@dd-code/oss-uploader 0.1.7 → 0.1.9
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/cli.cjs
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
|
-
"use strict";var e=require("cli-progress"),
|
|
2
|
+
"use strict";var e=require("chalk"),t=require("cli-progress"),s=require("fs/promises"),r=require("path"),o=require("micromatch"),i=require("js-yaml");(async()=>{const[{Command:e},{uploadDirectory:t}]=await Promise.all([import("commander"),Promise.resolve().then(function(){return w})]),s=new e;s.name("oss-upload").description("上传本地目录到 OSS（当前为华为 OBS）").argument("<localDir>","本地目录").requiredOption("-b, --bucket <bucket>","Bucket 名称","hr-uat").option("-e, --env <env>","环境标识，如 dev/test/prod","dev").option("--path-prefix <pathPrefix>","业务路径前缀，将拼在 base/env 后面").option("--include <pattern...>","包含的文件模式（可多次）").option("--exclude <pattern...>","排除的文件模式（可多次）").action(async(e,s)=>{const{loadObsCredentialsFromUrlIfNeeded:r}=await Promise.resolve().then(function(){return S});await r();try{(await t({env:s.env,bucket:s.bucket,localDir:e,pathPrefix:s.pathPrefix,include:s.include,exclude:s.exclude})).failed.length>0&&(process.exitCode=1)}catch(e){console.error("上传过程中发生错误:",e?.message||e),process.exitCode=1}}),s.parse(process.argv)})();class a{constructor(){this.progressBar=null}onStart(e){}onProgress(e,s){null===this.progressBar&&(this.progressBar=new t.SingleBar({format:" 上传进度 |{bar}| {percentage}% | {value}/{total} 文件",barCompleteChar:"█",barIncompleteChar:"░",hideCursor:!0},t.Presets.shades_classic),this.progressBar.start(s,0)),this.progressBar.update(e),e>=s&&(this.progressBar.stop(),this.progressBar=null)}onFileResult(e){}onComplete(t){const{total:s,success:r,failed:o,skipped:i,context:a}=t;console.log(e.bold.cyan("\n ─────────── 上传完成 ───────────")),a&&(console.log(e.bold(" 前缀 / 配置（便于查验）")),console.log(` bucket: ${a.bucket}`),console.log(` basePrefix: ${a.basePrefix}`),void 0!==a.pathPrefix&&""!==a.pathPrefix&&console.log(` pathPrefix: ${a.pathPrefix}`),console.log(` localDir: ${a.localDir}`),a.cdnBaseUrl&&console.log(` cdnBaseUrl: ${a.cdnBaseUrl}`),console.log("")),console.log(` 总数: ${e.bold(s)} `+e.green(`成功: ${r.length}`)+" "+e.gray(`跳过: ${i.length}`)+" "+(o.length>0?e.red.bold(`失败: ${o.length}`):`失败: ${o.length}`)),r.length>0&&(console.log(e.green(`\n ✓ 成功 (${r.length})`)),r.forEach(t=>console.log(e.green(` ${t}`)))),i.length>0&&(console.log(e.gray(`\n - 跳过 (${i.length})`)),i.forEach(t=>console.log(e.gray(` ${t}`)))),o.length>0&&(console.log(e.red(`\n ✗ 失败 (${o.length})`)),o.forEach(t=>console.log(e.red(` ${t}`)))),console.log("")}}const n=require("esdk-obs-nodejs");class c{constructor(e){this.config=e,this.client=new n({access_key_id:e.accessKey,secret_access_key:e.secretKey,server:e.endpoint}),this.whiteList=JSON.parse('["/index.html"]')}async listObjectKeys(e,t){const s=[];let r;do{const o={Bucket:e,MaxKeys:1e3,Prefix:t||void 0};r&&(o.Marker=r);const i=await this.client.listObjects(o);if(i.CommonMsg.Status>300)throw new Error(`OBS listObjects 失败: ${i.CommonMsg.Status} ${i.CommonMsg.Code} ${i.CommonMsg.Message}`);const a=i.InterfaceResult?.Contents??[];for(const e of a)e.Key&&s.push(e.Key);r="true"===i.InterfaceResult?.IsTruncated?i.InterfaceResult?.NextMarker:void 0}while(r);return s}async headObject(e,t){try{if(this.whiteList.some(e=>t.includes(e)))return{exists:!1};const s=await this.client.getObjectMetadata({Bucket:e,Key:t});if(s.CommonMsg.Status<=300)return{exists:!0};if(404===s.CommonMsg.Status||"NoSuchKey"===s.CommonMsg.Code||"NotFound"===s.CommonMsg.Code)return{exists:!1};throw new Error(`OBS getObjectMetadata 失败: ${s.CommonMsg.Status} ${s.CommonMsg.Code} ${s.CommonMsg.Message}`)}catch(e){const t=e&&"string"==typeof e.message?e.message:String(e),s=e?.Code??e?.code;if("NoSuchKey"===s||"NotFound"===s||t.includes("404")||t.includes("NoSuchKey"))return{exists:!1};throw e}}async putObject(e){const{bucket:t,key:s,contentType:r}=e,o={Bucket:t,Key:s,ContentType:r};if(e.sourceFile)o.SourceFile=e.sourceFile;else{if(!e.body)throw new Error("putObject 需要 body 或 sourceFile");o.Body=e.body}const i=await this.client.putObject(o);if(i.CommonMsg.Status>300){const{Status:e,Code:t,Message:s,RequestId:r}=i.CommonMsg,o=[e,t,s,r].filter(Boolean).join(" ");throw new Error(`OBS putObject 失败 (${o||"无详情"}). 请检查: 1) 桶名是否正确且已创建 2) OBS_ENDPOINT 是否与该桶所在区域一致，如 https://obs.xx-xx-1.myhuaweicloud.com`)}}}class l{resolveHuaweiConfig(e){const t=process.env.OBS_ACCESS_KEY,s=process.env.OBS_SECRET_KEY;if(!t||!s)throw new Error("缺少华为 OBS 配置: OBS_ENDPOINT / OBS_ACCESS_KEY / OBS_SECRET_KEY");return{endpoint:"https://obs.cn-east-3.myhuaweicloud.com",accessKey:t,secretKey:s,region:"cn-east-3",basePrefix:"jhr-static",cdnBaseUrl:"https://hruat-cos.jtexpress.com.cn"}}}class u{constructor(){this.huaweiResolver=new l}resolve(){{const e=this.huaweiResolver.resolveHuaweiConfig();return{providerConfig:{type:"huawei",options:e},basePrefix:e.basePrefix,cdnBaseUrl:e.cdnBaseUrl}}}}function h(e,t){const s=e.replace(/\/+$/,""),r=t.replace(/^\/+/,"");return r?`${s}/${r}`:s}const p={png:"image/png",jpg:"image/jpeg",jpeg:"image/jpeg",gif:"image/gif",webp:"image/webp",svg:"image/svg+xml",ico:"image/x-icon",bmp:"image/bmp",tiff:"image/tiff",tif:"image/tiff",js:"application/javascript",mjs:"application/javascript",json:"application/json",css:"text/css",html:"text/html",htm:"text/html",txt:"text/plain",woff:"font/woff",woff2:"font/woff2",ttf:"font/ttf",eot:"application/vnd.ms-fontobject"};function d(e){const t=r.extname(e).slice(1).toLowerCase();return t?p[t]:void 0}class f{constructor(e,t,s,r,o){this.storageClient=e,this.basePrefix=t,this.cdnBaseUrl=s,this.reporter=r,this.fileProcessor=o}async uploadDirectory(e){const t=await this.collectFiles(e.localDir,e.include,e.exclude),s={total:t.length,success:[],failed:[],skipped:[]},r=this.buildKey(this.basePrefix,e.env,e.pathPrefix,"");let o;"function"==typeof this.storageClient.listObjectKeys&&(o=new Set(await this.storageClient.listObjectKeys(e.bucket,r))),this.reporter?.onStart&&await this.reporter.onStart({env:e.env,bucket:e.bucket,basePrefix:this.basePrefix,pathPrefix:e.pathPrefix,localDir:e.localDir,cdnBaseUrl:this.cdnBaseUrl});for(const r of t){const i=await this.uploadOneFile(r,e,o);s[i.status].push("success"===i.status?[this.cdnBaseUrl??"",i.key??""].join("/"):r.relativePath);const a=s.success.length+s.failed.length+s.skipped.length;this.reporter?.onProgress&&await this.reporter.onProgress(a,t.length)}return s.context={bucket:e.bucket,basePrefix:this.basePrefix,pathPrefix:e.pathPrefix,localDir:e.localDir,cdnBaseUrl:this.cdnBaseUrl},this.reporter?.onComplete&&await this.reporter.onComplete(s),s}async collectFiles(e,t,i){const a=r.isAbsolute(e)?e:r.join(process.cwd(),e);if((await s.stat(a)).isFile())return[{absolutePath:a,relativePath:e}];return(await this.walkDir(a)).filter(e=>function(e,t,s){let r=!0;return t&&t.length>0&&(r=o.isMatch(e,t)),!(!r||s&&s.length>0&&o.isMatch(e,s))}(e.relativePath,t,i))}async uploadOneFile(e,t,r){const o=this.buildKey(this.basePrefix,t.env,t.pathPrefix,e.relativePath);try{const i=t.forceUploadPatterns?.some(e=>o.includes(e));if(void 0!==r){if(!i&&r.has(o))return await this.reportFile(e,t.bucket,o,"skipped"),{status:"skipped",key:o}}else{if((await this.storageClient.headObject(t.bucket,o)).exists)return await this.reportFile(e,t.bucket,o,"skipped"),{status:"skipped",key:o}}if(this.fileProcessor){const r=await s.readFile(e.absolutePath),{buffer:i,contentType:a}=await this.fileProcessor.process({localPath:e.absolutePath,relativePath:e.relativePath,buffer:r});await this.storageClient.putObject({bucket:t.bucket,key:o,body:i,contentType:a})}else await this.storageClient.putObject({bucket:t.bucket,key:o,sourceFile:e.absolutePath,contentType:d(e.relativePath)});return await this.reportFile(e,t.bucket,o,"success"),{status:"success",key:o}}catch(s){const r=s instanceof Error?s:new Error(String(s));return await this.reportFile(e,t.bucket,o,"failed",r),{status:"failed",key:o}}}buildKey(e,t,s,o){const i=(o??"").replace(/\\/g,"/");return r.join(e,s??"",t??"dev",i).replace(/\\/g,"/")}async walkDir(e,t=""){const o=r.join(e,t),i=await s.readdir(o,{withFileTypes:!0}),a=[];for(const s of i){const o=r.join(t,s.name),i=r.join(e,o);s.isDirectory()?a.push(...await this.walkDir(e,o)):s.isFile()&&a.push({absolutePath:i,relativePath:o.replace(/\\/g,"/")})}return a}async reportFile(e,t,s,r,o){if(!this.reporter?.onFileResult)return;const i={localPath:e.absolutePath,relativePath:e.relativePath,bucket:t,key:s,status:r,...this.cdnBaseUrl&&{accessUrl:h(this.cdnBaseUrl,s)},...o&&{error:o}};await this.reporter.onFileResult(i)}}class g extends f{constructor(e,t,s,r,o){super(e,t,s,r,o)}}class b{constructor(){this.resolver=new u}async uploadDirectory(e){const t=this.resolver.resolve(),s=function(e){if("huawei"===e.type)return new c(e.options);throw new Error(`Unsupported provider type: ${e.type}`)}(t.providerConfig),r=e.reporter??new a;return new g(s,t.basePrefix,t.cdnBaseUrl,r,e.fileProcessor).uploadDirectory({bucket:e.bucket,localDir:e.localDir,env:e.env||"dev",pathPrefix:e.pathPrefix,include:e.include,exclude:e.exclude,forceUploadPatterns:m()})}}function m(){try{const e='["/index.html"]';return JSON.parse(e)}catch{return[]}}var w=Object.freeze({__proto__:null,OssService:b,uploadDirectory:async function(e){return(new b).uploadDirectory(e)}});const y="OBS_CREDENTIALS_URL";var S=Object.freeze({__proto__:null,loadObsCredentialsFromUrlIfNeeded:async function(){const e="https://hr-uat.jtexpress.com.cn/hrpt/ast/static/obs-config.yaml",t=process.env.OBS_ACCESS_KEY,s=process.env.OBS_SECRET_KEY;if(t&&s)return;const r=await fetch(e);if(!r.ok)throw new Error(`拉取 OBS 凭证失败 (${r.status}): ${e}`);const o=await r.text(),a=i.load(o);if(!a||"object"!=typeof a)throw new Error(`OBS 凭证 YAML 解析结果无效，请检查 ${y} 返回内容`);const n=a.OBS_ACCESS_KEY,c=a.OBS_SECRET_KEY;if("string"==typeof n&&(process.env.OBS_ACCESS_KEY=n),"string"==typeof c&&(process.env.OBS_SECRET_KEY=c),!process.env.OBS_ACCESS_KEY||!process.env.OBS_SECRET_KEY)throw new Error(`OBS 凭证 YAML 中未找到 OBS_ACCESS_KEY 或 OBS_SECRET_KEY，请检查 ${y} 返回内容`)}});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UploadService.d.ts","sourceRoot":"","sources":["../../src/core/UploadService.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGhD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAgCrD,gBAAgB;AAChB,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,qDAAqD;IACrD,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;CAChC;AAED,MAAM,WAAW,SAAS;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;;GAGG;AACH,8BAAsB,aAAa;IAE/B,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa;IAC/C,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM;IACrC,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM;IACtC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ;IACtC,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,aAAa;IALlD,SAAS,aACY,aAAa,EAAE,aAAa,EAC5B,UAAU,EAAE,MAAM,EAClB,UAAU,CAAC,EAAE,MAAM,YAAA,EACnB,QAAQ,CAAC,EAAE,QAAQ,YAAA,EACnB,aAAa,CAAC,EAAE,aAAa,YAAA;IAG5C,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"UploadService.d.ts","sourceRoot":"","sources":["../../src/core/UploadService.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGhD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAgCrD,gBAAgB;AAChB,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,qDAAqD;IACrD,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;CAChC;AAED,MAAM,WAAW,SAAS;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;;GAGG;AACH,8BAAsB,aAAa;IAE/B,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa;IAC/C,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM;IACrC,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM;IACtC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ;IACtC,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,aAAa;IALlD,SAAS,aACY,aAAa,EAAE,aAAa,EAC5B,UAAU,EAAE,MAAM,EAClB,UAAU,CAAC,EAAE,MAAM,YAAA,EACnB,QAAQ,CAAC,EAAE,QAAQ,YAAA,EACnB,aAAa,CAAC,EAAE,aAAa,YAAA;IAG5C,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,aAAa,CAAC;IAuD9E,wBAAwB;cACR,YAAY,CAC1B,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,MAAM,EAAE,EAClB,OAAO,CAAC,EAAE,MAAM,EAAE,GACjB,OAAO,CAAC,SAAS,EAAE,CAAC;IAUvB,sEAAsE;cACtD,aAAa,CAC3B,IAAI,EAAE,SAAS,EACf,OAAO,EAAE,sBAAsB,EAC/B,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,GAC5B,OAAO,CAAC;QAAE,MAAM,EAAE,SAAS,GAAG,SAAS,GAAG,QAAQ,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;IAsDrE,SAAS,CAAC,QAAQ,CAChB,UAAU,EAAE,MAAM,EAClB,GAAG,CAAC,EAAE,MAAM,EACZ,UAAU,CAAC,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE,MAAM,GACpB,MAAM;cAKO,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,SAAK,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;cAoB/D,UAAU,CACxB,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,gBAAgB,CAAC,QAAQ,CAAC,EAClC,KAAK,CAAC,EAAE,KAAK,GACZ,OAAO,CAAC,IAAI,CAAC;CAajB"}
|
package/dist/core/reporter.d.ts
CHANGED
|
@@ -14,12 +14,20 @@ export interface UploadFileResult {
|
|
|
14
14
|
/** 配置了 CDN 时的完整访问地址，由 buildCdnAccessUrl 生成 */
|
|
15
15
|
accessUrl?: string;
|
|
16
16
|
}
|
|
17
|
-
/**
|
|
17
|
+
/** 整次上传的汇总统计（含前缀等上下文，便于查验） */
|
|
18
18
|
export interface UploadSummary {
|
|
19
19
|
total: number;
|
|
20
20
|
success: string[];
|
|
21
21
|
failed: string[];
|
|
22
22
|
skipped: string[];
|
|
23
|
+
/** 本次上传的前缀/配置，供报告展示 */
|
|
24
|
+
context?: {
|
|
25
|
+
bucket: string;
|
|
26
|
+
basePrefix: string;
|
|
27
|
+
pathPrefix?: string;
|
|
28
|
+
localDir: string;
|
|
29
|
+
cdnBaseUrl?: string;
|
|
30
|
+
};
|
|
23
31
|
}
|
|
24
32
|
/** Reporter 接口：上传开始、进度、每个文件结果、全部完成时回调 */
|
|
25
33
|
export interface Reporter {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reporter.d.ts","sourceRoot":"","sources":["../../src/core/reporter.ts"],"names":[],"mappings":"AAAA;;;GAGG;
|
|
1
|
+
{"version":3,"file":"reporter.d.ts","sourceRoot":"","sources":["../../src/core/reporter.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG,QAAQ,GAAG,SAAS,CAAC;AAE5D,8BAA8B;AAC9B,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,YAAY,CAAC;IACrB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,8CAA8C;IAC9C,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,8BAA8B;AAC9B,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,uBAAuB;IACvB,OAAO,CAAC,EAAE;QACR,MAAM,EAAE,MAAM,CAAC;QACf,UAAU,EAAE,MAAM,CAAC;QACnB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,QAAQ,EAAE,MAAM,CAAC;QACjB,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;CACH;AAED,yCAAyC;AACzC,MAAM,WAAW,QAAQ;IACvB,OAAO,CAAC,CAAC,OAAO,EAAE;QAChB,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,MAAM,CAAC;QACf,UAAU,EAAE,MAAM,CAAC;QACnB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,QAAQ,EAAE,MAAM,CAAC;QACjB,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzB,gCAAgC;IAChC,UAAU,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAElE,YAAY,CAAC,CAAC,MAAM,EAAE,gBAAgB,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE9D,UAAU,CAAC,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3D;AAED,0BAA0B;AAC1B,qBAAa,eAAgB,YAAW,QAAQ;IAC9C,OAAO,CAAC,WAAW,CAA0B;IAE7C,OAAO,CAAC,OAAO,EAAE;QACf,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,MAAM,CAAC;QACf,UAAU,EAAE,MAAM,CAAC;QACnB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,QAAQ,EAAE,MAAM,CAAC;QACjB,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,GAAG,IAAI;IAOR,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAoBhD,YAAY,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI;IAE7C,UAAU,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;CAsCzC"}
|
package/dist/index.cjs
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
"use strict";var e=require("cli-progress"),
|
|
1
|
+
"use strict";var e=require("chalk"),t=require("cli-progress"),s=require("fs/promises"),r=require("path"),o=require("micromatch");class i{constructor(){this.progressBar=null}onStart(e){}onProgress(e,s){null===this.progressBar&&(this.progressBar=new t.SingleBar({format:" 上传进度 |{bar}| {percentage}% | {value}/{total} 文件",barCompleteChar:"█",barIncompleteChar:"░",hideCursor:!0},t.Presets.shades_classic),this.progressBar.start(s,0)),this.progressBar.update(e),e>=s&&(this.progressBar.stop(),this.progressBar=null)}onFileResult(e){}onComplete(t){const{total:s,success:r,failed:o,skipped:i,context:a}=t;console.log(e.bold.cyan("\n ─────────── 上传完成 ───────────")),a&&(console.log(e.bold(" 前缀 / 配置（便于查验）")),console.log(` bucket: ${a.bucket}`),console.log(` basePrefix: ${a.basePrefix}`),void 0!==a.pathPrefix&&""!==a.pathPrefix&&console.log(` pathPrefix: ${a.pathPrefix}`),console.log(` localDir: ${a.localDir}`),a.cdnBaseUrl&&console.log(` cdnBaseUrl: ${a.cdnBaseUrl}`),console.log("")),console.log(` 总数: ${e.bold(s)} `+e.green(`成功: ${r.length}`)+" "+e.gray(`跳过: ${i.length}`)+" "+(o.length>0?e.red.bold(`失败: ${o.length}`):`失败: ${o.length}`)),r.length>0&&(console.log(e.green(`\n ✓ 成功 (${r.length})`)),r.forEach(t=>console.log(e.green(` ${t}`)))),i.length>0&&(console.log(e.gray(`\n - 跳过 (${i.length})`)),i.forEach(t=>console.log(e.gray(` ${t}`)))),o.length>0&&(console.log(e.red(`\n ✗ 失败 (${o.length})`)),o.forEach(t=>console.log(e.red(` ${t}`)))),console.log("")}}const a=require("esdk-obs-nodejs");class n{constructor(e){this.config=e,this.client=new a({access_key_id:e.accessKey,secret_access_key:e.secretKey,server:e.endpoint}),this.whiteList=JSON.parse('["/index.html"]')}async listObjectKeys(e,t){const s=[];let r;do{const o={Bucket:e,MaxKeys:1e3,Prefix:t||void 0};r&&(o.Marker=r);const i=await this.client.listObjects(o);if(i.CommonMsg.Status>300)throw new Error(`OBS listObjects 失败: ${i.CommonMsg.Status} ${i.CommonMsg.Code} ${i.CommonMsg.Message}`);const a=i.InterfaceResult?.Contents??[];for(const e of a)e.Key&&s.push(e.Key);r="true"===i.InterfaceResult?.IsTruncated?i.InterfaceResult?.NextMarker:void 0}while(r);return s}async headObject(e,t){try{if(this.whiteList.some(e=>t.includes(e)))return{exists:!1};const s=await this.client.getObjectMetadata({Bucket:e,Key:t});if(s.CommonMsg.Status<=300)return{exists:!0};if(404===s.CommonMsg.Status||"NoSuchKey"===s.CommonMsg.Code||"NotFound"===s.CommonMsg.Code)return{exists:!1};throw new Error(`OBS getObjectMetadata 失败: ${s.CommonMsg.Status} ${s.CommonMsg.Code} ${s.CommonMsg.Message}`)}catch(e){const t=e&&"string"==typeof e.message?e.message:String(e),s=e?.Code??e?.code;if("NoSuchKey"===s||"NotFound"===s||t.includes("404")||t.includes("NoSuchKey"))return{exists:!1};throw e}}async putObject(e){const{bucket:t,key:s,contentType:r}=e,o={Bucket:t,Key:s,ContentType:r};if(e.sourceFile)o.SourceFile=e.sourceFile;else{if(!e.body)throw new Error("putObject 需要 body 或 sourceFile");o.Body=e.body}const i=await this.client.putObject(o);if(i.CommonMsg.Status>300){const{Status:e,Code:t,Message:s,RequestId:r}=i.CommonMsg,o=[e,t,s,r].filter(Boolean).join(" ");throw new Error(`OBS putObject 失败 (${o||"无详情"}). 请检查: 1) 桶名是否正确且已创建 2) OBS_ENDPOINT 是否与该桶所在区域一致，如 https://obs.xx-xx-1.myhuaweicloud.com`)}}}class c{resolveHuaweiConfig(e){const t=process.env.OBS_ACCESS_KEY,s=process.env.OBS_SECRET_KEY;if(!t||!s)throw new Error("缺少华为 OBS 配置: OBS_ENDPOINT / OBS_ACCESS_KEY / OBS_SECRET_KEY");return{endpoint:"https://obs.cn-east-3.myhuaweicloud.com",accessKey:t,secretKey:s,region:"cn-east-3",basePrefix:"jhr-static",cdnBaseUrl:"https://hruat-cos.jtexpress.com.cn"}}}class l{constructor(){this.huaweiResolver=new c}resolve(){{const e=this.huaweiResolver.resolveHuaweiConfig();return{providerConfig:{type:"huawei",options:e},basePrefix:e.basePrefix,cdnBaseUrl:e.cdnBaseUrl}}}}function u(e,t){const s=e.replace(/\/+$/,""),r=t.replace(/^\/+/,"");return r?`${s}/${r}`:s}const h={png:"image/png",jpg:"image/jpeg",jpeg:"image/jpeg",gif:"image/gif",webp:"image/webp",svg:"image/svg+xml",ico:"image/x-icon",bmp:"image/bmp",tiff:"image/tiff",tif:"image/tiff",js:"application/javascript",mjs:"application/javascript",json:"application/json",css:"text/css",html:"text/html",htm:"text/html",txt:"text/plain",woff:"font/woff",woff2:"font/woff2",ttf:"font/ttf",eot:"application/vnd.ms-fontobject"};function p(e){const t=r.extname(e).slice(1).toLowerCase();return t?h[t]:void 0}class f{constructor(e,t,s,r,o){this.storageClient=e,this.basePrefix=t,this.cdnBaseUrl=s,this.reporter=r,this.fileProcessor=o}async uploadDirectory(e){const t=await this.collectFiles(e.localDir,e.include,e.exclude),s={total:t.length,success:[],failed:[],skipped:[]},r=this.buildKey(this.basePrefix,e.env,e.pathPrefix,"");let o;"function"==typeof this.storageClient.listObjectKeys&&(o=new Set(await this.storageClient.listObjectKeys(e.bucket,r))),this.reporter?.onStart&&await this.reporter.onStart({env:e.env,bucket:e.bucket,basePrefix:this.basePrefix,pathPrefix:e.pathPrefix,localDir:e.localDir,cdnBaseUrl:this.cdnBaseUrl});for(const r of t){const i=await this.uploadOneFile(r,e,o);s[i.status].push("success"===i.status?[this.cdnBaseUrl??"",i.key??""].join("/"):r.relativePath);const a=s.success.length+s.failed.length+s.skipped.length;this.reporter?.onProgress&&await this.reporter.onProgress(a,t.length)}return s.context={bucket:e.bucket,basePrefix:this.basePrefix,pathPrefix:e.pathPrefix,localDir:e.localDir,cdnBaseUrl:this.cdnBaseUrl},this.reporter?.onComplete&&await this.reporter.onComplete(s),s}async collectFiles(e,t,i){const a=r.isAbsolute(e)?e:r.join(process.cwd(),e);if((await s.stat(a)).isFile())return[{absolutePath:a,relativePath:e}];return(await this.walkDir(a)).filter(e=>function(e,t,s){let r=!0;return t&&t.length>0&&(r=o.isMatch(e,t)),!(!r||s&&s.length>0&&o.isMatch(e,s))}(e.relativePath,t,i))}async uploadOneFile(e,t,r){const o=this.buildKey(this.basePrefix,t.env,t.pathPrefix,e.relativePath);try{const i=t.forceUploadPatterns?.some(e=>o.includes(e));if(void 0!==r){if(!i&&r.has(o))return await this.reportFile(e,t.bucket,o,"skipped"),{status:"skipped",key:o}}else{if((await this.storageClient.headObject(t.bucket,o)).exists)return await this.reportFile(e,t.bucket,o,"skipped"),{status:"skipped",key:o}}if(this.fileProcessor){const r=await s.readFile(e.absolutePath),{buffer:i,contentType:a}=await this.fileProcessor.process({localPath:e.absolutePath,relativePath:e.relativePath,buffer:r});await this.storageClient.putObject({bucket:t.bucket,key:o,body:i,contentType:a})}else await this.storageClient.putObject({bucket:t.bucket,key:o,sourceFile:e.absolutePath,contentType:p(e.relativePath)});return await this.reportFile(e,t.bucket,o,"success"),{status:"success",key:o}}catch(s){const r=s instanceof Error?s:new Error(String(s));return await this.reportFile(e,t.bucket,o,"failed",r),{status:"failed",key:o}}}buildKey(e,t,s,o){const i=(o??"").replace(/\\/g,"/");return r.join(e,s??"",t??"dev",i).replace(/\\/g,"/")}async walkDir(e,t=""){const o=r.join(e,t),i=await s.readdir(o,{withFileTypes:!0}),a=[];for(const s of i){const o=r.join(t,s.name),i=r.join(e,o);s.isDirectory()?a.push(...await this.walkDir(e,o)):s.isFile()&&a.push({absolutePath:i,relativePath:o.replace(/\\/g,"/")})}return a}async reportFile(e,t,s,r,o){if(!this.reporter?.onFileResult)return;const i={localPath:e.absolutePath,relativePath:e.relativePath,bucket:t,key:s,status:r,...this.cdnBaseUrl&&{accessUrl:u(this.cdnBaseUrl,s)},...o&&{error:o}};await this.reporter.onFileResult(i)}}class g extends f{constructor(e,t,s,r,o){super(e,t,s,r,o)}}class d{constructor(){this.resolver=new l}async uploadDirectory(e){const t=this.resolver.resolve(),s=function(e){if("huawei"===e.type)return new n(e.options);throw new Error(`Unsupported provider type: ${e.type}`)}(t.providerConfig),r=e.reporter??new i;return new g(s,t.basePrefix,t.cdnBaseUrl,r,e.fileProcessor).uploadDirectory({bucket:e.bucket,localDir:e.localDir,env:e.env||"dev",pathPrefix:e.pathPrefix,include:e.include,exclude:e.exclude,forceUploadPatterns:b()})}}function b(){try{const e='["/index.html"]';return JSON.parse(e)}catch{return[]}}exports.upload=async function(e){return async function(e){return(new d).uploadDirectory(e)}({...e,env:e.env||"dev",bucket:e.bucket||"hr-uat"})};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dd-code/oss-uploader",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.9",
|
|
4
4
|
"description": "Upload local directories to OSS (currently Huawei OBS) with pluggable middleware and providers.",
|
|
5
5
|
"main": "dist/index.cjs",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -13,6 +13,7 @@
|
|
|
13
13
|
"prepare": "npm run build"
|
|
14
14
|
},
|
|
15
15
|
"dependencies": {
|
|
16
|
+
"chalk": "^5.6.2",
|
|
16
17
|
"cli-progress": "^3.12.0",
|
|
17
18
|
"commander": "^12.0.0",
|
|
18
19
|
"esdk-obs-nodejs": "^3.25.0",
|
|
@@ -107,6 +107,13 @@ export abstract class UploadService {
|
|
|
107
107
|
}
|
|
108
108
|
}
|
|
109
109
|
|
|
110
|
+
summary.context = {
|
|
111
|
+
bucket: options.bucket,
|
|
112
|
+
basePrefix: this.basePrefix,
|
|
113
|
+
pathPrefix: options.pathPrefix,
|
|
114
|
+
localDir: options.localDir,
|
|
115
|
+
cdnBaseUrl: this.cdnBaseUrl,
|
|
116
|
+
};
|
|
110
117
|
if (this.reporter?.onComplete) {
|
|
111
118
|
await this.reporter.onComplete(summary);
|
|
112
119
|
}
|
|
@@ -120,12 +127,12 @@ export abstract class UploadService {
|
|
|
120
127
|
include?: string[],
|
|
121
128
|
exclude?: string[],
|
|
122
129
|
): Promise<LocalFile[]> {
|
|
123
|
-
|
|
124
|
-
const stat = await fs.stat(
|
|
130
|
+
const absolutePath = path.isAbsolute(localDir) ? localDir : path.join(process.cwd(), localDir);
|
|
131
|
+
const stat = await fs.stat(absolutePath);
|
|
125
132
|
if (stat.isFile()) {
|
|
126
|
-
return [{ absolutePath:
|
|
133
|
+
return [{ absolutePath: absolutePath, relativePath: localDir }];
|
|
127
134
|
}
|
|
128
|
-
const files = await this.walkDir(
|
|
135
|
+
const files = await this.walkDir(absolutePath);
|
|
129
136
|
return files.filter((f) => shouldInclude(f.relativePath, include, exclude));
|
|
130
137
|
}
|
|
131
138
|
|
package/src/core/reporter.ts
CHANGED
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
* 默认实现为控制台输出，可扩展为企业微信、钉钉等通知。
|
|
4
4
|
*/
|
|
5
5
|
|
|
6
|
+
import chalk from 'chalk';
|
|
6
7
|
import { SingleBar, Presets } from 'cli-progress';
|
|
7
8
|
|
|
8
9
|
export type UploadStatus = 'success' | 'failed' | 'skipped';
|
|
@@ -19,12 +20,20 @@ export interface UploadFileResult {
|
|
|
19
20
|
accessUrl?: string;
|
|
20
21
|
}
|
|
21
22
|
|
|
22
|
-
/**
|
|
23
|
+
/** 整次上传的汇总统计（含前缀等上下文，便于查验） */
|
|
23
24
|
export interface UploadSummary {
|
|
24
25
|
total: number;
|
|
25
26
|
success: string[];
|
|
26
27
|
failed: string[];
|
|
27
28
|
skipped: string[];
|
|
29
|
+
/** 本次上传的前缀/配置，供报告展示 */
|
|
30
|
+
context?: {
|
|
31
|
+
bucket: string;
|
|
32
|
+
basePrefix: string;
|
|
33
|
+
pathPrefix?: string;
|
|
34
|
+
localDir: string;
|
|
35
|
+
cdnBaseUrl?: string;
|
|
36
|
+
};
|
|
28
37
|
}
|
|
29
38
|
|
|
30
39
|
/** Reporter 接口：上传开始、进度、每个文件结果、全部完成时回调 */
|
|
@@ -87,11 +96,42 @@ export class ConsoleReporter implements Reporter {
|
|
|
87
96
|
onFileResult(_result: UploadFileResult): void {}
|
|
88
97
|
|
|
89
98
|
onComplete(summary: UploadSummary): void {
|
|
90
|
-
|
|
91
|
-
console.log(
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
99
|
+
const { total, success, failed, skipped, context } = summary;
|
|
100
|
+
console.log(chalk.bold.cyan('\n ─────────── 上传完成 ───────────'));
|
|
101
|
+
if (context) {
|
|
102
|
+
console.log(chalk.bold(' 前缀 / 配置（便于查验）'));
|
|
103
|
+
console.log(` bucket: ${context.bucket}`);
|
|
104
|
+
console.log(` basePrefix: ${context.basePrefix}`);
|
|
105
|
+
if (context.pathPrefix !== undefined && context.pathPrefix !== '') {
|
|
106
|
+
console.log(` pathPrefix: ${context.pathPrefix}`);
|
|
107
|
+
}
|
|
108
|
+
console.log(` localDir: ${context.localDir}`);
|
|
109
|
+
if (context.cdnBaseUrl) {
|
|
110
|
+
console.log(` cdnBaseUrl: ${context.cdnBaseUrl}`);
|
|
111
|
+
}
|
|
112
|
+
console.log('');
|
|
113
|
+
}
|
|
114
|
+
console.log(
|
|
115
|
+
` 总数: ${chalk.bold(total)} ` +
|
|
116
|
+
chalk.green(`成功: ${success.length}`) +
|
|
117
|
+
` ` +
|
|
118
|
+
chalk.gray(`跳过: ${skipped.length}`) +
|
|
119
|
+
` ` +
|
|
120
|
+
(failed.length > 0 ? chalk.red.bold(`失败: ${failed.length}`) : `失败: ${failed.length}`),
|
|
121
|
+
);
|
|
122
|
+
if (success.length > 0) {
|
|
123
|
+
console.log(chalk.green(`\n ✓ 成功 (${success.length})`));
|
|
124
|
+
success.forEach((key) => console.log(chalk.green(` ${key}`)));
|
|
125
|
+
}
|
|
126
|
+
if (skipped.length > 0) {
|
|
127
|
+
console.log(chalk.gray(`\n - 跳过 (${skipped.length})`));
|
|
128
|
+
skipped.forEach((key) => console.log(chalk.gray(` ${key}`)));
|
|
129
|
+
}
|
|
130
|
+
if (failed.length > 0) {
|
|
131
|
+
console.log(chalk.red(`\n ✗ 失败 (${failed.length})`));
|
|
132
|
+
failed.forEach((key) => console.log(chalk.red(` ${key}`)));
|
|
133
|
+
}
|
|
134
|
+
console.log('');
|
|
95
135
|
}
|
|
96
136
|
}
|
|
97
137
|
|