most-box 0.2.0 → 0.2.1

package/server/src/index.js

@@ -16,6 +16,7 @@ import b4a from 'b4a'
 import crypto from 'node:crypto'
 import fs from 'node:fs'
 import path from 'node:path'
+import { Duplex } from 'node:stream'
 
 import { calculateCid, parseMostLink, buildMostLink } from './core/cid.js'
 import { normalizeChannelAttachment } from './core/channelAttachment.js'
@@ -28,11 +29,9 @@ import {
   normalizeChannelDisplayName,
   normalizeChannelAvatar,
   normalizeChannelId,
-  createChannelFingerprint,
   createChannelWriterId,
   buildChannelKey,
   normalizeChannelKey,
-  getChannelFingerprintFromKey,
   uniqueStrings,
 } from './core/channelIdentity.js'
 import { getPathBaseName, getDisplayPathFolder } from './core/displayPath.js'
@@ -99,6 +98,44 @@ import {
 
 const sleep = ms => new Promise(resolve => setTimeout(resolve, ms))
 
+function createMemoryDuplexPair() {
+  let left
+  let right
+
+  left = new Duplex({
+    read() {},
+    write(chunk, _encoding, callback) {
+      if (!right.destroyed) right.push(chunk)
+      callback()
+    },
+    final(callback) {
+      if (!right.destroyed) right.push(null)
+      callback()
+    },
+  })
+
+  right = new Duplex({
+    read() {},
+    write(chunk, _encoding, callback) {
+      if (!left.destroyed) left.push(chunk)
+      callback()
+    },
+    final(callback) {
+      if (!left.destroyed) left.push(null)
+      callback()
+    },
+  })
+
+  left.on('close', () => {
+    if (!right.destroyed) right.destroy()
+  })
+  right.on('close', () => {
+    if (!left.destroyed) left.destroy()
+  })
+
+  return [left, right]
+}
+
 export class MostBoxEngine extends EventEmitter {
   #store = null
   #swarm = null
@@ -123,6 +160,7 @@ export class MostBoxEngine extends EventEmitter {
   #channelIdDiscoveries = new Map()
   #channelPeers = new Map()
   #channelCandidateCache = new Map()
+  #channelStreams = new Set()
 
   #userSyncSessions = new Map()
   #userSyncCores = new Map()
@@ -387,6 +425,7 @@ export class MostBoxEngine extends EventEmitter {
     this.#channelIdDiscoveries.clear()
     this.#channelPeers.clear()
     this.#channelCandidateCache.clear()
+    this.#channelStreams.clear()
     this.#channels = []
 
     for (const [, coresMap] of this.#userSyncCores) {
@@ -1739,10 +1778,15 @@ export class MostBoxEngine extends EventEmitter {
 
     const left = this.#store.replicate(true, { live: true })
     const right = peerEngine.#store.replicate(false, { live: true })
+    const [leftChat, rightChat] = createMemoryDuplexPair()
 
     left.on('error', () => {})
     right.on('error', () => {})
+    leftChat.on('error', () => {})
+    rightChat.on('error', () => {})
     left.pipe(right).pipe(left)
+    this.#handleChannelConnection(leftChat).catch(() => {})
+    peerEngine.#handleChannelConnection(rightChat).catch(() => {})
     this.#exchangeUserSyncSessions(peerEngine).catch(() => {})
     peerEngine.#exchangeUserSyncSessions(this).catch(() => {})
 
@@ -1750,6 +1794,8 @@ export class MostBoxEngine extends EventEmitter {
       close: () => {
         left.destroy()
         right.destroy()
+        leftChat.destroy()
+        rightChat.destroy()
       },
     }
   }
@@ -2050,7 +2096,7 @@ export class MostBoxEngine extends EventEmitter {
   // --- 频道管理 ---
 
   /**
-   * 创建或加入频道。channelId 是用户输入的短 ID，channelKey 是内部唯一身份。
+   * 创建或加入频道。channelId 是用户输入的短 ID，channelKey 与频道名一致。
    * @param {string} channelIdInput - 用户可见短频道 ID
    * @param {string} [type='personal'] - 频道类型
    * @returns {Promise<object>}
@@ -2060,8 +2106,6 @@ export class MostBoxEngine extends EventEmitter {
     const ownerAddress = normalizeOwnerAddress(options.ownerAddress)
     const channelId = normalizeChannelId(channelIdInput)
     const channelType = String(type || 'personal').trim() || 'personal'
-    const selectedChannelKey = normalizeChannelKey(options.channelKey)
-    const selectedFingerprint = String(options.fingerprint || '').trim()
 
     if (channelId.includes('.') && channelType !== 'game') {
       throw new Error('点号为系统保留，不能用于手动频道 ID')
@@ -2079,30 +2123,6 @@ export class MostBoxEngine extends EventEmitter {
       throw new Error(`频道名最多 ${CHANNEL_NAME_MAX_LENGTH} 个字符`)
     }
 
-    if (selectedChannelKey || selectedFingerprint) {
-      const channelKey =
-        selectedChannelKey || buildChannelKey(channelId, selectedFingerprint)
-      const existing = this.#channels.find(c => c.channelKey === channelKey)
-      if (existing) {
-        await this.#mergeChannelWriterCoreKeys(
-          existing,
-          options.writerCoreKeys
-        )
-        if (this.#upsertChannelMember(existing, options)) {
-          existing.syncUpdatedAt = getNextSyncTimestamp(existing.syncUpdatedAt)
-          this.#saveChannelsMetadata()
-          this.#appendUserSyncChannelUpsertSoon(existing, ownerAddress)
-        }
-        return this.#formatChannelForResponse(existing, ownerAddress)
-      }
-
-      const candidate = this.#getCachedChannelCandidate(channelId, channelKey)
-      if (!candidate) {
-        throw new Error('未发现该频道候选，请重新搜索频道')
-      }
-      return this.#joinChannelFromCandidate(candidate, channelType, options)
-    }
-
     const localCandidates = this.#getLocalChannelCandidates(channelId)
     const remoteCandidates = options.discover
       ? await this.#discoverChannelCandidates(channelId, {
@@ -2114,28 +2134,26 @@ export class MostBoxEngine extends EventEmitter {
       ...remoteCandidates,
     ])
 
-    if (candidates.length > 1) {
-      return {
-        conflict: true,
-        channelId,
-        candidates: candidates.map(candidate =>
-          this.#formatChannelCandidateForResponse(candidate, ownerAddress)
-        ),
-      }
-    }
-
-    if (candidates.length === 1) {
+    if (candidates.length > 0) {
       const candidate = candidates[0]
       if (candidate.local) {
         const existing = this.#channels.find(
           channel => channel.channelKey === candidate.channelKey
         )
-        if (existing && this.#upsertChannelMember(existing, options)) {
-          existing.syncUpdatedAt = getNextSyncTimestamp(existing.syncUpdatedAt)
-          this.#saveChannelsMetadata()
-          this.#appendUserSyncChannelUpsertSoon(existing, ownerAddress)
+        if (existing) {
+          const writerKeysChanged = await this.#mergeChannelWriterCoreKeys(
+            existing,
+            candidate.writerCoreKeys
+          )
+          const memberChanged = this.#upsertChannelMember(existing, options)
+          if (writerKeysChanged || memberChanged) {
+            existing.syncUpdatedAt = getNextSyncTimestamp(existing.syncUpdatedAt)
+            this.#saveChannelsMetadata()
+            this.#appendUserSyncChannelUpsertSoon(existing, ownerAddress)
+            this.#broadcastChannelHello()
+          }
+          return this.#formatChannelForResponse(existing, ownerAddress)
         }
-        if (existing) return this.#formatChannelForResponse(existing, ownerAddress)
         const joined = await this.#joinChannelFromCandidate(
           candidate,
           channelType,
@@ -2188,25 +2206,32 @@ export class MostBoxEngine extends EventEmitter {
           ? { channelKey: String(candidateInput), channelId }
           : null
 
-    if (!candidate?.channelKey && !candidate?.fingerprint) {
+    if (!candidate?.channelKey) {
       return this.createChannel(channelId, options.type || 'group', options)
     }
 
-    const channelKey =
-      normalizeChannelKey(candidate.channelKey) ||
-      buildChannelKey(channelId, String(candidate.fingerprint || '').trim())
+    const channelKey = buildChannelKey(channelId)
     const existing = this.#channels.find(c => c.channelKey === channelKey)
     if (existing) {
-      await this.#mergeChannelWriterCoreKeys(existing, candidate.writerCoreKeys)
-      if (this.#upsertChannelMember(existing, options)) {
+      const writerKeysChanged = await this.#mergeChannelWriterCoreKeys(
+        existing,
+        candidate.writerCoreKeys
+      )
+      const memberChanged = this.#upsertChannelMember(existing, options)
+      if (writerKeysChanged || memberChanged) {
         existing.syncUpdatedAt = getNextSyncTimestamp(existing.syncUpdatedAt)
         this.#saveChannelsMetadata()
         this.#appendUserSyncChannelUpsertSoon(existing, options.ownerAddress)
+        this.#broadcastChannelHello()
       }
       return this.#formatChannelForResponse(existing, options.ownerAddress)
     }
 
-    const cached = this.#getCachedChannelCandidate(channelId, channelKey)
+    const cached =
+      this.#getCachedChannelCandidate(
+        channelId,
+        normalizeChannelKey(candidate.channelKey)
+      ) || this.#getCachedChannelCandidate(channelId, channelKey)
     const joined = await this.#joinChannelFromCandidate(cached || candidate, 'group', {
       ...options,
       channelKey,
@@ -2517,7 +2542,9 @@ export class MostBoxEngine extends EventEmitter {
       author,
       authorName,
       content: trimmed,
-      timestamp: Date.now(),
+      timestamp: await this.#getNextChannelMessageTimestamp(
+        channel.channelKey
+      ),
     }
     if (attachment) {
       message.attachment = attachment
@@ -2597,21 +2624,15 @@ export class MostBoxEngine extends EventEmitter {
     let channel = this.#channels.find(c => c.channelKey === value)
     if (channel) return channel
 
-    const matches = this.#channels.filter(c => c.channelId === value)
-    const visibleMatches = owner
-      ? matches.filter(c => this.#channelHasMember(c, owner))
-      : matches
-    if (visibleMatches.length === 1) return visibleMatches[0]
-    if (visibleMatches.length > 1) {
-      throw new Error('频道 ID 存在多个候选，请使用 channelKey')
+    channel = this.#channels.find(c => c.channelId === value)
+    if (channel && (!owner || this.#channelHasMember(channel, owner))) {
+      return channel
     }
     throw new Error('频道不存在')
   }
 
   async #createLocalChannel(channelId, type = 'personal', options = {}) {
-    const fingerprint =
-      String(options.fingerprint || '').trim() || createChannelFingerprint()
-    const channelKey = buildChannelKey(channelId, fingerprint)
+    const channelKey = buildChannelKey(channelId)
     const writerId = String(options.writerId || '').trim() || createChannelWriterId()
     const ns = this.#store.namespace(`channel-${channelKey}`)
     const localCore = ns.get({
@@ -2626,7 +2647,6 @@ export class MostBoxEngine extends EventEmitter {
     ])
     const channelInfo = {
       channelId,
-      fingerprint,
       channelKey,
       name: channelId,
       type: String(type || 'personal').trim() || 'personal',
@@ -2651,6 +2671,7 @@ export class MostBoxEngine extends EventEmitter {
     await this.#joinChannelDiscoveryTopics(channelInfo)
     this.#cacheChannelCandidate(this.#channelToCandidate(channelInfo, true))
     this.#saveChannelsMetadata()
+    this.#broadcastChannelHello()
     return channelInfo
   }
 
@@ -2658,24 +2679,18 @@ export class MostBoxEngine extends EventEmitter {
     const channelId = normalizeChannelId(
       candidateInput.channelId || options.channelId
     )
-    const channelKey = normalizeChannelKey(candidateInput.channelKey)
-    const fingerprint =
-      String(candidateInput.fingerprint || '').trim() ||
-      getChannelFingerprintFromKey(channelId, channelKey)
-    if (!channelId || !fingerprint) {
+    const channelKey = buildChannelKey(channelId)
+    if (!channelId || !channelKey) {
       throw new Error('频道候选缺少身份信息')
     }
-    const expectedChannelKey = buildChannelKey(channelId, fingerprint)
-    if (channelKey && channelKey !== expectedChannelKey) {
-      throw new Error('频道候选身份格式不匹配')
-    }
 
     const existing = this.#channels.find(
-      channel => channel.channelKey === expectedChannelKey
+      channel => channel.channelKey === channelKey
     )
     if (existing) {
       if (this.#upsertChannelMember(existing, options)) {
         this.#saveChannelsMetadata()
+        this.#broadcastChannelHello()
       }
       return this.#formatChannelForResponse(existing, options.ownerAddress)
     }
@@ -2691,7 +2706,6 @@ export class MostBoxEngine extends EventEmitter {
     const channelInfo = await this.#createLocalChannel(channelId, candidateInput.type || type, {
       ...options,
       ownerAddress,
-      fingerprint,
       createdAt: candidateInput.createdAt,
       lastMessageAt: candidateInput.lastMessageAt,
       writerCoreKeys: candidateInput.writerCoreKeys,
@@ -2805,7 +2819,18 @@ export class MostBoxEngine extends EventEmitter {
   }
 
   async #discoverChannelCandidates(channelId, options = {}) {
-    if (this.#options.disableNetwork) return []
+    const getCachedCandidates = () => {
+      const now = Date.now()
+      return [
+        ...(this.#channelCandidateCache.get(channelId)?.values() || []),
+      ].filter(
+        candidate =>
+          candidate.local ||
+          !candidate.lastSeen ||
+          now - candidate.lastSeen <= CHANNEL_CANDIDATE_TTL
+      )
+    }
+    if (this.#options.disableNetwork) return getCachedCandidates()
     const timeout =
       Number(options.timeout) >= 0
         ? Number(options.timeout)
@@ -2819,15 +2844,7 @@ export class MostBoxEngine extends EventEmitter {
       this.#channelIdDiscoveries.set(channelId, discovery)
     }
     await sleep(timeout)
-    const now = Date.now()
-    const candidates = [
-      ...(this.#channelCandidateCache.get(channelId)?.values() || []),
-    ].filter(
-      candidate =>
-        candidate.local ||
-        !candidate.lastSeen ||
-        now - candidate.lastSeen <= CHANNEL_CANDIDATE_TTL
-    )
+    const candidates = getCachedCandidates()
     if (!hadDiscovery && !this.#channels.some(c => c.channelId === channelId)) {
       this.#channelIdDiscoveries.delete(channelId)
       this.#chatSwarm
@@ -2846,7 +2863,6 @@ export class MostBoxEngine extends EventEmitter {
         byKey.set(candidate.channelKey, {
           ...candidate,
           writerCoreKeys: uniqueStrings(candidate.writerCoreKeys),
-          onlineCount: Number(candidate.onlineCount) || (candidate.local ? 0 : 1),
         })
         continue
       }
@@ -2858,9 +2874,6 @@ export class MostBoxEngine extends EventEmitter {
           ...existing.writerCoreKeys,
           ...(candidate.writerCoreKeys || []),
         ]),
-        onlineCount:
-          Math.max(Number(existing.onlineCount) || 0, 0) +
-          (candidate.local ? 0 : 1),
       })
     }
     return [...byKey.values()]
@@ -2869,66 +2882,47 @@ export class MostBoxEngine extends EventEmitter {
   #channelToCandidate(channel, local = false) {
     return {
       channelId: channel.channelId,
-      fingerprint: channel.fingerprint,
       channelKey: channel.channelKey,
       type: channel.type,
       createdAt: channel.createdAt,
       lastMessageAt: channel.lastMessageAt || '',
       writerCoreKeys: uniqueStrings(channel.writerCoreKeys),
       local,
-      onlineCount: local ? 0 : 1,
     }
   }
 
   #cacheChannelCandidate(candidate) {
-    if (!candidate?.channelId || !candidate?.channelKey) return
-    if (!this.#channelCandidateCache.has(candidate.channelId)) {
-      this.#channelCandidateCache.set(candidate.channelId, new Map())
-    }
-    const cache = this.#channelCandidateCache.get(candidate.channelId)
-    const existing = cache.get(candidate.channelKey)
-    cache.set(candidate.channelKey, {
+    const channelId = normalizeChannelId(candidate?.channelId)
+    const channelKey = buildChannelKey(channelId)
+    if (!channelId || !channelKey) return
+    if (!this.#channelCandidateCache.has(channelId)) {
+      this.#channelCandidateCache.set(channelId, new Map())
+    }
+    const cache = this.#channelCandidateCache.get(channelId)
+    const existing = cache.get(channelKey)
+    cache.set(channelKey, {
       ...existing,
       ...candidate,
+      channelId,
+      channelKey,
       writerCoreKeys: uniqueStrings([
         ...(existing?.writerCoreKeys || []),
         ...(candidate.writerCoreKeys || []),
       ]),
-      onlineCount: Math.max(Number(existing?.onlineCount) || 0, 0) + 1,
       lastSeen: Date.now(),
     })
   }
 
   #getCachedChannelCandidate(channelId, channelKey) {
-    const candidate = this.#channelCandidateCache.get(channelId)?.get(channelKey)
+    const normalizedChannelId = normalizeChannelId(channelId)
+    const normalizedChannelKey = buildChannelKey(normalizedChannelId)
+    const cache = this.#channelCandidateCache.get(normalizedChannelId)
+    const candidate = cache?.get(channelKey) || cache?.get(normalizedChannelKey)
     if (candidate) return candidate
-    const local = this.#channels.find(channel => channel.channelKey === channelKey)
-    return local ? this.#channelToCandidate(local, true) : null
-  }
-
-  #formatChannelCandidateForResponse(candidate, ownerAddress = '') {
-    const owner = normalizeOwnerAddress(ownerAddress)
-    const localChannel = this.#channels.find(
-      channel => channel.channelKey === candidate.channelKey
+    const local = this.#channels.find(
+      channel => channel.channelKey === normalizedChannelKey
     )
-    const remark =
-      localChannel && owner
-        ? localChannel.remarks?.[owner] || ''
-        : candidate.local
-          ? ''
-          : `${candidate.channelId}-网络`
-    return {
-      channelId: candidate.channelId,
-      fingerprint: candidate.fingerprint,
-      channelKey: candidate.channelKey,
-      name: candidate.channelId,
-      type: candidate.type || 'public',
-      createdAt: candidate.createdAt || '',
-      lastMessageAt: candidate.lastMessageAt || '',
-      remark,
-      local: Boolean(candidate.local),
-      onlineCount: Number(candidate.onlineCount) || 0,
-    }
+    return local ? this.#channelToCandidate(local, true) : null
   }
 
   #formatChannelForResponse(channel, ownerAddress = '') {
@@ -2936,7 +2930,6 @@ export class MostBoxEngine extends EventEmitter {
     return {
       name: channel.channelId,
       channelId: channel.channelId,
-      fingerprint: channel.fingerprint,
       channelKey: channel.channelKey,
       key: channel.channelKey,
       coreKey: channel.localWriterCoreKey,
@@ -3046,6 +3039,31 @@ export class MostBoxEngine extends EventEmitter {
       )
   }
 
+  async #getNextChannelMessageTimestamp(channelKey) {
+    const coresMap = this.#channelCores.get(channelKey)
+    let maxTimestamp = 0
+
+    if (coresMap) {
+      for (const [, core] of coresMap) {
+        for (let i = 0; i < core.length; i++) {
+          try {
+            const entry = await core.get(i)
+            if (entry?.type === 'message') {
+              maxTimestamp = Math.max(
+                maxTimestamp,
+                Number(entry.timestamp) || 0
+              )
+            }
+          } catch {
+            break
+          }
+        }
+      }
+    }
+
+    return Math.max(Date.now(), maxTimestamp + 1)
+  }
+
   #normalizeChannelMessageForResponse(channelKey, message) {
     const channel = this.#channels.find(item => item.channelKey === channelKey)
     const authorAddress = normalizeOwnerAddress(message?.author)
@@ -3523,7 +3541,6 @@ export class MostBoxEngine extends EventEmitter {
     }
     return {
       channelId: channel.channelId,
-      fingerprint: channel.fingerprint,
       channelKey: channel.channelKey,
       type: channel.type,
       createdAt: channel.createdAt,
@@ -3701,15 +3718,9 @@ export class MostBoxEngine extends EventEmitter {
   async #applyUserSyncChannelRecord(ownerAddress, record, timestamp) {
     if (!record || typeof record !== 'object') return false
     const channelId = normalizeChannelId(record.channelId)
-    const fingerprint = String(record.fingerprint || '').trim()
-    const expectedChannelKey =
-      channelId && fingerprint ? buildChannelKey(channelId, fingerprint) : ''
-    const recordChannelKey = normalizeChannelKey(record.channelKey)
-    if (recordChannelKey && recordChannelKey !== expectedChannelKey) {
-      return false
-    }
-    const channelKey = recordChannelKey || expectedChannelKey
-    if (!channelId || !fingerprint || !channelKey) return false
+    const expectedChannelKey = buildChannelKey(channelId)
+    const channelKey = expectedChannelKey
+    if (!channelId || !channelKey) return false
     const syncUpdatedAt = getSyncTimestamp(record.syncUpdatedAt, timestamp)
     const entityKey = `channel:${channelKey}`
     if (!this.#shouldApplyUserSyncEntity(ownerAddress, entityKey, syncUpdatedAt)) {
@@ -3721,7 +3732,6 @@ export class MostBoxEngine extends EventEmitter {
     if (!channel) {
       channel = {
         channelId,
-        fingerprint,
         channelKey,
         name: channelId,
         createdAt:
@@ -4668,16 +4678,11 @@ export class MostBoxEngine extends EventEmitter {
           .filter(channel => channel && typeof channel === 'object')
           .map(channel => {
             const channelId = normalizeChannelId(channel.channelId)
-            const fingerprint = String(channel.fingerprint || '').trim()
-            const expectedChannelKey =
-              channelId && fingerprint
-                ? buildChannelKey(channelId, fingerprint)
-                : ''
             const channelKey = normalizeChannelKey(channel.channelKey)
+            const expectedChannelKey = buildChannelKey(channelId)
             return {
               ...channel,
               channelId,
-              fingerprint,
               channelKey,
               expectedChannelKey,
               name: channelId,
@@ -4687,7 +4692,6 @@ export class MostBoxEngine extends EventEmitter {
           .filter(
             channel =>
               CHANNEL_NAME_REGEX.test(channel.channelId) &&
-              channel.fingerprint &&
               channel.channelKey === channel.expectedChannelKey &&
               channel.writerId &&
               channel.localWriterCoreKey
@@ -4710,7 +4714,6 @@ export class MostBoxEngine extends EventEmitter {
         .filter(channel => !TRANSIENT_CHANNEL_TYPES.has(channel?.type))
         .map(channel => ({
           channelId: channel.channelId,
-          fingerprint: channel.fingerprint,
           channelKey: channel.channelKey,
           name: channel.channelId,
           type: channel.type,
@@ -4840,13 +4843,9 @@ export class MostBoxEngine extends EventEmitter {
     }
   }
 
-  async #handleChannelConnection(conn) {
-    const stream = conn
-    let connectedPeerId = null
-
+  #buildChannelHelloMessage() {
     const channels = this.#channels.map(channel => ({
       channelId: channel.channelId,
-      fingerprint: channel.fingerprint,
       channelKey: channel.channelKey,
       type: channel.type,
       createdAt: channel.createdAt,
@@ -4865,122 +4864,157 @@ export class MostBoxEngine extends EventEmitter {
       })
     )
 
-    const helloMessage = JSON.stringify({
+    return {
       type: 'channel-hello',
       peerId: this.getNodeId(),
       authorName: this.getNodeId().slice(0, 4),
       channels,
       userSyncSessions,
-    })
+    }
+  }
 
+  #sendChannelHello(stream) {
+    if (!stream || stream.destroyed || stream.writableEnded) {
+      this.#channelStreams.delete(stream)
+      return false
+    }
     try {
-      stream.write(helloMessage)
+      stream.write(`${JSON.stringify(this.#buildChannelHelloMessage())}\n`)
+      return true
     } catch {
-      return
+      this.#channelStreams.delete(stream)
+      return false
     }
+  }
 
-    stream.on('data', async data => {
-      try {
-        const msg = JSON.parse(data.toString())
-        if (msg.type === 'channel-hello') {
-          connectedPeerId = msg.peerId
-
-          const remoteChannels = Array.isArray(msg.channels)
-            ? msg.channels
-                .filter(channel => channel && typeof channel === 'object')
-                .map(channel => ({
-                  channelId: normalizeChannelId(channel.channelId),
-                  fingerprint: String(channel.fingerprint || '').trim(),
-                  channelKey: normalizeChannelKey(channel.channelKey),
-                  type: String(channel.type || 'public').trim() || 'public',
-                  createdAt:
-                    typeof channel.createdAt === 'string'
-                      ? channel.createdAt
-                      : '',
-                  lastMessageAt:
-                    typeof channel.lastMessageAt === 'string'
-                      ? channel.lastMessageAt
-                      : '',
-                  writerCoreKeys: uniqueStrings(channel.writerCoreKeys),
-                }))
-                .filter(
-                  channel =>
-                    channel.channelId &&
-                    channel.fingerprint &&
-                    channel.channelKey
-                )
-            : []
-
-          for (const remoteChannel of remoteChannels) {
-            this.#cacheChannelCandidate({
-              ...remoteChannel,
-              local: false,
-              peerId: msg.peerId,
-              onlineCount: 1,
-            })
+  #broadcastChannelHello() {
+    for (const stream of [...this.#channelStreams]) {
+      this.#sendChannelHello(stream)
+    }
+  }
 
-            const localChannel = this.#channels.find(
-              channel => channel.channelKey === remoteChannel.channelKey
-            )
-            if (!localChannel) continue
-
-            const peers = this.#channelPeers.get(localChannel.channelKey)
-            if (peers) {
-              peers.set(msg.peerId, {
-                peerId: msg.peerId,
-                authorName: msg.authorName,
-                lastSeen: Date.now(),
-              })
-            }
+  async #processChannelHelloMessage(msg) {
+    if (msg.type !== 'channel-hello') return null
 
-            for (const writerCoreKey of remoteChannel.writerCoreKeys) {
-              if (
-                writerCoreKey &&
-                writerCoreKey !== this.#channelLocalCoreKey.get(localChannel.channelKey)
-              ) {
-                await this.#openRemoteChannelCore(
-                  localChannel.channelKey,
-                  writerCoreKey
-                )
-              }
+    const remoteChannels = Array.isArray(msg.channels)
+      ? msg.channels
+          .filter(channel => channel && typeof channel === 'object')
+          .map(channel => {
+            const channelId = normalizeChannelId(channel.channelId)
+            return {
+              channelId,
+              channelKey: buildChannelKey(channelId),
+              type: String(channel.type || 'public').trim() || 'public',
+              createdAt:
+                typeof channel.createdAt === 'string' ? channel.createdAt : '',
+              lastMessageAt:
+                typeof channel.lastMessageAt === 'string'
+                  ? channel.lastMessageAt
+                  : '',
+              writerCoreKeys: uniqueStrings(channel.writerCoreKeys),
             }
-          }
+          })
+          .filter(channel => channel.channelId && channel.channelKey)
+      : []
 
-          const remoteUserSyncSessions = Array.isArray(msg.userSyncSessions)
-            ? msg.userSyncSessions
-                .filter(session => session && typeof session === 'object')
-                .map(session => ({
-                  ownerAddress: normalizeOwnerAddress(session.ownerAddress),
-                  syncId: String(session.syncId || '').trim(),
-                  writerCoreKeys: uniqueStrings(session.writerCoreKeys),
-                }))
-                .filter(session => session.ownerAddress && session.syncId)
-            : []
-
-          for (const remoteSession of remoteUserSyncSessions) {
-            const localSession = this.#userSyncSessions.get(
-              remoteSession.ownerAddress
-            )
-            if (!localSession || localSession.syncId !== remoteSession.syncId) {
-              continue
-            }
-            await this.#mergeUserSyncWriterCoreKeys(
-              localSession,
-              remoteSession.writerCoreKeys
-            )
-          }
+    for (const remoteChannel of remoteChannels) {
+      this.#cacheChannelCandidate({
+        ...remoteChannel,
+        local: false,
+        peerId: msg.peerId,
+      })
 
-          this.emit('channel:peer:online', {
-            peerId: msg.peerId,
-            authorName: msg.authorName,
-          })
+      const localChannel = this.#channels.find(
+        channel => channel.channelKey === remoteChannel.channelKey
+      )
+      if (!localChannel) continue
+
+      const peers = this.#channelPeers.get(localChannel.channelKey)
+      if (peers) {
+        peers.set(msg.peerId, {
+          peerId: msg.peerId,
+          authorName: msg.authorName,
+          lastSeen: Date.now(),
+        })
+      }
+
+      for (const writerCoreKey of remoteChannel.writerCoreKeys) {
+        if (
+          writerCoreKey &&
+          writerCoreKey !== this.#channelLocalCoreKey.get(localChannel.channelKey)
+        ) {
+          await this.#openRemoteChannelCore(
+            localChannel.channelKey,
+            writerCoreKey
+          )
+        }
+      }
+    }
+
+    const remoteUserSyncSessions = Array.isArray(msg.userSyncSessions)
+      ? msg.userSyncSessions
+          .filter(session => session && typeof session === 'object')
+          .map(session => ({
+            ownerAddress: normalizeOwnerAddress(session.ownerAddress),
+            syncId: String(session.syncId || '').trim(),
+            writerCoreKeys: uniqueStrings(session.writerCoreKeys),
+          }))
+          .filter(session => session.ownerAddress && session.syncId)
+      : []
+
+    for (const remoteSession of remoteUserSyncSessions) {
+      const localSession = this.#userSyncSessions.get(
+        remoteSession.ownerAddress
+      )
+      if (!localSession || localSession.syncId !== remoteSession.syncId) {
+        continue
+      }
+      await this.#mergeUserSyncWriterCoreKeys(
+        localSession,
+        remoteSession.writerCoreKeys
+      )
+    }
+
+    this.emit('channel:peer:online', {
+      peerId: msg.peerId,
+      authorName: msg.authorName,
+    })
+
+    return msg.peerId
+  }
+
+  async #handleChannelConnection(conn) {
+    const stream = conn
+    let connectedPeerId = null
+    let readBuffer = ''
+    let closed = false
+
+    this.#channelStreams.add(stream)
+    if (!this.#sendChannelHello(stream)) return
+
+    stream.on('data', async data => {
+      readBuffer += data.toString()
+      let newlineIndex = readBuffer.indexOf('\n')
+      while (newlineIndex !== -1) {
+        const line = readBuffer.slice(0, newlineIndex).trim()
+        readBuffer = readBuffer.slice(newlineIndex + 1)
+        newlineIndex = readBuffer.indexOf('\n')
+        if (!line) continue
+        try {
+          const peerId = await this.#processChannelHelloMessage(
+            JSON.parse(line)
+          )
+          if (peerId) connectedPeerId = peerId
+        } catch (err) {
+          console.warn(`[MostBox] Failed to process channel data:`, err.message)
         }
-      } catch (err) {
-        console.warn(`[MostBox] Failed to process channel data:`, err.message)
       }
     })
 
-    stream.on('close', () => {
+    const cleanup = () => {
+      if (closed) return
+      closed = true
+      this.#channelStreams.delete(stream)
       if (connectedPeerId) {
         for (const [, peers] of this.#channelPeers) {
           if (peers.has(connectedPeerId)) {
@@ -4993,7 +5027,10 @@ export class MostBoxEngine extends EventEmitter {
           }
         }
       }
-    })
+    }
+
+    stream.on('close', cleanup)
+    stream.on('error', cleanup)
   }
 
   /**