@dsh-workbench/shared 0.3.10 → 1.0.0-beta.0

package/src/host/opencli-window.ts

@@ -1,11 +0,0 @@
-import { quoteShellArg } from './shell-text.js';
-
-const OPENCLI_WINDOW_ENV = 'OPENCLI_WINDOW=background';
-
-export function backgroundPrefix(): readonly string[] {
-  return [quoteShellArg('env'), quoteShellArg(OPENCLI_WINDOW_ENV)];
-}
-
-export function backgroundLine(command: string, argv: readonly string[]): string {
-  return [...backgroundPrefix(), quoteShellArg(command), ...argv.map(quoteShellArg)].join(' ');
-}

package/src/host/opencli.ts

@@ -1,213 +0,0 @@
-import type { DshShell } from '../api/dsh.js';
-import { OPENCLI_MAX_CONCURRENT, OPENCLI_TIMEOUT_MS } from '../config/constants.js';
-import { parseJsonLoose } from '../lib/text.js';
-import { quoteShellArg, tailLines } from './shell-text.js';
-import { helpUrlOf, parseCliErrorEnvelope } from './cli-error.js';
-import { backgroundPrefix } from './opencli-window.js';
-import { runShell } from './shell.js';
-
-const FORBIDDEN_CODES = new Set(['FORBIDDEN', 'PERMISSION_DENIED']);
-
-const SITE_SESSION_ARGS = ['--site-session', 'persistent'] as const;
-
-export class WorkbenchDataError extends Error {
-  readonly code: string;
-  readonly detail?: string;
-  readonly hint?: string;
-  readonly project?: unknown;
-  readonly helpUrl?: string;
-
-  constructor(
-    code: string,
-    message: string,
-    extra: { detail?: string; hint?: string; project?: unknown; helpUrl?: string } = {},
-  ) {
-    super(message);
-    this.name = 'WorkbenchDataError';
-    this.code = code;
-    if (extra.detail !== undefined) this.detail = extra.detail;
-    if (extra.hint !== undefined) this.hint = extra.hint;
-    if (extra.project !== undefined) this.project = extra.project;
-    if (extra.helpUrl !== undefined) this.helpUrl = extra.helpUrl;
-  }
-}
-
-export interface OpencliResult {
-  readonly value: unknown;
-  readonly at: number;
-}
-
-export type OpencliSession = 'persistent' | 'ephemeral' | 'none';
-
-export function opencliCommandLine(
-  command: string,
-  argv: readonly string[],
-  session: OpencliSession = 'persistent',
-): string {
-  return [
-    ...backgroundPrefix(),
-    quoteShellArg(command),
-    ...argv.map(quoteShellArg),
-    ...(session === 'persistent' ? SITE_SESSION_ARGS : []),
-    '-f',
-    'json',
-  ].join(' ');
-}
-
-export interface Opencli {
-  json(
-    args: readonly string[],
-    options?: { key?: string; workdir?: string; session?: OpencliSession },
-  ): Promise<OpencliResult>;
-}
-
-export function createOpencli(options: {
-  shell: DshShell;
-  plugin: string;
-  logger?: { warn?(message: string): void } | undefined;
-  command?: string;
-  timeoutMs?: number;
-  maxConcurrent?: number;
-}): Opencli {
-  const {
-    shell,
-    plugin,
-    logger,
-    command = 'opencli',
-    timeoutMs = OPENCLI_TIMEOUT_MS,
-    maxConcurrent = OPENCLI_MAX_CONCURRENT,
-  } = options;
-
-  const inflight = new Map<string, Promise<OpencliResult>>();
-
-  const MAX_CONCURRENT = maxConcurrent;
-  let running = 0;
-  const waiting: Array<() => void> = [];
-
-  async function acquire(): Promise<void> {
-    if (running < MAX_CONCURRENT) {
-      running += 1;
-      return;
-    }
-    await new Promise<void>((resolve) => waiting.push(resolve));
-  }
-
-  function release(): void {
-    const next = waiting.shift();
-    if (next === undefined) running -= 1;
-    else next();
-  }
-
-  async function runLimited<T>(task: () => Promise<T>): Promise<T> {
-    await acquire();
-    try {
-      return await task();
-    } finally {
-      release();
-    }
-  }
-
-  async function call(commandLine: string, workdir: string | undefined): Promise<unknown> {
-    let result;
-    try {
-      result = await runShell(shell, commandLine, {
-        ...(workdir === undefined ? {} : { workdir }),
-        timeoutMs,
-      });
-    } catch (error) {
-      throw new WorkbenchDataError('cli-exec-failed', `执行 opencli 失败：${String(error)}`, {
-        hint: '确认 opencli 已安装且在 PATH 里（which opencli）。',
-      });
-    }
-
-    if (result.timedOut) {
-      throw new WorkbenchDataError(
-        'cli-timeout',
-        `opencli 超过 ${Math.round(timeoutMs / 1000)} 秒没有返回`,
-        { hint: '无头浏览器可能没起来，重试一次通常就好。' },
-      );
-    }
-
-    if (result.exitCode !== 0) {
-      const detail = tailLines(result.stderr || result.stdout, 6);
-      const envelope = parseCliErrorEnvelope(result.stderr) ?? parseCliErrorEnvelope(result.stdout);
-
-      const url = envelope === undefined ? undefined : helpUrlOf(envelope);
-      if (envelope?.code === 'AUTH_REQUIRED') {
-        throw new WorkbenchDataError('auth-required', envelope.message, {
-          detail,
-          ...(url === undefined ? {} : { helpUrl: url }),
-        });
-      }
-      if (envelope !== undefined && FORBIDDEN_CODES.has(envelope.code)) {
-        throw new WorkbenchDataError('permission-denied', envelope.message, {
-          detail,
-          ...(url === undefined ? {} : { helpUrl: url }),
-        });
-      }
-      if (envelope !== undefined) {
-        throw new WorkbenchDataError('cli-command-failed', `${envelope.code}：${envelope.message}`, {
-          detail,
-          ...(envelope.help === undefined ? {} : { hint: envelope.help }),
-        });
-      }
-      throw new WorkbenchDataError(
-        'cli-unclassified',
-        `opencli 这条命令没跑通（退出码 ${result.exitCode}），而且没有结构化错误码`,
-        {
-          detail,
-          hint: '多半是插件里没有这条命令（版本旧就会缺），也可能是命令自己失败了：先确认命令存在，再更新插件重试。',
-        },
-      );
-    }
-
-    const parsed = parseJsonLoose(result.stdout);
-    if (parsed === undefined) {
-      throw new WorkbenchDataError('cli-bad-output', 'opencli 输出不是 JSON', {
-        detail: tailLines(result.stdout, 4),
-      });
-    }
-    return parsed;
-  }
-
-  async function json(
-    args: readonly string[],
-    callOptions: { key?: string; workdir?: string; session?: OpencliSession } = {},
-  ): Promise<OpencliResult> {
-    const { key, workdir } = callOptions;
-    const session = callOptions.session ?? 'persistent';
-    const callKey = key ?? args.map((arg) => String(arg)).join(' ');
-
-    const pending = inflight.get(callKey);
-    if (pending !== undefined) return pending;
-
-    const commandLine = opencliCommandLine(command, [plugin, ...args], session);
-
-    const once = async (): Promise<OpencliResult> => {
-      const value = await call(commandLine, workdir);
-      return { value, at: Date.now() };
-    };
-
-    const task = runLimited(async (): Promise<OpencliResult> => {
-      try {
-        return await once();
-      } catch (error) {
-        if (!(error instanceof WorkbenchDataError) || error.code !== 'auth-required') throw error;
-        return await once();
-      }
-    });
-
-    inflight.set(callKey, task);
-    try {
-      return await task;
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      logger?.warn?.(`[dsh-workbench] opencli 调用失败：${message}`);
-      throw error;
-    } finally {
-      inflight.delete(callKey);
-    }
-  }
-
-  return { json };
-}

package/src/host/unit-libs.ts

@@ -1,41 +0,0 @@
-import type { PluginSourceProblem } from './plugin-source.js';
-import type { PluginRelease, UnitLibNeed, UnitPluginNeed } from '../api/unit.js';
-
-export interface UnitLibState {
-  readonly name: string;
-  readonly purpose: string;
-  readonly status: 'ok' | 'outdated' | 'missing' | 'unsatisfied';
-  readonly installed?: string;
-  readonly latest?: string;
-  readonly command?: string;
-}
-
-export interface UnitCommands {
-  readonly unit: string;
-  readonly plugins?: readonly UnitPluginNeed[];
-  readonly libs?: readonly UnitLibNeed[];
-}
-
-export interface UnitPluginState {
-  readonly name: string;
-  readonly status: "ok" | "outdated" | "missing";
-  readonly missing: readonly string[];
-  readonly install?: "ready" | PluginSourceProblem;
-  readonly command?: string;
-  readonly release?: PluginRelease;
-}
-
-export interface UnitCapability {
-  readonly unit: string;
-  readonly status: "ok" | "failed" | "missing-commands" | "missing-plugin" | "unchecked";
-  readonly plugin?: string;
-  readonly required: readonly string[];
-  readonly missing: readonly string[];
-  readonly detail: string;
-  readonly command?: string;
-  readonly fix?: "install" | "update";
-  readonly install?: "ready" | PluginSourceProblem;
-  readonly plugins?: readonly UnitPluginState[];
-  readonly libs?: readonly UnitLibState[];
-  readonly released?: boolean;
-}

package/src/lib/blocker-action.test.ts

@@ -1,40 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import { blockerActionLabel, blockerPending } from './blocker-action.js';
-
-const t = (key: string): string => `«${key}»`;
-
-const RETRY = { kind: 'retry', label: '重试' } as const;
-const LOGIN = { kind: 'open-url', label: '去登录', url: 'https://cmdb.example/login', inline: true } as const;
-const COPY = { kind: 'copy', label: '复制命令', text: 'opencli cmdb envs' } as const;
-const FIX = { kind: 'run-fix', label: '帮我安装', unit: 'cmdb', fix: 'install' } as const;
-
-const idle = { retrying: false, running: null, copied: null } as const;
-
-describe('阻断态那颗按钮说什么', () => {
-  it('★ 忙的时候「重试」自己说「重试中…」（用户点的就是它）', () => {
-    expect(blockerActionLabel(RETRY, { ...idle, retrying: true }, t)).toBe('«blocker.retry.running»');
-  });
-
-  it('不忙就是原文（不假装忙）', () => {
-    expect(blockerActionLabel(RETRY, idle, t)).toBe('重试');
-  });
-
-  it('★ 忙的不是重试本身（安装在路上）→ 「重试」不许跟着说「重试中…」', () => {
-    expect(blockerActionLabel(RETRY, { ...idle, running: '帮我安装' }, t)).toBe('重试');
-    expect(blockerActionLabel(LOGIN, { ...idle, retrying: true }, t)).toBe('去登录');
-  });
-
-  it('安装在路上 → 那颗说「正在执行…」', () => {
-    expect(blockerActionLabel(FIX, { ...idle, running: '帮我安装' }, t)).toBe('«blocker.fix.running»');
-  });
-
-  it('复制成功那一下说「已复制」', () => {
-    expect(blockerActionLabel(COPY, { ...idle, copied: 'opencli cmdb envs' }, t)).toBe('«env.copied»');
-  });
-
-  it('★ 忙 = 卡片在刷 || 本地动作在跑（少算一半，按钮就又哑了）', () => {
-    expect(blockerPending(true, null)).toBe(true);
-    expect(blockerPending(false, '帮我安装')).toBe(true);
-    expect(blockerPending(false, null)).toBe(false);
-  });
-});