vxrn 1.21.6 → 1.21.7

package/dist/exports/dev.native.js

@@ -41,7 +41,7 @@ var dev = async function (optionsIn) {
     printServerUrls
   } = await import("../utils/printServerUrls.native.js");
   var {
-    clean
+    prepareCacheForVersion
   } = await import("./clean.native.js");
   var {
     filterViteServerResolvedUrls
@@ -109,8 +109,13 @@ export default defineConfig({
     cacheDir
   } = options;
   bindKeypressInput();
-  if (options.clean) {
-    await clean(optionsIn, options.clean);
+  var cacheWasCleaned = await prepareCacheForVersion({
+    root: options.root,
+    cacheDir,
+    versionHash: options.versionHash,
+    forceClean: optionsIn.clean === true
+  });
+  if (options.clean || cacheWasCleaned) {
     process.env.METRO_RESET_CACHE = "1";
   }
   await ensureDir(cacheDir);

package/dist/exports/dev.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["FSExtra","colors","debounce","normalizePath","ensureDir","setupOrphanDetection","process","platform","initialPpid","ppid","interval","setInterval","exit","unref","dev","optionsIn","_ref","_config_plugins_find____get","_config_plugins_find_","_config_plugins_find","_config_plugins","devStartTime","Date","now","env","IS_VXRN_CLI","debug","_process_env","DEBUG","startUserInterface","bindKeypressInput","fillOptions","getViteServerConfig","printServerUrls","clean","filterViteServerResolvedUrls","removeUndefined","createServer","loadConfigFromFile","config","mode","command","console","error","extraConfig","resolve","extraConfigPath","extraResult","mergeConfig","info","cyan","warn","yellow","oneServerConfig","plugins","find","x","_x_","Array","isArray","server","options","cacheDir","METRO_RESET_CACHE","serverConfig","viteServer","isClosing","start","_viteServer_httpServer","connectedNativeClients","pendingTransforms","Map","watcher","addListener","path","normalizedPath","includes","normalizedCwd","cwd","id","replace","endsWith","has","set","transformRequest","err","get","httpServer","on","listen","totalStartupTime","bold","viteServerResolvedUrls","resolvedUrls","logger","closePromise","Promise","res","_viteServer_httpServer2","stop","removeAllListeners"],"sources":["../../src/exports/dev.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["FSExtra","colors","debounce","normalizePath","ensureDir","setupOrphanDetection","process","platform","initialPpid","ppid","interval","setInterval","exit","unref","dev","optionsIn","_ref","_config_plugins_find____get","_config_plugins_find_","_config_plugins_find","_config_plugins","devStartTime","Date","now","env","IS_VXRN_CLI","debug","_process_env","DEBUG","startUserInterface","bindKeypressInput","fillOptions","getViteServerConfig","printServerUrls","prepareCacheForVersion","filterViteServerResolvedUrls","removeUndefined","createServer","loadConfigFromFile","config","mode","command","console","error","extraConfig","resolve","extraConfigPath","extraResult","mergeConfig","info","cyan","warn","yellow","oneServerConfig","plugins","find","x","_x_","Array","isArray","server","options","cacheDir","cacheWasCleaned","root","versionHash","forceClean","clean","METRO_RESET_CACHE","serverConfig","viteServer","isClosing","start","_viteServer_httpServer","connectedNativeClients","pendingTransforms","Map","watcher","addListener","path","normalizedPath","includes","normalizedCwd","cwd","id","replace","endsWith","has","set","transformRequest","err","get","httpServer","on","listen","totalStartupTime","bold","viteServerResolvedUrls","resolvedUrls","logger","closePromise","Promise","res","_viteServer_httpServer2","stop","removeAllListeners"],"sources":["../../src/exports/dev.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAOA,OAAA,MAAa;AACpB,OAAOC,MAAA,MAAY;AACnB,SAASC,QAAA,QAAgB;AACzB,SAASC,aAAA,QAAyC;AAGlD;EAAMC;AAAE,IAAUJ,OAAI;AAGtB,SAASK,qBAAA,EAAuB;EAC9B,IAAIC,OAAA,CAAQC,QAAA,KAAa,SAAS;EAElC,IAAAC,WAAM,GAAAF,OAAc,CAAAG,IAAQ;EAC5B,IAAAC,QAAM,GAAAC,WAAW,aAAkB;IAEjC,IAAIL,OAAA,CAAQG,IAAA,KAASD,WAAA,EAAa;MAChCF,OAAA,CAAQM,IAAA,CAAK,CAAC;IAChB;EACF,GAAG,GAAG;EACNF,QAAA,CAASG,KAAA,CAAM;AACjB;AAUO,IAAAC,GAAM,kBAAAA,CAAaC,SAA0B;EAClD,IAAAC,IAAA;EAEA,IAAAC,2BAA8B,EAAAC,qBAAA,EAAAC,oBAAA,EAAAC,eAAA;EAC9Bf,oBAAY;EAEZ,IAAIgB,YAAO,GAAAC,IAAU,CAAAC,GAAA;EACnBjB,OAAA,CAAAkB,GAAQ,CAAAC,WAAI,GAAW;EACzB,WAAAV,SAAA,CAAAW,KAAA;IAGA,IAAMC,YAAE;IACR,CAAAA,YAAQ,GAAArB,OAAA,CAAkBkB,GAAA,EAAII,KAAM,KAAAD,YAAO,CAAAC,KAAA,IAAAb,SAA4B,CAAAW,KAAA,oBAAAX,SAAA,CAAAW,KAAA;EACvE;EACA;IAAMG;EAAE,IAAoB,MAAI,MAAM,oCAAO;EAC7C;IAAMC;EAAkB,IAAI,MAAM,OAAO,sCAA0B;EACnE;IAAMC;EAAE,gBAAuB,CAAI,sCAAsB;EACzD;IAAMC;EAAE,gBACN,0CAAa;EACf;IAAMC;EAAE,IAAgB,MAAI,MAAM,qCAAO;EACzC;IAAMC;EAAgB,gBAAuB,oBAAM;EAEnD,IAAI;IAAEC;EACG,UAAmB;EAAA,IACxB;IAAAC;EAAM;EAAA,IACN;IAAAC,YAAS;IAAAC;EAAA;EACX,IAAC;IAAMC;EAAC,KAAAvB,IAAA,SAAAsB,kBAAA;IAEVE,IAAK,OAAQ;IACXC,OAAA,EAAQ;EAAM,gBAAAzB,IAAA,cAAAA,IAAA;EAAA,KAAAuB,MAAA;IAAAG,OAAA,CAAAC,KAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAad;AAAc;AAGhB;IACErC,OAAM,CAAEM,IAAA;EACR;EACA,IAAAG,SAAM,CAAA6B,WAAc;IAAM,IACtB;MAAAC;IAAM,IAAO,YAAS,OAAQ;IAAA,IAChCC,eAAA,GAAAD,OAAA,CAAA9B,SAAA,CAAA6B,WAAA;IACF,IAAAG,WAAA,SAAAT,kBAAA;MACAE,IAAI;MACFC,OAAM,EAAE;IACR,GAAAK,eAAS;IACT,IAAAC,WAAa,SAAO,IAAKA,WAAA,mBAA4B,IAAAA,WAAkB,CAAAR,MAAA;MACzE;QAAOS;MAAA;MACLT,MAAA,GAAQS,WAAY,CAAAT,MAAO,EAAAQ,WAAA,CAAAR,MAAA;MAC7BG,OAAA,CAAAO,IAAA,CAAAhD,MAAA,CAAAiD,IAAA,6BAAAJ,eAAA;IACF;MAIAJ,OAAM,CAAAS,IAAA,CAAAlD,MAAA,CAAkBmD,MAAA,qCAAiBN,eAAA;IACvC;EACF;EAEA,IAAAO,eAAgB,GAAMd,MAAA,SAAY,IAAAA,MAAA,wBAAAnB,eAAA,GAAAmB,MAAA,CAAAe,OAAA,cAAAlC,eAAA,wBAAAD,oBAAA,GAAAC,eAAA,CAAAmC,IAAA,WAAAC,CAAA;IAChC,IAAGC,GAAA;IACH,OAAAC,KAAQ,CAAAC,OAAA,CAAAH,CAAA,OAAAC,GAAA,GAAAD,CAAA,iBAAAC,GAAA,uBAAAA,GAAA;EAAA,QACH,QAAAtC,oBAAA,wBAAAD,qBAAA,GAAAC,oBAAA,iBAAAD,qBAAA,wBAAAD,2BAAA,GAAAC,qBAAA,uBAAAD,2BAAA,uBAAAA,2BAAA,CAAA2C,MAAA;EAAA,IACHC,OAAG,SAAA9B,WAAgB;IACrB,GAAAhB,SAAA;IACD6C,MAAA;MAED,GAAMP,eAAe;MAErB,GAAAjB,eAAkB,CAAArB,SAAA,CAAA6C,MAAA;IAElB;EAAqD,EACnD;EAAc,IACd;IAAAE;EAAA,IAAAD,OAAA;EAAA/B,iBACa;EAAQ,IACrBiC,eAAY,SAAU7B,sBAAU;IACjC8B,IAAA,EAAAH,OAAA,CAAAG,IAAA;IACDF,QAAI;IAEFG,WAAQ,EAAIJ,OAAA,CAAAI,WAAoB;IAClCC,UAAA,EAAAnD,SAAA,CAAAoD,KAAA;EAEA;EAGA,IAAAN,OAAM,CAAAM,KAAU,IAAGJ,eAAQ;IAE3BzD,OAAM,CAAAkB,GAAA,CAAA4C,iBAAqB;EAE3B;EAEA,MAAIhE,SAAA,CAAY0D,QAAA;EAEhB,MAAA1D,SAAO,IAAA0D,QAAA;EAAA,IACLO,YAAA,SAAArC,mBAAA,CAAA6B,OAAA,EAAAtB,MAAA;EAAA,IAEA+B,UAAO,OAAY;EACjB,IAAAC,SAAA,QAAa;EAKb;IACAD,UAAM;IAENE,KAAA,iBAAAA,CAAA,EAAmB;MAEjB,IAAAC,sBAAiB;MACfH,UAAA,SAAAjC,YAAA,CAAAgC,YAAA;MAAA,IACF;QAAAK;MAAA;MAGA,IAAAC,iBAAM,kBAA+B,IAAIC,GAAA;MACzCN,UAAI,CAAAO,OAAA,CAAAC,WAAwB,SAAQ,EAAG,gBAAAC,IAAA;QACrC,IAAAR,SAAA,IAAAG,sBAAA;UACF;QAEA;QACA,IAAAM,cAAW,GAAA7E,aAAuB,CAAA4E,IAAA;QAClC,IAAIC,cAAa,CAAAC,QAAU,CAAC,QAAG;UAC7B;QACF;QAGA,IAAIC,aAAC,GAAA/E,aAA2B,CAAAG,OAAA,CAAA6E,GAAA;QAC9B,IAAAC,EAAA,GAAAJ,cAAkB,CAAAK,OAAA,CAAAH,aAAA;QAAA,IAChB,CAAAE,EAAA,CAAAE,QAAA,YAAAF,EAAA,CAAAE,QAAA;UAAA;QAEE;QACA,KAAAX,iBAAI,CAAAY,GAAA,CAAAH,EAAA;UACFT,iBAAM,CAAAa,GAAA,CAAAJ,EAAY,EAAAlF,QAAA,mBAAmB;YAAA,IACvCqE,SAAS;YAEP;cACE,MAAAD,UAAQ,CAAKmB,gBAAU,CAAAL,EAAA;YAAA,SACzBM,GAAA;cACF,KAAAnB,SAAA;gBACC7B,OAAG,CAAAO,IAAA,QAAAyC,GAAA;cACR;YACF;UAEA;QACD;QAGDf,iBAAW,CAAAgB,GAAY,CAAAP,EAAG;MACxB;MACF,CAACX,sBAAA,GAAAH,UAAA,CAAAsB,UAAA,cAAAnB,sBAAA,uBAAAA,sBAAA,CAAAoB,EAAA;QAEDtB,SAAM,OAAW;MAEjB;MAEA,MAAAD,UAAa,CAAAwB,MAAA;MACb,IAAAC,gBAAoB,GAAAzE,IAAK,CAAAC,GAAA,KAAAF,YAAuB;MAChDqB,OAAA,CAAQO,IAAA,CAAK;MAEbP,OAAM,CAAAO,IAAA,CAAAhD,MAAA,CAAA+F,IAAA,oBAAyB;MAC/BtD,OAAI,CAAAO,IAAA;MACF,IAAAgD,sBAAgB,GAAA9D,4BAAuC,CAAAmC,UAAO,CAAA4B,YAAW;MAC3E,IAAAD,sBAAA;QAEAhE,eAAA,CAAAgE,sBAAwC,EAAC,IAAA3B,UAAA,CAAA/B,MAAA,CAAA4D,MAAA,CAAAlD,IAAA;MAEzC;MAAOpB,kBACS;QACZ+B,MAAA,EAAAU;MAAuC,EACzC;MACF;QACF8B,YAAA,MAAAC,OAAA,WAAAC,GAAA;UAEM,IAAAC,uBAAM;UACVjC,UAAY,aAAAA,UAAA,wBAAAiC,uBAAA,GAAAjC,UAAA,CAAAsB,UAAA,cAAAW,uBAAA,uBAAAA,uBAAA,CAAAV,EAAA,UAAAS,GAAA;QACZ;MACE;IACA;IAAwBE,IAC1B,WAAAA,CAAA;MACFjC,SAAA;MACF,IAAAD,UAAA;QACFA,UAAA,CAAAO,OAAA,CAAA4B,kBAAA","ignoreList":[]}

package/dist/serve/node.mjs

@@ -1,7 +1,6 @@
 import { createServer } from "node:http";
 import { networkInterfaces, platform } from "node:os";
 import { getRequestListener } from "@hono/node-server";
-import { serve as honoServe } from "@hono/node-server";
 import colors from "picocolors";
 function getNetworkAddress() {
   for (const addresses of Object.values(networkInterfaces())) {
@@ -20,22 +19,20 @@ const canReusePort = !["win32", "darwin"].includes(platform()) && (isBun || (()
 async function honoServeNode(app, options) {
   const port = options.port ?? 3e3;
   const host = options.host ?? "0.0.0.0";
-  let server;
-  if (canReusePort) {
-    const listener = getRequestListener(app.fetch);
-    server = createServer(listener);
-    server.listen({
-      port,
-      host,
+  const listener = getRequestListener((request, env) => {
+    request.headers.delete("x-vxrn-peer-address");
+    const address = env.incoming.socket.remoteAddress;
+    if (address) request.headers.set("x-vxrn-peer-address", address);
+    return app.fetch(request, env);
+  });
+  const server = createServer(listener);
+  server.listen({
+    port,
+    host,
+    ...(canReusePort && process.env.ONE_CLUSTER_WORKER === "1" ? {
       reusePort: true
-    });
-  } else {
-    server = honoServe({
-      fetch: app.fetch,
-      port,
-      hostname: host
-    });
-  }
+    } : {})
+  });
   const colorUrl = url => colors.cyan(url.replace(/:(\d+)\//, (_, port2) => `:${colors.bold(port2)}/`));
   const displayHost = host === "0.0.0.0" ? "localhost" : host;
   const localUrl = `http://${displayHost}:${port}/`;
@@ -49,15 +46,14 @@ async function honoServeNode(app, options) {
     }
   }
   console.info();
-  const shutdown = () => {
-    server.close(() => {
-      process.exit(0);
-    });
-  };
-  process.on("SIGINT", shutdown);
-  process.on("SIGTERM", shutdown);
-  await new Promise(res => {
+  const shutdown = () => server.close();
+  process.once("SIGINT", shutdown);
+  process.once("SIGTERM", shutdown);
+  await new Promise((res, rej) => {
+    server.once("error", rej);
     server.on("close", () => {
+      process.off("SIGINT", shutdown);
+      process.off("SIGTERM", shutdown);
       res();
     });
   });

package/dist/serve/node.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["createServer","networkInterfaces","platform","getRequestListener","serve","honoServe","colors","getNetworkAddress","addresses","Object","values","addr","family","internal","address","isBun","process","versions","bun","canReusePort","includes","major","minor","node","split","map","Number","honoServeNode","app","options","port","host","server","listener","fetch","listen","reusePort","hostname","colorUrl","url","cyan","replace","_","port2","bold","displayHost","localUrl","console","info","green","networkHost","networkUrl","shutdown","close","exit","on","Promise","res"],"sources":["../../src/serve/node.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["createServer","networkInterfaces","platform","getRequestListener","colors","getNetworkAddress","addresses","Object","values","addr","family","internal","address","isBun","process","versions","bun","canReusePort","includes","major","minor","node","split","map","Number","honoServeNode","app","options","port","host","listener","request","env","headers","delete","incoming","socket","remoteAddress","set","fetch","server","listen","ONE_CLUSTER_WORKER","reusePort","colorUrl","url","cyan","replace","_","port2","bold","displayHost","localUrl","console","info","green","networkHost","networkUrl","shutdown","close","once","Promise","res","rej","on","off"],"sources":["../../src/serve/node.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/serve/node.native.js

@@ -1,7 +1,6 @@
 import { createServer } from "http";
 import { networkInterfaces, platform } from "os";
 import { getRequestListener } from "@hono/node-server";
-import { serve as honoServe } from "@hono/node-server";
 import colors from "picocolors";
 function getNetworkAddress() {
   var _iteratorNormalCompletion = true,
@@ -59,22 +58,20 @@ async function honoServeNode(app, options) {
   var _options_port, _options_host;
   var port = (_options_port = options.port) !== null && _options_port !== void 0 ? _options_port : 3e3;
   var host = (_options_host = options.host) !== null && _options_host !== void 0 ? _options_host : "0.0.0.0";
-  var server;
-  if (canReusePort) {
-    var listener = getRequestListener(app.fetch);
-    server = createServer(listener);
-    server.listen({
-      port,
-      host,
+  var listener = getRequestListener(function (request, env) {
+    request.headers.delete("x-vxrn-peer-address");
+    var address = env.incoming.socket.remoteAddress;
+    if (address) request.headers.set("x-vxrn-peer-address", address);
+    return app.fetch(request, env);
+  });
+  var server = createServer(listener);
+  server.listen({
+    port,
+    host,
+    ...(canReusePort && process.env.ONE_CLUSTER_WORKER === "1" ? {
       reusePort: true
-    });
-  } else {
-    server = honoServe({
-      fetch: app.fetch,
-      port,
-      hostname: host
-    });
-  }
+    } : {})
+  });
   var colorUrl = function (url) {
     return colors.cyan(url.replace(/:(\d+)\//, function (_, port2) {
       return `:${colors.bold(port2)}/`;
@@ -93,14 +90,15 @@ async function honoServeNode(app, options) {
   }
   console.info();
   var shutdown = function () {
-    server.close(function () {
-      process.exit(0);
-    });
+    return server.close();
   };
-  process.on("SIGINT", shutdown);
-  process.on("SIGTERM", shutdown);
-  await new Promise(function (res) {
+  process.once("SIGINT", shutdown);
+  process.once("SIGTERM", shutdown);
+  await new Promise(function (res, rej) {
+    server.once("error", rej);
     server.on("close", function () {
+      process.off("SIGINT", shutdown);
+      process.off("SIGTERM", shutdown);
       res();
     });
   });

package/dist/serve/node.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["createServer","networkInterfaces","platform","getRequestListener","serve","honoServe","colors","getNetworkAddress","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Object","values","Symbol","iterator","_step","next","done","addresses","value","_iteratorNormalCompletion1","_didIteratorError1","_iteratorError1","_iterator1","_step1","addr","family","internal","address","err","return","isBun","process","versions","bun","canReusePort","includes","major","minor","node","split","map","Number","honoServeNode","app","options","_options_port","_options_host","port","host","server"],"sources":["../../src/serve/node.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,YAAA,QAAiC;AAC1C,SAASC,iBAAA,EAAmBC,QAAA,QAAgB;AAC5C,SAASC,kBAAA,QAA0B;AACnC,SAASC,KAAA,IAASC,SAAA,QAAiB;AAGnC,OAAOC,MAAA,MAAY;AAGnB,SAASC,kBAAA,EAAwC;EAC/C,IAAAC,yBAAwB,GAAO;IAAOC,iBAAA,GAAmB,KAAG;IAAAC,cAAA;EAC1D;IACE,SAAIC,SAAK,GAAAC,MAAW,CAAAC,MAAW,CAAAZ,iBAAe,IAAAa,MAAA,CAAAC,QAAA,KAAAC,KAAA,IAAAR,yBAAA,IAAAQ,KAAA,GAAAL,SAAA,CAAAM,IAAA,IAAAC,IAAA,GAAAV,yBAAA;MAC5C,IAAAW,SAAO,GAAKH,KAAA,CAAAI,KAAA;MACd,IAAAC,0BAAA;QAAAC,kBAAA;QAAAC,eAAA;MACF;QACF,SAAAC,UAAA,IAAAL,SAAA,QAAAL,MAAA,CAAAC,QAAA,KAAAU,MAAA,IAAAJ,0BAAA,IAAAI,MAAA,GAAAD,UAAA,CAAAP,IAAA,IAAAC,IAAA,GAAAG,0BAAA;UACF,IAAAK,IAAA,GAAAD,MAAA,CAAAL,KAAA;UAEM,IAAQM,IAAA,CAAAC,MAAO,KAAQ,UAAS,CAAAD,IAAA,CAAQE,QAAA;YAIxC,OAAAF,IACF,CAAAG,OAAA;UAGS;QACP;MACC,SAAAC,GAAA;QAIPR,kBAAsB,GAAc;QAC5BC,eAAe,GAAAO,GAAA;MACrB,UAAa;QAET;UAEA,KAAAT,0BAAc,IAAAG,UAAA,CAAAO,MAAA;YAGVP,UAAW,CAAAO,MAAA;UACjB;QACA,UAAc;UACT,IAAAT,kBAAA;YACL,MAASC,eAAU;UACjB;QACA;MACA;IACF;EACF,SAAAO,GAAA;IAEArB,iBAAkB,OAChB;IAEFC,cAAM,GAAAoB,GAAc;EACpB,UAAM;IAEN;MACA,IAAQ,CAAAtB,yBAAuB,IAAAG,SAAS,CAAAoB,MAAO,IAAK,MAAO;QAEvDpB,SAAS,CAAAoB,MAAA,EAAW;MACtB;IACA,UAAI;MACF,IAAAtB,iBAAmB;QACnB,MAAQC,cAAA;MAAA;IACoE;EAC5E;AACF;AAEF,IAAAsB,KAAA,GAAQ,OAAKC,OAAA,CAAAC,QAAA,CAAAC,GAAA;AAEb,IAAAC,YAAM,GAAW,EACf,SACE,SAAc,CAAAC,QACf,CAAAnC,QAAA,QAAA8B,KAAA;EACH,KAAAM,KAAA,EAAAC,KAAA,IAAAN,OAAA,CAAAC,QAAA,CAAAM,IAAA,CAAAC,KAAA,MAAAC,GAAA,CAAAC,MAAA;EAEA,OAAAL,KAAW,SAAUA,KAAA,KAAQ,MAAAC,KAAA,UAAAD,KAAA;AAC7B;AAEA,eAAUM,aAAeA,CAAQC,GAAA,EAAAC,OAAA;EAC/B,IAAAC,aAAU,EAAAC,aAAe;EACvB,IAAAC,IAAI,IAAAF,aAAA,GAAAD,OAAA,CAAAG,IAAA,cAAAF,aAAA,cAAAA,aAAA;EAAA,IACLG,IAAA,IAAAF,aAAA,GAAAF,OAAA,CAAAI,IAAA,cAAAF,aAAA,cAAAA,aAAA;EACH,IAACG,MAAA;EACH,IAAAf,YAAA","ignoreList":[]}
+{"version":3,"names":["createServer","networkInterfaces","platform","getRequestListener","colors","getNetworkAddress","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Object","values","Symbol","iterator","_step","next","done","addresses","value","_iteratorNormalCompletion1","_didIteratorError1","_iteratorError1","_iterator1","_step1","addr","family","internal","address","err","return","isBun","process","versions","bun","canReusePort","includes","major","minor","node","split","map","Number","honoServeNode","app","options","_options_port","_options_host","port","host","listener","request","env"],"sources":["../../src/serve/node.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,YAAA,QAAoB;AAC7B,SAASC,iBAAA,EAAmBC,QAAA,QAAgB;AAC5C,SAASC,kBAAA,QAA0B;AAEnC,OAAOC,MAAA,MAAY;AAGnB,SAASC,kBAAA,EAAwC;EAC/C,IAAAC,yBAAwB,GAAO;IAAOC,iBAAA,GAAmB,KAAG;IAAAC,cAAA;EAC1D;IACE,SAAIC,SAAK,GAAAC,MAAW,CAAAC,MAAW,CAAAV,iBAAe,IAAAW,MAAA,CAAAC,QAAA,KAAAC,KAAA,IAAAR,yBAAA,IAAAQ,KAAA,GAAAL,SAAA,CAAAM,IAAA,IAAAC,IAAA,GAAAV,yBAAA;MAC5C,IAAAW,SAAO,GAAKH,KAAA,CAAAI,KAAA;MACd,IAAAC,0BAAA;QAAAC,kBAAA;QAAAC,eAAA;MACF;QACF,SAAAC,UAAA,IAAAL,SAAA,QAAAL,MAAA,CAAAC,QAAA,KAAAU,MAAA,IAAAJ,0BAAA,IAAAI,MAAA,GAAAD,UAAA,CAAAP,IAAA,IAAAC,IAAA,GAAAG,0BAAA;UACF,IAAAK,IAAA,GAAAD,MAAA,CAAAL,KAAA;UAEM,IAAQM,IAAA,CAAAC,MAAO,KAAQ,UAAS,CAAAD,IAAA,CAAQE,QAAA;YAIxC,OAAAF,IACF,CAAAG,OAAA;UAGS;QACP;MACC,SAAAC,GAAA;QAIPR,kBAAsB,GAAc;QAC5BC,eAAe,GAAAO,GAAA;MACrB,UAAa;QAEP;UACJ,IAAQ,CAAAT,0BAAe,IAAAG,UAAqB,CAAAO,MAAA;YACtCP,UAAU,CAAAO,MAAI;UAChB;QACJ,UAAW;UACZ,IAAAT,kBAAA;YACK,MAASC,eAAa;UACrB;QACL;MACA;IACA;EAGF,CAAC,QAAAO,GAAA;IAEDrB,iBAAkB,OAChB;IAEFC,cAAM,GAAAoB,GAAc;EACpB,UAAM;IAEN;MACA,IAAQ,CAAAtB,yBAAuB,IAAAG,SAAS,CAAAoB,MAAO,IAAK,MAAO;QAEvDpB,SAAS,CAAAoB,MAAA,EAAW;MACtB;IACA,UAAI;MACF,IAAAtB,iBAAmB;QACnB,MAAQC,cAAA;MAAA;IACoE;EAC5E;AACF;AAEF,IAAAsB,KAAA,GAAQ,OAAKC,OAAA,CAAAC,QAAA,CAAAC,GAAA;AAEb,IAAAC,YAAM,GAAW,EAEjB,SACA,QAAQ,CAER,CAAAC,QAAM,CAAAjC,QAAI,CAAc,CAAC,MAAK4B,KAAA,IAAQ;EACpC,KAAAM,KAAO,EAAAC,KAAK,IAAAN,OAAY,CAAAC,QAAA,CAAAM,IAAA,CAAAC,KAAA,MAAAC,GAAA,CAAAC,MAAA;EACxB,OAAAL,KAAU,SAASA,KAAA,KAAM,MAAAC,KAAA,UAAAD,KAAA;AACvB;AACA,eAAQM,aAAIA,CAAWC,GAAA,EAAAC,OAAQ;EAC/B,IAAAC,aAAI,EAAAC,aAAA;EAAA,IACLC,IAAA,IAAAF,aAAA,GAAAD,OAAA,CAAAG,IAAA,cAAAF,aAAA,cAAAA,aAAA;EACH,IAACG,IAAA,IAAAF,aAAA,GAAAF,OAAA,CAAAI,IAAA,cAAAF,aAAA,cAAAA,aAAA;EACH,IAAAG,QAAA,GAAA9C,kBAAA,WAAA+C,OAAA,EAAAC,GAAA","ignoreList":[]}

package/dist/serve/node.test.mjs

@@ -0,0 +1,60 @@
+import { createServer } from "node:http";
+import { Hono } from "hono";
+import { describe, expect, test } from "vitest";
+import { honoServeNode } from "./node.mjs";
+describe("honoServeNode", () => {
+  test("rejects when the listener cannot bind", async () => {
+    const occupied = createServer();
+    await new Promise((resolve, reject) => {
+      occupied.once("error", reject);
+      occupied.listen(0, "127.0.0.1", resolve);
+    });
+    const address = occupied.address();
+    if (!address || typeof address === "string") throw new Error("missing test port");
+    const app = new Hono().get("/health", context => context.text("ok"));
+    await expect(honoServeNode(app, {
+      host: "127.0.0.1",
+      port: address.port
+    })).rejects.toMatchObject({
+      code: "EADDRINUSE"
+    });
+    await new Promise((resolve, reject) => occupied.close(error => error ? reject(error) : resolve()));
+  });
+  test("overwrites the trusted peer address header from the socket", async () => {
+    const reservation = createServer();
+    await new Promise((resolve, reject) => {
+      reservation.once("error", reject);
+      reservation.listen(0, "127.0.0.1", resolve);
+    });
+    const address = reservation.address();
+    if (!address || typeof address === "string") throw new Error("missing test port");
+    await new Promise((resolve, reject) => reservation.close(error => error ? reject(error) : resolve()));
+    const app = new Hono().get("/peer", context => context.text(context.req.header("x-vxrn-peer-address") || ""));
+    const running = honoServeNode(app, {
+      host: "127.0.0.1",
+      port: address.port
+    });
+    await new Promise((resolve, reject) => {
+      const startedAt = Date.now();
+      const probe = async () => {
+        try {
+          const response = await fetch(`http://127.0.0.1:${address.port}/peer`, {
+            headers: {
+              "x-vxrn-peer-address": "203.0.113.9"
+            }
+          });
+          expect(await response.text()).toBe("127.0.0.1");
+          resolve();
+        } catch (error) {
+          if (Date.now() - startedAt > 2e3) reject(error);else setTimeout(probe, 20);
+        }
+      };
+      void probe();
+    });
+    const shutdown = process.listeners("SIGTERM").at(-1);
+    expect(shutdown).toBeTypeOf("function");
+    shutdown?.("SIGTERM");
+    await running;
+  });
+});
+//# sourceMappingURL=node.test.mjs.map

package/dist/serve/node.test.mjs.map

@@ -0,0 +1 @@
+{"version":3,"names":["createServer","Hono","describe","expect","test","honoServeNode","occupied","Promise","resolve","reject","once","listen","address","Error","app","get","context","text","host","port","rejects","toMatchObject","code","close","error","reservation","req","header","running","startedAt","Date","now","probe","response","fetch","headers","toBe","setTimeout","shutdown","process","listeners","at","toBeTypeOf"],"sources":["../../src/serve/node.test.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,YAAA,QAAoB;AAC7B,SAASC,IAAA,QAAY;AACrB,SAASC,QAAA,EAAUC,MAAA,EAAQC,IAAA,QAAY;AACvC,SAASC,aAAA,QAAqB;AAE9BH,QAAA,CAAS,iBAAiB,MAAM;EAC9BE,IAAA,CAAK,yCAAyC,YAAY;IACxD,MAAME,QAAA,GAAWN,YAAA,CAAa;IAC9B,MAAM,IAAIO,OAAA,CAAc,CAACC,OAAA,EAASC,MAAA,KAAW;MAC3CH,QAAA,CAASI,IAAA,CAAK,SAASD,MAAM;MAC7BH,QAAA,CAASK,MAAA,CAAO,GAAG,aAAaH,OAAO;IACzC,CAAC;IACD,MAAMI,OAAA,GAAUN,QAAA,CAASM,OAAA,CAAQ;IACjC,IAAI,CAACA,OAAA,IAAW,OAAOA,OAAA,KAAY,UAAU,MAAM,IAAIC,KAAA,CAAM,mBAAmB;IAEhF,MAAMC,GAAA,GAAM,IAAIb,IAAA,CAAK,EAAEc,GAAA,CAAI,WAAYC,OAAA,IAAYA,OAAA,CAAQC,IAAA,CAAK,IAAI,CAAC;IACrE,MAAMd,MAAA,CACJE,aAAA,CAAcS,GAAA,EAAK;MAAEI,IAAA,EAAM;MAAaC,IAAA,EAAMP,OAAA,CAAQO;IAAK,CAAC,CAC9D,EAAEC,OAAA,CAAQC,aAAA,CAAc;MAAEC,IAAA,EAAM;IAAa,CAAC;IAE9C,MAAM,IAAIf,OAAA,CAAc,CAACC,OAAA,EAASC,MAAA,KAChCH,QAAA,CAASiB,KAAA,CAAOC,KAAA,IAAWA,KAAA,GAAQf,MAAA,CAAOe,KAAK,IAAIhB,OAAA,CAAQ,CAAE,CAC/D;EACF,CAAC;EAEDJ,IAAA,CAAK,8DAA8D,YAAY;IAC7E,MAAMqB,WAAA,GAAczB,YAAA,CAAa;IACjC,MAAM,IAAIO,OAAA,CAAc,CAACC,OAAA,EAASC,MAAA,KAAW;MAC3CgB,WAAA,CAAYf,IAAA,CAAK,SAASD,MAAM;MAChCgB,WAAA,CAAYd,MAAA,CAAO,GAAG,aAAaH,OAAO;IAC5C,CAAC;IACD,MAAMI,OAAA,GAAUa,WAAA,CAAYb,OAAA,CAAQ;IACpC,IAAI,CAACA,OAAA,IAAW,OAAOA,OAAA,KAAY,UAAU,MAAM,IAAIC,KAAA,CAAM,mBAAmB;IAChF,MAAM,IAAIN,OAAA,CAAc,CAACC,OAAA,EAASC,MAAA,KAChCgB,WAAA,CAAYF,KAAA,CAAOC,KAAA,IAAWA,KAAA,GAAQf,MAAA,CAAOe,KAAK,IAAIhB,OAAA,CAAQ,CAAE,CAClE;IAEA,MAAMM,GAAA,GAAM,IAAIb,IAAA,CAAK,EAAEc,GAAA,CAAI,SAAUC,OAAA,IACnCA,OAAA,CAAQC,IAAA,CAAKD,OAAA,CAAQU,GAAA,CAAIC,MAAA,CAAO,qBAAqB,KAAK,EAAE,CAC9D;IACA,MAAMC,OAAA,GAAUvB,aAAA,CAAcS,GAAA,EAAK;MAAEI,IAAA,EAAM;MAAaC,IAAA,EAAMP,OAAA,CAAQO;IAAK,CAAC;IAC5E,MAAM,IAAIZ,OAAA,CAAc,CAACC,OAAA,EAASC,MAAA,KAAW;MAC3C,MAAMoB,SAAA,GAAYC,IAAA,CAAKC,GAAA,CAAI;MAC3B,MAAMC,KAAA,GAAQ,MAAAA,CAAA,KAAY;QACxB,IAAI;UACF,MAAMC,QAAA,GAAW,MAAMC,KAAA,CAAM,oBAAoBtB,OAAA,CAAQO,IAAI,SAAS;YACpEgB,OAAA,EAAS;cAAE,uBAAuB;YAAc;UAClD,CAAC;UACDhC,MAAA,CAAO,MAAM8B,QAAA,CAAShB,IAAA,CAAK,CAAC,EAAEmB,IAAA,CAAK,WAAW;UAC9C5B,OAAA,CAAQ;QACV,SAASgB,KAAA,EAAO;UACd,IAAIM,IAAA,CAAKC,GAAA,CAAI,IAAIF,SAAA,GAAY,KAAOpB,MAAA,CAAOe,KAAK,OAC3Ca,UAAA,CAAWL,KAAA,EAAO,EAAE;QAC3B;MACF;MACA,KAAKA,KAAA,CAAM;IACb,CAAC;IACD,MAAMM,QAAA,GAAWC,OAAA,CAAQC,SAAA,CAAU,SAAS,EAAEC,EAAA,CAAG,EAAE;IACnDtC,MAAA,CAAOmC,QAAQ,EAAEI,UAAA,CAAW,UAAU;IACtCJ,QAAA,GAAW,SAAS;IACpB,MAAMV,OAAA;EACR,CAAC;AACH,CAAC","ignoreList":[]}

package/dist/serve/node.test.native.js

@@ -0,0 +1,72 @@
+import { createServer } from "http";
+import { Hono } from "hono";
+import { describe, expect, test } from "vitest";
+import { honoServeNode } from "./node.native.js";
+describe("honoServeNode", function () {
+  test("rejects when the listener cannot bind", async function () {
+    var occupied = createServer();
+    await new Promise(function (resolve, reject) {
+      occupied.once("error", reject);
+      occupied.listen(0, "127.0.0.1", resolve);
+    });
+    var address = occupied.address();
+    if (!address || typeof address === "string") throw new Error("missing test port");
+    var app = new Hono().get("/health", function (context) {
+      return context.text("ok");
+    });
+    await expect(honoServeNode(app, {
+      host: "127.0.0.1",
+      port: address.port
+    })).rejects.toMatchObject({
+      code: "EADDRINUSE"
+    });
+    await new Promise(function (resolve, reject) {
+      return occupied.close(function (error) {
+        return error ? reject(error) : resolve();
+      });
+    });
+  });
+  test("overwrites the trusted peer address header from the socket", async function () {
+    var reservation = createServer();
+    await new Promise(function (resolve, reject) {
+      reservation.once("error", reject);
+      reservation.listen(0, "127.0.0.1", resolve);
+    });
+    var address = reservation.address();
+    if (!address || typeof address === "string") throw new Error("missing test port");
+    await new Promise(function (resolve, reject) {
+      return reservation.close(function (error) {
+        return error ? reject(error) : resolve();
+      });
+    });
+    var app = new Hono().get("/peer", function (context) {
+      return context.text(context.req.header("x-vxrn-peer-address") || "");
+    });
+    var running = honoServeNode(app, {
+      host: "127.0.0.1",
+      port: address.port
+    });
+    await new Promise(function (resolve, reject) {
+      var startedAt = Date.now();
+      var probe = async function () {
+        try {
+          var response = await fetch(`http://127.0.0.1:${address.port}/peer`, {
+            headers: {
+              "x-vxrn-peer-address": "203.0.113.9"
+            }
+          });
+          expect(await response.text()).toBe("127.0.0.1");
+          resolve();
+        } catch (error) {
+          if (Date.now() - startedAt > 2e3) reject(error);else setTimeout(probe, 20);
+        }
+      };
+      void probe();
+    });
+    var shutdown = process.listeners("SIGTERM").at(-1);
+    expect(shutdown).toBeTypeOf("function");
+    shutdown === null || shutdown === void 0 ? void 0 : shutdown("SIGTERM");
+    await running;
+  });
+});
+//# sourceMappingURL=node.test.native.js.map

package/dist/serve/node.test.native.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["createServer","Hono","describe","expect","test","honoServeNode","occupied","Promise","resolve","reject","once","listen","address","Error","app","get","context","text","host","port","rejects","toMatchObject","code","close","error","reservation","req","header","running","startedAt","Date","now","probe","response","fetch","headers","toBe"],"sources":["../../src/serve/node.test.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,YAAA,QAAoB;AAC7B,SAASC,IAAA,QAAY;AACrB,SAASC,QAAA,EAAUC,MAAA,EAAQC,IAAA,QAAY;AACvC,SAASC,aAAA,QAAqB;AAE9BH,QAAA,CAAS,iBAAiB,YAAM;EAC9BE,IAAA,CAAK,yCAAyC,kBAAY;IACxD,IAAAE,QAAM,GAAAN,YAAW;IACjB,MAAM,IAAIO,OAAA,CAAc,UAACC,OAAS,EAAAC,MAAW;MAC3CH,QAAA,CAASI,IAAA,CAAK,SAASD,MAAM;MAC7BH,QAAA,CAASK,MAAA,CAAO,GAAG,aAAaH,OAAO;IACzC,CAAC;IACD,IAAAI,OAAM,GAAAN,QAAU,CAAAM,OAAS;IACzB,IAAI,CAACA,OAAA,IAAW,OAAOA,OAAA,KAAY,UAAU,MAAM,IAAIC,KAAA,CAAM,mBAAmB;IAEhF,IAAAC,GAAM,OAAMb,IAAI,GAAKc,GAAE,UAAI,YAAYC,OAAY;MACnD,OAAMA,OAAA,CAAAC,IAAA;IAAA,EACJ;IACF,MAAEd,MAAQ,CAAAE,aAAgB,CAAAS,GAAA,EAAM;MAEhCI,IAAM,aAAI;MAAcC,IAAC,EAAAP,OAAS,CAAAO;IAElC,IAAAC,OAAA,CAAAC,aAAA;MACDC,IAAA;IAED;IACE,MAAM,IAAAf,OAAA,WAAcC,OAAa,EAAAC,MAAA;MACjC,OAAMH,QAAI,CAAciB,KAAC,WAASC,KAAA,EAAW;QAC3C,OAAAA,KAAY,GAAKf,MAAA,CAAAe,KAAS,IAAMhB,OAAA;MAChC;IACF,CAAC;EACD;EACAJ,IAAA,6DAA6D,oBAAmB;IAChF,IAAAqB,WAAU,GAAAzB,YAAA;IAAA,MAAe,IAAAO,OAAS,WAChCC,OAAA,EAAYC,MAAO;MACrBgB,WAAA,CAAAf,IAAA,UAAAD,MAAA;MAEAgB,WAAY,CAAAd,MAAI,CAAK,GAAE,aAAAH,OAAA;IAAA,EAAI;IAAA,IAAUI,OAAA,GAAAa,WAC3B,CAAAb,OAAK;IACf,KAAAA,OAAA,WAAAA,OAAA,yBAAAC,KAAA;IACA,MAAM,IAAAN,OAAU,WAAAC,OAAc,EAAKC,MAAE,EAAM;MAC3C,OAAMgB,WAAmB,CAAAF,KAAA,WAASC,KAAW;QAC3C,OAAMA,KAAA,GAAAf,MAAiB,CAAAe,KAAI,IAAAhB,OAAA;MAC3B;IACE;IACE,IAAAM,GAAA,OAAMb,IAAA,GAAAc,GAAW,QAAM,YAAMC,OAAA;MAAyC,OACpEA,OAAA,CAASC,IAAE,CAAAD,OAAA,CAAAU,GAAA,CAAAC,MAAA,sBAAqC;IAAA;IAElD,IAAAC,OAAA,GAAOvB,aAAM,CAASS,GAAA,EAAK;MAC3BI,IAAA,aAAQ;MAAAC,IACV,EAAAP,OAAS,CAAAO;IACP;IAAgD,UAC3CZ,OAAA,WAAWC,OAAS,EAAAC,MAAA;MAAA,IAC3BoB,SAAA,GAAAC,IAAA,CAAAC,GAAA;MACF,IAAAC,KAAA,kBAAAA,CAAA;QACA,IAAK;UACN,IAAAC,QAAA,SAAAC,KAAA,qBAAAtB,OAAA,CAAAO,IAAA;YACKgB,OAAA,EAAW;cACV,qBAAqB;YAC5B;UACM;UACPhC,MAAA,OAAA8B,QAAA,CAAAhB,IAAA,IAAAmB,IAAA;UACF5B,OAAA","ignoreList":[]}

package/dist/utils/state.mjs

@@ -1,4 +1,6 @@
 import FSExtra from "fs-extra";
+import { randomUUID } from "node:crypto";
+import { rename, rm } from "node:fs/promises";
 import { join } from "node:path";
 async function readState(cacheDir) {
   const statePath = join(cacheDir, "state.json");
@@ -11,8 +13,16 @@ async function readState(cacheDir) {
 }
 async function writeState(cacheDir, state) {
   const statePath = join(cacheDir, "state.json");
+  const pendingStatePath = `${statePath}.${process.pid}.${randomUUID()}.tmp`;
   await FSExtra.ensureDir(cacheDir);
-  await FSExtra.writeJSON(statePath, state);
+  try {
+    await FSExtra.writeJSON(pendingStatePath, state);
+    await rename(pendingStatePath, statePath);
+  } finally {
+    await rm(pendingStatePath, {
+      force: true
+    });
+  }
 }
 export { readState, writeState };
 //# sourceMappingURL=state.mjs.map

package/dist/utils/state.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["FSExtra","join","readState","cacheDir","statePath","state","pathExists","readJSON","writeState","ensureDir","writeJSON"],"sources":["../../src/utils/state.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAOA,OAAA,MAAa;AACpB,SAASC,IAAA,QAAY;AAMrB,eAAsBC,UAAUC,QAAA,EAAkB;EAChD,MAAMC,SAAA,GAAYH,IAAA,CAAKE,QAAA,EAAU,YAAY;EAC7C,IAAI;IACF,MAAME,KAAA,GAAgB,OAAML,OAAA,CAAQM,UAAA,CAAWF,SAAS,KACpD,MAAMJ,OAAA,CAAQO,QAAA,CAASH,SAAS,IAChC,CAAC;IACL,OAAOC,KAAA;EACT,QAAQ;IAEN,OAAO,CAAC;EACV;AACF;AAEA,eAAsBG,WAAWL,QAAA,EAAkBE,KAAA,EAAc;EAC/D,MAAMD,SAAA,GAAYH,IAAA,CAAKE,QAAA,EAAU,YAAY;EAC7C,MAAMH,OAAA,CAAQS,SAAA,CAAUN,QAAQ;EAChC,MAAMH,OAAA,CAAQU,SAAA,CAAUN,SAAA,EAAWC,KAAK;AAC1C","ignoreList":[]}
+{"version":3,"names":["FSExtra","randomUUID","rename","rm","join","readState","cacheDir","statePath","state","pathExists","readJSON","writeState","pendingStatePath","process","pid","ensureDir","writeJSON","force"],"sources":["../../src/utils/state.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAOA,OAAA,MAAa;AACpB,SAASC,UAAA,QAAkB;AAC3B,SAASC,MAAA,EAAQC,EAAA,QAAU;AAC3B,SAASC,IAAA,QAAY;AAMrB,eAAsBC,UAAUC,QAAA,EAAkB;EAChD,MAAMC,SAAA,GAAYH,IAAA,CAAKE,QAAA,EAAU,YAAY;EAC7C,IAAI;IACF,MAAME,KAAA,GAAgB,OAAMR,OAAA,CAAQS,UAAA,CAAWF,SAAS,KACpD,MAAMP,OAAA,CAAQU,QAAA,CAASH,SAAS,IAChC,CAAC;IACL,OAAOC,KAAA;EACT,QAAQ;IAEN,OAAO,CAAC;EACV;AACF;AAEA,eAAsBG,WAAWL,QAAA,EAAkBE,KAAA,EAAc;EAC/D,MAAMD,SAAA,GAAYH,IAAA,CAAKE,QAAA,EAAU,YAAY;EAC7C,MAAMM,gBAAA,GAAmB,GAAGL,SAAS,IAAIM,OAAA,CAAQC,GAAG,IAAIb,UAAA,CAAW,CAAC;EACpE,MAAMD,OAAA,CAAQe,SAAA,CAAUT,QAAQ;EAChC,IAAI;IACF,MAAMN,OAAA,CAAQgB,SAAA,CAAUJ,gBAAA,EAAkBJ,KAAK;IAC/C,MAAMN,MAAA,CAAOU,gBAAA,EAAkBL,SAAS;EAC1C,UAAE;IACA,MAAMJ,EAAA,CAAGS,gBAAA,EAAkB;MAAEK,KAAA,EAAO;IAAK,CAAC;EAC5C;AACF","ignoreList":[]}

package/dist/utils/state.native.js

@@ -1,4 +1,6 @@
 import FSExtra from "fs-extra";
+import { randomUUID } from "crypto";
+import { rename, rm } from "fs/promises";
 import { join } from "path";
 async function readState(cacheDir) {
   var statePath = join(cacheDir, "state.json");
@@ -11,8 +13,16 @@ async function readState(cacheDir) {
 }
 async function writeState(cacheDir, state) {
   var statePath = join(cacheDir, "state.json");
+  var pendingStatePath = `${statePath}.${process.pid}.${randomUUID()}.tmp`;
   await FSExtra.ensureDir(cacheDir);
-  await FSExtra.writeJSON(statePath, state);
+  try {
+    await FSExtra.writeJSON(pendingStatePath, state);
+    await rename(pendingStatePath, statePath);
+  } finally {
+    await rm(pendingStatePath, {
+      force: true
+    });
+  }
 }
 export { readState, writeState };
 //# sourceMappingURL=state.native.js.map

package/dist/utils/state.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["FSExtra","join","readState","cacheDir","statePath","state","pathExists","readJSON","unused","writeState","ensureDir","writeJSON"],"sources":["../../src/utils/state.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAOA,OAAA,MAAa;AACpB,SAASC,IAAA,QAAY;AAMrB,eAAsBC,UAAUC,QAAA,EAAkB;EAChD,IAAAC,SAAM,GAAAH,IAAY,CAAAE,QAAK,cAAU;EACjC,IAAI;IACF,IAAAE,KAAM,UAAgBL,OAAM,CAAAM,UAAQ,CAAAF,SAAW,KAAS,MACpDJ,OAAM,CAAAO,QAAQ,CAAAH,SAAS,IAAS,EAChC;IACJ,OAAOC,KAAA;EACT,SAAQG,MAAA;IAEN,OAAO,CAAC;EACV;AACF;AAEA,eAAsBC,WAAWN,QAAA,EAAkBE,KAAA,EAAc;EAC/D,IAAAD,SAAM,GAAAH,IAAY,CAAAE,QAAK,cAAU;EACjC,MAAMH,OAAA,CAAQU,SAAA,CAAUP,QAAQ;EAChC,MAAMH,OAAA,CAAQW,SAAA,CAAUP,SAAA,EAAWC,KAAK;AAC1C","ignoreList":[]}
+{"version":3,"names":["FSExtra","randomUUID","rename","rm","join","readState","cacheDir","statePath","state","pathExists","readJSON","unused","writeState","pendingStatePath","process","pid","ensureDir","writeJSON","force"],"sources":["../../src/utils/state.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAOA,OAAA,MAAa;AACpB,SAASC,UAAA,QAAkB;AAC3B,SAASC,MAAA,EAAQC,EAAA,QAAU;AAC3B,SAASC,IAAA,QAAY;AAMrB,eAAsBC,UAAUC,QAAA,EAAkB;EAChD,IAAAC,SAAM,GAAAH,IAAY,CAAAE,QAAK,cAAU;EACjC,IAAI;IACF,IAAAE,KAAM,UAAgBR,OAAM,CAAAS,UAAQ,CAAAF,SAAW,KAAS,MACpDP,OAAM,CAAAU,QAAQ,CAAAH,SAAS,IAAS,EAChC;IACJ,OAAOC,KAAA;EACT,SAAQG,MAAA;IAEN,OAAO,CAAC;EACV;AACF;AAEA,eAAsBC,WAAWN,QAAA,EAAkBE,KAAA,EAAc;EAC/D,IAAAD,SAAM,GAAAH,IAAY,CAAAE,QAAK,cAAU;EACjC,IAAAO,gBAAM,MAAmBN,SAAG,IAASO,OAAI,CAAAC,GAAQ,IAAGd,UAAI,QAAY;EACpE,MAAMD,OAAA,CAAQgB,SAAA,CAAUV,QAAQ;EAChC,IAAI;IACF,MAAMN,OAAA,CAAQiB,SAAA,CAAUJ,gBAAA,EAAkBL,KAAK;IAC/C,MAAMN,MAAA,CAAOW,gBAAA,EAAkBN,SAAS;EAC1C,UAAE;IACA,MAAMJ,EAAA,CAAGU,gBAAA,EAAkB;MAC7BK,KAAA;IACF","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxrn",
-  "version": "1.21.6",
+  "version": "1.21.7",
   "sideEffects": false,
   "type": "module",
   "exports": {
@@ -60,16 +60,16 @@
     "@expo/config-plugins": "~55.0.6",
     "@hono/node-server": "^1.19.14",
     "@react-native/dev-middleware": "^0.83.4",
-    "@vxrn/compiler": "1.21.6",
-    "@vxrn/debug": "1.21.6",
-    "@vxrn/query-string": "1.21.6",
-    "@vxrn/resolve": "1.21.6",
-    "@vxrn/safe-area": "1.21.6",
-    "@vxrn/url-parse": "1.21.6",
-    "@vxrn/utils": "1.21.6",
-    "@vxrn/vendor": "1.21.6",
-    "@vxrn/vite-flow": "1.21.6",
-    "@vxrn/vite-plugin-metro": "1.21.6",
+    "@vxrn/compiler": "1.21.7",
+    "@vxrn/debug": "1.21.7",
+    "@vxrn/query-string": "1.21.7",
+    "@vxrn/resolve": "1.21.7",
+    "@vxrn/safe-area": "1.21.7",
+    "@vxrn/url-parse": "1.21.7",
+    "@vxrn/utils": "1.21.7",
+    "@vxrn/vendor": "1.21.7",
+    "@vxrn/vite-flow": "1.21.7",
+    "@vxrn/vite-plugin-metro": "1.21.7",
     "citty": "^0.1.6",
     "dotenv": "^17.2.1",
     "dotenv-expand": "^12.0.2",

package/src/config/getOptionsFilled.ts

@@ -5,7 +5,7 @@ import { join } from 'node:path'
 import { readPackageJSON } from 'pkg-types'
 import type { Mode, VXRNOptions } from '../types'
 import { getServerOptionsFilled } from './getServerOptionsFilled'
-import { readState, writeState } from '../utils/state'
+import { readState } from '../utils/state'
 import { getCacheDir } from '../utils/getCacheDir'
 
 const require = createRequire(import.meta.url)
@@ -71,9 +71,6 @@ export async function fillOptions(
       ? 'vite'
       : false
 
-  // no need to wait to write state
-  void writeState(cacheDir, { versionHash })
-
   if (typeof options.build?.server !== 'boolean' && !options.build?.server) {
     // default building server to off
     options.build ||= {}
@@ -106,6 +103,7 @@ export async function fillOptions(
     state,
     packageRootDir,
     cacheDir,
+    versionHash,
   } as const
 
   optionsFilled = final

package/src/exports/clean.test.ts

@@ -0,0 +1,82 @@
+import { execFile } from 'node:child_process'
+import { mkdtemp, mkdir, readFile, rm, writeFile } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { dirname, join } from 'node:path'
+import { pathToFileURL } from 'node:url'
+import { promisify } from 'node:util'
+import { afterEach, describe, expect, it } from 'vitest'
+
+const execFileAsync = promisify(execFile)
+
+describe('prepareCacheForVersion', () => {
+  let root: string | undefined
+
+  afterEach(async () => {
+    if (root) {
+      await rm(root, { recursive: true, force: true })
+    }
+  })
+
+  it('lets one process clean a stale same-root cache', async () => {
+    root = await mkdtemp(join(tmpdir(), 'vxrn-concurrent-clean-'))
+    const cacheDir = join(root, 'node_modules', '.vxrn')
+    const viteDir = join(root, 'node_modules', '.vite')
+    const participantsDir = join(root, 'participants')
+    const participantCount = 4
+
+    await Promise.all([
+      mkdir(cacheDir, { recursive: true }),
+      mkdir(viteDir, { recursive: true }),
+      mkdir(participantsDir, { recursive: true }),
+    ])
+    await Promise.all([
+      writeFile(join(cacheDir, 'state.json'), JSON.stringify({ versionHash: 'old' })),
+      writeFile(join(cacheDir, 'stale'), 'stale'),
+      writeFile(join(viteDir, 'stale'), 'stale'),
+    ])
+
+    const moduleUrl = pathToFileURL(join(dirname(import.meta.filename), 'clean.ts')).href
+    const workerScript = (participant: number) => `
+      import { readdir, writeFile } from 'node:fs/promises'
+      import { join } from 'node:path'
+      import { prepareCacheForVersion } from ${JSON.stringify(moduleUrl)}
+
+      const root = ${JSON.stringify(root)}
+      const participantsDir = ${JSON.stringify(participantsDir)}
+      await writeFile(join(participantsDir, ${JSON.stringify(String(participant))}), '')
+      while ((await readdir(participantsDir)).length < ${participantCount}) {
+        await Bun.sleep(5)
+      }
+      const cleaned = await prepareCacheForVersion({
+        root,
+        cacheDir: join(root, 'node_modules', '.vxrn'),
+        versionHash: 'new',
+      })
+      console.info(cleaned ? 'cleaned-by-worker' : 'cache-already-current')
+    `
+
+    const results = await Promise.all(
+      Array.from({ length: participantCount }, (_, participant) =>
+        execFileAsync('bun', ['-e', workerScript(participant)], {
+          env: { ...process.env, VXRN_DONT_CLEAN_SELF: '' },
+        })
+      )
+    )
+    const output = results.map(({ stdout }) => stdout).join('\n')
+
+    expect(output.match(/\[vxrn\] cleaning/g)).toHaveLength(1)
+    expect(output.match(/cleaned-by-worker/g)).toHaveLength(1)
+    expect(JSON.parse(await readFile(join(cacheDir, 'state.json'), 'utf8'))).toEqual({
+      versionHash: 'new',
+    })
+    await expect(readFile(join(cacheDir, 'stale'))).rejects.toMatchObject({
+      code: 'ENOENT',
+    })
+    await expect(readFile(join(viteDir, 'stale'))).rejects.toMatchObject({
+      code: 'ENOENT',
+    })
+    await expect(
+      readFile(join(root, 'node_modules', '.vxrn-clean.lock'))
+    ).rejects.toMatchObject({ code: 'ENOENT' })
+  }, 20_000)
+})