@bolloon/bolloon-agent 0.1.12 → 0.1.14

package/src/network/iroh-transport.ts

@@ -56,6 +56,7 @@ interface MessageStore {
   dequeueOfflineMessage(id: string): Promise<void>;
   incrementOfflineRetry(id: string): Promise<void>;
   getPendingOfflineCount(): Promise<number>;
+  getAllOfflineTargets(): Promise<string[]>;
   savePendingResponse(req: Omit<PendingResponse, 'id'>): Promise<PendingResponse>;
   getPendingResponse(requestId: string): Promise<PendingResponse | null>;
   removePendingResponse(requestId: string): Promise<void>;
@@ -172,6 +173,9 @@ export class IrohTransport {
         for (const queue of offlineQueues.values()) count += queue.length;
         return count;
       },
+      async getAllOfflineTargets() {
+        return Array.from(offlineQueues.keys());
+      },
       async savePendingResponse(req) {
         const id = crypto.randomUUID();
         const pending = { ...req, id };
@@ -196,9 +200,14 @@ export class IrohTransport {
     if (!this.messageStore) return;
 
     this.offlineDeliveryInterval = setInterval(async () => {
+      // 遍历所有有离线消息的目标节点（不仅是"已连接"的）
+      // 这样目标节点一旦在线（accept 连接）就能拿到离线消息
+      const allTargets = await this.messageStore!.getAllOfflineTargets();
       const connectedPeers = this.getConnectedPeers();
+      // 合并：已连接 + 有离线消息但未连接（也会去尝试 connect）
+      const targets = new Set<string>([...connectedPeers, ...allTargets]);
 
-      for (const peerId of connectedPeers) {
+      for (const peerId of targets) {
         const offlineMsgs = await this.messageStore!.getOfflineMessages(peerId);
 
         for (const msg of offlineMsgs) {
@@ -216,6 +225,8 @@ export class IrohTransport {
             if (success) {
               await this.messageStore!.dequeueOfflineMessage(msg.id);
               console.log(`[IrohTransport] Delivered offline message to ${peerId.substring(0, 12)}...`);
+            } else {
+              await this.messageStore!.incrementOfflineRetry(msg.id);
             }
           } catch {
             await this.messageStore!.incrementOfflineRetry(msg.id);
@@ -461,8 +472,10 @@ export class IrohTransport {
         await send.finish();
 
         // 等待响应，带超时
+        // 注意: server sendResponse 后会关闭连接，导致 readToEnd 以 "connection lost" 错误 reject
+        // 这里我们把 readToEnd 的错误吞掉（视为流结束），只有超时才视为失败
         const response = await Promise.race([
-          recv.readToEnd(64 * 1024),
+          recv.readToEnd(64 * 1024).catch(() => new Uint8Array(0)),
           new Promise<null>((_, rejectTimeout) =>
             setTimeout(() => rejectTimeout(new Error('timeout')), timeout)
           ),

package/src/network/p2p.ts

@@ -546,8 +546,8 @@ export class P2PNetwork {
         const colonIdx = messageStr.indexOf(':');
         const didMarker = 'DID:';
         let did: string | undefined;
-        let type: string;
-        let payload: string;
+        let type = 'message';
+        let payload = '';
         let requestId: string | undefined = undefined;
 
         if (messageStr.startsWith(didMarker)) {
@@ -770,7 +770,11 @@ export class P2PNetwork {
    * Register a handler for responses (used by the receiving side)
    */
   onResponse(type: string, handler: (payload: string, from: string, did?: string, requestId?: string) => void): void {
-    this.messageHandlers.set(type, handler);
+    // Store as pendingResponseHandlers-shaped wrapper. Extra args (did, requestId) are not
+    // available in pendingResponseHandlers signature, so ignore them when invoked.
+    this.pendingResponseHandlers.set(type, (responseData: string, from: string) => {
+      handler(responseData, from, undefined, undefined);
+    });
   }
 
   /**
@@ -797,11 +801,8 @@ export class P2PNetwork {
   private handleRequest(type: string, payload: string, requestId: string, fromPeerId: string, did?: string): void {
     const handler = this.messageHandlers.get(type);
     if (handler) {
-      // Create a wrapper that sends the response
-      const originalHandler = handler;
-      handler = (msg: Uint8Array, from: string, didParam?: string) => {
-        originalHandler(msg, from, didParam);
-      };
+      // Forward raw payload; callers register with onMessage() and adapt as needed.
+      handler(new TextEncoder().encode(payload), fromPeerId, did);
     }
 
     // Check if there's a response handler registered

package/src/network/storage/adapters/json-adapter.ts

@@ -16,7 +16,7 @@ import type {
   MessageQueryOptions,
   StorageConfig,
   MessageStatus,
-} from './types.js';
+} from '../types';
 
 const DEFAULT_CONFIG: Required<StorageConfig> = {
   baseDir: '',
@@ -69,7 +69,7 @@ export class JsonMessageStore implements MessageStore {
     const filePath = this.getMessageFilePath(new Date(msg.timestamp));
 
     await this.withLock(filePath, async () => {
-      const messages = await this.readJsonFile<StoredMessage[]>(filePath) || [];
+      let messages = await this.readJsonFile<StoredMessage[]>(filePath) || [];
       messages.push(stored);
 
       // 如果文件过大，拆分
@@ -238,6 +238,21 @@ export class JsonMessageStore implements MessageStore {
     return count;
   }
 
+  async getAllOfflineTargets(): Promise<string[]> {
+    // 重新从磁盘加载最新状态（避免内存 vs 磁盘不一致）
+    const baseDir = path.join(this.config.baseDir, 'offline');
+    let files: string[] = [];
+    try {
+      files = await fs.readdir(baseDir);
+    } catch {
+      return Array.from(this.offlineMessages.keys());
+    }
+    return files
+      .filter((f) => f.endsWith('.json'))
+      .map((f) => f.replace(/\.json$/, ''))
+      .filter((id) => id.length > 0);
+  }
+
   // ============================================================================
   // 待响应请求
   // ============================================================================

package/src/network/storage/index.ts

@@ -3,7 +3,7 @@
  * 导出消息存储工厂函数和类型
  */
 
-export type {
+import type {
   MessageStore,
   StoredMessage,
   OfflineMessage,
@@ -18,11 +18,27 @@ export type {
   IrohMessage,
   IrohMessageHandler,
 } from './types.js';
+import { DEFAULT_STORAGE_CONFIG } from './types.js';
+
+export type {
+  MessageStore,
+  StoredMessage,
+  OfflineMessage,
+  PendingResponse,
+  LocalPendingRequest,
+  MessageQueryOptions,
+  StorageConfig,
+  MessageDirection,
+  MessageStatus,
+  TransportType,
+  IrohPeer,
+  IrohMessage,
+  IrohMessageHandler,
+};
 
-export { DEFAULT_STORAGE_CONFIG } from './types.js';
+export { DEFAULT_STORAGE_CONFIG };
 
 import { JsonMessageStore } from './adapters/json-adapter.js';
-import type { MessageStore, StorageConfig } from './types.js';
 import * as path from 'path';
 
 // 默认存储配置

package/src/social/channels/channel-heartbeat-agent.ts

@@ -388,7 +388,7 @@ export class ChannelHeartbeatAgent {
         senderName: peer.name
       };
 
-      const decision = this.judgmentEngine.decide(context);
+      const decision = await this.judgmentEngine.decide(context);
 
       if (decision.shouldCall) {
         console.log(`[HeartbeatAgent] Auto-triggering Harness: Gate ${decision.gate} for ${peer.name}`);

package/src/types.d.ts

@@ -0,0 +1,12 @@
+/**
+ * 缺失类型模块的兜底声明 — 让 strict tsc 通过, 避免阻塞发布。
+ * 这些是项目里实际使用但 @types 包未安装或缺失的小依赖。
+ */
+declare module 'js-yaml' {
+  const yaml: {
+    load: (str: string) => any;
+    dump: (obj: any, opts?: any) => string;
+  };
+  export default yaml;
+  export = yaml;
+}

package/src/utils/auto-update.ts

@@ -283,27 +283,27 @@ function checkNpmOutdated(): OutdatedPackage[] {
  * 自动更新 npm 包
  */
 async function updatePackages(packages?: string[]): Promise<UpdateResult> {
-  try {
-    const args = packages && packages.length > 0
-      ? ['npm', 'install', ...packages, '--save']
-      : ['npm', 'install', '-g', '@bolloon/bolloon-agent'];
+  // 记录更新前的版本，用于事后判断"是否真的升级了"
+  // 与 getInstalledVersion 的"优先读全局"保持一致 —— install 也用 -g，
+  // 否则判断和执行落在不同的目录，永远改不到那个被读取的版本号。
+  const targets = packages && packages.length > 0 ? packages : ['@bolloon/bolloon-agent'];
+  const before = new Map<string, string | null>();
+  for (const p of targets) before.set(p, getInstalledVersion(p));
+
+  const isGlobal = !packages || packages.length === 0;
+  const args = isGlobal
+    ? ['npm', 'install', '-g', ...targets]
+    : ['npm', 'install', ...targets, '--save'];
 
-    log(`\n${CYAN}📦 正在更新包...${RESET}\n`, RESET);
+  log(`\n${CYAN}📦 正在更新包...${RESET}\n`, RESET);
 
-    // 执行 npm install
-    const result = execSync(args.join(' '), {
+  try {
+    execSync(args.join(' '), {
       encoding: 'utf-8',
       timeout: 300000, // 5分钟超时
       stdio: 'inherit',
       cwd: process.cwd()
     });
-
-    return {
-      success: true,
-      updated: true,
-      message: '更新成功',
-      updatedPackages: packages
-    };
   } catch (e: any) {
     return {
       success: false,
@@ -312,6 +312,37 @@ async function updatePackages(packages?: string[]): Promise<UpdateResult> {
       error: e.message
     };
   }
+
+  // install 退出码 0 并不等于"真的升上去了"（"up to date" 也是 0）。
+  // 重新读取磁盘版本，只有真的达到目标 latest 之一才算 updated。
+  const upgraded: string[] = [];
+  const failed: string[] = [];
+  for (const p of targets) {
+    const after = getInstalledVersion(p);
+    const was = before.get(p);
+    if (after && was && compareVersions(was, after) < 0) {
+      upgraded.push(p);
+    } else if (after && was && compareVersions(was, after) === 0) {
+      // 版本没变 —— install 跑过但没改动；不当作"刚升级"
+    } else {
+      failed.push(p);
+    }
+  }
+
+  if (upgraded.length > 0) {
+    return {
+      success: true,
+      updated: true,
+      message: `已更新: ${upgraded.join(', ')}`,
+      updatedPackages: upgraded
+    };
+  }
+  return {
+    success: true,
+    updated: false,
+    message: '已是最新版本，无需重启',
+    updatedPackages: []
+  };
 }
 
 /**