@nger/fk-upload 1.0.66 → 1.0.69

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

@@ -1,8 +1,16 @@
-import { TaskManager } from '@nger/rabbitmq';
+import { TaskEntity, TaskManager } from '@nger/rabbitmq';
 import { Db } from '@nger/typeorm';
 export declare class CheckUploadController {
     private db;
     private manager;
     constructor(db: Db, manager: TaskManager);
     reupload(): Promise<string>;
+    recheck(): Promise<{
+        msg: string;
+        list: TaskEntity<object>[];
+    }>;
+    redownload(): Promise<{
+        msg: string;
+        list: TaskEntity<object>[];
+    }>;
 }

package/dist/templates/check-upload.js

@@ -19,6 +19,18 @@ let CheckUploadController = class CheckUploadController {
         await Promise.all(list.map(item => this.manager.send(item)));
         return 'reupload success';
     }
+    async recheck() {
+        const task = this.db.manager.getRepository(rabbitmq_1.TaskEntity);
+        const list = await task.find({ where: { topic: '@nger/fk-upload/effect-task', status: 0 } });
+        await Promise.all(list.map(item => this.manager.send(item)));
+        return { msg: 'recheck success', list };
+    }
+    async redownload() {
+        const task = this.db.manager.getRepository(rabbitmq_1.TaskEntity);
+        const list = await task.find({ where: { topic: '@nger/fk-upload/download-task', status: 0 } });
+        await Promise.all(list.map(item => this.manager.send(item)));
+        return { msg: 'recheck success', list };
+    }
 };
 tslib_1.__decorate([
     (0, http_1.Get)('reupload'),
@@ -26,8 +38,20 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:paramtypes", []),
     tslib_1.__metadata("design:returntype", Promise)
 ], CheckUploadController.prototype, "reupload", null);
+tslib_1.__decorate([
+    (0, http_1.Get)('recheck'),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", []),
+    tslib_1.__metadata("design:returntype", Promise)
+], CheckUploadController.prototype, "recheck", null);
+tslib_1.__decorate([
+    (0, http_1.Get)('redownload'),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", []),
+    tslib_1.__metadata("design:returntype", Promise)
+], CheckUploadController.prototype, "redownload", null);
 CheckUploadController = tslib_1.__decorate([
-    (0, core_1.Controller)(`@nger/fk-uplaod`),
+    (0, core_1.Controller)(`@nger/fk-upload`),
     tslib_1.__metadata("design:paramtypes", [typeorm_1.Db, rabbitmq_1.TaskManager])
 ], CheckUploadController);
 exports.CheckUploadController = CheckUploadController;

package/dist/templates/tasks/download-task.d.ts

@@ -5,6 +5,7 @@ import { Injector, Next } from "@nger/core";
  */
 export declare class DownloadTask extends Task {
     constructor();
+    downloadingCount: number;
     handle(injector: Injector, next?: Next): Promise<void>;
     private createUploadTask;
 }

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

@@ -21,7 +21,12 @@ class DownloadTask extends rabbitmq_1.Task {
     constructor() {
         super(actions_1.DOWNLOAD_ACTION);
     }
+    downloadingCount = 0;
     async handle(injector, next) {
+        if (this.downloadingCount > 3) {
+            throw new Error(`system is busy`);
+        }
+        this.downloadingCount += 1;
         const db = injector.get(typeorm_1.Db);
         const task = injector.get(rabbitmq_1.DATA);
         const complete = injector.get(rabbitmq_1.COMPLETE);

package/dist/templates/tasks/providers.js

@@ -2,18 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tasksProviders = void 0;
 const rabbitmq_1 = require("@nger/rabbitmq");
+const download_task_1 = require("./download-task");
+const schedule_task_1 = require("./schedule-task");
 const upload_task_1 = require("./upload-task");
 exports.tasksProviders = [
-    // {
-    //     provide: Task,
-    //     useFactory: () => new DownloadTask(),
-    //     multi: true
-    // },
-    // {
-    //     provide: Task,
-    //     useFactory: () => new ScheduleTask(),
-    //     multi: true
-    // }, 
+    {
+        provide: rabbitmq_1.Task,
+        useFactory: () => new download_task_1.DownloadTask(),
+        multi: true
+    },
+    {
+        provide: rabbitmq_1.Task,
+        useFactory: () => new schedule_task_1.ScheduleTask(),
+        multi: true
+    },
     {
         provide: rabbitmq_1.Task,
         useFactory: () => new upload_task_1.UploadTask(),

package/dist/templates/tasks/upload-task.d.ts

@@ -2,5 +2,6 @@ import { Task } from "@nger/rabbitmq";
 import { Injector, Next } from "@nger/core";
 export declare class UploadTask extends Task {
     constructor();
+    runingCount: number;
     handle(injector: Injector, next?: Next): Promise<void>;
 }

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

@@ -12,6 +12,7 @@ class UploadTask extends rabbitmq_1.Task {
     constructor() {
         super(actions_1.UPLOAD_ACTION);
     }
+    runingCount = 0;
     async handle(injector, next) {
         const task = injector.get(rabbitmq_1.DATA);
         const complete = injector.get(rabbitmq_1.COMPLETE);
@@ -33,6 +34,10 @@ class UploadTask extends rabbitmq_1.Task {
             complete();
         }
         if (old.status === 1) {
+            if (this.runingCount > 3) {
+                throw new Error(`system is busy`);
+            }
+            this.runingCount += 1;
             // upload
             await fk.startUploadFile(task).then(async (res) => {
                 // create effect task

package/package.json

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