@expo/cli 0.22.13 → 0.22.14

package/build/bin/cli

@@ -121,7 +121,7 @@ const args = (0, _arg().default)({
 });
 if (args["--version"]) {
     // Version is added in the build script.
-    console.log("0.22.13");
+    console.log("0.22.14");
     process.exit(0);
 }
 if (args["--non-interactive"]) {

package/build/src/start/server/AsyncWsTunnel.js

@@ -20,9 +20,30 @@ function _chalk() {
     };
     return data;
 }
-function _nodeCrypto() {
-    const data = require("node:crypto");
-    _nodeCrypto = function() {
+function _nodeFs() {
+    const data = /*#__PURE__*/ _interopRequireWildcard(require("node:fs"));
+    _nodeFs = function() {
+        return data;
+    };
+    return data;
+}
+function _nodeOs() {
+    const data = require("node:os");
+    _nodeOs = function() {
+        return data;
+    };
+    return data;
+}
+function _nodePath() {
+    const data = /*#__PURE__*/ _interopRequireWildcard(require("node:path"));
+    _nodePath = function() {
+        return data;
+    };
+    return data;
+}
+function _tempDir() {
+    const data = /*#__PURE__*/ _interopRequireDefault(require("temp-dir"));
+    _tempDir = function() {
         return data;
     };
     return data;
@@ -102,6 +123,22 @@ class AsyncWsTunnel {
         this.serverUrl = null;
     }
 }
+// Generate a base-36 string of 5 characters (from 32 bits of randomness)
+function randomStr() {
+    return (Math.random().toString(36) + "00000").slice(2, 7);
+}
+function getTunnelSession() {
+    let session = randomStr() + randomStr() + randomStr();
+    if ((0, _env.envIsWebcontainer)()) {
+        const leaseId = Buffer.from((0, _nodeOs().hostname)()).toString("base64url");
+        const leaseFile = _nodePath().join(_tempDir().default, `_ws_tunnel_lease_${leaseId}`);
+        try {
+            session = _nodeFs().readFileSync(leaseFile, "utf8").trim() || session;
+            _nodeFs().writeFileSync(leaseFile, session, "utf8");
+        } catch  {}
+    }
+    return session;
+}
 function getTunnelOptions() {
     const userDefinedSubdomain = _env.env.EXPO_TUNNEL_SUBDOMAIN;
     if (userDefinedSubdomain && typeof userDefinedSubdomain === "string") {
@@ -109,16 +146,12 @@ function getTunnelOptions() {
         return {
             session: userDefinedSubdomain
         };
+    } else {
+        const session = getTunnelSession();
+        return {
+            session
+        };
     }
-    let session;
-    do {
-        // TODO(cedric): replace this with non-random data generated from server to manage and prevent overlapping sessions
-        session = (0, _nodeCrypto().randomBytes)(12).toString("base64url");
-    }while (!/^[A-Za-z0-9]/.test(session));
-    debug("Session:", session);
-    return {
-        session
-    };
 }
 
 //# sourceMappingURL=AsyncWsTunnel.js.map

package/build/src/start/server/AsyncWsTunnel.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/start/server/AsyncWsTunnel.ts"],"sourcesContent":["import * as tunnel from '@expo/ws-tunnel';\nimport chalk from 'chalk';\nimport { randomBytes } from 'node:crypto';\n\nimport * as Log from '../../log';\nimport { env } from '../../utils/env';\nimport { CommandError } from '../../utils/errors';\n\nconst debug = require('debug')('expo:start:server:ws-tunnel') as typeof console.log;\n\nexport class AsyncWsTunnel {\n  /** Info about the currently running instance of tunnel. */\n  private serverUrl: string | null = null;\n\n  constructor(_projectRoot: string, port: number) {\n    if (port !== 8081) {\n      throw new CommandError(\n        'WS_TUNNEL_PORT',\n        `WS-tunnel only supports tunneling over port 8081, attempted to use port ${port}`\n      );\n    }\n  }\n\n  public getActiveUrl(): string | null {\n    return this.serverUrl;\n  }\n\n  async startAsync(): Promise<void> {\n    this.serverUrl = await tunnel.startAsync({\n      ...getTunnelOptions(),\n      onStatusChange(status) {\n        if (status === 'disconnected') {\n          Log.error(\n            chalk.red(\n              'Tunnel connection has been closed. This is often related to intermittent connection problems with the ws proxy servers. Restart the dev server to try connecting again.'\n            ) + chalk.gray('\\nCheck the Expo status page for outages: https://status.expo.dev/')\n          );\n        }\n      },\n    });\n\n    debug('Tunnel URL:', this.serverUrl);\n  }\n\n  async stopAsync(): Promise<void> {\n    debug('Stopping Tunnel');\n    await tunnel.stopAsync();\n    this.serverUrl = null;\n  }\n}\n\nfunction getTunnelOptions() {\n  const userDefinedSubdomain = env.EXPO_TUNNEL_SUBDOMAIN;\n  if (userDefinedSubdomain && typeof userDefinedSubdomain === 'string') {\n    debug('Session:', userDefinedSubdomain);\n    return { session: userDefinedSubdomain };\n  }\n\n  let session: string;\n  do {\n    // TODO(cedric): replace this with non-random data generated from server to manage and prevent overlapping sessions\n    session = randomBytes(12).toString('base64url');\n  } while (!/^[A-Za-z0-9]/.test(session));\n  debug('Session:', session);\n  return { session };\n}\n"],"names":["AsyncWsTunnel","debug","require","serverUrl","constructor","_projectRoot","port","CommandError","getActiveUrl","startAsync","tunnel","getTunnelOptions","onStatusChange","status","Log","error","chalk","red","gray","stopAsync","userDefinedSubdomain","env","EXPO_TUNNEL_SUBDOMAIN","session","randomBytes","toString","test"],"mappings":"AAAA;;;;+BAUaA,eAAa;;aAAbA,aAAa;;;+DAVF,iBAAiB;;;;;;;8DACvB,OAAO;;;;;;;yBACG,aAAa;;;;;;2DAEpB,WAAW;qBACZ,iBAAiB;wBACR,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEjD,MAAMC,KAAK,GAAGC,OAAO,CAAC,OAAO,CAAC,CAAC,6BAA6B,CAAC,AAAsB,AAAC;AAE7E,MAAMF,aAAa;IACxB,yDAAyD,GACzD,AAAQG,SAAS,GAAkB,IAAI,CAAC;IAExCC,YAAYC,YAAoB,EAAEC,IAAY,CAAE;QAC9C,IAAIA,IAAI,KAAK,IAAI,EAAE;YACjB,MAAM,IAAIC,OAAY,aAAA,CACpB,gBAAgB,EAChB,CAAC,wEAAwE,EAAED,IAAI,CAAC,CAAC,CAClF,CAAC;QACJ,CAAC;IACH;IAEOE,YAAY,GAAkB;QACnC,OAAO,IAAI,CAACL,SAAS,CAAC;IACxB;UAEMM,UAAU,GAAkB;QAChC,IAAI,CAACN,SAAS,GAAG,MAAMO,SAAM,EAAA,CAACD,UAAU,CAAC;YACvC,GAAGE,gBAAgB,EAAE;YACrBC,cAAc,EAACC,MAAM,EAAE;gBACrB,IAAIA,MAAM,KAAK,cAAc,EAAE;oBAC7BC,IAAG,CAACC,KAAK,CACPC,MAAK,EAAA,QAAA,CAACC,GAAG,CACP,yKAAyK,CAC1K,GAAGD,MAAK,EAAA,QAAA,CAACE,IAAI,CAAC,oEAAoE,CAAC,CACrF,CAAC;gBACJ,CAAC;YACH,CAAC;SACF,CAAC,CAAC;QAEHjB,KAAK,CAAC,aAAa,EAAE,IAAI,CAACE,SAAS,CAAC,CAAC;IACvC;UAEMgB,SAAS,GAAkB;QAC/BlB,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACzB,MAAMS,SAAM,EAAA,CAACS,SAAS,EAAE,CAAC;QACzB,IAAI,CAAChB,SAAS,GAAG,IAAI,CAAC;IACxB;CACD;AAED,SAASQ,gBAAgB,GAAG;IAC1B,MAAMS,oBAAoB,GAAGC,IAAG,IAAA,CAACC,qBAAqB,AAAC;IACvD,IAAIF,oBAAoB,IAAI,OAAOA,oBAAoB,KAAK,QAAQ,EAAE;QACpEnB,KAAK,CAAC,UAAU,EAAEmB,oBAAoB,CAAC,CAAC;QACxC,OAAO;YAAEG,OAAO,EAAEH,oBAAoB;SAAE,CAAC;IAC3C,CAAC;IAED,IAAIG,OAAO,AAAQ,AAAC;IACpB,GAAG;QACD,mHAAmH;QACnHA,OAAO,GAAGC,IAAAA,WAAW,EAAA,YAAA,EAAC,EAAE,CAAC,CAACC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAClD,QAAS,CAAC,eAAeC,IAAI,CAACH,OAAO,CAAC,EAAE;IACxCtB,KAAK,CAAC,UAAU,EAAEsB,OAAO,CAAC,CAAC;IAC3B,OAAO;QAAEA,OAAO;KAAE,CAAC;AACrB,CAAC"}
+{"version":3,"sources":["../../../../src/start/server/AsyncWsTunnel.ts"],"sourcesContent":["import * as tunnel from '@expo/ws-tunnel';\nimport chalk from 'chalk';\nimport * as fs from 'node:fs';\nimport { hostname } from 'node:os';\nimport * as path from 'node:path';\nimport tempDir from 'temp-dir';\n\nimport * as Log from '../../log';\nimport { env, envIsWebcontainer } from '../../utils/env';\nimport { CommandError } from '../../utils/errors';\n\nconst debug = require('debug')('expo:start:server:ws-tunnel') as typeof console.log;\n\nexport class AsyncWsTunnel {\n  /** Info about the currently running instance of tunnel. */\n  private serverUrl: string | null = null;\n\n  constructor(_projectRoot: string, port: number) {\n    if (port !== 8081) {\n      throw new CommandError(\n        'WS_TUNNEL_PORT',\n        `WS-tunnel only supports tunneling over port 8081, attempted to use port ${port}`\n      );\n    }\n  }\n\n  public getActiveUrl(): string | null {\n    return this.serverUrl;\n  }\n\n  async startAsync(): Promise<void> {\n    this.serverUrl = await tunnel.startAsync({\n      ...getTunnelOptions(),\n      onStatusChange(status) {\n        if (status === 'disconnected') {\n          Log.error(\n            chalk.red(\n              'Tunnel connection has been closed. This is often related to intermittent connection problems with the ws proxy servers. Restart the dev server to try connecting again.'\n            ) + chalk.gray('\\nCheck the Expo status page for outages: https://status.expo.dev/')\n          );\n        }\n      },\n    });\n\n    debug('Tunnel URL:', this.serverUrl);\n  }\n\n  async stopAsync(): Promise<void> {\n    debug('Stopping Tunnel');\n    await tunnel.stopAsync();\n    this.serverUrl = null;\n  }\n}\n\n// Generate a base-36 string of 5 characters (from 32 bits of randomness)\nfunction randomStr() {\n  return (Math.random().toString(36) + '00000').slice(2, 7);\n}\n\nfunction getTunnelSession(): string {\n  let session = randomStr() + randomStr() + randomStr();\n  if (envIsWebcontainer()) {\n    const leaseId = Buffer.from(hostname()).toString('base64url');\n    const leaseFile = path.join(tempDir, `_ws_tunnel_lease_${leaseId}`);\n    try {\n      session = fs.readFileSync(leaseFile, 'utf8').trim() || session;\n      fs.writeFileSync(leaseFile, session, 'utf8');\n    } catch {}\n  }\n  return session;\n}\n\nfunction getTunnelOptions() {\n  const userDefinedSubdomain = env.EXPO_TUNNEL_SUBDOMAIN;\n  if (userDefinedSubdomain && typeof userDefinedSubdomain === 'string') {\n    debug('Session:', userDefinedSubdomain);\n    return { session: userDefinedSubdomain };\n  } else {\n    const session = getTunnelSession();\n    return { session };\n  }\n}\n"],"names":["AsyncWsTunnel","debug","require","serverUrl","constructor","_projectRoot","port","CommandError","getActiveUrl","startAsync","tunnel","getTunnelOptions","onStatusChange","status","Log","error","chalk","red","gray","stopAsync","randomStr","Math","random","toString","slice","getTunnelSession","session","envIsWebcontainer","leaseId","Buffer","from","hostname","leaseFile","path","join","tempDir","fs","readFileSync","trim","writeFileSync","userDefinedSubdomain","env","EXPO_TUNNEL_SUBDOMAIN"],"mappings":"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"}

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.22.13"}`,
+            "user-agent": `expo-cli/${"0.22.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.22.13"
+            version: "0.22.14"
         },
         ci: _ciInfo().isCI ? {
             name: _ciInfo().name,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/cli",
-  "version": "0.22.13",
+  "version": "0.22.14",
   "description": "The Expo CLI",
   "main": "build/bin/cli",
   "bin": {
@@ -42,7 +42,7 @@
     "@0no-co/graphql.web": "^1.0.8",
     "@babel/runtime": "^7.20.0",
     "@expo/code-signing-certificates": "^0.0.5",
-    "@expo/config": "~10.0.8",
+    "@expo/config": "~10.0.9",
     "@expo/config-plugins": "~9.0.15",
     "@expo/devcert": "^1.1.2",
     "@expo/env": "~0.4.1",
@@ -168,5 +168,5 @@
     "tree-kill": "^1.2.2",
     "tsd": "^0.28.1"
   },
-  "gitHead": "9442f00874e0cd738030abae80e5bdef184a2581"
+  "gitHead": "265195eb66a106580b68aa960afbc6d1b1c7929b"
 }