@nger/fk-upload 1.0.77 → 1.0.81

package/dist/fk-v2.service.js

@@ -107,7 +107,6 @@ let FkV2Service = class FkV2Service {
             }
         }).then(res => {
             const cookies = res.headers['set-cookie'];
-            console.log(cookies);
             return res.data;
         });
     }

package/dist/main.js

@@ -44,11 +44,11 @@ exports.AppModule = AppModule;
         process.send('ready');
 });
 process.on('uncaughtException', (err) => {
-    console.log(err.message);
+    // console.log(`uncaughtException`, err.message)
 });
 process.on('unhandledRejection', (reason, promisen) => {
     promisen.catch((e) => {
-        console.log(e.message);
-        console.log(e.stack);
+        // console.log(e.message)
+        // console.log(e.stack)
     });
 });

package/dist/templates/check-upload.d.ts

@@ -1,9 +1,11 @@
 import { TaskEntity, TaskManager } from '@nger/rabbitmq';
 import { Db } from '@nger/typeorm';
+import { Injector } from '@nger/core';
 export declare class CheckUploadController {
     private db;
     private manager;
-    constructor(db: Db, manager: TaskManager);
+    private injector;
+    constructor(db: Db, manager: TaskManager, injector: Injector);
     reupload(): Promise<string>;
     recheck(): Promise<{
         msg: string;

package/dist/templates/check-upload.js

@@ -13,9 +13,11 @@ const fs_extra_1 = require("fs-extra");
 let CheckUploadController = class CheckUploadController {
     db;
     manager;
-    constructor(db, manager) {
+    injector;
+    constructor(db, manager, injector) {
         this.db = db;
         this.manager = manager;
+        this.injector = injector;
     }
     async reupload() {
         const task = this.db.manager.getRepository(rabbitmq_1.TaskEntity);
@@ -39,14 +41,20 @@ let CheckUploadController = class CheckUploadController {
         const download = this.db.manager.getRepository(fk_download_task_entity_1.FkDownloadTaskEntity);
         // remove to large
         const largs = await download.find({ where: { totalSize: (0, typeorm_2.MoreThan)(1024 * 1024 * 1024) } });
-        // remove not use
         // remove finish
-        const list = await download.find({ where: { status: (0, typeorm_2.In)([2, 3]) } });
+        const list = await download.find({ where: { status: (0, typeorm_2.Not)(1) } });
+        // remove not use
+        const root = this.injector.get(core_1.APP_ROOT);
+        // const uploads = readdirSync(join(root, 'attachments/fk-upload'));
         const removes = [];
         Promise.all([...list, ...largs].map(async (item) => {
             if ((0, fs_1.existsSync)(item.path)) {
-                await (0, fs_extra_1.unlink)(item.path);
-                removes.push(item.path);
+                try {
+                    await (0, fs_extra_1.unlink)(item.path);
+                    await (0, fs_extra_1.unlink)(item.path);
+                    removes.push(item.path);
+                }
+                catch (e) { }
             }
         }));
         return { msg: 'succes', removes };
@@ -78,6 +86,6 @@ tslib_1.__decorate([
 ], CheckUploadController.prototype, "checkSpace", null);
 CheckUploadController = tslib_1.__decorate([
     (0, core_1.Controller)(`@nger/fk-upload`),
-    tslib_1.__metadata("design:paramtypes", [typeorm_1.Db, rabbitmq_1.TaskManager])
+    tslib_1.__metadata("design:paramtypes", [typeorm_1.Db, rabbitmq_1.TaskManager, core_1.Injector])
 ], CheckUploadController);
 exports.CheckUploadController = CheckUploadController;

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

@@ -33,7 +33,8 @@ class DownloadTask extends rabbitmq_1.Task {
         const fail = injector.get(rabbitmq_1.FAIL);
         const download = await db.manager.findOne(entities_1.FkDownloadTaskEntity, { where: { filename: task.filename } });
         if (download.status !== 0) {
-            complete();
+            await complete();
+            this.downloadingCount -= 1;
             return next && next();
         }
         (0, fs_extra_1.ensureDir)((0, path_1.dirname)(task.path));
@@ -71,16 +72,17 @@ class DownloadTask extends rabbitmq_1.Task {
             console.log(`file download success ${task.filename}: ${fileMd5}`);
             const uploadTask = await this.createUploadTask(task, total, fileMd5, injector);
             await manager.send(uploadTask);
-            complete();
+            await complete();
             this.downloadingCount -= 1;
         });
         req.on('response', async (resp) => {
             const headers = resp.headers;
             total = Number(headers["content-length"]);
+            console.log(`${task.filename} total is ${total}b`);
             if (total > 1024 * 1024 * 1024) {
                 console.log(`file is to large`);
                 req.destroy();
-                complete();
+                await complete();
                 this.downloadingCount -= 1;
             }
         });

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

@@ -15,7 +15,7 @@ class EffectTask extends rabbitmq_1.Task {
         const task = injector.get(rabbitmq_1.DATA);
         const complete = injector.get(rabbitmq_1.COMPLETE);
         if (task.uploadUrl.startsWith('https://site')) {
-            complete();
+            await complete();
             return next && next();
         }
         const fail = injector.get(rabbitmq_1.FAIL);
@@ -23,12 +23,15 @@ class EffectTask extends rabbitmq_1.Task {
         const db = injector.get(typeorm_1.Db);
         await db.manager.update(entities_1.FkDownloadTaskEntity, task.filename, { status: 3 });
         if (task.topicId) {
-            await (0, fs_extra_1.unlink)(task.path);
+            try {
+                await (0, fs_extra_1.unlink)(task.path);
+            }
+            catch (e) { }
             await w7.manager.update(w7_1.W7ChatTopicEntity, task.topicId, { thirdUrl: task.uploadUrl }).then(() => complete()).catch(() => fail());
-            complete();
+            await complete();
         }
         else {
-            complete();
+            await complete();
         }
         if (next)
             await next();

package/dist/templates/tasks/providers.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.tasksProviders = void 0;
 const rabbitmq_1 = require("@nger/rabbitmq");
 const download_task_1 = require("./download-task");
+const effect_task_1 = require("./effect-task");
 const schedule_task_1 = require("./schedule-task");
 const upload_task_1 = require("./upload-task");
 exports.tasksProviders = [
@@ -21,9 +22,9 @@ exports.tasksProviders = [
         useFactory: () => new upload_task_1.UploadTask(),
         multi: true
     },
-    // {
-    //     provide: Task,
-    //     useFactory: () => new EffectTask(),
-    //     multi: true
-    // }
+    {
+        provide: rabbitmq_1.Task,
+        useFactory: () => new effect_task_1.EffectTask(),
+        multi: true
+    }
 ];

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

@@ -23,18 +23,24 @@ class UploadTask extends rabbitmq_1.Task {
         const old = await db.manager.findOne(entities_1.FkDownloadTaskEntity, { where: { filename: task.filename } });
         // not exist
         if (!old) {
-            complete();
+            await complete();
+            this.runingCount -= 1;
+            return next && next();
         }
         // > 1G give up
         if (task.total >= 1024 * 1024 * 1024) {
-            complete();
+            await complete();
+            this.runingCount -= 1;
+            return next && next();
         }
         if (!(0, fs_1.existsSync)(task.path) || (old.fileMd5 && old.fileMd5.length > 0)) {
             await db.manager.update(entities_1.FkDownloadTaskEntity, task.filename, { status: 0 });
-            complete();
+            await complete();
+            this.runingCount -= 1;
+            return next && next();
         }
         if (old.status === 1) {
-            if (this.runingCount > 3) {
+            if (this.runingCount > 5) {
                 throw new Error(`system is busy`);
             }
             this.runingCount += 1;
@@ -49,7 +55,7 @@ class UploadTask extends rabbitmq_1.Task {
             });
         }
         else {
-            complete();
+            await complete();
         }
         if (next)
             await next();

package/package.json

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