@nger/fk-upload 1.0.124 → 1.0.125

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 (2) hide show
  1. package/dist/templates/tasks/effect-task.js +34 -22
  2. package/package.json +1 -1
package/dist/templates/tasks/effect-task.js CHANGED
@@ -7,7 +7,6 @@ const typeorm_1 = require("@nger/typeorm");
7
7
  const w7_1 = require("@nger/w7");
8
8
  const entities_1 = require("../../entities");
9
9
  const fs_extra_1 = require("fs-extra");
10
- const task_service_1 = require("./task.service");
11
10
  class EffectTask extends rabbitmq_1.Task {
12
11
  constructor() {
13
12
  super(actions_1.EFFECT_ACTION);
@@ -17,31 +16,44 @@ class EffectTask extends rabbitmq_1.Task {
17
16
  const task = injector.get(rabbitmq_1.DATA);
18
17
  const complete = injector.get(rabbitmq_1.COMPLETE);
19
18
  const manager = injector.get(rabbitmq_1.TaskManager);
20
- const taskService = injector.get(task_service_1.TaskService);
21
19
  console.log(`effect`, task.filename);
22
- if (task.uploadUrl.startsWith('https://site')) {
23
- // redownload
24
- const item = await db.manager.findOne(entities_1.FkDownloadTaskEntity, { where: { filename: task.filename } });
25
- if (item) {
26
- const downloadTask = await taskService.createDownLoadTask(item.url, item.loginId, item.topicId);
27
- await manager.send(downloadTask);
20
+ try {
21
+ if (task.uploadUrl.startsWith('https://site')) {
22
+ // redownload
23
+ const item = await db.manager.findOne(entities_1.FkDownloadTaskEntity, { where: { filename: task.filename } });
24
+ if (item) {
25
+ const download = {
26
+ filename: item.filename,
27
+ path: item.path,
28
+ url: item.url,
29
+ topicId: item.topicId,
30
+ loginId: item.loginId
31
+ };
32
+ const downloadTask = new rabbitmq_1.TaskEntity();
33
+ downloadTask.topic = actions_1.DOWNLOAD_ACTION;
34
+ downloadTask.data = download;
35
+ await manager.send(downloadTask);
36
+ }
37
+ await complete();
38
+ return next && next();
28
39
  }
29
- await complete();
30
- return next && next();
31
- }
32
- const fail = injector.get(rabbitmq_1.FAIL);
33
- const w7 = injector.get(w7_1.W7DataSource);
34
- await db.manager.update(entities_1.FkDownloadTaskEntity, task.filename, { status: 3 });
35
- if (task.topicId) {
36
- try {
37
- await (0, fs_extra_1.unlink)(task.path);
40
+ const fail = injector.get(rabbitmq_1.FAIL);
41
+ const w7 = injector.get(w7_1.W7DataSource);
42
+ await db.manager.update(entities_1.FkDownloadTaskEntity, task.filename, { status: 3 });
43
+ if (task.topicId) {
44
+ try {
45
+ await (0, fs_extra_1.unlink)(task.path);
46
+ }
47
+ catch (e) { }
48
+ await w7.manager.update(w7_1.W7ChatTopicEntity, task.topicId, { foreverUrl: task.uploadUrl }).then(() => complete()).catch(() => fail());
49
+ await complete();
50
+ }
51
+ else {
52
+ await complete();
38
53
  }
39
- catch (e) { }
40
- await w7.manager.update(w7_1.W7ChatTopicEntity, task.topicId, { foreverUrl: task.uploadUrl }).then(() => complete()).catch(() => fail());
41
- await complete();
42
54
  }
43
- else {
44
- await complete();
55
+ catch (e) {
56
+ console.log(`effect error`, e.message);
45
57
  }
46
58
  if (next)
47
59
  await next();
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nger/fk-upload",
3
- "version": "1.0.124",
3
+ "version": "1.0.125",
4
4
  "description": "",
5
5
  "main": "dist/core.js",
6
6
  "types": "dist/core.d.ts",