@nger/fk-upload 1.0.107 → 1.0.110

package/dist/entities/fk-download-task.entity.d.ts

@@ -12,4 +12,5 @@ export declare class FkDownloadTaskEntity {
     fileMd5: string;
     topicId: number;
     createDate: Date;
+    isBigFile: boolean;
 }

package/dist/entities/fk-download-task.entity.js

@@ -17,6 +17,7 @@ let FkDownloadTaskEntity = class FkDownloadTaskEntity {
     fileMd5;
     topicId;
     createDate;
+    isBigFile;
 };
 tslib_1.__decorate([
     (0, typeorm_1.PrimaryColumn)(),
@@ -95,6 +96,12 @@ tslib_1.__decorate([
     }),
     tslib_1.__metadata("design:type", Date)
 ], FkDownloadTaskEntity.prototype, "createDate", void 0);
+tslib_1.__decorate([
+    (0, typeorm_1.Column)({
+        default: false
+    }),
+    tslib_1.__metadata("design:type", Boolean)
+], FkDownloadTaskEntity.prototype, "isBigFile", void 0);
 FkDownloadTaskEntity = tslib_1.__decorate([
     (0, typeorm_1.Entity)({
         name: 'nger_fk_download_task'

package/dist/templates/check-upload.js

@@ -107,7 +107,7 @@ let CheckUploadController = class CheckUploadController {
             const item = new rabbitmq_1.TaskEntity();
             item.topic = actions_1.CHECK_ACTION;
             item.data = { filename: finish.filename };
-            this.manager.send(item);
+            return this.manager.send(item);
         }));
         return { list: finishs.map(it => it.filename) };
     }

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

@@ -80,6 +80,9 @@ class CheckTask extends rabbitmq_1.Task {
             size.resolve(Number(headers["content-length"]));
             req.destroy();
         });
+        req.on('error', (e) => {
+            size.resolve(0);
+        });
         return size;
     }
 }

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

@@ -64,7 +64,6 @@ class DownloadTask extends rabbitmq_1.Task {
             sub.complete();
             const fileMd5 = await (0, md5_file_1.default)(task.path);
             console.log(`file download success ${task.filename}: ${fileMd5}`);
-            const db = injector.get(typeorm_1.Db);
             await db.manager.update(entities_1.FkDownloadTaskEntity, task.filename, { totalSize: total, fileMd5: fileMd5, status: 1, size: total });
             const fk = injector.get(fk_service_1.FkService);
             const shouldSize = await fk.getSize(task.url);
@@ -83,7 +82,7 @@ class DownloadTask extends rabbitmq_1.Task {
             total = Number(headers["content-length"]);
             console.log(`${task.filename} total is ${total}b`);
             if (total > 1024 * 1024 * 1024) {
-                console.log(`file is to large`);
+                await db.manager.update(entities_1.FkDownloadTaskEntity, task.filename, { isBigFile: true });
                 req.destroy();
                 await complete();
             }

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

@@ -12,6 +12,7 @@ class EffectTask extends rabbitmq_1.Task {
         super(actions_1.EFFECT_ACTION);
     }
     async handle(injector, next) {
+        const db = injector.get(typeorm_1.Db);
         const task = injector.get(rabbitmq_1.DATA);
         const complete = injector.get(rabbitmq_1.COMPLETE);
         console.log(`effect`, task.filename);
@@ -21,7 +22,6 @@ 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 });
         if (task.topicId) {
             try {

package/package.json

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