universal-picgo 1.8.0 → 1.10.0

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "universal-picgo",
-  "version": "1.8.0",
+  "version": "1.10.0",
   "type": "module",
   "description": "picgo lib for node, browser and electron",
   "main": "./dist/index.js",
@@ -27,19 +27,28 @@
   "devDependencies": {
     "@terwer/eslint-config-custom": "^1.3.6",
     "@terwer/vite-config-custom": "^0.7.6",
+    "@types/mime": "^3.0.4",
     "@types/mime-types": "^2.1.4",
     "vite-plugin-node-polyfills": "^0.21.0"
   },
   "dependencies": {
+    "@aws-sdk/client-s3": "^3.421.0",
+    "@aws-sdk/s3-request-presigner": "^3.421.0",
+    "@smithy/types": "^2.12.0",
+    "@smithy/protocol-http": "^3.3.0",
+    "@smithy/querystring-builder": "^2.2.0",
+    "@smithy/fetch-http-handler": "^2.5.0",
     "@picgo/i18n": "^1.0.0",
     "ali-oss": "^6.20.0",
     "axios": "^1.6.8",
     "dayjs": "^1.11.10",
     "js-yaml": "^4.1.0",
+    "mime": "^2.5.2",
     "mime-types": "^2.1.35",
     "queue": "^7.0.0",
     "universal-picgo-store": "workspace:*",
-    "zhi-lib-base": "^0.8.0"
+    "zhi-lib-base": "^0.8.0",
+    "file-type": "^16.2.0"
   },
   "publishConfig": {
     "access": "public"

package/dist/src/i18n/zh-CN.d.ts

@@ -92,6 +92,29 @@ export declare const ZH_CN: {
     PICBED_UPYUN_MESSAGE_URL: string;
     PICBED_UPYUN_MESSAGE_OPTIONS: string;
     PICBED_UPYUN_MESSAGE_PATH: string;
+    PICBED_AWSS3PLIST: string;
+    PICBED_AWSS3PLIST_ACCESSKEYID: string;
+    PICBED_AWSS3PLIST_SECRET_ACCESSKEY: string;
+    PICBED_AWSS3PLIST_BUCKET: string;
+    PICBED_AWSS3PLIST_REGION: string;
+    PICBED_AWSS3PLIST_UPLOADPATH: string;
+    PICBED_AWSS3PLIST_ENDPOINT: string;
+    PICBED_AWSS3PLIST_CUSTOM_URL: string;
+    PICBED_AWSS3PLIST_PATHSTYLEACCESS: string;
+    PICBED_AWSS3PLIST_REJECTUNAUTHORIZED: string;
+    PICBED_AWSS3PLIST_ACL: string;
+    PICBED_AWSS3PLIST_CORS_PROXY: string;
+    PICBED_AWSS3PLIST_MESSAGE_ACCESSKEYID: string;
+    PICBED_AWSS3PLIST_MESSAGE_SECRET_ACCESSKEY: string;
+    PICBED_AWSS3PLIST_MESSAGE_BUCKET: string;
+    PICBED_AWSS3PLIST_MESSAGE_REGION: string;
+    PICBED_AWSS3PLIST_MESSAGE_UPLOADPATH: string;
+    PICBED_AWSS3PLIST_MESSAGE_ENDPOINT: string;
+    PICBED_AWSS3PLIST_MESSAGE_CUSTOM_URL: string;
+    PICBED_AWSS3PLIST_MESSAGE_PATHSTYLEACCESS: string;
+    PICBED_AWSS3PLIST_MESSAGE_REJECTUNAUTHORIZED: string;
+    PICBED_AWSS3PLIST_MESSAGE_ACL: string;
+    PICBED_AWSS3PLIST_MESSAGE_CORS_PROXY: string;
     PLUGIN_HANDLER_PLUGIN_INSTALL_SUCCESS: string;
     PLUGIN_HANDLER_PLUGIN_INSTALL_FAILED: string;
     PLUGIN_HANDLER_PLUGIN_INSTALL_FAILED_REASON: string;

package/dist/src/plugins/uploader/awss3.d.ts

@@ -0,0 +1,3 @@
+import { IPicGo } from '../../types';
+
+export default function register(ctx: IPicGo): void;

package/dist/src/plugins/uploader/s3/uploader.d.ts

@@ -0,0 +1,30 @@
+import { IAwsS3Config, IImgInfo, IPicGo } from '../../../types';
+import { S3Client } from '@aws-sdk/client-s3';
+
+export interface IUploadResult {
+    index: number;
+    key: string;
+    url: string;
+    imgURL: string;
+    versionId?: string;
+    eTag?: string;
+}
+declare function createS3Client(ctx: IPicGo, opts: IAwsS3Config): S3Client;
+interface createUploadTaskOpts {
+    client: S3Client;
+    bucketName: string;
+    path: string;
+    item: IImgInfo;
+    index: number;
+    acl: string;
+    customUrl?: string;
+    corsProxy?: boolean;
+}
+declare function createUploadTask(opts: createUploadTaskOpts): Promise<IUploadResult>;
+declare function getFileURL(opts: createUploadTaskOpts, eTag: string, versionId: string): Promise<string>;
+declare const _default: {
+    createS3Client: typeof createS3Client;
+    createUploadTask: typeof createUploadTask;
+    getFileURL: typeof getFileURL;
+};
+export default _default;

package/dist/src/plugins/uploader/s3/utils.d.ts

@@ -0,0 +1,8 @@
+import { IImgInfo } from '../../../types';
+
+export declare function formatPath(info: IImgInfo, format?: string): string;
+export declare function extractInfo(info: IImgInfo): Promise<{
+    body?: Buffer;
+    contentType?: string;
+    contentEncoding?: string;
+}>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "universal-picgo",
-  "version": "1.8.0",
+  "version": "1.10.0",
   "type": "module",
   "description": "picgo lib for node, browser and electron",
   "main": "./dist/index.js",
@@ -20,19 +20,28 @@
   "devDependencies": {
     "@terwer/eslint-config-custom": "^1.3.6",
     "@terwer/vite-config-custom": "^0.7.6",
+    "@types/mime": "^3.0.4",
     "@types/mime-types": "^2.1.4",
     "vite-plugin-node-polyfills": "^0.21.0"
   },
   "dependencies": {
+    "@aws-sdk/client-s3": "^3.421.0",
+    "@aws-sdk/s3-request-presigner": "^3.421.0",
+    "@smithy/types": "^2.12.0",
+    "@smithy/protocol-http": "^3.3.0",
+    "@smithy/querystring-builder": "^2.2.0",
+    "@smithy/fetch-http-handler": "^2.5.0",
     "@picgo/i18n": "^1.0.0",
     "ali-oss": "^6.20.0",
     "axios": "^1.6.8",
     "dayjs": "^1.11.10",
     "js-yaml": "^4.1.0",
+    "mime": "^2.5.2",
     "mime-types": "^2.1.35",
     "queue": "^7.0.0",
     "zhi-lib-base": "^0.8.0",
-    "universal-picgo-store": "1.8.0"
+    "file-type": "^16.2.0",
+    "universal-picgo-store": "1.10.0"
   },
   "publishConfig": {
     "access": "public"

package/dist/src/utils/cmd/index.d.ts

@@ -1,37 +0,0 @@
-/**
- * 使用 Electron 自有的环境执行命令
- */
-declare class ElectronCmd {
-    /**
-     * 使用 Electron 自带的 node 运行命令
-     *
-     * https://github.com/UniBO-PRISMLab/wam/issues/26#issuecomment-1456204046
-     * https://github.com/nodejs/help/issues/3885
-     * https://github.com/npm/pacote
-     *
-     * 示例：
-     * ```
-     * await ElectronCmd.executeCommandWithBundledNode("./node_modules/.bin/next", ["-v"], "/Users/terwer/Downloads/n")
-     *
-     * const command = "/Users/terwer/Documents/mydocs/siyuan-plugins/siyuan-plugin-local-service/public/setup.cjs"
-     * const args = []
-     * const cwd = undefined
-     * const result = await ElectronCmd.executeCommandWithBundledNodeAsync(command, args, cwd)
-     * if (result.status) {
-     *   console.log("命令执行成功！😄")
-     * } else {
-     *   console.error("命令执行失败😭: ", result.msg)
-     * }
-     * ```
-     *
-     * @param command - 命令
-     * @param args - 参数
-     * @param cwd - 运行目录，默认 process.cwd
-     */
-    static executeCommandWithBundledNodeAsync(command: string, args?: string[], cwd?: string): Promise<{
-        status: boolean;
-        code: number;
-        msg: string;
-    }>;
-}
-export { ElectronCmd };

package/dist/src/utils/eventBus.d.ts

@@ -1,4 +0,0 @@
-import { EventEmitter } from './nodePolyfill';
-
-declare const eventBus: EventEmitter<[never]>;
-export { eventBus };