@atsignal/browser 0.1.1 → 0.1.2

package/dist/index.cjs

@@ -166,7 +166,7 @@ var SignalBrowserClient = class extends import_js_core2.SignalClient {
     const queueStorage = options.persistQueue === false ? void 0 : (_c = options.storage) == null ? void 0 : _c.queue;
     return {
       ...options,
-      transport: (_d = options.transport) != null ? _d : (0, import_js_core2.createFetchTransport)({ keepalive: true }),
+      transportFactory: (_d = options.transportFactory) != null ? _d : (0, import_js_core2.createFetchTransport)({ keepalive: true }),
       storage: {
         identity: identityStorage,
         ...queueStorage !== void 0 ? { queue: queueStorage } : {}

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { ClientPlugin, KeyValueStorage, SignalClient, ClientConfig, Transport, QueueStorageInput } from '@atsignal/js-core';
+import { ClientPlugin, KeyValueStorage, SignalClient, ClientConfig, QueueStorageInput } from '@atsignal/js-core';
 export { ClientPlugin } from '@atsignal/js-core';
 
 type BrowserPluginFactory = (...args: unknown[]) => ClientPlugin;
@@ -28,7 +28,6 @@ declare class BrowserLocalStorage implements KeyValueStorage {
 }
 
 interface SignalBrowserOptions extends Omit<ClientConfig, "storage"> {
-    transport?: Transport;
     storage?: {
         identity?: KeyValueStorage;
         queue?: QueueStorageInput;

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { ClientPlugin, KeyValueStorage, SignalClient, ClientConfig, Transport, QueueStorageInput } from '@atsignal/js-core';
+import { ClientPlugin, KeyValueStorage, SignalClient, ClientConfig, QueueStorageInput } from '@atsignal/js-core';
 export { ClientPlugin } from '@atsignal/js-core';
 
 type BrowserPluginFactory = (...args: unknown[]) => ClientPlugin;
@@ -28,7 +28,6 @@ declare class BrowserLocalStorage implements KeyValueStorage {
 }
 
 interface SignalBrowserOptions extends Omit<ClientConfig, "storage"> {
-    transport?: Transport;
     storage?: {
         identity?: KeyValueStorage;
         queue?: QueueStorageInput;

package/dist/index.js

@@ -140,7 +140,7 @@ var SignalBrowserClient = class extends SignalClient {
     const queueStorage = options.persistQueue === false ? void 0 : (_c = options.storage) == null ? void 0 : _c.queue;
     return {
       ...options,
-      transport: (_d = options.transport) != null ? _d : createFetchTransport({ keepalive: true }),
+      transportFactory: (_d = options.transportFactory) != null ? _d : createFetchTransport({ keepalive: true }),
       storage: {
         identity: identityStorage,
         ...queueStorage !== void 0 ? { queue: queueStorage } : {}

package/dist/signal.global.js

@@ -157,22 +157,16 @@ var __signalBundle = (() => {
       return normalizePersistedQueueEntries(stored);
     }
   };
-  function resolveTimerApi() {
-    const maybeSetTimeout = globalThis.setTimeout;
-    const maybeClearTimeout = globalThis.clearTimeout;
+  function resolveTimerApi(timerApi) {
+    const timers = timerApi != null ? timerApi : globalThis;
+    const maybeSetTimeout = timers == null ? void 0 : timers.setTimeout;
+    const maybeClearTimeout = timers == null ? void 0 : timers.clearTimeout;
     if (typeof maybeSetTimeout !== "function" || typeof maybeClearTimeout !== "function") {
       return null;
     }
-    return {
-      setTimeout: maybeSetTimeout,
-      clearTimeout: maybeClearTimeout
-    };
+    return timers;
   }
-  function scheduleTask(callback, delayMs) {
-    const timers = resolveTimerApi();
-    if (!timers) {
-      return null;
-    }
+  function scheduleTask(callback, delayMs, timers) {
     const handle = timers.setTimeout(callback, delayMs);
     return {
       cancel: () => {
@@ -180,14 +174,10 @@ var __signalBundle = (() => {
       }
     };
   }
-  function createTimeoutController(timeoutMs, createTimeoutValue) {
+  function createTimeoutController(timeoutMs, createTimeoutValue, timers) {
     if (typeof timeoutMs !== "number" || timeoutMs <= 0) {
       return null;
     }
-    const timers = resolveTimerApi();
-    if (!timers) {
-      return null;
-    }
     let handle;
     const timeout = new Promise((resolve) => {
       handle = timers.setTimeout(() => resolve(createTimeoutValue()), timeoutMs);
@@ -231,7 +221,7 @@ var __signalBundle = (() => {
     return parts.join("&");
   }
   var FetchTransport = class {
-    constructor(options = {}) {
+    constructor(timers, options = {}) {
       var _a, _b, _c;
       const fetchImpl = (_a = options.fetch) != null ? _a : resolveGlobalFetch();
       if (!fetchImpl) {
@@ -240,14 +230,19 @@ var __signalBundle = (() => {
       this._fetch = fetchImpl;
       this._keepalive = (_b = options.keepalive) != null ? _b : false;
       this._headers = (_c = options.headers) != null ? _c : {};
+      this._timers = timers;
     }
     async send(request) {
-      const timer = createTimeoutController(request.timeoutMs, () => ({
-        ok: false,
-        retryable: true,
-        status: 0,
-        error: new Error("Request timed out")
-      }));
+      const timer = createTimeoutController(
+        request.timeoutMs,
+        () => ({
+          ok: false,
+          retryable: true,
+          status: 0,
+          error: new Error("Request timed out")
+        }),
+        this._timers
+      );
       const requestPromise = this._fetch(request.endpoint, {
         method: "POST",
         headers: {
@@ -283,7 +278,7 @@ var __signalBundle = (() => {
     }
   };
   function createFetchTransport(options = {}) {
-    return new FetchTransport(options);
+    return (runtime) => new FetchTransport(runtime.timers, options);
   }
   var DEFAULT_ENDPOINT = "https://api.example.com/track";
   var DEFAULT_FLUSH_INTERVAL_MS = 1e3;
@@ -390,7 +385,16 @@ var __signalBundle = (() => {
     }
     return new SnapshotQueueStorage(storage, QUEUE_STORAGE_KEY);
   }
-  function normalizeConfig(apiKey, config) {
+  function resolveRuntime(runtime) {
+    const timers = resolveTimerApi(runtime == null ? void 0 : runtime.timers);
+    if (!timers) {
+      throw new Error("Signal client requires a timer implementation");
+    }
+    return {
+      timers
+    };
+  }
+  function normalizeConfig(apiKey, config, runtime) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     if (!apiKey) {
       throw new Error("Signal client requires apiKey");
@@ -400,18 +404,19 @@ var __signalBundle = (() => {
       userId: resolveInitialUserId(config.userId),
       deviceId: resolveInitialDeviceId(config.deviceId)
     };
+    const transportFactory = (_b = config.transportFactory) != null ? _b : createFetchTransport();
     return {
       apiKey,
       resolvedConfig: {
-        endpoint: (_b = config.endpoint) != null ? _b : DEFAULT_ENDPOINT,
+        endpoint: (_c = config.endpoint) != null ? _c : DEFAULT_ENDPOINT,
         flushIntervalMs: toInteger(config.flushIntervalMs, DEFAULT_FLUSH_INTERVAL_MS),
         maxBatchSize: toInteger(config.maxBatchSize, DEFAULT_MAX_BATCH_SIZE),
         maxQueueSize: toInteger(config.maxQueueSize, DEFAULT_MAX_QUEUE_SIZE),
         retry: {
-          baseMs: toInteger((_c = config.retry) == null ? void 0 : _c.baseMs, DEFAULT_RETRY_BASE_MS),
-          maxMs: toInteger((_d = config.retry) == null ? void 0 : _d.maxMs, DEFAULT_RETRY_MAX_MS),
-          maxAttempts: toInteger((_e = config.retry) == null ? void 0 : _e.maxAttempts, DEFAULT_RETRY_ATTEMPTS),
-          jitter: typeof ((_f = config.retry) == null ? void 0 : _f.jitter) === "number" ? config.retry.jitter : DEFAULT_RETRY_JITTER
+          baseMs: toInteger((_d = config.retry) == null ? void 0 : _d.baseMs, DEFAULT_RETRY_BASE_MS),
+          maxMs: toInteger((_e = config.retry) == null ? void 0 : _e.maxMs, DEFAULT_RETRY_MAX_MS),
+          maxAttempts: toInteger((_f = config.retry) == null ? void 0 : _f.maxAttempts, DEFAULT_RETRY_ATTEMPTS),
+          jitter: typeof ((_g = config.retry) == null ? void 0 : _g.jitter) === "number" ? config.retry.jitter : DEFAULT_RETRY_JITTER
         },
         persistQueue,
         locationFromIp: resolveLocationFromIp(config.locationFromIp),
@@ -421,10 +426,10 @@ var __signalBundle = (() => {
         blockedProperties: resolveBlockedProperties(config.blockedProperties)
       },
       storage: {
-        identity: createIdentityStorage((_g = config.storage) == null ? void 0 : _g.identity),
-        queue: persistQueue ? createQueueStorage((_h = config.storage) == null ? void 0 : _h.queue) : NOOP_QUEUE_STORAGE
+        identity: createIdentityStorage((_h = config.storage) == null ? void 0 : _h.identity),
+        queue: persistQueue ? createQueueStorage((_i = config.storage) == null ? void 0 : _i.queue) : NOOP_QUEUE_STORAGE
       },
-      transport: (_i = config.transport) != null ? _i : createFetchTransport(),
+      transport: transportFactory(runtime),
       plugins: (_j = config.plugins) != null ? _j : [],
       initialIdentityOverrides
     };
@@ -934,7 +939,10 @@ var __signalBundle = (() => {
       }
       this._state = "initializing";
       try {
-        const normalized = normalizeConfig(apiKey, this.resolveInitConfig(options));
+        const initConfig = this.resolveInitConfig(options);
+        const runtime = resolveRuntime(initConfig.runtime);
+        const normalized = normalizeConfig(apiKey, initConfig, runtime);
+        this._runtime = runtime;
         this._applyNormalizedConfig(normalized);
         this._ready = this._initialize(normalized.initialIdentityOverrides);
         await this._ready;
@@ -1603,13 +1611,13 @@ var __signalBundle = (() => {
         enqueueAutomaticFlush();
         return;
       }
-      const task = scheduleTask(() => {
-        enqueueAutomaticFlush();
-      }, delayMs);
-      if (!task) {
-        enqueueAutomaticFlush();
-        return;
-      }
+      const task = scheduleTask(
+        () => {
+          enqueueAutomaticFlush();
+        },
+        delayMs,
+        this._runtime.timers
+      );
       this._flushTask = task;
     }
     async _performFlush(reason) {
@@ -2029,7 +2037,7 @@ var __signalBundle = (() => {
       const queueStorage = options.persistQueue === false ? void 0 : (_c = options.storage) == null ? void 0 : _c.queue;
       return {
         ...options,
-        transport: (_d = options.transport) != null ? _d : createFetchTransport({ keepalive: true }),
+        transportFactory: (_d = options.transportFactory) != null ? _d : createFetchTransport({ keepalive: true }),
         storage: {
           identity: identityStorage,
           ...queueStorage !== void 0 ? { queue: queueStorage } : {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atsignal/browser",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Browser SDK for Signal.",
   "license": "MIT",
   "type": "module",
@@ -27,7 +27,7 @@
     "dist"
   ],
   "dependencies": {
-    "@atsignal/js-core": "0.1.1"
+    "@atsignal/js-core": "0.1.2"
   },
   "publishConfig": {
     "access": "public",