@linxin666/dsh-pet 0.1.15 → 0.1.16

package/lib/types/routes.js

@@ -1,26 +1,38 @@
 /**
  * Pet HTTP routes — the browser half talks to the host through plain
- * same-origin JSON endpoints (`/api/pet/*`) and loads the whale-girl atlas
- * from `/pet/whale/*`. The `/plugins/` endpoint only serves client bundles
- * and RPC domains are platform-registered, so the pet serves its own API
- * and media — the same pattern as dsh-remote-web-ui's `/api/pair` family.
+ * same-origin JSON endpoints ('/api/pet/*') and loads pet assets from
+ * '/pet/<id>/*'. The '/plugins/' endpoint only serves client bundles and RPC
+ * domains are platform-registered, so the pet serves its own API and media —
+ * the same pattern as dsh-remote-web-ui's '/api/pair' family. The asset route
+ * is one prefix registration serving every registry entry (manifest, atlas,
+ * optional previews), so adding a pet never touches route wiring.
  * @module @linxin666/dsh-pet/routes
  */
+import { existsSync } from 'node:fs';
 import { readFile } from 'node:fs/promises';
 import { join } from 'node:path';
-import { fileURLToPath } from 'node:url';
+import { petEntryView } from "./registry.js";
 /** Browser-facing base path of the pet API. */
 export const PET_API_PREFIX = '/api/pet';
-/** Browser-facing base path of the pet asset routes. */
-export const PET_ASSET_PREFIX = '/pet/whale';
-/** Relative (to package root) asset files exposed under the prefix. */
-const ASSET_FILES = [
-    { name: 'spritesheet.webp', mime: 'image/webp' },
-    { name: 'pet.json', mime: 'application/json' },
-];
-/** Absolute package root, resolved from this module's own location (lib/). */
-export function petPackageRoot(importMetaUrl) {
-    return fileURLToPath(new URL('../', importMetaUrl));
+/** Browser-facing base path of the pet asset routes ('/pet/<id>/...'). */
+export const PET_ASSET_PREFIX = '/pet';
+const MANIFEST_FILE = 'pet.json';
+const PREVIEW_DIR = 'previews';
+const PREVIEW_PATTERN = /^[A-Za-z0-9._-]+$/;
+const MIME_BY_EXT = {
+    '.webp': 'image/webp',
+    '.png': 'image/png',
+    '.gif': 'image/gif',
+    '.jpg': 'image/jpeg',
+    '.jpeg': 'image/jpeg',
+    '.json': 'application/json',
+};
+/** Content type by file extension (safe fallback: octet-stream). */
+function mimeFor(file) {
+    const dot = file.lastIndexOf('.');
+    if (dot < 0)
+        return 'application/octet-stream';
+    return MIME_BY_EXT[file.slice(dot).toLowerCase()] ?? 'application/octet-stream';
 }
 /** Write one JSON response. */
 function json(res, status, body) {
@@ -42,8 +54,6 @@ function readJsonBody(req) {
         req.on('data', (chunk) => {
             size += chunk.length;
             if (size > 64 * 1024) {
-                // Reject first so the error handler can write the 400 response,
-                // then close the connection once the response is flushed.
                 reject(new Error('body-too-large'));
                 queueMicrotask(() => req.destroy());
                 return;
@@ -98,61 +108,169 @@ function postRoute(path, run) {
         },
     };
 }
-/** Build the full route family (API + assets) for one service + package root. */
+/** Legacy URL aliases: each entry's directory basename (e.g. 'whale'). */
+function dirAliases(registry) {
+    const aliases = new Map();
+    for (const entry of registry.entries) {
+        const alias = entry.dir.split(/[\\/]/).pop() ?? '';
+        if (alias !== '' && !aliases.has(alias))
+            aliases.set(alias, entry);
+    }
+    return aliases;
+}
+/**
+ * The one asset handler behind the '/pet' prefix. Resolves the pet by id (or
+ * legacy directory alias), then serves exactly the files a manifest declares:
+ * pet.json, the declared spritesheet path, and optional 'previews/<name>'
+ * media. Composed pets without a manifest file get a synthesized pet.json.
+ */
+function assetHandler(registry) {
+    const aliases = dirAliases(registry);
+    return (req, res) => {
+        if (req.method !== 'GET' && req.method !== 'HEAD') {
+            res.writeHead(405);
+            res.end();
+            return;
+        }
+        let pathname;
+        try {
+            pathname = new URL(req.url ?? '/', 'http://pet.local').pathname;
+        }
+        catch {
+            res.writeHead(400);
+            res.end();
+            return;
+        }
+        const segments = pathname.split('/').filter(segment => segment !== '');
+        if (segments[0] !== 'pet' || segments[1] === undefined) {
+            res.writeHead(404);
+            res.end();
+            return;
+        }
+        let id;
+        try {
+            id = decodeURIComponent(segments[1]);
+        }
+        catch {
+            res.writeHead(400);
+            res.end();
+            return;
+        }
+        const entry = registry.byId(id) ?? aliases.get(id);
+        if (entry === undefined) {
+            res.writeHead(404);
+            res.end();
+            return;
+        }
+        const rest = [];
+        for (const segment of segments.slice(2)) {
+            let decoded;
+            try {
+                decoded = decodeURIComponent(segment);
+            }
+            catch {
+                res.writeHead(400);
+                res.end();
+                return;
+            }
+            rest.push(decoded);
+        }
+        const rel = rest.join('/');
+        let file;
+        let synthesized = false;
+        if (rest.length === 1 && rest[0] === MANIFEST_FILE) {
+            const manifestFile = join(entry.dir, MANIFEST_FILE);
+            file = existsSync(manifestFile) ? manifestFile : undefined;
+            if (file === undefined)
+                synthesized = true;
+        }
+        else if (rest.length > 0 && rel === entry.spritesheetPath) {
+            file = join(entry.dir, entry.spritesheetPath);
+        }
+        else if (rest.length === 2 && rest[0] === PREVIEW_DIR && PREVIEW_PATTERN.test(rest[1])) {
+            const preview = join(entry.dir, PREVIEW_DIR, rest[1]);
+            file = existsSync(preview) ? preview : undefined;
+        }
+        if (synthesized) {
+            const body = Buffer.from(JSON.stringify(petEntryView(entry), null, 2), 'utf8');
+            res.writeHead(200, {
+                'content-type': 'application/json; charset=utf-8',
+                'content-length': String(body.byteLength),
+                'cache-control': 'no-cache',
+            });
+            if (req.method === 'HEAD') {
+                res.end();
+                return;
+            }
+            res.end(body);
+            return;
+        }
+        if (file === undefined) {
+            res.writeHead(404);
+            res.end();
+            return;
+        }
+        const resolved = file;
+        readFile(resolved).then((body) => {
+            res.writeHead(200, {
+                'content-type': mimeFor(resolved),
+                'content-length': String(body.byteLength),
+                'cache-control': 'no-cache',
+            });
+            if (req.method === 'HEAD') {
+                res.end();
+                return;
+            }
+            res.end(body);
+        }, () => {
+            res.writeHead(404);
+            res.end();
+        });
+    };
+}
+/** Build the full route family (API + assets) for one service. */
 export function makePetRoutes(deps) {
-    const { service, packageRoot } = deps;
+    const { service } = deps;
     const apiRoutes = [
-        getRoute(`${PET_API_PREFIX}/state`, () => service.state()),
-        postRoute(`${PET_API_PREFIX}/interact`, (body) => {
+        getRoute(PET_API_PREFIX + '/state', () => service.state()),
+        getRoute(PET_API_PREFIX + '/pets', () => service.pets()),
+        postRoute(PET_API_PREFIX + '/interact', (body) => {
             const kind = body.kind;
             if (kind !== 'pet' && kind !== 'feed')
                 return Promise.reject(new Error('invalid-kind'));
             return service.interact(kind);
         }),
-        postRoute(`${PET_API_PREFIX}/set-visible`, (body) => {
+        postRoute(PET_API_PREFIX + '/set-visible', (body) => {
             const visible = body.visible;
             if (typeof visible !== 'boolean')
                 return Promise.reject(new Error('invalid-visible'));
             return service.setVisible(visible);
         }),
-        postRoute(`${PET_API_PREFIX}/set-config`, (body) => service.setConfig({
+        postRoute(PET_API_PREFIX + '/set-config', (body) => service.setConfig({
             ...(typeof body.size === 'number' ? { size: body.size } : {}),
             ...(typeof body.right === 'number' ? { right: body.right } : {}),
             ...(typeof body.bottom === 'number' ? { bottom: body.bottom } : {}),
             ...(typeof body.visible === 'boolean' ? { visible: body.visible } : {}),
         })),
-        postRoute(`${PET_API_PREFIX}/set-name`, (body) => {
+        postRoute(PET_API_PREFIX + '/set-name', (body) => {
             const name = body.name;
             if (typeof name !== 'string')
                 return Promise.reject(new Error('invalid-name'));
             return service.setName(name);
         }),
+        postRoute(PET_API_PREFIX + '/set-pet', (body) => {
+            const petId = body.petId;
+            if (typeof petId !== 'string')
+                return Promise.reject(new Error('invalid-pet'));
+            return service.setPetId(petId);
+        }),
     ];
-    const assetRoutes = ASSET_FILES.map((file) => ({
-        kind: 'exact',
-        path: `${PET_ASSET_PREFIX}/${file.name}`,
-        handler: (req, res) => {
-            if (req.method !== 'GET' && req.method !== 'HEAD') {
-                res.writeHead(405);
-                res.end();
-                return;
-            }
-            return readFile(join(packageRoot, 'assets', 'whale', file.name)).then((body) => {
-                res.writeHead(200, {
-                    'content-type': file.mime,
-                    'content-length': String(body.byteLength),
-                    'cache-control': 'no-cache',
-                });
-                if (req.method === 'HEAD') {
-                    res.end();
-                    return;
-                }
-                res.end(body);
-            }, () => {
-                res.writeHead(404);
-                res.end();
-            });
-        },
-    }));
-    return [...apiRoutes, ...assetRoutes];
+    const assetRoute = {
+        kind: 'prefix',
+        path: PET_ASSET_PREFIX,
+        handler: assetHandler(service.registrySnapshot()),
+    };
+    return [...apiRoutes, assetRoute];
 }
+// Re-exported for the package surface (the registry owns the definition now).
+export { petPackageRoot } from "./registry.js";

package/lib/types/service.d.ts

@@ -3,8 +3,8 @@
  * the pure event projection (`event-projection`) onto the state machine,
  * delegates the affinity economy to the ledger (`ledger`), and routes
  * persistence through `persist`. The API gateway maps these methods onto
- * `pet.state` / `pet.interact` / `pet.setVisible` / `pet.setConfig` for
- * browser consumers.
+ * `pet.state` / `pet.pets` / `pet.interact` / `pet.setVisible` /
+ * `pet.setConfig` / `pet.setName` / `pet.setPet` for browser consumers.
  * @module @linxin666/dsh-pet/service
  */
 import { Context, Service } from '@deepseek-ai/cordis';
@@ -12,6 +12,7 @@ import type { AffinityConfig, PetAffinityView, PetInteraction } from './affinity
 import type { TreatConfig } from './treats.ts';
 import { type LedgerInteractionResult } from './ledger.ts';
 import { type PetDisplayConfig } from './persist.ts';
+import { type PetDefinition, type PetManifest, type PetRegistry } from './registry.ts';
 import { type PetStateConfig, type PetStateSnapshot } from './state.ts';
 /** Plugin configuration. */
 export interface PetConfig {
@@ -25,13 +26,21 @@ export interface PetConfig {
     persistDir?: string;
     /** Master switch for the plugin (browser half + host routes). */
     enabled?: boolean;
+    /** Prebuilt registry (tests); defaults to scanning the package + user dirs. */
+    registry?: PetRegistry;
+    /** Extra manifest entries composed by the embedding application. */
+    pets?: readonly PetManifest[];
 }
 /**
- * The pet's settings-namespace section: the display fields and name the web
- * settings surface edits. `right`/`bottom` are also updated by drag
+ * The pet's settings-namespace section: the pet selection and display fields
+ * the web settings surface edits. `right`/`bottom` are also updated by drag
  * interactions, which keep the settings document in sync through the service.
+ * Naming is per pet and lives outside the settings document (the hover-panel
+ * rename targets the selected pet).
  */
 export interface PetSettingsSection {
+    /** Selected pet id (a registry entry; the service clamps stale values). */
+    petId?: string;
     /** Master switch. */
     visible: boolean;
     /** Scale of the rendered pet in px (sprite cell height). */
@@ -40,8 +49,6 @@ export interface PetSettingsSection {
     right: number;
     /** Vertical inset from the viewport bottom edge, px. */
     bottom: number;
-    /** User-customizable pet display name. */
-    name: string;
     /** Master switch for the plugin (browser half + host routes). */
     enabled?: boolean;
 }
@@ -57,7 +64,16 @@ export interface PetStateView {
     affinity: PetAffinityView;
     /** Display configuration. */
     display: PetDisplayConfig;
-    /** User-customizable pet display name. */
+    /** The selected pet's registry identity. */
+    pet: {
+        /** Registry id. */
+        id: string;
+        /** Manifest display name (unrenamed default). */
+        displayName: string;
+        /** Manifest description. */
+        description: string;
+    };
+    /** The selected pet's display name (user rename or manifest default). */
     name: string;
     /** Treat (小鱼干) stock snapshot. */
     treats: {
@@ -84,6 +100,7 @@ export declare class PetService extends Service {
     static inject: string[];
     private readonly machine;
     private readonly ledger;
+    private readonly registry;
     private readonly persistDir;
     private enabled;
     private disposeActivity;
@@ -97,8 +114,24 @@ export declare class PetService extends Service {
     state(): Promise<PetStateView>;
     /** Current persisted display config (read-only view). */
     display(): PetDisplayConfig;
-    /** Current persisted pet name (read-only view). */
-    petName(): string;
+    /** RPC: the registry entries the browser half renders and selects from. */
+    pets(): Promise<PetDefinition[]>;
+    /** The loaded registry (the asset routes serve its entries). */
+    registrySnapshot(): PetRegistry;
+    /** The selected pet's registry entry. */
+    activeEntry(): NonNullable<PetRegistry['entries'][number]>;
+    /** Currently selected pet id (persisted). */
+    selectedPetId(): string;
+    /** The display name of one pet (user rename or manifest displayName). */
+    petName(petId?: string): string;
+    /** RPC: switch the selected pet (persisted, settings document mirrored). */
+    setPetId(petId: string): Promise<{
+        ok: true;
+        petId: string;
+    } | {
+        ok: false;
+        error: string;
+    }>;
     /** Start or stop the session-activity listeners that drive the pet. */
     setEnabled(enabled: boolean): void;
     private syncActivity;
@@ -118,7 +151,7 @@ export declare class PetService extends Service {
         ok: true;
         display: PetDisplayConfig;
     }>;
-    /** RPC: rename the pet (trimmed, 1–20 chars). */
+    /** RPC: rename the selected pet (trimmed, 1–20 chars, per-pet storage). */
     setName(name: string): Promise<{
         ok: true;
         name: string;
@@ -127,9 +160,9 @@ export declare class PetService extends Service {
         error: string;
     }>;
     /**
-     * Apply a committed settings section to the persisted display config. Called
-     * by the settings surface on every change; values are clamped exactly like
-     * the setConfig RPC so both write paths converge.
+     * Apply a committed settings section to the persisted selection and display
+     * config. Called by the settings surface on every change; values are
+     * clamped exactly like the setConfig RPC so both write paths converge.
      * @param section - the resolved settings section.
      */
     applySettingsSection(section: PetSettingsSection): void;

package/lib/types/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/service.ts"],"names":[],"mappings":"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"}

package/lib/types/service.js

@@ -3,14 +3,15 @@
  * the pure event projection (`event-projection`) onto the state machine,
  * delegates the affinity economy to the ledger (`ledger`), and routes
  * persistence through `persist`. The API gateway maps these methods onto
- * `pet.state` / `pet.interact` / `pet.setVisible` / `pet.setConfig` for
- * browser consumers.
+ * `pet.state` / `pet.pets` / `pet.interact` / `pet.setVisible` /
+ * `pet.setConfig` / `pet.setName` / `pet.setPet` for browser consumers.
  * @module @linxin666/dsh-pet/service
  */
 import { Service } from '@deepseek-ai/cordis';
 import { emptyProjectionRuntime, isActivityPhase, projectOfficialEvent, } from "./event-projection.js";
 import { PetLedger } from "./ledger.js";
-import { DISPLAY_INSET_MAX, DISPLAY_SIZE_MAX, DISPLAY_SIZE_MIN, PET_NAME_MAX_LENGTH, loadPetPersist, petHomeDir, savePetPersist, } from "./persist.js";
+import { DEFAULT_PET_NAME, DISPLAY_INSET_MAX, DISPLAY_SIZE_MAX, DISPLAY_SIZE_MIN, PET_NAME_MAX_LENGTH, loadPetPersist, petHomeDir, savePetPersist, } from "./persist.js";
+import { loadPetRegistry, petEntryView, petPackageRoot, } from "./registry.js";
 import { defaultPetStateConfig, PetStateMachine, } from "./state.js";
 /** Settings namespace of the pet capability. Spelled here rather than imported: the browser half spells the same value. */
 export const PET_SETTINGS_NAMESPACE = 'pet';
@@ -24,6 +25,7 @@ export class PetService extends Service {
     static inject = [];
     machine;
     ledger;
+    registry;
     persistDir;
     enabled;
     disposeActivity;
@@ -33,8 +35,22 @@ export class PetService extends Service {
     constructor(ctx, config = {}) {
         super(ctx, 'pet');
         this.persistDir = config.persistDir ?? petHomeDir();
+        this.registry = config.registry
+            ?? loadPetRegistry({
+                packageRoot: petPackageRoot(import.meta.url),
+                ...(config.pets === undefined ? {} : { extra: config.pets }),
+            });
+        if (this.registry.entries.length === 0) {
+            throw new Error('[dsh-pet] no valid pet manifests found; nothing to render');
+        }
+        let persist = loadPetPersist(this.persistDir);
+        if (this.registry.byId(persist.petId) === undefined) {
+            // The selected pet no longer exists (removed or a fresh install with a
+            // copied pet.json): fall back to the registry default.
+            persist = { ...persist, petId: this.registry.defaultEntry().id };
+        }
         const ledgerConfig = { affinity: config.affinity, treats: config.treats };
-        this.ledger = new PetLedger(loadPetPersist(this.persistDir), ledgerConfig);
+        this.ledger = new PetLedger(persist, ledgerConfig);
         this.machine = new PetStateMachine({
             ...defaultPetStateConfig,
             ...(config.state ?? {}),
@@ -54,9 +70,38 @@ export class PetService extends Service {
     display() {
         return { ...this.ledger.snapshot.display };
     }
-    /** Current persisted pet name (read-only view). */
-    petName() {
-        return this.ledger.snapshot.name;
+    /** RPC: the registry entries the browser half renders and selects from. */
+    async pets() {
+        return this.registry.entries.map(petEntryView);
+    }
+    /** The loaded registry (the asset routes serve its entries). */
+    registrySnapshot() {
+        return this.registry;
+    }
+    /** The selected pet's registry entry. */
+    activeEntry() {
+        return this.registry.byId(this.selectedPetId()) ?? this.registry.defaultEntry();
+    }
+    /** Currently selected pet id (persisted). */
+    selectedPetId() {
+        return this.ledger.snapshot.petId;
+    }
+    /** The display name of one pet (user rename or manifest displayName). */
+    petName(petId = this.selectedPetId()) {
+        const stored = this.ledger.snapshot.names[petId];
+        if (stored !== undefined && stored.trim() !== '')
+            return stored;
+        return this.registry.byId(petId)?.displayName ?? DEFAULT_PET_NAME;
+    }
+    /** RPC: switch the selected pet (persisted, settings document mirrored). */
+    async setPetId(petId) {
+        const entry = this.registry.byId(petId);
+        if (entry === undefined)
+            return { ok: false, error: 'unknown-pet' };
+        this.ledger.setPetId(entry.id);
+        this.flush();
+        this.syncSettingsFromPet();
+        return { ok: true, petId: entry.id };
     }
     /** Start or stop the session-activity listeners that drive the pet. */
     setEnabled(enabled) {
@@ -155,32 +200,38 @@ export class PetService extends Service {
         this.syncSettingsFromPet();
         return { ok: true, display: this.ledger.snapshot.display };
     }
-    /** RPC: rename the pet (trimmed, 1–20 chars). */
+    /** RPC: rename the selected pet (trimmed, 1–20 chars, per-pet storage). */
     async setName(name) {
         const trimmed = name.trim();
         if (trimmed === '')
             return { ok: false, error: 'name-empty' };
         if (trimmed.length > PET_NAME_MAX_LENGTH)
             return { ok: false, error: 'name-too-long' };
-        this.ledger.setName(trimmed);
+        this.ledger.setPetName(this.selectedPetId(), trimmed);
         this.flush();
-        this.syncSettingsFromPet();
         return { ok: true, name: trimmed };
     }
     /**
-     * Apply a committed settings section to the persisted display config. Called
-     * by the settings surface on every change; values are clamped exactly like
-     * the setConfig RPC so both write paths converge.
+     * Apply a committed settings section to the persisted selection and display
+     * config. Called by the settings surface on every change; values are
+     * clamped exactly like the setConfig RPC so both write paths converge.
      * @param section - the resolved settings section.
      */
     applySettingsSection(section) {
+        if (typeof section.petId === 'string' && this.registry.byId(section.petId) !== undefined) {
+            this.ledger.setPetId(section.petId);
+        }
+        else if (section.petId !== undefined) {
+            // The stored selection names a pet the registry no longer has: keep the
+            // current selection and repair the settings document.
+            this.syncSettingsFromPet();
+        }
         const next = { ...this.ledger.snapshot.display };
         next.visible = section.visible && (section.enabled ?? true);
         next.size = Math.round(Math.min(DISPLAY_SIZE_MAX, Math.max(DISPLAY_SIZE_MIN, section.size)));
         next.right = Math.round(Math.min(DISPLAY_INSET_MAX, Math.max(0, section.right)));
         next.bottom = Math.round(Math.min(DISPLAY_INSET_MAX, Math.max(0, section.bottom)));
         this.ledger.setDisplay(next);
-        this.ledger.setName(section.name.trim());
         this.flush();
     }
     /** Mirror the persisted display config into the settings document (best-effort). */
@@ -194,7 +245,7 @@ export class PetService extends Service {
             size: snapshot.display.size,
             right: snapshot.display.right,
             bottom: snapshot.display.bottom,
-            name: snapshot.name,
+            petId: snapshot.petId,
         }).catch(() => {
             // A settings write failure must not break the pet's own persistence.
         });
@@ -211,6 +262,7 @@ export class PetService extends Service {
     }
     view() {
         const snapshot = this.machine.render();
+        const entry = this.activeEntry();
         // Read-only: the ledger settles on economic events only, never on a read,
         // so polling the state cannot trigger pet.json writes.
         return {
@@ -220,7 +272,12 @@ export class PetService extends Service {
             sessionActive: snapshot.sessionActive,
             affinity: this.ledger.affinityView(Date.now()),
             display: { ...this.ledger.snapshot.display },
-            name: this.ledger.snapshot.name,
+            pet: {
+                id: entry.id,
+                displayName: entry.displayName,
+                description: entry.description,
+            },
+            name: this.petName(),
             treats: {
                 stocked: this.ledger.snapshot.treats.treats,
                 max: this.ledger.treatMax,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@linxin666/dsh-pet",
-  "description": "鲸鱼娘宠物插件 for the dsh web GUI: a soft healing whale-girl companion that reacts to model activity (idle/waiting/thinking/tool/done), with petting/feeding interactions and an affinity score",
-  "version": "0.1.15",
+  "description": "Multi-pet companion plugin for the dsh web GUI: a registry-driven floating pet that reacts to model activity, with per-pet naming, petting/feeding interactions and an affinity score",
+  "version": "0.1.16",
   "type": "module",
   "engines": {
     "node": "^22.19.0 || >=24.0.0"