@jlongo78/agent-spaces 0.9.6 → 0.9.8

package/.next/standalone/src/lib/vms/manager.ts

@@ -1,121 +1,121 @@
-import { InstancesClient, protos } from '@google-cloud/compute';
-import { readConfig, type CustomModelConfig } from '../config';
-
-export type VmStatus = 'PROVISIONING' | 'STAGING' | 'RUNNING' | 'STOPPING' | 'SUSPENDING' | 'SUSPENDED' | 'TERMINATED' | 'UNKNOWN';
-
-interface VmState {
-  username: string;
-  lastActive: number;
-}
-
-class VmManager {
-  private instancesClient: InstancesClient;
-  private state = new Map<string, VmState>();
-  private interval: NodeJS.Timeout | null = null;
-
-  constructor() {
-    this.instancesClient = new InstancesClient();
-    this.startMonitoring();
-  }
-
-  private startMonitoring() {
-    if (this.interval) clearInterval(this.interval);
-    this.interval = setInterval(() => {
-      this.checkInactivity();
-    }, 60000); // Check every minute
-  }
-
-  private async checkInactivity() {
-    const now = Date.now();
-    for (const [modelId, state] of this.state.entries()) {
-      const config = this.getModelConfig(state.username, modelId);
-      if (!config) continue;
-
-      const timeoutMs = (config.timeoutMinutes || 15) * 60 * 1000;
-      if (state.lastActive > 0 && now - state.lastActive > timeoutMs) {
-        console.log(`[VmManager] Model ${modelId} exceeded inactivity timeout. Stopping...`);
-        try {
-          await this.stopVm(state.username, modelId);
-        } catch (e) {
-          console.error(`[VmManager] Failed to auto-stop ${modelId}:`, e);
-        }
-      }
-    }
-  }
-
-  public updateActivity(username: string, modelId: string) {
-    this.state.set(modelId, { username, lastActive: Date.now() });
-  }
-
-  private getModelConfig(username: string, modelId: string): CustomModelConfig | undefined {
-    const config = readConfig(username);
-    return config.customModels?.find(m => m.id === modelId);
-  }
-
-  public async getStatus(username: string, modelId: string): Promise<VmStatus> {
-    const config = this.getModelConfig(username, modelId);
-    if (!config || config.provider !== 'gcp') return 'UNKNOWN';
-
-    try {
-      const [response] = await this.instancesClient.get({
-        project: config.gcpProject,
-        zone: config.gcpZone,
-        instance: config.gcpInstance,
-      });
-      return (response.status as VmStatus) || 'UNKNOWN';
-    } catch (e) {
-      console.error(`[VmManager] Failed to get status for ${modelId}:`, e);
-      return 'UNKNOWN';
-    }
-  }
-
-  public async startVm(username: string, modelId: string): Promise<void> {
-    const config = this.getModelConfig(username, modelId);
-    if (!config || config.provider !== 'gcp') throw new Error(`Model ${modelId} not configured for GCP`);
-
-    const status = await this.getStatus(username, modelId);
-    if (status === 'RUNNING' || status === 'PROVISIONING' || status === 'STAGING') {
-      this.updateActivity(username, modelId);
-      return;
-    }
-
-    console.log(`[VmManager] Starting VM for ${modelId}...`);
-    try {
-      const [operation] = await this.instancesClient.start({
-        project: config.gcpProject,
-        zone: config.gcpZone,
-        instance: config.gcpInstance,
-      });
-      
-      // Wait for the operation to complete
-      await operation.promise();
-      
-      this.updateActivity(username, modelId);
-      console.log(`[VmManager] VM for ${modelId} started successfully.`);
-    } catch (e) {
-      console.error(`[VmManager] Failed to start VM for ${modelId}:`, e);
-      throw e;
-    }
-  }
-
-  public async stopVm(username: string, modelId: string): Promise<void> {
-    const config = this.getModelConfig(username, modelId);
-    if (!config || config.provider !== 'gcp') return;
-
-    console.log(`[VmManager] Stopping VM for ${modelId}...`);
-    try {
-      await this.instancesClient.stop({
-        project: config.gcpProject,
-        zone: config.gcpZone,
-        instance: config.gcpInstance,
-      });
-      this.state.delete(modelId); // Remove from active tracking
-      console.log(`[VmManager] VM for ${modelId} stopped successfully.`);
-    } catch (e) {
-      console.error(`[VmManager] Failed to stop VM for ${modelId}:`, e);
-      throw e;
-    }
-  }
-}
-
-export const vmManager = new VmManager();
+import { InstancesClient, protos } from '@google-cloud/compute';
+import { readConfig, type CustomModelConfig } from '../config';
+
+export type VmStatus = 'PROVISIONING' | 'STAGING' | 'RUNNING' | 'STOPPING' | 'SUSPENDING' | 'SUSPENDED' | 'TERMINATED' | 'UNKNOWN';
+
+interface VmState {
+  username: string;
+  lastActive: number;
+}
+
+class VmManager {
+  private instancesClient: InstancesClient;
+  private state = new Map<string, VmState>();
+  private interval: NodeJS.Timeout | null = null;
+
+  constructor() {
+    this.instancesClient = new InstancesClient();
+    this.startMonitoring();
+  }
+
+  private startMonitoring() {
+    if (this.interval) clearInterval(this.interval);
+    this.interval = setInterval(() => {
+      this.checkInactivity();
+    }, 60000); // Check every minute
+  }
+
+  private async checkInactivity() {
+    const now = Date.now();
+    for (const [modelId, state] of this.state.entries()) {
+      const config = this.getModelConfig(state.username, modelId);
+      if (!config) continue;
+
+      const timeoutMs = (config.timeoutMinutes || 15) * 60 * 1000;
+      if (state.lastActive > 0 && now - state.lastActive > timeoutMs) {
+        console.log(`[VmManager] Model ${modelId} exceeded inactivity timeout. Stopping...`);
+        try {
+          await this.stopVm(state.username, modelId);
+        } catch (e) {
+          console.error(`[VmManager] Failed to auto-stop ${modelId}:`, e);
+        }
+      }
+    }
+  }
+
+  public updateActivity(username: string, modelId: string) {
+    this.state.set(modelId, { username, lastActive: Date.now() });
+  }
+
+  private getModelConfig(username: string, modelId: string): CustomModelConfig | undefined {
+    const config = readConfig(username);
+    return config.customModels?.find(m => m.id === modelId);
+  }
+
+  public async getStatus(username: string, modelId: string): Promise<VmStatus> {
+    const config = this.getModelConfig(username, modelId);
+    if (!config || config.provider !== 'gcp') return 'UNKNOWN';
+
+    try {
+      const [response] = await this.instancesClient.get({
+        project: config.gcpProject,
+        zone: config.gcpZone,
+        instance: config.gcpInstance,
+      });
+      return (response.status as VmStatus) || 'UNKNOWN';
+    } catch (e) {
+      console.error(`[VmManager] Failed to get status for ${modelId}:`, e);
+      return 'UNKNOWN';
+    }
+  }
+
+  public async startVm(username: string, modelId: string): Promise<void> {
+    const config = this.getModelConfig(username, modelId);
+    if (!config || config.provider !== 'gcp') throw new Error(`Model ${modelId} not configured for GCP`);
+
+    const status = await this.getStatus(username, modelId);
+    if (status === 'RUNNING' || status === 'PROVISIONING' || status === 'STAGING') {
+      this.updateActivity(username, modelId);
+      return;
+    }
+
+    console.log(`[VmManager] Starting VM for ${modelId}...`);
+    try {
+      const [operation] = await this.instancesClient.start({
+        project: config.gcpProject,
+        zone: config.gcpZone,
+        instance: config.gcpInstance,
+      });
+      
+      // Wait for the operation to complete
+      await operation.promise();
+      
+      this.updateActivity(username, modelId);
+      console.log(`[VmManager] VM for ${modelId} started successfully.`);
+    } catch (e) {
+      console.error(`[VmManager] Failed to start VM for ${modelId}:`, e);
+      throw e;
+    }
+  }
+
+  public async stopVm(username: string, modelId: string): Promise<void> {
+    const config = this.getModelConfig(username, modelId);
+    if (!config || config.provider !== 'gcp') return;
+
+    console.log(`[VmManager] Stopping VM for ${modelId}...`);
+    try {
+      await this.instancesClient.stop({
+        project: config.gcpProject,
+        zone: config.gcpZone,
+        instance: config.gcpInstance,
+      });
+      this.state.delete(modelId); // Remove from active tracking
+      console.log(`[VmManager] VM for ${modelId} stopped successfully.`);
+    } catch (e) {
+      console.error(`[VmManager] Failed to stop VM for ${modelId}:`, e);
+      throw e;
+    }
+  }
+}
+
+export const vmManager = new VmManager();

package/.next/standalone/src/middleware.ts

@@ -1,133 +1,133 @@
-import { NextRequest, NextResponse } from 'next/server';
-import { HAS_AUTH } from '@/lib/tier';
-
-async function verifyToken(token: string, secretHex: string): Promise<{ sub: string; role: string } | null> {
-  if (!token) return null;
-  const parts = token.split('.');
-  if (parts.length !== 2) return null;
-
-  const [payloadB64, sig] = parts;
-
-  const keyBytes = new Uint8Array(secretHex.length / 2);
-  for (let i = 0; i < secretHex.length; i += 2) {
-    keyBytes[i / 2] = parseInt(secretHex.substring(i, i + 2), 16);
-  }
-  const key = await crypto.subtle.importKey(
-    'raw', keyBytes, { name: 'HMAC', hash: 'SHA-256' }, false, ['sign']
-  );
-
-  const sigBytes = await crypto.subtle.sign('HMAC', key, new TextEncoder().encode(payloadB64));
-  const expectedSig = btoa(String.fromCharCode(...new Uint8Array(sigBytes)))
-    .replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '');
-
-  if (expectedSig !== sig) return null;
-
-  try {
-    const payloadStr = atob(payloadB64.replace(/-/g, '+').replace(/_/g, '/'));
-    const payload = JSON.parse(payloadStr);
-    if (payload.exp < Math.floor(Date.now() / 1000)) return null;
-    return { sub: payload.sub, role: payload.role || 'user' };
-  } catch {
-    return null;
-  }
-}
-
-export async function middleware(request: NextRequest) {
-  if (!HAS_AUTH) {
-    return NextResponse.next();
-  }
-
-  const pathname = request.nextUrl.pathname;
-
-  // Skip auth for login page, specific auth APIs, static assets, and Next.js internals
-  if (
-    pathname === '/login' || pathname === '/login/' ||
-    pathname.startsWith('/api/tier') ||
-    pathname.startsWith('/api/auth/login') ||
-    pathname.startsWith('/api/auth/logout') ||
-    pathname.startsWith('/api/auth/totp/') ||
-    pathname.startsWith('/_next/') ||
-    pathname.startsWith('/favicon') ||
-    pathname.endsWith('.png') ||
-    pathname.endsWith('.ico') ||
-    pathname.endsWith('.svg') ||
-    pathname.endsWith('.jpg') ||
-    pathname.endsWith('.css') ||
-    pathname.endsWith('.js')
-  ) {
-    return NextResponse.next();
-  }
-
-  // Federation API routes authenticate via Bearer token
-  if (pathname.startsWith('/api/network/') && request.headers.get('authorization')?.startsWith('Bearer ')) {
-    return NextResponse.next();
-  }
-
-  // Connection request/callback endpoints are unauthenticated (verified by token in body)
-  if (request.method === 'POST' && (
-    pathname === '/api/network/connect-request' || pathname === '/api/network/connect-request/' ||
-    pathname === '/api/network/connect-callback' || pathname === '/api/network/connect-callback/'
-  )) {
-    return NextResponse.next();
-  }
-
-  // Internal API requests from MCP servers / agent processes / VR client (local network)
-  const internalToken = request.headers.get('x-spaces-internal') || request.nextUrl.searchParams.get('_internal');
-  if (internalToken === (process.env.SPACES_SESSION_SECRET || '').slice(0, 16) &&
-      (request.headers.get('host')?.startsWith('localhost') || request.headers.get('host')?.startsWith('127.0.0.1') || request.headers.get('host')?.startsWith('192.168.'))) {
-    return NextResponse.next();
-  }
-
-  // Validate session cookie
-  const sessionToken = request.cookies.get('spaces-session')?.value;
-  const secretHex = process.env.SPACES_SESSION_SECRET || '';
-
-  if (!secretHex) {
-    const loginUrl = request.nextUrl.clone();
-    loginUrl.pathname = '/login';
-    loginUrl.searchParams.set('error', 'no-secret');
-    return NextResponse.redirect(loginUrl);
-  }
-
-  if (!sessionToken) {
-    const loginUrl = request.nextUrl.clone();
-    loginUrl.pathname = '/login';
-    loginUrl.searchParams.set('redirectTo', pathname);
-    return NextResponse.redirect(loginUrl);
-  }
-
-  const session = await verifyToken(sessionToken, secretHex);
-  if (!session) {
-    const loginUrl = request.nextUrl.clone();
-    loginUrl.pathname = '/login';
-    loginUrl.searchParams.set('redirectTo', pathname);
-    return NextResponse.redirect(loginUrl);
-  }
-
-  // Set auth headers on the forwarded request
-  const requestHeaders = new Headers(request.headers);
-  requestHeaders.set('x-auth-user', session.sub);
-  requestHeaders.set('x-auth-role', session.role);
-
-  // Auto-redirect mobile users
-  if (pathname === '/' || pathname === '') {
-    const ua = request.headers.get('user-agent') || '';
-    const isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(ua);
-    if (isMobile) {
-      const mobileUrl = request.nextUrl.clone();
-      mobileUrl.pathname = '/m/';
-      return NextResponse.redirect(mobileUrl);
-    }
-  }
-
-  return NextResponse.next({
-    request: { headers: requestHeaders },
-  });
-}
-
-export const config = {
-  matcher: [
-    '/',
-    '/((?!_next/static|_next/image).*)',
-  ],
-};
+import { NextRequest, NextResponse } from 'next/server';
+import { HAS_AUTH } from '@/lib/tier';
+
+async function verifyToken(token: string, secretHex: string): Promise<{ sub: string; role: string } | null> {
+  if (!token) return null;
+  const parts = token.split('.');
+  if (parts.length !== 2) return null;
+
+  const [payloadB64, sig] = parts;
+
+  const keyBytes = new Uint8Array(secretHex.length / 2);
+  for (let i = 0; i < secretHex.length; i += 2) {
+    keyBytes[i / 2] = parseInt(secretHex.substring(i, i + 2), 16);
+  }
+  const key = await crypto.subtle.importKey(
+    'raw', keyBytes, { name: 'HMAC', hash: 'SHA-256' }, false, ['sign']
+  );
+
+  const sigBytes = await crypto.subtle.sign('HMAC', key, new TextEncoder().encode(payloadB64));
+  const expectedSig = btoa(String.fromCharCode(...new Uint8Array(sigBytes)))
+    .replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '');
+
+  if (expectedSig !== sig) return null;
+
+  try {
+    const payloadStr = atob(payloadB64.replace(/-/g, '+').replace(/_/g, '/'));
+    const payload = JSON.parse(payloadStr);
+    if (payload.exp < Math.floor(Date.now() / 1000)) return null;
+    return { sub: payload.sub, role: payload.role || 'user' };
+  } catch {
+    return null;
+  }
+}
+
+export async function middleware(request: NextRequest) {
+  if (!HAS_AUTH) {
+    return NextResponse.next();
+  }
+
+  const pathname = request.nextUrl.pathname;
+
+  // Skip auth for login page, specific auth APIs, static assets, and Next.js internals
+  if (
+    pathname === '/login' || pathname === '/login/' ||
+    pathname.startsWith('/api/tier') ||
+    pathname.startsWith('/api/auth/login') ||
+    pathname.startsWith('/api/auth/logout') ||
+    pathname.startsWith('/api/auth/totp/') ||
+    pathname.startsWith('/_next/') ||
+    pathname.startsWith('/favicon') ||
+    pathname.endsWith('.png') ||
+    pathname.endsWith('.ico') ||
+    pathname.endsWith('.svg') ||
+    pathname.endsWith('.jpg') ||
+    pathname.endsWith('.css') ||
+    pathname.endsWith('.js')
+  ) {
+    return NextResponse.next();
+  }
+
+  // Federation API routes authenticate via Bearer token
+  if (pathname.startsWith('/api/network/') && request.headers.get('authorization')?.startsWith('Bearer ')) {
+    return NextResponse.next();
+  }
+
+  // Connection request/callback endpoints are unauthenticated (verified by token in body)
+  if (request.method === 'POST' && (
+    pathname === '/api/network/connect-request' || pathname === '/api/network/connect-request/' ||
+    pathname === '/api/network/connect-callback' || pathname === '/api/network/connect-callback/'
+  )) {
+    return NextResponse.next();
+  }
+
+  // Internal API requests from MCP servers / agent processes / VR client (local network)
+  const internalToken = request.headers.get('x-spaces-internal') || request.nextUrl.searchParams.get('_internal');
+  if (internalToken === (process.env.SPACES_SESSION_SECRET || '').slice(0, 16) &&
+      (request.headers.get('host')?.startsWith('localhost') || request.headers.get('host')?.startsWith('127.0.0.1') || request.headers.get('host')?.startsWith('192.168.'))) {
+    return NextResponse.next();
+  }
+
+  // Validate session cookie
+  const sessionToken = request.cookies.get('spaces-session')?.value;
+  const secretHex = process.env.SPACES_SESSION_SECRET || '';
+
+  if (!secretHex) {
+    const loginUrl = request.nextUrl.clone();
+    loginUrl.pathname = '/login';
+    loginUrl.searchParams.set('error', 'no-secret');
+    return NextResponse.redirect(loginUrl);
+  }
+
+  if (!sessionToken) {
+    const loginUrl = request.nextUrl.clone();
+    loginUrl.pathname = '/login';
+    loginUrl.searchParams.set('redirectTo', pathname);
+    return NextResponse.redirect(loginUrl);
+  }
+
+  const session = await verifyToken(sessionToken, secretHex);
+  if (!session) {
+    const loginUrl = request.nextUrl.clone();
+    loginUrl.pathname = '/login';
+    loginUrl.searchParams.set('redirectTo', pathname);
+    return NextResponse.redirect(loginUrl);
+  }
+
+  // Set auth headers on the forwarded request
+  const requestHeaders = new Headers(request.headers);
+  requestHeaders.set('x-auth-user', session.sub);
+  requestHeaders.set('x-auth-role', session.role);
+
+  // Auto-redirect mobile users
+  if (pathname === '/' || pathname === '') {
+    const ua = request.headers.get('user-agent') || '';
+    const isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(ua);
+    if (isMobile) {
+      const mobileUrl = request.nextUrl.clone();
+      mobileUrl.pathname = '/m/';
+      return NextResponse.redirect(mobileUrl);
+    }
+  }
+
+  return NextResponse.next({
+    request: { headers: requestHeaders },
+  });
+}
+
+export const config = {
+  matcher: [
+    '/',
+    '/((?!_next/static|_next/image).*)',
+  ],
+};