@dd-code/oss-uploader 0.1.10 → 0.1.12

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("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} 返回内容`)}});
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 m})]),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 E});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 n{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:n}=t;console.log(e.bold.cyan("\n ─────────── 上传完成 ───────────")),n&&(console.log(e.bold(" 前缀 / 配置(便于查验)")),console.log(` bucket: ${n.bucket}`),console.log(` basePrefix: ${n.basePrefix}`),void 0!==n.pathPrefix&&""!==n.pathPrefix&&console.log(` pathPrefix: ${n.pathPrefix}`),console.log(` localDir: ${n.localDir}`),n.cdnBaseUrl&&console.log(` cdnBaseUrl: ${n.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 c{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 n=i.InterfaceResult?.Contents??[];for(const e of n)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 p(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 d(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 n=s.success.length+s.failed.length+s.skipped.length;this.reporter?.onProgress&&await this.reporter.onProgress(n,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 n=r.isAbsolute(e)?e:r.join(process.cwd(),e);if((await s.stat(n)).isFile())return[{absolutePath:n,relativePath:e}];return(await this.walkDir(n)).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:n}=await this.fileProcessor.process({localPath:e.absolutePath,relativePath:e.relativePath,buffer:r});await this.storageClient.putObject({bucket:t.bucket,key:o,body:i,contentType:n})}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}),n=[];for(const s of i){const o=r.join(t,s.name),i=r.join(e,o);s.isDirectory()?n.push(...await this.walkDir(e,o)):s.isFile()&&n.push({absolutePath:i,relativePath:o.replace(/\\/g,"/")})}return n}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:p(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 S{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 n;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[]}}var m=Object.freeze({__proto__:null,OssService:S,uploadDirectory:async function(e){return(new S).uploadDirectory(e)}});const w="OBS_CREDENTIALS_URL";function y(){return process.env.OBS_ACCESS_KEY??process.env.OBS_AK}function C(){return process.env.OBS_SECRET_KEY??process.env.OBS_SK}var E=Object.freeze({__proto__:null,loadObsCredentialsFromUrlIfNeeded:async function(){const e="https://hr-uat.jtexpress.com.cn/hrpt/ast/static/obs-config.yaml",t=y(),s=C();if(t&&s)return t&&!process.env.OBS_ACCESS_KEY&&(process.env.OBS_ACCESS_KEY=y()),void(s&&!process.env.OBS_SECRET_KEY&&(process.env.OBS_SECRET_KEY=C()));const r=new AbortController,o=setTimeout(()=>r.abort(),15e3);let n;try{n=await fetch(e,{signal:r.signal})}catch(t){clearTimeout(o);throw new Error("AbortError"===t?.name?`拉取 OBS 凭证超时 (15000ms): ${e}。若在 Jenkins/CI 中无法访问该地址,请直接配置环境变量 OBS_ACCESS_KEY 和 OBS_SECRET_KEY。`:`拉取 OBS 凭证失败: ${t?.message??t}。若在 Jenkins/CI 中无法访问该地址,请直接配置环境变量 OBS_ACCESS_KEY 和 OBS_SECRET_KEY。`)}if(clearTimeout(o),!n.ok)throw new Error(`拉取 OBS 凭证失败 (${n.status}): ${e}`);const a=await n.text(),c=i.load(a);if(!c||"object"!=typeof c)throw new Error(`OBS 凭证 YAML 解析结果无效,请检查 ${w} 返回内容`);const l=c.OBS_ACCESS_KEY,u=c.OBS_SECRET_KEY;if("string"==typeof l&&(process.env.OBS_ACCESS_KEY=l),"string"==typeof u&&(process.env.OBS_SECRET_KEY=u),!process.env.OBS_ACCESS_KEY||!process.env.OBS_SECRET_KEY)throw new Error(`OBS 凭证 YAML 中未找到 OBS_ACCESS_KEY 或 OBS_SECRET_KEY,请检查 ${w} 返回内容`)}});
@@ -1 +1 @@
1
- {"version":3,"file":"loadObsCredentialsFromUrl.d.ts","sourceRoot":"","sources":["../../src/config/loadObsCredentialsFromUrl.ts"],"names":[],"mappings":"AAUA;;;GAGG;AACH,wBAAsB,iCAAiC,IAAI,OAAO,CAAC,IAAI,CAAC,CA+BvE"}
1
+ {"version":3,"file":"loadObsCredentialsFromUrl.d.ts","sourceRoot":"","sources":["../../src/config/loadObsCredentialsFromUrl.ts"],"names":[],"mappings":"AAqBA;;;GAGG;AACH,wBAAsB,iCAAiC,IAAI,OAAO,CAAC,IAAI,CAAC,CA8CvE"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dd-code/oss-uploader",
3
- "version": "0.1.10",
3
+ "version": "0.1.12",
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",
@@ -1,12 +1,23 @@
1
1
  /**
2
2
  * 当配置了 OBS_CREDENTIALS_URL 且未配置 AK/SK 时,从该 URL 拉取 YAML 并解析出
3
3
  * OBS_ACCESS_KEY、OBS_SECRET_KEY 写入 process.env,供 EnvConfigResolverImpl 使用。
4
+ *
5
+ * Jenkins/CI 用法:在 Job 中配置环境变量即可,不依赖 URL 拉取。
6
+ * - 标准名:OBS_ACCESS_KEY、OBS_SECRET_KEY(推荐)
7
+ * - 别名:OBS_AK、OBS_SK(若 Jenkins 凭证绑定使用此命名)
8
+ * 只要 AK/SK 任一组合存在则不会请求 OBS_CREDENTIALS_URL。
4
9
  */
5
10
  import yaml from 'js-yaml';
6
11
 
7
12
  const CREDENTIALS_URL_KEY = 'OBS_CREDENTIALS_URL';
8
- // const ACCESS_KEY_KEY = 'OBS_ACCESS_KEY';
9
- // const SECRET_KEY_KEY = 'OBS_SECRET_KEY';
13
+ const FETCH_TIMEOUT_MS = 15000;
14
+
15
+ function getObsAccessKey(): string | undefined {
16
+ return process.env.OBS_ACCESS_KEY ?? process.env.OBS_AK;
17
+ }
18
+ function getObsSecretKey(): string | undefined {
19
+ return process.env.OBS_SECRET_KEY ?? process.env.OBS_SK;
20
+ }
10
21
 
11
22
  /**
12
23
  * 若设置了 OBS_CREDENTIALS_URL 且当前未设置 OBS_ACCESS_KEY 或 OBS_SECRET_KEY,
@@ -14,15 +25,30 @@ const CREDENTIALS_URL_KEY = 'OBS_CREDENTIALS_URL';
14
25
  */
15
26
  export async function loadObsCredentialsFromUrlIfNeeded(): Promise<void> {
16
27
  const url = process.env.OBS_CREDENTIALS_URL;
17
- const hasAccessKey = process.env.OBS_ACCESS_KEY;
18
- const hasSecretKey = process.env.OBS_SECRET_KEY;
19
-
28
+ const hasAccessKey = getObsAccessKey();
29
+ const hasSecretKey = getObsSecretKey();
30
+
20
31
  if (!url || (hasAccessKey && hasSecretKey)) {
32
+ if (hasAccessKey && !process.env.OBS_ACCESS_KEY) process.env.OBS_ACCESS_KEY = getObsAccessKey();
33
+ if (hasSecretKey && !process.env.OBS_SECRET_KEY) process.env.OBS_SECRET_KEY = getObsSecretKey();
21
34
  return;
22
35
  }
23
36
 
24
- const res = await fetch(url);
25
-
37
+ const controller = new AbortController();
38
+ const timeoutId = setTimeout(() => controller.abort(), FETCH_TIMEOUT_MS);
39
+ let res: Response;
40
+ try {
41
+ res = await fetch(url, { signal: controller.signal });
42
+ } catch (err: any) {
43
+ clearTimeout(timeoutId);
44
+ const msg =
45
+ err?.name === 'AbortError'
46
+ ? `拉取 OBS 凭证超时 (${FETCH_TIMEOUT_MS}ms): ${url}。若在 Jenkins/CI 中无法访问该地址,请直接配置环境变量 OBS_ACCESS_KEY 和 OBS_SECRET_KEY。`
47
+ : `拉取 OBS 凭证失败: ${err?.message ?? err}。若在 Jenkins/CI 中无法访问该地址,请直接配置环境变量 OBS_ACCESS_KEY 和 OBS_SECRET_KEY。`;
48
+ throw new Error(msg);
49
+ }
50
+ clearTimeout(timeoutId);
51
+
26
52
  if (!res.ok) {
27
53
  throw new Error(`拉取 OBS 凭证失败 (${res.status}): ${url}`);
28
54
  }
@@ -30,17 +56,17 @@ export async function loadObsCredentialsFromUrlIfNeeded(): Promise<void> {
30
56
  const parsed = yaml.load(text) as Record<string, unknown> | undefined;
31
57
  if (!parsed || typeof parsed !== 'object') {
32
58
  throw new Error(
33
- `OBS 凭证 YAML 解析结果无效,请检查 ${CREDENTIALS_URL_KEY} 返回内容`
59
+ `OBS 凭证 YAML 解析结果无效,请检查 ${CREDENTIALS_URL_KEY} 返回内容`,
34
60
  );
35
61
  }
36
62
  const accessKey = parsed.OBS_ACCESS_KEY;
37
63
  const secretKey = parsed.OBS_SECRET_KEY;
38
64
  if (typeof accessKey === 'string') process.env.OBS_ACCESS_KEY = accessKey;
39
65
  if (typeof secretKey === 'string') process.env.OBS_SECRET_KEY = secretKey;
40
-
66
+
41
67
  if (!process.env.OBS_ACCESS_KEY || !process.env.OBS_SECRET_KEY) {
42
68
  throw new Error(
43
- `OBS 凭证 YAML 中未找到 OBS_ACCESS_KEY 或 OBS_SECRET_KEY,请检查 ${CREDENTIALS_URL_KEY} 返回内容`
69
+ `OBS 凭证 YAML 中未找到 OBS_ACCESS_KEY 或 OBS_SECRET_KEY,请检查 ${CREDENTIALS_URL_KEY} 返回内容`,
44
70
  );
45
71
  }
46
72
  }