@nger/fk-upload 1.0.115 → 1.0.118

package/dist/templates/check-upload.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CheckUploadController = void 0;
 const tslib_1 = require("tslib");
+const fk_service_1 = require("./tasks/fk.service");
 const fs_1 = require("fs");
 const fk_download_task_entity_1 = require("./../entities/fk-download-task.entity");
 const rabbitmq_1 = require("@nger/rabbitmq");
@@ -89,7 +90,11 @@ let CheckUploadController = class CheckUploadController {
         }
         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);
+        const fk = this.injector.get(fk_service_1.FkService);
         await Promise.all(list.map(async (item) => {
+            const cloudSize = await fk.getSize(item.url);
+            const localSize = fk.getLocalSize(item.path);
+            console.log({ cloudSize, localSize });
             const upload = await task.createUploadTask({
                 filename: item.filename,
                 path: item.path,

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

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

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

@@ -50,7 +50,8 @@ class UploadTask extends rabbitmq_1.Task {
             await complete();
             return next && next();
         }
-        if (old.status === 1) {
+        console.log(`receive upload task`, { filename: task.filename, status: old.status });
+        if (old.status == 1) {
             // upload
             await fk.startUploadFile(task).then(async (res) => {
                 // create effect task
@@ -65,7 +66,7 @@ class UploadTask extends rabbitmq_1.Task {
                 }
                 if (this.errorCount > 10) {
                     this.errorCount = 0;
-                    return await complete();
+                    return complete();
                 }
                 this.errorCount += 1;
                 throw e;

package/package.json

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