@soga/uploader 0.2.7 → 0.2.10

package/dist/hooks/complete.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.complete=complete;const sdk_1=require("@soga/sdk"),types_1=require("@soga/types");async function complete({file_id:e,sdk_domain:i,fileRepository:t}){const s=await t.findOneBy({id:e});let a=s.task_record_id;const o=(0,sdk_1.getSdk)(i),r={};let d;if(s.type==types_1.RecordType.AFFIX)a=0,await async function(e,i){e.encoded.affix?.forEach((e=>{e.parts.forEach((e=>{r[e.file]={md5:e.md5,size:e.size,source:!0,preview:!0}}))}));const t=await i.getRecordInfo({space_id:e.space_id,record_id:e.task_record_id,refresh:!0});t.manifest||(t.manifest={});d=t.manifest,d.meta||(d.meta={host_size:0});d.parts||(d.parts={});d.affix||(d.affix=[]);e.encoded.affix?.forEach((e=>{const{parts:i,...t}=e;d.affix.push({...t,parts:i.map((e=>e.file))})})),Object.assign(d.parts,r),p(),c()}(s,o);else{if(0!==s.pid){a=(await t.findOneBy({id:s.pid})).cloud_info.id}await async function(e){const{type:i,inputs:t,encoded:s}=e;if(s.source?.parts){let e=!0;i!=types_1.RecordType.VIDEO&&i!=types_1.RecordType.AUDIO||(e=!1),i==types_1.RecordType.TXT&&(e=!1),s.source.parts.forEach((i=>{r[i.file]={md5:i.md5,size:i.size,source:!0,preview:e}}))}s.media?.parts&&s.media.parts.forEach((e=>{r[e.file]={md5:e.md5,size:e.size,source:!1,preview:!0}}));s.img?.parts&&s.img.parts.forEach((e=>{r[e.file]={md5:e.md5,size:e.size,source:!1,preview:!0}}));s.txt?.parts&&s.txt.parts.forEach((e=>{r[e.file]={md5:e.md5,size:e.size,source:!1,preview:!0}}));const a=t[0],o={host_size:0,filesize:a.filesize,filename:a.filename,btime:a.local_btime,ctime:a.local_ctime,mtime:a.local_mtime};d={meta:o,parts:r},s.source?.parts&&(d.source={head:s.source.head,parts:s.source.parts.map((e=>e.file))});if(s.media?.parts){const{parts:e,...i}=s.media;d.media={...i,parts:e.map((e=>e.file))}}if(s.img?.parts){const{meta:e,parts:i}=s.img;d.img={meta:e,preview:i.map((e=>({file:e.file,start:e.start,end:e.end}))),parts:i.map((e=>e.file))}}if(s.txt?.parts){const{map:e,pad:i,pages:t,parts:a}=s.txt;d.txt={entrance:e,pad:i,pages:t,parts:a.map((e=>e.file))}}return c(),p(),d}(s)}function c(){const e=Object.values(r),i={host:0,preview:0,source:0};e.forEach((e=>{i.host+=e.size})),d.meta.host_size=i.host}function p(){if(s.ali_host_id&&!d.ali){d.ali={drive_id:"",host_id:s.ali_host_id,info:{}};const e=s.uploaded.ali;Object.keys(r).forEach((i=>{const t=e[i];d.ali.info[i]=t.file_id,d.ali.drive_id||(d.ali.drive_id=t.drive_id)}))}if(s.baidu_host_id){d.baidu={host_id:s.baidu_host_id,info:{}};const e=s.uploaded.baidu;Object.keys(r).forEach((i=>{const t=e[i];d.baidu.info[i]=t.fs_id}))}}await o.updateRecord({space_id:s.space_id,record_id:s.cloud_info.id,parent_id:a,manifest:JSON.stringify(d)})}
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.complete=complete;const sdk_1=require("@soga/sdk"),types_1=require("@soga/types"),processing_map=new Map;async function complete({file_id:e,sdk_domain:i,fileRepository:s}){if(processing_map.get(e))return;const t=await s.findOneBy({id:e});let a=t.task_record_id;const r=(0,sdk_1.getSdk)(i),o={};let d;if(t.type==types_1.RecordType.AFFIX){const e=await r.getRecordInfo({space_id:t.space_id,record_id:t.task_record_id,refresh:!0}),{parent_id:i}=e;a=i,await async function(e,i){e.encoded.affix?.forEach((e=>{e.parts.forEach((e=>{o[e.file]={md5:e.md5,size:e.size,source:!0,preview:!0}}))}));const s=await i.getRecordInfo({space_id:e.space_id,record_id:e.task_record_id,refresh:!0});s.manifest||(s.manifest={});d=s.manifest,d.meta||(d.meta={host_size:0});d.parts||(d.parts={});d.affix||(d.affix=[]);e.encoded.affix?.forEach((e=>{const{parts:i,...s}=e;d.affix.push({...s,parts:i.map((e=>e.file))})})),Object.assign(d.parts,o),p(),c()}(t,r)}else{if(0!==t.pid){a=(await s.findOneBy({id:t.pid})).cloud_info.id}await async function(e){const{type:i,inputs:s,encoded:t}=e;if(t.source?.parts){let e=!0;i!=types_1.RecordType.VIDEO&&i!=types_1.RecordType.AUDIO||(e=!1),i==types_1.RecordType.TXT&&(e=!1),t.source.parts.forEach((i=>{o[i.file]={md5:i.md5,size:i.size,source:!0,preview:e}}))}t.media?.parts&&t.media.parts.forEach((e=>{o[e.file]={md5:e.md5,size:e.size,source:!1,preview:!0}}));t.img?.parts&&t.img.parts.forEach((e=>{o[e.file]={md5:e.md5,size:e.size,source:!1,preview:!0}}));t.txt?.parts&&t.txt.parts.forEach((e=>{o[e.file]={md5:e.md5,size:e.size,source:!1,preview:!0}}));const a=s[0],r={host_size:0,filesize:a.filesize,filename:a.filename,btime:a.local_btime,ctime:a.local_ctime,mtime:a.local_mtime};d={meta:r,parts:o},t.source?.parts&&(d.source={head:t.source.head,parts:t.source.parts.map((e=>e.file))});if(t.media?.parts){const{parts:e,...i}=t.media;d.media={...i,parts:e.map((e=>e.file))}}if(t.img?.parts){const{meta:e,parts:i}=t.img;d.img={meta:e,preview:i.map((e=>({file:e.file,start:e.start,end:e.end}))),parts:i.map((e=>e.file))}}if(t.txt?.parts){const{map:e,pad:i,pages:s,parts:a}=t.txt;d.txt={entrance:e,pad:i,pages:s,parts:a.map((e=>e.file))}}return c(),p(),d}(t)}function c(){const e=Object.values(o),i={host:0,preview:0,source:0};e.forEach((e=>{i.host+=e.size})),d.meta.host_size=i.host}function p(){if(t.ali_host_id&&!d.ali){d.ali={drive_id:"",host_id:t.ali_host_id,info:{}};const e=t.uploaded.ali;Object.keys(o).forEach((i=>{const s=e[i];d.ali.info[i]=s.file_id,d.ali.drive_id||(d.ali.drive_id=s.drive_id)}))}if(t.baidu_host_id){d.baidu={host_id:t.baidu_host_id,info:{}};const e=t.uploaded.baidu;Object.keys(o).forEach((i=>{const s=e[i];d.baidu.info[i]=s.fs_id}))}}await r.updateRecord({space_id:t.space_id,record_id:t.cloud_info.id,parent_id:a,manifest:JSON.stringify(d)}),processing_map.delete(e)}

package/dist/host-uploader/base.d.ts

@@ -18,6 +18,7 @@ export declare abstract class BaseUploader {
     protected getValidThreads(threads: number): number;
     protected onPartProgress(params: UploadWorkerPercent): Promise<void>;
     protected onSomePartSuccess(file: UploadFile): Promise<void>;
+    private processing_file_map;
     protected onPartSuccess(part: UploadPart, file: UploadFile): Promise<void>;
     protected onPartError(err: Error, file: UploadFile): Promise<void>;
     constructor(baseParams: UploaderParams, host_type: HostType);

package/dist/host-uploader/base.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.BaseUploader=void 0;const typeorm_1=require("typeorm"),entities_1=require("@soga/entities"),types_1=require("@soga/types"),prepare_1=require("../hooks/prepare"),complete_1=require("../hooks/complete"),utils_1=require("@soga/utils");let isDequeueing=!1;class BaseUploader{hostType;onProgress=async()=>{};onSuccess=async()=>{};onError=async()=>{};fileRepository;partRepository;isRunning=!1;thread_count=1;maxThreads=10;threads=[];baseParams;getValidThreads(t){return Math.min(Math.max(t??0,0),this.maxThreads)}async onPartProgress(t){const{id:s,data:e,type:i}=t;if("percent"!=i)return;const{part_id:a,percent:o}=e;await this.partRepository.update(a,{upload_percent:o});const r=await this.partRepository.findBy({file_id:s});let p=0,d=0;for(const t of r)p+=t.info.size,d+=t.info.size*t.upload_percent;const n=d/p,u=await this.fileRepository.findOneBy({id:s}),h=types_1.UploadProcessStep[`upload_${this.hostType}`];u.progress[h].percent=n,u.percent=(0,utils_1.getProgressPercent)(u.progress),await this.fileRepository.update(s,{progress:u.progress,percent:u.percent}),await this.onProgress(u)}async onSomePartSuccess(t){const{ali_host_id:s,baidu_host_id:e,ali_upload_status:i,baidu_upload_status:a}=t;if(e&&a!=types_1.UploadStatus.SUCCESS)return;if(s&&i!=types_1.UploadStatus.SUCCESS)return;const o={ali:{},baidu:{}},r=await this.partRepository.findBy({file_id:t.id});if(!r.length)return;for(const t of r)t.host_type==types_1.HostType.BAIDU&&(o.baidu[t.info.file]=t.upload_result.baidu),t.host_type==types_1.HostType.ALI&&(o.ali[t.info.file]=t.upload_result.ali);await this.fileRepository.update(t.id,{uploaded:o}),await(0,complete_1.complete)({file_id:t.id,sdk_domain:this.baseParams.sdk_domain,fileRepository:this.fileRepository});const p=await this.fileRepository.findOneBy({id:t.id});p.progress.END.percent=1,p.percent=1,await this.fileRepository.update(t.id,{progress:p.progress,percent:p.percent,upload_status:types_1.UploadStatus.SUCCESS}),await this.partRepository.delete({file_id:t.id}),await this.onSuccess(await this.fileRepository.findOneBy({id:t.id}))}async onPartSuccess(t,s){const{host_type:e}=t,i=`${e}_upload_status`;if(s[i]==types_1.UploadStatus.ERROR)return;if(await this.partRepository.findOneBy({id:(0,typeorm_1.Not)(t.id),file_id:s.id,host_type:e,upload_status:(0,typeorm_1.Not)(types_1.UploadStatus.SUCCESS)}))return;await this.fileRepository.update(s.id,{[i]:types_1.UploadStatus.SUCCESS,some_parts_uploaded:!0});const a=await this.fileRepository.findOneBy({id:s.id});await this.onSomePartSuccess(a)}async onPartError(t,s){const e=`${this.hostType}_upload_status`;s[e]!=types_1.UploadStatus.ERROR&&(await this.fileRepository.update(s.id,{[e]:types_1.UploadStatus.ERROR}),await this.onError(t,s))}constructor(t,s){this.hostType=s,this.baseParams=t;const{dataSource:e}=t;this.fileRepository=e.getRepository(entities_1.UploadFile),this.partRepository=e.getRepository(entities_1.UploadPart),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))}async setThreads(t){const s=this.getValidThreads(t);this.thread_count=s,await this.run()}is_initing=!1;async init(){this.is_initing=!0,await this.partRepository.update({uid:this.baseParams.uid,upload_status:types_1.UploadStatus.PROCESS},{upload_status:types_1.UploadStatus.NULL});const t=await this.fileRepository.findBy({uid:this.baseParams.uid,some_parts_uploaded:!0});for(const s of t)await this.onSomePartSuccess(s);this.is_initing=!1}async start(){await this.run()}async stopFiles(t,s=!1){s&&(await this.partRepository.update({file_id:(0,typeorm_1.In)(t),is_paused:!1},{is_paused:!0}),await this.fileRepository.update({id:(0,typeorm_1.In)(t),is_paused:!1},{is_paused:!0}));const e=this.threads.filter((s=>t.includes(s.file_id)));await Promise.all(e.map((t=>t.stop()))),await this.start()}async stopAll(t=!1){t&&(await this.partRepository.update({uid:this.baseParams.uid},{is_paused:!0}),await this.fileRepository.update({uid:this.baseParams.uid,type:(0,typeorm_1.Not)(types_1.RecordType.FOLDER)},{is_paused:!0})),await Promise.all(this.threads.map((t=>t.stop())))}async run(){for(;this.isRunning;)await new Promise((t=>{setTimeout(t,200)}));this.isRunning=!0;const t=this.threads.length,s=this.thread_count;if(t<s){const e=s-t,i=async()=>await this.partRepository.findOne({where:{uid:this.baseParams.uid,is_paused:!1,upload_status:types_1.UploadStatus.NULL,host_id:this.baseParams.host_id},order:{created_at:"ASC"}});for(let t=0;t<e;t++){const t=await i();if(!t)break;const s=this.getThread(t);this.threads.push(s),await this.partRepository.update(t.id,{upload_status:types_1.UploadStatus.PROCESS}),s.start()}if(this.threads.length<s){await this.dequeueOneFile();await i()&&(this.isRunning=!1,await this.run())}}else if(t>s){const e=t-s,i=this.threads.slice(0,e);for(const t of i)await t.stop()}this.isRunning=!1}async dequeueOneFile(){for(;isDequeueing;)await new Promise((t=>{setTimeout(t,50)}));isDequeueing=!0;try{const t=`${this.hostType}_upload_status`,s=`${this.hostType}_host_id`,e=await this.fileRepository.findOne({where:{uid:this.baseParams.uid,is_paused:!1,encode_status:types_1.EncodeStatus.SUCCESS,[t]:(0,typeorm_1.IsNull)(),upload_status:(0,typeorm_1.In)([types_1.UploadStatus.NULL,types_1.UploadStatus.PROCESS])},order:{created_at:"ASC"}});if(!e)return;await this.fileRepository.update(e.id,{[t]:types_1.UploadStatus.PROCESS,upload_status:types_1.UploadStatus.PROCESS}),await(0,prepare_1.prepare)({file_id:e.id,sdk_domain:this.baseParams.sdk_domain,fileRepository:this.fileRepository});const{encoded:i}=e,{affix:a,source:o,txt:r,img:p,media:d}=i,n=[...o?.parts??[],...r?.parts??[],...p?.parts??[],...d?.parts??[]];a?.forEach((t=>{t.parts?.forEach((t=>{n.push(t)}))}));const u=e[s],h=n.map((t=>({uid:this.baseParams.uid,file_id:e.id,info:t,output_root:e.output_root,host_id:u,host_type:this.hostType})));return void await this.partRepository.save(h)}finally{isDequeueing=!1}}}exports.BaseUploader=BaseUploader;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.BaseUploader=void 0;const typeorm_1=require("typeorm"),entities_1=require("@soga/entities"),types_1=require("@soga/types"),prepare_1=require("../hooks/prepare"),complete_1=require("../hooks/complete"),utils_1=require("@soga/utils");let isDequeueing=!1;class BaseUploader{hostType;onProgress=async()=>{};onSuccess=async()=>{};onError=async()=>{};fileRepository;partRepository;isRunning=!1;thread_count=1;maxThreads=10;threads=[];baseParams;getValidThreads(t){return Math.min(Math.max(t??0,0),this.maxThreads)}async onPartProgress(t){const{id:s,data:e,type:i}=t;if("percent"!=i)return;const{part_id:a,percent:o}=e;await this.partRepository.update(a,{upload_percent:o});const r=await this.partRepository.findBy({file_id:s});let p=0,d=0;for(const t of r)p+=t.info.size,d+=t.info.size*t.upload_percent;const n=d/p,u=await this.fileRepository.findOneBy({id:s}),h=types_1.UploadProcessStep[`upload_${this.hostType}`];u.progress[h].percent=n,u.percent=(0,utils_1.getProgressPercent)(u.progress),await this.fileRepository.update(s,{progress:u.progress,percent:u.percent}),await this.onProgress(u)}async onSomePartSuccess(t){const{ali_host_id:s,baidu_host_id:e,ali_upload_status:i,baidu_upload_status:a}=t;if(e&&a!=types_1.UploadStatus.SUCCESS)return;if(s&&i!=types_1.UploadStatus.SUCCESS)return;const o={ali:{},baidu:{}},r=await this.partRepository.findBy({file_id:t.id});if(!r.length)return;for(const t of r)t.host_type==types_1.HostType.BAIDU&&(o.baidu[t.info.file]=t.upload_result.baidu),t.host_type==types_1.HostType.ALI&&(o.ali[t.info.file]=t.upload_result.ali);await this.fileRepository.update(t.id,{uploaded:o}),await(0,complete_1.complete)({file_id:t.id,sdk_domain:this.baseParams.sdk_domain,fileRepository:this.fileRepository});const p=await this.fileRepository.findOneBy({id:t.id});p.progress.END.percent=1,p.percent=1,await this.fileRepository.update(t.id,{progress:p.progress,percent:p.percent,upload_status:types_1.UploadStatus.SUCCESS}),await this.partRepository.delete({file_id:t.id}),await this.onSuccess(await this.fileRepository.findOneBy({id:t.id}))}processing_file_map=new Map;async onPartSuccess(t,s){for(;this.processing_file_map.get(s.id);)await new Promise((t=>setTimeout(t,50)));this.processing_file_map.set(s.id,!0);const{host_type:e}=t,i=`${e}_upload_status`;if(s[i]==types_1.UploadStatus.ERROR)return void this.processing_file_map.delete(s.id);if(await this.partRepository.findOneBy({id:(0,typeorm_1.Not)(t.id),file_id:s.id,host_type:e,upload_status:(0,typeorm_1.Not)(types_1.UploadStatus.SUCCESS)}))return void this.processing_file_map.delete(s.id);await this.fileRepository.update(s.id,{[i]:types_1.UploadStatus.SUCCESS,some_parts_uploaded:!0});const a=await this.fileRepository.findOneBy({id:s.id});await this.onSomePartSuccess(a),this.processing_file_map.delete(s.id)}async onPartError(t,s){const e=`${this.hostType}_upload_status`;s[e]!=types_1.UploadStatus.ERROR&&(await this.fileRepository.update(s.id,{[e]:types_1.UploadStatus.ERROR}),await this.onError(t,s))}constructor(t,s){this.hostType=s,this.baseParams=t;const{dataSource:e}=t;this.fileRepository=e.getRepository(entities_1.UploadFile),this.partRepository=e.getRepository(entities_1.UploadPart),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))}async setThreads(t){const s=this.getValidThreads(t);this.thread_count=s,await this.run()}is_initing=!1;async init(){this.is_initing=!0,await this.partRepository.update({uid:this.baseParams.uid,upload_status:types_1.UploadStatus.PROCESS},{upload_status:types_1.UploadStatus.NULL});const t=await this.fileRepository.findBy({uid:this.baseParams.uid,some_parts_uploaded:!0});for(const s of t)await this.onSomePartSuccess(s);this.is_initing=!1}async start(){await this.run()}async stopFiles(t,s=!1){s&&(await this.partRepository.update({file_id:(0,typeorm_1.In)(t),is_paused:!1},{is_paused:!0}),await this.fileRepository.update({id:(0,typeorm_1.In)(t),is_paused:!1},{is_paused:!0}));const e=this.threads.filter((s=>t.includes(s.file_id)));await Promise.all(e.map((t=>t.stop()))),await this.start()}async stopAll(t=!1){t&&(await this.partRepository.update({uid:this.baseParams.uid},{is_paused:!0}),await this.fileRepository.update({uid:this.baseParams.uid,type:(0,typeorm_1.Not)(types_1.RecordType.FOLDER)},{is_paused:!0})),await Promise.all(this.threads.map((t=>t.stop())))}async run(){for(;this.isRunning;)await new Promise((t=>{setTimeout(t,200)}));this.isRunning=!0;const t=this.threads.length,s=this.thread_count;if(t<s){const e=s-t,i=async()=>await this.partRepository.findOne({where:{uid:this.baseParams.uid,is_paused:!1,upload_status:types_1.UploadStatus.NULL,host_id:this.baseParams.host_id},order:{created_at:"ASC"}});for(let t=0;t<e;t++){const t=await i();if(!t)break;const s=this.getThread(t);this.threads.push(s),await this.partRepository.update(t.id,{upload_status:types_1.UploadStatus.PROCESS}),s.start()}if(this.threads.length<s){await this.dequeueOneFile();await i()&&(this.isRunning=!1,await this.run())}}else if(t>s){const e=t-s,i=this.threads.slice(0,e);for(const t of i)await t.stop()}this.isRunning=!1}async dequeueOneFile(){for(;isDequeueing;)await new Promise((t=>{setTimeout(t,50)}));isDequeueing=!0;try{const t=`${this.hostType}_upload_status`,s=`${this.hostType}_host_id`,e=await this.fileRepository.findOne({where:{uid:this.baseParams.uid,is_paused:!1,encode_status:types_1.EncodeStatus.SUCCESS,[t]:(0,typeorm_1.IsNull)(),upload_status:(0,typeorm_1.In)([types_1.UploadStatus.NULL,types_1.UploadStatus.PROCESS])},order:{created_at:"ASC"}});if(!e)return;await this.fileRepository.update(e.id,{[t]:types_1.UploadStatus.PROCESS,upload_status:types_1.UploadStatus.PROCESS}),await(0,prepare_1.prepare)({file_id:e.id,sdk_domain:this.baseParams.sdk_domain,fileRepository:this.fileRepository});const{encoded:i}=e,{affix:a,source:o,txt:r,img:p,media:d}=i,n=[...o?.parts??[],...r?.parts??[],...p?.parts??[],...d?.parts??[]];a?.forEach((t=>{t.parts?.forEach((t=>{n.push(t)}))}));const u=e[s],h=n.map((t=>({uid:this.baseParams.uid,file_id:e.id,info:t,output_root:e.output_root,host_id:u,host_type:this.hostType})));return void await this.partRepository.save(h)}finally{isDequeueing=!1}}}exports.BaseUploader=BaseUploader;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@soga/uploader",
-  "version": "0.2.7",
+  "version": "0.2.10",
   "publishConfig": {
     "access": "public"
   },
@@ -24,7 +24,6 @@
     "@soga/entities": "file:../entities",
     "@soga/part-uploader": "file:../part-uploader",
     "@soga/sdk": "file:../sdk",
-    "@soga/test": "^0.2.0",
     "@soga/types": "file:../types",
     "@soga/utils": "file:../utils",
     "@types/fs-extra": "^11.0.4",
@@ -54,12 +53,12 @@
     "typeorm": "*"
   },
   "dependencies": {
-    "@soga/entities": "^0.2.7",
-    "@soga/part-uploader": "^0.2.1",
-    "@soga/sdk": "^0.2.7",
-    "@soga/types": "^0.2.7",
-    "@soga/utils": "^0.2.1",
+    "@soga/entities": "^0.2.8",
+    "@soga/part-uploader": "^0.2.8",
+    "@soga/sdk": "^0.2.8",
+    "@soga/types": "^0.2.8",
+    "@soga/utils": "^0.2.8",
     "piscina": "^4.9.2"
   },
-  "gitHead": "527e923683c11ace899c5111d7dcfb38115d4d48"
+  "gitHead": "2e688c2ed275589e0b5b8eada07b1f6b8d45c0b5"
 }