@peerbit/server 5.5.0 → 5.6.0-1c918e0

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-C8bxNrXj.js"></script>
+  <script type="module" crossorigin src="/assets/index-BeFPnrza.js"></script>
   <link rel="stylesheet" crossorigin href="/assets/index-CIfVvUo9.css">
 </head>
 

package/package.json

@@ -1,91 +1,91 @@
 {
-	"name": "@peerbit/server",
-	"version": "5.5.0",
-	"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.57",
-		"@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.46",
-		"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.6.0-1c918e0",
+  "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-1c918e0",
+    "@peerbit/test-utils": "2.1.57-1c918e0",
+    "@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.46-1c918e0",
+    "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/aws.ts

@@ -249,40 +249,58 @@ export const launchNodes = async (properties: {
 		);
 	}
 
-	// wait for instance ips to become available
-	const info = await client.send(
-		new DescribeInstancesCommand({
-			InstanceIds: instanceOut.Instances.map((x) => x.InstanceId!),
-		}),
-	);
-	const foundInstances = info
-		.Reservations!.map((x) => x.Instances!.map((y) => y))
-		.flat()!;
-	const foundIps: string[] = [];
-	for (const out of instanceOut.Instances) {
-		const foundInstance = foundInstances.find(
-			(x) => x!.InstanceId === out.InstanceId!,
-		);
-		if (!foundInstance!.PublicIpAddress) {
-			await delay(3000);
-			continue;
-		}
-		foundIps.push(foundInstance!.PublicIpAddress!);
-	}
-	let publicIps: string[] = foundIps;
+	// wait for AWS to recognize the new instance IDs and for public IPs to be assigned
+	const instanceIds = instanceOut.Instances.map((x) => x.InstanceId!);
+	const timeoutMs = 3 * 60 * 1000; // 3 minutes
+	const pollIntervalMs = 5000;
+	const start = Date.now();
+	let foundInstances: Array<{
+		InstanceId?: string;
+		PublicIpAddress?: string;
+	}> = [];
 
-	if (publicIps.length === 0) {
-		throw new Error("Failed to resolve IPs for created instances");
+	while (Date.now() - start < timeoutMs) {
+		try {
+			const info = await client.send(
+				new DescribeInstancesCommand({ InstanceIds: instanceIds }),
+			);
+			foundInstances =
+				info.Reservations?.flatMap((r) => r.Instances || []) || [];
+			const allPresent = foundInstances.length >= instanceIds.length;
+			const ips = new Map(
+				foundInstances
+					.filter((i) => i.InstanceId && i.PublicIpAddress)
+					.map((i) => [i.InstanceId!, i.PublicIpAddress!]),
+			);
+			const allHaveIp = instanceIds.every((id) => ips.has(id));
+			if (allPresent && allHaveIp) {
+				// reorder to original order
+				var publicIps = instanceIds.map((id) => ips.get(id)!);
+				if (publicIps.length > 0) {
+					// success
+					return publicIps.map((v, ix) => {
+						return {
+							instanceId: instanceOut.Instances![ix].InstanceId!,
+							publicIp: v,
+							name: names[ix],
+							region: regionString,
+						};
+					});
+				}
+			}
+		} catch (e: any) {
+			// AWS eventual consistency: sometimes returns InvalidInstanceID.NotFound immediately after RunInstances
+			const code = e?.Code || e?.name || e?.code;
+			if (code !== "InvalidInstanceID.NotFound") {
+				throw e;
+			}
+		}
+		await delay(pollIntervalMs);
 	}
 
-	return publicIps.map((v, ix) => {
-		return {
-			instanceId: instanceOut.Instances![ix].InstanceId!,
-			publicIp: v,
-			name: names[ix],
-			region: regionString,
-		};
-	}); // TODO types
+	throw new Error(
+		"Timed out waiting for instances to be describe-able with public IPs",
+	);
 };
 
 export const terminateNode = async (properties: {

package/src/cli.ts

@@ -1188,6 +1188,29 @@ export const cli = async (args?: string[]) => {
 											}
 										},
 									})
+									.command({
+										command: "self-update [version]",
+										describe:
+											"Update @peerbit/server on the target node to [version] (default latest) and restart",
+										builder: (yargs) => {
+											yargs.positional("version", {
+												describe:
+													"Version spec for @peerbit/server (e.g. 5.4.16)",
+												type: "string",
+											});
+											return yargs;
+										},
+										handler: async (args) => {
+											for (const api of apis) {
+												const { version } = await api.api.selfUpdate(
+													args.version as string | undefined,
+												);
+												api.log(
+													`Self-update to @peerbit/server@${version} initiated`,
+												);
+											}
+										},
+									})
 									.command({
 										command: "stop",
 										describe: "Stop the server",

package/src/client.ts

@@ -22,6 +22,7 @@ import {
 	PROGRAM_VARIANTS_PATH,
 	REMOTE_API_PORT,
 	RESTART_PATH,
+	SELF_UPDATE_PATH,
 	STOP_PATH,
 	TRUST_PATH,
 	VERSIONS_PATH,
@@ -301,6 +302,18 @@ export const createClient = async (
 				}),
 			);
 		},
+		selfUpdate: async (version?: string): Promise<{ version: string }> => {
+			const resp = throwIfNot200(
+				await axiosInstance.post(
+					endpoint + SELF_UPDATE_PATH,
+					version ? JSON.stringify({ version }) : undefined,
+					{
+						validateStatus,
+					},
+				),
+			);
+			return resp.data as { version: string };
+		},
 		stop: async (): Promise<void> => {
 			throwIfNot200(
 				await axiosInstance.post(endpoint + STOP_PATH, undefined, {

package/src/routes.ts

@@ -24,3 +24,4 @@ export const TERMINATE_PATH = "/terminate";
 export const STOP_PATH = "/stop";
 export const LOG_PATH = "/log";
 export const VERSIONS_PATH = "/versions";
+export const SELF_UPDATE_PATH = "/self/update";

package/src/server.ts

@@ -35,6 +35,7 @@ import {
 	PROGRAM_PATH,
 	PROGRAM_VARIANTS_PATH,
 	RESTART_PATH,
+	SELF_UPDATE_PATH,
 	STOP_PATH,
 	TRUST_PATH,
 	VERSIONS_PATH,
@@ -712,6 +713,73 @@ export const startApiServer = async (
 						}
 
 						/* keep the remaining else-if blocks (PEER_ID_PATH, etc.) unchanged */
+					} else if (req.url.startsWith(SELF_UPDATE_PATH)) {
+						if (req.method === "POST") {
+							try {
+								// version is optional; default to latest
+								let versionSpec: string | undefined;
+								try {
+									const parsed = JSON.parse(body || "{}");
+									versionSpec = parsed?.version;
+								} catch (_e) {}
+
+								let resolvedVersion = "latest";
+								try {
+									const spec = `@peerbit/server${versionSpec ? "@" + versionSpec : ""}`;
+									const out = execSync(`npm view ${spec} version --json`, {
+										encoding: "utf8",
+									});
+									resolvedVersion = JSON.parse(out);
+								} catch (_e) {
+									resolvedVersion = versionSpec || "latest";
+								}
+
+								console.log(
+									"Self-updating @peerbit/server to version: " +
+										resolvedVersion,
+								);
+								res.setHeader("Content-Type", "application/json");
+								res.writeHead(200);
+								res.end(JSON.stringify({ version: resolvedVersion }));
+
+								process.nextTick(() => {
+									try {
+										const installDir = getInstallDir();
+										let permission = "";
+										if (installDir) {
+											try {
+												fs.accessSync(installDir, fs.constants.W_OK);
+											} catch (_e) {
+												permission = "sudo";
+											}
+											try {
+												execSync(
+													`${permission} npm install -g @peerbit/server@${resolvedVersion}`,
+												);
+											} catch (_globalErr) {
+												execSync(
+													`${permission} npm install @peerbit/server@${resolvedVersion} --prefix ${installDir} --no-save --no-package-lock`,
+												);
+											}
+										} else {
+											execSync(
+												`npm install -g @peerbit/server@${resolvedVersion}`,
+											);
+										}
+									} catch (e) {
+										console.error("Self-update installation failed:", e);
+									}
+									restart();
+								});
+							} catch (error: any) {
+								res.writeHead(500);
+								res.end(
+									"Unexpected self-update error: " + (error?.message || ""),
+								);
+							}
+						} else {
+							r404();
+						}
 					} else if (req.url.startsWith(BOOTSTRAP_PATH)) {
 						switch (req.method) {
 							case "POST":