From abe5975e272ba61bf3f0560e3326c784ffff4c6a Mon Sep 17 00:00:00 2001 From: joelchu Date: Tue, 24 Mar 2020 13:27:05 +0800 Subject: [PATCH 1/2] replace the jsonql-jwt with @jsonql/security --- packages/ws-server-core/package.json | 2 +- packages/ws-server-core/src/share/add-property.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ws-server-core/package.json b/packages/ws-server-core/package.json index c2e071f7..f8b9c80e 100644 --- a/packages/ws-server-core/package.json +++ b/packages/ws-server-core/package.json @@ -27,6 +27,7 @@ "author": "Joel Chu ", "license": "MIT", "dependencies": { + "@jsonql/security": "^0.9.0", "@to1source/event": "^1.1.1", "colors": "^1.4.0", "debug": "^4.1.1", @@ -34,7 +35,6 @@ "fs-extra": "^9.0.0", "jsonql-constants": "^2.0.10", "jsonql-errors": "^1.2.1", - "jsonql-jwt": "^1.3.10", "jsonql-params-validator": "^1.6.2", "jsonql-resolver": "^1.2.1", "jsonql-utils": "^1.2.5", diff --git a/packages/ws-server-core/src/share/add-property.js b/packages/ws-server-core/src/share/add-property.js index f47775da..98c77d73 100644 --- a/packages/ws-server-core/src/share/add-property.js +++ b/packages/ws-server-core/src/share/add-property.js @@ -4,7 +4,7 @@ const { INIT_CLIENT_PROP_KEY } = require('jsonql-constants') const { injectToFn } = require('jsonql-utils') -const { provideUserdata } = require('jsonql-jwt') +const { provideUserdata } = require('@jsonql/security') const { injectNodeClient } = require('jsonql-resolver') const { setupSendMethod } = require('./setup-send-method') -- Gitee From 3f60331952c52f17640926d5b6e7bef679279bf8 Mon Sep 17 00:00:00 2001 From: joelchu Date: Tue, 24 Mar 2020 13:37:31 +0800 Subject: [PATCH 2/2] jsonql-constants 2.0.11 --- packages/constants/README.md | 1 + packages/constants/base.js | 1 + packages/constants/browser.js | 1 + packages/constants/constants.json | 1 + packages/constants/index.js | 5 ++++- packages/constants/main.js | 1 + packages/constants/package.json | 2 +- packages/constants/prop.js | 3 +++ packages/ws-server-core/package.json | 4 +--- packages/ws-server-core/src/options/index.js | 8 ++++++-- 10 files changed, 20 insertions(+), 7 deletions(-) diff --git a/packages/constants/README.md b/packages/constants/README.md index c29435f8..7314baa5 100755 --- a/packages/constants/README.md +++ b/packages/constants/README.md @@ -170,6 +170,7 @@ Please consult the detail break down below. - FILE_HANDLER_FN_NAME_PROP_KEY - ENABLE_SPLIT_TASK_PROP_KEY - CONNECTED_PROP_KEY +- CACHE_STORE_PROP_KEY ### SOCKET diff --git a/packages/constants/base.js b/packages/constants/base.js index 3ed50cc9..f2b295e9 100644 --- a/packages/constants/base.js +++ b/packages/constants/base.js @@ -138,3 +138,4 @@ export const DEFAULT_PORT_NUM = 6557 export const CSRF_HEADER_KEY = 'X-CSRF-Token' export const ORIGIN_HEADER_KEYS = ['Origin'] export const WILD_CARD_CHAR = '*' + diff --git a/packages/constants/browser.js b/packages/constants/browser.js index 1745e143..9fe8f908 100644 --- a/packages/constants/browser.js +++ b/packages/constants/browser.js @@ -171,6 +171,7 @@ var jsonqlConstants = { "FILE_HANDLER_FN_NAME_PROP_KEY": "fileHandlerName", "ENABLE_SPLIT_TASK_PROP_KEY": "enableSplitTask", "CONNECTED_PROP_KEY": "connected", + "CACHE_STORE_PROP_KEY": "cacheStore", "SOCKET_PING_EVENT_NAME": "__ping__", "SWITCH_USER_EVENT_NAME": "__switch__", "LOGIN_EVENT_NAME": "__login__", diff --git a/packages/constants/constants.json b/packages/constants/constants.json index 11998a54..67d129fa 100644 --- a/packages/constants/constants.json +++ b/packages/constants/constants.json @@ -171,6 +171,7 @@ "FILE_HANDLER_FN_NAME_PROP_KEY": "fileHandlerName", "ENABLE_SPLIT_TASK_PROP_KEY": "enableSplitTask", "CONNECTED_PROP_KEY": "connected", + "CACHE_STORE_PROP_KEY": "cacheStore", "SOCKET_PING_EVENT_NAME": "__ping__", "SWITCH_USER_EVENT_NAME": "__switch__", "LOGIN_EVENT_NAME": "__login__", diff --git a/packages/constants/index.js b/packages/constants/index.js index 3bd128a7..60457e59 100644 --- a/packages/constants/index.js +++ b/packages/constants/index.js @@ -140,6 +140,7 @@ export const DEFAULT_PORT_NUM = 6557 export const CSRF_HEADER_KEY = 'X-CSRF-Token' export const ORIGIN_HEADER_KEYS = ['Origin'] export const WILD_CARD_CHAR = '*' + /* prop.js */ // this is all the key name for the config check map @@ -244,7 +245,9 @@ export const FILE_HANDLER_FN_NAME_PROP_KEY = 'fileHandlerName' export const ENABLE_SPLIT_TASK_PROP_KEY = 'enableSplitTask' export const CONNECTED_PROP_KEY = 'connected' - /* socket.js */ + +// share naming to id the cache store object +export const CACHE_STORE_PROP_KEY = 'cacheStore' /* socket.js */ // the constants file is gettig too large // we need to split up and group the related constant in one file diff --git a/packages/constants/main.js b/packages/constants/main.js index 3a686fd1..3b25e6cd 100644 --- a/packages/constants/main.js +++ b/packages/constants/main.js @@ -171,6 +171,7 @@ module.exports = { "FILE_HANDLER_FN_NAME_PROP_KEY": "fileHandlerName", "ENABLE_SPLIT_TASK_PROP_KEY": "enableSplitTask", "CONNECTED_PROP_KEY": "connected", + "CACHE_STORE_PROP_KEY": "cacheStore", "SOCKET_PING_EVENT_NAME": "__ping__", "SWITCH_USER_EVENT_NAME": "__switch__", "LOGIN_EVENT_NAME": "__login__", diff --git a/packages/constants/package.json b/packages/constants/package.json index 13c6a7ec..abf33e8d 100755 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -1,6 +1,6 @@ { "name": "jsonql-constants", - "version": "2.0.10", + "version": "2.0.11", "description": "All the share constants for jsonql modules", "main": "main.js", "module": "index.js", diff --git a/packages/constants/prop.js b/packages/constants/prop.js index 2642ee76..b871f24a 100644 --- a/packages/constants/prop.js +++ b/packages/constants/prop.js @@ -100,3 +100,6 @@ export const FILE_HANDLER_FN_NAME_PROP_KEY = 'fileHandlerName' export const ENABLE_SPLIT_TASK_PROP_KEY = 'enableSplitTask' export const CONNECTED_PROP_KEY = 'connected' + +// share naming to id the cache store object +export const CACHE_STORE_PROP_KEY = 'cacheStore' \ No newline at end of file diff --git a/packages/ws-server-core/package.json b/packages/ws-server-core/package.json index f8b9c80e..1e854a2f 100644 --- a/packages/ws-server-core/package.json +++ b/packages/ws-server-core/package.json @@ -38,9 +38,7 @@ "jsonql-params-validator": "^1.6.2", "jsonql-resolver": "^1.2.1", "jsonql-utils": "^1.2.5", - "lodash": "^4.17.15", - "nanoid": "^2.1.11", - "node-cache": "^5.1.0" + "lodash": "^4.17.15" }, "devDependencies": { "ava": "^3.5.1", diff --git a/packages/ws-server-core/src/options/index.js b/packages/ws-server-core/src/options/index.js index d5a1fc71..9eac0cd3 100644 --- a/packages/ws-server-core/src/options/index.js +++ b/packages/ws-server-core/src/options/index.js @@ -4,6 +4,8 @@ const { join } = require('path') const fsx = require('fs-extra') const { JsonqlValidationError } = require('jsonql-errors') const { getNspInfoByConfig } = require('jsonql-utils') +const { getNodeCache } = require('@jsonql/security') + const { checkConfig, checkConfigAsync, @@ -45,7 +47,7 @@ function checkSocketServerType(config) { function localCheckConfig(config) { return checkConfigAsync(config, wsDefaultOptions, wsConstProps) } -let callCtn = 0 + /** * We take the step two onward from the wsCheckConfig * @param {object} config configuration already checked @@ -58,7 +60,7 @@ function initWsServerOption(config) { .then(opts => { const nspInfo = getNspInfoByConfig(opts) - debug('take a look at nspInfo', ++callCtn, nspInfo) + debug('take a look at nspInfo', nspInfo) // add a check here and make sure the nspInfo is correct if (!nspInfo.publicNamespace) { @@ -76,6 +78,8 @@ function initWsServerOption(config) { throw new JsonqlValidationError(`initWsServerOption`, SECRET_MISSING_ERR) } } + // we init an cache object here now for re-use through out the app + opts.cacheStore = getNodeCache() return opts }) } -- Gitee