@xmoxmo/bncr 0.6.7 → 0.6.8

package/src/channel.ts

@@ -348,6 +348,7 @@ class BncrBridgeRuntime {
   // 内置健康/回归计数（替代独立脚本）
   private startedAt = now();
   private stopped = false;
+  private serviceStarted = false;
   private connectEventsByAccount = new Map<string, number>();
   private inboundEventsByAccount = new Map<string, number>();
   private activityEventsByAccount = new Map<string, number>();
@@ -840,8 +841,21 @@ class BncrBridgeRuntime {
     return BNCR_DEBUG_VERBOSE;
   }
 
-  startService = async (ctx: OpenClawPluginServiceContext, debug?: boolean) => {
-    await startBncrBridgeService(
+  getRuntimeObservation() {
+    const activeChannelAccounts = this.channelAccountWorkers.size;
+    return {
+      serviceRunning: this.serviceStarted,
+      channelRunning: activeChannelAccounts > 0,
+      activeChannelAccounts,
+    };
+  }
+
+  startService = async (
+    ctx: OpenClawPluginServiceContext,
+    debug?: boolean,
+    isStartCurrent?: () => boolean,
+  ) => {
+    const started = await startBncrBridgeService(
       {
         bridgeId: this.bridgeId,
         setStopped: (value) => {
@@ -865,11 +879,19 @@ class BncrBridgeRuntime {
           (((cfg as BncrChannelConfigRoot | null | undefined)?.channels || null)?.[CHANNEL_ID] as
             | Record<string, unknown>
             | undefined) || {},
+        resumeOutboxDrain: () => {
+          if (this.outbox.size === 0 || this.connections.size === 0) return;
+          this.schedulePushDrain(0);
+        },
+        isStartCurrent,
       },
       ctx,
       debug,
     );
+    if (!started || this.stopped || !(isStartCurrent?.() ?? true)) return false;
     this.startHistoryShardWorker();
+    this.serviceStarted = true;
+    return true;
   };
 
   stopService = async () => {
@@ -887,6 +909,7 @@ class BncrBridgeRuntime {
   }
 
   private cleanupRuntimeWaitersAndTimers(reason: string) {
+    this.serviceStarted = false;
     this.stopHistoryShardWorker(reason);
     this.clientRpcRuntime.shutdown();
     cleanupBncrBridgeRuntime(

package/src/plugin/bridge-lifecycle.ts

@@ -59,13 +59,15 @@ export function startBncrBridgeService(
     getChannelConfigRoot: (
       cfg: BncrChannelConfigRoot,
     ) => BncrChannelPolicyConfig | null | undefined;
+    resumeOutboxDrain?: () => void;
+    isStartCurrent?: () => boolean;
   },
   ctx: OpenClawPluginServiceContext,
   debug?: boolean,
 ) {
-  runtime.setStopped(false);
   runtime.setStatePath(path.join(ctx.stateDir, 'bncr-bridge-state.json'));
   return (async () => {
+    const isStartCurrent = () => runtime.isStartCurrent?.() ?? true;
     try {
       const cfg = runtime.getRuntimeConfig();
       runtime.initializeCanonicalAgentId(cfg);
@@ -76,8 +78,10 @@ export function startBncrBridgeService(
       // ignore startup canonical agent initialization errors
     }
     await runtime.loadState();
+    if (!isStartCurrent()) return false;
     if (process.env.BNCR_SQLITE_CUTOVER === '1' && runtime.cutoverToSqlite) {
       const cutover = await runtime.cutoverToSqlite();
+      if (!isStartCurrent()) return false;
       runtime.logInfo(
         'sqlite',
         `cutover completed backup=${cutover.backupPath || 'none'} storeMode=${cutover.storeMode}`,
@@ -85,6 +89,8 @@ export function startBncrBridgeService(
     }
     if (typeof debug === 'boolean') runtime.setDebugFlag(debug);
     await runtime.refreshDebugFlagFromConfig({ forceLog: true });
+    if (!isStartCurrent()) return false;
+    runtime.setStopped(false);
     const bootDiag = runtime.buildIntegratedDiagnostics(BNCR_DEFAULT_ACCOUNT_ID);
     runtime.logInfo(
       'startup',
@@ -95,7 +101,12 @@ export function startBncrBridgeService(
       `service started bridge=${runtime.bridgeId} diag.ok=${bootDiag.regression.ok} routes=${bootDiag.regression.totalKnownRoutes} pending=${bootDiag.health.pending} dead=${bootDiag.health.deadLetter}`,
       { debugOnly: true },
     );
-  })();
+    runtime.resumeOutboxDrain?.();
+    return true;
+  })().catch((error) => {
+    runtime.setStopped(true);
+    throw error;
+  });
 }
 
 export function cleanupBncrBridgeRuntime(