Merge pull request #332 from terwer/dev

feat: allow config timeout

README.md

@@ -1,15 +1,16 @@
 [中文](README_zh_CN.md)
 
+- SM.MS
 # PicGo Plugin
 
 ![](./preview.png)
 
 Your favorite PicGo image bed is still available in siyuan-notes, wuhu~
 
-> Important Note: 
-> 
-> Please refrain from updating this plugin for versions of siyuan-note prior to `3.0.3`; the highest permissible version remains `1.5.1`. For siyuan-note versions `3.0.3` and beyond, the PicGO plugin may be upgraded to `1.6.0+`. 
-> 
+> Important Note:
+>
+> Please refrain from updating this plugin for versions of siyuan-note prior to `3.0.3`; the highest permissible version remains `1.5.1`. For siyuan-note versions `3.0.3` and beyond, the PicGO plugin may be upgraded to `1.6.0+`.
+>
 > For versions of siyuan-note before `2.10.8`, it is advised not to upgrade this plugin beyond version `1.4.5`. Subsequent to siyuan-note `2.10.8`, the PicGO plugin can be updated to `1.5.0+`.
 
 ## Image Hosting Support
@@ -20,7 +21,6 @@ Your favorite PicGo image bed is still available in siyuan-notes, wuhu~
 - Tencent Cloud
 - Upyun
 - Qiniu Cloud
-- SM.MS
 - imgur
 
 ## Changelog

libs/Universal-PicGo-Core/custom.d.ts

@@ -3,6 +3,9 @@ declare module '*.json' {
   export default value
 }
 
+declare module '*raw'
+
 declare module "ali-oss"
 declare module "arraybuffer-to-buffer"
-declare module "upyun"
+declare module "upyun"
+declare module "js-yaml"

libs/zhi-siyuan-picgo/package.json

@@ -36,7 +36,7 @@
     "zhi-common": "^1.33.0",
     "zhi-device": "^2.11.0",
     "zhi-lib-base": "^0.8.0",
-    "zhi-siyuan-api": "^2.19.1"
+    "zhi-siyuan-api": "^2.20.0"
   },
   "publishConfig": {
     "access": "public"

libs/zhi-siyuan-picgo/src/index.ts

@@ -29,9 +29,10 @@ import { copyToClipboardInBrowser, generateUniqueName } from "./lib/utils/utils"
 import { ImageItem } from "./lib/models/ImageItem"
 import { ImageParser } from "./lib/parser/ImageParser"
 import { ParsedImage } from "./lib/models/ParsedImage"
+import { SIYUAN_PICGO_FILE_MAP_KEY } from "./lib/constants"
 
 export { SiyuanPicGo, SiyuanPicgoConfig, SiyuanPicgoPostApi, PicgoHelper }
-export { ImageItem, ImageParser, ParsedImage }
+export { ImageItem, ImageParser, ParsedImage, SIYUAN_PICGO_FILE_MAP_KEY }
 export { retrieveImageFromClipboardAsBlob, copyToClipboardInBrowser, calculateMD5, generateUniqueName }
 export { ConfigDb, PluginLoaderDb, ExternalPicgoConfigDb }
 export { PicgoTypeEnum }

libs/zhi-siyuan-picgo/src/lib/siyuanPicgoPostApi.ts

@@ -9,7 +9,7 @@
 
 import { ILogger, simpleLogger } from "zhi-lib-base"
 import { SiyuanPicGoUploadApi } from "./siyuanPicGoUploadApi"
-import { hasNodeEnv, IPicGo, isFileOrBlob, win } from "universal-picgo"
+import { hasNodeEnv, IImgInfo, IPicGo, isFileOrBlob, win } from "universal-picgo"
 import { ParsedImage } from "./models/ParsedImage"
 import { ImageItem } from "./models/ImageItem"
 import { SIYUAN_PICGO_FILE_MAP_KEY } from "./constants"
@@ -18,7 +18,6 @@ import { SiyuanConfig, SiyuanKernelApi } from "zhi-siyuan-api"
 import { ImageParser } from "./parser/ImageParser"
 import { PicgoPostResult } from "./models/PicgoPostResult"
 import { DeviceDetection, DeviceTypeEnum, SiyuanDevice } from "zhi-device"
-import { IImgInfo } from "universal-picgo/src"
 
 /**
  * Picgo与文章交互的通用方法

package.json

@@ -3,6 +3,7 @@
   "version": "1.6.0",
   "description": "picgo plugin for siyuan-note",
   "scripts": {
+    "clean": "./scripts/clean.sh",
     "serve": "turbo run serve",
     "dev": "turbo run dev",
     "build": "turbo run build",

packages/picgo-plugin-app/package.json

@@ -36,7 +36,7 @@
     "zhi-common": "^1.33.0",
     "zhi-device": "^2.11.0",
     "zhi-lib-base": "^0.8.0",
-    "zhi-siyuan-api": "^2.19.1",
+    "zhi-siyuan-api": "^2.20.0",
     "zhi-siyuan-picgo": "workspace:*"
   }
 }

packages/picgo-plugin-app/src/components/setting/PicgoSetting.vue

@@ -9,7 +9,7 @@
 
 <script setup lang="ts">
 import { useVueI18n } from "$composables/useVueI18n.ts"
-import { reactive } from "vue"
+import { onBeforeMount, reactive } from "vue"
 import { PicgoTypeEnum } from "zhi-siyuan-picgo"
 import { useExternalPicGoSetting } from "@/stores/useExternalPicGoSetting.ts"
 import { useBundledPicGoSetting } from "@/stores/useBundledPicGoSetting.ts"
@@ -28,23 +28,29 @@ const formData = reactive({
   picgoTypeList: [
     {
       value: PicgoTypeEnum.Bundled,
-      label: t("upload.adaptor.bundled")
+      label: t("upload.adaptor.bundled"),
     },
     {
       value: PicgoTypeEnum.App,
-      label: t("upload.adaptor.app")
-    }
+      label: t("upload.adaptor.app"),
+    },
     // {
     //   value: PicgoTypeEnum.Core,
     //   label: t("upload.adaptor.core"),
     // },
-  ]
+  ],
 })
 
 const handlePicgoTypeChange = (val: any) => {
   const isBundled = val === PicgoTypeEnum.Bundled
   externalPicGoSettingForm.value.useBundledPicgo = isBundled
 }
+
+onBeforeMount(() => {
+  // init siyuan related picgo config
+  bundledPicGoSettingForm.value.siyuan = bundledPicGoSettingForm.value.siyuan || {}
+  bundledPicGoSettingForm.value.siyuan.waitTimeout = bundledPicGoSettingForm.value.siyuan.waitTimeout || 10
+})
 </script>
 
 <template>
@@ -65,6 +71,14 @@ const handlePicgoTypeChange = (val: any) => {
       <div v-else>
         <external-picgo-setting :cfg="externalPicGoSettingForm" />
       </div>
+      <div>
+        <el-form-item :label="t('picgo.siyuan.wait.timeout')">
+          <el-input
+            v-model="bundledPicGoSettingForm.siyuan.waitTimeout"
+            :placeholder="t('picgo.siyuan.wait.timeout.tip')"
+          />
+        </el-form-item>
+      </div>
     </el-form>
   </back-page>
 </template>

packages/picgo-plugin-app/src/components/setting/picgo/bundled/PicbedSetting.vue

@@ -22,12 +22,12 @@ const { t } = useVueI18n()
 const props = defineProps({
   ctx: {
     type: Object,
-    default: null
+    default: null,
   },
   cfg: {
     type: Object,
-    default: null
-  }
+    default: null,
+  },
 })
 
 const formData = reactive({
@@ -50,13 +50,13 @@ const formData = reactive({
     // 当前配置项表单
     curFormPropertiesConfig: {} as IStringKeyMap,
     // 表单配置项ID
-    curFormConfigId: "" as string | undefined
+    curFormConfigId: "" as string | undefined,
   },
 
   // 表单展示
   isNewForm: false,
   showConfigForm: false,
-  configFormTitle: ""
+  configFormTitle: "",
 })
 // PicGo 持久化操作帮助类
 const picgoHelper = new PicgoHelper(props.ctx, formData.cfg)
@@ -152,7 +152,7 @@ function deleteConfig(config: IUploaderConfigListItem) {
   ElMessageBox.confirm(`确认删除配置 ${config._configName} 吗？`, t("main.opt.warning"), {
     confirmButtonText: t("main.opt.ok"),
     cancelButtonText: t("main.opt.cancel"),
-    type: "warning"
+    type: "warning",
   })
     .then(async () => {
       try {
@@ -162,12 +162,11 @@ function deleteConfig(config: IUploaderConfigListItem) {
       } catch (e) {
         ElMessage({
           type: "error",
-          message: t("main.opt.failure") + "=>" + e
+          message: t("main.opt.failure") + "=>" + e,
         })
       }
     })
-    .catch(() => {
-    })
+    .catch(() => {})
 }
 
 /**
@@ -238,7 +237,7 @@ onBeforeMount(() => {
           :key="item.type"
           :type="selectedPicbedStyle(item.type)"
           @click="handlePicBedTypeChange(item)"
-        >{{ item.name }}
+          >{{ item.name }}
         </el-button>
       </el-button-group>
     </div>
@@ -343,6 +342,10 @@ onBeforeMount(() => {
   margin-top: 10px;
 }
 
+.picbed-group
+  button
+    margin-bottom 10px
+
 .profile-card-item {
   display: inline-block;
   margin-right: 10px;

packages/picgo-plugin-app/src/composables/usePicgoCommon.ts

@@ -10,7 +10,7 @@
 import { useSiyuanDevice } from "$composables/useSiyuanDevice.ts"
 import { reactive } from "vue"
 import { isDev } from "@/utils/Constants.ts"
-import { ImageItem } from "zhi-siyuan-picgo/src/lib/models/ImageItem.ts"
+import { ImageItem } from "zhi-siyuan-picgo"
 
 /**
  * Picgo公共组件

packages/picgo-plugin-app/src/composables/usePicgoManage.ts

@@ -12,7 +12,7 @@ import { useSiyuanApi } from "$composables/useSiyuanApi.ts"
 import { createAppLogger } from "@/utils/appLogger.ts"
 import { reactive } from "vue"
 import { ElMessage, ElMessageBox } from "element-plus"
-import { ImageItem } from "zhi-siyuan-picgo/src/lib/models/ImageItem.ts"
+import { ImageItem } from "zhi-siyuan-picgo"
 import { SiyuanPicGoClient } from "@/utils/SiyuanPicGoClient.ts"
 
 /**
@@ -30,7 +30,7 @@ export const usePicgoManage = (props: any, deps: any) => {
   // public data
   const picgoManageData = reactive({
     dialogImageUrl: "",
-    dialogPreviewVisible: false,
+    dialogPreviewVisible: false
   })
 
   // deps
@@ -86,7 +86,7 @@ export const usePicgoManage = (props: any, deps: any) => {
         ElMessageBox.confirm("已经是远程图片，是否仍然覆盖上传？", t("main.opt.warning"), {
           confirmButtonText: t("main.opt.ok"),
           cancelButtonText: t("main.opt.cancel"),
-          type: "warning",
+          type: "warning"
         })
           .then(async () => {
             try {
@@ -100,7 +100,7 @@ export const usePicgoManage = (props: any, deps: any) => {
 
               ElMessage({
                 type: "error",
-                message: t("main.opt.failure") + "=>" + e,
+                message: t("main.opt.failure") + "=>" + e
               })
               logger.error(t("main.opt.failure") + "=>" + e)
             }
@@ -111,7 +111,7 @@ export const usePicgoManage = (props: any, deps: any) => {
             if (e.toString().indexOf("cancel") <= -1) {
               ElMessage({
                 type: "error",
-                message: t("main.opt.failure") + "，图片上传异常=>" + e,
+                message: t("main.opt.failure") + "，图片上传异常=>" + e
               })
               logger.error(t("main.opt.failure") + "=>" + e)
             }
@@ -127,7 +127,7 @@ export const usePicgoManage = (props: any, deps: any) => {
 
           ElMessage({
             type: "error",
-            message: t("main.opt.failure") + "=>" + e,
+            message: t("main.opt.failure") + "=>" + e
           })
           logger.error(t("main.opt.failure") + "=>" + e)
         }
@@ -156,11 +156,11 @@ export const usePicgoManage = (props: any, deps: any) => {
     handlePictureCardPreview: (url: string) => {
       picgoManageData.dialogImageUrl = url ?? ""
       picgoManageData.dialogPreviewVisible = true
-    },
+    }
   }
 
   return {
     picgoManageData,
-    picgoManageMethods,
+    picgoManageMethods
   }
 }

packages/picgo-plugin-app/src/composables/usePicgoUpload.ts

@@ -11,12 +11,11 @@ import { useRouter } from "vue-router"
 import { createAppLogger } from "@/utils/appLogger.ts"
 import { useVueI18n } from "$composables/useVueI18n.ts"
 import { reactive } from "vue"
-import { ImageItem } from "zhi-siyuan-picgo"
+import { generateUniqueName, ImageItem } from "zhi-siyuan-picgo"
 import { ElMessage } from "element-plus"
 import { useSiyuanApi } from "$composables/useSiyuanApi.ts"
 import { StrUtil } from "zhi-common"
 import { SiyuanPicGoClient } from "@/utils/SiyuanPicGoClient.ts"
-import { generateUniqueName } from "zhi-siyuan-picgo/src"
 
 /**
  * Picgo上传组件

packages/picgo-plugin-app/src/i18n/en_US.ts

@@ -144,4 +144,6 @@ export default {
     "The CORS proxy is essential for browsers and Docker environments. For further consultation, feel free to contact youweics@163.com.",
   "upload.no.beds":
     'No image hosting service is currently available. Kindly proceed to "Image Hosting Settings" to add a new image hosting service.',
+  "picgo.siyuan.wait.timeout": "Sync timeout(seconds)",
+  "picgo.siyuan.wait.timeout.tip": "Timeout when handle picbed sync",
 }

packages/picgo-plugin-app/src/i18n/zh_CN.ts

@@ -138,4 +138,6 @@ export default {
   "setting.cors.title": "CORS 代理",
   "setting.cors.title.tip": "CORS 代理，浏览器、dcoker以及某些插件可能需要，可付费咨询 youweics@163.com",
   "upload.no.beds": "暂无可用图床，请前往「图床设置」新增图床",
+  "picgo.siyuan.wait.timeout": "同步延迟(秒)",
+  "picgo.siyuan.wait.timeout.tip": "图床同步延迟时间，大于这个时间才会去同步图床元数据",
 }