@buoy-gg/external-sync 7.0.22 → 7.0.24

package/lib/commonjs/utils/getDefaultSocketURL.js

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.DEFAULT_BROKER_PORT = void 0;
 exports.getDefaultSocketURL = getDefaultSocketURL;
 exports.getMetroHost = getMetroHost;
+exports.hostFromScriptURL = hostFromScriptURL;
+exports.socketURLForHost = socketURLForHost;
 /**
  * Default broker-URL derivation. Kept in its own module (and never imported
  * from types.ts) because the deep react-native require below must not reach
@@ -16,6 +18,24 @@ exports.getMetroHost = getMetroHost;
 const DEFAULT_BROKER_PORT = exports.DEFAULT_BROKER_PORT = 42831;
 const HOST_RE = /^https?:\/\/([^:/]+)/;
 
+/**
+ * Host out of a bundle's scriptURL, or null when there isn't one.
+ *
+ * Release bundles are loaded from disk (`file:///.../main.jsbundle`), so this
+ * returns null and callers fall back to localhost — correct for simulators,
+ * emulators, and Android over USB (`adb reverse tcp:42831 tcp:42831`). A
+ * physical iOS device in a release build has no derivable host at all and
+ * must be given an explicit socketURL.
+ */
+function hostFromScriptURL(scriptURL) {
+  return scriptURL?.match(HOST_RE)?.[1] ?? null;
+}
+
+/** Broker URL for a host, falling back to localhost when none is known. */
+function socketURLForHost(host) {
+  return `http://${host ?? "localhost"}:${DEFAULT_BROKER_PORT}`;
+}
+
 /**
  * Host of the Metro dev server that served this bundle — the machine most
  * likely running Buoy Desktop. On a physical device this is the computer's
@@ -33,9 +53,8 @@ function getMetroHost() {
     const NativeSourceCode =
     // eslint-disable-next-line @typescript-eslint/no-var-requires
     require("react-native/Libraries/NativeModules/specs/NativeSourceCode").default;
-    const scriptURL = NativeSourceCode?.getConstants?.().scriptURL;
-    const match = scriptURL?.match(HOST_RE);
-    if (match) return match[1];
+    const host = hostFromScriptURL(NativeSourceCode?.getConstants?.().scriptURL);
+    if (host) return host;
   } catch {
     // web / RN internals moved — try the old-architecture module
   }
@@ -43,9 +62,8 @@ function getMetroHost() {
     const {
       NativeModules
     } = require("react-native");
-    const scriptURL = NativeModules?.SourceCode?.getConstants?.().scriptURL ?? NativeModules?.SourceCode?.scriptURL;
-    const match = scriptURL?.match(HOST_RE);
-    if (match) return match[1];
+    const host = hostFromScriptURL(NativeModules?.SourceCode?.getConstants?.().scriptURL ?? NativeModules?.SourceCode?.scriptURL);
+    if (host) return host;
   } catch {
     // not React Native
   }
@@ -58,5 +76,5 @@ function getMetroHost() {
  * later by getPlatformSpecificURL, so localhost still works there.
  */
 function getDefaultSocketURL() {
-  return `http://${getMetroHost() ?? "localhost"}:${DEFAULT_BROKER_PORT}`;
+  return socketURLForHost(getMetroHost());
 }

package/lib/module/utils/getDefaultSocketURL.js

@@ -10,6 +10,24 @@
 export const DEFAULT_BROKER_PORT = 42831;
 const HOST_RE = /^https?:\/\/([^:/]+)/;
 
+/**
+ * Host out of a bundle's scriptURL, or null when there isn't one.
+ *
+ * Release bundles are loaded from disk (`file:///.../main.jsbundle`), so this
+ * returns null and callers fall back to localhost — correct for simulators,
+ * emulators, and Android over USB (`adb reverse tcp:42831 tcp:42831`). A
+ * physical iOS device in a release build has no derivable host at all and
+ * must be given an explicit socketURL.
+ */
+export function hostFromScriptURL(scriptURL) {
+  return scriptURL?.match(HOST_RE)?.[1] ?? null;
+}
+
+/** Broker URL for a host, falling back to localhost when none is known. */
+export function socketURLForHost(host) {
+  return `http://${host ?? "localhost"}:${DEFAULT_BROKER_PORT}`;
+}
+
 /**
  * Host of the Metro dev server that served this bundle — the machine most
  * likely running Buoy Desktop. On a physical device this is the computer's
@@ -27,9 +45,8 @@ export function getMetroHost() {
     const NativeSourceCode =
     // eslint-disable-next-line @typescript-eslint/no-var-requires
     require("react-native/Libraries/NativeModules/specs/NativeSourceCode").default;
-    const scriptURL = NativeSourceCode?.getConstants?.().scriptURL;
-    const match = scriptURL?.match(HOST_RE);
-    if (match) return match[1];
+    const host = hostFromScriptURL(NativeSourceCode?.getConstants?.().scriptURL);
+    if (host) return host;
   } catch {
     // web / RN internals moved — try the old-architecture module
   }
@@ -37,9 +54,8 @@ export function getMetroHost() {
     const {
       NativeModules
     } = require("react-native");
-    const scriptURL = NativeModules?.SourceCode?.getConstants?.().scriptURL ?? NativeModules?.SourceCode?.scriptURL;
-    const match = scriptURL?.match(HOST_RE);
-    if (match) return match[1];
+    const host = hostFromScriptURL(NativeModules?.SourceCode?.getConstants?.().scriptURL ?? NativeModules?.SourceCode?.scriptURL);
+    if (host) return host;
   } catch {
     // not React Native
   }
@@ -52,5 +68,5 @@ export function getMetroHost() {
  * later by getPlatformSpecificURL, so localhost still works there.
  */
 export function getDefaultSocketURL() {
-  return `http://${getMetroHost() ?? "localhost"}:${DEFAULT_BROKER_PORT}`;
+  return socketURLForHost(getMetroHost());
 }

package/lib/typescript/utils/getDefaultSocketURL.d.ts

@@ -5,6 +5,18 @@
  */
 /** Port Buoy Desktop's broker listens on. */
 export declare const DEFAULT_BROKER_PORT = 42831;
+/**
+ * Host out of a bundle's scriptURL, or null when there isn't one.
+ *
+ * Release bundles are loaded from disk (`file:///.../main.jsbundle`), so this
+ * returns null and callers fall back to localhost — correct for simulators,
+ * emulators, and Android over USB (`adb reverse tcp:42831 tcp:42831`). A
+ * physical iOS device in a release build has no derivable host at all and
+ * must be given an explicit socketURL.
+ */
+export declare function hostFromScriptURL(scriptURL: string | null | undefined): string | null;
+/** Broker URL for a host, falling back to localhost when none is known. */
+export declare function socketURLForHost(host: string | null): string;
 /**
  * Host of the Metro dev server that served this bundle — the machine most
  * likely running Buoy Desktop. On a physical device this is the computer's

package/lib/typescript/utils/getDefaultSocketURL.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getDefaultSocketURL.d.ts","sourceRoot":"","sources":["../../../src/utils/getDefaultSocketURL.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,6CAA6C;AAC7C,eAAO,MAAM,mBAAmB,QAAQ,CAAC;AAIzC;;;;;;;;;GASG;AACH,wBAAgB,YAAY,IAAI,MAAM,GAAG,IAAI,CAyB5C;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,CAE5C"}
+{"version":3,"file":"getDefaultSocketURL.d.ts","sourceRoot":"","sources":["../../../src/utils/getDefaultSocketURL.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,6CAA6C;AAC7C,eAAO,MAAM,mBAAmB,QAAQ,CAAC;AAIzC;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GACnC,MAAM,GAAG,IAAI,CAEf;AAED,2EAA2E;AAC3E,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAE5D;AAED;;;;;;;;;GASG;AACH,wBAAgB,YAAY,IAAI,MAAM,GAAG,IAAI,CAyB5C;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,CAE5C"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@buoy-gg/external-sync",
-  "version": "7.0.22",
+  "version": "7.0.24",
   "description": "Generic device-to-desktop sync for Buoy dev tools",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",