From 60b38b918bc738c7046e4d87869994c929f3058a Mon Sep 17 00:00:00 2001 From: joelchu Date: Tue, 8 Oct 2019 17:57:52 +0800 Subject: [PATCH 1/3] jsonql-resolver to v0.9.3 --- packages/resolver/package.json | 2 +- packages/resolver/tests/fixtures/contract/es/contract.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/resolver/package.json b/packages/resolver/package.json index b5d3e501..db5c833f 100644 --- a/packages/resolver/package.json +++ b/packages/resolver/package.json @@ -37,7 +37,7 @@ }, "devDependencies": { "ava": "^2.4.0", - "jsonql-contract": "^1.7.20", + "jsonql-contract": "^1.7.21", "jsonql-koa": "^1.3.9", "server-io-core": "^1.2.0" }, diff --git a/packages/resolver/tests/fixtures/contract/es/contract.json b/packages/resolver/tests/fixtures/contract/es/contract.json index dd6753f6..9c8ff89a 100644 --- a/packages/resolver/tests/fixtures/contract/es/contract.json +++ b/packages/resolver/tests/fixtures/contract/es/contract.json @@ -43,6 +43,6 @@ } }, "auth": {}, - "timestamp": 1570437612, + "timestamp": 1570528611, "sourceType": "module" } -- Gitee From 301166bd8ca653b1290f530b4e985fa5dde4831f Mon Sep 17 00:00:00 2001 From: joelchu Date: Tue, 8 Oct 2019 22:02:20 +0800 Subject: [PATCH 2/3] set several debug option inside the node-client to check why the client keep return the wrong contract clients --- packages/node-client/package.json | 9 +++++---- packages/node-client/src/base/jsonql-base-cls.js | 6 +++--- packages/node-client/src/base/jsonql-cache-class.js | 5 ++++- packages/node-client/src/base/request-client.js | 2 +- .../resolver/tests/fixtures/contract/es/contract.json | 2 +- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/packages/node-client/package.json b/packages/node-client/package.json index 9e0647db..cc2363ca 100755 --- a/packages/node-client/package.json +++ b/packages/node-client/package.json @@ -1,10 +1,11 @@ { "name": "jsonql-node-client", - "version": "1.1.10", - "description": "jsonql node.js client using request", + "version": "1.1.11", + "description": "jsonql node.js client", "main": "index.js", "scripts": { - "test": "DEBUG=jsonql* ava --verbose", + "test": "ava --verbose", + "prepare": "npm run test", "test:nyc": "DEBUG=jsonql-node-client* nyc ava", "test:main": "DEBUG=jsonql-node-client* ava tests/main.test.js", "test:auth": "DEBUG=jsonql-* ava tests/auth.test.js", @@ -49,7 +50,7 @@ }, "devDependencies": { "ava": "^2.4.0", - "jsonql-contract": "^1.7.20", + "jsonql-contract": "^1.7.21", "jsonql-koa": "^1.3.9", "nyc": "^14.1.1", "server-io-core": "^1.2.0", diff --git a/packages/node-client/src/base/jsonql-base-cls.js b/packages/node-client/src/base/jsonql-base-cls.js index 7cca3783..decf4cd7 100755 --- a/packages/node-client/src/base/jsonql-base-cls.js +++ b/packages/node-client/src/base/jsonql-base-cls.js @@ -25,7 +25,7 @@ class JsonqlClient extends JsonqlCacheClass { super(config) this.opts = config // @TODO we need to figure out an alternative way to store the session data - this.__store__ = {}; // @TODO remove this later + // this.__store__ = {}; // @TODO remove this later this.__url__ = [this.opts.hostname, this.opts.jsonqlPath].join('/') } @@ -152,13 +152,13 @@ class JsonqlClient extends JsonqlCacheClass { if (this.__isContractExpired(cacheContract)) { this.setter('contract', false) // just clear it out } else { - debug(`get contract from cache`) + debug(`get contract from cache`, cacheContract) return Promise.resolve(cacheContract) } } // check if there is a contract store locally - const file = join(this.opts.contractDir, this.opts.contractFileName); + const file = join(this.opts.contractDir, this.opts.contractFileName) if (fsx.existsSync(file)) { debug('return contract from file: ', file) if (!this.__isContractExpired(contract)) { diff --git a/packages/node-client/src/base/jsonql-cache-class.js b/packages/node-client/src/base/jsonql-cache-class.js index 4c31fb4e..fbe26904 100644 --- a/packages/node-client/src/base/jsonql-cache-class.js +++ b/packages/node-client/src/base/jsonql-cache-class.js @@ -13,10 +13,13 @@ class JsonqlCacheClass { constructor(config) { this.nc = new NodeCache() this.ncBaseKey = config.hostname; + debug('ncBaseKey', this.ncBaseKey) } get baseCacheObj() { - return this.nc.get(this.ncBaseKey) + const key = this.nc.get(this.ncBaseKey) + debug('baseCacheObj', key) + return key } set baseCacheObj(values) { diff --git a/packages/node-client/src/base/request-client.js b/packages/node-client/src/base/request-client.js index ba1489ef..37661460 100755 --- a/packages/node-client/src/base/request-client.js +++ b/packages/node-client/src/base/request-client.js @@ -16,7 +16,7 @@ const debug = getDebug('request-client') class JsonqlRequestClient extends JsonqlClient { constructor(config = {}) { - super(config); + super(config) } // just a wrapper diff --git a/packages/resolver/tests/fixtures/contract/es/contract.json b/packages/resolver/tests/fixtures/contract/es/contract.json index 9c8ff89a..d8d89665 100644 --- a/packages/resolver/tests/fixtures/contract/es/contract.json +++ b/packages/resolver/tests/fixtures/contract/es/contract.json @@ -43,6 +43,6 @@ } }, "auth": {}, - "timestamp": 1570528611, + "timestamp": 1570528682, "sourceType": "module" } -- Gitee From 8f870810289a0c25ba57491795cb5feeedb0554f Mon Sep 17 00:00:00 2001 From: joelchu Date: Tue, 8 Oct 2019 22:04:38 +0800 Subject: [PATCH 3/3] jsdoc throw error on get-user but the test passed --- .../node-client/tests/fixtures/resolvers/query/get-user.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/node-client/tests/fixtures/resolvers/query/get-user.js b/packages/node-client/tests/fixtures/resolvers/query/get-user.js index cf0fc87d..d6fe859b 100755 --- a/packages/node-client/tests/fixtures/resolvers/query/get-user.js +++ b/packages/node-client/tests/fixtures/resolvers/query/get-user.js @@ -1,8 +1,9 @@ // const debug = require('debug')('jsonql-node-client:test:get-user'); const { users, msg } = require('../../options') const { JsonqlResolverAppError } = require('jsonql-errors') + /** - * @param {number} id + * @param {number} id user id * @return {object|string} user object on ok */ module.exports = function getUser(id) { -- Gitee