most-box 0.1.3 → 0.1.5

package/server/src/http/app.js

@@ -672,16 +672,16 @@ export function createApp(engine, options = {}) {
       return c.json({ error: parsed.error }, 400)
     }
 
-    const existingFile = engine
-      .getPublishedFiles({ ownerAddress: c.get('userAddress') })
-      .find(f => f.cid === parsed.cid)
-    if (existingFile) {
+    const localAvailability = await engine.getLocalCidAvailability(body.link, {
+      ownerAddress: c.get('userAddress'),
+    })
+    if (localAvailability) {
       return c.json({
         success: true,
         available: true,
         cid: parsed.cid,
-        fileName: existingFile.fileName,
-        size: Number(existingFile.size) || null,
+        fileName: localAvailability.fileName,
+        size: Number(localAvailability.size) || null,
         alreadyExists: true,
       })
     }
@@ -719,11 +719,13 @@ export function createApp(engine, options = {}) {
       return c.json({ error: parsed.error }, 400)
     }
 
-    const existingFile = engine
-      .getPublishedFiles({ ownerAddress: c.get('userAddress') })
-      .find(f => f.cid === parsed.cid)
-    if (existingFile) {
-      console.log(`[MostBox] File already exists: ${existingFile.fileName}`)
+    const localAvailability = await engine.getLocalCidAvailability(body.link, {
+      ownerAddress: c.get('userAddress'),
+    })
+    if (localAvailability) {
+      console.log(
+        `[MostBox] CID content already exists locally: ${parsed.cid}`
+      )
       try {
         const result = await engine.downloadFile(body.link, taskId, {
           ownerAddress: c.get('userAddress'),
@@ -801,7 +803,7 @@ export function createApp(engine, options = {}) {
       })
       return c.json({ success: true, ...result })
     } catch (err) {
-      return c.json({ error: err.message }, 400)
+      return badRequestOrAppError(c, err)
     }
   })
 
@@ -959,7 +961,13 @@ export function createApp(engine, options = {}) {
   })
 
   app.get('/api/channels', c => {
-    return c.json(engine.listChannels({ ownerAddress: c.get('userAddress') }))
+    return c.json(
+      engine.listChannels({
+        ownerAddress: c.get('userAddress'),
+        type: c.req.query('type'),
+        excludeType: c.req.query('excludeType'),
+      })
+    )
   })
 
   app.delete('/api/channels/:name', async c => {
@@ -1065,7 +1073,7 @@ export function createApp(engine, options = {}) {
       })
       return c.json({ success: true, ...result })
     } catch (err) {
-      return c.json({ error: err.message }, 400)
+      return badRequestOrAppError(c, err)
     }
   })
 

package/server/src/http/uploads.js

@@ -46,6 +46,7 @@ export async function parseMultipartBusboy(req, maxUploadSize = MAX_FILE_SIZE) {
 
     const busboy = Busboy({
       headers: req.headers,
+      preservePath: true,
       limits: {
         fileSize: maxUploadSize,
         files: 1,

package/server/src/index.js

@@ -48,7 +48,6 @@ import {
   SWARM_KEEP_ALIVE_INTERVAL,
   SWARM_RANDOM_PUNCH_INTERVAL,
   DRIVE_ENTRY_TIMEOUT,
-  DRIVE_SYNC_TIMEOUT,
   STREAM_READ_TIMEOUT,
   FILE_WRITE_CHUNK_SIZE,
   DOWNLOAD_POLL_INTERVAL_MIN,
@@ -67,12 +66,28 @@ import {
 } from './config.js'
 
 const sleep = ms => new Promise(resolve => setTimeout(resolve, ms))
+const CHAT_FILE_ROOT = 'chat-file'
 
 function normalizeOwnerAddress(address) {
   const value = String(address || '').trim()
   return /^0x[a-fA-F0-9]{40}$/.test(value) ? value.toLowerCase() : ''
 }
 
+function getPathBaseName(fileName) {
+  const parts = String(fileName || '').split('/').filter(Boolean)
+  return parts[parts.length - 1] || 'unnamed_file'
+}
+
+function getDisplayPathFolder(fileName) {
+  const parts = String(fileName || '').split('/').filter(Boolean)
+  parts.pop()
+  return parts.join('/')
+}
+
+function buildMostLink(cid, fileName) {
+  return `most://${cid}?filename=${encodeURIComponent(fileName)}`
+}
+
 function createOfflineSwarm() {
   return {
     connections: new Set(),
@@ -528,6 +543,10 @@ export class MostBoxEngine extends EventEmitter {
       }
     }
 
+    this.#assertDisplayNameAvailable(safeFileName, {
+      ownerAddress,
+    })
+
     // 获取或创建该 CID 对应的 drive
     let drive = this.#drives.get(name)
 
@@ -644,39 +663,48 @@ export class MostBoxEngine extends EventEmitter {
       const cidString = parsed.cid
       console.log(`[MostBox] Parsed CID: ${cidString}`)
       const { driveName: name } = this.#getCidInfo(cidString)
+      const linkFileName = sanitizeFilename(parsed.fileName)
 
-      const existingFile = this.#publishedFiles.find(
-        f => f.cid === cidString && this.#recordMatchesOwner(f, ownerAddress)
-      )
-      if (existingFile) {
-        console.log(`[MostBox] File already exists: ${existingFile.fileName}`)
+      const localContent = await this.#getLocalCidContent(cidString, {
+        ownerAddress,
+        public: true,
+        allowHoldingFallback: true,
+      })
+      if (localContent) {
+        const existingFile = localContent.fileRecord
+        console.log(
+          `[MostBox] CID content already exists locally: ${cidString}`
+        )
         const existingHolding = this.#holdings.find(
           item => item.cid === cidString
         )
-        const existingSize = Number(existingFile.size)
         await this.#joinCidTopicInternal(cidString, {
           server: true,
           client: false,
         })
         this.#upsertHolding({
           cid: cidString,
-          fileName: existingFile.fileName,
+          fileName:
+            existingHolding?.fileName || existingFile?.fileName || linkFileName,
           size:
             existingHolding?.size ??
-            (Number.isFinite(existingSize) ? existingSize : 0),
+            (Number.isFinite(localContent.size) ? localContent.size : 0),
           localPath:
-            existingHolding?.localPath || existingFile.localPath || null,
-          driveName: existingFile.driveName || name,
+            existingHolding?.localPath || existingFile?.localPath || null,
+          driveName: existingFile?.driveName || name,
           source: existingHolding?.source || 'published',
         })
         return {
           taskId,
-          fileName: existingFile.fileName,
+          fileName: linkFileName,
           alreadyExists: true,
         }
       }
 
-      const linkFileName = parsed.fileName
+      this.#assertDisplayNameAvailable(linkFileName, {
+        ownerAddress,
+        excludeCid: cidString,
+      })
 
       if (taskState.aborted) throw new Error('Download cancelled')
 
@@ -924,11 +952,14 @@ export class MostBoxEngine extends EventEmitter {
         const existingIndex = this.#publishedFiles.findIndex(
           f => f.cid === cidString && this.#recordMatchesOwner(f, ownerAddress)
         )
+        this.#assertDisplayNameAvailable(sanitizedFileName, {
+          ownerAddress,
+          excludeCid: cidString,
+        })
         if (existingIndex !== -1) {
           const existing = this.#publishedFiles[existingIndex]
-          if (existing.fileName !== sanitizedFileName) {
-            throw new Error(`文件已存在: ${existing.fileName}`)
-          }
+          existing.fileName = sanitizedFileName
+          existing.driveName = name
           existing.publishedAt = new Date().toISOString()
         } else {
           this.#publishedFiles.push({
@@ -959,6 +990,35 @@ export class MostBoxEngine extends EventEmitter {
     }
   }
 
+  /**
+   * 快速检查 most:// 链接对应的 CID 内容是否已在本机可读。
+   */
+  async getLocalCidAvailability(link, options = {}) {
+    this.#ensureInitialized()
+    const ownerAddress = normalizeOwnerAddress(options.ownerAddress)
+    const parsed = parseMostLink(link)
+    if (parsed.error) {
+      throw new ValidationError(parsed.error)
+    }
+
+    const localContent = await this.#getLocalCidContent(parsed.cid, {
+      ownerAddress,
+      public: true,
+      allowHoldingFallback: true,
+    })
+    if (!localContent) {
+      return null
+    }
+
+    return {
+      available: true,
+      cid: parsed.cid,
+      fileName: sanitizeFilename(parsed.fileName),
+      size: localContent.size,
+      alreadyExists: true,
+    }
+  }
+
   /**
    * 检测 most:// 链接当前是否能找到可下载内容，但不读取文件内容。
    * @param {string} link - most:// 链接
@@ -978,15 +1038,17 @@ export class MostBoxEngine extends EventEmitter {
 
     const cidString = parsed.cid
     const { driveName: name } = this.#getCidInfo(cidString)
-    const existingFile = this.#publishedFiles.find(
-      f => f.cid === cidString && this.#recordMatchesOwner(f, ownerAddress)
-    )
-    if (existingFile) {
+    const localContent = await this.#getLocalCidContent(cidString, {
+      ownerAddress,
+      public: true,
+      allowHoldingFallback: true,
+    })
+    if (localContent) {
       return {
         available: true,
         cid: cidString,
-        fileName: existingFile.fileName,
-        size: Number(existingFile.size) || null,
+        fileName: sanitizeFilename(parsed.fileName),
+        size: localContent.size,
         alreadyExists: true,
       }
     }
@@ -1172,6 +1234,20 @@ export class MostBoxEngine extends EventEmitter {
 
     const { driveName } = this.#getCidInfo(fileRecord.cid)
 
+    const existingIndex = this.#publishedFiles.findIndex(
+      f => f.cid === fileRecord.cid && this.#recordMatchesOwner(f, ownerAddress)
+    )
+    if (existingIndex !== -1) {
+      this.#trashFiles.splice(index, 1)
+      this.#saveTrashMetadata()
+      return this.listPublishedFiles({ ownerAddress })
+    }
+
+    this.#assertDisplayNameAvailable(fileRecord.fileName, {
+      ownerAddress,
+      excludeCid: fileRecord.cid,
+    })
+
     this.#publishedFiles.push({
       fileName: fileRecord.fileName,
       cid: fileRecord.cid,
@@ -1361,6 +1437,10 @@ export class MostBoxEngine extends EventEmitter {
       throw new Error('File not found')
     }
     const safeFileName = sanitizeFilename(newFileName)
+    this.#assertDisplayNameAvailable(safeFileName, {
+      ownerAddress,
+      excludeCid: cid,
+    })
     this.#publishedFiles[index].fileName = safeFileName
     this.#publishedFiles[index].publishedAt = new Date().toISOString()
     this.#savePublishedMetadata()
@@ -1382,7 +1462,7 @@ export class MostBoxEngine extends EventEmitter {
     this.#ensureInitialized()
     const ownerAddress = normalizeOwnerAddress(options.ownerAddress)
     const prefix = oldPath + '/'
-    const updatedFiles = []
+    const updates = []
 
     for (const file of this.#publishedFiles) {
       if (
@@ -1393,16 +1473,27 @@ export class MostBoxEngine extends EventEmitter {
         const newFileName = sanitizeFilename(
           remainder ? newPath + '/' + remainder : newPath
         )
-        file.fileName = newFileName
-        file.publishedAt = new Date().toISOString()
-        updatedFiles.push({
-          cid: file.cid,
-          fileName: file.fileName,
-          link: `most://${file.cid}?filename=${encodeURIComponent(file.fileName)}`,
-        })
+        updates.push({ file, newFileName })
       }
     }
 
+    for (const { file, newFileName } of updates) {
+      this.#assertDisplayNameAvailable(newFileName, {
+        ownerAddress,
+        excludeCid: file.cid,
+      })
+    }
+
+    const updatedFiles = updates.map(({ file, newFileName }) => {
+      file.fileName = newFileName
+      file.publishedAt = new Date().toISOString()
+      return {
+        cid: file.cid,
+        fileName: file.fileName,
+        link: `most://${file.cid}?filename=${encodeURIComponent(file.fileName)}`,
+      }
+    })
+
     if (updatedFiles.length > 0) {
       this.#savePublishedMetadata()
     }
@@ -1678,28 +1769,23 @@ export class MostBoxEngine extends EventEmitter {
     options = {}
   ) {
     this.#ensureInitialized()
+    if (typeof offset === 'object' && offset !== null) {
+      options = offset
+      offset = 0
+      limit = DEFAULT_READ_LIMIT
+    }
     const ownerAddress = normalizeOwnerAddress(options.ownerAddress)
 
-    const fileRecord = this.#publishedFiles.find(
-      f =>
-        f.cid === cid &&
-        (options.public || this.#recordMatchesOwner(f, ownerAddress))
-    )
-    if (!fileRecord) {
+    const localContent = await this.#getLocalCidContent(cid, {
+      ownerAddress,
+      public: options.public,
+    })
+    if (!localContent) {
       throw new Error('File not found')
     }
 
-    const drive = await this.#getDriveForFile(fileRecord)
-
-    // Hyperdrive 中 key 为 '/' + cid
     const driveKey = '/' + cid
-    const entry = await drive.entry(driveKey, {
-      wait: true,
-      timeout: DRIVE_ENTRY_TIMEOUT,
-    })
-    if (!entry || !entry.value) {
-      throw new Error('File content not available')
-    }
+    const { drive } = localContent
 
     const chunks = []
     const stream = drive.createReadStream(driveKey, {
@@ -1743,25 +1829,16 @@ export class MostBoxEngine extends EventEmitter {
     this.#ensureInitialized()
     const ownerAddress = normalizeOwnerAddress(options.ownerAddress)
 
-    const fileRecord = this.#publishedFiles.find(
-      f =>
-        f.cid === cid &&
-        (options.public || this.#recordMatchesOwner(f, ownerAddress))
-    )
-    if (!fileRecord) {
+    const localContent = await this.#getLocalCidContent(cid, {
+      ownerAddress,
+      public: options.public,
+    })
+    if (!localContent) {
       throw new Error('File not found')
     }
 
-    const drive = await this.#getDriveForFile(fileRecord)
-
     const driveKey = '/' + cid
-    const entry = await drive.entry(driveKey, {
-      wait: true,
-      timeout: DRIVE_ENTRY_TIMEOUT,
-    })
-    if (!entry || !entry.value || !entry.value.blob) {
-      throw new Error('File content not available')
-    }
+    const { drive, entry, fileRecord } = localContent
 
     const totalSize = entry.value.blob.byteLength || 0
 
@@ -1808,19 +1885,63 @@ export class MostBoxEngine extends EventEmitter {
     return { buffer, fileName: fileRecord.fileName, totalSize }
   }
 
-  /**
-   * 获取文件对应的 drive，如果不存在则创建并同步
-   */
-  async #getDriveForFile(fileRecord) {
-    let drive = this.#drives.get(fileRecord.driveName)
-    if (!drive) {
-      drive = await this.#getOrCreateDrive(fileRecord.driveName, {
-        server: true,
-        client: true,
-      })
+  async #hasLocalDriveContent(drive, key) {
+    try {
+      return await drive.has(key)
+    } catch {
+      return false
+    }
+  }
+
+  async #getLocalCidContent(cid, options = {}) {
+    const ownerAddress = normalizeOwnerAddress(options.ownerAddress)
+    const fileRecord = this.#publishedFiles.find(
+      f =>
+        f.cid === cid &&
+        (options.public || this.#recordMatchesOwner(f, ownerAddress))
+    )
+    if (!options.allowHoldingFallback && !fileRecord) {
+      return null
+    }
+    const holding = this.#holdings.find(item => item.cid === cid)
+    const { driveName } = this.#getCidInfo(cid)
+    const 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
+      }
+
+      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,
+          localPath: holding?.localPath || null,
+          size,
+          ownerAddress,
+        },
+      }
+    } catch {
+      return null
     }
-    await this.#syncDrive(drive)
-    return drive
   }
 
   // --- 频道管理 ---
@@ -1834,6 +1955,7 @@ export class MostBoxEngine extends EventEmitter {
   async createChannel(name, type = 'personal', options = {}) {
     this.#ensureInitialized()
     const ownerAddress = normalizeOwnerAddress(options.ownerAddress)
+    const channelType = String(type || 'personal').trim() || 'personal'
 
     if (!CHANNEL_NAME_REGEX.test(name)) {
       throw new Error('频道名只能包含字母、数字、下划线和连字符')
@@ -1879,7 +2001,7 @@ export class MostBoxEngine extends EventEmitter {
       discoveryKey: b4a.toString(discoveryKey, 'hex'),
       coreKey: b4a.toString(core.key, 'hex'),
       createdAt: new Date().toISOString(),
-      type,
+      type: channelType,
       ownerAddress,
       members: ownerAddress ? [ownerAddress] : [],
       remoteCoreKeys: [],
@@ -2105,12 +2227,19 @@ export class MostBoxEngine extends EventEmitter {
   listChannels(options = {}) {
     this.#ensureInitialized()
     const ownerAddress = normalizeOwnerAddress(options.ownerAddress)
+    const type = String(options.type || '').trim()
+    const excludeType = String(options.excludeType || '').trim()
 
     return this.#channels
       .filter(c => {
         if (!ownerAddress) return true
         return Array.isArray(c.members) && c.members.includes(ownerAddress)
       })
+      .filter(c => {
+        if (type) return c.type === type
+        if (excludeType) return c.type !== excludeType
+        return true
+      })
       .map(c => ({
         name: c.name,
         coreKey: c.coreKey,
@@ -2172,7 +2301,11 @@ export class MostBoxEngine extends EventEmitter {
     const start = Math.max(0, total - offset - limit)
     const end = total - offset
 
-    return unique.slice(start, end).map(({ _coreKey, _index, ...msg }) => msg)
+    return unique
+      .slice(start, end)
+      .map(({ _coreKey, _index, ...msg }) =>
+        this.#normalizeChannelMessageForResponse(name, msg)
+      )
   }
 
   /**
@@ -2304,6 +2437,44 @@ export class MostBoxEngine extends EventEmitter {
     }
   }
 
+  #normalizeChannelMessageForResponse(channelName, message) {
+    const attachment = message?.attachment
+    if (!attachment?.cid || !attachment.fileName) {
+      return message
+    }
+
+    const oldFileName = sanitizeFilename(String(attachment.fileName))
+    const channelPrefix = `${CHAT_FILE_ROOT}/${channelName}/`
+    const fileName = oldFileName.startsWith(channelPrefix)
+      ? oldFileName
+      : `${channelPrefix}${getPathBaseName(oldFileName)}`
+    const link = buildMostLink(attachment.cid, fileName)
+    const content =
+      typeof message.content === 'string' &&
+      (message.content === attachment.link ||
+        parseMostLink(message.content).cid === attachment.cid)
+        ? link
+        : message.content
+
+    if (
+      fileName === attachment.fileName &&
+      link === attachment.link &&
+      content === message.content
+    ) {
+      return message
+    }
+
+    return {
+      ...message,
+      content,
+      attachment: {
+        ...attachment,
+        fileName,
+        link,
+      },
+    }
+  }
+
   #getCidInfo(cid) {
     return getCidInfo(cid)
   }
@@ -2684,6 +2855,31 @@ export class MostBoxEngine extends EventEmitter {
     return normalizeOwnerAddress(record.ownerAddress) === normalizedOwner
   }
 
+  #assertDisplayNameAvailable(fileName, options = {}) {
+    const ownerAddress = normalizeOwnerAddress(options.ownerAddress)
+    const safeFileName = sanitizeFilename(fileName)
+    const folder = getDisplayPathFolder(safeFileName)
+    const baseName = getPathBaseName(safeFileName)
+    const conflict = this.#publishedFiles.find(file => {
+      if (
+        options.excludeCid &&
+        file.cid === options.excludeCid &&
+        this.#recordMatchesOwner(file, ownerAddress)
+      ) {
+        return false
+      }
+      if (!this.#recordMatchesOwner(file, ownerAddress)) return false
+      const existingFileName = sanitizeFilename(file.fileName)
+      return (
+        getDisplayPathFolder(existingFileName) === folder &&
+        getPathBaseName(existingFileName) === baseName
+      )
+    })
+    if (conflict) {
+      throw new ConflictError(`已有同名文件: ${safeFileName}`)
+    }
+  }
+
   #hasPublishedReference(cid) {
     return this.#publishedFiles.some(file => file.cid === cid)
   }
@@ -2732,20 +2928,6 @@ export class MostBoxEngine extends EventEmitter {
     }
   }
 
-  async #syncDrive(drive, timeout = DRIVE_SYNC_TIMEOUT) {
-    try {
-      const updated = await Promise.race([
-        drive.update(),
-        new Promise((_, reject) =>
-          setTimeout(() => reject(new Error('Sync timeout')), timeout)
-        ),
-      ])
-      return updated
-    } catch {
-      return false
-    }
-  }
-
   #getMetadataPath() {
     return path.join(this.#options.dataPath, 'published-files.json')
   }
@@ -2903,7 +3085,10 @@ export class MostBoxEngine extends EventEmitter {
             if (entry && entry.type === 'message') {
               this.emit('channel:message', {
                 channel: channelName,
-                message: entry,
+                message: this.#normalizeChannelMessageForResponse(
+                  channelName,
+                  entry
+                ),
               })
             }
           } catch (err) {

package/server/src/utils/avatar.js

@@ -1,8 +1,9 @@
 import { createAvatar } from '@dicebear/core'
 import { botttsNeutral } from '@dicebear/collection'
 
-export function generateAvatar(address) {
-  if (!address) return '/pwa-512x512.png'
+export function generateAvatar(address, avatar) {
+  if (avatar) return avatar
+  if (!address) return '/avatar.png'
   return createAvatar(botttsNeutral, {
     seed: 'most.box@' + address,
     flip: true,