@spatius/avatarkit 1.3.1-beta.7 → 1.3.1

package/dist/{OpusCodec-PWv7ynPp.js → OpusCodec-CXU7ysrU.js}

@@ -1,5 +1,5 @@
 import { n as __exportAll, r as __toESM, t as __commonJSMin } from "./rolldown-runtime-B-1-B7_t.js";
-import { t as logger } from "./logger-DdmfSEn-.js";
+import { t as logger } from "./logger-BOpQ7u0w.js";
 /** Opus granule positions are always in 48 kHz samples, regardless of input rate. */
 var OPUS_GRANULE_RATE = 48e3;
 /**
@@ -41418,12 +41418,26 @@ var OggOpusEncoder = class {
 	* @param end true on the final chunk of the req_id; flushes the tail and emits the EOS page.
 	* @returns Ogg page byte arrays to send over the socket, in order.
 	*/
-	encode(reqId, pcm, end) {
+	/**
+	* @param onFrame 可选：每编完一帧（20ms）回调一次，参数是这帧的 PCM 字节数。
+	*   给延迟打点用——编码内部逐帧进行，但结果打成页一起返回；只按整批记时会把
+	*   一次调用的全部耗时算成一段（实测 1068ms 一条），看不出编码速率是否稳定。
+	* @param onPages 可选：**每凑满 1 秒音频就吐一批页**，让调用方边编边发。
+	*
+	*   不给这个回调时退化为老行为（全部编完一次性返回）。宿主一次性灌入整段音频时，
+	*   老行为要等全部编完才发出第一个包——实测 12 秒音频编码 1105ms，首包上行就白等
+	*   这 1105ms（起播 startup_buffering 1804ms 里大半是它）。编 1 秒发 1 秒后，
+	*   首包在几十毫秒内就能上线。
+	*/
+	encode(reqId, pcm, end, onFrame, onPages) {
 		const pages = [];
+		const emit = onPages ?? ((built) => {
+			pages.push(...built);
+		});
 		if (reqId !== this.currentReqId) {
 			this.currentReqId = reqId;
 			this.pcmRemainder = /* @__PURE__ */ new Int16Array(0);
-			pages.push(...this.muxer.startStream(reqId));
+			emit(this.muxer.startStream(reqId));
 		}
 		const incoming = this.bytesToInt16(pcm);
 		let samples = incoming;
@@ -41433,18 +41447,29 @@ var OggOpusEncoder = class {
 			samples.set(incoming, this.pcmRemainder.length);
 		}
 		const frameGranule = this.muxer.toGranule(this.frameSamples);
-		const packets = [];
+		const FRAMES_PER_SECOND = Math.round(1e3 / FRAME_MS);
+		let packets = [];
 		let offset = 0;
+		const flushPackets = () => {
+			if (packets.length === 0) return;
+			const built = this.muxer.addPackets(packets, frameGranule);
+			packets = [];
+			emit(built);
+		};
 		while (samples.length - offset >= this.frameSamples) {
 			const frame = samples.subarray(offset, offset + this.frameSamples);
 			offset += this.frameSamples;
 			const packet = this.encodeFrame(frame);
-			if (packet) packets.push(packet);
+			if (packet) {
+				packets.push(packet);
+				onFrame?.(frame.length * 2);
+			}
+			if (onPages && packets.length >= FRAMES_PER_SECOND) flushPackets();
 		}
-		pages.push(...this.muxer.addPackets(packets, frameGranule));
+		flushPackets();
 		this.pcmRemainder = samples.slice(offset);
 		if (end) {
-			pages.push(...this.flush());
+			emit(this.flush());
 			this.currentReqId = null;
 		}
 		return pages;
@@ -41522,9 +41547,15 @@ var OggOpusDecoder = class {
 	* trailing page is buffered until the rest arrives.
 	*
 	* @param oggBytes raw Ogg stream bytes (any slice boundary).
+	* @param onSegment 可选：每解出一个 packet 就回调一次那一段 PCM。
+	*
+	*   给延迟打点用。`tap_N` 的语义是「第 N 秒音频进入播放链路的时刻」，若只在
+	*   decode 返回后按整块累计，宿主一次性喂进整段 Ogg 时所有 tap 会挤在同一个
+	*   时刻（实测 tap_1/2/4 三条同值），送入节奏这个信息就没了。解码本来就是逐包
+	*   进行的，把分段暴露出来，打点才能落在真实的音频时间轴上。
 	* @returns decoded PCM16 bytes, possibly empty.
 	*/
-	decode(oggBytes) {
+	decode(oggBytes, onSegment) {
 		const incoming = oggBytes instanceof Uint8Array ? oggBytes : new Uint8Array(oggBytes);
 		let buf;
 		if (this.carry.length > 0) {
@@ -41540,7 +41571,10 @@ var OggOpusDecoder = class {
 			offset = page.nextOffset;
 			for (const packet of page.packets) {
 				const pcm = this.decodePacket(packet);
-				if (pcm.length > 0) pcmChunks.push(pcm);
+				if (pcm.length > 0) {
+					pcmChunks.push(pcm);
+					onSegment?.(pcm);
+				}
 			}
 		}
 		this.carry = offset < buf.length ? buf.slice(offset) : /* @__PURE__ */ new Uint8Array(0);

package/dist/{OpusDecoderProxy-m0fVN_M2.js → OpusDecoderProxy-Cq8Z_MZY.js}

@@ -1,4 +1,4 @@
-import { t as logger } from "./logger-DdmfSEn-.js";
+import { t as logger } from "./logger-BOpQ7u0w.js";
 //#region audio/OpusDecoderProxy.ts
 var OpusDecoderProxy = class OpusDecoderProxy {
 	worker = null;
@@ -21,7 +21,7 @@ var OpusDecoderProxy = class OpusDecoderProxy {
 		} catch (err) {
 			logger.warn("[Opus][DecoderProxy] Worker unavailable, falling back to main-thread decode:", err instanceof Error ? err.message : String(err));
 		}
-		const { OggOpusDecoder } = await import("./OpusCodec-PWv7ynPp.js").then((n) => n.n);
+		const { OggOpusDecoder } = await import("./OpusCodec-CXU7ysrU.js").then((n) => n.n);
 		proxy.fallbackDecoder = new OggOpusDecoder();
 		proxy.backend = "main-thread";
 		return proxy;
@@ -32,7 +32,7 @@ var OpusDecoderProxy = class OpusDecoderProxy {
 			try {
 				worker = new Worker(new URL(
 					/* @vite-ignore */
-					"/assets/OpusDecoderWorker.worker-CSSWn75M.js",
+					"/assets/OpusDecoderWorker.worker-C2T0afkj.js",
 					"" + import.meta.url
 				), { type: "module" });
 			} catch (err) {
@@ -56,7 +56,11 @@ var OpusDecoderProxy = class OpusDecoderProxy {
 					return;
 				}
 				if (d.type === "pcm") {
-					this.pending.get(d.seq)?.resolve(new Uint8Array(d.pcm));
+					this.pending.get(d.seq)?.resolve({
+						pcm: new Uint8Array(d.pcm),
+						segments: d.segments ?? [],
+						segmentTs: (d.segmentTs ?? []).map((ts) => ts - performance.timeOrigin)
+					});
 					this.pending.delete(d.seq);
 					return;
 				}
@@ -103,8 +107,17 @@ var OpusDecoderProxy = class OpusDecoderProxy {
 			});
 		}
 		if (this.fallbackDecoder) try {
-			const pcm = this.fallbackDecoder.decode(ogg);
-			return Promise.resolve(pcm);
+			const segments = [];
+			const segmentTs = [];
+			const pcm = this.fallbackDecoder.decode(ogg, (seg) => {
+				segments.push(seg.length);
+				segmentTs.push(performance.now());
+			});
+			return Promise.resolve({
+				pcm,
+				segments,
+				segmentTs
+			});
 		} catch (err) {
 			return Promise.reject(err instanceof Error ? err : new Error(String(err)));
 		}

package/dist/{OpusEncoderProxy-DiW21sBK.js → OpusEncoderProxy-CzY-VckE.js}

@@ -1,5 +1,22 @@
-import { t as logger } from "./logger-DdmfSEn-.js";
+import { n as __exportAll } from "./rolldown-runtime-B-1-B7_t.js";
+import { t as logger } from "./logger-BOpQ7u0w.js";
 //#region audio/OpusEncoderProxy.ts
+var OpusEncoderProxy_exports = /* @__PURE__ */ __exportAll({
+	OpusEncoderProxy: () => OpusEncoderProxy,
+	setOpusEncodeFrameSink: () => setOpusEncodeFrameSink
+});
+/**
+* 逐帧编码时刻的接收钩子。由 `AnimationWebSocketClient` 装上，转交 trace 打点。
+*
+* 与解码那侧同理：编码在 Worker 里逐帧进行，结果打成页一起返回；只有把每帧的时刻
+* 带回来，span 才能按音频秒数切，而不是把整批耗时算成一段。
+* @internal
+*/
+var onEncodeFrames = null;
+/** @internal */
+function setOpusEncodeFrameSink(fn) {
+	onEncodeFrames = fn;
+}
 var OpusEncoderProxy = class OpusEncoderProxy {
 	worker = null;
 	fallbackEncoder = null;
@@ -26,7 +43,7 @@ var OpusEncoderProxy = class OpusEncoderProxy {
 		} catch (err) {
 			logger.warn("[Opus][Proxy] Worker unavailable, falling back to main-thread encode:", err instanceof Error ? err.message : String(err));
 		}
-		const { OggOpusEncoder } = await import("./OpusCodec-PWv7ynPp.js").then((n) => n.n);
+		const { OggOpusEncoder } = await import("./OpusCodec-CXU7ysrU.js").then((n) => n.n);
 		proxy.fallbackEncoder = new OggOpusEncoder(sampleRate, bitrate);
 		proxy.backend = "main-thread";
 		return proxy;
@@ -37,7 +54,7 @@ var OpusEncoderProxy = class OpusEncoderProxy {
 			try {
 				worker = new Worker(new URL(
 					/* @vite-ignore */
-					"/assets/OpusEncoderWorker.worker-q4TdCVDZ.js",
+					"/assets/OpusEncoderWorker.worker-DLYO9vPK.js",
 					"" + import.meta.url
 				), { type: "module" });
 			} catch (err) {
@@ -61,6 +78,11 @@ var OpusEncoderProxy = class OpusEncoderProxy {
 					return;
 				}
 				if (d.type === "pages") {
+					if (!d.last) {
+						this.pending.get(d.seq)?.onPages(d.pages);
+						return;
+					}
+					onEncodeFrames?.(d.frames ?? [], (d.frameTs ?? []).map((ts) => ts - performance.timeOrigin));
 					this.pending.get(d.seq)?.resolve(d.pages);
 					this.pending.delete(d.seq);
 					return;
@@ -92,13 +114,19 @@ var OpusEncoderProxy = class OpusEncoderProxy {
 	* worker path the main thread stays free while encoding runs; on the fallback
 	* path this blocks the main thread (same as the legacy behavior).
 	*/
-	encode(reqId, pcm, end) {
+	/**
+	* @param onPages 每凑满 1 秒音频回调一次那一批页，调用方应立刻发出去。
+	*   返回的 Promise 只带**收尾批**（通常为空）——所有页都从这个回调出去，等
+	*   Promise 再发会退回「整段编完才发」，白等一秒以上（见 OpusCodec.encode）。
+	*/
+	encode(reqId, pcm, end, onPages = () => {}) {
 		if (this.worker) {
 			const seq = this.seq++;
 			return new Promise((resolve, reject) => {
 				this.pending.set(seq, {
 					resolve,
-					reject
+					reject,
+					onPages
 				});
 				this.worker.postMessage({
 					type: "encode",
@@ -110,7 +138,14 @@ var OpusEncoderProxy = class OpusEncoderProxy {
 			});
 		}
 		if (this.fallbackEncoder) try {
-			return Promise.resolve(this.fallbackEncoder.encode(reqId, pcm, end));
+			const frames = [];
+			const frameTs = [];
+			const pages = this.fallbackEncoder.encode(reqId, pcm, end, (pcmBytes) => {
+				frames.push(pcmBytes);
+				frameTs.push(performance.now());
+			}, onPages);
+			onEncodeFrames?.(frames, frameTs);
+			return Promise.resolve(pages);
 		} catch (err) {
 			return Promise.reject(err instanceof Error ? err : new Error(String(err)));
 		}
@@ -132,4 +167,4 @@ var OpusEncoderProxy = class OpusEncoderProxy {
 	}
 };
 //#endregion
-export { OpusEncoderProxy };
+export { setOpusEncodeFrameSink as n, OpusEncoderProxy_exports as t };

package/dist/{StreamingAudioPlayer-C6hgkvbK.js → StreamingAudioPlayer-CIJmBp3z.js}

@@ -1,5 +1,5 @@
-import { c as logEvent, t as logger } from "./logger-DdmfSEn-.js";
-import { n as APP_CONFIG, t as errorToMessage } from "./error-utils-BCZDCrc6.js";
+import { c as logEvent, t as logger } from "./logger-BOpQ7u0w.js";
+import { n as APP_CONFIG, t as errorToMessage } from "./error-utils-BogEllAd.js";
 //#region audio/StreamingAudioPlayer.ts
 /**
 * Streaming Audio Player

package/dist/assets/{AvatarDownloader-LO9uuYvm.js → AvatarDownloader-G5FO1bVl.js}

@@ -1,5 +1,5 @@
-import { _ as recordHttpClientDuration, c as logEvent, dt as isDebugMode, l as logMetric, mt as AvatarError, pt as generateTraceId, t as logger, vt as ErrorCode } from "./logger-DCzHWd4N.js";
-import { t as AvatarSDK } from "./AvatarSDK-CPEeTeLT.js";
+import { bt as ErrorCode, c as logEvent, gt as AvatarError, h as hostOf, ht as generateTraceId, l as logMetric, pt as isDebugMode, t as logger, y as recordHttpClientDuration } from "./logger-YPooEAbA.js";
+import { t as AvatarSDK } from "./AvatarSDK-C_Anluwp.js";
 //#region config/app-config.ts
 const GLOBAL_FLAME_CDN_BASE = "https://cdn.spatialwalk.cloud/public";
 const CN_FLAME_CDN_BASE = "https://cdn.spatialwalk.top/public";
@@ -273,20 +273,46 @@ function getCacheInfo(url, response) {
 	};
 }
 /**
-* Simple download helper with CORS proxy support for development
-* Static resources don't need appId and token headers
-* 
-* Features:
-* - Supports AbortSignal for cancellation
-* - Automatic retry (default 3 times, no delay)
-* - PWA cache integration
-* 
-* @param url 资源 URL
-* @param options 下载选项
-* @returns ArrayBuffer and cache information
+* 把整次角色加载的资产下载汇总成**一条** Transaction。
+*
+* 成败取「最差的一片」：任一片 transport error 即整次记 transport error；否则取
+* 状态码最大的那个（4xx/5xx 会盖过 200）。这样后端按状态码切出的成功率，含义是
+* 「这次加载的资产是否全部拿到」——与用户实际体验一致，一片挂了角色就出不来。
+*
+* duration 传整体耗时而非单片，与 `download_avatar_assets_latency` 同口径。
+*/
+function recordAssetTransaction(outcomes, durationMs, operation = ASSET_OPERATION) {
+	const real = outcomes.filter((o) => !o.skipped);
+	if (real.length === 0) {
+		recordHttpClientDuration({
+			operation,
+			method: "GET",
+			durationMs,
+			statusCode: 200,
+			cacheHit: true
+		});
+		return;
+	}
+	recordHttpClientDuration({
+		operation,
+		method: "GET",
+		durationMs,
+		statusCode: real.some((o) => o.statusCode === void 0) ? void 0 : real.reduce((max, o) => Math.max(max, o.statusCode ?? 0), 0),
+		serverAddress: real[0].host,
+		cacheHit: false
+	});
+}
+/**
+* Transaction 的 `operation` 取值。必须低基数：资产 URL 带 avatar id 与文件名，
+* 直接当维度会让时间序列随角色数无限增长。要定位「哪个文件挂了」用
+* `download_avatar_assets_failed` log，它带 resource/url/error。
 */
+const ASSET_OPERATION = "/assets/character";
+const TEMPLATE_OPERATION = "/assets/template";
 async function downloadResource(url, options) {
-	const { signal, characterId, resourceType, maxRetries = 3 } = options || {};
+	const { signal, characterId, resourceType, maxRetries = 3, outcomes } = options || {};
+	const outcomeSlotIndex = outcomes ? outcomes.length : -1;
+	if (outcomes) outcomes.push({ host: hostOf(url) });
 	if (signal?.aborted) throw new Error("Download cancelled");
 	try {
 		let cached = null;
@@ -305,6 +331,10 @@ async function downloadResource(url, options) {
 			cacheInfo.cacheHit = true;
 			cacheInfo.cacheType = "pwa";
 			cacheInfo.pwaCacheSubtype = pwaCacheSubtype;
+			if (outcomes && outcomeSlotIndex >= 0) outcomes[outcomeSlotIndex] = {
+				host: "",
+				skipped: true
+			};
 			return {
 				data: cached,
 				cacheInfo
@@ -313,8 +343,11 @@ async function downloadResource(url, options) {
 		let lastError = null;
 		for (let attempt = 1; attempt <= maxRetries; attempt++) {
 			if (signal?.aborted) throw new Error("Download cancelled");
+			const outcomeSlot = { host: hostOf(url) };
+			if (outcomes) outcomes[outcomeSlotIndex] = outcomeSlot;
 			try {
 				const response = await fetch(url, { signal });
+				outcomeSlot.statusCode = response.status;
 				if (!response.ok) throw new Error(`HTTP ${response.status} ${response.statusText}`);
 				const arrayBuffer = await response.arrayBuffer();
 				const contentLength = response.headers.get("content-length");
@@ -372,32 +405,41 @@ var AvatarDownloader = class {
 				cache_hit: true,
 				cache_type: "pwa"
 			});
+			recordAssetTransaction([], duration, TEMPLATE_OPERATION);
 			return { unifiedModel: cached };
 		}
 		const maxRetries = 3;
 		let lastError = null;
-		for (let attempt = 1; attempt <= maxRetries; attempt++) try {
-			const response = await fetch(url);
-			if (!response.ok) throw new Error(`HTTP ${response.status} ${response.statusText}`);
-			let buffer;
-			if (APP_CONFIG.flame.unifiedModelPath.endsWith(".gz")) {
-				const decompressedStream = response.body.pipeThrough(new DecompressionStream("gzip"));
-				buffer = await new Response(decompressedStream).arrayBuffer();
-			} else buffer = await response.arrayBuffer();
-			logger.log(`✅ Unified template loaded (${(buffer.byteLength / 1024 / 1024).toFixed(1)} MB)`);
-			PwaCacheManager.putTemplateResource(url, buffer).catch((err) => {
-				logger.warn(`[loadUnifiedTemplate] Failed to cache:`, err);
-			});
-			logMetric("template_resources_load_measure", Date.now() - startTime, {
-				file_count: 1,
-				cache_hit: false,
-				cache_type: "none"
-			});
-			return { unifiedModel: buffer };
-		} catch (err) {
-			lastError = err instanceof Error ? err : new Error(String(err));
-			if (attempt < maxRetries) logger.warn(`[loadUnifiedTemplate] Attempt ${attempt}/${maxRetries} failed, retrying...`);
+		const templateOutcomes = [];
+		for (let attempt = 1; attempt <= maxRetries; attempt++) {
+			const outcomeSlot = { host: hostOf(url) };
+			templateOutcomes[0] = outcomeSlot;
+			try {
+				const response = await fetch(url);
+				outcomeSlot.statusCode = response.status;
+				if (!response.ok) throw new Error(`HTTP ${response.status} ${response.statusText}`);
+				let buffer;
+				if (APP_CONFIG.flame.unifiedModelPath.endsWith(".gz")) {
+					const decompressedStream = response.body.pipeThrough(new DecompressionStream("gzip"));
+					buffer = await new Response(decompressedStream).arrayBuffer();
+				} else buffer = await response.arrayBuffer();
+				logger.log(`✅ Unified template loaded (${(buffer.byteLength / 1024 / 1024).toFixed(1)} MB)`);
+				PwaCacheManager.putTemplateResource(url, buffer).catch((err) => {
+					logger.warn(`[loadUnifiedTemplate] Failed to cache:`, err);
+				});
+				logMetric("template_resources_load_measure", Date.now() - startTime, {
+					file_count: 1,
+					cache_hit: false,
+					cache_type: "none"
+				});
+				recordAssetTransaction(templateOutcomes, Date.now() - startTime, TEMPLATE_OPERATION);
+				return { unifiedModel: buffer };
+			} catch (err) {
+				lastError = err instanceof Error ? err : new Error(String(err));
+				if (attempt < maxRetries) logger.warn(`[loadUnifiedTemplate] Attempt ${attempt}/${maxRetries} failed, retrying...`);
+			}
 		}
+		recordAssetTransaction(templateOutcomes, Date.now() - startTime, TEMPLATE_OPERATION);
 		throw lastError || /* @__PURE__ */ new Error(`Failed to download unified template after ${maxRetries} attempts`);
 	}
 	/**
@@ -478,6 +520,8 @@ var AvatarDownloader = class {
 		};
 		const characterData = {};
 		const cacheInfos = [];
+		/** 各片的 HTTP 结果，收尾时汇总成一条 Transaction（见 recordAssetTransaction）。 */
+		const httpOutcomes = [];
 		const parallelStartTime = Date.now();
 		const downloadPromises = filesToLoad.map(async ({ key, url, filename, optional }) => {
 			updateProgress(filename, false);
@@ -485,7 +529,8 @@ var AvatarDownloader = class {
 				const { data: arrayBuffer, cacheInfo } = await downloadResource(url, {
 					signal,
 					characterId: characterMeta.characterId ?? void 0,
-					resourceType: "character"
+					resourceType: "character",
+					outcomes: httpOutcomes
 				});
 				if (key === "shape") characterData.shape = arrayBuffer;
 				else if (key === "pointCloud") characterData.pointCloud = arrayBuffer;
@@ -523,7 +568,11 @@ var AvatarDownloader = class {
 				};
 			}
 		});
-		await Promise.all(downloadPromises);
+		try {
+			await Promise.all(downloadPromises);
+		} finally {
+			recordAssetTransaction(httpOutcomes, Date.now() - totalStartTime);
+		}
 		const parallelDuration = Date.now() - parallelStartTime;
 		const totalDuration = Date.now() - totalStartTime;
 		if (!characterData.shape || !characterData.pointCloud) {
@@ -550,7 +599,11 @@ var AvatarDownloader = class {
 			parallel_duration: parallelDuration,
 			total_size: totalSize
 		});
-		return characterData;
+		return {
+			data: characterData,
+			cacheHit,
+			cacheType
+		};
 	}
 	/**
 	* Preload all resources (template + character data + camera info + settings)
@@ -559,7 +612,7 @@ var AvatarDownloader = class {
 	async preloadResources(characterMeta, options) {
 		const { progressCallback = null, signal, useCompressedModel = false } = options || {};
 		if (signal?.aborted) throw new Error("Preload cancelled");
-		const [characterData, preloadCameraSettings] = await Promise.all([this.loadCharacterData(characterMeta, {
+		const [characterResult, preloadCameraSettings] = await Promise.all([this.loadCharacterData(characterMeta, {
 			signal,
 			useCompressedModel,
 			progressCallback: (info) => {
@@ -570,9 +623,11 @@ var AvatarDownloader = class {
 			}
 		}), this.loadCameraSettings(characterMeta, { signal })]);
 		return {
-			characterData,
+			characterData: characterResult.data,
 			preloadCameraSettings,
-			characterSettings: characterMeta.characterSettings
+			characterSettings: characterMeta.characterSettings,
+			cacheHit: characterResult.cacheHit,
+			cacheType: characterResult.cacheType
 		};
 	}
 	/**