@nger/fk-upload 1.0.90 → 1.0.93

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

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

package/dist/templates/check-upload.js

@@ -11,6 +11,7 @@ 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");
+const actions_1 = require("./tasks/actions");
 let CheckUploadController = class CheckUploadController {
     db;
     manager;
@@ -100,6 +101,16 @@ let CheckUploadController = class CheckUploadController {
             list: list.map(item => item.filename)
         };
     }
+    async checkFinish() {
+        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.CHECK_ACTION;
+            item.data = { filename: finish.filename };
+            this.manager.send(item);
+        }));
+        return { list: finishs.map(it => it.filename) };
+    }
 };
 tslib_1.__decorate([
     (0, http_1.Get)('reupload'),
@@ -143,6 +154,12 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:paramtypes", []),
     tslib_1.__metadata("design:returntype", Promise)
 ], CheckUploadController.prototype, "checkWaitUploadTask", null);
+tslib_1.__decorate([
+    (0, http_1.Get)('checkFinish'),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", []),
+    tslib_1.__metadata("design:returntype", Promise)
+], CheckUploadController.prototype, "checkFinish", 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/actions.d.ts

@@ -37,3 +37,7 @@ export interface IEffectTask {
     path: string;
 }
 export declare const EFFECT_ACTION: StringToken<IEffectTask>;
+export interface ICheckTask {
+    filename: string;
+}
+export declare const CHECK_ACTION: StringToken<IEffectTask>;

package/dist/templates/tasks/actions.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EFFECT_ACTION = exports.UPLOAD_ACTION = exports.SCHEDULE_ACTION = exports.DOWNLOAD_ACTION = void 0;
+exports.CHECK_ACTION = exports.EFFECT_ACTION = exports.UPLOAD_ACTION = exports.SCHEDULE_ACTION = exports.DOWNLOAD_ACTION = void 0;
 exports.DOWNLOAD_ACTION = `@nger/fk-upload/download-task`;
 exports.SCHEDULE_ACTION = `@nger/fk-upload/schedule-task`;
 exports.UPLOAD_ACTION = `@nger/fk-upload/upload-task`;
 exports.EFFECT_ACTION = `@nger/fk-upload/effect-task`;
+exports.CHECK_ACTION = `@nger/fk-upload/check-task`;

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

@@ -0,0 +1,7 @@
+import { Task } from '@nger/rabbitmq';
+import { Next, Injector } from '@nger/core';
+export declare class CheckTask extends Task {
+    constructor();
+    handle(injector: Injector, next?: Next): Promise<void>;
+    getSize(url: string): Promise<number>;
+}

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

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CheckTask = void 0;
+const fk_download_task_entity_1 = require("./../../entities/fk-download-task.entity");
+const typeorm_1 = require("@nger/typeorm");
+const actions_1 = require("./actions");
+const rabbitmq_1 = require("@nger/rabbitmq");
+const core_1 = require("@nger/core");
+const request_1 = require("request");
+class CheckTask extends rabbitmq_1.Task {
+    constructor() {
+        super(actions_1.CHECK_ACTION);
+    }
+    async handle(injector, next) {
+        const data = injector.get(rabbitmq_1.DATA);
+        const complete = injector.get(rabbitmq_1.COMPLETE);
+        const db = injector.get(typeorm_1.Db);
+        const task = injector.get(rabbitmq_1.TaskManager);
+        const filename = data.filename;
+        if (filename) {
+            const finishs = await db.manager.findOne(fk_download_task_entity_1.FkDownloadTaskEntity, { where: { filename } });
+            const uploadSize = await this.getSize(finishs.uploadUrl);
+            const downloadSize = await this.getSize(finishs.url);
+            if (uploadSize === downloadSize) {
+                await complete();
+            }
+            else {
+                console.log({ uploadSize, downloadSize });
+                await complete();
+            }
+        }
+        else {
+            await complete();
+        }
+        return next && next();
+    }
+    async getSize(url) {
+        const size = (0, core_1.defer)();
+        const req = (0, request_1.get)(url, {
+            headers: {
+                'Content-Type': 'application/octet-stream'
+            }
+        });
+        req.on('response', async (resp) => {
+            const headers = resp.headers;
+            size.resolve(Number(headers["content-length"]));
+            req.destroy();
+        });
+        return size;
+    }
+}
+exports.CheckTask = CheckTask;

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

@@ -14,6 +14,7 @@ class EffectTask extends rabbitmq_1.Task {
     async handle(injector, next) {
         const task = injector.get(rabbitmq_1.DATA);
         const complete = injector.get(rabbitmq_1.COMPLETE);
+        console.log(`effect`, task.filename);
         if (task.uploadUrl.startsWith('https://site')) {
             await complete();
             return next && next();
@@ -27,7 +28,7 @@ class EffectTask extends rabbitmq_1.Task {
                 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());
+            await w7.manager.update(w7_1.W7ChatTopicEntity, task.topicId, { foreverUrl: task.uploadUrl }).then(() => complete()).catch(() => fail());
             await complete();
         }
         else {

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

@@ -162,9 +162,10 @@ let FkService = class FkService {
                     task.uploadUrl = fullUrl;
                 }
             }
-            console.log(`uploading ${task.filename} ${Math.floor((index + 1 / task.totalChunks))}%`);
+            // console.log(`uploading ${task.filename} ${Math.floor((index + 1 / task.totalChunks))}%`)
             index = index + 1;
         } while (!complete);
+        index = 0;
         // upload complete
         axios_1.default.post(`https://smr00.vip.webportal.top/ajax/advanceUpload.jsp?cmd=_report&_TOKEN=${task.token}`, this.encodeURIComponent({
             type: 1,

package/dist/templates/tasks/providers.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tasksProviders = void 0;
+const check_task_1 = require("./check-task");
 const rabbitmq_1 = require("@nger/rabbitmq");
 const download_task_1 = require("./download-task");
 const effect_task_1 = require("./effect-task");
@@ -26,5 +27,10 @@ exports.tasksProviders = [
         provide: rabbitmq_1.Task,
         useFactory: () => new effect_task_1.EffectTask(),
         multi: true
+    },
+    {
+        provide: rabbitmq_1.Task,
+        useFactory: () => new check_task_1.CheckTask(),
+        multi: true
     }
 ];

package/docs.md

@@ -5,6 +5,8 @@
 ```ts
 ssh root@111.229.255.176
 Yang1989.
+
+http://49.235.92.214:8889/a31539ae/
 ```
 
 ### manage url

package/package.json

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