@bytescale/sdk 3.17.0 → 3.18.0

package/dist/browser/cjs/main.js

@@ -2394,6 +2394,164 @@ var ConsoleUtils = /*#__PURE__*/function () {
   }]);
   return ConsoleUtils;
 }();
+;// CONCATENATED MODULE: ./src/private/ServiceWorkerUtils.ts
+function ServiceWorkerUtils_typeof(obj) { "@babel/helpers - typeof"; return ServiceWorkerUtils_typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, ServiceWorkerUtils_typeof(obj); }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = ServiceWorkerUtils_unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+function ServiceWorkerUtils_unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return ServiceWorkerUtils_arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return ServiceWorkerUtils_arrayLikeToArray(o, minLen); }
+function ServiceWorkerUtils_arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function ServiceWorkerUtils_await(value, then, direct) {
+  if (direct) {
+    return then ? then(value) : value;
+  }
+  if (!value || !value.then) {
+    value = Promise.resolve(value);
+  }
+  return then ? value.then(then) : value;
+}
+function ServiceWorkerUtils_catch(body, recover) {
+  try {
+    var result = body();
+  } catch (e) {
+    return recover(e);
+  }
+  if (result && result.then) {
+    return result.then(void 0, recover);
+  }
+  return result;
+}
+function ServiceWorkerUtils_classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function ServiceWorkerUtils_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, ServiceWorkerUtils_toPropertyKey(descriptor.key), descriptor); } }
+function ServiceWorkerUtils_createClass(Constructor, protoProps, staticProps) { if (protoProps) ServiceWorkerUtils_defineProperties(Constructor.prototype, protoProps); if (staticProps) ServiceWorkerUtils_defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function ServiceWorkerUtils_toPropertyKey(arg) { var key = ServiceWorkerUtils_toPrimitive(arg, "string"); return ServiceWorkerUtils_typeof(key) === "symbol" ? key : String(key); }
+function ServiceWorkerUtils_toPrimitive(input, hint) { if (ServiceWorkerUtils_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (ServiceWorkerUtils_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+
+var ServiceWorkerUtils = /*#__PURE__*/function () {
+  function ServiceWorkerUtils() {
+    ServiceWorkerUtils_classCallCheck(this, ServiceWorkerUtils);
+  }
+  ServiceWorkerUtils_createClass(ServiceWorkerUtils, [{
+    key: "registerServiceWorkerIfSupported",
+    value:
+    /**
+     * Idempotent.
+     *
+     * Only returns once the service worker has been activated.
+     *
+     * We don't need to unregister it: we just need to clear the config when auth ends.
+     */
+    function registerServiceWorkerIfSupported(serviceWorkerScript, configFieldName, fallbackMessage) {
+      try {
+        var _this2 = this;
+        if (serviceWorkerScript === undefined) {
+          return undefined;
+        }
+        if (!("serviceWorker" in navigator)) {
+          ConsoleUtils.warn("Service workers not supported by browser. ".concat(fallbackMessage));
+          return undefined;
+        }
+        if (!serviceWorkerScript.startsWith("/")) {
+          throw new Error("The '".concat(configFieldName, "' field must start with a '/' and reference a script at the root of your website."));
+        }
+        var forwardSlashCount = serviceWorkerScript.split("/").length - 1;
+        if (forwardSlashCount > 1) {
+          ConsoleUtils.warn("The '".concat(configFieldName, "' field should be a root script (e.g. '/script.js'). The Bytescale SDK can only authorize requests originating from webpages that are at the same level as the script or below."));
+        }
+        return ServiceWorkerUtils_await(_this2.registerAuthServiceWorker(serviceWorkerScript), function (_this$registerAuthSer) {
+          return _this$registerAuthSer.config;
+        });
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    }
+  }, {
+    key: "getActiveServiceWorkerElseRegister",
+    value: function getActiveServiceWorkerElseRegister(_ref) {
+      var serviceWorkerScope = _ref.serviceWorkerScope,
+        serviceWorkerScript = _ref.serviceWorkerScript;
+      try {
+        var _this4 = this;
+        return ServiceWorkerUtils_await(_this4.getActiveServiceWorker(serviceWorkerScope), function (serviceWorker) {
+          return serviceWorker !== undefined ? serviceWorker : ServiceWorkerUtils_await(_this4.registerAuthServiceWorker(serviceWorkerScript), function (_this3$registerAuthSe) {
+            return _this3$registerAuthSe.serviceWorker;
+          });
+        });
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    }
+    /**
+     * Idempotent.
+     *
+     * Only returns once the service worker has been activated.
+     *
+     * We don't need to unregister it: we just need to clear the config when auth ends.
+     */
+  }, {
+    key: "registerAuthServiceWorker",
+    value: function registerAuthServiceWorker(serviceWorkerScript) {
+      try {
+        return ServiceWorkerUtils_catch(function () {
+          return ServiceWorkerUtils_await(navigator.serviceWorker.register(serviceWorkerScript), function (registration) {
+            return registration.active !== null ? {
+              serviceWorker: registration.active,
+              config: {
+                serviceWorkerScript: serviceWorkerScript,
+                serviceWorkerScope: registration.scope
+              }
+            } : ServiceWorkerUtils_await(new Promise(function (resolve) {
+              registration.addEventListener("updatefound", function () {
+                var newWorker = registration.installing;
+                if (newWorker !== null) {
+                  newWorker.addEventListener("statechange", function () {
+                    if (newWorker.state === "activated") {
+                      resolve({
+                        config: {
+                          serviceWorkerScript: serviceWorkerScript,
+                          serviceWorkerScope: registration.scope
+                        },
+                        serviceWorker: newWorker
+                      });
+                    }
+                  });
+                }
+              });
+            }));
+          }); // Occurs when: (service worker is already registered AND there's been no code changes) OR (service worker was not previously registered).
+        }, function (e) {
+          throw new Error("Failed to install Bytescale Service Worker (SW). ".concat(e.name, ": ").concat(e.message));
+        });
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    }
+  }, {
+    key: "getActiveServiceWorker",
+    value: function getActiveServiceWorker(serviceWorkerScope) {
+      try {
+        return ServiceWorkerUtils_await(navigator.serviceWorker.getRegistrations(), function (registrations) {
+          var _iterator = _createForOfIteratorHelper(registrations),
+            _step;
+          try {
+            for (_iterator.s(); !(_step = _iterator.n()).done;) {
+              var registration = _step.value;
+              if (registration.active !== null && registration.scope === serviceWorkerScope) {
+                return registration.active;
+              }
+            }
+          } catch (err) {
+            _iterator.e(err);
+          } finally {
+            _iterator.f();
+          }
+          return undefined;
+        });
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    }
+  }]);
+  return ServiceWorkerUtils;
+}();
 ;// CONCATENATED MODULE: ./src/public/browser/AuthManagerBrowser.ts
 function AuthManagerBrowser_typeof(obj) { "@babel/helpers - typeof"; return AuthManagerBrowser_typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, AuthManagerBrowser_typeof(obj); }
 function AuthManagerBrowser_defineProperty(obj, key, value) { key = AuthManagerBrowser_toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -2463,9 +2621,11 @@ function AuthManagerBrowser_toPrimitive(input, hint) { if (AuthManagerBrowser_ty
 
 
 
+
 var AuthManagerImpl = /*#__PURE__*/function () {
-  function AuthManagerImpl() {
+  function AuthManagerImpl(serviceWorkerUtils) {
     AuthManagerBrowser_classCallCheck(this, AuthManagerImpl);
+    this.serviceWorkerUtils = serviceWorkerUtils;
     this.contentType = "content-type";
     this.contentTypeJson = "application/json";
     this.contentTypeText = "text/plain";
@@ -2490,13 +2650,14 @@ var AuthManagerImpl = /*#__PURE__*/function () {
           if (_this2.isAuthSessionActive()) {
             throw new Error("Auth session already active. Please call 'await endAuthSession()' and then call 'await beginAuthSession(...)' to start a new auth session.");
           }
-          return AuthManagerBrowser_await(_this2.registerAuthServiceWorker(params), function (_this2$registerAuthSe) {
+          var serviceWorkerScriptField = "serviceWorkerScript";
+          return AuthManagerBrowser_await(_this2.serviceWorkerUtils.registerServiceWorkerIfSupported(params.serviceWorkerScript, serviceWorkerScriptField, "Falling back to Bytescale CDN cookies for auth. These are third-party cookies, which some modern browsers block."), function (_this2$serviceWorkerU) {
             var newSession = {
               accessToken: undefined,
               accessTokenRefreshHandle: undefined,
               params: params,
               isActive: true,
-              authServiceWorker: _this2$registerAuthSe
+              authServiceWorker: _this2$serviceWorkerU
             };
             AuthSessionState.setSession(newSession);
             return newSession;
@@ -2525,62 +2686,13 @@ var AuthManagerImpl = /*#__PURE__*/function () {
             clearTimeout(session.accessTokenRefreshHandle);
           }
           return AuthManagerBrowser_await(_this4.deleteAccessToken(session.params), function () {
-            _this4.setServiceWorkerConfig(session, []); // Prevent service worker from authorizing subsequent requests.
+            return AuthManagerBrowser_awaitIgnored(_this4.setServiceWorkerConfig(session, [])); // Prevent service worker from authorizing subsequent requests.
           });
         })));
       } catch (e) {
         return Promise.reject(e);
       }
     }
-    /**
-     * Idempotent.
-     *
-     * Only returns once the service worker has been activated.
-     *
-     * We don't need to unregister it: we just need to clear the config when auth ends.
-     */
-  }, {
-    key: "registerAuthServiceWorker",
-    value: function registerAuthServiceWorker(_ref) {
-      var serviceWorkerScript = _ref.serviceWorkerScript;
-      try {
-        if (serviceWorkerScript === undefined) {
-          return undefined;
-        }
-        var field = "serviceWorkerScript";
-        if (!serviceWorkerScript.startsWith("/")) {
-          throw new Error("The '".concat(field, "' field must start with a '/' and reference a script at the root of your website."));
-        }
-        var forwardSlashCount = serviceWorkerScript.split("/").length - 1;
-        if (forwardSlashCount > 1) {
-          ConsoleUtils.warn("The '".concat(field, "' field should be a root script (e.g. '/bytescale-auth-sw.js'). The Bytescale SDK can only authorize requests originating from webpages that are at the same level as the script or below."));
-        }
-        return AuthManagerBrowser_catch(function () {
-          if ("serviceWorker" in navigator) {
-            return AuthManagerBrowser_await(navigator.serviceWorker.register(serviceWorkerScript), function (registration) {
-              return registration.active !== null ? registration.active : AuthManagerBrowser_awaitIgnored(new Promise(function (resolve) {
-                registration.addEventListener("updatefound", function () {
-                  var newWorker = registration.installing;
-                  if (newWorker !== null) {
-                    newWorker.addEventListener("statechange", function () {
-                      if (newWorker.state === "activated") {
-                        resolve(newWorker);
-                      }
-                    });
-                  }
-                });
-              }));
-            }); // Occurs when: (service worker is already registered AND there's been no code changes) OR (service worker was not previously registered).
-          } else {
-            ConsoleUtils.warn("Service workers not supported by browser. Falling back to Bytescale CDN cookies for auth. These are third-party cookies, which some modern browsers block.");
-          }
-        }, function (e) {
-          throw new Error("Failed to install Bytescale Auth Service Worker (SW). ".concat(e.name, ": ").concat(e.message));
-        });
-      } catch (e) {
-        return Promise.reject(e);
-      }
-    }
   }, {
     key: "refreshAccessToken",
     value: function refreshAccessToken(session) {
@@ -2603,22 +2715,23 @@ var AuthManagerImpl = /*#__PURE__*/function () {
                   // than cookie-based auth, which is another reason to prevent these cookies from being set unless required.
                   var setCookie = !_this6.isUsingServiceWorker(session);
                   return AuthManagerBrowser_await(_this6.setAccessToken(session.params, jwt, setCookie), function (setTokenResult) {
-                    _this6.setServiceWorkerConfig(session, [{
+                    return AuthManagerBrowser_await(_this6.setServiceWorkerConfig(session, [{
                       headers: [{
                         key: "Authorization",
                         value: "Bearer ".concat(jwt)
                       }],
                       expires: Date.now() + setTokenResult.ttlSeconds * 1000,
                       urlPrefix: "".concat(_this6.getCdnUrl(session.params), "/").concat(session.params.accountId, "/")
-                    }]);
-                    var desiredTtl = setTokenResult.ttlSeconds - _this6.refreshBeforeExpirySeconds;
-                    timeout = Math.max(desiredTtl, _this6.minJwtTtlSeconds);
-                    if (desiredTtl !== timeout) {
-                      ConsoleUtils.warn("JWT expiration is too short: waiting for ".concat(timeout, " 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!
-                    timeout = Math.min(timeout, _this6.maxJwtTtlSeconds);
-                    session.accessToken = setTokenResult.accessToken;
+                    }]), function () {
+                      var desiredTtl = setTokenResult.ttlSeconds - _this6.refreshBeforeExpirySeconds;
+                      timeout = Math.max(desiredTtl, _this6.minJwtTtlSeconds);
+                      if (desiredTtl !== timeout) {
+                        ConsoleUtils.warn("JWT expiration is too short: waiting for ".concat(timeout, " 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!
+                      timeout = Math.min(timeout, _this6.maxJwtTtlSeconds);
+                      session.accessToken = setTokenResult.accessToken;
+                    });
                   });
                 });
               });
@@ -2626,7 +2739,7 @@ var AuthManagerImpl = /*#__PURE__*/function () {
               // Use 'warn' instead of 'error' since this happens frequently, i.e. user goes through a tunnel, and some customers report these errors to systems like Sentry, so we don't want to spam.
               ConsoleUtils.warn("Unable to refresh JWT access token: ".concat(e));
             });
-          }, function (_wasThrown, _result3) {
+          }, function (_wasThrown, _result) {
             session.accessTokenRefreshHandle = window.setTimeout(function () {
               _this6.refreshAccessToken(session).then(function () {},
               // Should not occur, as this method shouldn't throw errors.
@@ -2634,7 +2747,7 @@ var AuthManagerImpl = /*#__PURE__*/function () {
                 return ConsoleUtils.error("Unexpected error when refreshing JWT access token: ".concat(e));
               });
             }, timeout * 1000);
-            return AuthManagerBrowser_rethrow(_wasThrown, _result3);
+            return AuthManagerBrowser_rethrow(_wasThrown, _result);
           }));
         })));
       } catch (e) {
@@ -2649,12 +2762,23 @@ var AuthManagerImpl = /*#__PURE__*/function () {
   }, {
     key: "setServiceWorkerConfig",
     value: function setServiceWorkerConfig(session, config) {
-      var _a;
-      var message = {
-        type: "SET_CONFIG",
-        config: config
-      };
-      (_a = session.authServiceWorker) === null || _a === void 0 ? void 0 : _a.postMessage(message);
+      try {
+        var _this8 = this;
+        if (session.authServiceWorker === undefined) {
+          return undefined;
+        }
+        // We re-fetch the latest active worker, as another tab may have registered a new one, and then the tab may be closed,
+        // leaving us as the only open tab but with an old and ineffective service worker reference.
+        return AuthManagerBrowser_await(_this8.serviceWorkerUtils.getActiveServiceWorkerElseRegister(session.authServiceWorker), function (serviceWorker) {
+          var message = {
+            type: "SET_BYTESCALE_AUTH_CONFIG",
+            config: config
+          };
+          serviceWorker.postMessage(message);
+        });
+      } catch (e) {
+        return Promise.reject(e);
+      }
     }
   }, {
     key: "getAccessTokenUrl",
@@ -2671,9 +2795,9 @@ var AuthManagerImpl = /*#__PURE__*/function () {
     key: "deleteAccessToken",
     value: function deleteAccessToken(params) {
       try {
-        var _this8 = this;
+        var _this10 = this;
         var _a;
-        return AuthManagerBrowser_awaitIgnored(BaseAPI.fetch(_this8.getAccessTokenUrl(params, true), {
+        return AuthManagerBrowser_awaitIgnored(BaseAPI.fetch(_this10.getAccessTokenUrl(params, true), {
           method: "DELETE",
           credentials: "include",
           headers: {}
@@ -2689,15 +2813,15 @@ var AuthManagerImpl = /*#__PURE__*/function () {
     key: "setAccessToken",
     value: function setAccessToken(params, jwt, setCookie) {
       try {
-        var _this10 = this;
+        var _this12 = this;
         var _a;
         var request = {
           accessToken: jwt
         };
-        return AuthManagerBrowser_await(BaseAPI.fetch(_this10.getAccessTokenUrl(params, setCookie), {
+        return AuthManagerBrowser_await(BaseAPI.fetch(_this12.getAccessTokenUrl(params, setCookie), {
           method: "PUT",
           credentials: "include",
-          headers: AuthManagerBrowser_defineProperty({}, _this10.contentType, _this10.contentTypeJson),
+          headers: AuthManagerBrowser_defineProperty({}, _this12.contentType, _this12.contentTypeJson),
           body: JSON.stringify(request)
         }, {
           isBytescaleApi: true,
@@ -2713,10 +2837,10 @@ var AuthManagerImpl = /*#__PURE__*/function () {
     key: "getAccessToken",
     value: function getAccessToken(params, headers) {
       try {
-        var _this12 = this;
+        var _this14 = this;
         var _a, _b;
         var endpointName = "Your auth API endpoint";
-        var requiredContentType = _this12.contentTypeText;
+        var requiredContentType = _this14.contentTypeText;
         return AuthManagerBrowser_await(BaseAPI.fetch(params.authUrl, {
           method: "GET",
           headers: headers
@@ -2724,10 +2848,10 @@ var AuthManagerImpl = /*#__PURE__*/function () {
           isBytescaleApi: false,
           fetchApi: (_a = params.options) === null || _a === void 0 ? void 0 : _a.fetchApi
         }), function (result) {
-          var actualContentType = (_b = result.headers.get(_this12.contentType)) !== null && _b !== void 0 ? _b : "";
+          var actualContentType = (_b = result.headers.get(_this14.contentType)) !== null && _b !== void 0 ? _b : "";
           // Support content types like "text/plain; charset=utf-8" and "text/plain"
           if (actualContentType.split(";")[0] !== requiredContentType) {
-            throw new Error("".concat(endpointName, " returned \"").concat(actualContentType, "\" for the ").concat(_this12.contentType, " response header, but the Bytescale SDK requires \"").concat(requiredContentType, "\"."));
+            throw new Error("".concat(endpointName, " returned \"").concat(actualContentType, "\" for the ").concat(_this14.contentType, " response header, but the Bytescale SDK requires \"").concat(requiredContentType, "\"."));
           }
           return AuthManagerBrowser_await(result.text(), function (jwt) {
             if (jwt.length === 0) {
@@ -2750,7 +2874,7 @@ var AuthManagerImpl = /*#__PURE__*/function () {
 /**
  * Alternative way of implementing a static class (i.e. all methods static). We do this so we can use a interface on the class (interfaces can't define static methods).
  */
-var AuthManager = new AuthManagerImpl();
+var AuthManager = new AuthManagerImpl(new ServiceWorkerUtils());
 ;// CONCATENATED MODULE: ./src/public/browser/index.ts
 
 

package/dist/browser/esm/main.mjs

@@ -2379,6 +2379,164 @@ var ConsoleUtils = /*#__PURE__*/function () {
   }]);
   return ConsoleUtils;
 }();
+;// CONCATENATED MODULE: ./src/private/ServiceWorkerUtils.ts
+function ServiceWorkerUtils_typeof(obj) { "@babel/helpers - typeof"; return ServiceWorkerUtils_typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, ServiceWorkerUtils_typeof(obj); }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = ServiceWorkerUtils_unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+function ServiceWorkerUtils_unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return ServiceWorkerUtils_arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return ServiceWorkerUtils_arrayLikeToArray(o, minLen); }
+function ServiceWorkerUtils_arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function ServiceWorkerUtils_await(value, then, direct) {
+  if (direct) {
+    return then ? then(value) : value;
+  }
+  if (!value || !value.then) {
+    value = Promise.resolve(value);
+  }
+  return then ? value.then(then) : value;
+}
+function ServiceWorkerUtils_catch(body, recover) {
+  try {
+    var result = body();
+  } catch (e) {
+    return recover(e);
+  }
+  if (result && result.then) {
+    return result.then(void 0, recover);
+  }
+  return result;
+}
+function ServiceWorkerUtils_classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function ServiceWorkerUtils_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, ServiceWorkerUtils_toPropertyKey(descriptor.key), descriptor); } }
+function ServiceWorkerUtils_createClass(Constructor, protoProps, staticProps) { if (protoProps) ServiceWorkerUtils_defineProperties(Constructor.prototype, protoProps); if (staticProps) ServiceWorkerUtils_defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function ServiceWorkerUtils_toPropertyKey(arg) { var key = ServiceWorkerUtils_toPrimitive(arg, "string"); return ServiceWorkerUtils_typeof(key) === "symbol" ? key : String(key); }
+function ServiceWorkerUtils_toPrimitive(input, hint) { if (ServiceWorkerUtils_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (ServiceWorkerUtils_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+
+var ServiceWorkerUtils = /*#__PURE__*/function () {
+  function ServiceWorkerUtils() {
+    ServiceWorkerUtils_classCallCheck(this, ServiceWorkerUtils);
+  }
+  ServiceWorkerUtils_createClass(ServiceWorkerUtils, [{
+    key: "registerServiceWorkerIfSupported",
+    value:
+    /**
+     * Idempotent.
+     *
+     * Only returns once the service worker has been activated.
+     *
+     * We don't need to unregister it: we just need to clear the config when auth ends.
+     */
+    function registerServiceWorkerIfSupported(serviceWorkerScript, configFieldName, fallbackMessage) {
+      try {
+        var _this2 = this;
+        if (serviceWorkerScript === undefined) {
+          return undefined;
+        }
+        if (!("serviceWorker" in navigator)) {
+          ConsoleUtils.warn("Service workers not supported by browser. ".concat(fallbackMessage));
+          return undefined;
+        }
+        if (!serviceWorkerScript.startsWith("/")) {
+          throw new Error("The '".concat(configFieldName, "' field must start with a '/' and reference a script at the root of your website."));
+        }
+        var forwardSlashCount = serviceWorkerScript.split("/").length - 1;
+        if (forwardSlashCount > 1) {
+          ConsoleUtils.warn("The '".concat(configFieldName, "' field should be a root script (e.g. '/script.js'). The Bytescale SDK can only authorize requests originating from webpages that are at the same level as the script or below."));
+        }
+        return ServiceWorkerUtils_await(_this2.registerAuthServiceWorker(serviceWorkerScript), function (_this$registerAuthSer) {
+          return _this$registerAuthSer.config;
+        });
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    }
+  }, {
+    key: "getActiveServiceWorkerElseRegister",
+    value: function getActiveServiceWorkerElseRegister(_ref) {
+      var serviceWorkerScope = _ref.serviceWorkerScope,
+        serviceWorkerScript = _ref.serviceWorkerScript;
+      try {
+        var _this4 = this;
+        return ServiceWorkerUtils_await(_this4.getActiveServiceWorker(serviceWorkerScope), function (serviceWorker) {
+          return serviceWorker !== undefined ? serviceWorker : ServiceWorkerUtils_await(_this4.registerAuthServiceWorker(serviceWorkerScript), function (_this3$registerAuthSe) {
+            return _this3$registerAuthSe.serviceWorker;
+          });
+        });
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    }
+    /**
+     * Idempotent.
+     *
+     * Only returns once the service worker has been activated.
+     *
+     * We don't need to unregister it: we just need to clear the config when auth ends.
+     */
+  }, {
+    key: "registerAuthServiceWorker",
+    value: function registerAuthServiceWorker(serviceWorkerScript) {
+      try {
+        return ServiceWorkerUtils_catch(function () {
+          return ServiceWorkerUtils_await(navigator.serviceWorker.register(serviceWorkerScript), function (registration) {
+            return registration.active !== null ? {
+              serviceWorker: registration.active,
+              config: {
+                serviceWorkerScript: serviceWorkerScript,
+                serviceWorkerScope: registration.scope
+              }
+            } : ServiceWorkerUtils_await(new Promise(function (resolve) {
+              registration.addEventListener("updatefound", function () {
+                var newWorker = registration.installing;
+                if (newWorker !== null) {
+                  newWorker.addEventListener("statechange", function () {
+                    if (newWorker.state === "activated") {
+                      resolve({
+                        config: {
+                          serviceWorkerScript: serviceWorkerScript,
+                          serviceWorkerScope: registration.scope
+                        },
+                        serviceWorker: newWorker
+                      });
+                    }
+                  });
+                }
+              });
+            }));
+          }); // Occurs when: (service worker is already registered AND there's been no code changes) OR (service worker was not previously registered).
+        }, function (e) {
+          throw new Error("Failed to install Bytescale Service Worker (SW). ".concat(e.name, ": ").concat(e.message));
+        });
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    }
+  }, {
+    key: "getActiveServiceWorker",
+    value: function getActiveServiceWorker(serviceWorkerScope) {
+      try {
+        return ServiceWorkerUtils_await(navigator.serviceWorker.getRegistrations(), function (registrations) {
+          var _iterator = _createForOfIteratorHelper(registrations),
+            _step;
+          try {
+            for (_iterator.s(); !(_step = _iterator.n()).done;) {
+              var registration = _step.value;
+              if (registration.active !== null && registration.scope === serviceWorkerScope) {
+                return registration.active;
+              }
+            }
+          } catch (err) {
+            _iterator.e(err);
+          } finally {
+            _iterator.f();
+          }
+          return undefined;
+        });
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    }
+  }]);
+  return ServiceWorkerUtils;
+}();
 ;// CONCATENATED MODULE: ./src/public/browser/AuthManagerBrowser.ts
 function AuthManagerBrowser_typeof(obj) { "@babel/helpers - typeof"; return AuthManagerBrowser_typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, AuthManagerBrowser_typeof(obj); }
 function AuthManagerBrowser_defineProperty(obj, key, value) { key = AuthManagerBrowser_toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -2448,9 +2606,11 @@ function AuthManagerBrowser_toPrimitive(input, hint) { if (AuthManagerBrowser_ty
 
 
 
+
 var AuthManagerImpl = /*#__PURE__*/function () {
-  function AuthManagerImpl() {
+  function AuthManagerImpl(serviceWorkerUtils) {
     AuthManagerBrowser_classCallCheck(this, AuthManagerImpl);
+    this.serviceWorkerUtils = serviceWorkerUtils;
     this.contentType = "content-type";
     this.contentTypeJson = "application/json";
     this.contentTypeText = "text/plain";
@@ -2475,13 +2635,14 @@ var AuthManagerImpl = /*#__PURE__*/function () {
           if (_this2.isAuthSessionActive()) {
             throw new Error("Auth session already active. Please call 'await endAuthSession()' and then call 'await beginAuthSession(...)' to start a new auth session.");
           }
-          return AuthManagerBrowser_await(_this2.registerAuthServiceWorker(params), function (_this2$registerAuthSe) {
+          var serviceWorkerScriptField = "serviceWorkerScript";
+          return AuthManagerBrowser_await(_this2.serviceWorkerUtils.registerServiceWorkerIfSupported(params.serviceWorkerScript, serviceWorkerScriptField, "Falling back to Bytescale CDN cookies for auth. These are third-party cookies, which some modern browsers block."), function (_this2$serviceWorkerU) {
             var newSession = {
               accessToken: undefined,
               accessTokenRefreshHandle: undefined,
               params: params,
               isActive: true,
-              authServiceWorker: _this2$registerAuthSe
+              authServiceWorker: _this2$serviceWorkerU
             };
             AuthSessionState.setSession(newSession);
             return newSession;
@@ -2510,62 +2671,13 @@ var AuthManagerImpl = /*#__PURE__*/function () {
             clearTimeout(session.accessTokenRefreshHandle);
           }
           return AuthManagerBrowser_await(_this4.deleteAccessToken(session.params), function () {
-            _this4.setServiceWorkerConfig(session, []); // Prevent service worker from authorizing subsequent requests.
+            return AuthManagerBrowser_awaitIgnored(_this4.setServiceWorkerConfig(session, [])); // Prevent service worker from authorizing subsequent requests.
           });
         })));
       } catch (e) {
         return Promise.reject(e);
       }
     }
-    /**
-     * Idempotent.
-     *
-     * Only returns once the service worker has been activated.
-     *
-     * We don't need to unregister it: we just need to clear the config when auth ends.
-     */
-  }, {
-    key: "registerAuthServiceWorker",
-    value: function registerAuthServiceWorker(_ref) {
-      var serviceWorkerScript = _ref.serviceWorkerScript;
-      try {
-        if (serviceWorkerScript === undefined) {
-          return undefined;
-        }
-        var field = "serviceWorkerScript";
-        if (!serviceWorkerScript.startsWith("/")) {
-          throw new Error("The '".concat(field, "' field must start with a '/' and reference a script at the root of your website."));
-        }
-        var forwardSlashCount = serviceWorkerScript.split("/").length - 1;
-        if (forwardSlashCount > 1) {
-          ConsoleUtils.warn("The '".concat(field, "' field should be a root script (e.g. '/bytescale-auth-sw.js'). The Bytescale SDK can only authorize requests originating from webpages that are at the same level as the script or below."));
-        }
-        return AuthManagerBrowser_catch(function () {
-          if ("serviceWorker" in navigator) {
-            return AuthManagerBrowser_await(navigator.serviceWorker.register(serviceWorkerScript), function (registration) {
-              return registration.active !== null ? registration.active : AuthManagerBrowser_awaitIgnored(new Promise(function (resolve) {
-                registration.addEventListener("updatefound", function () {
-                  var newWorker = registration.installing;
-                  if (newWorker !== null) {
-                    newWorker.addEventListener("statechange", function () {
-                      if (newWorker.state === "activated") {
-                        resolve(newWorker);
-                      }
-                    });
-                  }
-                });
-              }));
-            }); // Occurs when: (service worker is already registered AND there's been no code changes) OR (service worker was not previously registered).
-          } else {
-            ConsoleUtils.warn("Service workers not supported by browser. Falling back to Bytescale CDN cookies for auth. These are third-party cookies, which some modern browsers block.");
-          }
-        }, function (e) {
-          throw new Error("Failed to install Bytescale Auth Service Worker (SW). ".concat(e.name, ": ").concat(e.message));
-        });
-      } catch (e) {
-        return Promise.reject(e);
-      }
-    }
   }, {
     key: "refreshAccessToken",
     value: function refreshAccessToken(session) {
@@ -2588,22 +2700,23 @@ var AuthManagerImpl = /*#__PURE__*/function () {
                   // than cookie-based auth, which is another reason to prevent these cookies from being set unless required.
                   var setCookie = !_this6.isUsingServiceWorker(session);
                   return AuthManagerBrowser_await(_this6.setAccessToken(session.params, jwt, setCookie), function (setTokenResult) {
-                    _this6.setServiceWorkerConfig(session, [{
+                    return AuthManagerBrowser_await(_this6.setServiceWorkerConfig(session, [{
                       headers: [{
                         key: "Authorization",
                         value: "Bearer ".concat(jwt)
                       }],
                       expires: Date.now() + setTokenResult.ttlSeconds * 1000,
                       urlPrefix: "".concat(_this6.getCdnUrl(session.params), "/").concat(session.params.accountId, "/")
-                    }]);
-                    var desiredTtl = setTokenResult.ttlSeconds - _this6.refreshBeforeExpirySeconds;
-                    timeout = Math.max(desiredTtl, _this6.minJwtTtlSeconds);
-                    if (desiredTtl !== timeout) {
-                      ConsoleUtils.warn("JWT expiration is too short: waiting for ".concat(timeout, " 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!
-                    timeout = Math.min(timeout, _this6.maxJwtTtlSeconds);
-                    session.accessToken = setTokenResult.accessToken;
+                    }]), function () {
+                      var desiredTtl = setTokenResult.ttlSeconds - _this6.refreshBeforeExpirySeconds;
+                      timeout = Math.max(desiredTtl, _this6.minJwtTtlSeconds);
+                      if (desiredTtl !== timeout) {
+                        ConsoleUtils.warn("JWT expiration is too short: waiting for ".concat(timeout, " 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!
+                      timeout = Math.min(timeout, _this6.maxJwtTtlSeconds);
+                      session.accessToken = setTokenResult.accessToken;
+                    });
                   });
                 });
               });
@@ -2611,7 +2724,7 @@ var AuthManagerImpl = /*#__PURE__*/function () {
               // Use 'warn' instead of 'error' since this happens frequently, i.e. user goes through a tunnel, and some customers report these errors to systems like Sentry, so we don't want to spam.
               ConsoleUtils.warn("Unable to refresh JWT access token: ".concat(e));
             });
-          }, function (_wasThrown, _result3) {
+          }, function (_wasThrown, _result) {
             session.accessTokenRefreshHandle = window.setTimeout(function () {
               _this6.refreshAccessToken(session).then(function () {},
               // Should not occur, as this method shouldn't throw errors.
@@ -2619,7 +2732,7 @@ var AuthManagerImpl = /*#__PURE__*/function () {
                 return ConsoleUtils.error("Unexpected error when refreshing JWT access token: ".concat(e));
               });
             }, timeout * 1000);
-            return AuthManagerBrowser_rethrow(_wasThrown, _result3);
+            return AuthManagerBrowser_rethrow(_wasThrown, _result);
           }));
         })));
       } catch (e) {
@@ -2634,12 +2747,23 @@ var AuthManagerImpl = /*#__PURE__*/function () {
   }, {
     key: "setServiceWorkerConfig",
     value: function setServiceWorkerConfig(session, config) {
-      var _a;
-      var message = {
-        type: "SET_CONFIG",
-        config: config
-      };
-      (_a = session.authServiceWorker) === null || _a === void 0 ? void 0 : _a.postMessage(message);
+      try {
+        var _this8 = this;
+        if (session.authServiceWorker === undefined) {
+          return undefined;
+        }
+        // We re-fetch the latest active worker, as another tab may have registered a new one, and then the tab may be closed,
+        // leaving us as the only open tab but with an old and ineffective service worker reference.
+        return AuthManagerBrowser_await(_this8.serviceWorkerUtils.getActiveServiceWorkerElseRegister(session.authServiceWorker), function (serviceWorker) {
+          var message = {
+            type: "SET_BYTESCALE_AUTH_CONFIG",
+            config: config
+          };
+          serviceWorker.postMessage(message);
+        });
+      } catch (e) {
+        return Promise.reject(e);
+      }
     }
   }, {
     key: "getAccessTokenUrl",
@@ -2656,9 +2780,9 @@ var AuthManagerImpl = /*#__PURE__*/function () {
     key: "deleteAccessToken",
     value: function deleteAccessToken(params) {
       try {
-        var _this8 = this;
+        var _this10 = this;
         var _a;
-        return AuthManagerBrowser_awaitIgnored(BaseAPI.fetch(_this8.getAccessTokenUrl(params, true), {
+        return AuthManagerBrowser_awaitIgnored(BaseAPI.fetch(_this10.getAccessTokenUrl(params, true), {
           method: "DELETE",
           credentials: "include",
           headers: {}
@@ -2674,15 +2798,15 @@ var AuthManagerImpl = /*#__PURE__*/function () {
     key: "setAccessToken",
     value: function setAccessToken(params, jwt, setCookie) {
       try {
-        var _this10 = this;
+        var _this12 = this;
         var _a;
         var request = {
           accessToken: jwt
         };
-        return AuthManagerBrowser_await(BaseAPI.fetch(_this10.getAccessTokenUrl(params, setCookie), {
+        return AuthManagerBrowser_await(BaseAPI.fetch(_this12.getAccessTokenUrl(params, setCookie), {
           method: "PUT",
           credentials: "include",
-          headers: AuthManagerBrowser_defineProperty({}, _this10.contentType, _this10.contentTypeJson),
+          headers: AuthManagerBrowser_defineProperty({}, _this12.contentType, _this12.contentTypeJson),
           body: JSON.stringify(request)
         }, {
           isBytescaleApi: true,
@@ -2698,10 +2822,10 @@ var AuthManagerImpl = /*#__PURE__*/function () {
     key: "getAccessToken",
     value: function getAccessToken(params, headers) {
       try {
-        var _this12 = this;
+        var _this14 = this;
         var _a, _b;
         var endpointName = "Your auth API endpoint";
-        var requiredContentType = _this12.contentTypeText;
+        var requiredContentType = _this14.contentTypeText;
         return AuthManagerBrowser_await(BaseAPI.fetch(params.authUrl, {
           method: "GET",
           headers: headers
@@ -2709,10 +2833,10 @@ var AuthManagerImpl = /*#__PURE__*/function () {
           isBytescaleApi: false,
           fetchApi: (_a = params.options) === null || _a === void 0 ? void 0 : _a.fetchApi
         }), function (result) {
-          var actualContentType = (_b = result.headers.get(_this12.contentType)) !== null && _b !== void 0 ? _b : "";
+          var actualContentType = (_b = result.headers.get(_this14.contentType)) !== null && _b !== void 0 ? _b : "";
           // Support content types like "text/plain; charset=utf-8" and "text/plain"
           if (actualContentType.split(";")[0] !== requiredContentType) {
-            throw new Error("".concat(endpointName, " returned \"").concat(actualContentType, "\" for the ").concat(_this12.contentType, " response header, but the Bytescale SDK requires \"").concat(requiredContentType, "\"."));
+            throw new Error("".concat(endpointName, " returned \"").concat(actualContentType, "\" for the ").concat(_this14.contentType, " response header, but the Bytescale SDK requires \"").concat(requiredContentType, "\"."));
           }
           return AuthManagerBrowser_await(result.text(), function (jwt) {
             if (jwt.length === 0) {
@@ -2735,7 +2859,7 @@ var AuthManagerImpl = /*#__PURE__*/function () {
 /**
  * Alternative way of implementing a static class (i.e. all methods static). We do this so we can use a interface on the class (interfaces can't define static methods).
  */
-var AuthManager = new AuthManagerImpl();
+var AuthManager = new AuthManagerImpl(new ServiceWorkerUtils());
 ;// CONCATENATED MODULE: ./src/public/browser/index.ts
 
 

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

@@ -0,0 +1,21 @@
+import { ServiceWorkerConfig } from "./model/ServiceWorkerConfig";
+export declare class ServiceWorkerUtils {
+    /**
+     * Idempotent.
+     *
+     * Only returns once the service worker has been activated.
+     *
+     * We don't need to unregister it: we just need to clear the config when auth ends.
+     */
+    registerServiceWorkerIfSupported(serviceWorkerScript: string | undefined, configFieldName: string, fallbackMessage: string): Promise<ServiceWorkerConfig | undefined>;
+    getActiveServiceWorkerElseRegister({ serviceWorkerScope, serviceWorkerScript }: ServiceWorkerConfig): Promise<ServiceWorker>;
+    /**
+     * Idempotent.
+     *
+     * Only returns once the service worker has been activated.
+     *
+     * We don't need to unregister it: we just need to clear the config when auth ends.
+     */
+    private registerAuthServiceWorker;
+    private getActiveServiceWorker;
+}

package/dist/types/private/dtos/AuthSwSetConfigDto.d.ts

@@ -1,5 +1,11 @@
 import { AuthSwConfigDto } from "./AuthSwConfigDto";
 export interface AuthSwSetConfigDto {
     config: AuthSwConfigDto;
-    type: "SET_CONFIG";
+    /**
+     * We use a specific name for this type, since you can only register one service worker per scope, meaning it's
+     * possible the user will want to use their own service worker, which means we'll need to support having the Bytescale
+     * Auth Service Worker being a component of the user's service worker. Thus, we use a specific name to avoid conflict
+     * with the user's events.
+     */
+    type: "SET_BYTESCALE_AUTH_CONFIG";
 }

package/dist/types/private/model/AuthSession.d.ts

@@ -1,8 +1,9 @@
 import { BeginAuthSessionParams } from "./AuthManagerInterface";
+import { ServiceWorkerConfig } from "./ServiceWorkerConfig";
 export interface AuthSession {
     accessToken: string | undefined;
     accessTokenRefreshHandle: number | undefined;
-    authServiceWorker: ServiceWorker | undefined;
+    authServiceWorker: ServiceWorkerConfig | undefined;
     isActive: boolean;
     params: BeginAuthSessionParams;
 }

package/dist/types/private/model/ServiceWorkerConfig.d.ts

@@ -0,0 +1,4 @@
+export interface ServiceWorkerConfig {
+    serviceWorkerScope: string;
+    serviceWorkerScript: string;
+}

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

@@ -1,5 +1,7 @@
 import { AuthManagerInterface, BeginAuthSessionParams } from "../../private/model/AuthManagerInterface";
+import { ServiceWorkerUtils } from "../../private/ServiceWorkerUtils";
 declare class AuthManagerImpl implements AuthManagerInterface {
+    private readonly serviceWorkerUtils;
     private readonly authSessionMutex;
     private readonly contentType;
     private readonly contentTypeJson;
@@ -8,18 +10,10 @@ declare class AuthManagerImpl implements AuthManagerInterface {
     private readonly maxJwtTtlSeconds;
     private readonly retryAuthAfterErrorSeconds;
     private readonly refreshBeforeExpirySeconds;
-    constructor();
+    constructor(serviceWorkerUtils: ServiceWorkerUtils);
     isAuthSessionActive(): boolean;
     beginAuthSession(params: BeginAuthSessionParams): Promise<void>;
     endAuthSession(): Promise<void>;
-    /**
-     * Idempotent.
-     *
-     * Only returns once the service worker has been activated.
-     *
-     * We don't need to unregister it: we just need to clear the config when auth ends.
-     */
-    private registerAuthServiceWorker;
     private refreshAccessToken;
     private isUsingServiceWorker;
     private setServiceWorkerConfig;

package/package.json

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