@peerbit/server 5.0.32 → 5.0.33-218a5bb

package/lib/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-Dg4BL3Lz.js"></script>
+  <script type="module" crossorigin src="/assets/index-CvfEshgH.js"></script>
   <link rel="stylesheet" crossorigin href="/assets/index-BDBx6C_I.css">
 </head>
 

package/package.json

@@ -1,80 +1,79 @@
 {
-	"name": "@peerbit/server",
-	"version": "5.0.32",
-	"author": "dao.xyz",
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/dao-xyz/peerbit"
-	},
-	"license": "Apache-2.0",
-	"type": "module",
-	"sideEffects": false,
-	"bin": {
-		"peerbit": "./lib/esm/bin.js"
-	},
-	"module": "lib/esm/index.js",
-	"types": "lib/esm/index.d.ts",
-	"exports": {
-		"import": "./lib/esm/index.js"
-	},
-	"browser": {
-		"./lib/esm/server.js": "./lib/esm/server.browser.js",
-		"./server.js": "./lib/esm/server.browser.js",
-		"./lib/esm/config.js": "./lib/esm/config.browser.js",
-		"./config.js": "./lib/esm/config.browser.js",
-		"./lib/esm/remotes.js": "./lib/esm/remotes.browser.js",
-		"./remotes.js": "./lib/esm/remotes.browser.js",
-		"./lib/esm/docker.js": "./lib/esm/docker.browser.js",
-		"./docker.js": "./lib/esm/docker.browser.js",
-		"./lib/esm/aws.js": "./lib/esm/aws.browser.js"
-	},
-	"files": [
-		"lib",
-		"src",
-		"src/nginx-template.conf",
-		"!src/**/__tests__",
-		"!lib/**/__tests__",
-		"patches",
-		"LICENSE"
-	],
-	"publishConfig": {
-		"access": "public"
-	},
-	"engines": {
-		"node": ">=18"
-	},
-	"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 lib/esm/ && cp -r ../frontend/dist lib/ui",
-		"test": "node ../../../node_modules/.bin/jest test  -c  ../../../jest.config.ts --runInBand --forceExit",
-		"test:unit": "node ../../../node_modules/.bin/jest test  -c  ../../../jest.config.unit.ts --runInBand --forceExit",
-		"test:integration": "node ../node_modules/.bin/jest test -c  ../../../jest.config.integration.ts --runInBand --forceExit"
-	},
-	"devDependencies": {
-		"@peerbit/test-lib": "^0.0.1",
-		"@peerbit/test-utils": "2.0.32",
-		"@types/tmp": "^0.2.3",
-		"@types/yargs": "17.0.24",
-		"aws-sdk": "^2.1259.0",
-		"dotenv": "^16.1.4"
-	},
-	"dependencies": {
-		"@dao-xyz/libp2p-noise": "^14.1.2",
-		"axios": "^1.4.0",
-		"chalk": "^5.3.0",
-		"peerbit": "4.0.6",
-		"tar-stream": "^3.1.6",
-		"tmp": "^0.2.1",
-		"tty-table": "^4.2.1",
-		"yargs": "^17.7.2",
-		"zlib": "^1.0.5"
-	},
-	"optionalDependencies": {
-		"@aws-sdk/client-ec2": "^3.390.0",
-		"@aws-sdk/client-route-53": "^3.391.0"
-	},
-	"gitHead": "eaabc8746086d126df86d4308ca1c4f65ac20f32"
+  "name": "@peerbit/server",
+  "version": "5.0.33-218a5bb",
+  "author": "dao.xyz",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dao-xyz/peerbit"
+  },
+  "license": "Apache-2.0",
+  "type": "module",
+  "sideEffects": false,
+  "bin": {
+    "peerbit": "./lib/esm/bin.js"
+  },
+  "module": "lib/esm/index.js",
+  "types": "lib/esm/index.d.ts",
+  "exports": {
+    "import": "./lib/esm/index.js"
+  },
+  "browser": {
+    "./lib/esm/server.js": "./lib/esm/server.browser.js",
+    "./server.js": "./lib/esm/server.browser.js",
+    "./lib/esm/config.js": "./lib/esm/config.browser.js",
+    "./config.js": "./lib/esm/config.browser.js",
+    "./lib/esm/remotes.js": "./lib/esm/remotes.browser.js",
+    "./remotes.js": "./lib/esm/remotes.browser.js",
+    "./lib/esm/docker.js": "./lib/esm/docker.browser.js",
+    "./docker.js": "./lib/esm/docker.browser.js",
+    "./lib/esm/aws.js": "./lib/esm/aws.browser.js"
+  },
+  "files": [
+    "lib",
+    "src",
+    "src/nginx-template.conf",
+    "!src/test",
+    "!src/**/__tests__",
+    "!lib/**/__tests__",
+    "patches",
+    "LICENSE"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "engines": {
+    "node": ">=18"
+  },
+  "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 lib/esm/ && cp -r ../frontend/dist lib/ui",
+    "test": "aegir test"
+  },
+  "devDependencies": {
+    "@peerbit/test-lib": "0.0.1-218a5bb",
+    "@peerbit/test-utils": "2.0.33-218a5bb",
+    "@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": {
+    "@dao-xyz/libp2p-noise": "^14.1.2",
+    "axios": "^1.4.0",
+    "chalk": "^5.3.0",
+    "peerbit": "4.0.7-218a5bb",
+    "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

@@ -19,14 +19,14 @@ import {
 } from "./config.js";
 import chalk from "chalk";
 import { createClient, waitForDomain } from "./client.js";
-import { InstallDependency, StartProgram } from "./types.js";
+import type { InstallDependency, StartProgram } from "./types.js";
 import { exit } from "process";
 import yargs from "yargs";
 import readline from "readline";
 import fs from "fs";
 import path from "path";
 import { toBase64 } from "@peerbit/crypto";
-import { DEFAULT_REMOTE_GROUP, RemoteObject, Remotes } from "./remotes.js";
+import { DEFAULT_REMOTE_GROUP, type RemoteObject, Remotes } from "./remotes.js";
 import { peerIdFromString } from "@libp2p/peer-id";
 import { LOCAL_API_PORT } from "./routes.js";
 import { type PeerId } from "@libp2p/interface";
@@ -299,9 +299,9 @@ export const cli = async (args?: string[]) => {
 								region: args.region,
 								credentials: args.accessKeyId
 									? {
-											accessKeyId: args.accessKeyId,
-											secretAccessKey: args.secretAccessKey
-										}
+										accessKeyId: args.accessKeyId,
+										secretAccessKey: args.secretAccessKey
+									}
 									: undefined
 							});
 							await startCertbot(
@@ -385,12 +385,12 @@ export const cli = async (args?: string[]) => {
 							handler: async (args) => {
 								const accessGrant: PeerId[] =
 									args.access?.length > 0
-										? args.access.map((x) => peerIdFromString(x))
+										? args.access.map((x: any) => peerIdFromString(x))
 										: [
-												await (
-													await getKeypair(args.directory)
-												).publicKey.toPeerId()
-											];
+											await (
+												await getKeypair(args.directory)
+											).publicKey.toPeerId()
+										];
 								const nodes = await launchNodes({
 									email: "marcus@dao.xyz",
 									count: args.count,
@@ -401,8 +401,7 @@ export const cli = async (args?: string[]) => {
 								});
 
 								console.log(
-									`Waiting for ${args.count} ${
-										args.count > 1 ? "nodes" : "node"
+									`Waiting for ${args.count} ${args.count > 1 ? "nodes" : "node"
 									} to spawn. This might take a few minutes. You can watch the progress in your AWS console.`
 								);
 								const twirlTimer = (function () {
@@ -432,8 +431,7 @@ export const cli = async (args?: string[]) => {
 									} catch (error: any) {
 										process.stdout.write("\r");
 										console.error(
-											`Error waiting for domain for ip: ${
-												node.publicIp
+											`Error waiting for domain for ip: ${node.publicIp
 											} to be available: ${error?.toString()}`
 										);
 									}
@@ -690,7 +688,7 @@ export const cli = async (args?: string[]) => {
 
 						const selectedRemotes: RemoteObject[] = [];
 						if (names.length > 0) {
-							for (const [ix, name] of names.entries()) {
+							for (const [_ix, name] of names.entries()) {
 								if (name === "localhost") {
 									selectedRemotes.push({
 										address: "http://localhost:" + LOCAL_API_PORT,
@@ -740,8 +738,8 @@ export const cli = async (args?: string[]) => {
 											" ",
 											remote.name.length
 										) +
-											": " +
-											string
+										": " +
+										string
 									);
 
 								apis.push({
@@ -944,8 +942,7 @@ export const cli = async (args?: string[]) => {
 														} catch (error: any) {
 															api.log(
 																chalk.red(
-																	`Failed to drop ${
-																		args.address
+																	`Failed to drop ${args.address
 																	}: ${error.toString()}`
 																)
 															);

package/src/client.ts

@@ -1,4 +1,4 @@
-import { InstallDependency, StartProgram } from "./types.js";
+import type { InstallDependency, StartProgram } from "./types.js";
 import {
 	ADDRESS_PATH,
 	BOOTSTRAP_PATH,
@@ -13,19 +13,19 @@ import {
 	REMOTE_API_PORT,
 	PROGRAM_VARIANTS_PATH
 } from "./routes.js";
-import { Address } from "@peerbit/program";
 import { multiaddr } from "@multiformats/multiaddr";
-import { signRequest } from "./signes-request.js";
+import { signRequest } from "./signed-request.js";
 import {
 	Ed25519Keypair,
 	Ed25519PublicKey,
-	Identity,
+	type Identity,
 	PublicSignKey,
 	getPublicKeyFromPeerId
 } from "@peerbit/crypto";
-import { PeerId } from "@libp2p/interface";
+import { type PeerId } from "@libp2p/interface";
 import { waitForResolved } from "@peerbit/time";
-import { RemoteOrigin } from "./remotes.js";
+import type { RemoteOrigin } from "./remotes.js";
+import type { Address } from "@peerbit/program";
 
 export const createClient = async (
 	keypair: Identity<Ed25519PublicKey>,
@@ -77,22 +77,7 @@ export const createClient = async (
 		}
 		return resp;
 	};
-	const getBodyByStatus = <
-		D extends { toString(): string },
-		T extends { status: number; data: D }
-	>(
-		resp: T
-	): D | undefined => {
-		if (resp.status === 404) {
-			return;
-		}
-		if (resp.status == 200) {
-			return resp.data;
-		}
-		throw new Error(
-			typeof resp.data === "string" ? resp.data : resp.data.toString()
-		);
-	};
+
 	const getId = async () =>
 		throwIfNot200(
 			await axiosInstance.get(endpoint + PEER_ID_PATH, {
@@ -123,15 +108,15 @@ export const createClient = async (
 			allow: async (key: PublicSignKey | PeerId | string) => {
 				const result = await axiosInstance.put(
 					endpoint +
-						TRUST_PATH +
-						"/" +
-						encodeURIComponent(
-							typeof key === "string"
-								? key
-								: key instanceof PublicSignKey
-									? key.hashcode()
-									: getPublicKeyFromPeerId(key).hashcode()
-						),
+					TRUST_PATH +
+					"/" +
+					encodeURIComponent(
+						typeof key === "string"
+							? key
+							: key instanceof PublicSignKey
+								? key.hashcode()
+								: getPublicKeyFromPeerId(key).hashcode()
+					),
 					undefined,
 					{ validateStatus }
 				);
@@ -143,13 +128,13 @@ export const createClient = async (
 			deny: async (key: PublicSignKey | PeerId) => {
 				const result = await axiosInstance.delete(
 					endpoint +
-						TRUST_PATH +
-						"/" +
-						encodeURIComponent(
-							key instanceof PublicSignKey
-								? key.hashcode()
-								: getPublicKeyFromPeerId(key).hashcode()
-						),
+					TRUST_PATH +
+					"/" +
+					encodeURIComponent(
+						key instanceof PublicSignKey
+							? key.hashcode()
+							: getPublicKeyFromPeerId(key).hashcode()
+					),
 					{ validateStatus }
 				);
 				if (result.status !== 200 && result.status !== 404) {
@@ -162,9 +147,9 @@ export const createClient = async (
 			has: async (address: Address | string): Promise<boolean> => {
 				const result = await axiosInstance.head(
 					endpoint +
-						PROGRAM_PATH +
-						"/" +
-						encodeURIComponent(address.toString()),
+					PROGRAM_PATH +
+					"/" +
+					encodeURIComponent(address.toString()),
 					{ validateStatus }
 				);
 				if (result.status !== 200 && result.status !== 404) {
@@ -190,9 +175,9 @@ export const createClient = async (
 				throwIfNot200(
 					await axiosInstance.delete(
 						endpoint +
-							PROGRAM_PATH +
-							"/" +
-							encodeURIComponent(address.toString()),
+						PROGRAM_PATH +
+						"/" +
+						encodeURIComponent(address.toString()),
 						{
 							validateStatus
 						}
@@ -204,10 +189,10 @@ export const createClient = async (
 				throwIfNot200(
 					await axiosInstance.delete(
 						endpoint +
-							PROGRAM_PATH +
-							"/" +
-							encodeURIComponent(address.toString()) +
-							"?delete=true",
+						PROGRAM_PATH +
+						"/" +
+						encodeURIComponent(address.toString()) +
+						"?delete=true",
 						{
 							validateStatus
 						}

package/src/config.ts

@@ -6,7 +6,7 @@ import { Duplex } from "stream"; // Native Node Module
 import { Ed25519Keypair } from "@peerbit/crypto";
 import { dirname } from "path";
 
-const bufferToStream = (myBuffer) => {
+const bufferToStream = (myBuffer: any) => {
 	const tmp = new Duplex();
 	tmp.push(myBuffer);
 	tmp.push(null);
@@ -84,8 +84,8 @@ export const getPackageName = async (
 			const extract = tar.extract();
 			let data = "";
 
-			extract.on("entry", function (header, stream, cb) {
-				stream.on("data", function (chunk) {
+			extract.on("entry", function (header: any, stream: any, cb: any) {
+				stream.on("data", function (chunk: any) {
 					if (header.name == "package/package.json") data += chunk;
 				});
 
@@ -105,7 +105,7 @@ export const getPackageName = async (
 				}
 			});
 
-			extract.on("error", (e) => {
+			extract.on("error", (e: any) => {
 				reject(e);
 			});
 
@@ -120,4 +120,4 @@ export const getPackageName = async (
 	});
 };
 
-export class NotFoundError extends Error {}
+export class NotFoundError extends Error { }

package/src/docker.ts

@@ -6,7 +6,7 @@ export const installDocker = async () => {
 	// check if docker is installed
 	const dockerExist = async () => {
 		try {
-			const out = await new Promise((resolve, reject) => {
+			await new Promise((resolve, reject) => {
 				exec("docker --version", (error, stdout, stderr) => {
 					if (error || stderr) {
 						reject();
@@ -49,7 +49,7 @@ export const startContainer = async (cmd: string, errorMessage?: string) => {
 				if (error) {
 					reject(
 						(errorMessage || "Failed to start docker container: ") +
-							error.message
+						error.message
 					);
 				}
 				resolve(stdout);

package/src/domain.ts

@@ -2,7 +2,7 @@ import { waitFor } from "@peerbit/time";
 
 const isNode = typeof window === "undefined";
 
-const validateEmail = (email) => {
+const validateEmail = (email: any) => {
 	return String(email)
 		.toLowerCase()
 		.match(
@@ -55,7 +55,6 @@ const createConfig = async (
 	file = file.replaceAll("%DOMAIN%", domain);
 
 	const fs = await import("fs");
-	const path = await import("path");
 
 	fs.mkdir(outputPath, { recursive: true }, (err) => {
 		if (err) throw err;

package/src/peerbit.ts

@@ -2,7 +2,7 @@ import { DirectBlock } from "@peerbit/blocks";
 import { DirectSub } from "@peerbit/pubsub";
 import { Peerbit } from "peerbit";
 import path from "path";
-import { PeerId } from "@libp2p/interface";
+import { type PeerId } from "@libp2p/interface";
 
 export const LIBP2P_LISTEN_PORT = 8001;
 export const create = (properties: {
@@ -23,14 +23,13 @@ export const create = (properties: {
 			addresses: {
 				announce: properties.domain
 					? [
-							`/dns4/${properties.domain}/tcp/4002`,
-							`/dns4/${properties.domain}/tcp/4003/wss`
-						]
+						`/dns4/${properties.domain}/tcp/4002`,
+						`/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
+					`/ip4/127.0.0.1/tcp/${listenPort !== 0 ? listenPort + 1 : listenPort
 					}/ws`
 				]
 			},

package/src/server.ts

@@ -1,20 +1,18 @@
 import http from "http";
 import {
 	fromBase64,
-	getKeypairFromPeerId,
 	getPublicKeyFromPeerId
 } from "@peerbit/crypto";
 import { deserialize } from "@dao-xyz/borsh";
 import {
 	Program,
-	ProgramClient,
+	type ProgramClient,
 	getProgramFromVariant,
 	getProgramFromVariants
 } from "@peerbit/program";
 import { waitFor } from "@peerbit/time";
 import { v4 as uuid } from "uuid";
 import {
-	getHomeConfigDir,
 	getNodePath,
 	getKeypair,
 	getTrustPath
@@ -23,7 +21,7 @@ import { setMaxListeners } from "events";
 import { create } from "./peerbit.js";
 import { Peerbit } from "peerbit";
 import { getSchema } from "@dao-xyz/borsh";
-import {
+import type {
 	InstallDependency,
 	StartByBase64,
 	StartByVariant,
@@ -54,7 +52,7 @@ import { fileURLToPath } from "url";
 import { Level } from "level";
 import { MemoryLevel } from "memory-level";
 import { Trust } from "./trust.js";
-import { getBody, verifyRequest } from "./signes-request.js";
+import { getBody, verifyRequest } from "./signed-request.js";
 import { peerIdFromString } from "@libp2p/peer-id";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
@@ -109,9 +107,9 @@ export const startServerWithNode = async (properties: {
 	const session = new Session(
 		sessionDirectory
 			? new Level<string, Uint8Array>(sessionDirectory, {
-					valueEncoding: "view",
-					keyEncoding: "utf-8"
-				})
+				valueEncoding: "view",
+				keyEncoding: "utf-8"
+			})
 			: new MemoryLevel({ valueEncoding: "view", keyEncoding: "utf-8" })
 	);
 	if (!properties.newSession) {
@@ -161,9 +159,15 @@ export const startServerWithNode = async (properties: {
 				exit();
 			});
 		});
+
+		process.on("uncaughtException", (err) => {
+			console.error("Uncaught exception", err);
+		});
+
 		process.on("exit", async () => {
 			if (server.listening) {
 				console.log("Shutting down node (exit)");
+
 				await stopAndWait(server);
 				await controller.stop();
 			}
@@ -291,7 +295,7 @@ export const startApiServer = async (
 					try {
 						body =
 							req.url.startsWith(PEER_ID_PATH) ||
-							req.url.startsWith(ADDRESS_PATH)
+								req.url.startsWith(ADDRESS_PATH)
 								? await getBody(req)
 								: await getVerifiedBody(req);
 					} catch (error: any) {
@@ -309,7 +313,7 @@ export const startApiServer = async (
 						switch (req.method) {
 							case "GET":
 								try {
-									const ref = (client as Peerbit).handler?.items?.keys() || [];
+									const ref: any = (client as Peerbit).handler?.items?.keys() || [];
 									const keys = JSON.stringify([...ref]);
 									res.setHeader("Content-Type", "application/json");
 									res.writeHead(200);
@@ -420,7 +424,7 @@ export const startApiServer = async (
 											res.writeHead(400);
 											res.end(
 												"Missing program with variant: " +
-													(startArguments as StartByVariant).variant
+												(startArguments as StartByVariant).variant
 											);
 											return;
 										}
@@ -443,6 +447,7 @@ export const startApiServer = async (
 											res.end(program.address.toString());
 										})
 										.catch((error) => {
+											console.error(error);
 											res.writeHead(400);
 											res.end("Failed to open program: " + error.toString());
 										});
@@ -509,9 +514,9 @@ export const startApiServer = async (
 										res.writeHead(400);
 										res.end(
 											"Failed to install library: " +
-												packageName +
-												". " +
-												error.toString()
+											packageName +
+											". " +
+											error.toString()
 										);
 										clear?.();
 										return;

package/src/{signes-request.ts → signed-request.ts}

@@ -1,5 +1,5 @@
 import {
-	Identity,
+	type Identity,
 	PublicSignKey,
 	SignatureWithKey,
 	fromBase64,

package/lib/esm/signes-request.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"signes-request.js","sourceRoot":"","sources":["../../src/signes-request.ts"],"names":[],"mappings":"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"}