@condorinst/mobile-bridge 0.22.0 → 0.23.0

package/dist/index.cjs

@@ -35,6 +35,7 @@ __export(index_exports, {
   BridgeClient: () => BridgeClient,
   BridgeShell: () => BridgeShell,
   NATIVE_CHANNEL_NAME: () => NATIVE_CHANNEL_NAME,
+  createRequestId: () => createRequestId,
   versionAtLeast: () => versionAtLeast
 });
 module.exports = __toCommonJS(index_exports);
@@ -654,6 +655,11 @@ var Bridge = {
 };
 
 // src/bridge-client.ts
+function createRequestId() {
+  const bytes = new Uint8Array(16);
+  crypto.getRandomValues(bytes);
+  return Array.from(bytes, (b) => b.toString(16).padStart(2, "0")).join("");
+}
 var PROTOCOL_VERSION2 = "0.5.0";
 var HANDSHAKE_TIMEOUT_MS = 5e3;
 var SENSOR_LOG_TIMEOUT_MS = 1e4;
@@ -665,6 +671,11 @@ function insideShell() {
 }
 var subscribers2 = /* @__PURE__ */ new Map();
 var lastSystemStatus = null;
+function trustedHasDevices(status) {
+  if (!status || typeof status.hasDevices !== "boolean") return null;
+  if (status.hasDevicesKnown === false) return null;
+  return status.hasDevices;
+}
 var pendingHandshake2 = null;
 var messageListenerInstalled = false;
 function postToShell(msg) {
@@ -750,13 +761,18 @@ var BridgeClient = {
       if (remaining.length === 0) postToShell({ type: "unsubscribe", key });
     };
   },
-  send(command, args = {}) {
+  send(command, ...rest) {
+    const args = rest[0] ?? {};
     postToShell({ type: "send", command, args });
   },
   openSettings() {
     this.send("openSettings");
   },
-  fetchSensorLog(query, opts) {
+  fetchSensorLog(input, opts) {
+    const query = {
+      ...input,
+      requestId: input.requestId ?? createRequestId()
+    };
     const timeoutMs = opts?.timeoutMs ?? SENSOR_LOG_TIMEOUT_MS;
     return new Promise((resolve, reject) => {
       let settled = false;
@@ -794,18 +810,23 @@ var BridgeClient = {
     });
   },
   requestUserDevices(opts) {
-    let hasDevices = typeof lastSystemStatus?.hasDevices === "boolean" ? lastSystemStatus.hasDevices : null;
+    let hasDevices = trustedHasDevices(lastSystemStatus);
     const getFromServer = opts?.getFromServer ?? false;
     return retryUntilReply({
       timeoutMs: opts?.timeoutMs ?? SERVICE_TIMEOUT_MS,
       send: () => this.send("userDevice", { getFromServer }),
       listen: (done, resend) => {
-        const offDevices = this.on(
-          BRIDGE_KEYS.userDevice,
-          (devices) => done({ status: "ok", devices })
-        );
+        const offDevices = this.on(BRIDGE_KEYS.userDevice, (devices) => {
+          if (devices.error === void 0 || devices.error === null) {
+            done({ status: "ok", devices });
+          } else if (devices.error === "NO_DEVICES") {
+            done({ status: "no-devices" });
+          } else {
+            done({ status: "error", code: String(devices.error) });
+          }
+        });
         const offStatus = this.on(BRIDGE_KEYS.systemStatus, (status) => {
-          hasDevices = status.hasDevices;
+          hasDevices = trustedHasDevices(status);
           resend();
         });
         return () => {
@@ -1275,6 +1296,7 @@ function versionAtLeast(version, min) {
   BridgeClient,
   BridgeShell,
   NATIVE_CHANNEL_NAME,
+  createRequestId,
   versionAtLeast
 });
 //# sourceMappingURL=index.cjs.map