fix(#1012): custom name worker functions

src/task_queue/array_queue.ts

@@ -1,4 +1,4 @@
-import assert from 'node:assert';
+import * as assert from 'node:assert';
 
 import type { TaskQueue, Task } from '.';
 

src/task_queue/fixed_queue.ts

@@ -3,7 +3,7 @@
  * License: MIT License
  * Source: https://github.com/nodejs/node/blob/de7b37880f5a541d5f874c1c2362a65a4be76cd0/lib/internal/fixed_queue.js
  */
-import assert from 'node:assert';
+import * as assert from 'node:assert';
 import type { Task } from './common';
 import { TaskQueue } from '.';
 // Currently optimal queue size, tested on V8 6.0 - 6.6. Must be power of two.

src/worker.ts

@@ -55,16 +55,23 @@ async function getHandler (filename : string, name : string) : Promise<Function
     // With our current set of TypeScript options, this is transpiled to
     // `require(filename)`.
     handler = await import(filename);
-    if (typeof handler !== 'function') {
+
+    if (name?.length > 0) {
+      handler = await ((handler as any)[name]);
+    } else if (typeof handler !== 'function') {
       handler = await ((handler as any)[name]);
     }
   } catch {}
+
   if (typeof handler !== 'function') {
     handler = await getImportESM()(pathToFileURL(filename).href);
-    if (typeof handler !== 'function') {
+    if (name?.length > 0) {
+      handler = await ((handler as any)[name]);
+    } else if (typeof handler !== 'function') {
       handler = await ((handler as any)[name]);
     }
   }
+
   if (typeof handler !== 'function') {
     return null;
   }

src/worker_pool/base.ts

@@ -1,4 +1,4 @@
-import assert from 'node:assert';
+import * as assert from 'node:assert';
 
 export abstract class AsynchronouslyCreatedResource {
     onreadyListeners : (() => void)[] | null = [];

src/worker_pool/index.ts

@@ -1,6 +1,6 @@
 import { Worker, MessagePort, receiveMessageOnPort, WorkerOptions, Transferable } from 'node:worker_threads';
 import { createHistogram, RecordableHistogram } from 'node:perf_hooks';
-import assert from 'node:assert';
+import * as assert from 'node:assert';
 
 import { RequestMessage, ResponseMessage, StartupMessage } from '../types';
 import { Errors } from '../errors';

test/abort-task.test.ts

@@ -1,5 +1,5 @@
 import { test } from 'node:test';
-import assert from 'node:assert/strict';
+import * as assert from 'node:assert/strict';
 import { EventEmitter } from 'node:events';
 import Piscina from '..';
 import { resolve } from 'path';

test/async-context.test.ts

@@ -1,4 +1,4 @@
-import assert from 'node:assert/strict';
+import * as assert from 'node:assert/strict';
 import { test } from 'node:test';
 import { resolve } from 'node:path';
 import { createHook, executionAsyncId } from 'node:async_hooks';

test/atomics-optimization.test.ts

@@ -1,4 +1,4 @@
-import assert from 'node:assert/strict';
+import * as assert from 'node:assert/strict';
 import { test } from 'node:test';
 import { resolve } from 'node:path';
 import Piscina from '..';

test/console-log.test.ts

@@ -1,4 +1,4 @@
-import assert from 'node:assert/strict';
+import * as assert from 'node:assert/strict';
 import { resolve } from 'node:path';
 import { spawn } from 'node:child_process';
 import { test } from 'node:test';

test/fixed-queue.test.ts

@@ -1,4 +1,4 @@
-import assert from 'node:assert';
+import * as assert from 'node:assert/strict';
 import { test } from 'node:test';
 import { resolve } from 'node:path';
 import { kQueueOptions } from '../dist/symbols';

test/fixtures/cjs-default.js

@@ -0,0 +1,3 @@
+module.exports.default = async function generate() {
+  return 42;
+}

test/fixtures/move.ts

@@ -1,10 +1,10 @@
-import assert from 'node:assert';
+import * as assert from 'node:assert/strict';
 import { types } from 'node:util';
 import Piscina from '../..';
 
 export default function (moved) {
   if (moved !== undefined) {
-    assert(types.isAnyArrayBuffer(moved));
+    assert.ok(types.isAnyArrayBuffer(moved));
   }
   return Piscina.move(new ArrayBuffer(10));
 }

test/fixtures/notify-then-sleep-or.ts

@@ -1,5 +1,5 @@
 // Set the index-th bith in i32array[0], then wait for it to be un-set again.
-module.exports = function ({ i32array, index }) {
+export default function ({ i32array, index }) {
   Atomics.or(i32array, 0, 1 << index);
   Atomics.notify(i32array, 0, Infinity);
   do {

test/fixtures/wait-for-notify.ts

@@ -1,4 +1,4 @@
-module.exports = function (i32array) {
+export default function (i32array) {
   Atomics.wait(i32array, 0, 0);
   Atomics.store(i32array, 0, -1);
   Atomics.notify(i32array, 0, Infinity);

test/fixtures/wait-for-others.ts

@@ -1,6 +1,6 @@
 import { threadId } from 'worker_threads';
 
-module.exports = async function ([i32array, n]) {
+export default async function ([i32array, n]) {
   Atomics.add(i32array, 0, 1);
   Atomics.notify(i32array, 0, Infinity);
   let lastSeenValue;

test/generics.test.ts

@@ -1,4 +1,4 @@
-import assert from 'node:assert/strict';
+import * as assert from 'node:assert/strict';
 import { resolve } from 'node:path';
 import { test } from 'node:test';
 import Piscina from '../dist';

test/histogram.test.ts

@@ -1,4 +1,4 @@
-import assert from 'node:assert/strict';
+import * as assert from 'node:assert/strict';
 import { resolve } from 'node:path';
 import { test } from 'node:test';
 import type { TestContext } from 'node:test';

test/idle-timeout.test.ts

@@ -1,4 +1,4 @@
-import assert from 'node:assert/strict';
+import * as assert from 'node:assert/strict';
 import { test } from 'node:test';
 import { resolve } from 'node:path';
 import { promisify } from 'node:util';

test/issue-513.test.ts

@@ -1,4 +1,4 @@
-import assert from 'node:assert';
+import * as assert from 'node:assert/strict';
 import { test } from 'node:test';
 import { resolve } from 'node:path';
 import Piscina from '..';

test/load-with-esm.test.ts

@@ -1,4 +1,4 @@
-import assert from 'node:assert/strict';
+import * as assert from 'node:assert/strict';
 import { test } from 'node:test';
 
 

test/messages.test.ts

@@ -1,4 +1,4 @@
-import assert from 'node:assert/strict';
+import * as assert from 'node:assert/strict';
 import { test } from 'node:test';
 import { resolve } from 'node:path';
 import { once } from 'node:events';

test/move-test.test.ts

@@ -1,4 +1,4 @@
-import assert from 'node:assert';
+import * as assert from 'node:assert/strict';
 import { test } from 'node:test';
 import { types } from 'node:util';
 import { MessageChannel, MessagePort } from 'node:worker_threads';

test/nice.test.ts

@@ -1,4 +1,4 @@
-import assert from 'node:assert/strict';
+import * as assert from 'node:assert/strict';
 import { resolve } from 'node:path';
 import { test } from 'node:test';
 import { getCurrentProcessPriority, WindowsThreadPriority } from '@napi-rs/nice';

test/option-validation.test.ts

@@ -1,4 +1,4 @@
-import assert from 'node:assert/strict';
+import * as assert from 'node:assert/strict';
 import { test } from 'node:test';
 import Piscina from '..';
 

test/pool-close.test.ts

@@ -1,4 +1,4 @@
-import assert from 'node:assert/strict';
+import * as assert from 'node:assert/strict';
 import { once } from 'node:events';
 import { resolve } from 'node:path';
 import { describe, it, test } from 'node:test';

test/pool-destroy.test.ts

@@ -1,4 +1,4 @@
-import assert from 'node:assert/strict';
+import * as assert from 'node:assert/strict';
 import { test } from 'node:test';
 import { resolve } from 'node:path';
 import Piscina from '..';

test/pool.test.ts

@@ -1,4 +1,4 @@
-import assert from 'node:assert/strict';
+import * as assert from 'node:assert/strict';
 import { resolve } from 'node:path';
 import { test } from 'node:test';
 import { once } from 'node:events';

test/post-task.test.ts

@@ -1,4 +1,4 @@
-import assert from 'node:assert';
+import * as assert from 'node:assert/strict';
 import { test, TestContext } from 'node:test';
 import { MessageChannel } from 'node:worker_threads';
 import { resolve } from 'node:path';

test/ready-message.test.ts

@@ -1,4 +1,4 @@
-import assert from 'node:assert/strict';
+import * as assert from 'node:assert/strict';
 import { test } from 'node:test';
 import { resolve } from 'node:path';
 import { once } from 'node:events';

test/simple-test.test.ts

@@ -1,4 +1,4 @@
-import assert from 'node:assert';
+import * as assert from 'node:assert/strict';
 import { test } from 'node:test';
 import { pathToFileURL } from 'node:url';
 import { resolve } from 'node:path';
@@ -233,7 +233,7 @@ test('named tasks work', async () => {
   assert.strictEqual(await worker.run({}), 'a');
 });
 
-test('named tasks work', async () => {
+test('named tasks work (2)', async () => {
   const worker = new Piscina({
     filename: resolve(__dirname, 'fixtures/multiple.js'),
     name: 'b'
@@ -243,3 +243,12 @@ test('named tasks work', async () => {
   assert.strictEqual(await worker.run({}, { name: 'b' }), 'b');
   assert.strictEqual(await worker.run({}), 'b');
 });
+
+test('cjs#default named export works (#1012)', async () => {
+  const worker = new Piscina({
+    filename: resolve(__dirname, 'fixtures/cjs-default.js'),
+    name: 'default'
+  });
+
+  assert.strictEqual(await worker.run({}), 42);
+});

test/task-queue.test.ts

@@ -1,4 +1,4 @@
-import assert from 'node:assert/strict';
+import * as assert from 'node:assert/strict';
 import { test } from 'node:test';
 import { resolve } from 'node:path';
 import Piscina, { PiscinaTask, TaskQueue } from '..';

test/test-is-buffer-transferred.test.ts

@@ -1,4 +1,4 @@
-import assert from 'node:assert/strict';
+import * as assert from 'node:assert/strict';
 import { test } from 'node:test';
 import { resolve } from 'node:path';
 import Piscina from '..';

test/test-resourcelimits.test.ts

@@ -1,4 +1,4 @@
-import assert from 'node:assert/strict';
+import * as assert from 'node:assert/strict';
 import { test } from 'node:test';
 import { resolve } from 'node:path';
 import Piscina from '..';

test/test-uncaught-exception-from-handler.test.ts

@@ -1,4 +1,4 @@
-import assert from 'node:assert/strict';
+import * as assert from 'node:assert/strict';
 import { test } from 'node:test';
 import { resolve } from 'node:path';
 import { once } from 'node:events';

test/thread-count.test.ts

@@ -1,4 +1,4 @@
-import assert from 'node:assert/strict';
+import * as assert from 'node:assert/strict';
 import { test } from 'node:test';
 import { resolve } from 'node:path';
 import { cpus } from 'node:os';

test/workers.test.ts

@@ -1,4 +1,4 @@
-import assert from 'node:assert';
+import * as assert from 'node:assert/strict';
 import { test } from 'node:test';
 import { resolve } from 'node:path';
 import Piscina from '../dist';

tsconfig.json

@@ -15,7 +15,6 @@
     "noUnusedParameters": true,
     "noImplicitReturns": true,
     "noFallthroughCasesInSwitch": true,
-    "esModuleInterop": true,
 
     "resolveJsonModule": true,                /* Include modules imported with '.json' extension */
     "forceConsistentCasingInFileNames": true  /* Disallow inconsistently-cased references to the same file. */