@peerbit/server 5.8.2 → 5.8.3-9b0640c

package/package.json

@@ -1,91 +1,91 @@
 {
-	"name": "@peerbit/server",
-	"version": "5.8.2",
-	"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.3.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.3-9b0640c",
+  "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-9b0640c",
+    "@peerbit/test-utils": "2.2.1-9b0640c",
+    "@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-9b0640c",
+    "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,7 +52,11 @@ export const createRecord = async (options: {
 	await client.send(cmd);
 };
 
-const setupUserData = (grantAccess: PeerId[] = [], serverVersion?: string) => {
+const setupUserData = (
+	email: string,
+	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?
@@ -63,7 +67,7 @@ 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${versionSpec}
-sudo peerbit domain test
+sudo peerbit domain test --email ${email}
 peerbit start ${peerIdStrings.map((key) => `--ga ${key}`)} > log.txt 2>&1 &
 `;
 };
@@ -106,6 +110,7 @@ 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;
@@ -219,7 +224,11 @@ export const launchNodes = async (properties: {
 			SecurityGroupIds: [securityGroupOut.GroupId!],
 			InstanceType: ("t4g." + (properties.size || "micro")) as any, // TODO types
 			UserData: Buffer.from(
-				setupUserData(properties.grantAccess, properties.serverVersion),
+				setupUserData(
+					properties.email,
+					properties.grantAccess,
+					properties.serverVersion,
+				),
 			).toString("base64"),
 			MinCount: count,
 			MaxCount: count,

package/src/cli.ts

@@ -218,6 +218,11 @@ 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 security messages",
+								type: "string",
+								demandOption: true,
+							},
 							outdir: {
 								describe: "Output path for Nginx config",
 								type: "string",
@@ -232,7 +237,7 @@ export const cli = async (args?: string[]) => {
 						},
 						handler: async (args) => {
 							const domain = await createTestDomain();
-							await startCertbot(domain, args.wait);
+							await startCertbot(domain, args.email, args.wait);
 							exit();
 						},
 					})
@@ -300,7 +305,7 @@ export const cli = async (args?: string[]) => {
 										}
 									: undefined,
 							});
-							await startCertbot(args.domain, args.wait);
+							await startCertbot(args.domain, args.email, args.wait);
 							exit();
 						},
 					})
@@ -371,6 +376,12 @@ export const cli = async (args?: string[]) => {
 									alias: "d",
 									default: getHomeConfigDir(),
 								});
+								awsArgs.option("email", {
+									describe: "Email for Let's security messages",
+									type: "string",
+									alias: "e",
+									demandOption: true,
+								});
 								awsArgs.option("server-version", {
 									describe:
 										"@peerbit/server version or tag to install on the instance (e.g. 5.7.0-58d3d09)",
@@ -380,17 +391,18 @@ export const cli = async (args?: string[]) => {
 								return awsArgs;
 							},
 							handler: async (args) => {
+								const self = (
+									await getKeypair(args.directory)
+								).publicKey.toPeerId();
 								const accessGrant: PeerId[] =
 									args["grant-access"]?.length > 0
 										? (args["grant-access"] as string[]).map((x) =>
 												peerIdFromString(x),
 											)
-										: [
-												await (
-													await getKeypair(args.directory)
-												).publicKey.toPeerId(),
-											];
+										: [];
+								accessGrant.push(self);
 								const nodes = await launchNodes({
+									email: args.email as string,
 									count: args.count,
 									namePrefix: args.name,
 									region: args.region,

package/src/domain.ts

@@ -121,11 +121,23 @@ export const createTestDomain = async () => {
 	return domain;
 };
 
+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,}))$/,
+		);
+};
+
 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();
@@ -141,7 +153,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 \
-	${isTest ? "--env STAGING=1" : ""}\
+	--env CERTBOT_EMAIL=${email} ${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 \