diff --git a/packages/node-client/package.json b/packages/node-client/package.json index 9e0647dbb188b5261d3f9d0ae6fc5e538a4e65fe..cc2363ca1039910d05c71c8b12308a614f9e7561 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 7cca3783cf6672bc136c7733e945e65765e17397..decf4cd73bbecee4c91bef2ea1b3e7791ae8a221 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 4c31fb4e7376756316c5b5b1d9a4c5e894a2c071..fbe26904403837d93125fbcaf555c882e7113c78 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 ba1489efa10f5612787719f1c36eaf5027879889..376614604e901eb8c3211dceb99d44e9287598d4 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/node-client/tests/fixtures/resolvers/query/get-user.js b/packages/node-client/tests/fixtures/resolvers/query/get-user.js index cf0fc87d7121fdee497492c3803f308aa26f1099..d6fe859b6ea4fa7e92c681622de21b0e9c5789f2 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) { diff --git a/packages/resolver/package.json b/packages/resolver/package.json index b5d3e501a04f98e0471aa44ecde4aef411398ba7..db5c833f8609d7eda5912c486fae12eacf543bbf 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 dd6753f674201163da095736d5e0cf091df73d97..d8d8966563561314302239af2ffebdbf00241d04 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": 1570528682, "sourceType": "module" }