@kelnishi/satmouse-client 0.18.0 → 0.18.2

package/dist/react/index.js

@@ -261,6 +261,7 @@ var ExtensionAdapter = class {
   onClose = null;
   onError = null;
   messageHandler = null;
+  pendingDeviceFetch = null;
   static isAvailable() {
     return !!globalThis.__satmouseExtensionAvailable;
   }
@@ -292,11 +293,27 @@ var ExtensionAdapter = class {
         if (msg.type === "deviceStatus" && msg.data) {
           this.onDeviceStatus?.(msg.data.event, msg.data.device);
         }
+        if (msg.type === "deviceList" && this.pendingDeviceFetch) {
+          this.pendingDeviceFetch(Array.isArray(msg.data) ? msg.data : []);
+          this.pendingDeviceFetch = null;
+        }
       };
       globalThis.addEventListener("message", this.messageHandler);
       globalThis.postMessage({ target: "satmouse-extension", action: "connect" }, "*");
     });
   }
+  fetchDeviceInfo() {
+    return new Promise((resolve) => {
+      this.pendingDeviceFetch = resolve;
+      globalThis.postMessage({ target: "satmouse-extension", action: "fetchDevices" }, "*");
+      setTimeout(() => {
+        if (this.pendingDeviceFetch) {
+          this.pendingDeviceFetch = null;
+          resolve([]);
+        }
+      }, 3e3);
+    });
+  }
   close() {
     if (this.messageHandler) {
       globalThis.removeEventListener("message", this.messageHandler);
@@ -358,8 +375,8 @@ var SatMouseConnection = class extends TypedEmitter {
     if (!wtUrl && !wsUrl) {
       const tdUrl = this.options.tdUrl;
       const tdUrls = tdUrl ? [tdUrl] : [
-        "https://127.0.0.1:18947/td.json",
-        "http://127.0.0.1:18945/td.json"
+        "http://127.0.0.1:18945/td.json",
+        "https://127.0.0.1:18947/td.json"
       ];
       let resolved = false;
       for (const url of tdUrls) {
@@ -377,8 +394,7 @@ var SatMouseConnection = class extends TypedEmitter {
       }
       if (!resolved) {
         this.emit("error", new Error("Failed to fetch Thing Description"));
-        const isSecurePage = typeof globalThis.location !== "undefined" && globalThis.location.protocol === "https:";
-        wsUrl = isSecurePage ? "wss://127.0.0.1:18947/spatial" : "ws://127.0.0.1:18945/spatial";
+        wsUrl = "ws://127.0.0.1:18945/spatial";
       }
     }
     for (const proto of this.options.transports) {
@@ -426,11 +442,20 @@ var SatMouseConnection = class extends TypedEmitter {
     this.setState("disconnected", "none");
   }
   async fetchDeviceInfo() {
-    if (!this.deviceInfoUrl) return [];
-    const res = await globalThis.fetch(this.deviceInfoUrl);
-    if (!res.ok) return [];
-    const data = await res.json();
-    return data.devices ?? [];
+    if (this.deviceInfoUrl) {
+      try {
+        const res = await globalThis.fetch(this.deviceInfoUrl);
+        if (res.ok) {
+          const data = await res.json();
+          return data.devices ?? [];
+        }
+      } catch {
+      }
+    }
+    if (this.transport && "fetchDeviceInfo" in this.transport) {
+      return this.transport.fetchDeviceInfo();
+    }
+    return [];
   }
   async tryTransport(adapter) {
     adapter.onSpatialData = (data) => this.emit("spatialData", data);