@schematichq/schematic-react 1.2.12 → 1.2.14

package/dist/schematic-react.cjs.js

@@ -799,7 +799,7 @@ function contextString(context) {
   }, {});
   return JSON.stringify(sortedContext);
 }
-var version = "1.2.12";
+var version = "1.2.14";
 var anonymousIdKey = "schematicId";
 var Schematic = class {
   additionalHeaders = {};
@@ -824,6 +824,9 @@ var Schematic = class {
   webSocketConnectionTimeout = 1e4;
   webSocketReconnect = true;
   webSocketMaxReconnectAttempts = 7;
+  // Max attempts after connection disrupted
+  webSocketMaxConnectionAttempts = 3;
+  // Max attempts for initial connection
   webSocketInitialRetryDelay = 1e3;
   webSocketMaxRetryDelay = 3e4;
   wsReconnectAttempts = 0;
@@ -945,13 +948,17 @@ var Schematic = class {
   /**
    * Resolve fallback value according to priority order:
    * 1. Callsite fallback value (if provided)
-   * 2. Initialization fallback value (flagValueDefaults)
-   * 3. Default to false
+   * 2. Boolean value from flagCheckDefaults initialization option
+   * 3. Boolean value from flagValueDefaults initialization option
+   * 4. Default to false
    */
   resolveFallbackValue(key, callsiteFallback) {
     if (callsiteFallback !== void 0) {
       return callsiteFallback;
     }
+    if (key in this.flagCheckDefaults) {
+      return this.flagCheckDefaults[key].value;
+    }
     if (key in this.flagValueDefaults) {
       return this.flagValueDefaults[key];
     }
@@ -1047,7 +1054,7 @@ var Schematic = class {
         this.submitFlagCheckEvent(key, result, context);
         return result.value;
       }).catch((error) => {
-        console.error("There was a problem with the fetch operation:", error);
+        console.warn("There was a problem with the fetch operation:", error);
         const errorResult = this.resolveFallbackCheckFlagReturn(
           key,
           fallback,
@@ -1070,7 +1077,7 @@ var Schematic = class {
       try {
         await this.setContext(context);
       } catch (error) {
-        console.error(
+        console.warn(
           "WebSocket connection failed, falling back to REST:",
           error
         );
@@ -1213,7 +1220,7 @@ var Schematic = class {
       this.submitFlagCheckEvent(key, result, context);
       return result.value;
     } catch (error) {
-      console.error("REST API call failed, using fallback value:", error);
+      console.warn("REST API call failed, using fallback value:", error);
       const errorResult = this.resolveFallbackCheckFlagReturn(
         key,
         fallback,
@@ -1262,7 +1269,7 @@ var Schematic = class {
         {}
       );
     }).catch((error) => {
-      console.error("There was a problem with the fetch operation:", error);
+      console.warn("There was a problem with the fetch operation:", error);
       return {};
     });
   };
@@ -1279,7 +1286,7 @@ var Schematic = class {
         user: body.keys
       });
     } catch (error) {
-      console.error("Error setting context:", error);
+      console.warn("Error setting context:", error);
     }
     return this.handleEvent("identify", body);
   };
@@ -1337,7 +1344,7 @@ var Schematic = class {
       const socket = await this.conn;
       await this.wsSendMessage(socket, context);
     } catch (error) {
-      console.error("Failed to establish WebSocket connection:", error);
+      console.warn("Failed to establish WebSocket connection:", error);
       throw error;
     }
   };
@@ -1758,7 +1765,7 @@ var Schematic = class {
         }
         socket.close();
       } catch (error) {
-        console.error("Error during cleanup:", error);
+        console.warn("Error during cleanup:", error);
       } finally {
         this.conn = null;
         this.currentWebSocket = null;
@@ -1901,14 +1908,49 @@ var Schematic = class {
       }
     }, delay);
   };
-  // Open a websocket connection
-  wsConnect = () => {
+  // Open a websocket connection with retry logic for timeouts
+  wsConnect = async () => {
     if (this.isOffline()) {
       this.debug("wsConnect: skipped (offline mode)");
-      return Promise.reject(
-        new Error("WebSocket connection skipped in offline mode")
-      );
+      throw new Error("WebSocket connection skipped in offline mode");
+    }
+    let lastError = null;
+    const maxAttempts = this.webSocketMaxConnectionAttempts;
+    for (let attempt = 0; attempt < maxAttempts; attempt++) {
+      try {
+        const socket = await this.wsConnectOnce();
+        this.wsReconnectAttempts = 0;
+        return socket;
+      } catch (error) {
+        lastError = error instanceof Error ? error : new Error(String(error));
+        const isTimeout = lastError.message === "WebSocket connection timeout";
+        if (!isTimeout) {
+          this.debug(
+            `WebSocket connection failed with non-timeout error, not retrying:`,
+            lastError.message
+          );
+          throw lastError;
+        }
+        if (attempt < maxAttempts - 1) {
+          const baseDelay = this.webSocketInitialRetryDelay * Math.pow(2, attempt);
+          const cappedDelay = Math.min(baseDelay, this.webSocketMaxRetryDelay);
+          const jitter = cappedDelay * 0.2 * Math.random();
+          const delay = cappedDelay + jitter;
+          this.debug(
+            `WebSocket connection timeout (attempt ${attempt + 1}/${maxAttempts}), retrying in ${delay.toFixed(0)}ms`
+          );
+          await new Promise((resolve) => setTimeout(resolve, delay));
+        } else {
+          this.debug(
+            `WebSocket connection timeout (attempt ${attempt + 1}/${maxAttempts}), no more retries`
+          );
+        }
+      }
     }
+    throw lastError ?? new Error("WebSocket connection failed");
+  };
+  // Single attempt to open a websocket connection (no retry logic)
+  wsConnectOnce = () => {
     return new Promise((resolve, reject) => {
       const wsUrl = `${this.webSocketUrl}/flags/bootstrap?apiKey=${this.apiKey}`;
       this.debug(`connecting to WebSocket:`, wsUrl);
@@ -1919,6 +1961,7 @@ var Schematic = class {
       let isResolved = false;
       timeoutId = setTimeout(() => {
         if (!isResolved) {
+          isResolved = true;
           this.debug(
             `WebSocket connection timeout after ${this.webSocketConnectionTimeout}ms`
           );
@@ -1927,16 +1970,17 @@ var Schematic = class {
         }
       }, this.webSocketConnectionTimeout);
       webSocket.onopen = () => {
+        if (isResolved) return;
         isResolved = true;
         if (timeoutId !== null) {
           clearTimeout(timeoutId);
         }
-        this.wsReconnectAttempts = 0;
         this.wsIntentionalDisconnect = false;
         this.debug(`WebSocket connection ${connectionId} opened successfully`);
         resolve(webSocket);
       };
       webSocket.onerror = (error) => {
+        if (isResolved) return;
         isResolved = true;
         if (timeoutId !== null) {
           clearTimeout(timeoutId);
@@ -1945,7 +1989,6 @@ var Schematic = class {
         reject(error);
       };
       webSocket.onclose = () => {
-        isResolved = true;
         if (timeoutId !== null) {
           clearTimeout(timeoutId);
         }
@@ -1955,7 +1998,7 @@ var Schematic = class {
           this.currentWebSocket = null;
           this.isConnecting = false;
         }
-        if (!this.wsIntentionalDisconnect && this.webSocketReconnect) {
+        if (!isResolved && !this.wsIntentionalDisconnect && this.webSocketReconnect) {
           this.attemptReconnect();
         }
       };
@@ -2035,12 +2078,31 @@ var Schematic = class {
   getFlagCheck = (flagKey) => {
     const contextStr = contextString(this.context);
     const checks = this.checks[contextStr] ?? {};
-    return checks[flagKey];
+    const check = checks[flagKey];
+    if (check !== void 0) {
+      return check;
+    }
+    if (flagKey in this.flagCheckDefaults || flagKey in this.flagValueDefaults) {
+      return this.resolveFallbackCheckFlagReturn(
+        flagKey,
+        void 0,
+        "Default value used"
+      );
+    }
+    return void 0;
   };
   // flagValues state
   getFlagValue = (flagKey) => {
-    const check = this.getFlagCheck(flagKey);
-    return check?.value;
+    const contextStr = contextString(this.context);
+    const checks = this.checks[contextStr] ?? {};
+    const check = checks[flagKey];
+    if (check?.value !== void 0) {
+      return check.value;
+    }
+    if (flagKey in this.flagCheckDefaults || flagKey in this.flagValueDefaults) {
+      return this.resolveFallbackValue(flagKey);
+    }
+    return void 0;
   };
   /** Register an event listener that will be notified with the boolean value for a given flag when this value changes */
   addFlagValueListener = (flagKey, listener) => {
@@ -2137,7 +2199,7 @@ var notifyFlagValueListener = (listener, value) => {
 var import_react = __toESM(require("react"));
 
 // src/version.ts
-var version2 = "1.2.12";
+var version2 = "1.2.14";
 
 // src/context/schematic.tsx
 var import_jsx_runtime = require("react/jsx-runtime");

package/dist/schematic-react.esm.js

@@ -754,7 +754,7 @@ function contextString(context) {
   }, {});
   return JSON.stringify(sortedContext);
 }
-var version = "1.2.12";
+var version = "1.2.14";
 var anonymousIdKey = "schematicId";
 var Schematic = class {
   additionalHeaders = {};
@@ -779,6 +779,9 @@ var Schematic = class {
   webSocketConnectionTimeout = 1e4;
   webSocketReconnect = true;
   webSocketMaxReconnectAttempts = 7;
+  // Max attempts after connection disrupted
+  webSocketMaxConnectionAttempts = 3;
+  // Max attempts for initial connection
   webSocketInitialRetryDelay = 1e3;
   webSocketMaxRetryDelay = 3e4;
   wsReconnectAttempts = 0;
@@ -900,13 +903,17 @@ var Schematic = class {
   /**
    * Resolve fallback value according to priority order:
    * 1. Callsite fallback value (if provided)
-   * 2. Initialization fallback value (flagValueDefaults)
-   * 3. Default to false
+   * 2. Boolean value from flagCheckDefaults initialization option
+   * 3. Boolean value from flagValueDefaults initialization option
+   * 4. Default to false
    */
   resolveFallbackValue(key, callsiteFallback) {
     if (callsiteFallback !== void 0) {
       return callsiteFallback;
     }
+    if (key in this.flagCheckDefaults) {
+      return this.flagCheckDefaults[key].value;
+    }
     if (key in this.flagValueDefaults) {
       return this.flagValueDefaults[key];
     }
@@ -1002,7 +1009,7 @@ var Schematic = class {
         this.submitFlagCheckEvent(key, result, context);
         return result.value;
       }).catch((error) => {
-        console.error("There was a problem with the fetch operation:", error);
+        console.warn("There was a problem with the fetch operation:", error);
         const errorResult = this.resolveFallbackCheckFlagReturn(
           key,
           fallback,
@@ -1025,7 +1032,7 @@ var Schematic = class {
       try {
         await this.setContext(context);
       } catch (error) {
-        console.error(
+        console.warn(
           "WebSocket connection failed, falling back to REST:",
           error
         );
@@ -1168,7 +1175,7 @@ var Schematic = class {
       this.submitFlagCheckEvent(key, result, context);
       return result.value;
     } catch (error) {
-      console.error("REST API call failed, using fallback value:", error);
+      console.warn("REST API call failed, using fallback value:", error);
       const errorResult = this.resolveFallbackCheckFlagReturn(
         key,
         fallback,
@@ -1217,7 +1224,7 @@ var Schematic = class {
         {}
       );
     }).catch((error) => {
-      console.error("There was a problem with the fetch operation:", error);
+      console.warn("There was a problem with the fetch operation:", error);
       return {};
     });
   };
@@ -1234,7 +1241,7 @@ var Schematic = class {
         user: body.keys
       });
     } catch (error) {
-      console.error("Error setting context:", error);
+      console.warn("Error setting context:", error);
     }
     return this.handleEvent("identify", body);
   };
@@ -1292,7 +1299,7 @@ var Schematic = class {
       const socket = await this.conn;
       await this.wsSendMessage(socket, context);
     } catch (error) {
-      console.error("Failed to establish WebSocket connection:", error);
+      console.warn("Failed to establish WebSocket connection:", error);
       throw error;
     }
   };
@@ -1713,7 +1720,7 @@ var Schematic = class {
         }
         socket.close();
       } catch (error) {
-        console.error("Error during cleanup:", error);
+        console.warn("Error during cleanup:", error);
       } finally {
         this.conn = null;
         this.currentWebSocket = null;
@@ -1856,14 +1863,49 @@ var Schematic = class {
       }
     }, delay);
   };
-  // Open a websocket connection
-  wsConnect = () => {
+  // Open a websocket connection with retry logic for timeouts
+  wsConnect = async () => {
     if (this.isOffline()) {
       this.debug("wsConnect: skipped (offline mode)");
-      return Promise.reject(
-        new Error("WebSocket connection skipped in offline mode")
-      );
+      throw new Error("WebSocket connection skipped in offline mode");
+    }
+    let lastError = null;
+    const maxAttempts = this.webSocketMaxConnectionAttempts;
+    for (let attempt = 0; attempt < maxAttempts; attempt++) {
+      try {
+        const socket = await this.wsConnectOnce();
+        this.wsReconnectAttempts = 0;
+        return socket;
+      } catch (error) {
+        lastError = error instanceof Error ? error : new Error(String(error));
+        const isTimeout = lastError.message === "WebSocket connection timeout";
+        if (!isTimeout) {
+          this.debug(
+            `WebSocket connection failed with non-timeout error, not retrying:`,
+            lastError.message
+          );
+          throw lastError;
+        }
+        if (attempt < maxAttempts - 1) {
+          const baseDelay = this.webSocketInitialRetryDelay * Math.pow(2, attempt);
+          const cappedDelay = Math.min(baseDelay, this.webSocketMaxRetryDelay);
+          const jitter = cappedDelay * 0.2 * Math.random();
+          const delay = cappedDelay + jitter;
+          this.debug(
+            `WebSocket connection timeout (attempt ${attempt + 1}/${maxAttempts}), retrying in ${delay.toFixed(0)}ms`
+          );
+          await new Promise((resolve) => setTimeout(resolve, delay));
+        } else {
+          this.debug(
+            `WebSocket connection timeout (attempt ${attempt + 1}/${maxAttempts}), no more retries`
+          );
+        }
+      }
     }
+    throw lastError ?? new Error("WebSocket connection failed");
+  };
+  // Single attempt to open a websocket connection (no retry logic)
+  wsConnectOnce = () => {
     return new Promise((resolve, reject) => {
       const wsUrl = `${this.webSocketUrl}/flags/bootstrap?apiKey=${this.apiKey}`;
       this.debug(`connecting to WebSocket:`, wsUrl);
@@ -1874,6 +1916,7 @@ var Schematic = class {
       let isResolved = false;
       timeoutId = setTimeout(() => {
         if (!isResolved) {
+          isResolved = true;
           this.debug(
             `WebSocket connection timeout after ${this.webSocketConnectionTimeout}ms`
           );
@@ -1882,16 +1925,17 @@ var Schematic = class {
         }
       }, this.webSocketConnectionTimeout);
       webSocket.onopen = () => {
+        if (isResolved) return;
         isResolved = true;
         if (timeoutId !== null) {
           clearTimeout(timeoutId);
         }
-        this.wsReconnectAttempts = 0;
         this.wsIntentionalDisconnect = false;
         this.debug(`WebSocket connection ${connectionId} opened successfully`);
         resolve(webSocket);
       };
       webSocket.onerror = (error) => {
+        if (isResolved) return;
         isResolved = true;
         if (timeoutId !== null) {
           clearTimeout(timeoutId);
@@ -1900,7 +1944,6 @@ var Schematic = class {
         reject(error);
       };
       webSocket.onclose = () => {
-        isResolved = true;
         if (timeoutId !== null) {
           clearTimeout(timeoutId);
         }
@@ -1910,7 +1953,7 @@ var Schematic = class {
           this.currentWebSocket = null;
           this.isConnecting = false;
         }
-        if (!this.wsIntentionalDisconnect && this.webSocketReconnect) {
+        if (!isResolved && !this.wsIntentionalDisconnect && this.webSocketReconnect) {
           this.attemptReconnect();
         }
       };
@@ -1990,12 +2033,31 @@ var Schematic = class {
   getFlagCheck = (flagKey) => {
     const contextStr = contextString(this.context);
     const checks = this.checks[contextStr] ?? {};
-    return checks[flagKey];
+    const check = checks[flagKey];
+    if (check !== void 0) {
+      return check;
+    }
+    if (flagKey in this.flagCheckDefaults || flagKey in this.flagValueDefaults) {
+      return this.resolveFallbackCheckFlagReturn(
+        flagKey,
+        void 0,
+        "Default value used"
+      );
+    }
+    return void 0;
   };
   // flagValues state
   getFlagValue = (flagKey) => {
-    const check = this.getFlagCheck(flagKey);
-    return check?.value;
+    const contextStr = contextString(this.context);
+    const checks = this.checks[contextStr] ?? {};
+    const check = checks[flagKey];
+    if (check?.value !== void 0) {
+      return check.value;
+    }
+    if (flagKey in this.flagCheckDefaults || flagKey in this.flagValueDefaults) {
+      return this.resolveFallbackValue(flagKey);
+    }
+    return void 0;
   };
   /** Register an event listener that will be notified with the boolean value for a given flag when this value changes */
   addFlagValueListener = (flagKey, listener) => {
@@ -2092,7 +2154,7 @@ var notifyFlagValueListener = (listener, value) => {
 import React, { createContext, useEffect, useMemo, useRef } from "react";
 
 // src/version.ts
-var version2 = "1.2.12";
+var version2 = "1.2.14";
 
 // src/context/schematic.tsx
 import { jsx } from "react/jsx-runtime";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schematichq/schematic-react",
-  "version": "1.2.12",
+  "version": "1.2.14",
   "main": "dist/schematic-react.cjs.js",
   "module": "dist/schematic-react.esm.js",
   "types": "dist/schematic-react.d.ts",
@@ -31,7 +31,7 @@
     "prepare": "husky"
   },
   "dependencies": {
-    "@schematichq/schematic-js": "^1.2.12"
+    "@schematichq/schematic-js": "^1.2.14"
   },
   "devDependencies": {
     "@eslint/js": "^9.39.1",
@@ -50,7 +50,7 @@
     "happy-dom": "^20.0.10",
     "husky": "^9.1.7",
     "jsdom": "^27.2.0",
-    "prettier": "^3.6.2",
+    "prettier": "^3.7.4",
     "react": "^19.2.0",
     "react-dom": "^19.2.0",
     "typescript": "^5.9.3",