most-box 0.0.8 → 0.1.1

package/server/src/config.js

@@ -28,6 +28,10 @@ export const DOWNLOAD_POLL_INTERVAL_MIN = 500
 export const DOWNLOAD_POLL_INTERVAL_MAX = 2000
 export const DRIVE_UPDATE_INTERVAL = 2000
 
+// 启动时恢复做种 topic 的后台批处理
+export const HOLDING_REJOIN_BATCH_SIZE = 16
+export const HOLDING_REJOIN_BATCH_DELAY = 25
+
 // 进度更新节流间隔（毫秒）
 export const PROGRESS_THROTTLE = 500
 

package/server/src/core/cid.js

@@ -6,6 +6,7 @@
 import fs from 'node:fs'
 import { Readable } from 'node:stream'
 import { importer } from 'ipfs-unixfs-importer'
+import { CID } from 'multiformats/cid'
 
 /**
  * 用于 CID 计算的虚拟 Blockstore
@@ -26,19 +27,13 @@ function createDummyBlockstore() {
  * 使用流式方法高效处理大文件
  *
  * @param {string|Buffer|AsyncIterable} content - 文件路径（字符串）、Buffer 或异步迭代器
- * @param {object} options - 计算选项
- * @param {boolean} [options.rawLeaves=true] - 使用原始叶子节点以支持现代 CID
- * @param {number} [options.cidVersion=1] - CID 版本（0 或 1）
- * @param {number} [options.size] - 总字节数（可选，自动检测）
  * @returns {Promise<{cid: import('multiformats/cid').CID, size: number}>}
  */
-export async function calculateCid(content, options = {}) {
-  const { rawLeaves = true, cidVersion = 1, size: providedSize } = options
-
+export async function calculateCid(content) {
   const blockstore = createDummyBlockstore()
 
   let rootCid = null
-  let totalSize = providedSize || 0
+  let totalSize = 0
 
   let source
 
@@ -75,8 +70,8 @@ export async function calculateCid(content, options = {}) {
 
   try {
     for await (const entry of importer(source, blockstore, {
-      cidVersion,
-      rawLeaves,
+      cidVersion: 1,
+      rawLeaves: true,
       wrapWithDirectory: false,
     })) {
       rootCid = entry.cid
@@ -105,10 +100,27 @@ export function validateCidString(cidString) {
     return { valid: false, error: 'CID must be a non-empty string' }
   }
 
-  if (!cidString.startsWith('b')) {
+  let parsed
+  try {
+    parsed = CID.parse(cidString)
+  } catch {
+    return {
+      valid: false,
+      error: 'Invalid CID format',
+    }
+  }
+
+  if (parsed.version !== 1) {
+    return {
+      valid: false,
+      error: 'Invalid CID format: CID v1 required',
+    }
+  }
+
+  if (parsed.multihash.digest.length !== 32) {
     return {
       valid: false,
-      error: 'Invalid CID format: CID v1 must start with "b"',
+      error: 'CID digest must be 32 bytes',
     }
   }
 
@@ -116,42 +128,51 @@ export function validateCidString(cidString) {
 }
 
 /**
- * 解析 most:// 链接并提取 CID
- * @param {string} link - most://<cid> 格式的链接
- * @returns {{ cid: string, error?: string }}
+ * 解析 most:// 链接并提取 CID 与用户可见文件名
+ * @param {string} link - most://<cid>?filename=... 格式的链接
+ * @returns {{ cid: string, fileName?: string, error?: string }}
  */
 export function parseMostLink(link) {
   if (!link || typeof link !== 'string') {
     return { cid: '', error: 'Link must be a non-empty string' }
   }
 
-  let cidString = link
-
-  if (link.startsWith('most://')) {
-    cidString = link.replace('most://', '')
+  let url
+  try {
+    url = new URL(link)
+  } catch {
+    return { cid: '', error: 'Link must be a valid most:// URL' }
   }
 
-  // 移除尾部斜杠和空白
-  cidString = cidString.trim().replace(/\/+$/, '')
-
-  // 移除 query string，提取 filename
-  let fileName = null
-  if (cidString.includes('?')) {
-    const [cidPart, queryPart] = cidString.split('?')
-    cidString = cidPart
-    const params = new URLSearchParams(queryPart)
-    fileName = params.get('filename')
+  if (url.protocol !== 'most:') {
+    return { cid: '', error: 'Link must use most:// protocol' }
   }
 
-  // 处理可能的额外路径的 URL 解析
-  if (cidString.includes('/')) {
-    cidString = cidString.split('/')[0]
+  if (url.pathname && url.pathname !== '/') {
+    return { cid: '', error: 'Link path is not supported' }
   }
 
+  const cidString = url.hostname
+  const fileName = url.searchParams.get('filename')
+  const unsupportedParam = [...url.searchParams.keys()].find(
+    key => key !== 'filename'
+  )
+
   const validation = validateCidString(cidString)
   if (!validation.valid) {
     return { cid: '', error: validation.error }
   }
 
+  if (!fileName) {
+    return { cid: '', error: 'filename is required' }
+  }
+
+  if (unsupportedParam) {
+    return {
+      cid: '',
+      error: `Unsupported query parameter: ${unsupportedParam}`,
+    }
+  }
+
   return { cid: cidString, fileName }
 }