Merge branch 'main' of https://github.com/codeboltai/codeboltjs

Author: Nursid

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codebolt/codeboltjs",
-  "version": "2.0.13",
+  "version": "2.0.15",
   "description": "",
   "keywords": [],
   "author": "",

src/core/Codebolt.ts

@@ -35,6 +35,7 @@ class Codebolt {
     websocket: WebSocket | null = null;
     private isReady: boolean = false;
     private readyPromise: Promise<void>;
+    private readyHandlers: Array<() => void | Promise<void>> = [];
 
     /**
      * @constructor
@@ -56,6 +57,15 @@ class Codebolt {
             this.websocket = cbws.getWebsocket;
             this.isReady = true;
             console.log("Codebolt WebSocket connection established");
+            
+            // Execute all registered ready handlers
+            for (const handler of this.readyHandlers) {
+                try {
+                    await handler();
+                } catch (error) {
+                    console.error('Error executing ready handler:', error);
+                }
+            }
         } catch (error) {
             console.error('Failed to initialize WebSocket connection:', error);
             throw error;
@@ -106,6 +116,31 @@ class Codebolt {
     utils = cbutils;
     notify = notificationFunctions;
 
+    /**
+     * Sets up a handler function to be executed when the WebSocket connection is established.
+     * If the connection is already established, the handler will be executed immediately.
+     * @param {Function} handler - The handler function to call when the connection is ready.
+     * @returns {void}
+     */
+    onReady(handler: () => void | Promise<void>) {
+        if (this.isReady) {
+            // If already ready, execute the handler immediately
+            try {
+                const result = handler();
+                if (result instanceof Promise) {
+                    result.catch(error => {
+                        console.error('Error in ready handler:', error);
+                    });
+                }
+            } catch (error) {
+                console.error('Error in ready handler:', error);
+            }
+        } else {
+            // If not ready yet, add to the list of handlers to execute when ready
+            this.readyHandlers.push(handler);
+        }
+    }
+
     /**
      * Sets up a listener for incoming messages with a direct handler function.
      * @param {Function} handler - The handler function to call when a message is received.

src/core/websocket.ts

@@ -66,12 +66,9 @@ class cbws {
         const parentAgentInstanceIdParam = process.env.parentAgentInstanceId ? `&parentAgentInstanceId=${process.env.parentAgentInstanceId}` : '';
         const agentTask = process.env.agentTask ? `&agentTask=${process.env.agentTask}` : '';
         const socketPort = process.env.SOCKET_PORT || '12345';
+        const serverUrl = process.env.CODEBOLT_SERVER_URL || 'localhost';
 
-        // const wsUrl = `ws://100.126.109.83:${socketPort}/codebolt?id=${uniqueConnectionId}${agentIdParam}${parentIdParam}${parentAgentInstanceIdParam}${agentTask}${process.env.Is_Dev ? '&dev=true' : ''}`;
-
-        const wsUrl = `ws://localhost:${socketPort}/codebolt?id=${uniqueConnectionId}${agentIdParam}${parentIdParam}${parentAgentInstanceIdParam}${agentTask}${process.env.Is_Dev ? '&dev=true' : ''}`;
-       
-        
+        const wsUrl = `ws://${serverUrl}:${socketPort}/codebolt?id=${uniqueConnectionId}${agentIdParam}${parentIdParam}${parentAgentInstanceIdParam}${agentTask}${process.env.Is_Dev ? '&dev=true' : ''}`;
         console.log('[WebSocket] Connecting to:', wsUrl);
 
         this.websocket = new WebSocket(wsUrl);

src/notificationfunctions/agent.ts

@@ -11,23 +11,14 @@ import {
     SubagentTaskCompletedNotification
 } from '../types/notifications/agent';
 
+import { AgentNotifications } from '../types/notificationFunctions/agent';
+
 import {
     sendNotification,
     generateToolUseId,
-    validateRequiredFields,
-    createErrorResponse,
-    createSuccessResponse
+    validateRequiredFields
 } from './utils';
 
-/**
- * Interface for agent notification functions
- */
-export interface AgentNotifications {
-    StartSubagentTaskRequestNotify(parentAgentId: string, subagentId: string, task: string, priority?: string, dependencies?: string[], toolUseId?: string): void;
-    StartSubagentTaskResponseNotify(content: string | any, isError?: boolean, toolUseId?: string): void;
-    SubagentTaskCompletedNotify(parentAgentId: string, subagentId: string, taskId: string, result: any, status: string, toolUseId?: string): void;
-}
-
 /**
  * Sends a request to start a subagent task
  * 

src/notificationfunctions/browser.ts

@@ -12,21 +12,14 @@ import {
     WebSearchResponseNotification
 } from '../types/notifications/browser';
 
+import { BrowserNotifications } from '../types/notificationFunctions/browser';
+
 import {
     sendNotification,
     generateToolUseId,
     validateRequiredFields
 } from './utils';
 
-/**
- * Interface for browser notification functions
- */
-export interface BrowserNotifications {
-    WebFetchRequestNotify(url: string, method?: string, headers?: Record<string, string>, body?: any, timeout?: number, toolUseId?: string): void;
-    WebFetchResponseNotify(content: string | any, isError?: boolean, toolUseId?: string, data?: WebFetchResponseNotification['data']): void;
-    WebSearchRequestNotify(query: string, maxResults?: number, searchEngine?: string, filters?: any, toolUseId?: string): void;
-    WebSearchResponseNotify(content: string | any, isError?: boolean, toolUseId?: string, data?: WebSearchResponseNotification['data']): void;
-}
 
 /**
  * Sends a web fetch request notification

src/notificationfunctions/chat.ts

@@ -12,6 +12,8 @@ import {
     GetChatHistoryResultNotification
 } from '../types/notifications/chat';
 
+import { ChatNotifications } from '../types/notificationFunctions/chat';
+
 import {
     sendNotification,
     generateToolUseId,
@@ -20,15 +22,6 @@ import {
     createSuccessResponse
 } from './utils';
 
-/**
- * Interface for chat notification functions
- */
-export interface ChatNotifications {
-    UserMessageRequestNotify(message: string, payload?: any, toolUseId?: string): void;
-    AgentTextResponseNotify(content: string | any, isError?: boolean, toolUseId?: string, data?: AgentTextResponseNotification['data']): void;
-    GetChatHistoryRequestNotify(data?: GetChatHistoryRequestNotification['data'], toolUseId?: string): void;
-    GetChatHistoryResultNotify(content: string | any, isError?: boolean, toolUseId?: string): void;
-}
 
 /**
  * Sends a user message request

src/notificationfunctions/codeutils.ts

@@ -12,21 +12,14 @@ import {
     GlobSearchResponseNotification
 } from '../types/notifications/codeutils';
 
+import { CodeutilsNotifications } from '../types/notificationFunctions/codeutils';
+
 import {
     sendNotification,
     generateToolUseId,
     validateRequiredFields
 } from './utils';
 
-/**
- * Interface for code utils notification functions
- */
-export interface CodeutilsNotifications {
-    GrepSearchRequestNotify(pattern: string, filePath?: string, recursive?: boolean, ignoreCase?: boolean, maxResults?: number, toolUseId?: string): void;
-    GrepSearchResponseNotify(content: string | any, isError?: boolean, toolUseId?: string, data?: GrepSearchResponseNotification['data']): void;
-    GlobSearchRequestNotify(pattern: string, basePath?: string, maxDepth?: number, includeDirectories?: boolean, toolUseId?: string): void;
-    GlobSearchResponseNotify(content: string | any, isError?: boolean, toolUseId?: string, data?: GlobSearchResponseNotification['data']): void;
-}
 
 /**
  * Sends a grep search request

src/notificationfunctions/crawler.ts

@@ -12,23 +12,14 @@ import {
     CrawlerStartResponseNotification
 } from '../types/notifications/crawler';
 
+import { CrawlerNotifications } from '../types/notificationFunctions/crawler';
+
 import {
     sendNotification,
     generateToolUseId,
-    validateRequiredFields,
-    createErrorResponse,
-    createSuccessResponse
+    validateRequiredFields
 } from './utils';
 
-/**
- * Interface for crawler notification functions
- */
-export interface CrawlerNotifications {
-    CrawlerSearchRequestNotify(url: string, searchQuery?: string, maxDepth?: number, maxPages?: number, includeSubdomains?: boolean, followRedirects?: boolean, toolUseId?: string): void;
-    CrawlerSearchResponseNotify(content: string | any, isError?: boolean, toolUseId?: string, data?: CrawlerSearchResponseNotification['data']): void;
-    CrawlerStartRequestNotify(startUrl: string, options?: any, toolUseId?: string): void;
-    CrawlerStartResponseNotify(content: string | any, isError?: boolean, toolUseId?: string, data?: CrawlerStartResponseNotification['data']): void;
-}
 
 /**
  * Sends a request to perform a crawler search

src/notificationfunctions/dbmemory.ts

@@ -12,23 +12,14 @@ import {
     GetMemoryResultNotification
 } from '../types/notifications/dbmemory';
 
+import { DbmemoryNotifications } from '../types/notificationFunctions/dbmemory';
+
 import {
     sendNotification,
     generateToolUseId,
-    validateRequiredFields,
-    createErrorResponse,
-    createSuccessResponse
+    validateRequiredFields
 } from './utils';
 
-/**
- * Interface for database memory notification functions
- */
-export interface DbmemoryNotifications {
-    AddMemoryRequestNotify(key: string, value: any, toolUseId?: string): void;
-    AddMemoryResultNotify(content: string | any, isError?: boolean, toolUseId?: string): void;
-    GetMemoryRequestNotify(key: string, toolUseId?: string): void;
-    GetMemoryResultNotify(content: string | any, isError?: boolean, toolUseId?: string): void;
-}
 
 /**
  * Sends a request to add knowledge to memory