✨ Feature: s3-compatible storage is supported now

src/renderer/manage/utils/common.ts

@@ -89,13 +89,10 @@ export function formatFileName (fileName: string) {
   return name.length > 20 ? `${name.slice(0, 20)}...${ext}` : fileName
 }
 
-export function getExtension (fileName: string) {
-  return path.extname(fileName).slice(1)
-}
+export const getExtension = (fileName: string) => path.extname(fileName).slice(1)
 
-export function isImage (fileName: string) {
-  return ['jpg', 'jpeg', 'png', 'gif', 'webp', 'bmp', 'ico'].includes(getExtension(fileName))
-}
+export const isImage = (fileName: string) =>
+  ['jpg', 'jpeg', 'png', 'gif', 'webp', 'bmp', 'ico'].includes(getExtension(fileName))
 
 export function formObjToTableData (obj: any) {
   const exclude = [undefined, null, '', 'transformedConfig']
@@ -126,21 +123,23 @@ export interface IHTTPProxy {
 
 export const formatHttpProxy = (proxy: string | undefined, type: 'object' | 'string'): IHTTPProxy | undefined | string => {
   if (proxy === undefined || proxy === '') return undefined
-  if (proxy.startsWith('http://') || proxy.startsWith('https://')) {
+  if (/^https?:\/\//.test(proxy)) {
     const { protocol, hostname, port } = new URL(proxy)
-    if (type === 'string') return `${protocol}//${hostname}:${port}`
-    return {
-      host: hostname,
-      port: Number(port),
-      protocol: protocol.slice(0, -1)
-    }
+    return type === 'string'
+      ? `${protocol}//${hostname}:${port}`
+      : {
+        host: hostname,
+        port: Number(port),
+        protocol: protocol.slice(0, -1)
+      }
   } else {
     const [host, port] = proxy.split(':')
-    if (type === 'string') return `http://${host}:${port}`
-    return {
-      host,
-      port: port ? Number(port) : 80,
-      protocol: 'http'
-    }
+    return type === 'string'
+      ? `http://${host}:${port}`
+      : {
+        host,
+        port: port ? Number(port) : 80,
+        protocol: 'http'
+      }
   }
 }

src/renderer/manage/utils/constants.ts

@@ -51,6 +51,13 @@ const aliasRule = [
   }
 ]
 
+const aliasTooltip = '配置别名只能包含中文、英文、数字和下划线，且不能超过15个字符'
+const itemsPerPageTooltip = '每页显示数量必须在20-1000之间'
+const pagingTooltip = '关闭分页时，目录列表将使用数据库缓存以优化性能'
+const bucketNameTooltip = '英文逗号分隔，如：bucket1,bucket2,bucket3，和起始目录顺序一一对应'
+const baseDirTooltip = '英文逗号分隔，如：/dir1,/dir2,/dir3，和存储桶顺序一一对应'
+const isAutoCustomUrlTooltip = '开启时，将自动获取存储桶绑定的域名，关闭时可手动填写域名'
+
 export const supportedPicBedList: IStringKeyMap = {
   smms: {
     name: 'SM.MS',
@@ -62,7 +69,8 @@ export const supportedPicBedList: IStringKeyMap = {
         placeholder: '该配置的唯一标识',
         type: 'string',
         rule: aliasRule,
-        default: 'smms-A'
+        default: 'smms-A',
+        tooltip: aliasTooltip
       },
       token: {
         required: true,
@@ -75,7 +83,8 @@ export const supportedPicBedList: IStringKeyMap = {
         required: true,
         description: '是否分页',
         default: true,
-        type: 'boolean'
+        type: 'boolean',
+        tooltip: pagingTooltip
       }
     },
     explain: '大陆地区请访问备用域名https://smms.app, 请勿大批量上传图片，否则API接口会被限制',
@@ -93,7 +102,8 @@ export const supportedPicBedList: IStringKeyMap = {
         placeholder: '该配置的唯一标识',
         type: 'string',
         rule: aliasRule,
-        default: 'qiniu-A'
+        default: 'qiniu-A',
+        tooltip: aliasTooltip
       },
       accessKey: {
         required: true,
@@ -113,31 +123,42 @@ export const supportedPicBedList: IStringKeyMap = {
         required: false,
         description: '空间名-可选',
         placeholder: '英文逗号分隔，例如：bucket1,bucket2',
-        type: 'string'
+        type: 'string',
+        tooltip: bucketNameTooltip
       },
       baseDir: {
         required: false,
         description: '起始目录-可选',
         placeholder: '英文逗号分隔，例如：/test1,/test2',
         default: '/',
-        type: 'string'
+        type: 'string',
+        tooltip: baseDirTooltip
+      },
+      isAutoCustomUrl: {
+        required: true,
+        description: '是否自动获取绑定域名',
+        default: true,
+        type: 'boolean',
+        tooltip: isAutoCustomUrlTooltip
       },
       paging: {
         required: true,
         description: '是否分页',
         default: true,
-        type: 'boolean'
+        type: 'boolean',
+        tooltip: pagingTooltip
       },
       itemsPerPage: {
         required: true,
         description: '每页显示数量',
         default: 50,
         type: 'number',
-        rule: itemsPerPageRule
+        rule: itemsPerPageRule,
+        tooltip: itemsPerPageTooltip
       }
     },
     explain: '空间名和起始目录配置时可通过英文逗号分隔不同存储桶的设置，顺序必须一致，逗号间留空或缺失项使用默认值',
-    options: ['alias', 'accessKey', 'secretKey', 'bucketName', 'baseDir', 'paging', 'itemsPerPage'],
+    options: ['alias', 'accessKey', 'secretKey', 'bucketName', 'baseDir', 'isAutoCustomUrl', 'paging', 'itemsPerPage'],
     refLink: 'https://pichoro.horosama.com/#/PicHoroDocs/configure?id=%e5%8f%82%e6%95%b0%e8%af%b4%e6%98%8e-3',
     referenceText: '配置教程请参考：'
   },
@@ -151,14 +172,16 @@ export const supportedPicBedList: IStringKeyMap = {
         placeholder: '该配置的唯一标识',
         type: 'string',
         rule: aliasRule,
-        default: 'github-A'
+        default: 'github-A',
+        tooltip: aliasTooltip
       },
       token: {
         required: true,
         description: 'token-必需',
         placeholder: '请输入token',
         type: 'string',
-        rule: defaultBaseRule('token')
+        rule: defaultBaseRule('token'),
+        tooltip: '请提供具有完整repo权限的token，否则部分功能可能无法使用'
       },
       githubUsername: {
         required: true,
@@ -171,19 +194,22 @@ export const supportedPicBedList: IStringKeyMap = {
         required: false,
         description: '代理-可选',
         placeholder: '例如：http://127.0.0.1:1080',
-        type: 'string'
+        type: 'string',
+        tooltip: '如果您的网络环境需要使用代理才能访问GitHub，请在此处填写代理地址'
       },
       paging: {
         required: true,
         description: '是否分页',
         default: false,
-        type: 'boolean'
+        type: 'boolean',
+        tooltip: pagingTooltip
       },
       customUrl: {
         required: false,
-        description: 'CDN加速域名-可选；例如: https://cdn.staticaly.com/gh/{username}/{repo}@{branch}/{path}',
+        description: 'CDN加速域名-可选',
         placeholder: '支持使用{username}、{repo}、{branch}和{path}作为替换占位符，用于适配不同仓库和分支',
         type: 'string',
+        tooltip: '例如: https://cdn.staticaly.com/gh/{username}/{repo}@{branch}/{path}',
         rule: [
           {
             validator: (_rule: any, value: any, callback: any) => {
@@ -251,7 +277,8 @@ export const supportedPicBedList: IStringKeyMap = {
         placeholder: '该配置的唯一标识',
         type: 'string',
         rule: aliasRule,
-        default: 'aliyun-A'
+        default: 'aliyun-A',
+        tooltip: aliasTooltip
       },
       accessKeyId: {
         required: true,
@@ -271,31 +298,42 @@ export const supportedPicBedList: IStringKeyMap = {
         required: false,
         description: '存储桶名-可选',
         placeholder: '英文逗号分隔，例如：bucket1,bucket2',
-        type: 'string'
+        type: 'string',
+        tooltip: bucketNameTooltip
       },
       baseDir: {
         required: false,
         description: '起始目录-可选',
         placeholder: '英文逗号分隔，例如：/test1,/test2',
         type: 'string',
-        default: '/'
+        default: '/',
+        tooltip: baseDirTooltip
+      },
+      isAutoCustomUrl: {
+        required: true,
+        description: '是否自动获取绑定域名',
+        default: true,
+        type: 'boolean',
+        tooltip: isAutoCustomUrlTooltip
       },
       paging: {
         required: true,
         description: '是否分页',
         default: true,
-        type: 'boolean'
+        type: 'boolean',
+        tooltip: pagingTooltip
       },
       itemsPerPage: {
         required: true,
         description: '每页显示数量',
         default: 50,
         type: 'number',
-        rule: itemsPerPageRule
+        rule: itemsPerPageRule,
+        tooltip: itemsPerPageTooltip
       }
     },
     explain: '存储桶名和起始目录配置时可通过英文逗号分隔不同存储桶的设置，顺序必须一致，逗号间留空或缺失项使用默认值',
-    options: ['alias', 'accessKeyId', 'accessKeySecret', 'bucketName', 'baseDir', 'paging', 'itemsPerPage'],
+    options: ['alias', 'accessKeyId', 'accessKeySecret', 'bucketName', 'baseDir', 'isAutoCustomUrl', 'paging', 'itemsPerPage'],
     refLink: 'https://pichoro.horosama.com/#/PicHoroDocs/configure?id=%e5%8f%82%e6%95%b0%e8%af%b4%e6%98%8e-1',
     referenceText: '配置教程请参考：'
   },
@@ -309,7 +347,8 @@ export const supportedPicBedList: IStringKeyMap = {
         placeholder: '该配置的唯一标识',
         type: 'string',
         rule: aliasRule,
-        default: 'tcyun-A'
+        default: 'tcyun-A',
+        tooltip: aliasTooltip
       },
       secretId: {
         required: true,
@@ -330,37 +369,49 @@ export const supportedPicBedList: IStringKeyMap = {
         description: 'appId-必需',
         placeholder: '请输入appId',
         type: 'string',
-        rule: defaultBaseRule('appId')
+        rule: defaultBaseRule('appId'),
+        tooltip: '例如：1250000000'
       },
       bucketName: {
         required: false,
         description: '存储桶名-可选(注意包含AppId)',
         placeholder: '英文逗号分隔，例如：bucket1-1250000000,bucket2-1250000000',
-        type: 'string'
+        type: 'string',
+        tooltip: bucketNameTooltip
       },
       baseDir: {
         required: false,
         description: '起始目录-可选',
         placeholder: '英文逗号分隔，例如：/test1,/test2',
         type: 'string',
-        default: '/'
+        default: '/',
+        tooltip: baseDirTooltip
+      },
+      isAutoCustomUrl: {
+        required: true,
+        description: '是否自动获取绑定域名',
+        default: true,
+        type: 'boolean',
+        tooltip: isAutoCustomUrlTooltip
       },
       paging: {
         required: true,
         description: '是否分页',
         default: true,
-        type: 'boolean'
+        type: 'boolean',
+        tooltip: pagingTooltip
       },
       itemsPerPage: {
         required: true,
         description: '每页显示数量',
         default: 50,
         type: 'number',
-        rule: itemsPerPageRule
+        rule: itemsPerPageRule,
+        tooltip: itemsPerPageTooltip
       }
     },
     explain: '存储桶名和起始目录配置时可通过英文逗号分隔不同存储桶的设置，顺序必须一致，逗号间留空或缺失项使用默认值',
-    options: ['alias', 'secretId', 'secretKey', 'appId', 'bucketName', 'baseDir', 'paging', 'itemsPerPage'],
+    options: ['alias', 'secretId', 'secretKey', 'appId', 'bucketName', 'baseDir', 'isAutoCustomUrl', 'paging', 'itemsPerPage'],
     refLink: 'https://pichoro.horosama.com/#/PicHoroDocs/configure?id=%e5%8f%82%e6%95%b0%e8%af%b4%e6%98%8e-2',
     referenceText: '配置教程请参考：'
   },
@@ -374,7 +425,8 @@ export const supportedPicBedList: IStringKeyMap = {
         placeholder: '该配置的唯一标识',
         type: 'string',
         rule: aliasRule,
-        default: 'upyun-A'
+        default: 'upyun-A',
+        tooltip: aliasTooltip
       },
       bucketName: {
         required: true,
@@ -445,14 +497,16 @@ export const supportedPicBedList: IStringKeyMap = {
         required: true,
         description: '是否分页',
         default: true,
-        type: 'boolean'
+        type: 'boolean',
+        tooltip: pagingTooltip
       },
       itemsPerPage: {
         required: true,
         description: '每页显示数量',
         default: 50,
         type: 'number',
-        rule: itemsPerPageRule
+        rule: itemsPerPageRule,
+        tooltip: itemsPerPageTooltip
       }
     },
     explain: '又拍云图床务必填写加速域名，否则无法正常使用',
@@ -481,21 +535,131 @@ export const supportedPicBedList: IStringKeyMap = {
       },
       accessToken: {
         required: true,
-        description: 'accessToken-必需(不是clientID,请参考配置教程)',
+        description: 'accessToken-必需',
         placeholder: '请输入accessToken',
         type: 'string',
-        rule: defaultBaseRule('accessToken')
+        rule: defaultBaseRule('accessToken'),
+        tooltip: '不是clientID,请参考配置教程'
       },
       proxy: {
         required: false,
         description: '代理-可选',
         placeholder: '例如：http://127.0.0.1:1080',
-        type: 'string'
+        type: 'string',
+        tooltip: '大陆地区请使用代理，否则无法正常使用'
       }
     },
     explain: '大陆地区请使用代理，API调用存在限制，请注意使用频率',
     options: ['alias', 'imgurUserName', 'accessToken', 'proxy'],
     refLink: 'https://pichoro.horosama.com/#/PicHoroDocs/configure?id=imgur%e5%9b%be%e5%ba%8a-1',
     referenceText: '配置教程请参考：'
+  },
+  s3plist: {
+    name: 'S3兼容云',
+    icon: 's3plist',
+    configOptions: {
+      alias: {
+        required: true,
+        description: '配置别名-必需',
+        placeholder: '该配置的唯一标识',
+        type: 'string',
+        rule: aliasRule,
+        default: 's3plist-A',
+        tooltip: aliasTooltip
+      },
+      accessKeyId: {
+        required: true,
+        description: 'accessKeyId-必需',
+        placeholder: '请输入accessKeyId',
+        type: 'string',
+        rule: defaultBaseRule('accessKeyId')
+      },
+      secretAccessKey: {
+        required: true,
+        description: 'secretAccessKey-必需',
+        placeholder: '请输入secretAccessKey',
+        type: 'string',
+        rule: defaultBaseRule('secretAccessKey')
+      },
+      endpoint: {
+        required: false,
+        description: 'endpoint-可选',
+        placeholder: '例如：s3.us-east-1.amazonaws.com',
+        type: 'string',
+        tooltip: '如果不填写，默认访问 AWS S3，请提供根API endpoint'
+      },
+      sslEnabled: {
+        required: true,
+        description: '使用HTTPS连接',
+        default: true,
+        type: 'boolean',
+        tooltip: '大部分平台都支持HTTPS连接，如果您的平台不支持，请关闭该选项'
+      },
+      s3ForcePathStyle: {
+        required: true,
+        description: '启用 S3 Path style',
+        default: false,
+        type: 'boolean',
+        tooltip: '例如使用 minio 时需要启用'
+      },
+      proxy: {
+        required: false,
+        description: '代理-可选',
+        placeholder: '例如：http://127.0.0.1:1080',
+        type: 'string',
+        tooltip: '如果部分平台大陆地区无法访问，请使用代理'
+      },
+      aclForUpload: {
+        required: true,
+        description: '上传文件的权限',
+        rule: defaultBaseRule('aclForUpload'),
+        default: 'public-read',
+        type: 'select',
+        selectOptions: {
+          private: '私有',
+          'public-read': '公共读',
+          'public-read-write': '公共读写',
+          'authenticated-read': '授权读',
+          'bucket-owner-read': '桶所有者读',
+          'bucket-owner-full-control': '桶所有者完全控制',
+          'aws-exec-read': 'aws执行读'
+        },
+        tooltip: '上传文件的权限，可选值：private、public-read、public-read-write、authenticated-read、bucket-owner-read、bucket-owner-full-control、aws-exec-read'
+      },
+      bucketName: {
+        required: false,
+        description: '存储桶名-可选',
+        placeholder: '英文逗号分隔，例如：bucket1,bucket2',
+        type: 'string',
+        tooltip: bucketNameTooltip
+      },
+      baseDir: {
+        required: false,
+        description: '起始目录-可选',
+        placeholder: '英文逗号分隔，例如：/test1,/test2',
+        type: 'string',
+        default: '/',
+        tooltip: baseDirTooltip
+      },
+      paging: {
+        required: true,
+        description: '是否分页',
+        default: true,
+        type: 'boolean',
+        tooltip: pagingTooltip
+      },
+      itemsPerPage: {
+        required: true,
+        description: '每页显示数量',
+        default: 50,
+        type: 'number',
+        rule: itemsPerPageRule,
+        tooltip: itemsPerPageTooltip
+      }
+    },
+    explain: '存储桶名和起始目录配置时可通过英文逗号分隔不同存储桶的设置，顺序必须一致，逗号间留空或缺失项使用默认值',
+    options: ['alias', 'accessKeyId', 'secretAccessKey', 'endpoint', 'sslEnabled', 's3ForcePathStyle', 'proxy', 'aclForUpload', 'bucketName', 'baseDir', 'paging', 'itemsPerPage'],
+    refLink: 'https://github.com/wayjam/picgo-plugin-s3',
+    referenceText: '配置教程请参考：'
   }
 }