coaction 1.0.1 → 1.2.0

package/dist/index.js

@@ -80,23 +80,54 @@ var createAsyncClientStore = (createStore, asyncStoreClientOption) => {
     throw new Error("transport is required");
   }
   asyncClientStore.transport = transport;
+  let syncingPromise = null;
   const fullSync = async () => {
-    const latest = await transport.emit("fullSync");
-    asyncClientStore.apply(JSON.parse(latest.state));
-    internal.sequence = latest.sequence;
+    if (!syncingPromise) {
+      syncingPromise = (async () => {
+        const latest = await transport.emit("fullSync");
+        if (typeof latest.sequence !== "number" || typeof latest.state !== "string") {
+          throw new Error("Invalid fullSync payload");
+        }
+        if (latest.sequence < internal.sequence) {
+          return;
+        }
+        asyncClientStore.apply(JSON.parse(latest.state));
+        internal.sequence = latest.sequence;
+      })().finally(() => {
+        syncingPromise = null;
+      });
+    }
+    return syncingPromise;
   };
   if (typeof transport.onConnect !== "function") {
     throw new Error("transport.onConnect is required");
   }
-  transport.onConnect?.(async () => {
-    await fullSync();
+  transport.onConnect?.(() => {
+    void fullSync().catch((error) => {
+      if (process.env.NODE_ENV === "development") {
+        console.error(error);
+      }
+    });
   });
   transport.listen("update", async (options) => {
-    if (typeof options.sequence === "number" && options.sequence === internal.sequence + 1) {
-      internal.sequence = options.sequence;
-      asyncClientStore.apply(void 0, options.patches);
-    } else {
-      await fullSync();
+    try {
+      if (typeof options.sequence !== "number") {
+        await fullSync();
+        return;
+      }
+      if (options.sequence <= internal.sequence) {
+        return;
+      }
+      if (options.sequence === internal.sequence + 1) {
+        internal.sequence = options.sequence;
+        asyncClientStore.apply(void 0, options.patches);
+      } else {
+        await fullSync();
+      }
+    } catch (error) {
+      if (process.env.NODE_ENV === "development") {
+        console.error(error);
+      }
     }
   });
   return wrapStore(asyncClientStore, () => asyncClientStore.getState());
@@ -131,6 +162,7 @@ var isObject = (value) => typeof value === "object" && value !== null;
 var isStateFactory = (value) => typeof value === "function";
 var hasGetState = (value) => (typeof value === "object" || typeof value === "function") && value !== null && typeof value.getState === "function";
 var hasBindState = (value) => isObject(value) && !!value[bindSymbol];
+var formatInvalidStateMessage = (type, stateOrFn, key) => `Invalid state ${type} encountered in makeState: ${key ? `for key ${key}, ` : ""}${typeof stateOrFn}`;
 var getInitialState = (store, createState, internal) => {
   const makeState = (stateOrFn, key) => {
     let state;
@@ -140,9 +172,7 @@ var getInitialState = (store, createState, internal) => {
       state = stateOrFn;
     } else {
       if (process.env.NODE_ENV !== "production") {
-        throw new Error(
-          `Invalid state value encountered in makeState: ${key ? `for key ${key}, ` : ""}${typeof stateOrFn}`
-        );
+        throw new Error(formatInvalidStateMessage("value", stateOrFn, key));
       }
       return {};
     }
@@ -169,6 +199,12 @@ var getInitialState = (store, createState, internal) => {
       delete state[bindSymbol];
       return rawState;
     }
+    if (!isObject(state)) {
+      if (process.env.NODE_ENV !== "production") {
+        throw new Error(formatInvalidStateMessage("result", state, key));
+      }
+      return {};
+    }
     return state;
   };
   return store.isSliceStore ? Object.entries(createState).reduce(
@@ -204,9 +240,14 @@ var areShallowEqualWithArray = (prev, next) => {
 var mergeObject = (target, source, isSlice) => {
   if (isSlice) {
     if (typeof source === "object" && source !== null) {
-      for (const key in source) {
-        if (typeof source[key] === "object" && source[key] !== null) {
-          Object.assign(target[key], source[key]);
+      for (const key of Object.keys(source)) {
+        const sourceValue = source[key];
+        if (typeof sourceValue !== "object" || sourceValue === null) {
+          continue;
+        }
+        const targetValue = target[key];
+        if (typeof targetValue === "object" && targetValue !== null) {
+          Object.assign(targetValue, sourceValue);
         }
       }
     }
@@ -259,6 +300,21 @@ var createSelectorCreatorWithArray = (memoize = defaultMemoize) => {
 var createSelectorWithArray = createSelectorCreatorWithArray();
 
 // src/getRawState.ts
+var clientExecuteSyncTimeoutMs = 1500;
+var transportErrorMarker = "__coactionTransportError__";
+var isTransportErrorEnvelope = (value) => {
+  if (typeof value !== "object" || value === null) {
+    return false;
+  }
+  return value[transportErrorMarker] === true && typeof value.message === "string";
+};
+var isLegacyTransportErrorEnvelope = (value) => {
+  if (typeof value !== "object" || value === null) {
+    return false;
+  }
+  const candidate = value;
+  return typeof candidate.$$Error === "string" && candidate.$$Error.length > 0 && Object.keys(candidate).length === 1;
+};
 var getRawState = (store, internal, initialState, options) => {
   const rawState = {};
   const handle = (_rawState, _initialState, sliceKey) => {
@@ -337,31 +393,78 @@ var getRawState = (store, internal, initialState, options) => {
               };
             }
             const keys = sliceKey ? [sliceKey, key] : [key];
-            return store.transport.emit("execute", keys, args).then(([result, sequence]) => {
-              if (internal.sequence >= sequence) {
-                if (result?.$$Error) {
-                  done?.(result);
-                  throw new Error(result.$$Error);
+            return store.transport.emit("execute", keys, args).then(async (response) => {
+              const result = Array.isArray(response) ? response[0] : response;
+              const sequence = Array.isArray(response) ? typeof response[1] === "number" ? response[1] : internal.sequence : internal.sequence;
+              if (internal.sequence < sequence) {
+                if (process.env.NODE_ENV === "development") {
+                  console.warn(
+                    `The sequence of the action is not consistent.`,
+                    sequence,
+                    internal.sequence
+                  );
                 }
+                await new Promise((resolve, reject) => {
+                  let settled = false;
+                  let unsubscribe = () => {
+                  };
+                  let timeoutId;
+                  const cleanup = () => {
+                    unsubscribe();
+                    if (typeof timeoutId !== "undefined") {
+                      clearTimeout(timeoutId);
+                    }
+                  };
+                  const finishResolve = () => {
+                    if (settled) return;
+                    settled = true;
+                    cleanup();
+                    resolve();
+                  };
+                  const finishReject = (error) => {
+                    if (settled) return;
+                    settled = true;
+                    cleanup();
+                    reject(error);
+                  };
+                  unsubscribe = store.subscribe(() => {
+                    if (internal.sequence >= sequence) {
+                      finishResolve();
+                    }
+                  });
+                  timeoutId = setTimeout(() => {
+                    void store.transport.emit("fullSync").then((latest) => {
+                      const next = latest;
+                      if (typeof next.state !== "string" || typeof next.sequence !== "number") {
+                        throw new Error("Invalid fullSync payload");
+                      }
+                      store.apply(JSON.parse(next.state));
+                      internal.sequence = next.sequence;
+                      if (internal.sequence >= sequence) {
+                        finishResolve();
+                        return;
+                      }
+                      finishReject(
+                        new Error(
+                          `Stale fullSync sequence: expected >= ${sequence}, got ${internal.sequence}`
+                        )
+                      );
+                    }).catch((error) => {
+                      finishReject(error);
+                    });
+                  }, clientExecuteSyncTimeoutMs);
+                });
+              }
+              if (isTransportErrorEnvelope(result)) {
                 done?.(result);
-                return result;
+                throw new Error(result.message);
               }
-              if (process.env.NODE_ENV === "development") {
-                console.warn(
-                  `The sequence of the action is not consistent.`,
-                  sequence,
-                  internal.sequence
-                );
+              if (isLegacyTransportErrorEnvelope(result)) {
+                done?.(result);
+                throw new Error(result.$$Error);
               }
-              return new Promise((resolve) => {
-                const unsubscribe = store.subscribe(() => {
-                  if (internal.sequence >= sequence) {
-                    unsubscribe();
-                    done?.(result);
-                    resolve(result);
-                  }
-                });
-              });
+              done?.(result);
+              return result;
             });
           };
         } else {
@@ -525,7 +628,11 @@ var handleState = (store, internal, options) => {
         }
       }
     }
-    return [internal.rootState, patches, inversePatches];
+    return [
+      internal.rootState,
+      finalPatches.patches,
+      finalPatches.inversePatches
+    ];
   }) => {
     if (store.share === "client") {
       throw new Error(
@@ -634,6 +741,7 @@ var getErrorMessage = (error) => {
   }
   return String(error);
 };
+var transportErrorMarker2 = "__coactionTransportError__";
 var handleMainTransport = (store, internal, storeTransport, workerType, checkEnablePatches) => {
   const transport = storeTransport ?? (workerType === "SharedWorkerInternal" || workerType === "WebWorkerInternal" ? (0, import_data_transport2.createTransport)(workerType, {
     prefix: store.name
@@ -659,12 +767,19 @@ var handleMainTransport = (store, internal, storeTransport, workerType, checkEna
       if (typeof base !== "function") {
         throw new Error("The function is not found");
       }
-      return [base(...args), internal.sequence];
+      const result = await base(...args);
+      return [result, internal.sequence];
     } catch (error) {
       if (process.env.NODE_ENV === "development") {
         console.error(error);
       }
-      return [{ $$Error: getErrorMessage(error) }, internal.sequence];
+      return [
+        {
+          [transportErrorMarker2]: true,
+          message: getErrorMessage(error)
+        },
+        internal.sequence
+      ];
     }
   });
   transport.listen("fullSync", async () => {
@@ -696,7 +811,7 @@ var create = (createState, options = {}) => {
       listeners: /* @__PURE__ */ new Set()
     };
     const name = options.name ?? defaultName;
-    const shouldTrackName = process.env.NODE_ENV === "development" && share2 === "main";
+    const shouldTrackName = share2 === "main" && process.env.NODE_ENV !== "test";
     const releaseStoreName = () => {
       if (shouldTrackName) {
         namespaceMap.delete(name);

package/dist/index.mjs

@@ -52,23 +52,54 @@ var createAsyncClientStore = (createStore, asyncStoreClientOption) => {
     throw new Error("transport is required");
   }
   asyncClientStore.transport = transport;
+  let syncingPromise = null;
   const fullSync = async () => {
-    const latest = await transport.emit("fullSync");
-    asyncClientStore.apply(JSON.parse(latest.state));
-    internal.sequence = latest.sequence;
+    if (!syncingPromise) {
+      syncingPromise = (async () => {
+        const latest = await transport.emit("fullSync");
+        if (typeof latest.sequence !== "number" || typeof latest.state !== "string") {
+          throw new Error("Invalid fullSync payload");
+        }
+        if (latest.sequence < internal.sequence) {
+          return;
+        }
+        asyncClientStore.apply(JSON.parse(latest.state));
+        internal.sequence = latest.sequence;
+      })().finally(() => {
+        syncingPromise = null;
+      });
+    }
+    return syncingPromise;
   };
   if (typeof transport.onConnect !== "function") {
     throw new Error("transport.onConnect is required");
   }
-  transport.onConnect?.(async () => {
-    await fullSync();
+  transport.onConnect?.(() => {
+    void fullSync().catch((error) => {
+      if (process.env.NODE_ENV === "development") {
+        console.error(error);
+      }
+    });
   });
   transport.listen("update", async (options) => {
-    if (typeof options.sequence === "number" && options.sequence === internal.sequence + 1) {
-      internal.sequence = options.sequence;
-      asyncClientStore.apply(void 0, options.patches);
-    } else {
-      await fullSync();
+    try {
+      if (typeof options.sequence !== "number") {
+        await fullSync();
+        return;
+      }
+      if (options.sequence <= internal.sequence) {
+        return;
+      }
+      if (options.sequence === internal.sequence + 1) {
+        internal.sequence = options.sequence;
+        asyncClientStore.apply(void 0, options.patches);
+      } else {
+        await fullSync();
+      }
+    } catch (error) {
+      if (process.env.NODE_ENV === "development") {
+        console.error(error);
+      }
     }
   });
   return wrapStore(asyncClientStore, () => asyncClientStore.getState());
@@ -103,6 +134,7 @@ var isObject = (value) => typeof value === "object" && value !== null;
 var isStateFactory = (value) => typeof value === "function";
 var hasGetState = (value) => (typeof value === "object" || typeof value === "function") && value !== null && typeof value.getState === "function";
 var hasBindState = (value) => isObject(value) && !!value[bindSymbol];
+var formatInvalidStateMessage = (type, stateOrFn, key) => `Invalid state ${type} encountered in makeState: ${key ? `for key ${key}, ` : ""}${typeof stateOrFn}`;
 var getInitialState = (store, createState, internal) => {
   const makeState = (stateOrFn, key) => {
     let state;
@@ -112,9 +144,7 @@ var getInitialState = (store, createState, internal) => {
       state = stateOrFn;
     } else {
       if (process.env.NODE_ENV !== "production") {
-        throw new Error(
-          `Invalid state value encountered in makeState: ${key ? `for key ${key}, ` : ""}${typeof stateOrFn}`
-        );
+        throw new Error(formatInvalidStateMessage("value", stateOrFn, key));
       }
       return {};
     }
@@ -141,6 +171,12 @@ var getInitialState = (store, createState, internal) => {
       delete state[bindSymbol];
       return rawState;
     }
+    if (!isObject(state)) {
+      if (process.env.NODE_ENV !== "production") {
+        throw new Error(formatInvalidStateMessage("result", state, key));
+      }
+      return {};
+    }
     return state;
   };
   return store.isSliceStore ? Object.entries(createState).reduce(
@@ -179,9 +215,14 @@ var areShallowEqualWithArray = (prev, next) => {
 var mergeObject = (target, source, isSlice) => {
   if (isSlice) {
     if (typeof source === "object" && source !== null) {
-      for (const key in source) {
-        if (typeof source[key] === "object" && source[key] !== null) {
-          Object.assign(target[key], source[key]);
+      for (const key of Object.keys(source)) {
+        const sourceValue = source[key];
+        if (typeof sourceValue !== "object" || sourceValue === null) {
+          continue;
+        }
+        const targetValue = target[key];
+        if (typeof targetValue === "object" && targetValue !== null) {
+          Object.assign(targetValue, sourceValue);
         }
       }
     }
@@ -234,6 +275,21 @@ var createSelectorCreatorWithArray = (memoize = defaultMemoize) => {
 var createSelectorWithArray = createSelectorCreatorWithArray();
 
 // src/getRawState.ts
+var clientExecuteSyncTimeoutMs = 1500;
+var transportErrorMarker = "__coactionTransportError__";
+var isTransportErrorEnvelope = (value) => {
+  if (typeof value !== "object" || value === null) {
+    return false;
+  }
+  return value[transportErrorMarker] === true && typeof value.message === "string";
+};
+var isLegacyTransportErrorEnvelope = (value) => {
+  if (typeof value !== "object" || value === null) {
+    return false;
+  }
+  const candidate = value;
+  return typeof candidate.$$Error === "string" && candidate.$$Error.length > 0 && Object.keys(candidate).length === 1;
+};
 var getRawState = (store, internal, initialState, options) => {
   const rawState = {};
   const handle = (_rawState, _initialState, sliceKey) => {
@@ -312,31 +368,78 @@ var getRawState = (store, internal, initialState, options) => {
               };
             }
             const keys = sliceKey ? [sliceKey, key] : [key];
-            return store.transport.emit("execute", keys, args).then(([result, sequence]) => {
-              if (internal.sequence >= sequence) {
-                if (result?.$$Error) {
-                  done?.(result);
-                  throw new Error(result.$$Error);
+            return store.transport.emit("execute", keys, args).then(async (response) => {
+              const result = Array.isArray(response) ? response[0] : response;
+              const sequence = Array.isArray(response) ? typeof response[1] === "number" ? response[1] : internal.sequence : internal.sequence;
+              if (internal.sequence < sequence) {
+                if (process.env.NODE_ENV === "development") {
+                  console.warn(
+                    `The sequence of the action is not consistent.`,
+                    sequence,
+                    internal.sequence
+                  );
                 }
+                await new Promise((resolve, reject) => {
+                  let settled = false;
+                  let unsubscribe = () => {
+                  };
+                  let timeoutId;
+                  const cleanup = () => {
+                    unsubscribe();
+                    if (typeof timeoutId !== "undefined") {
+                      clearTimeout(timeoutId);
+                    }
+                  };
+                  const finishResolve = () => {
+                    if (settled) return;
+                    settled = true;
+                    cleanup();
+                    resolve();
+                  };
+                  const finishReject = (error) => {
+                    if (settled) return;
+                    settled = true;
+                    cleanup();
+                    reject(error);
+                  };
+                  unsubscribe = store.subscribe(() => {
+                    if (internal.sequence >= sequence) {
+                      finishResolve();
+                    }
+                  });
+                  timeoutId = setTimeout(() => {
+                    void store.transport.emit("fullSync").then((latest) => {
+                      const next = latest;
+                      if (typeof next.state !== "string" || typeof next.sequence !== "number") {
+                        throw new Error("Invalid fullSync payload");
+                      }
+                      store.apply(JSON.parse(next.state));
+                      internal.sequence = next.sequence;
+                      if (internal.sequence >= sequence) {
+                        finishResolve();
+                        return;
+                      }
+                      finishReject(
+                        new Error(
+                          `Stale fullSync sequence: expected >= ${sequence}, got ${internal.sequence}`
+                        )
+                      );
+                    }).catch((error) => {
+                      finishReject(error);
+                    });
+                  }, clientExecuteSyncTimeoutMs);
+                });
+              }
+              if (isTransportErrorEnvelope(result)) {
                 done?.(result);
-                return result;
+                throw new Error(result.message);
               }
-              if (process.env.NODE_ENV === "development") {
-                console.warn(
-                  `The sequence of the action is not consistent.`,
-                  sequence,
-                  internal.sequence
-                );
+              if (isLegacyTransportErrorEnvelope(result)) {
+                done?.(result);
+                throw new Error(result.$$Error);
               }
-              return new Promise((resolve) => {
-                const unsubscribe = store.subscribe(() => {
-                  if (internal.sequence >= sequence) {
-                    unsubscribe();
-                    done?.(result);
-                    resolve(result);
-                  }
-                });
-              });
+              done?.(result);
+              return result;
             });
           };
         } else {
@@ -503,7 +606,11 @@ var handleState = (store, internal, options) => {
         }
       }
     }
-    return [internal.rootState, patches, inversePatches];
+    return [
+      internal.rootState,
+      finalPatches.patches,
+      finalPatches.inversePatches
+    ];
   }) => {
     if (store.share === "client") {
       throw new Error(
@@ -612,6 +719,7 @@ var getErrorMessage = (error) => {
   }
   return String(error);
 };
+var transportErrorMarker2 = "__coactionTransportError__";
 var handleMainTransport = (store, internal, storeTransport, workerType, checkEnablePatches) => {
   const transport = storeTransport ?? (workerType === "SharedWorkerInternal" || workerType === "WebWorkerInternal" ? createTransport2(workerType, {
     prefix: store.name
@@ -637,12 +745,19 @@ var handleMainTransport = (store, internal, storeTransport, workerType, checkEna
       if (typeof base !== "function") {
         throw new Error("The function is not found");
       }
-      return [base(...args), internal.sequence];
+      const result = await base(...args);
+      return [result, internal.sequence];
     } catch (error) {
       if (process.env.NODE_ENV === "development") {
         console.error(error);
       }
-      return [{ $$Error: getErrorMessage(error) }, internal.sequence];
+      return [
+        {
+          [transportErrorMarker2]: true,
+          message: getErrorMessage(error)
+        },
+        internal.sequence
+      ];
     }
   });
   transport.listen("fullSync", async () => {
@@ -674,7 +789,7 @@ var create = (createState, options = {}) => {
       listeners: /* @__PURE__ */ new Set()
     };
     const name = options.name ?? defaultName;
-    const shouldTrackName = process.env.NODE_ENV === "development" && share2 === "main";
+    const shouldTrackName = share2 === "main" && process.env.NODE_ENV !== "test";
     const releaseStoreName = () => {
       if (shouldTrackName) {
         namespaceMap.delete(name);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coaction",
-  "version": "1.0.1",
+  "version": "1.2.0",
   "description": "A sleek JavaScript library designed for high-performance and multithreading web apps.",
   "keywords": [
     "coaction"