@averyyy/pi-server 0.80.3-piclient.3 → 0.80.3-piclient.5

package/CHANGELOG.md

@@ -12,5 +12,6 @@
 - `/api/request/chunk` endpoint for reassembling oversized client requests before dispatch.
 - `DELETE /api/session/:id` endpoint for removing one server-side session.
 - `/health` endpoint for health checks.
+- `pi-server update` command with npm global package updates and proxy warning acknowledgement.
 - Configurable via `PI_SERVER_CONFIG` or environment variables: `PI_SERVER_HOST`, `PI_SERVER_PORT`, `PI_SERVER_AUTH_TOKEN`.
 - Persistent session tree storage under `PI_SERVER_SESSION_STORE_DIR`, including exact tree hashes in session responses.

package/bin/pi-server.js

@@ -0,0 +1,26 @@
+#!/usr/bin/env node
+import { spawnSync } from "node:child_process";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+
+const args = process.argv.slice(2);
+const modulePromise =
+	args[0] === "update"
+		? import("./update.js").then(async ({ runPiServerUpdate }) => {
+				process.exitCode = await runPiServerUpdate(args.slice(1));
+			})
+		: runPiServer(args);
+
+Promise.resolve(modulePromise).catch((e) => {
+	console.error(e);
+	process.exit(1);
+});
+
+function runPiServer(args) {
+	const packageRoot = dirname(dirname(fileURLToPath(import.meta.url)));
+	const result = spawnSync(process.execPath, [join(packageRoot, "dist", "cli.js"), ...args], {
+		stdio: "inherit",
+	});
+	if (result.error) throw result.error;
+	process.exitCode = result.status ?? (result.signal === "SIGINT" ? 130 : 1);
+}

package/bin/update.js

@@ -0,0 +1,250 @@
+import { Buffer } from "node:buffer";
+import { spawnSync } from "node:child_process";
+import { readFileSync } from "node:fs";
+import { dirname, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+
+const H_PROXY_WARNING_URL_PATTERN =
+	/https?:\/\/114\.114\.114\.114:\d+\/proxycontrolwarn\/httpwarning_\d+\.html\?ori_url=[A-Za-z0-9+/=]+(?:&uid=\d+)?/;
+const H_PROXY_WARNING_HOST = "114.114.114.114:9421";
+const H_PROXY_HEADERS = {
+	"User-Agent":
+		"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121 Safari/537.36",
+	Accept: "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
+	"Accept-Language": "en-US,en;q=0.5",
+};
+
+function defaultPackageRoot() {
+	return dirname(dirname(fileURLToPath(import.meta.url)));
+}
+
+function defaultRepoRoot() {
+	return resolve(defaultPackageRoot(), "..", "..");
+}
+
+function readPackageMetadata(packageRoot) {
+	return JSON.parse(readFileSync(resolve(packageRoot, "package.json"), "utf-8"));
+}
+
+function runStep(runner, command, args, cwd, stdio = "inherit") {
+	return runner(command, args, { cwd, stdio, encoding: "utf-8" });
+}
+
+function responseStatus(response) {
+	return response.statusText ? `${response.status} ${response.statusText}` : String(response.status);
+}
+
+function getQueryValue(url, name) {
+	const match = new RegExp(`[?&]${name}=([^&]+)`).exec(url);
+	return match?.[1] ?? "";
+}
+
+function getInputValue(html, id) {
+	const match = new RegExp(`id="${id}"[^>]*value="([^"]*)"`).exec(html);
+	return match?.[1] ?? "";
+}
+
+function bitReverse(value) {
+	return (
+		((1 & value) << 7) |
+		((2 & value) << 5) |
+		((4 & value) << 3) |
+		((8 & value) << 1) |
+		((16 & value) >> 1) |
+		((32 & value) >> 3) |
+		((64 & value) >> 5) |
+		((128 & value) >> 7)
+	);
+}
+
+function encodeWarningByte(value) {
+	if (value === 32) return "+";
+	if (
+		(value < 48 && value !== 45 && value !== 46) ||
+		(value < 65 && value > 57) ||
+		(value > 90 && value < 97 && value !== 95) ||
+		value > 122
+	) {
+		return `%${value.toString(16).toUpperCase().padStart(2, "0")}`;
+	}
+	return String.fromCharCode(value);
+}
+
+function md6(value) {
+	let result = "";
+	for (let index = 0; index < value.length; index++) {
+		result += encodeWarningByte(53 ^ bitReverse(value.charCodeAt(index)) ^ (255 & index));
+	}
+	return result;
+}
+
+function b64(value) {
+	return Buffer.from(value, "utf-8").toString("base64");
+}
+
+async function findHProxyWarningUrl(response) {
+	const location = response.headers.get("location") ?? "";
+	if (response.status === 302 && H_PROXY_WARNING_URL_PATTERN.test(location)) return location;
+	if (H_PROXY_WARNING_URL_PATTERN.test(response.url)) return response.url;
+
+	const contentType = response.headers.get("content-type")?.toLowerCase() ?? "";
+	if (!contentType.includes("text/html")) return undefined;
+
+	const body = await response.clone().text();
+	return H_PROXY_WARNING_URL_PATTERN.exec(body)?.[0];
+}
+
+async function approveHProxyWarning(warningUrl, fetchImpl) {
+	const warningResponse = await fetchImpl(warningUrl, {
+		method: "GET",
+		headers: H_PROXY_HEADERS,
+		redirect: "manual",
+	});
+	const html = await warningResponse.text();
+	if (!warningResponse.ok) {
+		throw new Error(`Proxy warning page fetch failed: ${responseStatus(warningResponse)}`);
+	}
+
+	const oriUrl = getQueryValue(warningUrl, "ori_url");
+	const sessionId = getInputValue(html, "sessionid");
+	if (!oriUrl || !sessionId) {
+		throw new Error("Proxy warning page did not include approval fields");
+	}
+
+	const pid = getInputValue(html, "pid");
+	const uid = getInputValue(html, "uid");
+	const payload = `ori_url=${oriUrl}&sessionid=${sessionId}&pid=${pid}&uid=${uid}`;
+	const checkUrl = `http://${H_PROXY_WARNING_HOST}/proxycontrolwarn/check?${b64(md6(b64(payload)))}`;
+	const checkResponse = await fetchImpl(checkUrl, {
+		method: "GET",
+		headers: H_PROXY_HEADERS,
+		redirect: "manual",
+	});
+	const checkBody = await checkResponse.text();
+	if (!checkResponse.ok) {
+		throw new Error(`Proxy approval failed: ${responseStatus(checkResponse)} ${checkBody.slice(0, 80)}`);
+	}
+}
+
+async function approveHProxyTarget(url, fetchImpl) {
+	let response;
+	try {
+		response = await fetchImpl(url, { method: "GET", headers: H_PROXY_HEADERS, redirect: "manual" });
+	} catch {
+		return false;
+	}
+
+	const warningUrl = await findHProxyWarningUrl(response);
+	if (!warningUrl) return false;
+
+	await approveHProxyWarning(warningUrl, fetchImpl);
+	return true;
+}
+
+function maybeGitHttpUrl(value) {
+	const trimmed = value.trim();
+	if (trimmed.startsWith("http://") || trimmed.startsWith("https://")) return trimmed;
+	const ssh = /^git@([^:]+):(.+)$/.exec(trimmed);
+	if (ssh) return `https://${ssh[1]}/${ssh[2]}`;
+	return undefined;
+}
+
+function maybeHttpUrl(value) {
+	const trimmed = value.trim();
+	return trimmed.startsWith("http://") || trimmed.startsWith("https://") ? trimmed : undefined;
+}
+
+function getProxyApprovalTargets(runner, repoRoot, includeGitRemote = true) {
+	const targets = [];
+	if (includeGitRemote) {
+		const remote = runStep(runner, "git", ["config", "--get", "remote.origin.url"], repoRoot, "pipe");
+		if (remote.status === 0) {
+			const url = maybeGitHttpUrl(String(remote.stdout ?? ""));
+			if (url) targets.push(url);
+		}
+	}
+
+	const registry = runStep(runner, "npm", ["config", "get", "registry"], repoRoot, "pipe");
+	if (registry.status === 0) {
+		const url = maybeHttpUrl(String(registry.stdout ?? ""));
+		if (url) targets.push(url);
+	}
+
+	return [...new Set(targets)];
+}
+
+async function approveUpdateProxyTargets(runner, repoRoot, stdout, fetchImpl, includeGitRemote = true) {
+	for (const target of getProxyApprovalTargets(runner, repoRoot, includeGitRemote)) {
+		if (await approveHProxyTarget(target, fetchImpl)) {
+			stdout.write(`Approved proxy warning for ${target}\n`);
+		}
+	}
+}
+
+function isMissingGitCheckout(result) {
+	const text = `${String(result.stdout ?? "")}\n${String(result.stderr ?? "")}`;
+	return result.status !== 0 && text.includes("not a git repository");
+}
+
+async function runNpmGlobalUpdate(runner, repoRoot, stdout, stderr, fetchImpl) {
+	await approveUpdateProxyTargets(runner, repoRoot, stdout, fetchImpl, false);
+	stdout.write("Updating npm packages: @averyyy/pi-client@latest @averyyy/pi-server@latest\n");
+	const result = runStep(
+		runner,
+		"npm",
+		["install", "-g", "--ignore-scripts", "@averyyy/pi-client@latest", "@averyyy/pi-server@latest"],
+		repoRoot,
+	);
+	if (result.status !== 0) {
+		stderr.write("pi-server update failed: npm install -g --ignore-scripts @averyyy/pi-client@latest @averyyy/pi-server@latest\n");
+		return result.status ?? 1;
+	}
+	stdout.write("pi-server update complete\n");
+	return 0;
+}
+
+export async function runPiServerUpdate(_args = [], options = {}) {
+	const packageRoot = options.packageRoot ?? defaultPackageRoot();
+	const repoRoot = options.repoRoot ?? defaultRepoRoot();
+	const runner = options.runner ?? spawnSync;
+	const fetchImpl = options.fetch ?? globalThis.fetch;
+	const stdout = options.stdout ?? process.stdout;
+	const stderr = options.stderr ?? process.stderr;
+	const pkg = readPackageMetadata(packageRoot);
+
+	stdout.write(`pi-server ${pkg.version}\n`);
+	stdout.write(`Updating checkout: ${repoRoot}\n`);
+
+	const status = runStep(runner, "git", ["status", "--porcelain"], repoRoot, "pipe");
+	if (status.status !== 0) {
+		if (isMissingGitCheckout(status)) {
+			return runNpmGlobalUpdate(runner, repoRoot, stdout, stderr, fetchImpl);
+		}
+		stderr.write("pi-server update failed: unable to inspect git status\n");
+		return status.status ?? 1;
+	}
+	if (String(status.stdout ?? "").trim().length > 0) {
+		stderr.write("pi-server update failed: working tree has uncommitted changes\n");
+		return 1;
+	}
+
+	await approveUpdateProxyTargets(runner, repoRoot, stdout, fetchImpl);
+
+	const steps = [
+		["git", ["pull", "--ff-only"]],
+		["npm", ["install", "--ignore-scripts"]],
+		["npm", ["run", "install:pi-client"]],
+		["npm", ["run", "install:pi-server"]],
+	];
+
+	for (const [command, args] of steps) {
+		const result = runStep(runner, command, args, repoRoot);
+		if (result.status !== 0) {
+			stderr.write(`pi-server update failed: ${command} ${args.join(" ")}\n`);
+			return result.status ?? 1;
+		}
+	}
+
+	stdout.write("pi-server update complete\n");
+	return 0;
+}

package/package.json

@@ -1,10 +1,10 @@
 {
 	"name": "@averyyy/pi-server",
-	"version": "0.80.3-piclient.3",
+	"version": "0.80.3-piclient.5",
 	"description": "Proxy server for pi-client that stores session state and forwards incremental requests to upstream LLM providers",
 	"type": "module",
 	"bin": {
-		"pi-server": "dist/cli.js"
+		"pi-server": "bin/pi-server.js"
 	},
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",
@@ -15,6 +15,7 @@
 		}
 	},
 	"files": [
+		"bin",
 		"dist",
 		"README.md",
 		"CHANGELOG.md"
@@ -26,8 +27,8 @@
 		"prepublishOnly": "npm run clean && npm run build"
 	},
 	"dependencies": {
-		"@earendil-works/pi-ai": "npm:@averyyy/pi-ai@0.80.3-piclient.2",
-		"@earendil-works/pi-agent-core": "npm:@averyyy/pi-agent-core@0.80.3-piclient.2"
+		"@earendil-works/pi-ai": "npm:@averyyy/pi-ai@0.80.3-piclient.5",
+		"@earendil-works/pi-agent-core": "npm:@averyyy/pi-agent-core@0.80.3-piclient.5"
 	},
 	"keywords": [
 		"pi-server",
@@ -39,7 +40,7 @@
 	"license": "MIT",
 	"repository": {
 		"type": "git",
-		"url": "git+https://github.com/earendil-works/pi.git",
+		"url": "https://github.com/Averyyy/pi-client",
 		"directory": "packages/pi-server"
 	},
 	"engines": {
@@ -50,5 +51,8 @@
 		"shx": "0.4.0",
 		"typescript": "5.9.3",
 		"vitest": "4.1.9"
+	},
+	"publishConfig": {
+		"access": "public"
 	}
 }