diff --git a/packages/constants/README.md b/packages/constants/README.md index d61ed942ca2fdef94ba52efb43dbf5d806557830..128e1d41ec1439906250c4e91127fd5b57fec3b7 100755 --- a/packages/constants/README.md +++ b/packages/constants/README.md @@ -106,20 +106,15 @@ non-javascript to develop your tool. You can also use the included `constants.js - JS_WS_NAME - JS_PRIMUS_NAME - GO_WS_COOLPY7_NAME +- SOCKET_TYPE_KEY - SOCKET_TYPE_CLIENT_ALIAS - SOCKET_TYPE_SERVER_ALIAS -- SOCKET_TYPE_KEY -- ON_MESSAGE_PROP_NAME -- ON_RESULT_PROP_NAME -- ON_ERROR_PROP_NAME -- ON_READY_PROP_NAME -- ON_LOGIN_PROP_NAME -- SEND_MSG_PROP_NAME -- MESSAGE_PROP_NAME -- RESULT_PROP_NAME -- ERROR_PROP_NAME -- READY_PROP_NAME -- LOGIN_PROP_NAME +- ON_MESSAGE_FN_NAME +- ON_RESULT_FN_NAME +- ON_ERROR_FN_NAME +- ON_READY_FN_NAME +- ON_LOGIN_FN_NAME +- SEND_MSG_FN_NAME - CLIENT_PROP_NAME - USERDATA_PROP_NAME - INIT_CLIENT_PROP_KEY diff --git a/packages/constants/constants.json b/packages/constants/constants.json index 54c124196d1d0f10f9e6014340ecf8d1df4b8797..af74d2e49e0347dff68e41a446276a7066bdd5f8 100644 --- a/packages/constants/constants.json +++ b/packages/constants/constants.json @@ -137,20 +137,15 @@ "JS_WS_NAME": "ws", "JS_PRIMUS_NAME": "primus", "GO_WS_COOLPY7_NAME": "coolpy7", + "SOCKET_TYPE_KEY": "serverType", "SOCKET_TYPE_CLIENT_ALIAS": "socketClientType", "SOCKET_TYPE_SERVER_ALIAS": "socketServerType", - "SOCKET_TYPE_KEY": "serverType", - "ON_MESSAGE_PROP_NAME": "onMessage", - "ON_RESULT_PROP_NAME": "onResult", - "ON_ERROR_PROP_NAME": "onError", - "ON_READY_PROP_NAME": "onReady", - "ON_LOGIN_PROP_NAME": "onLogin", - "SEND_MSG_PROP_NAME": "send", - "MESSAGE_PROP_NAME": "message", - "RESULT_PROP_NAME": "result", - "ERROR_PROP_NAME": "error", - "READY_PROP_NAME": "ready", - "LOGIN_PROP_NAME": "login", + "ON_MESSAGE_FN_NAME": "onMessage", + "ON_RESULT_FN_NAME": "onResult", + "ON_ERROR_FN_NAME": "onError", + "ON_READY_FN_NAME": "onReady", + "ON_LOGIN_FN_NAME": "onLogin", + "SEND_MSG_FN_NAME": "send", "CLIENT_PROP_NAME": "client", "USERDATA_PROP_NAME": "userdata", "INIT_CLIENT_PROP_KEY": "nodeClient", diff --git a/packages/constants/main.js b/packages/constants/main.js index a511baae44e79445e1e881b1d672d78224adad89..e40da32bf3ccf929da062203bbe766db8b4b77d7 100644 --- a/packages/constants/main.js +++ b/packages/constants/main.js @@ -137,20 +137,15 @@ module.exports = { "JS_WS_NAME": "ws", "JS_PRIMUS_NAME": "primus", "GO_WS_COOLPY7_NAME": "coolpy7", + "SOCKET_TYPE_KEY": "serverType", "SOCKET_TYPE_CLIENT_ALIAS": "socketClientType", "SOCKET_TYPE_SERVER_ALIAS": "socketServerType", - "SOCKET_TYPE_KEY": "serverType", - "ON_MESSAGE_PROP_NAME": "onMessage", - "ON_RESULT_PROP_NAME": "onResult", - "ON_ERROR_PROP_NAME": "onError", - "ON_READY_PROP_NAME": "onReady", - "ON_LOGIN_PROP_NAME": "onLogin", - "SEND_MSG_PROP_NAME": "send", - "MESSAGE_PROP_NAME": "message", - "RESULT_PROP_NAME": "result", - "ERROR_PROP_NAME": "error", - "READY_PROP_NAME": "ready", - "LOGIN_PROP_NAME": "login", + "ON_MESSAGE_FN_NAME": "onMessage", + "ON_RESULT_FN_NAME": "onResult", + "ON_ERROR_FN_NAME": "onError", + "ON_READY_FN_NAME": "onReady", + "ON_LOGIN_FN_NAME": "onLogin", + "SEND_MSG_FN_NAME": "send", "CLIENT_PROP_NAME": "client", "USERDATA_PROP_NAME": "userdata", "INIT_CLIENT_PROP_KEY": "nodeClient", diff --git a/packages/constants/module.js b/packages/constants/module.js index 36d98da4c69c913b00662678f2f78de80bbaf904..8a4e7699bb1a559ce591087602f45380a0d878ed 100644 --- a/packages/constants/module.js +++ b/packages/constants/module.js @@ -147,26 +147,19 @@ export const JS_WS_SOCKET_IO_NAME = 'socket.io' export const JS_WS_NAME = 'ws' export const JS_PRIMUS_NAME = 'primus' export const GO_WS_COOLPY7_NAME = 'coolpy7' +// type name and Alias +export const SOCKET_TYPE_KEY = 'serverType' //1.9.1 export const SOCKET_TYPE_CLIENT_ALIAS = 'socketClientType' // 1.9.0 export const SOCKET_TYPE_SERVER_ALIAS = 'socketServerType' // 1.9.1 -export const SOCKET_TYPE_KEY = 'serverType' //1.9.1 - -// for ws client -export const ON_MESSAGE_PROP_NAME = 'onMessage' -export const ON_RESULT_PROP_NAME = 'onResult' -export const ON_ERROR_PROP_NAME = 'onError' -export const ON_READY_PROP_NAME = 'onReady' -export const ON_LOGIN_PROP_NAME = 'onLogin' // new @1.8.6 +// for ws client, 1.9.3 breaking change to name them as FN instead of PROP +export const ON_MESSAGE_FN_NAME = 'onMessage' +export const ON_RESULT_FN_NAME = 'onResult' +export const ON_ERROR_FN_NAME = 'onError' +export const ON_READY_FN_NAME = 'onReady' +export const ON_LOGIN_FN_NAME = 'onLogin' // new @1.8.6 // the actual method name client.resolverName.send -export const SEND_MSG_PROP_NAME = 'send' -// breaking change from 1.8.8 the above name was the name below -// the names are using in the new resolver.on getter interface -export const MESSAGE_PROP_NAME = 'message' -export const RESULT_PROP_NAME = 'result' -export const ERROR_PROP_NAME = 'error' -export const READY_PROP_NAME = 'ready' -export const LOGIN_PROP_NAME = 'login' // new @1.8.6 +export const SEND_MSG_FN_NAME = 'send' // this one is for nodeClient inject into the resolver export const CLIENT_PROP_NAME = 'client' diff --git a/packages/constants/package.json b/packages/constants/package.json index 3af9fc9e9055d628e847f6c282ec604a469a1a9c..4e0f0a758bbf80e4e2e2136c455eb131030a44e6 100755 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -1,6 +1,6 @@ { "name": "jsonql-constants", - "version": "1.9.2", + "version": "1.9.3", "description": "All the share constants for json:ql tools", "main": "main.js", "module": "module.js", diff --git a/packages/ws-client-core/package.json b/packages/ws-client-core/package.json index 7ece871f195c2a7f4a9f761bd3ce0db98192030c..08b7a98c643c6317b801dfb6d09e42ab62739226 100644 --- a/packages/ws-client-core/package.json +++ b/packages/ws-client-core/package.json @@ -53,7 +53,7 @@ "node": ">=8" }, "dependencies": { - "jsonql-constants": "^1.9.1", + "jsonql-constants": "^1.9.2", "jsonql-errors": "^1.1.10", "jsonql-params-validator": "^1.5.2", "jsonql-utils": "^1.0.0",