@nger/fk-upload 1.0.81 → 1.0.84

package/dist/main.js

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

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

@@ -1,3 +1,4 @@
+import { FkDownloadTaskEntity } from './../entities/fk-download-task.entity';
 import { TaskEntity, TaskManager } from '@nger/rabbitmq';
 import { Db } from '@nger/typeorm';
 import { Injector } from '@nger/core';
@@ -19,4 +20,13 @@ export declare class CheckUploadController {
         msg: string;
         removes: string[];
     }>;
+    checkWaitEffectTask(): Promise<{
+        list: FkDownloadTaskEntity[];
+    }>;
+    checkWaitDownloadTask(): Promise<{
+        list: FkDownloadTaskEntity[];
+    }>;
+    checkWaitUploadTask(): Promise<{
+        list: FkDownloadTaskEntity[];
+    }>;
 }

package/dist/templates/check-upload.js

@@ -10,6 +10,7 @@ const core_1 = require("@nger/core");
 const http_1 = require("@nger/http");
 const typeorm_2 = require("typeorm");
 const fs_extra_1 = require("fs-extra");
+const task_service_1 = require("./tasks/task.service");
 let CheckUploadController = class CheckUploadController {
     db;
     manager;
@@ -59,6 +60,46 @@ let CheckUploadController = class CheckUploadController {
         }));
         return { msg: 'succes', removes };
     }
+    async checkWaitEffectTask() {
+        const download = this.db.manager.getRepository(fk_download_task_entity_1.FkDownloadTaskEntity);
+        const list = await download.find({ where: { status: 2 } });
+        const task = this.injector.get(task_service_1.TaskService);
+        await Promise.all(list.map(async (item) => {
+            const download = await task.createEffectTask(item.filename, item.uploadUrl, item.topicId, item.path);
+            return this.manager.send(download);
+        }));
+        return { list };
+    }
+    async checkWaitDownloadTask() {
+        const download = this.db.manager.getRepository(fk_download_task_entity_1.FkDownloadTaskEntity);
+        const list = await download.find({ where: { status: 0 } });
+        const task = this.injector.get(task_service_1.TaskService);
+        await Promise.all(list.map(async (item) => {
+            const download = await task.createDownLoadTask(item.url, item.loginId, item.topicId);
+            return this.manager.send(download);
+        }));
+        return { list };
+    }
+    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 });
+        const list = await download.find({ where: { status: 1 } });
+        const task = this.injector.get(task_service_1.TaskService);
+        await Promise.all(list.map(async (item) => {
+            const upload = await task.createUploadTask({
+                filename: item.filename,
+                path: item.path,
+                url: item.url,
+                topicId: item.topicId,
+                loginId: item.loginId
+            }, item.totalSize, item.fileMd5, this.injector);
+            return this.manager.send(upload);
+        }));
+        return {
+            list
+        };
+    }
 };
 tslib_1.__decorate([
     (0, http_1.Get)('reupload'),
@@ -84,6 +125,24 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:paramtypes", []),
     tslib_1.__metadata("design:returntype", Promise)
 ], CheckUploadController.prototype, "checkSpace", null);
+tslib_1.__decorate([
+    (0, http_1.Get)('checkWaitEffectTask'),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", []),
+    tslib_1.__metadata("design:returntype", Promise)
+], CheckUploadController.prototype, "checkWaitEffectTask", null);
+tslib_1.__decorate([
+    (0, http_1.Get)('checkWaitDownloadTask'),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", []),
+    tslib_1.__metadata("design:returntype", Promise)
+], CheckUploadController.prototype, "checkWaitDownloadTask", null);
+tslib_1.__decorate([
+    (0, http_1.Get)('checkWaitUploadTask'),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", []),
+    tslib_1.__metadata("design:returntype", Promise)
+], CheckUploadController.prototype, "checkWaitUploadTask", 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.d.ts

@@ -5,7 +5,6 @@ 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,12 +21,7 @@ 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);
@@ -34,7 +29,6 @@ class DownloadTask extends rabbitmq_1.Task {
         const download = await db.manager.findOne(entities_1.FkDownloadTaskEntity, { where: { filename: task.filename } });
         if (download.status !== 0) {
             await complete();
-            this.downloadingCount -= 1;
             return next && next();
         }
         (0, fs_extra_1.ensureDir)((0, path_1.dirname)(task.path));
@@ -73,7 +67,6 @@ class DownloadTask extends rabbitmq_1.Task {
             const uploadTask = await this.createUploadTask(task, total, fileMd5, injector);
             await manager.send(uploadTask);
             await complete();
-            this.downloadingCount -= 1;
         });
         req.on('response', async (resp) => {
             const headers = resp.headers;
@@ -83,7 +76,6 @@ class DownloadTask extends rabbitmq_1.Task {
                 console.log(`file is to large`);
                 req.destroy();
                 await complete();
-                this.downloadingCount -= 1;
             }
         });
         if (next)

package/dist/templates/tasks/task.service.d.ts

@@ -1,10 +1,11 @@
 import { Injector } from "@nger/core";
-import { IDownloadTask } from "./actions";
+import { IDownloadTask, IUploadTask } from "./actions";
 import { TaskEntity } from "@nger/rabbitmq";
 export declare class TaskService {
     private injector;
     constructor(injector: Injector);
     createEffectTask(filename: string, uploadUrl: string, topicId: number, path: string): Promise<TaskEntity<any>>;
     createScheduleTask(name: string, rule: string): Promise<TaskEntity<any>>;
+    createUploadTask(download: IDownloadTask, total: number, md5: string, injector: Injector): Promise<TaskEntity<IUploadTask>>;
     createDownLoadTask(url: string, loginId: number, topicId: number): Promise<TaskEntity<IDownloadTask>>;
 }

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

@@ -2,6 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TaskService = void 0;
 const tslib_1 = require("tslib");
+const fk_service_1 = require("./fk.service");
+const fk_download_task_entity_1 = require("./../../entities/fk-download-task.entity");
+const typeorm_1 = require("@nger/typeorm");
 const cids_1 = tslib_1.__importDefault(require("cids"));
 const fs_extra_1 = require("fs-extra");
 const multihashing_async_1 = tslib_1.__importDefault(require("multihashing-async"));
@@ -36,6 +39,37 @@ let TaskService = class TaskService {
         task.data = schedule;
         return task;
     }
+    async createUploadTask(download, total, md5, injector) {
+        const db = injector.get(typeorm_1.Db);
+        await db.manager.update(fk_download_task_entity_1.FkDownloadTaskEntity, download.filename, { totalSize: total, fileMd5: md5, status: 1, size: total });
+        const fk = injector.get(fk_service_1.FkService);
+        const info = await fk.getUploadInfo(download.loginId, download.filename, md5, total);
+        if (info) {
+            const totalChunks = Math.ceil(total / info.splitSize) - 1;
+            const uploadTask = new rabbitmq_1.TaskEntity();
+            uploadTask.topic = actions_1.UPLOAD_ACTION;
+            const data = {
+                filename: download.filename,
+                path: download.path,
+                total: total,
+                splitSize: info.splitSize,
+                totalChunks,
+                uploadUrl: info.uploadUrl,
+                cookies: info.cookies,
+                topicId: download.topicId,
+                token: info.token,
+                aid: info.aid,
+                folderId: info.uploadGroupId,
+                fileMd5: md5,
+                start: info.uploadedSize,
+                loginId: download.loginId,
+                index: Math.ceil(info.uploadedSize / info.splitSize)
+            };
+            uploadTask.data = data;
+            return uploadTask;
+        }
+        throw new Error(`get upload info fail`);
+    }
     async createDownLoadTask(url, loginId, topicId) {
         const hash = await (0, multihashing_async_1.default)(Buffer.from(url), 'sha1', 16);
         const cid = new cids_1.default(1, 'raw', hash, 'base64');

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

@@ -2,6 +2,5 @@ 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,7 +12,6 @@ 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);
@@ -24,26 +23,19 @@ class UploadTask extends rabbitmq_1.Task {
         // not exist
         if (!old) {
             await complete();
-            this.runingCount -= 1;
             return next && next();
         }
         // > 1G give up
         if (task.total >= 1024 * 1024 * 1024) {
             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 });
             await complete();
-            this.runingCount -= 1;
             return next && next();
         }
         if (old.status === 1) {
-            if (this.runingCount > 5) {
-                throw new Error(`system is busy`);
-            }
-            this.runingCount += 1;
             // upload
             await fk.startUploadFile(task).then(async (res) => {
                 // create effect task
@@ -51,7 +43,6 @@ class UploadTask extends rabbitmq_1.Task {
                 await db.manager.update(entities_1.FkDownloadTaskEntity, task.filename, { status: 2, uploadUrl: task.uploadUrl, uploadSize: task.total, uploadStatus: 1 });
                 const effectTask = await taskService.createEffectTask(res.filename, res.uploadUrl, task.topicId, task.path);
                 await manager.send(effectTask).then(() => complete());
-                this.runingCount -= 1;
             });
         }
         else {

package/package.json

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