most-box 0.3.5 → 0.3.7

package/server/src/index.js

@@ -101,6 +101,26 @@ function isChannelHistoryEntry(entry) {
   return entry?.type === 'message' || entry?.type === 'system'
 }
 
+function getChannelHistoryDedupeKey(message) {
+  const type = String(message?.type || '')
+  const event = String(message?.event || '')
+  const author = normalizeOwnerAddress(message?.author)
+  const content = String(message?.content || '').trim()
+
+  if (type === 'system' && event === CHANNEL_MEMBER_JOINED_EVENT && author) {
+    return `${type}:${event}:${author}:${content}`
+  }
+
+  return [
+    message?._coreKey || '',
+    type,
+    event,
+    message?.author || '',
+    message?.timestamp || '',
+    content,
+  ].join(':')
+}
+
 function createMemoryDuplexPair() {
   let left
   let right
@@ -293,6 +313,42 @@ export class MostBoxEngine extends EventEmitter {
     return this.#pruneStaleChannelPresence()
   }
 
+  #isClosedSessionError(err) {
+    if (!err || typeof err !== 'object') return false
+    const code = String(err.code || '')
+    const message = String(err.message || '')
+    return (
+      code === 'SESSION_CLOSED' ||
+      message.includes('SESSION_CLOSED') ||
+      message.includes('closed session')
+    )
+  }
+
+  async #reopenChannelLocalWriter(channel) {
+    const channelKey = channel.channelKey
+    const localKeyHex =
+      this.#channelLocalCoreKey.get(channelKey) || channel.localWriterCoreKey
+    const coresMap = this.#channelCores.get(channelKey)
+    const staleCore = localKeyHex && coresMap ? coresMap.get(localKeyHex) : null
+
+    if (staleCore) {
+      coresMap.delete(localKeyHex)
+      await staleCore.close().catch(() => {})
+    }
+    this.#channelLocalCoreKey.delete(channelKey)
+
+    await this.#openChannelRuntime(channel)
+
+    const reopenedKeyHex = this.#channelLocalCoreKey.get(channelKey)
+    const reopenedCore = reopenedKeyHex
+      ? this.#channelCores.get(channelKey)?.get(reopenedKeyHex)
+      : null
+    if (!reopenedCore) {
+      throw new Error('频道未初始化或无可写 core')
+    }
+    return reopenedCore
+  }
+
   /**
    * 初始化引擎 — 必须在调用其他方法之前调用
    */
@@ -624,29 +680,38 @@ export class MostBoxEngine extends EventEmitter {
     const publishedBucket = this.#getPublishedBucket(ownerAddress, true)
     // 检查相同内容是否已存在
     const existingIndex = publishedBucket.findIndex(f => f.cid === cidString)
+    const repairingMissingContent = existingIndex !== -1
     if (existingIndex !== -1) {
       const existing = publishedBucket[existingIndex]
-      await this.#joinCidTopicInternal(cidString, {
-        server: true,
-        client: false,
-      })
-      this.#upsertHolding({
-        cid: cidString,
-        fileName: existing.fileName,
-        size: fileSize,
-        driveName: name,
-        source: 'published',
+      const existingContent = await this.#getLocalCidContent(cidString, {
+        ownerAddress,
+        public: true,
+        allowHoldingFallback: true,
       })
-      return {
-        cid: cidString,
-        link: buildMostLink(cidString, existing.fileName),
-        fileName: existing.fileName,
-        alreadyExists: true,
+      if (existingContent) {
+        await this.#joinCidTopicInternal(cidString, {
+          server: true,
+          client: false,
+        })
+        this.#upsertHolding({
+          cid: cidString,
+          fileName: existing.fileName,
+          size: fileSize,
+          driveName: name,
+          source: 'published',
+        })
+        return {
+          cid: cidString,
+          link: buildMostLink(cidString, existing.fileName),
+          fileName: existing.fileName,
+          alreadyExists: true,
+        }
       }
     }
 
     this.#assertDisplayNameAvailable(safeFileName, {
       ownerAddress,
+      excludeCid: repairingMissingContent ? cidString : undefined,
     })
 
     // 获取或创建该 CID 对应的 drive
@@ -667,40 +732,17 @@ export class MostBoxEngine extends EventEmitter {
 
     // Hyperdrive 中用 CID 作为 key 存储（解耦目录结构）
     const driveKey = '/' + cidString
-
-    const ws = drive.createWriteStream(driveKey)
-
-    if (Buffer.isBuffer(content)) {
-      let offset = 0
-      const waitForDrain = () =>
-        new Promise(resolve => ws.once('drain', resolve))
-
-      try {
-        while (offset < content.length) {
-          const chunk = content.slice(offset, offset + FILE_WRITE_CHUNK_SIZE)
-          const canContinue = ws.write(chunk)
-          offset += chunk.length
-          if (!canContinue && offset < content.length) {
-            await waitForDrain()
-          }
-        }
-        ws.end()
-        await new Promise((resolve, reject) => {
-          ws.on('finish', resolve)
-          ws.on('error', reject)
-        })
-      } catch (err) {
-        ws.destroy()
+    try {
+      await this.#writeDriveFile(drive, driveKey, content, cleanPath)
+    } catch (err) {
+      if (!this.#isClosedSessionError(err)) {
         throw err
       }
-    } else {
-      const rs = fs.createReadStream(cleanPath)
-      await new Promise((resolve, reject) => {
-        rs.pipe(ws)
-        ws.on('finish', resolve)
-        ws.on('error', reject)
-        rs.on('error', reject)
+      drive = await this.#reopenDrive(name, {
+        server: true,
+        client: false,
       })
+      await this.#writeDriveFile(drive, driveKey, content, cleanPath)
     }
 
     // 存储 displayName（用户看到的文件夹路径），不存储 drivePath
@@ -715,7 +757,11 @@ export class MostBoxEngine extends EventEmitter {
       starred: false,
       syncUpdatedAt: now,
     }
-    publishedBucket.push(fileRecord)
+    if (repairingMissingContent) {
+      publishedBucket[existingIndex] = fileRecord
+    } else {
+      publishedBucket.push(fileRecord)
+    }
     this.#savePublishedMetadata()
     this.#upsertHolding({
       cid: cidString,
@@ -2214,7 +2260,10 @@ export class MostBoxEngine extends EventEmitter {
   async #hasLocalDriveContent(drive, key) {
     try {
       return await drive.has(key)
-    } catch {
+    } catch (err) {
+      if (this.#isClosedSessionError(err)) {
+        throw err
+      }
       return false
     }
   }
@@ -2234,42 +2283,53 @@ export class MostBoxEngine extends EventEmitter {
     }
     const holding = this.#holdings.find(item => item.cid === cid)
     const { driveName } = this.#getCidInfo(cid)
-    const drive = await this.#getOrCreateDrive(
+    let drive = await this.#getOrCreateDrive(
       fileRecord?.driveName || holding?.driveName || driveName,
       { server: true, client: false }
     )
     const driveKey = '/' + cid
 
-    try {
-      const entry = await drive.entry(driveKey, { wait: false })
-      if (!entry?.value?.blob) {
-        return null
-      }
-      const hasContent = await this.#hasLocalDriveContent(drive, driveKey)
-      if (!hasContent) {
-        return null
-      }
+    for (let attempt = 0; attempt < 2; attempt += 1) {
+      try {
+        const entry = await drive.entry(driveKey, { wait: false })
+        if (!entry?.value?.blob) {
+          return null
+        }
+        const hasContent = await this.#hasLocalDriveContent(drive, driveKey)
+        if (!hasContent) {
+          return null
+        }
 
-      const size =
-        Number(entry.value.blob.byteLength) ||
-        Number(fileRecord?.size) ||
-        Number(holding?.size) ||
-        0
-      return {
-        drive,
-        entry,
-        size,
-        fileRecord: fileRecord || {
-          cid,
-          fileName: holding?.fileName || cid,
-          driveName: holding?.driveName || driveName,
+        const size =
+          Number(entry.value.blob.byteLength) ||
+          Number(fileRecord?.size) ||
+          Number(holding?.size) ||
+          0
+        return {
+          drive,
+          entry,
           size,
-          ownerAddress,
-        },
+          fileRecord: fileRecord || {
+            cid,
+            fileName: holding?.fileName || cid,
+            driveName: holding?.driveName || driveName,
+            size,
+            ownerAddress,
+          },
+        }
+      } catch (err) {
+        if (attempt === 0 && this.#isClosedSessionError(err)) {
+          drive = await this.#reopenDrive(
+            fileRecord?.driveName || holding?.driveName || driveName,
+            { server: true, client: false }
+          )
+          continue
+        }
+        return null
       }
-    } catch {
-      return null
     }
+
+    return null
   }
 
   // --- 频道管理 ---
@@ -2632,7 +2692,7 @@ export class MostBoxEngine extends EventEmitter {
 
     const seen = new Set()
     const unique = allMessages.filter(m => {
-      const key = `${m._coreKey}:${m.type}:${m.event || ''}:${m.author}:${m.timestamp}:${m.content}`
+      const key = getChannelHistoryDedupeKey(m)
       if (seen.has(key)) return false
       seen.add(key)
       return true
@@ -2721,7 +2781,15 @@ export class MostBoxEngine extends EventEmitter {
       if (event) message.event = event
     }
 
-    await core.append(message)
+    try {
+      await core.append(message)
+    } catch (err) {
+      if (!this.#isClosedSessionError(err)) {
+        throw err
+      }
+      const reopenedCore = await this.#reopenChannelLocalWriter(channel)
+      await reopenedCore.append(message)
+    }
     if (channel) {
       channel.lastMessageAt = new Date(message.timestamp).toISOString()
       this.#saveChannelsMetadata()
@@ -4085,6 +4153,19 @@ export class MostBoxEngine extends EventEmitter {
             if (!this.#holdings.some(current => current.cid === holding.cid)) {
               return
             }
+            const localContent = await this.#getLocalCidContent(holding.cid, {
+              public: true,
+              allowHoldingFallback: true,
+            })
+            if (!localContent) {
+              this.#setSeedState(holding.cid, {
+                status: 'error',
+                topic: holding.topic,
+                driveName: holding.driveName,
+                error: 'Local CID content missing',
+              })
+              return
+            }
             await this.#joinCidTopicInternal(holding.cid, {
               server: true,
               client: false,
@@ -4312,6 +4393,60 @@ export class MostBoxEngine extends EventEmitter {
     return drive
   }
 
+  async #reopenDrive(name, options = { server: true, client: false }) {
+    const staleDrive = this.#drives.get(name)
+    if (staleDrive) {
+      this.#drives.delete(name)
+      await staleDrive.close().catch(() => {})
+    }
+    this.#drivePromises.delete(name)
+    return this.#getOrCreateDrive(name, options)
+  }
+
+  async #writeDriveFile(drive, driveKey, content, cleanPath) {
+    const ws = drive.createWriteStream(driveKey)
+
+    if (Buffer.isBuffer(content)) {
+      let offset = 0
+      const waitForDrain = () =>
+        new Promise(resolve => ws.once('drain', resolve))
+
+      try {
+        while (offset < content.length) {
+          const chunk = content.slice(offset, offset + FILE_WRITE_CHUNK_SIZE)
+          const canContinue = ws.write(chunk)
+          offset += chunk.length
+          if (!canContinue && offset < content.length) {
+            await waitForDrain()
+          }
+        }
+        ws.end()
+        await new Promise((resolve, reject) => {
+          ws.on('finish', resolve)
+          ws.on('error', reject)
+        })
+      } catch (err) {
+        ws.destroy()
+        throw err
+      }
+      return
+    }
+
+    const rs = fs.createReadStream(cleanPath)
+    try {
+      await new Promise((resolve, reject) => {
+        rs.pipe(ws)
+        ws.on('finish', resolve)
+        ws.on('error', reject)
+        rs.on('error', reject)
+      })
+    } catch (err) {
+      ws.destroy()
+      rs.destroy()
+      throw err
+    }
+  }
+
   #getOwnerKey(ownerAddress) {
     return getOwnerBucketKey(ownerAddress)
   }

package/out/assets/AccountMenu-D-wa5tux.js

@@ -1 +0,0 @@
-import{t as e}from"./jsx-runtime-Bt-cYkS5.js";import{B as t,E as n,W as r,t as i}from"./useAppStore-DNhyhD20.js";import{a,c as o,o as s}from"./i18n-C6yaqRst.js";import{S as c,g as l}from"./index-D1mozno-.js";var u=t(`check`,[[`path`,{d:`M20 6 9 17l-5-5`,key:`1gmf2c`}]]),d=t(`languages`,[[`path`,{d:`m5 8 6 6`,key:`1wu5hv`}],[`path`,{d:`m4 14 6-6 2-3`,key:`1k1g8d`}],[`path`,{d:`M2 5h12`,key:`or177f`}],[`path`,{d:`M7 2h1`,key:`1t2jsx`}],[`path`,{d:`m22 22-5-10-5 10`,key:`don7ne`}],[`path`,{d:`M14 18h6`,key:`1m8k6r`}]]),f=t(`moon`,[[`path`,{d:`M20.985 12.486a9 9 0 1 1-9.473-9.472c.405-.022.617.46.402.803a6 6 0 0 0 8.268 8.268c.344-.215.825-.004.803.401`,key:`kfwtm`}]]),p=t(`sun`,[[`circle`,{cx:`12`,cy:`12`,r:`4`,key:`4exip2`}],[`path`,{d:`M12 2v2`,key:`tus03m`}],[`path`,{d:`M12 20v2`,key:`1lh1kg`}],[`path`,{d:`m4.93 4.93 1.41 1.41`,key:`149t6j`}],[`path`,{d:`m17.66 17.66 1.41 1.41`,key:`ptbguv`}],[`path`,{d:`M2 12h2`,key:`1t8f8n`}],[`path`,{d:`M20 12h2`,key:`1q8mjw`}],[`path`,{d:`m6.34 17.66-1.41 1.41`,key:`1m8zz5`}],[`path`,{d:`m19.07 4.93-1.41 1.41`,key:`1shlcs`}]]),m=t(`user`,[[`path`,{d:`M19 21v-2a4 4 0 0 0-4-4H9a4 4 0 0 0-4 4v2`,key:`975kel`}],[`circle`,{cx:`12`,cy:`7`,r:`4`,key:`17ys0d`}]]),h=e();function g(){let{t:e}=a(),t=i(e=>e.isDarkMode),n=i(e=>e.setIsDarkMode),r=e(`common.appearance.toggle`);return(0,h.jsx)(`button`,{type:`button`,className:`header-tool-btn`,title:r,"aria-label":r,"aria-pressed":t,onClick:()=>n(!t),children:t?(0,h.jsx)(p,{size:16}):(0,h.jsx)(f,{size:16})})}function _(){let{locale:e,setLocale:t,t:n}=a(),r=n(`common.locale.choose`);return(0,h.jsx)(c,{ariaLabel:r,className:`language-toggle`,items:s.map(n=>({key:n,label:o[n],icon:n===e?(0,h.jsx)(u,{size:16}):(0,h.jsx)(`span`,{className:`language-toggle-placeholder`,"aria-hidden":`true`}),onSelect:()=>{n!==e&&t(n)}})),renderTrigger:e=>(0,h.jsx)(`button`,{...e,className:`header-tool-btn`,title:r,"aria-label":r,children:(0,h.jsx)(d,{size:16})})})}function v(){let{t:e}=a(),t=n(e=>e.identity),i=l(t?.address,t?.avatar),o=e(`nav.profile`);return(0,h.jsx)(r,{to:`/profile/`,className:`account-profile-link`,title:o,"aria-label":o,children:t?(0,h.jsx)(`img`,{className:`account-profile-link-avatar`,src:i,alt:``,"aria-hidden":`true`}):(0,h.jsx)(m,{size:18})})}export{u as a,m as i,_ as n,g as r,v as t};

package/out/assets/AppShell-BdRKZIZ9.js

@@ -1 +0,0 @@
-import{n as e,o as t,t as n}from"./jsx-runtime-Bt-cYkS5.js";import{B as r}from"./useAppStore-DNhyhD20.js";import{a as i}from"./i18n-C6yaqRst.js";import{n as a,r as o,t as s}from"./AccountMenu-D-wa5tux.js";import"./index-D1mozno-.js";var c=r(`menu`,[[`path`,{d:`M4 5h16`,key:`1tepv9`}],[`path`,{d:`M4 12h16`,key:`1lakjw`}],[`path`,{d:`M4 19h16`,key:`1djgab`}]]),l=t(e(),1);function u(e,t){return typeof t==`boolean`?t:typeof window<`u`&&`matchMedia`in window?window.matchMedia(e).matches:!1}function d(e,t,{getInitialValueInEffect:n}={getInitialValueInEffect:!0}){let[r,i]=(0,l.useState)(n?t:u(e));return(0,l.useEffect)(()=>{try{if(`matchMedia`in window){let t=window.matchMedia(e);i(t.matches);let n=e=>i(e.matches);return t.addEventListener(`change`,n),()=>{t.removeEventListener(`change`,n)}}}catch{return}},[e]),r||!1}function f(e=!1,t={}){let[n,r]=(0,l.useState)(e),i=(0,l.useCallback)(()=>{r(e=>e||(t.onOpen?.(),!0))},[t.onOpen]),a=(0,l.useCallback)(()=>{r(e=>e&&(t.onClose?.(),!1))},[t.onClose]);return[n,{open:i,close:a,toggle:(0,l.useCallback)(()=>{n?a():i()},[a,i,n]),set:r}]}var p=n(),m=(0,l.createContext)(null);function h(){let e=(0,l.useContext)(m);if(!e)throw Error(`useAppShell must be used within AppShell`);return e}function g({sidebar:e,className:t=``,headerTitle:n,headerRight:r,sidebarToggleReplacement:u,defaultHide:h=!1,hideAccountMenu:g=!1,children:_}){let[v,y]=f(!1),[b,x]=(0,l.useState)(h),S=(0,l.useRef)(h),C=d(`(max-width: 768px)`),{t:w}=i(),T=(0,l.useCallback)((e={})=>{y.close(),e.collapse&&x(!0)},[y]);(0,l.useEffect)(()=>{h!==S.current&&(h?T({collapse:!0}):x(!1),S.current=h)},[h,T]);let E=()=>{C?y.toggle():x(!b)},D=()=>{C?y.open():x(!1)},O=C?v:!b;return(0,p.jsx)(m.Provider,{value:{closeSidebar:T,openSidebar:D,isSidebarVisible:O},children:(0,p.jsxs)(`div`,{className:[`app-layout`,t].filter(Boolean).join(` `),children:[(0,p.jsx)(`div`,{className:`sidebar-overlay ${v?`visible`:``}`,onClick:()=>T()}),(0,p.jsx)(`div`,{className:`sidebar ${v?`open`:``} ${b?`collapsed`:``}`,children:e({closeSidebar:T,openSidebar:D})}),(0,p.jsxs)(`div`,{className:`main-content`,children:[(0,p.jsxs)(`header`,{className:`app-header`,children:[(0,p.jsxs)(`div`,{className:`header-left`,children:[u??(0,p.jsx)(`button`,{onClick:E,className:`btn btn-icon sidebar-toggle-btn`,"aria-label":w(C?`appShell.openMenu`:b?`appShell.expandSidebar`:`appShell.collapseSidebar`),children:(0,p.jsx)(c,{size:16})}),n]}),(0,p.jsxs)(`div`,{className:`header-right`,children:[r,(0,p.jsx)(o,{}),(0,p.jsx)(a,{}),!g&&(0,p.jsx)(s,{})]})]}),_]})]})})}export{h as n,f as r,g as t};