@nger/fk-upload 1.0.23 → 1.0.26

package/dist/templates/task.service.d.ts

@@ -27,6 +27,7 @@ export interface UploadTask {
     totalChunks: number;
     complete: boolean;
     topicId: number;
+    token: string;
 }
 import { ScheduleService } from '@nger/schedule';
 import { W7DataSource } from '@nger/w7';

package/dist/templates/task.service.js

@@ -167,21 +167,20 @@ 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}`);
-                            console.log(task.filename);
-                            formdata.append('fileName', task.filename);
-                            formdata.append(`totalSize`, `${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('isFreeVer', this.encodeURIComponent(false));
+                            formdata.append('aid', this.encodeURIComponent(task.aid));
+                            formdata.append('folderId', this.encodeURIComponent(task.folderId));
+                            formdata.append('fileName', this.encodeURIComponent(task.filename));
+                            formdata.append(`totalSize`, this.encodeURIComponent(task.total));
+                            formdata.append(`fileMd5`, this.encodeURIComponent(task.fileMd5));
+                            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
                             };
-                            formdata.append('bssInfo', JSON.stringify(bssInfo));
+                            formdata.append('bssInfo', this.encodeURIComponent(bssInfo));
                             const headers = formdata.getHeaders();
                             const uploadResult = await axios_1.default.post(task.uploadUrl, formdata, {
                                 headers: {
@@ -204,8 +203,20 @@ let TaskService = class TaskService {
                                     // fullDownUrl
                                     const downUrl = data.fullDownUrl;
                                     if (downUrl) {
-                                        const fullUrl = downUrl.startsWith('http') ? downUrl : `https://` + downUrl;
-                                        console.log(fullUrl);
+                                        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,
+                                            time: NaN,
+                                            flag: true,
+                                            name: task.filename
+                                        }), {
+                                            headers: {
+                                                [`Content-Type`]: `application/x-www-form-urlencoded; charset=UTF-8`,
+                                                Cookie: task.cookies
+                                            }
+                                        });
                                         this.redis.del(task.filename);
                                         this.ws.send({
                                             action: `@nger/fk-upload/uploading`,
@@ -299,6 +310,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)}`;
@@ -332,7 +346,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);
@@ -381,7 +395,8 @@ let TaskService = class TaskService {
                                     totalChunks: totalChunks,
                                     splitSize,
                                     complete,
-                                    topicId: task.topicId
+                                    topicId: task.topicId,
+                                    token: token
                                 });
                                 index = index + 1;
                                 start = endSize;

package/package.json

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