Merge remote-tracking branch 'origin/master'

# Conflicts:
#	apps/client/package.json
#	apps/client/src/index.ts
#	apps/server/package.json
#	apps/server/src/index.ts

apps/browser/package.json

@@ -1,10 +1,10 @@
 {
-  "name": "rage-fw-example-cef",
+  "name": "rage-fw-example-browser",
   "version": "0.0.0",
   "type": "module",
   "author": "Entity Seven Group",
-  "license": "CC BY-ND",
-  "description": "CEF side of rage-fw example",
+  "license": "MIT",
+  "description": "Browser side of rage-fw-example",
   "scripts": {
     "dev": "vite",
     "build": "tsc && vite build",
@@ -12,9 +12,9 @@
     "preview": "vite preview"
   },
   "dependencies": {
+    "@entityseven/rage-fw-browser": "0.2.0",
     "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "rage-fw-cef": "latest"
+    "react-dom": "^18.2.0"
   },
   "devDependencies": {
     "@types/react": "^18.2.66",

apps/browser/src/App.tsx

@@ -0,0 +1,28 @@
+import { fw } from '@entityseven/rage-fw-browser'
+import { useEffect, useState } from 'react'
+
+function App() {
+    const [data, setData] = useState('initial')
+
+    useEffect(() => {
+        fw.event.register('customBrowserEvent', async message => {
+            setData(p => p + ' | ' + message)
+
+            const response = await fw.event.triggerServer('customServerEvent', [
+                'hello from browser',
+            ])
+            setData(p => p + ' | ' + response)
+
+            return 'response from browser'
+        })
+    }, [])
+
+    return (
+        <div style={{ width: '100%', color: 'white', textAlign: 'center' }}>
+            <h1>Hello World!</h1>
+            <h2>{data}</h2>
+        </div>
+    )
+}
+
+export default App

apps/cef/src/App.tsx

@@ -1,22 +0,0 @@
-import { fw } from 'rage-fw-cef'
-import { useEffect, useState } from 'react'
-
-function App() {
-    const [data, setData] = useState('')
-
-    useEffect(() => {
-        fw.event.register('customCefEvent', async ([test]) => {
-            setData(p => p + ' ' + test)
-            return 'from cef'
-        })
-    }, [])
-
-    return (
-        <div style={{ width: '100%', color: 'white', textAlign: 'center' }}>
-            <h1>Hello World!</h1>
-            <h2>{data}</h2>
-        </div>
-    )
-}
-
-export default App

apps/client/package.json

@@ -8,6 +8,6 @@
     "build": "esbuild src/index.ts --bundle --platform=node --outfile=../../server/client_packages/index.js --format=esm"
   },
   "dependencies": {
-    "rage-fw-client": "latest"
+    "@entityseven/rage-fw-client": "latest"
   }
 }

apps/client/src/index.ts

@@ -1,14 +1,3 @@
-import { fw } from 'rage-fw-client'
+import { fw } from '@entityseven/rage-fw-client'
 
-fw.player.browser = mp.browsers.new('package://cef/index.html')
-
-fw.event.register('cefReady', async () => {
-    fw.system.log.info('cefReady')
-
-    const responseCef = await fw.player.triggerBrowser('customCefEvent', [
-        'from client',
-    ])
-    fw.system.log.info(responseCef)
-
-    await fw.player.triggerServer('customServerEvent', ['from client'])
-})
+fw.player.browser = mp.browsers.new('https://localhost:8080')

apps/server/package.json

@@ -8,6 +8,6 @@
     "build": "esbuild src/index.ts --bundle --platform=node --target=node10.4 --outfile=../../server/packages/server/index.js"
   },
   "dependencies": {
-    "rage-fw-server": "latest"
+    "@entityseven/rage-fw-server": "latest"
   }
 }

apps/server/src/commands.ts

@@ -0,0 +1,10 @@
+mp.events.addCommand('veh', async (player, fullText) => {
+    const vehicleID = mp.joaat(fullText)
+    const vehicle = mp.vehicles.new(vehicleID, player.position, {
+        numberPlate: 'admin',
+    })
+
+    setTimeout(() => {
+        player.putIntoVehicle(vehicle, 0)
+    }, 250)
+})

apps/server/src/index.ts

@@ -1,18 +1,9 @@
-import { fw } from 'rage-fw-server'
+import { fw } from '@entityseven/rage-fw-server'
 
-fw.event.register('playerJoin', async ([player]) => {
+import './commands'
+
+fw.event.register('playerJoin', async player => {
     fw.system.log.info(`Connected: ${player.socialClub}`)
-})
 
-fw.event.register('customServerEvent', async ([player, msg]) => {
-    fw.system.log.info(player.socialClub + ' ' + msg)
-
-    const resFromCef = await fw.player.triggerBrowser(
-        player,
-        'customCefEvent',
-        ['from server'],
-    )
-    fw.system.log.info(player.socialClub + ' ' + resFromCef)
-
-    return 'from server'
+    fw.system.log.info(`Response from client: here respionse}`)
 })

apps/server/tsconfig.json

@@ -4,7 +4,7 @@
     "resolveJsonModule": true,
     "baseUrl": "./src",
     "types": [
-      "../../node_modules/@ragempcommunity/types-server",
+      "../../node_modules/@ragempcommunity/types-server/",
       "../shared/declarations/rage-fw-shared-types/"
     ]
   }

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

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

package.json

@@ -1,24 +1,24 @@
 {
   "name": "framework-example",
-  "version": "0.1.0",
-  "author": "Entity Seven Group",
-  "license": "CC BY-ND",
   "description": "This project is example of RAGE FW usage.",
+  "workspaces": ["apps/*"],
   "scripts": {
     "server:update": "cd server && rage-win64.exe",
-
     "build:client": "cd apps/client && pnpm build",
     "build:server": "cd apps/server && pnpm build",
     "build:cef": "cd apps/cef && pnpm build",
     "build:all": "pnpm build:client && pnpm build:server && pnpm build:cef"
   },
   "devDependencies": {
+    "@entityseven/rage-fw-shared-types": "0.2.0",
     "@ragempcommunity/types-client": "^2.1.8",
     "@ragempcommunity/types-server": "^2.1.8",
     "@ragempcommunity/types-cef": "^2.1.8",
-    "rage-fw-shared-types": "latest",
     "esbuild": "^0.21.5",
     "typescript": "^5.4.5",
     "prettier": "^3.3.2"
-  }
+  },
+  "author": "Entity Seven Group",
+  "license": "MIT",
+  "version": "0.1.0"
 }

pnpm-workspace.yaml

@@ -1,5 +1,5 @@
 packages:
-  - "apps/cef"
+  - "apps/browser"
   - "apps/client"
   - "apps/server"
   - "apps/shared"

tsconfig.json

@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "target": "ESNext",
-    "lib": ["ESNext", "ES2019"],
+    "lib": ["ESNext", "ES2019", "DOM"],
     "moduleResolution": "node",
     "module": "ESNext",
     "resolveJsonModule": true,