@nger/fk-upload 1.0.110 → 1.0.114

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

@@ -32,4 +32,7 @@ export declare class CheckUploadController {
     checkFinish(): Promise<{
         list: string[];
     }>;
+    reEffect(): Promise<{
+        list: string[];
+    }>;
 }

package/dist/templates/check-upload.js

@@ -84,7 +84,9 @@ let CheckUploadController = class CheckUploadController {
     async checkWaitUploadTask() {
         const download = this.db.manager.getRepository(fk_download_task_entity_1.FkDownloadTaskEntity);
         const errors = await download.find({ where: { uploadUrl: (0, typeorm_2.Like)('https://site%') } });
-        await download.update(errors.map(err => err.filename), { status: 1 });
+        if (errors && errors.length > 0) {
+            await download.update(errors.map(err => err.filename), { status: 1 });
+        }
         const list = await download.find({ where: { status: 1, totalSize: (0, typeorm_2.LessThan)(1024 * 1024 * 1024) } });
         const task = this.injector.get(task_service_1.TaskService);
         await Promise.all(list.map(async (item) => {
@@ -111,6 +113,21 @@ let CheckUploadController = class CheckUploadController {
         }));
         return { list: finishs.map(it => it.filename) };
     }
+    async reEffect() {
+        const finishs = await this.db.manager.find(fk_download_task_entity_1.FkDownloadTaskEntity, { where: { status: 3 } });
+        await Promise.all(finishs.map(finish => {
+            const item = new rabbitmq_1.TaskEntity();
+            item.topic = actions_1.EFFECT_ACTION;
+            item.data = {
+                filename: finish.filename,
+                uploadUrl: finish.uploadUrl,
+                topicId: finish.topicId,
+                path: finish.path,
+            };
+            return this.manager.send(item);
+        }));
+        return { list: finishs.map(it => it.filename) };
+    }
 };
 tslib_1.__decorate([
     (0, http_1.Get)('reupload'),
@@ -160,6 +177,12 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:paramtypes", []),
     tslib_1.__metadata("design:returntype", Promise)
 ], CheckUploadController.prototype, "checkFinish", null);
+tslib_1.__decorate([
+    (0, http_1.Get)('reEffect'),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", []),
+    tslib_1.__metadata("design:returntype", Promise)
+], CheckUploadController.prototype, "reEffect", null);
 CheckUploadController = tslib_1.__decorate([
     (0, core_1.Controller)(`@nger/fk-upload`),
     tslib_1.__metadata("design:paramtypes", [typeorm_1.Db, rabbitmq_1.TaskManager, core_1.Injector])

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

@@ -69,7 +69,7 @@ class DownloadTask extends rabbitmq_1.Task {
             const shouldSize = await fk.getSize(task.url);
             const localSize = await fk.getLocalSize(task.path);
             if (shouldSize != localSize) {
-                // download
+                // re download
                 await fail();
                 return next && next();
             }
@@ -77,6 +77,9 @@ class DownloadTask extends rabbitmq_1.Task {
             await manager.send(uploadTask);
             await complete();
         });
+        req.on('error', async () => {
+            await fail();
+        });
         req.on('response', async (resp) => {
             const headers = resp.headers;
             total = Number(headers["content-length"]);

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

@@ -7,6 +7,7 @@ const typeorm_1 = require("@nger/typeorm");
 const w7_1 = require("@nger/w7");
 const entities_1 = require("../../entities");
 const fs_extra_1 = require("fs-extra");
+const task_service_1 = require("./task.service");
 class EffectTask extends rabbitmq_1.Task {
     constructor() {
         super(actions_1.EFFECT_ACTION);
@@ -15,8 +16,16 @@ class EffectTask extends rabbitmq_1.Task {
         const db = injector.get(typeorm_1.Db);
         const task = injector.get(rabbitmq_1.DATA);
         const complete = injector.get(rabbitmq_1.COMPLETE);
+        const manager = injector.get(rabbitmq_1.TaskManager);
+        const taskService = injector.get(task_service_1.TaskService);
         console.log(`effect`, task.filename);
         if (task.uploadUrl.startsWith('https://site')) {
+            // redownload
+            const item = await db.manager.findOne(entities_1.FkDownloadTaskEntity, { where: { filename: task.filename } });
+            if (item) {
+                const downloadTask = await taskService.createDownLoadTask(item.url, item.loginId, item.topicId);
+                await manager.send(downloadTask);
+            }
             await complete();
             return next && next();
         }

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

@@ -64,13 +64,22 @@ class ScheduleTask extends rabbitmq_1.Task {
                         await manager.send(task);
                     }
                     else {
-                        if (item.status === 0) { }
-                        else if (item.status === 1) { }
-                        else if (item.status === 2) { }
-                        else if (item.status === 3) { }
+                        if (item.status === 0) {
+                        }
+                        else if (item.status === 1) {
+                        }
+                        else if (item.status === 2) {
+                        }
+                        else if (item.status === 3) {
+                        }
                     }
                 }
             });
+            // check status = 1
+            const waitUploadTask = await db.manager.find(entities_1.FkDownloadTaskEntity, { where: { status: 1 } });
+            // waitUploadTask.map(task => {
+            //     taskService.createUploadTask()
+            // })
         };
         await run();
         schedule.scheduleJob(task.name, task.rule, async (time) => {

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

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

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UploadTask = void 0;
-const redis_1 = require("@nger/redis");
 const rabbitmq_1 = require("@nger/rabbitmq");
 const actions_1 = require("./actions");
 const fk_service_1 = require("./fk.service");
@@ -22,6 +21,7 @@ class UploadTask extends rabbitmq_1.Task {
             return 0;
         }
     }
+    errorCount = 0;
     async handle(injector, next) {
         const task = injector.get(rabbitmq_1.DATA);
         const complete = injector.get(rabbitmq_1.COMPLETE);
@@ -43,6 +43,8 @@ class UploadTask extends rabbitmq_1.Task {
         }
         if (!(0, fs_1.existsSync)(task.path) || !(old.fileMd5 && old.fileMd5.length > 0)) {
             await db.manager.update(entities_1.FkDownloadTaskEntity, task.filename, { status: 0 });
+            const download = await taskService.createDownLoadTask(old.url, old.loginId, old.topicId);
+            await manager.send(download);
             await complete();
             return next && next();
         }
@@ -59,18 +61,16 @@ class UploadTask extends rabbitmq_1.Task {
                 if (e.message === 'to big') {
                     return complete();
                 }
-                // 
-                const resdis = injector.get(redis_1.RedisService);
-                let count = await resdis.get(task.filename) || 0;
-                if (count > 5) {
-                    return complete();
+                if (this.errorCount > 10) {
+                    this.errorCount = 0;
+                    return await complete();
                 }
-                count += 1;
-                resdis.set(task.filename, count);
+                this.errorCount += 1;
                 throw e;
             });
         }
         else {
+            // check
             await complete();
         }
         if (next)

package/package.json

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