@nger/fk-upload 1.0.121 → 1.0.124

package/dist/templates/tasks/fk.service.js

@@ -161,15 +161,10 @@ let FkService = class FkService {
                 timeout: 8000
             }).then(res => {
                 return res.data;
-            }).catch(async (e) => {
-                throw e;
+            }).catch((e) => {
+                console.log(`upload error`, e.message);
+                return this.startUploadFile(task);
             });
-            console.log(`upload ----- `, { index, max, start, end, uploadResult });
-            if (!uploadResult) {
-                complete = true;
-                index = 0;
-                break;
-            }
             if (uploadResult.code !== 200) {
                 if (uploadResult.data) {
                     const data = uploadResult.data;
@@ -180,6 +175,7 @@ let FkService = class FkService {
                 }
                 throw new Error(`${task.filename}--${uploadResult.msg}`);
             }
+            console.log(`upload ----- `, { index, max, start, end });
             if (uploadResult) {
                 const data = uploadResult.data;
                 const downUrl = data.path;

package/dist/templates/tasks/upload-task.js

@@ -25,6 +25,7 @@ class UploadTask extends rabbitmq_1.Task {
     async handle(injector, next) {
         const task = injector.get(rabbitmq_1.DATA);
         const complete = injector.get(rabbitmq_1.COMPLETE);
+        const fail = injector.get(rabbitmq_1.FAIL);
         const fk = injector.get(fk_service_1.FkService);
         const taskService = injector.get(task_service_1.TaskService);
         const manager = injector.get(rabbitmq_1.TaskManager);
@@ -57,7 +58,7 @@ class UploadTask extends rabbitmq_1.Task {
                 // create effect task
                 console.log(`upload success`, res.filename);
                 await db.manager.update(entities_1.FkDownloadTaskEntity, task.filename, { status: 2, uploadUrl: task.uploadUrl, uploadSize: task.total, uploadStatus: 1 });
-                const effectTask = await taskService.createEffectTask(res.filename, res.uploadUrl, task.topicId, task.path);
+                const effectTask = await taskService.createEffectTask(task.filename, task.uploadUrl, task.topicId, task.path);
                 await manager.send(effectTask);
                 await complete();
             }).catch(async (e) => {
@@ -66,10 +67,9 @@ class UploadTask extends rabbitmq_1.Task {
                 }
                 if (this.errorCount > 10) {
                     this.errorCount = 0;
-                    return complete();
                 }
                 this.errorCount += 1;
-                console.log(`upload error ${this.errorCount}`, e);
+                console.log(`upload error ${this.errorCount}`, e.message);
                 throw e;
             });
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nger/fk-upload",
-  "version": "1.0.121",
+  "version": "1.0.124",
   "description": "",
   "main": "dist/core.js",
   "types": "dist/core.d.ts",