entityseven/rage-framework
2
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rpc integration + type fixes #3

Merged
rilaxik merged 26 commits from dev into master 2024-10-28 12:13:19 +00:00
Conversation 0 Commits 26 Files Changed 52 +19 -8
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7369ff8868 - Show all commits

2
rpc/src/events.ts
View File

@ -2,4 +2,4 @@ export const EVENT_LISTENER = '__rpc:listener'
export const EVENT_RESPONSE = '__rpc:response' export const EVENT_RESPONSE = '__rpc:response'
export const CEF_EVENT_LISTENER = '__rpc:cef_listener' export const CEF_EVENT_LISTENER = '__rpc:cef_listener'
export const CLIENT_ROUTER_LISTENER = '__rpc:clientRouter' export const CLIENT_ROUTER_EVENT = '__rpc:clientRouter'

25
rpc/src/modules/client.ts
View File

@ -1,12 +1,14 @@
import { CLIENT_ROUTER_LISTENER } from '../events' import { CLIENT_ROUTER_EVENT, EVENT_LISTENER } from '../events'
import { Wrapper } from './wrapper' import { Wrapper } from './wrapper'
import { Environment } from '../utils' import { Environment } from '../utils'
class Client extends Wrapper { class Client extends Wrapper {
private browser: any
constructor() { constructor() {
super() super()
mp.events.add(CLIENT_ROUTER_LISTENER, (data: string) => { mp.events.add(CLIENT_ROUTER_EVENT, (data: string) => {
const parsedData = this._utils.prepareForExecute(data) const parsedData = this._utils.prepareForExecute(data)
const environment = this._environment const environment = this._environment
@ -14,21 +16,28 @@ class Client extends Wrapper {
switch (parsedData.calledTo) { switch (parsedData.calledTo) {
case Environment.SERVER: case Environment.SERVER:
// route to server listener // route to server listener
this.requestToServer(data)
break break
case Environment.CEF: case Environment.CEF:
// route to cef listener this.requestToBrowser(data)
break break
} }
} }
}) })
} }
public useBrowser(browser: any) {
this.browser = browser
}
private async createCallbackListener(uuid: string) { private async createCallbackListener(uuid: string) {
const eventName = this._utils.generateResponseEventName(uuid) const eventName = this._utils.generateResponseEventName(uuid)
const handler = async (data: string) => { const handler = async (data: string) => {
mp.events.remove(eventName) mp.events.remove(eventName)
//TODO: transfer to CEF/Server
} }
mp.events.add(eventName, handler) mp.events.add(eventName, handler)
@ -38,16 +47,18 @@ class Client extends Wrapper {
private async requestToServer(data: string) { private async requestToServer(data: string) {
const { uuid } = this._utils.prepareForExecute(data) 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) { private async requestToBrowser(data: string) {
const { uuid } = this._utils.prepareForExecute(data) 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) { // private sendResponseToServer(data: RPCState) {