@nger/fk-upload 1.0.32 → 1.0.35

package/dist/entities/fk-download-task.entity.js

@@ -30,15 +30,21 @@ __decorate([
     __metadata("design:type", String)
 ], FkDownloadTaskEntity.prototype, "filename", void 0);
 __decorate([
-    (0, typeorm_1.Column)(),
+    (0, typeorm_1.Column)({
+        default: 0
+    }),
     __metadata("design:type", Number)
 ], FkDownloadTaskEntity.prototype, "status", void 0);
 __decorate([
-    (0, typeorm_1.Column)(),
+    (0, typeorm_1.Column)({
+        default: 0
+    }),
     __metadata("design:type", Number)
 ], FkDownloadTaskEntity.prototype, "totalSize", void 0);
 __decorate([
-    (0, typeorm_1.Column)(),
+    (0, typeorm_1.Column)({
+        default: 0
+    }),
     __metadata("design:type", Number)
 ], FkDownloadTaskEntity.prototype, "size", void 0);
 __decorate([

package/dist/fk-upload.module.js

@@ -19,20 +19,23 @@ const error_1 = require("./templates/error");
 const help_1 = require("./templates/help");
 const setting_1 = require("./templates/setting");
 const task_manage_1 = require("./templates/task-manage");
-const task_service_1 = require("./templates/task.service");
+const task_service_1 = require("./templates/tasks/task.service");
+const providers_1 = require("./templates/tasks/providers");
 const upload_1 = require("./templates/upload");
 const upload_task_1 = require("./templates/upload-task");
-const upload_service_1 = require("./templates/upload.service");
 const verify_1 = require("./templates/verify");
 const urlSafeBase64Decode_1 = require("./urlSafeBase64Decode");
+const fk_service_1 = require("./templates/tasks/fk.service");
+const player_1 = require("./templates/player");
 let FkUploadModule = class FkUploadModule {
 };
 FkUploadModule = __decorate([
     (0, core_1.Module)({
         providers: [
             urlSafeBase64Decode_1.UrlSafeBase64,
-            upload_service_1.UploadService,
             task_service_1.TaskService,
+            fk_service_1.FkService,
+            ...providers_1.tasksProviders,
             {
                 provide: core_1.LoadAddon,
                 useFactory: () => new mq_runner_1.MqRunner(),
@@ -50,7 +53,8 @@ FkUploadModule = __decorate([
             task_manage_1.TaskManageController,
             add_task_1.AddTaskController,
             error_1.ErrorController,
-            setting_1.SettingController
+            setting_1.SettingController,
+            player_1.Player
         ],
         imports: [
             typeorm_1.TypeormModule.forFeature([

package/dist/main.js

@@ -46,7 +46,8 @@ AppModule = __decorate([
 ], AppModule);
 exports.AppModule = AppModule;
 (0, core_1.platformCore)().bootstrap(AppModule).then(() => {
-    process.send('ready');
+    if (process && process.send)
+        process.send('ready');
 });
 process.on('uncaughtException', (err) => {
     console.log(err.message);

package/dist/mq-runner.js

@@ -2,18 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MqRunner = void 0;
 const core_1 = require("@nger/core");
-const task_service_1 = require("./templates/task.service");
-let i = 0;
+const rabbitmq_1 = require("@nger/rabbitmq");
 class MqRunner extends core_1.LoadAddon {
     constructor() {
         super(`mq runner`);
     }
     async handle(injector, next) {
-        const task = injector.get(task_service_1.TaskService);
-        await task.receiveDownloadTask();
-        await task.receiveUploadTask();
-        await task.receiveEffectTask();
-        await task.receiveScheduleTask();
+        const tasks = injector.getMulti(rabbitmq_1.Task);
+        const manager = injector.get(rabbitmq_1.TaskManager);
+        const topics = [...new Set(tasks.map(task => task.name))];
+        topics.map(topic => manager.listen(topic));
         if (next)
             await next();
     }

package/dist/templates/add-task.d.ts

@@ -1,10 +1,12 @@
 import { Db } from '@nger/typeorm';
 import { Context } from 'koa';
-import { TaskService } from './task.service';
+import { TaskService } from './tasks/task.service';
+import { TaskManager } from '@nger/rabbitmq';
 export declare class AddTaskController {
     private db;
     private task;
-    constructor(db: Db, task: TaskService);
+    private taskService;
+    constructor(db: Db, task: TaskManager, taskService: TaskService);
     postAddTask(post: any, ctx: Context): Promise<void>;
     addTask(): JSX.Element;
 }

package/dist/templates/add-task.js

@@ -22,19 +22,23 @@ const component_1 = require("./component");
 const react_1 = __importDefault(require("react"));
 const typeorm_1 = require("@nger/typeorm");
 const entities_1 = require("../entities");
-const task_service_1 = require("./task.service");
+const task_service_1 = require("./tasks/task.service");
+const rabbitmq_1 = require("@nger/rabbitmq");
 let AddTaskController = class AddTaskController {
     db;
     task;
-    constructor(db, task) {
+    taskService;
+    constructor(db, task, taskService) {
         this.db = db;
         this.task = task;
+        this.taskService = taskService;
     }
     async postAddTask(post, ctx) {
         const { url, we7Username } = post;
         const loginEntity = await this.db.manager.findOne(entities_1.FkLoginEntity, { where: { w7Username: we7Username } });
         if (loginEntity) {
-            await this.task.createDownLoadTask(url, loginEntity.fkLoginId, 0);
+            const task = await this.taskService.createDownLoadTask(url, loginEntity.fkLoginId, 0);
+            await this.task.send(task);
         }
         ctx.redirect('/@nger/fk-upload/task-manage');
         return;
@@ -71,6 +75,6 @@ __decorate([
 ], AddTaskController.prototype, "addTask", null);
 AddTaskController = __decorate([
     (0, core_1.Controller)('@nger/fk-upload'),
-    __metadata("design:paramtypes", [typeorm_1.Db, task_service_1.TaskService])
+    __metadata("design:paramtypes", [typeorm_1.Db, rabbitmq_1.TaskManager, task_service_1.TaskService])
 ], AddTaskController);
 exports.AddTaskController = AddTaskController;

package/dist/templates/create-download-task.js

@@ -0,0 +1 @@
+"use strict";

package/dist/templates/player.d.ts

@@ -0,0 +1,3 @@
+export declare class Player {
+    player(): JSX.Element;
+}

package/dist/templates/player.js

@@ -0,0 +1,34 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+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.Player = void 0;
+const core_1 = require("@nger/core");
+const http_1 = require("@nger/http");
+const react_1 = __importDefault(require("react"));
+let Player = class Player {
+    player() {
+        return react_1.default.createElement("div", null,
+            react_1.default.createElement("video", { controls: true, autoPlay: true, src: "https://17854642.s21v.faiusr.com/58/ABUIABA6GAAg0___kwYozPPaiAI.mp4" }));
+    }
+};
+__decorate([
+    (0, http_1.Get)(`player`),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], Player.prototype, "player", null);
+Player = __decorate([
+    (0, core_1.Controller)(`@nger/fk-upload`)
+], Player);
+exports.Player = Player;

package/dist/templates/receive-shedule-task.d.ts

@@ -0,0 +1,14 @@
+import { RabbitMqService } from "@nger/rabbitmq";
+import { RedisService } from "@nger/redis";
+import { ScheduleService } from "@nger/schedule";
+import { Db } from "@nger/typeorm";
+import { W7DataSource } from "packages/w7/dist/core";
+export declare class ReceiveScheduleTask {
+    private rabbit;
+    private redis;
+    private schedule;
+    private db;
+    private w7;
+    constructor(rabbit: RabbitMqService, redis: RedisService, schedule: ScheduleService, db: Db, w7: W7DataSource);
+    receiveScheduleTask(runner: Function): Promise<void>;
+}

package/dist/templates/receive-shedule-task.js

@@ -0,0 +1,64 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ReceiveScheduleTask = void 0;
+const core_1 = require("packages/w7/dist/core");
+const entities_1 = require("../entities");
+const typeorm_1 = require("typeorm");
+class ReceiveScheduleTask {
+    rabbit;
+    redis;
+    schedule;
+    db;
+    w7;
+    constructor(rabbit, redis, schedule, db, w7) {
+        this.rabbit = rabbit;
+        this.redis = redis;
+        this.schedule = schedule;
+        this.db = db;
+        this.w7 = w7;
+    }
+    async receiveScheduleTask(runner) {
+        const obs = await this.rabbit.receive(`@nger/fk-upload/schedule-task`);
+        obs.subscribe({
+            next: async ([data, complete, fail]) => {
+                try {
+                    const task = JSON.parse(data);
+                    const setting = await this.redis.get(`setting`);
+                    if (!setting) {
+                        return complete();
+                    }
+                    if (task.name === setting.name) {
+                        console.log(`shedule job regist ${task.name}`);
+                        this.schedule.scheduleJob(task.name, task.rule, async (time) => {
+                            const accounts = await this.db.manager.find(entities_1.FkLoginEntity, {});
+                            const w7Usernames = accounts.map(account => account.w7Username);
+                            const users = await this.w7.manager.find(core_1.W7UsersEntity, { where: { username: (0, typeorm_1.In)(w7Usernames) } });
+                            const uids = users.map(user => user.uid);
+                            const uniAccounts = await this.w7.manager.find(core_1.W7UniAccountEntity, { where: { createUid: (0, typeorm_1.In)(uids) } });
+                            const uniacids = uniAccounts.map(a => a.uniacid);
+                            const tasks = await this.db.manager.find(entities_1.FkDownloadTaskEntity, { select: ['topicId'] });
+                            const ids = tasks.map(task => task.topicId);
+                            const topics = await this.w7.manager.find(core_1.W7ChatTopicEntity, { where: { uniacid: (0, typeorm_1.In)(uniacids), id: (0, typeorm_1.Not)((0, typeorm_1.In)(ids)) } });
+                            topics.map(topic => {
+                                if (topic.thirdUrl) {
+                                    const uniacid = topic.uniacid;
+                                    const account = uniAccounts.find(a => a.uniacid === uniacid);
+                                    const user = users.find(u => u.uid === account.createUid);
+                                    const login = accounts.find(a => a.w7Username === user.username);
+                                    this.createDownLoadTask(topic.thirdUrl, login.fkLoginId, topic.id);
+                                }
+                            });
+                        });
+                    }
+                    else {
+                        complete();
+                    }
+                }
+                catch (e) {
+                    fail();
+                }
+            }
+        });
+    }
+}
+exports.ReceiveScheduleTask = ReceiveScheduleTask;

package/dist/templates/setting.d.ts

@@ -1,10 +1,12 @@
-import { TaskService } from './task.service';
+import { TaskService } from './tasks/task.service';
 import { Client } from '@nger/redis';
 import { Context } from 'koa';
+import { TaskManager } from '@nger/rabbitmq';
 export declare class SettingController {
     private task;
     private redis;
-    constructor(task: TaskService, redis: Client);
-    saveSetting(body: any, ctx: Context): void;
+    private manager;
+    constructor(task: TaskService, redis: Client, manager: TaskManager);
+    saveSetting(body: any, ctx: Context): Promise<void>;
     setting(): Promise<JSX.Element>;
 }

package/dist/templates/setting.js

@@ -20,22 +20,21 @@ const core_1 = require("@nger/core");
 const http_1 = require("@nger/http");
 const react_1 = __importDefault(require("react"));
 const component_1 = require("./component");
-const task_service_1 = require("./task.service");
+const task_service_1 = require("./tasks/task.service");
 const redis_1 = require("@nger/redis");
+const rabbitmq_1 = require("@nger/rabbitmq");
 let SettingController = class SettingController {
     task;
     redis;
-    constructor(task, redis) {
+    manager;
+    constructor(task, redis, manager) {
         this.task = task;
         this.redis = redis;
+        this.manager = manager;
     }
-    saveSetting(body, ctx) {
-        const task = {
-            name: body.name,
-            rule: body.rule
-        };
-        this.task.addScheduleTask(task);
-        this.redis.set(`setting`, JSON.stringify(task));
+    async saveSetting(body, ctx) {
+        const task = await this.task.createScheduleTask(body.name, body.rule);
+        await this.manager.send(task);
         ctx.redirect(`/@nger/fk-upload/setting`);
         return;
     }
@@ -70,7 +69,7 @@ __decorate([
     __param(1, (0, core_1.Inject)(http_1.CONTEXT)),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object]),
-    __metadata("design:returntype", void 0)
+    __metadata("design:returntype", Promise)
 ], SettingController.prototype, "saveSetting", null);
 __decorate([
     (0, http_1.Get)(`setting`),
@@ -80,6 +79,6 @@ __decorate([
 ], SettingController.prototype, "setting", null);
 SettingController = __decorate([
     (0, core_1.Controller)(`@nger/fk-upload`),
-    __metadata("design:paramtypes", [task_service_1.TaskService, redis_1.Client])
+    __metadata("design:paramtypes", [task_service_1.TaskService, redis_1.Client, rabbitmq_1.TaskManager])
 ], SettingController);
 exports.SettingController = SettingController;

package/dist/templates/task-manage.d.ts

@@ -1,13 +1,10 @@
 import { Config } from '@nger/core';
 import { Db } from '@nger/typeorm';
-import { UploadService } from './upload.service';
 import { Context } from 'koa';
 export declare class TaskManageController {
     private db;
     private config;
-    private upload;
-    constructor(db: Db, config: Config, upload: UploadService);
-    taskContinue(filename: string, ctx: Context): void;
+    constructor(db: Db, config: Config);
     taskManage(): Promise<JSX.Element>;
-    staticTaskManage(ctx: Context): string;
+    staticTaskManage(ctx: Context): any;
 }

package/dist/templates/task-manage.js

@@ -24,7 +24,6 @@ const entities_1 = require("../entities");
 const component_1 = require("./component");
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
-const upload_service_1 = require("./upload.service");
 function getStatusTitle(status) {
     switch (status) {
         case 0:
@@ -38,17 +37,9 @@ function getStatusTitle(status) {
 let TaskManageController = class TaskManageController {
     db;
     config;
-    upload;
-    constructor(db, config, upload) {
+    constructor(db, config) {
         this.db = db;
         this.config = config;
-        this.upload = upload;
-    }
-    taskContinue(filename, ctx) {
-        if (filename)
-            this.upload.continueTask(decodeURIComponent(filename));
-        ctx.redirect(`/@nger/fk-upload/task-manage`);
-        return;
     }
     async taskManage() {
         const tasks = await this.db.manager.find(entities_1.FkDownloadTaskEntity, { where: {}, order: { loginId: "DESC" } });
@@ -70,7 +61,6 @@ let TaskManageController = class TaskManageController {
                                 react_1.default.createElement("td", null, "upload size"),
                                 react_1.default.createElement("td", { width: '240px' }, "upload url"))),
                         react_1.default.createElement("tbody", null, tasks.map((task, key) => {
-                            const _continue = `/@nger/fk-upload/task-continue?filename=${encodeURIComponent(task.filename)}`;
                             return react_1.default.createElement("tr", { key: key },
                                 react_1.default.createElement("td", null, task.filename),
                                 react_1.default.createElement("td", null, getStatusTitle(task.status)),
@@ -82,19 +72,16 @@ let TaskManageController = class TaskManageController {
             react_1.default.createElement("script", { src: "/@nger/fk-upload/static/task-manage.js?t=" + new Date().getTime() }));
     }
     staticTaskManage(ctx) {
-        ctx.type = 'js';
-        const content = (0, fs_extra_1.readFileSync)((0, path_1.join)(__dirname, '../static/task-manage.js')).toString('utf-8');
-        return content;
+        try {
+            ctx.type = 'js';
+            const content = (0, fs_extra_1.readFileSync)((0, path_1.join)(__dirname, '../static/task-manage.js')).toString('utf-8');
+            return content;
+        }
+        catch (e) {
+            return e.message;
+        }
     }
 };
-__decorate([
-    (0, http_1.Get)('task-continue'),
-    __param(0, (0, http_1.Query)('filename')),
-    __param(1, (0, core_1.Inject)(http_1.CONTEXT)),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, Object]),
-    __metadata("design:returntype", void 0)
-], TaskManageController.prototype, "taskContinue", null);
 __decorate([
     (0, http_1.Get)('task-manage'),
     __metadata("design:type", Function),
@@ -110,6 +97,6 @@ __decorate([
 ], TaskManageController.prototype, "staticTaskManage", null);
 TaskManageController = __decorate([
     (0, core_1.Controller)(`@nger/fk-upload`),
-    __metadata("design:paramtypes", [typeorm_1.Db, core_1.Config, upload_service_1.UploadService])
+    __metadata("design:paramtypes", [typeorm_1.Db, core_1.Config])
 ], TaskManageController);
 exports.TaskManageController = TaskManageController;

package/dist/templates/task-types.d.ts

@@ -0,0 +1,34 @@
+export interface EffectTask {
+    filename: string;
+    uploadUrl: string;
+    topicId: number;
+}
+export interface ScheduleTask {
+    name: string;
+    rule: string;
+}
+export interface DownloadTask {
+    filename: string;
+    path: string;
+    size: number;
+    url: string;
+    totalSize: number;
+}
+export interface UploadTask {
+    filename: string;
+    path: string;
+    uploadUrl: string;
+    start: number;
+    end: number;
+    total: number;
+    cookies: string;
+    aid: number;
+    folderId: number;
+    fileMd5: string;
+    index: number;
+    splitSize: number;
+    totalChunks: number;
+    complete: boolean;
+    topicId: number;
+    token: string;
+}

package/dist/templates/task-types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -1,68 +0,0 @@
-import { Injector } from '@nger/core';
-import { RabbitMqService } from '@nger/rabbitmq';
-import { Client } from '@nger/redis';
-import { Db } from '@nger/typeorm';
-import { Observable } from 'rxjs';
-import { WsService } from '@nger/ws';
-export interface DownloadTask {
-    filename: string;
-    path: string;
-    size: number;
-    url: string;
-    totalSize: number;
-}
-export interface UploadTask {
-    filename: string;
-    path: string;
-    uploadUrl: string;
-    start: number;
-    end: number;
-    total: number;
-    cookies: string;
-    aid: number;
-    folderId: number;
-    fileMd5: string;
-    index: number;
-    splitSize: number;
-    totalChunks: number;
-    complete: boolean;
-    topicId: number;
-    token: string;
-}
-import { ScheduleService } from '@nger/schedule';
-import { W7DataSource } from '@nger/w7';
-export interface EffectTask {
-    filename: string;
-    uploadUrl: string;
-    topicId: number;
-}
-export interface ScheduleTask {
-    name: string;
-    rule: string;
-}
-export declare class TaskService {
-    private rabbit;
-    private redis;
-    private db;
-    private ws;
-    private schedule;
-    private w7;
-    private injector;
-    constructor(rabbit: RabbitMqService, redis: Client, db: Db, ws: WsService, schedule: ScheduleService, w7: W7DataSource, injector: Injector);
-    addDownloadTask(task: DownloadTask): Promise<void>;
-    addUploadTask(task: UploadTask): Promise<void>;
-    beginUploadTask(filename: string): Promise<void>;
-    addEffectTask(task: EffectTask): Promise<void>;
-    addScheduleTask(task: ScheduleTask): Promise<void>;
-    createDownLoadTask(url: string, fkLoginId: number, topicId: number): Promise<void>;
-    receiveScheduleTask(): Promise<void>;
-    receiveEffectTask(): Promise<void>;
-    receiveUploadTask(): Promise<void>;
-    receiveDownloadTask(): Promise<void>;
-    private getUploadInfourl;
-    private encodeURIComponent;
-    private getUploadUrl;
-    reUploadTask(): Promise<void>;
-    startUploadTask(filename: string): Promise<void>;
-    download(task: DownloadTask): Observable<DownloadTask>;
-}