@bytescale/sdk 3.42.0 → 3.43.0

package/dist/browser/cjs/main.js

@@ -3076,6 +3076,77 @@ var ServiceWorkerUtils = /*#__PURE__*/function () {
     }
   }]);
 }();
+;// CONCATENATED MODULE: ./src/private/Scheduler.ts
+function Scheduler_typeof(o) { "@babel/helpers - typeof"; return Scheduler_typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, Scheduler_typeof(o); }
+function Scheduler_classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function Scheduler_defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, Scheduler_toPropertyKey(descriptor.key), descriptor); } }
+function Scheduler_createClass(Constructor, protoProps, staticProps) { if (protoProps) Scheduler_defineProperties(Constructor.prototype, protoProps); if (staticProps) Scheduler_defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function Scheduler_toPropertyKey(t) { var i = Scheduler_toPrimitive(t, "string"); return "symbol" == Scheduler_typeof(i) ? i : i + ""; }
+function Scheduler_toPrimitive(t, r) { if ("object" != Scheduler_typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != Scheduler_typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+
+var Scheduler = /*#__PURE__*/function () {
+  function Scheduler() {
+    Scheduler_classCallCheck(this, Scheduler);
+    this.callbacks = {};
+    this.nextId = 0;
+    this.intervalId = undefined;
+  }
+  return Scheduler_createClass(Scheduler, [{
+    key: "schedule",
+    value: function schedule(epoch, callback) {
+      var handle = this.nextId++;
+      this.callbacks[handle] = {
+        epoch: epoch,
+        callback: callback
+      };
+      this.startInterval();
+      return handle;
+    }
+  }, {
+    key: "unschedule",
+    value: function unschedule(handle) {
+      // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+      delete this.callbacks[handle];
+      if (Object.keys(this.callbacks).length === 0) {
+        this.stopInterval();
+      }
+    }
+  }, {
+    key: "startInterval",
+    value: function startInterval() {
+      var _this = this;
+      if (this.intervalId === undefined) {
+        this.intervalId = setInterval(function () {
+          return _this.checkCallbacks();
+        }, 1000);
+      }
+    }
+  }, {
+    key: "stopInterval",
+    value: function stopInterval() {
+      if (this.intervalId !== undefined) {
+        clearInterval(this.intervalId);
+        this.intervalId = undefined;
+      }
+    }
+  }, {
+    key: "checkCallbacks",
+    value: function checkCallbacks() {
+      var now = Date.now();
+      for (var handleStr in this.callbacks) {
+        var handle = parseInt(handleStr);
+        if (this.callbacks[handle].epoch <= now) {
+          try {
+            this.callbacks[handle].callback();
+          } catch (e) {
+            ConsoleUtils.error("Unhandled error from scheduled callback: ".concat(e));
+          }
+          this.unschedule(handle);
+        }
+      }
+    }
+  }]);
+}();
 ;// CONCATENATED MODULE: ./src/public/browser/AuthManagerBrowser.ts
 function AuthManagerBrowser_empty() {}
 function AuthManagerBrowser_awaitIgnored(value, direct) {
@@ -3159,6 +3230,7 @@ function AuthManagerBrowser_toPrimitive(t, r) { if ("object" != AuthManagerBrows
 
 
 
+
 var AuthManagerImpl = /*#__PURE__*/function () {
   function AuthManagerImpl(serviceWorkerUtils) {
     AuthManagerBrowser_classCallCheck(this, AuthManagerImpl);
@@ -3168,9 +3240,9 @@ var AuthManagerImpl = /*#__PURE__*/function () {
     this.contentTypeJson = "application/json";
     this.contentTypeText = "text/plain";
     this.minJwtTtlSeconds = 10;
-    this.maxJwtTtlSeconds = 2147483; // Max value for window.setTimeout is 2147483647ms -- if we go over this, the timeout fires immediately.
     this.retryAuthAfterErrorSeconds = 5;
     this.refreshBeforeExpirySeconds = 20;
+    this.scheduler = new Scheduler();
     this.authSessionMutex = AuthSessionState.getMutex();
   }
   return AuthManagerBrowser_createClass(AuthManagerImpl, [{
@@ -3227,7 +3299,7 @@ var AuthManagerImpl = /*#__PURE__*/function () {
           AuthSessionState.setSession(undefined);
           session.isActive = false;
           if (session.accessTokenRefreshHandle !== undefined) {
-            clearTimeout(session.accessTokenRefreshHandle);
+            _this2.scheduler.unschedule(session.accessTokenRefreshHandle);
           }
           return AuthManagerBrowser_await(_this2.deleteAccessToken(session.params), function () {
             return AuthManagerBrowser_invokeIgnored(function () {
@@ -3254,7 +3326,10 @@ var AuthManagerImpl = /*#__PURE__*/function () {
           if (!session.isActive) {
             return;
           }
-          var timeout = _this3.retryAuthAfterErrorSeconds;
+          var secondsFromNow = function secondsFromNow(seconds) {
+            return Date.now() + seconds * 1000;
+          };
+          var expires = secondsFromNow(_this3.retryAuthAfterErrorSeconds);
           return AuthManagerBrowser_continueIgnored(AuthManagerBrowser_finallyRethrows(function () {
             return AuthManagerBrowser_catch(function () {
               var _getAccessToken = _this3.getAccessToken,
@@ -3276,7 +3351,7 @@ var AuthManagerImpl = /*#__PURE__*/function () {
                               key: "Authorization",
                               value: "Bearer ".concat(jwt)
                             }],
-                            expires: Date.now() + setTokenResult.ttlSeconds * 1000,
+                            expires: secondsFromNow(setTokenResult.ttlSeconds),
                             urlPrefix: "".concat(_this3.getCdnUrl(session.params), "/").concat(session.params.accountId, "/")
                           }]
                         }, session.authServiceWorker, _this3.serviceWorkerScriptFieldName), function () {
@@ -3290,13 +3365,12 @@ var AuthManagerImpl = /*#__PURE__*/function () {
                       }
                     }, function () {
                       var desiredTtl = setTokenResult.ttlSeconds - _this3.refreshBeforeExpirySeconds;
-                      timeout = Math.max(desiredTtl, _this3.minJwtTtlSeconds);
-                      if (desiredTtl !== timeout) {
-                        ConsoleUtils.warn("JWT expiration is too short: waiting for ".concat(timeout, " seconds before refreshing."));
+                      var actualTtl = Math.max(desiredTtl, _this3.minJwtTtlSeconds);
+                      if (desiredTtl !== actualTtl) {
+                        ConsoleUtils.warn("JWT expiration is too short: waiting for ".concat(actualTtl, " seconds before refreshing."));
                       }
-                      // There's no need to print a warning for this: it's OK to silently request the JWT before it expires. Also, this is 24 days in this case!
+                      expires = secondsFromNow(actualTtl);
                       // Set this at the end, as it's also used to signal 'isAuthSessionReady', so must be set after configuring the Service Worker, etc.
-                      timeout = Math.min(timeout, _this3.maxJwtTtlSeconds);
                       session.accessToken = setTokenResult.accessToken;
                     });
                   });
@@ -3307,13 +3381,13 @@ var AuthManagerImpl = /*#__PURE__*/function () {
               ConsoleUtils.warn("Unable to refresh JWT access token: ".concat(e));
             });
           }, function (_wasThrown, _result) {
-            session.accessTokenRefreshHandle = window.setTimeout(function () {
+            session.accessTokenRefreshHandle = _this3.scheduler.schedule(expires, function () {
               _this3.refreshAccessToken(session).then(function () {},
               // Should not occur, as this method shouldn't throw errors.
               function (e) {
                 return ConsoleUtils.error("Unexpected error when refreshing JWT access token: ".concat(e));
               });
-            }, timeout * 1000);
+            });
             return AuthManagerBrowser_rethrow(_wasThrown, _result);
           }));
         }))));

package/dist/browser/esm/main.mjs

@@ -3061,6 +3061,77 @@ var ServiceWorkerUtils = /*#__PURE__*/function () {
     }
   }]);
 }();
+;// CONCATENATED MODULE: ./src/private/Scheduler.ts
+function Scheduler_typeof(o) { "@babel/helpers - typeof"; return Scheduler_typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, Scheduler_typeof(o); }
+function Scheduler_classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function Scheduler_defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, Scheduler_toPropertyKey(descriptor.key), descriptor); } }
+function Scheduler_createClass(Constructor, protoProps, staticProps) { if (protoProps) Scheduler_defineProperties(Constructor.prototype, protoProps); if (staticProps) Scheduler_defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function Scheduler_toPropertyKey(t) { var i = Scheduler_toPrimitive(t, "string"); return "symbol" == Scheduler_typeof(i) ? i : i + ""; }
+function Scheduler_toPrimitive(t, r) { if ("object" != Scheduler_typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != Scheduler_typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+
+var Scheduler = /*#__PURE__*/function () {
+  function Scheduler() {
+    Scheduler_classCallCheck(this, Scheduler);
+    this.callbacks = {};
+    this.nextId = 0;
+    this.intervalId = undefined;
+  }
+  return Scheduler_createClass(Scheduler, [{
+    key: "schedule",
+    value: function schedule(epoch, callback) {
+      var handle = this.nextId++;
+      this.callbacks[handle] = {
+        epoch: epoch,
+        callback: callback
+      };
+      this.startInterval();
+      return handle;
+    }
+  }, {
+    key: "unschedule",
+    value: function unschedule(handle) {
+      // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+      delete this.callbacks[handle];
+      if (Object.keys(this.callbacks).length === 0) {
+        this.stopInterval();
+      }
+    }
+  }, {
+    key: "startInterval",
+    value: function startInterval() {
+      var _this = this;
+      if (this.intervalId === undefined) {
+        this.intervalId = setInterval(function () {
+          return _this.checkCallbacks();
+        }, 1000);
+      }
+    }
+  }, {
+    key: "stopInterval",
+    value: function stopInterval() {
+      if (this.intervalId !== undefined) {
+        clearInterval(this.intervalId);
+        this.intervalId = undefined;
+      }
+    }
+  }, {
+    key: "checkCallbacks",
+    value: function checkCallbacks() {
+      var now = Date.now();
+      for (var handleStr in this.callbacks) {
+        var handle = parseInt(handleStr);
+        if (this.callbacks[handle].epoch <= now) {
+          try {
+            this.callbacks[handle].callback();
+          } catch (e) {
+            ConsoleUtils.error("Unhandled error from scheduled callback: ".concat(e));
+          }
+          this.unschedule(handle);
+        }
+      }
+    }
+  }]);
+}();
 ;// CONCATENATED MODULE: ./src/public/browser/AuthManagerBrowser.ts
 function AuthManagerBrowser_empty() {}
 function AuthManagerBrowser_awaitIgnored(value, direct) {
@@ -3144,6 +3215,7 @@ function AuthManagerBrowser_toPrimitive(t, r) { if ("object" != AuthManagerBrows
 
 
 
+
 var AuthManagerImpl = /*#__PURE__*/function () {
   function AuthManagerImpl(serviceWorkerUtils) {
     AuthManagerBrowser_classCallCheck(this, AuthManagerImpl);
@@ -3153,9 +3225,9 @@ var AuthManagerImpl = /*#__PURE__*/function () {
     this.contentTypeJson = "application/json";
     this.contentTypeText = "text/plain";
     this.minJwtTtlSeconds = 10;
-    this.maxJwtTtlSeconds = 2147483; // Max value for window.setTimeout is 2147483647ms -- if we go over this, the timeout fires immediately.
     this.retryAuthAfterErrorSeconds = 5;
     this.refreshBeforeExpirySeconds = 20;
+    this.scheduler = new Scheduler();
     this.authSessionMutex = AuthSessionState.getMutex();
   }
   return AuthManagerBrowser_createClass(AuthManagerImpl, [{
@@ -3212,7 +3284,7 @@ var AuthManagerImpl = /*#__PURE__*/function () {
           AuthSessionState.setSession(undefined);
           session.isActive = false;
           if (session.accessTokenRefreshHandle !== undefined) {
-            clearTimeout(session.accessTokenRefreshHandle);
+            _this2.scheduler.unschedule(session.accessTokenRefreshHandle);
           }
           return AuthManagerBrowser_await(_this2.deleteAccessToken(session.params), function () {
             return AuthManagerBrowser_invokeIgnored(function () {
@@ -3239,7 +3311,10 @@ var AuthManagerImpl = /*#__PURE__*/function () {
           if (!session.isActive) {
             return;
           }
-          var timeout = _this3.retryAuthAfterErrorSeconds;
+          var secondsFromNow = function secondsFromNow(seconds) {
+            return Date.now() + seconds * 1000;
+          };
+          var expires = secondsFromNow(_this3.retryAuthAfterErrorSeconds);
           return AuthManagerBrowser_continueIgnored(AuthManagerBrowser_finallyRethrows(function () {
             return AuthManagerBrowser_catch(function () {
               var _getAccessToken = _this3.getAccessToken,
@@ -3261,7 +3336,7 @@ var AuthManagerImpl = /*#__PURE__*/function () {
                               key: "Authorization",
                               value: "Bearer ".concat(jwt)
                             }],
-                            expires: Date.now() + setTokenResult.ttlSeconds * 1000,
+                            expires: secondsFromNow(setTokenResult.ttlSeconds),
                             urlPrefix: "".concat(_this3.getCdnUrl(session.params), "/").concat(session.params.accountId, "/")
                           }]
                         }, session.authServiceWorker, _this3.serviceWorkerScriptFieldName), function () {
@@ -3275,13 +3350,12 @@ var AuthManagerImpl = /*#__PURE__*/function () {
                       }
                     }, function () {
                       var desiredTtl = setTokenResult.ttlSeconds - _this3.refreshBeforeExpirySeconds;
-                      timeout = Math.max(desiredTtl, _this3.minJwtTtlSeconds);
-                      if (desiredTtl !== timeout) {
-                        ConsoleUtils.warn("JWT expiration is too short: waiting for ".concat(timeout, " seconds before refreshing."));
+                      var actualTtl = Math.max(desiredTtl, _this3.minJwtTtlSeconds);
+                      if (desiredTtl !== actualTtl) {
+                        ConsoleUtils.warn("JWT expiration is too short: waiting for ".concat(actualTtl, " seconds before refreshing."));
                       }
-                      // There's no need to print a warning for this: it's OK to silently request the JWT before it expires. Also, this is 24 days in this case!
+                      expires = secondsFromNow(actualTtl);
                       // Set this at the end, as it's also used to signal 'isAuthSessionReady', so must be set after configuring the Service Worker, etc.
-                      timeout = Math.min(timeout, _this3.maxJwtTtlSeconds);
                       session.accessToken = setTokenResult.accessToken;
                     });
                   });
@@ -3292,13 +3366,13 @@ var AuthManagerImpl = /*#__PURE__*/function () {
               ConsoleUtils.warn("Unable to refresh JWT access token: ".concat(e));
             });
           }, function (_wasThrown, _result) {
-            session.accessTokenRefreshHandle = window.setTimeout(function () {
+            session.accessTokenRefreshHandle = _this3.scheduler.schedule(expires, function () {
               _this3.refreshAccessToken(session).then(function () {},
               // Should not occur, as this method shouldn't throw errors.
               function (e) {
                 return ConsoleUtils.error("Unexpected error when refreshing JWT access token: ".concat(e));
               });
-            }, timeout * 1000);
+            });
             return AuthManagerBrowser_rethrow(_wasThrown, _result);
           }));
         }))));

package/dist/types/private/Scheduler.d.ts

@@ -0,0 +1,10 @@
+export declare class Scheduler {
+    private callbacks;
+    private nextId;
+    private intervalId;
+    schedule(epoch: number, callback: () => void): number;
+    unschedule(handle: number): void;
+    private startInterval;
+    private stopInterval;
+    private checkCallbacks;
+}

package/dist/types/public/browser/AuthManagerBrowser.d.ts

@@ -9,9 +9,9 @@ declare class AuthManagerImpl implements AuthManagerInterface {
     private readonly contentTypeJson;
     private readonly contentTypeText;
     private readonly minJwtTtlSeconds;
-    private readonly maxJwtTtlSeconds;
     private readonly retryAuthAfterErrorSeconds;
     private readonly refreshBeforeExpirySeconds;
+    private readonly scheduler;
     constructor(serviceWorkerUtils: ServiceWorkerUtils<AuthSwSetConfigDto>);
     isAuthSessionActive(): boolean;
     isAuthSessionReady(): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytescale/sdk",
-  "version": "3.42.0",
+  "version": "3.43.0",
   "description": "Bytescale JavaScript SDK",
   "author": "Bytescale <hello@bytescale.com> (https://www.bytescale.com)",
   "license": "MIT",