@xmanrui/dsh-im 0.7.0 → 0.7.2

package/src/channels/feishu/feishu-runtime.mjs

@@ -1,6 +1,26 @@
 import { FeishuHarnessBridge } from './bridge.mjs';
 import { VerifiedFeishuChannel } from './feishu-channel.mjs';
 
+const DEFAULT_REQUEST_TIMEOUT_MS = 15_000;
+
+function httpInstanceWithTimeout(httpInstance, timeoutMs) {
+  if (!httpInstance || typeof httpInstance.request !== 'function') return undefined;
+  const optionsWithTimeout = (options) => ({
+    ...(options ?? {}),
+    timeout: options?.timeout ?? timeoutMs,
+  });
+  return {
+    request: (options) => httpInstance.request(optionsWithTimeout(options)),
+    get: (url, options) => httpInstance.get(url, optionsWithTimeout(options)),
+    delete: (url, options) => httpInstance.delete(url, optionsWithTimeout(options)),
+    head: (url, options) => httpInstance.head(url, optionsWithTimeout(options)),
+    options: (url, options) => httpInstance.options(url, optionsWithTimeout(options)),
+    post: (url, data, options) => httpInstance.post(url, data, optionsWithTimeout(options)),
+    put: (url, data, options) => httpInstance.put(url, data, optionsWithTimeout(options)),
+    patch: (url, data, options) => httpInstance.patch(url, data, optionsWithTimeout(options)),
+  };
+}
+
 export function createBridgeStatus({ allowedSenderCount = 1 } = {}) {
   return {
     startedAt: null,
@@ -43,11 +63,13 @@ export class FeishuRuntime {
   #state;
   #replyTimeoutMs;
   #connectTimeoutMs;
+  #requestTimeoutMs;
   #logger;
   #client = null;
   #bridge = null;
   #wsClient = null;
   #starting = null;
+  #abortController = null;
   #status;
 
   constructor({
@@ -61,6 +83,7 @@ export class FeishuRuntime {
     state,
     replyTimeoutMs = 600000,
     connectTimeoutMs = 15000,
+    requestTimeoutMs = DEFAULT_REQUEST_TIMEOUT_MS,
     logger = console,
   }) {
     if (!lark) throw new Error('FeishuRuntime requires the Feishu SDK');
@@ -70,6 +93,9 @@ export class FeishuRuntime {
     if (normalizedOwners.length === 0) throw new Error('FeishuRuntime requires at least one owner open_id');
     if (!harness) throw new Error('FeishuRuntime requires a Harness client');
     if (!state) throw new Error('FeishuRuntime requires a state store');
+    if (!Number.isFinite(requestTimeoutMs) || requestTimeoutMs <= 0) {
+      throw new TypeError('FeishuRuntime requestTimeoutMs must be a positive number');
+    }
 
     this.#lark = lark;
     this.#appId = appId;
@@ -80,6 +106,7 @@ export class FeishuRuntime {
     this.#state = state;
     this.#replyTimeoutMs = replyTimeoutMs;
     this.#connectTimeoutMs = connectTimeoutMs;
+    this.#requestTimeoutMs = requestTimeoutMs;
     this.#logger = logger;
     this.#status = createBridgeStatus({ allowedSenderCount: normalizedOwners.length });
   }
@@ -99,12 +126,15 @@ export class FeishuRuntime {
   }
 
   async #start() {
+    const abortController = new AbortController();
+    this.#abortController = abortController;
+    const { signal } = abortController;
     this.#status.startedAt = new Date().toISOString();
     this.#status.feishuLongConnectionState = 'connecting';
     this.#status.lastError = null;
 
     try {
-      await this.#harness.ensureRunning();
+      await this.#harness.ensureRunning({ signal });
       this.#status.harnessReachable = true;
 
       const sdkDomain = this.#domain === 'lark'
@@ -115,6 +145,11 @@ export class FeishuRuntime {
         appSecret: this.#appSecret,
         domain: sdkDomain,
       };
+      const httpInstance = httpInstanceWithTimeout(
+        this.#lark.defaultHttpInstance,
+        this.#requestTimeoutMs,
+      );
+      if (httpInstance) larkConfig.httpInstance = httpInstance;
       this.#client = new this.#lark.Client(larkConfig);
       const channel = new VerifiedFeishuChannel({
         client: this.#client,
@@ -128,6 +163,8 @@ export class FeishuRuntime {
         status: this.#status,
         allowedSenderOpenIds: new Set(this.#ownerOpenIds),
         replyTimeoutMs: this.#replyTimeoutMs,
+        signal,
+        logger: this.#logger,
       });
 
       const dispatcher = new this.#lark.EventDispatcher({}).register({
@@ -205,6 +242,9 @@ export class FeishuRuntime {
 
   async stop({ preserveError = false } = {}) {
     const error = preserveError ? this.#status.lastError : null;
+    const abortController = this.#abortController;
+    this.#abortController = null;
+    abortController?.abort(new DOMException('Feishu runtime stopped', 'AbortError'));
     this.#status.ready = false;
     if (this.#wsClient) {
       this.#wsClient.close({ force: true });

package/src/channels/feishu/harness-client.mjs

@@ -1,338 +1,19 @@
-import { spawn } from 'node:child_process';
-import { randomUUID } from 'node:crypto';
-import { isAbsolute } from 'node:path';
-
-import { adoptRegisteredWorkspaceSession } from '../shared/harness-session-binding.mjs';
-
-const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-
-function workspacePaths(value) {
-  if (!Array.isArray(value?.items)) return [];
-  return value.items.flatMap((item) => (
-    typeof item?.path === 'string' && isAbsolute(item.path) ? [item.path] : []
-  ));
-}
-
-function workspaceFromList(workspacePath, workspaceList) {
-  if (!Array.isArray(workspaceList?.items)
-    || !Array.isArray(workspaceList?.archivedSessionIds)) {
-    throw new Error('Harness returned an invalid response for workspace.list');
-  }
-
-  const workspace = workspaceList.items.find((item) => item?.path === workspacePath);
-  if (!workspace) return null;
-  if (!Array.isArray(workspace.sessionIds)
-    || workspace.sessionIds.some((sessionId) => typeof sessionId !== 'string')) {
-    throw new Error('Harness returned invalid session IDs for workspace.list');
-  }
-  return workspace;
-}
-
-function workspaceSessions(workspace, archivedSessionIds, sessionList) {
-  if (!Array.isArray(sessionList?.items)) {
-    throw new Error('Harness returned an invalid response for session.list');
-  }
-
-  const archived = new Set(archivedSessionIds);
-  const summaries = new Map(sessionList.items.flatMap((item) => (
-    typeof item?.sessionId === 'string' ? [[item.sessionId, item]] : []
-  )));
-  return {
-    workspace: workspace.path,
-    sessions: workspace.sessionIds.map((sessionId) => {
-      const summary = summaries.get(sessionId);
-      const title = summary?.projections?.values?.title;
-      return {
-        sessionId,
-        title: typeof title === 'string' ? title : null,
-        archived: archived.has(sessionId),
-        blank: summary?.blank === true,
-        origin: summary?.origin === 'subagent' ? 'subagent' : null,
-        summaryAvailable: summary !== undefined,
-      };
-    }),
-  };
-}
-
-function messageText(event) {
-  return (event?.data?.message?.content ?? [])
-    .filter((part) => part.type === 'text' && typeof part.text === 'string')
-    .map((part) => part.text)
-    .join('\n')
-    .trim();
-}
-
-export class HarnessReplyTracker {
-  #promptRpcId;
-  #lastSeq;
-  #openTurn = null;
-  #targetTurn = null;
-  #stepText = new Map();
-  #latestText = '';
-  #finished = false;
-  #reason = null;
-
-  constructor({ promptRpcId, afterSeq = -1 }) {
-    this.#promptRpcId = promptRpcId;
-    this.#lastSeq = afterSeq;
-  }
-
-  get finished() {
-    return this.#finished;
-  }
-
-  get answer() {
-    return this.#latestText.trim();
-  }
-
-  get reason() {
-    return this.#reason;
-  }
-
-  consume(entries) {
-    let update = null;
-    const ordered = [...entries]
-      .map((entry) => entry?.event ?? entry)
-      .filter(Boolean)
-      .sort((left, right) => (left.seq ?? -1) - (right.seq ?? -1));
-
-    for (const event of ordered) {
-      const seq = event.seq ?? -1;
-      if (seq <= this.#lastSeq) continue;
-      this.#lastSeq = seq;
-
-      if (event.type === 'turn/start') {
-        this.#openTurn = event.data?.turn ?? null;
-      }
-
-      if (event.type === 'user/message'
-        && event.data?.source?.rpcId === this.#promptRpcId) {
-        this.#targetTurn = this.#openTurn;
-        continue;
-      }
-
-      if (this.#targetTurn === null) continue;
-
-      if (event.type === 'turn/end') {
-        if (event.data?.turn !== this.#targetTurn) continue;
-        this.#finished = true;
-        this.#reason = event.data?.reason ?? null;
-        this.#openTurn = null;
-        continue;
-      }
-
-      if (event.data?.turn !== this.#targetTurn) continue;
-
-      if (event.type === 'assistant/chunk' && event.data?.chunk?.type === 'text-delta') {
-        const step = event.data?.step ?? 0;
-        const index = event.data.chunk.index ?? 0;
-        const key = `${step}:${index}`;
-        this.#stepText.set(key, (this.#stepText.get(key) ?? '') + event.data.chunk.text);
-        const stepPrefix = `${step}:`;
-        const text = [...this.#stepText.entries()]
-          .filter(([partKey]) => partKey.startsWith(stepPrefix))
-          .sort(([left], [right]) => Number(left.split(':')[1]) - Number(right.split(':')[1]))
-          .map(([, part]) => part)
-          .join('\n')
-          .trim();
-        if (text && text !== this.#latestText) {
-          this.#latestText = text;
-          update = { type: 'text', text };
-        }
-        continue;
-      }
-
-      if (event.type === 'assistant/message') {
-        const text = messageText(event);
-        if (text && text !== this.#latestText) {
-          this.#latestText = text;
-          update = { type: 'text', text };
-        }
-        continue;
-      }
-
-      if (event.type === 'tool/call') {
-        update = { type: 'tool', name: event.data?.name ?? '工具' };
-      } else if (event.type === 'tool/result') {
-        update = { type: 'status', text: '正在整理结果…' };
-      }
-    }
-
-    return update;
-  }
-}
-
-export class HarnessRpcError extends Error {
-  constructor(method, error) {
-    super(`${method}: ${error?.message ?? 'unknown Harness RPC error'}`);
-    this.name = 'HarnessRpcError';
-    this.method = method;
-    this.code = error?.code ?? 'internal';
-    this.details = error?.details ?? {};
-  }
-}
-
-export class HarnessClient {
-  #baseUrl;
-  #workspace;
-  #agentPreset;
-  #autostart;
-  #dshBin;
-  #managedProcess = null;
-
-  constructor({ baseUrl, workspace, agentPreset, autostart, dshBin }) {
-    this.#baseUrl = new URL(baseUrl);
-    this.#workspace = workspace;
-    this.#agentPreset = agentPreset;
-    this.#autostart = autostart;
-    this.#dshBin = dshBin;
-  }
-
-  async rpc(method, payload = {}, timeoutMs = 30000, options = {}) {
-    const rpcId = options.rpcId ?? `feishu-${randomUUID()}`;
-    const response = await fetch(new URL(`/api/${method}`, this.#baseUrl), {
-      method: 'POST',
-      headers: { 'content-type': 'application/json' },
-      body: JSON.stringify({ type: 'client-request', rpcId, method, payload }),
-      signal: AbortSignal.timeout(timeoutMs),
+import {
+  HarnessClient as SharedHarnessClient,
+} from '../shared/harness-client.mjs';
+
+export {
+  HarnessInteractionError,
+  HarnessReplyTracker,
+  HarnessRpcError,
+} from '../shared/harness-client.mjs';
+
+export class HarnessClient extends SharedHarnessClient {
+  constructor(options) {
+    super({
+      ...options,
+      rpcIdPrefix: 'feishu',
+      logPrefix: 'dsh-feishu',
     });
-    if (!response.ok) throw new Error(`Harness transport ${method} failed: HTTP ${response.status}`);
-    const body = await response.json();
-    if (body?.type !== 'server-response' || body?.rpcId !== rpcId) {
-      throw new Error(`Harness returned an invalid response for ${method}`);
-    }
-    if (!body.result?.ok) throw new HarnessRpcError(method, body.result?.error);
-    return body.result.value;
-  }
-
-  async health() {
-    await this.rpc('host.describe', {}, 5000);
-    return true;
-  }
-
-  async ensureRunning() {
-    try {
-      return await this.health();
-    } catch (firstError) {
-      if (!this.#autostart) throw firstError;
-    }
-
-    if (!this.#managedProcess || this.#managedProcess.exitCode !== null) {
-      const port = this.#baseUrl.port || (this.#baseUrl.protocol === 'https:' ? '443' : '80');
-      this.#managedProcess = spawn(this.#dshBin, [
-        'web',
-        '--host',
-        this.#baseUrl.hostname,
-        '--port',
-        port,
-      ], {
-        cwd: this.#workspace,
-        env: process.env,
-        stdio: ['ignore', 'inherit', 'inherit'],
-      });
-      this.#managedProcess.on('error', (error) => {
-        console.error('[bridge] failed to start Harness:', error.message);
-      });
-    }
-
-    const deadline = Date.now() + 60000;
-    let lastError;
-    while (Date.now() < deadline) {
-      await sleep(1000);
-      try {
-        return await this.health();
-      } catch (error) {
-        lastError = error;
-      }
-    }
-    throw new Error(`Harness did not become ready: ${lastError?.message ?? 'timeout'}`);
-  }
-
-  async listWorkspaces(options = {}) {
-    await this.ensureRunning();
-    return workspacePaths(await this.rpc('workspace.list', {}, 30000, options));
-  }
-
-  async listWorkspaceSessions(workspacePath, options = {}) {
-    await this.ensureRunning();
-    const workspaceList = await this.rpc('workspace.list', {}, 30000, options);
-    const workspace = workspaceFromList(workspacePath, workspaceList);
-    if (!workspace) return { workspace: workspacePath, sessions: [] };
-    const sessionList = await this.rpc('session.list', {}, 30000, options);
-    return workspaceSessions(workspace, workspaceList.archivedSessionIds, sessionList);
-  }
-
-  async adoptWorkspaceSession(value, options = {}) {
-    return adoptRegisteredWorkspaceSession(this, value, options, 30000);
-  }
-
-  async workspaceId(options = {}) {
-    const workspace = options.workspace ?? this.#workspace;
-    const { items } = await this.rpc('workspace.list', {});
-    const existing = items.find((item) => item.path === workspace);
-    if (existing) return existing.workspaceId;
-    const created = await this.rpc('workspace.create', { path: workspace });
-    return created.workspace.workspaceId;
-  }
-
-  async createSession(options = {}) {
-    await this.ensureRunning();
-    const workspaceId = await this.workspaceId(options);
-    const created = await this.rpc('session.create', {
-      workspaceId,
-      agentPreset: this.#agentPreset,
-    });
-    return created.sessionId;
-  }
-
-  async sessionExists(sessionId) {
-    try {
-      await this.rpc('session.history', { sessionId, maxMessages: 1 });
-      return true;
-    } catch (error) {
-      if (error instanceof HarnessRpcError && error.code === 'session-not-found') return false;
-      throw error;
-    }
-  }
-
-  async ask(sessionId, text, options = {}) {
-    if (typeof options === 'number') options = { timeoutMs: options };
-    const timeoutMs = options.timeoutMs ?? 600000;
-    const onUpdate = typeof options.onUpdate === 'function' ? options.onUpdate : null;
-    await this.ensureRunning();
-    const before = await this.rpc('session.history', { sessionId, maxMessages: 1 });
-    const baselineSeq = Math.max(-1, ...(before.events ?? []).map(({ event }) => event.seq ?? -1));
-    const promptRpcId = `feishu-${randomUUID()}`;
-    const tracker = new HarnessReplyTracker({ promptRpcId, afterSeq: baselineSeq });
-
-    await this.rpc('session.prompt', {
-      sessionId,
-      mode: 'queue',
-      content: [{ type: 'text', text }],
-      clientTimeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
-    }, 30000, { rpcId: promptRpcId });
-
-    const deadline = Date.now() + timeoutMs;
-    while (Date.now() < deadline) {
-      await sleep(300);
-      const history = await this.rpc('session.history', { sessionId, maxMessages: 50 });
-      const update = tracker.consume(history.events ?? []);
-      if (update && onUpdate) {
-        try {
-          await onUpdate(update);
-        } catch (error) {
-          console.warn('[bridge] ignored a progress update failure:', error.message);
-        }
-      }
-      if (!tracker.finished) continue;
-      if (tracker.answer) return tracker.answer;
-
-      throw new Error(`Harness turn ended without a text reply${tracker.reason ? ` (${JSON.stringify(tracker.reason)})` : ''}`);
-    }
-    throw new Error(`Harness reply timed out after ${Math.round(timeoutMs / 1000)} seconds`);
-  }
-
-  stopManagedProcess() {
-    if (this.#managedProcess?.exitCode === null) this.#managedProcess.kill('SIGTERM');
   }
 }

package/src/channels/qq/harness-client.mjs

@@ -1,3 +1,11 @@
-import { HarnessClient } from '../weixin/harness-client.mjs';
+import { HarnessClient } from '../shared/harness-client.mjs';
 
-export class QqHarnessClient extends HarnessClient {}
+export class QqHarnessClient extends HarnessClient {
+  constructor(options) {
+    super({
+      ...options,
+      rpcIdPrefix: 'qq',
+      logPrefix: 'dsh-qq',
+    });
+  }
+}