@bytescale/sdk 3.59.0 → 3.60.0

package/dist/browser/cjs/main.js

@@ -3678,14 +3678,14 @@ var AuthManagerImpl = /*#__PURE__*/function () {
           return AuthManagerBrowser_invoke(function () {
             if (session.authConfigs === undefined && typeof session.params.accountId === "string") {
               return AuthManagerBrowser_continueIgnored(AuthManagerBrowser_catch(function () {
-                return AuthManagerBrowser_awaitIgnored(_this3.deleteAccessToken(session.params.options, session.params.accountId));
+                return AuthManagerBrowser_awaitIgnored(_this3.deleteAccessToken(session.params.options, _this3.getCdnUrl(session.params), session.params.accountId));
               }, function (e) {
                 cleanupError = e;
               }));
             } else {
               return AuthManagerBrowser_continueIgnored(AuthManagerBrowser_forOf(cookieConfigs, function (state) {
                 return AuthManagerBrowser_continueIgnored(AuthManagerBrowser_catch(function () {
-                  return AuthManagerBrowser_awaitIgnored(_this3.deleteAccessToken(session.params.options, state.config.accountId));
+                  return AuthManagerBrowser_awaitIgnored(_this3.deleteAccessToken(session.params.options, _this3.getConfigCdnUrl(session.params, state.config), state.config.accountId));
                 }, function (e) {
                   cleanupError !== null && cleanupError !== void 0 ? cleanupError : cleanupError = e;
                 }));
@@ -3736,7 +3736,7 @@ var AuthManagerImpl = /*#__PURE__*/function () {
             return AuthManagerBrowser_catch(function () {
               return AuthManagerBrowser_await(_this4.getAuthorizationToken(session.params, state.config), function (jwt) {
                 var setCookie = _this4.shouldSetCookie(session, state.config);
-                return AuthManagerBrowser_await(_this4.setAccessToken(session.params.options, state.config.accountId, jwt, setCookie), function (token) {
+                return AuthManagerBrowser_await(_this4.setAccessToken(session.params.options, _this4.getConfigCdnUrl(session.params, state.config), state.config.accountId, jwt, setCookie), function (token) {
                   var expiresAt = Date.now() + token.ttlSeconds * 1000;
                   state.accessToken = token.accessToken;
                   state.expiresAt = expiresAt;
@@ -3801,7 +3801,7 @@ var AuthManagerImpl = /*#__PURE__*/function () {
               value: "Bearer ".concat(state.jwt)
             }],
             sourceUrlPrefixes: state.config.sourceUrlPrefixes,
-            urlPrefix: "".concat(_this5.getCdnUrl(session.params), "/").concat(state.config.accountId, "/")
+            urlPrefix: "".concat(_this5.getConfigCdnUrl(session.params, state.config), "/").concat(state.config.accountId, "/")
           }];
         });
         return AuthManagerBrowser_await(AuthManagerBrowser_awaitIgnored(_this5.sendServiceWorkerConfig(session, config, _this5.isV2Params(session.params) ? session.params.urlRewriteRules : undefined)));
@@ -3894,6 +3894,9 @@ var AuthManagerImpl = /*#__PURE__*/function () {
           if (isV2 && !this.isValidAccountId(config.accountId)) {
             throw new Error("Invalid Bytescale account ID: '".concat(String(config.accountId), "'."));
           }
+          if (config.cdnUrl !== undefined && typeof config.cdnUrl !== "string") {
+            throw new Error("The 'cdnUrl' field must be a string when provided.");
+          }
           if (config.enableCookieAuth !== undefined && typeof config.enableCookieAuth !== "boolean" || config.enableServiceWorkerAuth !== undefined && typeof config.enableServiceWorkerAuth !== "boolean") {
             throw new Error("Authentication enablement flags must be booleans when provided.");
           }
@@ -3914,7 +3917,7 @@ var AuthManagerImpl = /*#__PURE__*/function () {
             cookieConfig = config;
           }
           if (this.isServiceWorkerEnabled(config)) {
-            var _prefix = "".concat(this.getCdnUrl(params), "/").concat(config.accountId, "/");
+            var _prefix = "".concat(this.getConfigCdnUrl(params, config), "/").concat(config.accountId, "/");
             if (workerConfigsByPrefix.has(_prefix)) {
               throw new Error("Multiple service-worker auth configurations target the same URL prefix: '".concat(_prefix, "'."));
             }
@@ -3927,7 +3930,7 @@ var AuthManagerImpl = /*#__PURE__*/function () {
         _iterator2.f();
       }
       if (cookieConfig !== undefined) {
-        var prefix = "".concat(this.getCdnUrl(params), "/").concat(cookieConfig.accountId, "/");
+        var prefix = "".concat(this.getConfigCdnUrl(params, cookieConfig), "/").concat(cookieConfig.accountId, "/");
         var workerConfig = workerConfigsByPrefix.get(prefix);
         if (workerConfig !== undefined && workerConfig !== cookieConfig) {
           throw new Error("Cookie and service-worker authentication cannot target the same account from different configs.");
@@ -4006,8 +4009,8 @@ var AuthManagerImpl = /*#__PURE__*/function () {
     }
   }, {
     key: "getAccessTokenUrl",
-    value: function getAccessTokenUrl(options, accountId, setCookie) {
-      return "".concat(BytescaleApiClientConfigUtils.getCdnUrl(options !== null && options !== void 0 ? options : {}), "/api/v1/access_tokens/").concat(accountId, "?set-cookie=").concat(setCookie ? "true" : "false");
+    value: function getAccessTokenUrl(cdnUrl, accountId, setCookie) {
+      return "".concat(cdnUrl, "/api/v1/access_tokens/").concat(accountId, "?set-cookie=").concat(setCookie ? "true" : "false");
     }
   }, {
     key: "getCdnUrl",
@@ -4015,12 +4018,20 @@ var AuthManagerImpl = /*#__PURE__*/function () {
       var _a;
       return BytescaleApiClientConfigUtils.getCdnUrl((_a = params.options) !== null && _a !== void 0 ? _a : {});
     }
+  }, {
+    key: "getConfigCdnUrl",
+    value: function getConfigCdnUrl(params, config) {
+      var _a, _b;
+      return BytescaleApiClientConfigUtils.getCdnUrl({
+        cdnUrl: (_a = config.cdnUrl) !== null && _a !== void 0 ? _a : (_b = params.options) === null || _b === void 0 ? void 0 : _b.cdnUrl
+      });
+    }
   }, {
     key: "deleteAccessToken",
-    value: function deleteAccessToken(options, accountId) {
+    value: function deleteAccessToken(options, cdnUrl, accountId) {
       try {
         var _this8 = this;
-        return AuthManagerBrowser_await(AuthManagerBrowser_awaitIgnored(BaseAPI.fetch(_this8.getAccessTokenUrl(options, accountId, true), {
+        return AuthManagerBrowser_await(AuthManagerBrowser_awaitIgnored(BaseAPI.fetch(_this8.getAccessTokenUrl(cdnUrl, accountId, true), {
           method: "DELETE",
           credentials: "include",
           headers: {}
@@ -4034,13 +4045,13 @@ var AuthManagerImpl = /*#__PURE__*/function () {
     }
   }, {
     key: "setAccessToken",
-    value: function setAccessToken(options, accountId, jwt, setCookie) {
+    value: function setAccessToken(options, cdnUrl, accountId, jwt, setCookie) {
       try {
         var _this9 = this;
         var request = {
           accessToken: jwt
         };
-        return AuthManagerBrowser_await(BaseAPI.fetch(_this9.getAccessTokenUrl(options, accountId, setCookie), {
+        return AuthManagerBrowser_await(BaseAPI.fetch(_this9.getAccessTokenUrl(cdnUrl, accountId, setCookie), {
           method: "PUT",
           credentials: "include",
           headers: AuthManagerBrowser_defineProperty({}, _this9.contentType, _this9.contentTypeJson),

package/dist/browser/esm/main.mjs

@@ -3638,14 +3638,14 @@ var AuthManagerImpl = /*#__PURE__*/function () {
           return AuthManagerBrowser_invoke(function () {
             if (session.authConfigs === undefined && typeof session.params.accountId === "string") {
               return AuthManagerBrowser_continueIgnored(AuthManagerBrowser_catch(function () {
-                return AuthManagerBrowser_awaitIgnored(_this3.deleteAccessToken(session.params.options, session.params.accountId));
+                return AuthManagerBrowser_awaitIgnored(_this3.deleteAccessToken(session.params.options, _this3.getCdnUrl(session.params), session.params.accountId));
               }, function (e) {
                 cleanupError = e;
               }));
             } else {
               return AuthManagerBrowser_continueIgnored(AuthManagerBrowser_forOf(cookieConfigs, function (state) {
                 return AuthManagerBrowser_continueIgnored(AuthManagerBrowser_catch(function () {
-                  return AuthManagerBrowser_awaitIgnored(_this3.deleteAccessToken(session.params.options, state.config.accountId));
+                  return AuthManagerBrowser_awaitIgnored(_this3.deleteAccessToken(session.params.options, _this3.getConfigCdnUrl(session.params, state.config), state.config.accountId));
                 }, function (e) {
                   cleanupError !== null && cleanupError !== void 0 ? cleanupError : cleanupError = e;
                 }));
@@ -3696,7 +3696,7 @@ var AuthManagerImpl = /*#__PURE__*/function () {
             return AuthManagerBrowser_catch(function () {
               return AuthManagerBrowser_await(_this4.getAuthorizationToken(session.params, state.config), function (jwt) {
                 var setCookie = _this4.shouldSetCookie(session, state.config);
-                return AuthManagerBrowser_await(_this4.setAccessToken(session.params.options, state.config.accountId, jwt, setCookie), function (token) {
+                return AuthManagerBrowser_await(_this4.setAccessToken(session.params.options, _this4.getConfigCdnUrl(session.params, state.config), state.config.accountId, jwt, setCookie), function (token) {
                   var expiresAt = Date.now() + token.ttlSeconds * 1000;
                   state.accessToken = token.accessToken;
                   state.expiresAt = expiresAt;
@@ -3761,7 +3761,7 @@ var AuthManagerImpl = /*#__PURE__*/function () {
               value: "Bearer ".concat(state.jwt)
             }],
             sourceUrlPrefixes: state.config.sourceUrlPrefixes,
-            urlPrefix: "".concat(_this5.getCdnUrl(session.params), "/").concat(state.config.accountId, "/")
+            urlPrefix: "".concat(_this5.getConfigCdnUrl(session.params, state.config), "/").concat(state.config.accountId, "/")
           }];
         });
         return AuthManagerBrowser_await(AuthManagerBrowser_awaitIgnored(_this5.sendServiceWorkerConfig(session, config, _this5.isV2Params(session.params) ? session.params.urlRewriteRules : undefined)));
@@ -3854,6 +3854,9 @@ var AuthManagerImpl = /*#__PURE__*/function () {
           if (isV2 && !this.isValidAccountId(config.accountId)) {
             throw new Error("Invalid Bytescale account ID: '".concat(String(config.accountId), "'."));
           }
+          if (config.cdnUrl !== undefined && typeof config.cdnUrl !== "string") {
+            throw new Error("The 'cdnUrl' field must be a string when provided.");
+          }
           if (config.enableCookieAuth !== undefined && typeof config.enableCookieAuth !== "boolean" || config.enableServiceWorkerAuth !== undefined && typeof config.enableServiceWorkerAuth !== "boolean") {
             throw new Error("Authentication enablement flags must be booleans when provided.");
           }
@@ -3874,7 +3877,7 @@ var AuthManagerImpl = /*#__PURE__*/function () {
             cookieConfig = config;
           }
           if (this.isServiceWorkerEnabled(config)) {
-            var _prefix = "".concat(this.getCdnUrl(params), "/").concat(config.accountId, "/");
+            var _prefix = "".concat(this.getConfigCdnUrl(params, config), "/").concat(config.accountId, "/");
             if (workerConfigsByPrefix.has(_prefix)) {
               throw new Error("Multiple service-worker auth configurations target the same URL prefix: '".concat(_prefix, "'."));
             }
@@ -3887,7 +3890,7 @@ var AuthManagerImpl = /*#__PURE__*/function () {
         _iterator2.f();
       }
       if (cookieConfig !== undefined) {
-        var prefix = "".concat(this.getCdnUrl(params), "/").concat(cookieConfig.accountId, "/");
+        var prefix = "".concat(this.getConfigCdnUrl(params, cookieConfig), "/").concat(cookieConfig.accountId, "/");
         var workerConfig = workerConfigsByPrefix.get(prefix);
         if (workerConfig !== undefined && workerConfig !== cookieConfig) {
           throw new Error("Cookie and service-worker authentication cannot target the same account from different configs.");
@@ -3966,8 +3969,8 @@ var AuthManagerImpl = /*#__PURE__*/function () {
     }
   }, {
     key: "getAccessTokenUrl",
-    value: function getAccessTokenUrl(options, accountId, setCookie) {
-      return "".concat(BytescaleApiClientConfigUtils.getCdnUrl(options !== null && options !== void 0 ? options : {}), "/api/v1/access_tokens/").concat(accountId, "?set-cookie=").concat(setCookie ? "true" : "false");
+    value: function getAccessTokenUrl(cdnUrl, accountId, setCookie) {
+      return "".concat(cdnUrl, "/api/v1/access_tokens/").concat(accountId, "?set-cookie=").concat(setCookie ? "true" : "false");
     }
   }, {
     key: "getCdnUrl",
@@ -3975,12 +3978,20 @@ var AuthManagerImpl = /*#__PURE__*/function () {
       var _a;
       return BytescaleApiClientConfigUtils.getCdnUrl((_a = params.options) !== null && _a !== void 0 ? _a : {});
     }
+  }, {
+    key: "getConfigCdnUrl",
+    value: function getConfigCdnUrl(params, config) {
+      var _a, _b;
+      return BytescaleApiClientConfigUtils.getCdnUrl({
+        cdnUrl: (_a = config.cdnUrl) !== null && _a !== void 0 ? _a : (_b = params.options) === null || _b === void 0 ? void 0 : _b.cdnUrl
+      });
+    }
   }, {
     key: "deleteAccessToken",
-    value: function deleteAccessToken(options, accountId) {
+    value: function deleteAccessToken(options, cdnUrl, accountId) {
       try {
         var _this8 = this;
-        return AuthManagerBrowser_await(AuthManagerBrowser_awaitIgnored(BaseAPI.fetch(_this8.getAccessTokenUrl(options, accountId, true), {
+        return AuthManagerBrowser_await(AuthManagerBrowser_awaitIgnored(BaseAPI.fetch(_this8.getAccessTokenUrl(cdnUrl, accountId, true), {
           method: "DELETE",
           credentials: "include",
           headers: {}
@@ -3994,13 +4005,13 @@ var AuthManagerImpl = /*#__PURE__*/function () {
     }
   }, {
     key: "setAccessToken",
-    value: function setAccessToken(options, accountId, jwt, setCookie) {
+    value: function setAccessToken(options, cdnUrl, accountId, jwt, setCookie) {
       try {
         var _this9 = this;
         var request = {
           accessToken: jwt
         };
-        return AuthManagerBrowser_await(BaseAPI.fetch(_this9.getAccessTokenUrl(options, accountId, setCookie), {
+        return AuthManagerBrowser_await(BaseAPI.fetch(_this9.getAccessTokenUrl(cdnUrl, accountId, setCookie), {
           method: "PUT",
           credentials: "include",
           headers: AuthManagerBrowser_defineProperty({}, _this9.contentType, _this9.contentTypeJson),

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

@@ -3,6 +3,8 @@ export interface AuthSessionConfigBase {
     accountId: string;
     /** A string names this configuration. `undefined` deliberately marks it as the session default. */
     authConfigId: string | undefined;
+    /** Overrides `options.cdnUrl` for this configuration. Excludes the trailing "/". */
+    cdnUrl?: string;
     /** Enables CDN cookie authentication. Defaults to false. */
     enableCookieAuth?: boolean;
     /** Enables CDN service-worker authentication. Defaults to true. */

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

@@ -37,6 +37,7 @@ declare class AuthManagerImpl implements AuthManagerInterface {
     private waitForServiceWorker;
     private getAccessTokenUrl;
     private getCdnUrl;
+    private getConfigCdnUrl;
     private deleteAccessToken;
     private setAccessToken;
     private getAuthorizationToken;

package/package.json

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

package/tests/AuthManagerBrowser.test.ts

@@ -203,6 +203,60 @@ describe("AuthManager browser multi-configuration sessions", () => {
     });
   });
 
+  test("uses each config's effective CDN URL for registration, worker prefixes, cleanup, and collisions", async () => {
+    const fetchApi = createFetchApi();
+    const defaultCdnUrl = "https://downloads-default.example.com";
+    const customCdnUrl = "https://downloads-custom.example.com";
+    const cookieCdnUrl = "https://downloads-cookie.example.com";
+
+    await AuthManager.beginAuthSession({
+      authConfigs: async () => [
+        {
+          ...apiOnlyConfig("custom-worker", accountA, async () => jwtA),
+          cdnUrl: customCdnUrl,
+          enableServiceWorkerAuth: true
+        },
+        {
+          ...apiOnlyConfig("default-worker", accountA, async () => jwtB),
+          enableServiceWorkerAuth: true
+        },
+        {
+          ...apiOnlyConfig("cookie", accountA, async () => jwtC),
+          cdnUrl: cookieCdnUrl,
+          enableCookieAuth: true
+        }
+      ],
+      options: { cdnUrl: defaultCdnUrl, fetchApi },
+      serviceWorkerScript: "/auth-sw.js"
+    });
+
+    expect(fetchApi.mock.calls.filter(([, init]) => init?.method === "PUT").map(([input]) => inputUrl(input))).toEqual([
+      `${customCdnUrl}/api/v1/access_tokens/${accountA}?set-cookie=false`,
+      `${defaultCdnUrl}/api/v1/access_tokens/${accountA}?set-cookie=false`,
+      `${cookieCdnUrl}/api/v1/access_tokens/${accountA}?set-cookie=true`
+    ]);
+    expect((postMessage.mock.calls.at(-1)?.[0] as any).config).toEqual([
+      {
+        expires: expect.any(Number),
+        headers: [{ key: "Authorization", value: `Bearer ${jwtA}` }],
+        sourceUrlPrefixes: undefined,
+        urlPrefix: `${customCdnUrl}/${accountA}/`
+      },
+      {
+        expires: expect.any(Number),
+        headers: [{ key: "Authorization", value: `Bearer ${jwtB}` }],
+        sourceUrlPrefixes: undefined,
+        urlPrefix: `${defaultCdnUrl}/${accountA}/`
+      }
+    ]);
+
+    await AuthManager.endAuthSession();
+
+    expect(
+      fetchApi.mock.calls.filter(([, init]) => init?.method === "DELETE").map(([input]) => inputUrl(input))
+    ).toEqual([`${cookieCdnUrl}/api/v1/access_tokens/${accountA}?set-cookie=true`]);
+  });
+
   test("supports a manual cookie-only V2 config without a service worker", async () => {
     delete navigatorValue.serviceWorker;
     const fetchApi = createFetchApi();
@@ -340,6 +394,14 @@ describe("AuthManager browser multi-configuration sessions", () => {
       params: (fetchApi: FetchApi) => v2Params(fetchApi, [apiOnlyConfig("a", "A12/abc", async () => jwtA)]),
       error: "Invalid Bytescale account ID"
     },
+    {
+      name: "invalid config CDN URL",
+      params: (fetchApi: FetchApi) =>
+        v2Params(fetchApi, [
+          { ...apiOnlyConfig("a", accountA, async () => jwtA), cdnUrl: 123 } as unknown as AuthSessionConfig
+        ]),
+      error: "cdnUrl"
+    },
     {
       name: "overlapping cookie and worker accounts",
       params: (fetchApi: FetchApi): BeginAuthSessionParamsV2 => ({

package/tests/AuthServiceWorkerRewrite.test.ts

@@ -150,6 +150,15 @@ describe("Auth service-worker URL rewriting", () => {
     expect(untouched.responded).toBe(false);
   });
 
+  test("waits for delayed persistent authentication state on a cold start", async () => {
+    const harness = new AuthServiceWorkerHarness();
+    harness.setPersistentConfig([authConfig("account-a/", "token-a")], 300);
+
+    const result = await harness.dispatchFetch("https://upcdn.io/account-a/file.pdf");
+
+    expect(result.outboundRequest?.headers.get("Authorization")).toBe("Bearer token-a");
+  });
+
   test("keeps source-page authorization independent across multiple client IDs", async () => {
     const harness = new AuthServiceWorkerHarness();
     harness.setWindowClient("client-a", "https://app.example.com/a/");
@@ -221,6 +230,8 @@ type WorkerEventListener = (event: unknown) => void;
 
 class AuthServiceWorkerHarness {
   private readonly clientsById = new Map<string, { type: "window"; url: string }>();
+  private readonly cacheEntries = new Map<string, NodeFetchResponse>();
+  private cacheReadDelayMilliseconds = 0;
   private readonly context: {
     getRewrittenUrl: (url: string, rules: UrlRewriteRule[]) => string | undefined;
     setConfig: (config: AuthSwConfigEntryDto[], rules?: UrlRewriteRule[]) => Promise<void>;
@@ -231,7 +242,6 @@ class AuthServiceWorkerHarness {
 
   constructor(private readonly upstreamResponse: NodeFetchResponse = new NodeFetchResponse("ok")) {
     const listeners = new Map<string, WorkerEventListener>();
-    const cacheEntries = new Map<string, NodeFetchResponse>();
     this.fetchMock = jest.fn(async (_request: TestRequest): Promise<NodeFetchResponse> => this.upstreamResponse);
 
     const self = {
@@ -246,9 +256,14 @@ class AuthServiceWorkerHarness {
       skipWaiting: async (): Promise<void> => {}
     };
     const cache = {
-      match: async (key: string): Promise<NodeFetchResponse | undefined> => cacheEntries.get(key)?.clone(),
+      match: async (key: string): Promise<NodeFetchResponse | undefined> => {
+        if (this.cacheReadDelayMilliseconds > 0) {
+          await new Promise(resolve => setTimeout(resolve, this.cacheReadDelayMilliseconds));
+        }
+        return this.cacheEntries.get(key)?.clone();
+      },
       put: async (key: string, value: NodeFetchResponse): Promise<void> => {
-        cacheEntries.set(key, value.clone());
+        this.cacheEntries.set(key, value.clone());
       }
     };
     const sandbox = {
@@ -284,6 +299,11 @@ class AuthServiceWorkerHarness {
     this.clientsById.set(clientId, { type: "window", url });
   }
 
+  setPersistentConfig(config: AuthSwConfigEntryDto[], cacheReadDelayMilliseconds: number): void {
+    this.cacheEntries.set("config", new NodeFetchResponse(JSON.stringify(config)));
+    this.cacheReadDelayMilliseconds = cacheReadDelayMilliseconds;
+  }
+
   async dispatchFetch(url: string, options: FetchOptions = {}): Promise<FetchResult> {
     const request = new TestRequest(url, { headers: options.headers as NodeFetchRequestInit["headers"] });
     if (options.navigation === true) {