vmsan 0.1.0-alpha.16 → 0.1.0-alpha.18

package/dist/_chunks/connect.mjs

@@ -29,11 +29,9 @@ const connectCommand = defineCommand({
 		const paths = vmsanPaths();
 		try {
 			const { state, guestIp, port } = resolveVmState(args.vmId, paths);
-			const log = consola.withTag(args.vmId);
 			consola.debug(`Agent endpoint: ${guestIp}:${port}`);
-			log.start("Waiting for agent to become ready...");
+			consola.debug("Waiting for agent to become ready...");
 			await waitForAgent(guestIp, port);
-			log.success("Agent is ready. Connecting via PTY shell...");
 			const shell = new ShellSession({
 				host: guestIp,
 				port,

package/dist/_chunks/context.mjs

@@ -1333,6 +1333,7 @@ function generateAgentEnv(token, port, vmId) {
 	return `VMSAN_AGENT_TOKEN=${token}
 VMSAN_AGENT_PORT=${port}
 VMSAN_VM_ID=${vmId}
+VMSAN_DEFAULT_USER=ubuntu
 `;
 }
 /**
@@ -1627,6 +1628,7 @@ const APT_PACKAGES = [
 	"openssh-server",
 	"openssl",
 	"procps",
+	"sudo",
 	"tar",
 	"unzip",
 	"debianutils",
@@ -1648,6 +1650,7 @@ const DNF_PACKAGES = [
 	"openssl",
 	"openssl-libs",
 	"procps",
+	"sudo",
 	"tar",
 	"unzip",
 	"which",
@@ -1655,6 +1658,7 @@ const DNF_PACKAGES = [
 	"zstd"
 ];
 const APK_PACKAGES = [
+	"bash",
 	"bind-tools",
 	"bzip2",
 	"findutils",
@@ -1669,6 +1673,7 @@ const APK_PACKAGES = [
 	"openssh",
 	"openssl",
 	"procps",
+	"sudo",
 	"tar",
 	"unzip",
 	"whois",
@@ -1681,6 +1686,14 @@ RUN if command -v apt-get >/dev/null 2>&1; then ${`apt-get update && apt-get ins
     elif command -v yum >/dev/null 2>&1; then ${`yum install -y ${DNF_PACKAGES.join(" ")} && yum clean all`}; \\
     elif command -v apk >/dev/null 2>&1; then ${`apk add --no-cache ${APK_PACKAGES.join(" ")}`}; \\
     fi
+RUN if command -v apk >/dev/null 2>&1; then \\
+      id -u ubuntu >/dev/null 2>&1 || adduser -D -s /bin/bash ubuntu; \\
+    else \\
+      id -u ubuntu >/dev/null 2>&1 || useradd -m -s /bin/bash ubuntu; \\
+    fi; \\
+    echo 'ubuntu ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/ubuntu; \\
+    chmod 440 /etc/sudoers.d/ubuntu; \\
+    mkdir -p /home/ubuntu/.ssh && chown -R ubuntu:ubuntu /home/ubuntu
 RUN ssh-keygen -A 2>/dev/null || true; \\
     mkdir -p /root/.ssh && chmod 700 /root/.ssh; \\
     if [ -f /etc/ssh/sshd_config ]; then \\

package/dist/_chunks/exec.mjs

@@ -106,19 +106,16 @@ const execCommand = defineCommand({
 			const envVars = parseEnvFlags(command);
 			const { state, guestIp, port, store } = resolveVmState(args.vmId, paths);
 			consola.debug(`Agent endpoint: ${guestIp}:${port}`);
-			const log = consola.withTag(args.vmId);
-			log.start("Waiting for agent...");
+			consola.debug(`Waiting for agent on ${guestIp}:${port}...`);
 			await waitForAgent(guestIp, port);
 			if (args.interactive) {
 				const parts = [];
 				parts.push(`export PS1=${shellEscape(buildVmsanPrompt(args.vmId))} TERM=xterm-256color &&`);
 				if (args.workdir) parts.push(`cd ${shellEscape(args.workdir)} &&`);
 				for (const [key, val] of Object.entries(envVars)) parts.push(`${key}=${shellEscape(val)}`);
-				if (args.sudo) parts.push("sudo");
 				parts.push(shellEscape(command));
 				for (const a of commandArgs) parts.push(shellEscape(a));
-				const injectedCmd = parts.join(" ") + "; exit $?\n";
-				log.success("Agent is ready. Connecting interactive shell...");
+				const injectedCmd = "clear; " + parts.join(" ") + "; exit $?\n";
 				let extender = null;
 				if (!args["no-extend-timeout"] && state.timeoutMs) {
 					extender = new TimeoutExtender({
@@ -133,7 +130,8 @@ const execCommand = defineCommand({
 						host: guestIp,
 						port,
 						token: state.agentToken,
-						initialCommand: injectedCmd
+						initialCommand: injectedCmd,
+						user: args.sudo ? "root" : void 0
 					}).connect();
 				} finally {
 					extender?.stop();
@@ -149,13 +147,12 @@ const execCommand = defineCommand({
 			} else {
 				consola.debug(`exec: ${command} ${commandArgs.join(" ")}`);
 				const agent = new AgentClient(`http://${guestIp}:${port}`, state.agentToken);
-				const cmd = args.sudo ? "sudo" : command;
-				const runArgs = args.sudo ? [command, ...commandArgs] : commandArgs;
 				const params = {
-					cmd,
-					args: runArgs.length > 0 ? runArgs : void 0,
+					cmd: command,
+					args: commandArgs.length > 0 ? commandArgs : void 0,
 					cwd: args.workdir || void 0,
-					env: Object.keys(envVars).length > 0 ? envVars : void 0
+					env: Object.keys(envVars).length > 0 ? envVars : void 0,
+					user: args.sudo ? "root" : void 0
 				};
 				const ac = new AbortController();
 				const onSignal = () => ac.abort();

package/dist/_chunks/shell.mjs

@@ -137,6 +137,7 @@ var ShellSession = class {
 		const url = new URL(`${proto}://${this.opts.host}:${this.opts.port}/ws/shell`);
 		url.searchParams.set("token", this.opts.token);
 		if (this.opts.shell) url.searchParams.set("shell", this.opts.shell);
+		if (this.opts.user) url.searchParams.set("user", this.opts.user);
 		return url.toString();
 	}
 };

package/dist/index.d.mts

@@ -2857,6 +2857,7 @@ interface RunParams {
   env?: Record<string, string>;
   timeoutMs?: number;
   detached?: boolean;
+  user?: string;
 }
 type RunEventType = "started" | "stdout" | "stderr" | "exit" | "timeout" | "error";
 interface RunEvent {
@@ -3043,6 +3044,7 @@ interface ShellSessionOptions {
   shell?: string;
   sessionId?: string;
   initialCommand?: string;
+  user?: string;
 }
 interface ShellCloseInfo {
   /** true when the shell process exited (e.g. user typed `exit`) */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vmsan",
-  "version": "0.1.0-alpha.16",
+  "version": "0.1.0-alpha.18",
   "description": "Firecracker microVM sandbox toolkit",
   "homepage": "https://github.com/angelorc/vmsan",
   "bugs": "https://github.com/angelorc/vmsan/issues",