@nger/fk-upload 1.0.27 → 1.0.30

package/dist/templates/task.service.js

@@ -70,15 +70,16 @@ 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 = encodeURIComponent(cid.toString('base64'));
+        let filename = encodeURIComponent(cid.toString('base64'));
         const _url = new URL(url);
         const filePath = _url.pathname;
-        const ext = (0, path_1.extname)(filePath);
+        let ext = (0, path_1.extname)(filePath);
+        filename += ext === '.' ? '.mp4' : ext;
         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', filename + ext);
-        task.filename = filename + ext;
+        const path = (0, path_1.join)(root, 'attachments/fk-upload', filename);
+        task.filename = filename;
         task.url = url;
         task.loginId = fkLoginId;
         task.totalSize = 0;
@@ -159,6 +160,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);
@@ -201,10 +206,9 @@ let TaskService = class TaskService {
                                 this.redis.set(task.filename, `${task.index + 1}`);
                                 if (data) {
                                     // fullDownUrl
-                                    const downUrl = data.fullDownUrl;
+                                    const downUrl = data.path;
                                     if (downUrl) {
                                         const fullUrl = downUrl.startsWith('http') ? downUrl : `https:` + downUrl;
-                                        console.log({ data, task });
                                         axios_1.default.post(`https://smr00.vip.webportal.top/ajax/advanceUpload.jsp?cmd=_report&_TOKEN=${task.token}`, this.encodeURIComponent({
                                             type: 1,
                                             size: task.total,

package/package.json

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