Merge pull request #681 from terwer/dev

feat(siyuan): add clear all shares functionality

Author: terwer

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
 
       - uses: pnpm/action-setup@v4
         with:
-          version: 9.15.1
+          version: 10.12.1
 
       - name: Setup Node.js environment
         uses: actions/setup-node@v4

.github/workflows/release-please.yml

@@ -40,7 +40,7 @@ jobs:
         uses: pnpm/action-setup@v4
         id: pnpm-install
         with:
-          version: 9.15.1
+          version: 10.12.1
           run_install: false
         if: ${{ steps.release.outputs.release_created }}
 

apps/app/nuxt.config.ts

@@ -13,7 +13,7 @@ const generateDynamicV = () => {
 }
 
 const isDev = process.env.NODE_ENV === "development"
-const appBase = "/"
+const appBase = "/plugins/siyuan-blog/app/"
 const staticV = generateDynamicV()
 
 // https://nuxt.com/docs/api/configuration/nuxt-config
@@ -30,6 +30,37 @@ export default defineNuxtConfig({
     vueI18n: "./i18n.ts"
   },
 
+  // https://nuxt.com/docs/guide/going-further/custom-routing#hash-mode-spa
+  ssr: false,
+  router: {
+    options: {
+      hashMode: true,
+    },
+  },
+
+  vite: {
+    define: {
+      "process.env.DEV_MODE": `"${isDev}"`,
+      "process.env.APP_BASE": `"${appBase}"`,
+      "process.env.SSR": "\"false\"",
+    },
+    plugins: [
+      AutoImport({
+        resolvers: [ElementPlusResolver()],
+      }),
+      Components({
+        resolvers: [ElementPlusResolver()],
+      }),
+    ]
+  },
+
+  css: ["~/assets/css/index.styl"],
+
+  elementPlus: {
+    /** Options */
+    themes: ["dark"],
+  },
+
   app: {
     baseURL: appBase,
     head: {
@@ -85,36 +116,13 @@ export default defineNuxtConfig({
     },
   },
 
-  vite: {
-    define: {
-      "process.env.DEV_MODE": `"${isDev}"`,
-      "process.env.APP_BASE": `"${appBase}"`,
-      "process.env.SSR": "\"true\"",
-    },
-    plugins: [
-      AutoImport({
-        resolvers: [ElementPlusResolver()],
-      }),
-      Components({
-        resolvers: [ElementPlusResolver()],
-      }),
-    ]
-  },
-
-  css: ["~/assets/css/index.styl"],
-
-  elementPlus: {
-    /** Options */
-    themes: ["dark"],
-  },
-
   // 环境变量
   runtimeConfig: {
     public: {
-      defaultType: process.env.NUXT_PUBLIC_DEFAULT_TYPE ?? "node",
-      siyuanApiUrl: process.env.NUXT_PUBLIC_SIYUAN_API_URL ?? "http://127.0.0.1:6806",
-      providerMode: process.env.NUXT_PUBLIC_PROVIDER_MODE ?? "false",
-      providerUrl: process.env.NUXT_PUBLIC_PROVIDER_URL ?? "http://127.0.0.1:8086",
+      defaultType: "siyuan",
+      siyuanApiUrl: "",
+      providerMode: "false",
+      providerUrl: "",
     },
   },
 

apps/siyuan/src/composables/useStaticAssets.ts

@@ -26,6 +26,18 @@ export const useStaticAssets = () => {
         const src = image.attribs["src"]
         const imageUrl = [baseUrl, src].join("/")
         const toFilepath = [saveFolder, src].join("/")
+        
+        // 验证文件名
+        if (!isValidWindowsFilename(src)) {
+          logger.warn(`Invalid filename detected: ${src}, skipping...`)
+          continue
+        }
+        
+        // 跳过网络图片
+        if (src.startsWith("http")) {
+          continue
+        }
+        
         logger.info(`download image ${imageUrl} to ${toFilepath}`)
 
         // eslint-disable-next-line no-await-in-loop
@@ -38,6 +50,38 @@ export const useStaticAssets = () => {
     }
   }
 
+  // 验证 Windows 文件名是否合法
+  const isValidWindowsFilename = (filename: string): boolean => {
+    // 检查长度
+    if (filename.length > 255) {
+      return false
+    }
+
+    // 检查非法字符
+    const invalidChars = /[:*?"<>|]/
+    if (invalidChars.test(filename)) {
+      return false
+    }
+
+    // 检查是否以点号结尾
+    if (filename.endsWith(".")) {
+      return false
+    }
+
+    // 检查保留的设备名称
+    const reservedNames = [
+      "CON", "PRN", "AUX", "NUL",
+      "COM1", "COM2", "COM3", "COM4",
+      "LPT1", "LPT2", "LPT3", "LPT4"
+    ]
+    const nameWithoutExt = filename.split(".")[0].toUpperCase()
+    if (reservedNames.includes(nameWithoutExt)) {
+      return false
+    }
+
+    return true
+  }
+
   // =========================================================================
   const getImageBlob = async (url: string) => {
     try {

apps/siyuan/src/composables/useStaticShare.ts

@@ -82,5 +82,15 @@ export const useStaticShare = () => {
     await removeSharePage(pageId)
   }
 
-  return {openStaticShare, closeStaticShare, updateStaticShare}
+  /**
+   * 清除所有静态分享页面
+   * 用于修复和清理所有分享数据
+   */
+  const clearSharePages = async () => {
+    const publicBlogFolder = "/data/public/siyuan-blog"
+    await kernelApi.removeFile(publicBlogFolder)
+    logger.info("all static share data cleared success")
+  }
+
+  return {openStaticShare, closeStaticShare, updateStaticShare, clearSharePages}
 }

apps/siyuan/src/i18n/en_US.json

@@ -28,6 +28,10 @@
   "share.link.expires.time.placeholder": "Units/sec, up to 7 days. 0 means permanent",
   "share.set.home": "Set home",
   "share.click.view": "Click to view",
+  "share.clear.all": "Clear all shares",
+  "share.clear.all.tip": "This operation will clear all shared documents, please be careful",
+  "share.clear.all.warning": "This operation will clear all shared documents and cannot be undone, continue?",
+  "share.clear.all.success": "Successfully cleared all shared documents",
   "share.setting.basic": "Basic setting",
   "share.setting.advanced": "Preference setting",
   "main.label.siteUrl": "Custom Domain",

apps/siyuan/src/i18n/zh_CN.json

@@ -28,6 +28,10 @@
   "share.link.expires.time.placeholder": "单位/秒，最多支持7天。0表示永久生效",
   "share.set.home": "设为主页",
   "share.click.view": "点击查看",
+  "share.clear.all": "清除所有分享",
+  "share.clear.all.tip": "此操作将清除所有已分享的文档，请谨慎操作",
+  "share.clear.all.warning": "此操作将清除所有已分享的文档，且不可恢复，是否继续？",
+  "share.clear.all.success": "已成功清除所有分享的文档",
   "share.setting.basic": "基本设置",
   "share.setting.advanced": "偏好设置",
   "main.label.siteUrl": "自定义域名",

apps/siyuan/src/pages/Share.vue

@@ -11,7 +11,7 @@
 import {onBeforeMount, reactive, toRaw} from "vue"
 import copy from "copy-to-clipboard"
 import {JsonUtil, StrUtil} from "zhi-common"
-import {showMessage} from "siyuan"
+import {showMessage,confirm} from "siyuan"
 import {createAppLogger} from "../utils/appLogger.ts"
 import {useSiyuanApi} from "../composables/useSiyuanApi.ts"
 import {getAllIps} from "../utils/urlUtil.ts"
@@ -31,7 +31,7 @@ const {getSetting, updateSetting} = useSettingStore()
 const {blogApi, kernelApi} = useSiyuanApi()
 const {handleMethod} = useMethod(props.pluginInstance)
 const {handleMethodAsync} = useMethodAsync(props.pluginInstance)
-const {openStaticShare, closeStaticShare, updateStaticShare} = useStaticShare()
+const {openStaticShare, closeStaticShare, updateStaticShare, clearSharePages} = useStaticShare()
 
 const basePath = "/plugins/siyuan-blog/app/#"
 // datas
@@ -201,6 +201,21 @@ const handleExpiresTime = async () => {
   )
 }
 
+const handleClearAllShares = async (event: Event) => {
+  // 阻止事件冒泡
+  event.stopPropagation()
+  // 清除所有分享
+  await clearSharePages()
+  // 更新当前页面的分享状态
+  formData.shared = false
+  await kernelApi.setBlockAttrs(props.id, {
+    "custom-publish-status": "draft",
+    "custom-publish-time": "",
+  })
+  // 操作完成后再显示成功提示
+  showMessage(props.pluginInstance.i18n["share.clear.all.success"])
+}
+
 onBeforeMount(async () => {
   formData.setting = await getSetting()
   formData.post = await blogApi.getPost(props.id, false, false)
@@ -284,6 +299,18 @@ logger.debug("share inited", props)
         <input class="b3-switch fn__flex-center" type="checkbox" v-model="formData.isHome" @change="handleSetHome">
       </div>
     </div>
+
+    <div class="divider"/>
+
+    <div class="setting-row">
+      <span class="setting-label">
+        {{ pluginInstance.i18n["share.clear.all"] }}
+      </span>
+      <div class="input-group">
+        <div class="danger-text">{{ pluginInstance.i18n["share.clear.all.tip"] }}</div>
+        <button class="danger-button" @click="handleClearAllShares">{{ pluginInstance.i18n["share.clear.all"] }}</button>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -458,4 +485,14 @@ html[data-theme-mode="dark"]
 
   .info-text
     color #ff7875
+
+.danger-button
+  background-color #ff4d4f
+  &:hover
+    background-color #ff7875
+
+.danger-text
+  color #ff4d4f
+  font-size 12px
+  margin-right 8px
 </style>

package.json

@@ -20,7 +20,7 @@
   },
   "devDependencies": {
     "rimraf": "^6.0.1",
-    "turbo": "^2.3.3"
+    "turbo": "^2.5.4"
   },
-  "packageManager": "pnpm@9.15.1"
+  "packageManager": "pnpm@10.12.1"
 }