@arkstack/console 0.17.17 → 0.17.19

package/dist/index.js

@@ -11,6 +11,7 @@ import { Arkstack } from "@arkstack/contract";
 import { MakeResource, applyRuntimeConfig, getDefaultConfig } from "resora";
 import { Command, Kernel } from "@h3ravel/musket";
 import { spawn } from "node:child_process";
+import ngrok from "@ngrok/ngrok";
 import { randomBytes } from "node:crypto";
 import { resolve as resolve$1 } from "path";
 import { writeFile } from "fs/promises";
@@ -61,6 +62,16 @@ var DevCommand = class DevCommand extends Command {
 		const vars = DevCommand.devServerEnv(this.options());
 		const rootDir = Arkstack.rootDir();
 		const bin = DevCommand.resolveTsdownBin(rootDir);
+		let tunnel;
+		if (this.option?.("tunnel")) {
+			tunnel = await ngrok.forward({
+				addr: Number(env("APP_PORT", env("PORT", 3e3))),
+				authtoken: env("NGROK_AUTHTOKEN"),
+				domain: env("NGROK_DOMAIN")
+			});
+			const url = tunnel.url();
+			if (url) vars.TUNNEL_URL = url;
+		}
 		const [command, args] = bin ? [process.execPath, [
 			bin,
 			"--log-level",
@@ -71,23 +82,27 @@ var DevCommand = class DevCommand extends Command {
 			"--log-level",
 			"silent"
 		]];
-		await new Promise((resolve, reject) => {
-			const child = spawn(command, args, {
-				cwd: rootDir,
-				stdio: "inherit",
-				env: Object.assign(process.env, vars)
-			});
-			child.on("error", (error) => {
-				reject(error);
-			});
-			child.on("exit", (code) => {
-				if (code === 0 || code === null) {
-					resolve();
-					return;
-				}
-				reject(/* @__PURE__ */ new Error(`tsdown exited with code ${code}`));
+		try {
+			await new Promise((resolve, reject) => {
+				const child = spawn(command, args, {
+					cwd: rootDir,
+					stdio: "inherit",
+					env: Object.assign({}, process.env, vars)
+				});
+				child.on("error", (error) => {
+					reject(error);
+				});
+				child.on("exit", (code) => {
+					if (code === 0 || code === null) {
+						resolve();
+						return;
+					}
+					reject(/* @__PURE__ */ new Error(`tsdown exited with code ${code}`));
+				});
 			});
-		});
+		} finally {
+			await tunnel?.close();
+		}
 	}
 	/**
 	* Resolve the absolute path to tsdown's executable so it can be run directly
@@ -112,7 +127,8 @@ var DevCommand = class DevCommand extends Command {
 	*
 	* The dev server binds `127.0.0.1` by default so it is local-only; `--host`
 	* switches it to `0.0.0.0` to expose it on the local network. `--secure` flags
-	* the driver to serve HTTPS, and `--tunnel` enables the Ngrok tunnel.
+	* the driver to serve HTTPS. The command itself owns the Ngrok tunnel so
+	* watcher-driven application restarts cannot replace its public URL.
 	* 
 	* @param options 
 	* @returns 
@@ -120,9 +136,9 @@ var DevCommand = class DevCommand extends Command {
 	static devServerEnv(options) {
 		const vars = {
 			NODE_ENV: "development",
-			APP_HOST: options.host ? "0.0.0.0" : "127.0.0.1"
+			APP_HOST: options.host ? "0.0.0.0" : "127.0.0.1",
+			ARKSTACK_ENV_RELOAD: "true"
 		};
-		if (options.tunnel) vars.TUNNEL = "true";
 		if (options.secure) vars.APP_SECURE = "true";
 		return vars;
 	}

package/dist/prepare.js

@@ -73,6 +73,8 @@ var ArkormArtifacts = class ArkormArtifacts {
 
 //#endregion
 //#region dist/prepare.js
+if (!globalThis.env) globalThis.env = (await import("@arkstack/common")).env;
+if (!globalThis.config) globalThis.config = (await import("@arkstack/common")).config;
 if (!existsSync(path.join(Arkstack.rootDir(), ".arkstack/build"))) mkdirSync(path.join(Arkstack.rootDir(), ".arkstack/build"), { recursive: true });
 if (!process.env.NODE_CI) {
 	BuildInterfaces.configs();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkstack/console",
-  "version": "0.17.17",
+  "version": "0.17.19",
   "type": "module",
   "description": "Console module for Arkstack, providing the command-line runtime and console integration layer.",
   "homepage": "https://arkstack.toneflix.net/guide/cli",
@@ -42,16 +42,17 @@
   "peerDependencies": {
     "arkormx": "^2.12.8",
     "clear-router": "^2.9.3",
-    "@arkstack/database": "^0.17.17"
+    "@arkstack/database": "^0.17.19"
   },
   "dependencies": {
+    "@ngrok/ngrok": "^1.7.0",
     "@h3ravel/musket": "^2.2.13",
     "@h3ravel/support": "^2.2.7",
     "chalk": "^5.6.2",
     "resora": "^1.3.34",
     "ts-morph": "^28.0.0",
-    "@arkstack/common": "^0.17.17",
-    "@arkstack/contract": "^0.17.17"
+    "@arkstack/common": "^0.17.19",
+    "@arkstack/contract": "^0.17.19"
   },
   "peerDependenciesMeta": {
     "@arkstack/database": {