@barchart/portfolio-client-js 1.3.17 → 1.3.18

package/example/example.js

@@ -2000,7 +2000,8 @@ module.exports = (() => {
       this._started = false;
       this._startPromise = null;
       this._endpoint = endpoint;
-      this._refreshInterval = refreshInterval || null;
+      this._refreshInterval = refreshInterval || 0;
+      this._refreshJitter = Math.floor(this._refreshInterval / 10);
     }
     /**
      * Initializes the connection to the remote server and returns a promise
@@ -2055,42 +2056,26 @@ module.exports = (() => {
 
     toRequestInterceptor() {
       const scheduler = new Scheduler();
-      let cachePromise = null;
-      let cacheDisposable = null;
+      let refreshPromise = null;
+      let refreshTime = null;
 
       const refreshToken = () => {
-        const refreshPromise = scheduler.backoff(() => this.readToken(), 750, 'Read JWT token', 3).then(token => {
-          if (this._refreshInterval) {
-            cachePromise = refreshPromise;
-
-            if (cacheDisposable === null) {
-              cacheDisposable = scheduler.repeat(() => refreshToken(), this._refreshInterval, 'Refresh JWT token');
-            }
-          }
-
-          return token;
-        }).catch(e => {
-          if (cacheDisposable !== null) {
-            cacheDisposable.dispose();
-            cacheDisposable = null;
-            cachePromise = null;
-          }
+        if (refreshPromise === null || this._refreshInterval > 0 && refreshTime !== null && getTime() > refreshTime + this._refreshInterval + this._refreshJitter) {
+          refreshPromise = scheduler.backoff(() => this.readToken(), 750, 'Read JWT token', 3).then(token => {
+            refreshTime = getTime();
+            return token;
+          }).catch(e => {
+            refreshPromise = null;
+            refreshTime = null;
+            return Promise.reject(e);
+          });
+        }
 
-          return Promise.reject(e);
-        });
         return refreshPromise;
       };
 
       const delegate = (options, endpoint) => {
-        let tokenPromise;
-
-        if (cachePromise !== null) {
-          tokenPromise = cachePromise;
-        } else {
-          tokenPromise = refreshToken();
-        }
-
-        return tokenPromise.then(token => {
+        return refreshToken().then(token => {
           options.headers = options.headers || {};
           options.headers.Authorization = `Bearer ${token}`;
           return options;
@@ -2277,6 +2262,10 @@ module.exports = (() => {
     }
   }
 
+  function getTime() {
+    return new Date().getTime();
+  }
+
   function forDevelopment(userId, legacyUserId) {
     return EndpointBuilder.for('read-jwt-token-for-development', 'lookup user identity').withVerb(VerbType.GET).withProtocol(ProtocolType.HTTPS).withHost(Configuration.developmentHost).withPathBuilder(pb => {
       pb.withLiteralParameter('token', 'token').withLiteralParameter('barchart', 'barchart').withLiteralParameter('generator', 'generator');
@@ -2334,7 +2323,7 @@ module.exports = (() => {
   return {
     JwtGateway: JwtGateway,
     PortfolioGateway: PortfolioGateway,
-    version: '1.3.17'
+    version: '1.3.18'
   };
 })();
 

package/lib/gateway/jwt/JwtGateway.js

@@ -37,7 +37,9 @@ module.exports = (() => {
 			this._startPromise = null;
 
 			this._endpoint = endpoint;
-			this._refreshInterval = refreshInterval || null;
+
+			this._refreshInterval = refreshInterval || 0;
+			this._refreshJitter = Math.floor(this._refreshInterval / 10);
 		}
 
 		/**
@@ -97,56 +99,41 @@ module.exports = (() => {
 		toRequestInterceptor() {
 			const scheduler = new Scheduler();
 
-			let cachePromise = null;
-			let cacheDisposable = null;
+			let refreshPromise = null;
+			let refreshTime = null;
 
 			const refreshToken = () => {
-				const refreshPromise = scheduler.backoff(() => this.readToken(), 750, 'Read JWT token', 3)
-					.then((token) => {
-						if (this._refreshInterval) {
-							cachePromise = refreshPromise;
-
-							if (cacheDisposable === null) {
-								cacheDisposable = scheduler.repeat(() => refreshToken(), this._refreshInterval, 'Refresh JWT token');
-							}
-						}
-
-						return token;
-					}).catch((e) => {
-						if (cacheDisposable !== null) {
-							cacheDisposable.dispose();
-
-							cacheDisposable = null;
-							cachePromise = null;
-						}
-
-						return Promise.reject(e);
-					});
+				if (refreshPromise === null || (this._refreshInterval > 0 && refreshTime !== null && getTime() > (refreshTime + this._refreshInterval + this._refreshJitter))) {
+					refreshPromise = scheduler.backoff(() => this.readToken(), 750, 'Read JWT token', 3)
+						.then((token) => {
+							refreshTime = getTime();
+
+							return token;
+						}).catch((e) => {
+							refreshPromise = null;
+							refreshTime = null;
+
+							return Promise.reject(e);
+						});
+				}
 
 				return refreshPromise;
 			};
 
 			const delegate = (options, endpoint) => {
-				let tokenPromise;
-
-				if (cachePromise !== null) {
-					tokenPromise = cachePromise;
-				}  else {
-					tokenPromise = refreshToken();
-				}
-
-				return tokenPromise.then((token) => {
-					options.headers = options.headers || { };
-					options.headers.Authorization = `Bearer ${token}`;
+				return refreshToken()
+					.then((token) => {
+						options.headers = options.headers || { };
+						options.headers.Authorization = `Bearer ${token}`;
 
-					return options;
-				}).catch((e) => {
-					const failure = FailureReason.forRequest({ endpoint: endpoint })
+						return options;
+					}).catch((e) => {
+						const failure = FailureReason.forRequest({ endpoint: endpoint })
 						.addItem(FailureType.REQUEST_IDENTITY_FAILURE)
 						.format();
 
-					return Promise.reject(failure);
-				});
+						return Promise.reject(failure);
+					});
 			};
 
 			return RequestInterceptor.fromDelegate(delegate);
@@ -319,6 +306,10 @@ module.exports = (() => {
 		}
 	}
 
+	function getTime() {
+		return (new Date()).getTime();
+	}
+
 	function forDevelopment(userId, legacyUserId) {
 		return EndpointBuilder.for('read-jwt-token-for-development', 'lookup user identity')
 			.withVerb(VerbType.GET)
@@ -366,9 +357,9 @@ module.exports = (() => {
 			})
 			.withQueryBuilder((qb) => {
 				qb.withLiteralParameter('user', 'userId', userId)
-				.withLiteralParameter('legacy user', 'userLegacyId', userId)
-				.withLiteralParameter('user context', 'userContext', 'Barchart')
-				.withLiteralParameter('user permission level', 'userPermissions', 'registered');
+					.withLiteralParameter('legacy user', 'userLegacyId', userId)
+					.withLiteralParameter('user context', 'userContext', 'Barchart')
+					.withLiteralParameter('user permission level', 'userPermissions', 'registered');
 			})
 			.withResponseInterceptor(ResponseInterceptor.DATA)
 			.endpoint;

package/lib/index.js

@@ -7,6 +7,6 @@ module.exports = (() => {
 	return {
 		JwtGateway: JwtGateway,
 		PortfolioGateway: PortfolioGateway,
-		version: '1.3.17'
+		version: '1.3.18'
 	};
 })();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barchart/portfolio-client-js",
-  "version": "1.3.17",
+  "version": "1.3.18",
   "description": "JavaScript library for interfacing with Barchart's Portfolio API",
   "author": {
     "name": "Bryan Ingle",