@ateam-ai-mobile/expo 0.1.21 → 0.1.23

package/dist/bootstrap.js

@@ -176,7 +176,7 @@ __export(bootstrap_exports, {
 });
 module.exports = __toCommonJS(bootstrap_exports);
 var import_core3 = require("@ateam-ai-mobile/core");
-var import_plugin_runtime3 = require("@ateam-ai-mobile/plugin-runtime");
+var import_plugin_runtime4 = require("@ateam-ai-mobile/plugin-runtime");
 var import_ui2 = require("@ateam-ai-mobile/ui");
 
 // src/audio/index.ts
@@ -2925,6 +2925,7 @@ function createDeviceProvider(config2) {
 
 // src/aiLive/provider.ts
 var import_core2 = require("@ateam-ai-mobile/core");
+var import_plugin_runtime3 = require("@ateam-ai-mobile/plugin-runtime");
 
 // src/aiLive/streamProtocol.ts
 var STREAM_PATH = "/ws/stream";
@@ -2953,8 +2954,8 @@ function encodeFrame({ seq, tCapture, payload }) {
   out.set(payload, HEADER_BYTES);
   return out;
 }
-function openMessage(kind) {
-  return JSON.stringify({ type: "open", kind });
+function openMessage(kind, params) {
+  return JSON.stringify(params ? { type: "open", kind, params } : { type: "open", kind });
 }
 var CLOSE_MESSAGE = JSON.stringify({ type: "close" });
 function parseServerEvent(text2) {
@@ -3002,22 +3003,14 @@ function base64ToBytes(b64) {
 }
 
 // src/aiLive/provider.ts
-var PHONE_SLICE_USD = 0.5;
 var LIVE_KIND = "ai-models.live";
 var FRESH_MS2 = 3e3;
 var MAX_BUFFERED = 512 * 1024;
 var DEFAULT_CAMERA = { fps: 1, maxPx: 768 };
-var SESSION_UP = /* @__PURE__ */ new Set(["starting", "running", "degraded"]);
-async function defaultCallCp(method, params = {}) {
-  const res = await (0, import_core2.mcpToolCall)("cp.ai_models_api", { method, params });
-  if (res?.error) throw new Error(res.error.message || "AI Models refused the request");
-  const out = (0, import_core2.unwrapMcpResult)(res?.result);
-  if (res?.result?.isError) throw new Error(typeof out === "string" ? out : out?.message || out?.error || "AI Models refused the request");
-  if (out && typeof out === "object" && out.ok === false) throw new Error(out.message || out.error || "AI Models refused the request");
-  return out;
-}
+var OPEN_TIMEOUT_MS = 2e4;
+var CLOSE_WAIT_MS = 3e3;
+var isEpisode = (d) => !!d && typeof d === "object" && typeof d.type === "string" && typeof d.class === "string" && typeof d.episodeId === "string" && typeof d.actorId === "string" && d.actorId.length > 0 && Number.isFinite(d.at);
 var defaultAiLiveDeps = () => ({
-  callCp: defaultCallCp,
   WebSocketImpl: globalThis.WebSocket,
   wsBase: import_core2.getCoreWsUrl,
   token: import_core2.getToken,
@@ -3025,7 +3018,9 @@ var defaultAiLiveDeps = () => ({
   jpegById,
   now: Date.now,
   setInterval: (fn, ms) => setInterval(fn, ms),
-  clearInterval: (h) => clearInterval(h)
+  clearInterval: (h) => clearInterval(h),
+  setTimeout: (fn, ms) => setTimeout(fn, ms),
+  clearTimeout: (h) => clearTimeout(h)
 });
 var idle = () => ({ state: "idle", camera: null, sent: 0, skipped: 0, lastEpisode: null, lastError: null });
 function createAiLiveProvider(overrides = {}) {
@@ -3035,7 +3030,11 @@ function createAiLiveProvider(overrides = {}) {
   let ws = null;
   let loop = null;
   let visual = null;
-  let startedSession = false;
+  let allowed = () => false;
+  let stopReason = null;
+  let tearingDown = null;
+  const waitingToStart = /* @__PURE__ */ new Map();
+  const closedOf = /* @__PURE__ */ new WeakMap();
   let closingOnPurpose = false;
   let seq = 0;
   let busy = false;
@@ -3088,6 +3087,12 @@ function createAiLiveProvider(overrides = {}) {
     const g = gen;
     const sock = ws;
     const current = () => g === gen && ws === sock && sock?.readyState === 1;
+    const consentGone = () => {
+      if (allowed()) return false;
+      if (g === gen) void teardown("stopped", import_plugin_runtime3.CONSENT_TAKEN_BACK);
+      return true;
+    };
+    if (consentGone()) return;
     if (busy || !current()) {
       set2({ skipped: snap.skipped + 1 });
       return;
@@ -3108,7 +3113,7 @@ function createAiLiveProvider(overrides = {}) {
         return;
       }
       const b64 = await deps.jpegById(id, camera.maxPx, 0.7);
-      if (!current()) return;
+      if (!current() || consentGone()) return;
       const frame = encodeFrame({ seq: mySeq, tCapture: t, payload: base64ToBytes(b64) });
       sock.send(frame.buffer);
       lastFrameId = id;
@@ -3132,22 +3137,42 @@ function createAiLiveProvider(overrides = {}) {
       const sock = new deps.WebSocketImpl(url, [SUBPROTOCOL, `adas.bearer.${token}`]);
       ws = sock;
       sock.binaryType = "arraybuffer";
+      let markClosed = () => {
+      };
+      closedOf.set(sock, new Promise((r) => {
+        markClosed = r;
+      }));
+      const gaveUp = deps.setTimeout(() => {
+        if (opened) return;
+        reject(new Error("Core did not answer in time. Try again."));
+        try {
+          sock.close();
+        } catch {
+        }
+      }, OPEN_TIMEOUT_MS);
       sock.onopen = () => {
         try {
-          sock.send(openMessage(LIVE_KIND));
+          sock.send(openMessage(LIVE_KIND, { session: "own", source: "phone" }));
         } catch (e) {
           reject(e);
         }
       };
       sock.onmessage = (m) => {
+        if (ws !== sock) return;
         const ev = parseServerEvent(m?.data);
         if (!ev) return;
+        if (ev.event === "session" && !opened) {
+          const c = ev.data?.camera;
+          camera = c && Number(c.fps) > 0 && Number(c.maxPx) > 0 ? { fps: Number(c.fps), maxPx: Number(c.maxPx) } : DEFAULT_CAMERA;
+          return;
+        }
         if (ev.event === "opened" && !opened) {
           opened = true;
+          deps.clearTimeout(gaveUp);
           resolve();
           return;
         }
-        if (ev.event === "episode" && ev.data && typeof ev.data === "object") {
+        if (ev.event === "episode" && isEpisode(ev.data)) {
           const episode = ev.data;
           set2({ lastEpisode: episode });
           for (const cb of owner && episodeCbs.get(owner) || []) {
@@ -3161,8 +3186,10 @@ function createAiLiveProvider(overrides = {}) {
       sock.onerror = () => {
       };
       sock.onclose = (c) => {
+        markClosed();
         const why = describeClose(Number(c?.code), c?.reason);
         if (!opened) {
+          deps.clearTimeout(gaveUp);
           reject(new Error(why));
           return;
         }
@@ -3171,9 +3198,20 @@ function createAiLiveProvider(overrides = {}) {
       };
     });
   }
-  async function teardown(state, lastError) {
-    const hadSession = startedSession;
-    startedSession = false;
+  function teardown(state, lastError) {
+    if (tearingDown) return tearingDown;
+    const p = teardownNow(state, lastError);
+    tearingDown = p;
+    void p.then(() => {
+    }, () => {
+    }).then(() => {
+      if (tearingDown === p) tearingDown = null;
+    });
+    return p;
+  }
+  async function teardownNow(state, lastError) {
+    stopReason = lastError;
+    allowed = () => false;
     gen++;
     stopTimers();
     const sock = ws;
@@ -3190,21 +3228,40 @@ function createAiLiveProvider(overrides = {}) {
     closingOnPurpose = false;
     const v = visual;
     visual = null;
-    try {
-      await v?.stop?.();
-    } catch {
-    }
-    if (hadSession) {
-      try {
-        await deps.callCp("liveStop");
-      } catch {
-      }
-    }
+    let gaveUp = null;
+    const closed = sock && closedOf.get(sock);
+    await Promise.all([
+      (async () => {
+        try {
+          await v?.stop?.();
+        } catch {
+        }
+      })(),
+      closed ? Promise.race([closed, new Promise((r) => {
+        gaveUp = deps.setTimeout(r, CLOSE_WAIT_MS);
+      })]) : Promise.resolve()
+    ]);
+    if (gaveUp != null) deps.clearTimeout(gaveUp);
     owner = null;
     set2({ state, lastError });
   }
   return {
     async start(opts, who, ctx) {
+      if (tearingDown) {
+        const wait = { cancelled: false };
+        waitingToStart.set(who, wait);
+        try {
+          while (tearingDown) {
+            try {
+              await tearingDown;
+            } catch {
+            }
+          }
+        } finally {
+          if (waitingToStart.get(who) === wait) waitingToStart.delete(who);
+        }
+        if (wait.cancelled) throw Object.assign(new Error("aiLive: stopped before it started."), { code: "STOPPED" });
+      }
       if (owner && owner !== who) throw Object.assign(new Error("aiLive: another screen is sending to AI right now. Close it first."), { code: "CONFLICT" });
       if (owner === who) return snap;
       const cam = opts?.camera === "front" ? "front" : "back";
@@ -3212,35 +3269,52 @@ function createAiLiveProvider(overrides = {}) {
       owner = who;
       lastOwner = who;
       visual = ctx.visual;
+      allowed = typeof ctx.allowed === "function" ? ctx.allowed : () => false;
       gen++;
       seq = 0;
       lastFrameId = null;
       busy = false;
+      const g = gen;
+      const cameraOfScreen = ctx.visual;
       snap = { ...idle(), camera: cam };
       set2({ state: "starting" });
+      const stillStarting = async () => {
+        if (g === gen && !allowed()) await teardown("stopped", import_plugin_runtime3.CONSENT_TAKEN_BACK);
+        if (g !== gen) throw Object.assign(new Error(stopReason || "aiLive: stopped before it started sending."), { code: "STOPPED" });
+      };
       try {
-        let session = (await deps.callCp("liveStatus"))?.session;
-        if (!SESSION_UP.has(session?.state)) {
-          session = (await deps.callCp("liveStart", { source: "phone", budgetSliceUsd: PHONE_SLICE_USD }))?.session;
-          startedSession = true;
-        }
-        const c = session?.camera;
-        camera = c && Number(c.fps) > 0 && Number(c.maxPx) > 0 ? { fps: Number(c.fps), maxPx: Number(c.maxPx) } : DEFAULT_CAMERA;
-        await visual.start({ intent: "stream", facing: cam });
+        await stillStarting();
+        camera = DEFAULT_CAMERA;
+        if (g !== gen) throw Object.assign(new Error(stopReason || "aiLive: stopped before it started sending."), { code: "STOPPED" });
         await openSocket();
+        await stillStarting();
+        await cameraOfScreen.start({ intent: "stream", facing: cam });
+        if (g !== gen) {
+          try {
+            await cameraOfScreen.stop?.();
+          } catch {
+          }
+        }
+        await stillStarting();
+        if (g !== gen) throw Object.assign(new Error(stopReason || "aiLive: stopped before it started sending."), { code: "STOPPED" });
         loop = deps.setInterval(() => {
           void slot();
         }, Math.max(200, Math.round(1e3 / camera.fps)));
         set2({ state: "sending" });
         return snap;
       } catch (e) {
+        if (g !== gen) {
+          throw e?.code === "STOPPED" ? e : Object.assign(new Error(stopReason || "aiLive: stopped before it started sending."), { code: "STOPPED" });
+        }
         await teardown("error", String(e?.message || e));
         throw e;
       }
     },
-    async stop(who) {
+    async stop(who, why) {
+      const waiting = waitingToStart.get(who);
+      if (waiting) waiting.cancelled = true;
       if (owner !== who) return;
-      await teardown("stopped", null);
+      await teardown("stopped", why ?? null);
     },
     getSnapshot: (who) => lastOwner === who ? snap : idle(),
     onEpisode: (cb, who) => add(episodeCbs, who, cb),
@@ -3342,7 +3416,7 @@ function bootstrapExpoAdas(opts) {
     deviceProvider: createDeviceProvider({ reachabilityUrl: opts.reachabilityUrl })
   });
   for (const plugin of opts.nativePlugins ?? []) {
-    for (const id of plugin.ids) (0, import_plugin_runtime3.registerNativePlugin)(id, plugin.resolver);
+    for (const id of plugin.ids) (0, import_plugin_runtime4.registerNativePlugin)(id, plugin.resolver);
   }
   const relay = opts.urls.relay;
   (0, import_ui2.setPluginWebViewExtraHosts)(() => relay ? [relay()] : []);
@@ -3356,11 +3430,11 @@ function bootstrapExpoAdas(opts) {
     const onReach = opts.onReachabilityChange;
     (0, import_core3.setAcsReachabilityReporter)({ up: () => onReach(true), down: () => onReach(false) });
   }
-  (0, import_plugin_runtime3.setDeviceStateProvider)(
+  (0, import_plugin_runtime4.setDeviceStateProvider)(
     createDeviceState({ connectivity: connectivity_exports, location: location_exports })
   );
-  (0, import_plugin_runtime3.setAiLiveProvider)(createAiLiveProvider());
-  (0, import_plugin_runtime3.registerPlatformDeviceTools)();
+  (0, import_plugin_runtime4.setAiLiveProvider)(createAiLiveProvider());
+  (0, import_plugin_runtime4.registerPlatformDeviceTools)();
   (0, import_ui2.setUIActionNavigator)(opts.navigateToPlugin);
   (0, import_core3.initAdas)({
     coreUrl: opts.urls.core,