@nger/fk-upload 1.0.105 → 1.0.108

package/dist/templates/check-upload.js

@@ -107,7 +107,7 @@ let CheckUploadController = class CheckUploadController {
             const item = new rabbitmq_1.TaskEntity();
             item.topic = actions_1.CHECK_ACTION;
             item.data = { filename: finish.filename };
-            this.manager.send(item);
+            return this.manager.send(item);
         }));
         return { list: finishs.map(it => it.filename) };
     }

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

@@ -32,20 +32,22 @@ class CheckTask extends rabbitmq_1.Task {
                     await complete();
                     return next && next();
                 }
-            }
-            if (finishs.totalSize === this.getLocalSize(finishs.path)) {
-                // re upload
-                await db.manager.update(fk_download_task_entity_1.FkDownloadTaskEntity, filename, { status: 1 });
-                const upload = await task.createUploadTask({
-                    filename: finishs.filename,
-                    path: finishs.path,
-                    url: finishs.url,
-                    topicId: finishs.topicId,
-                    loginId: finishs.loginId
-                }, finishs.totalSize, finishs.fileMd5, injector);
-                await manager.send(upload);
-                await complete();
-                return next && next();
+                else {
+                    if (finishs.totalSize === this.getLocalSize(finishs.path)) {
+                        // re upload
+                        await db.manager.update(fk_download_task_entity_1.FkDownloadTaskEntity, filename, { status: 1 });
+                        const upload = await task.createUploadTask({
+                            filename: finishs.filename,
+                            path: finishs.path,
+                            url: finishs.url,
+                            topicId: finishs.topicId,
+                            loginId: finishs.loginId
+                        }, finishs.totalSize, finishs.fileMd5, injector);
+                        await manager.send(upload);
+                        await complete();
+                        return next && next();
+                    }
+                }
             }
             await db.manager.update(fk_download_task_entity_1.FkDownloadTaskEntity, filename, { status: 0 });
             const item = await task.createDownLoadTask(finishs.url, finishs.loginId, finishs.topicId);
@@ -58,8 +60,13 @@ class CheckTask extends rabbitmq_1.Task {
         return next && next();
     }
     getLocalSize(path) {
-        const satts = (0, fs_extra_1.statSync)(path);
-        return satts.size;
+        try {
+            const satts = (0, fs_extra_1.statSync)(path);
+            return satts.size;
+        }
+        catch (e) {
+            return 0;
+        }
     }
     async getSize(url) {
         const size = (0, core_1.defer)();

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

@@ -66,6 +66,14 @@ class DownloadTask extends rabbitmq_1.Task {
             console.log(`file download success ${task.filename}: ${fileMd5}`);
             const db = injector.get(typeorm_1.Db);
             await db.manager.update(entities_1.FkDownloadTaskEntity, task.filename, { totalSize: total, fileMd5: fileMd5, status: 1, size: total });
+            const fk = injector.get(fk_service_1.FkService);
+            const shouldSize = await fk.getSize(task.url);
+            const localSize = await fk.getLocalSize(task.path);
+            if (shouldSize != localSize) {
+                // download
+                await fail();
+                return next && next();
+            }
             const uploadTask = await this.createUploadTask(task, total, fileMd5, injector);
             await manager.send(uploadTask);
             await complete();

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

@@ -4,6 +4,7 @@ import { IUploadTask } from "./actions";
 export declare class FkService {
     private db;
     constructor(db: Db);
+    getLocalSize(path: string): number;
     getFkLogin(loginId: number): Promise<FkLoginEntity>;
     getFkLoginCookie(loginId: number): Promise<FkLoginCookieEntity[]>;
     createCookieStr(cookies: FkLoginCookieEntity[]): string;
@@ -14,6 +15,7 @@ export declare class FkService {
     getUploadUrl(token: any, forceDirect?: boolean): string;
     getUploadInfo(loginId: number, filename: string, fileMd5: string, totalSize: number): Promise<any>;
     startUploadFile(task: IUploadTask): Promise<IUploadTask>;
+    getSize(url: string): Promise<number>;
     uploadFile(task: IUploadTask): Promise<IUploadTask>;
     getBssInfo(): {
         fromSite: boolean;

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

@@ -8,11 +8,21 @@ const axios_1 = tslib_1.__importDefault(require("axios"));
 const core_1 = require("@nger/core");
 const fs_extra_1 = require("fs-extra");
 const form_data_1 = tslib_1.__importDefault(require("form-data"));
+const request_1 = require("request");
 let FkService = class FkService {
     db;
     constructor(db) {
         this.db = db;
     }
+    getLocalSize(path) {
+        try {
+            const stat = (0, fs_extra_1.statSync)(path);
+            return stat.size;
+        }
+        catch (e) {
+            return 0;
+        }
+    }
     async getFkLogin(loginId) {
         return await this.db.manager.findOneOrFail(entities_1.FkLoginEntity, { where: { fkLoginId: loginId } });
     }
@@ -100,6 +110,20 @@ let FkService = class FkService {
         task.index = Math.ceil(info.uploadedSize / info.splitSize);
         return await this.uploadFile(task);
     }
+    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;
+    }
     async uploadFile(task) {
         let complete = false;
         const max = task.total - 1;

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();
+    getLocalSize(path: string): number;
     handle(injector: Injector, next?: Next): Promise<void>;
 }

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

@@ -13,6 +13,15 @@ class UploadTask extends rabbitmq_1.Task {
     constructor() {
         super(actions_1.UPLOAD_ACTION);
     }
+    getLocalSize(path) {
+        try {
+            const stat = (0, fs_1.statSync)(path);
+            return stat.size;
+        }
+        catch (e) {
+            return 0;
+        }
+    }
     async handle(injector, next) {
         const task = injector.get(rabbitmq_1.DATA);
         const complete = injector.get(rabbitmq_1.COMPLETE);
@@ -20,6 +29,7 @@ class UploadTask extends rabbitmq_1.Task {
         const taskService = injector.get(task_service_1.TaskService);
         const manager = injector.get(rabbitmq_1.TaskManager);
         const db = injector.get(typeorm_1.Db);
+        // check file size
         const old = await db.manager.findOne(entities_1.FkDownloadTaskEntity, { where: { filename: task.filename } });
         // not exist
         if (!old) {

package/package.json

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