From 7369ff8868114f041b8cff58f44d82af3499fa75 Mon Sep 17 00:00:00 2001
From: Oleksandr Honcharov <0976053529@ukr.net>
Date: Wed, 2 Oct 2024 21:44:51 +0300
Subject: [PATCH] lol

---
 rpc/src/events.ts         |  2 +-
 rpc/src/modules/client.ts | 25 ++++++++++++++++++-------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/rpc/src/events.ts b/rpc/src/events.ts
index b3df93f..d6fcef9 100644
--- a/rpc/src/events.ts
+++ b/rpc/src/events.ts
@@ -2,4 +2,4 @@ export const EVENT_LISTENER = '__rpc:listener'
 export const EVENT_RESPONSE = '__rpc:response'
 export const CEF_EVENT_LISTENER = '__rpc:cef_listener'
 
-export const CLIENT_ROUTER_LISTENER = '__rpc:clientRouter'
+export const CLIENT_ROUTER_EVENT = '__rpc:clientRouter'
diff --git a/rpc/src/modules/client.ts b/rpc/src/modules/client.ts
index 02b6c04..d5e042f 100644
--- a/rpc/src/modules/client.ts
+++ b/rpc/src/modules/client.ts
@@ -1,12 +1,14 @@
-import { CLIENT_ROUTER_LISTENER } from '../events'
+import { CLIENT_ROUTER_EVENT, EVENT_LISTENER } from '../events'
 import { Wrapper } from './wrapper'
 import { Environment } from '../utils'
 
 class Client extends Wrapper {
+    private browser: any
+
     constructor() {
         super()
 
-        mp.events.add(CLIENT_ROUTER_LISTENER, (data: string) => {
+        mp.events.add(CLIENT_ROUTER_EVENT, (data: string) => {
             const parsedData = this._utils.prepareForExecute(data)
             const environment = this._environment
 
@@ -14,21 +16,28 @@ class Client extends Wrapper {
                 switch (parsedData.calledTo) {
                     case Environment.SERVER:
                         // route to server listener
+                        this.requestToServer(data)
                         break
 
                     case Environment.CEF:
-                        // route to cef listener
+                        this.requestToBrowser(data)
                         break
                 }
             }
         })
     }
 
+    public useBrowser(browser: any) {
+        this.browser = browser
+    }
+
     private async createCallbackListener(uuid: string) {
         const eventName = this._utils.generateResponseEventName(uuid)
 
         const handler = async (data: string) => {
             mp.events.remove(eventName)
+
+            //TODO: transfer to CEF/Server
         }
 
         mp.events.add(eventName, handler)
@@ -38,16 +47,18 @@ class Client extends Wrapper {
 
     private async requestToServer(data: string) {
         const { uuid } = this._utils.prepareForExecute(data)
-        const callbackEventName = await this.createCallbackListener(uuid)
+        await this.createCallbackListener(uuid)
 
-        mp.events.callRemote(callbackEventName, data)
+        mp.events.callRemote(EVENT_LISTENER, data)
     }
 
     private async requestToBrowser(data: string) {
         const { uuid } = this._utils.prepareForExecute(data)
-        const callbackEventName = await this.createCallbackListener(uuid)
+        await this.createCallbackListener(uuid)
 
-        mp.browsers.at(0).call()
+        if (!this.browser) return //TODO: Error browser not initialized
+
+        this.browser.call(EVENT_LISTENER, data)
     }
 
     // private sendResponseToServer(data: RPCState) {