multi-tasks 3.3.0 → 3.4.0

package/workers/TaskMgr.js

@@ -255,6 +255,21 @@ const TaskMgr = {
             callback(newPath, false);
         }
     },
+    //同步版: master 侧超时/崩溃归档专用(非热路径)。异步 rename 在 master 判定全部完成 exit 时
+    //可能未落盘, 任务滞留 running 被静默跳过; renameSync 保证返回即落盘(勿回退成 fire-and-forget 异步)
+    mvTaskSync: (subid, from, to)=> {
+        runLog.write('Move task(sync):', subid, `${from}>${to}`);
+        let {progressRootFolder} = main_config;
+        let oldPath = pathutil.resolve(progressRootFolder, `./${from}/${subid}.task.json`);
+        let newPath = pathutil.resolve(progressRootFolder, `./${to}/${subid}.task.json`);
+        try{
+            fs.renameSync(oldPath, newPath);
+            return true;
+        }catch(e){
+            runLog.warn(e);
+            return false;
+        }
+    },
     saveTaskResult:(subid, hasError, data)=>{
         //数据不可 JSON 序列化时不抛错(抛错会把任务吞掉)也不翻转成败: 任务跑通了只是结果存不下,
         //结果文件改写为说明占位(成功侧对象本体, 错误侧包成数组), 任务状态不受影响; 同步写用户消息文件
@@ -374,6 +389,17 @@ const TaskMgr = {
         let {taskFolderResultFailed, taskFolderFailed} = main_config;
         forEachResult(taskFolderResultFailed, taskFolderFailed, cb);
     },
+    forEachResult:(cb)=>{//无所谓成败遍历全部结果: 先 succ(succeeded=true) 后 errors(false), count 两段连续编号
+        let {taskFolderResult, taskFolderResultFailed, taskFolderFinished, taskFolderFailed} = main_config;
+        let offset = 0;
+        forEachResult(taskFolderResult, taskFolderFinished, (count, task, result)=>{
+            cb(count, task, result, true);
+            offset = count + 1;
+        });
+        forEachResult(taskFolderResultFailed, taskFolderFailed, (count, task, err)=>{
+            cb(offset + count, task, err, false);
+        });
+    },
     resetTaskFolders:(taskFolder)=>{
         fs.rmSync(taskFolder, {recursive: true, force: true});
     },

package/workers/WorkerMgr.js

@@ -1,27 +1,18 @@
-let workers = {};
-let status = {};
-
-const runLog = require('../utils/runLog');
-
-const mgr = {
-    addWorker:(worker)=>{
-        let id = `${worker.id}`;
-        if(workers[id] || status[id]){
-            throw new Error('FATAL: duplicated worker!');
-        }
-        status[id] = {isBusy: true};
-        runLog.write('add worker', worker.id);
-        workers[id] = worker;
-    },
-    getWorker:(id)=>{
-        return workers[`${id}`];
-    },
-    setBusy:(id, isBusy)=>{
-        status[`${id}`] = {isBusy: isBusy};
-    },
-    isBusy:(id)=>{
-        let s = status[`${id}`];
-        return s ? s.isBusy : false;
-    }
-};
-module.exports = mgr;
+let workers = {};
+
+const runLog = require('../utils/runLog');
+
+const mgr = {
+    addWorker:(worker)=>{
+        let id = `${worker.id}`;
+        if(workers[id]){
+            throw new Error('FATAL: duplicated worker!');
+        }
+        runLog.write('add worker', worker.id);
+        workers[id] = worker;
+    },
+    removeWorker:(id)=>{//worker 退出(含崩溃补员)时清引用: map 只增不减会累积死 worker
+        delete workers[`${id}`];
+    }
+};
+module.exports = mgr;