feat: use global static share, allow select ip

components/default/Home.vue

@@ -34,9 +34,7 @@ const props = defineProps({
 </script>
 
 <template>
-
-      <default-detail :page-id="props.pageId" :override-seo="true" />
-
+  <default-detail :page-id="props.pageId" :override-seo="true" />
 </template>
 
 <style scoped></style>

components/static/Footer.vue

@@ -20,7 +20,7 @@ const goGithub = () => {
 }
 
 const goAbout = () => {
-  window.open("https://blog.terwer.space/about")
+  window.open("https://terwer.space/about")
 }
 
 // methods

composables/useCommonShareType.ts

@@ -74,7 +74,7 @@ export const useCommonShareType = () => {
 
   const isPrivateShare = async () => {
     const shareType = await getShareType()
-    return shareType === ShareTypeEnum.ShareType_Private
+    return shareType === ShareTypeEnum.ShareType_Static
   }
 
   const updateShareType = async (shareType: ShareTypeEnum) => {

composables/useShareType.ts

@@ -24,18 +24,33 @@
  */
 
 import { ShareTypeEnum } from "~/enums/ShareTypeEnum"
+import { createAppLogger } from "~/common/appLogger"
 
 /**
  * 自定义hook，用于获取分享类型
  */
 export const useShareType = () => {
+  const logger = createAppLogger("use-share-type")
+
   /**
    * 获取分享类型
    */
   const getShareType = () => {
+    // const isLocalhost = window.location.hostname === "localhost" || window.location.hostname === "127.0.0.1"
+    // logger.info(`check isLocalhost => ${isLocalhost}, window.location.hostname = `, window.location.hostname)
+    // // 为安全起见，非 127.0.0.1 分享全部采用静态
+    // // 因为 https://github.com/siyuan-note/siyuan/pull/9634 导致公共分享不可用了
+    // if (!isLocalhost) {
+    //   logger.warn(
+    //     "当前不是本地环境，无法实现公共分享，将使用静态，详情请参考：https://github.com/siyuan-note/siyuan/pull/9634"
+    //   )
+    // }
+
+    // 为安全起见，全部采用静态分享
     const win = window.parent as any
-    const accessCodeEnabled = win?.siyuan?.config?.accessAuthCode !== ""
-    return accessCodeEnabled ? ShareTypeEnum.ShareType_Private : ShareTypeEnum.ShareType_Public
+    const accessAuthCodeEnabled = win?.siyuan?.config?.accessAuthCode !== ""
+    logger.info(`accessAuthCodeEnabled => ${accessAuthCodeEnabled}`)
+    return ShareTypeEnum.ShareType_Static
   }
 
   /**
@@ -44,7 +59,7 @@ export const useShareType = () => {
    * @returns {boolean} 是否为私有分享
    */
   const isPrivateShare = (): boolean => {
-    return getShareType() === ShareTypeEnum.ShareType_Private
+    return getShareType() === ShareTypeEnum.ShareType_Static
   }
 
   return { getShareType, isPrivateShare }

enums/ShareTypeEnum.ts

@@ -28,12 +28,14 @@
  */
 export enum ShareTypeEnum {
   /**
-   * 公共分享
+   * 公共分享，已废弃，不安全
+   *
+   * @deprecated see ttps://github.com/siyuan-note/siyuan/pull/9634
    */
   ShareType_Public = "public",
 
   /**
-   * 私有分享
+   * 静态分享
    */
-  ShareType_Private = "private",
+  ShareType_Static = "private",
 }

locales/zh_CN.ts

@@ -93,6 +93,6 @@ export default {
   "form.select": "请选择",
   "form.nodata": "暂无数据",
   "change.ip.title": "切换IP",
-  "share.accessCodeEnabled.tip": "特别提示：检测到您已开启授权码，若文档或者设置有更新，需重新分享，请知悉。",
+  "share.accessCodeEnabled.tip": "特别提示：为安全起见，1.9.0+ 将使用静态分享，若文档有更新，需重新分享，请知悉。",
   "share.public.tip": "当前处于公共分享模式",
 }

pages/share.vue

@@ -105,6 +105,7 @@ const goHelp = async () => {
 const copyWebLink = () => {
   handleMethod(() => {
     copy(formData.shareLink)
+    ElMessage.info("注意：如果是非 127.0.0.1 环境，请通过 设置->关于->网络伺服 打开伺服")
   })
 }
 
@@ -244,7 +245,21 @@ const handleIpChange = (val: string) => {
           <el-input v-model="formData.shareLink" />
         </div>
         <div class="item-right">
-          <el-button type="default" @click="copyWebLink">{{ t("share.copy.web.link") }}</el-button>
+          <el-button @click="copyWebLink">{{ t("share.copy.web.link") }}</el-button>
+        </div>
+      </div>
+      <div class="share-item">
+        <div class="item-left">
+          <span class="change-ip-title">{{ t("change.ip.title") }}</span>
+          <el-select
+            v-model="formData.ip"
+            class="m-2"
+            :placeholder="t('form.select')"
+            no-data-text="t('form.nodata')"
+            @change="handleIpChange"
+          >
+            <el-option v-for="item in formData.ipList" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
         </div>
       </div>
       <el-divider class="share-split" />
@@ -264,20 +279,6 @@ const handleIpChange = (val: string) => {
         <div class="item-right"></div>
       </div>
 
-      <div v-if="optionState" class="share-item">
-        <div class="item-left">
-          <span class="change-ip-title">{{ t("change.ip.title") }}</span>
-          <el-select
-            v-model="formData.ip"
-            class="m-2"
-            :placeholder="t('form.select')"
-            no-data-text="t('form.nodata')"
-            @change="handleIpChange"
-          >
-            <el-option v-for="item in formData.ipList" :key="item.value" :label="item.label" :value="item.value" />
-          </el-select>
-        </div>
-      </div>
       <div v-if="optionState" class="share-item expires-link-item">
         <div class="expires-link expires-link-label">
           {{ t("share.other.option.link.expires") }}

utils/urlUtil.ts

@@ -24,6 +24,9 @@
  */
 
 import { DeviceDetection, DeviceTypeEnum, SiyuanDevice } from "zhi-device"
+import { createAppLogger } from "~/common/appLogger"
+
+const logger = createAppLogger("url-utils")
 
 const getIPv4List = () => {
   const win = SiyuanDevice.siyuanWindow()
@@ -58,15 +61,8 @@ const getLocalIp = () => {
 }
 
 export const getAllIps = () => {
-  if (typeof window === "undefined") {
-    return []
-  }
-  const win = window as any
-  if (typeof win.siyuan === "undefined" || typeof win.parent.siyuan === "undefined") {
-    return []
-  }
   const syWin = SiyuanDevice.siyuanWindow()
-  const ips = syWin.siyuan.config.localIPs
+  const ips = syWin?.siyuan?.config?.localIPs ?? []
 
   const deviceType = DeviceDetection.getDevice()
   if (
@@ -78,7 +74,10 @@ export const getAllIps = () => {
     ips.push(...ipv4s)
   }
 
-  return ips
+  const v4IPs = ips.filter((ip: string) => !ip.startsWith("[") && !ip.endsWith("]"))
+  const uniqueIPs = Array.from(new Set(v4IPs)) as any[]
+  logger.info("getAll v4Ips =>", uniqueIPs)
+  return uniqueIPs
 }
 
 export const getAvailableOrigin = () => {