@nger/fk-upload 1.0.79 → 1.0.82

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.
Files changed (6) hide show
  1. package/dist/fk-v2.service.js +0 -1
  2. package/dist/main.js +0 -3
  3. package/dist/templates/tasks/download-task.js +5 -3
  4. package/dist/templates/tasks/effect-task.js +3 -3
  5. package/dist/templates/tasks/upload-task.js +10 -4
  6. package/package.json +1 -1
package/dist/fk-v2.service.js CHANGED
@@ -107,7 +107,6 @@ let FkV2Service = class FkV2Service {
107
107
  }
108
108
  }).then(res => {
109
109
  const cookies = res.headers['set-cookie'];
110
- console.log(cookies);
111
110
  return res.data;
112
111
  });
113
112
  }
package/dist/main.js CHANGED
@@ -44,11 +44,8 @@ exports.AppModule = AppModule;
44
44
  process.send('ready');
45
45
  });
46
46
  process.on('uncaughtException', (err) => {
47
- console.log(err.message);
48
47
  });
49
48
  process.on('unhandledRejection', (reason, promisen) => {
50
49
  promisen.catch((e) => {
51
- console.log(e.message);
52
- console.log(e.stack);
53
50
  });
54
51
  });
package/dist/templates/tasks/download-task.js CHANGED
@@ -33,7 +33,8 @@ class DownloadTask extends rabbitmq_1.Task {
33
33
  const fail = injector.get(rabbitmq_1.FAIL);
34
34
  const download = await db.manager.findOne(entities_1.FkDownloadTaskEntity, { where: { filename: task.filename } });
35
35
  if (download.status !== 0) {
36
- complete();
36
+ await complete();
37
+ this.downloadingCount -= 1;
37
38
  return next && next();
38
39
  }
39
40
  (0, fs_extra_1.ensureDir)((0, path_1.dirname)(task.path));
@@ -71,16 +72,17 @@ class DownloadTask extends rabbitmq_1.Task {
71
72
  console.log(`file download success ${task.filename}: ${fileMd5}`);
72
73
  const uploadTask = await this.createUploadTask(task, total, fileMd5, injector);
73
74
  await manager.send(uploadTask);
74
- complete();
75
+ await complete();
75
76
  this.downloadingCount -= 1;
76
77
  });
77
78
  req.on('response', async (resp) => {
78
79
  const headers = resp.headers;
79
80
  total = Number(headers["content-length"]);
81
+ console.log(`${task.filename} total is ${total}b`);
80
82
  if (total > 1024 * 1024 * 1024) {
81
83
  console.log(`file is to large`);
82
84
  req.destroy();
83
- complete();
85
+ await complete();
84
86
  this.downloadingCount -= 1;
85
87
  }
86
88
  });
package/dist/templates/tasks/effect-task.js CHANGED
@@ -15,7 +15,7 @@ class EffectTask extends rabbitmq_1.Task {
15
15
  const task = injector.get(rabbitmq_1.DATA);
16
16
  const complete = injector.get(rabbitmq_1.COMPLETE);
17
17
  if (task.uploadUrl.startsWith('https://site')) {
18
- complete();
18
+ await complete();
19
19
  return next && next();
20
20
  }
21
21
  const fail = injector.get(rabbitmq_1.FAIL);
@@ -28,10 +28,10 @@ class EffectTask extends rabbitmq_1.Task {
28
28
  }
29
29
  catch (e) { }
30
30
  await w7.manager.update(w7_1.W7ChatTopicEntity, task.topicId, { thirdUrl: task.uploadUrl }).then(() => complete()).catch(() => fail());
31
- complete();
31
+ await complete();
32
32
  }
33
33
  else {
34
- complete();
34
+ await complete();
35
35
  }
36
36
  if (next)
37
37
  await next();
package/dist/templates/tasks/upload-task.js CHANGED
@@ -23,15 +23,21 @@ class UploadTask extends rabbitmq_1.Task {
23
23
  const old = await db.manager.findOne(entities_1.FkDownloadTaskEntity, { where: { filename: task.filename } });
24
24
  // not exist
25
25
  if (!old) {
26
- complete();
26
+ await complete();
27
+ this.runingCount -= 1;
28
+ return next && next();
27
29
  }
28
30
  // > 1G give up
29
31
  if (task.total >= 1024 * 1024 * 1024) {
30
- complete();
32
+ await complete();
33
+ this.runingCount -= 1;
34
+ return next && next();
31
35
  }
32
36
  if (!(0, fs_1.existsSync)(task.path) || (old.fileMd5 && old.fileMd5.length > 0)) {
33
37
  await db.manager.update(entities_1.FkDownloadTaskEntity, task.filename, { status: 0 });
34
- complete();
38
+ await complete();
39
+ this.runingCount -= 1;
40
+ return next && next();
35
41
  }
36
42
  if (old.status === 1) {
37
43
  if (this.runingCount > 5) {
@@ -49,7 +55,7 @@ class UploadTask extends rabbitmq_1.Task {
49
55
  });
50
56
  }
51
57
  else {
52
- complete();
58
+ await complete();
53
59
  }
54
60
  if (next)
55
61
  await next();
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nger/fk-upload",
3
- "version": "1.0.79",
3
+ "version": "1.0.82",
4
4
  "description": "",
5
5
  "main": "dist/core.js",
6
6
  "types": "dist/core.d.ts",