dsh-offwork 1.0.1 → 1.1.1

package/tools/build.mjs

@@ -1,7 +1,19 @@
 import { readFile, writeFile } from 'node:fs/promises';
 
 const root = new URL('../', import.meta.url);
-const moduleNames = ['client.source.js', 'clock.js', 'ui-utils.js'];
+const moduleNames = [
+  'client.source.js',
+  'clock.js',
+  'ui-utils.js',
+  'companion.js',
+  'pet-view.js',
+  'pet-motion.js',
+  'pet-video.js',
+  'pet-interactions.js',
+  'pet-surfaces.js',
+  'hydration.js',
+  'hydration-store.js',
+];
 const [entry, ...modules] = await Promise.all(
   moduleNames.map((name) => readFile(new URL(name, root), 'utf8')),
 );
@@ -10,11 +22,55 @@ if (entry.split(marker).length !== 2) {
   throw new Error('Expected exactly one pure-module marker in client.source.js');
 }
 
-// Preserve the pure modules verbatim apart from exports so the browser runs
-// the same implementation that the Node.js tests import.
-const pure = modules.map((source) => source.replace(/^export /gm, '')).join('\n');
-const banner = '// Generated by tools/build.mjs; edit client.source.js, clock.js or ui-utils.js.\n';
-const result = banner + entry.replace(marker, pure);
+// Embed the tested modules, removing only their internal module wiring.
+// The browser and Node.js tests execute the same calculation and store code.
+const pure = modules
+  .map((source) =>
+    source.replace(/^import .* from '\.\/hydration\.js';\n/gm, '').replace(/^export /gm, ''),
+  )
+  .join('\n');
+const banner = '// Generated by tools/build.mjs; edit the source modules, not this file.\n';
+const spriteMarker = '/* PET_SPRITES */';
+if (entry.split(spriteMarker).length !== 2) throw new Error('Expected one sprite marker');
+const sprites = Object.fromEntries(
+  await Promise.all(
+    ['whale-dress', 'whale-ornate', 'whale-actions', 'whale-ornate-actions'].map(async (id) => {
+      const bytes = await readFile(new URL(`assets/characters/${id}.webp`, root));
+      if (bytes.toString('ascii', 8, 12) !== 'WEBP' || bytes.length > 200000)
+        throw new Error(`Invalid sprite: ${id}`);
+      return [id, 'data:image/webp;base64,' + bytes.toString('base64')];
+    }),
+  ),
+);
+const clipMarker = '/* PET_CLIPS */';
+if (entry.split(clipMarker).length !== 2) throw new Error('Expected one clip marker');
+async function clip(name, maximum) {
+  const bytes = await readFile(new URL(`assets/animations/${name}.webm`, root));
+  if (bytes.readUInt32BE(0) !== 0x1a45dfa3 || bytes.length > maximum)
+    throw new Error(`Invalid or oversized WebM: ${name}`);
+  return 'data:video/webm;base64,' + bytes.toString('base64');
+}
+const [probe, greet, celebrate, ornateIdle, ornateGreet, ornateDrink] = await Promise.all([
+  clip('alpha-probe', 10000),
+  clip('whale-greet', 2000000),
+  clip('whale-drink', 2000000),
+  clip('ornate-idle', 2000000),
+  clip('ornate-greet', 2000000),
+  clip('ornate-drink', 2000000),
+]);
+const clips = {
+  probe,
+  models: {
+    'whale-actions': { greet, celebrate },
+    'whale-ornate-actions': { idle: ornateIdle, greet: ornateGreet, celebrate: ornateDrink },
+  },
+};
+const result =
+  banner +
+  entry
+    .replace(marker, pure)
+    .replace(spriteMarker, () => `const PET_SPRITES = ${JSON.stringify(sprites)};`)
+    .replace(clipMarker, () => `const PET_CLIPS = ${JSON.stringify(clips)};`);
 const output = new URL('client.js', root);
 
 if (process.argv.includes('--check')) {

package/tools/check-package.mjs

@@ -68,8 +68,28 @@ for (const path of [
   'package.json',
   'index.js',
   'client.js',
+  'companion.js',
+  'pet-view.js',
+  'pet-motion.js',
+  'pet-video.js',
+  'pet-interactions.js',
+  'pet-surfaces.js',
+  'hydration.js',
+  'hydration-store.js',
   'cordis.patch.yml',
   'icon.svg',
+  'assets/characters/whale-dress.webp',
+  'assets/characters/whale-ornate.webp',
+  'assets/characters/whale-actions.webp',
+  'assets/characters/whale-ornate-actions.webp',
+  'assets/animations/ornate-idle.webm',
+  'assets/animations/ornate-greet.webm',
+  'assets/animations/ornate-drink.webm',
+  'assets/animations/whale-greet.webm',
+  'assets/animations/whale-drink.webm',
+  'assets/animations/alpha-probe.webm',
+  'assets/animations/NOTICE.md',
+  'assets/characters/NOTICE.md',
   'locale/zh.json',
   'locale/en.json',
   'README.md',

package/ui-utils.js

@@ -11,11 +11,13 @@ export function clampPosition(position, viewport, size) {
   const width = Math.max(0, viewport.width),
     height = Math.max(0, viewport.height);
   const edge = Math.min(12, width / 2, height / 2);
-  const maxX = Math.max(edge, width - size.width - edge);
-  const maxY = Math.max(edge, height - size.height - edge);
+  const left = viewport.left ?? 0,
+    top = viewport.top ?? 0;
+  const maxX = Math.max(left + edge, left + width - size.width - edge);
+  const maxY = Math.max(top + edge, top + height - size.height - edge);
   return {
-    x: Math.max(edge, Math.min(Number.isFinite(position?.x) ? position.x : maxX, maxX)),
-    y: Math.max(edge, Math.min(Number.isFinite(position?.y) ? position.y : 88, maxY)),
+    x: Math.max(left + edge, Math.min(Number.isFinite(position?.x) ? position.x : maxX, maxX)),
+    y: Math.max(top + edge, Math.min(Number.isFinite(position?.y) ? position.y : top + 88, maxY)),
   };
 }
 
@@ -29,6 +31,22 @@ export function normalizeView(value) {
   return {
     mini: value?.mini !== false,
     masked: value?.masked !== false,
+    companion: value?.companion !== false,
+    companionMotion: value?.companionMotion !== false,
+    petModel: [
+      'whale-dress',
+      'whale-ornate',
+      'whale-actions',
+      'whale-ornate-actions',
+      'xiaoxie-original',
+    ].includes(value?.petModel)
+      ? value.petModel
+      : 'whale-dress',
+    petSize: Math.min(180, Math.max(80, Number.isFinite(value?.petSize) ? value.petSize : 132)),
+    petPosition:
+      Number.isFinite(value?.petPosition?.x) && Number.isFinite(value?.petPosition?.y)
+        ? { x: value.petPosition.x, y: value.petPosition.y }
+        : null,
     opacity: clampOpacity(value?.opacity),
     position:
       Number.isFinite(value?.position?.x) && Number.isFinite(value?.position?.y)