@onnie81/murdoku-spor 1.2.2 → 1.2.4

package/client/src/audio.js

@@ -7,6 +7,12 @@ let master, sfxBus, musicBus, analyser;
 let enabled = { sfx: true, music: true };
 let musicOn = false;
 let schedTimer = null;
+let outEl = null; // iOS: audio leaves through a media element, not ctx.destination
+
+// iPadOS pretends to be MacIntel, hence the maxTouchPoints check
+const IS_IOS = typeof navigator !== 'undefined' &&
+  (/iP(hone|ad|od)/.test(navigator.userAgent) ||
+    (navigator.platform === 'MacIntel' && navigator.maxTouchPoints > 1));
 
 function ensureCtx() {
   if (ctx) return ctx;
@@ -15,7 +21,21 @@ function ensureCtx() {
   ctx = new AC();
   master = ctx.createGain();
   master.gain.value = 0.9;
-  master.connect(ctx.destination);
+  if (IS_IOS) {
+    // Direct WebAudio output is unreliable on iOS (silent-switch category and
+    // sample-rate mismatches can mute it entirely while the graph keeps
+    // "playing"). Routing through a MediaStream + <audio> element uses the
+    // real media playback path: audible, and immune to the ring switch.
+    const dest = ctx.createMediaStreamDestination();
+    master.connect(dest);
+    outEl = document.createElement('audio');
+    outEl.setAttribute('playsinline', '');
+    outEl.autoplay = true;
+    outEl.srcObject = dest.stream;
+    document.body.appendChild(outEl);
+  } else {
+    master.connect(ctx.destination);
+  }
   analyser = ctx.createAnalyser();
   analyser.fftSize = 2048;
   master.connect(analyser);
@@ -40,22 +60,8 @@ 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; }
+function unlocked() {
+  return ctx && ctx.state === 'running' && (!IS_IOS || (outEl && !outEl.paused));
 }
 
 export function initAudioOnGesture() {
@@ -63,22 +69,31 @@ export function initAudioOnGesture() {
   const kick = () => {
     const c = ensureCtx();
     if (!c) return;
-    unlockMediaSession();
+    // both calls must happen inside the user gesture
+    if (outEl && outEl.paused) {
+      const p = outEl.play();
+      if (p && p.catch) p.catch(() => {});
+    }
     const go = () => {
-      if (c.state !== 'running') return; // keep listeners until truly unlocked
+      if (!unlocked()) return; // keep listening until truly audible
       EVENTS.forEach(ev => window.removeEventListener(ev, kick));
       if (enabled.music) startMusic();
     };
     if (c.state === 'suspended') c.resume().then(go).catch(() => {});
-    else go();
+    else setTimeout(go, 50);
   };
   EVENTS.forEach(ev => window.addEventListener(ev, kick));
 
-  // phones suspend the context when the tab goes to background — resume on return
+  // phones suspend audio when the tab goes to background — restore on return
   document.addEventListener('visibilitychange', () => {
-    if (!document.hidden && ctx && ctx.state === 'suspended') {
+    if (document.hidden || !ctx) return;
+    if (ctx.state === 'suspended') {
       ctx.resume().then(() => { if (enabled.music) startMusic(); }).catch(() => {});
     }
+    if (outEl && outEl.paused) {
+      const p = outEl.play();
+      if (p && p.catch) p.catch(() => {});
+    }
   });
 }
 
@@ -144,6 +159,10 @@ export function sfx(name) {
   const c = ensureCtx();
   if (!c) return;
   if (c.state === 'suspended') c.resume();
+  if (outEl && outEl.paused) {
+    const p = outEl.play();
+    if (p && p.catch) p.catch(() => {});
+  }
   switch (name) {
     case 'place': // soft wooden tap + warm blip
       noise({ d: 0.05, peak: 0.25, freq: 900, q: 0.8, type: 'lowpass' });
@@ -302,6 +321,8 @@ if (typeof window !== 'undefined') {
     state: () => (ctx ? ctx.state : 'none'),
     musicOn: () => musicOn,
     enabled: () => ({ ...enabled }),
+    route: () => (IS_IOS ? (outEl ? (outEl.paused ? 'ios-media:paused' : 'ios-media:playing') : 'ios-media:missing') : 'direct'),
+    rate: () => (ctx ? ctx.sampleRate : 0),
     rms() {
       if (!analyser) return 0;
       const a = new Float32Array(analyser.fftSize);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onnie81/murdoku-spor",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "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,17 +32,29 @@ 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)
+# the deploy runner updates itself from the package and re-executes so the
+# rest of THIS deploy runs with the fresh logic (cmp guard prevents looping)
 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"
+  echo "$(date -Is) deploy runner self-updated — re-executing"
+  rm -rf "$tmp"
+  exec env FORCE=1 /usr/local/bin/murdoku-deploy "$APP" "$BRANCH"
 fi
 
-# refresh real git history from the bundle carried in the package (optional)
+# refresh real git history from the bundle carried in the package.
+# NOTE: fetch into a side ref — git refuses to fetch into the checked-out
+# branch, which is what froze the reported sha at the first deploy.
 if command -v git >/dev/null 2>&1 && [ -f "$src/murdoku.bundle" ]; then
   if [ ! -d "$APP/.git" ]; then git -C "$APP" init -q; fi
-  git -C "$APP" fetch -f "$src/murdoku.bundle" 'refs/heads/main:refs/heads/main' || true
-  git -C "$APP" symbolic-ref HEAD refs/heads/main 2>/dev/null || true
+  if git -C "$APP" fetch -f "$src/murdoku.bundle" 'refs/heads/main:refs/heads/incoming' 2>/dev/null; then
+    NEWREF=$(git -C "$APP" rev-parse --verify incoming 2>/dev/null || true)
+    if [ -n "$NEWREF" ]; then
+      git -C "$APP" update-ref refs/heads/main "$NEWREF"
+      git -C "$APP" symbolic-ref HEAD refs/heads/main 2>/dev/null || true
+      git -C "$APP" reset --hard main >/dev/null 2>&1 || true
+      git -C "$APP" update-ref -d refs/heads/incoming 2>/dev/null || true
+    fi
+  fi
 fi
 
 cd "$APP"