@nger/fk-upload 1.0.39 → 1.0.42

package/dist/login.controller.d.ts

@@ -5,7 +5,7 @@ export declare class LoginController {
     cookies: Map<string, Map<string, string>>;
     constructor(db: Db);
     login(loginId: string, ctx: Context): Promise<any>;
-    relogin(token: string, loginId: string, ctx: Context): Promise<"login fail : username or password error" | undefined>;
+    relogin(token: string, loginId: string, ctx: Context): Promise<string>;
     private tryLogin;
     logDog(arg0: number, arg1: number): void;
     private loginSuccess;

package/dist/main.js

@@ -5,7 +5,6 @@ const tslib_1 = require("tslib");
 require("reflect-metadata");
 require('dotenv').config();
 const core_1 = require("@nger/core");
-const core_2 = require("@nger/core");
 const fk_upload_module_1 = require("./fk-upload.module");
 const http_1 = require("@nger/http");
 const typeorm_1 = require("@nger/typeorm");
@@ -19,7 +18,7 @@ const w7_1 = require("@nger/w7");
 let AppModule = class AppModule {
 };
 AppModule = tslib_1.__decorate([
-    (0, core_2.Module)({
+    (0, core_1.Module)({
         providers: [{
                 provide: core_1.APP_ROOT,
                 useValue: process.cwd()

package/dist/static/task-manage.js

@@ -1,4 +1,3 @@
-"use strict";
 const url = new URL(window.location.href);
 const WS_PORT = Reflect.get(window, 'WS_PORT');
 const socket = new WebSocket(`ws://${url.hostname}:${WS_PORT}`);

package/dist/templates/add-fk-login.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { Db } from '@nger/typeorm';
 import { Context } from 'koa';
 import { CryptoService } from '@nger/utils';

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { Db } from '@nger/typeorm';
 import { Context } from 'koa';
 import { TaskService } from './tasks/task.service';

package/dist/templates/add-task.js

@@ -24,6 +24,14 @@ let AddTaskController = class AddTaskController {
         const loginEntity = await this.db.manager.findOne(entities_1.FkLoginEntity, { where: { w7Username: we7Username } });
         if (loginEntity) {
             const task = await this.taskService.createDownLoadTask(url, loginEntity.fkLoginId, 0);
+            const download = task.data;
+            const fkdownloadTask = new entities_1.FkDownloadTaskEntity();
+            fkdownloadTask.filename = download.filename;
+            fkdownloadTask.loginId = download.loginId;
+            fkdownloadTask.path = download.path;
+            fkdownloadTask.url = download.url;
+            fkdownloadTask.topicId = download.topicId;
+            await this.db.manager.save(entities_1.FkDownloadTaskEntity, fkdownloadTask);
             await this.task.send(task);
         }
         ctx.redirect('/@nger/fk-upload/task-manage');

package/dist/templates/code.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export declare class FkUploadCodeController {
     upload(loginId: string): JSX.Element;
 }

package/dist/templates/component.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface Nav {
     title: string;
     link: string;

package/dist/templates/error.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export declare class ErrorController {
     error(msg: string): JSX.Element;
 }

package/dist/templates/help.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { Db } from '@nger/typeorm';
 export declare class HelpController {
     private db;

package/dist/templates/player.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export declare class Player {
     player(): JSX.Element;
 }

package/dist/templates/setting.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { TaskService } from './tasks/task.service';
 import { Client } from '@nger/redis';
 import { Context } from 'koa';

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { Config } from '@nger/core';
 import { Db } from '@nger/typeorm';
 import { Context } from 'koa';

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

@@ -12,6 +12,8 @@ const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
 const typeorm_1 = require("@nger/typeorm");
 const entities_1 = require("../../entities");
+const rxjs_1 = require("rxjs");
+const operators_1 = require("rxjs/operators");
 /**
  * upload and task
  */
@@ -20,6 +22,7 @@ class DownloadTask extends rabbitmq_1.Task {
         super(actions_1.DOWNLOAD_ACTION);
     }
     async handle(injector, next) {
+        const db = injector.get(typeorm_1.Db);
         const task = injector.get(rabbitmq_1.DATA);
         const complete = injector.get(rabbitmq_1.COMPLETE);
         const fail = injector.get(rabbitmq_1.FAIL);
@@ -32,12 +35,19 @@ class DownloadTask extends rabbitmq_1.Task {
                 'Content-Type': 'application/octet-stream'
             }
         });
-        let length = 0;
         let total = 0;
+        let length = 0;
         let md5 = ``;
+        console.log(`download ${url}`);
+        const sub = new rxjs_1.Subject();
+        sub.pipe((0, operators_1.throttleTime)(1000), (0, operators_1.switchMap)((size) => {
+            console.log(`download ${task.filename}: ${length}`);
+            return db.manager.update(entities_1.FkDownloadTaskEntity, task.filename, { size });
+        })).subscribe();
         // get split size
         req.on('data', (buf) => {
             length += buf.length;
+            sub.next(length);
             writeStream.write(buf, (err) => {
                 if (err)
                     fail();
@@ -45,6 +55,7 @@ class DownloadTask extends rabbitmq_1.Task {
         });
         req.on('end', async () => {
             writeStream.end();
+            sub.complete();
             const fileMd5 = await (0, md5_file_1.default)(task.path);
             const isEqual = md5 === fileMd5;
             console.log(`file download success ${task.filename}, check result is ${isEqual}`);

package/dist/templates/tasks/effect-task.js

@@ -17,8 +17,8 @@ class EffectTask extends rabbitmq_1.Task {
         const fail = injector.get(rabbitmq_1.FAIL);
         const w7 = injector.get(w7_1.W7DataSource);
         const db = injector.get(typeorm_1.Db);
+        await db.manager.update(entities_1.FkDownloadTaskEntity, task.filename, { status: 3, uploadUrl: task.uploadUrl });
         if (task.topicId) {
-            await db.manager.update(entities_1.FkDownloadTaskEntity, task.filename, { status: 3, uploadUrl: task.uploadUrl });
             await (0, fs_extra_1.unlink)(task.path);
             await w7.manager.update(w7_1.W7ChatTopicEntity, task.topicId, { thirdUrl: task.uploadUrl }).then(() => complete()).catch(() => fail());
         }

package/dist/templates/tasks/fk.service.js

@@ -163,6 +163,7 @@ let FkService = class FkService {
                     task.uploadUrl = fullUrl;
                 }
             }
+            console.log(`uploading ${index / task.totalChunks}`);
             index = index + 1;
         } while (!complete);
         // upload complete

package/dist/templates/tasks/schedule-task.js

@@ -26,13 +26,18 @@ class ScheduleTask extends rabbitmq_1.Task {
         const run = async () => {
             const accounts = await db.manager.find(entities_1.FkLoginEntity, {});
             const w7Usernames = accounts.map(account => account.w7Username);
+            console.log(`accounts`, accounts);
             const users = await w7.manager.find(w7_1.W7UsersEntity, { where: { username: (0, typeorm_2.In)(w7Usernames) } });
             const uids = users.map(user => user.uid);
             const uniAccounts = await w7.manager.find(w7_1.W7UniAccountEntity, { where: { createUid: (0, typeorm_2.In)(uids) } });
             const uniacids = uniAccounts.map(a => a.uniacid);
+            console.log(`uniacids`, uniacids);
             const tasks = await db.manager.find(entities_1.FkDownloadTaskEntity, { select: ['topicId'] });
             const ids = tasks.map(task => task.topicId);
-            const topics = await w7.manager.find(w7_1.W7ChatTopicEntity, { where: { uniacid: (0, typeorm_2.In)(uniacids), id: (0, typeorm_2.Not)((0, typeorm_2.In)(ids)) } });
+            console.log(`topic ids`, ids);
+            const date = new Date('2022-05-14');
+            const topics = await w7.manager.find(w7_1.W7ChatTopicEntity, { where: { uniacid: (0, typeorm_2.In)(uniacids), id: (0, typeorm_2.Not)((0, typeorm_2.In)(ids)), createTime: Math.floor(date.getTime() / 1000) } });
+            console.log(`topics`, topics);
             topics.map(async (topic) => {
                 if (topic.thirdUrl) {
                     const uniacid = topic.uniacid;

package/dist/templates/tasks/task.service.js

@@ -43,7 +43,18 @@ let TaskService = class TaskService {
         const _url = new URL(url);
         const filePath = _url.pathname;
         let ext = (0, path_1.extname)(filePath);
-        filename += ext === '.' ? '.mp4' : ext;
+        if (ext.length < 5) {
+            filename += ext === '.' ? '.mp4' : ext;
+        }
+        else if (filename.indexOf('.jpg')) {
+            filename += '.jpg';
+        }
+        else if (filename.indexOf('.png')) {
+            filename += '.png';
+        }
+        else if (filename.indexOf('.mp4')) {
+            filename += '.mp4';
+        }
         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);

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

@@ -5,5 +5,5 @@ export declare class UploadTaskController {
     constructor(db: Db);
     uploadTask(filename: string): Promise<{
         msg: string;
-    } | undefined>;
+    }>;
 }

package/dist/templates/upload.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { Db } from '@nger/typeorm';
 import { Context } from 'koa';
 export declare class UploadController {

package/dist/templates/upload.js

@@ -4,7 +4,6 @@ exports.UploadController = void 0;
 const tslib_1 = require("tslib");
 const core_1 = require("@nger/core");
 const http_1 = require("@nger/http");
-const react_1 = tslib_1.__importDefault(require("react"));
 const form_data_1 = tslib_1.__importDefault(require("form-data"));
 const axios_1 = tslib_1.__importDefault(require("axios"));
 const typeorm_1 = require("@nger/typeorm");
@@ -15,6 +14,7 @@ const url_1 = require("url");
 const fs_extra_1 = require("fs-extra");
 const request_1 = tslib_1.__importDefault(require("request"));
 const component_1 = require("./component");
+const react_1 = tslib_1.__importDefault(require("react"));
 let UploadController = class UploadController {
     db;
     constructor(db) {

package/docs.md

@@ -32,3 +32,4 @@ RABBITMQ_USERNAME=imeepos
 RABBITMQ_PASSWORD=123qwe
 ```
 
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nger/fk-upload",
-  "version": "1.0.39",
+  "version": "1.0.42",
   "description": "",
   "main": "dist/core.js",
   "types": "dist/core.d.ts",
@@ -20,7 +20,7 @@
     "@nger/w7": "^1.0.0",
     "@nger/ws": "^1.0.0",
     "@types/download": "^8.0.1",
-    "@types/react": "^18.0.5",
+    "@types/react": "^18.0.8",
     "@types/request": "^2.48.8",
     "axios": "^0.26.1",
     "cids": "^1.1.9",
@@ -29,7 +29,7 @@
     "fs-extra": "^10.1.0",
     "md5-file": "^5.0.0",
     "multihashing-async": "^2.1.4",
-    "react": "^18.0.0",
+    "react": "^18.1.0",
     "request": "^2.88.2"
   },
   "scripts": {

package/pnpm-lock.yaml

@@ -11,7 +11,7 @@ specifiers:
   '@nger/w7': workspace:^1.0.0
   '@nger/ws': workspace:^1.0.0
   '@types/download': ^8.0.1
-  '@types/react': ^18.0.5
+  '@types/react': ^18.0.8
   '@types/request': ^2.48.8
   axios: ^0.26.1
   cids: ^1.1.9
@@ -20,7 +20,7 @@ specifiers:
   fs-extra: ^10.1.0
   md5-file: ^5.0.0
   multihashing-async: ^2.1.4
-  react: ^18.0.0
+  react: ^18.1.0
   request: ^2.88.2
 
 dependencies:
@@ -30,7 +30,7 @@ dependencies:
   '@nger/rabbitmq': link:../rabbitmq
   '@nger/redis': link:../redis
   '@nger/schedule': link:../schedule
-  '@nger/typeorm': link:../package
+  '@nger/typeorm': link:../typeorm
   '@nger/w7': link:../w7
   '@nger/ws': link:../ws
   '@types/download': 8.0.1