@workglow/util 0.0.126 → 0.1.0

package/dist/browser.js

@@ -215,10 +215,19 @@ class EventEmitter {
   emit(event, ...args) {
     const listeners = this.listeners[event];
     if (listeners) {
-      listeners.forEach(({ listener }) => {
-        listener(...args);
-      });
+      const snapshot = [...listeners];
+      const errors = [];
+      for (const { listener } of snapshot) {
+        try {
+          listener(...args);
+        } catch (e) {
+          errors.push(e);
+        }
+      }
       this.listeners[event] = listeners.filter((l) => !l.once);
+      if (errors.length > 0) {
+        throw errors[0];
+      }
     }
   }
   subscribe(event, listener) {
@@ -766,10 +775,23 @@ class WorkerManager {
     worker.addEventListener("messageerror", (event) => {
       console.error("Worker message error:", event);
     });
-    const readyPromise = new Promise((resolve) => {
+    const readyPromise = new Promise((resolve, reject) => {
+      const timeout = setTimeout(() => {
+        worker.removeEventListener("message", handleReady);
+        worker.removeEventListener("error", handleError);
+        reject(new Error(`Worker "${name}" did not become ready within 10s`));
+      }, 1e4);
+      const handleError = (event) => {
+        clearTimeout(timeout);
+        worker.removeEventListener("message", handleReady);
+        worker.removeEventListener("error", handleError);
+        reject(new Error(`Worker "${name}" initialization error: ${event.message ?? "unknown error"}`));
+      };
       const handleReady = (event) => {
         if (event.data?.type === "ready") {
+          clearTimeout(timeout);
           worker.removeEventListener("message", handleReady);
+          worker.removeEventListener("error", handleError);
           this.workerFunctions.set(name, new Set(event.data.functions ?? []));
           this.workerStreamFunctions.set(name, new Set(event.data.streamFunctions ?? []));
           this.workerReactiveFunctions.set(name, new Set(event.data.reactiveFunctions ?? []));
@@ -777,6 +799,7 @@ class WorkerManager {
         }
       };
       worker.addEventListener("message", handleReady);
+      worker.addEventListener("error", handleError);
     });
     this.readyWorkers.set(name, readyPromise);
   }
@@ -835,7 +858,10 @@ class WorkerManager {
         } else if (type === "error") {
           cleanup();
           getLogger().debug(`Worker ${workerName} function ${functionName} error.`, { data });
-          reject(new Error(data));
+          const err = typeof data === "object" && data !== null ? Object.assign(new Error(data.message ?? String(data)), {
+            name: data.name ?? "Error"
+          }) : new Error(String(data));
+          reject(err);
         }
       };
       const handleAbort = () => {
@@ -1162,7 +1188,7 @@ var SALT_LENGTH = 16;
 async function deriveKey(passphrase, salt) {
   const enc = new TextEncoder;
   const keyMaterial = await crypto.subtle.importKey("raw", enc.encode(passphrase), "PBKDF2", false, ["deriveKey"]);
-  return crypto.subtle.deriveKey({ name: "PBKDF2", salt, iterations: 1e5, hash: "SHA-256" }, keyMaterial, { name: "AES-GCM", length: 256 }, false, ["encrypt", "decrypt"]);
+  return crypto.subtle.deriveKey({ name: "PBKDF2", salt, iterations: 600000, hash: "SHA-256" }, keyMaterial, { name: "AES-GCM", length: 256 }, false, ["encrypt", "decrypt"]);
 }
 async function encrypt(plaintext, passphrase, keyCache) {
   const enc = new TextEncoder;
@@ -1417,12 +1443,20 @@ class WorkerServerBase {
     const uniqueTransferables = [...new Set(transferables)];
     postMessage({ id, type: "complete", data: result }, uniqueTransferables);
   };
-  postError = (id, errorMessage) => {
+  postError = (id, error) => {
     if (this.completedRequests.has(id)) {
       return;
     }
     this.completedRequests.add(id);
-    postMessage({ id, type: "error", data: errorMessage });
+    let data;
+    if (typeof error === "string") {
+      data = { message: error, name: "Error" };
+    } else if (error instanceof Error) {
+      data = { message: error.message, name: error.name };
+    } else {
+      data = { message: String(error), name: "Error" };
+    }
+    postMessage({ id, type: "error", data });
   };
   postStreamChunk = (id, event) => {
     if (this.completedRequests.has(id)) {
@@ -1468,6 +1502,7 @@ class WorkerServerBase {
       controller?.abort();
       this.requestControllers.delete(id);
       this.postError(id, "Operation aborted");
+      this.scheduleCompletedRequestCleanup(id);
     }
   }
   async handleReactiveCall(id, functionName, [input, output, model]) {
@@ -1480,7 +1515,7 @@ class WorkerServerBase {
       const result = await fn(input, output, model);
       this.postResult(id, result);
     } catch (error) {
-      this.postError(id, error.message);
+      this.postError(id, error);
     }
   }
   async handleCall(id, functionName, [input, model]) {
@@ -1500,12 +1535,10 @@ class WorkerServerBase {
       const result = await fn(input, model, postProgress, abortController.signal);
       this.postResult(id, result);
     } catch (error) {
-      this.postError(id, error.message);
+      this.postError(id, error);
     } finally {
       this.requestControllers.delete(id);
-      setTimeout(() => {
-        this.completedRequests.delete(id);
-      }, 1000);
+      this.scheduleCompletedRequestCleanup(id);
     }
   }
   async handleStreamCall(id, functionName, [input, model]) {
@@ -1522,12 +1555,10 @@ class WorkerServerBase {
         }
         this.postResult(id, undefined);
       } catch (error) {
-        this.postError(id, error.message);
+        this.postError(id, error);
       } finally {
         this.requestControllers.delete(id);
-        setTimeout(() => {
-          this.completedRequests.delete(id);
-        }, 1000);
+        this.scheduleCompletedRequestCleanup(id);
       }
     } else if (functionName in this.functions) {
       try {
@@ -1539,17 +1570,29 @@ class WorkerServerBase {
         this.postStreamChunk(id, { type: "finish", data: result });
         this.postResult(id, undefined);
       } catch (error) {
-        this.postError(id, error.message);
+        this.postError(id, error);
       } finally {
         this.requestControllers.delete(id);
-        setTimeout(() => {
-          this.completedRequests.delete(id);
-        }, 1000);
+        this.scheduleCompletedRequestCleanup(id);
       }
     } else {
       this.postError(id, `Function ${functionName} not found`);
     }
   }
+  scheduleCompletedRequestCleanup(id) {
+    setTimeout(() => {
+      this.completedRequests.delete(id);
+    }, 5000);
+    if (this.completedRequests.size > 1e4) {
+      const iter = this.completedRequests.values();
+      for (let i = 0;i < 5000; i++) {
+        const entry = iter.next();
+        if (entry.done)
+          break;
+        this.completedRequests.delete(entry.value);
+      }
+    }
+  }
 }
 
 // src/worker/Worker.browser.ts
@@ -1622,4 +1665,4 @@ export {
   BaseError
 };
 
-//# debugId=C665251EA27E791364756E2164756E21
+//# debugId=65F2AF5A900EB08C64756E2164756E21