dsh-crossterm 0.3.33 → 0.3.34

package/client/client.js

@@ -181,6 +181,10 @@ window.__ModuleLoader__.load({
 
 			const onToggleCloud = async () => {
 				const running = Boolean((status && status.cloud && status.cloud.running) || false);
+				if (!(status && status.cloud && status.cloud.configured)) {
+					setMsg("这台机器还没连接云端：先按 README「云端配置」配好网盘授权（baidu-app.json + baidu-auth.json）");
+					return;
+				}
 				setBusy("cloud");
 				setMsg(running ? "正在关闭云同步…" : "正在开启云同步…");
 				try {
@@ -241,7 +245,9 @@ window.__ModuleLoader__.load({
 									"span",
 									null,
 									status
-										? `${(cloud.provider && cloud.provider.name) || "云端"} · ${cloud.root || "—"}${cloud.running ? "（同步中）" : "（未同步）"}`
+										? cloud.configured
+											? `${(cloud.provider && cloud.provider.name) || "云端"} · ${cloud.root || "—"}${cloud.running ? "（同步中）" : "（未同步）"}`
+											: "未连接（还没配置云盘）"
 										: "—",
 								),
 								status
@@ -254,8 +260,12 @@ window.__ModuleLoader__.load({
 													void onToggleCloud();
 												},
 												disabled: busy !== "",
-												title: cloud.running ? "点击关闭云同步" : "点击开启云同步",
-												"aria-label": cloud.running ? "云同步开启中" : "云同步已关闭",
+												title: !cloud.configured
+													? "还没配置云盘，点击查看说明"
+													: cloud.running
+														? "点击关闭云同步"
+														: "点击开启云同步",
+												"aria-label": !cloud.configured ? "云盘未配置" : cloud.running ? "云同步开启中" : "云同步已关闭",
 											},
 											h("span", { style: cloud.running ? S.knobOn : S.knobOff }),
 										)

package/lib/bus.js

@@ -22,7 +22,7 @@ import os from 'node:os'
 import path from 'node:path'
 import crypto from 'node:crypto'
 
-export const VERSION = '0.3.33'
+export const VERSION = '0.3.34'
 
 /** DSH 的家目录：与宿主其它状态（sessions / profiles）同一个根，多终端天然共享 */
 export function dshHome() {

package/lib/web.js

@@ -79,10 +79,14 @@ function installMode(spec) {
 
 /** 云端用哪家网盘：现在只接了百度，靠凭证文件认；以后加别家在这里扩展 */
 function cloudProvider(cfg) {
-  if (!cfg) return { id: '', name: '' }
-  if (cfg.baiduAppFile) return { id: 'baidu', name: '百度网盘' }
-  if (cfg.cloudRoot) return { id: 'custom', name: '自定义云端' }
-  return { id: '', name: '' }
+  if (!cfg) return { id: '', name: '', configured: false }
+  // readConfig 会把 baiduAppFile / baiduAuthFile 补成默认路径（非空字符串），
+  // 所以「配置了路径」不等于「已经授权」——必须两个凭证文件真的存在才算连上云端。
+  const exists = (file) => Boolean(file) && fs.existsSync(file)
+  if (exists(cfg.baiduAppFile) && exists(cfg.baiduAuthFile)) {
+    return { id: 'baidu', name: '百度网盘', configured: true }
+  }
+  return { id: 'none', name: '未连接', configured: false }
 }
 
 /** 语义化版本比较：只比 主.次.补（忽略预发布尾巴），a>b 返回正数 */
@@ -159,6 +163,7 @@ function statusOf(term) {
     /* ignore */
   }
   const cloud = term.cloud
+  const provider = cloudProvider(cfg)
   return {
     ok: true,
     version: VERSION,
@@ -169,11 +174,13 @@ function statusOf(term) {
     workspace: cfg.workspace || '',
     install: { profile: (info && info.name) || '', spec: (info && info.spec) || '', mode },
     cloud: {
-      enabled: cfg.cloudEnabled === true,
-      running: Boolean(cloud && cloud.running),
-      root: cfg.cloudRoot || '',
+      // 没配云盘时不要把默认路径当成「已连接的云端」显示出来
+      configured: provider.configured,
+      enabled: cfg.cloudEnabled === true && provider.configured,
+      running: provider.configured && Boolean(cloud && cloud.running),
+      root: provider.configured ? cfg.cloudRoot || '' : '',
       intervalMs: cfg.cloudIntervalMs || 0,
-      provider: cloudProvider(cfg),
+      provider,
     },
     chains,
   }
@@ -220,6 +227,15 @@ export function registerWeb(ctx, term, log) {
             path: '/crossterm/api/cloud/start',
             handler: (req, res) => {
               try {
+                const before = statusOf(term).cloud
+                if (!before.configured) {
+                  json(res, 200, {
+                    ok: false,
+                    message: '这台机器还没连接云盘：先配置自己的网盘授权（需要 baidu-app.json + baidu-auth.json），配置步骤见 README「云端配置」',
+                    cloud: before,
+                  })
+                  return
+                }
                 term.enableCloud()
                 json(res, 200, { ok: true, message: '云同步已开启', cloud: statusOf(term).cloud })
               } catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-crossterm",
-  "version": "0.3.33",
+  "version": "0.3.34",
   "description": "DSH 跨终端互联：同一账号下的多个 DSH 终端/进程互发邮件与文件（主题内联、正文落盘，收件方自己读）",
   "type": "module",
   "main": "./lib/index.js",