hackerrun 0.1.10 → 0.1.12

package/src/lib/cluster.ts

@@ -1,6 +1,7 @@
 import { AppCluster, VMNode, PlatformClient } from './platform-client.js';
 import { SSHCertManager, testIPv6Connectivity } from './ssh-cert.js';
 import { createTunnel, killTunnel, TunnelInfo } from './gateway-tunnel.js';
+import { UncloudRunner } from './uncloud-runner.js';
 import { execSync } from 'child_process';
 import ora from 'ora';
 import chalk from 'chalk';
@@ -18,11 +19,14 @@ export interface ClusterInitOptions {
 
 export class ClusterManager {
   private sshCertManager: SSHCertManager;
+  private uncloudRunner: UncloudRunner;
 
   constructor(
-    private platformClient: PlatformClient
+    private platformClient: PlatformClient,
+    uncloudRunner?: UncloudRunner
   ) {
     this.sshCertManager = new SSHCertManager(platformClient);
+    this.uncloudRunner = uncloudRunner || new UncloudRunner(platformClient);
   }
 
   /**
@@ -58,10 +62,7 @@ export class ClusterManager {
   async initializeCluster(options: ClusterInitOptions): Promise<AppCluster> {
     const { appName, location, vmSize, storageSize, bootImage } = options;
 
-    // First node is always appName-1
-    const vmName = `${appName}-1`;
-
-    let spinner = ora(`Creating VM '${vmName}' in ${location}...`).start();
+    let spinner = ora(`Creating VM for '${appName}' in ${location}...`).start();
 
     try {
       // Get platform SSH keys (for VM creation)
@@ -73,10 +74,9 @@ export class ClusterManager {
       const privateSubnetId = gateway?.subnetId;
 
       // Create IPv6-only VM via platform API with platform SSH key
-      // VM is placed in the same private subnet as the gateway for NAT64 routing
-      spinner.text = `Creating VM '${vmName}'...`;
-      const vm = await this.platformClient.createVM({
-        name: vmName,
+      // VM name is auto-generated by platform: u{userId}-{appName}-{nodeNum}
+      spinner.text = 'Creating VM...';
+      const vm = await this.platformClient.createAppVM(appName, {
         location,
         size: vmSize,
         storage_size: storageSize,
@@ -85,9 +85,12 @@ export class ClusterManager {
         public_key: platformKeys.platformPublicKey,
         enable_ip4: !privateSubnetId,  // IPv6-only if we have a subnet for NAT64
         private_subnet_id: privateSubnetId,
+        isPrimary: true,
       });
 
-      spinner.text = `Waiting for VM to be ready...`;
+      const vmName = vm.name;  // Name generated by platform
+
+      spinner.text = `Waiting for VM '${vmName}' to be ready...`;
       spinner.stop();
 
       console.log(chalk.cyan('\nWaiting for VM to get an IPv6 address...'));
@@ -168,10 +171,7 @@ export class ClusterManager {
     const gateway = await this.platformClient.getGateway(cluster.location);
     const privateSubnetId = gateway?.subnetId;
 
-    // Generate sequential node name: appName-1, appName-2, etc.
-    const vmName = this.generateNodeName(appName, cluster.nodes);
-
-    let spinner = ora(`Adding node '${vmName}' to cluster...`).start();
+    let spinner = ora('Adding node to cluster...').start();
 
     try {
       // Get platform SSH keys (for VM creation)
@@ -179,9 +179,9 @@ export class ClusterManager {
       const platformKeys = await this.getPlatformKeys();
 
       // Create new IPv6-only VM via platform API with platform SSH key
-      spinner.text = `Creating VM '${vmName}'...`;
-      const vm = await this.platformClient.createVM({
-        name: vmName,
+      // VM name is auto-generated by platform: u{userId}-{appName}-{nodeNum}
+      spinner.text = 'Creating VM...';
+      const vm = await this.platformClient.createAppVM(appName, {
         location: cluster.location,
         size: vmSize,
         boot_image: bootImage,
@@ -189,9 +189,12 @@ export class ClusterManager {
         public_key: platformKeys.platformPublicKey,
         enable_ip4: !privateSubnetId,
         private_subnet_id: privateSubnetId,
+        isPrimary: false,
       });
 
-      spinner.text = `Waiting for VM to be ready...`;
+      const vmName = vm.name;  // Name generated by platform
+
+      spinner.text = `Waiting for VM '${vmName}' to be ready...`;
       spinner.stop();
       console.log(chalk.cyan('\nWaiting for VM to get an IPv6 address...'));
       const vmWithIp = await this.waitForVM(cluster.location, vmName, 600, false);
@@ -207,7 +210,7 @@ export class ClusterManager {
       spinner.text = 'Joining uncloud cluster...';
       spinner.stop();
       console.log(chalk.cyan('\nJoining uncloud cluster...'));
-      await this.joinUncloudCluster(vmWithIp.ip6!, existingNode.ipv6, appName);
+      await this.joinUncloudCluster(vmWithIp.ip6!, appName);
 
       spinner = ora('Configuring Docker for NAT64...').start();
 
@@ -321,26 +324,17 @@ export class ClusterManager {
 
   /**
    * Join a new node to an existing uncloud cluster
-   * Uses --connect ssh:// to avoid local context dependency
+   * Uses `uc machine add` which handles:
+   * - SSH to the new machine
+   * - Installing uncloudd if needed
+   * - Getting token from new machine via gRPC
+   * - Registering machine in cluster
    */
-  private async joinUncloudCluster(newVmIp: string, primaryVmIp: string, contextName: string): Promise<void> {
+  private async joinUncloudCluster(newVmIp: string, appName: string): Promise<void> {
     try {
-      // Get SSH certificates for both nodes and add to agent
-      await this.sshCertManager.getSession(contextName, primaryVmIp);
-      await this.sshCertManager.getSession(contextName, newVmIp);
-
-      // Get join token from primary node using --connect ssh://
-      const token = execSync(`uc --connect ssh://root@${primaryVmIp} machine token`, {
-        encoding: 'utf-8',
-        timeout: 30000,
-      }).trim();
-
-      if (!token) {
-        throw new Error('Failed to get join token from primary node');
-      }
-
-      // Join the new node to the cluster using --connect ssh://
-      execSync(`uc --connect ssh://root@${primaryVmIp} machine add root@${newVmIp} --token "${token}"`, {
+      // Use uc machine add which SSHes to the new VM and joins it to the cluster
+      // The --no-caddy flag skips Caddy deployment (we use the gateway for routing)
+      await this.uncloudRunner.run(appName, 'machine', ['add', `root@${newVmIp}`, '--no-caddy'], {
         stdio: 'inherit',
         timeout: 600000,  // 10 min timeout
       });
@@ -549,31 +543,6 @@ REMOTESCRIPT`, {
     console.log(chalk.yellow('  Warning: Timeout waiting for unregistry, continuing anyway...'));
   }
 
-  /**
-   * Generate a sequential node name: appName-1, appName-2, etc.
-   * Finds the next available number by checking existing node names
-   */
-  private generateNodeName(appName: string, existingNodes: VMNode[]): string {
-    // Extract existing numbers from node names
-    const existingNumbers = existingNodes
-      .map(n => {
-        const match = n.name.match(new RegExp(`^${appName}-(\\d+)$`));
-        return match ? parseInt(match[1], 10) : 0;
-      })
-      .filter(n => n > 0);
-
-    // Find the next available number
-    const maxNumber = existingNumbers.length > 0 ? Math.max(...existingNumbers) : 0;
-    return `${appName}-${maxNumber + 1}`;
-  }
-
-  /**
-   * Generate a random ID (used for legacy naming or fallback)
-   */
-  private generateId(): string {
-    return Math.random().toString(36).substring(2, 9);
-  }
-
   /**
    * Sleep for specified milliseconds
    */

package/src/lib/platform-client.ts

@@ -64,6 +64,19 @@ export interface CreateVMParams {
   private_subnet_id?: string;  // Put VM in specific private subnet for NAT64 routing
 }
 
+// Parameters for creating an app VM (name is auto-generated by platform)
+export interface CreateAppVMParams {
+  location: string;
+  size: string;
+  storage_size?: number;
+  unix_user: string;
+  public_key: string;
+  boot_image: string;
+  enable_ip4?: boolean;
+  private_subnet_id?: string;
+  isPrimary?: boolean;
+}
+
 export interface UbicloudVM {
   id: string;
   name: string;
@@ -274,6 +287,20 @@ export class PlatformClient {
     return vm;
   }
 
+  /**
+   * Create a new VM for an app with auto-generated name
+   * Name format: u{userId}-{appName}-{nodeNum}
+   */
+  async createAppVM(appName: string, params: CreateAppVMParams): Promise<UbicloudVM> {
+    const { vm } = await this.request<{ vm: UbicloudVM }>(
+      'POST',
+      `/api/apps/${appName}/vms`,
+      params,
+      { operation: `Create VM for app '${appName}'` }
+    );
+    return vm;
+  }
+
   /**
    * Get a specific VM
    */