@nger/fk-upload 1.0.47 → 1.0.50

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

@@ -37,13 +37,15 @@ class DownloadTask extends rabbitmq_1.Task {
         });
         let total = 0;
         let length = 0;
-        let md5 = ``;
         console.log(`download ${url}`);
         const sub = new rxjs_1.Subject();
         sub.pipe((0, operators_1.throttleTime)(1000), (0, operators_1.switchMap)((size) => {
-            console.log(`download ${task.filename}: ${length}`);
-            return db.manager.update(entities_1.FkDownloadTaskEntity, task.filename, { size });
-        })).subscribe();
+            return db.manager.update(entities_1.FkDownloadTaskEntity, task.filename, { totalSize: total, size });
+        })).subscribe({
+            next: () => { },
+            complete: () => {
+            }
+        });
         // get split size
         req.on('data', (buf) => {
             length += buf.length;
@@ -57,8 +59,7 @@ class DownloadTask extends rabbitmq_1.Task {
             writeStream.end();
             sub.complete();
             const fileMd5 = await (0, md5_file_1.default)(task.path);
-            const isEqual = md5 === fileMd5;
-            console.log(`file download success ${task.filename}, check result is ${isEqual}`);
+            console.log(`file download success ${task.filename}: ${fileMd5}`);
             const uploadTask = await this.createUploadTask(task, total, fileMd5, injector);
             await manager.send(uploadTask);
             complete();

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

@@ -5,8 +5,6 @@ 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);
@@ -17,14 +15,13 @@ 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(entities_1.FkDownloadTaskEntity, task.filename, { status: 3, uploadUrl: task.uploadUrl });
-        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());
-        }
-        else {
-            complete();
-        }
+        // 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();
+        // }
         if (next)
             await next();
     }

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

@@ -159,6 +159,9 @@ let FkService = class FkService {
                 const data = uploadResult.data;
                 const downUrl = data.path;
                 if (downUrl) {
+                    console.log({
+                        data
+                    });
                     const fullUrl = downUrl.startsWith('http') ? downUrl : `https:` + downUrl;
                     task.uploadUrl = fullUrl;
                 }

package/package.json

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