happy-coder 0.9.1 → 0.10.0-1

package/dist/lib.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var types = require('./types-DNUk09Np.cjs');
+var types = require('./types-D9P2bndj.cjs');
 require('axios');
 require('chalk');
 require('fs');
@@ -13,6 +13,12 @@ require('node:crypto');
 require('tweetnacl');
 require('node:events');
 require('socket.io-client');
+require('child_process');
+require('util');
+require('fs/promises');
+require('crypto');
+require('path');
+require('url');
 require('expo-server-sdk');
 
 

package/dist/lib.d.cts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import { EventEmitter } from 'node:events';
-import { ChildProcess } from 'child_process';
+import { Socket } from 'socket.io-client';
 import { ExpoPushMessage } from 'expo-server-sdk';
 
 /**
@@ -288,7 +288,80 @@ declare const RawJSONLinesSchema: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
 }, z.ZodTypeAny, "passthrough">>]>;
 type RawJSONLines = z.infer<typeof RawJSONLinesSchema>;
 
-type RpcHandler<T = any, R = any> = (data: T) => R | Promise<R>;
+/**
+ * Common RPC types and interfaces for both session and machine clients
+ */
+/**
+ * Generic RPC handler function type
+ * @template TRequest - The request data type
+ * @template TResponse - The response data type
+ */
+type RpcHandler<TRequest = any, TResponse = any> = (data: TRequest) => TResponse | Promise<TResponse>;
+/**
+ * RPC request data from server
+ */
+interface RpcRequest {
+    method: string;
+    params: string;
+}
+/**
+ * Configuration for RPC handler manager
+ */
+interface RpcHandlerConfig {
+    /** Prefix to add to all method names (e.g., sessionId or machineId) */
+    scopePrefix: string;
+    /** Secret key for encryption/decryption */
+    secret: Uint8Array;
+    /** Logger function for debugging */
+    logger?: (message: string, data?: any) => void;
+}
+
+/**
+ * Generic RPC handler manager for session and machine clients
+ * Manages RPC method registration, encryption/decryption, and handler execution
+ */
+
+declare class RpcHandlerManager {
+    private handlers;
+    private readonly scopePrefix;
+    private readonly secret;
+    private readonly logger;
+    private socket;
+    constructor(config: RpcHandlerConfig);
+    /**
+     * Register an RPC handler for a specific method
+     * @param method - The method name (without prefix)
+     * @param handler - The handler function
+     */
+    registerHandler<TRequest = any, TResponse = any>(method: string, handler: RpcHandler<TRequest, TResponse>): void;
+    /**
+     * Handle an incoming RPC request
+     * @param request - The RPC request data
+     * @param callback - The response callback
+     */
+    handleRequest(request: RpcRequest): Promise<any>;
+    onSocketConnect(socket: Socket): void;
+    onSocketDisconnect(): void;
+    /**
+     * Get the number of registered handlers
+     */
+    getHandlerCount(): number;
+    /**
+     * Check if a handler is registered
+     * @param method - The method name (without prefix)
+     */
+    hasHandler(method: string): boolean;
+    /**
+     * Clear all handlers
+     */
+    clearHandlers(): void;
+    /**
+     * Get the prefixed method name
+     * @param method - The method name
+     */
+    private getPrefixedMethod;
+}
+
 declare class ApiSessionClient extends EventEmitter {
     private readonly token;
     private readonly secret;
@@ -300,7 +373,7 @@ declare class ApiSessionClient extends EventEmitter {
     private socket;
     private pendingMessages;
     private pendingMessageCallback;
-    private rpcHandlers;
+    readonly rpcHandlerManager: RpcHandlerManager;
     private agentStateLock;
     private metadataLock;
     constructor(token: string, secret: Uint8Array, session: Session);
@@ -344,16 +417,6 @@ declare class ApiSessionClient extends EventEmitter {
      * @param handler - Handler function that returns the updated agent state
      */
     updateAgentState(handler: (metadata: AgentState) => AgentState): void;
-    /**
-     * Set a custom RPC handler for a specific method with encrypted arguments and responses
-     * @param method - The method name to handle
-     * @param handler - The handler function to call when the method is invoked
-     */
-    setHandler<T = any, R = any>(method: string, handler: RpcHandler<T, R>): void;
-    /**
-     * Re-register all RPC handlers after reconnection
-     */
-    private reregisterHandlers;
     /**
      * Wait for socket buffer to flush
      */
@@ -643,23 +706,22 @@ type AgentState = {
     };
 };
 
-/**
- * Daemon-specific types (not related to API/server communication)
- */
-
-/**
- * Session tracking for daemon
- */
-interface TrackedSession {
-    startedBy: 'daemon' | string;
-    happySessionId?: string;
-    happySessionMetadataFromLocalWebhook?: Metadata;
-    pid: number;
-    childProcess?: ChildProcess;
-    error?: string;
-    directoryCreated?: boolean;
-    message?: string;
+interface SpawnSessionOptions {
+    machineId?: string;
+    directory: string;
+    sessionId?: string;
+    approvedNewDirectoryCreation?: boolean;
 }
+type SpawnSessionResult = {
+    type: 'success';
+    sessionId: string;
+} | {
+    type: 'requestToApproveDirectoryCreation';
+    directory: string;
+} | {
+    type: 'error';
+    errorMessage: string;
+};
 
 /**
  * WebSocket client for machine/daemon communication with Happy server
@@ -667,7 +729,7 @@ interface TrackedSession {
  */
 
 type MachineRpcHandlers = {
-    spawnSession: (directory: string, sessionId?: string) => Promise<TrackedSession | null>;
+    spawnSession: (options: SpawnSessionOptions) => Promise<SpawnSessionResult>;
     stopSession: (sessionId: string) => boolean;
     requestShutdown: () => void;
 };
@@ -677,9 +739,7 @@ declare class ApiMachineClient {
     private machine;
     private socket;
     private keepAliveInterval;
-    private spawnSession?;
-    private stopSession?;
-    private requestShutdown?;
+    private rpcHandlerManager;
     constructor(token: string, secret: Uint8Array, machine: Machine);
     setRPCHandlers({ spawnSession, stopSession, requestShutdown }: MachineRpcHandlers): void;
     /**
@@ -750,7 +810,7 @@ declare class ApiClient {
      * Register or update machine with the server
      * Returns the current machine state from the server with decrypted metadata and daemonState
      */
-    createMachineOrGetExistingAsIs(opts: {
+    getOrCreateMachine(opts: {
         machineId: string;
         metadata: MachineMetadata;
         daemonState?: DaemonState;
@@ -758,6 +818,11 @@ declare class ApiClient {
     sessionSyncClient(session: Session): ApiSessionClient;
     machineSyncClient(machine: Machine): ApiMachineClient;
     push(): PushNotificationClient;
+    /**
+     * Register a vendor API token with the server
+     * The token is sent as a JSON string - server handles encryption
+     */
+    registerVendorToken(vendor: 'openai' | 'anthropic' | 'gemini', apiKey: any): Promise<void>;
 }
 
 /**

package/dist/lib.d.mts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import { EventEmitter } from 'node:events';
-import { ChildProcess } from 'child_process';
+import { Socket } from 'socket.io-client';
 import { ExpoPushMessage } from 'expo-server-sdk';
 
 /**
@@ -288,7 +288,80 @@ declare const RawJSONLinesSchema: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
 }, z.ZodTypeAny, "passthrough">>]>;
 type RawJSONLines = z.infer<typeof RawJSONLinesSchema>;
 
-type RpcHandler<T = any, R = any> = (data: T) => R | Promise<R>;
+/**
+ * Common RPC types and interfaces for both session and machine clients
+ */
+/**
+ * Generic RPC handler function type
+ * @template TRequest - The request data type
+ * @template TResponse - The response data type
+ */
+type RpcHandler<TRequest = any, TResponse = any> = (data: TRequest) => TResponse | Promise<TResponse>;
+/**
+ * RPC request data from server
+ */
+interface RpcRequest {
+    method: string;
+    params: string;
+}
+/**
+ * Configuration for RPC handler manager
+ */
+interface RpcHandlerConfig {
+    /** Prefix to add to all method names (e.g., sessionId or machineId) */
+    scopePrefix: string;
+    /** Secret key for encryption/decryption */
+    secret: Uint8Array;
+    /** Logger function for debugging */
+    logger?: (message: string, data?: any) => void;
+}
+
+/**
+ * Generic RPC handler manager for session and machine clients
+ * Manages RPC method registration, encryption/decryption, and handler execution
+ */
+
+declare class RpcHandlerManager {
+    private handlers;
+    private readonly scopePrefix;
+    private readonly secret;
+    private readonly logger;
+    private socket;
+    constructor(config: RpcHandlerConfig);
+    /**
+     * Register an RPC handler for a specific method
+     * @param method - The method name (without prefix)
+     * @param handler - The handler function
+     */
+    registerHandler<TRequest = any, TResponse = any>(method: string, handler: RpcHandler<TRequest, TResponse>): void;
+    /**
+     * Handle an incoming RPC request
+     * @param request - The RPC request data
+     * @param callback - The response callback
+     */
+    handleRequest(request: RpcRequest): Promise<any>;
+    onSocketConnect(socket: Socket): void;
+    onSocketDisconnect(): void;
+    /**
+     * Get the number of registered handlers
+     */
+    getHandlerCount(): number;
+    /**
+     * Check if a handler is registered
+     * @param method - The method name (without prefix)
+     */
+    hasHandler(method: string): boolean;
+    /**
+     * Clear all handlers
+     */
+    clearHandlers(): void;
+    /**
+     * Get the prefixed method name
+     * @param method - The method name
+     */
+    private getPrefixedMethod;
+}
+
 declare class ApiSessionClient extends EventEmitter {
     private readonly token;
     private readonly secret;
@@ -300,7 +373,7 @@ declare class ApiSessionClient extends EventEmitter {
     private socket;
     private pendingMessages;
     private pendingMessageCallback;
-    private rpcHandlers;
+    readonly rpcHandlerManager: RpcHandlerManager;
     private agentStateLock;
     private metadataLock;
     constructor(token: string, secret: Uint8Array, session: Session);
@@ -344,16 +417,6 @@ declare class ApiSessionClient extends EventEmitter {
      * @param handler - Handler function that returns the updated agent state
      */
     updateAgentState(handler: (metadata: AgentState) => AgentState): void;
-    /**
-     * Set a custom RPC handler for a specific method with encrypted arguments and responses
-     * @param method - The method name to handle
-     * @param handler - The handler function to call when the method is invoked
-     */
-    setHandler<T = any, R = any>(method: string, handler: RpcHandler<T, R>): void;
-    /**
-     * Re-register all RPC handlers after reconnection
-     */
-    private reregisterHandlers;
     /**
      * Wait for socket buffer to flush
      */
@@ -643,23 +706,22 @@ type AgentState = {
     };
 };
 
-/**
- * Daemon-specific types (not related to API/server communication)
- */
-
-/**
- * Session tracking for daemon
- */
-interface TrackedSession {
-    startedBy: 'daemon' | string;
-    happySessionId?: string;
-    happySessionMetadataFromLocalWebhook?: Metadata;
-    pid: number;
-    childProcess?: ChildProcess;
-    error?: string;
-    directoryCreated?: boolean;
-    message?: string;
+interface SpawnSessionOptions {
+    machineId?: string;
+    directory: string;
+    sessionId?: string;
+    approvedNewDirectoryCreation?: boolean;
 }
+type SpawnSessionResult = {
+    type: 'success';
+    sessionId: string;
+} | {
+    type: 'requestToApproveDirectoryCreation';
+    directory: string;
+} | {
+    type: 'error';
+    errorMessage: string;
+};
 
 /**
  * WebSocket client for machine/daemon communication with Happy server
@@ -667,7 +729,7 @@ interface TrackedSession {
  */
 
 type MachineRpcHandlers = {
-    spawnSession: (directory: string, sessionId?: string) => Promise<TrackedSession | null>;
+    spawnSession: (options: SpawnSessionOptions) => Promise<SpawnSessionResult>;
     stopSession: (sessionId: string) => boolean;
     requestShutdown: () => void;
 };
@@ -677,9 +739,7 @@ declare class ApiMachineClient {
     private machine;
     private socket;
     private keepAliveInterval;
-    private spawnSession?;
-    private stopSession?;
-    private requestShutdown?;
+    private rpcHandlerManager;
     constructor(token: string, secret: Uint8Array, machine: Machine);
     setRPCHandlers({ spawnSession, stopSession, requestShutdown }: MachineRpcHandlers): void;
     /**
@@ -750,7 +810,7 @@ declare class ApiClient {
      * Register or update machine with the server
      * Returns the current machine state from the server with decrypted metadata and daemonState
      */
-    createMachineOrGetExistingAsIs(opts: {
+    getOrCreateMachine(opts: {
         machineId: string;
         metadata: MachineMetadata;
         daemonState?: DaemonState;
@@ -758,6 +818,11 @@ declare class ApiClient {
     sessionSyncClient(session: Session): ApiSessionClient;
     machineSyncClient(machine: Machine): ApiMachineClient;
     push(): PushNotificationClient;
+    /**
+     * Register a vendor API token with the server
+     * The token is sent as a JSON string - server handles encryption
+     */
+    registerVendorToken(vendor: 'openai' | 'anthropic' | 'gemini', apiKey: any): Promise<void>;
 }
 
 /**

package/dist/lib.mjs

@@ -1,4 +1,4 @@
-export { A as ApiClient, a as ApiSessionClient, R as RawJSONLinesSchema, c as configuration, l as logger } from './types-BS8Pr3Im.mjs';
+export { A as ApiClient, a as ApiSessionClient, R as RawJSONLinesSchema, c as configuration, l as logger } from './types-BUXwivpV.mjs';
 import 'axios';
 import 'chalk';
 import 'fs';
@@ -11,4 +11,10 @@ import 'node:crypto';
 import 'tweetnacl';
 import 'node:events';
 import 'socket.io-client';
+import 'child_process';
+import 'util';
+import 'fs/promises';
+import 'crypto';
+import 'path';
+import 'url';
 import 'expo-server-sdk';