multi-tasks 1.0.2 → 1.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/LICENSE ADDED
@@ -0,0 +1,21 @@
1
+ MIT License
2
+
3
+ Copyright (c) 2024 Lei Zhang
4
+
5
+ Permission is hereby granted, free of charge, to any person obtaining a copy
6
+ of this software and associated documentation files (the "Software"), to deal
7
+ in the Software without restriction, including without limitation the rights
8
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9
+ copies of the Software, and to permit persons to whom the Software is
10
+ furnished to do so, subject to the following conditions:
11
+
12
+ The above copyright notice and this permission notice shall be included in all
13
+ copies or substantial portions of the Software.
14
+
15
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21
+ SOFTWARE.
package/README.md ADDED
@@ -0,0 +1,2 @@
1
+ # multi-tasks
2
+ multi-tasks
@@ -1,4 +1,4 @@
1
- let SuperConsumer = require('multi-task').SuperConsumer;
1
+ let SuperConsumer = require('../index').SuperConsumer;
2
2
 
3
3
 
4
4
  let _do = (mainTaskInfo, actions, callback)=>{
@@ -1,4 +1,4 @@
1
- let SuperProducer = require('multi-task').SuperProducer;
1
+ let SuperProducer = require('../index').SuperProducer;
2
2
  class TestProducer extends SuperProducer {
3
3
 
4
4
  // constructor
package/example/run.js CHANGED
@@ -1,5 +1,4 @@
1
1
  let fs = require('fs');
2
- let _ = require('lodash');
3
2
  let pathutil = require('path');
4
3
  let RunnerProducer = require('./RunnerProducer')
5
4
  let RunnerConsumer = require('./RunnerConsumer')
@@ -9,7 +8,7 @@ let multi_task_parent_folder = pathutil.resolve(__dirname, `../../../tasks-searc
9
8
 
10
9
  let producer = new RunnerProducer(`workers_of_${taskId}`, multi_task_parent_folder)
11
10
  let consumer = new RunnerConsumer();
12
- let master = require('multi-task').master;
11
+ let master = require('../index').master;
13
12
 
14
13
  console.log(producer.getTaskName())
15
14
  //return;
@@ -1,6 +1,14 @@
1
1
  let fs = require('fs');
2
+ const jsonFormat = require('json-format');
2
3
  let pathutil = require('path');
4
+ const { spawn, exec } = require('child_process');
3
5
  let SuperConsumer = require('../index').SuperConsumer;
6
+ let localUtil = require('./util');
7
+ const makeDir = require('make-dir');
8
+
9
+ let thisroot = pathutil.parse(__filename).dir;
10
+ let garbagedir = pathutil.resolve(thisroot,`./tmp-garbage`);
11
+ makeDir.sync(garbagedir);
4
12
 
5
13
  let loadTaskFile = (dir)=>{
6
14
  var results = []
@@ -12,40 +20,138 @@ let loadTaskFile = (dir)=>{
12
20
  }catch(e){
13
21
  //Must try-catch, the file maybe deleted by other process
14
22
  }
15
- if (stat && !stat.isDirectory()) results.push({file, fpath: pathutil.resolve(dir, file)});
23
+ if (stat && !stat.isDirectory()) results.push({
24
+ file,
25
+ fpath: pathutil.resolve(dir, file)
26
+ });
16
27
  })
17
28
  //console.log(results);
18
29
  return results;
19
30
  };
20
- let mvTask = (oldPath, newPath, oldfname, callback)=>{
21
- if(typeof callback === 'undefined') callback = ()=>{};
22
- //console.log('>>>', oldPath, newPath, oldfname)
23
- let oldfPath = pathutil.resolve(oldPath, oldfname);
24
- let newfPath = pathutil.resolve(newPath, oldfname);
25
- //if(fs.existsSync(newfPath)) fs.rmSync(newfPath, {force: true});
26
- fs.rename(oldfPath, newfPath, (err) => {
27
- if (err) throw err;
28
- callback(newfPath);
31
+ let processTask = (moduleName, requestVersion, callback)=>{
32
+ let outputs = [];
33
+ let ls = spawn(`ls`, [], {cwd: garbagedir, shell: true});
34
+ ls.stdout.on('data', (data) => {
35
+ let stdout = data.toString();
36
+ outputs.push(stdout);
37
+ //console.log('[stdout]', stdout)
38
+ });
39
+ ls.stderr.on('data', (data) => {
40
+ let stdout = data.toString();
41
+ //console.log('[stderr]', stdout)
42
+ outputs.push(stdout);
43
+ });
44
+ ls.on('close', (code) => {
45
+ //console.log('[close]', code)
46
+ // if(code === 1) {
47
+ // console.log('[error], checkout failed!!')
48
+ // }
49
+ let succ = true;
50
+ let logTxt = outputs.join('');
51
+
52
+ if(logTxt.indexOf('ERR!')>=0 && logTxt.match(/ERR\!/g)) {
53
+ succ = false;
54
+ }
55
+ let logJson;
56
+ try{
57
+ logJson = JSON.parse(logTxt);
58
+ }catch(e){
59
+ console.log(e)
60
+ console.log(`at===`, moduleName, requestVersion)
61
+ console.log(`logTxt===`, logTxt)
62
+ succ = false;
63
+ }
64
+ if(succ && logJson){
65
+ if(!Array.isArray(logJson)){
66
+ logJson = [logJson];
67
+ };
68
+ let data = {
69
+ response: logJson,
70
+ __info__: {
71
+ moduleName,
72
+ requestVersion,
73
+ }
74
+ };
75
+ callback(true, data);
76
+ }else{
77
+ callback(false, logTxt);
78
+ }
29
79
  });
30
- };
80
+
81
+ }
31
82
 
32
83
  let _do = (mainTaskInfo, actions, callback)=>{
33
84
  let{dynamicTasksFolderNew, dynamicTasksFolderSucc, dynamicTasksFolderFail} = mainTaskInfo.defination;
85
+ let tasks = loadTaskFile(dynamicTasksFolderNew);
86
+ if(tasks.length === 0) return callback({data:'hahaha'+Math.random()});//stop!
34
87
 
35
- let tasks = loadTaskFile(dynamicTasksFolderNew);
36
-
37
- if(tasks.length === 0) return callback({data:'hahaha'+Math.random()});
38
- let task = tasks[0];
39
- let fpath = task.fpath;
88
+ tasks = localUtil.shuffleAnArray(tasks);//avoid file IO conflicts
40
89
 
41
- mvTask(dynamicTasksFolderNew, dynamicTasksFolderSucc, task.file);
42
-
43
- {
44
- //processing...
45
- console.log('processing...', fpath);
90
+ let task;
91
+ let data;
92
+ while(!data){
93
+ task = tasks.shift();
94
+ try{
95
+ data = JSON.parse(fs.readFileSync(task.fpath, 'utf8'));
96
+ }catch(e){
97
+ console.log('xxxx')
98
+ }
46
99
  }
47
100
 
48
- _do(mainTaskInfo, actions, callback);
101
+ if(task && data){
102
+ let fpath = task.fpath;
103
+ {
104
+ //processing...
105
+ let {moduleName, requestVersion, fullnameMd5} = data.info;
106
+ let oldfPath = fpath;
107
+ let newfPath = pathutil.resolve(dynamicTasksFolderNew, `${fullnameMd5}.json`);
108
+ let succfPath = pathutil.resolve(dynamicTasksFolderSucc, `${fullnameMd5}.json`);
109
+ let errfPath = pathutil.resolve(dynamicTasksFolderFail, `${fullnameMd5}.json`);
110
+ if(fs.existsSync(succfPath) || fs.existsSync(errfPath)) {
111
+ console.log('exist...', process.pid, fullnameMd5);
112
+ if(fs.existsSync(newfPath))
113
+ try{
114
+ fs.unlinkSync(newfPath);
115
+ }catch(e){
116
+ console.log('remove failed', process.pid, newfPath, e);
117
+ }
118
+ _do(mainTaskInfo, actions, callback);
119
+ }else {
120
+ console.log('processing...', process.pid, fpath);
121
+ processTask(moduleName, requestVersion, (succ, logJson)=>{
122
+ if(succ){
123
+ fs.writeFileSync(succfPath, jsonFormat(logJson));
124
+ logJson.response.forEach((item)=>{
125
+ if(item.dependencies){
126
+ for(let module2 in item.dependencies){
127
+ let version2 = item.dependencies[module2];
128
+ console.log('found new task', module2, version2);
129
+ localUtil.createNewTask(module2, version2, dynamicTasksFolderNew);//find new one, create a new task file
130
+ }
131
+ }
132
+ });
133
+ }else{
134
+ console.log('ERR! failed', moduleName, requestVersion);
135
+ fs.writeFileSync(pathutil.resolve(dynamicTasksFolderFail, `${fullnameMd5}.json`), jsonFormat({
136
+ moduleName, requestVersion,
137
+ msg: logJson
138
+ }));
139
+ }
140
+ _do(mainTaskInfo, actions, callback);
141
+ });
142
+ }
143
+ if(fs.existsSync(oldfPath)){
144
+ try{
145
+ fs.unlinkSync(oldfPath);
146
+ }catch(e){
147
+ console.log('remove failed', process.pid, oldfPath, e);
148
+ }
149
+ }
150
+ }
151
+ }else{
152
+ console.log('__done2', process.pid)
153
+ return callback({data:'hahaha'+Math.random()});//stop!
154
+ }
49
155
  };
50
156
 
51
157
 
@@ -1,4 +1,24 @@
1
1
  let SuperProducer = require('../index').SuperProducer;
2
+ const fs = require('fs');
3
+ let pathutil = require('path');
4
+ const jsonFormat = require('json-format');
5
+
6
+ let thisroot = pathutil.parse(__filename).dir;
7
+
8
+ let localUtil = require('./util')
9
+
10
+
11
+ let createInitialTasks = (info)=>{
12
+ let succList = JSON.parse(fs.readFileSync(pathutil.resolve(thisroot,'../tmp/version_succList.json'), 'utf8'));
13
+ //succList = succList.slice(0, 20);
14
+ succList.forEach((item)=>{
15
+ let {moduleName, requestVersion} = item;
16
+ localUtil.createNewTask(moduleName, requestVersion, info.dynamicTasksFolderNew);
17
+ });
18
+ };
19
+
20
+
21
+
2
22
  class TestProducer extends SuperProducer {
3
23
 
4
24
  // constructor
@@ -10,7 +30,7 @@ class TestProducer extends SuperProducer {
10
30
  this.trunkInfo = trunkInfo;
11
31
  }
12
32
  getAllActions() {
13
-
33
+ createInitialTasks(this.trunkInfo);
14
34
  return new Promise((resolve, reject)=>{
15
35
  let trunkInfo = this.trunkInfo;
16
36
  let {NUMBER_OF_WORKS} = trunkInfo;
@@ -18,7 +38,7 @@ class TestProducer extends SuperProducer {
18
38
  //throw repos.length+'ff'+repos2.length
19
39
  //here, IGNORED_repoRegexStringList
20
40
  let alltasks = []
21
- for(let i=0;i<NUMBER_OF_WORKS;i++){
41
+ for(let i=0;i<NUMBER_OF_WORKS;i++){//the task was driven by files, not here
22
42
  alltasks.push({
23
43
  num:i
24
44
  })
@@ -6,7 +6,7 @@ let RunnerConsumer = require('./RunnerConsumer')
6
6
 
7
7
  let thisroot = pathutil.parse(__filename).dir;
8
8
  let taskId = `workers_of_${Math.random()}`;
9
- let multi_task_parent_folder = pathutil.resolve(thisroot, `../../../multi-tasks-example2-dynamicIncreasing`);
9
+ let multi_task_parent_folder = pathutil.resolve(thisroot, `../../example2_dynamicly_increasing`);
10
10
 
11
11
  let producer = new RunnerProducer(taskId, multi_task_parent_folder)
12
12
  let consumer = new RunnerConsumer();
@@ -15,7 +15,7 @@ let master = require('../index').master;
15
15
  console.log(producer.getTaskName())
16
16
  //return;
17
17
 
18
- let NUMBER_OF_WORKS = 6;//LOCK NUMBER OF WORKERS
18
+ let NUMBER_OF_WORKS = 5;//LOCK NUMBER OF WORKERS
19
19
 
20
20
  let taskConfig = {
21
21
  NUMBER_OF_WORKS,
@@ -23,10 +23,9 @@ let taskConfig = {
23
23
  dynamicTasksFolderSucc: pathutil.resolve(multi_task_parent_folder, `./dynamicTasks-SUCC`),
24
24
  dynamicTasksFolderFail: pathutil.resolve(multi_task_parent_folder, `./dynamicTasks-FAIL`),
25
25
  }
26
-
27
- if(!fs.existsSync(taskConfig.dynamicTasksFolderNew)) throw "Must create folder, DO NOT create by code!";
28
- if(!fs.existsSync(taskConfig.dynamicTasksFolderSucc)) throw "Must create folder, DO NOT create by code!";
29
- if(!fs.existsSync(taskConfig.dynamicTasksFolderFail)) throw "Must create folder, DO NOT create by code!";
26
+ makeDir.sync(taskConfig.dynamicTasksFolderNew)
27
+ makeDir.sync(taskConfig.dynamicTasksFolderSucc)
28
+ makeDir.sync(taskConfig.dynamicTasksFolderFail)
30
29
 
31
30
 
32
31
  producer.setTaskTrunkInfo(taskConfig);
@@ -0,0 +1,47 @@
1
+ const md5 = require('md5');
2
+ const fs = require('fs');
3
+ let pathutil = require('path');
4
+ const jsonFormat = require('json-format');
5
+
6
+ let getFileName = (moduleName, requestVersion)=>{
7
+ let fullname = `${moduleName}@${requestVersion}`;
8
+ let fullnameMd5 = md5(fullname);
9
+ return fullnameMd5;
10
+ };
11
+ let createNewTask = (moduleName, requestVersion, dynamicTasksFolderNew)=>{
12
+ let fullnameMd5 = getFileName(moduleName, requestVersion);
13
+ fs.writeFileSync(pathutil.resolve(dynamicTasksFolderNew, `./${fullnameMd5}.json`), jsonFormat({
14
+ info:{
15
+ moduleName,
16
+ requestVersion,
17
+ fullnameMd5,
18
+ }
19
+ }));
20
+ };
21
+ function shuffleAnArray(array) {
22
+ if(array.length === 0 || array.length === 1) return array;
23
+ let currentIndex = array.length, randomIndex;
24
+
25
+ // While there remain elements to shuffle.
26
+ while (currentIndex > 0) {
27
+
28
+ // Pick a remaining element.
29
+ randomIndex = Math.floor(Math.random() * currentIndex);
30
+ currentIndex--;
31
+
32
+ // And swap it with the current element.
33
+ let tmp = array[currentIndex];
34
+ array[currentIndex] = array[randomIndex];
35
+ array[randomIndex] = tmp;
36
+
37
+ // [array[currentIndex], array[randomIndex]] = [
38
+ // array[randomIndex], array[currentIndex]];
39
+ }
40
+
41
+ return array;
42
+ }
43
+ module.exports = {
44
+ createNewTask,
45
+ getFileName,
46
+ shuffleAnArray
47
+ };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "multi-tasks",
3
- "version": "1.0.2",
3
+ "version": "1.0.4",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "directories": {
package/workers/master.js CHANGED
@@ -62,12 +62,19 @@ let run = (currentProducer, currentConsumer, opt)=>{
62
62
  if(message === MSG_REQUEST_TASKID){
63
63
  if(taskStack.length > 0){
64
64
  let subTaskInfo = taskStack.shift();
65
- worker.send({
66
- startTimestamp: new Date()*1,
67
- mainTaskInfo,
68
- subTaskInfo,
69
- totalTaskNum
70
- })
65
+ let _sendMsg = ()=>{
66
+ worker.send({
67
+ startTimestamp: new Date()*1,
68
+ mainTaskInfo,
69
+ subTaskInfo,
70
+ totalTaskNum
71
+ },()=>{
72
+ //handler
73
+ }, {
74
+ keepOpen: (typeof opt.keepOpen === 'undefined') ? true : opt.keepOpen
75
+ })
76
+ };
77
+ _sendMsg();
71
78
  }else{
72
79
  removeWorker(worker.id)
73
80
  worker.kill();