@nger/fk-upload 1.0.52 → 1.0.56

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

@@ -5,6 +5,8 @@ const rabbitmq_1 = require("@nger/rabbitmq");
 const actions_1 = require("./actions");
 const typeorm_1 = require("@nger/typeorm");
 const w7_1 = require("@nger/w7");
+const entities_1 = require("../../entities");
+const fs_extra_1 = require("fs-extra");
 class EffectTask extends rabbitmq_1.Task {
     constructor() {
         super(actions_1.EFFECT_ACTION);
@@ -15,13 +17,15 @@ class EffectTask extends rabbitmq_1.Task {
         const fail = injector.get(rabbitmq_1.FAIL);
         const w7 = injector.get(w7_1.W7DataSource);
         const db = injector.get(typeorm_1.Db);
-        // await db.manager.update(FkDownloadTaskEntity, task.filename, { status: 3, uploadUrl: task.uploadUrl });
-        // if (task.topicId) {
-        //     await unlink(task.path);
-        //     await w7.manager.update(W7ChatTopicEntity, task.topicId, { thirdUrl: task.uploadUrl }).then(() => complete()).catch(() => fail())
-        // } else {
-        //     complete();
-        // }
+        await db.manager.update(entities_1.FkDownloadTaskEntity, task.filename, { status: 3 });
+        if (task.topicId) {
+            await (0, fs_extra_1.unlink)(task.path);
+            await w7.manager.update(w7_1.W7ChatTopicEntity, task.topicId, { thirdUrl: task.uploadUrl }).then(() => complete()).catch(() => fail());
+            complete();
+        }
+        else {
+            complete();
+        }
         if (next)
             await next();
     }

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

@@ -154,6 +154,17 @@ let FkService = class FkService {
                 complete = true;
                 break;
             }
+            if (uploadResult.code !== 200) {
+                console.log(uploadResult, { size: end - start });
+                const info = await this.getUploadInfo(task.loginId, task.filename, task.fileMd5, task.total);
+                task.cookies = info.cookies;
+                task.splitSize = info.splitSize;
+                task.start = info.uploadedSize;
+                task.uploadUrl = info.uploadUrl;
+                task.index = Math.ceil(info.uploadedSize / info.splitSize);
+                await this.uploadFile(task);
+                return;
+            }
             if (uploadResult) {
                 const data = uploadResult.data;
                 const downUrl = data.path;

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

@@ -21,7 +21,7 @@ class UploadTask extends rabbitmq_1.Task {
         const db = injector.get(typeorm_1.Db);
         await fk.startUploadFile(task).then(async (res) => {
             // create effect task
-            await db.manager.update(entities_1.FkDownloadTaskEntity, task.filename, { status: 2, uploadSize: task.total, uploadStatus: 1 });
+            await db.manager.update(entities_1.FkDownloadTaskEntity, task.filename, { status: 2, uploadUrl: task.uploadUrl, uploadSize: task.total, uploadStatus: 1 });
             const effectTask = await taskService.createEffectTask(task.filename, task.uploadUrl, task.topicId, task.path);
             return manager.send(effectTask).then(() => complete()).catch(() => fail());
         }).catch(() => fail());

package/package.json

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