dsh-wkgeo-ops 0.2.2 → 0.2.4

package/client/client.js

@@ -131,6 +131,25 @@ window.__ModuleLoader__.load({
         initTitle: '第一步：先选站点根目录',
         initHint: '所有站点的本地文件夹都放在这个根目录下。可以直接粘路径，也可以点「选择根目录」一层层点进来。',
         initNote: '根目录只存在本机（DSH profile 里），不上传；只有根目录里面的文件夹能绑定给站点。',
+        // ---- v5：首次进入三步（① 选页根目录 → ② 授权 → ③ 建站，老板 2026-10-30 定） ----
+        stepRoot: '选页根目录',
+        stepAuth: '授权',
+        stepCreate: '建站',
+        stepRootDone: '页根目录：{dir}',
+        stepHint: '首次进入按顺序走：第 1 步选页根目录 → 第 2 步授权 → 第 3 步建站。',
+        authTitle: '第二步：授权 wkgeo 账号',
+        authHint: '建站要走 wkgeo CLI 的写接口，必须先授权。在终端里执行下面这条命令，浏览器会打开授权页；完成后回到这里点「我已授权，重新检查」。',
+        authCommand: 'wkgeo login',
+        authCheck: '我已授权，重新检查',
+        authChecking: '正在检查授权…',
+        authOk: '已授权：能读到站点列表',
+        authNote: '授权凭据由 wkgeo CLI 自己保存，本插件不读取、不显示、不上传账号密码或 token。',
+        needRoot: '先去第 1 步选页根目录，选定后才能建站。',
+        needAuth: '先去第 2 步完成授权（wkgeo login），之后才能建站。',
+        blockedTitle: '还差一步才能建站',
+        crashTitle: '悟空GEO-网站运营 · 面板异常',
+        crashRefresh: '刷新界面',
+        regWarn: '面板自检：',
         rootLabel: '站点根目录',
         rootUnset: '未设置根目录',
         rootPick: '选择根目录',
@@ -248,6 +267,25 @@ window.__ModuleLoader__.load({
         initTitle: 'Step 1: choose a site root folder',
         initHint: 'Every site keeps its local folder under this root. Paste a path, or click "Choose root" and browse into it.',
         initNote: 'The root is stored locally (in your DSH profile), never uploaded. Only folders inside the root can be bound to a site.',
+        // ---- v5: first run = root folder -> authorization -> create ----
+        stepRoot: 'root folder',
+        stepAuth: 'authorize',
+        stepCreate: 'create',
+        stepRootDone: 'Root folder: {dir}',
+        stepHint: 'First run goes in order: step 1 pick a root folder, step 2 authorize, step 3 create.',
+        authTitle: 'Step 2: authorize the wkgeo account',
+        authHint: 'Creating a site uses the wkgeo CLI write API, so authorization is required. Run the command below in a terminal; a browser page opens for authorization, then come back and click "I have authorized, check again".',
+        authCommand: 'wkgeo login',
+        authCheck: 'I have authorized, check again',
+        authChecking: 'Checking authorization…',
+        authOk: 'Authorized: the site list is readable',
+        authNote: 'Credentials are kept by the wkgeo CLI itself; this plugin never reads, shows or uploads your password or token.',
+        needRoot: 'Pick a root folder in step 1 first, then you can create a site.',
+        needAuth: 'Finish authorization in step 2 (wkgeo login) before creating a site.',
+        blockedTitle: 'One more step before creating a site',
+        crashTitle: 'wkgeo site ops · panel error',
+        crashRefresh: 'Reload UI',
+        regWarn: 'Panel self-check: ',
         rootLabel: 'Site root folder',
         rootUnset: 'no root folder yet',
         rootPick: 'Choose root',
@@ -331,7 +369,9 @@ window.__ModuleLoader__.load({
         height: '100%',
         width: '100%',
         minWidth: 0,
-        minHeight: 0,
+        // 老板 2026-10-30 白屏复盘：主区容器是 flex 项，历史上有过「高度塌成 0、看起来全白」的情况，
+        // 这里给一个最小高度兜底；真渲染出来了，内容就一定会占可见高度。
+        minHeight: '320px',
         flex: '1 1 auto',
         gap: '10px',
         padding: '12px',
@@ -956,12 +996,8 @@ window.__ModuleLoader__.load({
       }
       render() {
         if (this.state.error) {
-          const msg = String((this.state.error && this.state.error.message) || this.state.error || 'unknown')
-          return h(
-            'div',
-            { style: { ...STYLE.err, margin: '12px', fontSize: '12px', whiteSpace: 'pre-wrap' } },
-            '面板渲染出错：' + msg.slice(0, 600),
-          )
+          // 老板 2026-10-30：渲染异常不许变成一片空白 —— 消息 + 堆栈摘要直接打在面板上。
+          return h(PanelCrash, { error: this.state.error, where: '面板渲染（PanelBoundary 捕获）' })
         }
         return this.props.children
       }
@@ -1512,6 +1548,107 @@ window.__ModuleLoader__.load({
       )
     }
 
+    /**
+     * 面板自检记录（老板 2026-10-30 白屏复盘）：
+     * 旧代码里注册失败被 `try{...}catch{return undefined}` 静默吞掉 —— 左栏有图标、点进去一片空白，
+     * 界面上一个字都没有，只能靠猜。现在所有注册失败都记进这里，面板会把它打在首屏/错误页上。
+     */
+    const REGISTRATION = { ok: {}, errors: [] }
+
+    function noteRegistration(label, err) {
+      if (!err) {
+        REGISTRATION.ok[label] = true
+        return
+      }
+      const msg = String((err && err.message) || err || 'unknown')
+      REGISTRATION.ok[label] = false
+      const entry = label + ' → ' + msg
+      if (REGISTRATION.errors[REGISTRATION.errors.length - 1] !== entry) {
+        REGISTRATION.errors.push(entry)
+        if (REGISTRATION.errors.length > 6) REGISTRATION.errors.shift()
+      }
+      try {
+        console.error('[wkgeo-ops] slot register failed · ' + label, err)
+      } catch (_consoleErr) {
+        /* 忽略 */
+      }
+    }
+
+    /** 错误兜底页：异常消息 + 堆栈摘要 + 注册自检，保证「绝不静默空白」。 */
+    function PanelCrash(props) {
+      const err = props ? props.error : null
+      const where = (props && props.where) || '面板'
+      const msg = String((err && err.message) || err || 'unknown')
+      const stack = err && err.stack ? String(err.stack) : ''
+      const trace = stack ? stack.split('\n').slice(0, 8).join('\n') : ''
+      return h(
+        'div',
+        { style: STYLE.wrap },
+        h('div', { style: STYLE.bar }, h('span', { style: STYLE.barTitle }, MESSAGES.zh.crashTitle)),
+        h(
+          'div',
+          {
+            style: {
+              ...STYLE.err,
+              whiteSpace: 'pre-wrap',
+              wordBreak: 'break-word',
+              fontFamily: 'ui-monospace, SFMono-Regular, Consolas, monospace',
+              fontSize: '12px',
+              lineHeight: '1.5',
+              padding: '10px',
+              border: '1px solid var(--dsw-alias-border-l2)',
+              borderRadius: '8px',
+              background: 'var(--dsw-alias-bg-layer-2)',
+            },
+          },
+          '位置：' + where + '\n' + msg + (trace ? '\n\n堆栈摘要：\n' + trace : ''),
+        ),
+        REGISTRATION.errors.length
+          ? h(
+              'div',
+              { style: { ...STYLE.warn, whiteSpace: 'pre-wrap', fontSize: '11px' } },
+              MESSAGES.zh.regWarn + '\n' + REGISTRATION.errors.slice(-4).join('\n'),
+            )
+          : null,
+        h(
+          'div',
+          { style: STYLE.actions },
+          h(
+            'button',
+            {
+              type: 'button',
+              style: STYLE.btnPrimary,
+              onClick: () => {
+                try {
+                  if (typeof window !== 'undefined' && window.location) window.location.reload()
+                } catch (_reloadErr) {
+                  /* 忽略 */
+                }
+              },
+            },
+            MESSAGES.zh.crashRefresh,
+          ),
+        ),
+      )
+    }
+
+    /** 首次进入的三步指示条：① 选页根目录 → ② 授权 → ③ 建站 */
+    function stepChip(t, label, done, active) {
+      const mark = done ? '✓ ' : active ? '● ' : '○ '
+      return h(
+        'span',
+        {
+          style: {
+            ...STYLE.pill,
+            color: done ? '#15803d' : active ? 'var(--dsw-alias-label-primary)' : 'var(--dsw-alias-label-tertiary)',
+            borderColor: done ? '#15803d' : undefined,
+            opacity: done || active ? 1 : 0.75,
+          },
+        },
+        mark + label,
+      )
+    }
+
     /** 面板主体 */
     function PanelBody(ctx) {
       const t = makeT(ctx)
@@ -1570,6 +1707,18 @@ window.__ModuleLoader__.load({
       }, [])
 
       const openWizard = () => {
+        // 三步顺序（老板 2026-10-30）：① 页根目录 → ② 授权 → ③ 建站。前两步没完成不许进向导。
+        if (!rootReady) {
+          setView('init')
+          setInitError(t('needRoot'))
+          return
+        }
+        if (!authed) {
+          setInitError('')
+          setView('list')
+          load(true)
+          return
+        }
         setWizard(defaultWizard())
         setWizardError('')
         setRun({ busy: false, ok: false, siteId: '', log: [], unfilled: [], gaps: [] })
@@ -1824,12 +1973,25 @@ window.__ModuleLoader__.load({
       const rootReady = Boolean(cfg.rootDir)
       const boundCount = Object.keys(folders || {}).length
       const cfgDown = cfg.phase === 'error'
+      // 第 2 步「授权」的判定：站点接口能拿到 ok 数据即视为已授权；明确返回 NOT_LOGGED_IN 即未授权。
+      const authed = Boolean(data) && data.ok !== false && !isLoginIssue
+      const needAuth = Boolean(data) && isLoginIssue
+      const canCreate = rootReady && authed
+      const blockedHint = !rootReady ? t('needRoot') : !authed ? t('needAuth') : ''
+
+      const steps = h(
+        'div',
+        { style: { display: 'flex', alignItems: 'center', flexWrap: 'wrap', gap: '6px' } },
+        stepChip(t, '1 · ' + t('stepRoot'), rootReady, !rootReady),
+        stepChip(t, '2 · ' + t('stepAuth'), authed, rootReady && !authed),
+        stepChip(t, '3 · ' + t('stepCreate'), false, canCreate),
+      )
 
       const head = h(
         'div',
         { style: STYLE.bar },
         h('span', { style: STYLE.barTitle }, t('title')),
-        h('span', { style: { ...STYLE.barMeta, fontSize: '10px', opacity: 0.65 }, title: 'client build' }, 'v5'),
+        h('span', { style: { ...STYLE.barMeta, fontSize: '10px', opacity: 0.65 }, title: 'client build' }, 'v6'),
         h(
           'span',
           { style: { ...STYLE.badge, cursor: 'pointer' }, title: cfg.rootDir || t('rootUnset'), onClick: openBrowserRoot },
@@ -1837,7 +1999,17 @@ window.__ModuleLoader__.load({
         ),
         h('button', { type: 'button', style: STYLE.btn, disabled: busy, onClick: () => load(true), title: t('refresh') }, busy ? t('refreshing') : t('refresh')),
         sites.length > 0 && (view === 'list' || view === 'detail')
-          ? h('button', { type: 'button', style: STYLE.btn, onClick: openWizard }, t('create'))
+          ? h(
+              'button',
+              {
+                type: 'button',
+                style: canCreate ? STYLE.btn : { ...STYLE.btn, opacity: 0.55, cursor: 'not-allowed' },
+                disabled: !canCreate,
+                title: blockedHint || t('create'),
+                onClick: openWizard,
+              },
+              t('create'),
+            )
           : null,
         h(
           'span',
@@ -1847,6 +2019,34 @@ window.__ModuleLoader__.load({
         ),
       )
 
+      // 第 2 步：授权卡片（放在建站之前，未授权时首屏就是它，建站按钮全部禁用并提示去哪一步）
+      const authPanel = h(
+        'div',
+        { style: STYLE.initCard },
+        h('div', { style: STYLE.bar }, h('span', { style: STYLE.barTitle }, t('authTitle'))),
+        h('div', { style: STYLE.hint }, t('authHint')),
+        h('div', { style: STYLE.growRow }, h('code', { style: STYLE.code }, t('authCommand'))),
+        h(
+          'div',
+          { style: STYLE.actions },
+          h(
+            'button',
+            { type: 'button', style: STYLE.btnPrimary, disabled: busy, onClick: () => load(true) },
+            busy ? t('authChecking') : t('authCheck'),
+          ),
+          h('button', { type: 'button', style: STYLE.btn, onClick: () => setView('init') }, t('rootChange')),
+          // 第 3 步的入口先亮出来但禁用：未授权时点不动，title 说明缺的是哪一步
+          h(
+            'button',
+            { type: 'button', style: STYLE.btn, disabled: true, title: blockedHint || t('needAuth') },
+            t('create'),
+          ),
+        ),
+        needAuth && !busy ? h('div', { style: STYLE.err }, t('loginHint')) : null,
+        state.error ? h('div', { style: STYLE.err }, String(state.error).slice(0, 300)) : null,
+        h('div', { style: STYLE.note }, t('authNote')),
+      )
+
       const initPanel = h(
         'div',
         { style: STYLE.initCard },
@@ -1945,6 +2145,9 @@ window.__ModuleLoader__.load({
         })
       } else if (!rootReady && !cfgDown) {
         body = initPanel
+      } else if (needAuth) {
+        // 第 2 步：目录已选、但还没授权 → 先授权，建站按钮此时是禁用的
+        body = authPanel
       } else if (state.phase === 'loading' && !data) {
         body = h('div', { style: STYLE.state }, h('div', { style: STYLE.stateTitle }, t('refreshing')))
       } else if (state.error) {
@@ -1953,9 +2156,19 @@ window.__ModuleLoader__.load({
           { style: STYLE.state },
           h('div', { style: STYLE.stateTitle }, isLoginIssue ? t('loginHint') : t('error')),
           h('div', null, String(state.error).slice(0, 300)),
-          isLoginIssue ? h('div', null, t('emptyHint')) : null,
+          !canCreate ? h('div', { style: STYLE.hint }, blockedHint) : null,
           h('button', { type: 'button', style: STYLE.btn, onClick: () => load(true) }, t('retry')),
-          h('button', { type: 'button', style: STYLE.btnPrimary, onClick: openWizard }, t('create')),
+          h(
+            'button',
+            {
+              type: 'button',
+              style: canCreate ? STYLE.btnPrimary : { ...STYLE.btnPrimary, opacity: 0.55, cursor: 'not-allowed' },
+              disabled: !canCreate,
+              title: blockedHint || t('create'),
+              onClick: openWizard,
+            },
+            t('create'),
+          ),
         )
       } else if (sites.length === 0) {
         body = h(
@@ -1963,7 +2176,18 @@ window.__ModuleLoader__.load({
           { style: STYLE.state },
           h('div', { style: STYLE.stateTitle }, t('empty')),
           h('div', null, t('emptyHint')),
-          h('button', { type: 'button', style: { ...STYLE.btnPrimary, ...STYLE.btnBlock }, onClick: openWizard }, t('createFirst')),
+          !canCreate ? h('div', { style: STYLE.hint }, blockedHint) : null,
+          h(
+            'button',
+            {
+              type: 'button',
+              style: canCreate ? { ...STYLE.btnPrimary, ...STYLE.btnBlock } : { ...STYLE.btn, ...STYLE.btnBlock, opacity: 0.55, cursor: 'not-allowed' },
+              disabled: !canCreate,
+              title: blockedHint || t('createFirst'),
+              onClick: openWizard,
+            },
+            t('createFirst'),
+          ),
           h('div', { style: STYLE.hint }, '没登录会取不到站点：', h('code', { style: STYLE.code }, 'wkgeo login')),
         )
       } else {
@@ -1980,7 +2204,16 @@ window.__ModuleLoader__.load({
               onPickFolder: openBrowserSite,
             }),
           ),
-          h('div', { key: '__new__', style: STYLE.newCard, onClick: openWizard }, t('newCard')),
+          h(
+            'div',
+            {
+              key: '__new__',
+              style: canCreate ? STYLE.newCard : { ...STYLE.newCard, opacity: 0.55, cursor: 'not-allowed' },
+              title: blockedHint || t('newCard'),
+              onClick: canCreate ? openWizard : undefined,
+            },
+            canCreate ? t('newCard') : t('blockedTitle') + '：' + blockedHint,
+          ),
         )
       }
 
@@ -1988,6 +2221,8 @@ window.__ModuleLoader__.load({
         'div',
         { style: STYLE.wrap },
         head,
+        steps,
+        rootReady ? h('div', { style: { ...STYLE.hint, fontSize: '11px' }, title: cfg.rootDir }, t('stepRootDone', { dir: cfg.rootDir })) : null,
         cfgDown ? h('div', { style: STYLE.warn }, t('cfgUnavailable')) : null,
         rootReady && cfg.exists === false ? h('div', { style: STYLE.warn }, t('rootMissingNow')) : null,
         folderError ? h('div', { style: STYLE.err }, String(folderError).slice(0, 300)) : null,
@@ -1998,25 +2233,98 @@ window.__ModuleLoader__.load({
           data && data.ageMs != null ? t('updated', { t: new Date().toLocaleTimeString() }) : '',
           boundCount > 0 ? ' · 📁 ' + boundCount : '',
         ),
+        REGISTRATION.errors.length
+          ? h(
+              'div',
+              { style: { ...STYLE.warn, whiteSpace: 'pre-wrap', fontSize: '11px' } },
+              t('regWarn') + REGISTRATION.errors.slice(-3).join(' | '),
+            )
+          : null,
       )
     }
 
     function apply(ctx) {
       // 面板入口：错误边界包住面板本身 —— 渲染异常变成可复制的报错文本，绝不整块空白。
-      const OpsPanel = () => h(PanelBoundary, null, h(PanelBody, ctx))
+      // 面板入口：① 函数级 try/catch 兜住「构造元素树就抛错」；② PanelBoundary 兜住渲染期异常。
+      // 两条都不许再变成空白 —— 出错就打错误页（异常消息 + 堆栈摘要 + 注册自检）。
+      const OpsPanel = () => {
+        try {
+          return h(PanelBoundary, null, h(PanelBody, ctx))
+        } catch (err) {
+          return h(PanelCrash, { error: err, where: 'OpsPanel 构造元素树' })
+        }
+      }
 
-      const scope = (label, fn) => {
+      /** 注册期兜底：失败必须记账（旧代码在这里静默 return undefined，正是白屏查不出来的原因）。 */
+      const guard = (label, fn) => {
         try {
           if (typeof ctx.effect === 'function') return ctx.effect(fn, label)
           return fn()
-        } catch (_err) {
+        } catch (err) {
+          noteRegistration(label, err)
           return undefined
         }
       }
 
-      scope('wkgeo-ops:locale', () => ctx.locale.register(NS, { zh: MESSAGES.zh, en: MESSAGES.en }))
+      const SLOT_RETRY_MAX = 20
+      const SLOT_RETRY_MS = 300
+
+      /**
+       * 槽位注册（白屏根因修复，老板 2026-10-30）：
+       * DSH 的 SlotCore.register 在「槽位还没被父 entry 的 children 表声明」时会**同步抛错**
+       * （`slot "main" is not declared (a parent entry's children table must declare it)`）。
+       * 旧代码是「直接 register + catch 静默吞掉」：只要那次 register 抛了，`main` 就永远不存在，
+       * 结果正是「左栏图标在、点进去一片空白、界面没有任何报错」。
+       * 官方范式（DSH 内置插件全部如此）是 ctx.slots.inject(name, () => ctx.slots.register(...))：
+       * 声明前挂起、声明后自动补注册；这里再叠加定时重试，双保险。
+       */
+      const slotRegister = (label, options, component) => {
+        const name = options && options.name
+        let off = null
+        let timer = null
+        let tries = 0
+        let disposed = false
+        const attempt = () => {
+          if (disposed) return undefined
+          try {
+            off = ctx.slots.register(options, component)
+            noteRegistration(label, null)
+            return off
+          } catch (err) {
+            noteRegistration(label, err)
+            tries += 1
+            if (tries <= SLOT_RETRY_MAX && !timer) {
+              timer = setTimeout(() => {
+                timer = null
+                attempt()
+              }, SLOT_RETRY_MS)
+            }
+            return undefined
+          }
+        }
+        let offInject = null
+        if (typeof ctx.slots.inject === 'function') {
+          try {
+            offInject = ctx.slots.inject(name, attempt)
+          } catch (err) {
+            noteRegistration(label, err)
+            attempt()
+          }
+        } else {
+          attempt()
+        }
+        return () => {
+          disposed = true
+          if (timer) clearTimeout(timer)
+          timer = null
+          if (typeof offInject === 'function') offInject()
+          if (typeof off === 'function') off()
+        }
+      }
+
+      guard('wkgeo-ops:locale', () => ctx.locale.register(NS, { zh: MESSAGES.zh, en: MESSAGES.en }))
 
-      scope('wkgeo-ops:tab', () =>
+      guard('wkgeo-ops:tab', () =>
         ctx.sidebarRightTabs.register({
           id: PANEL_ID,
           kind: 'wkgeo-ops',
@@ -2043,18 +2351,19 @@ window.__ModuleLoader__.load({
         }),
       )
 
-      scope('wkgeo-ops:pane', () =>
-        ctx.slots.inject('sidebar.right.pane.tab', () =>
-          ctx.slots.register(
-            { name: 'sidebar.right.pane.tab', key: PANEL_ID, locale: NS, inject: () => ({}) },
-            OpsPanel,
-          ),
+      guard('wkgeo-ops:pane', () =>
+        slotRegister(
+          'sidebar.right.pane.tab',
+          { name: 'sidebar.right.pane.tab', key: PANEL_ID, locale: NS, inject: () => ({}) },
+          OpsPanel,
         ),
       )
 
-      scope('wkgeo-ops:pane-title', () =>
-        ctx.slots.inject('sidebar.right.pane.tab.title', () =>
-          ctx.slots.register({ name: 'sidebar.right.pane.tab.title', key: PANEL_ID }, () => h('span', null, MESSAGES.zh.title)),
+      guard('wkgeo-ops:pane-title', () =>
+        slotRegister(
+          'sidebar.right.pane.tab.title',
+          { name: 'sidebar.right.pane.tab.title', key: PANEL_ID },
+          () => h('span', null, SIDEBAR_ROW_LABEL),
         ),
       )
 
@@ -2063,8 +2372,9 @@ window.__ModuleLoader__.load({
       //   ① sidebar.panellist —— 左栏里的一行图标（id = PANEL_ID）
       //   ② main             —— 点该图标后中央区域渲染的面板（key = PANEL_ID）
       // 少一条就看不到入口（只有①会点不开，只有②没有图标）。停用插件时把界面交还对话。
-      scope('wkgeo-ops:sidebar-entry', () => {
-        const offRow = ctx.slots.register(
+      guard('wkgeo-ops:sidebar-row', () =>
+        slotRegister(
+          'sidebar.panellist',
           {
             name: 'sidebar.panellist',
             id: PANEL_ID,
@@ -2073,24 +2383,23 @@ window.__ModuleLoader__.load({
             locale: NS,
           },
           (owner = {}) => h(OpsIcon, { size: owner.size }),
-        )
-        const offPanel = ctx.slots.register(
-          { name: 'main', key: PANEL_ID, locale: NS, inject: () => ({}) },
-          OpsPanel,
-        )
-        return () => {
-          try {
-            const layout = typeof ctx.get === 'function' ? ctx.get('layout') : null
-            const info = layout && layout.panelInfo
-            if (info && typeof info.getSnapshot === 'function') {
-              const snapshot = info.getSnapshot()
-              if (snapshot && snapshot.activePanelId === PANEL_ID) layout.selectPanel(null)
-            }
-          } catch (_err) {
-            /* 尽力而为 */
+        ),
+      )
+
+      guard('wkgeo-ops:main', () =>
+        slotRegister('main', { name: 'main', key: PANEL_ID, locale: NS, inject: () => ({}) }, OpsPanel),
+      )
+
+      guard('wkgeo-ops:cleanup', () => () => {
+        try {
+          const layout = typeof ctx.get === 'function' ? ctx.get('layout') : null
+          const info = layout && layout.panelInfo
+          if (info && typeof info.getSnapshot === 'function') {
+            const snapshot = info.getSnapshot()
+            if (snapshot && snapshot.activePanelId === PANEL_ID) layout.selectPanel(null)
           }
-          offRow()
-          offPanel()
+        } catch (_err) {
+          /* 尽力而为 */
         }
       })
     }