@wervt/cli 0.1.0 → 0.2.1

package/dist/index.mjs

@@ -1,6 +1,7 @@
 import { existsSync } from "node:fs";
-import { mkdir, readFile, readdir, stat, writeFile } from "node:fs/promises";
+import { appendFile, mkdir, readFile, readdir, stat, writeFile } from "node:fs/promises";
 import { dirname, join, relative, resolve } from "node:path";
+import { styleText } from "node:util";
 import * as p from "@clack/prompts";
 import { defineCommand, runMain } from "citty";
 import { detectPackageManager } from "nypm";
@@ -70,6 +71,52 @@ async function saveConfig(config) {
 	return file;
 }
 //#endregion
+//#region src/source.ts
+async function git(dir, ...args) {
+	try {
+		const result = await x("git", args, {
+			nodeOptions: { cwd: dir },
+			throwOnError: false
+		});
+		return result.exitCode === 0 ? result.stdout.trim() || void 0 : void 0;
+	} catch {
+		return;
+	}
+}
+/** `git@github.com:owner/repo.git` and `https://…/repo.git` as `https://github.com/owner/repo`. */
+function webUrl(remote) {
+	if (!remote) return void 0;
+	const ssh = remote.match(/^(?:ssh:\/\/)?git@([^:/]+)[:/](.+?)(?:\.git)?$/);
+	if (ssh) return `https://${ssh[1]}/${ssh[2]}`;
+	const https = remote.match(/^https:\/\/(?:[^@/]+@)?(.+?)(?:\.git)?$/);
+	return https ? `https://${https[1]}` : void 0;
+}
+async function deploySource(dir) {
+	const env = process.env;
+	const message = await git(dir, "log", "-1", "--format=%s");
+	if (env.GITHUB_ACTIONS === "true") {
+		const repo = `${env.GITHUB_SERVER_URL}/${env.GITHUB_REPOSITORY}`;
+		return {
+			commit: env.GITHUB_SHA,
+			branch: env.GITHUB_HEAD_REF || env.GITHUB_REF_NAME,
+			message,
+			repo,
+			actor: env.GITHUB_ACTOR,
+			run: `${repo}/actions/runs/${env.GITHUB_RUN_ID}`
+		};
+	}
+	const status = await git(dir, "status", "--porcelain", "--", ".");
+	const commit = await git(dir, "rev-parse", "HEAD");
+	return {
+		commit,
+		branch: await git(dir, "branch", "--show-current"),
+		message,
+		dirty: commit ? Boolean(status) : void 0,
+		repo: webUrl(await git(dir, "remote", "get-url", "origin")),
+		actor: await git(dir, "config", "user.name")
+	};
+}
+//#endregion
 //#region src/index.ts
 const connection = {
 	url: {
@@ -78,7 +125,7 @@ const connection = {
 	},
 	token: {
 		type: "string",
-		description: "Deploy token (or WERVT_TOKEN)"
+		description: "Admin, read or deploy token (or WERVT_TOKEN)"
 	}
 };
 async function api(path, flags, init = {}) {
@@ -91,7 +138,12 @@ async function api(path, flags, init = {}) {
 	});
 	if (!res.ok) {
 		const body = await res.text();
-		throw new Error(`${res.status} ${res.statusText}: ${body}`);
+		let message = body;
+		try {
+			message = JSON.parse(body).error ?? body;
+		} catch {}
+		console.error(styleText("red", `Error (${res.status}): ${message}`));
+		process.exit(1);
 	}
 	return res;
 }
@@ -152,9 +204,13 @@ const deploy = defineCommand({
 		const bundle = await createBundle(dir);
 		spinner.stop(`Packed ${bundle.files} files (${(bundle.data.byteLength / 1024).toFixed(0)} kB)`);
 		spinner.start("Uploading");
+		const source = await deploySource(dir);
 		const res = await api(`/v1/apps/${name}/deploys`, args, {
 			method: "POST",
-			headers: { "content-type": "application/gzip" },
+			headers: {
+				"content-type": "application/gzip",
+				"x-wervt-source": encodeURIComponent(JSON.stringify(source))
+			},
 			body: new Uint8Array(bundle.data)
 		});
 		const labels = {
@@ -178,6 +234,7 @@ const deploy = defineCommand({
 				if (event.done) {
 					spinner.stop(`Release ${event.release}`);
 					p.outro(`Deployed → ${event.url}`);
+					if (process.env.GITHUB_OUTPUT) await appendFile(process.env.GITHUB_OUTPUT, `url=${event.url}\nrelease=${event.release}\n`);
 					return;
 				}
 				spinner.message(labels[event.step] ?? event.step);
@@ -230,7 +287,18 @@ const releases = defineCommand({
 	},
 	async run({ args }) {
 		const info = await (await api(`/v1/apps/${args.app}`, args)).json();
-		for (const release of [...info.releases].reverse()) console.log(`${release}${release === info.release ? "  (active)" : ""}`);
+		const history = new Map(info.history?.map((entry) => [entry.release, entry]));
+		for (const release of [...info.releases].reverse()) {
+			const { source, deployedBy } = history.get(release) ?? {};
+			const details = [
+				source?.commit ? `${source.commit.slice(0, 7)}${source.dirty ? "+" : ""}` : void 0,
+				source?.branch,
+				source?.actor ?? deployedBy,
+				source?.message && styleText("dim", source.message)
+			].filter(Boolean);
+			const active = release === info.release ? styleText("green", " (active)") : "";
+			console.log(`${release}${active}${details.length ? `  ${details.join("  ")}` : ""}`);
+		}
 	}
 });
 const activate = defineCommand({
@@ -372,7 +440,53 @@ const env = defineCommand({
 			})
 		}) : await api(`/v1/apps/${args.app}/env`, args)).json();
 		console.log(keys.length ? keys.join("\n") : "No variables set.");
-		if (Object.keys(set).length || unset.length) console.log("Applies to newly started isolates (next deploy or after idle timeout).");
+		if (Object.keys(set).length || unset.length) console.log("Applies from the next request.");
+	}
+});
+const tokens = defineCommand({
+	meta: {
+		name: "tokens",
+		description: "List, create or revoke an app's deploy tokens (for CI)"
+	},
+	args: {
+		app: {
+			type: "positional",
+			required: true,
+			description: "App name"
+		},
+		create: {
+			type: "string",
+			description: "Create a token with this name, e.g. github"
+		},
+		revoke: {
+			type: "string",
+			description: "Revoke the token with this id"
+		},
+		...connection
+	},
+	async run({ args }) {
+		const path = `/v1/apps/${args.app}/tokens`;
+		if (args.create) {
+			const token = await (await api(path, args, {
+				method: "POST",
+				headers: { "content-type": "application/json" },
+				body: JSON.stringify({ name: args.create })
+			})).json();
+			console.error(`Deploy token "${token.name}" for ${args.app} (shown once):`);
+			console.log(token.token);
+			console.error(styleText("dim", "It can deploy this app and nothing else. Store it as the WERVT_TOKEN secret."));
+			return;
+		}
+		if (args.revoke) {
+			await api(`${path}/${args.revoke}`, args, { method: "DELETE" });
+			return console.log(`Revoked ${args.revoke}`);
+		}
+		const list = await (await api(path, args)).json();
+		if (!list.length) return console.log(`No deploy tokens for ${args.app}.`);
+		for (const token of list) {
+			const used = token.lastUsedAt ? `used ${token.lastUsedAt.slice(0, 10)}` : "never used";
+			console.log(`${token.id}  ${token.name.padEnd(20)} created ${token.createdAt.slice(0, 10)}  ${used}`);
+		}
 	}
 });
 const remove = defineCommand({
@@ -409,6 +523,83 @@ const remove = defineCommand({
 		console.log(`Deleted ${args.app}${dropDb ? " and its database" : ""}`);
 	}
 });
+const LEVEL_COLORS = {
+	error: "red",
+	warn: "yellow",
+	info: "cyan",
+	debug: "gray"
+};
+/** `09:07:52.060 error  <message>`, or the entry as one JSON line. */
+function printLog(entry, asJson) {
+	if (asJson) return console.log(JSON.stringify(entry));
+	const time = new Date(entry._time).toISOString().slice(11, 23);
+	const level = String(entry.level ?? "info");
+	const color = LEVEL_COLORS[level] ?? "white";
+	console.log(`${styleText("dim", time)} ${styleText(color, level.padEnd(5))} ${entry._msg ?? ""}`);
+}
+const logs = defineCommand({
+	meta: {
+		name: "logs",
+		description: "Show an app's logs: console output, request events and isolate events"
+	},
+	args: {
+		app: {
+			type: "positional",
+			required: true,
+			description: "App name"
+		},
+		query: {
+			type: "positional",
+			required: false,
+			description: "LogsQL filter, e.g. 'level:error' or 'status:>=500' (default: all)"
+		},
+		since: {
+			type: "string",
+			default: "1h",
+			description: "How far back, e.g. 15m, 6h, 2d"
+		},
+		until: {
+			type: "string",
+			description: "End of the range (default: now)"
+		},
+		limit: {
+			type: "string",
+			default: "100",
+			description: "Newest entries to show (max 1000)"
+		},
+		follow: {
+			type: "boolean",
+			alias: "f",
+			description: "Keep printing new entries"
+		},
+		json: {
+			type: "boolean",
+			description: "One JSON object per line, with every field"
+		},
+		...connection
+	},
+	async run({ args }) {
+		const params = new URLSearchParams();
+		if (args.query) params.set("query", args.query);
+		if (args.follow) {
+			params.set("since", args.since);
+			const res = await api(`/v1/apps/${args.app}/logs/tail?${params.toString()}`, args);
+			let rest = "";
+			for await (const chunk of res.body.pipeThrough(new TextDecoderStream())) {
+				const lines = (rest + chunk).split("\n");
+				rest = lines.pop() ?? "";
+				for (const line of lines) if (line) printLog(JSON.parse(line), Boolean(args.json));
+			}
+			return;
+		}
+		params.set("start", args.since);
+		if (args.until) params.set("end", args.until);
+		params.set("limit", args.limit);
+		const entries = await (await api(`/v1/apps/${args.app}/logs?${params.toString()}`, args)).json();
+		if (!entries.length && !args.json) return console.error(`No logs in the last ${args.since}.`);
+		for (const entry of entries.reverse()) printLog(entry, Boolean(args.json));
+	}
+});
 const login = defineCommand({
 	meta: {
 		name: "login",
@@ -423,12 +614,12 @@ const login = defineCommand({
 		token: {
 			type: "string",
 			required: true,
-			description: "Deploy token"
+			description: "Admin, read or deploy token"
 		}
 	},
 	async run({ args }) {
 		const res = await fetch(`${args.url.replace(/\/$/, "")}/v1/apps`, { headers: { authorization: `Bearer ${args.token}` } });
-		if (!res.ok) throw new Error(`Login failed: ${res.status} ${res.statusText}`);
+		if (!res.ok && res.status !== 403) throw new Error(`Login failed: ${res.status} ${res.statusText}`);
 		const file = await saveConfig({
 			url: args.url,
 			token: args.token
@@ -445,11 +636,13 @@ runMain(defineCommand({
 		deploy,
 		apps,
 		releases,
+		logs,
 		activate,
 		rollback,
 		reprovision,
 		access,
 		env,
+		tokens,
 		delete: remove,
 		login
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wervt/cli",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "description": "Deploy and manage apps on wervt.",
   "keywords": [
     "agents",