@mx-space/cli 0.6.6 → 0.6.8

package/dist/bin/mxs.mjs

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
-import { t as run } from "../mxs-DUkVdHhE.mjs";
+import { t as run } from "../mxs-CCNd5SIa.mjs";
 export { run };

package/dist/index.mjs

@@ -1,2 +1,2 @@
-import { a as defaultMessageFor, c as tagToCode, i as codeForTag, l as toErrorEnvelope, n as defaultGlobalFlags, o as exitCodeForError, r as parseGlobalFlags, s as exitCodeForTag, t as run } from "./mxs-DUkVdHhE.mjs";
+import { a as defaultMessageFor, c as tagToCode, i as codeForTag, l as toErrorEnvelope, n as defaultGlobalFlags, o as exitCodeForError, r as parseGlobalFlags, s as exitCodeForTag, t as run } from "./mxs-CCNd5SIa.mjs";
 export { codeForTag, defaultGlobalFlags, defaultMessageFor, exitCodeForError, exitCodeForTag, parseGlobalFlags, run, tagToCode, toErrorEnvelope };

package/dist/{mxs-DUkVdHhE.mjs → mxs-CCNd5SIa.mjs}

@@ -9821,6 +9821,8 @@ const parseApiUrl = (input) => gen(function* () {
 		baseUrl: match[1],
 		apiVersion: Number(match[2])
 	};
+	const apiSuffix = url.match(/^(.*)\/api$/);
+	if (apiSuffix) return { baseUrl: apiSuffix[1] };
 	return { baseUrl: url };
 });
 const PROFILES_SUBDIR = "profiles";
@@ -10042,7 +10044,7 @@ var Config = class Config extends Tag$2("Config")() {
 };
 //#endregion
 //#region src/services/Auth.ts
-const SUPPORTED_API_VERSIONS = [2];
+const SUPPORTED_API_VERSIONS = [3, 2];
 var Auth = class Auth extends Tag$2("Auth")() {
 	/** Build the Auth Layer; depends on `Config` and `HttpClient`. */
 	static Default = effect(Auth, gen(function* () {
@@ -10112,13 +10114,19 @@ function makeAuthService(http, config) {
 			version: null
 		}];
 		let lastTransport = null;
+		const attempted = [];
 		for (const cand of candidates) {
-			const result = yield* sendJson(`${apiUrl}${cand.prefix}/ok`, "GET", void 0, { accept: "application/json" }).pipe(either);
+			const probeUrl = `${apiUrl}${cand.prefix}/ok`;
+			const result = yield* sendJson(probeUrl, "GET", void 0, { accept: "application/json" }).pipe(either);
 			if (result._tag === "Left") {
 				lastTransport = result.left;
 				continue;
 			}
 			const res = result.right;
+			attempted.push({
+				url: probeUrl,
+				status: res.status
+			});
 			if (res.status >= 200 && res.status < 300) {
 				const apiVersion = cand.version ?? SUPPORTED_API_VERSIONS[0];
 				return {
@@ -10132,7 +10140,7 @@ function makeAuthService(http, config) {
 		if (lastTransport && lastTransport._tag !== "Generic") return yield* fail$2(lastTransport);
 		return yield* fail$2(new AuthProbe({
 			message: "cannot detect auth endpoint",
-			hint: "verify the URL points at a running mx-core server"
+			hint: `tried: ${attempted.length > 0 ? attempted.map((a) => `${a.url} → ${a.status}`).join(", ") : "no responses"}. supply the site root (e.g. https://blog.example.com), not the API path. verify the server is reachable and runs a supported API version (${SUPPORTED_API_VERSIONS.join(", ")}).`
 		}));
 	});
 	const requestDeviceCode = (authBase, clientId, scope = "openid profile email") => gen(function* () {
@@ -27517,10 +27525,20 @@ const login = make$13("login", { production: production$1 }, ({ production }) =>
 		targetProfile = flagProfile?.trim() || (yield* config.readCurrent);
 	}
 	yield* renderer.emitInfoBlock(({ color }) => `${arrow(`probing ${apiUrl}…`, color)}`);
-	const probeResult = yield* auth.probe(apiUrl).pipe(mapError((e) => new Generic({
-		message: e.message ?? "auth probe failed",
-		cause: e
-	})));
+	const probeResult = yield* auth.probe(apiUrl).pipe(catchTags({
+		NetworkTimeout: (e) => fail$2(new Generic({
+			message: e.message ?? "auth probe failed",
+			cause: e
+		})),
+		NetworkDns: (e) => fail$2(new Generic({
+			message: e.message ?? "auth probe failed",
+			cause: e
+		})),
+		NetworkRefused: (e) => fail$2(new Generic({
+			message: e.message ?? "auth probe failed",
+			cause: e
+		}))
+	}));
 	const code = yield* auth.requestDeviceCode(probeResult.authBase, DEFAULT_CLIENT_ID);
 	yield* renderer.emitInfoBlock(({ color }) => {
 		const ttl = humanDuration(code.expires_in);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mx-space/cli",
-  "version": "0.6.6",
+  "version": "0.6.8",
   "description": "Command line interface for mx-space (mx-core) — auth, content, configuration",
   "keywords": [
     "mx-space",