@chromahq/react 1.0.16 → 1.0.18

package/dist/index.js

@@ -13,7 +13,10 @@ const CONFIG = {
   MAX_ERROR_CHECKS: 10,
   CONSECUTIVE_FAILURE_THRESHOLD: 2,
   RECONNECT_DELAY: 100,
-  PORT_NAME: "chroma-bridge"
+  PORT_NAME: "chroma-bridge",
+  // Service worker restart retry settings (indefinite retries)
+  SW_RESTART_RETRY_DELAY: 500,
+  SW_RESTART_MAX_DELAY: 5e3
 };
 const calculateBackoffDelay = (attempt, baseDelay, maxDelay) => Math.min(baseDelay * Math.pow(2, attempt - 1), maxDelay);
 const clearTimeoutSafe = (ref) => {
@@ -200,6 +203,8 @@ const BridgeProvider = ({
   const retryCountRef = useRef(0);
   const reconnectTimeoutRef = useRef(null);
   const maxRetryCooldownRef = useRef(null);
+  const triggerReconnectTimeoutRef = useRef(null);
+  const swRestartRetryCountRef = useRef(0);
   const pingIntervalRef = useRef(null);
   const errorCheckIntervalRef = useRef(null);
   const consecutivePingFailuresRef = useRef(0);
@@ -233,6 +238,7 @@ const BridgeProvider = ({
   );
   const cleanup = useCallback(() => {
     clearTimeoutSafe(reconnectTimeoutRef);
+    clearTimeoutSafe(triggerReconnectTimeoutRef);
     clearIntervalSafe(errorCheckIntervalRef);
     clearIntervalSafe(pingIntervalRef);
     if (portRef.current) {
@@ -278,6 +284,7 @@ const BridgeProvider = ({
   }, []);
   const scheduleReconnect = useCallback(
     (connectFn) => {
+      if (!isMountedRef.current) return;
       if (retryCountRef.current < maxRetries) {
         retryCountRef.current++;
         const delay = calculateBackoffDelay(
@@ -287,11 +294,14 @@ const BridgeProvider = ({
         );
         console.log(`[Bridge] Reconnecting in ${delay}ms (${retryCountRef.current}/${maxRetries})`);
         updateStatus("reconnecting");
-        reconnectTimeoutRef.current = setTimeout(connectFn, delay);
+        reconnectTimeoutRef.current = setTimeout(() => {
+          if (isMountedRef.current) connectFn();
+        }, delay);
       } else {
         console.warn(`[Bridge] Max retries reached. Cooldown: ${maxRetryCooldown}ms`);
         clearTimeoutSafe(maxRetryCooldownRef);
         maxRetryCooldownRef.current = setTimeout(() => {
+          if (!isMountedRef.current) return;
           console.log("[Bridge] Cooldown complete, reconnecting...");
           retryCountRef.current = 0;
           connectFn();
@@ -300,6 +310,25 @@ const BridgeProvider = ({
     },
     [maxRetries, retryAfter, maxRetryCooldown, updateStatus]
   );
+  const scheduleSwRestartReconnect = useCallback(
+    (connectFn) => {
+      if (!isMountedRef.current) return;
+      swRestartRetryCountRef.current++;
+      const delay = calculateBackoffDelay(
+        swRestartRetryCountRef.current,
+        CONFIG.SW_RESTART_RETRY_DELAY,
+        CONFIG.SW_RESTART_MAX_DELAY
+      );
+      console.log(
+        `[Bridge] Service worker not ready, retrying in ${delay}ms (attempt ${swRestartRetryCountRef.current})`
+      );
+      updateStatus("reconnecting");
+      reconnectTimeoutRef.current = setTimeout(() => {
+        if (isMountedRef.current) connectFn();
+      }, delay);
+    },
+    [updateStatus]
+  );
   const connect = useCallback(() => {
     if (isConnectingRef.current) return;
     if (retryCountRef.current >= maxRetries) {
@@ -325,10 +354,10 @@ const BridgeProvider = ({
         if (err) {
           clearIntervalSafe(errorCheckIntervalRef);
           if (err.includes("Receiving end does not exist")) {
-            console.warn("[Bridge] Background not ready, retrying...");
+            console.warn("[Bridge] Service worker not ready (may be restarting)...");
             cleanup();
             isConnectingRef.current = false;
-            scheduleReconnect(connect);
+            scheduleSwRestartReconnect(connect);
           }
           return;
         }
@@ -347,14 +376,19 @@ const BridgeProvider = ({
           updateStatus("disconnected");
         }
         cleanup();
-        scheduleReconnect(connect);
+        if (isMountedRef.current) {
+          scheduleReconnect(connect);
+        }
       });
       const triggerReconnect = () => {
+        if (!isMountedRef.current) return;
         setIsServiceWorkerAlive(false);
         updateStatus("reconnecting");
         retryCountRef.current = 0;
         isConnectingRef.current = false;
-        setTimeout(() => {
+        clearTimeoutSafe(triggerReconnectTimeoutRef);
+        triggerReconnectTimeoutRef.current = setTimeout(() => {
+          if (!isMountedRef.current) return;
           cleanup();
           connect();
         }, CONFIG.RECONNECT_DELAY);
@@ -375,6 +409,7 @@ const BridgeProvider = ({
       setIsServiceWorkerAlive(true);
       setError(null);
       retryCountRef.current = 0;
+      swRestartRetryCountRef.current = 0;
       consecutiveTimeoutsRef.current = 0;
       isConnectingRef.current = false;
       startHealthMonitor({
@@ -396,6 +431,7 @@ const BridgeProvider = ({
     handleError,
     handleMessage,
     scheduleReconnect,
+    scheduleSwRestartReconnect,
     defaultTimeout,
     updateStatus,
     pingInterval

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chromahq/react",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "description": "React bindings for the Chroma Chrome extension framework",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",