multi-tasks 1.0.5 → 1.0.7

package/example/RunnerProducer.js

@@ -17,7 +17,7 @@ class TestProducer extends SuperProducer {
            //throw repos.length+'ff'+repos2.length
             //here, IGNORED_repoRegexStringList
             let alltasks = []
-            for(let i=0;i<100;i++){
+            for(let i=0;i<200;i++){
                 alltasks.push({
                     num:i
                 })

package/example/run.js

@@ -4,7 +4,7 @@ let RunnerProducer = require('./RunnerProducer')
 let RunnerConsumer = require('./RunnerConsumer')
 
 let taskId = Math.random()+'';
-let multi_task_parent_folder = pathutil.resolve(__dirname, `../../../tasks-search-keywords`);
+let multi_task_parent_folder = `C:/tmp-demo`;
 
 let producer = new RunnerProducer(`workers_of_${taskId}`, multi_task_parent_folder)
 let consumer = new RunnerConsumer();

package/package.json

@@ -1,23 +1,22 @@
-{
-  "name": "multi-tasks",
-  "version": "1.0.5",
-  "description": "",
-  "main": "index.js",
-  "directories": {
-    "example": "example"
-  },
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [
-    "multitask",
-    "worker",
-    "multithread"
-  ],
-  "dependencies": {
-    "moment":"2.29.4",
-    "make-dir":"^3.1.0"
-  },
-  "author": "zhanglei923@gmail.com",
-  "license": "MIT"
-}
+{
+  "name": "multi-tasks",
+  "version": "1.0.7",
+  "description": "",
+  "main": "index.js",
+  "directories": {
+    "example": "example"
+  },
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [
+    "multitask",
+    "worker",
+    "multithread"
+  ],
+  "dependencies": {
+    "make-dir":"^3.1.0"
+  },
+  "author": "zhanglei923@gmail.com",
+  "license": "MIT"
+}

package/workers/SuperProducer.js

@@ -1,8 +1,20 @@
 let fs = require('fs');
-let moment = require('moment');
 let pathutil = require('path');
 let makeDir = require('make-dir');
 let splitter = require('./taskSplitter');
+let fmtdigit = (n)=>{
+    return n > 9 ? "" + n: "0" + n;
+}
+let getDateTimeTxt = ()=>{
+    let d=new Date();
+    let YYYY=d.getFullYear()
+    let MM=fmtdigit(d.getMonth()+1);
+    let DD=fmtdigit(d.getDate());
+    let HH=fmtdigit(d.getHours());
+    let mm=fmtdigit(d.getMinutes());
+    let ss=fmtdigit(d.getSeconds());
+    return `${YYYY}-${MM}-${DD}_${HH}-${mm}-${ss}`;
+};
 class SuperProducer {
     // constructor
     constructor(taskname, parentfolder) {
@@ -20,7 +32,7 @@ class SuperProducer {
     }
     generateTasks (quota, callback){
         if(typeof quota === 'undefined' || !quota)quota=10;
-        let dateTimeText = moment().format('YYYY-MM-DD_HH-mm-ss');
+        let dateTimeText = getDateTimeTxt();//moment().format('YYYY-MM-DD_HH-mm-ss');
         let masterTaskId = `${this.taskname}_${dateTimeText}`;
         console.log('masterTaskId=',masterTaskId);
         this.taskfolder = pathutil.resolve(this.parentfolder, masterTaskId)
@@ -45,17 +57,20 @@ class SuperProducer {
 
         
             console.log('allSubTasks=', allSubTasks.length)
+
+            let allSubTasksId = [];
     
             allSubTasks.forEach((info, i)=>{
                 let subid = i;
                 info.subid = subid;
+                allSubTasksId.push(subid+'');
                 let taskfilepath = pathutil.resolve(taskFolderNew, `./${info.subid}.task.json`);
                 fs.writeFileSync(taskfilepath, JSON.stringify(info));
             });
     
             callback({
                 masterTaskId,
-                allSubTasks,
+                allSubTasksId,
                 //mainRptFolder,
                 taskFolder,
                 taskFolderNew,

package/workers/master.js

@@ -2,7 +2,6 @@ var fs = require('fs');
 var pathutil = require('path');
 const cluster = require('cluster');
 const numCPUs = require('os').cpus().length;
-let moment = require('moment');
 
 
 let MSG_REQUEST_TASKID = 'request_taskid';
@@ -12,9 +11,19 @@ let MSG_REQUEST_TASKID = 'request_taskid';
  *   -masterTaskId, id of a master, will rename to masterId 
  *     -task, a child computing process
  */
-
+let fmtdigit = (n)=>{
+  return n > 9 ? "" + n: "0" + n;
+}
  let getDateTimeTxt = ()=>{
-  return moment().format('YYYY-MM-DD HH:mm:ss');
+    let d=new Date();
+    let YYYY=d.getFullYear()
+    let MM=fmtdigit(d.getMonth()+1);
+    let DD=fmtdigit(d.getDate());
+    let HH=fmtdigit(d.getHours());
+    let mm=fmtdigit(d.getMinutes());
+    let ss=fmtdigit(d.getSeconds());
+    //return moment().format('YYYY-MM-DD HH:mm:ss');
+    return `${YYYY}-${MM}-${DD} ${HH}:${mm}:${ss}`;
 };
 let workidlist = new Set();
 let addWorker = (wid)=>{
@@ -49,7 +58,7 @@ let run = (currentProducer, currentConsumer, opt)=>{
 
       currentProducer.generateTasks(opt.quotaOfEachTask, (mainTaskInfo)=>{
           //get ready
-          taskStack = mainTaskInfo.allSubTasks;
+          taskStack = mainTaskInfo.allSubTasksId;
           let totalTaskNum = taskStack.length; 
           console.log( 'tasks=', mainTaskInfo.masterTaskId);
           console.log( 'totalTaskNum=', totalTaskNum);
@@ -61,12 +70,12 @@ let run = (currentProducer, currentConsumer, opt)=>{
               //console.log(`(master).${process.pid} got: '${JSON.stringify(message)}' from w.${worker.process.pid}`);
               if(message === MSG_REQUEST_TASKID){
                 if(taskStack.length > 0){     
-                  let subTaskInfo = taskStack.shift();
+                  let subTaskId = taskStack.shift();
                   let _sendMsg = ()=>{
                     worker.send({
                       startTimestamp: new Date()*1,
                       mainTaskInfo,
-                      subTaskInfo,
+                      subTaskId,
                       totalTaskNum
                     },()=>{
                       //handler
@@ -101,9 +110,12 @@ let run = (currentProducer, currentConsumer, opt)=>{
       //console.log(`>[w]=${process.pid} started`);
       process.on('message', function(message) {});
       worker.on('message', function(message) {
-          if(message.subTaskInfo){
+          if(message.subTaskId){
               let mainTaskInfo = message.mainTaskInfo;
-              let subTaskInfo = message.subTaskInfo;
+              //console.log(message);
+              let subTaskFilePath = pathutil.resolve(mainTaskInfo.taskFolderNew, `./${message.subTaskId}.task.json`);
+              let subTaskInfo = JSON.parse(fs.readFileSync(subTaskFilePath));
+              //let subTaskInfo = message.subTaskInfo;
               let subid = subTaskInfo.subid;
               if(mainTaskInfo){
                     console.log(`[Task Start]: "${subid}"`, `${subid}/${message.totalTaskNum}`, `pid=${process.pid}`, getDateTimeTxt());