typescript-virtual-container 1.4.9 → 1.5.1

package/src/VirtualShell/shell.ts

@@ -2,7 +2,7 @@ import type { ChildProcessWithoutNullStreams } from "node:child_process";
 import { readFile, unlink, writeFile } from "node:fs/promises";
 import * as path from "node:path";
 import type { ShellProperties, VirtualShell } from ".";
-import { getCommandNames, makeDefaultEnv, runCommand } from "../commands";
+import { getCommandNames, makeDefaultEnv, runCommand, userHome } from "../commands";
 import {
 	spawnHtopProcess,
 	spawnNanoEditorProcess,
@@ -55,12 +55,12 @@ export function startShell(
 	let history = loadHistory(shell.vfs, authUser);
 	let historyIndex: number | null = null;
 	let historyDraft = "";
-	let cwd = `/home/${authUser}`;
+	let cwd = userHome(authUser);
 	const shellEnv: ShellEnv = makeDefaultEnv(authUser, hostname);
 	let nanoSession: NanoSession | null = null;
 	let pendingSudo: PendingSudo | null = null;
 	const buildCurrentPrompt = (): string => {
-		const homePath = `/home/${authUser}`;
+		const homePath = userHome(authUser);
 		const cwdLabel = cwd === homePath ? "~" : path.posix.basename(cwd) || "/";
 		return buildPrompt(authUser, hostname, cwdLabel);
 	};
@@ -71,7 +71,7 @@ export function startShell(
 
 	// Load .bashrc if it exists
 	void (async () => {
-		const bashrcPath = `/home/${authUser}/.bashrc`;
+		const bashrcPath = `${userHome(authUser)}/.bashrc`;
 		if (shell.vfs.exists(bashrcPath)) {
 			try {
 				const bashrc = shell.vfs.readFile(bashrcPath);
@@ -146,7 +146,7 @@ export function startShell(
 		if (!challenge.commandLine) {
 			authUser = challenge.targetUser;
 			if (challenge.loginShell) {
-				cwd = `/home/${authUser}`;
+				cwd = userHome(authUser);
 			}
 			shell.users.updateSession(sessionId, authUser, remoteAddress);
 			stream.write("\r\n");
@@ -154,7 +154,7 @@ export function startShell(
 			return;
 		}
 
-		const runCwd = challenge.loginShell ? `/home/${challenge.targetUser}` : cwd;
+		const runCwd = challenge.loginShell ? userHome(challenge.targetUser) : cwd;
 		const result = await Promise.resolve(
 			runCommand(
 				challenge.commandLine,
@@ -196,7 +196,7 @@ export function startShell(
 
 		if (result.switchUser) {
 			authUser = result.switchUser;
-			cwd = result.nextCwd ?? `/home/${authUser}`;
+			cwd = result.nextCwd ?? userHome(authUser);
 			shell.users.updateSession(sessionId, authUser, remoteAddress);
 		} else if (result.nextCwd) {
 			cwd = result.nextCwd;
@@ -388,11 +388,11 @@ export function startShell(
 		}
 
 		const data = history.length > 0 ? `${history.join("\n")}\n` : "";
-		shell.vfs.writeFile(`/home/${authUser}/.bash_history`, data);
+		shell.vfs.writeFile(`${userHome(authUser)}/.bash_history`, data);
 	}
 
 	function readLastLogin(): { at: string; from: string } | null {
-		const lastlogPath = `/home/${authUser}/.lastlog.json`;
+		const lastlogPath = `${userHome(authUser)}/.lastlog.json`;
 		if (!shell.vfs.exists(lastlogPath)) {
 			return null;
 		}
@@ -408,7 +408,7 @@ export function startShell(
 	}
 
 	function writeLastLogin(nowIso: string): void {
-		const lastlogPath = `/home/${authUser}/.lastlog`;
+		const lastlogPath = `${userHome(authUser)}/.lastlog`;
 		shell.vfs.writeFile(
 			lastlogPath,
 			JSON.stringify({ at: nowIso, from: remoteAddress }),
@@ -651,7 +651,7 @@ export function startShell(
 
 					if (result.switchUser) {
 						authUser = result.switchUser;
-						cwd = result.nextCwd ?? `/home/${authUser}`;
+						cwd = result.nextCwd ?? userHome(authUser);
 						shell.users.updateSession(sessionId, authUser, remoteAddress);
 						lineBuffer = "";
 						cursorPos = 0;
@@ -686,7 +686,7 @@ export function startShell(
 }
 
 function loadHistory(vfs: VirtualFileSystem, authUser: string): string[] {
-	const historyPath = `/home/${authUser}/.bash_history`;
+	const historyPath = `${userHome(authUser)}/.bash_history`;
 	if (!vfs.exists(historyPath)) {
 		vfs.writeFile(historyPath, "");
 		return [];

package/src/VirtualUserManager/index.ts

@@ -103,14 +103,14 @@ export class VirtualUserManager extends EventEmitter {
 		// 	changed = true;
 		// }
 		
-		// const homePath = `/home/root`;
-		// if (!this.vfs.exists(homePath)) {
-		// 	this.vfs.mkdir(homePath, 0o755);
-		// 	this.vfs.writeFile(
-		// 		`${homePath}/README.txt`,
-		// 		`Welcome to the virtual environment, root`,
-		// 	);
-		// }
+		const homePath = "/root";
+		if (!this.vfs.exists(homePath)) {
+			this.vfs.mkdir(homePath, 0o755);
+			this.vfs.writeFile(
+				`${homePath}/README.txt`,
+				`Welcome to the virtual environment, root`,
+			);
+		}
 
 		if (changed) {
 			await this.persist();
@@ -173,7 +173,7 @@ export class VirtualUserManager extends EventEmitter {
 	 */
 	public getUsageBytes(username: string): number {
 		perf.mark("getUsageBytes");
-		const homePath = `/home/${username}`;
+		const homePath = username === "root" ? "/root" : `/home/${username}`;
 		if (!this.vfs.exists(homePath)) {
 			return 0;
 		}
@@ -202,7 +202,7 @@ export class VirtualUserManager extends EventEmitter {
 		}
 
 		const normalizedPath = normalizeVfsPath(targetPath);
-		const homePath = normalizeVfsPath(`/home/${username}`);
+		const homePath = normalizeVfsPath(username === "root" ? "/root" : `/home/${username}`);
 		const inUserHome =
 			normalizedPath === homePath || normalizedPath.startsWith(`${homePath}/`);
 		if (!inUserHome) {
@@ -279,7 +279,7 @@ export class VirtualUserManager extends EventEmitter {
 		if (this.autoSudoForNewUsers) {
 			this.sudoers.add(username);
 		}
-		const homePath = `/home/${username}`;
+		const homePath = username === "root" ? "/root" : `/home/${username}`;
 		if (!this.vfs.exists(homePath)) {
 			this.vfs.mkdir(homePath, 0o755);
 			this.vfs.writeFile(

package/src/commands/apt.ts

@@ -57,8 +57,8 @@ export const aptCommand: ShellModule = {
 			case "update": {
 				return {
 					stdout: [
-						"Hit:1 fortune://packages.fortune.local aurora InRelease",
-						"Hit:2 fortune://security.fortune.local aurora-security InRelease",
+						"Hit:1 fortune://packages.fortune.local nyx InRelease",
+						"Hit:2 fortune://security.fortune.local nyx-security InRelease",
 						"Reading package lists... Done",
 						"Building dependency tree... Done",
 						"Reading state information... Done",
@@ -218,7 +218,7 @@ export const aptCacheCommand: ShellModule = {
 						`  Candidate: ${def.version}`,
 						`  Version table:`,
 						`     ${def.version} 500`,
-						`        500 fortune://packages.fortune.local aurora/main amd64 Packages`,
+						`        500 fortune://packages.fortune.local nyx/main amd64 Packages`,
 					].join("\n"),
 					exitCode: 0,
 				};

package/src/commands/cd.ts

@@ -1,5 +1,6 @@
 import type { ShellModule } from "../types/commands";
 import { assertPathAccess, resolvePath } from "./helpers";
+import { userHome } from "./runtime";
 
 /**
  * Change current working directory.
@@ -12,7 +13,7 @@ export const cdCommand: ShellModule = {
 	category: "navigation",
 	params: ["[path]"],
 	run: ({ authUser, shell, cwd, args }) => {
-		const target = resolvePath(cwd, args[0] ?? `~`);
+		const target = resolvePath(cwd, args[0] ?? "~", userHome(authUser));
 		assertPathAccess(authUser, target, "cd");
 		const stats = shell.vfs.stat(target);
 		if (stats.type !== "directory") {

package/src/commands/helpers.ts

@@ -28,12 +28,13 @@ export function normalizeTerminalOutput(text: string): string {
 		.trimEnd();
 }
 
-export function resolvePath(cwd: string, inputPath: string): string {
+export function resolvePath(cwd: string, inputPath: string, homeDir?: string): string {
 	if (!inputPath || inputPath.trim() === "") {
 		return cwd;
 	}
 	if (inputPath.startsWith("~")) {
-		return path.posix.normalize(`/home/${inputPath.slice(1)}`);
+		const home = homeDir ?? "/root";
+		return path.posix.normalize(`${home}${inputPath.slice(1)}`);
 	}
 	return inputPath.startsWith("/")
 		? path.posix.normalize(inputPath)

package/src/commands/index.ts

@@ -6,4 +6,4 @@ export {
 	resolveModule
 } from "./registry";
 
-export { makeDefaultEnv, runCommand, runCommandDirect } from "./runtime";
+export { makeDefaultEnv, runCommand, runCommandDirect, userHome } from "./runtime";

package/src/commands/lsb-release.ts

@@ -13,7 +13,7 @@ export const lsbReleaseCommand: ShellModule = {
 	params: ["[-a] [-i] [-d] [-r] [-c]"],
 	run: ({ args, shell }) => {
 		let osName = shell.properties?.os ?? "Fortune GNU/Linux x64";
-		let codename = "aurora";
+		let codename = "nyx";
 		let version = "1.0";
 
 		try {

package/src/commands/runtime.ts

@@ -11,11 +11,16 @@ import { expandAsync, expandBraces } from "../utils/expand";
 import { tokenizeCommand } from "../utils/tokenize";
 import { resolveModule } from "./registry";
 
+/** Returns the home directory path for a given user. Root lives at /root. */
+export function userHome(authUser: string): string {
+	return authUser === "root" ? "/root" : `/home/${authUser}`;
+}
+
 export function makeDefaultEnv(authUser: string, hostname: string): ShellEnv {
 	return {
 		vars: {
 			PATH: "/usr/local/bin:/usr/bin:/bin",
-			HOME: `/home/${authUser}`,
+			HOME: userHome(authUser),
 			USER: authUser,
 			LOGNAME: authUser,
 			SHELL: "/bin/sh",