@nger/fk-upload 1.0.25 → 1.0.28

package/dist/templates/task.service.js

@@ -70,14 +70,14 @@ let TaskService = class TaskService {
     async createDownLoadTask(url, fkLoginId, topicId) {
         const hash = await (0, multihashing_async_1.default)(Buffer.from(url), 'sha1', 16);
         const cid = new cids_1.default(1, 'raw', hash, 'base64');
-        const filename = cid.toString('base64');
+        const filename = encodeURIComponent(cid.toString('base64'));
         const _url = new URL(url);
         const filePath = _url.pathname;
         const ext = (0, path_1.extname)(filePath);
         const task = new entities_1.FkDownloadTaskEntity();
         const root = this.injector.get(core_1.APP_ROOT);
         (0, fs_extra_1.ensureDirSync)((0, path_1.join)(root, 'attachments/fk-upload'));
-        const path = (0, path_1.join)(root, 'attachments/fk-upload', encodeURIComponent(filename));
+        const path = (0, path_1.join)(root, 'attachments/fk-upload', filename + ext);
         task.filename = filename + ext;
         task.url = url;
         task.loginId = fkLoginId;
@@ -159,6 +159,10 @@ let TaskService = class TaskService {
                     if (err)
                         return fail();
                     if (reply) {
+                        const isExist = await this.db.manager.find(entities_1.FkDownloadTaskEntity, { where: { filename: task.filename } });
+                        if (!isExist) {
+                            return complete();
+                        }
                         const taskIndex = Number(reply); // next
                         const isComplete = task.complete && task.index === taskIndex;
                         const isShouldRunning = isComplete || (!isComplete && task.index == taskIndex);
@@ -167,16 +171,16 @@ let TaskService = class TaskService {
                             const fileStream = (0, fs_extra_1.createReadStream)(task.path, { start: task.start, end: task.end });
                             const formdata = new form_data_1.default();
                             formdata.append('ctrl', fileStream);
-                            formdata.append('isFreeVer', 'false');
-                            formdata.append('aid', `${task.aid}`);
-                            formdata.append('folderId', `${task.folderId}`);
+                            formdata.append('isFreeVer', this.encodeURIComponent(false));
+                            formdata.append('aid', this.encodeURIComponent(task.aid));
+                            formdata.append('folderId', this.encodeURIComponent(task.folderId));
                             formdata.append('fileName', task.filename);
-                            formdata.append(`totalSize`, `${task.total}`);
+                            formdata.append(`totalSize`, this.encodeURIComponent(task.total));
                             formdata.append(`fileMd5`, task.fileMd5);
-                            formdata.append('index', `${task.index}`);
-                            formdata.append('chunkSize', `${task.splitSize}`);
-                            formdata.append('totalChunks', `${task.totalChunks}`);
-                            formdata.append(`complete`, `${task.complete}`);
+                            formdata.append('index', this.encodeURIComponent(task.index));
+                            formdata.append('chunkSize', this.encodeURIComponent(task.splitSize));
+                            formdata.append('totalChunks', this.encodeURIComponent(task.totalChunks));
+                            formdata.append(`complete`, this.encodeURIComponent(task.complete));
                             const bssInfo = {
                                 fromSite: true, siteId: 0, groupId: 0, fileSizeLimit: 1024
                             };
@@ -310,6 +314,9 @@ let TaskService = class TaskService {
         return `https://${token.url}/${token.visitType}/${token.app}/advance/info?cmd=${token.cmd}&token=${token.token}`;
     }
     encodeURIComponent(data) {
+        if ((0, core_1.isPrimitive)(data)) {
+            return encodeURIComponent(data);
+        }
         return Object.keys(data).map(key => {
             const value = Reflect.get(data, key);
             return `${key}=${encodeURIComponent(value)}`;
@@ -343,7 +350,7 @@ let TaskService = class TaskService {
             }
             if (token.length > 0) {
                 // 01
-                const url = `https://smr00.vip.webportal.top/cn/api/manage/advanceUpload/genAccessKey?_v=1651232099799&_TOKEN=${token}`;
+                const url = `https://smr00.vip.webportal.top/cn/api/manage/advanceUpload/genAccessKey?_v=${new Date().getTime()}&_TOKEN=${token}`;
                 const accessKey = await axios_1.default.get(url).then(res => res.data);
                 if (accessKey.success) {
                     const accessTokenString = decode(accessKey.accessKey);

package/package.json

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