@bytescale/sdk 3.18.0 → 3.20.0

package/dist/browser/cjs/main.js

@@ -2419,6 +2419,13 @@ function ServiceWorkerUtils_catch(body, recover) {
   }
   return result;
 }
+function ServiceWorkerUtils_invoke(body, then) {
+  var result = body();
+  if (result && result.then) {
+    return result.then(then);
+  }
+  return then(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; }
@@ -2430,50 +2437,53 @@ var ServiceWorkerUtils = /*#__PURE__*/function () {
     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) {
+    key: "canUseServiceWorkers",
+    value: function canUseServiceWorkers() {
+      return "serviceWorker" in navigator;
+    }
+  }, {
+    key: "sendMessage",
+    value: function sendMessage(message, config, serviceWorkerScriptFieldName) {
       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;
-        }
+        return ServiceWorkerUtils_await(config.serviceWorkerScope !== undefined ? _this2.getActiveServiceWorkerElseRegister(config, message) : _this2.registerServiceWorkerValidated(config.serviceWorkerScript, message, serviceWorkerScriptFieldName), function (result) {
+          if (!result.messageSent) {
+            result.serviceWorker.postMessage(message);
+          }
+          return result.config;
+        });
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    }
+  }, {
+    key: "registerServiceWorkerValidated",
+    value: function registerServiceWorkerValidated(serviceWorkerScript, init, serviceWorkerScriptFieldName) {
+      try {
+        var _this4 = this;
         if (!serviceWorkerScript.startsWith("/")) {
-          throw new Error("The '".concat(configFieldName, "' field must start with a '/' and reference a script at the root of your website."));
+          throw new Error("The '".concat(serviceWorkerScriptFieldName, "' 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."));
+          ConsoleUtils.warn("The '".concat(serviceWorkerScriptFieldName, "' 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;
-        });
+        return ServiceWorkerUtils_await(_this4.registerServiceWorker(serviceWorkerScript, init));
       } catch (e) {
         return Promise.reject(e);
       }
     }
   }, {
     key: "getActiveServiceWorkerElseRegister",
-    value: function getActiveServiceWorkerElseRegister(_ref) {
-      var serviceWorkerScope = _ref.serviceWorkerScope,
-        serviceWorkerScript = _ref.serviceWorkerScript;
+    value: function getActiveServiceWorkerElseRegister(config, init) {
       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;
-          });
+        var _this6 = this;
+        return ServiceWorkerUtils_await(_this6.getActiveServiceWorker(config.serviceWorkerScope), function (serviceWorker) {
+          return serviceWorker !== undefined ? {
+            serviceWorker: serviceWorker,
+            messageSent: false,
+            config: config
+          } : ServiceWorkerUtils_await(_this6.registerServiceWorker(config.serviceWorkerScript, init));
         });
       } catch (e) {
         return Promise.reject(e);
@@ -2487,36 +2497,25 @@ var ServiceWorkerUtils = /*#__PURE__*/function () {
      * We don't need to unregister it: we just need to clear the config when auth ends.
      */
   }, {
-    key: "registerAuthServiceWorker",
-    value: function registerAuthServiceWorker(serviceWorkerScript) {
+    key: "registerServiceWorker",
+    value: function registerServiceWorker(serviceWorkerScript, init) {
       try {
+        var _this8 = this;
         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
-                      });
-                    }
-                  });
+            return ServiceWorkerUtils_await(_this8.waitForActiveServiceWorker(registration, init), function (_ref) {
+              var serviceWorker = _ref.serviceWorker,
+                messageSent = _ref.messageSent;
+              return {
+                serviceWorker: serviceWorker,
+                messageSent: messageSent,
+                config: {
+                  serviceWorkerScript: serviceWorkerScript,
+                  serviceWorkerScope: registration.scope
                 }
-              });
-            }));
-          }); // 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));
         });
@@ -2524,6 +2523,52 @@ var ServiceWorkerUtils = /*#__PURE__*/function () {
         return Promise.reject(e);
       }
     }
+  }, {
+    key: "waitForActiveServiceWorker",
+    value: function waitForActiveServiceWorker(registration, init) {
+      try {
+        var _exit2 = false;
+        // We must check the 'installing' state before the 'active' state (see comment below).
+        // The state will be 'installing' when the service worker is installed for the first time, or if there have been
+        // code changes to the service worker, else the state will be 'active'.
+        var installing = registration.installing;
+        return ServiceWorkerUtils_invoke(function () {
+          if (installing !== null) {
+            installing.postMessage(init);
+            _exit2 = true;
+            return ServiceWorkerUtils_await(new Promise(function (resolve) {
+              var stateChangeHandler = function stateChangeHandler(e) {
+                var sw = e.target;
+                if (sw.state === "activated") {
+                  installing.removeEventListener("statechange", stateChangeHandler);
+                  resolve({
+                    messageSent: true,
+                    serviceWorker: sw
+                  });
+                }
+              };
+              installing.addEventListener("statechange", stateChangeHandler);
+            }));
+          }
+        }, function (_result) {
+          if (_exit2) return _result;
+          // We must check the 'installing' state before the 'active' state, because if we've just installed a new service
+          // worker, then the new service worker will be in the 'installing' slot whereas the old service worker will be in
+          // the 'active' slot. So, if we checked this first, we would always return the old service worker, and therefore the
+          // new service worker would never be initialized.
+          if (registration.active !== null) {
+            return {
+              serviceWorker: registration.active,
+              messageSent: false
+            };
+          }
+          // We expect the service worker to use 'skipWaiting', so we don't expect 'waiting' service workers.
+          throw new Error("Service worker was neither 'installing' or 'active'.");
+        });
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    }
   }, {
     key: "getActiveServiceWorker",
     value: function getActiveServiceWorker(serviceWorkerScope) {
@@ -2582,6 +2627,19 @@ function AuthManagerBrowser_async(f) {
     }
   };
 }
+function AuthManagerBrowser_invokeIgnored(body) {
+  var result = body();
+  if (result && result.then) {
+    return result.then(AuthManagerBrowser_empty);
+  }
+}
+function AuthManagerBrowser_invoke(body, then) {
+  var result = body();
+  if (result && result.then) {
+    return result.then(then);
+  }
+  return then(result);
+}
 function AuthManagerBrowser_catch(body, recover) {
   try {
     var result = body();
@@ -2626,6 +2684,7 @@ var AuthManagerImpl = /*#__PURE__*/function () {
   function AuthManagerImpl(serviceWorkerUtils) {
     AuthManagerBrowser_classCallCheck(this, AuthManagerImpl);
     this.serviceWorkerUtils = serviceWorkerUtils;
+    this.serviceWorkerScriptFieldName = "serviceWorkerScript";
     this.contentType = "content-type";
     this.contentTypeJson = "application/json";
     this.contentTypeText = "text/plain";
@@ -2650,18 +2709,18 @@ 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.");
           }
-          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$serviceWorkerU
-            };
-            AuthSessionState.setSession(newSession);
-            return newSession;
-          });
+          var newSession = {
+            accessToken: undefined,
+            accessTokenRefreshHandle: undefined,
+            params: params,
+            isActive: true,
+            authServiceWorker: params.serviceWorkerScript !== undefined && _this2.serviceWorkerUtils.canUseServiceWorkers() ? {
+              serviceWorkerScript: params.serviceWorkerScript,
+              serviceWorkerScope: undefined
+            } : undefined
+          };
+          AuthSessionState.setSession(newSession);
+          return newSession;
         })), function (session) {
           // IMPORTANT: must be called outside the above, else re-entrant deadlock will occur.
           return AuthManagerBrowser_awaitIgnored(_this2.refreshAccessToken(session));
@@ -2686,7 +2745,15 @@ var AuthManagerImpl = /*#__PURE__*/function () {
             clearTimeout(session.accessTokenRefreshHandle);
           }
           return AuthManagerBrowser_await(_this4.deleteAccessToken(session.params), function () {
-            return AuthManagerBrowser_awaitIgnored(_this4.setServiceWorkerConfig(session, [])); // Prevent service worker from authorizing subsequent requests.
+            return AuthManagerBrowser_invokeIgnored(function () {
+              if (session.authServiceWorker !== undefined) {
+                // Prevent service worker from authorizing subsequent requests.
+                return AuthManagerBrowser_awaitIgnored(_this4.serviceWorkerUtils.sendMessage({
+                  type: "SET_BYTESCALE_AUTH_CONFIG",
+                  config: []
+                }, session.authServiceWorker, _this4.serviceWorkerScriptFieldName));
+              }
+            });
           });
         })));
       } catch (e) {
@@ -2713,16 +2780,23 @@ var AuthManagerImpl = /*#__PURE__*/function () {
                   // confusion for us in the future (i.e. we may question "do we need to use both together? was there a reason?").
                   // Also: if the user has omitted "allowedOrigins" from their JWT, then service worker-based auth is more secure
                   // than cookie-based auth, which is another reason to prevent these cookies from being set unless required.
-                  var setCookie = !_this6.isUsingServiceWorker(session);
+                  var setCookie = session.authServiceWorker === undefined;
                   return AuthManagerBrowser_await(_this6.setAccessToken(session.params, jwt, setCookie), function (setTokenResult) {
-                    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, "/")
-                    }]), function () {
+                    return AuthManagerBrowser_invoke(function () {
+                      if (session.authServiceWorker !== undefined) {
+                        return AuthManagerBrowser_awaitIgnored(_this6.serviceWorkerUtils.sendMessage({
+                          type: "SET_BYTESCALE_AUTH_CONFIG",
+                          config: [{
+                            headers: [{
+                              key: "Authorization",
+                              value: "Bearer ".concat(jwt)
+                            }],
+                            expires: Date.now() + setTokenResult.ttlSeconds * 1000,
+                            urlPrefix: "".concat(_this6.getCdnUrl(session.params), "/").concat(session.params.accountId, "/")
+                          }]
+                        }, session.authServiceWorker, _this6.serviceWorkerScriptFieldName));
+                      }
+                    }, function () {
                       var desiredTtl = setTokenResult.ttlSeconds - _this6.refreshBeforeExpirySeconds;
                       timeout = Math.max(desiredTtl, _this6.minJwtTtlSeconds);
                       if (desiredTtl !== timeout) {
@@ -2754,32 +2828,6 @@ var AuthManagerImpl = /*#__PURE__*/function () {
         return Promise.reject(e);
       }
     }
-  }, {
-    key: "isUsingServiceWorker",
-    value: function isUsingServiceWorker(session) {
-      return session.authServiceWorker !== undefined;
-    }
-  }, {
-    key: "setServiceWorkerConfig",
-    value: function setServiceWorkerConfig(session, config) {
-      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",
     value: function getAccessTokenUrl(params, setCookie) {
@@ -2795,9 +2843,9 @@ var AuthManagerImpl = /*#__PURE__*/function () {
     key: "deleteAccessToken",
     value: function deleteAccessToken(params) {
       try {
-        var _this10 = this;
+        var _this8 = this;
         var _a;
-        return AuthManagerBrowser_awaitIgnored(BaseAPI.fetch(_this10.getAccessTokenUrl(params, true), {
+        return AuthManagerBrowser_awaitIgnored(BaseAPI.fetch(_this8.getAccessTokenUrl(params, true), {
           method: "DELETE",
           credentials: "include",
           headers: {}
@@ -2813,15 +2861,15 @@ var AuthManagerImpl = /*#__PURE__*/function () {
     key: "setAccessToken",
     value: function setAccessToken(params, jwt, setCookie) {
       try {
-        var _this12 = this;
+        var _this10 = this;
         var _a;
         var request = {
           accessToken: jwt
         };
-        return AuthManagerBrowser_await(BaseAPI.fetch(_this12.getAccessTokenUrl(params, setCookie), {
+        return AuthManagerBrowser_await(BaseAPI.fetch(_this10.getAccessTokenUrl(params, setCookie), {
           method: "PUT",
           credentials: "include",
-          headers: AuthManagerBrowser_defineProperty({}, _this12.contentType, _this12.contentTypeJson),
+          headers: AuthManagerBrowser_defineProperty({}, _this10.contentType, _this10.contentTypeJson),
           body: JSON.stringify(request)
         }, {
           isBytescaleApi: true,
@@ -2837,10 +2885,10 @@ var AuthManagerImpl = /*#__PURE__*/function () {
     key: "getAccessToken",
     value: function getAccessToken(params, headers) {
       try {
-        var _this14 = this;
+        var _this12 = this;
         var _a, _b;
         var endpointName = "Your auth API endpoint";
-        var requiredContentType = _this14.contentTypeText;
+        var requiredContentType = _this12.contentTypeText;
         return AuthManagerBrowser_await(BaseAPI.fetch(params.authUrl, {
           method: "GET",
           headers: headers
@@ -2848,10 +2896,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(_this14.contentType)) !== null && _b !== void 0 ? _b : "";
+          var actualContentType = (_b = result.headers.get(_this12.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(_this14.contentType, " response header, but the Bytescale SDK requires \"").concat(requiredContentType, "\"."));
+            throw new Error("".concat(endpointName, " returned \"").concat(actualContentType, "\" for the ").concat(_this12.contentType, " response header, but the Bytescale SDK requires \"").concat(requiredContentType, "\"."));
           }
           return AuthManagerBrowser_await(result.text(), function (jwt) {
             if (jwt.length === 0) {

package/dist/browser/esm/main.mjs

@@ -2404,6 +2404,13 @@ function ServiceWorkerUtils_catch(body, recover) {
   }
   return result;
 }
+function ServiceWorkerUtils_invoke(body, then) {
+  var result = body();
+  if (result && result.then) {
+    return result.then(then);
+  }
+  return then(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; }
@@ -2415,50 +2422,53 @@ var ServiceWorkerUtils = /*#__PURE__*/function () {
     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) {
+    key: "canUseServiceWorkers",
+    value: function canUseServiceWorkers() {
+      return "serviceWorker" in navigator;
+    }
+  }, {
+    key: "sendMessage",
+    value: function sendMessage(message, config, serviceWorkerScriptFieldName) {
       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;
-        }
+        return ServiceWorkerUtils_await(config.serviceWorkerScope !== undefined ? _this2.getActiveServiceWorkerElseRegister(config, message) : _this2.registerServiceWorkerValidated(config.serviceWorkerScript, message, serviceWorkerScriptFieldName), function (result) {
+          if (!result.messageSent) {
+            result.serviceWorker.postMessage(message);
+          }
+          return result.config;
+        });
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    }
+  }, {
+    key: "registerServiceWorkerValidated",
+    value: function registerServiceWorkerValidated(serviceWorkerScript, init, serviceWorkerScriptFieldName) {
+      try {
+        var _this4 = this;
         if (!serviceWorkerScript.startsWith("/")) {
-          throw new Error("The '".concat(configFieldName, "' field must start with a '/' and reference a script at the root of your website."));
+          throw new Error("The '".concat(serviceWorkerScriptFieldName, "' 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."));
+          ConsoleUtils.warn("The '".concat(serviceWorkerScriptFieldName, "' 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;
-        });
+        return ServiceWorkerUtils_await(_this4.registerServiceWorker(serviceWorkerScript, init));
       } catch (e) {
         return Promise.reject(e);
       }
     }
   }, {
     key: "getActiveServiceWorkerElseRegister",
-    value: function getActiveServiceWorkerElseRegister(_ref) {
-      var serviceWorkerScope = _ref.serviceWorkerScope,
-        serviceWorkerScript = _ref.serviceWorkerScript;
+    value: function getActiveServiceWorkerElseRegister(config, init) {
       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;
-          });
+        var _this6 = this;
+        return ServiceWorkerUtils_await(_this6.getActiveServiceWorker(config.serviceWorkerScope), function (serviceWorker) {
+          return serviceWorker !== undefined ? {
+            serviceWorker: serviceWorker,
+            messageSent: false,
+            config: config
+          } : ServiceWorkerUtils_await(_this6.registerServiceWorker(config.serviceWorkerScript, init));
         });
       } catch (e) {
         return Promise.reject(e);
@@ -2472,36 +2482,25 @@ var ServiceWorkerUtils = /*#__PURE__*/function () {
      * We don't need to unregister it: we just need to clear the config when auth ends.
      */
   }, {
-    key: "registerAuthServiceWorker",
-    value: function registerAuthServiceWorker(serviceWorkerScript) {
+    key: "registerServiceWorker",
+    value: function registerServiceWorker(serviceWorkerScript, init) {
       try {
+        var _this8 = this;
         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
-                      });
-                    }
-                  });
+            return ServiceWorkerUtils_await(_this8.waitForActiveServiceWorker(registration, init), function (_ref) {
+              var serviceWorker = _ref.serviceWorker,
+                messageSent = _ref.messageSent;
+              return {
+                serviceWorker: serviceWorker,
+                messageSent: messageSent,
+                config: {
+                  serviceWorkerScript: serviceWorkerScript,
+                  serviceWorkerScope: registration.scope
                 }
-              });
-            }));
-          }); // 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));
         });
@@ -2509,6 +2508,52 @@ var ServiceWorkerUtils = /*#__PURE__*/function () {
         return Promise.reject(e);
       }
     }
+  }, {
+    key: "waitForActiveServiceWorker",
+    value: function waitForActiveServiceWorker(registration, init) {
+      try {
+        var _exit2 = false;
+        // We must check the 'installing' state before the 'active' state (see comment below).
+        // The state will be 'installing' when the service worker is installed for the first time, or if there have been
+        // code changes to the service worker, else the state will be 'active'.
+        var installing = registration.installing;
+        return ServiceWorkerUtils_invoke(function () {
+          if (installing !== null) {
+            installing.postMessage(init);
+            _exit2 = true;
+            return ServiceWorkerUtils_await(new Promise(function (resolve) {
+              var stateChangeHandler = function stateChangeHandler(e) {
+                var sw = e.target;
+                if (sw.state === "activated") {
+                  installing.removeEventListener("statechange", stateChangeHandler);
+                  resolve({
+                    messageSent: true,
+                    serviceWorker: sw
+                  });
+                }
+              };
+              installing.addEventListener("statechange", stateChangeHandler);
+            }));
+          }
+        }, function (_result) {
+          if (_exit2) return _result;
+          // We must check the 'installing' state before the 'active' state, because if we've just installed a new service
+          // worker, then the new service worker will be in the 'installing' slot whereas the old service worker will be in
+          // the 'active' slot. So, if we checked this first, we would always return the old service worker, and therefore the
+          // new service worker would never be initialized.
+          if (registration.active !== null) {
+            return {
+              serviceWorker: registration.active,
+              messageSent: false
+            };
+          }
+          // We expect the service worker to use 'skipWaiting', so we don't expect 'waiting' service workers.
+          throw new Error("Service worker was neither 'installing' or 'active'.");
+        });
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    }
   }, {
     key: "getActiveServiceWorker",
     value: function getActiveServiceWorker(serviceWorkerScope) {
@@ -2567,6 +2612,19 @@ function AuthManagerBrowser_async(f) {
     }
   };
 }
+function AuthManagerBrowser_invokeIgnored(body) {
+  var result = body();
+  if (result && result.then) {
+    return result.then(AuthManagerBrowser_empty);
+  }
+}
+function AuthManagerBrowser_invoke(body, then) {
+  var result = body();
+  if (result && result.then) {
+    return result.then(then);
+  }
+  return then(result);
+}
 function AuthManagerBrowser_catch(body, recover) {
   try {
     var result = body();
@@ -2611,6 +2669,7 @@ var AuthManagerImpl = /*#__PURE__*/function () {
   function AuthManagerImpl(serviceWorkerUtils) {
     AuthManagerBrowser_classCallCheck(this, AuthManagerImpl);
     this.serviceWorkerUtils = serviceWorkerUtils;
+    this.serviceWorkerScriptFieldName = "serviceWorkerScript";
     this.contentType = "content-type";
     this.contentTypeJson = "application/json";
     this.contentTypeText = "text/plain";
@@ -2635,18 +2694,18 @@ 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.");
           }
-          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$serviceWorkerU
-            };
-            AuthSessionState.setSession(newSession);
-            return newSession;
-          });
+          var newSession = {
+            accessToken: undefined,
+            accessTokenRefreshHandle: undefined,
+            params: params,
+            isActive: true,
+            authServiceWorker: params.serviceWorkerScript !== undefined && _this2.serviceWorkerUtils.canUseServiceWorkers() ? {
+              serviceWorkerScript: params.serviceWorkerScript,
+              serviceWorkerScope: undefined
+            } : undefined
+          };
+          AuthSessionState.setSession(newSession);
+          return newSession;
         })), function (session) {
           // IMPORTANT: must be called outside the above, else re-entrant deadlock will occur.
           return AuthManagerBrowser_awaitIgnored(_this2.refreshAccessToken(session));
@@ -2671,7 +2730,15 @@ var AuthManagerImpl = /*#__PURE__*/function () {
             clearTimeout(session.accessTokenRefreshHandle);
           }
           return AuthManagerBrowser_await(_this4.deleteAccessToken(session.params), function () {
-            return AuthManagerBrowser_awaitIgnored(_this4.setServiceWorkerConfig(session, [])); // Prevent service worker from authorizing subsequent requests.
+            return AuthManagerBrowser_invokeIgnored(function () {
+              if (session.authServiceWorker !== undefined) {
+                // Prevent service worker from authorizing subsequent requests.
+                return AuthManagerBrowser_awaitIgnored(_this4.serviceWorkerUtils.sendMessage({
+                  type: "SET_BYTESCALE_AUTH_CONFIG",
+                  config: []
+                }, session.authServiceWorker, _this4.serviceWorkerScriptFieldName));
+              }
+            });
           });
         })));
       } catch (e) {
@@ -2698,16 +2765,23 @@ var AuthManagerImpl = /*#__PURE__*/function () {
                   // confusion for us in the future (i.e. we may question "do we need to use both together? was there a reason?").
                   // Also: if the user has omitted "allowedOrigins" from their JWT, then service worker-based auth is more secure
                   // than cookie-based auth, which is another reason to prevent these cookies from being set unless required.
-                  var setCookie = !_this6.isUsingServiceWorker(session);
+                  var setCookie = session.authServiceWorker === undefined;
                   return AuthManagerBrowser_await(_this6.setAccessToken(session.params, jwt, setCookie), function (setTokenResult) {
-                    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, "/")
-                    }]), function () {
+                    return AuthManagerBrowser_invoke(function () {
+                      if (session.authServiceWorker !== undefined) {
+                        return AuthManagerBrowser_awaitIgnored(_this6.serviceWorkerUtils.sendMessage({
+                          type: "SET_BYTESCALE_AUTH_CONFIG",
+                          config: [{
+                            headers: [{
+                              key: "Authorization",
+                              value: "Bearer ".concat(jwt)
+                            }],
+                            expires: Date.now() + setTokenResult.ttlSeconds * 1000,
+                            urlPrefix: "".concat(_this6.getCdnUrl(session.params), "/").concat(session.params.accountId, "/")
+                          }]
+                        }, session.authServiceWorker, _this6.serviceWorkerScriptFieldName));
+                      }
+                    }, function () {
                       var desiredTtl = setTokenResult.ttlSeconds - _this6.refreshBeforeExpirySeconds;
                       timeout = Math.max(desiredTtl, _this6.minJwtTtlSeconds);
                       if (desiredTtl !== timeout) {
@@ -2739,32 +2813,6 @@ var AuthManagerImpl = /*#__PURE__*/function () {
         return Promise.reject(e);
       }
     }
-  }, {
-    key: "isUsingServiceWorker",
-    value: function isUsingServiceWorker(session) {
-      return session.authServiceWorker !== undefined;
-    }
-  }, {
-    key: "setServiceWorkerConfig",
-    value: function setServiceWorkerConfig(session, config) {
-      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",
     value: function getAccessTokenUrl(params, setCookie) {
@@ -2780,9 +2828,9 @@ var AuthManagerImpl = /*#__PURE__*/function () {
     key: "deleteAccessToken",
     value: function deleteAccessToken(params) {
       try {
-        var _this10 = this;
+        var _this8 = this;
         var _a;
-        return AuthManagerBrowser_awaitIgnored(BaseAPI.fetch(_this10.getAccessTokenUrl(params, true), {
+        return AuthManagerBrowser_awaitIgnored(BaseAPI.fetch(_this8.getAccessTokenUrl(params, true), {
           method: "DELETE",
           credentials: "include",
           headers: {}
@@ -2798,15 +2846,15 @@ var AuthManagerImpl = /*#__PURE__*/function () {
     key: "setAccessToken",
     value: function setAccessToken(params, jwt, setCookie) {
       try {
-        var _this12 = this;
+        var _this10 = this;
         var _a;
         var request = {
           accessToken: jwt
         };
-        return AuthManagerBrowser_await(BaseAPI.fetch(_this12.getAccessTokenUrl(params, setCookie), {
+        return AuthManagerBrowser_await(BaseAPI.fetch(_this10.getAccessTokenUrl(params, setCookie), {
           method: "PUT",
           credentials: "include",
-          headers: AuthManagerBrowser_defineProperty({}, _this12.contentType, _this12.contentTypeJson),
+          headers: AuthManagerBrowser_defineProperty({}, _this10.contentType, _this10.contentTypeJson),
           body: JSON.stringify(request)
         }, {
           isBytescaleApi: true,
@@ -2822,10 +2870,10 @@ var AuthManagerImpl = /*#__PURE__*/function () {
     key: "getAccessToken",
     value: function getAccessToken(params, headers) {
       try {
-        var _this14 = this;
+        var _this12 = this;
         var _a, _b;
         var endpointName = "Your auth API endpoint";
-        var requiredContentType = _this14.contentTypeText;
+        var requiredContentType = _this12.contentTypeText;
         return AuthManagerBrowser_await(BaseAPI.fetch(params.authUrl, {
           method: "GET",
           headers: headers
@@ -2833,10 +2881,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(_this14.contentType)) !== null && _b !== void 0 ? _b : "";
+          var actualContentType = (_b = result.headers.get(_this12.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(_this14.contentType, " response header, but the Bytescale SDK requires \"").concat(requiredContentType, "\"."));
+            throw new Error("".concat(endpointName, " returned \"").concat(actualContentType, "\" for the ").concat(_this12.contentType, " response header, but the Bytescale SDK requires \"").concat(requiredContentType, "\"."));
           }
           return AuthManagerBrowser_await(result.text(), function (jwt) {
             if (jwt.length === 0) {

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

@@ -1,5 +1,9 @@
-import { ServiceWorkerConfig } from "./model/ServiceWorkerConfig";
-export declare class ServiceWorkerUtils {
+import { ServiceWorkerConfig, ServiceWorkerConfigInitialized } from "./model/ServiceWorkerConfig";
+export declare class ServiceWorkerUtils<TMessage> {
+    canUseServiceWorkers(): boolean;
+    sendMessage(message: TMessage, config: ServiceWorkerConfig, serviceWorkerScriptFieldName: string): Promise<ServiceWorkerConfigInitialized>;
+    private registerServiceWorkerValidated;
+    private getActiveServiceWorkerElseRegister;
     /**
      * Idempotent.
      *
@@ -7,15 +11,7 @@ export declare class ServiceWorkerUtils {
      *
      * 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 registerServiceWorker;
+    private waitForActiveServiceWorker;
     private getActiveServiceWorker;
 }

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

@@ -1,4 +1,9 @@
-export interface ServiceWorkerConfig {
+export declare type ServiceWorkerConfig = ServiceWorkerConfigUninitialized | ServiceWorkerConfigInitialized;
+export interface ServiceWorkerConfigUninitialized {
+    serviceWorkerScope: undefined;
+    serviceWorkerScript: string;
+}
+export interface ServiceWorkerConfigInitialized {
     serviceWorkerScope: string;
     serviceWorkerScript: string;
 }

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

@@ -0,0 +1,6 @@
+import { ServiceWorkerConfigInitialized } from "./ServiceWorkerConfig";
+export interface ServiceWorkerInitStatus {
+    config: ServiceWorkerConfigInitialized;
+    messageSent: boolean;
+    serviceWorker: ServiceWorker;
+}

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

@@ -1,8 +1,10 @@
 import { AuthManagerInterface, BeginAuthSessionParams } from "../../private/model/AuthManagerInterface";
+import { AuthSwSetConfigDto } from "../../private/dtos/AuthSwSetConfigDto";
 import { ServiceWorkerUtils } from "../../private/ServiceWorkerUtils";
 declare class AuthManagerImpl implements AuthManagerInterface {
     private readonly serviceWorkerUtils;
     private readonly authSessionMutex;
+    private readonly serviceWorkerScriptFieldName;
     private readonly contentType;
     private readonly contentTypeJson;
     private readonly contentTypeText;
@@ -10,13 +12,11 @@ declare class AuthManagerImpl implements AuthManagerInterface {
     private readonly maxJwtTtlSeconds;
     private readonly retryAuthAfterErrorSeconds;
     private readonly refreshBeforeExpirySeconds;
-    constructor(serviceWorkerUtils: ServiceWorkerUtils);
+    constructor(serviceWorkerUtils: ServiceWorkerUtils<AuthSwSetConfigDto>);
     isAuthSessionActive(): boolean;
     beginAuthSession(params: BeginAuthSessionParams): Promise<void>;
     endAuthSession(): Promise<void>;
     private refreshAccessToken;
-    private isUsingServiceWorker;
-    private setServiceWorkerConfig;
     private getAccessTokenUrl;
     private getCdnUrl;
     private deleteAccessToken;

package/package.json

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