appium-ios-remotexpc 0.6.1 → 0.6.2

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [0.6.2](https://github.com/appium/appium-ios-remotexpc/compare/v0.6.1...v0.6.2) (2025-10-08)
+
+### Bug Fixes
+
+* improve DNS resolution in bonjour service ([#78](https://github.com/appium/appium-ios-remotexpc/issues/78)) ([5cfda64](https://github.com/appium/appium-ios-remotexpc/commit/5cfda643f9e00de3d7e6da51f757ebb90e661757))
+
 ## [0.6.1](https://github.com/appium/appium-ios-remotexpc/compare/v0.6.0...v0.6.1) (2025-10-07)
 
 ### Miscellaneous Chores

package/build/src/lib/bonjour/bonjour-discovery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bonjour-discovery.d.ts","sourceRoot":"","sources":["../../../../src/lib/bonjour/bonjour-discovery.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAiB3C;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG,KAAK,CAAC;IACzC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,cAAc,CAAC;CACzB,CAAC,CAAC;AA6XH,qBAAa,gBAAiB,SAAQ,YAAY;IAChD,OAAO,CAAC,cAAc,CAAC,CAAe;IACtC,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAA0C;IAE9E;;OAEG;IACG,aAAa,CACjB,WAAW,GAAE,MAA+C,EAC5D,MAAM,GAAE,MAA+B,GACtC,OAAO,CAAC,IAAI,CAAC;IAgBhB;;OAEG;IACH,YAAY,IAAI,IAAI;IAQpB;;OAEG;IACH,qBAAqB,IAAI,cAAc,EAAE;IAIzC;;OAEG;IACG,cAAc,CAClB,WAAW,EAAE,MAAM,EACnB,WAAW,GAAE,MAA+C,EAC5D,MAAM,GAAE,MAA+B,GACtC,OAAO,CAAC,cAAc,CAAC;IAoB1B;;OAEG;IACG,4BAA4B,CAChC,SAAS,GAAE,MAA2C,GACrD,OAAO,CAAC,aAAa,EAAE,CAAC;IAmB3B;;OAEG;IACH,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAsBzC;;OAEG;YACW,kBAAkB;IA4BhC;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAuBhC;;OAEG;YACW,kBAAkB;IAuBhC;;OAEG;IACH,OAAO,CAAC,OAAO;CAMhB"}
+{"version":3,"file":"bonjour-discovery.d.ts","sourceRoot":"","sources":["../../../../src/lib/bonjour/bonjour-discovery.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAiB3C;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG,KAAK,CAAC;IACzC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,cAAc,CAAC;CACzB,CAAC,CAAC;AAwXH,qBAAa,gBAAiB,SAAQ,YAAY;IAChD,OAAO,CAAC,cAAc,CAAC,CAAe;IACtC,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAA0C;IAE9E;;OAEG;IACG,aAAa,CACjB,WAAW,GAAE,MAA+C,EAC5D,MAAM,GAAE,MAA+B,GACtC,OAAO,CAAC,IAAI,CAAC;IAgBhB;;OAEG;IACH,YAAY,IAAI,IAAI;IAQpB;;OAEG;IACH,qBAAqB,IAAI,cAAc,EAAE;IAIzC;;OAEG;IACG,cAAc,CAClB,WAAW,EAAE,MAAM,EACnB,WAAW,GAAE,MAA+C,EAC5D,MAAM,GAAE,MAA+B,GACtC,OAAO,CAAC,cAAc,CAAC;IAoB1B;;OAEG;IACG,4BAA4B,CAChC,SAAS,GAAE,MAA2C,GACrD,OAAO,CAAC,aAAa,EAAE,CAAC;IAmB3B;;OAEG;IACH,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAsBzC;;OAEG;YACW,kBAAkB;IA4BhC;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAuBhC;;OAEG;YACW,kBAAkB;IAuBhC;;OAEG;IACH,OAAO,CAAC,OAAO;CAMhB"}

package/build/src/lib/bonjour/bonjour-discovery.js

@@ -1,6 +1,6 @@
 import { logger } from '@appium/support';
 import { spawn } from 'node:child_process';
-import { resolve4 } from 'node:dns/promises';
+import { lookup } from 'node:dns/promises';
 import { EventEmitter } from 'node:events';
 import { clearTimeout, setTimeout } from 'node:timers';
 import { setTimeout as delay } from 'node:timers/promises';
@@ -93,11 +93,21 @@ async function waitForProcessResult(process, timeoutMs, outputHandler, timeoutMe
             log.debug(`[dns-sd] output: ${output}`);
             try {
                 const handlerResult = outputHandler(output);
-                if (handlerResult === true) {
-                    result = undefined;
-                }
-                else if (handlerResult) {
-                    result = handlerResult;
+                if (handlerResult) {
+                    try {
+                        process.kill('SIGTERM');
+                    }
+                    catch { }
+                    clearTimeout(timeout);
+                    isResolved = true;
+                    if (handlerResult === true) {
+                        resolve({ success: true });
+                    }
+                    else {
+                        result = handlerResult;
+                        resolve({ success: true, data: result });
+                    }
+                    return;
                 }
             }
             catch (error) {
@@ -226,25 +236,16 @@ function shouldSkipLine(line) {
  * Resolve hostname to IP address
  */
 async function resolveIPAddress(hostname) {
+    const clean = hostname.endsWith('.') ? hostname.slice(0, -1) : hostname;
     try {
-        const address = await resolve4(hostname);
-        log.info(`[ServiceResolver] Resolved ${hostname} to IPv4: ${address}`);
-        return address;
+        const results = await lookup(clean, { family: 4, all: true });
+        const list = Array.isArray(results) ? results : [results];
+        const addresses = list.map((r) => r.address);
+        log.info(`[ServiceResolver] Resolved ${clean} to IPv4: ${addresses}`);
+        return addresses;
     }
     catch (error) {
-        log.warn(`[ServiceResolver] Failed to resolve hostname ${hostname} to IPv4: ${error}`);
-        // For .local hostnames, try without the trailing dot
-        if (hostname.endsWith('.local.')) {
-            const cleanHostname = hostname.slice(0, -1); // Remove trailing dot
-            try {
-                const address = await resolve4(cleanHostname);
-                log.info(`[ServiceResolver] Resolved ${cleanHostname} to IPv4: ${address}`);
-                return address;
-            }
-            catch (retryError) {
-                log.warn(`[ServiceResolver] Failed to resolve ${cleanHostname} to IPv4: ${retryError}`);
-            }
-        }
+        log.debug(`[ServiceResolver] IPv4 lookup failed for ${clean}: ${error}`);
         return undefined;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium-ios-remotexpc",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
   "type": "module",

package/src/lib/bonjour/bonjour-discovery.ts

@@ -1,6 +1,6 @@
 import { logger } from '@appium/support';
 import { type ChildProcess, spawn } from 'node:child_process';
-import { resolve4 } from 'node:dns/promises';
+import { lookup } from 'node:dns/promises';
 import { EventEmitter } from 'node:events';
 import { clearTimeout, setTimeout } from 'node:timers';
 import { setTimeout as delay } from 'node:timers/promises';
@@ -173,10 +173,19 @@ async function waitForProcessResult<T>(
 
       try {
         const handlerResult = outputHandler(output);
-        if (handlerResult === true) {
-          result = undefined;
-        } else if (handlerResult) {
-          result = handlerResult as T;
+        if (handlerResult) {
+          try {
+            process.kill('SIGTERM');
+          } catch {}
+          clearTimeout(timeout);
+          isResolved = true;
+          if (handlerResult === true) {
+            resolve({ success: true });
+          } else {
+            result = handlerResult as T;
+            resolve({ success: true, data: result });
+          }
+          return;
         }
       } catch (error) {
         hasError = true;
@@ -345,29 +354,15 @@ function shouldSkipLine(line: string): boolean {
 async function resolveIPAddress(
   hostname: string,
 ): Promise<string[] | undefined> {
+  const clean = hostname.endsWith('.') ? hostname.slice(0, -1) : hostname;
   try {
-    const address = await resolve4(hostname);
-    log.info(`[ServiceResolver] Resolved ${hostname} to IPv4: ${address}`);
-    return address;
+    const results = await lookup(clean, { family: 4, all: true });
+    const list = Array.isArray(results) ? results : [results];
+    const addresses = list.map((r) => r.address);
+    log.info(`[ServiceResolver] Resolved ${clean} to IPv4: ${addresses}`);
+    return addresses;
   } catch (error) {
-    log.warn(
-      `[ServiceResolver] Failed to resolve hostname ${hostname} to IPv4: ${error}`,
-    );
-    // For .local hostnames, try without the trailing dot
-    if (hostname.endsWith('.local.')) {
-      const cleanHostname = hostname.slice(0, -1); // Remove trailing dot
-      try {
-        const address = await resolve4(cleanHostname);
-        log.info(
-          `[ServiceResolver] Resolved ${cleanHostname} to IPv4: ${address}`,
-        );
-        return address;
-      } catch (retryError) {
-        log.warn(
-          `[ServiceResolver] Failed to resolve ${cleanHostname} to IPv4: ${retryError}`,
-        );
-      }
-    }
+    log.debug(`[ServiceResolver] IPv4 lookup failed for ${clean}: ${error}`);
     return undefined;
   }
 }