picgo-plugin-s3 1.3.1 → 1.3.3

package/README.md

@@ -32,6 +32,7 @@ picgo set uploader aws-s3
 | `pathStyleAccess`    | 是否启用 S3 Path style                                                  | 默认为 `false`，使用 minio 请设置为 `true` (e.g., https://s3.amazonaws.com/<bucketName>/<key> instead of https://<bucketName>.s3.amazonaws.com/<key>)              |
 | `rejectUnauthorized` | 是否拒绝无效 TLS 证书连接                                               | 默认为 `true`，如上传失败日志显示证书问题可设置为`false` |
 | `acl`                | 访问控制列表，上传资源的访问策略                                        | 默认为 `public-read`, AWS 可选 `private"|"public-read"|"public-read-write"|"authenticated-read"|"aws-exec-read"|"bucket-owner-read"|"bucket-owner-full-control`                                     |
+| `disableBucketPrefixToURL`  | 开启 `pathStyleAccess` 时，是否要禁用最终生成URL中添加 bucket 前缀   | 默认为 `false`  |
 
 **上传路径支持 payload：**
 

package/dist/config.d.ts

@@ -10,4 +10,5 @@ export interface IS3UserConfig {
     pathStyleAccess?: boolean;
     rejectUnauthorized?: boolean;
     acl?: string;
+    disableBucketPrefixToURL?: boolean;
 }

package/dist/index.js

@@ -39,7 +39,7 @@ module.exports = (ctx) => {
                 type: "input",
                 default: userConfig.bucketName,
                 required: true,
-                alias: "桶",
+                alias: "桶名",
             },
             {
                 name: "uploadPath",
@@ -82,9 +82,9 @@ module.exports = (ctx) => {
                 name: "pathStyleAccess",
                 type: "confirm",
                 default: userConfig.pathStyleAccess || false,
-                message: "enable path-style-access or not",
+                message: "enable s3ForcePathStyle or not",
                 required: false,
-                alias: "PathStyleAccess",
+                alias: "ForcePathStyle",
             },
             {
                 name: "rejectUnauthorized",
@@ -92,7 +92,7 @@ module.exports = (ctx) => {
                 default: userConfig.rejectUnauthorized || true,
                 message: "是否拒绝无效TLS证书连接",
                 required: false,
-                alias: "rejectUnauthorized",
+                alias: "拒绝无效TLS证书连接",
             },
             {
                 name: "acl",
@@ -102,6 +102,14 @@ module.exports = (ctx) => {
                 required: false,
                 alias: "ACL 访问控制列表",
             },
+            {
+                name: "disableBucketPrefixToURL",
+                type: "input",
+                default: userConfig.disableBucketPrefixToURL || false,
+                message: "开启 `pathStyleAccess` 时，是否要禁用最终生成URL中添加 bucket 前缀",
+                required: false,
+                alias: "Bucket 前缀",
+            },
         ];
     };
     const handle = async (ctx) => {
@@ -111,7 +119,7 @@ module.exports = (ctx) => {
         }
         if (userConfig.urlPrefix) {
             userConfig.urlPrefix = userConfig.urlPrefix.replace(/\/?$/, "");
-            if (userConfig.pathStyleAccess) {
+            if (userConfig.pathStyleAccess && !userConfig.disableBucketPrefixToURL) {
                 userConfig.urlPrefix += "/" + userConfig.bucketName;
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "picgo-plugin-s3",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "description": "picgo amazon s3 uploader",
   "main": "dist/index.js",
   "publishConfig": {
@@ -12,9 +12,10 @@
     "build": "tsc -p .",
     "dev": "tsc -w -p .",
     "pub": "rm -rf dist/* && npm build && npm publish",
-    "patch": "npm version patch -m 'bump version into v%s' && git push origin main && git push origin --tags",
-    "minor": "npm version minor -m 'bump version into v%s' && git push origin main && git push origin --tags",
-    "major": "npm version major -m 'bump version into v%s' && git push origin main && git push origin --tags"
+    "push": "git push origin main && git push origin --tags",
+    "patch": "npm version patch -m 'bump version into v%s'",
+    "minor": "npm version minor -m 'bump version into v%s'",
+    "major": "npm version major -m 'bump version into v%s'"
   },
   "keywords": [
     "amazon-s3",
@@ -34,16 +35,17 @@
     "eslint": "^8.25.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "picgo": "^1.5.0",
     "prettier": "^2.7.1",
     "typescript": "^4.8.4"
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.304.0",
     "@aws-sdk/lib-storage": "^3.304.0",
+    "@aws-sdk/node-http-handler": "^3.360.0",
     "@aws-sdk/s3-request-presigner": "^3.305.0",
     "file-type": "^16.2.0",
     "hpagent": "^1.2.0",
-    "mime": "^2.5.2"
+    "mime": "^2.5.2",
+    "picgo": "^1.5.3"
   }
 }