@kehto/shell 0.24.5 → 0.25.0

package/dist/index.js

@@ -2210,36 +2210,90 @@ function nappletNamespacePrelude(domains, normalizeIntentUri2) {
     };
   }
   function makeMedia() {
+    const sessions = /* @__PURE__ */ new Set();
+    const ended = /* @__PURE__ */ new Map();
+    const retained = /* @__PURE__ */ new Map();
+    const callbacks = /* @__PURE__ */ new Map();
+    const warnings = /* @__PURE__ */ new Set();
+    const warn = (name, replacement) => {
+      if (warnings.has(name)) return;
+      warnings.add(name);
+      console.warn(`[KEHTO-MEDIA-${name}] Deprecated media API; use ${replacement}. Warned once per endpoint.`);
+    };
+    listen((event) => {
+      if (!isParentMessage(event)) return;
+      const msg = event.data;
+      if (!msg || typeof msg !== "object" || typeof msg.sessionId !== "string") return;
+      const sessionId = msg.sessionId;
+      if (msg.type === "media.session.create.result" && !msg.error) {
+        if (!ended.has(sessionId)) sessions.add(sessionId);
+        return;
+      }
+      if (!sessions.has(sessionId) || ended.has(sessionId)) return;
+      if (msg.type === "media.session.ended") {
+        ended.set(sessionId, msg);
+        retained.delete(sessionId);
+        sessions.delete(sessionId);
+      } else if (["media.state", "media.capabilities", "media.controls"].includes(msg.type)) {
+        const cache2 = retained.get(sessionId) ?? /* @__PURE__ */ new Map();
+        cache2.set(msg.type, msg);
+        retained.set(sessionId, cache2);
+      } else if (msg.type !== "media.command") return;
+      const delivery = Array.from(callbacks.get(sessionId)?.get(msg.type) ?? []);
+      for (const callback of delivery) callback(msg);
+      if (ended.has(sessionId)) callbacks.delete(sessionId);
+    });
     const on = (type, sessionId, callback) => {
-      const off = listen((event) => {
-        if (!isParentMessage(event)) return;
-        const msg = event.data;
-        if (typeof msg === "object" && msg !== null && msg.type === type && msg.sessionId === sessionId) callback(msg);
+      const terminal = ended.get(sessionId);
+      if (terminal) {
+        if (type === "media.session.ended") callback(terminal);
+        return subscriptionHandle(() => {
+        });
+      }
+      const byType = callbacks.get(sessionId) ?? /* @__PURE__ */ new Map();
+      const handlers = byType.get(type) ?? /* @__PURE__ */ new Set();
+      handlers.add(callback);
+      byType.set(type, handlers);
+      callbacks.set(sessionId, byType);
+      const cached = retained.get(sessionId)?.get(type);
+      if (cached) callback(cached);
+      return subscriptionHandle(() => {
+        handlers.delete(callback);
       });
-      return subscriptionHandle(off);
     };
-    return {
+    const command = (sessionId, value) => {
+      if (ended.has(sessionId)) return;
+      fire({ ...value && typeof value === "object" ? value : {}, type: "media.command", sessionId });
+    };
+    return Object.freeze({
       createSession: (options) => request(
-        { type: "media.session.create", ...options && typeof options === "object" ? options : {} },
+        { ...options && typeof options === "object" ? options : {}, type: "media.session.create" },
         "media.session.create.result",
         withoutEnvelope,
         { rejectOnError: false }
       ),
       updateSession: (sessionId, metadata) => fire({ type: "media.session.update", sessionId, metadata }),
       destroySession: (sessionId) => fire({ type: "media.session.destroy", sessionId }),
-      reportState: (sessionId, state) => fire({ type: "media.state", sessionId, ...state && typeof state === "object" ? state : {} }),
+      reportState: (sessionId, state) => fire({ ...state && typeof state === "object" ? state : {}, type: "media.state", sessionId }),
       reportCapabilities: (sessionId, actions) => fire({ type: "media.capabilities", sessionId, actions }),
-      sendCommand: (sessionId, action, value) => fire({ type: "media.command", sessionId, action, ...value === void 0 ? {} : { value } }),
-      onCommand: (sessionId, callback) => on("media.command", sessionId, (msg) => callback(msg.action, msg.value)),
-      onState: (sessionId, callback) => on("media.state", sessionId, (msg) => callback({
-        status: msg.status,
-        position: msg.position,
-        duration: msg.duration,
-        volume: msg.volume
-      })),
+      command,
+      sendCommand: (sessionId, action, value) => {
+        warn("SEND-COMMAND", "media.command(sessionId, { action, value })");
+        command(sessionId, { action, ...value === void 0 ? {} : { value } });
+      },
+      onCommand: (sessionId, callback) => {
+        const legacy = callback.length >= 2;
+        if (legacy) warn("COMMAND-CALLBACK", "media.onCommand(sessionId, command => ...)");
+        return on("media.command", sessionId, (msg) => legacy ? callback(msg.action, msg.value) : callback({ action: msg.action, ...msg.value === void 0 ? {} : { value: msg.value }, ...msg.reason === void 0 ? {} : { reason: msg.reason } }));
+      },
+      onState: (sessionId, callback) => on("media.state", sessionId, (msg) => {
+        const { type: _type, sessionId: _sessionId, ...state } = msg;
+        callback(state);
+      }),
       onCapabilities: (sessionId, callback) => on("media.capabilities", sessionId, (msg) => callback(msg.actions)),
-      onControls: (sessionId, callback) => on("media.controls", sessionId, (msg) => callback(msg.controls))
-    };
+      onControls: (sessionId, callback) => on("media.controls", sessionId, (msg) => callback(msg.controls)),
+      onEnded: (sessionId, callback) => on("media.session.ended", sessionId, (msg) => callback({ sessionId: msg.sessionId, reason: msg.reason }))
+    });
   }
   function makeNotify() {
     const on = (type, callback) => {
@@ -2877,10 +2931,12 @@ function nappletNamespacePrelude(domains, normalizeIntentUri2) {
     intent ??= Object.freeze(makeIntent());
     return intent;
   }
+  let media;
   function isProtectedDomain(domain) {
-    return domain === "gamepad" || domain === "shell" || domain === "inc" || domain === "identity" || domain === "theme" || domain === "intent";
+    return domain === "media" || domain === "gamepad" || domain === "shell" || domain === "inc" || domain === "identity" || domain === "theme" || domain === "intent";
   }
   function makeDomain(domain, existing) {
+    if (domain === "media") return media ??= makeMedia();
     if (domain === "gamepad") return gamepad ??= makeGamepad();
     if (domain === "shell") return shell;
     if (domain === "inc") return makeProtectedInc(existing);
@@ -2895,8 +2951,6 @@ function nappletNamespacePrelude(domains, normalizeIntentUri2) {
         return makeStorage();
       case "keys":
         return makeKeys();
-      case "media":
-        return makeMedia();
       case "notify":
         return makeNotify();
       case "config":