@peerbit/server 5.8.2-c30b40f → 5.8.3-9b0640c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peerbit/server",
-  "version": "5.8.2-c30b40f",
+  "version": "5.8.3-9b0640c",
   "author": "dao.xyz",
   "repository": {
     "type": "git",
@@ -66,8 +66,8 @@
     "lint": "aegir lint"
   },
   "devDependencies": {
-    "@peerbit/test-lib": "0.0.1-c30b40f",
-    "@peerbit/test-utils": "2.2.1-c30b40f",
+    "@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",
@@ -78,7 +78,7 @@
   "dependencies": {
     "axios": "^1.4.0",
     "chalk": "^5.3.0",
-    "peerbit": "4.3.0-c30b40f",
+    "peerbit": "4.3.0-9b0640c",
     "yargs": "^17.7.2",
     "tar-stream": "^3.1.7",
     "tmp": "^0.2.1",

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

@@ -376,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)",
@@ -385,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,