@nger/fk-upload 1.0.201 → 1.0.204

package/dist/tasks/effect-task.js

@@ -0,0 +1,111 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EffectTask = void 0;
+const effect_task_1 = require("./../entities/effect-task");
+const rabbitmq_1 = require("@nger/rabbitmq");
+const actions_1 = require("./actions");
+const typeorm_1 = require("@nger/typeorm");
+const typeorm_2 = require("typeorm");
+const w7_chat_topic_1 = require("../entities/w7_chat_topic");
+class EffectTask extends rabbitmq_1.Task {
+    constructor() {
+        super(actions_1.EFFECT_ACTION);
+        this.count = 1;
+    }
+    async handle(injector, next) {
+        const task = injector.get(rabbitmq_1.DATA);
+        const db = injector.get(typeorm_1.Db);
+        const complete = injector.get(rabbitmq_1.COMPLETE);
+        const fail = injector.get(rabbitmq_1.FAIL);
+        const effect = await db.manager.findOneOrFail(effect_task_1.FkEffectTask, {
+            where: { id: task.id },
+            relations: [
+                'upload',
+                'upload.downloadTask',
+                'upload.downloadTask.w7Account',
+                'upload.downloadTask.w7Account.fkAccount',
+                // w7Account.w7
+                'upload.downloadTask.w7Account.w7',
+                'upload.downloadTask.jiqun',
+            ]
+        });
+        if (!effect) {
+            complete();
+            return next && next();
+        }
+        // stop
+        if (effect.status !== '1') {
+            complete();
+            return next && next();
+        }
+        const upload = effect.upload;
+        if (!upload) {
+            complete();
+            return next && next();
+        }
+        const download = upload.downloadTask;
+        if (!download) {
+            complete();
+            return next && next();
+        }
+        if (download.status !== '7') {
+            complete();
+            return next && next();
+        }
+        const w7Account = download.w7Account;
+        if (!w7Account) {
+            complete();
+            return next && next();
+        }
+        const w7 = w7Account.w7;
+        if (!w7) {
+            complete();
+            return next && next();
+        }
+        const fkAccount = w7Account.fkAccount;
+        if (!fkAccount) {
+            complete();
+            return next && next();
+        }
+        const jiqun = download.jiqun;
+        if (!jiqun) {
+            complete();
+            return next && next();
+        }
+        // create database
+        const ds = new typeorm_2.DataSource({
+            type: 'mysql',
+            host: w7.host,
+            port: w7.port,
+            password: w7.password,
+            database: w7.database,
+            username: w7.username,
+            synchronize: false,
+            entities: [
+                w7_chat_topic_1.W7ChatTopicEntity
+            ]
+        });
+        await ds.initialize();
+        // 
+        const uploadUrl = upload.url;
+        if (uploadUrl.includes('s21i.faiusr.com')) {
+            effect.url = uploadUrl.replace('s21i.faiusr.com', 's21v.faiusr.com');
+        }
+        if (uploadUrl.includes('s21d.faiusrd.com')) {
+            effect.url = uploadUrl.replace('s21d.faiusrd.com', 's21v.faiusr.com');
+        }
+        if (download.topicId > 0) {
+            await ds.manager.update(w7_chat_topic_1.W7ChatTopicEntity, download.topicId, {
+                topicStyle: 7,
+                foreverUrl: effect.url
+            });
+            await db.manager.update(effect_task_1.FkEffectTask, effect.id, { status: '2', url: effect.url });
+        }
+        else {
+            await db.manager.update(effect_task_1.FkEffectTask, effect.id, { status: '3', url: effect.url, desc: '没有找到相关活动' });
+        }
+        await complete();
+        return next && next();
+    }
+}
+exports.EffectTask = EffectTask;

package/dist/{templates/tasks → tasks}/providers.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tasksProviders = void 0;
-const check_task_1 = require("./check-task");
 const rabbitmq_1 = require("@nger/rabbitmq");
+const check_task_1 = require("./check-task");
+const download_continue_task_1 = require("./download-continue-task");
 const download_task_1 = require("./download-task");
 const effect_task_1 = require("./effect-task");
-const schedule_task_1 = require("./schedule-task");
+const upload_continue_task_1 = require("./upload-continue-task");
 const upload_task_1 = require("./upload-task");
 exports.tasksProviders = [
     {
@@ -15,7 +16,12 @@ exports.tasksProviders = [
     },
     {
         provide: rabbitmq_1.Task,
-        useFactory: () => new schedule_task_1.ScheduleTask(),
+        useFactory: () => new download_continue_task_1.DownloadContinueTask(),
+        multi: true
+    },
+    {
+        provide: rabbitmq_1.Task,
+        useFactory: () => new check_task_1.CheckTask(),
         multi: true
     },
     {
@@ -25,12 +31,12 @@ exports.tasksProviders = [
     },
     {
         provide: rabbitmq_1.Task,
-        useFactory: () => new effect_task_1.EffectTask(),
+        useFactory: () => new upload_continue_task_1.UploadContinueTask(),
         multi: true
     },
     {
         provide: rabbitmq_1.Task,
-        useFactory: () => new check_task_1.CheckTask(),
+        useFactory: () => new effect_task_1.EffectTask(),
         multi: true
     }
 ];

package/dist/tasks/upload-continue-task.d.ts

@@ -0,0 +1,8 @@
+import { Task } from "@nger/rabbitmq";
+import { Injector, Next } from "@nger/core";
+export declare class UploadContinueTask extends Task {
+    constructor();
+    getLocalSize(path: string): number;
+    errorCount: number;
+    handle(injector: Injector, next?: Next): Promise<void>;
+}

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

@@ -0,0 +1,114 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UploadContinueTask = void 0;
+const rabbitmq_1 = require("@nger/rabbitmq");
+const actions_1 = require("./actions");
+const typeorm_1 = require("@nger/typeorm");
+const fs_1 = require("fs");
+const upload_task_1 = require("../entities/upload-task");
+const client_service_1 = require("../services/client.service");
+const fk_service_1 = require("../services/fk.service");
+const operators_1 = require("rxjs/operators");
+const fs_extra_1 = require("fs-extra");
+class UploadContinueTask extends rabbitmq_1.Task {
+    constructor() {
+        super(actions_1.UPLOAD_CONTINUE_ACTION);
+        this.count = 1;
+    }
+    getLocalSize(path) {
+        try {
+            const stat = (0, fs_1.statSync)(path);
+            return stat.size;
+        }
+        catch (e) {
+            return 0;
+        }
+    }
+    errorCount = 0;
+    async handle(injector, next) {
+        const task = injector.get(rabbitmq_1.DATA);
+        const db = injector.get(typeorm_1.Db);
+        const complete = injector.get(rabbitmq_1.COMPLETE);
+        const fail = injector.get(rabbitmq_1.FAIL);
+        const upload = await db.manager.findOneOrFail(upload_task_1.FkUploadTask, { where: { id: task.id }, relations: ['downloadTask', 'downloadTask.jiqun', 'downloadTask.w7Account', 'downloadTask.w7Account.fkAccount'] });
+        if (!upload) {
+            complete();
+            return next && next();
+        }
+        // stop
+        if (upload.status !== '5') {
+            complete();
+            return next && next();
+        }
+        const download = upload.downloadTask;
+        if (!download) {
+            complete();
+            return next && next();
+        }
+        if (download.status !== '7') {
+            complete();
+            return next && next();
+        }
+        const w7Account = download.w7Account;
+        if (!w7Account) {
+            complete();
+            return next && next();
+        }
+        const fkAccount = w7Account.fkAccount;
+        if (!fkAccount) {
+            complete();
+            return next && next();
+        }
+        const jiqun = download.jiqun;
+        if (!jiqun) {
+            complete();
+            return next && next();
+        }
+        const client = injector.get(client_service_1.ClientService);
+        const clientId = client.createClientId();
+        if (jiqun.clientId !== clientId) {
+            fail();
+            return next && next();
+        }
+        const filePath = download.path;
+        // check file size
+        // not exist
+        if (!(0, fs_1.existsSync)(filePath)) {
+            await db.manager.update(upload_task_1.FkUploadTask, upload.id, { status: '6', desc: '找不到文件' });
+            return next && next();
+        }
+        // upload
+        const stats = (0, fs_1.statSync)(filePath);
+        const total = stats.size;
+        await db.manager.update(upload_task_1.FkUploadTask, upload.id, { status: '3', size: total });
+        const fkService = injector.get(fk_service_1.FkService);
+        const sub = await fkService.uploadFile(fkAccount, download);
+        sub.pipe((0, operators_1.switchMap)(async (res) => {
+            const item = await db.manager.findOne(upload_task_1.FkUploadTask, { where: { id: upload.id } });
+            if (!item) {
+                sub.error(`人为中止`);
+                return;
+            }
+            if (item.status !== '3') {
+                sub.error(`人为中止`);
+                return;
+            }
+            await db.manager.update(upload_task_1.FkUploadTask, upload.id, { uploadSize: res.end + 1, url: res.url });
+            return;
+        })).subscribe({
+            next: () => { },
+            complete: async () => {
+                await db.manager.update(upload_task_1.FkUploadTask, upload.id, { status: '7' });
+                await (0, fs_extra_1.unlink)(download.path);
+                await complete();
+            },
+            error: async (e) => {
+                await db.manager.update(upload_task_1.FkUploadTask, upload.id, { status: '6', desc: e.message || '' });
+                await fail();
+            }
+        });
+        if (next)
+            await next();
+    }
+}
+exports.UploadContinueTask = UploadContinueTask;

package/dist/tasks/upload-task.js

@@ -0,0 +1,114 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UploadTask = void 0;
+const rabbitmq_1 = require("@nger/rabbitmq");
+const actions_1 = require("./actions");
+const typeorm_1 = require("@nger/typeorm");
+const fs_1 = require("fs");
+const upload_task_1 = require("../entities/upload-task");
+const client_service_1 = require("../services/client.service");
+const fk_service_1 = require("../services/fk.service");
+const operators_1 = require("rxjs/operators");
+const fs_extra_1 = require("fs-extra");
+class UploadTask extends rabbitmq_1.Task {
+    constructor() {
+        super(actions_1.UPLOAD_ACTION);
+        this.count = 1;
+    }
+    getLocalSize(path) {
+        try {
+            const stat = (0, fs_1.statSync)(path);
+            return stat.size;
+        }
+        catch (e) {
+            return 0;
+        }
+    }
+    errorCount = 0;
+    async handle(injector, next) {
+        const task = injector.get(rabbitmq_1.DATA);
+        const db = injector.get(typeorm_1.Db);
+        const complete = injector.get(rabbitmq_1.COMPLETE);
+        const fail = injector.get(rabbitmq_1.FAIL);
+        const upload = await db.manager.findOneOrFail(upload_task_1.FkUploadTask, { where: { id: task.id }, relations: ['downloadTask', 'downloadTask.jiqun', 'downloadTask.w7Account', 'downloadTask.w7Account.fkAccount'] });
+        if (!upload) {
+            complete();
+            return next && next();
+        }
+        // stop
+        if (upload.status !== '2') {
+            complete();
+            return next && next();
+        }
+        const download = upload.downloadTask;
+        if (!download) {
+            complete();
+            return next && next();
+        }
+        if (download.status !== '7') {
+            complete();
+            return next && next();
+        }
+        const w7Account = download.w7Account;
+        if (!w7Account) {
+            complete();
+            return next && next();
+        }
+        const fkAccount = w7Account.fkAccount;
+        if (!fkAccount) {
+            complete();
+            return next && next();
+        }
+        const jiqun = download.jiqun;
+        if (!jiqun) {
+            complete();
+            return next && next();
+        }
+        const client = injector.get(client_service_1.ClientService);
+        const clientId = client.createClientId();
+        if (jiqun.clientId !== clientId) {
+            fail();
+            return next && next();
+        }
+        const filePath = download.path;
+        // check file size
+        // not exist
+        if (!(0, fs_1.existsSync)(filePath)) {
+            await db.manager.update(upload_task_1.FkUploadTask, upload.id, { status: '6', desc: '找不到文件' });
+            return next && next();
+        }
+        // upload
+        const stats = (0, fs_1.statSync)(filePath);
+        const total = stats.size;
+        await db.manager.update(upload_task_1.FkUploadTask, upload.id, { status: '3', size: total });
+        const fkService = injector.get(fk_service_1.FkService);
+        const sub = await fkService.uploadFile(fkAccount, download);
+        sub.pipe((0, operators_1.switchMap)(async (res) => {
+            const item = await db.manager.findOne(upload_task_1.FkUploadTask, { where: { id: upload.id } });
+            if (!item) {
+                sub.error(`人为中止`);
+                return;
+            }
+            if (item.status !== '3') {
+                sub.error(`人为中止`);
+                return;
+            }
+            await db.manager.update(upload_task_1.FkUploadTask, upload.id, { uploadSize: res.end + 1, url: res.url });
+            return;
+        })).subscribe({
+            next: () => { },
+            complete: async () => {
+                await db.manager.update(upload_task_1.FkUploadTask, upload.id, { status: '7' });
+                await (0, fs_extra_1.unlink)(download.path);
+                await complete();
+            },
+            error: async (e) => {
+                await db.manager.update(upload_task_1.FkUploadTask, upload.id, { status: '6', desc: e.message });
+                await fail();
+            }
+        });
+        if (next)
+            await next();
+    }
+}
+exports.UploadTask = UploadTask;

package/package.json

@@ -1,9 +1,12 @@
 {
   "name": "@nger/fk-upload",
-  "version": "1.0.201",
+  "version": "1.0.204",
   "description": "nger fk upload",
-  "main": "dist/electon.js",
-  "types": "dist/core.d.ts",
+  "main": "dist/main.js",
+  "types": "dist/main.d.ts",
+  "bin": {
+    "fk-upload": "./dist/main.js"
+  },
   "nger": {
     "cover": [],
     "menu": []
@@ -15,33 +18,34 @@
   "license": "ISC",
   "dependencies": {
     "@nger/api": "^1.0.0",
+    "@nger/main": "^1.0.0",
     "@nger/core": "^1.0.0",
-    "@nger/rest": "^1.0.0",
     "@nger/http": "^4.0.0",
     "@nger/rabbitmq": "^1.0.0",
     "@nger/redis": "^1.0.0",
+    "@nger/rest": "^1.0.0",
     "@nger/schedule": "^1.0.0",
     "@nger/typeorm": "^1.0.0",
     "@nger/w7": "^1.0.0",
     "@nger/ws": "^1.0.0",
-    "@types/download": "^8.0.1",
-    "@types/react": "^18.0.8",
-    "@types/request": "^2.48.8",
     "axios": "^0.26.1",
-    "bootstrap": "5.2.0-beta1",
-    "cids": "^1.1.9",
-    "download": "^8.0.0",
+    "date-fns": "^2.28.0",
     "form-data": "^4.0.0",
     "fs-extra": "^10.1.0",
     "md5-file": "^5.0.0",
-    "multihashing-async": "^2.1.4",
-    "multispinner": "^0.2.1",
     "react": "^18.1.0",
-    "request": "^2.88.2"
+    "request": "^2.88.2",
+    "tough-cookie": "^4.0.0",
+    "uuid": "^8.3.2"
+  },
+  "devDependencies": {
+    "@types/react": "^18.0.8",
+    "@types/request": "^2.48.8"
   },
   "scripts": {
     "tsc": "tsc",
-    "tsc:build": "tsc"
+    "tsc:build": "tsc",
+    "start": "ts-node src/main.ts"
   },
   "readme": "## admin\n\n## account\n\n## test url -- \n\n## \n\nhttp://kaifa2.jidujiaowang.com/web/index.php?c=site&a=entry&eid=8&version_id=0\nadmin888\n12345678"
 }