diff --git a/apps/cef/src/App.tsx b/apps/cef/src/App.tsx
index f6b0b54..8d962b7 100644
--- a/apps/cef/src/App.tsx
+++ b/apps/cef/src/App.tsx
@@ -5,17 +5,17 @@ function App() {
const [data, setData] = useState('')
useEffect(() => {
- fw.event.register('customCefEvent', ([test]) => {
- setData(test)
- return 'response from cef'
+ fw.event.register('customCefEvent', async ([test]) => {
+ setData(p => p + ' ' + test)
+ return 'from cef'
})
}, [])
return (
- <>
+
Hello World!
{data}
- >
+
)
}
diff --git a/apps/client/src/index.ts b/apps/client/src/index.ts
index 8c65fc2..fb0ac70 100644
--- a/apps/client/src/index.ts
+++ b/apps/client/src/index.ts
@@ -1,12 +1,14 @@
import { fw } from 'rage-fw-client'
-fw.browser.registerBrowser(mp.browsers.new('package://cef/index.html'))
+fw.player.registerBrowser(mp.browsers.new('package://cef/index.html'))
-fw.event.register('customClientEvent', async ([greetings]) => {
- fw.system.log.info(greetings)
+fw.event.register('cefReady', async () => {
+ fw.system.log.info('cefReady')
- const data = await fw.player.triggerBrowser('customCefEvent', ['str'])
- fw.system.log.info(`CEF RESPONSE: ${data}`)
+ const responseCef = await fw.player.triggerBrowser('customCefEvent', [
+ 'from client',
+ ])
+ fw.system.log.info(responseCef)
- return 'Hola from client!'
+ await fw.player.triggerServer('customServerEvent', ['from client'])
})
diff --git a/apps/server/src/index.ts b/apps/server/src/index.ts
index ef79917..63e964c 100644
--- a/apps/server/src/index.ts
+++ b/apps/server/src/index.ts
@@ -2,12 +2,17 @@ import { fw } from 'rage-fw-server'
fw.event.register('playerJoin', async ([player]) => {
fw.system.log.info(`Connected: ${player.socialClub}`)
+})
- const response = await fw.player.triggerClient(
+fw.event.register('customServerEvent', async ([player, msg]) => {
+ fw.system.log.info(player.socialClub + ' ' + msg)
+
+ const resFromCef = await fw.player.triggerBrowser(
player,
- 'customClientEvent',
- ['Hi from server!'],
+ 'customCefEvent',
+ ['from server'],
)
+ fw.system.log.info(player.socialClub + ' ' + resFromCef)
- fw.system.log.info(`Response from client: ${response}`)
+ return 'from server'
})
diff --git a/apps/shared/declarations/rage-fw-shared-types/index.d.ts b/apps/shared/declarations/rage-fw-shared-types/index.d.ts
index 09030d4..5156884 100644
--- a/apps/shared/declarations/rage-fw-shared-types/index.d.ts
+++ b/apps/shared/declarations/rage-fw-shared-types/index.d.ts
@@ -1,7 +1,5 @@
declare module 'rage-fw-shared-types' {
- export interface RageFW_ICustomClientEvent {
- customClientEvent(greetings: string): Promise
- }
+ export interface RageFW_ICustomClientEvent {}
export interface RageFW_ICustomServerEvent {
customServerEvent(greetings: string): string
diff --git a/server/conf.json b/server/conf.json
index 5ced364..1cf5028 100644
--- a/server/conf.json
+++ b/server/conf.json
@@ -1,9 +1,10 @@
{
"maxplayers" : 100,
- "name" : "RAGE FW Server powered by Entity Seven Group",
+ "name" : "RageFW Example Server. Powered by Entity Seven Group",
"gamemode" : "freeroam",
"stream-distance" : 300.0,
"announce" : false,
"csharp" : "disabled",
+ "allow-cef-debugging": true,
"port": 22005
}
\ No newline at end of file