@statsig/client-core 3.25.5 → 3.26.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@statsig/client-core",
-  "version": "3.25.5",
+  "version": "3.26.0",
   "license": "ISC",
   "homepage": "https://github.com/statsig-io/js-client-monorepo",
   "repository": {

package/src/NetworkCore.js

@@ -108,10 +108,7 @@ class NetworkCore {
                 return null;
             }
             const currentAttempt = attempt !== null && attempt !== void 0 ? attempt : 1;
-            const abortController = typeof AbortController !== 'undefined' ? new AbortController() : null;
-            const timeoutHandle = setTimeout(() => {
-                abortController === null || abortController === void 0 ? void 0 : abortController.abort(`Timeout of ${this._timeout}ms expired.`);
-            }, this._timeout);
+            let reqTimedOut = false;
             const populatedUrl = this._getPopulatedURL(args);
             let response = null;
             const keepalive = (0, VisibilityObserving_1._isUnloading)();
@@ -120,7 +117,6 @@ class NetworkCore {
                     method,
                     body,
                     headers: Object.assign({}, args.headers),
-                    signal: abortController === null || abortController === void 0 ? void 0 : abortController.signal,
                     priority: args.priority,
                     keepalive,
                 };
@@ -131,8 +127,16 @@ class NetworkCore {
                     this._leakyBucket[endpoint] = bucket;
                 }
                 const func = (_a = this._netConfig.networkOverrideFunc) !== null && _a !== void 0 ? _a : fetch;
-                response = yield func(populatedUrl, config);
-                clearTimeout(timeoutHandle);
+                let timeoutId;
+                response = yield Promise.race([
+                    func(populatedUrl, config).finally(() => clearTimeout(timeoutId)),
+                    new Promise((_, reject) => {
+                        timeoutId = setTimeout(() => {
+                            reqTimedOut = true;
+                            reject(new Error(`Timeout of ${this._timeout}ms expired.`));
+                        }, this._timeout);
+                    }),
+                ]);
                 if (!response.ok) {
                     const text = yield response.text().catch(() => 'No Text');
                     const err = new Error(`NetworkError: ${populatedUrl} ${text}`);
@@ -148,8 +152,8 @@ class NetworkCore {
                 };
             }
             catch (error) {
-                const errorMessage = _getErrorMessage(abortController, error);
-                const timedOut = _didTimeout(abortController);
+                const errorMessage = _getErrorMessage(error);
+                const timedOut = _didTimeout(errorMessage !== null && errorMessage !== void 0 ? errorMessage : '', reqTimedOut);
                 _tryMarkInitEnd(args, response, currentAttempt, '', error);
                 const fallbackUpdated = yield this._fallbackResolver.tryFetchUpdatedFallbackInfo(args.sdkKey, args.urlConfig, errorMessage, timedOut);
                 if (fallbackUpdated) {
@@ -328,11 +332,7 @@ function _allowCompression(args, options) {
             return false;
     }
 }
-function _getErrorMessage(controller, error) {
-    if ((controller === null || controller === void 0 ? void 0 : controller.signal.aborted) &&
-        typeof controller.signal.reason === 'string') {
-        return controller.signal.reason;
-    }
+function _getErrorMessage(error) {
     if (typeof error === 'string') {
         return error;
     }
@@ -341,11 +341,9 @@ function _getErrorMessage(controller, error) {
     }
     return 'Unknown Error';
 }
-function _didTimeout(controller) {
-    const timeout = (controller === null || controller === void 0 ? void 0 : controller.signal.aborted) &&
-        typeof controller.signal.reason === 'string' &&
-        controller.signal.reason.includes('Timeout');
-    return timeout || false;
+function _didTimeout(errorMsg, abortedByTimeout) {
+    const timeout = errorMsg.includes('Timeout'); // probably not needed but just in case
+    return timeout || abortedByTimeout;
 }
 function _tryMarkInitStart(args, attempt) {
     if (args.urlConfig.endpoint !== NetworkConfig_1.Endpoint._initialize) {

package/src/StatsigMetadata.d.ts

@@ -1,4 +1,4 @@
-export declare const SDK_VERSION = "3.25.5";
+export declare const SDK_VERSION = "3.26.0";
 export type StatsigMetadata = {
     readonly [key: string]: string | undefined | null;
     readonly appVersion?: string;

package/src/StatsigMetadata.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StatsigMetadataProvider = exports.SDK_VERSION = void 0;
-exports.SDK_VERSION = '3.25.5';
+exports.SDK_VERSION = '3.26.0';
 let metadata = {
     sdkVersion: exports.SDK_VERSION,
     sdkType: 'js-mono', // js-mono is overwritten by Precomp and OnDevice clients