@peerbit/server 4.0.3 → 4.0.4

package/src/cli.ts

@@ -2,20 +2,20 @@ import {
 	createTestDomain,
 	getDomainFromConfig,
 	loadConfig,
-	startCertbot,
+	startCertbot
 } from "./domain.js";
 import { startServerWithNode } from "./server.js";
 import {
 	AWS_LINUX_ARM_AMIs,
 	createRecord,
 	launchNodes,
-	terminateNode,
+	terminateNode
 } from "./aws.js";
 import {
 	getHomeConfigDir,
 	getKeypair,
 	getPackageName,
-	getRemotesPath,
+	getRemotesPath
 } from "./config.js";
 import chalk from "chalk";
 import { createClient, waitForDomain } from "./client.js";
@@ -95,7 +95,7 @@ const colors = [
 	"#A5FFD2",
 	"#FFB167",
 	"#009BFF",
-	"#E85EBE",
+	"#E85EBE"
 ];
 const padString = function (
 	string: string,
@@ -135,12 +135,12 @@ export const cli = async (args?: string[]) => {
 						defaultDescription: "~.peerbit",
 						type: "string",
 						alias: "d",
-						default: getHomeConfigDir(),
+						default: getHomeConfigDir()
 					})
 					.option("bootstrap", {
 						describe: "Whether to connect to bootstap nodes on startup",
 						type: "boolean",
-						default: false,
+						default: false
 					})
 					.option("grant-access", {
 						describe: "Grant access to public keys on start",
@@ -148,26 +148,26 @@ export const cli = async (args?: string[]) => {
 							"The publickey of this device located in 'directory'",
 						type: "string",
 						array: true,
-						alias: "ga",
+						alias: "ga"
 					})
 					.option("reset", {
 						describe:
 							"If true, then programs opened during last session will not be opened",
 						type: "boolean",
 						default: false,
-						alias: "r",
+						alias: "r"
 					})
 					.option("port-api", {
 						describe:
 							"Set API server port. Only modify this when testing locally, since NGINX config depends on the default value",
 						type: "number",
-						default: undefined,
+						default: undefined
 					})
 					.option("port-node", {
 						describe:
 							"Set Libp2p listen port. Only modify this when testing locally, since NGINX config depends on the default value",
 						type: "number",
-						default: undefined,
+						default: undefined
 					});
 				return yargs;
 			},
@@ -180,9 +180,9 @@ export const cli = async (args?: string[]) => {
 					ports: { api: args["port-api"], node: args["port-node"] },
 					bootstrap: args.bootstrap,
 					newSession: args.reset,
-					grantAccess: args["grant-access"],
+					grantAccess: args["grant-access"]
 				});
-			},
+			}
 		})
 		.command({
 			command: "id",
@@ -193,14 +193,14 @@ export const cli = async (args?: string[]) => {
 					defaultDescription: "~.peerbit",
 					type: "string",
 					alias: "d",
-					default: getHomeConfigDir(),
+					default: getHomeConfigDir()
 				});
 				return yargs;
 			},
 			handler: async (args) => {
 				const kp = await getKeypair(args.directory);
 				console.log((await kp.toPeerId()).toString());
-			},
+			}
 		})
 		.command(
 			"domain",
@@ -215,25 +215,25 @@ export const cli = async (args?: string[]) => {
 							email: {
 								describe: "Email for Lets encrypt autorenewal messages",
 								type: "string",
-								demandOption: true,
+								demandOption: true
 							},
 							outdir: {
 								describe: "Output path for Nginx config",
 								type: "string",
-								alias: "o",
+								alias: "o"
 							},
 							wait: {
 								alias: "w",
 								describe: "Wait for setup to succeed (or fail)",
 								type: "boolean",
-								default: false,
-							},
+								default: false
+							}
 						},
 						handler: async (args) => {
 							const domain = await createTestDomain();
 							await startCertbot(domain, args.email, args.outdir, args.wait);
 							exit();
-						},
+						}
 					})
 					.command({
 						command: "aws",
@@ -244,45 +244,45 @@ export const cli = async (args?: string[]) => {
 								describe: "domain, e.g. abc.example.com, example.com",
 								alias: "d",
 								type: "string",
-								demandOption: true,
+								demandOption: true
 							},
 							hostedZoneId: {
 								describe: 'The id of the hosted zone "HostedZoneId"',
 								alias: "hz",
 								type: "string",
-								require: true,
+								require: true
 							},
 							accessKeyId: {
 								describe: "Access key id of the AWS user",
 								alias: "ak",
-								type: "string",
+								type: "string"
 							},
 							region: {
 								describe: "AWS region",
 								alias: "r",
-								type: "string",
+								type: "string"
 							},
 							secretAccessKey: {
 								describe: "Secret key id of the AWS user",
 								alias: "sk",
-								type: "string",
+								type: "string"
 							},
 							email: {
 								describe: "Email for Lets encrypt auto-renewal messages",
 								type: "string",
-								demandOption: true,
+								demandOption: true
 							},
 							outdir: {
 								describe: "Output path for Nginx config",
 								type: "string",
-								alias: "o",
+								alias: "o"
 							},
 							wait: {
 								alias: "w",
 								describe: "Wait for setup to succeed (or fail)",
 								type: "boolean",
-								default: false,
-							},
+								default: false
+							}
 						},
 						handler: async (args) => {
 							if (
@@ -300,9 +300,9 @@ export const cli = async (args?: string[]) => {
 								credentials: args.accessKeyId
 									? {
 											accessKeyId: args.accessKeyId,
-											secretAccessKey: args.secretAccessKey,
+											secretAccessKey: args.secretAccessKey
 									  }
-									: undefined,
+									: undefined
 							});
 							await startCertbot(
 								args.domain,
@@ -311,7 +311,7 @@ export const cli = async (args?: string[]) => {
 								args.wait
 							);
 							exit();
-						},
+						}
 					})
 					.strict()
 					.demandCommand();
@@ -330,19 +330,19 @@ export const cli = async (args?: string[]) => {
 									defaultDescription: "One node",
 									type: "number",
 									alias: "c",
-									default: 1,
+									default: 1
 								});
 								awsArgs.option("region", {
 									describe: "Region",
 									type: "string",
 									defaultDescription: "Region defined in ~.aws/config",
-									choices: Object.keys(AWS_LINUX_ARM_AMIs),
+									choices: Object.keys(AWS_LINUX_ARM_AMIs)
 								});
 								awsArgs.option("group", {
 									describe: "Remote group to launch nodes in",
 									type: "string",
 									alias: "g",
-									default: DEFAULT_REMOTE_GROUP,
+									default: DEFAULT_REMOTE_GROUP
 								});
 								awsArgs.option("size", {
 									describe: "Instance size",
@@ -354,16 +354,16 @@ export const cli = async (args?: string[]) => {
 										"medium",
 										"large",
 										"xlarge",
-										"2xlarge",
+										"2xlarge"
 									],
-									default: "micro",
+									default: "micro"
 								});
 
 								awsArgs.option("name", {
 									describe: "Name prefix for spawned nodes",
 									type: "string",
 									alias: "n",
-									default: "peerbit-node",
+									default: "peerbit-node"
 								});
 								awsArgs.option("grant-access", {
 									describe: "Grant access to public keys on start",
@@ -371,14 +371,14 @@ export const cli = async (args?: string[]) => {
 										"The publickey of this device located in 'directory'",
 									type: "string",
 									array: true,
-									alias: "ga",
+									alias: "ga"
 								});
 								awsArgs.option("directory", {
 									describe: "Peerbit directory",
 									defaultDescription: "~.peerbit",
 									type: "string",
 									alias: "d",
-									default: getHomeConfigDir(),
+									default: getHomeConfigDir()
 								});
 								return awsArgs;
 							},
@@ -389,7 +389,7 @@ export const cli = async (args?: string[]) => {
 										: [
 												await (
 													await getKeypair(args.directory)
-												).publicKey.toPeerId(),
+												).publicKey.toPeerId()
 										  ];
 								const nodes = await launchNodes({
 									email: "marcus@dao.xyz",
@@ -397,7 +397,7 @@ export const cli = async (args?: string[]) => {
 									namePrefix: args.name,
 									region: args.region,
 									grantAccess: accessGrant,
-									size: args.size,
+									size: args.size
 								});
 
 								console.log(
@@ -426,8 +426,8 @@ export const cli = async (args?: string[]) => {
 											origin: {
 												type: "aws",
 												instanceId: node.instanceId,
-												region: node.region,
-											},
+												region: node.region
+											}
 										});
 									} catch (error: any) {
 										process.stdout.write("\r");
@@ -444,7 +444,7 @@ export const cli = async (args?: string[]) => {
 								for (const node of nodes) {
 									console.log(chalk.green(node.name));
 								}
-							},
+							}
 						})
 						.strict()
 						.demandCommand();
@@ -456,21 +456,21 @@ export const cli = async (args?: string[]) => {
 						killArgs.option("all", {
 							describe: "Kill all nodes",
 							type: "boolean",
-							default: false,
+							default: false
 						});
 						killArgs.positional("name", {
 							type: "string",
 							describe: "Remote name",
 							default: "localhost",
 							demandOption: false,
-							array: true,
+							array: true
 						});
 						killArgs.option("directory", {
 							describe: "Peerbit directory",
 							defaultDescription: "~.peerbit",
 							type: "string",
 							alias: "d",
-							default: getHomeConfigDir(),
+							default: getHomeConfigDir()
 						});
 						return killArgs;
 					},
@@ -482,12 +482,12 @@ export const cli = async (args?: string[]) => {
 								if (remote.origin?.type === "aws") {
 									await terminateNode({
 										instanceId: remote.origin.instanceId,
-										region: remote.origin.region,
+										region: remote.origin.region
 									});
 								}
 							}
 						}
-					},
+					}
 				})
 				.command({
 					command: "list",
@@ -499,7 +499,7 @@ export const cli = async (args?: string[]) => {
 							defaultDescription: "~.peerbit",
 							type: "string",
 							alias: "d",
-							default: getHomeConfigDir(),
+							default: getHomeConfigDir()
 						});
 
 						return yargs;
@@ -530,7 +530,7 @@ export const cli = async (args?: string[]) => {
 									resolvedOrRejected[ix].status === "fulfilled"
 										? chalk.green("Y")
 										: chalk.red("N"),
-									remote.address,
+									remote.address
 								];
 								rows.push(row);
 							}
@@ -544,7 +544,7 @@ export const cli = async (args?: string[]) => {
 						} else {
 							console.log("No remotes found!");
 						}
-					},
+					}
 				})
 				.command({
 					command: "add <name> <address>",
@@ -554,25 +554,25 @@ export const cli = async (args?: string[]) => {
 							.positional("name", {
 								type: "string",
 								describe: "Remote address",
-								demandOption: true,
+								demandOption: true
 							})
 							.positional("address", {
 								type: "string",
 								describe: "Remote name",
-								demandOption: true,
+								demandOption: true
 							})
 							.option("group", {
 								describe: "Group name",
 								type: "string",
 								alias: "g",
-								default: DEFAULT_REMOTE_GROUP,
+								default: DEFAULT_REMOTE_GROUP
 							})
 							.option("directory", {
 								describe: "Peerbit directory",
 								defaultDescription: "~.peerbit",
 								type: "string",
 								alias: "d",
-								default: getHomeConfigDir(),
+								default: getHomeConfigDir()
 							});
 
 						return yargs;
@@ -582,7 +582,7 @@ export const cli = async (args?: string[]) => {
 							throw new Error("Remote can not be named 'localhost'");
 						}
 						const api = await createClient(await getKeypair(args.directory), {
-							address: args.address,
+							address: args.address
 						});
 						try {
 							await api.program.list();
@@ -596,9 +596,9 @@ export const cli = async (args?: string[]) => {
 						remotes.add({
 							name: args.name,
 							address: args.address,
-							group: args.group,
+							group: args.group
 						});
-					},
+					}
 				})
 				.command({
 					command: "remove <name>",
@@ -609,14 +609,14 @@ export const cli = async (args?: string[]) => {
 							.positional("name", {
 								type: "string",
 								describe: "Remote address",
-								demandOption: true,
+								demandOption: true
 							})
 							.option("directory", {
 								describe: "Peerbit directory",
 								defaultDescription: "~.peerbit",
 								type: "string",
 								alias: "d",
-								default: getHomeConfigDir(),
+								default: getHomeConfigDir()
 							});
 
 						return yargs;
@@ -632,7 +632,7 @@ export const cli = async (args?: string[]) => {
 								chalk.red("Did not find any remote with name: " + args.name)
 							);
 						}
-					},
+					}
 				})
 				.command({
 					command: "connect [name...]",
@@ -644,26 +644,26 @@ export const cli = async (args?: string[]) => {
 								describe: "Remote name",
 								default: "localhost",
 								demandOption: false,
-								array: true,
+								array: true
 							})
 							.option("all", {
 								type: "boolean",
 								describe: "Connect to all nodes",
-								default: false,
+								default: false
 							})
 							.option("group", {
 								type: "string",
 								describe: "Remote group name",
 								alias: "g",
 								default: [],
-								array: true,
+								array: true
 							})
 							.option("directory", {
 								describe: "Peerbit directory",
 								defaultDescription: "~.peerbit",
 								type: "string",
 								alias: "d",
-								default: getHomeConfigDir(),
+								default: getHomeConfigDir()
 							});
 						return yargs;
 					},
@@ -694,7 +694,7 @@ export const cli = async (args?: string[]) => {
 									selectedRemotes.push({
 										address: "http://localhost:" + LOCAL_API_PORT,
 										name: "localhost",
-										group: DEFAULT_REMOTE_GROUP,
+										group: DEFAULT_REMOTE_GROUP
 									});
 								} else {
 									const remote = remotes.getByName(name);
@@ -746,7 +746,7 @@ export const cli = async (args?: string[]) => {
 								apis.push({
 									log: logFn,
 									name: remote.name,
-									api: await createClient(keypair, remote),
+									api: await createClient(keypair, remote)
 								});
 							}
 
@@ -765,7 +765,7 @@ export const cli = async (args?: string[]) => {
 								input: process.stdin,
 								output: process.stdout,
 								terminal: true,
-								historySize: 100,
+								historySize: 100
 							});
 
 							console.log("Write 'help' to show commands.\n");
@@ -782,7 +782,7 @@ export const cli = async (args?: string[]) => {
 													for (const api of apis) {
 														api.log((await api.api.peer.id.get()).toString());
 													}
-												},
+												}
 											})
 											.command({
 												command: "address",
@@ -793,7 +793,7 @@ export const cli = async (args?: string[]) => {
 															api.log(x.toString())
 														);
 													}
-												},
+												}
 											})
 											.strict()
 											.demandCommand();
@@ -811,7 +811,7 @@ export const cli = async (args?: string[]) => {
 														yargs.positional("peer-id", {
 															describe: "Peer id",
 															type: "string",
-															demandOption: true,
+															demandOption: true
 														});
 														return yargs;
 													},
@@ -822,7 +822,7 @@ export const cli = async (args?: string[]) => {
 														for (const api of apis) {
 															await api.api.access.allow(peerId);
 														}
-													},
+													}
 												})
 												.command({
 													command: "deny <peer-id>",
@@ -830,7 +830,7 @@ export const cli = async (args?: string[]) => {
 													builder: (yargs: yargs.Argv) => {
 														yargs.positional("peer-id", {
 															describe: "Peer id",
-															demandOption: true,
+															demandOption: true
 														});
 														return yargs;
 													},
@@ -839,7 +839,7 @@ export const cli = async (args?: string[]) => {
 														for (const api of apis) {
 															await api.api.access.deny(peerId);
 														}
-													},
+													}
 												})
 												.strict()
 												.demandCommand();
@@ -854,7 +854,7 @@ export const cli = async (args?: string[]) => {
 													for (const api of apis) {
 														await api.api.network.bootstrap();
 													}
-												},
+												}
 											})
 											.strict()
 											.demandCommand();
@@ -874,7 +874,7 @@ export const cli = async (args?: string[]) => {
 															type: "boolean",
 															describe: "Replicate data on this topic",
 															aliases: "r",
-															default: false,
+															default: false
 														});
 														return yargs;
 													},
@@ -890,7 +890,7 @@ export const cli = async (args?: string[]) => {
 												console.log("Not subscribed to any topics");
 											} */
 														console.error("Not implemented");
-													},
+													}
 												})
 												.strict()
 												.demandCommand();
@@ -906,7 +906,7 @@ export const cli = async (args?: string[]) => {
 													yargs.positional("address", {
 														type: "string",
 														describe: "Program address",
-														demandOption: true,
+														demandOption: true
 													});
 													return yargs;
 												},
@@ -922,7 +922,7 @@ export const cli = async (args?: string[]) => {
 															api.log(chalk.green("Open"));
 														}
 													}
-												},
+												}
 											})
 											.command({
 												command: "drop <address>",
@@ -931,7 +931,7 @@ export const cli = async (args?: string[]) => {
 													yargs.positional("address", {
 														type: "string",
 														describe: "Program address",
-														demandOption: true,
+														demandOption: true
 													});
 													return yargs;
 												},
@@ -950,7 +950,7 @@ export const cli = async (args?: string[]) => {
 															);
 														}
 													}
-												},
+												}
 											})
 											.command({
 												command: "close <address>",
@@ -959,7 +959,7 @@ export const cli = async (args?: string[]) => {
 													yargs.positional("address", {
 														type: "string",
 														describe: "Program address",
-														demandOption: true,
+														demandOption: true
 													});
 													return yargs;
 												},
@@ -968,7 +968,7 @@ export const cli = async (args?: string[]) => {
 													for (const api of apis) {
 														await api.api.program.close(args.address);
 													}
-												},
+												}
 											})
 											.command({
 												command: "list",
@@ -982,7 +982,7 @@ export const cli = async (args?: string[]) => {
 															api.log(chalk.green(p));
 														});
 													}
-												},
+												}
 											})
 
 											.command({
@@ -992,17 +992,17 @@ export const cli = async (args?: string[]) => {
 													yargs.positional("program", {
 														type: "string",
 														describe: "Identifier",
-														demandOption: true,
+														demandOption: true
 													});
 													yargs.option("base64", {
 														type: "string",
 														describe: "Base64 encoded serialized",
-														aliases: "b",
+														aliases: "b"
 													});
 													yargs.option("variant", {
 														type: "string",
 														describe: "Variant name",
-														aliases: "v",
+														aliases: "v"
 													});
 													return yargs;
 												},
@@ -1015,21 +1015,20 @@ export const cli = async (args?: string[]) => {
 													let startArg: StartProgram;
 													if (args.base64) {
 														startArg = {
-															base64: args.base64,
+															base64: args.base64
 														};
 													} else {
 														startArg = {
-															variant: args.variant,
+															variant: args.variant
 														};
 													}
 													for (const api of apis) {
-														const address = await api.api.program.open(
-															startArg
-														);
+														const address =
+															await api.api.program.open(startArg);
 														api.log("Started program with address: ");
 														api.log(chalk.green(address.toString()));
 													}
-												},
+												}
 											})
 											.strict()
 											.demandCommand();
@@ -1043,7 +1042,7 @@ export const cli = async (args?: string[]) => {
 												type: "string",
 												describe:
 													"Installed dependency will be loaded with js import(...)",
-												demandOption: true,
+												demandOption: true
 											});
 
 											return yargs;
@@ -1063,16 +1062,15 @@ export const cli = async (args?: string[]) => {
 												installCommand = {
 													type: "tgz",
 													name: await getPackageName(packageName),
-													base64,
+													base64
 												};
 											} else {
 												installCommand = { type: "npm", name: packageName };
 											}
 
 											for (const api of apis) {
-												const newPrograms = await api.api.dependency.install(
-													installCommand
-												);
+												const newPrograms =
+													await api.api.dependency.install(installCommand);
 												api.log(
 													`New programs available (${newPrograms.length}):`
 												);
@@ -1080,7 +1078,7 @@ export const cli = async (args?: string[]) => {
 													api.log(chalk.green(p));
 												});
 											}
-										},
+										}
 									})
 									.command({
 										command: "restart",
@@ -1089,7 +1087,7 @@ export const cli = async (args?: string[]) => {
 											for (const api of apis) {
 												await api.api.restart();
 											}
-										},
+										}
 									})
 									.command({
 										command: "stop",
@@ -1098,7 +1096,7 @@ export const cli = async (args?: string[]) => {
 											for (const api of apis) {
 												await api.api.stop();
 											}
-										},
+										}
 									})
 									.help()
 									.strict()
@@ -1117,7 +1115,7 @@ export const cli = async (args?: string[]) => {
 								rl.prompt(true);
 							});
 						}
-					},
+					}
 				})
 				.help()
 				.strict()