init

apps/browser/.prettierrc.yaml

@@ -5,10 +5,13 @@ jsxSingleQuote: false
 semi: false
 arrowParens: avoid
 endOfLine: auto
+plugins:
+    - prettier-plugin-svelte
 overrides:
-  - files: "*.{css,sass,scss}"
+    - files: '*.{css,sass,scss}'
       options:
           tabWidth: 2
-plugins:
+          parser: scss
-  - prettier-plugin-tailwindcss
+    - files: '*.svelte'
-parser: typescript
+      options:
+          parser: 'svelte'

apps/browser/package.json

@@ -7,8 +7,8 @@
         "check": "svelte-check --tsconfig ./tsconfig.json && tsc -p tsconfig.node.json"
     },
     "dependencies": {
-    "@rage-fw/shared": "workspace:^",
+        "@entityseven/rage-fw-browser": "0.2.0",
-    "@entityseven/rage-fw-rpc": "0.2.5"
+        "@rage-fw/shared": "workspace:^"
     },
     "devDependencies": {
         "@sveltejs/vite-plugin-svelte": "^4.0.0-next.6",
@@ -22,7 +22,7 @@
         "eslint-plugin-prettier": "^5.2.1",
         "globals": "^15.9.0",
         "prettier": "^3.3.3",
-    "prettier-plugin-svelte": "^3.2.6",
+        "prettier-plugin-svelte": "^3.3.3",
         "svelte": "5.1.3",
         "svelte-check": "^3.8.5",
         "tslib": "^2.6.3",

apps/browser/src/app.svelte

@@ -1,16 +1,20 @@
 <script lang="ts">
+    import { fw } from '@entityseven/rage-fw-browser'
+    import type { RageFW_ICustomBrowserEvent } from '@entityseven/rage-fw-shared-types'
     import { onMount } from 'svelte'
-    import { events } from '@rage-fw/shared'
-    import { rpc } from '@/lib'
 
-    let data = $state<string>('')
+    let data =
+        $state<ReturnType<RageFW_ICustomBrowserEvent['customBrowserEvent']>>()
 
     onMount(() => {
-        rpc.register(events.browser.customBrowserEvent, (args: string) => {
+        try {
-            data = data + ' | ' + args
+            fw.event.register('customBrowserEvent', async greeting => {
-            return 'response from cef'
+                data += greeting
+                return 'from cef'
             })
-        rpc.callClient(events.client.cefReady, ['hello from cef'])
+        } catch (e) {
+            console.error(e)
+        }
     })
 </script>
 

apps/browser/src/lib/index.ts

@@ -1,5 +0,0 @@
-import { Rpc } from '@entityseven/rage-fw-rpc'
-
-export const rpc = new Rpc({
-    debugLogs: true,
-})

apps/browser/tsconfig.json

@@ -21,10 +21,11 @@
         "noFallthroughCasesInSwitch": true,
         "types": [
             "../../node_modules/@ragempcommunity/types-cef",
+            "../shared/declarations/rage-fw-shared-types/"
         ],
         "paths": {
             "@": ["./src"],
-      "@/*": ["./src/*"],
+            "@/*": ["./src/*"]
         }
     },
     "include": ["src"],

apps/browser/tsconfig.node.json

@@ -3,7 +3,6 @@
         "composite": true,
         "skipLibCheck": true,
         "strict": true,
-//    "noEmit": true,
         "module": "ESNext",
         "moduleResolution": "bundler",
         "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo"

apps/client/package.json

@@ -6,7 +6,7 @@
     },
     "dependencies": {
         "@rage-fw/shared": "workspace:^",
-    "@entityseven/rage-fw-rpc": "0.2.5"
+        "@entityseven/rage-fw-client": "0.2.0"
     },
     "license": "MIT",
     "author": "Entity Seven Group",

apps/client/src/index.ts

@@ -1,22 +1,15 @@
-import { events } from '@rage-fw/shared'
+import { fw } from '@entityseven/rage-fw-client'
-import { rpc } from './lib'
 
-rpc.browser = mp.browsers.new('package://cef/index.html')
+fw.player.browser = mp.browsers.new('package://cef/index.html')
 
-rpc.register(events.client.cefReady, async (args: string) => {
+fw.event.register('cefReady', async () => {
-    mp.console.logInfo(args)
+    fw.system.log.info('cefReady')
-    const res = (await rpc.callServer(events.server.customServerEvent, [
+
-        'hello from client',
+    const responseBrowser = await fw.player.triggerBrowser(
-    ])) as string
+        'customBrowserEvent',
-    mp.console.logInfo(res)
+        ['from client'],
-    return 'response from client'
+    )
-})
+    fw.system.log.info(responseBrowser)
-
+
-rpc.register(events.client.cefReady, async (args: string) => {
+    await fw.player.triggerServer('customServerEvent', ['from client'])
-    mp.console.logInfo(args)
-    const res = (await rpc.callBrowser(events.browser.customBrowserEvent, [
-        'hello from client',
-    ])) as string
-    mp.console.logInfo(res)
-    return 'response from client'
 })

apps/client/src/lib/index.ts

@@ -1,5 +0,0 @@
-import { Rpc } from '@entityseven/rage-fw-rpc'
-
-export const rpc = new Rpc({
-    debugLogs: true,
-})

apps/server/package.json

@@ -6,7 +6,7 @@
     },
     "dependencies": {
         "@rage-fw/shared": "workspace:^",
-    "@entityseven/rage-fw-rpc": "0.2.5"
+        "@entityseven/rage-fw-server": "0.2.0"
     },
     "license": "MIT",
     "author": "Entity Seven Group",

apps/server/src/index.ts

@@ -1,20 +1,18 @@
-import { events } from '@rage-fw/shared'
+import { fw } from '@entityseven/rage-fw-server'
-import { rpc } from './lib'
 
-rpc.register('playerJoin', async (player: PlayerMp) => {
+fw.event.register('playerJoin', async player => {
-    console.log(`[Server] ${player.socialClub} connected`)
+    fw.system.log.info(`Connected: ${player.socialClub}`)
 })
 
-rpc.register(
+fw.event.register('customServerEvent', async (player, greeting) => {
-    events.server.customServerEvent,
+    fw.system.log.info(player.socialClub + ' ' + greeting)
-    async (player: PlayerMp, args: string) => {
+
-        console.log(args)
+    const resFromBrowser = await fw.player.triggerBrowser(
-        const res = await rpc.callClient(
         player,
-            events.client.customClientEvent,
+        'customBrowserEvent',
-            ['hello from server'],
+        ['from server'],
-        )
-        console.log(res)
-        return 'response from server'
-    },
     )
+    fw.system.log.info(player.socialClub + ' ' + resFromBrowser)
+
+    return 'from server'
+})

apps/server/src/lib/index.ts

@@ -1,5 +0,0 @@
-import { Rpc } from '@entityseven/rage-fw-rpc'
-
-export const rpc = new Rpc({
-    debugLogs: true,
-})

apps/shared/declarations/rage-fw-shared-types/index.d.ts

@@ -0,0 +1,11 @@
+declare module '@entityseven/rage-fw-shared-types' {
+    export interface RageFW_ICustomClientEvent {}
+
+    export interface RageFW_ICustomServerEvent {
+        customServerEvent(greetings: string): string
+    }
+
+    export interface RageFW_ICustomBrowserEvent {
+        customBrowserEvent(greetings: string): string
+    }
+}

apps/shared/index.ts

@@ -1,12 +0,0 @@
-export const events = {
-    server: {
-        customServerEvent: 'customServerEvent',
-    },
-    client: {
-        cefReady: 'cefReady',
-        customClientEvent: 'customClientEvent',
-    },
-    browser: {
-        customBrowserEvent: 'customBrowserEvent',
-    },
-}

package.json

@@ -18,6 +18,7 @@
     "@ragempcommunity/types-client": "^2.1.8",
     "@ragempcommunity/types-server": "^2.1.8",
     "@ragempcommunity/types-cef": "^2.1.8",
+    "@entityseven/rage-fw-shared-types": "0.2.0",
     "esbuild": "^0.21.5",
     "typescript": "^5.4.5",
     "prettier": "^3.3.2"