@peerbit/server 4.0.2 → 4.0.4

package/src/client.ts

@@ -10,7 +10,7 @@ import {
 	PROGRAM_PATH,
 	RESTART_PATH,
 	TRUST_PATH,
-	REMOTE_API_PORT,
+	REMOTE_API_PORT
 } from "./routes.js";
 import { Address } from "@peerbit/program";
 import { multiaddr } from "@multiformats/multiaddr";
@@ -20,7 +20,7 @@ import {
 	Ed25519PublicKey,
 	Identity,
 	PublicSignKey,
-	getPublicKeyFromPeerId,
+	getPublicKeyFromPeerId
 } from "@peerbit/crypto";
 import { PeerId } from "@libp2p/interface/peer-id";
 import { waitForResolved } from "@peerbit/time";
@@ -29,7 +29,7 @@ import { RemoteOrigin } from "./remotes.js";
 export const createClient = async (
 	keypair: Identity<Ed25519PublicKey>,
 	remote: { address: string; origin?: RemoteOrigin } = {
-		address: "http://localhost:" + LOCAL_API_PORT,
+		address: "http://localhost:" + LOCAL_API_PORT
 	}
 ) => {
 	// Add missing protocol
@@ -96,26 +96,26 @@ export const createClient = async (
 		throwIfNot200(
 			await axiosInstance.get(endpoint + PEER_ID_PATH, {
 				validateStatus,
-				timeout: 5000,
+				timeout: 5000
 			})
 		).data;
 
 	return {
 		peer: {
 			id: {
-				get: getId,
+				get: getId
 			},
 			addresses: {
 				get: async () => {
 					return (
 						throwIfNot200(
 							await axiosInstance.get(endpoint + ADDRESS_PATH, {
-								validateStatus,
+								validateStatus
 							})
 						).data as string[]
 					).map((x) => multiaddr(x));
-				},
-			},
+				}
+			}
 		},
 
 		access: {
@@ -155,7 +155,7 @@ export const createClient = async (
 					throw new Error(result.data);
 				}
 				return result.status === 200 ? true : false;
-			},
+			}
 		},
 		program: {
 			has: async (address: Address | string): Promise<boolean> => {
@@ -178,7 +178,7 @@ export const createClient = async (
 						endpoint + PROGRAM_PATH,
 						JSON.stringify(program),
 						{
-							validateStatus,
+							validateStatus
 						}
 					)
 				);
@@ -193,7 +193,7 @@ export const createClient = async (
 							"/" +
 							encodeURIComponent(address.toString()),
 						{
-							validateStatus,
+							validateStatus
 						}
 					)
 				);
@@ -208,7 +208,7 @@ export const createClient = async (
 							encodeURIComponent(address.toString()) +
 							"?delete=true",
 						{
-							validateStatus,
+							validateStatus
 						}
 					)
 				);
@@ -217,11 +217,11 @@ export const createClient = async (
 			list: async (): Promise<string[]> => {
 				const resp = throwIfNot200(
 					await axiosInstance.get(endpoint + PROGRAMS_PATH, {
-						validateStatus,
+						validateStatus
 					})
 				);
 				return resp.data as string[];
-			},
+			}
 		},
 		dependency: {
 			install: async (instruction: InstallDependency): Promise<string[]> => {
@@ -229,7 +229,7 @@ export const createClient = async (
 					endpoint + INSTALL_PATH,
 					JSON.stringify(instruction),
 					{
-						validateStatus,
+						validateStatus
 					}
 				);
 				if (resp.status !== 200) {
@@ -238,29 +238,29 @@ export const createClient = async (
 					);
 				}
 				return resp.data;
-			},
+			}
 		},
 		network: {
 			bootstrap: async (): Promise<void> => {
 				throwIfNot200(
 					await axiosInstance.post(endpoint + BOOTSTRAP_PATH, undefined, {
-						validateStatus,
+						validateStatus
 					})
 				);
-			},
+			}
 		},
 
 		restart: async (): Promise<void> => {
 			throwIfNot200(
 				await axiosInstance.post(endpoint + RESTART_PATH, undefined, {
-					validateStatus,
+					validateStatus
 				})
 			);
 		},
 		stop: async (): Promise<void> => {
 			throwIfNot200(
 				await axiosInstance.post(endpoint + STOP_PATH, undefined, {
-					validateStatus,
+					validateStatus
 				})
 			);
 		},
@@ -269,10 +269,10 @@ export const createClient = async (
 			if (remote.origin?.type === "aws") {
 				await terminateNode({
 					instanceId: remote.origin.instanceId,
-					region: remote.origin.region,
+					region: remote.origin.region
 				});
 			}
-		},
+		}
 	};
 };
 
@@ -281,7 +281,7 @@ export const waitForDomain = async (
 	timeout: number = 5 * 60 * 1000
 ): Promise<string> => {
 	const c = await createClient(await Ed25519Keypair.create(), {
-		address: "http://" + ip + ":" + LOCAL_API_PORT,
+		address: "http://" + ip + ":" + LOCAL_API_PORT
 	});
 	const result = await waitForResolved(
 		async () => {
@@ -294,7 +294,7 @@ export const waitForDomain = async (
 		},
 		{
 			delayInterval: 5000,
-			timeout,
+			timeout
 		}
 	);
 	if (!result) {

package/src/docker.ts

@@ -33,7 +33,7 @@ export const installDocker = async () => {
 		try {
 			await waitForAsync(() => dockerExist(), {
 				timeout: 30 * 1000,
-				delayInterval: 1000,
+				delayInterval: 1000
 			});
 		} catch (error) {
 			throw new Error("Failed to install docker");

package/src/peerbit.ts

@@ -24,29 +24,29 @@ export const create = (properties: {
 				announce: properties.domain
 					? [
 							`/dns4/${properties.domain}/tcp/4002`,
-							`/dns4/${properties.domain}/tcp/4003/wss`,
+							`/dns4/${properties.domain}/tcp/4003/wss`
 					  ]
 					: undefined,
 				listen: [
 					`/ip4/127.0.0.1/tcp/${listenPort}`,
 					`/ip4/127.0.0.1/tcp/${
 						listenPort !== 0 ? listenPort + 1 : listenPort
-					}/ws`,
-				],
+					}/ws`
+				]
 			},
 			connectionManager: {
 				maxConnections: Infinity,
-				minConnections: 0,
+				minConnections: 0
 			},
 			services: {
 				blocks: (c) =>
 					new DirectBlock(c, {
 						directory: blocksDirectory,
-						canRelayMessage: true,
+						canRelayMessage: true
 					}),
-				pubsub: (c) => new DirectSub(c, { canRelayMessage: true }),
-			},
+				pubsub: (c) => new DirectSub(c, { canRelayMessage: true })
+			}
 		},
-		directory: properties.directory,
+		directory: properties.directory
 	});
 };

package/src/remotes.ts

@@ -31,7 +31,7 @@ export class Remotes {
 			) as RemotesObject;
 		} else {
 			this.data = {
-				remotes: [],
+				remotes: []
 			};
 		}
 	}

package/src/server.ts

@@ -2,14 +2,14 @@ import http from "http";
 import {
 	fromBase64,
 	getKeypairFromPeerId,
-	getPublicKeyFromPeerId,
+	getPublicKeyFromPeerId
 } from "@peerbit/crypto";
 import { deserialize } from "@dao-xyz/borsh";
 import {
 	Program,
 	ProgramClient,
 	getProgramFromVariant,
-	getProgramFromVariants,
+	getProgramFromVariants
 } from "@peerbit/program";
 import { waitFor } from "@peerbit/time";
 import { v4 as uuid } from "uuid";
@@ -17,7 +17,7 @@ import {
 	getHomeConfigDir,
 	getNodePath,
 	getKeypair,
-	getTrustPath,
+	getTrustPath
 } from "./config.js";
 import { setMaxListeners } from "events";
 import { create } from "./peerbit.js";
@@ -27,7 +27,7 @@ import {
 	InstallDependency,
 	StartByBase64,
 	StartByVariant,
-	StartProgram,
+	StartProgram
 } from "./types.js";
 import {
 	ADDRESS_PATH,
@@ -39,7 +39,7 @@ import {
 	PROGRAM_PATH,
 	RESTART_PATH,
 	TRUST_PATH,
-	STOP_PATH,
+	STOP_PATH
 } from "./routes.js";
 import { Session } from "./session.js";
 import fs from "fs";
@@ -95,7 +95,7 @@ export const startServerWithNode = async (properties: {
 		directory: getNodePath(properties.directory),
 		domain: properties.domain,
 		listenPort: properties.ports?.node,
-		peerId: await keypair.toPeerId(),
+		peerId: await keypair.toPeerId()
 	});
 
 	if (properties.bootstrap) {
@@ -110,7 +110,7 @@ export const startServerWithNode = async (properties: {
 		sessionDirectory
 			? new Level<string, Uint8Array>(sessionDirectory, {
 					valueEncoding: "view",
-					keyEncoding: "utf-8",
+					keyEncoding: "utf-8"
 			  })
 			: new MemoryLevel({ valueEncoding: "view", keyEncoding: "utf-8" })
 	);
@@ -134,7 +134,7 @@ export const startServerWithNode = async (properties: {
 	const server = await startApiServer(peer, {
 		port: properties.ports?.api,
 		trust,
-		session,
+		session
 	});
 	const printNodeInfo = async () => {
 		console.log("Starting node with address(es): ");
@@ -156,7 +156,6 @@ export const startServerWithNode = async (properties: {
 				if (server.listening) {
 					console.log("Shutting down node");
 					await stopAndWait(server);
-					await waitFor(() => closed);
 					await controller.stop();
 				}
 				exit();
@@ -166,7 +165,6 @@ export const startServerWithNode = async (properties: {
 			if (server.listening) {
 				console.log("Shutting down node");
 				await stopAndWait(server);
-				await waitFor(() => closed);
 				await controller.stop();
 			}
 		});
@@ -242,13 +240,13 @@ export const startApiServer = async (
 			process.argv.shift()!,
 			[
 				...process.execArgv,
-				...process.argv.filter((x) => x !== "--reset" && x !== "-r"),
+				...process.argv.filter((x) => x !== "--reset" && x !== "-r")
 			],
 			{
 				cwd: process.cwd(),
 				detached: true,
 				stdio: "inherit",
-				gid: process.getgid!(),
+				gid: process.getgid!()
 			}
 		);
 		process.exit(0);
@@ -452,7 +450,7 @@ export const startApiServer = async (
 										name:
 											base58btc.encode(Buffer.from(installName)) +
 											uuid() +
-											".tgz",
+											".tgz"
 									});
 									fs.writeFileSync(tempFile.fd, binary);
 									clear = () => tempFile.removeCallback();

package/src/session.ts

@@ -13,13 +13,13 @@ export class Session {
 		this.imports = new KV(
 			this.level.sublevel<string, Uint8Array>("imports", {
 				keyEncoding: "utf8",
-				valueEncoding: "view",
+				valueEncoding: "view"
 			})
 		);
 		this.programs = new KV(
 			this.level.sublevel<string, Uint8Array>("programs", {
 				keyEncoding: "utf8",
-				valueEncoding: "view",
+				valueEncoding: "view"
 			})
 		);
 	}

package/src/signes-request.ts

@@ -5,7 +5,7 @@ import {
 	fromBase64,
 	toBase64,
 	verify,
-	Ed25519PublicKey,
+	Ed25519PublicKey
 } from "@peerbit/crypto";
 import { deserialize, serialize, BinaryWriter } from "@dao-xyz/borsh";
 import http from "http";