@peerbit/server 5.5.0-aeb9685 → 5.6.0-1c918e0

package/dist/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-Dcbn6kSA.js"></script>
+  <script type="module" crossorigin src="/assets/index-BeFPnrza.js"></script>
   <link rel="stylesheet" crossorigin href="/assets/index-CIfVvUo9.css">
 </head>
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peerbit/server",
-  "version": "5.5.0-aeb9685",
+  "version": "5.6.0-1c918e0",
   "author": "dao.xyz",
   "repository": {
     "type": "git",
@@ -66,8 +66,8 @@
     "lint": "aegir lint"
   },
   "devDependencies": {
-    "@peerbit/test-lib": "0.0.1-aeb9685",
-    "@peerbit/test-utils": "2.1.57-aeb9685",
+    "@peerbit/test-lib": "0.0.1-1c918e0",
+    "@peerbit/test-utils": "2.1.57-1c918e0",
     "@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.1.46-aeb9685",
+    "peerbit": "4.1.46-1c918e0",
     "yargs": "^17.7.2",
     "tar-stream": "^3.1.7",
     "tmp": "^0.2.1",

package/src/aws.ts

@@ -249,40 +249,58 @@ export const launchNodes = async (properties: {
 		);
 	}
 
-	// wait for instance ips to become available
-	const info = await client.send(
-		new DescribeInstancesCommand({
-			InstanceIds: instanceOut.Instances.map((x) => x.InstanceId!),
-		}),
-	);
-	const foundInstances = info
-		.Reservations!.map((x) => x.Instances!.map((y) => y))
-		.flat()!;
-	const foundIps: string[] = [];
-	for (const out of instanceOut.Instances) {
-		const foundInstance = foundInstances.find(
-			(x) => x!.InstanceId === out.InstanceId!,
-		);
-		if (!foundInstance!.PublicIpAddress) {
-			await delay(3000);
-			continue;
-		}
-		foundIps.push(foundInstance!.PublicIpAddress!);
-	}
-	let publicIps: string[] = foundIps;
+	// wait for AWS to recognize the new instance IDs and for public IPs to be assigned
+	const instanceIds = instanceOut.Instances.map((x) => x.InstanceId!);
+	const timeoutMs = 3 * 60 * 1000; // 3 minutes
+	const pollIntervalMs = 5000;
+	const start = Date.now();
+	let foundInstances: Array<{
+		InstanceId?: string;
+		PublicIpAddress?: string;
+	}> = [];
 
-	if (publicIps.length === 0) {
-		throw new Error("Failed to resolve IPs for created instances");
+	while (Date.now() - start < timeoutMs) {
+		try {
+			const info = await client.send(
+				new DescribeInstancesCommand({ InstanceIds: instanceIds }),
+			);
+			foundInstances =
+				info.Reservations?.flatMap((r) => r.Instances || []) || [];
+			const allPresent = foundInstances.length >= instanceIds.length;
+			const ips = new Map(
+				foundInstances
+					.filter((i) => i.InstanceId && i.PublicIpAddress)
+					.map((i) => [i.InstanceId!, i.PublicIpAddress!]),
+			);
+			const allHaveIp = instanceIds.every((id) => ips.has(id));
+			if (allPresent && allHaveIp) {
+				// reorder to original order
+				var publicIps = instanceIds.map((id) => ips.get(id)!);
+				if (publicIps.length > 0) {
+					// success
+					return publicIps.map((v, ix) => {
+						return {
+							instanceId: instanceOut.Instances![ix].InstanceId!,
+							publicIp: v,
+							name: names[ix],
+							region: regionString,
+						};
+					});
+				}
+			}
+		} catch (e: any) {
+			// AWS eventual consistency: sometimes returns InvalidInstanceID.NotFound immediately after RunInstances
+			const code = e?.Code || e?.name || e?.code;
+			if (code !== "InvalidInstanceID.NotFound") {
+				throw e;
+			}
+		}
+		await delay(pollIntervalMs);
 	}
 
-	return publicIps.map((v, ix) => {
-		return {
-			instanceId: instanceOut.Instances![ix].InstanceId!,
-			publicIp: v,
-			name: names[ix],
-			region: regionString,
-		};
-	}); // TODO types
+	throw new Error(
+		"Timed out waiting for instances to be describe-able with public IPs",
+	);
 };
 
 export const terminateNode = async (properties: {