@push.rocks/smartproxy 22.6.0 → 23.1.0

package/ts/proxies/smart-proxy/rust-proxy-bridge.ts

@@ -1,310 +1,179 @@
 import * as plugins from '../../plugins.js';
 import { logger } from '../../core/utils/logger.js';
-import { RustBinaryLocator } from './rust-binary-locator.js';
 import type { IRouteConfig } from './models/route-types.js';
-import { ChildProcess, spawn } from 'child_process';
-import { createInterface, Interface as ReadlineInterface } from 'readline';
 
 /**
- * Management request sent to the Rust binary via stdin.
+ * Type-safe command definitions for the Rust proxy IPC protocol.
  */
-interface IManagementRequest {
-  id: string;
-  method: string;
-  params: Record<string, any>;
+type TSmartProxyCommands = {
+  start:                 { params: { config: any };              result: void };
+  stop:                  { params: Record<string, never>;        result: void };
+  updateRoutes:          { params: { routes: IRouteConfig[] };   result: void };
+  getMetrics:            { params: Record<string, never>;        result: any };
+  getStatistics:         { params: Record<string, never>;        result: any };
+  provisionCertificate:  { params: { routeName: string };        result: void };
+  renewCertificate:      { params: { routeName: string };        result: void };
+  getCertificateStatus:  { params: { routeName: string };        result: any };
+  getListeningPorts:     { params: Record<string, never>;        result: { ports: number[] } };
+  getNftablesStatus:     { params: Record<string, never>;        result: any };
+  setSocketHandlerRelay: { params: { socketPath: string };       result: void };
+  addListeningPort:      { params: { port: number };             result: void };
+  removeListeningPort:   { params: { port: number };             result: void };
+  loadCertificate:       { params: { domain: string; cert: string; key: string; ca?: string }; result: void };
+};
+
+/**
+ * Get the package root directory using import.meta.url.
+ * This file is at ts/proxies/smart-proxy/, so package root is 3 levels up.
+ */
+function getPackageRoot(): string {
+  const thisDir = plugins.path.dirname(plugins.url.fileURLToPath(import.meta.url));
+  return plugins.path.resolve(thisDir, '..', '..', '..');
 }
 
 /**
- * Management response received from the Rust binary via stdout.
+ * Map Node.js process.platform/process.arch to tsrust's friendly name suffix.
+ * tsrust names cross-compiled binaries as: rustproxy_linux_amd64, rustproxy_linux_arm64, etc.
  */
-interface IManagementResponse {
-  id: string;
-  success: boolean;
-  result?: any;
-  error?: string;
+function getTsrustPlatformSuffix(): string | null {
+  const archMap: Record<string, string> = { x64: 'amd64', arm64: 'arm64' };
+  const osMap: Record<string, string> = { linux: 'linux', darwin: 'macos' };
+  const os = osMap[process.platform];
+  const arch = archMap[process.arch];
+  if (os && arch) {
+    return `${os}_${arch}`;
+  }
+  return null;
 }
 
 /**
- * Management event received from the Rust binary (unsolicited).
+ * Build local search paths for the Rust binary, including dist_rust/ candidates
+ * (built by tsrust) and local development build paths.
  */
-interface IManagementEvent {
-  event: string;
-  data: any;
+function buildLocalPaths(): string[] {
+  const packageRoot = getPackageRoot();
+  const suffix = getTsrustPlatformSuffix();
+  const paths: string[] = [];
+
+  // dist_rust/ candidates (tsrust cross-compiled output)
+  if (suffix) {
+    paths.push(plugins.path.join(packageRoot, 'dist_rust', `rustproxy_${suffix}`));
+  }
+  paths.push(plugins.path.join(packageRoot, 'dist_rust', 'rustproxy'));
+
+  // Local dev build paths
+  paths.push(plugins.path.resolve(process.cwd(), 'rust', 'target', 'release', 'rustproxy'));
+  paths.push(plugins.path.resolve(process.cwd(), 'rust', 'target', 'debug', 'rustproxy'));
+
+  return paths;
 }
 
 /**
  * Bridge between TypeScript SmartProxy and the Rust binary.
- * Communicates via JSON-over-stdin/stdout IPC protocol.
+ * Wraps @push.rocks/smartrust's RustBridge with type-safe command definitions.
  */
 export class RustProxyBridge extends plugins.EventEmitter {
-  private locator = new RustBinaryLocator();
-  private process: ChildProcess | null = null;
-  private readline: ReadlineInterface | null = null;
-  private pendingRequests = new Map<string, {
-    resolve: (value: any) => void;
-    reject: (error: Error) => void;
-    timer: NodeJS.Timeout;
-  }>();
-  private requestCounter = 0;
-  private isRunning = false;
-  private binaryPath: string | null = null;
-  private readonly requestTimeoutMs = 30000;
+  private bridge: plugins.smartrust.RustBridge<TSmartProxyCommands>;
+
+  constructor() {
+    super();
+
+    this.bridge = new plugins.smartrust.RustBridge<TSmartProxyCommands>({
+      binaryName: 'rustproxy',
+      envVarName: 'SMARTPROXY_RUST_BINARY',
+      platformPackagePrefix: '@push.rocks/smartproxy',
+      localPaths: buildLocalPaths(),
+      logger: {
+        log: (level: string, message: string, data?: Record<string, any>) => {
+          logger.log(level as any, message, data);
+        },
+      },
+    });
+
+    // Forward events from the inner bridge
+    this.bridge.on('exit', (code: number | null, signal: string | null) => {
+      this.emit('exit', code, signal);
+    });
+  }
 
   /**
    * Spawn the Rust binary in management mode.
    * Returns true if the binary was found and spawned successfully.
    */
   public async spawn(): Promise<boolean> {
-    this.binaryPath = await this.locator.findBinary();
-    if (!this.binaryPath) {
-      return false;
-    }
-
-    return new Promise<boolean>((resolve) => {
-      try {
-        this.process = spawn(this.binaryPath!, ['--management'], {
-          stdio: ['pipe', 'pipe', 'pipe'],
-          env: { ...process.env },
-        });
-
-        // Handle stderr (logging from Rust goes here)
-        const stderrHandler = (data: Buffer) => {
-          const lines = data.toString().split('\n').filter(l => l.trim());
-          for (const line of lines) {
-            logger.log('debug', `[rustproxy] ${line}`, { component: 'rust-bridge' });
-          }
-        };
-        this.process.stderr?.on('data', stderrHandler);
-
-        // Handle stdout (JSON IPC)
-        this.readline = createInterface({ input: this.process.stdout! });
-        this.readline.on('line', (line: string) => {
-          this.handleLine(line.trim());
-        });
-
-        // Handle process exit
-        this.process.on('exit', (code, signal) => {
-          logger.log('info', `RustProxy process exited (code=${code}, signal=${signal})`, { component: 'rust-bridge' });
-          this.cleanup();
-          this.emit('exit', code, signal);
-        });
-
-        this.process.on('error', (err) => {
-          logger.log('error', `RustProxy process error: ${err.message}`, { component: 'rust-bridge' });
-          this.cleanup();
-          resolve(false);
-        });
-
-        // Wait for the 'ready' event from Rust
-        const readyTimeout = setTimeout(() => {
-          logger.log('error', 'RustProxy did not send ready event within 10s', { component: 'rust-bridge' });
-          this.kill();
-          resolve(false);
-        }, 10000);
-
-        this.once('management:ready', () => {
-          clearTimeout(readyTimeout);
-          this.isRunning = true;
-          logger.log('info', 'RustProxy bridge connected', { component: 'rust-bridge' });
-          resolve(true);
-        });
-      } catch (err: any) {
-        logger.log('error', `Failed to spawn RustProxy: ${err.message}`, { component: 'rust-bridge' });
-        resolve(false);
-      }
-    });
+    return this.bridge.spawn();
   }
 
   /**
-   * Send a management command to the Rust process and wait for the response.
+   * Kill the Rust process and clean up.
    */
-  public async sendCommand(method: string, params: Record<string, any> = {}): Promise<any> {
-    if (!this.process || !this.isRunning) {
-      throw new Error('RustProxy bridge is not running');
-    }
-
-    const id = `req_${++this.requestCounter}`;
-    const request: IManagementRequest = { id, method, params };
-
-    return new Promise<any>((resolve, reject) => {
-      const timer = setTimeout(() => {
-        this.pendingRequests.delete(id);
-        reject(new Error(`RustProxy command '${method}' timed out after ${this.requestTimeoutMs}ms`));
-      }, this.requestTimeoutMs);
-
-      this.pendingRequests.set(id, { resolve, reject, timer });
+  public kill(): void {
+    this.bridge.kill();
+  }
 
-      const json = JSON.stringify(request) + '\n';
-      this.process!.stdin!.write(json, (err) => {
-        if (err) {
-          clearTimeout(timer);
-          this.pendingRequests.delete(id);
-          reject(new Error(`Failed to write to RustProxy stdin: ${err.message}`));
-        }
-      });
-    });
+  /**
+   * Whether the bridge is currently running.
+   */
+  public get running(): boolean {
+    return this.bridge.running;
   }
 
-  // Convenience methods for each management command
+  // --- Convenience methods for each management command ---
 
   public async startProxy(config: any): Promise<void> {
-    await this.sendCommand('start', { config });
+    await this.bridge.sendCommand('start', { config });
   }
 
   public async stopProxy(): Promise<void> {
-    await this.sendCommand('stop');
+    await this.bridge.sendCommand('stop', {} as Record<string, never>);
   }
 
   public async updateRoutes(routes: IRouteConfig[]): Promise<void> {
-    await this.sendCommand('updateRoutes', { routes });
+    await this.bridge.sendCommand('updateRoutes', { routes });
   }
 
   public async getMetrics(): Promise<any> {
-    return this.sendCommand('getMetrics');
+    return this.bridge.sendCommand('getMetrics', {} as Record<string, never>);
   }
 
   public async getStatistics(): Promise<any> {
-    return this.sendCommand('getStatistics');
+    return this.bridge.sendCommand('getStatistics', {} as Record<string, never>);
   }
 
   public async provisionCertificate(routeName: string): Promise<void> {
-    await this.sendCommand('provisionCertificate', { routeName });
+    await this.bridge.sendCommand('provisionCertificate', { routeName });
   }
 
   public async renewCertificate(routeName: string): Promise<void> {
-    await this.sendCommand('renewCertificate', { routeName });
+    await this.bridge.sendCommand('renewCertificate', { routeName });
   }
 
   public async getCertificateStatus(routeName: string): Promise<any> {
-    return this.sendCommand('getCertificateStatus', { routeName });
+    return this.bridge.sendCommand('getCertificateStatus', { routeName });
   }
 
   public async getListeningPorts(): Promise<number[]> {
-    const result = await this.sendCommand('getListeningPorts');
+    const result = await this.bridge.sendCommand('getListeningPorts', {} as Record<string, never>);
     return result?.ports ?? [];
   }
 
   public async getNftablesStatus(): Promise<any> {
-    return this.sendCommand('getNftablesStatus');
+    return this.bridge.sendCommand('getNftablesStatus', {} as Record<string, never>);
   }
 
   public async setSocketHandlerRelay(socketPath: string): Promise<void> {
-    await this.sendCommand('setSocketHandlerRelay', { socketPath });
+    await this.bridge.sendCommand('setSocketHandlerRelay', { socketPath });
   }
 
   public async addListeningPort(port: number): Promise<void> {
-    await this.sendCommand('addListeningPort', { port });
+    await this.bridge.sendCommand('addListeningPort', { port });
   }
 
   public async removeListeningPort(port: number): Promise<void> {
-    await this.sendCommand('removeListeningPort', { port });
+    await this.bridge.sendCommand('removeListeningPort', { port });
   }
 
   public async loadCertificate(domain: string, cert: string, key: string, ca?: string): Promise<void> {
-    await this.sendCommand('loadCertificate', { domain, cert, key, ca });
-  }
-
-  /**
-   * Kill the Rust process and clean up all stdio streams.
-   */
-  public kill(): void {
-    if (this.process) {
-      const proc = this.process;
-      this.process = null;
-      this.isRunning = false;
-
-      // Close readline (reads from stdout)
-      if (this.readline) {
-        this.readline.close();
-        this.readline = null;
-      }
-
-      // Reject pending requests
-      for (const [, pending] of this.pendingRequests) {
-        clearTimeout(pending.timer);
-        pending.reject(new Error('RustProxy process killed'));
-      }
-      this.pendingRequests.clear();
-
-      // Remove all listeners so nothing keeps references
-      proc.removeAllListeners();
-      proc.stdout?.removeAllListeners();
-      proc.stderr?.removeAllListeners();
-      proc.stdin?.removeAllListeners();
-
-      // Kill the process
-      try { proc.kill('SIGTERM'); } catch { /* already dead */ }
-
-      // Destroy all stdio pipes to free handles
-      try { proc.stdin?.destroy(); } catch { /* ignore */ }
-      try { proc.stdout?.destroy(); } catch { /* ignore */ }
-      try { proc.stderr?.destroy(); } catch { /* ignore */ }
-
-      // Unref process so Node doesn't wait for it
-      try { proc.unref(); } catch { /* ignore */ }
-
-      // Force kill after 5 seconds
-      setTimeout(() => {
-        try { proc.kill('SIGKILL'); } catch { /* already dead */ }
-      }, 5000).unref();
-    }
-  }
-
-  /**
-   * Whether the bridge is currently running.
-   */
-  public get running(): boolean {
-    return this.isRunning;
-  }
-
-  private handleLine(line: string): void {
-    if (!line) return;
-
-    let parsed: any;
-    try {
-      parsed = JSON.parse(line);
-    } catch {
-      logger.log('warn', `Non-JSON output from RustProxy: ${line}`, { component: 'rust-bridge' });
-      return;
-    }
-
-    // Check if it's an event (has 'event' field)
-    if ('event' in parsed) {
-      const event = parsed as IManagementEvent;
-      this.emit(`management:${event.event}`, event.data);
-      return;
-    }
-
-    // Otherwise it's a response (has 'id' field)
-    if ('id' in parsed) {
-      const response = parsed as IManagementResponse;
-      const pending = this.pendingRequests.get(response.id);
-      if (pending) {
-        clearTimeout(pending.timer);
-        this.pendingRequests.delete(response.id);
-        if (response.success) {
-          pending.resolve(response.result);
-        } else {
-          pending.reject(new Error(response.error || 'Unknown error from RustProxy'));
-        }
-      }
-    }
-  }
-
-  private cleanup(): void {
-    this.isRunning = false;
-    this.process = null;
-
-    if (this.readline) {
-      this.readline.close();
-      this.readline = null;
-    }
-
-    // Reject all pending requests
-    for (const [id, pending] of this.pendingRequests) {
-      clearTimeout(pending.timer);
-      pending.reject(new Error('RustProxy process exited'));
-    }
-    this.pendingRequests.clear();
+    await this.bridge.sendCommand('loadCertificate', { domain, cert, key, ca });
   }
 }

package/ts/proxies/smart-proxy/smart-proxy.ts

@@ -3,7 +3,6 @@ import { logger } from '../../core/utils/logger.js';
 
 // Rust bridge and helpers
 import { RustProxyBridge } from './rust-proxy-bridge.js';
-import { RustBinaryLocator } from './rust-binary-locator.js';
 import { RoutePreprocessor } from './route-preprocessor.js';
 import { SocketHandlerServer } from './socket-handler-server.js';
 import { RustMetricsAdapter } from './rust-metrics-adapter.js';
@@ -120,7 +119,7 @@ export class SmartProxy extends plugins.EventEmitter {
     if (!spawned) {
       throw new Error(
         'RustProxy binary not found. Set SMARTPROXY_RUST_BINARY env var, install the platform package, ' +
-        'or build locally with: cd rust && cargo build --release'
+        'or build locally with: pnpm build'
       );
     }
 

package/dist_ts/common/eventUtils.d.ts

@@ -1,14 +0,0 @@
-import type { ICertificateData, ICertificateFailure, ICertificateExpiring } from './types.js';
-/**
- * Subscribers callback definitions for Port80Handler events
- */
-export interface Port80HandlerSubscribers {
-    onCertificateIssued?: (data: ICertificateData) => void;
-    onCertificateRenewed?: (data: ICertificateData) => void;
-    onCertificateFailed?: (data: ICertificateFailure) => void;
-    onCertificateExpiring?: (data: ICertificateExpiring) => void;
-}
-/**
- * Subscribes to Port80Handler events based on provided callbacks
- */
-export declare function subscribeToPort80Handler(handler: any, subscribers: Port80HandlerSubscribers): void;

package/dist_ts/common/eventUtils.js

@@ -1,20 +0,0 @@
-// Port80Handler removed - use SmartCertManager instead
-import { Port80HandlerEvents } from './types.js';
-/**
- * Subscribes to Port80Handler events based on provided callbacks
- */
-export function subscribeToPort80Handler(handler, subscribers) {
-    if (subscribers.onCertificateIssued) {
-        handler.on(Port80HandlerEvents.CERTIFICATE_ISSUED, subscribers.onCertificateIssued);
-    }
-    if (subscribers.onCertificateRenewed) {
-        handler.on(Port80HandlerEvents.CERTIFICATE_RENEWED, subscribers.onCertificateRenewed);
-    }
-    if (subscribers.onCertificateFailed) {
-        handler.on(Port80HandlerEvents.CERTIFICATE_FAILED, subscribers.onCertificateFailed);
-    }
-    if (subscribers.onCertificateExpiring) {
-        handler.on(Port80HandlerEvents.CERTIFICATE_EXPIRING, subscribers.onCertificateExpiring);
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXZlbnRVdGlscy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzL2NvbW1vbi9ldmVudFV0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLHVEQUF1RDtBQUN2RCxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFhakQ7O0dBRUc7QUFDSCxNQUFNLFVBQVUsd0JBQXdCLENBQ3RDLE9BQVksRUFDWixXQUFxQztJQUVyQyxJQUFJLFdBQVcsQ0FBQyxtQkFBbUIsRUFBRSxDQUFDO1FBQ3BDLE9BQU8sQ0FBQyxFQUFFLENBQUMsbUJBQW1CLENBQUMsa0JBQWtCLEVBQUUsV0FBVyxDQUFDLG1CQUFtQixDQUFDLENBQUM7SUFDdEYsQ0FBQztJQUNELElBQUksV0FBVyxDQUFDLG9CQUFvQixFQUFFLENBQUM7UUFDckMsT0FBTyxDQUFDLEVBQUUsQ0FBQyxtQkFBbUIsQ0FBQyxtQkFBbUIsRUFBRSxXQUFXLENBQUMsb0JBQW9CLENBQUMsQ0FBQztJQUN4RixDQUFDO0lBQ0QsSUFBSSxXQUFXLENBQUMsbUJBQW1CLEVBQUUsQ0FBQztRQUNwQyxPQUFPLENBQUMsRUFBRSxDQUFDLG1CQUFtQixDQUFDLGtCQUFrQixFQUFFLFdBQVcsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDO0lBQ3RGLENBQUM7SUFDRCxJQUFJLFdBQVcsQ0FBQyxxQkFBcUIsRUFBRSxDQUFDO1FBQ3RDLE9BQU8sQ0FBQyxFQUFFLENBQUMsbUJBQW1CLENBQUMsb0JBQW9CLEVBQUUsV0FBVyxDQUFDLHFCQUFxQixDQUFDLENBQUM7SUFDMUYsQ0FBQztBQUNILENBQUMifQ==

package/dist_ts/common/types.d.ts

@@ -1,82 +0,0 @@
-/**
- * Shared types for certificate management and domain options
- */
-/**
- * Domain forwarding configuration
- */
-export interface IForwardConfig {
-    ip: string;
-    port: number;
-}
-/**
- * Domain configuration options
- */
-export interface IDomainOptions {
-    domainName: string;
-    sslRedirect: boolean;
-    acmeMaintenance: boolean;
-    forward?: IForwardConfig;
-    acmeForward?: IForwardConfig;
-}
-/**
- * Certificate data that can be emitted via events or set from outside
- */
-export interface ICertificateData {
-    domain: string;
-    certificate: string;
-    privateKey: string;
-    expiryDate: Date;
-}
-/**
- * Events emitted by the Port80Handler
- */
-export declare enum Port80HandlerEvents {
-    CERTIFICATE_ISSUED = "certificate-issued",
-    CERTIFICATE_RENEWED = "certificate-renewed",
-    CERTIFICATE_FAILED = "certificate-failed",
-    CERTIFICATE_EXPIRING = "certificate-expiring",
-    MANAGER_STARTED = "manager-started",
-    MANAGER_STOPPED = "manager-stopped",
-    REQUEST_FORWARDED = "request-forwarded"
-}
-/**
- * Certificate failure payload type
- */
-export interface ICertificateFailure {
-    domain: string;
-    error: string;
-    isRenewal: boolean;
-}
-/**
- * Certificate expiry payload type
- */
-export interface ICertificateExpiring {
-    domain: string;
-    expiryDate: Date;
-    daysRemaining: number;
-}
-/**
- * Forwarding configuration for specific domains in ACME setup
- */
-export interface IDomainForwardConfig {
-    domain: string;
-    forwardConfig?: IForwardConfig;
-    acmeForwardConfig?: IForwardConfig;
-    sslRedirect?: boolean;
-}
-/**
- * Unified ACME configuration options used across proxies and handlers
- */
-export interface IAcmeOptions {
-    accountEmail?: string;
-    enabled?: boolean;
-    port?: number;
-    useProduction?: boolean;
-    httpsRedirectPort?: number;
-    renewThresholdDays?: number;
-    renewCheckIntervalHours?: number;
-    autoRenew?: boolean;
-    certificateStore?: string;
-    skipConfiguredCerts?: boolean;
-    domainForwards?: IDomainForwardConfig[];
-}

package/dist_ts/common/types.js

@@ -1,15 +0,0 @@
-import * as plugins from '../plugins.js';
-/**
- * Events emitted by the Port80Handler
- */
-export var Port80HandlerEvents;
-(function (Port80HandlerEvents) {
-    Port80HandlerEvents["CERTIFICATE_ISSUED"] = "certificate-issued";
-    Port80HandlerEvents["CERTIFICATE_RENEWED"] = "certificate-renewed";
-    Port80HandlerEvents["CERTIFICATE_FAILED"] = "certificate-failed";
-    Port80HandlerEvents["CERTIFICATE_EXPIRING"] = "certificate-expiring";
-    Port80HandlerEvents["MANAGER_STARTED"] = "manager-started";
-    Port80HandlerEvents["MANAGER_STOPPED"] = "manager-stopped";
-    Port80HandlerEvents["REQUEST_FORWARDED"] = "request-forwarded";
-})(Port80HandlerEvents || (Port80HandlerEvents = {}));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9jb21tb24vdHlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE9BQU8sTUFBTSxlQUFlLENBQUM7QUFtQ3pDOztHQUVHO0FBQ0gsTUFBTSxDQUFOLElBQVksbUJBUVg7QUFSRCxXQUFZLG1CQUFtQjtJQUM3QixnRUFBeUMsQ0FBQTtJQUN6QyxrRUFBMkMsQ0FBQTtJQUMzQyxnRUFBeUMsQ0FBQTtJQUN6QyxvRUFBNkMsQ0FBQTtJQUM3QywwREFBbUMsQ0FBQTtJQUNuQywwREFBbUMsQ0FBQTtJQUNuQyw4REFBdUMsQ0FBQTtBQUN6QyxDQUFDLEVBUlcsbUJBQW1CLEtBQW5CLG1CQUFtQixRQVE5QiJ9