@nger/fk-upload 1.0.59 → 1.0.62

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

@@ -141,30 +141,14 @@ let FkService = class FkService {
             }).then(res => {
                 return res.data;
             }).catch(async (e) => {
-                const info = await this.getUploadInfo(task.loginId, task.filename, task.fileMd5, task.total);
-                task.cookies = info.cookies;
-                task.splitSize = info.splitSize;
-                task.start = info.uploadedSize;
-                task.uploadUrl = info.uploadUrl;
-                task.index = Math.ceil(info.uploadedSize / info.splitSize);
-                console.log(info);
-                await this.uploadFile(task);
-                return;
+                throw e;
             });
             if (!uploadResult) {
                 complete = true;
                 break;
             }
             if (uploadResult.code !== 200) {
-                console.log(uploadResult, { size: end - start });
-                const info = await this.getUploadInfo(task.loginId, task.filename, task.fileMd5, task.total);
-                task.cookies = info.cookies;
-                task.splitSize = info.splitSize;
-                task.start = info.uploadedSize;
-                task.uploadUrl = info.uploadUrl;
-                task.index = Math.ceil(info.uploadedSize / info.splitSize);
-                await this.uploadFile(task);
-                return;
+                throw new Error(uploadResult.code);
             }
             if (uploadResult) {
                 const data = uploadResult.data;
@@ -177,7 +161,7 @@ let FkService = class FkService {
                     task.uploadUrl = fullUrl;
                 }
             }
-            console.log(`uploading ${index / task.totalChunks}`);
+            console.log(`uploading ${Math.floor((index + 1 / task.totalChunks) * 100)}%`);
             index = index + 1;
         } while (!complete);
         // upload complete

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

@@ -19,12 +19,16 @@ 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);
+        // > 1G give up
+        if (task.total >= 1024 * 1024 * 1024) {
+            complete();
+        }
         await fk.startUploadFile(task).then(async (res) => {
             // create effect 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(task.filename, task.uploadUrl, task.topicId, task.path);
-            return manager.send(effectTask).then(() => complete()).catch(() => fail());
-        }).catch(() => fail());
+            return manager.send(effectTask).then(() => complete());
+        });
         if (next)
             await next();
     }

package/package.json

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