@vxrn/vite-plugin-metro 1.14.4 → 1.14.5

package/dist/cjs/plugins/expoManifestRequestHandlerPlugin.native.js

@@ -5,31 +5,37 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-    for (var name in all) __defProp(target, name, {
-      get: all[name],
-      enumerable: !0
-    });
-  },
-  __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var expoManifestRequestHandlerPlugin_exports = {};
 __export(expoManifestRequestHandlerPlugin_exports, {
   expoManifestRequestHandlerPlugin: () => expoManifestRequestHandlerPlugin
 });
 module.exports = __toCommonJS(expoManifestRequestHandlerPlugin_exports);
-var import_tls = require("tls"),
-  import_projectImport = require("../utils/projectImport.native.js"),
-  import_patchExpoGoManifestHandlerMiddlewareWithCustomMainModuleName = require("../utils/patchExpoGoManifestHandlerMiddlewareWithCustomMainModuleName.native.js");
+var import_tls = require("tls");
+var import_projectImport = require("../utils/projectImport.native.js");
+var import_patchExpoGoManifestHandlerMiddlewareWithCustomMainModuleName = require("../utils/patchExpoGoManifestHandlerMiddlewareWithCustomMainModuleName.native.js");
 function _instanceof(left, right) {
-  return right != null && typeof Symbol < "u" && right[Symbol.hasInstance] ? !!right[Symbol.hasInstance](left) : left instanceof right;
+  if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
+    return !!right[Symbol.hasInstance](left);
+  } else {
+    return left instanceof right;
+  }
 }
 function expoManifestRequestHandlerPlugin(options) {
   return {
@@ -39,27 +45,37 @@ function expoManifestRequestHandlerPlugin(options) {
     // },
     configureServer(server) {
       var {
-          root: projectRoot
-        } = server.config,
-        ExpoGoManifestHandlerMiddleware,
-        importPromise = (0, import_projectImport.projectImport)(projectRoot, "@expo/cli/build/src/start/server/middleware/ExpoGoManifestHandlerMiddleware.js").then(function (mod) {
-          ExpoGoManifestHandlerMiddleware = mod.default.ExpoGoManifestHandlerMiddleware;
-        });
+        root: projectRoot
+      } = server.config;
+      var ExpoGoManifestHandlerMiddleware;
+      var importPromise = (0, import_projectImport.projectImport)(projectRoot, "@expo/cli/build/src/start/server/middleware/ExpoGoManifestHandlerMiddleware.js").then(function (mod) {
+        ExpoGoManifestHandlerMiddleware = mod.default.ExpoGoManifestHandlerMiddleware;
+      });
       server.middlewares.use(async function (req, res, next) {
-        if (!req.headers["expo-platform"]) return next();
-        ExpoGoManifestHandlerMiddleware || (await importPromise);
-        var protocol = _instanceof(req.socket, import_tls.TLSSocket) && req.socket.encrypted ? "https" : "http",
-          manifestHandlerMiddleware = new ExpoGoManifestHandlerMiddleware(projectRoot, {
-            constructUrl: function (param) {
-              var {
-                  scheme,
-                  hostname
-                } = param,
-                host = req.headers["x-forwarded-host"] || req.headers.host || hostname;
-              return scheme ? `${protocol || scheme}://${host}` : host;
+        if (!req.headers["expo-platform"]) {
+          return next();
+        }
+        if (!ExpoGoManifestHandlerMiddleware) {
+          await importPromise;
+        }
+        var protocol = _instanceof(req.socket, import_tls.TLSSocket) && req.socket.encrypted ? "https" : "http";
+        var manifestHandlerMiddleware = new ExpoGoManifestHandlerMiddleware(projectRoot, {
+          constructUrl: function (param) {
+            var {
+              scheme,
+              hostname
+            } = param;
+            var host = req.headers["x-forwarded-host"] || req.headers.host || hostname;
+            if (!scheme) {
+              return host;
             }
-          });
-        options?.mainModuleName && (0, import_patchExpoGoManifestHandlerMiddlewareWithCustomMainModuleName.patchExpoGoManifestHandlerMiddlewareWithCustomMainModuleName)(manifestHandlerMiddleware, options.mainModuleName), manifestHandlerMiddleware.handleRequestAsync(req, res, next);
+            return `${protocol || scheme}://${host}`;
+          }
+        });
+        if (options === null || options === void 0 ? void 0 : options.mainModuleName) {
+          (0, import_patchExpoGoManifestHandlerMiddlewareWithCustomMainModuleName.patchExpoGoManifestHandlerMiddlewareWithCustomMainModuleName)(manifestHandlerMiddleware, options.mainModuleName);
+        }
+        manifestHandlerMiddleware.handleRequestAsync(req, res, next);
       });
     }
   };

package/dist/cjs/plugins/expoManifestRequestHandlerPlugin.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","expoManifestRequestHandlerPlugin_exports","__export","expoManifestRequestHandlerPlugin","module","exports","import_tls","require","import_projectImport","import_patchExpoGoManifestHandlerMiddlewareWithCustomMainModuleName","_instanceof","left","right","Symbol","hasInstance","options","name","configureServer","server","root","projectRoot","config","ExpoGoManifestHandlerMiddleware","importPromise","projectImport","then","default","middlewares","use","req","res","next","headers","protocol","socket","TLSSocket","encrypted","manifestHandlerMiddleware","constructUrl","param","scheme","hostname","host","mainModuleName","patchExpoGoManifestHandlerMiddlewareWithCustomMainModuleName","handleRequestAsync"],"sources":["../../../src/plugins/expoManifestRequestHandlerPlugin.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,wCAAA;AAAAC,QAAA,CAAAD,wCAAA;EAAAE,gCAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAT,YAA0B,CAAAK,wCAGI;AAevB,IAAAK,UAAS,GAAAC,OAAA;EAAAC,oBAEA,GAAAD,OAAA;EAAAE,mEAAA,GAAAF,OAAA;AAGd,SAAOG,YAAAC,IAAA,EAAAC,KAAA;EAAA,OACLA,KAAM,mBAAAC,MAAA,UAAAD,KAAA,CAAAC,MAAA,CAAAC,WAAA,MAAAF,KAAA,CAAAC,MAAA,CAAAC,WAAA,EAAAH,IAAA,IAAAA,IAAA,YAAAC,KAAA;AAAA;AAAA,SAAAT,iCAAAY,OAAA;EAAA;IAINC,IAAA,iCAAwB;IACtB;IAGA;IACA;IAAsBC,eACpBA,CAAAC,MAAA;MAAA,IACA;UAAAC,IAAA,EAAAC;QAAA,IAAAF,MAAA,CAAAG,MAAA;QAAAC,+BAAA;QAAAC,aAAA,OAAAf,oBAAA,CAAAgB,aAAA,EAAAJ,WAAA,oFAAAK,IAAA,WAAA5B,GAAA;UACAyB,+BAAc,GAAAzB,GAAA,CAAA6B,OAAA,CAAAJ,+BAAA;QACd;MACFJ,MAAC,CAAAS,WAAA,CAAAC,GAAA,iBAAAC,GAAA,EAAAC,GAAA,EAAAC,IAAA;QAED,KAAOF,GAAA,CAAAG,OAAA,CAAY,eAAW,CAAK,EACjC,OAASD,IAAA;QAEPT,+BAAY,WAAAC,aAAA;QAIT,IAAAU,QAAA,GAAAvB,WAAA,CAAAmB,GAAA,CAAAK,MACH,EAAA5B,UAAM,CAAA6B,SAAA,KAAAN,GAAA,CAAAK,MAAA,CAAAE,SAAA;UAAAC,yBAAA,OAAAf,+BAAA,CAAAF,WAAA;YAGRkB,YAAM,WAAAA,CACAC,KAAA;cAGJ;kBAAAC,MAAA;kBAAAC;gBAAA,IAAAF,KAAA;gBAAAG,IAAA,GAAAb,GAAA,CAAAG,OAAA,wBAAAH,GAAA,CAAAG,OAAA,CAAAU,IAAA,IAAAD,QAAA;cACA,OAAAD,MAAA,MAAAP,QAAA,IAAAO,MAAA,MAAAE,IAAA,KAAAA,IAAA;YAAA;UAGI;QAEA3B,OAAA,EAAA4B,cAOO,IAAG,IAAAlC,mEAHD,CAAAmC,4DAAA,EAAAP,yBAAA,EAAAtB,OAAA,CAAA4B,cAAA,GAAAN,yBAAA,CAAAQ,kBAAA,CAAAhB,GAAA,EAAAC,GAAA,EAAAC,IAAA;MAAA;IAIX;EACF;AAGF","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","expoManifestRequestHandlerPlugin_exports","__export","expoManifestRequestHandlerPlugin","module","exports","import_tls","require","import_projectImport","import_patchExpoGoManifestHandlerMiddlewareWithCustomMainModuleName","_instanceof","left","right","Symbol","hasInstance","options","name","configureServer","server","root","projectRoot","config","ExpoGoManifestHandlerMiddleware","importPromise","projectImport","then","default","middlewares","use","req","res","next","headers","protocol","socket","TLSSocket","encrypted","manifestHandlerMiddleware","constructUrl","param","scheme","hostname","host","mainModuleName","patchExpoGoManifestHandlerMiddlewareWithCustomMainModuleName","handleRequestAsync"],"sources":["../../../src/plugins/expoManifestRequestHandlerPlugin.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,wCAAA;AAAAC,QAAA,CAAAD,wCAAA;EAAAE,gCAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAT,YAA0B,CAAAK,wCAAA;AAG1B,IAAAK,UAAA,GAAAC,OAAA,MAA8B;AAC9B,IAAAC,oBAAA,GAAAD,OAAA;AAcO,IAAAE,mEAES,GAAAF,OAAA;AAGd,SAAOG,YAAAC,IAAA,EAAAC,KAAA;EAAA,IACLA,KAAM,mBAAAC,MAAA,oBAAAD,KAAA,CAAAC,MAAA,CAAAC,WAAA;IAAA,SAAAF,KAAA,CAAAC,MAAA,CAAAC,WAAA,EAAAH,IAAA;EAAA;IAAA,OAAAA,IAAA,YAAAC,KAAA;EAAA;AAKJ;AAGA,SAAAT,gCAAIA,CAAAY,OAAA;EACJ;IAAsBC,IACpB;IAAA;IACA;IAEA;IAA8CC,eAC/CA,CAAAC,MAAA;MAED;QAAAC,IAAO,EAAAC;MAAgB,IAAAF,MAAO,CAAKG,MAAK;MACtC,IAAAC,+BAAgC;MAE9B,IAAAC,aAAY,OAAAf,oBAAA,CAAAgB,aAAA,EAAAJ,WAAA,oFAAAK,IAAA,WAAA5B,GAAA;QACdyB,+BAAA,GAAAzB,GAAA,CAAA6B,OAAA,CAAAJ,+BAAA;MAGA;MACEJ,MAAA,CAAAS,WAAM,CAAAC,GAAA,iBAAAC,GAAA,EAAAC,GAAA,EAAAC,IAAA;QACR,KAAAF,GAAA,CAAAG,OAAA;UAEA,OAAMD,IAAA;QAGN;QAAsC,IACpC,CAAAT,+BAAA;UACA,MAAAC,aAAA;QAAA;QAGI,IAAAU,QAAM,GAAAvB,WAAW,CAAAmB,GAAA,CAAQK,MAAA,EAAA5B,UAAkB,CAAA6B,SAAS,KAAAN,GAAQ,CAAAK,MAAQ,CAAAE,SAAA;QAEpE,IAAAC,yBAAa,OAAAf,+BAAA,CAAAF,WAAA;UAIXkB,YAAA,EAAO,SAAAA,CAAAC,KAAA;YAAA,IACT;cAAAC,MAAA;cAAAC;YAAA,IAAAF,KAAA;YAEA,IAAAG,IAAA,GAAOb,GAAG,CAAAG,OAAA,mBAA4B,KAAAH,GAAA,CAAAG,OAAA,CAAAU,IAAA,IAAAD,QAAA;YACxC,KAAAD,MAAA;cACF,OAAAE,IAAA;YACF;YAEI,UAAST,QAAA,IAAAO,MAAgB,MAAAE,IAAA;UAC3B;QAAA;QACE,IACA3B,OAAA,KAAQ,QAAAA,OAAA,uBAAAA,OAAA,CAAA4B,cAAA;UACV,IAAAlC,mEAAA,CAAAmC,4DAAA,EAAAP,yBAAA,EAAAtB,OAAA,CAAA4B,cAAA;QACF;QAGAN,yBAAA,CAA0BQ,kBAAA,CAAmBhB,GAAA,EAAKC,GAAA,EAAKC,IAAI;MAC7D,CAAC;IACH;EACF;AACF","ignoreList":[]}

package/dist/cjs/plugins/metroPlugin.cjs

@@ -2,51 +2,54 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf,
-  __hasOwnProp = Object.prototype.hasOwnProperty;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-    for (var name in all) __defProp(target, name, {
-      get: all[name],
-      enumerable: !0
-    });
-  },
-  __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
-    value: mod,
-    enumerable: !0
-  }) : target, mod)),
-  __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-    value: !0
-  }), mod);
+// If the importer is in node compatibility mode or this is not an ESM
+// file that has been converted to a CommonJS file using a Babel-
+// compatible transform (i.e. "__esModule" has not been set), then set
+// "default" to the CommonJS "module.exports" for node compatibility.
+isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
+  value: mod,
+  enumerable: true
+}) : target, mod));
+var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
+  value: true
+}), mod);
 var metroPlugin_exports = {};
 __export(metroPlugin_exports, {
   metroPlugin: () => metroPlugin
 });
 module.exports = __toCommonJS(metroPlugin_exports);
-var import_node_fs = require("node:fs"),
-  import_promises = require("node:fs/promises"),
-  import_launch_editor = __toESM(require("launch-editor"), 1),
-  import_debug = require("@vxrn/debug"),
-  import_metroCacheManager = require("../utils/metroCacheManager.cjs"),
-  import_projectImport = require("../utils/projectImport.cjs"),
-  import_getMetroConfigFromViteConfig = require("../metro-config/getMetroConfigFromViteConfig.cjs"),
-  import_patchMetroServerWithViteConfigAndMetroPluginOptions = require("../metro-config/patchMetroServerWithViteConfigAndMetroPluginOptions.cjs");
+var import_node_fs = require("node:fs");
+var import_promises = require("node:fs/promises");
+var import_launch_editor = __toESM(require("launch-editor"), 1);
+var import_debug = require("@vxrn/debug");
+var import_metroCacheManager = require("../utils/metroCacheManager.cjs");
+var import_projectImport = require("../utils/projectImport.cjs");
+var import_getMetroConfigFromViteConfig = require("../metro-config/getMetroConfigFromViteConfig.cjs");
+var import_patchMetroServerWithViteConfigAndMetroPluginOptions = require("../metro-config/patchMetroServerWithViteConfigAndMetroPluginOptions.cjs");
 const {
   debug
 } = (0, import_debug.createDebugger)("vite-plugin-metro");
 function metroPlugin(options = {}) {
-  return globalThis.__viteMetroPluginOptions__ = options, {
+  globalThis["__viteMetroPluginOptions__"] = options;
+  return {
     name: "metro",
     // configResolved(config) {
     //   projectRoot = config.root
@@ -55,14 +58,14 @@ function metroPlugin(options = {}) {
       const {
         root: projectRoot
       } = server.config;
-      let metroReady = !1,
-        middleware,
-        metroServer,
-        hmrServer,
-        websocketEndpoints,
-        rnDevtoolsMiddleware,
-        metroPromise,
-        metroPromiseResolvers;
+      let metroReady = false;
+      let middleware;
+      let metroServer;
+      let hmrServer;
+      let websocketEndpoints;
+      let rnDevtoolsMiddleware;
+      let metroPromise;
+      let metroPromiseResolvers;
       metroPromise = new Promise((resolve, reject) => {
         metroPromiseResolvers = {
           resolve,
@@ -70,110 +73,165 @@ function metroPlugin(options = {}) {
         };
       });
       const startMetro = async () => {
-          const metroStartTime = Date.now();
-          try {
-            (0, import_metroCacheManager.checkAndClearMetroCacheFromVite)(server, server.config.logger);
-            const {
-                default: Metro
-              } = await (0, import_projectImport.projectImport)(projectRoot, "metro"),
-              {
-                default: MetroHmrServer
-              } = await (0, import_projectImport.projectImport)(projectRoot, "metro/private/HmrServer"),
-              {
-                default: createWebsocketServer
-              } = await (0, import_projectImport.projectImport)(projectRoot, "metro/private/lib/createWebsocketServer"),
-              {
-                createDevMiddleware
-              } = await (0, import_projectImport.projectImport)(projectRoot, "@react-native/dev-middleware"),
-              config = await (0, import_getMetroConfigFromViteConfig.getMetroConfigFromViteConfig)(server.config, options),
-              metroResult = await Metro.createConnectMiddleware(config, {
-                // Force enable file watching, even on CI.
-                // This is needed for HMR tests to work on CI.
-                watch: !0
-              });
-            middleware = metroResult.middleware, metroServer = metroResult.metroServer, (0, import_patchMetroServerWithViteConfigAndMetroPluginOptions.patchMetroServerWithViteConfigAndMetroPluginOptions)(metroServer, server.config, options), hmrServer = new MetroHmrServer(metroServer.getBundler(), metroServer.getCreateModuleId(), config);
-            const reactNativeDevToolsUrl = `http://${typeof server.config.server.host == "boolean" ? "localhost" : server.config.server.host}:${server.config.server.port}`,
-              devMiddleware = createDevMiddleware({
-                serverBaseUrl: reactNativeDevToolsUrl,
-                logger: console
-              });
-            rnDevtoolsMiddleware = devMiddleware.middleware, websocketEndpoints = {
-              "/hot": createWebsocketServer({
-                websocketServer: hmrServer
-              }),
-              ...devMiddleware.websocketEndpoints
-            }, server.httpServer?.on("upgrade", (request, socket, head) => {
-              const pathname = new URL(request.url, `http://${request.headers.host}`).pathname,
-                endpoint = websocketEndpoints[pathname];
-              endpoint && endpoint.handleUpgrade(request, socket, head, ws => {
+        const metroStartTime = Date.now();
+        try {
+          (0, import_metroCacheManager.checkAndClearMetroCacheFromVite)(server, server.config.logger);
+          const {
+            default: Metro
+          } = await (0, import_projectImport.projectImport)(projectRoot, "metro");
+          const {
+            default: MetroHmrServer
+          } = await (0, import_projectImport.projectImport)(projectRoot, "metro/private/HmrServer");
+          const {
+            default: createWebsocketServer
+          } = await (0, import_projectImport.projectImport)(projectRoot, "metro/private/lib/createWebsocketServer");
+          const {
+            createDevMiddleware
+          } = await (0, import_projectImport.projectImport)(projectRoot, "@react-native/dev-middleware");
+          const config = await (0, import_getMetroConfigFromViteConfig.getMetroConfigFromViteConfig)(server.config, options);
+          const metroResult = await Metro.createConnectMiddleware(config, {
+            // Force enable file watching, even on CI.
+            // This is needed for HMR tests to work on CI.
+            watch: true
+          });
+          middleware = metroResult.middleware;
+          metroServer = metroResult.metroServer;
+          (0, import_patchMetroServerWithViteConfigAndMetroPluginOptions.patchMetroServerWithViteConfigAndMetroPluginOptions)(metroServer, server.config, options);
+          hmrServer = new MetroHmrServer(metroServer.getBundler(), metroServer.getCreateModuleId(), config);
+          const reactNativeDevToolsUrl = `http://${typeof server.config.server.host === "boolean" ? "localhost" : server.config.server.host}:${server.config.server.port}`;
+          const devMiddleware = createDevMiddleware({
+            serverBaseUrl: reactNativeDevToolsUrl,
+            logger: console
+          });
+          rnDevtoolsMiddleware = devMiddleware.middleware;
+          websocketEndpoints = {
+            "/hot": createWebsocketServer({
+              websocketServer: hmrServer
+            }),
+            ...devMiddleware.websocketEndpoints
+          };
+          server.httpServer?.on("upgrade", (request, socket, head) => {
+            const pathname = new URL(request.url, `http://${request.headers.host}`).pathname;
+            const endpoint = websocketEndpoints[pathname];
+            if (endpoint) {
+              endpoint.handleUpgrade(request, socket, head, ws => {
                 endpoint.emit("connection", ws, request);
               });
-            }), server.middlewares.use(rnDevtoolsMiddleware), metroReady = !0;
-            const metroElapsed = Date.now() - metroStartTime;
-            debug?.(`Metro bundler ready (${metroElapsed}ms)`), metroPromiseResolvers.resolve();
-          } catch (err) {
-            throw debug?.(`Error during Metro initialization: ${err}`), metroPromiseResolvers.reject(err), err;
-          }
-        },
-        isLazyStartup = options.startup === "lazy";
-      let metroStarting = !1;
-      const ensureMetroStarted = () => {
-        metroStarting || metroReady || (metroStarting = !0, debug?.("Starting Metro on-demand (lazy startup)"), startMetro().catch(err => {
-          debug?.(`Failed to start Metro: ${err}`);
-        }));
+            }
+          });
+          server.middlewares.use(rnDevtoolsMiddleware);
+          metroReady = true;
+          const metroElapsed = Date.now() - metroStartTime;
+          debug?.(`Metro bundler ready (${metroElapsed}ms)`);
+          metroPromiseResolvers.resolve();
+        } catch (err) {
+          debug?.(`Error during Metro initialization: ${err}`);
+          metroPromiseResolvers.reject(err);
+          throw err;
+        }
       };
-      if (isLazyStartup) debug?.("Metro lazy startup enabled - will start on first native request");else if (server.httpServer) server.httpServer.listening ? startMetro().catch(err => {
-        debug?.(`Failed to start Metro: ${err}`);
-      }) : server.httpServer.on("listening", () => {
+      const isLazyStartup = options.startup === "lazy";
+      let metroStarting = false;
+      const ensureMetroStarted = () => {
+        if (metroStarting || metroReady) return;
+        metroStarting = true;
+        debug?.("Starting Metro on-demand (lazy startup)");
         startMetro().catch(err => {
           debug?.(`Failed to start Metro: ${err}`);
         });
-      });else {
-        const waitForServer = () => {
-          server.httpServer ? server.httpServer.listening ? startMetro().catch(err => {
-            debug?.(`Failed to start Metro: ${err}`);
-          }) : server.httpServer.on("listening", () => {
+      };
+      if (!isLazyStartup) {
+        if (server.httpServer) {
+          if (server.httpServer.listening) {
             startMetro().catch(err => {
               debug?.(`Failed to start Metro: ${err}`);
             });
-          }) : setTimeout(waitForServer, 10);
-        };
-        waitForServer();
+          } else {
+            server.httpServer.on("listening", () => {
+              startMetro().catch(err => {
+                debug?.(`Failed to start Metro: ${err}`);
+              });
+            });
+          }
+        } else {
+          const waitForServer = () => {
+            if (server.httpServer) {
+              if (server.httpServer.listening) {
+                startMetro().catch(err => {
+                  debug?.(`Failed to start Metro: ${err}`);
+                });
+              } else {
+                server.httpServer.on("listening", () => {
+                  startMetro().catch(err => {
+                    debug?.(`Failed to start Metro: ${err}`);
+                  });
+                });
+              }
+            } else {
+              setTimeout(waitForServer, 10);
+            }
+          };
+          waitForServer();
+        }
+      } else {
+        debug?.("Metro lazy startup enabled - will start on first native request");
       }
       server.middlewares.use(async (req, res, next) => {
         const isNativeRequest = req.headers["user-agent"]?.includes("CFNetwork/") || req.headers["user-agent"]?.includes("okhttp/");
-        if (isLazyStartup && !metroReady && (req.url?.includes(".bundle") || req.url === "/status" && isNativeRequest) && ensureMetroStarted(), req.url === "/status" && isNativeRequest) {
-          res.statusCode = 200, res.end("packager-status:running");
+        if (isLazyStartup && !metroReady) {
+          if (req.url?.includes(".bundle") || req.url === "/status" && isNativeRequest) {
+            ensureMetroStarted();
+          }
+        }
+        if (req.url === "/status" && isNativeRequest) {
+          res.statusCode = 200;
+          res.end("packager-status:running");
           return;
         }
-        if (req.url?.includes(".bundle") && !metroReady && (await metroPromise), middleware) try {
-          if (req.url?.includes(".bundle")) {
-            const VITE_METRO_DEBUG_BUNDLE = process.env.VITE_METRO_DEBUG_BUNDLE;
-            if (VITE_METRO_DEBUG_BUNDLE && (0, import_node_fs.existsSync)(VITE_METRO_DEBUG_BUNDLE)) {
-              debug?.(`serving debug bundle from ${VITE_METRO_DEBUG_BUNDLE}`);
-              const content = await (0, import_promises.readFile)(VITE_METRO_DEBUG_BUNDLE, "utf-8");
-              res.setHeader("Content-Type", "application/javascript"), res.end(content);
+        if (req.url?.includes(".bundle") && !metroReady) {
+          await metroPromise;
+        }
+        if (middleware) {
+          try {
+            if (req.url?.includes(".bundle")) {
+              const VITE_METRO_DEBUG_BUNDLE = process.env.VITE_METRO_DEBUG_BUNDLE;
+              if (VITE_METRO_DEBUG_BUNDLE) {
+                if ((0, import_node_fs.existsSync)(VITE_METRO_DEBUG_BUNDLE)) {
+                  debug?.(`serving debug bundle from ${VITE_METRO_DEBUG_BUNDLE}`);
+                  const content = await (0, import_promises.readFile)(VITE_METRO_DEBUG_BUNDLE, "utf-8");
+                  res.setHeader("Content-Type", "application/javascript");
+                  res.end(content);
+                  return;
+                }
+              }
+            }
+            if (req.url === "/open-stack-frame" && req.method === "POST") {
+              let body = "";
+              req.on("data", chunk => {
+                body += chunk.toString();
+              });
+              req.on("end", () => {
+                try {
+                  const frame = JSON.parse(body);
+                  (0, import_launch_editor.default)(frame.file);
+                  res.statusCode = 200;
+                  res.end("Stack frame opened in editor");
+                } catch (e) {
+                  debug?.(`Failed to parse stack frame: ${e}`);
+                  res.statusCode = 400;
+                  return res.end("Invalid stack frame JSON");
+                }
+              });
               return;
             }
+            await middleware(req, res, next);
+          } catch (error) {
+            debug?.(`Metro middleware error: ${error}`);
+            next();
           }
-          if (req.url === "/open-stack-frame" && req.method === "POST") {
-            let body = "";
-            req.on("data", chunk => {
-              body += chunk.toString();
-            }), req.on("end", () => {
-              try {
-                const frame = JSON.parse(body);
-                (0, import_launch_editor.default)(frame.file), res.statusCode = 200, res.end("Stack frame opened in editor");
-              } catch (e) {
-                return debug?.(`Failed to parse stack frame: ${e}`), res.statusCode = 400, res.end("Invalid stack frame JSON");
-              }
-            });
-            return;
-          }
-          await middleware(req, res, next);
-        } catch (error) {
-          debug?.(`Metro middleware error: ${error}`), next();
-        } else next();
+        } else {
+          next();
+        }
       });
     }
   };