@utoo/pack 1.0.7 → 1.0.8-alpha.1

package/cjs/binding.d.ts

@@ -9,20 +9,25 @@ export declare class ExternalObject<T> {
     [K: symbol]: T
   }
 }
-export interface PoolOptions {
-  filename: string
-  maxConcurrency: number
+export declare function registerWorkerScheduler(creator: (arg: NapiWorkerCreation) => any, terminator: (arg: NapiWorkerTermination) => any): void
+export declare function workerCreated(workerId: number): void
+export interface NapiWorkerCreation {
+  options: NapiWorkerOptions
 }
-export interface WorkerTermination {
-  filename: string
+export interface NapiWorkerOptions {
+  filename: RcStr
+  cwd: RcStr
+}
+export interface NapiWorkerTermination {
+  options: NapiWorkerOptions
   workerId: number
 }
-export declare function recvPoolRequest(): Promise<PoolOptions>
-export declare function recvWorkerTermination(): Promise<WorkerTermination>
-export declare function recvWorkerRequest(filename: string): Promise<number>
-export declare function recvMessageInWorker(workerId: number): Promise<string>
-export declare function notifyWorkerAck(taskId: number, workerId: number): Promise<void>
-export declare function sendTaskMessage(taskId: number, message: string): Promise<void>
+export interface NapiTaskMessage {
+  taskId: number
+  data: string
+}
+export declare function recvTaskMessageInWorker(workerId: number): Promise<NapiTaskMessage>
+export declare function sendTaskMessage(message: NapiTaskMessage): Promise<void>
 export interface NapiEndpointConfig {
   
 }

package/cjs/binding.js

@@ -319,12 +319,10 @@ if (!nativeBinding) {
     }
     throw new Error(`Failed to load native binding`);
 }
-const { recvPoolRequest, recvWorkerTermination, recvWorkerRequest, recvMessageInWorker, notifyWorkerAck, sendTaskMessage, endpointWriteToDisk, endpointServerChangedSubscribe, endpointClientChangedSubscribe, projectNew, projectUpdate, projectOnExit, projectShutdown, projectWriteAllEntrypointsToDisk, projectEntrypointsSubscribe, projectHmrEvents, projectHmrIdentifiersSubscribe, projectUpdateInfoSubscribe, projectTraceSource, projectGetSourceForAsset, projectGetSourceMap, projectGetSourceMapSync, rootTaskDispose, initCustomTraceSubscriber, teardownTraceSubscriber } = nativeBinding;
-module.exports.recvPoolRequest = recvPoolRequest;
-module.exports.recvWorkerTermination = recvWorkerTermination;
-module.exports.recvWorkerRequest = recvWorkerRequest;
-module.exports.recvMessageInWorker = recvMessageInWorker;
-module.exports.notifyWorkerAck = notifyWorkerAck;
+const { registerWorkerScheduler, workerCreated, recvTaskMessageInWorker, sendTaskMessage, endpointWriteToDisk, endpointServerChangedSubscribe, endpointClientChangedSubscribe, projectNew, projectUpdate, projectOnExit, projectShutdown, projectWriteAllEntrypointsToDisk, projectEntrypointsSubscribe, projectHmrEvents, projectHmrIdentifiersSubscribe, projectUpdateInfoSubscribe, projectTraceSource, projectGetSourceForAsset, projectGetSourceMap, projectGetSourceMapSync, rootTaskDispose, initCustomTraceSubscriber, teardownTraceSubscriber } = nativeBinding;
+module.exports.registerWorkerScheduler = registerWorkerScheduler;
+module.exports.workerCreated = workerCreated;
+module.exports.recvTaskMessageInWorker = recvTaskMessageInWorker;
 module.exports.sendTaskMessage = sendTaskMessage;
 module.exports.endpointWriteToDisk = endpointWriteToDisk;
 module.exports.endpointServerChangedSubscribe = endpointServerChangedSubscribe;

package/cjs/loaderWorkerPool.d.ts

@@ -0,0 +1 @@
+export declare function runLoaderWorkerPool(binding: typeof import("./binding"), bindingPath: string): Promise<void>;

package/cjs/loaderWorkerPool.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runLoaderWorkerPool = runLoaderWorkerPool;
+const worker_threads_1 = require("worker_threads");
+const loaderWorkers = {};
+function getPoolId(cwd, filename) {
+    return `${cwd}:${filename}`;
+}
+async function runLoaderWorkerPool(binding, bindingPath) {
+    binding.registerWorkerScheduler((creation) => {
+        const { options: { filename, cwd }, } = creation;
+        let poolId = getPoolId(cwd, filename);
+        const worker = new worker_threads_1.Worker(filename, {
+            workerData: {
+                bindingPath,
+                cwd,
+            },
+        });
+        worker.unref();
+        const workers = loaderWorkers[poolId] || (loaderWorkers[poolId] = new Map());
+        workers.set(worker.threadId, worker);
+    }, (termination) => {
+        var _a;
+        const { options: { filename, cwd }, workerId, } = termination;
+        let poolId = getPoolId(cwd, filename);
+        const workers = loaderWorkers[poolId];
+        (_a = workers.get(workerId)) === null || _a === void 0 ? void 0 : _a.terminate();
+        workers.delete(workerId);
+    });
+}

package/cjs/project.js

@@ -36,8 +36,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TurbopackInternalError = void 0;
 exports.projectFactory = projectFactory;
 const util_1 = require("util");
-const worker_threads_1 = require("worker_threads");
 const binding = __importStar(require("./binding"));
+const loaderWorkerPool_1 = require("./loaderWorkerPool");
 const util_2 = require("./util");
 class TurbopackInternalError extends Error {
     constructor(cause) {
@@ -201,59 +201,11 @@ function projectFactory() {
         };
         return iterator;
     }
-    const loaderWorkers = {};
-    const createOrScalePool = async () => {
-        while (true) {
-            try {
-                let poolOptions = await binding.recvPoolRequest();
-                const { filename, maxConcurrency } = poolOptions;
-                const workers = loaderWorkers[filename] || (loaderWorkers[filename] = []);
-                if (workers.length < maxConcurrency) {
-                    for (let i = workers.length; i < maxConcurrency; i++) {
-                        const worker = new worker_threads_1.Worker(filename, {
-                            workerData: {
-                                poolId: filename,
-                                bindingPath: require.resolve("./binding.js"),
-                            },
-                        });
-                        worker.unref();
-                        workers.push(worker);
-                    }
-                }
-                else if (workers.length > maxConcurrency) {
-                    const workersToStop = workers.splice(0, workers.length - maxConcurrency);
-                    workersToStop.forEach((worker) => worker.terminate());
-                }
-            }
-            catch (e) {
-                return;
-            }
-        }
-    };
-    const waitingForWorkerTermination = async () => {
-        while (true) {
-            try {
-                const { filename, workerId } = await binding.recvWorkerTermination();
-                const workers = loaderWorkers[filename];
-                const workerIdx = workers.findIndex((worker) => worker.threadId === workerId);
-                if (workerIdx > -1) {
-                    const worker = workers.splice(workerIdx, 1);
-                    worker[0].terminate();
-                }
-            }
-            catch (e) {
-                return;
-            }
-        }
-    };
     class ProjectImpl {
         constructor(nativeProject) {
             this._nativeProject = nativeProject;
-            if (typeof binding.recvPoolRequest === "function") {
-                createOrScalePool();
-            }
-            if (typeof binding.recvWorkerTermination === "function") {
-                waitingForWorkerTermination();
+            if (typeof binding.registerWorkerScheduler === "function") {
+                (0, loaderWorkerPool_1.runLoaderWorkerPool)(binding, require.resolve("@utoo/pack/cjs/binding.js"));
             }
         }
         async update(options) {

package/cjs/types.d.ts

@@ -144,6 +144,7 @@ export interface ConfigComplete {
         concatenateModules?: boolean;
         removeUnusedExports?: boolean;
         nestedAsyncChunking?: boolean;
+        inlineWasm?: boolean;
     };
     styles?: {
         less?: {

package/esm/binding.d.ts

@@ -9,20 +9,25 @@ export declare class ExternalObject<T> {
     [K: symbol]: T
   }
 }
-export interface PoolOptions {
-  filename: string
-  maxConcurrency: number
+export declare function registerWorkerScheduler(creator: (arg: NapiWorkerCreation) => any, terminator: (arg: NapiWorkerTermination) => any): void
+export declare function workerCreated(workerId: number): void
+export interface NapiWorkerCreation {
+  options: NapiWorkerOptions
 }
-export interface WorkerTermination {
-  filename: string
+export interface NapiWorkerOptions {
+  filename: RcStr
+  cwd: RcStr
+}
+export interface NapiWorkerTermination {
+  options: NapiWorkerOptions
   workerId: number
 }
-export declare function recvPoolRequest(): Promise<PoolOptions>
-export declare function recvWorkerTermination(): Promise<WorkerTermination>
-export declare function recvWorkerRequest(filename: string): Promise<number>
-export declare function recvMessageInWorker(workerId: number): Promise<string>
-export declare function notifyWorkerAck(taskId: number, workerId: number): Promise<void>
-export declare function sendTaskMessage(taskId: number, message: string): Promise<void>
+export interface NapiTaskMessage {
+  taskId: number
+  data: string
+}
+export declare function recvTaskMessageInWorker(workerId: number): Promise<NapiTaskMessage>
+export declare function sendTaskMessage(message: NapiTaskMessage): Promise<void>
 export interface NapiEndpointConfig {
   
 }

package/esm/binding.js

@@ -319,12 +319,10 @@ if (!nativeBinding) {
     }
     throw new Error(`Failed to load native binding`);
 }
-const { recvPoolRequest, recvWorkerTermination, recvWorkerRequest, recvMessageInWorker, notifyWorkerAck, sendTaskMessage, endpointWriteToDisk, endpointServerChangedSubscribe, endpointClientChangedSubscribe, projectNew, projectUpdate, projectOnExit, projectShutdown, projectWriteAllEntrypointsToDisk, projectEntrypointsSubscribe, projectHmrEvents, projectHmrIdentifiersSubscribe, projectUpdateInfoSubscribe, projectTraceSource, projectGetSourceForAsset, projectGetSourceMap, projectGetSourceMapSync, rootTaskDispose, initCustomTraceSubscriber, teardownTraceSubscriber } = nativeBinding;
-module.exports.recvPoolRequest = recvPoolRequest;
-module.exports.recvWorkerTermination = recvWorkerTermination;
-module.exports.recvWorkerRequest = recvWorkerRequest;
-module.exports.recvMessageInWorker = recvMessageInWorker;
-module.exports.notifyWorkerAck = notifyWorkerAck;
+const { registerWorkerScheduler, workerCreated, recvTaskMessageInWorker, sendTaskMessage, endpointWriteToDisk, endpointServerChangedSubscribe, endpointClientChangedSubscribe, projectNew, projectUpdate, projectOnExit, projectShutdown, projectWriteAllEntrypointsToDisk, projectEntrypointsSubscribe, projectHmrEvents, projectHmrIdentifiersSubscribe, projectUpdateInfoSubscribe, projectTraceSource, projectGetSourceForAsset, projectGetSourceMap, projectGetSourceMapSync, rootTaskDispose, initCustomTraceSubscriber, teardownTraceSubscriber } = nativeBinding;
+module.exports.registerWorkerScheduler = registerWorkerScheduler;
+module.exports.workerCreated = workerCreated;
+module.exports.recvTaskMessageInWorker = recvTaskMessageInWorker;
 module.exports.sendTaskMessage = sendTaskMessage;
 module.exports.endpointWriteToDisk = endpointWriteToDisk;
 module.exports.endpointServerChangedSubscribe = endpointServerChangedSubscribe;

package/esm/loaderWorkerPool.d.ts

@@ -0,0 +1 @@
+export declare function runLoaderWorkerPool(binding: typeof import("./binding"), bindingPath: string): Promise<void>;

package/esm/loaderWorkerPool.js

@@ -0,0 +1,27 @@
+import { Worker } from "worker_threads";
+const loaderWorkers = {};
+function getPoolId(cwd, filename) {
+    return `${cwd}:${filename}`;
+}
+export async function runLoaderWorkerPool(binding, bindingPath) {
+    binding.registerWorkerScheduler((creation) => {
+        const { options: { filename, cwd }, } = creation;
+        let poolId = getPoolId(cwd, filename);
+        const worker = new Worker(filename, {
+            workerData: {
+                bindingPath,
+                cwd,
+            },
+        });
+        worker.unref();
+        const workers = loaderWorkers[poolId] || (loaderWorkers[poolId] = new Map());
+        workers.set(worker.threadId, worker);
+    }, (termination) => {
+        var _a;
+        const { options: { filename, cwd }, workerId, } = termination;
+        let poolId = getPoolId(cwd, filename);
+        const workers = loaderWorkers[poolId];
+        (_a = workers.get(workerId)) === null || _a === void 0 ? void 0 : _a.terminate();
+        workers.delete(workerId);
+    });
+}

package/esm/project.js

@@ -1,6 +1,6 @@
 import { isDeepStrictEqual } from "util";
-import { Worker } from "worker_threads";
 import * as binding from "./binding";
+import { runLoaderWorkerPool } from "./loaderWorkerPool";
 import { rustifyEnv } from "./util";
 export class TurbopackInternalError extends Error {
     constructor(cause) {
@@ -163,59 +163,11 @@ export function projectFactory() {
         };
         return iterator;
     }
-    const loaderWorkers = {};
-    const createOrScalePool = async () => {
-        while (true) {
-            try {
-                let poolOptions = await binding.recvPoolRequest();
-                const { filename, maxConcurrency } = poolOptions;
-                const workers = loaderWorkers[filename] || (loaderWorkers[filename] = []);
-                if (workers.length < maxConcurrency) {
-                    for (let i = workers.length; i < maxConcurrency; i++) {
-                        const worker = new Worker(filename, {
-                            workerData: {
-                                poolId: filename,
-                                bindingPath: require.resolve("./binding.js"),
-                            },
-                        });
-                        worker.unref();
-                        workers.push(worker);
-                    }
-                }
-                else if (workers.length > maxConcurrency) {
-                    const workersToStop = workers.splice(0, workers.length - maxConcurrency);
-                    workersToStop.forEach((worker) => worker.terminate());
-                }
-            }
-            catch (e) {
-                return;
-            }
-        }
-    };
-    const waitingForWorkerTermination = async () => {
-        while (true) {
-            try {
-                const { filename, workerId } = await binding.recvWorkerTermination();
-                const workers = loaderWorkers[filename];
-                const workerIdx = workers.findIndex((worker) => worker.threadId === workerId);
-                if (workerIdx > -1) {
-                    const worker = workers.splice(workerIdx, 1);
-                    worker[0].terminate();
-                }
-            }
-            catch (e) {
-                return;
-            }
-        }
-    };
     class ProjectImpl {
         constructor(nativeProject) {
             this._nativeProject = nativeProject;
-            if (typeof binding.recvPoolRequest === "function") {
-                createOrScalePool();
-            }
-            if (typeof binding.recvWorkerTermination === "function") {
-                waitingForWorkerTermination();
+            if (typeof binding.registerWorkerScheduler === "function") {
+                runLoaderWorkerPool(binding, require.resolve("@utoo/pack/cjs/binding.js"));
             }
         }
         async update(options) {

package/esm/types.d.ts

@@ -144,6 +144,7 @@ export interface ConfigComplete {
         concatenateModules?: boolean;
         removeUnusedExports?: boolean;
         nestedAsyncChunking?: boolean;
+        inlineWasm?: boolean;
     };
     styles?: {
         less?: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@utoo/pack",
-  "version": "1.0.7",
+  "version": "1.0.8-alpha.1",
   "main": "cjs/index.js",
   "module": "esm/index.js",
   "exports": {
@@ -85,12 +85,12 @@
   },
   "repository": "git@github.com:utooland/utoo.git",
   "optionalDependencies": {
-    "@utoo/pack-darwin-arm64": "1.0.7",
-    "@utoo/pack-darwin-x64": "1.0.7",
-    "@utoo/pack-linux-arm64-gnu": "1.0.7",
-    "@utoo/pack-linux-arm64-musl": "1.0.7",
-    "@utoo/pack-linux-x64-gnu": "1.0.7",
-    "@utoo/pack-linux-x64-musl": "1.0.7",
-    "@utoo/pack-win32-x64-msvc": "1.0.7"
+    "@utoo/pack-darwin-arm64": "1.0.8-alpha.1",
+    "@utoo/pack-darwin-x64": "1.0.8-alpha.1",
+    "@utoo/pack-linux-arm64-gnu": "1.0.8-alpha.1",
+    "@utoo/pack-linux-arm64-musl": "1.0.8-alpha.1",
+    "@utoo/pack-linux-x64-gnu": "1.0.8-alpha.1",
+    "@utoo/pack-linux-x64-musl": "1.0.8-alpha.1",
+    "@utoo/pack-win32-x64-msvc": "1.0.8-alpha.1"
   }
 }