xhs-mp-compiler-cli 1.3.4 → 1.4.0-beta.0

package/dist/sharedFs.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const sharedFs = require('xhs-mp-shared-fs');
+exports.default = sharedFs;

package/dist/utils/workerPool.d.ts

@@ -0,0 +1,29 @@
+declare class WorkerPool {
+    workerPath: string;
+    numberOfThreads: number;
+    _queue: any[];
+    _workersById: {
+        [key: string]: any;
+    };
+    _activeWorkersById: {
+        [key: string]: any;
+    };
+    constructor(workerPath: any, options?: {}, numberOfThreads?: any);
+    /**
+     * 检查空闲的 Worker
+     */
+    getInactiveWorkerId(): number;
+    /**
+     * 调用 Worker 执行，目的是在指定的 Worker 里执行指定的任务
+     */
+    runWorker(workerId: any, taskObj: any): void;
+    /**
+     * 运行线程
+     */
+    run(data: any): Promise<unknown>;
+    /**
+     * 销毁
+     */
+    destroy(force?: boolean): void;
+}
+export default WorkerPool;

package/dist/utils/workerPool.js

@@ -0,0 +1,115 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+// 获取当前设备的 CPU 线程数目，作为 numberOfThreads 的默认值。
+const { length: cpusLength } = require('os').cpus();
+const { Worker } = require('worker_threads');
+class WorkerPool {
+    constructor(workerPath, options = {}, numberOfThreads = cpusLength) {
+        this._workersById = {};
+        this._activeWorkersById = {};
+        if (numberOfThreads < 1) {
+            throw new Error('Number of threads should be greater or equal than 1!');
+        }
+        this.workerPath = workerPath;
+        this.numberOfThreads = numberOfThreads;
+        // 任务队列
+        this._queue = [];
+        // Worker 索引
+        this._workersById = {};
+        // Worker 激活状态索引
+        this._activeWorkersById = {};
+        // 创建 Workers
+        for (let i = 0; i < this.numberOfThreads; i++) {
+            const worker = new Worker(workerPath, options);
+            this._workersById[i] = worker;
+            // 将这些 Worker 设置为未激活状态
+            this._activeWorkersById[i] = false;
+        }
+    }
+    /**
+     * 检查空闲的 Worker
+     */
+    getInactiveWorkerId() {
+        for (let i = 0; i < this.numberOfThreads; i++) {
+            if (!this._activeWorkersById[i])
+                return i;
+        }
+        return -1;
+    }
+    /**
+     * 调用 Worker 执行，目的是在指定的 Worker 里执行指定的任务
+     */
+    runWorker(workerId, taskObj) {
+        const worker = this._workersById[workerId];
+        // 当任务执行完毕后执行
+        const doAfterTaskIsFinished = () => {
+            // 去除所有的 Listener，不然一次次添加不同的 Listener 会内存溢出（OOM）
+            worker.removeAllListeners('message');
+            worker.removeAllListeners('error');
+            // 将这个 Worker 设为未激活状态
+            this._activeWorkersById[workerId] = false;
+            if (this._queue.length) {
+                // 任务队列非空，使用该 Worker 执行任务队列中第一个任务
+                this.runWorker(workerId, this._queue.shift());
+            }
+        };
+        // 将这个 Worker 设置为激活状态
+        this._activeWorkersById[workerId] = true;
+        // 设置两个回调，用于 Worker 的监听器
+        const messageCallback = result => {
+            taskObj.cb(null, result);
+            doAfterTaskIsFinished();
+        };
+        const errorCallback = error => {
+            taskObj.cb(error);
+            doAfterTaskIsFinished();
+        };
+        // 为 Worker 添加 'message' 和 'error' 两个 Listener
+        worker.once('message', messageCallback);
+        worker.once('error', errorCallback);
+        // 将数据传给 Worker 供其获取和执行
+        worker.postMessage(taskObj.data);
+    }
+    /**
+     * 运行线程
+     */
+    run(data) {
+        // Promise 是个好东西
+        return new Promise((resolve, reject) => {
+            // 调用 getInactiveWorkerId() 获取一个空闲的 Worker
+            const availableWorkerId = this.getInactiveWorkerId();
+            const taskObj = {
+                data,
+                cb: (error, result) => {
+                    // 虽然 Workers 需要使用 Listener 和 Callback，但这不能阻止我们使用 Promise，对吧？
+                    // 不，你不能 util.promisify(taskObj) 。人不能，至少不应该。
+                    if (error)
+                        reject(error);
+                    return resolve(result);
+                }
+            };
+            if (availableWorkerId === -1) {
+                // 当前没有空闲的 Workers 了，把任务丢进队列里，这样一旦有 Workers 空闲时就会开始执行。
+                this._queue.push(taskObj);
+                return null;
+            }
+            // 有一个空闲的 Worker，用它执行任务
+            this.runWorker(availableWorkerId, taskObj);
+        });
+    }
+    /**
+     * 销毁
+     */
+    destroy(force = false) {
+        for (let i = 0; i < this.numberOfThreads; i++) {
+            if (this._activeWorkersById[i] && !force) {
+                // 通常情况下，不应该在还有 Worker 在执行的时候就销毁它，这一定是什么地方出了问题，所以还是抛个 Error 比较好
+                // 不过保留一个 force 参数，总有人用得到的
+                throw new Error(`The worker ${i} is still runing!`);
+            }
+            // 销毁这个 Worker
+            this._workersById[i].terminate();
+        }
+    }
+}
+exports.default = WorkerPool;

package/package.json

@@ -1,11 +1,24 @@
 {
   "name": "xhs-mp-compiler-cli",
-  "version": "1.3.4",
+  "version": "1.4.0-beta.0",
   "description": "xhs mp command tool.",
   "preferGlobal": true,
   "category": "esm",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "require": "./dist/index.js",
+      "import": "./dist/index.js",
+      "types": "./dist/index.d.ts"
+    },
+    "./sharedFs": {
+      "require": "./dist/sharedFs.js",
+      "import": "./dist/sharedFs.js",
+      "types": "./dist/sharedFs.d.ts"
+    },
+    "./*.map": "./dist/*.map"
+  },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
@@ -20,11 +33,6 @@
   "author": "zyu1 <fuzhu@xiaohongshu.com>",
   "license": "MIT",
   "dependencies": {
-    "archiver": "^7.0.1",
-    "debug": "^4.3.4",
-    "globby": "^11.1.0",
-    "query-string": "^8.1.0",
-    "yauzl": "^2.10.0",
     "@babel/core": "^7.12.10",
     "@babel/generator": "^7.12.10",
     "@babel/parser": "^7.12.10",
@@ -38,11 +46,11 @@
     "@swc/core": "^1.3.74",
     "@swc/helpers": "^0.5.1",
     "@vue/babel-preset-jsx": "^1.2.4",
+    "archiver": "^7.0.1",
     "babel-loader": "^8.2.2",
     "babel-plugin-istanbul": "^6.0.0",
     "babel-preset-minify": "^0.4.3",
     "clean-webpack-plugin": "^3.0.0",
-    "uuid": "^9.0.1",
     "clone": "^2.1.2",
     "commander": "^8.0.0",
     "copy-webpack-plugin": "^9.0.1",
@@ -50,11 +58,13 @@
     "css-loader": "^5.0.2",
     "css-minimizer-webpack-plugin": "^1.2.0",
     "cssnano": "4.1.10",
+    "debug": "^4.3.4",
     "enhanced-resolve": "^5.8.3",
     "fork-ts-checker-webpack-plugin": "^6.1.0",
     "friendly-errors-webpack-plugin": "^1.7.0",
     "fs-extra": "^10.0.0",
     "glob": "^8.0.1",
+    "globby": "^11.1.0",
     "htmlparser2": "^7.1.2",
     "lodash": "^4.17.21",
     "mini-css-extract-plugin": "^1.6.2",
@@ -67,6 +77,7 @@
     "postcss-prefix-selector": "^1.10.0",
     "postcss-preset-env": "^6.7.0",
     "postcss-pxtorem": "^5.1.1",
+    "query-string": "^8.1.0",
     "querystring": "^0.2.1",
     "source-map": "^0.6.1",
     "speed-measure-webpack-plugin": "^1.5.0",
@@ -75,6 +86,7 @@
     "tapable": "^2.2.1",
     "terser-webpack-plugin": "^5.2.4",
     "typescript": "^5.1.6",
+    "uuid": "^9.0.1",
     "vue": "^3.2.26",
     "vue-loader": "^16.4.1",
     "vue-style-loader": "^4.1.2",
@@ -82,11 +94,13 @@
     "webpack-bundle-analyzer": "^4.4.0",
     "webpack-chain": "^6.5.1",
     "webpack-sources": "^3.2.2",
-    "xhs-mp-compiler-ml-loader": "1.3.4",
-    "xhs-mp-compiler-utils": "1.2.4",
-    "xhs-mp-pack": "^1.2.4",
-    "xhs-mp-project": "^1.2.4",
-    "xhs-mp-utils": "^1.3.4"
+    "xhs-mp-compiler-ml-loader": "1.4.0-beta.0",
+    "xhs-mp-compiler-utils": "1.3.0-beta.0",
+    "xhs-mp-pack": "^1.3.0-beta.0",
+    "xhs-mp-project": "^1.3.0-beta.0",
+    "xhs-mp-utils": "^1.4.0-beta.0",
+    "xhs-mp-shared-fs": "^1.1.0-beta.0",
+    "yauzl": "^2.10.0"
   },
   "devDependencies": {
     "@types/babel__generator": "7.6.3",