ai-remote 0.3.0 → 0.4.0

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "ai-remote",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "RDP, VNC and SSH protocol engines that run in Node, a Worker or a browser -- plus `npx ai-remote`, a CLI that drives a machine and shows you what it is doing",
   "type": "module",
   "bin": {
-    "ai-remote": "./dist/cli.mjs",
-    "remotectl": "./dist/cli.mjs"
+    "ai-remote": "dist/cli.mjs",
+    "remotectl": "dist/cli.mjs"
   },
   "license": "MIT",
   "author": {
@@ -15,7 +15,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/guocity/vnc-node-worker.git"
+    "url": "git+https://github.com/guocity/vnc-node-worker.git"
   },
   "keywords": [
     "remote-desktop",
@@ -88,5 +88,8 @@
   },
   "engines": {
     "node": ">=22"
+  },
+  "optionalDependencies": {
+    "@webviewjs/webview": "^0.4.3"
   }
 }

package/src/cli/cli.ts

@@ -10,8 +10,9 @@
 import { basename, resolve as resolvePath } from 'node:path';
 import { spawn } from 'node:child_process';
 import { readFileSync, readdirSync, existsSync, openSync, unlinkSync } from 'node:fs';
-import { Shell } from './shell';
+import { bareUsername, Shell } from './shell';
 import { runDaemon } from './daemon';
+import { runWindow } from './window';
 import { request } from './ipc';
 import { ensureRunDir, logPath, metaPath, RUN_DIR, sessionName, socketPath } from './paths';
 
@@ -59,7 +60,8 @@ Steps for "do", separated by semicolons:
 Options
   -u, --user NAME        account on the host
   -d, --domain NAME      Windows domain or computer name
-      --ssh-user NAME    account for the terminal (default: --user)
+      --ssh-user NAME    only if the terminal signs in as someone else;
+                         by default it reuses --user and the same password
       --ssh-port N       SSH port                      (default: 22)
   -s, --security MODE    auto | nla | tls | rdp        (default: auto)
   -W, --width  N         desktop width                 (default: 1280)
@@ -186,6 +188,8 @@ async function startSession(args: Args, name: string, host: string, port: number
   ];
   if (has(args, 'no-view', 'headless')) daemonArgs.push('--no-view');
   if (has(args, 'no-open')) daemonArgs.push('--no-open');
+  if (has(args, 'tab')) daemonArgs.push('--tab');
+  if (has(args, 'fullscreen')) daemonArgs.push('--fullscreen');
 
   // Its output goes to a file rather than nowhere: a session that fails to
   // start is the one moment its log is worth having.
@@ -273,6 +277,8 @@ async function main(): Promise<void> {
       viewPort: Number(flag(args, 'view-port') ?? 7373),
       sshUsername: flag(args, 'ssh-user') ?? flag(args, 'u', 'user') ?? '',
       sshPort: Number(flag(args, 'ssh-port') ?? 22),
+      tab: has(args, 'tab'),
+      fullscreen: has(args, 'fullscreen'),
       // Zero by default: a session stays open until it is closed. An agent
       // that pauses to think is not an agent that has finished.
       idleMs: Math.max(0, Number(flag(args, 'idle') ?? 0)) * 60_000,
@@ -280,6 +286,9 @@ async function main(): Promise<void> {
     return;
   }
 
+  // The hidden command the native window runs as.
+  if (args.command === '__window') { await runWindow(process.argv.slice(3)); return; }
+
   if (args.command === 'shell') { await interactiveShell(args, host); return; }
 
   // Everything else runs against a session: the one already open, or a new one.
@@ -296,7 +305,7 @@ async function main(): Promise<void> {
       if (!has(args, 'no-view', 'headless') && !status.viewer) {
         Object.assign(status, await ask(name, 'view-open', { launch: !has(args, 'no-open') }));
       }
-      Object.assign(report, { viewer: status.viewer });
+      Object.assign(report, { viewer: status.viewer, window: status.window, viewers: status.viewers });
       break;
 
     case 'view': {
@@ -376,7 +385,7 @@ async function interactiveShell(args: Args, host: string): Promise<void> {
   const shell = new Shell({
     host,
     port: Number(flag(args, 'ssh-port') ?? 22),
-    username: flag(args, 'ssh-user') ?? flag(args, 'u', 'user') ?? '',
+    username: flag(args, 'ssh-user') ?? bareUsername(flag(args, 'u', 'user') ?? ''),
     password: password(),
     columns: process.stdout.columns ?? 120,
     rows: process.stdout.rows ?? 30,
@@ -423,8 +432,10 @@ function describe(command: string, report: Record<string, unknown>): string {
   const where = report.reused ? 'the open session' : 'a new session';
 
   if (command === 'open') {
-    return `${report.reused ? 'Already connected' : 'Connected'} to ${report.host}:${report.port} at ${size}.`
-      + `${report.viewer ? `\nWindow: ${report.viewer}` : ''}`
+    const window = report.window === 'window' ? 'A window is open on it.'
+      : report.window === 'tab' ? 'It opened in your browser.'
+      : report.viewer ? `Open it at ${report.viewer}` : 'No window (headless).';
+    return `${report.reused ? 'Already connected' : 'Connected'} to ${report.host}:${report.port} at ${size}. ${window}`
       + `\nRun more commands against it, then \`${NAME} close ${report.host}\` when you are done.`;
   }
   if (command === 'view') {

package/src/cli/daemon.ts

@@ -13,7 +13,7 @@
 import net from 'node:net';
 import { unlinkSync, writeFileSync, existsSync } from 'node:fs';
 import { RdpSession, type SessionOptions } from './session';
-import { Shell } from './shell';
+import { bareUsername, Shell } from './shell';
 import { downscale, encodePng } from './png';
 import { startViewer, type Viewer } from './viewer';
 import { readMessages, writeMessage, type Request } from './ipc';
@@ -26,6 +26,10 @@ export interface DaemonOptions extends SessionOptions {
   viewPort: number;
   /** Account for the terminal, when one is wanted. Blank leaves SSH unopened. */
   sshUsername: string;
+  /** Open in the default browser rather than a window of its own. */
+  tab: boolean;
+  /** Start the window already filling the display. */
+  fullscreen: boolean;
   sshPort: number;
   idleMs: number;
 }
@@ -43,6 +47,10 @@ export async function runDaemon(options: DaemonOptions): Promise<void> {
    * The terminal is opened on first use rather than at connect time. Most
    * sessions never ask for one, and a second sign-in that nobody wanted is a
    * second chance to lock an account out.
+   *
+   * It signs in as the desktop's own account and password by default. Needing a
+   * separate flag to get a terminal on the machine you are already looking at
+   * is a question with an obvious answer, so it is not asked.
    */
   function openShell(): Promise<Shell> {
     if (shell) return Promise.resolve(shell);
@@ -52,7 +60,7 @@ export async function runDaemon(options: DaemonOptions): Promise<void> {
       const started = new Shell({
         host: options.host,
         port: options.sshPort,
-        username: options.sshUsername || options.username,
+        username: options.sshUsername || bareUsername(options.username),
         password: options.password,
       });
       await started.connect();
@@ -100,7 +108,12 @@ export async function runDaemon(options: DaemonOptions): Promise<void> {
       if (launch) viewer.launch();
       return viewer;
     }
-    viewer = await startViewer(session, options.viewPort, { launch, openShell });
+    viewer = await startViewer(session, options.viewPort, {
+      launch,
+      openShell,
+      tab: options.tab,
+      fullscreen: options.fullscreen,
+    });
     writeMeta();
     return viewer;
   }
@@ -143,7 +156,7 @@ export async function runDaemon(options: DaemonOptions): Promise<void> {
     switch (message.op) {
       case 'view-open': {
         const opened = await openViewer(args.launch !== false);
-        return { viewer: opened.url };
+        return { viewer: opened.url, window: opened.window?.kind ?? null };
       }
 
       case 'view-close':
@@ -158,6 +171,8 @@ export async function runDaemon(options: DaemonOptions): Promise<void> {
           height: session.framebuffer.height,
           connected: session.connected,
           viewer: viewer?.url ?? null,
+          window: viewer?.window?.kind ?? null,
+          viewers: viewer?.viewers ?? 0,
           shell: shell ? 'open' : shellStarting ? 'opening' : 'closed',
           pid: process.pid,
         };