@expo/cli 0.19.13 → 0.19.14

package/build/src/utils/ip.js

@@ -13,13 +13,101 @@ function _internalIp() {
     };
     return data;
 }
+function _nodeChildProcess() {
+    const data = require("node:child_process");
+    _nodeChildProcess = function() {
+        return data;
+    };
+    return data;
+}
+function _nodeNet() {
+    const data = require("node:net");
+    _nodeNet = function() {
+        return data;
+    };
+    return data;
+}
+function _nodeOs() {
+    const data = require("node:os");
+    _nodeOs = function() {
+        return data;
+    };
+    return data;
+}
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
+/** Gets a route address by opening a UDP socket to a publicly routed address.
+ * @privateRemarks
+ * This is wrapped in `spawnSync` since the original `getIpAddress` utility exported
+ * in this module is used synchronosly. An appropriate timeout has been set and UDP
+ * ports don't send a message when opened.
+ * @throws if `spawnSync` fails
+ */ function getRouteAddress() {
+    const { error , status , stdout  } = (0, _nodeChildProcess().spawnSync)(process.execPath, [
+        "-"
+    ], {
+        // This should be the cheapest method to determine the default route
+        // By opening a socket to a publicly routed IP address, we let the default
+        // gateway handle this socket, which means the socket's address will be
+        // the prioritised route for public IP addresses.
+        // It might fall back to `"0.0.0.0"` when no network connection is established
+        input: `
+      var socket = require('dgram').createSocket({ type: 'udp4', reuseAddr: true });
+      socket.unref();
+      socket.connect(53, '1.1.1.1', function() {
+        var address = socket.address();
+        socket.close();
+        if (address && 'address' in address) {
+          process.stdout.write(address.address);
+          process.exit(0);
+        } else {
+          process.exit(1);
+        }
+      });
+    `,
+        shell: false,
+        timeout: 500,
+        encoding: "utf8",
+        windowsVerbatimArguments: false,
+        windowsHide: true
+    });
+    // We only use the stdout as an IP, if it validates as an IP and we got a zero exit code
+    if (status || error) {
+        return null;
+    } else if (!status && typeof stdout === "string" && (0, _nodeNet().isIPv4)(stdout.trim())) {
+        return stdout.trim();
+    } else {
+        return null;
+    }
+}
+/** Determines the internal IP address by opening a socket, then checking the socket address against non-internal network interface assignments
+ * @throws If no address can be determined.
+ */ function getRouteIPAddress() {
+    // We check the IP address we get against the available network interfaces
+    // It's only an internal IP address if we have a matching address on an interface's IP assignment
+    let routeAddress = null;
+    try {
+        routeAddress = getRouteAddress();
+    } catch  {}
+    if (!routeAddress) {
+        return null;
+    }
+    const ifaces = (0, _nodeOs().networkInterfaces)();
+    for(const iface in ifaces){
+        const assignments = ifaces[iface];
+        for(let i = 0; assignments && i < assignments.length; i++){
+            const assignment = assignments[i];
+            // Only use IPv4 assigments that aren't internal
+            if (assignment.family === "IPv4" && !assignment.internal && assignment.address === routeAddress) return routeAddress;
+        }
+    }
+    return null;
+}
 function getIpAddress() {
-    return _internalIp().default.v4.sync() || "127.0.0.1";
+    return _internalIp().default.v4.sync() || getRouteIPAddress() || "127.0.0.1";
 }
 
 //# sourceMappingURL=ip.js.map

package/build/src/utils/ip.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/utils/ip.ts"],"sourcesContent":["import internalIp from 'internal-ip';\n\nexport function getIpAddress(): string {\n  return internalIp.v4.sync() || '127.0.0.1';\n}\n"],"names":["getIpAddress","internalIp","v4","sync"],"mappings":"AAAA;;;;+BAEgBA,cAAY;;aAAZA,YAAY;;;8DAFL,aAAa;;;;;;;;;;;AAE7B,SAASA,YAAY,GAAW;IACrC,OAAOC,WAAU,EAAA,QAAA,CAACC,EAAE,CAACC,IAAI,EAAE,IAAI,WAAW,CAAC;AAC7C,CAAC"}
+{"version":3,"sources":["../../../src/utils/ip.ts"],"sourcesContent":["import internalIp from 'internal-ip';\nimport { spawnSync } from 'node:child_process';\nimport { isIPv4 } from 'node:net';\nimport { networkInterfaces } from 'node:os';\n\n/** Gets a route address by opening a UDP socket to a publicly routed address.\n * @privateRemarks\n * This is wrapped in `spawnSync` since the original `getIpAddress` utility exported\n * in this module is used synchronosly. An appropriate timeout has been set and UDP\n * ports don't send a message when opened.\n * @throws if `spawnSync` fails\n */\nfunction getRouteAddress(): string | null {\n  const { error, status, stdout } = spawnSync(process.execPath, ['-'], {\n    // This should be the cheapest method to determine the default route\n    // By opening a socket to a publicly routed IP address, we let the default\n    // gateway handle this socket, which means the socket's address will be\n    // the prioritised route for public IP addresses.\n    // It might fall back to `\"0.0.0.0\"` when no network connection is established\n    input: `\n      var socket = require('dgram').createSocket({ type: 'udp4', reuseAddr: true });\n      socket.unref();\n      socket.connect(53, '1.1.1.1', function() {\n        var address = socket.address();\n        socket.close();\n        if (address && 'address' in address) {\n          process.stdout.write(address.address);\n          process.exit(0);\n        } else {\n          process.exit(1);\n        }\n      });\n    `,\n    shell: false,\n    timeout: 500,\n    encoding: 'utf8',\n    windowsVerbatimArguments: false,\n    windowsHide: true,\n  });\n  // We only use the stdout as an IP, if it validates as an IP and we got a zero exit code\n  if (status || error) {\n    return null;\n  } else if (!status && typeof stdout === 'string' && isIPv4(stdout.trim())) {\n    return stdout.trim();\n  } else {\n    return null;\n  }\n}\n\n/** Determines the internal IP address by opening a socket, then checking the socket address against non-internal network interface assignments\n * @throws If no address can be determined.\n */\nfunction getRouteIPAddress(): string | null {\n  // We check the IP address we get against the available network interfaces\n  // It's only an internal IP address if we have a matching address on an interface's IP assignment\n  let routeAddress: string | null = null;\n  try {\n    routeAddress = getRouteAddress();\n  } catch {}\n  if (!routeAddress) {\n    return null;\n  }\n  const ifaces = networkInterfaces();\n  for (const iface in ifaces) {\n    const assignments = ifaces[iface];\n    for (let i = 0; assignments && i < assignments.length; i++) {\n      const assignment = assignments[i];\n      // Only use IPv4 assigments that aren't internal\n      if (\n        assignment.family === 'IPv4' &&\n        !assignment.internal &&\n        assignment.address === routeAddress\n      )\n        return routeAddress;\n    }\n  }\n  return null;\n}\n\nexport function getIpAddress(): string {\n  return internalIp.v4.sync() || getRouteIPAddress() || '127.0.0.1';\n}\n"],"names":["getIpAddress","getRouteAddress","error","status","stdout","spawnSync","process","execPath","input","shell","timeout","encoding","windowsVerbatimArguments","windowsHide","isIPv4","trim","getRouteIPAddress","routeAddress","ifaces","networkInterfaces","iface","assignments","i","length","assignment","family","internal","address","internalIp","v4","sync"],"mappings":"AAAA;;;;+BA+EgBA,cAAY;;aAAZA,YAAY;;;8DA/EL,aAAa;;;;;;;yBACV,oBAAoB;;;;;;;yBACvB,UAAU;;;;;;;yBACC,SAAS;;;;;;;;;;;AAE3C;;;;;;CAMC,GACD,SAASC,eAAe,GAAkB;IACxC,MAAM,EAAEC,KAAK,CAAA,EAAEC,MAAM,CAAA,EAAEC,MAAM,CAAA,EAAE,GAAGC,IAAAA,iBAAS,EAAA,UAAA,EAACC,OAAO,CAACC,QAAQ,EAAE;QAAC,GAAG;KAAC,EAAE;QACnE,oEAAoE;QACpE,0EAA0E;QAC1E,uEAAuE;QACvE,iDAAiD;QACjD,8EAA8E;QAC9EC,KAAK,EAAE,CAAC;;;;;;;;;;;;;IAaR,CAAC;QACDC,KAAK,EAAE,KAAK;QACZC,OAAO,EAAE,GAAG;QACZC,QAAQ,EAAE,MAAM;QAChBC,wBAAwB,EAAE,KAAK;QAC/BC,WAAW,EAAE,IAAI;KAClB,CAAC,AAAC;IACH,wFAAwF;IACxF,IAAIV,MAAM,IAAID,KAAK,EAAE;QACnB,OAAO,IAAI,CAAC;IACd,OAAO,IAAI,CAACC,MAAM,IAAI,OAAOC,MAAM,KAAK,QAAQ,IAAIU,IAAAA,QAAM,EAAA,OAAA,EAACV,MAAM,CAACW,IAAI,EAAE,CAAC,EAAE;QACzE,OAAOX,MAAM,CAACW,IAAI,EAAE,CAAC;IACvB,OAAO;QACL,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED;;CAEC,GACD,SAASC,iBAAiB,GAAkB;IAC1C,0EAA0E;IAC1E,iGAAiG;IACjG,IAAIC,YAAY,GAAkB,IAAI,AAAC;IACvC,IAAI;QACFA,YAAY,GAAGhB,eAAe,EAAE,CAAC;IACnC,EAAE,OAAM,CAAC,CAAC;IACV,IAAI,CAACgB,YAAY,EAAE;QACjB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAMC,MAAM,GAAGC,IAAAA,OAAiB,EAAA,kBAAA,GAAE,AAAC;IACnC,IAAK,MAAMC,KAAK,IAAIF,MAAM,CAAE;QAC1B,MAAMG,WAAW,GAAGH,MAAM,CAACE,KAAK,CAAC,AAAC;QAClC,IAAK,IAAIE,CAAC,GAAG,CAAC,EAAED,WAAW,IAAIC,CAAC,GAAGD,WAAW,CAACE,MAAM,EAAED,CAAC,EAAE,CAAE;YAC1D,MAAME,UAAU,GAAGH,WAAW,CAACC,CAAC,CAAC,AAAC;YAClC,gDAAgD;YAChD,IACEE,UAAU,CAACC,MAAM,KAAK,MAAM,IAC5B,CAACD,UAAU,CAACE,QAAQ,IACpBF,UAAU,CAACG,OAAO,KAAKV,YAAY,EAEnC,OAAOA,YAAY,CAAC;QACxB,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAEM,SAASjB,YAAY,GAAW;IACrC,OAAO4B,WAAU,EAAA,QAAA,CAACC,EAAE,CAACC,IAAI,EAAE,IAAId,iBAAiB,EAAE,IAAI,WAAW,CAAC;AACpE,CAAC"}

package/build/src/utils/telemetry/clients/FetchClient.js

@@ -31,7 +31,7 @@ class FetchClient {
         this.headers = {
             accept: "application/json",
             "content-type": "application/json",
-            "user-agent": `expo-cli/${"0.19.13"}`,
+            "user-agent": `expo-cli/${"0.19.14"}`,
             authorization: "Basic " + _nodeBuffer().Buffer.from(`${target}:`).toString("base64")
         };
     }

package/build/src/utils/telemetry/utils/context.js

@@ -79,7 +79,7 @@ function createContext() {
         cpu: summarizeCpuInfo(),
         app: {
             name: "expo/cli",
-            version: "0.19.13"
+            version: "0.19.14"
         },
         ci: _ciInfo().isCI ? {
             name: _ciInfo().name,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/cli",
-  "version": "0.19.13",
+  "version": "0.19.14",
   "description": "The Expo CLI",
   "main": "build/bin/cli",
   "bin": {
@@ -39,6 +39,7 @@
   },
   "homepage": "https://github.com/expo/expo/tree/main/packages/@expo/cli",
   "dependencies": {
+    "@0no-co/graphql.web": "^1.0.8",
     "@babel/runtime": "^7.20.0",
     "@expo/code-signing-certificates": "^0.0.5",
     "@expo/config": "~10.0.2",
@@ -56,8 +57,8 @@
     "@expo/spawn-async": "^1.7.2",
     "@expo/xcpretty": "^4.3.0",
     "@react-native/dev-middleware": "0.76.1",
-    "@urql/core": "^2.3.6",
-    "@urql/exchange-retry": "0.3.0",
+    "@urql/core": "^5.0.6",
+    "@urql/exchange-retry": "^1.3.0",
     "accepts": "^1.3.8",
     "arg": "^5.0.2",
     "better-opn": "~3.0.2",
@@ -76,8 +77,6 @@
     "fs-extra": "~8.1.0",
     "getenv": "^1.0.0",
     "glob": "^10.4.2",
-    "graphql": "^15.8.0",
-    "graphql-tag": "^2.10.1",
     "internal-ip": "^4.3.0",
     "is-docker": "^2.0.0",
     "is-wsl": "^2.1.1",
@@ -168,5 +167,5 @@
     "tree-kill": "^1.2.2",
     "tsd": "^0.28.1"
   },
-  "gitHead": "8f821c2fa246a5206d25b00ca83fd4cfe639e784"
+  "gitHead": "d97ae0839fa465cee14e13ca38f3c6c84c124d82"
 }