@codebolt/codeboltjs 1.1.39 → 1.1.41

package/index.d.ts

@@ -65,7 +65,7 @@ declare class Codebolt {
     };
     chat: {
         getChatHistory: () => Promise<import("@codebolt/types").ChatMessage[]>;
-        userMessageListener: () => {
+        onActionMessage: () => {
             [EventEmitter.captureRejectionSymbol]?<K>(error: Error, event: string | symbol, ...args: any[]): void;
             addListener<K_1>(eventName: string | symbol, listener: (...args: any[]) => void): any;
             on<K_2>(eventName: string | symbol, listener: (...args: any[]) => void): any;
@@ -84,7 +84,7 @@ declare class Codebolt {
             eventNames(): (string | symbol)[];
         } | undefined;
         sendMessage: (message: string) => void;
-        waitforReply: (message: string) => Promise<string>;
+        waitforReply: (message: string) => Promise<import("@codebolt/types").UserMessage>;
         processStarted: () => {
             event: {
                 [EventEmitter.captureRejectionSymbol]?<K>(error: Error, event: string | symbol, ...args: any[]): void;
@@ -150,7 +150,7 @@ declare class Codebolt {
         click: (id: string) => Promise<unknown>;
         type: (id: string, text: string) => Promise<unknown>;
         enter: () => void;
-        crawl: () => void;
+        crawl: (query: string) => Promise<unknown>;
     };
     search: {
         init: (engine?: string) => void;

package/modules/chat.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { EventEmitter } from 'events';
-import { ChatMessage } from '@codebolt/types';
+import { ChatMessage, UserMessage } from '@codebolt/types';
 /**
  * CustomEventEmitter class that extends the Node.js EventEmitter class.
  */
@@ -19,7 +19,7 @@ declare const cbchat: {
      * Sets up a listener for incoming WebSocket messages and emits a custom event when a message is received.
      * @returns {EventEmitter} The event emitter used for emitting custom events.
      */
-    userMessageListener: () => CustomEventEmitter | undefined;
+    onActionMessage: () => CustomEventEmitter | undefined;
     /**
      * Sends a message through the WebSocket connection.
      * @param {string} message - The message to be sent.
@@ -28,9 +28,9 @@ declare const cbchat: {
     /**
      * Waits for a reply to a sent message.
      * @param {string} message - The message for which a reply is expected.
-     * @returns {Promise<ChatMessage>} A promise that resolves with the reply.
+     * @returns {Promise<UserMessage>} A promise that resolves with the reply.
      */
-    waitforReply: (message: string) => Promise<string>;
+    waitforReply: (message: string) => Promise<UserMessage>;
     /**
      * Notifies the server that a process has started and sets up an event listener for stopProcessClicked events.
      * @returns An object containing the event emitter and a stopProcess method.

package/modules/chat.js

@@ -37,13 +37,19 @@ const cbchat = {
      * Sets up a listener for incoming WebSocket messages and emits a custom event when a message is received.
      * @returns {EventEmitter} The event emitter used for emitting custom events.
      */
-    userMessageListener: () => {
+    onActionMessage: () => {
         if (!websocket_1.default.getWebsocket)
             return;
         websocket_1.default.getWebsocket.on('message', (data) => {
             const response = JSON.parse(data);
             if (response.type === "messageResponse") {
-                eventEmitter.emit("userMessage", response.response);
+                // Pass a callback function as an argument to the emit method
+                eventEmitter.emit("userMessage", response, (message) => {
+                    console.log("Callback function invoked with message:", message);
+                    websocket_1.default.getWebsocket.send(JSON.stringify({
+                        "type": "processStoped"
+                    }));
+                });
             }
         });
         return eventEmitter;
@@ -62,7 +68,7 @@ const cbchat = {
     /**
      * Waits for a reply to a sent message.
      * @param {string} message - The message for which a reply is expected.
-     * @returns {Promise<ChatMessage>} A promise that resolves with the reply.
+     * @returns {Promise<UserMessage>} A promise that resolves with the reply.
      */
     waitforReply: (message) => {
         return new Promise((resolve, reject) => {

package/modules/crawler.d.ts

@@ -40,6 +40,6 @@ declare const cbcrawler: {
     /**
      * Initiates a crawl process.
      */
-    crawl: () => void;
+    crawl: (query: string) => Promise<unknown>;
 };
 export default cbcrawler;

package/modules/crawler.js

@@ -102,11 +102,22 @@ const cbcrawler = {
     /**
      * Initiates a crawl process.
      */
-    crawl: () => {
-        websocket_1.default.getWebsocket.send(JSON.stringify({
-            "type": "crawlerEvent",
-            action: 'crawl'
-        }));
+    crawl: (query) => {
+        return new Promise((resolve, reject) => {
+            websocket_1.default.getWebsocket.send(JSON.stringify({
+                "type": "crawlerEvent",
+                "action": 'crawl',
+                "message": {
+                    query
+                }
+            }));
+            websocket_1.default.getWebsocket.on('message', (data) => {
+                const response = JSON.parse(data);
+                if (response.type === "crawlResponse") {
+                    resolve(response); // Resolve the Promise with the response data
+                }
+            });
+        });
     }
 };
 exports.default = cbcrawler;

package/modules/websocket.d.ts

@@ -8,6 +8,7 @@ declare class cbws {
      * Constructs a new cbws instance and initializes the WebSocket connection.
      */
     constructor();
+    private getUniqueConnectionId;
     /**
      * Initializes the WebSocket by setting up event listeners and returning a promise that resolves
      * when the WebSocket connection is successfully opened.

package/modules/websocket.js

@@ -4,6 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const ws_1 = __importDefault(require("ws"));
+const fs_1 = __importDefault(require("fs"));
+const js_yaml_1 = __importDefault(require("js-yaml"));
 /**
  * Class representing a WebSocket connection.
  */
@@ -12,11 +14,24 @@ class cbws {
      * Constructs a new cbws instance and initializes the WebSocket connection.
      */
     constructor() {
-        this.websocket = new ws_1.default("ws://localhost:12345/codebolt");
+        const uniqueConnectionId = this.getUniqueConnectionId();
+        console.log(uniqueConnectionId);
+        this.websocket = new ws_1.default(`ws://localhost:12345/codebolt?id=${uniqueConnectionId}`);
         this.initializeWebSocket().catch(error => {
             console.error("WebSocket connection failed:", error);
         });
     }
+    getUniqueConnectionId() {
+        try {
+            let fileContents = fs_1.default.readFileSync('./codebotagent.yml', 'utf8');
+            let data = js_yaml_1.default.load(fileContents);
+            return data.uniqueConnectionId;
+        }
+        catch (e) {
+            console.error('Unable to locate codebotagent.yml file.');
+            return '';
+        }
+    }
     /**
      * Initializes the WebSocket by setting up event listeners and returning a promise that resolves
      * when the WebSocket connection is successfully opened.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codebolt/codeboltjs",
-  "version": "1.1.39",
+  "version": "1.1.41",
   "description": "",
   "keywords": [],
   "author": "",
@@ -18,7 +18,7 @@
   "license": "MIT",
   "homepage": "https://codeboltai.github.io",
   "dependencies": {
-    "@codebolt/types": "^1.0.9",
+    "@codebolt/types": "^1.0.10",
     "tree-sitter": "^0.21.1",
     "tree-sitter-javascript": "^0.21.2",
     "typedoc-plugin-missing-exports": "^2.2.0",
@@ -26,6 +26,7 @@
   },
   "devDependencies": {
     "@types/events": "^3.0.3",
+    "@types/js-yaml": "^4.0.9",
     "@types/ws": "^8.5.10",
     "jest": "^29.7.0",
     "jest-serial-runner": "^1.2.1",

package/src/modules/chat.ts

@@ -1,7 +1,7 @@
 // chat.ts
 import cbws from './websocket';
 import { EventEmitter } from 'events';
-import {ChatMessage} from  '@codebolt/types'
+import {ChatMessage,UserMessage} from  '@codebolt/types'
 
 
 
@@ -37,12 +37,18 @@ const cbchat = {
      * Sets up a listener for incoming WebSocket messages and emits a custom event when a message is received.
      * @returns {EventEmitter} The event emitter used for emitting custom events.
      */
-    userMessageListener: () => {
+    onActionMessage: () => {
         if (!cbws.getWebsocket) return;
         cbws.getWebsocket.on('message', (data: string) => {
             const response = JSON.parse(data);
             if (response.type === "messageResponse") {
-                eventEmitter.emit("userMessage", response.response);
+                // Pass a callback function as an argument to the emit method
+                eventEmitter.emit("userMessage", response, (message: string) => {
+                    console.log("Callback function invoked with message:", message);
+                    cbws.getWebsocket.send(JSON.stringify({
+                        "type": "processStoped"
+                    }));
+                });
             } 
         });
         return eventEmitter;
@@ -63,9 +69,9 @@ const cbchat = {
     /**
      * Waits for a reply to a sent message.
      * @param {string} message - The message for which a reply is expected.
-     * @returns {Promise<ChatMessage>} A promise that resolves with the reply.
+     * @returns {Promise<UserMessage>} A promise that resolves with the reply.
      */
-    waitforReply: (message: string): Promise<string> => {
+    waitforReply: (message: string): Promise<UserMessage> => {
         return new Promise((resolve, reject) => {
             cbws.getWebsocket.send(JSON.stringify({
                 "type": "waitforReply",

package/src/modules/crawler.ts

@@ -98,11 +98,23 @@ const cbcrawler = {
     /**
      * Initiates a crawl process.
      */
-    crawl: () => {
-       cbws.getWebsocket.send(JSON.stringify({
-            "type": "crawlerEvent",
-            action: 'crawl'
-        }));
+    crawl: (query:string) => {
+        return new Promise((resolve, reject) => {
+            cbws.getWebsocket.send(JSON.stringify({
+                "type": "crawlerEvent",
+                "action": 'crawl',
+                "message":{
+                    query
+                }
+            }));
+            cbws.getWebsocket.on('message', (data: string) => {
+                const response = JSON.parse(data);
+                if (response.type === "crawlResponse") {
+                    resolve(response); // Resolve the Promise with the response data
+                } 
+            });
+        });
+  
     }
 };
 

package/src/modules/websocket.ts

@@ -1,4 +1,6 @@
 import WebSocket from 'ws';
+import fs from 'fs';
+import yaml from 'js-yaml';
 
 /**
  * Class representing a WebSocket connection.
@@ -10,11 +12,23 @@ class cbws {
      * Constructs a new cbws instance and initializes the WebSocket connection.
      */
     constructor() {
-        this.websocket = new WebSocket("ws://localhost:12345/codebolt");
+        const uniqueConnectionId = this.getUniqueConnectionId();
+        console.log(uniqueConnectionId)
+        this.websocket = new WebSocket(`ws://localhost:12345/codebolt?id=${uniqueConnectionId}`);
         this.initializeWebSocket().catch(error => {
             console.error("WebSocket connection failed:", error);
         });
     }
+    private getUniqueConnectionId(): string {
+        try {
+            let fileContents = fs.readFileSync('./codebotagent.yml', 'utf8');
+            let data:any = yaml.load(fileContents);
+            return data.uniqueConnectionId;
+        } catch (e) {
+            console.error('Unable to locate codebotagent.yml file.');
+            return '';
+        }
+    }
 
     /**
      * Initializes the WebSocket by setting up event listeners and returning a promise that resolves