@bytescale/sdk 3.19.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; }
@@ -2439,7 +2446,7 @@ var ServiceWorkerUtils = /*#__PURE__*/function () {
     value: function sendMessage(message, config, serviceWorkerScriptFieldName) {
       try {
         var _this2 = this;
-        return ServiceWorkerUtils_await(config.serviceWorkerScope !== undefined ? _this2.getActiveServiceWorkerElseRegister(config, message) : _this2.registerServiceWorkerIfSupported(config.serviceWorkerScript, message, serviceWorkerScriptFieldName), function (result) {
+        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);
           }
@@ -2450,8 +2457,8 @@ var ServiceWorkerUtils = /*#__PURE__*/function () {
       }
     }
   }, {
-    key: "registerServiceWorkerIfSupported",
-    value: function registerServiceWorkerIfSupported(serviceWorkerScript, init, serviceWorkerScriptFieldName) {
+    key: "registerServiceWorkerValidated",
+    value: function registerServiceWorkerValidated(serviceWorkerScript, init, serviceWorkerScriptFieldName) {
       try {
         var _this4 = this;
         if (!serviceWorkerScript.startsWith("/")) {
@@ -2461,7 +2468,7 @@ var ServiceWorkerUtils = /*#__PURE__*/function () {
         if (forwardSlashCount > 1) {
           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(_this4.registerAuthServiceWorker(serviceWorkerScript, init));
+        return ServiceWorkerUtils_await(_this4.registerServiceWorker(serviceWorkerScript, init));
       } catch (e) {
         return Promise.reject(e);
       }
@@ -2476,7 +2483,7 @@ var ServiceWorkerUtils = /*#__PURE__*/function () {
             serviceWorker: serviceWorker,
             messageSent: false,
             config: config
-          } : ServiceWorkerUtils_await(_this6.registerAuthServiceWorker(config.serviceWorkerScript, init));
+          } : ServiceWorkerUtils_await(_this6.registerServiceWorker(config.serviceWorkerScript, init));
         });
       } catch (e) {
         return Promise.reject(e);
@@ -2490,8 +2497,8 @@ 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, init) {
+    key: "registerServiceWorker",
+    value: function registerServiceWorker(serviceWorkerScript, init) {
       try {
         var _this8 = this;
         return ServiceWorkerUtils_catch(function () {
@@ -2520,43 +2527,44 @@ var ServiceWorkerUtils = /*#__PURE__*/function () {
     key: "waitForActiveServiceWorker",
     value: function waitForActiveServiceWorker(registration, init) {
       try {
-        // If the service worker is already active, return it.
-        if (registration.active !== null) {
-          return {
-            serviceWorker: registration.active,
-            messageSent: false
-          };
-        }
-        // Service worker has not finished installing, which means we've just started installing a new one, so send the INIT
-        // message to it, as it will be waiting for it to complete its install phase.
-        var messageSent;
-        if (registration.installing !== null) {
-          messageSent = true;
-          registration.installing.postMessage(init);
-        } else {
-          messageSent = false;
-        }
-        // Wait for the service worker to become active.
-        return ServiceWorkerUtils_await(new Promise(function (resolve, reject) {
-          var _a, _b;
-          var serviceWorker = (_b = (_a = registration.installing) !== null && _a !== void 0 ? _a : registration.waiting) !== null && _b !== void 0 ? _b : undefined;
-          if (serviceWorker !== undefined) {
-            var stateChangeHandler = function stateChangeHandler(e) {
-              var sw = e.target;
-              if (sw.state === "activated") {
-                serviceWorker.removeEventListener("statechange", stateChangeHandler);
-                resolve({
-                  messageSent: messageSent,
-                  serviceWorker: sw
-                });
-              }
+        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
             };
-            serviceWorker.addEventListener("statechange", stateChangeHandler);
-          } else {
-            // If there's no installing or waiting service worker, reject.
-            reject(new Error("No service worker is installing or waiting."));
           }
-        }));
+          // 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);
       }

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; }
@@ -2424,7 +2431,7 @@ var ServiceWorkerUtils = /*#__PURE__*/function () {
     value: function sendMessage(message, config, serviceWorkerScriptFieldName) {
       try {
         var _this2 = this;
-        return ServiceWorkerUtils_await(config.serviceWorkerScope !== undefined ? _this2.getActiveServiceWorkerElseRegister(config, message) : _this2.registerServiceWorkerIfSupported(config.serviceWorkerScript, message, serviceWorkerScriptFieldName), function (result) {
+        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);
           }
@@ -2435,8 +2442,8 @@ var ServiceWorkerUtils = /*#__PURE__*/function () {
       }
     }
   }, {
-    key: "registerServiceWorkerIfSupported",
-    value: function registerServiceWorkerIfSupported(serviceWorkerScript, init, serviceWorkerScriptFieldName) {
+    key: "registerServiceWorkerValidated",
+    value: function registerServiceWorkerValidated(serviceWorkerScript, init, serviceWorkerScriptFieldName) {
       try {
         var _this4 = this;
         if (!serviceWorkerScript.startsWith("/")) {
@@ -2446,7 +2453,7 @@ var ServiceWorkerUtils = /*#__PURE__*/function () {
         if (forwardSlashCount > 1) {
           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(_this4.registerAuthServiceWorker(serviceWorkerScript, init));
+        return ServiceWorkerUtils_await(_this4.registerServiceWorker(serviceWorkerScript, init));
       } catch (e) {
         return Promise.reject(e);
       }
@@ -2461,7 +2468,7 @@ var ServiceWorkerUtils = /*#__PURE__*/function () {
             serviceWorker: serviceWorker,
             messageSent: false,
             config: config
-          } : ServiceWorkerUtils_await(_this6.registerAuthServiceWorker(config.serviceWorkerScript, init));
+          } : ServiceWorkerUtils_await(_this6.registerServiceWorker(config.serviceWorkerScript, init));
         });
       } catch (e) {
         return Promise.reject(e);
@@ -2475,8 +2482,8 @@ 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, init) {
+    key: "registerServiceWorker",
+    value: function registerServiceWorker(serviceWorkerScript, init) {
       try {
         var _this8 = this;
         return ServiceWorkerUtils_catch(function () {
@@ -2505,43 +2512,44 @@ var ServiceWorkerUtils = /*#__PURE__*/function () {
     key: "waitForActiveServiceWorker",
     value: function waitForActiveServiceWorker(registration, init) {
       try {
-        // If the service worker is already active, return it.
-        if (registration.active !== null) {
-          return {
-            serviceWorker: registration.active,
-            messageSent: false
-          };
-        }
-        // Service worker has not finished installing, which means we've just started installing a new one, so send the INIT
-        // message to it, as it will be waiting for it to complete its install phase.
-        var messageSent;
-        if (registration.installing !== null) {
-          messageSent = true;
-          registration.installing.postMessage(init);
-        } else {
-          messageSent = false;
-        }
-        // Wait for the service worker to become active.
-        return ServiceWorkerUtils_await(new Promise(function (resolve, reject) {
-          var _a, _b;
-          var serviceWorker = (_b = (_a = registration.installing) !== null && _a !== void 0 ? _a : registration.waiting) !== null && _b !== void 0 ? _b : undefined;
-          if (serviceWorker !== undefined) {
-            var stateChangeHandler = function stateChangeHandler(e) {
-              var sw = e.target;
-              if (sw.state === "activated") {
-                serviceWorker.removeEventListener("statechange", stateChangeHandler);
-                resolve({
-                  messageSent: messageSent,
-                  serviceWorker: sw
-                });
-              }
+        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
             };
-            serviceWorker.addEventListener("statechange", stateChangeHandler);
-          } else {
-            // If there's no installing or waiting service worker, reject.
-            reject(new Error("No service worker is installing or waiting."));
           }
-        }));
+          // 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);
       }

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

@@ -2,7 +2,7 @@ import { ServiceWorkerConfig, ServiceWorkerConfigInitialized } from "./model/Ser
 export declare class ServiceWorkerUtils<TMessage> {
     canUseServiceWorkers(): boolean;
     sendMessage(message: TMessage, config: ServiceWorkerConfig, serviceWorkerScriptFieldName: string): Promise<ServiceWorkerConfigInitialized>;
-    private registerServiceWorkerIfSupported;
+    private registerServiceWorkerValidated;
     private getActiveServiceWorkerElseRegister;
     /**
      * Idempotent.
@@ -11,7 +11,7 @@ export declare class ServiceWorkerUtils<TMessage> {
      *
      * 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/package.json

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