offsite 0.0.5 → 0.0.7

package/README.md

@@ -12,21 +12,22 @@ npx offsite
 
 Then open the pairing link it prints. It pairs this browser with the server, so only browsers that opened the link can use it.
 
-| Command          | What it does                                                                       |
-| ---------------- | ---------------------------------------------------------------------------------- |
-| `offsite`        | Starts the server and the web app                                                  |
-| `offsite web`    | Same as `offsite`                                                                  |
-| `offsite serve`  | Starts only the server, use it from [offsite.sayad.dev](https://offsite.sayad.dev) |
-| `offsite pair`   | Makes a pairing token for another browser and prints its links. `--name` labels it |
-| `offsite unpair` | Lists paired browsers so you can pick which to unpair                              |
-
-| Flag        | Default      | What it sets                                                 |
-| ----------- | ------------ | ------------------------------------------------------------ |
-| `--host`    | `127.0.0.1`  | Address to listen on                                         |
-| `--port`    | `47841`      | Port to listen on                                            |
-| `--dir`     | `~/.offsite` | Folder for settings and accounts                             |
-| `--no-auth` | auth on      | Accept connections without the pairing token                 |
-| `--no-pair` | pair on      | Don't create a pairing token or print pairing links on start |
+| Command          | What it does                                                                                     |
+| ---------------- | ------------------------------------------------------------------------------------------------ |
+| `offsite`        | Starts the server and the web app                                                                |
+| `offsite web`    | Same as `offsite`                                                                                |
+| `offsite serve`  | Starts only the server, use it from [offsite.sayad.dev](https://offsite.sayad.dev)               |
+| `offsite pair`   | Makes a pairing token for another browser and prints its links and a QR code. `--name` labels it |
+| `offsite unpair` | Lists paired browsers so you can pick which to unpair                                            |
+
+| Flag         | Default      | What it sets                                                                             |
+| ------------ | ------------ | ---------------------------------------------------------------------------------------- |
+| `--host`     | `127.0.0.1`  | Address to listen on                                                                     |
+| `--port`     | `47841`      | Port to listen on                                                                        |
+| `--dir`      | `~/.offsite` | Folder for settings and accounts                                                         |
+| `--no-auth`  | auth on      | Accept connections without the pairing token                                             |
+| `--no-pair`  | pair on      | Don't create a pairing token or print pairing links on start                             |
+| `--fallback` | none         | Address the pairing links add for when this one is unreachable, e.g. a Cloudflare tunnel |
 
 Pairing tokens stay in `tokens.json` inside `--dir`. A running offsite disconnects an unpaired browser within seconds.
 

package/apps/server/dist/main.mjs

@@ -2,6 +2,7 @@ import { createReadStream, existsSync, lstatSync, mkdirSync, readFileSync, readd
 import { createServer } from "node:http";
 import path from "node:path";
 import { consola } from "consola";
+import { renderUnicodeCompact } from "uqr";
 import { WebSocketServer } from "ws";
 import os from "node:os";
 import { deleteSession, forkSession, getSessionMessages, getSubagentMessages, listSessions, query, renameSession } from "@anthropic-ai/claude-agent-sdk";
@@ -47,7 +48,7 @@ function broadcast(event) {
 //#region src/args.ts
 let command = "web";
 let name = null;
-const program = new Command("offsite").description("Starts the server and the web app").option("--host <host>", "Address to listen on", "127.0.0.1").option("--port <port>", "Port to listen on", "47841").option("--dir <dir>", "Folder for settings and accounts", path.join(os.homedir(), ".offsite")).option("--no-auth", "Accept connections without the pairing token").option("--no-pair", "Don't create a pairing token or print pairing links");
+const program = new Command("offsite").description("Starts the server and the web app").option("--host <host>", "Address to listen on", "127.0.0.1").option("--port <port>", "Port to listen on", "47841").option("--dir <dir>", "Folder for settings and accounts", path.join(os.homedir(), ".offsite")).option("--no-auth", "Accept connections without the pairing token").option("--no-pair", "Don't create a pairing token or print pairing links").option("--fallback <url>", "Address to try when this one is unreachable, e.g. a Cloudflare tunnel");
 program.command("web", { isDefault: true }).description("Starts the server and the web app, same as offsite");
 program.command("serve").description("Starts only the server, without the web app").action(() => {
 	command = "serve";
@@ -85,15 +86,18 @@ function lock() {
 		if (!hasCode(error, "EEXIST")) throw error;
 	}
 	let content;
+	let modified;
 	try {
 		content = readFileSync(lockFile, "utf8");
+		modified = statSync(lockFile).mtimeMs;
 	} catch (error) {
 		if (hasCode(error, "ENOENT")) return lock();
 		throw error;
 	}
 	const pid = Number(content);
-	if (!Number.isInteger(pid) || pid < 1) throw new Error(`invalid pid ${JSON.stringify(content)} in ${lockFile}`);
-	if (pid !== process.pid && isRunning(pid)) {
+	const validPid = Number.isInteger(pid) && pid > 0;
+	const writtenThisBoot = modified > Date.now() - os.uptime() * 1e3;
+	if (validPid && writtenThisBoot && pid !== process.pid && isRunning(pid)) {
 		consola.error(`offsite is already running for ${home} (pid ${pid})`);
 		process.exit(1);
 	}
@@ -3787,7 +3791,7 @@ var Run = class {
 				return;
 			}
 			case "result": {
-				if (message.subtype !== "success") this.add(notice(message.errors.join("\n") || message.subtype));
+				if (message.subtype !== "success" && message.terminal_reason !== "aborted_streaming" && message.terminal_reason !== "aborted_tools") this.add(notice(message.errors.filter((error) => !error.startsWith("[ede_diagnostic]")).join("\n") || message.subtype));
 				this.finishTurn();
 				const usage = this.model === null ? void 0 : message.modelUsage[this.model];
 				if (this.context !== null && usage !== void 0) this.context = {
@@ -5630,11 +5634,17 @@ if (!Number.isInteger(port) || port < 1 || port > 65535) {
 	process.exit(1);
 }
 const address = `http://${args.host}:${port}`;
+const fallback = args.fallback === void 0 ? null : readFallback(args.fallback);
 if (args.command === "pair") {
 	const links = pairingLinks(addToken(args.name));
-	console.log("Open one of these links in the browser to pair:");
-	console.log(`  ${links.local}`);
+	console.log(`Scan this to pair a phone with ${HOSTED_APP}:`);
+	console.log("");
+	console.log(renderUnicodeCompact(links.hosted, { border: 2 }));
+	console.log("");
+	console.log("Or open one of these links in the browser to pair:");
 	console.log(`  ${links.hosted}`);
+	console.log(`  ${links.local}`);
+	if (fallback !== null) console.log(`Fallback: ${fallback}`);
 	process.exit(0);
 }
 if (args.command === "unpair") {
@@ -5745,9 +5755,24 @@ async function unpair() {
 	removeTokens(picked);
 	console.log(`Unpaired ${picked.length} ${picked.length === 1 ? "browser" : "browsers"}; a running offsite disconnects them within seconds`);
 }
+function readFallback(link) {
+	let url;
+	try {
+		url = new URL(link);
+	} catch {
+		console.error(`invalid fallback URL ${link}`);
+		process.exit(1);
+	}
+	if (url.protocol !== "http:" && url.protocol !== "https:") {
+		console.error(`the fallback URL ${link} needs http:// or https://`);
+		process.exit(1);
+	}
+	return url.origin;
+}
 function pairingLinks(token) {
 	const hosted = new URLSearchParams({
 		machine: address,
+		...fallback !== null && { fallback },
 		...token !== null && { token }
 	});
 	return {