@peerbit/server 5.3.2 → 5.4.0-a762412

package/dist/ui/index.html

@@ -23,7 +23,7 @@
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
 	<title>Peerbit</title>
-  <script type="module" crossorigin src="/assets/index-D7nQ7uHD.js"></script>
+  <script type="module" crossorigin src="/assets/index-D-KTj4Kv.js"></script>
   <link rel="stylesheet" crossorigin href="/assets/index-CIfVvUo9.css">
 </head>
 

package/package.json

@@ -1,91 +1,91 @@
 {
-	"name": "@peerbit/server",
-	"version": "5.3.2",
-	"author": "dao.xyz",
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/dao-xyz/peerbit"
-	},
-	"license": "Apache-2.0",
-	"type": "module",
-	"sideEffects": false,
-	"bin": {
-		"peerbit": "./dist/src/bin.js"
-	},
-	"module": "dist/src/index.js",
-	"types": "dist/src/index.d.ts",
-	"exports": {
-		"import": "./dist/src/index.js"
-	},
-	"browser": {
-		"./dist/src/server.js": "./dist/src/server.browser.js",
-		"./server.js": "./dist/src/server.browser.js",
-		"./dist/src/config.js": "./dist/src/config.browser.js",
-		"./config.js": "./dist/src/config.browser.js",
-		"./dist/src/remotes.js": "./dist/src/remotes.browser.js",
-		"./remotes.js": "./dist/src/remotes.browser.js",
-		"./dist/src/docker.js": "./dist/src/docker.browser.js",
-		"./docker.js": "./dist/src/docker.browser.js",
-		"./dist/src/aws.js": "./dist/src/aws.browser.js"
-	},
-	"files": [
-		"dist",
-		"src",
-		"src/nginx-template.conf",
-		"!src/test",
-		"!src/**/__tests__",
-		"!lib/**/__tests__",
-		"patches",
-		"LICENSE"
-	],
-	"publishConfig": {
-		"access": "public"
-	},
-	"engines": {
-		"node": ">=18"
-	},
-	"eslintConfig": {
-		"extends": "peerbit",
-		"parserOptions": {
-			"project": true,
-			"sourceType": "module"
-		},
-		"ignorePatterns": [
-			"!.aegir.js",
-			"test/ts-use",
-			"*.d.ts"
-		]
-	},
-	"scripts": {
-		"clean": "shx rm -rf lib/*",
-		"build": "yarn clean && yarn build-lib && yarn build-ui",
-		"build-lib": "tsc -p tsconfig.json",
-		"build-ui": "cd ../frontend && yarn build && cd ../node",
-		"postbuild": "cp src/nginx-template.conf dist/src/ && cp -r ../frontend/dist/. dist/ui",
-		"test": "aegir test --t node",
-		"lint": "aegir lint"
-	},
-	"devDependencies": {
-		"@peerbit/test-lib": "^0.0.1",
-		"@peerbit/test-utils": "2.1.44",
-		"@types/yargs": "17.0.24",
-		"aws-sdk": "^2.1259.0",
-		"dotenv": "^16.1.4",
-		"@types/tmp": "^0.2.3",
-		"@types/tar-stream": "^3.1.3",
-		"shx": "^0.3.4"
-	},
-	"dependencies": {
-		"axios": "^1.4.0",
-		"chalk": "^5.3.0",
-		"peerbit": "4.1.34",
-		"yargs": "^17.7.2",
-		"tar-stream": "^3.1.7",
-		"tmp": "^0.2.1",
-		"tty-table": "^4.2.1"
-	},
-	"optionalDependencies": {
-		"@aws-sdk/client-ec2": "^3.390.0",
-		"@aws-sdk/client-route-53": "^3.391.0"
-	}
+  "name": "@peerbit/server",
+  "version": "5.4.0-a762412",
+  "author": "dao.xyz",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dao-xyz/peerbit"
+  },
+  "license": "Apache-2.0",
+  "type": "module",
+  "sideEffects": false,
+  "bin": {
+    "peerbit": "./dist/src/bin.js"
+  },
+  "module": "dist/src/index.js",
+  "types": "dist/src/index.d.ts",
+  "exports": {
+    "import": "./dist/src/index.js"
+  },
+  "browser": {
+    "./dist/src/server.js": "./dist/src/server.browser.js",
+    "./server.js": "./dist/src/server.browser.js",
+    "./dist/src/config.js": "./dist/src/config.browser.js",
+    "./config.js": "./dist/src/config.browser.js",
+    "./dist/src/remotes.js": "./dist/src/remotes.browser.js",
+    "./remotes.js": "./dist/src/remotes.browser.js",
+    "./dist/src/docker.js": "./dist/src/docker.browser.js",
+    "./docker.js": "./dist/src/docker.browser.js",
+    "./dist/src/aws.js": "./dist/src/aws.browser.js"
+  },
+  "files": [
+    "dist",
+    "src",
+    "src/nginx-template.conf",
+    "!src/test",
+    "!src/**/__tests__",
+    "!lib/**/__tests__",
+    "patches",
+    "LICENSE"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "engines": {
+    "node": ">=18"
+  },
+  "eslintConfig": {
+    "extends": "peerbit",
+    "parserOptions": {
+      "project": true,
+      "sourceType": "module"
+    },
+    "ignorePatterns": [
+      "!.aegir.js",
+      "test/ts-use",
+      "*.d.ts"
+    ]
+  },
+  "scripts": {
+    "clean": "shx rm -rf lib/*",
+    "build": "yarn clean && yarn build-lib && yarn build-ui",
+    "build-lib": "tsc -p tsconfig.json",
+    "build-ui": "cd ../frontend && yarn build && cd ../node",
+    "postbuild": "cp src/nginx-template.conf dist/src/ && cp -r ../frontend/dist/. dist/ui",
+    "test": "aegir test --t node",
+    "lint": "aegir lint"
+  },
+  "devDependencies": {
+    "@peerbit/test-lib": "0.0.1-a762412",
+    "@peerbit/test-utils": "2.1.45-a762412",
+    "@types/yargs": "17.0.24",
+    "aws-sdk": "^2.1259.0",
+    "dotenv": "^16.1.4",
+    "@types/tmp": "^0.2.3",
+    "@types/tar-stream": "^3.1.3",
+    "shx": "^0.3.4"
+  },
+  "dependencies": {
+    "axios": "^1.4.0",
+    "chalk": "^5.3.0",
+    "peerbit": "4.1.35-a762412",
+    "yargs": "^17.7.2",
+    "tar-stream": "^3.1.7",
+    "tmp": "^0.2.1",
+    "tty-table": "^4.2.1"
+  },
+  "optionalDependencies": {
+    "@aws-sdk/client-ec2": "^3.390.0",
+    "@aws-sdk/client-route-53": "^3.391.0"
+  }
 }

package/src/cli.ts

@@ -1129,6 +1129,25 @@ export const cli = async (args?: string[]) => {
 											}
 										},
 									})
+									.command({
+										command: "versions",
+										describe:
+											"Print <pkg>@<version> for every dependency installed on the target node",
+
+										handler: async (args) => {
+											for (const api of apis) {
+												const packageWithVersion: Record<string, string> =
+													await api.api.dependency.versions();
+
+												for (const [packageName, version] of Object.entries(
+													packageWithVersion,
+												)) {
+													api.log(`${packageName}@${version}`);
+												}
+											}
+										},
+									})
+
 									.command({
 										command: "restart",
 										describe: "Restart the server",

package/src/client.ts

@@ -15,7 +15,7 @@ import {
 	BOOTSTRAP_PATH,
 	INSTALL_PATH,
 	LOCAL_API_PORT,
-	LOG_PATH, // <-- Added the log route constant
+	LOG_PATH,
 	PEER_ID_PATH,
 	PROGRAMS_PATH,
 	PROGRAM_PATH,
@@ -24,6 +24,7 @@ import {
 	RESTART_PATH,
 	STOP_PATH,
 	TRUST_PATH,
+	VERSIONS_PATH,
 } from "./routes.js";
 import { signRequest } from "./signed-request.js";
 import type { InstallDependency, StartProgram } from "./types.js";
@@ -257,6 +258,14 @@ export const createClient = async (
 				}
 				return resp.data;
 			},
+			versions: async (): Promise<Record<string, string>> => {
+				const resp = throwIfNot200(
+					await axiosInstance.get(endpoint + VERSIONS_PATH, {
+						validateStatus,
+					}),
+				);
+				return resp.data as Record<string, string>;
+			},
 		},
 		network: {
 			bootstrap: async (): Promise<void> => {

package/src/routes.ts

@@ -23,3 +23,4 @@ export const RESTART_PATH = "/restart";
 export const TERMINATE_PATH = "/terminate";
 export const STOP_PATH = "/path";
 export const LOG_PATH = "/log";
+export const VERSIONS_PATH = "/versions";

package/src/server.ts

@@ -9,7 +9,7 @@ import {
 	getProgramFromVariants,
 } from "@peerbit/program";
 import { waitFor } from "@peerbit/time";
-import { execSync, spawn } from "child_process";
+import { execSync, spawn, spawnSync } from "child_process";
 import { setMaxListeners } from "events";
 import fs from "fs";
 import http from "http";
@@ -37,6 +37,7 @@ import {
 	RESTART_PATH,
 	STOP_PATH,
 	TRUST_PATH,
+	VERSIONS_PATH,
 } from "./routes.js";
 import { Session } from "./session.js";
 import { getBody, verifyRequest } from "./signed-request.js";
@@ -48,9 +49,52 @@ import type {
 	StartProgram,
 } from "./types.js";
 
+const MAX_LISTENER_LIMIT = 1e5;
+
+const getInstallDir = (): string | null => {
+	return (
+		process.env.PEERBIT_MODULES_PATH ||
+		findPeerbitProgramFolder(__dirname) || // same util used by /install
+		null
+	);
+};
+
 // eslint-disable-next-line @typescript-eslint/naming-convention
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
+const extraNodePath = () => {
+	const installDir = getInstallDir();
+	return installDir ? path.join(installDir, "node_modules") : undefined;
+};
+const extra = extraNodePath();
+if (extra) {
+	process.env.NODE_PATH = process.env.NODE_PATH
+		? process.env.NODE_PATH + path.delimiter + extra
+		: extra;
+
+	// always re-parse NODE_PATH for *this* process
+	((await import("module")).default as any)["_initPaths"]();
+}
+
+// add next to execSync
+
+const listVersions = (dir: string): Record<string, string> => {
+	const proc = spawnSync("npm", ["ls", "--depth", "0", "--json", "--silent"], {
+		cwd: dir,
+		encoding: "utf8",
+	});
+
+	// npm may exit 1, but proc.stdout usually contains valid JSON
+	if (!proc.stdout) throw new Error(proc.stderr || "npm ls failed");
+
+	const tree = JSON.parse(proc.stdout);
+	const versions: Record<string, string> = {};
+	for (const [name, info] of Object.entries(tree.dependencies || {})) {
+		versions[name] = (info as any)?.version || "UNKNOWN";
+	}
+	return versions;
+};
+
 export const stopAndWait = (server: http.Server) => {
 	let closed = false;
 	server.on("close", () => {
@@ -230,24 +274,36 @@ export const startApiServer = async (
 	const port = properties?.port ?? LOCAL_API_PORT;
 
 	const restart = async () => {
-		await client.stop();
-		await stopAndWait(server);
-
-		// We filter out the reset command, since restarting means that we want to resume something
-		spawn(
-			process.argv.shift()!,
-			[
-				...process.execArgv,
-				...process.argv.filter((x) => x !== "--reset" && x !== "-r"),
-			],
-			{
-				cwd: process.cwd(),
-				detached: true,
-				stdio: "inherit",
-				gid: process.getgid!(),
-			},
+		console.log(
+			"Process will be lost during restart. Please find it using a process monitor. Or find it from the port e.g. 'lsof -i tcp:8001'",
 		);
-		process.exit(0);
+		process.nextTick(async () => {
+			await client.stop();
+			await stopAndWait(server);
+
+			// We filter out the reset command, since restarting means that we want to resume something
+			spawn(
+				process.argv.shift()!,
+				[
+					...process.execArgv,
+					...process.argv.filter((x) => x !== "--reset" && x !== "-r"),
+				],
+				{
+					cwd: process.cwd(),
+					detached: true,
+					stdio: "inherit",
+					gid: process.getgid!(),
+					env: {
+						...process.env,
+						NODE_PATH:
+							(process.env.NODE_PATH
+								? process.env.NODE_PATH + path.delimiter
+								: "") + (extraNodePath() ?? ""),
+					},
+				},
+			);
+			process.exit(0);
+		});
 	};
 	if (!client.peerId.equals(await client.identity.publicKey.toPeerId())) {
 		throw new Error("Expecting node identity to equal peerId");
@@ -494,9 +550,8 @@ export const startApiServer = async (
 								} else {
 									try {
 										// TODO do this without sudo. i.e. for servers provide arguments so that this app folder is writeable by default by the user
-										const installDir =
-											process.env.PEERBIT_MODULES_PATH ||
-											findPeerbitProgramFolder(__dirname);
+										const installDir = getInstallDir();
+
 										let permission = "";
 										if (!installDir) {
 											res.writeHead(400);
@@ -563,6 +618,31 @@ export const startApiServer = async (
 								break;
 							}
 						}
+					} else if (req.url.startsWith(VERSIONS_PATH)) {
+						if (req.method === "GET") {
+							try {
+								const installDir = getInstallDir();
+								if (!installDir) {
+									res.writeHead(400);
+									res.end("Cannot determine install directory");
+									return;
+								}
+
+								const versions = listVersions(installDir);
+
+								res.setHeader("Content-Type", "application/json");
+								res.writeHead(200);
+								res.end(JSON.stringify(versions, null, 2));
+							} catch (err) {
+								console.error("Failed to list versions:", err);
+								res.writeHead(500);
+								res.end("Error fetching versions");
+							}
+						} else {
+							r404();
+						}
+
+						/* keep the remaining else-if blocks (PEER_ID_PATH, etc.) unchanged */
 					} else if (req.url.startsWith(BOOTSTRAP_PATH)) {
 						switch (req.method) {
 							case "POST":
@@ -692,8 +772,8 @@ export const startApiServer = async (
 		};
 	};
 
-	setMaxListeners(Infinity); // TODO make this better (lower and large enough)
-	process.setMaxListeners(Infinity); // TODO make this better (lower and large enough)
+	setMaxListeners(MAX_LISTENER_LIMIT); // TODO make this better (lower and large enough)
+	process.setMaxListeners(MAX_LISTENER_LIMIT); // TODO make this better (lower and large enough)
 
 	const server = http.createServer(endpoints(client));
 	server.listen(port);