@vxrn/vite-plugin-metro 1.2.33 → 1.2.35

package/dist/esm/plugins/metroPlugin.mjs

@@ -1,9 +1,13 @@
 import { existsSync } from "node:fs";
 import { readFile } from "node:fs/promises";
 import launchEditor from "launch-editor";
+import { createDebugger } from "@vxrn/debug";
 import { projectImport } from "../utils/projectImport.mjs";
 import { getMetroConfigFromViteConfig } from "../metro-config/getMetroConfigFromViteConfig.mjs";
 import { patchMetroServerWithViteConfigAndMetroPluginOptions } from "../metro-config/patchMetroServerWithViteConfigAndMetroPluginOptions.mjs";
+const {
+  debug
+} = createDebugger("vite-plugin-metro");
 function metroPlugin(options = {}) {
   return globalThis.__viteMetroPluginOptions__ = options, {
     name: "metro",
@@ -12,16 +16,24 @@ function metroPlugin(options = {}) {
     // },
     configureServer(server) {
       const {
-          root: projectRoot
-        } = server.config,
-        metroStartTime = Date.now();
+        root: projectRoot
+      } = server.config;
       let metroReady = !1,
         middleware,
         metroServer,
         hmrServer,
         websocketEndpoints,
-        rnDevtoolsMiddleware;
-      const metroPromise = (async () => {
+        rnDevtoolsMiddleware,
+        metroPromise,
+        metroPromiseResolvers;
+      metroPromise = new Promise((resolve, reject) => {
+        metroPromiseResolvers = {
+          resolve,
+          reject
+        };
+      });
+      const startMetro = async () => {
+        const metroStartTime = Date.now();
         try {
           const {
               default: Metro
@@ -53,28 +65,42 @@ function metroPlugin(options = {}) {
               websocketServer: hmrServer
             }),
             ...devMiddleware.websocketEndpoints
-          }, metroReady = !0;
+          }, server.httpServer?.on("upgrade", (request, socket, head) => {
+            const pathname = new URL(request.url, `http://${request.headers.host}`).pathname;
+            websocketEndpoints[pathname] && websocketEndpoints[pathname].handleUpgrade(request, socket, head, ws => {
+              websocketEndpoints[pathname].emit("connection", ws, request);
+            });
+          }), server.middlewares.use(rnDevtoolsMiddleware), metroReady = !0;
           const metroElapsed = Date.now() - metroStartTime;
-          console.info(`[metro] Metro bundler ready (${metroElapsed}ms)`);
+          debug?.(`Metro bundler ready (${metroElapsed}ms)`), metroPromiseResolvers.resolve();
         } catch (err) {
-          throw console.error("[metro] Error during Metro initialization:", err), err;
+          throw debug?.(`Error during Metro initialization: ${err}`), metroPromiseResolvers.reject(err), err;
         }
-      })();
-      metroPromise.catch(err => {
-        console.error("[metro] Failed to start Metro:", err);
-      }), metroPromise.then(() => {
-        server.httpServer?.on("upgrade", (request, socket, head) => {
-          const pathname = new URL(request.url, `http://${request.headers.host}`).pathname;
-          websocketEndpoints[pathname] && websocketEndpoints[pathname].handleUpgrade(request, socket, head, ws => {
-            websocketEndpoints[pathname].emit("connection", ws, request);
-          });
-        }), server.middlewares.use(rnDevtoolsMiddleware);
-      }), server.middlewares.use(async (req, res, next) => {
+      };
+      if (server.httpServer) server.httpServer.listening ? startMetro().catch(err => {
+        debug?.(`Failed to start Metro: ${err}`);
+      }) : server.httpServer.on("listening", () => {
+        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", () => {
+            startMetro().catch(err => {
+              debug?.(`Failed to start Metro: ${err}`);
+            });
+          }) : setTimeout(waitForServer, 10);
+        };
+        waitForServer();
+      }
+      server.middlewares.use(async (req, res, next) => {
         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 && existsSync(VITE_METRO_DEBUG_BUNDLE)) {
-              console.info("  !!! - serving debug bundle from", VITE_METRO_DEBUG_BUNDLE);
+              debug?.(`serving debug bundle from ${VITE_METRO_DEBUG_BUNDLE}`);
               const content = await readFile(VITE_METRO_DEBUG_BUNDLE, "utf-8");
               res.setHeader("Content-Type", "application/javascript"), res.end(content);
               return;
@@ -98,14 +124,14 @@ function metroPlugin(options = {}) {
                 const frame = JSON.parse(body);
                 launchEditor(frame.file), res.statusCode = 200, res.end("Stack frame opened in editor");
               } catch (e) {
-                return console.error("Failed to parse stack frame:", e), res.statusCode = 400, res.end("Invalid stack frame JSON");
+                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) {
-          console.error("Metro middleware error:", error), next();
+          debug?.(`Metro middleware error: ${error}`), next();
         } else next();
       });
     }

package/dist/esm/plugins/metroPlugin.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["existsSync","readFile","launchEditor","projectImport","getMetroConfigFromViteConfig","patchMetroServerWithViteConfigAndMetroPluginOptions","metroPlugin","options","globalThis","__viteMetroPluginOptions__","name","configureServer","server","root","projectRoot","config","metroStartTime","Date","now","metroReady","middleware","metroServer","hmrServer","websocketEndpoints","rnDevtoolsMiddleware","metroPromise","default","Metro","MetroHmrServer","createWebsocketServer","createDevMiddleware","metroResult","createConnectMiddleware","watch","getBundler","getCreateModuleId","reactNativeDevToolsUrl","host","port","devMiddleware","serverBaseUrl","logger","console","websocketServer","metroElapsed","info","err","error","catch","then","httpServer","on","request","socket","head","pathname","URL","url","headers","handleUpgrade","ws","emit","middlewares","use","req","res","next","includes","VITE_METRO_DEBUG_BUNDLE","process","env","content","setHeader","end","statusCode","method","body","chunk","toString","frame","JSON","parse","file","e"],"sources":["../../../src/plugins/metroPlugin.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,UAAA,QAAkB;AAC3B,SAASC,QAAA,QAAgB;AAEzB,OAAOC,YAAA,MAAkB;AAWzB,SAASC,aAAA,QAAqB;AAE9B,SAASC,4BAAA,QAAoC;AAC7C,SAASC,mDAAA,QAA2D;AAyC7D,SAASC,YAAYC,OAAA,GAA8B,CAAC,GAAiB;EAO1E,OAAAC,UAAA,CAAWC,0BAAA,GAAgCF,OAAA,EAEpC;IACLG,IAAA,EAAM;IAAA;IAAA;IAAA;IAKNC,gBAAgBC,MAAA,EAAQ;MACtB,MAAM;UAAEC,IAAA,EAAMC;QAAY,IAAIF,MAAA,CAAOG,MAAA;QAG/BC,cAAA,GAAiBC,IAAA,CAAKC,GAAA,CAAI;MAChC,IAAIC,UAAA,GAAa;QAIbC,UAAA;QACAC,WAAA;QACAC,SAAA;QACAC,kBAAA;QACAC,oBAAA;MAEJ,MAAMC,YAAA,IAAgB,YAAY;QAChC,IAAI;UAEF,MAAM;cAAEC,OAAA,EAASC;YAAM,IAAI,MAAMxB,aAAA,CAE9BW,WAAA,EAAa,OAAO;YACjB;cAAEY,OAAA,EAASE;YAAe,IAAI,MAAMzB,aAAA,CAEvCW,WAAA,EAAa,yBAAyB;YACnC;cAAEY,OAAA,EAASG;YAAsB,IAAI,MAAM1B,aAAA,CAE9CW,WAAA,EAAa,yCAAyC;YACnD;cAAEgB;YAAoB,IAAI,MAAM3B,aAAA,CAEnCW,WAAA,EAAa,8BAA8B;YAExCC,MAAA,GAAS,MAAMX,4BAAA,CAA6BQ,MAAA,CAAOG,MAAA,EAAQR,OAAO;YAGlEwB,WAAA,GAAc,MAAMJ,KAAA,CAAMK,uBAAA,CAAwBjB,MAAA,EAAQ;cAAA;cAAA;cAG9DkB,KAAA,EAAO;YACT,CAAC;UAEHb,UAAA,GAAaW,WAAA,CAAYX,UAAA,EACzBC,WAAA,GAAcU,WAAA,CAAYV,WAAA,EAE1BhB,mDAAA,CAAoDgB,WAAA,EAAaT,MAAA,CAAOG,MAAA,EAAQR,OAAO,GAEvFe,SAAA,GAAY,IAAIM,cAAA,CACdP,WAAA,CAAYa,UAAA,CAAW,GACvBb,WAAA,CAAYc,iBAAA,CAAkB,GAC9BpB,MACF;UAEA,MAAMqB,sBAAA,GAAyB,UAAU,OAAOxB,MAAA,CAAOG,MAAA,CAAOH,MAAA,CAAOyB,IAAA,IAAS,YAAY,cAAczB,MAAA,CAAOG,MAAA,CAAOH,MAAA,CAAOyB,IAAI,IAAIzB,MAAA,CAAOG,MAAA,CAAOH,MAAA,CAAO0B,IAAI;YACxJC,aAAA,GAAgBT,mBAAA,CAAoB;cACxChB,WAAA;cACA0B,aAAA,EAAeJ,sBAAA;cACfK,MAAA,EAAQC;YACV,CAAC;UAEDlB,oBAAA,GAAuBe,aAAA,CAAcnB,UAAA,EACrCG,kBAAA,GAAqB;YACnB,QAAQM,qBAAA,CAAsB;cAC5Bc,eAAA,EAAiBrB;YACnB,CAAC;YACD,GAAGiB,aAAA,CAAchB;UACnB,GAEEJ,UAAA,GAAa;UACb,MAAMyB,YAAA,GAAe3B,IAAA,CAAKC,GAAA,CAAI,IAAIF,cAAA;UAClC0B,OAAA,CAAQG,IAAA,CAAK,gCAAgCD,YAAY,KAAK;QAChE,SAASE,GAAA,EAAK;UACZ,MAAAJ,OAAA,CAAQK,KAAA,CAAM,8CAA8CD,GAAG,GACzDA,GAAA;QACR;MACF,GAAG;MAGHrB,YAAA,CAAauB,KAAA,CAAOF,GAAA,IAAQ;QAC1BJ,OAAA,CAAQK,KAAA,CAAM,kCAAkCD,GAAG;MACrD,CAAC,GAGDrB,YAAA,CAAawB,IAAA,CAAK,MAAM;QACtBrC,MAAA,CAAOsC,UAAA,EAAYC,EAAA,CAAG,WAAW,CAACC,OAAA,EAASC,MAAA,EAAQC,IAAA,KAAS;UAC1D,MAAMC,QAAA,GAAW,IAAIC,GAAA,CAAIJ,OAAA,CAAQK,GAAA,EAAM,UAAUL,OAAA,CAAQM,OAAA,CAAQrB,IAAI,EAAE,EAAEkB,QAAA;UAErEhC,kBAAA,CAAmBgC,QAAQ,KAC7BhC,kBAAA,CAAmBgC,QAAQ,EAAEI,aAAA,CAAcP,OAAA,EAASC,MAAA,EAAQC,IAAA,EAAOM,EAAA,IAAO;YACxErC,kBAAA,CAAmBgC,QAAQ,EAAEM,IAAA,CAAK,cAAcD,EAAA,EAAIR,OAAO;UAC7D,CAAC;QAEL,CAAC,GAGDxC,MAAA,CAAOkD,WAAA,CAAYC,GAAA,CAAIvC,oBAAoB;MAC7C,CAAC,GAEDZ,MAAA,CAAOkD,WAAA,CAAYC,GAAA,CAAI,OAAOC,GAAA,EAAKC,GAAA,EAAKC,IAAA,KAAS;QAO/C,IALIF,GAAA,CAAIP,GAAA,EAAKU,QAAA,CAAS,SAAS,KAAK,CAAChD,UAAA,KACnC,MAAMM,YAAA,GAIJL,UAAA,EACF,IAAI;UAEF,IAAI4C,GAAA,CAAIP,GAAA,EAAKU,QAAA,CAAS,SAAS,GAAG;YAChC,MAAMC,uBAAA,GAA0BC,OAAA,CAAQC,GAAA,CAAIF,uBAAA;YAC5C,IAAIA,uBAAA,IACEpE,UAAA,CAAWoE,uBAAuB,GAAG;cACvC1B,OAAA,CAAQG,IAAA,CAAK,qCAAqCuB,uBAAuB;cACzE,MAAMG,OAAA,GAAU,MAAMtE,QAAA,CAASmE,uBAAA,EAAyB,OAAO;cAC/DH,GAAA,CAAIO,SAAA,CAAU,gBAAgB,wBAAwB,GACtDP,GAAA,CAAIQ,GAAA,CAAIF,OAAO;cACf;YACF;UAEJ;UAKA,IACEP,GAAA,CAAIP,GAAA,KAAQ;UAAA;UAAA;UAGXO,GAAA,CAAIN,OAAA,CAAQ,YAAY,GAAGS,QAAA,CAAS;UAAA,SAAsB,KACzDH,GAAA,CAAIN,OAAA,CAAQ,YAAY,GAAGS,QAAA,CAAS;UAAA,aAAuB,IAC7D;YACAF,GAAA,CAAIS,UAAA,GAAa,KACjBT,GAAA,CAAIQ,GAAA,CAAI,yBAAyB;YACjC;UACF;UAEA,IAAIT,GAAA,CAAIP,GAAA,KAAQ,uBAAuBO,GAAA,CAAIW,MAAA,KAAW,QAAQ;YAC5D,IAAIC,IAAA,GAAO;YAEXZ,GAAA,CAAIb,EAAA,CAAG,QAAS0B,KAAA,IAAU;cACxBD,IAAA,IAAQC,KAAA,CAAMC,QAAA,CAAS;YACzB,CAAC,GAEDd,GAAA,CAAIb,EAAA,CAAG,OAAO,MAAM;cAClB,IAAI;gBACF,MAAM4B,KAAA,GAAQC,IAAA,CAAKC,KAAA,CAAML,IAAI;gBAG7B1E,YAAA,CAAa6E,KAAA,CAAMG,IAAI,GACvBjB,GAAA,CAAIS,UAAA,GAAa,KACjBT,GAAA,CAAIQ,GAAA,CAAI,8BAA8B;cACxC,SAASU,CAAA,EAAG;gBACV,OAAAzC,OAAA,CAAQK,KAAA,CAAM,gCAAgCoC,CAAC,GAC/ClB,GAAA,CAAIS,UAAA,GAAa,KACVT,GAAA,CAAIQ,GAAA,CAAI,0BAA0B;cAC3C;YACF,CAAC;YAED;UACF;UAGA,MAAOrD,UAAA,CAAmB4C,GAAA,EAAKC,GAAA,EAAKC,IAAI;QAC1C,SAASnB,KAAA,EAAO;UAEdL,OAAA,CAAQK,KAAA,CAAM,2BAA2BA,KAAK,GAC9CmB,IAAA,CAAK;QACP,OAGAA,IAAA,CAAK;MAET,CAAC;IACH;EACF;AACF","ignoreList":[]}
+{"version":3,"names":["existsSync","readFile","launchEditor","createDebugger","projectImport","getMetroConfigFromViteConfig","patchMetroServerWithViteConfigAndMetroPluginOptions","debug","metroPlugin","options","globalThis","__viteMetroPluginOptions__","name","configureServer","server","root","projectRoot","config","metroReady","middleware","metroServer","hmrServer","websocketEndpoints","rnDevtoolsMiddleware","metroPromise","metroPromiseResolvers","Promise","resolve","reject","startMetro","metroStartTime","Date","now","default","Metro","MetroHmrServer","createWebsocketServer","createDevMiddleware","metroResult","createConnectMiddleware","watch","getBundler","getCreateModuleId","reactNativeDevToolsUrl","host","port","devMiddleware","serverBaseUrl","logger","console","websocketServer","httpServer","on","request","socket","head","pathname","URL","url","headers","handleUpgrade","ws","emit","middlewares","use","metroElapsed","err","listening","catch","waitForServer","setTimeout","req","res","next","includes","VITE_METRO_DEBUG_BUNDLE","process","env","content","setHeader","end","statusCode","method","body","chunk","toString","frame","JSON","parse","file","e","error"],"sources":["../../../src/plugins/metroPlugin.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/plugins/metroPlugin.native.js

@@ -1,9 +1,13 @@
 import { existsSync } from "fs";
 import { readFile } from "fs/promises";
 import launchEditor from "launch-editor";
+import { createDebugger } from "@vxrn/debug";
 import { projectImport } from "../utils/projectImport.native.js";
 import { getMetroConfigFromViteConfig } from "../metro-config/getMetroConfigFromViteConfig.native.js";
 import { patchMetroServerWithViteConfigAndMetroPluginOptions } from "../metro-config/patchMetroServerWithViteConfigAndMetroPluginOptions.native.js";
+var {
+  debug
+} = createDebugger("vite-plugin-metro");
 function metroPlugin() {
   var options = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
   return globalThis.__viteMetroPluginOptions__ = options, {
@@ -15,70 +19,92 @@ function metroPlugin() {
       var {
           root: projectRoot
         } = server.config,
-        metroStartTime = Date.now(),
         metroReady = !1,
         middleware,
         metroServer,
         hmrServer,
         websocketEndpoints,
         rnDevtoolsMiddleware,
-        metroPromise = async function () {
-          try {
-            var {
-                default: Metro
-              } = await projectImport(projectRoot, "metro"),
-              {
-                default: MetroHmrServer
-              } = await projectImport(projectRoot, "metro/private/HmrServer"),
-              {
-                default: createWebsocketServer
-              } = await projectImport(projectRoot, "metro/private/lib/createWebsocketServer"),
-              {
-                createDevMiddleware
-              } = await projectImport(projectRoot, "@react-native/dev-middleware"),
-              config = await 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, patchMetroServerWithViteConfigAndMetroPluginOptions(metroServer, server.config, options), hmrServer = new MetroHmrServer(metroServer.getBundler(), metroServer.getCreateModuleId(), config);
-            var reactNativeDevToolsUrl = `http://${typeof server.config.server.host == "boolean" ? "localhost" : server.config.server.host}:${server.config.server.port}`,
-              devMiddleware = createDevMiddleware({
-                projectRoot,
-                serverBaseUrl: reactNativeDevToolsUrl,
-                logger: console
-              });
-            rnDevtoolsMiddleware = devMiddleware.middleware, websocketEndpoints = {
-              "/hot": createWebsocketServer({
-                websocketServer: hmrServer
-              }),
-              ...devMiddleware.websocketEndpoints
-            }, metroReady = !0;
-            var metroElapsed = Date.now() - metroStartTime;
-            console.info(`[metro] Metro bundler ready (${metroElapsed}ms)`);
-          } catch (err) {
-            throw console.error("[metro] Error during Metro initialization:", err), err;
-          }
-        }();
-      metroPromise.catch(function (err) {
-        console.error("[metro] Failed to start Metro:", err);
-      }), metroPromise.then(function () {
-        var _server_httpServer;
-        (_server_httpServer = server.httpServer) === null || _server_httpServer === void 0 || _server_httpServer.on("upgrade", function (request, socket, head) {
-          var pathname = new URL(request.url, `http://${request.headers.host}`).pathname;
-          websocketEndpoints[pathname] && websocketEndpoints[pathname].handleUpgrade(request, socket, head, function (ws) {
-            websocketEndpoints[pathname].emit("connection", ws, request);
-          });
-        }), server.middlewares.use(rnDevtoolsMiddleware);
-      }), server.middlewares.use(async function (req, res, next) {
+        metroPromise,
+        metroPromiseResolvers;
+      metroPromise = new Promise(function (resolve, reject) {
+        metroPromiseResolvers = {
+          resolve,
+          reject
+        };
+      });
+      var startMetro = async function () {
+        var metroStartTime = Date.now();
+        try {
+          var _server_httpServer,
+            {
+              default: Metro
+            } = await projectImport(projectRoot, "metro"),
+            {
+              default: MetroHmrServer
+            } = await projectImport(projectRoot, "metro/private/HmrServer"),
+            {
+              default: createWebsocketServer
+            } = await projectImport(projectRoot, "metro/private/lib/createWebsocketServer"),
+            {
+              createDevMiddleware
+            } = await projectImport(projectRoot, "@react-native/dev-middleware"),
+            config = await 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, patchMetroServerWithViteConfigAndMetroPluginOptions(metroServer, server.config, options), hmrServer = new MetroHmrServer(metroServer.getBundler(), metroServer.getCreateModuleId(), config);
+          var reactNativeDevToolsUrl = `http://${typeof server.config.server.host == "boolean" ? "localhost" : server.config.server.host}:${server.config.server.port}`,
+            devMiddleware = createDevMiddleware({
+              projectRoot,
+              serverBaseUrl: reactNativeDevToolsUrl,
+              logger: console
+            });
+          rnDevtoolsMiddleware = devMiddleware.middleware, websocketEndpoints = {
+            "/hot": createWebsocketServer({
+              websocketServer: hmrServer
+            }),
+            ...devMiddleware.websocketEndpoints
+          }, (_server_httpServer = server.httpServer) === null || _server_httpServer === void 0 || _server_httpServer.on("upgrade", function (request, socket, head) {
+            var pathname = new URL(request.url, `http://${request.headers.host}`).pathname;
+            websocketEndpoints[pathname] && websocketEndpoints[pathname].handleUpgrade(request, socket, head, function (ws) {
+              websocketEndpoints[pathname].emit("connection", ws, request);
+            });
+          }), server.middlewares.use(rnDevtoolsMiddleware), metroReady = !0;
+          var 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;
+        }
+      };
+      if (server.httpServer) server.httpServer.listening ? startMetro().catch(function (err) {
+        debug?.(`Failed to start Metro: ${err}`);
+      }) : server.httpServer.on("listening", function () {
+        startMetro().catch(function (err) {
+          debug?.(`Failed to start Metro: ${err}`);
+        });
+      });else {
+        var waitForServer = function () {
+          server.httpServer ? server.httpServer.listening ? startMetro().catch(function (err) {
+            debug?.(`Failed to start Metro: ${err}`);
+          }) : server.httpServer.on("listening", function () {
+            startMetro().catch(function (err) {
+              debug?.(`Failed to start Metro: ${err}`);
+            });
+          }) : setTimeout(waitForServer, 10);
+        };
+        waitForServer();
+      }
+      server.middlewares.use(async function (req, res, next) {
         var _req_url;
         if (!((_req_url = req.url) === null || _req_url === void 0) && _req_url.includes(".bundle") && !metroReady && (await metroPromise), middleware) try {
           var _req_url1, _req_headers_useragent, _req_headers_useragent1;
           if (!((_req_url1 = req.url) === null || _req_url1 === void 0) && _req_url1.includes(".bundle")) {
             var VITE_METRO_DEBUG_BUNDLE = process.env.VITE_METRO_DEBUG_BUNDLE;
             if (VITE_METRO_DEBUG_BUNDLE && existsSync(VITE_METRO_DEBUG_BUNDLE)) {
-              console.info("  !!! - serving debug bundle from", VITE_METRO_DEBUG_BUNDLE);
+              debug?.(`serving debug bundle from ${VITE_METRO_DEBUG_BUNDLE}`);
               var content = await readFile(VITE_METRO_DEBUG_BUNDLE, "utf-8");
               res.setHeader("Content-Type", "application/javascript"), res.end(content);
               return;
@@ -97,14 +123,14 @@ function metroPlugin() {
                 var frame = JSON.parse(body);
                 launchEditor(frame.file), res.statusCode = 200, res.end("Stack frame opened in editor");
               } catch (e) {
-                return console.error("Failed to parse stack frame:", e), res.statusCode = 400, res.end("Invalid stack frame JSON");
+                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) {
-          console.error("Metro middleware error:", error), next();
+          debug?.(`Metro middleware error: ${error}`), next();
         } else next();
       });
     }

package/dist/esm/plugins/metroPlugin.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["existsSync","readFile","launchEditor","projectImport","getMetroConfigFromViteConfig","patchMetroServerWithViteConfigAndMetroPluginOptions","metroPlugin","options","arguments","length","globalThis","__viteMetroPluginOptions__","name","configureServer","server","root","projectRoot","config","metroStartTime","Date","now","metroReady","middleware","metroServer","hmrServer","websocketEndpoints","rnDevtoolsMiddleware","metroPromise","default","Metro","MetroHmrServer","createWebsocketServer","createDevMiddleware","metroResult","createConnectMiddleware","watch","getBundler","getCreateModuleId","reactNativeDevToolsUrl","host","port","devMiddleware","serverBaseUrl","logger","console","websocketServer","metroElapsed","info","err","error","catch","then","_server_httpServer","httpServer","on","request","socket","head","pathname","URL","url","headers","handleUpgrade","ws","emit","middlewares","use","req","res","next","_req_url","includes","_req_url1","_req_headers_useragent","_req_headers_useragent1","VITE_METRO_DEBUG_BUNDLE","process","env","content","setHeader","end","statusCode","method","body","chunk","toString","frame","JSON","parse","file","e"],"sources":["../../../src/plugins/metroPlugin.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["existsSync","readFile","launchEditor","createDebugger","projectImport","getMetroConfigFromViteConfig","patchMetroServerWithViteConfigAndMetroPluginOptions","debug","metroPlugin","options","arguments","length","globalThis","__viteMetroPluginOptions__","name","configureServer","server","root","projectRoot","config","metroReady","middleware","metroServer","hmrServer","websocketEndpoints","rnDevtoolsMiddleware","metroPromise","metroPromiseResolvers","Promise","resolve","reject","startMetro","metroStartTime","Date","now","_server_httpServer","default","Metro","MetroHmrServer","createWebsocketServer","createDevMiddleware","metroResult","createConnectMiddleware","watch","getBundler","getCreateModuleId","reactNativeDevToolsUrl","host","port","devMiddleware","serverBaseUrl","logger","console","websocketServer","httpServer","on","request","socket","head","pathname","URL","url","headers","handleUpgrade","ws","emit","middlewares","use","metroElapsed","err","listening","catch","waitForServer","setTimeout","req","res","next","_req_url","includes","_req_url1","_req_headers_useragent","_req_headers_useragent1","VITE_METRO_DEBUG_BUNDLE","process","env","content","setHeader","end","statusCode","method","body","chunk","toString","frame","JSON","parse","file","e","error"],"sources":["../../../src/plugins/metroPlugin.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vxrn/vite-plugin-metro",
-  "version": "1.2.33",
+  "version": "1.2.35",
   "sideEffects": false,
   "type": "module",
   "main": "dist/cjs",
@@ -60,7 +60,7 @@
     "@babel/core": "^7.28.5",
     "@babel/helper-plugin-utils": "^7.27.1",
     "@babel/types": "^7.28.5",
-    "@vxrn/debug": "1.2.33",
+    "@vxrn/debug": "1.2.35",
     "babel-preset-expo": "*",
     "launch-editor": "^2.10.0",
     "micromatch": "^4.0.8",

package/src/plugins/metroPlugin.ts

@@ -2,6 +2,9 @@ import { existsSync } from 'node:fs'
 import { readFile } from 'node:fs/promises'
 import type { PluginOption } from 'vite'
 import launchEditor from 'launch-editor'
+import { createDebugger } from '@vxrn/debug'
+
+const { debug } = createDebugger('vite-plugin-metro')
 
 // For Metro and Expo, we only import types here.
 // We use `projectImport` to dynamically import the actual modules
@@ -74,21 +77,28 @@ export function metroPlugin(options: MetroPluginOptions = {}): PluginOption {
     configureServer(server) {
       const { root: projectRoot } = server.config
 
-      // Track Metro startup separately from Vite
-      const metroStartTime = Date.now()
       let metroReady = false
 
-      // Start Metro in background WITHOUT blocking Vite server startup
-      // All imports and config are done inside metroPromise to avoid blocking
+      // Metro state - initialized after Vite server is listening
       let middleware: Awaited<ReturnType<typeof MetroT.createConnectMiddleware>>['middleware']
       let metroServer: Awaited<ReturnType<typeof MetroT.createConnectMiddleware>>['metroServer']
       let hmrServer: MetroHmrServerT
       let websocketEndpoints: Record<string, ReturnType<typeof createWebsocketServerT>>
       let rnDevtoolsMiddleware: ReturnType<typeof createDevMiddlewareT>['middleware']
 
-      const metroPromise = (async () => {
+      let metroPromise: Promise<void>
+      let metroPromiseResolvers: { resolve: () => void; reject: (err: Error) => void }
+
+      // Create a promise that will be resolved when Metro is ready
+      // This is used by the middleware to wait for Metro on bundle requests
+      metroPromise = new Promise((resolve, reject) => {
+        metroPromiseResolvers = { resolve, reject }
+      })
+
+      const startMetro = async () => {
+        const metroStartTime = Date.now()
         try {
-          // Import Metro modules lazily to avoid blocking Vite startup
+          // Import Metro modules lazily - only after Vite server is listening
           const { default: Metro } = await projectImport<{
             default: typeof MetroT
           }>(projectRoot, 'metro')
@@ -111,61 +121,94 @@ export function metroPlugin(options: MetroPluginOptions = {}): PluginOption {
             watch: true,
           })
 
-        middleware = metroResult.middleware
-        metroServer = metroResult.metroServer
-
-        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({
-          projectRoot,
-          serverBaseUrl: reactNativeDevToolsUrl,
-          logger: console,
-        })
-
-        rnDevtoolsMiddleware = devMiddleware.middleware
-        websocketEndpoints = {
-          '/hot': createWebsocketServer({
-            websocketServer: hmrServer,
-          }),
-          ...devMiddleware.websocketEndpoints,
-        }
+          middleware = metroResult.middleware
+          metroServer = metroResult.metroServer
+
+          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({
+            projectRoot,
+            serverBaseUrl: reactNativeDevToolsUrl,
+            logger: console,
+          })
+
+          rnDevtoolsMiddleware = devMiddleware.middleware
+          websocketEndpoints = {
+            '/hot': createWebsocketServer({
+              websocketServer: hmrServer,
+            }),
+            ...devMiddleware.websocketEndpoints,
+          }
+
+          // Setup websocket handling
+          server.httpServer?.on('upgrade', (request, socket, head) => {
+            const pathname = new URL(request.url!, `http://${request.headers.host}`).pathname
+
+            if (websocketEndpoints[pathname]) {
+              websocketEndpoints[pathname].handleUpgrade(request, socket, head, (ws) => {
+                websocketEndpoints[pathname].emit('connection', ws, request)
+              })
+            }
+          })
+
+          // Insert devtools middleware
+          server.middlewares.use(rnDevtoolsMiddleware)
 
           metroReady = true
           const metroElapsed = Date.now() - metroStartTime
-          console.info(`[metro] Metro bundler ready (${metroElapsed}ms)`)
+          debug?.(`Metro bundler ready (${metroElapsed}ms)`)
+          metroPromiseResolvers.resolve()
         } catch (err) {
-          console.error('[metro] Error during Metro initialization:', err)
+          debug?.(`Error during Metro initialization: ${err}`)
+          metroPromiseResolvers.reject(err as Error)
           throw err
         }
-      })()
-
-      // Don't await - let Metro initialize in parallel
-      metroPromise.catch((err) => {
-        console.error('[metro] Failed to start Metro:', err)
-      })
-
-      // Setup websocket handling after Metro is ready
-      metroPromise.then(() => {
-        server.httpServer?.on('upgrade', (request, socket, head) => {
-          const pathname = new URL(request.url!, `http://${request.headers.host}`).pathname
-
-          if (websocketEndpoints[pathname]) {
-            websocketEndpoints[pathname].handleUpgrade(request, socket, head, (ws) => {
-              websocketEndpoints[pathname].emit('connection', ws, request)
+      }
+
+      // Wait for Vite server to be listening before starting Metro
+      // This ensures Metro logs appear AFTER Vite's server URLs
+      if (server.httpServer) {
+        if (server.httpServer.listening) {
+          // Server is already listening (unlikely but handle it)
+          startMetro().catch((err) => {
+            debug?.(`Failed to start Metro: ${err}`)
+          })
+        } else {
+          server.httpServer.on('listening', () => {
+            startMetro().catch((err) => {
+              debug?.(`Failed to start Metro: ${err}`)
             })
+          })
+        }
+      } else {
+        // No httpServer yet, wait for it via a small delay and retry
+        // This shouldn't normally happen but is a safety fallback
+        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)
           }
-        })
-
-        // Insert devtools middleware after Metro is ready
-        server.middlewares.use(rnDevtoolsMiddleware)
-      })
+        }
+        waitForServer()
+      }
 
       server.middlewares.use(async (req, res, next) => {
         // Wait for Metro if it's a bundle request and Metro isn't ready yet
@@ -181,7 +224,7 @@ export function metroPlugin(options: MetroPluginOptions = {}): PluginOption {
               const VITE_METRO_DEBUG_BUNDLE = process.env.VITE_METRO_DEBUG_BUNDLE
               if (VITE_METRO_DEBUG_BUNDLE) {
                 if (existsSync(VITE_METRO_DEBUG_BUNDLE)) {
-                  console.info(`  !!! - serving debug bundle from`, VITE_METRO_DEBUG_BUNDLE)
+                  debug?.(`serving debug bundle from ${VITE_METRO_DEBUG_BUNDLE}`)
                   const content = await readFile(VITE_METRO_DEBUG_BUNDLE, 'utf-8')
                   res.setHeader('Content-Type', 'application/javascript')
                   res.end(content)
@@ -221,7 +264,7 @@ export function metroPlugin(options: MetroPluginOptions = {}): PluginOption {
                   res.statusCode = 200
                   res.end('Stack frame opened in editor')
                 } catch (e) {
-                  console.error('Failed to parse stack frame:', e)
+                  debug?.(`Failed to parse stack frame: ${e}`)
                   res.statusCode = 400
                   return res.end('Invalid stack frame JSON')
                 }
@@ -233,8 +276,7 @@ export function metroPlugin(options: MetroPluginOptions = {}): PluginOption {
             // this is the actual Metro middleware that handles bundle requests
             await (middleware as any)(req, res, next)
           } catch (error) {
-            // TODO: handle errors from Metro middleware?
-            console.error('Metro middleware error:', error)
+            debug?.(`Metro middleware error: ${error}`)
             next()
           }
         } else {

package/types/plugins/metroPlugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metroPlugin.d.ts","sourceRoot":"","sources":["../../src/plugins/metroPlugin.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAOxC,OAAO,KAAK,EAAE,UAAU,IAAI,WAAW,EAAE,MAAM,OAAO,CAAA;AAMtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAA;AAIjE,KAAK,kBAAkB,GAAG,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,CAAA;AAC3D,KAAK,gBAAgB,GAAG,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,CAAA;AAEzD,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,CAAC,EAAE,kBAAkB,CAAA;IACzB,sBAAsB,CAAC,EACnB,gBAAgB,GAChB,CAAC,CAAC,aAAa,EAAE,gBAAgB,KAAK,gBAAgB,CAAC,CAAA;IAC3D;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB;;;;;;;;;;OAUG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,CAAA;IACzB,kDAAkD;IAClD,WAAW,CAAC,EAAE,gBAAgB,CAAA;IAC9B,oBAAoB,CAAC,EAAE,CAAC,aAAa,EAAE,gBAAgB,KAAK,gBAAgB,CAAA;IAC5E;;;;;;;OAOG;IACH,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB,CAAA;AAED,wBAAgB,WAAW,CAAC,OAAO,GAAE,kBAAuB,GAAG,YAAY,CA4L1E"}
+{"version":3,"file":"metroPlugin.d.ts","sourceRoot":"","sources":["../../src/plugins/metroPlugin.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAUxC,OAAO,KAAK,EAAE,UAAU,IAAI,WAAW,EAAE,MAAM,OAAO,CAAA;AAMtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAA;AAIjE,KAAK,kBAAkB,GAAG,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,CAAA;AAC3D,KAAK,gBAAgB,GAAG,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,CAAA;AAEzD,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,CAAC,EAAE,kBAAkB,CAAA;IACzB,sBAAsB,CAAC,EACnB,gBAAgB,GAChB,CAAC,CAAC,aAAa,EAAE,gBAAgB,KAAK,gBAAgB,CAAC,CAAA;IAC3D;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB;;;;;;;;;;OAUG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,CAAA;IACzB,kDAAkD;IAClD,WAAW,CAAC,EAAE,gBAAgB,CAAA;IAC9B,oBAAoB,CAAC,EAAE,CAAC,aAAa,EAAE,gBAAgB,KAAK,gBAAgB,CAAA;IAC5E;;;;;;;OAOG;IACH,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB,CAAA;AAED,wBAAgB,WAAW,CAAC,OAAO,GAAE,kBAAuB,GAAG,YAAY,CAmO1E"}