@peerbit/server 5.10.13 → 5.10.14-3f16953

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peerbit/server",
-  "version": "5.10.13",
+  "version": "5.10.14-3f16953",
   "author": "dao.xyz",
   "repository": {
     "type": "git",
@@ -58,6 +58,8 @@
     ]
   },
   "devDependencies": {
+    "@peerbit/test-lib": "0.0.1-3f16953",
+    "@peerbit/test-utils": "2.3.19-3f16953",
     "@types/yargs": "17.0.24",
     "aws-sdk": "^2.1259.0",
     "dotenv": "^16.1.4",
@@ -65,13 +67,12 @@
     "@types/tar-stream": "^3.1.3",
     "shx": "^0.3.4",
     "@types/libsodium-wrappers": "^0.7.14",
-    "uuid": "^10.0.0",
-    "@peerbit/test-lib": "0.0.1",
-    "@peerbit/test-utils": "2.3.18"
+    "uuid": "^10.0.0"
   },
   "dependencies": {
     "axios": "^1.4.0",
     "chalk": "^5.3.0",
+    "peerbit": "4.4.19-3f16953",
     "yargs": "^17.7.2",
     "tar-stream": "^3.1.7",
     "tmp": "^0.2.1",
@@ -82,19 +83,18 @@
     "@libp2p/tcp": "^11.0.2",
     "@libp2p/websockets": "^10.1.0",
     "@multiformats/multiaddr": "^13.0.1",
+    "@peerbit/blocks": "3.1.8-3f16953",
+    "@peerbit/crypto": "2.4.1-3f16953",
+    "@peerbit/program": "5.6.3-3f16953",
+    "@peerbit/pubsub": "4.1.4-3f16953",
+    "@peerbit/time": "2.3.0-3f16953",
     "@dao-xyz/borsh": "^6.0.0",
     "libsodium-wrappers": "0.7.15",
     "uint8arrays": "^5.1.0",
     "level": "^10.0.0",
     "memory-level": "^3.1.0",
     "multiformats": "^13.4.1",
-    "abstract-level": "^3.1.0",
-    "peerbit": "4.4.18",
-    "@peerbit/blocks": "3.1.8",
-    "@peerbit/crypto": "2.4.1",
-    "@peerbit/program": "5.6.2",
-    "@peerbit/pubsub": "4.1.4",
-    "@peerbit/time": "2.3.0"
+    "abstract-level": "^3.1.0"
   },
   "optionalDependencies": {
     "@aws-sdk/client-ec2": "^3.390.0",

package/src/client.ts

@@ -77,18 +77,31 @@ export const createClient = async (
 
 	const throwIfNot200 = (resp: { status: number; data: any }) => {
 		if (resp.status !== 200) {
-			throw new Error(resp.data);
+			throw new Error(`HTTP ${resp.status}: ${resp.data ?? ""}`.trim());
 		}
 		return resp;
 	};
 
+	const endpointUrl = (path: string) => new URL(path, endpoint).toString();
+
 	const getId = async () =>
-		throwIfNot200(
-			await axiosInstance.get(endpoint + PEER_ID_PATH, {
-				validateStatus,
-				timeout: 5000,
-			}),
-		).data;
+		(
+			await waitForResolved(
+				async () => {
+					const resp = await axiosInstance.get(endpointUrl(PEER_ID_PATH), {
+						validateStatus,
+						timeout: 5000,
+					});
+					return throwIfNot200(resp).data as string;
+				},
+				{
+					// Occasional CI flake: server can return 404 during very early startup
+					// or transient network hiccups; retry briefly.
+					timeout: 5000,
+					delayInterval: 50,
+				},
+			)
+		).toString();
 
 	const close = async (address: string) => {
 		return throwIfNot200(
@@ -123,14 +136,17 @@ export const createClient = async (
 			},
 			addresses: {
 				get: async () => {
-					return (
-						throwIfNot200(
-							await axiosInstance.get(endpoint + ADDRESS_PATH, {
+					const addresses = await waitForResolved(
+						async () => {
+							const resp = await axiosInstance.get(endpointUrl(ADDRESS_PATH), {
 								timeout: 5000,
 								validateStatus,
-							}),
-						).data as string[]
-					).map((x) => multiaddr(x));
+							});
+							return throwIfNot200(resp).data as string[];
+						},
+						{ timeout: 5000, delayInterval: 50 },
+					);
+					return addresses.map((x) => multiaddr(x));
 				},
 			},
 			stats: {
@@ -304,11 +320,17 @@ export const createClient = async (
 			},
 		},
 		network: {
-			bootstrap: async (): Promise<void> => {
+			bootstrap: async (options?: { addresses?: string[] }): Promise<void> => {
 				throwIfNot200(
-					await axiosInstance.post(endpoint + BOOTSTRAP_PATH, undefined, {
-						validateStatus,
-					}),
+					await axiosInstance.post(
+						endpoint + BOOTSTRAP_PATH,
+						options?.addresses
+							? JSON.stringify({ addresses: options.addresses })
+							: undefined,
+						{
+							validateStatus,
+						},
+					),
 				);
 			},
 		},

package/src/peerbit.ts

@@ -1,7 +1,7 @@
 import { keys } from "@libp2p/crypto";
 import { DirectBlock } from "@peerbit/blocks";
 import type { Ed25519Keypair } from "@peerbit/crypto";
-import { DirectSub } from "@peerbit/pubsub";
+import { FanoutTree, TopicControlPlane, TopicRootControlPlane } from "@peerbit/pubsub";
 import path from "path";
 import { Peerbit } from "peerbit";
 import { concat } from "uint8arrays";
@@ -14,6 +14,19 @@ export const create = (properties: {
 	keypair: Ed25519Keypair;
 }) => {
 	const listenPort = properties.listenPort ?? LIBP2P_LISTEN_PORT;
+	const topicRootControlPlane = new TopicRootControlPlane({
+		defaultCandidates: [properties.keypair.publicKey.hashcode()],
+	});
+	let fanoutInstance: FanoutTree | undefined;
+	const getOrCreateFanout = (c: any) => {
+		if (!fanoutInstance) {
+			fanoutInstance = new FanoutTree(c, {
+				connectionManager: false,
+				topicRootControlPlane,
+			});
+		}
+		return fanoutInstance;
+	};
 	const blocksDirectory =
 		properties.directory != null
 			? path.join(properties.directory, "/blocks").toString()
@@ -72,7 +85,14 @@ export const create = (properties: {
 						directory: blocksDirectory,
 						canRelayMessage: true,
 					}),
-				pubsub: (c) => new DirectSub(c, { canRelayMessage: true }),
+				pubsub: (c) =>
+					new TopicControlPlane(c, {
+						canRelayMessage: true,
+						topicRootControlPlane,
+						fanout: getOrCreateFanout(c),
+						hostShards: true,
+					}),
+				fanout: (c) => getOrCreateFanout(c),
 			},
 		},
 		directory: properties.directory,

package/src/server.ts

@@ -851,16 +851,26 @@ export const startApiServer = async (
 						}
 					} else if (req.url.startsWith(BOOTSTRAP_PATH)) {
 						switch (req.method) {
-							case "POST":
+							case "POST": {
 								if (client instanceof Peerbit === false) {
 									res.writeHead(400);
 									res.end("Server node is not running a native client");
 									return;
 								}
-								await (client as Peerbit).bootstrap();
+								let addresses: string[] | undefined;
+								try {
+									const parsed = body ? JSON.parse(body) : undefined;
+									if (Array.isArray(parsed?.addresses)) {
+										addresses = parsed.addresses;
+									}
+								} catch {
+									// ignore invalid bootstrap payload; fall back to default bootstrap list
+								}
+								await (client as Peerbit).bootstrap(addresses);
 								res.writeHead(200);
 								res.end();
 								break;
+							}
 
 							default:
 								r404();