@nger/fk-upload 1.0.8 → 1.0.9

package/dist/templates/upload.service.js

@@ -8,266 +8,39 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UploadService = void 0;
-const path_1 = require("path");
 const entities_1 = require("../entities");
-const cids_1 = __importDefault(require("cids"));
-const multihashing_async_1 = __importDefault(require("multihashing-async"));
 const typeorm_1 = require("@nger/typeorm");
-const rxjs_1 = require("rxjs");
-const request_1 = require("request");
-const fs_1 = require("fs");
-const md5_file_1 = __importDefault(require("md5-file"));
 const core_1 = require("@nger/core");
-const axios_1 = __importDefault(require("axios"));
-const form_data_1 = __importDefault(require("form-data"));
-const fs_extra_1 = require("fs-extra");
+const ws_1 = require("@nger/ws");
+const task_service_1 = require("./task.service");
 let UploadService = class UploadService {
     db;
     injector;
+    get ws() {
+        return this.injector.get(ws_1.WsService);
+    }
+    get task() {
+        return this.injector.get(task_service_1.TaskService);
+    }
     constructor(db, injector) {
         this.db = db;
         this.injector = injector;
     }
-    async createDownLoadTask(url, fkLoginId) {
-        const observable = await this.createObservable(url);
-        return observable.listen.pipe((0, rxjs_1.throttleTime)(1000), (0, rxjs_1.switchMap)(async (res) => {
-            const exist = await this.db.manager.findOne(entities_1.FkDownloadTaskEntity, { where: { filename: observable.filename } });
-            if (exist) {
-                const size = res.size;
-                const total = res.totalSize;
-                const num = Math.floor((size / total) * 100);
-                await this.db.manager.update(entities_1.FkDownloadTaskEntity, exist.filename, { size: num });
-            }
-            else {
-                await this.db.manager.save(entities_1.FkDownloadTaskEntity, res);
-            }
-            return res;
-        })).subscribe({
-            next: () => { },
-            complete: async () => {
-                const exist = await this.db.manager.findOne(entities_1.FkDownloadTaskEntity, { where: { filename: observable.filename } });
-                const md5 = await (0, md5_file_1.default)(exist.path);
-                await this.db.manager.update(entities_1.FkDownloadTaskEntity, observable.filename, { status: 1, size: 100, fileMd5: md5, loginId: fkLoginId });
-                // upload
-                return await this.createUplaodTask(exist.filename);
-            }
-        });
-    }
-    getUploadUrl(token, forceDirect = true) {
-        if (forceDirect) {
-            return `https://${token.url}/${token.visitType}/${token.app}/upload?cmd=${token.cmd}&token=${token.token}`;
-        }
-        else {
-            return `https://${token.url}/${token.visitType}/${token.app}/advance?cmd=${token.cmd}&token=${token.token}`;
-        }
-    }
-    getUploadInfourl(token) {
-        return `https://${token.url}/${token.visitType}/${token.app}/advance/info?cmd=${token.cmd}&token=${token.token}`;
-    }
-    encodeURIComponent(data) {
-        return Object.keys(data).map(key => {
-            const value = Reflect.get(data, key);
-            return `${key}=${encodeURIComponent(value)}`;
-        }).join('&');
-    }
-    async createUplaodTask(filename) {
-        // 
+    async continueTask(filename) {
         const task = await this.db.manager.findOne(entities_1.FkDownloadTaskEntity, { where: { filename } });
         if (task) {
             if (task.status === 0) {
-                return {
-                    msg: 'downloading'
-                };
-            }
-            if (task.status === 2) {
-                return {
-                    msg: 'uploaded'
-                };
+                return this.task.createDownLoadTask(task.url, task.loginId, 0);
             }
-            const loginEntity = await this.db.manager.findOne(entities_1.FkLoginEntity, { where: { fkLoginId: task.loginId } });
-            const cookies = await this.db.manager.find(entities_1.FkLoginCookieEntity, { where: { fkLoginId: task.loginId } });
-            const cookie = cookies.map(cookie => `${cookie.key}=${cookie.value}`).join(';');
-            // 00 take token
-            const url = `https://i.vip.webportal.top/`;
-            const iVipWebPortal = await axios_1.default.get(url, {
-                headers: {
-                    Cookie: cookie
-                }
-            }).then(res => res.data);
-            const items = iVipWebPortal.match(/<meta id='_TOKEN' value='(.*?)'\/>/);
-            let token = ``;
-            if (items && items.length === 2) {
-                token = items[1];
+            else if (task.status === 1) {
+                return this.task.startUploadTask(task.filename);
             }
-            if (token.length > 0) {
-                // 01
-                const url = `https://smr00.vip.webportal.top/cn/api/manage/advanceUpload/genAccessKey?_v=1651232099799&_TOKEN=${token}`;
-                const accessKey = await axios_1.default.get(url).then(res => res.data);
-                if (accessKey.success) {
-                    const accessTokenString = decode(accessKey.accessKey);
-                    if (accessTokenString) {
-                        const accessToken = JSON.parse(accessTokenString);
-                        const uploadInfoUrl = this.getUploadInfourl(accessToken);
-                        const bssInfo = {
-                            fromSite: true, siteId: 0, groupId: 0, fileSizeLimit: 1024
-                        };
-                        const info = await axios_1.default.post(uploadInfoUrl, this.encodeURIComponent({
-                            fileMd5: task.fileMd5,
-                            fileSize: task.totalSize,
-                            isFreeVer: false,
-                            aid: loginEntity.aid,
-                            folderId: loginEntity.uploadGroupId,
-                            bssInfo: JSON.stringify(bssInfo),
-                            fileName: task.filename
-                        }), { headers: { cookie: cookie } }).then(res => res.data);
-                        if (info.code === 200) {
-                            const data = info.data;
-                            const { delayTime, splitSize, uploadedSize } = data;
-                            const uploadUrl = this.getUploadUrl(accessToken, false);
-                            const totalChunks = Math.ceil((task.totalSize - uploadedSize) / splitSize);
-                            let start = uploadedSize;
-                            let index = Math.ceil(uploadedSize / splitSize);
-                            let complete = false;
-                            do {
-                                if (index >= totalChunks - 1) {
-                                    complete = true;
-                                }
-                                const fileStream = (0, fs_1.createReadStream)(task.path, { start: start, end: start + splitSize });
-                                const formdata = new form_data_1.default();
-                                formdata.append('ctrl', fileStream);
-                                formdata.append('isFreeVer', 'false');
-                                formdata.append('aid', `${loginEntity.aid || 0}`);
-                                formdata.append('folderId', `${loginEntity.uploadGroupId || 0}`);
-                                formdata.append('fileName', task.filename);
-                                formdata.append(`totalSize`, `${task.totalSize}`);
-                                formdata.append(`fileMd5`, task.fileMd5);
-                                formdata.append('index', `${index}`);
-                                formdata.append('chunkSize', `${splitSize}`);
-                                formdata.append('totalChunks', `${totalChunks}`);
-                                formdata.append(`complete`, `${complete}`);
-                                formdata.append('bssInfo', JSON.stringify(bssInfo));
-                                const headers = formdata.getHeaders();
-                                const uploadResult = await axios_1.default.post(uploadUrl, formdata, {
-                                    headers: {
-                                        ...headers,
-                                        Cookie: cookie
-                                    }
-                                }).then(res => {
-                                    const data = res.data;
-                                    return data;
-                                });
-                                if (uploadResult.code === 200) {
-                                    const data = uploadResult.data;
-                                    if (data) {
-                                        const downUrl = data.downUrl;
-                                        if (downUrl) {
-                                            await this.db.manager.update(entities_1.FkDownloadTaskEntity, task.filename, {
-                                                status: 2,
-                                                uploadUrl: `https://` + downUrl,
-                                                uploadSize: 100
-                                            });
-                                        }
-                                        else {
-                                            await this.db.manager.update(entities_1.FkDownloadTaskEntity, task.filename, {
-                                                uploadSize: Math.floor(((index + 1) / totalChunks) * 100)
-                                            });
-                                        }
-                                    }
-                                    index = index + 1;
-                                    start = start + splitSize;
-                                }
-                            } while (!complete);
-                        }
-                    }
-                }
-            }
-        }
-    }
-    async createObservable(url) {
-        const hash = await (0, multihashing_async_1.default)(Buffer.from(url), 'sha1', 16);
-        const cid = new cids_1.default(1, 'raw', hash, 'base64');
-        // const _url = new URL(url);
-        // const pathname = _url.pathname;
-        // const ext = extname(pathname)
-        const filename = cid.toString('base64');
-        let item = await this.db.manager.findOne(entities_1.FkDownloadTaskEntity, { where: { filename } });
-        if (item) {
-            let task = item;
-            if (task.status) {
-                return {
-                    listen: (0, rxjs_1.of)(task),
-                    filename
-                };
+            else {
+                console.log(task);
             }
-            const observable = new rxjs_1.Observable((sub) => {
-                // go on
-                const writeStream = (0, fs_1.createWriteStream)(task.path, { start: task.size });
-                const req = (0, request_1.get)(url, {
-                    headers: {
-                        'Content-Type': 'application/octet-stream'
-                    }
-                });
-                let length = 0;
-                req.on('data', (buf) => {
-                    length += buf.length;
-                    if (length >= task.size) {
-                        task.size = length;
-                        writeStream.write(buf, (err) => {
-                            if (err)
-                                sub.error(err);
-                        });
-                        sub.next(task);
-                    }
-                });
-                req.on('end', () => {
-                    sub.complete();
-                    writeStream.end();
-                });
-            });
-            return { listen: observable, filename };
         }
-        ;
-        const root = this.injector.get(core_1.APP_ROOT);
-        const observable = new rxjs_1.Observable((sub) => {
-            let task = new entities_1.FkDownloadTaskEntity();
-            task.url = url;
-            const req = (0, request_1.get)(url);
-            (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 writeStream = (0, fs_1.createWriteStream)(path);
-            task.path = path;
-            let total = 0;
-            let length = 0;
-            task.filename = filename;
-            task.uploadSize = 0;
-            req.on('data', (buf) => {
-                length += buf.length;
-                task.size = length;
-                writeStream.write(buf, (err) => {
-                    if (err)
-                        sub.error(err);
-                });
-                sub.next(task);
-            });
-            req.on('end', () => {
-                sub.complete();
-                writeStream.end();
-            });
-            req.on('response', (resp) => {
-                const headers = resp.headers;
-                total = Number(Reflect.get(headers, 'content-length'));
-                task.totalSize = total;
-                task.size = 0;
-                task.status = 0;
-                sub.next(task);
-            });
-        });
-        return { listen: observable, filename };
     }
 };
 UploadService = __decorate([
@@ -275,24 +48,3 @@ UploadService = __decorate([
     __metadata("design:paramtypes", [typeorm_1.Db, core_1.Injector])
 ], UploadService);
 exports.UploadService = UploadService;
-function decode(base64Str) {
-    if (!base64Str)
-        return;
-    const t = base64Str.replace(/_/g, "/").replace(/-/g, "+");
-    const f = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
-    let l = 0;
-    let p = 0;
-    let h = [];
-    do {
-        const o = f.indexOf(t.charAt(l++));
-        const u = f.indexOf(t.charAt(l++));
-        const a = f.indexOf(t.charAt(l++));
-        const c = f.indexOf(t.charAt(l++));
-        const s = o << 18 | u << 12 | a << 6 | c;
-        const e = s >> 16 & 255;
-        const r = s >> 8 & 255;
-        const n = 255 & s;
-        h[p++] = 64 === a ? String.fromCharCode(e) : 64 === c ? String.fromCharCode(e, r) : String.fromCharCode(e, r, n);
-    } while (l < t.length);
-    return h.join('');
-}

package/docs.md

@@ -0,0 +1,34 @@
+## host
+
+### ssh
+
+```ts
+ssh root@111.229.255.176
+Yang1989.
+```
+
+### manage url
+
+```
+http://111.229.255.176:8081/@nger/fk-upload/help
+```
+
+### redis
+
+```
+REDIS_HOST=111.229.255.176
+REDIS_PORT=6379
+REDIS_PASS=123qwe
+```
+
+### rabbit mq
+
+http://111.229.255.176:15672/#/
+
+```
+RABBITMQ_HOST=111.229.255.176
+RABBITMQ_PORT=5672
+RABBITMQ_USERNAME=imeepos
+RABBITMQ_PASSWORD=123qwe
+```
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nger/fk-upload",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "",
   "main": "dist/core.js",
   "types": "dist/core.d.ts",
@@ -14,7 +14,11 @@
     "@nger/api": "^1.0.0",
     "@nger/http": "^4.0.0",
     "@nger/typeorm": "^1.0.0",
+    "@nger/redis": "^1.0.0",
+    "@nger/rabbitmq": "^1.0.0",
     "@nger/ws": "^1.0.0",
+    "@nger/schedule": "^1.0.0",
+    "@nger/w7": "^1.0.0",
     "@types/download": "^8.0.1",
     "@types/request": "^2.48.8",
     "axios": "^0.26.1",

package/pnpm-lock.yaml

@@ -4,7 +4,11 @@ specifiers:
   '@nger/api': workspace:^1.0.0
   '@nger/core': workspace:^1.0.0
   '@nger/http': workspace:^4.0.0
+  '@nger/rabbitmq': workspace:^1.0.0
+  '@nger/redis': workspace:^1.0.0
+  '@nger/schedule': workspace:^1.0.0
   '@nger/typeorm': workspace:^1.0.0
+  '@nger/w7': workspace:^1.0.0
   '@nger/ws': workspace:^1.0.0
   '@types/download': ^8.0.1
   '@types/request': ^2.48.8
@@ -21,7 +25,11 @@ dependencies:
   '@nger/api': link:../api
   '@nger/core': link:../core
   '@nger/http': link:../http
+  '@nger/rabbitmq': link:../rabbitmq
+  '@nger/redis': link:../redis
+  '@nger/schedule': link:../schedule
   '@nger/typeorm': link:../typeorm
+  '@nger/w7': link:../w7
   '@nger/ws': link:../ws
   '@types/download': 8.0.1
   '@types/request': 2.48.8