dsh-plugin-vrmpet3d 0.1.2 → 0.1.4

package/lib/config-page.js

@@ -1081,7 +1081,7 @@
      * it is the same predicate as `loadModelInfo`'s, not "is the picker here".
      */
     if (!needsModelVocabulary()) return Promise.resolve(null);
-    return fetch('/vrmpet3d/catalog', { credentials: 'omit' })
+    return fetch('/vrmpet3d/catalog', { credentials: 'same-origin' })
       .then(function (response) { return response.ok ? response.json() : null; })
       .then(function (body) {
         catalog = body && Array.isArray(body.models) ? body.models : [];
@@ -1183,7 +1183,7 @@
   }
 
   function loadImported() {
-    return fetch('/vrmpet3d/models', { credentials: 'omit' })
+    return fetch('/vrmpet3d/models', { credentials: 'same-origin' })
       .then(function (response) { return response.ok ? response.json() : null; })
       .then(function (body) {
         imported.models = body && Array.isArray(body.importedModels) ? body.importedModels : [];
@@ -1209,7 +1209,7 @@
   function writeImported(body) {
     return fetch('/vrmpet3d/models', {
       method: 'POST',
-      credentials: 'omit',
+      credentials: 'same-origin',
       headers: { 'content-type': 'application/json' },
       body: JSON.stringify(body),
     }).then(function (response) {
@@ -1341,7 +1341,7 @@
   }
 
   function loadImportedMotions() {
-    return fetch('/vrmpet3d/motions', { credentials: 'omit' })
+    return fetch('/vrmpet3d/motions', { credentials: 'same-origin' })
       .then(function (response) { return response.ok ? response.json() : null; })
       .then(function (body) {
         importedMotions.imports = body && Array.isArray(body.importedMotions) ? body.importedMotions : [];
@@ -1363,7 +1363,7 @@
   function writeImportedMotion(body) {
     return fetch('/vrmpet3d/motions', {
       method: 'POST',
-      credentials: 'omit',
+      credentials: 'same-origin',
       headers: { 'content-type': 'application/json' },
       body: JSON.stringify(body),
     }).then(function (response) {
@@ -1503,7 +1503,7 @@
     var settle = function () {
       if (modelInfoInFlight && modelInfoInFlight.id === id) modelInfoInFlight = null;
     };
-    var promise = fetch('/vrmpet3d/model-info?m=' + encodeURIComponent(id), { credentials: 'omit' })
+    var promise = fetch('/vrmpet3d/model-info?m=' + encodeURIComponent(id), { credentials: 'same-origin' })
       .then(function (response) {
         if (response.status === 404) return null;
         return response.ok ? response.json() : null;
@@ -2787,7 +2787,7 @@
   }
 
   function loadMotions() {
-    return fetch('/vrmpet3d/motions', { credentials: 'omit' })
+    return fetch('/vrmpet3d/motions', { credentials: 'same-origin' })
       .then(function (response) {
         if (!response.ok) return null;
         return response.json();
@@ -2992,7 +2992,7 @@
     try {
       fetch('/vrmpet3d/preview', {
         method: 'POST',
-        credentials: 'omit',
+        credentials: 'same-origin',
         headers: { 'content-type': 'application/json' },
         body: JSON.stringify(preview || {}),
       }).catch(function () { return null; });
@@ -4186,7 +4186,7 @@
      */
     var loadLlm = function (wanted) {
       askedLlmProvider = wanted || '';
-      return fetch('/vrmpet3d/llm' + (wanted ? '?provider=' + encodeURIComponent(wanted) : ''), { credentials: 'omit' })
+      return fetch('/vrmpet3d/llm' + (wanted ? '?provider=' + encodeURIComponent(wanted) : ''), { credentials: 'same-origin' })
         .then(function (response) { return response.ok ? response.json() : null; })
         .then(function (body) {
           if (!body) return;
@@ -4391,7 +4391,7 @@
         fetch('/vrmpet3d/say', {
           method: 'POST',
           headers: { 'content-type': 'application/json' },
-          credentials: 'omit',
+          credentials: 'same-origin',
           // The HOST answers in this language, so the test line reads like the pet the user is configuring.
           body: JSON.stringify({ state: state, language: language }),
         }).then(function (response) { return response.json(); })
@@ -4631,7 +4631,7 @@
    * about "is anything drawing this model".
    */
   function refreshStatus() {
-    return fetch('/vrmpet3d/desktop', { credentials: 'omit' })
+    return fetch('/vrmpet3d/desktop', { credentials: 'same-origin' })
       .then(function (response) { return response.ok ? response.json() : null; })
       .then(function (status) {
         if (!status) {
@@ -5444,7 +5444,7 @@
       };
       fetch('/vrmpet3d/desktop', {
         method: 'POST',
-        credentials: 'omit',
+        credentials: 'same-origin',
         headers: { 'content-type': 'application/json' },
         body: JSON.stringify({ action: 'setup' }),
       }).then(function (response) {

package/lib/core.js

@@ -5005,7 +5005,7 @@ var MOTION_STATES = STATUS_STATES.concat(INTERACTION_STATES, ['dancing']);
     function load() {
       if (!supported || stopped) return Promise.resolve(null);
       var request = ++issued;
-      return doFetch(url, { credentials: 'omit' })
+      return doFetch(url, { credentials: 'same-origin' })
         .then(function (response) {
           if (response.status === 404 || response.status === 405) {
             supported = false;
@@ -5169,7 +5169,7 @@ var MOTION_STATES = STATUS_STATES.concat(INTERACTION_STATES, ['dancing']);
     function load() {
       if (!supported || stopped) return Promise.resolve(null);
       var request = ++issued;
-      return doFetch(url, { credentials: 'omit' })
+      return doFetch(url, { credentials: 'same-origin' })
         .then(function (response) {
           if (response.status === 404 || response.status === 405) {
             supported = false;
@@ -5213,7 +5213,7 @@ var MOTION_STATES = STATUS_STATES.concat(INTERACTION_STATES, ['dancing']);
   /**
    * The reporting half of `watchHostState`: the app's pet tells the host what it resolved.
    *
-   * Deduplicated on the last value SENT, so the sixty-per-second frame loop can call this on every change
+   * Deduplicated on the latest in-flight value or acknowledged value, so the frame loop can call this on every change
    * without a POST per frame — and a state that flaps back to what the host already has costs nothing.
    *
    * The 碎碎念 LINE travels with the state, and the dedupe key is both together: the pet can say something
@@ -5245,6 +5245,8 @@ var MOTION_STATES = STATUS_STATES.concat(INTERACTION_STATES, ['dancing']);
     var sentUnread = null;
     /** The last diagnostic sent (see `report`), so the heartbeat re-states what the state it repeats was based on. */
     var sentWhy = null;
+    var reportSequence = 0;
+    var pendingReport = null;
     var beatTimer = null;
     /**
      * What the heartbeat re-states: the last STATE and LINE, never the touch.
@@ -5465,22 +5467,27 @@ var MOTION_STATES = STATUS_STATES.concat(INTERACTION_STATES, ['dancing']);
         return JSON.stringify(value ? [value.waitingSessionIds || [], value.completedSessionIds || [],
           value.statusSessionId || null, value.completedSessionId || null] : [[], [], null, null]);
       };
-      if (force !== true && next === sent && nextLine === sentLine && nextTouchKey === sentTouchKey
-        && nextClockKey === sentClockKey && nextUnread === sentUnread && navigationKey(nextWhy) === navigationKey(sentWhy)) {
+      // Dedupe against the newest in-flight request, or the last ACKNOWLEDGED report.
+      // A rejected request must remain retryable; an older response cannot commit over a newer report.
+      if (!doFetch || !next) return Promise.resolve(null);
+      var key = JSON.stringify([next, nextLine, nextTouchKey, nextClockKey, nextUnread, navigationKey(nextWhy)]);
+      if (force !== true && ((pendingReport && pendingReport.key === key)
+        || (!pendingReport && next === sent && nextLine === sentLine && nextTouchKey === sentTouchKey
+          && nextClockKey === sentClockKey && nextUnread === sentUnread && navigationKey(nextWhy) === navigationKey(sentWhy)))) {
         return Promise.resolve(null);
       }
-      sent = next;
-      sentLine = nextLine;
-      sentTouch = nextTouch;
-      sentClock = nextClock;
-      sentUnread = nextUnread;
-      sentWhy = nextWhy;
-      // No state, no report: the host refuses an unknown name, and a line with no state behind it would only
-      // clear the state it is meant to accompany.
-      if (!doFetch || !next) return Promise.resolve(null);
-      // Recorded for the heartbeat AFTER the send is judged worth making, so a beat always repeats something the
-      // host has actually been told.
-      lastBeat = { state: next, line: nextLine, why: nextWhy };
+      var request = ++reportSequence;
+      pendingReport = { key: key, request: request };
+      // Heartbeats retry the latest desired STATE, never a one-shot touch event.
+      lastBeat = { state: next, line: nextLine, why: nextWhy, clock: nextClock, unread: nextUnread };
+      function failed() {
+        if (request === reportSequence) {
+          pendingReport = null;
+          sent = null;
+          sentLine = sentTouch = sentClock = sentUnread = sentWhy = null;
+        }
+        return null;
+      }
       try {
         var body = { state: next };
         if (nextLine) body.line = nextLine;
@@ -5488,16 +5495,57 @@ var MOTION_STATES = STATUS_STATES.concat(INTERACTION_STATES, ['dancing']);
         if (nextClock) body.clock = nextClock;
         if (nextUnread !== null) body.unread = nextUnread;
         if (nextWhy) body.why = nextWhy;
-        return doFetch(url, {
-          method: 'POST',
-          credentials: 'omit',
-          headers: { 'content-type': 'application/json' },
-          body: JSON.stringify(body),
-        }).then(function () { return next; }, function () { return null; });
+        return postReport(body).then(function (accepted) {
+          if (!accepted) return failed();
+          if (request === reportSequence) {
+            pendingReport = null;
+            sent = next;
+            sentLine = nextLine;
+            sentTouch = nextTouch;
+            sentClock = nextClock;
+            sentUnread = nextUnread;
+            sentWhy = nextWhy;
+          }
+          return next;
+        }).catch(failed);
       } catch (_error) {
-        return Promise.resolve(null);
+        return Promise.resolve(failed());
       }
     }
+    function readAcknowledgement(response) {
+      if (!response || !response.ok || response.redirected) return Promise.resolve(false);
+      return response.json().then(function (payload) {
+        return !!payload && typeof payload.seq === 'number' && Number.isFinite(payload.seq)
+          && payload.seq >= 0 && payload.superseded !== true;
+      });
+    }
+    function postReport(body) {
+      var controller = typeof AbortController === 'function' ? new AbortController() : null;
+      var deadline = null;
+      // A stalled fetch/body must not permanently suppress all subsequent heartbeats.
+      var timeoutMs = Number(settings.requestTimeoutMs) > 0 ? Number(settings.requestTimeoutMs) : 8000;
+      return new Promise(function (resolve, reject) {
+        deadline = setTimeout(function () {
+          if (controller) controller.abort();
+          resolve(false);
+        }, timeoutMs);
+        if (deadline && typeof deadline.unref === 'function') deadline.unref();
+        try {
+          var options = {
+            method: 'POST', credentials: 'same-origin', redirect: 'error',
+            headers: { 'content-type': 'application/json' }, body: JSON.stringify(body),
+          };
+          if (controller) options.signal = controller.signal;
+          Promise.resolve(doFetch(url, options)).then(readAcknowledgement).then(resolve, reject);
+        } catch (error) { reject(error); }
+      }).then(function (accepted) {
+        clearTimeout(deadline);
+        return accepted;
+      }, function (error) {
+        clearTimeout(deadline);
+        throw error;
+      });
+    }
     /**
      * Re-state the last report, unchanged, so that SILENCE can be told from DEATH.
      *
@@ -5514,7 +5562,8 @@ var MOTION_STATES = STATUS_STATES.concat(INTERACTION_STATES, ['dancing']);
        * all" on every beat — so the floating window lost the turn's 用时 a few seconds into every long turn. `force`
        * is the parameter that exists for this.
        */
-      return report(lastBeat.state, lastBeat.line, null, sentClock, true, sentUnread, lastBeat.why);
+      if (pendingReport) return Promise.resolve(null);
+      return report(lastBeat.state, lastBeat.line, null, lastBeat.clock, true, lastBeat.unread, lastBeat.why);
     }
 
     function startHeartbeat(intervalMs) {
@@ -5544,12 +5593,8 @@ var MOTION_STATES = STATUS_STATES.concat(INTERACTION_STATES, ['dancing']);
       if (!doFetch) return Promise.resolve(null);
       var message = error && (error.stack || error.message) ? String(error.stack || error.message) : String(error);
       try {
-        return doFetch(url, {
-          method: 'POST',
-          credentials: 'omit',
-          headers: { 'content-type': 'application/json' },
-          body: JSON.stringify({ state: sent || '', error: message.slice(0, 500) }),
-        }).then(function () { return message; }, function () { return null; });
+        return postReport({ state: sent || '', error: message.slice(0, 500) })
+          .then(function (accepted) { return accepted ? message : null; }).catch(function () { return null; });
       } catch (_error) {
         return Promise.resolve(null);
       }
@@ -5610,7 +5655,7 @@ var MOTION_STATES = STATUS_STATES.concat(INTERACTION_STATES, ['dancing']);
     function load() {
       if (!supported || stopped) return Promise.resolve(null);
       var request = ++issued;
-      return doFetch(url, { credentials: 'omit' })
+      return doFetch(url, { credentials: 'same-origin' })
         .then(function (response) {
           if (response.status === 404 || response.status === 405) {
             // No store on this host: stop asking, and let the caller keep its own storage.
@@ -5636,7 +5681,7 @@ var MOTION_STATES = STATUS_STATES.concat(INTERACTION_STATES, ['dancing']);
       var request = ++issued;
       return doFetch(url, {
         method: 'POST',
-        credentials: 'omit',
+        credentials: 'same-origin',
         headers: { 'content-type': 'application/json' },
         body: JSON.stringify(body || {}),
       })

package/lib/desktop-page.js

@@ -692,6 +692,7 @@
       if (id === 'globalSettings') { openSettingsWindow('global'); return; }
       // 切换模型: the model picker's page, the same one the guide's 偏好模型 step is built from.
       if (id === 'switchModel') { openSettingsWindow('picker'); return; }
+      if (id === 'miniGame') { openSettingsWindow('game'); return; }
       /**
        * 重载模型 — the same row the app pet's menu grew, with the same meaning (operator, 2026-10-14: 「给内置和外置宠物的右键
        * 菜单新增“重载模型”的选项，用来刷新模型」): re-read the model FILE and rebuild this window's scene. Nothing about the
@@ -1373,7 +1374,7 @@
       fetch('/vrmpet3d/say', {
         method: 'POST',
         headers: { 'content-type': 'application/json' },
-        credentials: 'omit',
+        credentials: 'same-origin',
         body: JSON.stringify({
           state: hostState || null,
           event: stateEventName(),
@@ -1693,7 +1694,7 @@
      */
     function refreshCatalog() {
       if (typeof fetch !== 'function') return Promise.resolve([]);
-      return fetch('/vrmpet3d/catalog', { credentials: 'omit' })
+      return fetch('/vrmpet3d/catalog', { credentials: 'same-origin' })
         .then(function (response) {
           if (!response.ok) throw new Error('catalog route returned HTTP ' + response.status);
           return response.json();
@@ -1868,6 +1869,14 @@
      * query parameter this build no longer reads.
      */
     function openSettingsWindow(page) {
+      if (page === 'game') {
+        fetch('/vrmpet3d/desktop', { method: 'POST', credentials: 'same-origin',
+          headers: { 'content-type': 'application/json' },
+          body: JSON.stringify({ action: 'game', modelId: resolvedModelId(preferences.modelId || loadedModel) })
+        }).then(function (response) { if (!response.ok) throw new Error('小游戏窗口打开失败'); })
+          .catch(function (error) { console.warn(error.message); });
+        return;
+      }
       var which = page === 'global' ? 'settings' : (page === 'picker' ? 'picker' : 'config');
       var url = which === 'settings'
         ? '/vrmpet3d/global'
@@ -1881,7 +1890,7 @@
         fetch('/vrmpet3d/desktop', {
           method: 'POST',
           headers: { 'content-type': 'application/json' },
-          credentials: 'omit',
+          credentials: 'same-origin',
           // Same reason as the app's pet: name the model that is on screen, so the window opens on it.
           body: JSON.stringify({ action: which, modelId: resolvedModelId(preferences.modelId || loadedModel) }),
         }).then(function (response) { if (!response.ok) fallback(); })
@@ -2663,7 +2672,7 @@
             try {
               fetch('/vrmpet3d/preview', {
                 method: 'POST',
-                credentials: 'omit',
+                credentials: 'same-origin',
                 headers: { 'content-type': 'application/json' },
                 body: '{}',
               }).catch(function () { return null; });
@@ -2790,7 +2799,7 @@
     }
 
     function fetchMotionBytes(id) {
-      return fetch('/vrmpet3d/motion?m=' + encodeURIComponent(id), { credentials: 'omit' })
+      return fetch('/vrmpet3d/motion?m=' + encodeURIComponent(id), { credentials: 'same-origin' })
         .then(function (response) {
           if (!response.ok) throw new Error('the motion route answered HTTP ' + response.status);
           return response.arrayBuffer();
@@ -2909,7 +2918,7 @@
      */
     function refreshMotions() {
       if (!motionRouteAvailable || typeof fetch !== 'function') return Promise.resolve(null);
-      return fetch('/vrmpet3d/motions', { credentials: 'omit' })
+      return fetch('/vrmpet3d/motions', { credentials: 'same-origin' })
         .then(function (response) {
           if (response.status === 404 || response.status === 405) {
             motionRouteAvailable = false;
@@ -3637,7 +3646,7 @@
       scene.setPreview(null);
       scene.setState('resting');
       fetch('/vrmpet3d/preview', {
-        method: 'POST', credentials: 'omit',
+        method: 'POST', credentials: 'same-origin',
         headers: { 'content-type': 'application/json' }, body: '{}',
       }).catch(function () { return null; });
     }