@linxin666/dsh-pet 0.3.5 → 0.3.6

package/contracts/voice-pack-v1.schema.json

@@ -206,6 +206,36 @@
           "description": "Subset of actions to render in canonical order; absent = all three, [] = none."
         }
       }
+    },
+    "remarks": {
+      "type": "object",
+      "additionalProperties": false,
+      "description": "Pat/feed interaction remark pools (issue #1226). Keyed by pet/petCooldown/feed/feedCooldown/noTreats.",
+      "properties": {
+        "pet": {
+          "$ref": "#/definitions/pool"
+        },
+        "petCooldown": {
+          "$ref": "#/definitions/pool"
+        },
+        "feed": {
+          "$ref": "#/definitions/pool"
+        },
+        "feedCooldown": {
+          "$ref": "#/definitions/pool"
+        },
+        "noTreats": {
+          "$ref": "#/definitions/pool"
+        }
+      }
+    },
+    "ranks": {
+      "type": "object",
+      "additionalProperties": {
+        "type": "string",
+        "maxLength": 80
+      },
+      "description": "Affinity rank name overrides (issue #1226), keyed by tier minimum points or original rank name."
     }
   },
   "definitions": {

package/cordis.patch.yml

@@ -1,6 +1,6 @@
 # dsh-pet bundle patch: inserts its plugin row into the web plugin roster.
 # The bundle is the official dsh plugin shape — install it into a dsh profile
-# (`dsh plugin --profile <name> add link:/Users/zcl/code/dsh-web-ui/packages/dsh-pet`). The single
+# (`dsh plugin --profile <name> add link:/Users/zcl/code/dsh-web/packages/dsh-pet`). The single
 # row mounts BOTH halves: the host side (pet registry, state machine,
 # affinity score, pet.* RPC service) and the browser side (the modules node
 # half scans dsh.client packages into the web plugin roster, served from this

package/lib/client.js

@@ -712,7 +712,12 @@ window.__ModuleLoader__.load({
 									children: displayName
 								}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 									className: pet_module_css_default.statRank,
-									children: panelStat("rank", "pet.rank", { rank: snapshot?.affinity.rank ?? "?" })
+									children: (() => {
+										const rawRank = snapshot?.affinity.rank ?? "?";
+										const rankKey = `pet.rank.name.${rawRank}`;
+										const localized = props.t(rankKey);
+										return panelStat("rank", "pet.rank", { rank: localized !== rankKey ? localized : rawRank });
+									})()
 								})]
 							}),
 							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
@@ -1811,6 +1816,18 @@ window.__ModuleLoader__.load({
 		* phase-mapped track. Rendering never throws: a broken track list degrades
 		* to the first decodable frame, and the 1.2 s stall watchdog re-kicks the
 		* playback chain after timer throttling.
+		*
+		* Frame presentation has two modes picked once at mount by capability
+		* probing:
+		* - Canvas bitmap buffer (default where createImageBitmap/fetch/2D context
+		*   exist): every frame is decoded exactly once into an ImageBitmap during
+		*   the warm pass and drawn onto one <canvas> - steady-state playback issues
+		*   zero DOM mutations and zero re-decodes (measured hotspot: swapping
+		*   <img>.src per frame drove image decode + invalidation every tick).
+		* - Classic <img> fallback (jsdom/tests or missing APIs): identical to the
+		*   historical behavior - cache-warm Image elements plus guarded src swaps,
+		*   so environments without modern decoding keep working unchanged.
+		*
 		* @module @linxin666/dsh-pet/client/renderers/frames2d
 		*/
 		/** Stall watchdog period: a looping track stuck longer re-kicks its chain. */
@@ -1844,19 +1861,79 @@ window.__ModuleLoader__.load({
 			validateConfig: validateFrames2dConfig,
 			mount(ctx, config) {
 				const reducedMotion = typeof window !== "undefined" && typeof window.matchMedia === "function" && window.matchMedia("(prefers-reduced-motion: reduce)").matches;
-				const img = document.createElement("img");
-				img.dataset.dshPetFrames2d = ctx.petId;
-				img.alt = "";
-				img.draggable = false;
-				img.style.width = "100%";
-				img.style.height = "100%";
-				img.style.objectFit = "contain";
-				img.style.pointerEvents = "none";
-				ctx.container.appendChild(img);
-				for (const track of Object.values(config.tracks)) for (const url of track.frames) {
-					const pre = new Image();
-					pre.src = url;
+				let canvas = null;
+				let context2d = null;
+				let img = null;
+				try {
+					if (typeof createImageBitmap === "function" && typeof fetch === "function") {
+						const probe = document.createElement("canvas");
+						const c2d = probe.getContext("2d");
+						if (c2d !== null) {
+							canvas = probe;
+							context2d = c2d;
+						}
+					}
+				} catch {
+					canvas = null;
+					context2d = null;
 				}
+				if (canvas !== null && context2d !== null) {
+					canvas.dataset.dshPetFrames2d = ctx.petId;
+					canvas.draggable = false;
+					canvas.style.width = "100%";
+					canvas.style.height = "100%";
+					canvas.style.objectFit = "contain";
+					canvas.style.pointerEvents = "none";
+					ctx.container.appendChild(canvas);
+				} else {
+					img = document.createElement("img");
+					img.dataset.dshPetFrames2d = ctx.petId;
+					img.alt = "";
+					img.draggable = false;
+					img.style.width = "100%";
+					img.style.height = "100%";
+					img.style.objectFit = "contain";
+					img.style.pointerEvents = "none";
+					ctx.container.appendChild(img);
+				}
+				const decoding = /* @__PURE__ */ new Map();
+				const decodedAll = [];
+				const loadFrame = (url) => {
+					const cached = decoding.get(url);
+					if (cached !== void 0) return cached;
+					const job = (async () => {
+						try {
+							const response = await fetch(url);
+							if (!response.ok) throw new Error("http " + response.status);
+							const bitmap = await createImageBitmap(await response.blob());
+							return {
+								source: bitmap,
+								width: bitmap.width,
+								height: bitmap.height
+							};
+						} catch {
+							return await new Promise((resolve) => {
+								try {
+									const pre = new Image();
+									pre.onload = () => {
+										resolve(pre.naturalWidth > 0 ? {
+											source: pre,
+											width: pre.naturalWidth,
+											height: pre.naturalHeight
+										} : void 0);
+									};
+									pre.onerror = () => resolve(void 0);
+									pre.src = url;
+								} catch {
+									resolve(void 0);
+								}
+							});
+						}
+					})();
+					decoding.set(url, job);
+					decodedAll.push(job.then(() => void 0, () => void 0));
+					return job;
+				};
 				let disposed = false;
 				let timer;
 				let watchdog;
@@ -1864,13 +1941,35 @@ window.__ModuleLoader__.load({
 				let frameIndex = 0;
 				let lastAdvance = Date.now();
 				let override;
+				let drawToken = 0;
+				let lastDrawnUrl;
 				const trackForPhase = (phase) => {
 					const mapped = config.phases[phase];
 					return mapped !== void 0 && config.tracks[mapped] !== void 0 ? mapped : config.phases.idle;
 				};
+				/** Canvas path: paints the newest requested frame; stale draws drop out. */
+				const paintCanvas = (url) => {
+					if (context2d === null || canvas === null) return;
+					const myToken = ++drawToken;
+					loadFrame(url).then((frame) => {
+						if (disposed || frame === void 0 || myToken !== drawToken) return;
+						if (lastDrawnUrl === url) return;
+						lastDrawnUrl = url;
+						if (canvas.width !== frame.width || canvas.height !== frame.height) {
+							canvas.width = frame.width;
+							canvas.height = frame.height;
+						} else context2d.clearRect(0, 0, canvas.width, canvas.height);
+						context2d.drawImage(frame.source, 0, 0);
+					}).catch(() => {});
+				};
 				const show = (trackId, index) => {
 					const url = config.tracks[trackId]?.frames[index];
-					if (url !== void 0 && img.getAttribute("src") !== url) img.src = url;
+					if (url === void 0) return;
+					if (img !== null) {
+						if (img.getAttribute("src") !== url) img.src = url;
+						return;
+					}
+					paintCanvas(url);
 				};
 				const schedule = (ms) => {
 					if (disposed) return;
@@ -1922,6 +2021,7 @@ window.__ModuleLoader__.load({
 					const expected = (def.durations[frameIndex] ?? 200) + WATCHDOG_MS;
 					if (Date.now() - lastAdvance > expected) tick();
 				}, WATCHDOG_MS);
+				for (const warmTrack of Object.values(config.tracks)) for (const warmUrl of warmTrack.frames) loadFrame(warmUrl);
 				play(track);
 				let disposedOnce = false;
 				const dispose = () => {
@@ -1931,7 +2031,17 @@ window.__ModuleLoader__.load({
 					unsubscribe();
 					if (timer !== void 0) clearTimeout(timer);
 					if (watchdog !== void 0) clearInterval(watchdog);
-					img.remove();
+					Promise.allSettled(decodedAll).then(() => {
+						for (const job of decoding.values()) job.then((frame) => {
+							try {
+								const maybeClose = (frame?.source)?.close;
+								if (typeof maybeClose === "function" && frame !== void 0) maybeClose.call(frame.source);
+							} catch {}
+						}).catch(() => {});
+						decoding.clear();
+					});
+					canvas?.remove();
+					img?.remove();
 				};
 				ctx.onCleanup(dispose);
 				return {
@@ -3081,6 +3191,15 @@ window.__ModuleLoader__.load({
 			"pet.namePlaceholder": "输入新名字",
 			"pet.summon": "召唤{name}",
 			"pet.rank": "亲密度 {rank}",
+			"pet.rank.name.幼鲸": "幼鲸",
+			"pet.rank.name.伙伴": "伙伴",
+			"pet.rank.name.挚友": "挚友",
+			"pet.rank.name.深海羁绊": "深海羁绊",
+			"pet.rank.name.心有灵犀": "心有灵犀",
+			"pet.rank.name.传说羁绊": "传说羁绊",
+			"pet.rank.name.神话羁绊": "神话羁绊",
+			"pet.rank.name.永恒之契": "永恒之契",
+			"pet.rank.name.鲸生共渡": "鲸生共渡",
 			"pet.points": "{points} 点",
 			"pet.treats": "小鱼干 ×{n}",
 			"pet.state.loading": "宠物正在赶来…",
@@ -3151,6 +3270,15 @@ window.__ModuleLoader__.load({
 			"pet.namePlaceholder": "Enter a new name",
 			"pet.summon": "Summon {name}",
 			"pet.rank": "Affinity {rank}",
+			"pet.rank.name.幼鲸": "Baby Whale",
+			"pet.rank.name.伙伴": "Companion",
+			"pet.rank.name.挚友": "Close Friend",
+			"pet.rank.name.深海羁绊": "Deep Sea Bond",
+			"pet.rank.name.心有灵犀": "Kindred Spirit",
+			"pet.rank.name.传说羁绊": "Legendary Bond",
+			"pet.rank.name.神话羁绊": "Mythic Bond",
+			"pet.rank.name.永恒之契": "Eternal Covenant",
+			"pet.rank.name.鲸生共渡": "Lifelong Companion",
 			"pet.points": "{points} pts",
 			"pet.treats": "Treats ×{n}",
 			"pet.state.loading": "The pet is on its way…",
@@ -3242,7 +3370,7 @@ window.__ModuleLoader__.load({
 		/** The building package's version, when the bundle carries it. */
 		function bakedVersion() {
 			try {
-				return "0.3.5";
+				return "0.3.6";
 			} catch {
 				return;
 			}