picgo-plugin-s3 1.2.2 → 1.2.4

package/.eslintrc

@@ -5,7 +5,10 @@
     "plugin:@typescript-eslint/recommended",
     "prettier"
   ],
-  "plugins": ["prettier", "@typescript-eslint"],
+  "plugins": [
+    "prettier",
+    "@typescript-eslint"
+  ],
   "env": {
     "es6": true,
     "node": true

package/README.md

@@ -27,6 +27,7 @@ picgo set uploader aws-s3
 | `uploadPath`         | 上传路径                                                                | `{year}/{month}/{fullName}`                              |
 | `urlPrefix`          | 最终生成图片 URL 的自定义前缀                                           | `https://img.example.com/my-blog/`                       |
 | `endpoint`           | 指定自定义终端节点                                                      | `s3.us-west-2.amazonaws.com`                             |
+| `proxy`              | 代理地址                                                                | 支持http代理，例如 `http://127.0.0.1:1080`               |
 | `region`             | 指定执行服务请求的区域                                                  | `us-west-1`                                              |
 | `pathStyleAccess`    | 是否启用 S3 Path style                                                  | 默认为 `false`，使用 minio 请设置为 `true`               |
 | `rejectUnauthorized` | 是否拒绝无效 TLS 证书连接                                               | 默认为 `true`，如上传失败日志显示证书问题可设置为`false` |

package/dist/config.d.ts

@@ -5,6 +5,7 @@ export interface IS3UserConfig {
     uploadPath: string;
     region?: string;
     endpoint?: string;
+    proxy?: string;
     urlPrefix?: string;
     pathStyleAccess?: boolean;
     rejectUnauthorized?: boolean;

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import picgo from "picgo";
-declare const _default: (ctx: picgo) => {
+import { PicGo } from "picgo";
+declare const _default: (ctx: PicGo) => {
     register: () => void;
 };
 export = _default;

package/dist/index.js

@@ -63,6 +63,14 @@ module.exports = (ctx) => {
                 required: false,
                 alias: "自定义节点",
             },
+            {
+                name: "proxy",
+                type: "input",
+                default: userConfig.proxy,
+                required: false,
+                alias: "代理",
+                message: "http://127.0.0.1:1080",
+            },
             {
                 name: "urlPrefix",
                 type: "input",

package/dist/uploader.d.ts

@@ -1,5 +1,5 @@
 import { S3 } from "aws-sdk";
-import { IImgInfo } from "picgo/dist/src/types";
+import { IImgInfo } from "picgo";
 import { IS3UserConfig } from "./config";
 export interface IUploadResult {
     url: string;

package/dist/uploader.js

@@ -15,7 +15,6 @@ function createS3Client(opts) {
     catch (_a) {
         // eslint-disable-next-line no-empty
     }
-    const http = sslEnabled ? require("https") : require("http");
     const s3 = new aws_sdk_1.S3({
         region: opts.region,
         endpoint: opts.endpoint,
@@ -25,9 +24,7 @@ function createS3Client(opts) {
         s3BucketEndpoint: opts.bucketEndpoint,
         sslEnabled: sslEnabled,
         httpOptions: {
-            agent: new http.Agent({
-                rejectUnauthorized: opts.rejectUnauthorized,
-            }),
+            agent: (0, utils_1.getProxyAgent)(opts.proxy, sslEnabled, opts.rejectUnauthorized),
         },
     });
     return s3;

package/dist/utils.d.ts

@@ -1,8 +1,10 @@
 /// <reference types="node" />
-import { IImgInfo } from "picgo/dist/src/types";
+import { IImgInfo } from "picgo";
+import { HttpsProxyAgent, HttpProxyAgent } from "hpagent";
 export declare function formatPath(info: IImgInfo, format?: string): string;
 export declare function extractInfo(info: IImgInfo): Promise<{
     body?: Buffer;
     contentType?: string;
     contentEncoding?: string;
 }>;
+export declare function getProxyAgent(proxy: string | undefined, sslEnabled: boolean, rejectUnauthorized: boolean): HttpProxyAgent | HttpsProxyAgent | undefined;

package/dist/utils.js

@@ -3,10 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractInfo = exports.formatPath = void 0;
+exports.getProxyAgent = exports.extractInfo = exports.formatPath = void 0;
 const crypto_1 = __importDefault(require("crypto"));
 const file_type_1 = __importDefault(require("file-type"));
 const mime_1 = __importDefault(require("mime"));
+const hpagent_1 = require("hpagent");
 class FileNameGenerator {
     constructor(info) {
         this.date = new Date();
@@ -37,6 +38,24 @@ class FileNameGenerator {
     md5() {
         return crypto_1.default.createHash("md5").update(this.imgBuffer()).digest("hex");
     }
+    md5B64() {
+        return crypto_1.default
+            .createHash("md5")
+            .update(this.imgBuffer())
+            .digest("base64")
+            .replace(/\+/g, "-")
+            .replace(/\//g, "_")
+            .replace(/=+$/, "");
+    }
+    md5B64Short() {
+        return crypto_1.default
+            .createHash("md5")
+            .update(this.imgBuffer())
+            .digest("base64")
+            .replace(/\+/g, "-")
+            .replace(/\//g, "_")
+            .slice(0, 7);
+    }
     sha1() {
         return crypto_1.default.createHash("sha1").update(this.imgBuffer()).digest("hex");
     }
@@ -55,6 +74,8 @@ FileNameGenerator.fields = [
     "fileName",
     "extName",
     "md5",
+    "md5B64",
+    "md5B64Short",
     "sha1",
     "sha256",
 ];
@@ -94,3 +115,34 @@ async function extractInfo(info) {
     return result;
 }
 exports.extractInfo = extractInfo;
+function formatHttpProxyURL(url = "") {
+    if (!url)
+        return "";
+    if (!/^https?:\/\//.test(url)) {
+        const [host, port] = url.split(":");
+        return `http://${host.replace("127.0.0.1", "localhost")}:${port}`;
+    }
+    try {
+        const { protocol, hostname, port } = new URL(url);
+        return `${protocol}//${hostname.replace("127.0.0.1", "localhost")}:${port}`;
+    }
+    catch (e) {
+        return "";
+    }
+}
+function getProxyAgent(proxy, sslEnabled, rejectUnauthorized) {
+    const formatedProxy = formatHttpProxyURL(proxy);
+    if (!formatedProxy) {
+        return undefined;
+    }
+    const Agent = sslEnabled ? hpagent_1.HttpsProxyAgent : hpagent_1.HttpProxyAgent;
+    const options = {
+        keepAlive: true,
+        keepAliveMsecs: 1000,
+        scheduling: "lifo",
+        rejectUnauthorized,
+        proxy: formatedProxy,
+    };
+    return new Agent(options);
+}
+exports.getProxyAgent = getProxyAgent;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "picgo-plugin-s3",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "description": "picgo amazon s3 uploader",
   "main": "dist/index.js",
   "publishConfig": {
@@ -27,19 +27,21 @@
   "author": "WayJam So",
   "license": "MIT",
   "devDependencies": {
+    "@types/mime": "^3.0.1",
     "@types/node": "^18.7.23",
     "@typescript-eslint/eslint-plugin": "^5.38.1",
     "@typescript-eslint/parser": "^5.38.1",
     "eslint": "^8.25.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "picgo": "^1.4.0 >1.4.16",
+    "picgo": "^1.5.0",
     "prettier": "^2.7.1",
     "typescript": "^4.8.4"
   },
   "dependencies": {
     "aws-sdk": "^2.839.0",
     "file-type": "^16.2.0",
+    "hpagent": "^1.2.0",
     "mime": "^2.5.2"
   }
 }