@soga/uploader 0.0.1 → 0.0.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/uploader/ali.js +1 -1
- package/dist/uploader/baidu.js +1 -1
- package/package.json +1 -1
package/dist/uploader/ali.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
"use strict";var __importDefault=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(exports,"__esModule",{value:!0}),exports.AliUploader=void 0;const axios_1=__importDefault(require("axios")),runtime_1=require("../types/runtime"),base_1=require("./base"),utils_1=require("@soga/utils"),types_1=require("@soga/types"),fs_1=require("fs"),crypto_1=require("crypto"),typeorm_1=require("typeorm");class AliUploader extends base_1.BaseUploader{axios;params;hostType=types_1.HostType.ALI;checked={};constructor(e){super(e),this.params=e,this.initAxios()}async run(){for(;this.isRunning;)await new Promise((e=>{setTimeout(e,200)}));const e=this.threads.map((e=>e.group));this.isRunning=!0;const t=this.threads.length,i=this.thread_count;if(t<i){const a=i-t;for(let t=0;t<a;t++){const t=await this.chunkRepository.findOne({where:{uid:this.uid,type:this.hostType,step:runtime_1.UploadStep.NULL,group:e.length?(0,typeorm_1.Not)((0,typeorm_1.In)(e)):void 0,is_paused:!1},order:{
|
|
1
|
+
"use strict";var __importDefault=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(exports,"__esModule",{value:!0}),exports.AliUploader=void 0;const axios_1=__importDefault(require("axios")),runtime_1=require("../types/runtime"),base_1=require("./base"),utils_1=require("@soga/utils"),types_1=require("@soga/types"),fs_1=require("fs"),crypto_1=require("crypto"),typeorm_1=require("typeorm");class AliUploader extends base_1.BaseUploader{axios;params;hostType=types_1.HostType.ALI;checked={};constructor(e){super(e),this.params=e,this.initAxios()}async run(){for(;this.isRunning;)await new Promise((e=>{setTimeout(e,200)}));const e=this.threads.map((e=>e.group));this.isRunning=!0;const t=this.threads.length,i=this.thread_count;if(t<i){const a=i-t;for(let t=0;t<a;t++){const t=await this.chunkRepository.findOne({where:{uid:this.uid,type:this.hostType,step:runtime_1.UploadStep.NULL,group:e.length?(0,typeorm_1.Not)((0,typeorm_1.In)(e)):void 0,is_paused:!1},order:{created_at:"ASC"}});if(!t)break;const i=this.getThread(t);this.threads.push(i),await this.chunkRepository.update(t.id,{step:runtime_1.UploadStep.PROCESS}),e.push(i.group),i.start()}if(this.threads.length<i){const e=await this.dequeueChunk();this.isRunning=!1,e&&await this.run()}}this.isRunning=!1}getThread(e){const t=this.getGroupName(e.queue_id,e.part_name);return{id:e.id,uid:e.uid,file_id:e.file_id,queue_id:e.queue_id,part_name:e.part_name,group:t,start:async()=>{const{part_name:t,queue_id:i}=e;let a=await this.queueRepository.findOneBy({id:i});const{need_insert:r,need_update:s}=this.getPrecreateStatus(a,t);r&&(await this.insertPrecreateInfo(i,t),a=await this.queueRepository.findOneBy({id:i}));try{const t=await this.chunkRepository.findOneBy({id:e.id});if(!t)return;if(!await this.uploadChunk({queue:a,chunk:t,need_update:s}))throw new Error("upload chunk failed!");await this.onChunkSuccess({chunk_id:e.id})}catch(t){"AbortError"!==t.name?await this.onChunkError({chunk_id:e.id}):await this.chunkRepository.update(e.id,{step:runtime_1.UploadStep.NULL})}finally{await this.onChunkComplete({chunk_id:e.id})}},stop:async()=>{}}}async insertPrecreateInfo(e,t){if(await this.waitUpsertPrecreate(e,t))return;const i=await this.queueRepository.findOneBy({id:e}),a=i.parts[t];if(a.step==runtime_1.UploadStep.SUCCESS)return;const r=await this.getPrecreateInfo({queue:i,part_name:t});if(r.completed)await this.onPartSuccess({queue_id:e,part_name:t,result:{file_id:r.data.file_id}}),await this.increaseUploadedSize({queue_id:e,size:a.info.size});else{const i=await this.queueRepository.findOneBy({id:e});if(!i)return;i.precreate_info[t]={expired_at:Date.now()+342e4,data:r.data},await this.queueRepository.update(e,i)}}async getPrecreateInfo({queue:e,part_name:t}){const i=e.parts[t].info,a=await this.getProofCode({part:i}),r=(await this.getChunkList(e,i)).map(((e,t)=>({part_number:t+1,part_size:e.size}))),s=`dpan_p_${i.md5}.txt`,n={drive_id:this.params.drive_id,parent_file_id:this.params.parent_file_id,name:s,type:"file",check_name_mode:"refuse",part_info_list:r,size:i.size,content_hash_name:"sha1",content_hash:i.sha1,proof_code:a,proof_version:"v1"},o=await this.axios.post("/adrive/v1.0/openFile/create",n),{data:d}=o;return d.exist&&"available"===d.status||d.rapid_upload?{completed:!0,data:{file_id:d.file_id}}:d.upload_id?{completed:!1,data:{file_id:d.file_id,upload_id:d.upload_id,part_info_list:d.part_info_list}}:void 0}async getLatestUploadUrl({file_id:e,upload_id:t,part_number:i}){const a=this.params.drive_id,r=[{part_number:i}],s=await this.axios.post("/adrive/v1.0/openFile/getUploadUrl",{drive_id:a,file_id:e,upload_id:t,part_info_list:r}),{data:n}=s;return n.part_info_list.find((e=>e.part_number===i)).upload_url}async correctChunk(e){if(!e)return;const{part_name:t}=e,i=await this.queueRepository.findOneBy({id:e.queue_id});if(!i)return;const a=i.precreate_info[t];if(!a)return;const{upload_id:r,file_id:s}=a.data;(await this.axios.post("/adrive/v1.0/openFile/listUploadedParts",{upload_id:r,file_id:s,drive_id:this.params.drive_id})).data.uploaded_parts.find((t=>t.part_number==e.chunk_index+1))?await this.chunkRepository.update(e.id,{step:runtime_1.UploadStep.SUCCESS}):await this.chunkRepository.update(e.id,{step:runtime_1.UploadStep.NULL})}async init(){const e=await this.chunkRepository.findBy({uid:this.uid,type:this.hostType,step:(0,typeorm_1.In)([runtime_1.UploadStep.PROCESS,runtime_1.UploadStep.ERROR])}),t=[];for(const i of e)await this.correctChunk(i),t.includes(i.queue_id)||t.push(i.queue_id);for(const e of t)await this.reCalculatePercent({queue_id:e})}async uploadChunk({chunk:e,queue:t,need_update:i}){const{precreate_info:a}=t,r=a[e.part_name],{part_info_list:s,file_id:n,upload_id:o}=r.data,d=s.find((t=>t.part_number==e.chunk_index+1));if(!d)return!0;if(i){const e=await this.getLatestUploadUrl({file_id:n,upload_id:o,part_number:d.part_number});d.upload_url=e}try{const{file_path:t,start:i,end:a}=e.chunk_info,r=(0,fs_1.createReadStream)(t,{start:i,end:a});return await axios_1.default.put(d.upload_url,r,{headers:{"Content-Type":null},timeout:12e4}),!0}catch(t){return console.error(t),e.id,!1}}async getPostcreateInfo({queue:e,part_name:t}){const i=e.precreate_info[t].data,a=await this.axios.post("/adrive/v1.0/openFile/complete",{drive_id:this.params.drive_id,file_id:i.file_id,upload_id:i.upload_id}),{file_id:r}=a.data;return{file_id:r}}async getProofCode({part:e}){const{access_token:t}=await this.params.getAuthData(),{size:i}=e,a=(0,crypto_1.createHash)("md5").update(t).digest("hex").slice(0,16),r=BigInt(`0x${a}`),s=Number(r%BigInt(i)),n=s,o=Math.min(i,s+8),d=e.start+n,u=e.start+o;return(await(0,utils_1.getFileBufferSlice)(e.path,d,u-1)).toString("base64")}initAxios(){this.axios=axios_1.default.create({baseURL:"https://openapi.alipan.com"}),this.axios.interceptors.request.use((async e=>{const{access_token:t}=await this.params.getAuthData();return e.headers.Authorization=`Bearer ${t}`,e}),(e=>Promise.reject(e)))}}exports.AliUploader=AliUploader;
|
package/dist/uploader/baidu.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
"use strict";var __importDefault=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(exports,"__esModule",{value:!0}),exports.BaiduUploader=void 0;const axios_1=__importDefault(require("axios")),runtime_1=require("../types/runtime"),base_1=require("./base"),utils_1=require("@soga/utils"),form_data_1=__importDefault(require("form-data")),types_1=require("@soga/types"),typeorm_1=require("typeorm");class BaiduUploader extends base_1.BaseUploader{params;hostType=types_1.HostType.BAIDU;constructor(e){super(e),this.params=e}async init(){const e=await this.chunkRepository.findBy({uid:this.uid,type:this.hostType,step:(0,typeorm_1.In)([runtime_1.UploadStep.PROCESS,runtime_1.UploadStep.ERROR])});if(!e.length)return;const t=[];for(const a of e)t.includes(a.queue_id)||t.push(a.queue_id);for(const e of t)await this.reCalculatePercent({queue_id:e});await this.chunkRepository.update({uid:this.uid,type:this.hostType,step:(0,typeorm_1.In)([runtime_1.UploadStep.PROCESS,runtime_1.UploadStep.ERROR])},{step:runtime_1.UploadStep.NULL})}async run(){for(;this.isRunning;)await new Promise((e=>{setTimeout(e,200)}));this.isRunning=!0;const e=this.threads.length,t=this.thread_count;if(e<t){const a=t-e;for(let e=0;e<a;e++){const e=await this.chunkRepository.
|
|
1
|
+
"use strict";var __importDefault=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(exports,"__esModule",{value:!0}),exports.BaiduUploader=void 0;const axios_1=__importDefault(require("axios")),runtime_1=require("../types/runtime"),base_1=require("./base"),utils_1=require("@soga/utils"),form_data_1=__importDefault(require("form-data")),types_1=require("@soga/types"),typeorm_1=require("typeorm");class BaiduUploader extends base_1.BaseUploader{params;hostType=types_1.HostType.BAIDU;constructor(e){super(e),this.params=e}async init(){const e=await this.chunkRepository.findBy({uid:this.uid,type:this.hostType,step:(0,typeorm_1.In)([runtime_1.UploadStep.PROCESS,runtime_1.UploadStep.ERROR])});if(!e.length)return;const t=[];for(const a of e)t.includes(a.queue_id)||t.push(a.queue_id);for(const e of t)await this.reCalculatePercent({queue_id:e});await this.chunkRepository.update({uid:this.uid,type:this.hostType,step:(0,typeorm_1.In)([runtime_1.UploadStep.PROCESS,runtime_1.UploadStep.ERROR])},{step:runtime_1.UploadStep.NULL})}async run(){for(;this.isRunning;)await new Promise((e=>{setTimeout(e,200)}));this.isRunning=!0;const e=this.threads.length,t=this.thread_count;if(e<t){const a=t-e;for(let e=0;e<a;e++){const e=await this.chunkRepository.findOne({where:{uid:this.uid,type:this.hostType,step:runtime_1.UploadStep.NULL,is_paused:!1},order:{created_at:"ASC"}});if(!e)break;const t=this.getThread(e);this.threads.push(t),await this.chunkRepository.update(e.id,{step:runtime_1.UploadStep.PROCESS}),t.start()}if(this.threads.length<t){const e=await this.dequeueChunk();this.isRunning=!1,e&&await this.run()}}this.isRunning=!1}getThread(e){const t=this.getGroupName(e.queue_id,e.part_name);return{id:e.id,uid:e.uid,file_id:e.file_id,queue_id:e.queue_id,part_name:e.part_name,group:t,start:async()=>{const{part_name:t,queue_id:a}=e;let i=await this.queueRepository.findOneBy({id:a});const{need_insert:s,need_update:r,need_upsert:n}=this.getPrecreateStatus(i,t);s&&await this.insertPrecreateInfo(a,t),r&&(await this.updatePrecreateInfo(a,t),await this.reCalculatePercent({queue_id:a})),n&&(i=await this.queueRepository.findOneBy({id:a}));try{const t=await this.chunkRepository.findOneBy({id:e.id});if(!t)return;if(!await this.uploadChunk({queue:i,chunk:t}))throw new Error("upload chunk failed!");await this.onChunkSuccess({chunk_id:e.id})}catch(t){"AbortError"!==t.name?await this.onChunkError({chunk_id:e.id}):await this.chunkRepository.update(e.id,{step:runtime_1.UploadStep.NULL})}finally{await this.onChunkComplete({chunk_id:e.id})}},stop:async()=>{}}}async insertPrecreateInfo(e,t){if(await this.waitUpsertPrecreate(e,t))return;const a=await this.queueRepository.findOneBy({id:e}),i=a.parts[t];if(i.step==runtime_1.UploadStep.SUCCESS)return;const s=await this.getPrecreateInfo({queue:a,part_name:t});if(s.completed)await this.onPartSuccess({queue_id:e,part_name:t,result:{fs_id:s.data.fs_id}}),await this.increaseUploadedSize({queue_id:e,size:i.info.size});else{const a={expired_at:Date.now()+216e5,data:s.data},i=await this.queueRepository.findOneBy({id:e});if(!i)return;i.precreate_info[t]=a,await this.queueRepository.update(e,i)}}async updatePrecreateInfo(e,t){if(await this.waitUpsertPrecreate(e,t))return;const a=await this.queueRepository.findOneBy({id:e});if(a.parts[t].step==runtime_1.UploadStep.SUCCESS)return;const{upload_id:i}=a.precreate_info[t].data,s=await this.getPrecreateInfo({queue:a,part_name:t,upload_id:i});if(!s.completed){const a={expired_at:Date.now()+216e5,data:s.data},i=await this.queueRepository.findOneBy({id:e});if(!i)return;i.precreate_info[t]=a,await this.queueRepository.update(e,i),await this.chunkRepository.update({queue_id:e,part_name:t,chunk_index:(0,typeorm_1.In)(s.data.block_list)},{step:runtime_1.UploadStep.NULL})}}async getPrecreateInfo({queue:e,part_name:t,upload_id:a}){const i=e.parts[t].info,{size:s,md4:r,md5:n}=i,o=await this.getMd5List(e,i),u=`${this.params.cloud_folder}/${n}.bin`,{access_token:d}=await this.params.getAccessToken(),p=`https://pan.baidu.com/rest/2.0/xpan/file?method=precreate&access_token=${d}`,c=this.getSearchParams({path:u,size:`${s}`,isdir:"0",block_list:JSON.stringify(o),autoinit:"1",rtype:"2","content-md5":n,"slice-md5":r,uploadid:a||void 0}),h=await axios_1.default.post(p,c,{headers:{"User-Agent":this.params.ua}}),{data:_}=h;return 1===_.return_type?{completed:!1,data:{upload_id:_.uploadid,block_list:_.block_list}}:{completed:!0,data:{fs_id:_.info.fs_id}}}async uploadChunk({chunk:e,queue:t}){const{access_token:a}=await this.params.getAccessToken(),{precreate_info:i}=t,s=i[e.part_name],{upload_id:r}=s.data,n=e.chunk_info.md5,o=`${this.params.cloud_folder}/${n}.bin`;try{const{file_path:t,start:i,end:s,md5:n,index:u}=e.chunk_info,d=await(0,utils_1.getFileBufferSlice)(t,i,s),p=`https://d.pcs.baidu.com/rest/2.0/pcs/superfile2?access_token=${a}&method=upload&type=tmpfile&path=${o}&uploadid=${r}&partseq=${u}`,c=new form_data_1.default;c.append("file",d,`${n}`);return!!await axios_1.default.post(p,c,{timeout:18e4,headers:{"User-Agent":this.params.ua}})}catch(e){return!1}}async getPostcreateInfo({queue:e,part_name:t}){const a=e.parts[t].info,i=e.precreate_info[t],{upload_id:s}=i.data,r=await this.getMd5List(e,a),n=`/apps/dpan/uploader/${a.md5}.bin`,o=a.size,{access_token:u}=await this.params.getAccessToken(),d=`https://pan.baidu.com/rest/2.0/xpan/file?method=create&access_token=${u}`,p=this.getSearchParams({path:n,size:`${o}`,isdir:"0",block_list:JSON.stringify(r),uploadid:s||void 0,rtype:"2"}),c=await axios_1.default.post(d,p,{headers:{"User-Agent":this.params.ua}});if(!c)return;const{data:h}=c;if(h.errno){const e=`upload create file error: ${h.errno}`;throw new Error(e)}return{fs_id:h.fs_id}}getSearchParams(e){Object.keys(e).forEach((t=>{void 0===e[t]&&delete e[t]}));return new URLSearchParams(e).toString()}}exports.BaiduUploader=BaiduUploader;
|