@dmop/puru 0.1.4 → 0.1.10

package/dist/index.js

@@ -56,21 +56,20 @@ function getConfig() {
 
 // src/runtime.ts
 function detectRuntime() {
-  if (typeof globalThis.Bun !== "undefined") return "bun";
-  if (typeof globalThis.Deno !== "undefined") return "deno";
-  if (typeof globalThis.process !== "undefined" && globalThis.process.versions?.node)
-    return "node";
+  if ("Bun" in globalThis) return "bun";
+  if ("Deno" in globalThis) return "deno";
+  if (typeof globalThis.process !== "undefined" && globalThis.process.versions?.node) return "node";
   return "browser";
 }
 function detectCapability() {
   const runtime = detectRuntime();
   if (runtime === "node" || runtime === "bun") return "full-threads";
-  if (typeof globalThis.Worker !== "undefined") return "full-threads";
+  if ("Worker" in globalThis) return "full-threads";
   return "single-thread";
 }
 
 // src/adapters/node.ts
-import { Worker as Worker2 } from "worker_threads";
+import { Worker } from "worker_threads";
 
 // src/bootstrap.ts
 var CHANNEL_PROXY_CODE = `
@@ -286,7 +285,7 @@ self.postMessage({ type: 'ready' });
 var NodeManagedWorker = class {
   worker;
   constructor() {
-    this.worker = new Worker2(NODE_BOOTSTRAP_CODE, { eval: true });
+    this.worker = new Worker(NODE_BOOTSTRAP_CODE, { eval: true });
   }
   get id() {
     return this.worker.threadId;
@@ -332,7 +331,11 @@ var BunManagedWorker = class {
   id;
   constructor() {
     this.id = ++workerIdCounter;
-    this.worker = new Worker(getBootstrapFile());
+    const WorkerConstructor = globalThis.Worker;
+    if (!WorkerConstructor) {
+      throw new Error("Bun Worker constructor is not available in this runtime");
+    }
+    this.worker = new WorkerConstructor(getBootstrapFile());
   }
   postMessage(data) {
     this.worker.postMessage(data);
@@ -344,27 +347,28 @@ var BunManagedWorker = class {
   on(event, handler) {
     if (event === "message") {
       this.worker.addEventListener("message", (e) => {
+        ;
         handler(e.data);
       });
     } else if (event === "error") {
       this.worker.addEventListener("error", (e) => {
+        ;
         handler(e.error ?? new Error(e.message));
       });
     } else if (event === "exit") {
       this.worker.addEventListener("close", (e) => {
+        ;
         handler(e.code ?? 0);
       });
     }
   }
   unref() {
     if ("unref" in this.worker && typeof this.worker.unref === "function") {
-      ;
       this.worker.unref();
     }
   }
   ref() {
     if ("ref" in this.worker && typeof this.worker.ref === "function") {
-      ;
       this.worker.ref();
     }
   }
@@ -376,9 +380,11 @@ var BunWorkerAdapter = class {
 };
 
 // src/channel.ts
+var CLOSED = /* @__PURE__ */ Symbol("puru.channel.closed");
 var channelIdCounter = 0;
 var channelRegistry = /* @__PURE__ */ new Map();
 var ChannelImpl = class {
+  // constraint: can't create channels of nullable type
   /** @internal */
   _id;
   buffer = [];
@@ -427,14 +433,16 @@ var ChannelImpl = class {
       return Promise.resolve(null);
     }
     return new Promise((resolve) => {
-      this.recvQueue.push({ resolve });
+      this.recvQueue.push({
+        resolve: (v) => resolve(v === CLOSED ? null : v)
+      });
     });
   }
   close() {
     if (this.closed) return;
     this.closed = true;
     for (const receiver of this.recvQueue) {
-      receiver.resolve(null);
+      receiver.resolve(CLOSED);
     }
     this.recvQueue = [];
     for (const sender of this.sendQueue) {
@@ -459,6 +467,9 @@ function chan(capacity = 0) {
 function getChannelById(id) {
   return channelRegistry.get(id);
 }
+function getChannelId(channel) {
+  return channel._id;
+}
 
 // src/adapters/inline.ts
 var inlineIdCounter = 0;
@@ -475,15 +486,14 @@ var InlineManagedWorker = class {
       this.emit("message", { type: "ready" });
     });
   }
-  postMessage(data) {
+  postMessage(msg) {
     if (this.terminated) return;
-    const msg = data;
     if (msg.type === "execute") {
-      this.executeTask(msg.taskId, msg.fnStr, msg.concurrent ?? false, msg.channels);
+      this.executeTask(msg.taskId, msg.fnStr, msg.concurrent, msg.channels);
     } else if (msg.type === "cancel") {
       this.cancelledTasks.add(msg.taskId);
     } else if (msg.type === "channel-result") {
-      this.emit("message", msg);
+      return;
     } else if (msg.type === "shutdown") {
       this.terminated = true;
       this.emit("exit", 0);
@@ -513,7 +523,6 @@ var InlineManagedWorker = class {
     }
   }
   buildChannelProxies(channels) {
-    const self = this;
     const proxies = {};
     for (const [name, channelId] of Object.entries(channels)) {
       proxies[name] = {
@@ -535,13 +544,7 @@ var InlineManagedWorker = class {
         [Symbol.asyncIterator]() {
           const ch = getChannelById(channelId);
           if (!ch) throw new Error(`Channel ${channelId} not found`);
-          return {
-            async next() {
-              const value = await ch.recv();
-              if (value === null) return { done: true, value: void 0 };
-              return { done: false, value };
-            }
-          };
+          return ch[Symbol.asyncIterator]();
         }
       };
     }
@@ -620,14 +623,14 @@ var WorkerPool = class {
     this.adapter = adapter;
   }
   // --- Queue helpers ---
-  enqueue(task) {
-    this.queues[task.priority].push(task);
+  enqueue(task2) {
+    this.queues[task2.priority].push(task2);
   }
   dequeue() {
     return this.queues.high.shift() ?? this.queues.normal.shift() ?? this.queues.low.shift();
   }
-  enqueueConcurrent(task) {
-    this.concurrentQueues[task.priority].push(task);
+  enqueueConcurrent(task2) {
+    this.concurrentQueues[task2.priority].push(task2);
   }
   dequeueConcurrent() {
     return this.concurrentQueues.high.shift() ?? this.concurrentQueues.normal.shift() ?? this.concurrentQueues.low.shift();
@@ -653,73 +656,73 @@ var WorkerPool = class {
     return void 0;
   }
   // --- Submit ---
-  submit(task) {
+  submit(task2) {
     if (this.draining) {
-      task.reject(new Error("Pool is shutting down"));
+      task2.reject(new Error("Pool is shutting down"));
       return;
     }
-    if (task.concurrent) {
-      this.submitConcurrent(task);
+    if (task2.concurrent) {
+      this.submitConcurrent(task2);
     } else {
-      this.submitExclusive(task);
+      this.submitExclusive(task2);
     }
   }
-  submitExclusive(task) {
+  submitExclusive(task2) {
     const worker = this.idleWorkers.pop();
     if (worker) {
-      this.dispatch(worker, task);
+      this.dispatch(worker, task2);
       return;
     }
     const totalWorkers = this.allWorkers.size + this.pendingWorkerCount;
     if (totalWorkers < this.config.maxThreads) {
       this.pendingWorkerCount++;
-      this.pendingTasksForWorkers.push(task);
+      this.pendingTasksForWorkers.push(task2);
       this.createAndReadyWorker();
       return;
     }
-    this.enqueue(task);
+    this.enqueue(task2);
   }
-  submitConcurrent(task) {
+  submitConcurrent(task2) {
     for (const [worker, tasks] of this.sharedWorkers) {
       if (tasks.size < this.config.concurrency) {
-        this.dispatchConcurrent(worker, task);
+        this.dispatchConcurrent(worker, task2);
         return;
       }
     }
     const idleWorker = this.idleWorkers.pop();
     if (idleWorker) {
-      this.dispatchConcurrent(idleWorker, task);
+      this.dispatchConcurrent(idleWorker, task2);
       return;
     }
     const totalWorkers = this.allWorkers.size + this.pendingWorkerCount;
     if (totalWorkers < this.config.maxThreads) {
       this.pendingWorkerCount++;
-      this.pendingTasksForWorkers.push(task);
+      this.pendingTasksForWorkers.push(task2);
       this.createAndReadyWorker();
       return;
     }
-    this.enqueueConcurrent(task);
+    this.enqueueConcurrent(task2);
   }
   // --- Dispatch ---
-  dispatch(worker, task) {
+  dispatch(worker, task2) {
     const timer = this.idleTimers.get(worker);
     if (timer) {
       clearTimeout(timer);
       this.idleTimers.delete(worker);
     }
     worker.ref();
-    this.exclusiveWorkers.set(task.id, worker);
-    this.taskMap.set(task.id, task);
+    this.exclusiveWorkers.set(task2.id, worker);
+    this.taskMap.set(task2.id, task2);
     const msg = {
       type: "execute",
-      taskId: task.id,
-      fnStr: task.fnStr,
+      taskId: task2.id,
+      fnStr: task2.fnStr,
       concurrent: false,
-      channels: task.channels
+      channels: task2.channels
     };
     worker.postMessage(msg);
   }
-  dispatchConcurrent(worker, task) {
+  dispatchConcurrent(worker, task2) {
     const timer = this.idleTimers.get(worker);
     if (timer) {
       clearTimeout(timer);
@@ -729,14 +732,14 @@ var WorkerPool = class {
     if (!this.sharedWorkers.has(worker)) {
       this.sharedWorkers.set(worker, /* @__PURE__ */ new Set());
     }
-    this.sharedWorkers.get(worker).add(task.id);
-    this.taskMap.set(task.id, task);
+    this.sharedWorkers.get(worker).add(task2.id);
+    this.taskMap.set(task2.id, task2);
     const msg = {
       type: "execute",
-      taskId: task.id,
-      fnStr: task.fnStr,
+      taskId: task2.id,
+      fnStr: task2.fnStr,
       concurrent: true,
-      channels: task.channels
+      channels: task2.channels
     };
     worker.postMessage(msg);
   }
@@ -763,6 +766,9 @@ var WorkerPool = class {
       const taskId = response.taskId;
       const err = new Error(response.message);
       if (response.stack) err.stack = response.stack;
+      if (response.message.match(/^ReferenceError:/) || response.message.match(/ is not defined$/)) {
+        err.message += "\n  Hint: functions passed to spawn() cannot access variables from the enclosing scope. Inline all required values directly in the function body, or pass them via the channels option.";
+      }
       this.rejectTask(taskId, err);
       if (this.exclusiveWorkers.has(taskId)) {
         this.exclusiveWorkers.delete(taskId);
@@ -871,19 +877,28 @@ var WorkerPool = class {
   }
   // --- Task resolution ---
   resolveTask(taskId, value) {
-    const task = this.taskMap.get(taskId);
-    if (task) {
+    const task2 = this.taskMap.get(taskId);
+    if (task2) {
       this.taskMap.delete(taskId);
       this.totalCompleted++;
-      task.resolve(value);
+      task2.resolve(value);
     }
   }
   rejectTask(taskId, reason) {
-    const task = this.taskMap.get(taskId);
-    if (task) {
+    const task2 = this.taskMap.get(taskId);
+    if (task2) {
       this.taskMap.delete(taskId);
       this.totalFailed++;
-      task.reject(reason);
+      task2.reject(reason);
+    }
+  }
+  rejectExclusiveTaskForWorker(worker, reason) {
+    for (const [taskId, assignedWorker] of this.exclusiveWorkers) {
+      if (assignedWorker === worker) {
+        this.exclusiveWorkers.delete(taskId);
+        this.rejectTask(taskId, reason);
+        break;
+      }
     }
   }
   // --- Cancellation ---
@@ -923,17 +938,21 @@ var WorkerPool = class {
   async drain() {
     this.draining = true;
     for (const priority of ["high", "normal", "low"]) {
-      for (const task of this.queues[priority]) {
-        task.reject(new Error("Pool is shutting down"));
+      for (const task2 of this.queues[priority]) {
+        task2.reject(new Error("Pool is shutting down"));
       }
       this.queues[priority] = [];
     }
     for (const priority of ["high", "normal", "low"]) {
-      for (const task of this.concurrentQueues[priority]) {
-        task.reject(new Error("Pool is shutting down"));
+      for (const task2 of this.concurrentQueues[priority]) {
+        task2.reject(new Error("Pool is shutting down"));
       }
       this.concurrentQueues[priority] = [];
     }
+    for (const [taskId] of this.exclusiveWorkers) {
+      this.taskMap.delete(taskId);
+    }
+    this.exclusiveWorkers.clear();
     for (const [, taskSet] of this.sharedWorkers) {
       for (const taskId of taskSet) {
         this.taskMap.delete(taskId);
@@ -957,10 +976,10 @@ var WorkerPool = class {
     while (true) {
       const totalWorkers = this.allWorkers.size + this.pendingWorkerCount;
       if (totalWorkers >= maxThreads) break;
-      const task = this.dequeue() ?? this.dequeueConcurrent();
-      if (!task) break;
+      const task2 = this.dequeue() ?? this.dequeueConcurrent();
+      if (!task2) break;
       this.pendingWorkerCount++;
-      this.pendingTasksForWorkers.push(task);
+      this.pendingTasksForWorkers.push(task2);
       this.createAndReadyWorker();
     }
     while (this.allWorkers.size > maxThreads && this.idleWorkers.length > 0) {
@@ -980,19 +999,18 @@ var WorkerPool = class {
     const onReady = () => {
       this.pendingWorkerCount--;
       this.allWorkers.add(worker);
-      const task = this.pendingTasksForWorkers.shift();
-      if (task) {
-        if (task.concurrent) {
-          this.dispatchConcurrent(worker, task);
+      const task2 = this.pendingTasksForWorkers.shift();
+      if (task2) {
+        if (task2.concurrent) {
+          this.dispatchConcurrent(worker, task2);
         } else {
-          this.dispatch(worker, task);
+          this.dispatch(worker, task2);
         }
       } else {
         this.makeIdle(worker);
       }
     };
-    worker.on("message", (msg) => {
-      const response = msg;
+    worker.on("message", (response) => {
       if (response.type === "ready") {
         onReady();
         return;
@@ -1000,12 +1018,7 @@ var WorkerPool = class {
       this.handleWorkerMessage(worker, response);
     });
     worker.on("error", (err) => {
-      for (const [taskId, w] of this.exclusiveWorkers) {
-        if (w === worker) {
-          this.exclusiveWorkers.delete(taskId);
-          break;
-        }
-      }
+      this.rejectExclusiveTaskForWorker(worker, err);
       const taskSet = this.sharedWorkers.get(worker);
       if (taskSet) {
         for (const taskId of taskSet) {
@@ -1025,12 +1038,7 @@ var WorkerPool = class {
       if (idleIdx !== -1) {
         this.idleWorkers.splice(idleIdx, 1);
       }
-      for (const [taskId, w] of this.exclusiveWorkers) {
-        if (w === worker) {
-          this.exclusiveWorkers.delete(taskId);
-          break;
-        }
-      }
+      this.rejectExclusiveTaskForWorker(worker, new Error("Worker exited unexpectedly"));
       const taskSet = this.sharedWorkers.get(worker);
       if (taskSet) {
         for (const taskId of taskSet) {
@@ -1100,6 +1108,12 @@ function stats() {
 function resize(maxThreads) {
   getPool().resize(maxThreads);
 }
+async function shutdown() {
+  if (poolInstance) {
+    await poolInstance.drain();
+    poolInstance = null;
+  }
+}
 
 // src/spawn.ts
 var taskCounter = 0;
@@ -1118,14 +1132,10 @@ function spawn(fn, opts) {
   if (opts?.channels) {
     channelMap = {};
     for (const [name, ch] of Object.entries(opts.channels)) {
-      const impl = ch;
-      if (!impl._id) {
-        throw new Error(`Channel "${name}" is not a valid puru channel`);
-      }
-      channelMap[name] = impl._id;
+      channelMap[name] = getChannelId(ch);
     }
   }
-  const task = {
+  const task2 = {
     id: taskId,
     fnStr,
     priority: opts?.priority ?? "normal",
@@ -1148,7 +1158,7 @@ function spawn(fn, opts) {
       }
     }
   };
-  getPool().submit(task);
+  getPool().submit(task2);
   const cancel = () => {
     if (settled) return;
     settled = true;
@@ -1162,9 +1172,18 @@ function spawn(fn, opts) {
 var WaitGroup = class {
   tasks = [];
   controller = new AbortController();
+  /**
+   * An `AbortSignal` shared across all tasks in this group.
+   * Pass it into spawned functions so they can stop early when `cancel()` is called.
+   */
   get signal() {
     return this.controller.signal;
   }
+  /**
+   * Spawns a function on a worker thread and adds it to the group.
+   *
+   * @throws If the group has already been cancelled.
+   */
   spawn(fn, opts) {
     if (this.controller.signal.aborted) {
       throw new Error("WaitGroup has been cancelled");
@@ -1172,16 +1191,28 @@ var WaitGroup = class {
     const handle = spawn(fn, opts);
     this.tasks.push(handle);
   }
+  /**
+   * Waits for all tasks to complete successfully.
+   * Rejects as soon as any task throws.
+   */
   async wait() {
     return Promise.all(this.tasks.map((t) => t.result));
   }
+  /**
+   * Waits for all tasks to settle (fulfilled or rejected) and returns each outcome.
+   * Never rejects — inspect each `PromiseSettledResult` to handle failures individually.
+   */
   async waitSettled() {
     return Promise.allSettled(this.tasks.map((t) => t.result));
   }
+  /**
+   * Cancels all tasks in the group and signals the shared `AbortSignal`.
+   * Already-settled tasks are unaffected.
+   */
   cancel() {
     this.controller.abort();
-    for (const task of this.tasks) {
-      task.cancel();
+    for (const task2 of this.tasks) {
+      task2.cancel();
     }
   }
 };
@@ -1190,7 +1221,7 @@ var WaitGroup = class {
 var ErrGroup = class {
   tasks = [];
   controller = new AbortController();
-  firstError = void 0;
+  firstError = null;
   hasError = false;
   get signal() {
     return this.controller.signal;
@@ -1211,7 +1242,7 @@ var ErrGroup = class {
   }
   async wait() {
     const settled = await Promise.allSettled(this.tasks.map((t) => t.result));
-    if (this.hasError) {
+    if (this.hasError && this.firstError) {
       throw this.firstError;
     }
     return settled.map((r) => {
@@ -1221,8 +1252,8 @@ var ErrGroup = class {
   }
   cancel() {
     this.controller.abort();
-    for (const task of this.tasks) {
-      task.cancel();
+    for (const task2 of this.tasks) {
+      task2.cancel();
     }
   }
 };
@@ -1367,7 +1398,7 @@ var Ticker = class {
       if (this.resolve) {
         const r = this.resolve;
         this.resolve = null;
-        r();
+        r(true);
       }
     }, ms);
     if (this.interval.unref) this.interval.unref();
@@ -1375,7 +1406,11 @@ var Ticker = class {
   async tick() {
     if (this.stopped) return false;
     return new Promise((resolve) => {
-      this.resolve = () => resolve(true);
+      this.resolve = resolve;
+      if (this.stopped) {
+        this.resolve = null;
+        resolve(false);
+      }
     });
   }
   stop() {
@@ -1387,7 +1422,7 @@ var Ticker = class {
     if (this.resolve) {
       const r = this.resolve;
       this.resolve = null;
-      r();
+      r(false);
     }
   }
   async *[Symbol.asyncIterator]() {
@@ -1401,54 +1436,45 @@ function ticker(ms) {
 }
 
 // src/registry.ts
-var registry = /* @__PURE__ */ new Map();
 var taskCounter2 = 0;
-function register(name, fn) {
-  if (registry.has(name)) {
-    throw new Error(`Task "${name}" is already registered`);
-  }
-  registry.set(name, fn);
-}
-function run(name, ...args) {
-  const fn = registry.get(name);
-  if (!fn) {
-    throw new Error(`Task "${name}" is not registered. Call register() first.`);
-  }
-  const fnStr = serializeFunction(fn);
-  const serializedArgs = args.map((a) => {
-    const json = JSON.stringify(a);
-    if (json === void 0) {
-      throw new TypeError(
-        `Argument of type ${typeof a} is not JSON-serializable. run() args must be JSON-serializable (no undefined, functions, symbols, or BigInt).`
-      );
-    }
-    return json;
-  });
-  const wrapperStr = `() => (${fnStr})(${serializedArgs.join(", ")})`;
-  const taskId = `reg_${++taskCounter2}`;
-  const spawnStack = new Error().stack;
-  let resolveFn;
-  let rejectFn;
-  const result = new Promise((resolve, reject) => {
-    resolveFn = resolve;
-    rejectFn = reject;
-  });
-  const task = {
-    id: taskId,
-    fnStr: wrapperStr,
-    priority: "normal",
-    concurrent: false,
-    resolve: (value) => resolveFn(value),
-    reject: (reason) => {
-      if (reason instanceof Error && spawnStack) {
-        const callerLine = spawnStack.split("\n").slice(2).join("\n");
-        reason.stack = (reason.stack ?? reason.message) + "\n    --- spawned at ---\n" + callerLine;
+function task(fn) {
+  return (...args) => {
+    const fnStr = serializeFunction(fn);
+    const serializedArgs = args.map((a) => {
+      const json = JSON.stringify(a);
+      if (json === void 0) {
+        throw new TypeError(
+          `Argument of type ${typeof a} is not JSON-serializable. task() args must be JSON-serializable (no undefined, functions, symbols, or BigInt).`
+        );
       }
-      rejectFn(reason);
-    }
+      return json;
+    });
+    const wrapperStr = `() => (${fnStr})(${serializedArgs.join(", ")})`;
+    const taskId = `task_${++taskCounter2}`;
+    const spawnStack = new Error().stack;
+    let resolveFn;
+    let rejectFn;
+    const result = new Promise((resolve, reject) => {
+      resolveFn = resolve;
+      rejectFn = reject;
+    });
+    const taskObj = {
+      id: taskId,
+      fnStr: wrapperStr,
+      priority: "normal",
+      concurrent: false,
+      resolve: (value) => resolveFn(value),
+      reject: (reason) => {
+        if (reason instanceof Error && spawnStack) {
+          const callerLine = spawnStack.split("\n").slice(2).join("\n");
+          reason.stack = (reason.stack ?? reason.message) + "\n    --- spawned at ---\n" + callerLine;
+        }
+        rejectFn(reason);
+      }
+    };
+    getPool().submit(taskObj);
+    return result;
   };
-  getPool().submit(task);
-  return result;
 }
 export {
   ErrGroup,
@@ -1461,12 +1487,12 @@ export {
   configure,
   detectCapability,
   detectRuntime,
-  register,
   resize,
-  run,
   select,
+  shutdown,
   spawn,
   stats,
+  task,
   ticker
 };
 //# sourceMappingURL=index.js.map