@onnie81/murdoku-spor 1.2.0 → 1.2.2

package/client/src/audio.js

@@ -3,7 +3,7 @@
 // copyright entanglements. Autoplay-safe: the context starts on first gesture.
 
 let ctx = null;
-let master, sfxBus, musicBus;
+let master, sfxBus, musicBus, analyser;
 let enabled = { sfx: true, music: true };
 let musicOn = false;
 let schedTimer = null;
@@ -16,6 +16,9 @@ function ensureCtx() {
   master = ctx.createGain();
   master.gain.value = 0.9;
   master.connect(ctx.destination);
+  analyser = ctx.createAnalyser();
+  analyser.fftSize = 2048;
+  master.connect(analyser);
   sfxBus = ctx.createGain();
   sfxBus.gain.value = 0.5;
   sfxBus.connect(master);
@@ -37,18 +40,46 @@ function ensureCtx() {
   return ctx;
 }
 
+// iOS: playing a (nearly) silent media element inside the gesture switches the
+// audio session to "playback", so WebAudio stays audible even with the ring
+// switch on silent. One-time, invisible.
+const SILENT_WAV = 'data:audio/wav;base64,UklGRiQAAABXQVZFZm10IBAAAAABAAEAQB8AAIA+AAACABAAZGF0YQAAAAA=';
+let mediaUnlocked = false;
+function unlockMediaSession() {
+  if (mediaUnlocked) return;
+  mediaUnlocked = true;
+  try {
+    const a = document.createElement('audio');
+    a.setAttribute('playsinline', '');
+    a.src = SILENT_WAV;
+    a.volume = 0.01;
+    const p = a.play();
+    if (p && p.catch) p.catch(() => { mediaUnlocked = false; });
+  } catch { mediaUnlocked = false; }
+}
+
 export function initAudioOnGesture() {
+  const EVENTS = ['pointerdown', 'touchend', 'mousedown', 'keydown'];
   const kick = () => {
     const c = ensureCtx();
     if (!c) return;
-    const go = () => { if (enabled.music) startMusic(); };
+    unlockMediaSession();
+    const go = () => {
+      if (c.state !== 'running') return; // keep listeners until truly unlocked
+      EVENTS.forEach(ev => window.removeEventListener(ev, kick));
+      if (enabled.music) startMusic();
+    };
     if (c.state === 'suspended') c.resume().then(go).catch(() => {});
     else go();
-    window.removeEventListener('pointerdown', kick);
-    window.removeEventListener('keydown', kick);
   };
-  window.addEventListener('pointerdown', kick);
-  window.addEventListener('keydown', kick);
+  EVENTS.forEach(ev => window.addEventListener(ev, kick));
+
+  // phones suspend the context when the tab goes to background — resume on return
+  document.addEventListener('visibilitychange', () => {
+    if (!document.hidden && ctx && ctx.state === 'suspended') {
+      ctx.resume().then(() => { if (enabled.music) startMusic(); }).catch(() => {});
+    }
+  });
 }
 
 export function setAudioPrefs({ sfx, music }) {
@@ -264,3 +295,21 @@ export function stopMusic() {
     musicBus.gain.exponentialRampToValueAtTime(0.0001, ctx.currentTime + 0.8);
   }
 }
+
+// diagnostics hook (used by the e2e test and handy in devtools)
+if (typeof window !== 'undefined') {
+  window.__mdkAudio = {
+    state: () => (ctx ? ctx.state : 'none'),
+    musicOn: () => musicOn,
+    enabled: () => ({ ...enabled }),
+    rms() {
+      if (!analyser) return 0;
+      const a = new Float32Array(analyser.fftSize);
+      analyser.getFloatTimeDomainData(a);
+      let s = 0;
+      for (let i = 0; i < a.length; i++) s += a[i] * a[i];
+      return Math.sqrt(s / a.length);
+    },
+    ping: () => sfx('chime')
+  };
+}

package/client/src/components/PlayView.jsx

@@ -5,7 +5,7 @@
 import React, { useEffect, useMemo, useRef, useState, useCallback } from 'react';
 import { api } from '../api.js';
 import { createGameStore, useGame } from '../game.js';
-import { useApp, navigate, toast, getState } from '../store.js';
+import { useApp, navigate, toast, getState, updateSettings } from '../store.js';
 import { Board } from './Board.jsx';
 import { Tray } from './Tray.jsx';
 import { CluePanel } from './CluePanel.jsx';
@@ -44,10 +44,13 @@ export function PlayView({ gameId }) {
 }
 
 function PlayInner({ loaded }) {
+  const app = useApp();
   const store = useMemo(
     () => createGameStore(loaded.game, loaded.puzzle, () => getState().settings, (key) => toast(t(key))),
     [loaded]
   );
+  const soundOn = app.settings.sfx !== false || app.settings.music !== false;
+  const soundToggle = () => updateSettings({ sfx: !soundOn, music: !soundOn });
   const snap = useGame(store);
   const boardRef = useRef(null);
   const [drag, setDrag] = useState(null);
@@ -294,6 +297,7 @@ function PlayInner({ loaded }) {
             <span className="stat-mist">✗ {snap.mistakes}</span>
           </div>
           <button className="icon-btn" onClick={() => setCaseOpen(true)} aria-label={t('caseFile')}>📜</button>
+          <button className="icon-btn" onClick={soundToggle} aria-label={t('sound')}>{soundOn ? '🔊' : '🔇'}</button>
           {fsAvailable && (
             <button className="icon-btn" onClick={fsToggle} aria-label={t('fullscreen')}>{isFs ? '🡼' : '⛶'}</button>
           )}
@@ -358,6 +362,7 @@ function PlayInner({ loaded }) {
           <span className="stat-time">{fmtTime(snap.timeMs)}</span>
           <span className="stat-mist" title={t('mistakes')}>✗ {snap.mistakes}</span>
         </div>
+        <button className="icon-btn" onClick={soundToggle} aria-label={t('sound')}>{soundOn ? '🔊' : '🔇'}</button>
         {fsAvailable && (
           <button className="icon-btn" onClick={fsToggle} aria-label={t('fullscreen')}>{isFs ? '🡼' : '⛶'}</button>
         )}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onnie81/murdoku-spor",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "type": "module",
   "description": "Murdoku — online murder-mystery logic puzzle (sudoku-style placement deduction). Deploy artifact for games.onniehex.dev.",
   "license": "MIT",

package/scripts/npm-server-deploy.sh

@@ -32,6 +32,12 @@ mkdir -p "$APP"
 find "$APP" -mindepth 1 -maxdepth 1 ! -name .git ! -name .version -exec rm -rf {} +
 cp -a "$src"/. "$APP"/
 
+# the deploy runner updates itself from the package (effective next run)
+if [ -f "$APP/scripts/npm-server-deploy.sh" ] && ! cmp -s "$APP/scripts/npm-server-deploy.sh" /usr/local/bin/murdoku-deploy; then
+  install -m 755 "$APP/scripts/npm-server-deploy.sh" /usr/local/bin/murdoku-deploy || true
+  echo "$(date -Is) deploy runner self-updated"
+fi
+
 # refresh real git history from the bundle carried in the package (optional)
 if command -v git >/dev/null 2>&1 && [ -f "$src/murdoku.bundle" ]; then
   if [ ! -d "$APP/.git" ]; then git -C "$APP" init -q; fi
@@ -43,7 +49,11 @@ cd "$APP"
 GIT_SHA=$(git rev-parse --short main 2>/dev/null || echo "$ver")
 export GIT_SHA
 if docker compose version >/dev/null 2>&1; then DC="docker compose"; else DC="docker-compose"; fi
-$DC up -d --build
+if ! $DC up -d --build --remove-orphans; then
+  echo "$(date -Is) compose up failed — clearing stray containers and retrying"
+  docker rm -f murdoku murdoku-caddy >/dev/null 2>&1 || true
+  $DC up -d --build --remove-orphans
+fi
 
 ok=0
 for _ in $(seq 1 45); do