@fa-software/semi2-dsh 0.0.10 → 0.0.11-preview.20260921034433

package/lib/service/connection.js

@@ -7,8 +7,7 @@ import { codeOf } from '../hub/errors.js';
 /** 等运行面契约出现的上限；超时按宿主直跑（无适配器）处理。 */
 export const CONTRACT_TIMEOUT_MS = 5_000;
 const CONTRACT_POLL_MS = 25;
-const CREDENTIAL_TRIES = 10;
-const CREDENTIAL_INTERVAL_MS = 150;
+export const CREDENTIAL_RETRY = { tries: 10, intervalMs: 150 };
 /**
  * 运行面契约：适配器 apply 是长跑 async（等配置 settle），其 fiber 尚未 active：严格查找一直
  * undefined，故不用 ctx.inject 而直接宽松轮询（服务注册本身是同步的）。
@@ -36,16 +35,16 @@ export async function connectionSnapshot(ports, environment, contract) {
     return { fields, contract };
 }
 /** credentials 存储首次读盘可能晚于插件启动：有界窗口内重试，仍无凭据即按「未配置」处理。 */
-export async function resolveConnectionWithRetry(ports, environment, contract) {
+export async function resolveConnectionWithRetry(ports, environment, contract, retry = CREDENTIAL_RETRY) {
     let consoleUrl = null;
-    for (let attempt = 0; attempt < CREDENTIAL_TRIES; attempt += 1) {
+    for (let attempt = 0; attempt < retry.tries; attempt += 1) {
         const { fields } = await connectionSnapshot(ports, environment, contract);
         consoleUrl = fields.url?.value ?? consoleUrl;
         const connection = connectionOf(fields);
         if (connection !== null)
             return { connection, consoleUrl };
-        if (attempt < CREDENTIAL_TRIES - 1)
-            await delay(CREDENTIAL_INTERVAL_MS);
+        if (attempt < retry.tries - 1)
+            await delay(retry.intervalMs);
     }
     return { connection: null, consoleUrl };
 }

package/lib/service/lifecycle.js

@@ -31,7 +31,7 @@ export async function start(engine) {
         }
         await ensureContract(engine);
         engine.workspace().ensureImplicit();
-        const { connection, consoleUrl } = await resolveConnectionWithRetry(engine.ports, engine.environment, engine.contract());
+        const { connection, consoleUrl } = await resolveConnectionWithRetry(engine.ports, engine.environment, engine.contract(), engine.credentialRetry);
         engine.setConnection(await exchange(engine, connection));
         if (engine.connection() === null)
             engine.setCurrent(initialState(false, consoleUrl, engine.workspace().tracked()));

package/lib/service/orchestrator.js

@@ -1,7 +1,7 @@
 import { setTimeout as delay } from 'node:timers/promises';
 import { initialState, } from '../hub/facts.js';
 import { DOMAINS } from './registry.js';
-import { CONTRACT_TIMEOUT_MS } from './connection.js';
+import { CONTRACT_TIMEOUT_MS, CREDENTIAL_RETRY } from './connection.js';
 import { healthSnapshot } from './publish.js';
 /** 领域 attach 的等待上限：超时按「该面不提供此能力」审计（依赖永不到达不能永久悬空）。 */
 const DOMAIN_ATTACH_TIMEOUT_MS = 2_000;
@@ -25,6 +25,7 @@ export class Orchestrator {
     environment;
     startupDir;
     contractTimeoutMs;
+    credentialRetry;
     runtimeContract;
     resolved = false;
     activeConnection = null;
@@ -41,6 +42,7 @@ export class Orchestrator {
         this.environment = { ...environment };
         this.startupDir = process.cwd();
         this.contractTimeoutMs = options.contractTimeoutMs ?? CONTRACT_TIMEOUT_MS;
+        this.credentialRetry = { ...CREDENTIAL_RETRY, ...options.credentialRetry };
         const settled = Promise.withResolvers();
         this.ready = settled.promise;
         this.settledResolve = settled.resolve;

package/lib/types/service/connection.d.ts

@@ -5,6 +5,12 @@ import type { Semi2Api } from '../api/index.js';
 import type { Ports } from './ports.js';
 /** 等运行面契约出现的上限；超时按宿主直跑（无适配器）处理。 */
 export declare const CONTRACT_TIMEOUT_MS = 5000;
+/** 凭据存储首次读盘可能晚于插件启动：有界重试窗口（生产默认见 CREDENTIAL_RETRY）。 */
+export interface CredentialRetry {
+    tries: number;
+    intervalMs: number;
+}
+export declare const CREDENTIAL_RETRY: CredentialRetry;
 export interface ConnectionStore {
     /** 当前连接凭据（契约或 dsh credentials 存储）；未配置为 null。 */
     get(): ConnectionCredentials | null;
@@ -27,7 +33,7 @@ export interface ConnectionResolution {
 /** 凭据与地址的当前快照（地址单独解析：只有地址没有令牌也算「未登录但已知端点」）。 */
 export declare function connectionSnapshot(ports: Ports, environment: NodeJS.ProcessEnv, contract: Semi2Runtime | undefined): Promise<ConnectionSnapshot>;
 /** credentials 存储首次读盘可能晚于插件启动：有界窗口内重试，仍无凭据即按「未配置」处理。 */
-export declare function resolveConnectionWithRetry(ports: Ports, environment: NodeJS.ProcessEnv, contract: Semi2Runtime | undefined): Promise<ConnectionResolution>;
+export declare function resolveConnectionWithRetry(ports: Ports, environment: NodeJS.ProcessEnv, contract: Semi2Runtime | undefined, retry?: CredentialRetry): Promise<ConnectionResolution>;
 /**
  * CNB 面：把平台注入的短期 CNB_TOKEN 换成 hub 用户密钥（一次兑换，之后一律用换来的密钥）。
  * 兑换失败按现有降级口径：本次不注入配置，不阻断会话。其它面 / 登录态原样返回。

package/lib/types/service/orchestrator.d.ts

@@ -6,6 +6,7 @@ import type { Semi2Runtime } from '../contract.js';
 import type { ConnectionCredentials } from '../hub/credentials.js';
 import type { HealthContributor } from './health.js';
 import type { Ports, SettingsLike } from './ports.js';
+import { type CredentialRetry } from './connection.js';
 /** 编排层驱动的工作区面 = 工作区 peer 去掉项目解析（缺席时由空操作替身顶上）。 */
 export type WorkspaceOps = Omit<WorkspacePeer, 'projectForCwd' | 'workspaceProjects'>;
 export declare const NOOP_WORKSPACE: WorkspaceOps;
@@ -18,6 +19,7 @@ export interface OrchestratorInternals {
     /** 启动目录（迁移与状态展示共用同一个事实；状态渲染因此保持纯函数）。 */
     readonly startupDir: string;
     readonly contractTimeoutMs: number;
+    readonly credentialRetry: CredentialRetry;
     readonly domains: ReadonlyMap<DomainId, DomainService & object>;
     /** 领域 peer 面（类型化；该领域未就位返回 undefined）。 */
     peer<K extends DomainId>(id: K): DomainPeers[K] | undefined;
@@ -45,7 +47,10 @@ export interface OrchestratorInternals {
     noteFailure(area: string, error: unknown): string;
 }
 export interface OrchestratorOptions {
+    /** 等运行面契约出现的上限（ms）：默认 5s，宿主直跑即等满。 */
     contractTimeoutMs?: number;
+    /** 凭据重试窗口：宿主的凭据存储晚就绪时用（测试可收短，默认见 connection.ts）。 */
+    credentialRetry?: Partial<CredentialRetry>;
 }
 export declare class Orchestrator implements DomainHost, OrchestratorInternals {
     readonly ctx: Context;
@@ -57,6 +62,7 @@ export declare class Orchestrator implements DomainHost, OrchestratorInternals {
     readonly environment: NodeJS.ProcessEnv;
     readonly startupDir: string;
     readonly contractTimeoutMs: number;
+    readonly credentialRetry: CredentialRetry;
     private runtimeContract;
     private resolved;
     private activeConnection;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fa-software/semi2-dsh",
-  "version": "0.0.10",
+  "version": "0.0.11-preview.20260921034433",
   "type": "module",
   "description": "Semi2 单插件：semi2-hub 配置引导 + codegraph 结构索引 + 公共 Web 能力。",
   "main": "lib/index.js",
@@ -77,7 +77,6 @@
   "scripts": {
     "build": "rm -rf lib && node scripts/gen-documents.mjs && graphql-codegen -c codegen.ts && tsc -p tsconfig.json && tsdown -c tsdown.config.ts",
     "typecheck": "tsc -p tsconfig.json --noEmit",
-    "test": "pnpm run build && node --test test/*.test.mjs",
     "dev": "tsc -p tsconfig.json --watch --preserveWatchOutput",
     "dev:client": "tsdown -c tsdown.config.ts --watch"
   }