@peerbit/server 5.7.0 → 5.8.1-8f8f903

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

package/package.json

@@ -1,91 +1,91 @@
 {
-	"name": "@peerbit/server",
-	"version": "5.7.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.2.0",
-		"@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.2.0",
-		"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.8.1-8f8f903",
+  "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-8f8f903",
+    "@peerbit/test-utils": "2.2.1-8f8f903",
+    "@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.3.0-8f8f903",
+    "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

@@ -52,17 +52,18 @@ export const createRecord = async (options: {
 	await client.send(cmd);
 };
 
-const setupUserData = (email: string, grantAccess: PeerId[] = []) => {
+const setupUserData = (grantAccess: PeerId[] = [], serverVersion?: string) => {
 	const peerIdStrings = grantAccess.map((x) => x.toString());
 
 	// better-sqlite3 force use to install build-essentials for `make` command, TOOD dont bundle better-sqlite3 by default?
+	const versionSpec = serverVersion ? `@${serverVersion}` : "";
 	return `#!/bin/bash
 cd /home/ubuntu
 curl -fsSL https://deb.nodesource.com/setup_22.x | sudo -E bash - &&\
 sudo apt-get install -y nodejs
 sudo apt-get install -y build-essential
-npm install -g @peerbit/server
-sudo peerbit domain test --email ${email}
+npm install -g @peerbit/server${versionSpec}
+sudo peerbit domain test
 peerbit start ${peerIdStrings.map((key) => `--ga ${key}`)} > log.txt 2>&1 &
 `;
 };
@@ -105,11 +106,11 @@ export const AWS_LINUX_ARM_AMIs: Record<string, string> = {
 };
 export const launchNodes = async (properties: {
 	region?: string;
-	email: string;
 	count?: number;
 	size?: "micro" | "small" | "medium" | "large" | "xlarge" | "2xlarge";
 	namePrefix?: string;
 	grantAccess?: PeerId[];
+	serverVersion?: string;
 }): Promise<
 	{ instanceId: string; publicIp: string; name: string; region: string }[]
 > => {
@@ -218,7 +219,7 @@ export const launchNodes = async (properties: {
 			SecurityGroupIds: [securityGroupOut.GroupId!],
 			InstanceType: ("t4g." + (properties.size || "micro")) as any, // TODO types
 			UserData: Buffer.from(
-				setupUserData(properties.email, properties.grantAccess),
+				setupUserData(properties.grantAccess, properties.serverVersion),
 			).toString("base64"),
 			MinCount: count,
 			MaxCount: count,

package/src/cli.ts

@@ -218,11 +218,6 @@ export const cli = async (args?: string[]) => {
 						describe:
 							"Setup a testing domain with SSL (no guarantess on how long the domain will be available)",
 						builder: {
-							email: {
-								describe: "Email for Lets encrypt autorenewal messages",
-								type: "string",
-								demandOption: true,
-							},
 							outdir: {
 								describe: "Output path for Nginx config",
 								type: "string",
@@ -237,7 +232,7 @@ export const cli = async (args?: string[]) => {
 						},
 						handler: async (args) => {
 							const domain = await createTestDomain();
-							await startCertbot(domain, args.email, args.wait);
+							await startCertbot(domain, args.wait);
 							exit();
 						},
 					})
@@ -273,11 +268,6 @@ export const cli = async (args?: string[]) => {
 								alias: "sk",
 								type: "string",
 							},
-							email: {
-								describe: "Email for Lets encrypt auto-renewal messages",
-								type: "string",
-								demandOption: true,
-							},
 							outdir: {
 								describe: "Output path for Nginx config",
 								type: "string",
@@ -310,12 +300,7 @@ export const cli = async (args?: string[]) => {
 										}
 									: undefined,
 							});
-							await startCertbot(
-								args.domain,
-								args.email,
-								args.outdir,
-								args.wait,
-							);
+							await startCertbot(args.domain, args.wait);
 							exit();
 						},
 					})
@@ -386,24 +371,33 @@ export const cli = async (args?: string[]) => {
 									alias: "d",
 									default: getHomeConfigDir(),
 								});
+								awsArgs.option("server-version", {
+									describe:
+										"@peerbit/server version or tag to install on the instance (e.g. 5.7.0-58d3d09)",
+									type: "string",
+									alias: ["sv"],
+								});
 								return awsArgs;
 							},
 							handler: async (args) => {
 								const accessGrant: PeerId[] =
-									args.access?.length > 0
-										? args.access.map((x: any) => peerIdFromString(x))
+									args["grant-access"]?.length > 0
+										? (args["grant-access"] as string[]).map((x) =>
+												peerIdFromString(x),
+											)
 										: [
 												await (
 													await getKeypair(args.directory)
 												).publicKey.toPeerId(),
 											];
 								const nodes = await launchNodes({
-									email: "marcus@dao.xyz",
 									count: args.count,
 									namePrefix: args.name,
 									region: args.region,
 									grantAccess: accessGrant,
 									size: args.size,
+									serverVersion:
+										(args["server-version"] as string) || undefined,
 								});
 
 								console.log(

package/src/client.ts

@@ -23,6 +23,7 @@ import {
 	REMOTE_API_PORT,
 	RESTART_PATH,
 	SELF_UPDATE_PATH,
+	STATS_PATH,
 	STOP_PATH,
 	TRUST_PATH,
 	VERSIONS_PATH,
@@ -132,6 +133,22 @@ export const createClient = async (
 					).map((x) => multiaddr(x));
 				},
 			},
+			stats: {
+				get: async (): Promise<{
+					connections: { total: number; inbound: number; outbound: number };
+					dialQueue: { pending: number };
+				}> => {
+					const resp = throwIfNot200(
+						await axiosInstance.get(endpoint + STATS_PATH, {
+							validateStatus,
+						}),
+					);
+					return resp.data as {
+						connections: { total: number; inbound: number; outbound: number };
+						dialQueue: { pending: number };
+					};
+				},
+			},
 		},
 
 		access: {

package/src/domain.ts

@@ -3,14 +3,6 @@ import { waitFor } from "@peerbit/time";
 
 const isNode = typeof process !== "undefined" && process.versions?.node != null;
 
-const validateEmail = (email: any) => {
-	return String(email)
-		.toLowerCase()
-		.match(
-			/^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/,
-		);
-};
-
 const getConfigFileTemplate = async (): Promise<string> => {
 	const url = await import("url");
 	const filename = url.fileURLToPath(import.meta.url);
@@ -131,13 +123,9 @@ export const createTestDomain = async () => {
 
 export const startCertbot = async (
 	domain: string,
-	email: string,
 	waitForUp = false,
 	dockerProcessName = "nginx-certbot",
 ): Promise<void> => {
-	if (!validateEmail(email)) {
-		throw new Error("Email for SSL renenewal is invalid");
-	}
 	const { installDocker, startContainer } = await import("./docker.js");
 
 	const nginxConfigPath = await getNginxFolderPath();
@@ -153,7 +141,7 @@ export const startCertbot = async (
 	// copy ui from node_modules to home for permission reasons (volume will not work otherwise)
 	const certbotDockerCommand = `cp -r ${uiPath} $(pwd)/ui && docker pull jonasal/nginx-certbot:latest && docker run -d --net=host \
 	--restart unless-stopped \
-	--env CERTBOT_EMAIL=${email} ${isTest ? "--env STAGING=1" : ""}\
+	${isTest ? "--env STAGING=1" : ""}\
     -v $(pwd)/nginx_secrets:/etc/letsencrypt \
     -v ${nginxConfigPath}:/etc/nginx/user_conf.d:ro \
     -v $(pwd)/ui:/usr/share/nginx/html:ro \

package/src/nginx-template.conf

@@ -1,23 +1,5 @@
 server_names_hash_bucket_size 128;
 
-# --- stream (TCP/UDP) layer ---
-stream {
-    # libp2p TCP forward: /dns4/%DOMAIN%/tcp/4002 -> 127.0.0.1:8001
-    server {
-        listen 4002;
-        proxy_connect_timeout 10s;
-        proxy_timeout 1h;
-        proxy_pass 127.0.0.1:8001;
-    }
-
-    # webrtc-direct UDP forward: /dns4/%DOMAIN%/udp/4004/webrtc-direct -> 127.0.0.1:8004
-    server {
-        listen 4003 udp;
-        proxy_timeout 1h;
-        proxy_pass 127.0.0.1:8003;
-    }
-}
-
 server {
     server_name %DOMAIN%;
     listen [::]:4003 ssl ipv6only=on;

package/src/peerbit.ts

@@ -33,16 +33,27 @@ export const create = (properties: {
 					? [
 							`/dns4/${properties.domain}/tcp/4002`,
 							`/dns4/${properties.domain}/tcp/4003/wss`,
-							`/dns4/${properties.domain}/tcp/4004/webrtc-direct`,
+							`/dns4/${properties.domain}/udp/4004/webrtc-direct`,
 						]
 					: undefined,
-				listen: [
-					`/ip4/127.0.0.1/tcp/${listenPort}`,
-					`/ip4/127.0.0.1/tcp/${
-						listenPort !== 0 ? listenPort + 1 : listenPort
-					}/ws`,
-					`/ip4/127.0.0.1/udp/${listenPort !== 0 ? listenPort + 2 : listenPort}/webrtc-direct`,
-				],
+				listen: (() => {
+					if (properties.domain) {
+						// Direct binds on public ports, keep only local WS for nginx TLS->WS proxy
+						return [
+							`/ip4/0.0.0.0/tcp/4002`,
+							`/ip4/127.0.0.1/tcp/${
+								listenPort !== 0 ? listenPort + 1 : listenPort
+							}/ws`,
+							`/ip4/0.0.0.0/udp/4004/webrtc-direct`,
+						];
+					}
+					// Local-only defaults (no domain)
+					return [
+						`/ip4/127.0.0.1/tcp/${listenPort}`,
+						`/ip4/127.0.0.1/tcp/${listenPort !== 0 ? listenPort + 1 : listenPort}/ws`,
+						`/ip4/127.0.0.1/udp/${listenPort !== 0 ? listenPort + 2 : listenPort}/webrtc-direct`,
+					];
+				})(),
 			},
 			connectionMonitor: {
 				abortConnectionOnPingFailure: false,

package/src/routes.ts

@@ -14,6 +14,7 @@ export const LOCAL_API_PORT = 8082;
 export const TRUST_PATH = "/trust";
 export const PEER_ID_PATH = "/peer/id";
 export const ADDRESS_PATH = "/peer/address";
+export const STATS_PATH = "/peer/stats";
 export const PROGRAM_PATH = "/program";
 export const PROGRAMS_PATH = "/programs";
 export const PROGRAM_VARIANTS_PATH = "/program/variants";

package/src/server.ts

@@ -4,7 +4,6 @@ import { peerIdFromString } from "@libp2p/peer-id";
 import { fromBase64, getPublicKeyFromPeerId } from "@peerbit/crypto";
 import {
 	Program,
-	type ProgramClient,
 	getProgramFromVariant,
 	getProgramFromVariants,
 } from "@peerbit/program";
@@ -36,6 +35,7 @@ import {
 	PROGRAM_VARIANTS_PATH,
 	RESTART_PATH,
 	SELF_UPDATE_PATH,
+	STATS_PATH,
 	STOP_PATH,
 	TRUST_PATH,
 	VERSIONS_PATH,
@@ -268,7 +268,7 @@ function findPeerbitProgramFolder(inputDirectory: string): string | null {
 }
 
 export const startApiServer = async (
-	client: ProgramClient,
+	client: Peerbit,
 	properties: {
 		trust: Trust;
 		session?: Session;
@@ -332,7 +332,7 @@ export const startApiServer = async (
 
 	const e404 = "404";
 
-	const endpoints = (client: ProgramClient): http.RequestListener => {
+	const endpoints = (client: Peerbit): http.RequestListener => {
 		return async (req, res) => {
 			res.setHeader("Access-Control-Allow-Origin", "*");
 			res.setHeader("Access-Control-Request-Method", "*");
@@ -887,12 +887,45 @@ export const startApiServer = async (
 								r404();
 								break;
 						}
-					}  */ else if (req.url.startsWith(PEER_ID_PATH)) {
+					}  */ else if (req.url.startsWith(STATS_PATH)) {
+						if (req.method === "GET") {
+							try {
+								const connections = client.libp2p.getConnections();
+								const inbound = connections.filter(
+									(c) => c.direction === "inbound",
+								).length;
+								const outbound = connections.filter(
+									(c) => c.direction === "outbound",
+								).length;
+								const dialQueue = client.libp2p.getDialQueue();
+
+								const payload = {
+									connections: {
+										total: connections.length,
+										inbound,
+										outbound,
+									},
+									dialQueue: {
+										pending: dialQueue.length,
+									},
+								};
+								res.setHeader("Content-Type", "application/json");
+								res.writeHead(200);
+								res.end(JSON.stringify(payload));
+							} catch (error: any) {
+								res.writeHead(500);
+								res.end(error?.message || "Failed to compute stats");
+							}
+						} else {
+							r404();
+						}
+					} else if (req.url.startsWith(PEER_ID_PATH)) {
 						res.writeHead(200);
 						res.end(client.peerId.toString());
 					} else if (req.url.startsWith(ADDRESS_PATH)) {
 						res.setHeader("Content-Type", "application/json");
 						res.writeHead(200);
+
 						const addresses = client.getMultiaddrs().map((x) => x.toString());
 						res.end(JSON.stringify(addresses));
 					} else {