@nger/fk-upload 1.0.71 → 1.0.74

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

@@ -13,4 +13,8 @@ export declare class CheckUploadController {
         msg: string;
         list: TaskEntity<object>[];
     }>;
+    checkSpace(): Promise<{
+        msg: string;
+        removes: string[];
+    }>;
 }

package/dist/templates/check-upload.js

@@ -2,10 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CheckUploadController = void 0;
 const tslib_1 = require("tslib");
+const fs_1 = require("fs");
+const fk_download_task_entity_1 = require("./../entities/fk-download-task.entity");
 const rabbitmq_1 = require("@nger/rabbitmq");
 const typeorm_1 = require("@nger/typeorm");
 const core_1 = require("@nger/core");
 const http_1 = require("@nger/http");
+const typeorm_2 = require("typeorm");
+const fs_extra_1 = require("fs-extra");
 let CheckUploadController = class CheckUploadController {
     db;
     manager;
@@ -29,7 +33,18 @@ let CheckUploadController = class CheckUploadController {
         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 };
+        return { msg: 'redownload success', list };
+    }
+    async checkSpace() {
+        const download = this.db.manager.getRepository(fk_download_task_entity_1.FkDownloadTaskEntity);
+        const list = await download.find({ where: { status: (0, typeorm_2.In)([2, 3]) } });
+        const removes = [];
+        list.map(item => {
+            if ((0, fs_1.existsSync)(item.path)) {
+                (0, fs_extra_1.unlink)(item.path);
+            }
+        });
+        return { msg: 'succes', removes };
     }
 };
 tslib_1.__decorate([
@@ -50,6 +65,12 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:paramtypes", []),
     tslib_1.__metadata("design:returntype", Promise)
 ], CheckUploadController.prototype, "redownload", null);
+tslib_1.__decorate([
+    (0, http_1.Get)('checkspace'),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", []),
+    tslib_1.__metadata("design:returntype", Promise)
+], 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])

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

@@ -31,6 +31,11 @@ class DownloadTask extends rabbitmq_1.Task {
         const task = injector.get(rabbitmq_1.DATA);
         const complete = injector.get(rabbitmq_1.COMPLETE);
         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();
+            return next && next();
+        }
         (0, fs_extra_1.ensureDir)((0, path_1.dirname)(task.path));
         const writeStream = (0, fs_1.createWriteStream)(task.path);
         const manager = injector.get(rabbitmq_1.TaskManager);
@@ -67,6 +72,7 @@ class DownloadTask extends rabbitmq_1.Task {
             const uploadTask = await this.createUploadTask(task, total, fileMd5, injector);
             await manager.send(uploadTask);
             complete();
+            this.downloadingCount -= 1;
         });
         req.on('response', async (resp) => {
             const headers = resp.headers;
@@ -75,6 +81,7 @@ class DownloadTask extends rabbitmq_1.Task {
                 console.log(`file is to large`);
                 req.destroy();
                 complete();
+                this.downloadingCount -= 1;
             }
         });
         if (next)

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

@@ -14,16 +14,16 @@ class EffectTask extends rabbitmq_1.Task {
     async handle(injector, next) {
         const task = injector.get(rabbitmq_1.DATA);
         const complete = injector.get(rabbitmq_1.COMPLETE);
+        if (task.uploadUrl.startsWith('https://site')) {
+            complete();
+            return next && next();
+        }
         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) {
             await (0, fs_extra_1.unlink)(task.path);
-            if (task.uploadUrl.startsWith('https://site')) {
-                complete();
-                return;
-            }
             await w7.manager.update(w7_1.W7ChatTopicEntity, task.topicId, { thirdUrl: task.uploadUrl }).then(() => complete()).catch(() => fail());
             complete();
         }

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

@@ -44,7 +44,8 @@ class UploadTask extends rabbitmq_1.Task {
                 console.log(`upload success`, res.filename);
                 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);
-                return manager.send(effectTask).then(() => complete());
+                await manager.send(effectTask).then(() => complete());
+                this.runingCount -= 1;
             });
         }
         else {

package/package.json

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