@steve02081504/fount-p2p 0.0.17 → 0.0.19

package/dag/storage.mjs

@@ -1,62 +1,18 @@
 import { Buffer } from 'node:buffer'
-import { randomUUID } from 'node:crypto'
 import { createReadStream, createWriteStream } from 'node:fs'
-import { appendFile, mkdir, open, readFile, rename, unlink, writeFile } from 'node:fs/promises'
+import { appendFile, mkdir, open, readFile, writeFile } from 'node:fs/promises'
 import { dirname } from 'node:path'
 import { createInterface } from 'node:readline'
 import { Readable } from 'node:stream'
 import { pipeline } from 'node:stream/promises'
-import { setTimeout as sleep } from 'node:timers/promises'
 
+import { atomicTemporaryPath, finalizeAtomicRename } from '../utils/atomic_fs.mjs'
 import { withAsyncMutex } from '../utils/async_mutex.mjs'
 
+export { finalizeAtomicRename } from '../utils/atomic_fs.mjs'
+
 /** 流式重写 JSONL 时分块写入的行数上限 */
 const WRITE_JSONL_CHUNK_LINES = 1000
-/** Windows 上 rename 可能被短暂占用，做几次短退避重试。 */
-const ATOMIC_RENAME_RETRY_DELAYS_MS = [0, 10, 25, 50, 100]
-const ATOMIC_RENAME_RETRY_CODES = new Set(['EPERM', 'EBUSY', 'EACCES'])
-
-/**
- * @param {string} filePath 目标路径
- * @returns {string} 唯一临时文件路径
- */
-function atomicTemporaryPath(filePath) {
-	return `${filePath}.tmp.${process.pid}.${randomUUID()}`
-}
-
-/**
- * @param {string} temporaryPath 临时文件路径
- * @returns {Promise<void>}
- */
-async function cleanupAtomicTemporary(temporaryPath) {
-	try { await unlink(temporaryPath) } catch { /* ok */ }
-}
-
-/**
- * 完成原子写的最终 rename；若目标目录已在 cleanup 中消失，则清理残余临时文件后静默返回。
- * @param {string} temporaryPath 临时文件路径
- * @param {string} filePath 最终目标路径
- * @returns {Promise<boolean>} 是否已成功落到目标路径
- */
-export async function finalizeAtomicRename(temporaryPath, filePath) {
-	/** @type {NodeJS.ErrnoException | undefined} */
-	let lastError
-	for (const delayMs of ATOMIC_RENAME_RETRY_DELAYS_MS) {
-		if (delayMs) await sleep(delayMs)
-		try {
-			await rename(temporaryPath, filePath)
-			return true
-		}
-		catch (error) {
-			lastError = error
-			if (ATOMIC_RENAME_RETRY_CODES.has(error?.code)) continue
-			break
-		}
-	}
-	await cleanupAtomicTemporary(temporaryPath)
-	if (lastError?.code === 'ENOENT') return false
-	throw lastError
-}
 
 /**
  * @param {string} line JSONL 单行

package/files/manifest_fetch.mjs

@@ -15,9 +15,12 @@ import { fanoutFedFetch } from './fetch_fanout.mjs'
 import { normalizeFileManifest } from './manifest.mjs'
 import { shouldPreferIncomingPublicManifest } from './public_manifest.mjs'
 
+const DEFAULT_MANIFEST_FETCH_TIMEOUT_MS = 8000
+
 /**
  * 拉取公开 manifest；默认不写盘。`cache: true` 或 `cachePublicManifest` 才缓存。
- * @param {{ username: string, ownerEntityHash: string, logicalPath: string, cache?: boolean }} context - 拉取上下文
+ * 本地已有 publicSig 时仍会 fanout 再校验，按 publishedAt 择新；超时则回退本地。
+ * @param {{ username: string, ownerEntityHash: string, logicalPath: string, cache?: boolean, timeoutMs?: number }} context - 拉取上下文
  * @returns {Promise<import('./manifest.mjs').FileManifest | null>} 验签后的 manifest，失败为 null
  */
 export async function fetchPublicManifest(context) {
@@ -27,16 +30,19 @@ export async function fetchPublicManifest(context) {
 	if (!ownerEntityHash || !logicalPath || !username) return null
 
 	const local = await loadFileManifest(ownerEntityHash, logicalPath)
-	if (local?.transferKeyDescriptor?.type === 'public' && local?.meta?.publicSig)
-		return local
+	const hasLocalPublic = local?.transferKeyDescriptor?.type === 'public' && !!local?.meta?.publicSig
 
-	if (pendingManifestFetches.size >= MAX_PENDING_MANIFEST_FETCHES) return null
+	if (pendingManifestFetches.size >= MAX_PENDING_MANIFEST_FETCHES)
+		return hasLocalPublic ? local : null
 
+	const timeoutMs = Number(context.timeoutMs) > 0
+		? Number(context.timeoutMs)
+		: DEFAULT_MANIFEST_FETCH_TIMEOUT_MS
 	const requestId = randomUUID()
 	const { done } = registerManifestFetchWait(
 		requestId,
 		manifestFetchExpectedKey(ownerEntityHash, logicalPath),
-		8000,
+		timeoutMs,
 	)
 	const { nodeHash } = await resolveNodeHash(username)
 	const payload = {
@@ -47,11 +53,14 @@ export async function fetchPublicManifest(context) {
 	}
 	await fanoutFedFetch(username, 'fed_manifest_get', payload)
 	const result = await done
-	if (!result) return null
 
-	if (context.cache === true)
-		await cachePublicManifest(ownerEntityHash, logicalPath, result)
-	return result
+	if (result && (!hasLocalPublic || shouldPreferIncomingPublicManifest(local, result))) {
+		if (context.cache === true)
+			await cachePublicManifest(ownerEntityHash, logicalPath, result)
+		return result
+	}
+	if (hasLocalPublic) return local
+	return null
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@steve02081504/fount-p2p",
-	"version": "0.0.17",
+	"version": "0.0.19",
 	"description": "fount federation P2P layer — link, trust graph, mailbox, DAG, EVFS.",
 	"keywords": [
 		"network",

package/utils/atomic_fs.mjs

@@ -0,0 +1,87 @@
+/**
+ * 原子落盘：唯一临时路径 + rename（Windows 短暂占用时短退避重试）。
+ */
+import { randomUUID } from 'node:crypto'
+import fs from 'node:fs'
+import { rename, unlink } from 'node:fs/promises'
+import { setTimeout as sleep } from 'node:timers/promises'
+
+/** Windows 上 rename 可能被短暂占用，做几次短退避重试。 */
+const ATOMIC_RENAME_RETRY_DELAYS_MS = [0, 10, 25, 50, 100]
+const ATOMIC_RENAME_RETRY_CODES = new Set(['EPERM', 'EBUSY', 'EACCES'])
+
+/**
+ * @param {string} filePath 目标路径
+ * @returns {string} 唯一临时文件路径
+ */
+export function atomicTemporaryPath(filePath) {
+	return `${filePath}.tmp.${process.pid}.${randomUUID()}`
+}
+
+/**
+ * @param {string} temporaryPath 临时文件路径
+ * @returns {Promise<void>}
+ */
+async function cleanupAtomicTemporary(temporaryPath) {
+	try { await unlink(temporaryPath) } catch { /* ok */ }
+}
+
+/**
+ * @param {string} temporaryPath 临时文件路径
+ * @returns {void}
+ */
+function cleanupAtomicTemporarySync(temporaryPath) {
+	try { fs.unlinkSync(temporaryPath) } catch { /* ok */ }
+}
+
+/**
+ * 完成原子写的最终 rename；若目标目录已在 cleanup 中消失，则清理残余临时文件后静默返回。
+ * @param {string} temporaryPath 临时文件路径
+ * @param {string} filePath 最终目标路径
+ * @returns {Promise<boolean>} 是否已成功落到目标路径
+ */
+export async function finalizeAtomicRename(temporaryPath, filePath) {
+	/** @type {NodeJS.ErrnoException | undefined} */
+	let lastError
+	for (const delayMs of ATOMIC_RENAME_RETRY_DELAYS_MS) {
+		if (delayMs) await sleep(delayMs)
+		try {
+			await rename(temporaryPath, filePath)
+			return true
+		}
+		catch (error) {
+			lastError = error
+			if (ATOMIC_RENAME_RETRY_CODES.has(error?.code)) continue
+			break
+		}
+	}
+	await cleanupAtomicTemporary(temporaryPath)
+	if (lastError?.code === 'ENOENT') return false
+	throw lastError
+}
+
+/**
+ * `finalizeAtomicRename` 的同步版。
+ * @param {string} temporaryPath 临时文件路径
+ * @param {string} filePath 最终目标路径
+ * @returns {boolean} 是否已成功落到目标路径
+ */
+export function finalizeAtomicRenameSync(temporaryPath, filePath) {
+	/** @type {NodeJS.ErrnoException | undefined} */
+	let lastError
+	for (const delayMs of ATOMIC_RENAME_RETRY_DELAYS_MS) {
+		if (delayMs) Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, delayMs)
+		try {
+			fs.renameSync(temporaryPath, filePath)
+			return true
+		}
+		catch (error) {
+			lastError = error
+			if (ATOMIC_RENAME_RETRY_CODES.has(error?.code)) continue
+			break
+		}
+	}
+	cleanupAtomicTemporarySync(temporaryPath)
+	if (lastError?.code === 'ENOENT') return false
+	throw lastError
+}

package/utils/json_io.mjs

@@ -2,6 +2,8 @@ import fs from 'node:fs'
 import fsp from 'node:fs/promises'
 import path from 'node:path'
 
+import { atomicTemporaryPath, finalizeAtomicRename, finalizeAtomicRenameSync } from './atomic_fs.mjs'
+
 /**
  * @param {string} filePath 绝对路径
  * @returns {Promise<object | null>} JSON 或 null
@@ -24,9 +26,10 @@ export async function readJsonFile(filePath) {
  */
 export async function writeJsonFile(filePath, data) {
 	await fsp.mkdir(path.dirname(filePath), { recursive: true })
-	const temporaryPath = `${filePath}.tmp`
+	const temporaryPath = atomicTemporaryPath(filePath)
 	await fsp.writeFile(temporaryPath, `${JSON.stringify(data, null, 2)}\n`, 'utf8')
-	await fsp.rename(temporaryPath, filePath)
+	if (!await finalizeAtomicRename(temporaryPath, filePath))
+		throw Object.assign(new Error(`ENOENT: atomic rename failed for ${filePath}`), { code: 'ENOENT' })
 }
 
 /**
@@ -51,7 +54,8 @@ export function readJsonFileSync(filePath) {
  */
 export function writeJsonFileSync(filePath, data) {
 	fs.mkdirSync(path.dirname(filePath), { recursive: true })
-	const temporaryPath = `${filePath}.tmp`
+	const temporaryPath = atomicTemporaryPath(filePath)
 	fs.writeFileSync(temporaryPath, `${JSON.stringify(data, null, 2)}\n`, 'utf8')
-	fs.renameSync(temporaryPath, filePath)
+	if (!finalizeAtomicRenameSync(temporaryPath, filePath))
+		throw Object.assign(new Error(`ENOENT: atomic rename failed for ${filePath}`), { code: 'ENOENT' })
 }