@soga/encoder 0.0.14 → 0.1.0

package/dist/encoder.d.ts

@@ -1,5 +1,5 @@
 import { Repository } from 'typeorm';
-import { EncoderParams } from './types/main';
+import { EncoderParams } from './types';
 import { UploadFile } from '@soga/entities';
 export declare class Encoder {
     protected onProgress: (file: UploadFile) => Promise<void>;

package/dist/encoder.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.Encoder=void 0;const typeorm_1=require("typeorm"),entities_1=require("@soga/entities"),types_1=require("@soga/types"),piscina_1=require("piscina"),single_encoder_1=require("@soga/single-encoder"),piscina=new piscina_1.Piscina({filename:require.resolve("@soga/single-encoder")});class Encoder{onProgress=async()=>{};onSuccess=async()=>{};onError=async()=>{};fileRepository;isRunning=!1;thread_count=3;maxThreads=10;threads=[];params;getValidThreads(t){return Math.min(Math.max(t??0,0),this.maxThreads)}constructor(t){this.params=t,this.fileRepository=t.dataSource.getRepository(entities_1.UploadFile),this.thread_count=this.getValidThreads(t.threads??this.thread_count),t.onProgress&&(this.onProgress=t.onProgress.bind(this)),t.onSuccess&&(this.onSuccess=t.onSuccess.bind(this)),t.onError&&(this.onError=t.onError.bind(this)),piscina.on("message",(async t=>{if("percent"==t.type){const{id:e,data:s}=t,i=await this.fileRepository.findOneBy({id:e});if(!i)return;const{percent:a,step:o}=s;i.progress[o].percent=a,await this.fileRepository.update(i.id,{progress:i.progress}),this.onProgress(i)}}))}async setThreads(t){const e=this.getValidThreads(t);this.thread_count=e,await this.run()}async init(){await this.fileRepository.update({uid:this.params.uid,encode_status:types_1.EncodeStatus.PROCESS},{encode_status:types_1.EncodeStatus.NULL})}async start(){await this.run()}async stopFiles(t,e=!1){e&&await this.fileRepository.update({id:(0,typeorm_1.In)(t),is_paused:!1},{is_paused:!0});const s=this.threads.filter((e=>t.includes(e.id)));await Promise.all(s.map((t=>t.stop()))),await this.run()}async stopAll(t=!1){t&&await this.fileRepository.update({uid:this.params.uid},{is_paused:!0}),await Promise.all(this.threads.map((t=>t.stop())))}getThread(t){const e=new AbortController;return{id:t.id,uid:t.uid,start:async()=>{try{const s=await this.fileRepository.findOneBy({id:t.id});if(s.encode_status!==types_1.EncodeStatus.PROCESS)return;if(!s)return;const{id:i,uid:a,config:o,path:r,type:n,ftype:d,external_texts:p}=s,c=[];s.ali_host_id&&c.push(types_1.HostType.ALI),s.baidu_host_id&&c.push(types_1.HostType.BAIDU);const h=await this.params.getOutputRoot(s);await this.fileRepository.update(t.id,{output_root:h});const u={id:i,uid:a,keepPreview:o.file_keeps==types_1.RecordFileKeep.PREVIEW||o.file_keeps==types_1.RecordFileKeep.BOTH,keepSource:o.file_keeps==types_1.RecordFileKeep.SOURCE||o.file_keeps==types_1.RecordFileKeep.BOTH,filePath:r,type:n,ftype:d,hosts:c,outputRoot:h,texts:p,ffmpegPath:this.params.ffmpegPath},l=await(0,single_encoder_1.prepare)(u);Object.keys(s.progress??{}).length||await this.fileRepository.update(t.id,{progress:l.data});const y=await piscina.run(u,{name:"encode",signal:e.signal});if(!y||!y.state)throw new Error("upload chunk failed!");const{img:_,media:f,source:g,txt:w}=y.data;await this.fileRepository.update(t.id,{encode_status:types_1.EncodeStatus.SUCCESS,img_data:_,media_data:f,source_data:g,txt_data:w}),await this.onSuccess(await this.fileRepository.findOneBy({id:i}))}catch(e){"AbortError"!==e.name?await this.onError(await this.fileRepository.findOneBy({id:t.id})):await this.fileRepository.update(t.id,{encode_status:types_1.EncodeStatus.NULL})}finally{this.threads=this.threads.filter((e=>e.id!==t.id)),await this.run()}},stop:async()=>{e.abort()}}}async run(){for(;this.isRunning;)await new Promise((t=>{setTimeout(t,100)}));this.isRunning=!0;const t=this.threads.length,e=this.thread_count;if(t<e){const s=e-t;for(let t=0;t<s;t++){const t=await this.fileRepository.findOne({where:{uid:this.params.uid,encode_status:types_1.EncodeStatus.NULL,is_folder:!1,is_paused:!1},order:{created_at:"ASC"}});if(!t)break;const e=this.getThread(t);this.threads.push(e),await this.fileRepository.update(t.id,{encode_status:types_1.EncodeStatus.PROCESS}),e.start()}}else if(t>e){const s=t-e,i=this.threads.slice(0,s);for(const t of i)await t.stop()}this.isRunning=!1}}exports.Encoder=Encoder;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.Encoder=void 0;const typeorm_1=require("typeorm"),entities_1=require("@soga/entities"),types_1=require("@soga/types"),piscina_1=require("piscina"),single_encoder_1=require("@soga/single-encoder"),piscina=new piscina_1.Piscina({filename:require.resolve("@soga/single-encoder")});class Encoder{onProgress=async()=>{};onSuccess=async()=>{};onError=async()=>{};fileRepository;isRunning=!1;thread_count=3;maxThreads=10;threads=[];params;getValidThreads(t){return Math.min(Math.max(t??0,0),this.maxThreads)}constructor(t){this.params=t,this.fileRepository=t.dataSource.getRepository(entities_1.UploadFile),this.thread_count=this.getValidThreads(t.threads??this.thread_count),t.onProgress&&(this.onProgress=t.onProgress.bind(this)),t.onSuccess&&(this.onSuccess=t.onSuccess.bind(this)),t.onError&&(this.onError=t.onError.bind(this)),piscina.on("message",(async t=>{if("percent"==t.type){const{id:e,data:s}=t,i=await this.fileRepository.findOneBy({id:e});if(!i)return;const{percent:a,step:r}=s;i.progress[r].percent=a,await this.fileRepository.update(i.id,{progress:i.progress}),this.onProgress(i)}})),piscina.on("error",(async t=>{await(this.params.onError?.(null,t))}))}async setThreads(t){const e=this.getValidThreads(t);this.thread_count=e,await this.run()}async init(){await this.fileRepository.update({uid:this.params.uid,encode_status:types_1.EncodeStatus.PROCESS},{encode_status:types_1.EncodeStatus.NULL})}async start(){await this.run()}async stopFiles(t,e=!1){e&&await this.fileRepository.update({id:(0,typeorm_1.In)(t),is_paused:!1},{is_paused:!0});const s=this.threads.filter((e=>t.includes(e.id)));await Promise.all(s.map((t=>t.stop()))),await this.run()}async stopAll(t=!1){t&&await this.fileRepository.update({uid:this.params.uid},{is_paused:!0}),await Promise.all(this.threads.map((t=>t.stop())))}getThread(t){const e=new AbortController;return{id:t.id,uid:t.uid,start:async()=>{try{const s=await this.fileRepository.findOneBy({id:t.id});if(s.encode_status!==types_1.EncodeStatus.PROCESS)return;if(!s)return;const{id:i,uid:a,config:r,path:o,type:n,external_texts:d}=s,p=[];s.ali_host_id&&p.push(types_1.HostType.ALI),s.baidu_host_id&&p.push(types_1.HostType.BAIDU);const c=await this.params.getOutputRoot(s);await this.fileRepository.update(t.id,{output_root:c});const h={id:i,uid:a,keepPreview:r.file_keeps==types_1.RecordFileKeep.PREVIEW||r.file_keeps==types_1.RecordFileKeep.BOTH,keepSource:r.file_keeps==types_1.RecordFileKeep.SOURCE||r.file_keeps==types_1.RecordFileKeep.BOTH,filePath:o,type:n,hosts:p,outputRoot:c,texts:d,ffmpegPath:this.params.ffmpegPath,debug:this.params.debug},u=await(0,single_encoder_1.prepare)(h);Object.keys(s.progress??{}).length||await this.fileRepository.update(t.id,{progress:u.data});const l=await piscina.run(h,{name:"encode",signal:e.signal});if(!l||!l.state)throw new Error("upload chunk failed!");const{img:y,media:_,source:f,txt:g}=l.data;await this.fileRepository.update(t.id,{encode_status:types_1.EncodeStatus.SUCCESS,img_data:y,media_data:_,source_data:f,txt_data:g}),await this.onSuccess(await this.fileRepository.findOneBy({id:i}))}catch(e){"AbortError"!==e.name?await this.onError(await this.fileRepository.findOneBy({id:t.id})):await this.fileRepository.update(t.id,{encode_status:types_1.EncodeStatus.NULL})}finally{this.threads=this.threads.filter((e=>e.id!==t.id)),await this.run()}},stop:async()=>{e.abort()}}}async run(){for(;this.isRunning;)await new Promise((t=>{setTimeout(t,100)}));this.isRunning=!0;const t=this.threads.length,e=this.thread_count;if(t<e){const s=e-t;for(let t=0;t<s;t++){const t=await this.fileRepository.findOne({where:{uid:this.params.uid,encode_status:types_1.EncodeStatus.NULL,is_folder:!1,is_paused:!1},order:{created_at:"ASC"}});if(!t)break;const e=this.getThread(t);this.threads.push(e),await this.fileRepository.update(t.id,{encode_status:types_1.EncodeStatus.PROCESS}),e.start()}}else if(t>e){const s=t-e,i=this.threads.slice(0,s);for(const t of i)await t.stop()}this.isRunning=!1}}exports.Encoder=Encoder;

package/dist/main.d.ts

@@ -1,4 +1,4 @@
 import { Encoder } from './encoder';
-import { EncoderParams } from './types/main';
-export declare const getEncoder: (params: EncoderParams) => Promise<Encoder>;
+import { EncoderParams } from './types';
+export declare const getEncoder: (params: EncoderParams, cleanOtherCache?: boolean) => Promise<Encoder>;
 export declare const getEncoderByUid: (uid: number) => Promise<Encoder>;

package/dist/main.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.getEncoderByUid=exports.getEncoder=void 0;const encoder_1=require("./encoder"),instanceMap=new Map,getEncoder=async e=>{for(;instanceMap.get(e.uid)?.initing;)await new Promise((e=>setTimeout(e,100)));if(instanceMap.get(e.uid)?.encoder)return instanceMap.get(e.uid).encoder;const n={encoder:new encoder_1.Encoder(e),initing:!0};return instanceMap.set(e.uid,n),await n.encoder.init(),n.initing=!1,instanceMap.set(e.uid,n),n.encoder};exports.getEncoder=getEncoder;const getEncoderByUid=async e=>{if(instanceMap.has(e)){for(;instanceMap.get(e)?.initing;)await new Promise((e=>setTimeout(e,100)));return instanceMap.get(e)?.encoder}return null};exports.getEncoderByUid=getEncoderByUid;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.getEncoderByUid=exports.getEncoder=void 0;const encoder_1=require("./encoder"),instanceMap=new Map,getEncoder=async(e,n=!0)=>{for(;instanceMap.get(e.uid)?.initing;)await new Promise((e=>setTimeout(e,100)));if(instanceMap.get(e.uid)?.encoder)return instanceMap.get(e.uid).encoder;const t={encoder:new encoder_1.Encoder(e),initing:!0};return instanceMap.set(e.uid,t),await t.encoder.init(),t.initing=!1,instanceMap.set(e.uid,t),n&&instanceMap.forEach(((n,t)=>{t!==e.uid&&instanceMap.delete(t)})),t.encoder};exports.getEncoder=getEncoder;const getEncoderByUid=async e=>{if(instanceMap.has(e)){for(;instanceMap.get(e)?.initing;)await new Promise((e=>setTimeout(e,100)));return instanceMap.get(e)?.encoder}return null};exports.getEncoderByUid=getEncoderByUid;

package/dist/{types/main.d.ts → types.d.ts}

@@ -9,11 +9,5 @@ export type EncoderParams = {
     debug?: boolean;
     onProgress?: (file: UploadFile) => Promise<void>;
     onSuccess?: (file: UploadFile) => Promise<void>;
-    onError?: (file: UploadFile) => Promise<void>;
-};
-export type ThreadType = {
-    id: number;
-    uid: number;
-    start: () => Promise<void>;
-    stop: () => Promise<void>;
+    onError?: (file: UploadFile | null, error?: Error) => Promise<void>;
 };

package/package.json

@@ -1,57 +1,59 @@
-{
-  "name": "@soga/encoder",
-  "version": "0.0.14",
-  "publishConfig": {
-    "access": "public"
-  },
-  "description": "",
-  "main": "dist/main.js",
-  "types": "dist/main.d.ts",
-  "files": [
-    "dist"
-  ],
-  "scripts": {
-    "build": "rimraf dist && tsc && ts-node ./scripts/minify",
-    "minify": "ts-node ./scripts/minify",
-    "demo_backup": "ts-node ./demo/demo.ts",
-    "demo": "ts-node ./demo/demo.ts",
-    "worker": "tsc && ts-node ./demo/worker.ts",
-    "test": "jest",
-    "dev": "ts-node ./src/main.ts",
-    "lint": "eslint . --ext .ts",
-    "prepublishOnly": "npm run build"
-  },
-  "devDependencies": {
-    "@types/fs-extra": "^11.0.4",
-    "@types/glob": "^8.1.0",
-    "@types/jest": "^29.5.4",
-    "@types/node": "^20.8.7",
-    "@typescript-eslint/eslint-plugin": "^6.4.1",
-    "@typescript-eslint/parser": "^6.4.1",
-    "eslint": "^8.47.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-jest": "^27.2.3",
-    "eslint-plugin-prettier": "^5.0.0",
-    "glob": "^10.3.3",
-    "jest": "^29.6.3",
-    "piscina": "^4.8.0",
-    "prettier": "^3.0.2",
-    "terser": "^5.19.2",
-    "ts-jest": "^29.1.1",
-    "ts-node": "^10.9.1",
-    "typescript": "^5.1.6"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "@soga/single-encoder": "^0.0.4",
-    "@soga/types": "^0.0.61",
-    "fs-extra": "^11.2.0"
-  },
-  "peerDependencies": {
-    "@soga/entities": "*",
-    "typeorm": "*",
-    "better-sqlite3": "*"
-  }
-}
+{
+  "name": "@soga/encoder",
+  "version": "0.1.0",
+  "publishConfig": {
+    "access": "public"
+  },
+  "description": "",
+  "main": "dist/main.js",
+  "types": "dist/main.d.ts",
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "build": "rimraf dist && tsc && ts-node ./scripts/minify",
+    "minify": "ts-node ./scripts/minify",
+    "demo_backup": "ts-node ./demo/demo.ts",
+    "demo": "ts-node ./demo/demo.ts",
+    "worker": "tsc && ts-node ./demo/worker.ts",
+    "test": "jest",
+    "dev": "ts-node ./src/main.ts",
+    "lint": "eslint . --ext .ts",
+    "prepublishOnly": "npm run build"
+  },
+  "devDependencies": {
+    "@soga/single-encoder": "^0.1.0",
+    "@types/fs-extra": "^11.0.4",
+    "@types/glob": "^8.1.0",
+    "@types/jest": "^29.5.4",
+    "@types/node": "^20.8.7",
+    "@typescript-eslint/eslint-plugin": "^6.4.1",
+    "@typescript-eslint/parser": "^6.4.1",
+    "eslint": "^8.47.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-jest": "^27.2.3",
+    "eslint-plugin-prettier": "^5.0.0",
+    "glob": "^10.3.3",
+    "jest": "^29.6.3",
+    "piscina": "^4.8.0",
+    "prettier": "^3.0.2",
+    "rimraf": "^6.0.1",
+    "terser": "^5.19.2",
+    "ts-jest": "^29.1.1",
+    "ts-node": "^10.9.1",
+    "typescript": "^5.1.6"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "fs-extra": "^11.2.0"
+  },
+  "peerDependencies": {
+    "@soga/entities": "file:../base-entities",
+    "@soga/types": "file:../base-types",
+    "better-sqlite3": "*",
+    "typeorm": "*"
+  },
+  "gitHead": "9c477d59857bc4b74ae6479898b38b1444744144"
+}