Compare commits
12
Commits
84994ef121
..
dev
| Author | SHA1 | Date | |
|---|---|---|---|
 rilaxik
|
12d2197e18 | ||
|
rilaxik
|
897fd5a9f5 | ||
|
rilaxik
|
d5dc6924aa | ||
|
rilaxik
|
78d1831bbc | ||
|
rilaxik
|
a820e9896b | ||
|
rilaxik
|
edafb5289e | ||
|
rilaxik
|
7a37aa390e | ||
|
rilaxik
|
e29dc20398 | ||
|
rilaxik
|
82050004f6 | ||
|
rilaxik
|
179d7b8b93 | ||
|
rilaxik
|
978d15bd25 | ||
|
rilaxik
|
4e48772950 |
@@ -0,0 +1,8 @@
|
||||
# Changesets
|
||||
|
||||
Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works
|
||||
with multi-package repos, or single-package repos to help you version and publish your code. You can
|
||||
find the full documentation for it [in our repository](https://github.com/changesets/changesets)
|
||||
|
||||
We have a quick list of common questions to get you started engaging with this project in
|
||||
[our documentation](https://github.com/changesets/changesets/blob/main/docs/common-questions.md)
|
||||
@@ -0,0 +1,13 @@
|
||||
{
|
||||
"$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
|
||||
"changelog": "@changesets/cli/changelog",
|
||||
"commit": false,
|
||||
"fixed": [
|
||||
["@entityseven/rage-fw-browser","@entityseven/rage-fw-client","@entityseven/rage-fw-server"]
|
||||
],
|
||||
"linked": [],
|
||||
"access": "public",
|
||||
"baseBranch": "master",
|
||||
"updateInternalDependencies": "patch",
|
||||
"ignore": []
|
||||
}
|
||||
@@ -1,31 +0,0 @@
|
||||
env:
|
||||
node: true
|
||||
es6: true
|
||||
es2019: true
|
||||
extends:
|
||||
- 'eslint:recommended'
|
||||
- 'plugin:@typescript-eslint/recommended'
|
||||
# - 'prettier'
|
||||
parser: '@typescript-eslint/parser'
|
||||
parserOptions:
|
||||
ecmaVersion: '2019'
|
||||
sourceType: 'script'
|
||||
plugins:
|
||||
- '@typescript-eslint'
|
||||
ignorePatterns:
|
||||
- 'node_modules'
|
||||
rules: {
|
||||
'@typescript-eslint/no-explicit-any': 'off',
|
||||
'@typescript-eslint/no-unused-vars': [
|
||||
'warn',
|
||||
{
|
||||
"argsIgnorePattern": '^_',
|
||||
"varsIgnorePattern": '^_',
|
||||
"caughtErrorsIgnorePattern": '^_'
|
||||
}
|
||||
],
|
||||
'@typescript-eslint/ban-ts-comment': 'off',
|
||||
'@typescript-eslint/ban-types': 'off',
|
||||
'consistent-return': 'warn',
|
||||
'no-empty': 'off',
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,330 +0,0 @@
|
||||
[NX Daemon Server] - 2025-01-28T20:41:46.142Z - Started listening on: \\.\pipe\nx\C:\Users\admin\AppData\Local\Temp\6a0f073bacbc0964d84e\d.sock
|
||||
[NX Daemon Server] - 2025-01-28T20:41:46.146Z - [WATCHER]: Subscribed to changes within: D:\hub\rage-framework (native)
|
||||
[NX Daemon Server] - 2025-01-28T20:41:46.153Z - Established a connection. Number of open connections: 1
|
||||
[NX Daemon Server] - 2025-01-28T20:41:46.156Z - Closed a connection. Number of open connections: 0
|
||||
[NX Daemon Server] - 2025-01-28T20:41:46.156Z - Established a connection. Number of open connections: 1
|
||||
[NX Daemon Server] - 2025-01-28T20:41:46.158Z - [REQUEST]: Client Request for Project Graph Received
|
||||
[NX Daemon Server] - 2025-01-28T20:41:46.183Z - Time taken for 'loadSpecifiedNxPlugins' 2.68850000000009ms
|
||||
[NX Daemon Server] - 2025-01-28T20:41:46.705Z - Time taken for 'Load Nx Plugin: D:\hub\rage-framework\node_modules\.pnpm\[email protected]\node_modules\nx\src\plugins\package-json' 543.9495999999999ms
|
||||
[NX Daemon Server] - 2025-01-28T20:41:46.706Z - Time taken for 'Load Nx Plugin: D:\hub\rage-framework\node_modules\.pnpm\[email protected]\node_modules\nx\src\plugins\project-json\build-nodes\project-json' 544.9321000000001ms
|
||||
[NX Daemon Server] - 2025-01-28T20:41:47.044Z - [REQUEST]: Updated workspace context based on watched changes, recomputing project graph...
|
||||
[NX Daemon Server] - 2025-01-28T20:41:47.044Z - [REQUEST]:
|
||||
[NX Daemon Server] - 2025-01-28T20:41:47.044Z - [REQUEST]:
|
||||
[NX Daemon Server] - 2025-01-28T20:41:47.052Z - Time taken for 'loadDefaultNxPlugins' 884.6633999999999ms
|
||||
[NX Daemon Server] - 2025-01-28T20:41:47.553Z - Time taken for 'build-project-configs' 487.7887999999998ms
|
||||
[NX Daemon Server] - 2025-01-28T20:41:47.594Z - [SYNC]: collect registered sync generators
|
||||
[NX Daemon Server] - 2025-01-28T20:41:47.595Z - [REQUEST]: Responding to the client. project-graph
|
||||
[NX Daemon Server] - 2025-01-28T20:41:47.596Z - Time taken for 'total for creating and serializing project graph' 1437.3822999999998ms
|
||||
[NX Daemon Server] - 2025-01-28T20:41:47.597Z - Done responding to the client project-graph
|
||||
[NX Daemon Server] - 2025-01-28T20:41:47.597Z - Handled REQUEST_PROJECT_GRAPH. Handling time: 1437. Response time: 2.
|
||||
[NX Daemon Server] - 2025-01-28T20:41:47.604Z - [REQUEST]: Responding to the client. handleContextFileData
|
||||
[NX Daemon Server] - 2025-01-28T20:41:47.605Z - Done responding to the client handleContextFileData
|
||||
[NX Daemon Server] - 2025-01-28T20:41:47.605Z - Handled GET_CONTEXT_FILE_DATA. Handling time: 0. Response time: 1.
|
||||
[NX Daemon Server] - 2025-01-28T20:41:47.630Z - [REQUEST]: Client Request for Project Graph Received
|
||||
[NX Daemon Server] - 2025-01-28T20:41:47.631Z - [REQUEST]: Responding to the client. project-graph
|
||||
[NX Daemon Server] - 2025-01-28T20:41:47.631Z - Time taken for 'total for creating and serializing project graph' 0.45870000000013533ms
|
||||
[NX Daemon Server] - 2025-01-28T20:41:47.632Z - Done responding to the client project-graph
|
||||
[NX Daemon Server] - 2025-01-28T20:41:47.632Z - Handled REQUEST_PROJECT_GRAPH. Handling time: 1. Response time: 1.
|
||||
[NX Daemon Server] - 2025-01-28T20:41:47.639Z - [REQUEST]: Responding to the client. handleRunPreTasksExecution
|
||||
[NX Daemon Server] - 2025-01-28T20:41:47.639Z - Time taken for 'preTasksExecution' 1.3951999999999316ms
|
||||
[NX Daemon Server] - 2025-01-28T20:41:47.639Z - Done responding to the client handleRunPreTasksExecution
|
||||
[NX Daemon Server] - 2025-01-28T20:41:47.639Z - Handled PRE_TASKS_EXECUTION. Handling time: 2. Response time: 0.
|
||||
[NX Daemon Server] - 2025-01-28T20:41:47.900Z - [REQUEST]: Responding to the client. handleHashTasks
|
||||
[NX Daemon Server] - 2025-01-28T20:41:47.902Z - Done responding to the client handleHashTasks
|
||||
[NX Daemon Server] - 2025-01-28T20:41:47.902Z - Handled HASH_TASKS. Handling time: 9. Response time: 2.
|
||||
[NX Daemon Server] - 2025-01-28T20:41:47.938Z - [REQUEST]: Responding to the client. handleGetEstimatedTaskTimings
|
||||
[NX Daemon Server] - 2025-01-28T20:41:47.938Z - Done responding to the client handleGetEstimatedTaskTimings
|
||||
[NX Daemon Server] - 2025-01-28T20:41:47.939Z - Handled GET_ESTIMATED_TASK_TIMINGS. Handling time: 15. Response time: 1.
|
||||
[NX Daemon Server] - 2025-01-28T20:41:52.844Z - [WATCHER]: 0 file(s) created or restored, 0 file(s) modified, 4 file(s) deleted
|
||||
[NX Daemon Server] - 2025-01-28T20:41:52.845Z - [WATCHER]: Processing file changes in outputs
|
||||
[NX Daemon Server] - 2025-01-28T20:41:52.971Z - [REQUEST]: Updated workspace context based on watched changes, recomputing project graph...
|
||||
[NX Daemon Server] - 2025-01-28T20:41:52.971Z - [REQUEST]:
|
||||
[NX Daemon Server] - 2025-01-28T20:41:52.971Z - [REQUEST]: rpc/tsup.config.bundled_8odzncbcd9b.mjs,browser/tsup.config.bundled_bs51xsnk3ks.mjs,client/tsup.config.bundled_gnglxh2rl3n.mjs,server/tsup.config.bundled_8l7kz62kjtj.mjs
|
||||
[NX Daemon Server] - 2025-01-28T20:41:52.979Z - Time taken for 'hash changed files from watcher' 0.2857000000003609ms
|
||||
[NX Daemon Server] - 2025-01-28T20:41:52.996Z - Time taken for 'build-project-configs' 14.298400000000584ms
|
||||
[NX Daemon Server] - 2025-01-28T20:41:53.024Z - [SYNC]: collect registered sync generators
|
||||
[NX Daemon Server] - 2025-01-28T20:41:53.026Z - [SYNC]: project graph hash is the same, not collecting task sync generators
|
||||
[NX Daemon Server] - 2025-01-28T20:41:53.026Z - [SYNC]: nx.json hash is the same, not collecting global sync generators
|
||||
[NX Daemon Server] - 2025-01-28T20:41:53.026Z - Time taken for 'total execution time for createProjectGraph()' 23.09150000000045ms
|
||||
[NX Daemon Server] - 2025-01-28T20:41:55.708Z - [WATCHER]: Processing file changes in outputs
|
||||
[NX Daemon Server] - 2025-01-28T20:41:55.818Z - [WATCHER]: Processing file changes in outputs
|
||||
[NX Daemon Server] - 2025-01-28T20:41:55.876Z - [WATCHER]: Processing file changes in outputs
|
||||
[NX Daemon Server] - 2025-01-28T20:41:55.943Z - [WATCHER]: Processing file changes in outputs
|
||||
[NX Daemon Server] - 2025-01-28T20:41:56.009Z - [WATCHER]: Processing file changes in outputs
|
||||
[NX Daemon Server] - 2025-01-28T20:41:56.061Z - [WATCHER]: Processing file changes in outputs
|
||||
[NX Daemon Server] - 2025-01-28T20:41:56.112Z - [WATCHER]: Processing file changes in outputs
|
||||
[NX Daemon Server] - 2025-01-28T20:41:56.182Z - [WATCHER]: Processing file changes in outputs
|
||||
[NX Daemon Server] - 2025-01-28T20:42:07.338Z - [WATCHER]: Processing file changes in outputs
|
||||
[NX Daemon Server] - 2025-01-28T20:42:07.475Z - [WATCHER]: Processing file changes in outputs
|
||||
[NX Daemon Server] - 2025-01-28T20:42:07.533Z - [REQUEST]: Responding to the client. recordOutputsHash
|
||||
[NX Daemon Server] - 2025-01-28T20:42:07.535Z - Done responding to the client recordOutputsHash
|
||||
[NX Daemon Server] - 2025-01-28T20:42:07.535Z - Handled RECORD_OUTPUTS_HASH. Handling time: 2. Response time: 2.
|
||||
[NX Daemon Server] - 2025-01-28T20:42:08.005Z - [WATCHER]: Processing file changes in outputs
|
||||
[NX Daemon Server] - 2025-01-28T20:42:08.077Z - [WATCHER]: Processing file changes in outputs
|
||||
[NX Daemon Server] - 2025-01-28T20:42:08.103Z - [REQUEST]: Responding to the client. recordOutputsHash
|
||||
[NX Daemon Server] - 2025-01-28T20:42:08.104Z - Done responding to the client recordOutputsHash
|
||||
[NX Daemon Server] - 2025-01-28T20:42:08.104Z - Handled RECORD_OUTPUTS_HASH. Handling time: 0. Response time: 1.
|
||||
[NX Daemon Server] - 2025-01-28T20:42:08.162Z - [REQUEST]: Responding to the client. recordOutputsHash
|
||||
[NX Daemon Server] - 2025-01-28T20:42:08.162Z - Done responding to the client recordOutputsHash
|
||||
[NX Daemon Server] - 2025-01-28T20:42:08.163Z - Handled RECORD_OUTPUTS_HASH. Handling time: 0. Response time: 1.
|
||||
[NX Daemon Server] - 2025-01-28T20:42:08.256Z - [WATCHER]: Processing file changes in outputs
|
||||
[NX Daemon Server] - 2025-01-28T20:42:08.313Z - [WATCHER]: Processing file changes in outputs
|
||||
[NX Daemon Server] - 2025-01-28T20:42:08.325Z - [REQUEST]: Responding to the client. recordOutputsHash
|
||||
[NX Daemon Server] - 2025-01-28T20:42:08.325Z - Done responding to the client recordOutputsHash
|
||||
[NX Daemon Server] - 2025-01-28T20:42:08.325Z - Handled RECORD_OUTPUTS_HASH. Handling time: 0. Response time: 0.
|
||||
[NX Daemon Server] - 2025-01-28T20:42:08.402Z - [REQUEST]: Responding to the client. handleRecordTaskRuns
|
||||
[NX Daemon Server] - 2025-01-28T20:42:08.403Z - Done responding to the client handleRecordTaskRuns
|
||||
[NX Daemon Server] - 2025-01-28T20:42:08.403Z - Handled RECORD_TASK_RUNS. Handling time: 65. Response time: 1.
|
||||
[NX Daemon Server] - 2025-01-28T20:42:08.405Z - [REQUEST]: Responding to the client. handleGetFlakyTasks
|
||||
[NX Daemon Server] - 2025-01-28T20:42:08.406Z - Done responding to the client handleGetFlakyTasks
|
||||
[NX Daemon Server] - 2025-01-28T20:42:08.406Z - Handled GET_FLAKY_TASKS. Handling time: 1. Response time: 1.
|
||||
[NX Daemon Server] - 2025-01-28T20:42:08.746Z - [REQUEST]: Responding to the client. handleRunPostTasksExecution
|
||||
[NX Daemon Server] - 2025-01-28T20:42:08.746Z - Time taken for 'postTasksExecution' 0.3852000000006228ms
|
||||
[NX Daemon Server] - 2025-01-28T20:42:08.747Z - Done responding to the client handleRunPostTasksExecution
|
||||
[NX Daemon Server] - 2025-01-28T20:42:08.747Z - Handled POST_TASKS_EXECUTION. Handling time: 0. Response time: 1.
|
||||
[NX Daemon Server] - 2025-01-28T20:42:08.756Z - Closed a connection. Number of open connections: 0
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.174Z - Established a connection. Number of open connections: 1
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.174Z - Closed a connection. Number of open connections: 0
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.175Z - Established a connection. Number of open connections: 1
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.176Z - [REQUEST]: Client Request for Project Graph Received
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.177Z - [REQUEST]: Responding to the client. project-graph
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.177Z - Time taken for 'total for creating and serializing project graph' 0.49299999999493593ms
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.178Z - Done responding to the client project-graph
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.178Z - Handled REQUEST_PROJECT_GRAPH. Handling time: 1. Response time: 1.
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.183Z - [REQUEST]: Responding to the client. handleContextFileData
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.183Z - Done responding to the client handleContextFileData
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.183Z - Handled GET_CONTEXT_FILE_DATA. Handling time: 0. Response time: 1.
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.209Z - [REQUEST]: Client Request for Project Graph Received
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.210Z - [REQUEST]: Responding to the client. project-graph
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.210Z - Time taken for 'total for creating and serializing project graph' 0.4357000000018161ms
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.211Z - Done responding to the client project-graph
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.211Z - Handled REQUEST_PROJECT_GRAPH. Handling time: 1. Response time: 1.
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.215Z - [REQUEST]: Responding to the client. handleRunPreTasksExecution
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.215Z - Time taken for 'preTasksExecution' 0.29950000000098953ms
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.215Z - Done responding to the client handleRunPreTasksExecution
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.215Z - Handled PRE_TASKS_EXECUTION. Handling time: 0. Response time: 0.
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.247Z - [REQUEST]: Responding to the client. handleHashTasks
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.248Z - Done responding to the client handleHashTasks
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.248Z - Handled HASH_TASKS. Handling time: 9. Response time: 1.
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.294Z - [REQUEST]: Responding to the client. handleGetEstimatedTaskTimings
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.295Z - Done responding to the client handleGetEstimatedTaskTimings
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.295Z - Handled GET_ESTIMATED_TASK_TIMINGS. Handling time: 0. Response time: 1.
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.398Z - [REQUEST]: Responding to the client. outputsHashesMatch
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.398Z - Done responding to the client outputsHashesMatch
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.398Z - Handled OUTPUTS_HASHES_MATCH. Handling time: 1. Response time: 0.
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.399Z - [REQUEST]: Responding to the client. outputsHashesMatch
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.400Z - Done responding to the client outputsHashesMatch
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.400Z - Handled OUTPUTS_HASHES_MATCH. Handling time: 0. Response time: 1.
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.401Z - [REQUEST]: Responding to the client. outputsHashesMatch
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.402Z - Done responding to the client outputsHashesMatch
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.402Z - Handled OUTPUTS_HASHES_MATCH. Handling time: 0. Response time: 1.
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.403Z - [REQUEST]: Responding to the client. outputsHashesMatch
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.404Z - Done responding to the client outputsHashesMatch
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.404Z - Handled OUTPUTS_HASHES_MATCH. Handling time: 0. Response time: 1.
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.409Z - [REQUEST]: Responding to the client. recordOutputsHash
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.409Z - Done responding to the client recordOutputsHash
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.409Z - Handled RECORD_OUTPUTS_HASH. Handling time: 1. Response time: 0.
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.415Z - [REQUEST]: Responding to the client. recordOutputsHash
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.415Z - Done responding to the client recordOutputsHash
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.415Z - Handled RECORD_OUTPUTS_HASH. Handling time: 1. Response time: 0.
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.419Z - [REQUEST]: Responding to the client. recordOutputsHash
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.419Z - Done responding to the client recordOutputsHash
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.419Z - Handled RECORD_OUTPUTS_HASH. Handling time: 0. Response time: 0.
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.424Z - [REQUEST]: Responding to the client. recordOutputsHash
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.424Z - Done responding to the client recordOutputsHash
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.424Z - Handled RECORD_OUTPUTS_HASH. Handling time: 1. Response time: 0.
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.458Z - [REQUEST]: Responding to the client. handleRecordTaskRuns
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.458Z - Done responding to the client handleRecordTaskRuns
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.458Z - Handled RECORD_TASK_RUNS. Handling time: 26. Response time: 0.
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.460Z - [REQUEST]: Responding to the client. handleGetFlakyTasks
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.460Z - Done responding to the client handleGetFlakyTasks
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.461Z - Handled GET_FLAKY_TASKS. Handling time: 1. Response time: 1.
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.778Z - [REQUEST]: Responding to the client. handleRunPostTasksExecution
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.778Z - Time taken for 'postTasksExecution' 0.3403000000034808ms
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.778Z - Done responding to the client handleRunPostTasksExecution
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.778Z - Handled POST_TASKS_EXECUTION. Handling time: 0. Response time: 0.
|
||||
[NX Daemon Server] - 2025-01-28T20:42:31.782Z - Closed a connection. Number of open connections: 0
|
||||
[NX Daemon Server] - 2025-01-28T20:42:36.676Z - [WATCHER]: Processing file changes in outputs
|
||||
[NX Daemon Server] - 2025-01-28T20:43:59.375Z - [WATCHER]: Processing file changes in outputs
|
||||
[NX Daemon Server] - 2025-01-28T20:44:24.208Z - Established a connection. Number of open connections: 1
|
||||
[NX Daemon Server] - 2025-01-28T20:44:24.208Z - Closed a connection. Number of open connections: 0
|
||||
[NX Daemon Server] - 2025-01-28T20:44:24.209Z - Established a connection. Number of open connections: 1
|
||||
[NX Daemon Server] - 2025-01-28T20:44:24.211Z - [REQUEST]: Client Request for Project Graph Received
|
||||
[NX Daemon Server] - 2025-01-28T20:44:24.211Z - [REQUEST]: Responding to the client. project-graph
|
||||
[NX Daemon Server] - 2025-01-28T20:44:24.212Z - Time taken for 'total for creating and serializing project graph' 0.478899999987334ms
|
||||
[NX Daemon Server] - 2025-01-28T20:44:24.212Z - Done responding to the client project-graph
|
||||
[NX Daemon Server] - 2025-01-28T20:44:24.212Z - Handled REQUEST_PROJECT_GRAPH. Handling time: 0. Response time: 1.
|
||||
[NX Daemon Server] - 2025-01-28T20:44:24.217Z - [REQUEST]: Responding to the client. handleContextFileData
|
||||
[NX Daemon Server] - 2025-01-28T20:44:24.217Z - Done responding to the client handleContextFileData
|
||||
[NX Daemon Server] - 2025-01-28T20:44:24.217Z - Handled GET_CONTEXT_FILE_DATA. Handling time: 0. Response time: 0.
|
||||
[NX Daemon Server] - 2025-01-28T20:44:24.245Z - Closed a connection. Number of open connections: 0
|
||||
[NX Daemon Server] - 2025-01-28T20:44:49.231Z - [WATCHER]: package.json was modified
|
||||
[NX Daemon Server] - 2025-01-28T20:44:49.232Z - [WATCHER]: Processing file changes in outputs
|
||||
[NX Daemon Server] - 2025-01-28T20:44:49.337Z - [REQUEST]: Updated workspace context based on watched changes, recomputing project graph...
|
||||
[NX Daemon Server] - 2025-01-28T20:44:49.337Z - [REQUEST]: package.json
|
||||
[NX Daemon Server] - 2025-01-28T20:44:49.337Z - [REQUEST]:
|
||||
[NX Daemon Server] - 2025-01-28T20:44:49.340Z - Time taken for 'hash changed files from watcher' 0.2194000000017695ms
|
||||
[NX Daemon Server] - 2025-01-28T20:44:49.351Z - Time taken for 'build-project-configs' 9.470000000001164ms
|
||||
[NX Daemon Server] - 2025-01-28T20:44:49.369Z - [SYNC]: collect registered sync generators
|
||||
[NX Daemon Server] - 2025-01-28T20:44:49.370Z - [SYNC]: project graph hash is the same, not collecting task sync generators
|
||||
[NX Daemon Server] - 2025-01-28T20:44:49.370Z - [SYNC]: nx.json hash is the same, not collecting global sync generators
|
||||
[NX Daemon Server] - 2025-01-28T20:44:49.370Z - Time taken for 'total execution time for createProjectGraph()' 13.973300000012387ms
|
||||
[NX Daemon Server] - 2025-01-28T20:45:02.860Z - [WATCHER]: package.json was modified
|
||||
[NX Daemon Server] - 2025-01-28T20:45:02.860Z - [WATCHER]: Processing file changes in outputs
|
||||
[NX Daemon Server] - 2025-01-28T20:45:03.062Z - [REQUEST]: Updated workspace context based on watched changes, recomputing project graph...
|
||||
[NX Daemon Server] - 2025-01-28T20:45:03.062Z - [REQUEST]: package.json
|
||||
[NX Daemon Server] - 2025-01-28T20:45:03.062Z - [REQUEST]:
|
||||
[NX Daemon Server] - 2025-01-28T20:45:03.064Z - Time taken for 'hash changed files from watcher' 0.18880000000353903ms
|
||||
[NX Daemon Server] - 2025-01-28T20:45:03.076Z - Time taken for 'build-project-configs' 10.329300000012154ms
|
||||
[NX Daemon Server] - 2025-01-28T20:45:03.092Z - [SYNC]: collect registered sync generators
|
||||
[NX Daemon Server] - 2025-01-28T20:45:03.093Z - [SYNC]: project graph hash is the same, not collecting task sync generators
|
||||
[NX Daemon Server] - 2025-01-28T20:45:03.093Z - [SYNC]: nx.json hash is the same, not collecting global sync generators
|
||||
[NX Daemon Server] - 2025-01-28T20:45:03.093Z - Time taken for 'total execution time for createProjectGraph()' 12.222299999993993ms
|
||||
[NX Daemon Server] - 2025-01-28T20:45:12.857Z - Established a connection. Number of open connections: 1
|
||||
[NX Daemon Server] - 2025-01-28T20:45:12.858Z - Closed a connection. Number of open connections: 0
|
||||
[NX Daemon Server] - 2025-01-28T20:45:12.858Z - Established a connection. Number of open connections: 1
|
||||
[NX Daemon Server] - 2025-01-28T20:45:12.860Z - [REQUEST]: Client Request for Project Graph Received
|
||||
[NX Daemon Server] - 2025-01-28T20:45:12.860Z - [REQUEST]: Responding to the client. project-graph
|
||||
[NX Daemon Server] - 2025-01-28T20:45:12.861Z - Time taken for 'total for creating and serializing project graph' 0.43260000000009313ms
|
||||
[NX Daemon Server] - 2025-01-28T20:45:12.861Z - Done responding to the client project-graph
|
||||
[NX Daemon Server] - 2025-01-28T20:45:12.861Z - Handled REQUEST_PROJECT_GRAPH. Handling time: 0. Response time: 1.
|
||||
[NX Daemon Server] - 2025-01-28T20:45:12.868Z - [REQUEST]: Responding to the client. handleContextFileData
|
||||
[NX Daemon Server] - 2025-01-28T20:45:12.869Z - Done responding to the client handleContextFileData
|
||||
[NX Daemon Server] - 2025-01-28T20:45:12.869Z - Handled GET_CONTEXT_FILE_DATA. Handling time: 0. Response time: 1.
|
||||
[NX Daemon Server] - 2025-01-28T20:45:13.066Z - Closed a connection. Number of open connections: 0
|
||||
[NX Daemon Server] - 2025-01-28T20:45:16.230Z - Established a connection. Number of open connections: 1
|
||||
[NX Daemon Server] - 2025-01-28T20:45:16.231Z - Closed a connection. Number of open connections: 0
|
||||
[NX Daemon Server] - 2025-01-28T20:45:16.231Z - Established a connection. Number of open connections: 1
|
||||
[NX Daemon Server] - 2025-01-28T20:45:16.235Z - [REQUEST]: Client Request for Project Graph Received
|
||||
[NX Daemon Server] - 2025-01-28T20:45:16.236Z - [REQUEST]: Responding to the client. project-graph
|
||||
[NX Daemon Server] - 2025-01-28T20:45:16.236Z - Time taken for 'total for creating and serializing project graph' 0.8950000000186265ms
|
||||
[NX Daemon Server] - 2025-01-28T20:45:16.237Z - Done responding to the client project-graph
|
||||
[NX Daemon Server] - 2025-01-28T20:45:16.237Z - Handled REQUEST_PROJECT_GRAPH. Handling time: 1. Response time: 1.
|
||||
[NX Daemon Server] - 2025-01-28T20:45:16.242Z - [REQUEST]: Responding to the client. handleContextFileData
|
||||
[NX Daemon Server] - 2025-01-28T20:45:16.242Z - Done responding to the client handleContextFileData
|
||||
[NX Daemon Server] - 2025-01-28T20:45:16.242Z - Handled GET_CONTEXT_FILE_DATA. Handling time: 1. Response time: 0.
|
||||
[NX Daemon Server] - 2025-01-28T20:45:16.274Z - Closed a connection. Number of open connections: 0
|
||||
[NX Daemon Server] - 2025-01-28T20:45:37.404Z - [WATCHER]: Processing file changes in outputs
|
||||
[NX Daemon Server] - 2025-01-28T20:49:56.788Z - [WATCHER]: Processing file changes in outputs
|
||||
[NX Daemon Server] - 2025-01-28T20:50:49.577Z - [WATCHER]: package.json was modified
|
||||
[NX Daemon Server] - 2025-01-28T20:50:49.577Z - [WATCHER]: Processing file changes in outputs
|
||||
[NX Daemon Server] - 2025-01-28T20:50:49.685Z - [REQUEST]: Updated workspace context based on watched changes, recomputing project graph...
|
||||
[NX Daemon Server] - 2025-01-28T20:50:49.685Z - [REQUEST]: package.json
|
||||
[NX Daemon Server] - 2025-01-28T20:50:49.685Z - [REQUEST]:
|
||||
[NX Daemon Server] - 2025-01-28T20:50:49.689Z - Time taken for 'hash changed files from watcher' 0.24730000004637986ms
|
||||
[NX Daemon Server] - 2025-01-28T20:50:49.707Z - Time taken for 'build-project-configs' 12.489500000025146ms
|
||||
[NX Daemon Server] - 2025-01-28T20:50:49.727Z - [SYNC]: collect registered sync generators
|
||||
[NX Daemon Server] - 2025-01-28T20:50:49.728Z - [SYNC]: project graph hash is the same, not collecting task sync generators
|
||||
[NX Daemon Server] - 2025-01-28T20:50:49.728Z - [SYNC]: nx.json hash is the same, not collecting global sync generators
|
||||
[NX Daemon Server] - 2025-01-28T20:50:49.728Z - Time taken for 'total execution time for createProjectGraph()' 20.910800000070594ms
|
||||
[NX Daemon Server] - 2025-01-28T20:50:52.572Z - Established a connection. Number of open connections: 1
|
||||
[NX Daemon Server] - 2025-01-28T20:50:52.573Z - Closed a connection. Number of open connections: 0
|
||||
[NX Daemon Server] - 2025-01-28T20:50:52.574Z - Established a connection. Number of open connections: 1
|
||||
[NX Daemon Server] - 2025-01-28T20:50:52.579Z - [REQUEST]: Client Request for Project Graph Received
|
||||
[NX Daemon Server] - 2025-01-28T20:50:52.580Z - [REQUEST]: Responding to the client. project-graph
|
||||
[NX Daemon Server] - 2025-01-28T20:50:52.580Z - Time taken for 'total for creating and serializing project graph' 0.5017999999690801ms
|
||||
[NX Daemon Server] - 2025-01-28T20:50:52.581Z - Done responding to the client project-graph
|
||||
[NX Daemon Server] - 2025-01-28T20:50:52.581Z - Handled REQUEST_PROJECT_GRAPH. Handling time: 1. Response time: 1.
|
||||
[NX Daemon Server] - 2025-01-28T20:50:52.585Z - [REQUEST]: Responding to the client. handleContextFileData
|
||||
[NX Daemon Server] - 2025-01-28T20:50:52.586Z - Done responding to the client handleContextFileData
|
||||
[NX Daemon Server] - 2025-01-28T20:50:52.586Z - Handled GET_CONTEXT_FILE_DATA. Handling time: 0. Response time: 1.
|
||||
[NX Daemon Server] - 2025-01-28T20:50:54.463Z - Closed a connection. Number of open connections: 0
|
||||
[NX Daemon Server] - 2025-01-28T20:51:16.299Z - [WATCHER]: Processing file changes in outputs
|
||||
[NX Daemon Server] - 2025-01-28T20:51:16.346Z - [WATCHER]: lerna.json was modified
|
||||
[NX Daemon Server] - 2025-01-28T20:51:16.454Z - [REQUEST]: Updated workspace context based on watched changes, recomputing project graph...
|
||||
[NX Daemon Server] - 2025-01-28T20:51:16.454Z - [REQUEST]: lerna.json
|
||||
[NX Daemon Server] - 2025-01-28T20:51:16.454Z - [REQUEST]:
|
||||
[NX Daemon Server] - 2025-01-28T20:51:16.457Z - Time taken for 'hash changed files from watcher' 0.20230000000447035ms
|
||||
[NX Daemon Server] - 2025-01-28T20:51:16.466Z - Time taken for 'build-project-configs' 8.910200000042096ms
|
||||
[NX Daemon Server] - 2025-01-28T20:51:16.485Z - [SYNC]: collect registered sync generators
|
||||
[NX Daemon Server] - 2025-01-28T20:51:16.486Z - [SYNC]: project graph hash is the same, not collecting task sync generators
|
||||
[NX Daemon Server] - 2025-01-28T20:51:16.486Z - [SYNC]: nx.json hash is the same, not collecting global sync generators
|
||||
[NX Daemon Server] - 2025-01-28T20:51:16.486Z - Time taken for 'total execution time for createProjectGraph()' 14.330699999933131ms
|
||||
[NX Daemon Server] - 2025-01-28T20:51:16.654Z - [WATCHER]: Processing file changes in outputs
|
||||
[NX Daemon Server] - 2025-01-28T20:51:44.399Z - [WATCHER]: Processing file changes in outputs
|
||||
[NX Daemon Server] - 2025-01-28T20:51:44.403Z - [WATCHER]: lerna.json was modified
|
||||
[NX Daemon Server] - 2025-01-28T20:51:44.616Z - [REQUEST]: Updated workspace context based on watched changes, recomputing project graph...
|
||||
[NX Daemon Server] - 2025-01-28T20:51:44.616Z - [REQUEST]: lerna.json
|
||||
[NX Daemon Server] - 2025-01-28T20:51:44.616Z - [REQUEST]:
|
||||
[NX Daemon Server] - 2025-01-28T20:51:44.618Z - Time taken for 'hash changed files from watcher' 0.2323999999789521ms
|
||||
[NX Daemon Server] - 2025-01-28T20:51:44.627Z - Time taken for 'build-project-configs' 7.7696999999461696ms
|
||||
[NX Daemon Server] - 2025-01-28T20:51:44.642Z - [SYNC]: collect registered sync generators
|
||||
[NX Daemon Server] - 2025-01-28T20:51:44.642Z - [SYNC]: project graph hash is the same, not collecting task sync generators
|
||||
[NX Daemon Server] - 2025-01-28T20:51:44.643Z - [SYNC]: nx.json hash is the same, not collecting global sync generators
|
||||
[NX Daemon Server] - 2025-01-28T20:51:44.643Z - Time taken for 'total execution time for createProjectGraph()' 11.859399999957532ms
|
||||
[NX Daemon Server] - 2025-01-28T20:52:24.087Z - [WATCHER]: Processing file changes in outputs
|
||||
[NX Daemon Server] - 2025-01-28T20:52:24.183Z - [WATCHER]: Processing file changes in outputs
|
||||
[NX Daemon Server] - 2025-01-28T20:52:24.185Z - [WATCHER]: lerna.json was modified
|
||||
[NX Daemon Server] - 2025-01-28T20:52:24.597Z - [REQUEST]: Updated workspace context based on watched changes, recomputing project graph...
|
||||
[NX Daemon Server] - 2025-01-28T20:52:24.597Z - [REQUEST]: lerna.json
|
||||
[NX Daemon Server] - 2025-01-28T20:52:24.597Z - [REQUEST]:
|
||||
[NX Daemon Server] - 2025-01-28T20:52:24.601Z - Time taken for 'hash changed files from watcher' 0.26670000003650784ms
|
||||
[NX Daemon Server] - 2025-01-28T20:52:24.612Z - Time taken for 'build-project-configs' 10.979699999908917ms
|
||||
[NX Daemon Server] - 2025-01-28T20:52:24.627Z - [SYNC]: collect registered sync generators
|
||||
[NX Daemon Server] - 2025-01-28T20:52:24.628Z - [SYNC]: project graph hash is the same, not collecting task sync generators
|
||||
[NX Daemon Server] - 2025-01-28T20:52:24.628Z - [SYNC]: nx.json hash is the same, not collecting global sync generators
|
||||
[NX Daemon Server] - 2025-01-28T20:52:24.628Z - Time taken for 'total execution time for createProjectGraph()' 12.477199999964796ms
|
||||
[NX Daemon Server] - 2025-01-28T20:52:30.705Z - [WATCHER]: lerna.json was modified
|
||||
[NX Daemon Server] - 2025-01-28T20:52:30.796Z - [WATCHER]: lerna.json was modified
|
||||
[NX Daemon Server] - 2025-01-28T20:52:30.796Z - [WATCHER]: Processing file changes in outputs
|
||||
[NX Daemon Server] - 2025-01-28T20:52:31.541Z - [REQUEST]: Updated workspace context based on watched changes, recomputing project graph...
|
||||
[NX Daemon Server] - 2025-01-28T20:52:31.541Z - [REQUEST]: lerna.json
|
||||
[NX Daemon Server] - 2025-01-28T20:52:31.541Z - [REQUEST]:
|
||||
[NX Daemon Server] - 2025-01-28T20:52:31.543Z - Time taken for 'hash changed files from watcher' 0.23149999999441206ms
|
||||
[NX Daemon Server] - 2025-01-28T20:52:31.554Z - Time taken for 'build-project-configs' 10.172599999932572ms
|
||||
[NX Daemon Server] - 2025-01-28T20:52:31.573Z - [SYNC]: collect registered sync generators
|
||||
[NX Daemon Server] - 2025-01-28T20:52:31.574Z - [SYNC]: project graph hash is the same, not collecting task sync generators
|
||||
[NX Daemon Server] - 2025-01-28T20:52:31.574Z - [SYNC]: nx.json hash is the same, not collecting global sync generators
|
||||
[NX Daemon Server] - 2025-01-28T20:52:31.575Z - Time taken for 'total execution time for createProjectGraph()' 11.375900000100955ms
|
||||
[NX Daemon Server] - 2025-01-28T20:53:03.987Z - [WATCHER]: lerna.json was modified
|
||||
[NX Daemon Server] - 2025-01-28T20:53:04.329Z - [WATCHER]: Processing file changes in outputs
|
||||
[NX Daemon Server] - 2025-01-28T20:53:04.387Z - [WATCHER]: lerna.json was modified
|
||||
[NX Daemon Server] - 2025-01-28T20:53:04.387Z - [WATCHER]: Processing file changes in outputs
|
||||
[NX Daemon Server] - 2025-01-28T20:53:05.938Z - [REQUEST]: Updated workspace context based on watched changes, recomputing project graph...
|
||||
[NX Daemon Server] - 2025-01-28T20:53:05.938Z - [REQUEST]: lerna.json
|
||||
[NX Daemon Server] - 2025-01-28T20:53:05.938Z - [REQUEST]:
|
||||
[NX Daemon Server] - 2025-01-28T20:53:05.960Z - Time taken for 'hash changed files from watcher' 0.2722999999532476ms
|
||||
[NX Daemon Server] - 2025-01-28T20:53:05.971Z - Time taken for 'build-project-configs' 25.801199999987148ms
|
||||
[NX Daemon Server] - 2025-01-28T20:53:05.989Z - [SYNC]: collect registered sync generators
|
||||
[NX Daemon Server] - 2025-01-28T20:53:05.990Z - [SYNC]: project graph hash is the same, not collecting task sync generators
|
||||
[NX Daemon Server] - 2025-01-28T20:53:05.990Z - [SYNC]: nx.json hash is the same, not collecting global sync generators
|
||||
[NX Daemon Server] - 2025-01-28T20:53:05.991Z - Time taken for 'total execution time for createProjectGraph()' 16.946699999971315ms
|
||||
[NX Daemon Server] - 2025-01-28T20:54:46.765Z - [WATCHER]: Processing file changes in outputs
|
||||
[NX Daemon Server] - 2025-01-28T20:54:46.767Z - [WATCHER]: 0 file(s) created or restored, 4 file(s) modified, 0 file(s) deleted
|
||||
[NX Daemon Server] - 2025-01-28T20:54:49.970Z - [REQUEST]: Updated workspace context based on watched changes, recomputing project graph...
|
||||
[NX Daemon Server] - 2025-01-28T20:54:49.970Z - [REQUEST]: .syncpackrc,client/package.json,server/package.json,browser/package.json
|
||||
[NX Daemon Server] - 2025-01-28T20:54:49.971Z - [REQUEST]:
|
||||
[NX Daemon Server] - 2025-01-28T20:54:49.974Z - Time taken for 'hash changed files from watcher' 1.8414000000339001ms
|
||||
[NX Daemon Server] - 2025-01-28T20:54:49.986Z - Time taken for 'build-project-configs' 9.93909999995958ms
|
||||
[NX Daemon Server] - 2025-01-28T20:54:50.005Z - [SYNC]: collect registered sync generators
|
||||
[NX Daemon Server] - 2025-01-28T20:54:50.006Z - [SYNC]: project graph hash is the same, not collecting task sync generators
|
||||
[NX Daemon Server] - 2025-01-28T20:54:50.007Z - [SYNC]: nx.json hash is the same, not collecting global sync generators
|
||||
[NX Daemon Server] - 2025-01-28T20:54:50.007Z - Time taken for 'total execution time for createProjectGraph()' 16.313499999931082ms
|
||||
[NX Daemon Server] - 2025-01-28T20:55:50.500Z - [WATCHER]: Processing file changes in outputs
|
||||
[NX Daemon Server] - 2025-01-28T20:56:37.313Z - [WATCHER]: .syncpackrc was modified
|
||||
[NX Daemon Server] - 2025-01-28T20:56:37.314Z - [WATCHER]: Processing file changes in outputs
|
||||
[NX Daemon Server] - 2025-01-28T20:56:43.718Z - [REQUEST]: Updated workspace context based on watched changes, recomputing project graph...
|
||||
[NX Daemon Server] - 2025-01-28T20:56:43.718Z - [REQUEST]: .syncpackrc
|
||||
[NX Daemon Server] - 2025-01-28T20:56:43.718Z - [REQUEST]:
|
||||
[NX Daemon Server] - 2025-01-28T20:56:43.720Z - Time taken for 'hash changed files from watcher' 0.20400000002700835ms
|
||||
[NX Daemon Server] - 2025-01-28T20:56:43.730Z - Time taken for 'build-project-configs' 8.262399999890476ms
|
||||
[NX Daemon Server] - 2025-01-28T20:56:43.747Z - [SYNC]: collect registered sync generators
|
||||
[NX Daemon Server] - 2025-01-28T20:56:43.748Z - [SYNC]: project graph hash is the same, not collecting task sync generators
|
||||
[NX Daemon Server] - 2025-01-28T20:56:43.748Z - [SYNC]: nx.json hash is the same, not collecting global sync generators
|
||||
[NX Daemon Server] - 2025-01-28T20:56:43.748Z - Time taken for 'total execution time for createProjectGraph()' 13.381500000017695ms
|
||||
[NX Daemon Server] - 2025-01-28T21:01:02.854Z - [WATCHER]: Processing file changes in outputs
|
||||
[NX Daemon Server] - 2025-01-28T21:02:38.819Z - [WATCHER]: 0 file(s) created or restored, 5 file(s) modified, 0 file(s) deleted
|
||||
[NX Daemon Server] - 2025-01-28T21:02:38.819Z - [WATCHER]: Processing file changes in outputs
|
||||
[NX Daemon Server] - 2025-01-28T21:02:45.225Z - [REQUEST]: Updated workspace context based on watched changes, recomputing project graph...
|
||||
[NX Daemon Server] - 2025-01-28T21:02:45.225Z - [REQUEST]: browser/package.json,client/package.json,server/package.json,shared-types/package.json,rpc/package.json
|
||||
[NX Daemon Server] - 2025-01-28T21:02:45.225Z - [REQUEST]:
|
||||
[NX Daemon Server] - 2025-01-28T21:02:45.227Z - Time taken for 'hash changed files from watcher' 0.46259999996982515ms
|
||||
[NX Daemon Server] - 2025-01-28T21:02:45.238Z - Time taken for 'build-project-configs' 9.553899999940768ms
|
||||
[NX Daemon Server] - 2025-01-28T21:02:45.255Z - [SYNC]: collect registered sync generators
|
||||
[NX Daemon Server] - 2025-01-28T21:02:45.256Z - [SYNC]: project graph hash is the same, not collecting task sync generators
|
||||
[NX Daemon Server] - 2025-01-28T21:02:45.256Z - [SYNC]: nx.json hash is the same, not collecting global sync generators
|
||||
[NX Daemon Server] - 2025-01-28T21:02:45.256Z - Time taken for 'total execution time for createProjectGraph()' 13.6832000000868ms
|
||||
[NX Daemon Server] - 2025-01-28T21:03:17.124Z - [WATCHER]: Processing file changes in outputs
|
||||
[NX Daemon Server] - 2025-01-28T21:03:34.968Z - [WATCHER]: Processing file changes in outputs
|
||||
[NX Daemon Server] - 2025-01-28T21:03:39.693Z - [WATCHER]: Processing file changes in outputs
|
||||
[NX Daemon Server] - 2025-01-28T21:03:42.830Z - [WATCHER]: Processing file changes in outputs
|
||||
@@ -1,3 +0,0 @@
|
||||
{
|
||||
"processId": 1932
|
||||
}
|
||||
@@ -1,421 +0,0 @@
|
||||
{
|
||||
"version": "6.0",
|
||||
"nxVersion": "20.4.0",
|
||||
"pathMappings": {},
|
||||
"nxJsonPlugins": [],
|
||||
"fileMap": {
|
||||
"nonProjectFiles": [
|
||||
{
|
||||
"file": ".syncpackrc",
|
||||
"hash": "13719523772355468859"
|
||||
},
|
||||
{
|
||||
"file": "nx.json",
|
||||
"hash": "9446346482472849254"
|
||||
},
|
||||
{
|
||||
"file": "cli/pnpm-lock.yaml",
|
||||
"hash": "17187343980520924484"
|
||||
},
|
||||
{
|
||||
"file": ".prettierrc.yaml",
|
||||
"hash": "17309111231433830353"
|
||||
},
|
||||
{
|
||||
"file": ".gitignore",
|
||||
"hash": "466019069558237198"
|
||||
},
|
||||
{
|
||||
"file": "cli/src/utils/cloner.ts",
|
||||
"hash": "1132274951157266930"
|
||||
},
|
||||
{
|
||||
"file": "cli/package.json",
|
||||
"hash": "3111660507833056649"
|
||||
},
|
||||
{
|
||||
"file": "readme.md",
|
||||
"hash": "1902671373761520170"
|
||||
},
|
||||
{
|
||||
"file": "cli/LICENSE",
|
||||
"hash": "1507993085755105257"
|
||||
},
|
||||
{
|
||||
"file": "cli/tsup.config.ts",
|
||||
"hash": "13827088844122432138"
|
||||
},
|
||||
{
|
||||
"file": "LICENSE",
|
||||
"hash": "3851877826332079922"
|
||||
},
|
||||
{
|
||||
"file": "cli/src/commands/download-updater.ts",
|
||||
"hash": "11440367832134551579"
|
||||
},
|
||||
{
|
||||
"file": "cli/src/commands/create.ts",
|
||||
"hash": "2930999059286089181"
|
||||
},
|
||||
{
|
||||
"file": "cli/src/index.ts",
|
||||
"hash": "16870627862244864272"
|
||||
},
|
||||
{
|
||||
"file": "pnpm-lock.yaml",
|
||||
"hash": "449396566283249838"
|
||||
},
|
||||
{
|
||||
"file": "cli/src/utils/update.ts",
|
||||
"hash": "17254076707872483328"
|
||||
},
|
||||
{
|
||||
"file": "lerna.json",
|
||||
"hash": "9008042841666655823"
|
||||
},
|
||||
{
|
||||
"file": ".eslintrc.yaml",
|
||||
"hash": "10112531714126869677"
|
||||
},
|
||||
{
|
||||
"file": "package.json",
|
||||
"hash": "14631295638127641855"
|
||||
},
|
||||
{
|
||||
"file": ".gitea/ISSUE_TEMPLATE.yaml",
|
||||
"hash": "6189181406018576855"
|
||||
},
|
||||
{
|
||||
"file": "cli/src/commands/test-rpc.ts",
|
||||
"hash": "14383022690595309411"
|
||||
},
|
||||
{
|
||||
"file": "cli/tsconfig.json",
|
||||
"hash": "12144877836401991171"
|
||||
},
|
||||
{
|
||||
"file": "tsconfig.json",
|
||||
"hash": "13322631129280839479"
|
||||
},
|
||||
{
|
||||
"file": "pnpm-workspace.yaml",
|
||||
"hash": "7023137976272453398"
|
||||
},
|
||||
{
|
||||
"file": "cli/.prettierrc.yaml",
|
||||
"hash": "14222459966692279673"
|
||||
},
|
||||
{
|
||||
"file": "cli/readme.md",
|
||||
"hash": "16218391603489013576"
|
||||
}
|
||||
],
|
||||
"projectFileMap": {
|
||||
"@entityseven/rage-fw-browser": [
|
||||
{
|
||||
"file": "browser/LICENSE",
|
||||
"hash": "9830167294304212237"
|
||||
},
|
||||
{
|
||||
"file": "browser/package.json",
|
||||
"hash": "8394336659605379646",
|
||||
"deps": [
|
||||
"@entityseven/rage-fw-shared-types",
|
||||
"npm:@ragempcommunity/types-cef",
|
||||
"npm:typescript",
|
||||
"npm:@types/node",
|
||||
"@entityseven/rage-fw-rpc"
|
||||
]
|
||||
},
|
||||
{
|
||||
"file": "browser/readme.md",
|
||||
"hash": "6784772156454526638"
|
||||
},
|
||||
{
|
||||
"file": "browser/src/core/browser.ts",
|
||||
"hash": "10009864015750364307"
|
||||
},
|
||||
{
|
||||
"file": "browser/src/core/helper.ts",
|
||||
"hash": "16517722629531985457"
|
||||
},
|
||||
{
|
||||
"file": "browser/src/core/index.ts",
|
||||
"hash": "18164198928683611675"
|
||||
},
|
||||
{
|
||||
"file": "browser/src/core/rpc.ts",
|
||||
"hash": "9519301954074409646"
|
||||
},
|
||||
{
|
||||
"file": "browser/src/index.ts",
|
||||
"hash": "18040406898247939535"
|
||||
},
|
||||
{
|
||||
"file": "browser/src/types/browser.ts",
|
||||
"hash": "13468197454536495262"
|
||||
},
|
||||
{
|
||||
"file": "browser/src/types/client.ts",
|
||||
"hash": "13557429918052813179"
|
||||
},
|
||||
{
|
||||
"file": "browser/src/types/index.ts",
|
||||
"hash": "6260220750609320042"
|
||||
},
|
||||
{
|
||||
"file": "browser/src/types/server.ts",
|
||||
"hash": "13131068453376579715"
|
||||
},
|
||||
{
|
||||
"file": "browser/tsconfig.json",
|
||||
"hash": "14297308517805023912"
|
||||
},
|
||||
{
|
||||
"file": "browser/tsup.config.ts",
|
||||
"hash": "16689115104994349313"
|
||||
}
|
||||
],
|
||||
"@entityseven/rage-fw-shared-types": [
|
||||
{
|
||||
"file": "shared-types/LICENSE",
|
||||
"hash": "14463895369240724148"
|
||||
},
|
||||
{
|
||||
"file": "shared-types/package.json",
|
||||
"hash": "13177243656489706574"
|
||||
},
|
||||
{
|
||||
"file": "shared-types/readme.md",
|
||||
"hash": "3257693895969571940"
|
||||
},
|
||||
{
|
||||
"file": "shared-types/types/types/index.d.ts",
|
||||
"hash": "18373304961881856136"
|
||||
}
|
||||
],
|
||||
"@entityseven/rage-fw-rpc": [
|
||||
{
|
||||
"file": "rpc/.prettierrc.yaml",
|
||||
"hash": "14222459966692279673"
|
||||
},
|
||||
{
|
||||
"file": "rpc/LICENSE",
|
||||
"hash": "1507993085755105257"
|
||||
},
|
||||
{
|
||||
"file": "rpc/index.d.ts",
|
||||
"hash": "13476386923588110951"
|
||||
},
|
||||
{
|
||||
"file": "rpc/package.json",
|
||||
"hash": "2726171849136238360",
|
||||
"deps": [
|
||||
"npm:typescript",
|
||||
"npm:@types/node"
|
||||
]
|
||||
},
|
||||
{
|
||||
"file": "rpc/readme.md",
|
||||
"hash": "17726864455644137560"
|
||||
},
|
||||
{
|
||||
"file": "rpc/src/browser.ts",
|
||||
"hash": "10760242538683633981"
|
||||
},
|
||||
{
|
||||
"file": "rpc/src/client.ts",
|
||||
"hash": "4979339141366720878"
|
||||
},
|
||||
{
|
||||
"file": "rpc/src/index.ts",
|
||||
"hash": "14029206864504852225"
|
||||
},
|
||||
{
|
||||
"file": "rpc/src/server.ts",
|
||||
"hash": "2711426930830177028"
|
||||
},
|
||||
{
|
||||
"file": "rpc/src/utils.ts",
|
||||
"hash": "4568122399599156842"
|
||||
},
|
||||
{
|
||||
"file": "rpc/src/wrapper.ts",
|
||||
"hash": "16618263225580598982"
|
||||
},
|
||||
{
|
||||
"file": "rpc/tsconfig.json",
|
||||
"hash": "8261161459009218106"
|
||||
},
|
||||
{
|
||||
"file": "rpc/tsup.config.ts",
|
||||
"hash": "2161793031369605898"
|
||||
}
|
||||
],
|
||||
"@entityseven/rage-fw-server": [
|
||||
{
|
||||
"file": "server/LICENSE",
|
||||
"hash": "9830167294304212237"
|
||||
},
|
||||
{
|
||||
"file": "server/package.json",
|
||||
"hash": "6004332410691816215",
|
||||
"deps": [
|
||||
"@entityseven/rage-fw-shared-types",
|
||||
"npm:@ragempcommunity/types-server",
|
||||
"npm:typescript",
|
||||
"npm:@types/node",
|
||||
"@entityseven/rage-fw-rpc",
|
||||
"npm:zod"
|
||||
]
|
||||
},
|
||||
{
|
||||
"file": "server/readme.md",
|
||||
"hash": "3705642702728283598"
|
||||
},
|
||||
{
|
||||
"file": "server/src/core/index.ts",
|
||||
"hash": "4619088953770171501"
|
||||
},
|
||||
{
|
||||
"file": "server/src/core/logger.ts",
|
||||
"hash": "7025360456831463395"
|
||||
},
|
||||
{
|
||||
"file": "server/src/core/middleware.ts",
|
||||
"hash": "9029153851835799179"
|
||||
},
|
||||
{
|
||||
"file": "server/src/core/player.ts",
|
||||
"hash": "646640399873855317"
|
||||
},
|
||||
{
|
||||
"file": "server/src/core/rpc.ts",
|
||||
"hash": "9716036782015846138"
|
||||
},
|
||||
{
|
||||
"file": "server/src/core/server.ts",
|
||||
"hash": "6249953495453629660"
|
||||
},
|
||||
{
|
||||
"file": "server/src/data/nativeEvents.ts",
|
||||
"hash": "8734820093303622792"
|
||||
},
|
||||
{
|
||||
"file": "server/src/index.ts",
|
||||
"hash": "6725152021010613153"
|
||||
},
|
||||
{
|
||||
"file": "server/src/types/browser.ts",
|
||||
"hash": "9902395004151881622"
|
||||
},
|
||||
{
|
||||
"file": "server/src/types/client.ts",
|
||||
"hash": "17401029848475306040"
|
||||
},
|
||||
{
|
||||
"file": "server/src/types/index.ts",
|
||||
"hash": "11615606045704199032"
|
||||
},
|
||||
{
|
||||
"file": "server/src/types/middleware.ts",
|
||||
"hash": "15504233768206130683"
|
||||
},
|
||||
{
|
||||
"file": "server/src/types/server.ts",
|
||||
"hash": "12180897328661038971"
|
||||
},
|
||||
{
|
||||
"file": "server/tsconfig.json",
|
||||
"hash": "12269433865326198421"
|
||||
},
|
||||
{
|
||||
"file": "server/tsup.config.ts",
|
||||
"hash": "16689115104994349313"
|
||||
}
|
||||
],
|
||||
"@entityseven/rage-fw-client": [
|
||||
{
|
||||
"file": "client/LICENSE",
|
||||
"hash": "9830167294304212237"
|
||||
},
|
||||
{
|
||||
"file": "client/package.json",
|
||||
"hash": "7671149151701632021",
|
||||
"deps": [
|
||||
"@entityseven/rage-fw-shared-types",
|
||||
"npm:@ragempcommunity/types-client",
|
||||
"npm:typescript",
|
||||
"npm:@types/node",
|
||||
"@entityseven/rage-fw-rpc",
|
||||
"npm:zod"
|
||||
]
|
||||
},
|
||||
{
|
||||
"file": "client/readme.md",
|
||||
"hash": "4325406592838224661"
|
||||
},
|
||||
{
|
||||
"file": "client/src/core/client.ts",
|
||||
"hash": "8772011607925425550"
|
||||
},
|
||||
{
|
||||
"file": "client/src/core/index.ts",
|
||||
"hash": "14359302072116059486"
|
||||
},
|
||||
{
|
||||
"file": "client/src/core/logger.ts",
|
||||
"hash": "1392569423019756721"
|
||||
},
|
||||
{
|
||||
"file": "client/src/core/middleware.ts",
|
||||
"hash": "9312588993748562168"
|
||||
},
|
||||
{
|
||||
"file": "client/src/core/player.ts",
|
||||
"hash": "16403642367083183429"
|
||||
},
|
||||
{
|
||||
"file": "client/src/core/rpc.ts",
|
||||
"hash": "9716036782015846138"
|
||||
},
|
||||
{
|
||||
"file": "client/src/data/keys.ts",
|
||||
"hash": "4970966175919914552"
|
||||
},
|
||||
{
|
||||
"file": "client/src/index.ts",
|
||||
"hash": "7504560440612327032"
|
||||
},
|
||||
{
|
||||
"file": "client/src/types/browser.ts",
|
||||
"hash": "4594561225616283705"
|
||||
},
|
||||
{
|
||||
"file": "client/src/types/client.ts",
|
||||
"hash": "10642873317397961667"
|
||||
},
|
||||
{
|
||||
"file": "client/src/types/index.ts",
|
||||
"hash": "11615606045704199032"
|
||||
},
|
||||
{
|
||||
"file": "client/src/types/middleware.ts",
|
||||
"hash": "4334930242322593693"
|
||||
},
|
||||
{
|
||||
"file": "client/src/types/server.ts",
|
||||
"hash": "13053104819399812773"
|
||||
},
|
||||
{
|
||||
"file": "client/tsconfig.json",
|
||||
"hash": "9579073419844235185"
|
||||
},
|
||||
{
|
||||
"file": "client/tsup.config.ts",
|
||||
"hash": "16689115104994349313"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
7883411914066010959
|
||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
+1
-1
@@ -1,4 +1,4 @@
|
||||
Custom Attribution-NoDerivs Software License
|
||||
Custom Attribution-NoDerives Software License
|
||||
|
||||
Copyright (c) 2024 Entity Seven Group
|
||||
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
".": "./src/index.ts"
|
||||
},
|
||||
"publishConfig": {
|
||||
"access": "public",
|
||||
"main": "dist/index.js",
|
||||
"types": "dist/index.d.ts",
|
||||
"exports": {
|
||||
|
||||
+117
-36
@@ -1,14 +1,9 @@
|
||||
import { Helper } from './helper'
|
||||
import { FW_Helper } from './helper'
|
||||
import { rpc } from './rpc'
|
||||
import type * as T from '../types'
|
||||
import {
|
||||
RageFW_BrowserEvent,
|
||||
RageFW_ClientEvent,
|
||||
RageFW_ServerEvent,
|
||||
} from '../types'
|
||||
|
||||
/** Browser-side interactions */
|
||||
export class Browser extends Helper {
|
||||
export class FW_Browser extends FW_Helper {
|
||||
constructor() {
|
||||
super()
|
||||
}
|
||||
@@ -34,7 +29,7 @@ export class Browser extends Helper {
|
||||
*
|
||||
* @param eventName - The name of the event to register
|
||||
* @param callback - The callback function to be executed when the event is triggered
|
||||
* @returns {Browser} The current browser instance, enabling method chaining
|
||||
* @returns {FW_Browser} The current browser instance, enabling method chaining
|
||||
*
|
||||
* @example
|
||||
* // Registering an event
|
||||
@@ -44,10 +39,10 @@ export class Browser extends Helper {
|
||||
*
|
||||
* @see {@link https://git.entityseven.com/entityseven/rage-framework/wiki Wiki}
|
||||
*/
|
||||
public register<EventName extends T.RageFW_BrowserEvent>(
|
||||
public register<EventName extends T.FW_BrowserEvent>(
|
||||
eventName: EventName,
|
||||
callback: T.RageFW_BrowserCallback<EventName>,
|
||||
): Browser {
|
||||
callback: T.FW_BrowserCallback<EventName>,
|
||||
): FW_Browser {
|
||||
this.log_('register', eventName, callback)
|
||||
|
||||
rpc.register<
|
||||
@@ -63,7 +58,7 @@ export class Browser extends Helper {
|
||||
* Unregisters a browser event, removing the associated callback
|
||||
*
|
||||
* @param eventName - The name of the event to unregister
|
||||
* @returns {Browser} The current browser instance, enabling method chaining
|
||||
* @returns {FW_Browser} The current browser instance, enabling method chaining
|
||||
*
|
||||
* @example
|
||||
* // Unregistering an event
|
||||
@@ -71,21 +66,51 @@ export class Browser extends Helper {
|
||||
*
|
||||
* @see {@link https://git.entityseven.com/entityseven/rage-framework/wiki Wiki}
|
||||
*/
|
||||
public unregister<EventName extends T.RageFW_BrowserEvent>(
|
||||
public unregister<EventName extends T.FW_BrowserEvent>(
|
||||
eventName: EventName,
|
||||
): Browser {
|
||||
): FW_Browser {
|
||||
rpc.unregister<EventName>(eventName)
|
||||
|
||||
return this
|
||||
}
|
||||
|
||||
/**
|
||||
* Triggers a browser event from the browser with arguments from shared types
|
||||
* Triggers a browser event from the browser with arguments from 'rage-fw-shared-types'
|
||||
*
|
||||
* Formerly known as ``call`` or ``emit``
|
||||
*
|
||||
* @param eventName - The name of the browser event to trigger
|
||||
* @param [args] - Arguments for the browser event, if present
|
||||
* @returns {void}
|
||||
*
|
||||
* @example
|
||||
* // Triggering a browser event without arguments
|
||||
* fw.event.trigger("browserEventName")
|
||||
*
|
||||
* @example
|
||||
* // Triggering a browser event with arguments
|
||||
* fw.event.trigger("browserEventName", ["message to me"])
|
||||
*
|
||||
* @see {@link https://git.entityseven.com/entityseven/rage-framework/wiki Wiki}
|
||||
*/
|
||||
public trigger<EventName extends T.FW_BrowserEvent>(
|
||||
eventName: EventName,
|
||||
...args: T._BrowserEventHasArgs<EventName> extends true
|
||||
? [T.FW_BrowserArgs<EventName>]
|
||||
: []
|
||||
): void {
|
||||
this.log_('[RPC](trigger):', eventName, ...args)
|
||||
|
||||
rpc.call<typeof args, EventName>(eventName, args)
|
||||
}
|
||||
|
||||
/**
|
||||
* Triggers an asynchronous browser event from the browser with arguments from 'rage-fw-shared-types', and expects to receive a response from an event
|
||||
*
|
||||
* Formerly known as ``callAsync`` or ``emitAsync``
|
||||
*
|
||||
* @param eventName - The name of the browser event to trigger
|
||||
* @param [args] - Arguments for the browser event, if present
|
||||
* @returns {Promise} resolving to the browser's response for the event
|
||||
*
|
||||
* @example
|
||||
@@ -98,28 +123,58 @@ export class Browser extends Helper {
|
||||
*
|
||||
* @see {@link https://git.entityseven.com/entityseven/rage-framework/wiki Wiki}
|
||||
*/
|
||||
public async trigger<EventName extends T.RageFW_BrowserEvent>(
|
||||
public async triggerAsync<EventName extends T.FW_BrowserEvent>(
|
||||
eventName: EventName,
|
||||
...args: T._BrowserEventHasArgs<EventName> extends true
|
||||
? [T.RageFW_BrowserArgs<EventName>]
|
||||
? [T.FW_BrowserArgs<EventName>]
|
||||
: []
|
||||
): Promise<T.RageFW_BrowserReturn<EventName>> {
|
||||
): Promise<T.FW_BrowserReturn<EventName>> {
|
||||
this.log_('[RPC](trigger):', eventName, ...args)
|
||||
|
||||
return await rpc.call<
|
||||
return await rpc.callAsync<
|
||||
typeof args,
|
||||
EventName,
|
||||
T.RageFW_BrowserReturn<EventName>
|
||||
T.FW_BrowserReturn<EventName>
|
||||
>(eventName, args)
|
||||
}
|
||||
|
||||
/**
|
||||
* Triggers a server event from the browser with arguments from shared types
|
||||
* Triggers a server event from the browser with arguments from 'rage-fw-shared-types'
|
||||
*
|
||||
* Formerly known as ``callServer`` or ``emitServer``
|
||||
*
|
||||
* @param eventName - The name of the server event to trigger
|
||||
* @param [args] - Arguments for the server event, if present
|
||||
* @returns {void}
|
||||
*
|
||||
* @example
|
||||
* // Triggering a server event without arguments
|
||||
* fw.event.triggerServer("serverEventName")
|
||||
*
|
||||
* @example
|
||||
* // Triggering a server event with arguments
|
||||
* fw.event.triggerServer("serverEventName", ["message to server"])
|
||||
*
|
||||
* @see {@link https://git.entityseven.com/entityseven/rage-framework/wiki Wiki}
|
||||
*/
|
||||
public triggerServer<EventName extends T.FW_ServerEvent>(
|
||||
eventName: EventName,
|
||||
...args: T._ServerEventHasArgs<EventName> extends true
|
||||
? [T.FW_ServerArgs<EventName>]
|
||||
: []
|
||||
): void {
|
||||
this.log_('[RPC](triggerServer):', eventName, ...args)
|
||||
|
||||
rpc.callServer<typeof args, EventName>(eventName, args)
|
||||
}
|
||||
|
||||
/**
|
||||
* Triggers an asynchronous server event from the browser with arguments from 'rage-fw-shared-types', and expects to receive a response from an event
|
||||
*
|
||||
* Formerly known as ``callServerAsync`` or ``emitServerAsync``
|
||||
*
|
||||
* @param eventName - The name of the server event to trigger
|
||||
* @param [args] - Arguments for the server event, if present
|
||||
* @returns {Promise} resolving to the server's response for the event
|
||||
*
|
||||
* @example
|
||||
@@ -132,28 +187,58 @@ export class Browser extends Helper {
|
||||
*
|
||||
* @see {@link https://git.entityseven.com/entityseven/rage-framework/wiki Wiki}
|
||||
*/
|
||||
public async triggerServer<EventName extends T.RageFW_ServerEvent>(
|
||||
public async triggerServerAsync<EventName extends T.FW_ServerEvent>(
|
||||
eventName: EventName,
|
||||
...args: T._ServerEventHasArgs<EventName> extends true
|
||||
? [T.RageFW_ServerArgs<EventName>]
|
||||
? [T.FW_ServerArgs<EventName>]
|
||||
: []
|
||||
): Promise<T.RageFW_ServerReturn<EventName>> {
|
||||
): Promise<T.FW_ServerReturn<EventName>> {
|
||||
this.log_('[RPC](triggerServer):', eventName, ...args)
|
||||
|
||||
return await rpc.callServer<
|
||||
return await rpc.callServerAsync<
|
||||
typeof args,
|
||||
EventName,
|
||||
T.RageFW_ServerReturn<EventName>
|
||||
T.FW_ServerReturn<EventName>
|
||||
>(eventName, args)
|
||||
}
|
||||
|
||||
/**
|
||||
* Triggers a client event from the browser with arguments from shared types
|
||||
* Triggers a browser event from the browser with arguments from 'rage-fw-shared-types'
|
||||
*
|
||||
* Formerly known as ``callClient`` or ``emitClient``
|
||||
*
|
||||
* @param eventName - The name of the client event to trigger
|
||||
* @param [args] - Arguments for the client event, if present
|
||||
* @returns {void}
|
||||
*
|
||||
* @example
|
||||
* // Triggering a client event without arguments
|
||||
* fw.event.triggerClient("clientEventName")
|
||||
*
|
||||
* @example
|
||||
* // Triggering a client event with arguments
|
||||
* fw.event.triggerClient("clientEventName", ["message to client"])
|
||||
*
|
||||
* @see {@link https://git.entityseven.com/entityseven/rage-framework/wiki Wiki}
|
||||
*/
|
||||
public triggerClient<EventName extends T.FW_ClientEvent>(
|
||||
eventName: EventName,
|
||||
...args: T._ClientEventHasArgs<EventName> extends true
|
||||
? [T.FW_ClientArgs<EventName>]
|
||||
: []
|
||||
): void {
|
||||
this.log_('[RPC](triggerClient):', eventName, ...args)
|
||||
|
||||
rpc.callClient<typeof args, EventName>(eventName, args)
|
||||
}
|
||||
|
||||
/**
|
||||
* Triggers an asynchronous client event from the browser with arguments from 'rage-fw-shared-types', and expects to receive a response from an event
|
||||
*
|
||||
* Formerly known as ``callClientAsync`` or ``emitClientAsync``
|
||||
*
|
||||
* @param eventName - The name of the client event to trigger
|
||||
* @param [args] - Arguments for the client event, if present
|
||||
* @returns {Promise} resolving to the client's response for the event
|
||||
*
|
||||
* @example
|
||||
@@ -166,22 +251,18 @@ export class Browser extends Helper {
|
||||
*
|
||||
* @see {@link https://git.entityseven.com/entityseven/rage-framework/wiki Wiki}
|
||||
*/
|
||||
public async triggerClient<EventName extends T.RageFW_ClientEvent>(
|
||||
public async triggerClientAsync<EventName extends T.FW_ClientEvent>(
|
||||
eventName: EventName,
|
||||
...args: T._ClientEventHasArgs<EventName> extends true
|
||||
? [T.RageFW_ClientArgs<EventName>]
|
||||
? [T.FW_ClientArgs<EventName>]
|
||||
: []
|
||||
): Promise<T.RageFW_ClientReturn<EventName>> {
|
||||
): Promise<T.FW_ClientReturn<EventName>> {
|
||||
this.log_('[RPC](triggerClient):', eventName, ...args)
|
||||
|
||||
return await rpc.callClient<
|
||||
return await rpc.callClientAsync<
|
||||
typeof args,
|
||||
EventName,
|
||||
T.RageFW_ClientReturn<EventName>
|
||||
T.FW_ClientReturn<EventName>
|
||||
>(eventName, args)
|
||||
}
|
||||
}
|
||||
|
||||
// new Browser()
|
||||
// .register('customCefEvent', async (a, b) => true)
|
||||
// .triggerServer('customServerEvent', ['', 1])
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
export class Helper {
|
||||
export class FW_Helper {
|
||||
protected debugLogs_: boolean = false
|
||||
protected customLogger_:
|
||||
| undefined
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Browser, rpc } from './core'
|
||||
import { FW_Browser, rpc } from './core'
|
||||
|
||||
/**
|
||||
* Package used on a browser-side of your Rage:MP Server
|
||||
@@ -7,10 +7,7 @@ import { Browser, rpc } from './core'
|
||||
*/
|
||||
export const fw = {
|
||||
/** Browser-side interactions */
|
||||
event: new Browser(),
|
||||
event: new FW_Browser(),
|
||||
/** ``rage-fw-rpc`` instance used under the hood. It is highly recommended to use this one if you need it instead of creating a new instance */
|
||||
rpc,
|
||||
}
|
||||
;(async () => {
|
||||
await fw.event.triggerClient('cefReady')
|
||||
})()
|
||||
|
||||
@@ -1,40 +1,41 @@
|
||||
import type { RageFW_ICustomBrowserEvent } from '@entityseven/rage-fw-shared-types'
|
||||
import type { FW_ICustomBrowserEvent } from '@entityseven/rage-fw-shared-types'
|
||||
|
||||
export type { RageFW_ICustomBrowserEvent } from '@entityseven/rage-fw-shared-types'
|
||||
export type { FW_ICustomBrowserEvent } from '@entityseven/rage-fw-shared-types'
|
||||
|
||||
/**
|
||||
* Union of all available browser event names
|
||||
* These only include custom events
|
||||
*/
|
||||
export type RageFW_BrowserEvent = keyof RageFW_ICustomBrowserEvent
|
||||
export type FW_BrowserEvent = keyof FW_ICustomBrowserEvent
|
||||
|
||||
/**
|
||||
* Array of arguments of an event you pass as a generic
|
||||
* These only include custom browser events
|
||||
*/
|
||||
export type RageFW_BrowserArgs<K extends RageFW_BrowserEvent> = Parameters<
|
||||
RageFW_ICustomBrowserEvent[K]
|
||||
export type FW_BrowserArgs<K extends FW_BrowserEvent> = Parameters<
|
||||
FW_ICustomBrowserEvent[K]
|
||||
>
|
||||
|
||||
/**
|
||||
* Return type of event you pass as a generic
|
||||
* These only include custom browser events
|
||||
*/
|
||||
export type RageFW_BrowserReturn<K extends RageFW_BrowserEvent> = ReturnType<
|
||||
RageFW_ICustomBrowserEvent[K]
|
||||
export type FW_BrowserReturn<K extends FW_BrowserEvent> = ReturnType<
|
||||
FW_ICustomBrowserEvent[K]
|
||||
>
|
||||
|
||||
/**
|
||||
* Callback (function) of event you pass as a generic
|
||||
* These only include custom browser events
|
||||
*/
|
||||
export type RageFW_BrowserCallback<K extends keyof RageFW_ICustomBrowserEvent> =
|
||||
(...args: RageFW_BrowserArgs<K>) => Promise<RageFW_BrowserReturn<K>>
|
||||
export type FW_BrowserCallback<K extends keyof FW_ICustomBrowserEvent> = (
|
||||
...args: FW_BrowserArgs<K>
|
||||
) => Promise<FW_BrowserReturn<K>>
|
||||
|
||||
export type _BrowserEventHasArgs<
|
||||
EventName extends keyof RageFW_ICustomBrowserEvent,
|
||||
> = keyof RageFW_ICustomBrowserEvent extends never
|
||||
EventName extends keyof FW_ICustomBrowserEvent,
|
||||
> = keyof FW_ICustomBrowserEvent extends never
|
||||
? false
|
||||
: Parameters<RageFW_ICustomBrowserEvent[EventName]>[0] extends undefined
|
||||
: Parameters<FW_ICustomBrowserEvent[EventName]>[0] extends undefined
|
||||
? false
|
||||
: true
|
||||
|
||||
+11
-12
@@ -1,33 +1,32 @@
|
||||
import type { RageFW_ICustomClientEvent } from '@entityseven/rage-fw-shared-types'
|
||||
import type { FW_ICustomClientEvent } from '@entityseven/rage-fw-shared-types'
|
||||
|
||||
export type { RageFW_ICustomClientEvent } from '@entityseven/rage-fw-shared-types'
|
||||
export type { FW_ICustomClientEvent } from '@entityseven/rage-fw-shared-types'
|
||||
|
||||
/**
|
||||
* Union of all available client event names
|
||||
* These only include custom events and some extras from RageFW
|
||||
* These only include custom events and some internals for RageFW
|
||||
*/
|
||||
export type RageFW_ClientEvent = keyof RageFW_ICustomClientEvent
|
||||
export type FW_ClientEvent = keyof FW_ICustomClientEvent
|
||||
|
||||
/**
|
||||
* Array of arguments of event you pass as a generic
|
||||
* These only include custom client events
|
||||
*/
|
||||
export type RageFW_ClientArgs<K extends RageFW_ClientEvent> = Parameters<
|
||||
RageFW_ICustomClientEvent[K]
|
||||
export type FW_ClientArgs<K extends FW_ClientEvent> = Parameters<
|
||||
FW_ICustomClientEvent[K]
|
||||
>
|
||||
|
||||
/**
|
||||
* Return type of event you pass as a generic
|
||||
* These only include custom client events
|
||||
*/
|
||||
export type RageFW_ClientReturn<K extends RageFW_ClientEvent> = ReturnType<
|
||||
RageFW_ICustomClientEvent[K]
|
||||
export type FW_ClientReturn<K extends FW_ClientEvent> = ReturnType<
|
||||
FW_ICustomClientEvent[K]
|
||||
>
|
||||
|
||||
export type _ClientEventHasArgs<
|
||||
EventName extends keyof RageFW_ICustomClientEvent,
|
||||
> = keyof RageFW_ICustomClientEvent extends never
|
||||
export type _ClientEventHasArgs<EventName extends keyof FW_ICustomClientEvent> =
|
||||
keyof FW_ICustomClientEvent extends never
|
||||
? false
|
||||
: Parameters<RageFW_ICustomClientEvent[EventName]>[0] extends undefined
|
||||
: Parameters<FW_ICustomClientEvent[EventName]>[0] extends undefined
|
||||
? false
|
||||
: true
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
export * from './browser'
|
||||
export * from './client'
|
||||
export * from './server'
|
||||
export type * from './browser'
|
||||
export type * from './client'
|
||||
export type * from './server'
|
||||
|
||||
+10
-11
@@ -1,33 +1,32 @@
|
||||
import type { RageFW_ICustomServerEvent } from '@entityseven/rage-fw-shared-types'
|
||||
import type { FW_ICustomServerEvent } from '@entityseven/rage-fw-shared-types'
|
||||
|
||||
export type { RageFW_ICustomServerEvent } from '@entityseven/rage-fw-shared-types'
|
||||
export type { FW_ICustomServerEvent } from '@entityseven/rage-fw-shared-types'
|
||||
|
||||
/**
|
||||
* Union of all available server event names
|
||||
* These only include custom events
|
||||
*/
|
||||
export type RageFW_ServerEvent = keyof RageFW_ICustomServerEvent
|
||||
export type FW_ServerEvent = keyof FW_ICustomServerEvent
|
||||
|
||||
/**
|
||||
* Array of arguments of event you pass as a generic
|
||||
* These only include custom server events
|
||||
*/
|
||||
export type RageFW_ServerArgs<K extends RageFW_ServerEvent> = Parameters<
|
||||
RageFW_ICustomServerEvent[K]
|
||||
export type FW_ServerArgs<K extends FW_ServerEvent> = Parameters<
|
||||
FW_ICustomServerEvent[K]
|
||||
>
|
||||
|
||||
/**
|
||||
* Return type of event you pass as a generic
|
||||
* These only include custom server events
|
||||
*/
|
||||
export type RageFW_ServerReturn<K extends RageFW_ServerEvent> = ReturnType<
|
||||
RageFW_ICustomServerEvent[K]
|
||||
export type FW_ServerReturn<K extends FW_ServerEvent> = ReturnType<
|
||||
FW_ICustomServerEvent[K]
|
||||
>
|
||||
|
||||
export type _ServerEventHasArgs<
|
||||
EventName extends keyof RageFW_ICustomServerEvent,
|
||||
> = keyof RageFW_ICustomServerEvent extends never
|
||||
export type _ServerEventHasArgs<EventName extends keyof FW_ICustomServerEvent> =
|
||||
keyof FW_ICustomServerEvent extends never
|
||||
? false
|
||||
: Parameters<RageFW_ICustomServerEvent[EventName]>[0] extends undefined
|
||||
: Parameters<FW_ICustomServerEvent[EventName]>[0] extends undefined
|
||||
? false
|
||||
: true
|
||||
|
||||
+3
-21
@@ -1,26 +1,8 @@
|
||||
{
|
||||
"$schema": "https://json.schemastore.org/tsconfig",
|
||||
"display": "Base",
|
||||
"exclude": [
|
||||
"node_modules"
|
||||
],
|
||||
"display": "Browser",
|
||||
"compilerOptions": {
|
||||
"incremental": false,
|
||||
"composite": false,
|
||||
"target": "ES2022",
|
||||
"experimentalDecorators": true,
|
||||
"moduleDetection": "auto",
|
||||
"module": "CommonJS",
|
||||
"resolveJsonModule": true,
|
||||
"declaration": false,
|
||||
"declarationMap": false,
|
||||
"sourceMap": false,
|
||||
"downlevelIteration": false,
|
||||
"inlineSourceMap": false,
|
||||
"esModuleInterop": true,
|
||||
"forceConsistentCasingInFileNames": true,
|
||||
"strict": true,
|
||||
"skipLibCheck": true,
|
||||
"types": ["./node_modules/@ragempcommunity/types-cef/index.d.ts", "node"]
|
||||
}
|
||||
},
|
||||
"extends": ["../tsconfig.ragefw.json"]
|
||||
}
|
||||
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
"target": "es6",
|
||||
"target": "esnext",
|
||||
"module": "commonjs",
|
||||
"moduleResolution": "node",
|
||||
"lib": ["DOM", "ES6"],
|
||||
"lib": ["DOM", "esnext"],
|
||||
"declaration": true,
|
||||
"declarationMap": true,
|
||||
"sourceMap": true,
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
Custom Attribution-NoDerivs Software License
|
||||
Custom Attribution-NoDerives Software License
|
||||
|
||||
Copyright (c) 2024 Entity Seven Group
|
||||
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
".": "./src/index.ts"
|
||||
},
|
||||
"publishConfig": {
|
||||
"access": "public",
|
||||
"main": "dist/index.js",
|
||||
"types": "dist/index.d.ts",
|
||||
"exports": {
|
||||
|
||||
+10
-14
@@ -1,9 +1,9 @@
|
||||
import { rpc } from './rpc'
|
||||
import { Middleware } from './middleware'
|
||||
import { FW_Middleware } from './middleware'
|
||||
import type * as T from '../types'
|
||||
|
||||
/** Client-side interactions */
|
||||
export class Client {
|
||||
export class FW_Client {
|
||||
/**
|
||||
* Registers a client event with an associated callback
|
||||
*
|
||||
@@ -11,7 +11,7 @@ export class Client {
|
||||
* @param callback - The callback function to be executed when the event is triggered
|
||||
* @param [options] - Optional settings for callback execution
|
||||
* @param [options.middlewares] - Middleware functions to be checked before the callback executes
|
||||
* @returns {Client} The current client instance, enabling method chaining
|
||||
* @returns {FW_Client} The current client instance, enabling method chaining
|
||||
*
|
||||
* @example
|
||||
* // Registering an event
|
||||
@@ -40,13 +40,13 @@ export class Client {
|
||||
*
|
||||
* @see {@link https://git.entityseven.com/entityseven/rage-framework/wiki Wiki}
|
||||
*/
|
||||
public register<EventName extends T.RageFW_ClientEvent>(
|
||||
public register<EventName extends T.FW_ClientEvent>(
|
||||
eventName: EventName,
|
||||
callback: T.RageFW_ClientCallback<EventName>,
|
||||
callback: T.FW_ClientCallback<EventName>,
|
||||
options?: {
|
||||
middlewares?: T.RageFW_MiddlewareOptions<EventName>
|
||||
middlewares?: T.FW_MiddlewareOptions<EventName>
|
||||
},
|
||||
): Client {
|
||||
): FW_Client {
|
||||
rpc.register<
|
||||
Parameters<typeof callback>,
|
||||
ReturnType<typeof callback> | Promise<unknown>,
|
||||
@@ -54,7 +54,7 @@ export class Client {
|
||||
>(eventName, async (...data) => {
|
||||
if (!options?.middlewares) return await callback(...data)
|
||||
|
||||
await Middleware.process(options.middlewares, callback, data)
|
||||
await FW_Middleware.process(options.middlewares, callback, data)
|
||||
})
|
||||
|
||||
return this
|
||||
@@ -72,15 +72,11 @@ export class Client {
|
||||
*
|
||||
* @see {@link https://git.entityseven.com/entityseven/rage-framework/wiki Wiki}
|
||||
*/
|
||||
public unregister<EventName extends T.RageFW_ClientEvent>(
|
||||
public unregister<EventName extends T.FW_ClientEvent>(
|
||||
eventName: EventName,
|
||||
): Client {
|
||||
): FW_Client {
|
||||
rpc.unregister<EventName>(eventName)
|
||||
|
||||
return this
|
||||
}
|
||||
}
|
||||
|
||||
// new Client()
|
||||
// .register('customClientEvent', async (a, b) => true)
|
||||
// .unregister('customClientEvent')
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/**
|
||||
* Used to log to a client in-game console
|
||||
*/
|
||||
export class Logger {
|
||||
export class FW_Logger {
|
||||
/**
|
||||
* Informational logs. Colored in white
|
||||
*
|
||||
@@ -10,7 +10,7 @@ export class Logger {
|
||||
*/
|
||||
public info(...message: unknown[]) {
|
||||
mp.console.logInfo(
|
||||
`[${new Date().toLocaleTimeString()}] [INFO] ${message.join(' ')}`,
|
||||
`[${new Date().toLocaleTimeString(undefined, { hour: 'numeric', minute: 'numeric', second: 'numeric', fractionalSecondDigits: 2 })}] [INFO] ${message.join(' ')}`,
|
||||
)
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@ export class Logger {
|
||||
*/
|
||||
public warn(...message: unknown[]) {
|
||||
mp.console.logWarning(
|
||||
`[${new Date().toLocaleTimeString()}] [WARN] ${message.join(' ')}`,
|
||||
`[${new Date().toLocaleTimeString(undefined, { hour: 'numeric', minute: 'numeric', second: 'numeric', fractionalSecondDigits: 2 })}] [WARN] ${message.join(' ')}`,
|
||||
)
|
||||
}
|
||||
|
||||
@@ -34,7 +34,7 @@ export class Logger {
|
||||
*/
|
||||
public error(...message: unknown[]) {
|
||||
mp.console.logError(
|
||||
`[${new Date().toLocaleTimeString()}] [ERROR] ${message.join(' ')}`,
|
||||
`[${new Date().toLocaleTimeString(undefined, { hour: 'numeric', minute: 'numeric', second: 'numeric', fractionalSecondDigits: 2 })}] [ERROR] ${message.join(' ')}`,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
import type * as T from '../types'
|
||||
|
||||
export class Middleware {
|
||||
export class FW_Middleware {
|
||||
constructor() {}
|
||||
|
||||
private static async execute<EventName extends T.RageFW_ClientEvent>(
|
||||
middlewares: T.RageFW_MiddlewareFunction<EventName>[],
|
||||
args: T.RageFW_ClientArgs<EventName>,
|
||||
): Promise<T.RageFW_MiddlewareResponseInternal> {
|
||||
private static async execute<EventName extends T.FW_ClientEvent>(
|
||||
middlewares: T.FW_MiddlewareFunction<EventName>[],
|
||||
args: T.FW_ClientArgs<EventName>,
|
||||
): Promise<T.FW_MiddlewareResponseInternal> {
|
||||
for (let i = 0; i < middlewares.length; i++) {
|
||||
const result = await middlewares[i](...args)
|
||||
|
||||
@@ -21,20 +21,20 @@ export class Middleware {
|
||||
}
|
||||
}
|
||||
|
||||
public static async process<EventName extends T.RageFW_ClientEvent>(
|
||||
middlewareOptions: T.RageFW_MiddlewareOptions<EventName>,
|
||||
callback: T.RageFW_ClientCallback<EventName>,
|
||||
args: T.RageFW_ClientArgs<EventName>,
|
||||
public static async process<EventName extends T.FW_ClientEvent>(
|
||||
middlewareOptions: T.FW_MiddlewareOptions<EventName>,
|
||||
callback: T.FW_ClientCallback<EventName>,
|
||||
args: T.FW_ClientArgs<EventName>,
|
||||
) {
|
||||
if (Array.isArray(middlewareOptions)) {
|
||||
const middlewaresResponse = await Middleware.execute(
|
||||
const middlewaresResponse = await FW_Middleware.execute(
|
||||
middlewareOptions,
|
||||
args,
|
||||
)
|
||||
|
||||
if (middlewaresResponse.success) return await callback(...args)
|
||||
} else {
|
||||
const middlewaresResponse = await Middleware.execute(
|
||||
const middlewaresResponse = await FW_Middleware.execute(
|
||||
middlewareOptions.executables,
|
||||
args,
|
||||
)
|
||||
|
||||
+106
-23
@@ -2,7 +2,7 @@ import { rpc } from './rpc'
|
||||
import type * as T from '../types'
|
||||
|
||||
/** Handles event manipulations that require player to be present in context */
|
||||
export class Player {
|
||||
export class FW_Player {
|
||||
private _browser: BrowserMp | undefined = undefined
|
||||
|
||||
/**
|
||||
@@ -14,12 +14,40 @@ export class Player {
|
||||
}
|
||||
|
||||
/**
|
||||
* Triggers a client event from the client with arguments from shared types
|
||||
* Triggers a client event from the client with arguments from 'rage-fw-shared-types'
|
||||
*
|
||||
* Formerly known as ``call`` or ``emit``
|
||||
*
|
||||
* @param eventName - The name of the client event to trigger
|
||||
* @param [args] - Arguments for the client event, if present
|
||||
* @returns {void}
|
||||
*
|
||||
* @example
|
||||
* // Triggering a client event without arguments
|
||||
* fw.player.trigger("clientEventName")
|
||||
*
|
||||
* @example
|
||||
* // Triggering a client event with arguments
|
||||
* fw.player.trigger("clientEventName", ["message to me"])
|
||||
*
|
||||
* @see {@link https://git.entityseven.com/entityseven/rage-framework/wiki Wiki}
|
||||
*/
|
||||
public trigger<EventName extends keyof T.FW_ICustomClientEvent>(
|
||||
eventName: EventName,
|
||||
...args: T._ClientEventHasArgs<EventName> extends true
|
||||
? [T.FW_ClientArgs<EventName>]
|
||||
: []
|
||||
): void {
|
||||
rpc.call<typeof args, EventName>(eventName, args)
|
||||
}
|
||||
|
||||
/**
|
||||
* Triggers an asynchronous client event from the client with arguments from 'rage-fw-shared-types', and expects to receive a response from an event
|
||||
*
|
||||
* Formerly known as ``callAsync`` or ``emitAsync``
|
||||
*
|
||||
* @param eventName - The name of the client event to trigger
|
||||
* @param [args] - Arguments for the client event, if present
|
||||
* @returns {Promise} resolving to the client's response for the event
|
||||
*
|
||||
* @example
|
||||
@@ -32,26 +60,54 @@ export class Player {
|
||||
*
|
||||
* @see {@link https://git.entityseven.com/entityseven/rage-framework/wiki Wiki}
|
||||
*/
|
||||
public async trigger<EventName extends keyof T.RageFW_ICustomClientEvent>(
|
||||
public async triggerAsync<EventName extends keyof T.FW_ICustomClientEvent>(
|
||||
eventName: EventName,
|
||||
...args: T._ClientEventHasArgs<EventName> extends true
|
||||
? [T.RageFW_ClientArgs<EventName>]
|
||||
? [T.FW_ClientArgs<EventName>]
|
||||
: []
|
||||
): Promise<T.RageFW_ClientReturn<EventName>> {
|
||||
return await rpc.call<
|
||||
): Promise<T.FW_ClientReturn<EventName>> {
|
||||
return await rpc.callAsync<
|
||||
typeof args,
|
||||
EventName,
|
||||
T.RageFW_ClientReturn<EventName>
|
||||
T.FW_ClientReturn<EventName>
|
||||
>(eventName, args)
|
||||
}
|
||||
|
||||
/**
|
||||
* Triggers a server event from the client with arguments from shared types
|
||||
* Triggers a server event from the client with arguments from 'rage-fw-shared-types'
|
||||
*
|
||||
* Formerly known as ``callServer`` or ``emitServer``
|
||||
*
|
||||
* @param eventName - The name of the server event to trigger
|
||||
* @param [args] - Arguments for the server event, if present
|
||||
* @returns {void}
|
||||
*
|
||||
* @example
|
||||
* // Triggering a server event without arguments
|
||||
* fw.player.triggerServer("serverEventName")
|
||||
*
|
||||
* @example
|
||||
* // Triggering a server event with arguments
|
||||
* fw.player.triggerServer("serverEventName", ["message to server"])
|
||||
*
|
||||
* @see {@link https://git.entityseven.com/entityseven/rage-framework/wiki Wiki}
|
||||
*/
|
||||
public triggerServer<EventName extends T.FW_ServerEvent>(
|
||||
eventName: EventName,
|
||||
...args: T._ServerEventHasArgs<EventName> extends true
|
||||
? [T.FW_ServerArgs<EventName>]
|
||||
: []
|
||||
): void {
|
||||
rpc.callServer<typeof args, EventName>(eventName, args)
|
||||
}
|
||||
|
||||
/**
|
||||
* Triggers an asynchronous server event from the client with arguments from 'rage-fw-shared-types', and expects to receive a response from an event
|
||||
*
|
||||
* Formerly known as ``callServerAsync`` or ``emitServerAsync``
|
||||
*
|
||||
* @param eventName - The name of the server event to trigger
|
||||
* @param [args] - Arguments for the server event, if present
|
||||
* @returns {Promise} resolving to the server's response for the event
|
||||
*
|
||||
* @example
|
||||
@@ -64,26 +120,57 @@ export class Player {
|
||||
*
|
||||
* @see {@link https://git.entityseven.com/entityseven/rage-framework/wiki Wiki}
|
||||
*/
|
||||
public async triggerServer<EventName extends T.RageFW_ServerEvent>(
|
||||
public async triggerServerAsync<EventName extends T.FW_ServerEvent>(
|
||||
eventName: EventName,
|
||||
...args: T._ServerEventHasArgs<EventName> extends true
|
||||
? [T.RageFW_ServerArgs<EventName>]
|
||||
? [T.FW_ServerArgs<EventName>]
|
||||
: []
|
||||
): Promise<T.RageFW_ClientServerReturn<EventName>> {
|
||||
return await rpc.callServer<
|
||||
): Promise<T.FW_ClientServerReturn<EventName>> {
|
||||
return await rpc.callServerAsync<
|
||||
typeof args,
|
||||
EventName,
|
||||
T.RageFW_ClientServerReturn<EventName>
|
||||
T.FW_ClientServerReturn<EventName>
|
||||
>(eventName, args)
|
||||
}
|
||||
|
||||
/**
|
||||
* Triggers a browser event from the client with arguments from shared types
|
||||
* Triggers a browser event from the client with arguments from 'rage-fw-shared-types'
|
||||
*
|
||||
* Formerly known as ``callBrowser`` or ``emitBrowser``
|
||||
*
|
||||
* @param eventName - The name of the browser event to trigger
|
||||
* @param [args] - Arguments for the browser event, if present
|
||||
* @returns {void}
|
||||
*
|
||||
* @example
|
||||
* // Triggering a browser event without arguments
|
||||
* fw.player.triggerBrowser("browserEventName")
|
||||
*
|
||||
* @example
|
||||
* // Triggering a browser event with arguments
|
||||
* fw.player.triggerBrowser("browserEventName", ["message to browser"])
|
||||
*
|
||||
* @see {@link https://git.entityseven.com/entityseven/rage-framework/wiki Wiki}
|
||||
*/
|
||||
public triggerBrowser<EventName extends T.FW_BrowserEvent>(
|
||||
eventName: EventName,
|
||||
...args: T._BrowserEventHasArgs<EventName> extends true
|
||||
? [T.FW_BrowserArgs<EventName>]
|
||||
: []
|
||||
): void {
|
||||
if (!this._browser)
|
||||
throw new Error('You need to initialize browser first')
|
||||
|
||||
rpc.callBrowser<typeof args, EventName>(eventName, args)
|
||||
}
|
||||
|
||||
/**
|
||||
* Triggers an asynchronous browser event from the client with arguments from 'rage-fw-shared-types', and expects to receive a response from an event
|
||||
*
|
||||
* Formerly known as ``callBrowserAsync`` or ``emitBrowserAsync``
|
||||
*
|
||||
* @param eventName - The name of the browser event to trigger
|
||||
* @param [args] - Arguments for the browser event, if present
|
||||
* @returns {Promise} resolving to the browser's response for the event
|
||||
*
|
||||
* @example
|
||||
@@ -96,23 +183,19 @@ export class Player {
|
||||
*
|
||||
* @see {@link https://git.entityseven.com/entityseven/rage-framework/wiki Wiki}
|
||||
*/
|
||||
public async triggerBrowser<EventName extends T.RageFW_BrowserEvent>(
|
||||
public async triggerBrowserAsync<EventName extends T.FW_BrowserEvent>(
|
||||
eventName: EventName,
|
||||
...args: T._BrowserEventHasArgs<EventName> extends true
|
||||
? [T.RageFW_BrowserArgs<EventName>]
|
||||
? [T.FW_BrowserArgs<EventName>]
|
||||
: []
|
||||
): Promise<T.RageFW_BrowserReturn<EventName>> {
|
||||
): Promise<T.FW_BrowserReturn<EventName>> {
|
||||
if (!this._browser)
|
||||
throw new Error('You need to initialize browser first')
|
||||
|
||||
return await rpc.callBrowser<
|
||||
return await rpc.callBrowserAsync<
|
||||
typeof args,
|
||||
EventName,
|
||||
T.RageFW_BrowserReturn<EventName>
|
||||
T.FW_BrowserReturn<EventName>
|
||||
>(eventName, args)
|
||||
}
|
||||
}
|
||||
|
||||
// new Player().trigger('customClientEvent', ['', 1])
|
||||
// new Player().triggerServer('customServerEvent', ['', 1])
|
||||
// new Player().triggerBrowser('customCefEvent', ['', 1])
|
||||
|
||||
+5
-5
@@ -1,6 +1,6 @@
|
||||
import { Client, Logger, Player, rpc } from './core'
|
||||
import { FW_Client, FW_Logger, FW_Player, rpc } from './core'
|
||||
|
||||
export type { RageFW_MiddlewareFunction } from './types'
|
||||
export type { FW_MiddlewareFunction } from './types'
|
||||
|
||||
/**
|
||||
* Package used on a client-side of your Rage:MP Server
|
||||
@@ -9,13 +9,13 @@ export type { RageFW_MiddlewareFunction } from './types'
|
||||
*/
|
||||
export const fw = {
|
||||
/** Client-side interactions */
|
||||
event: new Client(),
|
||||
event: new FW_Client(),
|
||||
/** Handles event manipulations that require player to be present in context */
|
||||
player: new Player(),
|
||||
player: new FW_Player(),
|
||||
/** Handles functions used to interact with the client environment */
|
||||
system: {
|
||||
/** Used to log in a client in-game console */
|
||||
log: new Logger(),
|
||||
log: new FW_Logger(),
|
||||
},
|
||||
/** ``rage-fw-rpc`` instance used under the hood. It is highly recommended to use this one if you need it instead of creating a new instance */
|
||||
rpc,
|
||||
|
||||
@@ -1,29 +1,29 @@
|
||||
/// <reference types="@ragempcommunity/types-client" />
|
||||
|
||||
import type { RageFW_ICustomBrowserEvent } from '@entityseven/rage-fw-shared-types'
|
||||
import type { FW_ICustomBrowserEvent } from '@entityseven/rage-fw-shared-types'
|
||||
|
||||
/**
|
||||
* Union of all available browser event names callable from client
|
||||
* These only include custom events
|
||||
*/
|
||||
export type RageFW_BrowserEvent = keyof RageFW_ICustomBrowserEvent
|
||||
export type FW_BrowserEvent = keyof FW_ICustomBrowserEvent
|
||||
|
||||
/**
|
||||
* Array of arguments for an event, name of which you pass as a generic
|
||||
* These only include custom events
|
||||
*/
|
||||
export type RageFW_BrowserArgs<K extends RageFW_BrowserEvent> = Parameters<
|
||||
RageFW_ICustomBrowserEvent[K]
|
||||
export type FW_BrowserArgs<K extends FW_BrowserEvent> = Parameters<
|
||||
FW_ICustomBrowserEvent[K]
|
||||
>
|
||||
|
||||
export type RageFW_BrowserReturn<K extends RageFW_BrowserEvent> = ReturnType<
|
||||
RageFW_ICustomBrowserEvent[K]
|
||||
export type FW_BrowserReturn<K extends FW_BrowserEvent> = ReturnType<
|
||||
FW_ICustomBrowserEvent[K]
|
||||
>
|
||||
|
||||
export type _BrowserEventHasArgs<
|
||||
EventName extends keyof RageFW_ICustomBrowserEvent,
|
||||
> = keyof RageFW_ICustomBrowserEvent extends never
|
||||
EventName extends keyof FW_ICustomBrowserEvent,
|
||||
> = keyof FW_ICustomBrowserEvent extends never
|
||||
? false
|
||||
: Parameters<RageFW_ICustomBrowserEvent[EventName]>[0] extends undefined
|
||||
: Parameters<FW_ICustomBrowserEvent[EventName]>[0] extends undefined
|
||||
? false
|
||||
: true
|
||||
|
||||
+15
-18
@@ -1,24 +1,22 @@
|
||||
/// <reference types="@ragempcommunity/types-client" />
|
||||
|
||||
import type { RageFW_ICustomClientEvent } from '@entityseven/rage-fw-shared-types'
|
||||
import type { FW_ICustomClientEvent } from '@entityseven/rage-fw-shared-types'
|
||||
|
||||
export type { RageFW_ICustomClientEvent } from '@entityseven/rage-fw-shared-types'
|
||||
export type { FW_ICustomClientEvent } from '@entityseven/rage-fw-shared-types'
|
||||
|
||||
/**
|
||||
* Union of all available client event names
|
||||
* These include custom and system events
|
||||
*/
|
||||
export type RageFW_ClientEvent =
|
||||
| keyof RageFW_ICustomClientEvent
|
||||
| keyof IClientEvents
|
||||
export type FW_ClientEvent = keyof FW_ICustomClientEvent | keyof IClientEvents
|
||||
|
||||
/**
|
||||
* Array of arguments for an event, name of which you pass as a generic
|
||||
* These include custom and system events
|
||||
*/
|
||||
export type RageFW_ClientArgs<K extends RageFW_ClientEvent> =
|
||||
K extends keyof RageFW_ICustomClientEvent
|
||||
? Parameters<RageFW_ICustomClientEvent[K]>
|
||||
export type FW_ClientArgs<K extends FW_ClientEvent> =
|
||||
K extends keyof FW_ICustomClientEvent
|
||||
? Parameters<FW_ICustomClientEvent[K]>
|
||||
: K extends keyof IClientEvents
|
||||
? Parameters<IClientEvents[K]>
|
||||
: never
|
||||
@@ -27,9 +25,9 @@ export type RageFW_ClientArgs<K extends RageFW_ClientEvent> =
|
||||
* Return type for an event, name of which you pass as a generic
|
||||
* These include custom and system events
|
||||
*/
|
||||
export type RageFW_ClientReturn<K extends RageFW_ClientEvent> =
|
||||
K extends keyof RageFW_ICustomClientEvent
|
||||
? ReturnType<RageFW_ICustomClientEvent[K]>
|
||||
export type FW_ClientReturn<K extends FW_ClientEvent> =
|
||||
K extends keyof FW_ICustomClientEvent
|
||||
? ReturnType<FW_ICustomClientEvent[K]>
|
||||
: K extends keyof IClientEvents
|
||||
? ReturnType<IClientEvents[K]>
|
||||
: void
|
||||
@@ -38,17 +36,16 @@ export type RageFW_ClientReturn<K extends RageFW_ClientEvent> =
|
||||
* Callback (function) for an event, name of which you pass as a generic
|
||||
* These include custom and system events
|
||||
*/
|
||||
export type RageFW_ClientCallback<K extends RageFW_ClientEvent> = (
|
||||
...args: RageFW_ClientArgs<K>
|
||||
) => Promise<RageFW_ClientReturn<K>>
|
||||
export type FW_ClientCallback<K extends FW_ClientEvent> = (
|
||||
...args: FW_ClientArgs<K>
|
||||
) => Promise<FW_ClientReturn<K>>
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
export type _ClientEventHasArgs<
|
||||
EventName extends keyof RageFW_ICustomClientEvent,
|
||||
> = keyof RageFW_ICustomClientEvent extends never
|
||||
export type _ClientEventHasArgs<EventName extends keyof FW_ICustomClientEvent> =
|
||||
keyof FW_ICustomClientEvent extends never
|
||||
? false
|
||||
: Parameters<RageFW_ICustomClientEvent[EventName]>[0] extends undefined
|
||||
: Parameters<FW_ICustomClientEvent[EventName]>[0] extends undefined
|
||||
? false
|
||||
: true
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
export * from './browser'
|
||||
export * from './client'
|
||||
export * from './middleware'
|
||||
export * from './server'
|
||||
export type * from './browser'
|
||||
export type * from './client'
|
||||
export type * from './middleware'
|
||||
export type * from './server'
|
||||
|
||||
@@ -1,26 +1,25 @@
|
||||
import type * as T from './client'
|
||||
|
||||
export type RageFW_MiddlewareResponse =
|
||||
export type FW_MiddlewareResponse =
|
||||
| {
|
||||
success: boolean
|
||||
message?: string
|
||||
}
|
||||
| boolean
|
||||
|
||||
export type RageFW_MiddlewareResponseInternal = {
|
||||
export type FW_MiddlewareResponseInternal = {
|
||||
success: boolean
|
||||
message?: string
|
||||
id?: number
|
||||
}
|
||||
|
||||
export type RageFW_MiddlewareFunction<EventName extends T.RageFW_ClientEvent> =
|
||||
(
|
||||
...args: T.RageFW_ClientArgs<EventName>
|
||||
) => Promise<RageFW_MiddlewareResponse>
|
||||
export type FW_MiddlewareFunction<EventName extends T.FW_ClientEvent> = (
|
||||
...args: T.FW_ClientArgs<EventName>
|
||||
) => Promise<FW_MiddlewareResponse>
|
||||
|
||||
export type RageFW_MiddlewareOptions<EventName extends T.RageFW_ClientEvent> =
|
||||
| RageFW_MiddlewareFunction<EventName>[]
|
||||
export type FW_MiddlewareOptions<EventName extends T.FW_ClientEvent> =
|
||||
| FW_MiddlewareFunction<EventName>[]
|
||||
| {
|
||||
executables: RageFW_MiddlewareFunction<EventName>[]
|
||||
executables: FW_MiddlewareFunction<EventName>[]
|
||||
onError: (error: string) => unknown
|
||||
}
|
||||
|
||||
+12
-13
@@ -1,38 +1,37 @@
|
||||
/// <reference types="@ragempcommunity/types-client" />
|
||||
|
||||
import type {
|
||||
RageFW_ICustomClientEvent,
|
||||
RageFW_ICustomServerEvent,
|
||||
FW_ICustomClientEvent,
|
||||
FW_ICustomServerEvent,
|
||||
} from '@entityseven/rage-fw-shared-types'
|
||||
|
||||
/**
|
||||
* Union of all available server event names callable from client
|
||||
* These only include custom events
|
||||
*/
|
||||
export type RageFW_ServerEvent = keyof RageFW_ICustomServerEvent
|
||||
export type FW_ServerEvent = keyof FW_ICustomServerEvent
|
||||
|
||||
/**
|
||||
* Array of arguments for an event, name of which you pass as a generic
|
||||
* These only include custom events
|
||||
*/
|
||||
export type RageFW_ServerArgs<K extends RageFW_ServerEvent> =
|
||||
K extends keyof RageFW_ICustomServerEvent
|
||||
? Parameters<RageFW_ICustomServerEvent[K]>
|
||||
export type FW_ServerArgs<K extends FW_ServerEvent> =
|
||||
K extends keyof FW_ICustomServerEvent
|
||||
? Parameters<FW_ICustomServerEvent[K]>
|
||||
: never
|
||||
|
||||
/**
|
||||
* Return type for an event, name of which you pass as a generic
|
||||
* These only include custom events
|
||||
*/
|
||||
export type RageFW_ClientServerReturn<K extends RageFW_ServerEvent> =
|
||||
K extends keyof RageFW_ICustomServerEvent
|
||||
? ReturnType<RageFW_ICustomServerEvent[K]>
|
||||
export type FW_ClientServerReturn<K extends FW_ServerEvent> =
|
||||
K extends keyof FW_ICustomServerEvent
|
||||
? ReturnType<FW_ICustomServerEvent[K]>
|
||||
: never
|
||||
|
||||
export type _ServerEventHasArgs<
|
||||
EventName extends keyof RageFW_ICustomServerEvent,
|
||||
> = keyof RageFW_ICustomClientEvent extends never
|
||||
export type _ServerEventHasArgs<EventName extends keyof FW_ICustomServerEvent> =
|
||||
keyof FW_ICustomClientEvent extends never
|
||||
? false
|
||||
: Parameters<RageFW_ICustomServerEvent[EventName]>[0] extends undefined
|
||||
: Parameters<FW_ICustomServerEvent[EventName]>[0] extends undefined
|
||||
? false
|
||||
: true
|
||||
|
||||
+3
-21
@@ -1,26 +1,8 @@
|
||||
{
|
||||
"$schema": "https://json.schemastore.org/tsconfig",
|
||||
"display": "Base",
|
||||
"exclude": [
|
||||
"node_modules"
|
||||
],
|
||||
"display": "Client",
|
||||
"compilerOptions": {
|
||||
"incremental": false,
|
||||
"composite": false,
|
||||
"target": "ES2022",
|
||||
"experimentalDecorators": true,
|
||||
"moduleDetection": "auto",
|
||||
"module": "CommonJS",
|
||||
"resolveJsonModule": true,
|
||||
"declaration": false,
|
||||
"declarationMap": false,
|
||||
"sourceMap": false,
|
||||
"downlevelIteration": false,
|
||||
"inlineSourceMap": false,
|
||||
"esModuleInterop": true,
|
||||
"forceConsistentCasingInFileNames": true,
|
||||
"strict": true,
|
||||
"skipLibCheck": true,
|
||||
"types": ["./node_modules/@ragempcommunity/types-client/index.d.ts"]
|
||||
}
|
||||
},
|
||||
"extends": ["../tsconfig.ragefw.json"]
|
||||
}
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
import globals from 'globals'
|
||||
import pluginJs from '@eslint/js'
|
||||
import tseslint from 'typescript-eslint'
|
||||
|
||||
import type { Linter } from 'eslint'
|
||||
|
||||
export default [
|
||||
{
|
||||
ignores: ['**/.*/*', '**/dist/*', '**/node_modules/*', '*.config.*'],
|
||||
},
|
||||
pluginJs.configs.recommended,
|
||||
...(tseslint.configs.recommended as Linter.Config[]),
|
||||
{
|
||||
name: 'global',
|
||||
rules: {
|
||||
'@typescript-eslint/no-explicit-any': 'off',
|
||||
'@typescript-eslint/no-unused-vars': [
|
||||
'warn',
|
||||
{
|
||||
argsIgnorePattern: '^_',
|
||||
varsIgnorePattern: '^_',
|
||||
caughtErrorsIgnorePattern: '^_',
|
||||
},
|
||||
],
|
||||
'@typescript-eslint/ban-ts-comment': 'off',
|
||||
'@typescript-eslint/ban-types': 'off',
|
||||
'consistent-return': 'off',
|
||||
'no-empty': 'off',
|
||||
},
|
||||
},
|
||||
{
|
||||
name: 'browser/rpc',
|
||||
files: ['browser/src/*.{ts,js}', 'rpc/src/*.{ts,js}'],
|
||||
languageOptions: {
|
||||
globals: { ...globals.browser, ...globals.node, ...globals.es2022 },
|
||||
},
|
||||
},
|
||||
{
|
||||
name: 'cli',
|
||||
files: ['cli/src/*.{ts,js}'],
|
||||
languageOptions: {
|
||||
globals: { ...globals.node, ...globals.es2024 },
|
||||
ecmaVersion: 2024,
|
||||
},
|
||||
},
|
||||
{
|
||||
name: 'client/server/shared',
|
||||
files: [
|
||||
'client/**/*.{ts,js}',
|
||||
'server/**/*.{ts,js}',
|
||||
'shared/**/*.{ts,js}',
|
||||
],
|
||||
languageOptions: {
|
||||
globals: { ...globals.node, ...globals.es2022 },
|
||||
},
|
||||
},
|
||||
] satisfies Linter.Config[]
|
||||
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
|
||||
"version": "0.0.0",
|
||||
"npmClient": "pnpm"
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
{
|
||||
"targetDefaults": {
|
||||
"build": {
|
||||
"cache": true,
|
||||
"dependsOn": [
|
||||
"^install"
|
||||
],
|
||||
"outputs": [
|
||||
"{projectRoot}/browser/dist",
|
||||
"{projectRoot}/client/dist",
|
||||
"{projectRoot}/server/dist",
|
||||
"{projectRoot}/rpc/dist"
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
+12
-14
@@ -4,37 +4,35 @@
|
||||
"!cli"
|
||||
],
|
||||
"scripts": {
|
||||
"lint": "eslint --c .eslintrc.yaml --ext .ts browser/ client/ server/ shared-types/",
|
||||
|
||||
"lint": "eslint . --config eslint.config.ts",
|
||||
"_____build": "echo build",
|
||||
"build:browser": "cd browser && pnpm build",
|
||||
"build:client": "cd client && pnpm build",
|
||||
"build:server": "cd server && pnpm build",
|
||||
"build:rpc": "cd rpc pnpm build",
|
||||
"build": "pnpm rebuild:browser && pnpm rebuild:client && pnpm rebuild:server",
|
||||
|
||||
"build:rpc": "cd rpc && pnpm build",
|
||||
"build": "pnpm build:browser && pnpm build:client && pnpm build:server && pnpm build:rpc",
|
||||
"_____deps": "echo must be ran before lerna commands",
|
||||
"deps:check": "syncpack list-mismatches",
|
||||
"deps:fix": "syncpack fix-mismatches",
|
||||
|
||||
"_____lerna": "echo publish",
|
||||
"lerna:system": "lerna info && lerna list",
|
||||
"lerna:version": "lerna version --no-private",
|
||||
"lerna:build": "lerna run build"
|
||||
"_____publish": "echo publish",
|
||||
"publish:check": "pnpm run deps:check && pnpm run lint",
|
||||
"publish:changeset": "pnpm changeset add",
|
||||
"publish:version": "pnpm changeset version"
|
||||
},
|
||||
"dependencies": {
|
||||
"@changesets/cli": "^2.27.12",
|
||||
"@eslint/js": "^9.19.0",
|
||||
"@microsoft/api-extractor": "^7.49.1",
|
||||
"@ragempcommunity/types-cef": "^2.1.8",
|
||||
"@ragempcommunity/types-client": "^2.1.8",
|
||||
"@ragempcommunity/types-server": "^2.1.8",
|
||||
"@typescript-eslint/eslint-plugin": "^7.13.0",
|
||||
"@typescript-eslint/parser": "^7.13.0",
|
||||
"cli": "^1.0.1",
|
||||
"eslint": "^9.19.0",
|
||||
"lerna": "^8.1.9",
|
||||
"globals": "^15.14.0",
|
||||
"jiti": "^2.4.2",
|
||||
"prettier": "^3.4.2",
|
||||
"tsup": "^8.3.6",
|
||||
"typescript": "^5.7.3",
|
||||
"typescript-eslint": "^8.22.0",
|
||||
"winston": "^3.17.0"
|
||||
},
|
||||
"engines": {
|
||||
|
||||
Generated
+449
-3591
File diff suppressed because it is too large
Load Diff
Vendored
+1
-18
@@ -1,25 +1,8 @@
|
||||
export {}
|
||||
|
||||
interface Mp {
|
||||
trigger(event: string, data?: any): void
|
||||
events: {
|
||||
add(event: string, data: any): void
|
||||
call(event: string, data: any): void
|
||||
callRemote(event: string, data: any): void
|
||||
remove(event: string): void
|
||||
}
|
||||
joaat?: unknown
|
||||
game: {
|
||||
joaat?: unknown
|
||||
}
|
||||
console: {
|
||||
logInfo: (...args: unknown[]) => void
|
||||
}
|
||||
}
|
||||
declare var global: Record<string, (...args: any[]) => unknown>
|
||||
|
||||
declare global {
|
||||
const mp: Mp
|
||||
const global: Record<string, (...args: any[]) => unknown>
|
||||
interface Window {
|
||||
[p: string]: any
|
||||
}
|
||||
|
||||
+11
-1
@@ -2,8 +2,18 @@
|
||||
"private": false,
|
||||
"name": "@entityseven/rage-fw-rpc",
|
||||
"version": "0.2.5",
|
||||
"main": "src/index.ts",
|
||||
"exports": {
|
||||
".": "./src/index.ts"
|
||||
},
|
||||
"publishConfig": {
|
||||
"access": "public",
|
||||
"main": "dist/index.js",
|
||||
"types": "dist/src/index.d.ts",
|
||||
"types": "dist/index.d.ts",
|
||||
"exports": {
|
||||
".": "./dist/index.js"
|
||||
}
|
||||
},
|
||||
"scripts": {
|
||||
"build": "tsup",
|
||||
"start": "npx ./dist create"
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
/// <reference types="@ragempcommunity/types-cef" />
|
||||
|
||||
import { Wrapper } from './wrapper'
|
||||
import {
|
||||
Environment,
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
/// <reference types="@ragempcommunity/types-client" />
|
||||
|
||||
import { Wrapper } from './wrapper'
|
||||
import {
|
||||
Environment,
|
||||
|
||||
+422
-79
@@ -77,7 +77,7 @@ class Rpc extends Wrapper {
|
||||
*
|
||||
* @template CallbackArguments - An array of argument types that the callback function accepts
|
||||
* @template CallbackReturn - The type of the value returned by the callback function
|
||||
* @template EventName - A string representing the event name or union of names
|
||||
* @template EventName - A string or union representing the event name
|
||||
*
|
||||
* @param {EventName} eventName - The name of the event to register the callback for
|
||||
* @param {(...args: CallbackArguments) => CallbackReturn} cb - The callback function that is called when the event is triggered
|
||||
@@ -116,7 +116,7 @@ class Rpc extends Wrapper {
|
||||
/**
|
||||
* Unregisters callback function for a specified event
|
||||
*
|
||||
* @template EventName - A string representing the event name or union of names
|
||||
* @template EventName - A string or union representing the event name
|
||||
*
|
||||
* @param {EventName} eventName - The name of the event to register the callback for
|
||||
*
|
||||
@@ -133,88 +133,69 @@ class Rpc extends Wrapper {
|
||||
Utils.errorUnknownEnvironment(this.environment_)
|
||||
|
||||
delete this.state_[eventName]
|
||||
mp.events.remove(eventName)
|
||||
}
|
||||
|
||||
/**
|
||||
* Calls a client-side event from server or browser
|
||||
* Calls a client-side event from browser or server. Use 'call' to call client from client
|
||||
*
|
||||
* @template Arguments - An array of argument types to be passed to the client event
|
||||
* @template EventName - A string representing the client event name or union of names
|
||||
* @template Return - The type of the value returned by the client event
|
||||
* @template EventName - A string or union representing the client event name
|
||||
*
|
||||
* @param {EventName} eventName - The name of the client event to be called
|
||||
* @param {Arguments} [args] - Optional arguments to pass to the client event
|
||||
* @returns {Promise<Return>} A promise resolving to the return value of the client event
|
||||
* @returns {void}
|
||||
*
|
||||
* @example
|
||||
* // Calls an event on client without specifying a player
|
||||
* callClient<[], string, object>('onDataRequest').then(response => {
|
||||
* console.log(`Received: ${response}`) // ^ object
|
||||
* })
|
||||
* // Calls an event on a client without specifying a player
|
||||
* callClient<[], string, object>('onDataRequest')
|
||||
*/
|
||||
public async callClient<
|
||||
public callClient<
|
||||
Arguments extends unknown[] = unknown[],
|
||||
EventName extends string = string,
|
||||
Return = unknown,
|
||||
>(eventName: EventName, args?: Arguments): Promise<Return>
|
||||
>(eventName: EventName, args?: Arguments): void
|
||||
/**
|
||||
* Calls a client-side event from server or browser
|
||||
* Calls a client-side event from server or server. Use 'call' to call client from client
|
||||
*
|
||||
* @template Arguments - An array of argument types to be passed to the client event
|
||||
* @template EventName - A string representing the client event name or union of names
|
||||
* @template Return - The type of the value returned by the client event
|
||||
* @template EventName - A string or union representing the client event name
|
||||
*
|
||||
* @param {PlayerMp} player - The player for whom the client event is called
|
||||
* @param {EventName} eventName - The name of the client event to be called
|
||||
* @param {Arguments} [args] - Optional arguments to pass to the client event
|
||||
* @returns {Promise<Return>} A promise resolving to the return value of the client event
|
||||
* @returns {void} A promise resolving to the return value of the client event
|
||||
*
|
||||
* @example
|
||||
* // Calls an event on client for a specific player
|
||||
* callClient<[string, number], string, boolean>(player, 'onPlayerAction', ['jump', 2]).then(result => {
|
||||
* console.log(`Action success: ${result}`) // ^ boolean
|
||||
* })
|
||||
* // Calls an event on a client for a specific player
|
||||
* callClient<[string, number], string, boolean>(player, 'onPlayerAction', ['jump', 2])
|
||||
*/
|
||||
public async callClient<
|
||||
public callClient<
|
||||
Arguments extends unknown[] = unknown[],
|
||||
EventName extends string = string,
|
||||
Return = unknown,
|
||||
>(player: PlayerMp, eventName: EventName, args?: Arguments): Promise<Return>
|
||||
public async callClient(
|
||||
>(player: PlayerMp, eventName: EventName, args?: Arguments): void
|
||||
public callClient(
|
||||
playerOrEventName: PlayerMp | string,
|
||||
eventNameOrArgs?: string | unknown[],
|
||||
args?: unknown[],
|
||||
) {
|
||||
_is1StParamPlayer(playerOrEventName)
|
||||
? this.log(
|
||||
if (_is1StParamPlayer(playerOrEventName)) {
|
||||
this.log(
|
||||
'callClient',
|
||||
eventNameOrArgs as string,
|
||||
playerOrEventName,
|
||||
eventNameOrArgs,
|
||||
args,
|
||||
)
|
||||
: this.log(
|
||||
'callClient',
|
||||
playerOrEventName as string,
|
||||
eventNameOrArgs,
|
||||
)
|
||||
} else {
|
||||
this.log('callClient', playerOrEventName as string, eventNameOrArgs)
|
||||
}
|
||||
|
||||
if (this.forceBrowserDevMode_) return
|
||||
Utils.errorUnknownEnvironment(this.environment_)
|
||||
|
||||
function _is1StParamPlayer(x: unknown): x is PlayerMp {
|
||||
return typeof x === 'object'
|
||||
}
|
||||
|
||||
function _is2NdParamEventName(x: unknown): x is string {
|
||||
return typeof x === 'string'
|
||||
}
|
||||
|
||||
if (this.environment_ === Environment.CLIENT) {
|
||||
// client
|
||||
return await this.call(
|
||||
playerOrEventName as string,
|
||||
args as unknown[],
|
||||
)
|
||||
this.call(playerOrEventName as string, args as unknown[])
|
||||
}
|
||||
|
||||
// server
|
||||
@@ -236,7 +217,6 @@ class Rpc extends Wrapper {
|
||||
const dataRaw = Utils.prepareTransfer(state)
|
||||
|
||||
playerOrEventName.call(Events.LOCAL_EVENT_LISTENER, [dataRaw])
|
||||
return (await this.responseHandler(state.uuid)).data
|
||||
}
|
||||
|
||||
// browser
|
||||
@@ -258,15 +238,213 @@ class Rpc extends Wrapper {
|
||||
const dataRaw = Utils.prepareTransfer(state)
|
||||
|
||||
mp.trigger(Events.LOCAL_EVENT_LISTENER, dataRaw)
|
||||
return (await this.responseHandler(state.uuid)).data
|
||||
}
|
||||
|
||||
function _is1StParamPlayer(x: unknown): x is PlayerMp {
|
||||
return typeof x === 'object'
|
||||
}
|
||||
|
||||
function _is2NdParamEventName(x: unknown): x is string {
|
||||
return typeof x === 'string'
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Calls a server-side event from browser or client
|
||||
* Calls an asynchronous client-side event from server or browser, expecting a response. Use 'callAsync' to call client from client
|
||||
*
|
||||
* @template Arguments - An array of argument types to be passed to the client event
|
||||
* @template EventName - A string or union representing the client event name
|
||||
* @template Return - The type of the value returned by the client event
|
||||
*
|
||||
* @param {EventName} eventName - The name of the client event to be called
|
||||
* @param {Arguments} [args] - Optional arguments to pass to the client event
|
||||
* @returns {Promise<Return>} A promise resolving to the return value of the client event
|
||||
*
|
||||
* @example
|
||||
* // Calls an event on a client without specifying a player
|
||||
* callClient<[], string, object>('onDataRequest').then(response => {
|
||||
* console.log(`Received: ${response}`) // ^ object
|
||||
* })
|
||||
*/
|
||||
public async callClientAsync<
|
||||
Arguments extends unknown[] = unknown[],
|
||||
EventName extends string = string,
|
||||
Return = unknown,
|
||||
>(eventName: EventName, args?: Arguments): Promise<Return>
|
||||
/**
|
||||
* Calls an asynchronous client-side event from server or browser, expecting a response. Use 'callAsync' to call client from client
|
||||
*
|
||||
* @template Arguments - An array of argument types to be passed to the client event
|
||||
* @template EventName - A string or union representing the client event name
|
||||
* @template Return - The type of the value returned by the client event
|
||||
*
|
||||
* @param {PlayerMp} player - The player for whom the client event is called
|
||||
* @param {EventName} eventName - The name of the client event to be called
|
||||
* @param {Arguments} [args] - Optional arguments to pass to the client event
|
||||
* @returns {Promise<Return>} A promise resolving to the return value of the client event
|
||||
*
|
||||
* @example
|
||||
* // Calls an event on a client for a specific player
|
||||
* callClient<[string, number], string, boolean>(player, 'onPlayerAction', ['jump', 2]).then(result => {
|
||||
* console.log(`Action success: ${result}`) // ^ boolean
|
||||
* })
|
||||
*/
|
||||
public async callClientAsync<
|
||||
Arguments extends unknown[] = unknown[],
|
||||
EventName extends string = string,
|
||||
Return = unknown,
|
||||
>(player: PlayerMp, eventName: EventName, args?: Arguments): Promise<Return>
|
||||
public async callClientAsync(
|
||||
playerOrEventName: PlayerMp | string,
|
||||
eventNameOrArgs?: string | unknown[],
|
||||
args?: unknown[],
|
||||
) {
|
||||
if (_is1StParamPlayer(playerOrEventName)) {
|
||||
this.log(
|
||||
'callClientAsync',
|
||||
eventNameOrArgs as string,
|
||||
playerOrEventName,
|
||||
eventNameOrArgs,
|
||||
args,
|
||||
)
|
||||
} else {
|
||||
this.log(
|
||||
'callClientAsync',
|
||||
playerOrEventName as string,
|
||||
eventNameOrArgs,
|
||||
)
|
||||
}
|
||||
|
||||
if (this.forceBrowserDevMode_) return
|
||||
Utils.errorUnknownEnvironment(this.environment_)
|
||||
|
||||
if (this.environment_ === Environment.CLIENT) {
|
||||
// client
|
||||
return await this.callAsync(
|
||||
playerOrEventName as string,
|
||||
args as unknown[],
|
||||
)
|
||||
}
|
||||
|
||||
// server
|
||||
if (
|
||||
this.environment_ === Environment.SERVER &&
|
||||
_is1StParamPlayer(playerOrEventName) &&
|
||||
_is2NdParamEventName(eventNameOrArgs)
|
||||
) {
|
||||
let state: RPCState = {
|
||||
uuid: Utils.generateUUID(),
|
||||
eventName: eventNameOrArgs,
|
||||
calledTo: Environment.CLIENT,
|
||||
calledFrom: this.environment_,
|
||||
knownError: undefined,
|
||||
data: args as unknown[],
|
||||
type: RPCEventType.EVENT,
|
||||
}
|
||||
|
||||
const dataRaw = Utils.prepareTransfer(state)
|
||||
|
||||
playerOrEventName.call(Events.LOCAL_EVENT_LISTENER, [dataRaw])
|
||||
|
||||
return await this.responseHandler(state.uuid)
|
||||
.then(r => r.data)
|
||||
.catch((e: string) => {
|
||||
state.knownError = e
|
||||
return this.triggerError_(state)
|
||||
})
|
||||
}
|
||||
|
||||
// browser
|
||||
if (
|
||||
this.environment_ === Environment.BROWSER &&
|
||||
!_is1StParamPlayer(playerOrEventName) &&
|
||||
!_is2NdParamEventName(eventNameOrArgs)
|
||||
) {
|
||||
const state: RPCState = {
|
||||
uuid: Utils.generateUUID(),
|
||||
eventName: playerOrEventName,
|
||||
calledTo: Environment.CLIENT,
|
||||
calledFrom: this.environment_,
|
||||
knownError: undefined,
|
||||
data: eventNameOrArgs,
|
||||
type: RPCEventType.EVENT,
|
||||
}
|
||||
|
||||
const dataRaw = Utils.prepareTransfer(state)
|
||||
|
||||
mp.trigger(Events.LOCAL_EVENT_LISTENER, dataRaw)
|
||||
|
||||
return await this.responseHandler(state.uuid)
|
||||
.then(r => r.data)
|
||||
.catch((e: string) => {
|
||||
state.knownError = e
|
||||
return this.triggerError_(state)
|
||||
})
|
||||
}
|
||||
|
||||
function _is1StParamPlayer(x: unknown): x is PlayerMp {
|
||||
return typeof x === 'object'
|
||||
}
|
||||
|
||||
function _is2NdParamEventName(x: unknown): x is string {
|
||||
return typeof x === 'string'
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Calls a server-side event from browser or client. Use 'call' to call server from server
|
||||
*
|
||||
* @template Arguments - An array of argument types to be passed to the server event
|
||||
* @template EventName - A string representing the server event name or union of names
|
||||
* @template EventName - A string or union representing the server event name
|
||||
*
|
||||
* @param {EventName} eventName - The name of the server event to be called
|
||||
* @param {Arguments} [args] - Optional arguments to pass to the server event
|
||||
* @returns {void}
|
||||
*
|
||||
* @example
|
||||
* // Calls an event on a server
|
||||
* callServer<[], string, object>('onDataRequest')
|
||||
*/
|
||||
public callServer<
|
||||
Arguments extends unknown[] = unknown[],
|
||||
EventName extends string = string,
|
||||
>(eventName: EventName, args?: Arguments): void {
|
||||
this.log('callServer', eventName, args)
|
||||
if (this.forceBrowserDevMode_) return
|
||||
Utils.errorUnknownEnvironment(this.environment_)
|
||||
|
||||
const state: RPCState = {
|
||||
uuid: Utils.generateUUID(),
|
||||
eventName,
|
||||
calledTo: Environment.SERVER,
|
||||
calledFrom: this.environment_,
|
||||
knownError: undefined,
|
||||
data: args,
|
||||
type: RPCEventType.EVENT,
|
||||
}
|
||||
|
||||
const dataRaw = Utils.prepareTransfer(state)
|
||||
|
||||
switch (this.environment_) {
|
||||
case Environment.SERVER:
|
||||
this.callSelf(state)
|
||||
break
|
||||
|
||||
case Environment.CLIENT:
|
||||
mp.events.callRemote(Events.LOCAL_EVENT_LISTENER, dataRaw)
|
||||
break
|
||||
|
||||
case Environment.BROWSER:
|
||||
mp.trigger(Events.LOCAL_EVENT_LISTENER, dataRaw)
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Calls an asynchronous server-side event from browser or client, expecting a response. Use 'callAsync' to call server from server
|
||||
*
|
||||
* @template Arguments - An array of argument types to be passed to the server event
|
||||
* @template EventName - A string or union representing the server event name
|
||||
* @template Return - The type of the value returned by the server event
|
||||
*
|
||||
* @param {EventName} eventName - The name of the server event to be called
|
||||
@@ -274,17 +452,17 @@ class Rpc extends Wrapper {
|
||||
* @returns {Promise<Return>} A promise resolving to the return value of the server event
|
||||
*
|
||||
* @example
|
||||
* // Calls an event on server
|
||||
* // Calls an event on a server
|
||||
* callServer<[], string, object>('onDataRequest').then(response => {
|
||||
* console.log(`Received: ${response}`) // ^ object
|
||||
* })
|
||||
*/
|
||||
public async callServer<
|
||||
public async callServerAsync<
|
||||
Arguments extends unknown[] = unknown[],
|
||||
EventName extends string = string,
|
||||
Return = unknown,
|
||||
>(eventName: EventName, args?: Arguments): Promise<Return> {
|
||||
this.log('callServer', eventName, args)
|
||||
this.log('callServerAsync', eventName, args)
|
||||
if (this.forceBrowserDevMode_)
|
||||
return undefined as unknown as Promise<Return>
|
||||
Utils.errorUnknownEnvironment(this.environment_)
|
||||
@@ -303,7 +481,7 @@ class Rpc extends Wrapper {
|
||||
|
||||
switch (this.environment_) {
|
||||
case Environment.SERVER:
|
||||
return this.callSelf(state)
|
||||
return this.callSelfAsync(state)
|
||||
|
||||
case Environment.CLIENT:
|
||||
mp.events.callRemote(Events.LOCAL_EVENT_LISTENER, dataRaw)
|
||||
@@ -314,14 +492,122 @@ class Rpc extends Wrapper {
|
||||
break
|
||||
}
|
||||
|
||||
return (await this.responseHandler(state.uuid)).data
|
||||
return await this.responseHandler(state.uuid)
|
||||
.then(r => r.data)
|
||||
.catch((e: string) => {
|
||||
state.knownError = e
|
||||
return this.triggerError_(state)
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* Calls a browser-side event from server or client
|
||||
* Calls a browser-side event from client or server. Use 'call' to call browser from browser
|
||||
*
|
||||
* @template Arguments - An array of argument types to be passed to the browser event
|
||||
* @template EventName - A string or union representing the browser event name
|
||||
*
|
||||
* @param {EventName} eventName - The name of the browser event to be called
|
||||
* @param {Arguments} [args] - Optional arguments to pass to the browser event
|
||||
* @returns {void}
|
||||
*
|
||||
* @example
|
||||
* // Calls an event on a browser without specifying a player
|
||||
* callBrowser<[], string, object>('onDataRequest')
|
||||
*/
|
||||
public callBrowser<
|
||||
Arguments extends unknown[] = unknown[],
|
||||
EventName extends string = string,
|
||||
>(eventName: EventName, args?: Arguments): void
|
||||
/**
|
||||
* Calls a browser-side event from client or server. Use 'call' to call browser from browser
|
||||
*
|
||||
* @template Arguments - An array of argument types to be passed to the browser event
|
||||
* @template EventName - A string representing the browser event name or union of names
|
||||
*
|
||||
* @param {PlayerMp} player - The player for whom the browser event is called
|
||||
* @param {EventName} eventName - The name of the browser event to be called
|
||||
* @param {Arguments} [args] - Optional arguments to pass to the browser event
|
||||
* @returns {void}
|
||||
*
|
||||
* @example
|
||||
* // Calls an event on a browser for a specific player
|
||||
* callBrowser<[string, number], string, boolean>(player, 'onPlayerAction', ['jump', 2])
|
||||
*/
|
||||
public callBrowser<
|
||||
Arguments extends unknown[] = unknown[],
|
||||
EventName extends string = string,
|
||||
>(player: PlayerMp, eventName: EventName, args?: Arguments): void
|
||||
public callBrowser(
|
||||
playerOrEventName: PlayerMp | string,
|
||||
eventNameOrArgs?: string | unknown[],
|
||||
args?: unknown[],
|
||||
) {
|
||||
if (_is1StParamPlayer(playerOrEventName)) {
|
||||
this.log(
|
||||
'callBrowser',
|
||||
eventNameOrArgs as string,
|
||||
playerOrEventName,
|
||||
eventNameOrArgs,
|
||||
args,
|
||||
)
|
||||
} else {
|
||||
this.log(
|
||||
'callBrowser',
|
||||
playerOrEventName as string,
|
||||
eventNameOrArgs,
|
||||
)
|
||||
}
|
||||
|
||||
if (this.forceBrowserDevMode_) return
|
||||
Utils.errorUnknownEnvironment(this.environment_)
|
||||
|
||||
const state: RPCState = {
|
||||
uuid: Utils.generateUUID(),
|
||||
eventName: !_is1StParamPlayer(playerOrEventName)
|
||||
? playerOrEventName
|
||||
: _is2NdParamEventName(eventNameOrArgs)
|
||||
? eventNameOrArgs
|
||||
: '',
|
||||
calledTo: Environment.BROWSER,
|
||||
calledFrom: this.environment_,
|
||||
knownError: undefined,
|
||||
data: _is1StParamPlayer(playerOrEventName) ? args : eventNameOrArgs,
|
||||
type: RPCEventType.EVENT,
|
||||
}
|
||||
|
||||
const dataRaw = Utils.prepareTransfer(state)
|
||||
|
||||
switch (this.environment_) {
|
||||
case Environment.BROWSER:
|
||||
this.callSelf(state)
|
||||
break
|
||||
|
||||
case Environment.CLIENT:
|
||||
mp.events.callRemote(Events.LOCAL_EVENT_LISTENER, dataRaw)
|
||||
break
|
||||
|
||||
case Environment.SERVER:
|
||||
;(playerOrEventName as PlayerMp).call(
|
||||
Events.LOCAL_EVENT_LISTENER,
|
||||
[dataRaw],
|
||||
)
|
||||
break
|
||||
}
|
||||
|
||||
function _is1StParamPlayer(x: unknown): x is PlayerMp {
|
||||
return typeof x === 'object'
|
||||
}
|
||||
|
||||
function _is2NdParamEventName(x: unknown): x is string {
|
||||
return typeof x === 'string'
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Calls an asynchronous browser-side event from client or server, expecting response. Use 'callAsync' to call browser from browser
|
||||
*
|
||||
* @template Arguments - An array of argument types to be passed to the browser event
|
||||
* @template EventName - A string or union representing the browser event name
|
||||
* @template Return - The type of the value returned by the browser event
|
||||
*
|
||||
* @param {EventName} eventName - The name of the browser event to be called
|
||||
@@ -329,18 +615,18 @@ class Rpc extends Wrapper {
|
||||
* @returns {Promise<Return>} A promise resolving to the return value of the browser event
|
||||
*
|
||||
* @example
|
||||
* // Calls an event on browser without specifying a player
|
||||
* // Calls an event on a browser without specifying a player
|
||||
* callBrowser<[], string, object>('onDataRequest').then(response => {
|
||||
* console.log(`Received: ${response}`) // ^ object
|
||||
* })
|
||||
*/
|
||||
public async callBrowser<
|
||||
public async callBrowserAsync<
|
||||
Arguments extends unknown[] = unknown[],
|
||||
EventName extends string = string,
|
||||
Return = unknown,
|
||||
>(eventName: EventName, args?: Arguments): Promise<Return>
|
||||
/**
|
||||
* Calls a browser-side event from server or client
|
||||
* Calls an asynchronous browser-side event from client or server, expecting response. Use 'callAsync' to call browser from browser
|
||||
*
|
||||
* @template Arguments - An array of argument types to be passed to the browser event
|
||||
* @template EventName - A string representing the browser event name or union of names
|
||||
@@ -352,45 +638,40 @@ class Rpc extends Wrapper {
|
||||
* @returns {Promise<Return>} A promise resolving to the return value of the browser event
|
||||
*
|
||||
* @example
|
||||
* // Calls an event on a browser for a specific player
|
||||
* // Calls an asynchronous event on a browser for a specific player
|
||||
* callBrowser<[string, number], string, boolean>(player, 'onPlayerAction', ['jump', 2]).then(result => {
|
||||
* console.log(`Action success: ${result}`) // ^ boolean
|
||||
* })
|
||||
*/
|
||||
public async callBrowser<
|
||||
public async callBrowserAsync<
|
||||
Arguments extends unknown[] = unknown[],
|
||||
EventName extends string = string,
|
||||
Return = unknown,
|
||||
>(player: PlayerMp, eventName: EventName, args?: Arguments): Promise<Return>
|
||||
public async callBrowser(
|
||||
public async callBrowserAsync(
|
||||
playerOrEventName: PlayerMp | string,
|
||||
eventNameOrArgs?: string | unknown[],
|
||||
args?: unknown[],
|
||||
) {
|
||||
_is1StParamPlayer(playerOrEventName)
|
||||
? this.log(
|
||||
'DEV callClient',
|
||||
if (_is1StParamPlayer(playerOrEventName)) {
|
||||
this.log(
|
||||
'callBrowserAsync',
|
||||
eventNameOrArgs as string,
|
||||
playerOrEventName,
|
||||
eventNameOrArgs,
|
||||
args,
|
||||
)
|
||||
: this.log(
|
||||
'DEV callClient',
|
||||
} else {
|
||||
this.log(
|
||||
'callBrowserAsync',
|
||||
playerOrEventName as string,
|
||||
eventNameOrArgs,
|
||||
)
|
||||
}
|
||||
|
||||
if (this.forceBrowserDevMode_) return
|
||||
Utils.errorUnknownEnvironment(this.environment_)
|
||||
|
||||
function _is1StParamPlayer(x: unknown): x is PlayerMp {
|
||||
return typeof x === 'object'
|
||||
}
|
||||
|
||||
function _is2NdParamEventName(x: unknown): x is string {
|
||||
return typeof x === 'string'
|
||||
}
|
||||
|
||||
const state: RPCState = {
|
||||
uuid: Utils.generateUUID(),
|
||||
eventName: !_is1StParamPlayer(playerOrEventName)
|
||||
@@ -423,14 +704,62 @@ class Rpc extends Wrapper {
|
||||
break
|
||||
}
|
||||
|
||||
return (await this.responseHandler(state.uuid)).data
|
||||
return await this.responseHandler(state.uuid)
|
||||
.then(r => r.data)
|
||||
.catch((e: string) => {
|
||||
state.knownError = e
|
||||
return this.triggerError_(state)
|
||||
})
|
||||
|
||||
function _is1StParamPlayer(x: unknown): x is PlayerMp {
|
||||
return typeof x === 'object'
|
||||
}
|
||||
|
||||
function _is2NdParamEventName(x: unknown): x is string {
|
||||
return typeof x === 'string'
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Calls an event in current environment
|
||||
*
|
||||
* @template Arguments - An array of argument types to be passed to the event
|
||||
* @template EventName - A string representing the event name or union of names
|
||||
* @template EventName - A string or union representing the event name
|
||||
*
|
||||
* @param {EventName} eventName - The name of the event to be called
|
||||
* @param {Arguments} [args] - Optional arguments to pass to the event
|
||||
* @returns {void}
|
||||
*
|
||||
* @example
|
||||
* // Calls an event in current environment
|
||||
* call<[], string>('getSomething')
|
||||
*/
|
||||
public call<
|
||||
Arguments extends unknown[] = unknown[],
|
||||
EventName extends string = string,
|
||||
>(eventName: EventName, args?: Arguments): void {
|
||||
this.log('call', eventName, args)
|
||||
if (this.forceBrowserDevMode_) return
|
||||
Utils.errorUnknownEnvironment(this.environment_)
|
||||
|
||||
const state: RPCState = {
|
||||
uuid: Utils.generateUUID(),
|
||||
eventName,
|
||||
calledTo: this.environment_,
|
||||
calledFrom: this.environment_,
|
||||
knownError: undefined,
|
||||
data: args,
|
||||
type: RPCEventType.EVENT,
|
||||
}
|
||||
|
||||
this.callSelf(state)
|
||||
}
|
||||
|
||||
/**
|
||||
* Calls an asynchronous event in current environment, expecting a response
|
||||
*
|
||||
* @template Arguments - An array of argument types to be passed to the event
|
||||
* @template EventName - A string or union representing the event name
|
||||
* @template Return - The type of the value returned by the event
|
||||
*
|
||||
* @param {EventName} eventName - The name of the event to be called
|
||||
@@ -443,12 +772,12 @@ class Rpc extends Wrapper {
|
||||
* console.log(`Received: ${response}`) // ^ number
|
||||
* })
|
||||
*/
|
||||
public async call<
|
||||
public async callAsync<
|
||||
Arguments extends unknown[] = unknown[],
|
||||
EventName extends string = string,
|
||||
Return = unknown,
|
||||
>(eventName: EventName, args?: Arguments): Promise<Return> {
|
||||
this.log('call', eventName, args)
|
||||
this.log('callAsync', eventName, args)
|
||||
if (this.forceBrowserDevMode_)
|
||||
return undefined as unknown as Promise<Return>
|
||||
Utils.errorUnknownEnvironment(this.environment_)
|
||||
@@ -463,13 +792,27 @@ class Rpc extends Wrapper {
|
||||
type: RPCEventType.EVENT,
|
||||
}
|
||||
|
||||
return await this.callSelf<Return>(state)
|
||||
return await this.callSelfAsync<Return>(state)
|
||||
}
|
||||
|
||||
/**
|
||||
* redirects an event in cases of it calling its own environment
|
||||
*/
|
||||
private async callSelf<Return = unknown>(state: RPCState): Promise<Return> {
|
||||
private callSelf(state: RPCState): void {
|
||||
state = this.verifyEvent_(state)
|
||||
if (state.knownError) {
|
||||
this.triggerError_(state, state.knownError)
|
||||
}
|
||||
|
||||
this.state_[state.eventName](...state.data)
|
||||
}
|
||||
|
||||
/**
|
||||
* redirects an asynchronous event in cases of it calling its own environment
|
||||
*/
|
||||
private async callSelfAsync<Return = unknown>(
|
||||
state: RPCState,
|
||||
): Promise<Return> {
|
||||
state = this.verifyEvent_(state)
|
||||
if (state.knownError) {
|
||||
this.triggerError_(state, state.knownError)
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
/// <reference types="@ragempcommunity/types-server" />
|
||||
|
||||
import { Wrapper } from './wrapper'
|
||||
import {
|
||||
type PlayerMp,
|
||||
|
||||
+5
-17
@@ -1,30 +1,18 @@
|
||||
{
|
||||
"$schema": "https://json.schemastore.org/tsconfig",
|
||||
"display": "RPC",
|
||||
"compilerOptions": {
|
||||
"target": "es6",
|
||||
"module": "commonjs",
|
||||
"moduleResolution": "node",
|
||||
"lib": [
|
||||
"ES6",
|
||||
"es2022",
|
||||
"dom"
|
||||
],
|
||||
"declaration": true,
|
||||
"declarationMap": true,
|
||||
"sourceMap": true,
|
||||
|
||||
"outDir": "bin",
|
||||
"esModuleInterop": true,
|
||||
|
||||
"strict": true,
|
||||
"forceConsistentCasingInFileNames": true,
|
||||
"noImplicitAny": true,
|
||||
"skipLibCheck": true
|
||||
},
|
||||
"include": [
|
||||
"src/**/*",
|
||||
"./index.d.ts"
|
||||
"src"
|
||||
],
|
||||
"exclude": [
|
||||
"node_modules",
|
||||
"dist"
|
||||
]
|
||||
"extends": ["../tsconfig.ragefw.json"]
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
Custom Attribution-NoDerivs Software License
|
||||
Custom Attribution-NoDerives Software License
|
||||
|
||||
Copyright (c) 2024 Entity Seven Group
|
||||
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
".": "./src/index.ts"
|
||||
},
|
||||
"publishConfig": {
|
||||
"access": "public",
|
||||
"main": "dist/index.js",
|
||||
"types": "dist/index.d.ts",
|
||||
"exports": {
|
||||
|
||||
@@ -3,9 +3,9 @@ import winston, { format } from 'winston'
|
||||
const { timestamp, printf, colorize } = format
|
||||
|
||||
/** Used to log in a server console */
|
||||
export class Logger {
|
||||
export class FW_Logger {
|
||||
private format = printf(({ message, level }) => {
|
||||
return `[${new Date().toLocaleTimeString()}] [${level}]: ${message}`
|
||||
return `[${new Date().toLocaleTimeString(undefined, { hour: 'numeric', minute: 'numeric', second: 'numeric', fractionalSecondDigits: 2 })}] [${level}]: ${message}`
|
||||
})
|
||||
|
||||
private systemLogger = winston.createLogger({
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
import type * as T from '../types'
|
||||
|
||||
export class Middleware {
|
||||
export class FW_Middleware {
|
||||
constructor() {}
|
||||
|
||||
private static async execute<EventName extends T.RageFW_ServerEvent>(
|
||||
middlewares: T.RageFW_MiddlewareFunction<EventName>[],
|
||||
args: T.RageFW_ServerArgs<EventName>,
|
||||
): Promise<T.RageFW_MiddlewareResponseInternal> {
|
||||
private static async execute<EventName extends T.FW_ServerEvent>(
|
||||
middlewares: T.FW_MiddlewareFunction<EventName>[],
|
||||
args: T.FW_ServerArgs<EventName>,
|
||||
): Promise<T.FW_MiddlewareResponseInternal> {
|
||||
for (let i = 0; i < middlewares.length; i++) {
|
||||
const result = await middlewares[i](...args)
|
||||
|
||||
@@ -21,20 +21,20 @@ export class Middleware {
|
||||
}
|
||||
}
|
||||
|
||||
public static async process<EventName extends T.RageFW_ServerEvent>(
|
||||
middlewareOptions: T.RageFW_MiddlewareOptions<EventName>,
|
||||
callback: T.RageFW_ServerCallback<EventName>,
|
||||
args: T.RageFW_ServerArgs<EventName>,
|
||||
public static async process<EventName extends T.FW_ServerEvent>(
|
||||
middlewareOptions: T.FW_MiddlewareOptions<EventName>,
|
||||
callback: T.FW_ServerCallback<EventName>,
|
||||
args: T.FW_ServerArgs<EventName>,
|
||||
) {
|
||||
if (Array.isArray(middlewareOptions)) {
|
||||
const middlewaresResponse = await Middleware.execute(
|
||||
const middlewaresResponse = await FW_Middleware.execute(
|
||||
middlewareOptions,
|
||||
args,
|
||||
)
|
||||
|
||||
if (middlewaresResponse.success) return await callback(...args)
|
||||
} else {
|
||||
const middlewaresResponse = await Middleware.execute(
|
||||
const middlewaresResponse = await FW_Middleware.execute(
|
||||
middlewareOptions.executables,
|
||||
args,
|
||||
)
|
||||
|
||||
+80
-15
@@ -2,15 +2,45 @@ import { rpc } from './rpc'
|
||||
import type * as T from '../types'
|
||||
|
||||
/** Handles event manipulations that require player to be present in context */
|
||||
export class Player {
|
||||
export class FW_Player {
|
||||
/**
|
||||
* Triggers a client event from the server with arguments from shared types
|
||||
* Triggers a client event from the server with arguments from 'rage-fw-shared-types'
|
||||
*
|
||||
* Formerly known as ``callClient`` or ``emitClient``
|
||||
*
|
||||
* @param {PlayerMp} player - Player object as an event target
|
||||
* @param eventName - The name of the client event to trigger
|
||||
* @param [args] - Arguments for the client event, if present
|
||||
* @returns {void}
|
||||
*
|
||||
* @example
|
||||
* // Triggering a client event without arguments
|
||||
* fw.player.triggerClient("clientEventName")
|
||||
*
|
||||
* @example
|
||||
* // Triggering a client event with arguments
|
||||
* fw.player.triggerClient("clientEventName", ["message to client"])
|
||||
*
|
||||
* @see {@link https://git.entityseven.com/entityseven/rage-framework/wiki Wiki}
|
||||
*/
|
||||
public triggerClient<EventName extends T.FW_ClientEvent>(
|
||||
player: PlayerMp,
|
||||
eventName: EventName,
|
||||
...args: T._ClientEventHasArgs<EventName> extends true
|
||||
? [T.FW_ClientArgs<EventName>]
|
||||
: []
|
||||
): void {
|
||||
rpc.callClient<typeof args, EventName>(player, eventName, args)
|
||||
}
|
||||
|
||||
/**
|
||||
* Triggers an asynchronous client event from the server with arguments from 'rage-fw-shared-types', and expects to receive a response from an event
|
||||
*
|
||||
* Formerly known as ``callClientAsync`` or ``emitClientAsync``
|
||||
*
|
||||
* @param {PlayerMp} player - Player object as an event target
|
||||
* @param eventName - The name of the client event to trigger
|
||||
* @param [args] - Arguments for the client event, if present
|
||||
* @returns {Promise} resolving to the client's response for the event
|
||||
*
|
||||
* @example
|
||||
@@ -23,25 +53,29 @@ export class Player {
|
||||
*
|
||||
* @see {@link https://git.entityseven.com/entityseven/rage-framework/wiki Wiki}
|
||||
*/
|
||||
public async triggerClient<EventName extends T.RageFW_ClientEvent>(
|
||||
public async triggerClientAsync<EventName extends T.FW_ClientEvent>(
|
||||
player: PlayerMp,
|
||||
eventName: EventName,
|
||||
...args: T._ClientEventHasArgs<EventName> extends true
|
||||
? [T.RageFW_ClientArgs<EventName>]
|
||||
? [T.FW_ClientArgs<EventName>]
|
||||
: []
|
||||
): Promise<T.RageFW_ClientReturn<EventName>> {
|
||||
return await rpc.callClient(player, eventName, args)
|
||||
): Promise<T.FW_ClientReturn<EventName>> {
|
||||
return await rpc.callClientAsync<
|
||||
typeof args,
|
||||
EventName,
|
||||
T.FW_ClientReturn<EventName>
|
||||
>(player, eventName, args)
|
||||
}
|
||||
|
||||
/**
|
||||
* Triggers a browser event from the server with arguments from shared types
|
||||
* Triggers a browser event from the server with arguments from 'rage-fw-shared-types'
|
||||
*
|
||||
* Formerly known as ``callBrowser`` or ``emitBrowser``
|
||||
*
|
||||
* @param {PlayerMp} player - Player object as an event target
|
||||
* @param eventName - The name of the browser event to trigger
|
||||
* @param [args] - Arguments for the browser event, if present
|
||||
* @returns {Promise} resolving to the browser's response for the event
|
||||
* @returns {void}
|
||||
*
|
||||
* @example
|
||||
* // Triggering a browser event without arguments
|
||||
@@ -53,16 +87,47 @@ export class Player {
|
||||
*
|
||||
* @see {@link https://git.entityseven.com/entityseven/rage-framework/wiki Wiki}
|
||||
*/
|
||||
public async triggerBrowser<EventName extends T.RageFW_BrowserEvent>(
|
||||
public triggerBrowser<EventName extends T.FW_BrowserEvent>(
|
||||
player: PlayerMp,
|
||||
eventName: EventName,
|
||||
...args: T._BrowserEventHasArgs<EventName> extends true
|
||||
? [T.RageFW_BrowserArgs<EventName>]
|
||||
? [T.FW_BrowserArgs<EventName>]
|
||||
: []
|
||||
): Promise<T.RageFW_BrowserReturn<EventName>> {
|
||||
return await rpc.callBrowser(player, eventName, args)
|
||||
}
|
||||
): void {
|
||||
rpc.callBrowser<typeof args, EventName>(player, eventName, args)
|
||||
}
|
||||
|
||||
// new Player().triggerBrowser({} as PlayerMp, 'customCefEvent', ['', 1])
|
||||
// new Player().triggerClient({} as PlayerMp, 'customClientEvent', ['', 1])
|
||||
/**
|
||||
* Triggers an asynchronous browser event from the server with arguments from 'rage-fw-shared-types', and expects to receive a response from an event
|
||||
*
|
||||
* Formerly known as ``callBrowserAsync`` or ``emitBrowserAsync``
|
||||
*
|
||||
* @param {PlayerMp} player - Player object as an event target
|
||||
* @param eventName - The name of the browser event to trigger
|
||||
* @param [args] - Arguments for the browser event, if present
|
||||
* @returns {Promise} resolving to the browser's response for the event
|
||||
*
|
||||
* @example
|
||||
* // Triggering a browser event without arguments
|
||||
* fw.player.triggerBrowserAsync("browserEventName")
|
||||
*
|
||||
* @example
|
||||
* // Triggering a browser event with arguments
|
||||
* fw.player.triggerBrowserAsync("browserEventName", ["message to browser"])
|
||||
*
|
||||
* @see {@link https://git.entityseven.com/entityseven/rage-framework/wiki Wiki}
|
||||
*/
|
||||
public async triggerBrowserAsync<EventName extends T.FW_BrowserEvent>(
|
||||
player: PlayerMp,
|
||||
eventName: EventName,
|
||||
...args: T._BrowserEventHasArgs<EventName> extends true
|
||||
? [T.FW_BrowserArgs<EventName>]
|
||||
: []
|
||||
): Promise<T.FW_BrowserReturn<EventName>> {
|
||||
return await rpc.callBrowserAsync<
|
||||
typeof args,
|
||||
EventName,
|
||||
T.FW_BrowserReturn<EventName>
|
||||
>(player, eventName, args)
|
||||
}
|
||||
}
|
||||
|
||||
+14
-18
@@ -1,9 +1,9 @@
|
||||
import { rpc } from './rpc'
|
||||
import { Middleware } from './middleware'
|
||||
import { FW_Middleware } from './middleware'
|
||||
import type * as T from '../types'
|
||||
|
||||
/** Server-side interactions */
|
||||
export class Server {
|
||||
export class FW_Server {
|
||||
/**
|
||||
* Registers a server event with an associated callback
|
||||
*
|
||||
@@ -11,7 +11,7 @@ export class Server {
|
||||
* @param callback - The callback function to be executed when the event is triggered
|
||||
* @param [options] - Optional settings for callback execution
|
||||
* @param [options.middlewares] - Middleware functions to be checked before the callback executes
|
||||
* @returns {Server} The current server instance, enabling method chaining
|
||||
* @returns {FW_Server} The current server instance, enabling method chaining
|
||||
*
|
||||
* @example
|
||||
* // Registering an event
|
||||
@@ -40,13 +40,13 @@ export class Server {
|
||||
*
|
||||
* @see {@link https://git.entityseven.com/entityseven/rage-framework/wiki Wiki}
|
||||
*/
|
||||
public register<EventName extends T.RageFW_ServerEvent>(
|
||||
public register<EventName extends T.FW_ServerEvent>(
|
||||
eventName: EventName,
|
||||
callback: T.RageFW_ServerCallback<EventName>,
|
||||
callback: T.FW_ServerCallback<EventName>,
|
||||
options?: {
|
||||
middlewares?: T.RageFW_MiddlewareOptions<EventName>
|
||||
middlewares?: T.FW_MiddlewareOptions<EventName>
|
||||
},
|
||||
): Server {
|
||||
): FW_Server {
|
||||
rpc.register<
|
||||
Parameters<typeof callback>,
|
||||
ReturnType<typeof callback> | Promise<unknown>,
|
||||
@@ -54,7 +54,7 @@ export class Server {
|
||||
>(eventName, async (...data) => {
|
||||
if (!options?.middlewares) return await callback(...data)
|
||||
|
||||
await Middleware.process(options.middlewares, callback, data)
|
||||
await FW_Middleware.process(options.middlewares, callback, data)
|
||||
})
|
||||
|
||||
return this
|
||||
@@ -64,7 +64,7 @@ export class Server {
|
||||
* Unregisters a server event, removing the associated callback
|
||||
*
|
||||
* @param eventName - The name of the event to unregister
|
||||
* @returns {Server} The current server instance, enabling method chaining
|
||||
* @returns {FW_Server} The current server instance, enabling method chaining
|
||||
*
|
||||
* @example
|
||||
* // Unregistering an event
|
||||
@@ -72,25 +72,21 @@ export class Server {
|
||||
*
|
||||
* @see {@link https://git.entityseven.com/entityseven/rage-framework/wiki Wiki}
|
||||
*/
|
||||
public unregister<EventName extends T.RageFW_ServerEvent>(
|
||||
public unregister<EventName extends T.FW_ServerEvent>(
|
||||
eventName: EventName,
|
||||
): Server {
|
||||
): FW_Server {
|
||||
rpc.unregister<EventName>(eventName)
|
||||
|
||||
return this
|
||||
}
|
||||
|
||||
// fixme
|
||||
// public trigger<EventName extends keyof T.RageFW_ICustomServerEvent>(
|
||||
// public trigger<EventName extends keyof T.FW_ICustomServerEvent>(
|
||||
// eventName: EventName,
|
||||
// ...args: T._ServerEventHasArgs<EventName> extends true
|
||||
// ? [T.RageFW_ServerArgs<EventName>]
|
||||
// ? [T.FW_ServerArgs<EventName>]
|
||||
// : []
|
||||
// ): Promise<T.RageFW_ServerReturn<EventName>> {
|
||||
// ): Promise<T.FW_ServerReturn<EventName>> {
|
||||
// return rpc.call(eventName, args)
|
||||
// }
|
||||
}
|
||||
|
||||
// new Server()
|
||||
// .register('customServerEvent', async (a, b, c) => true)
|
||||
// .unregister('customServerEvent')
|
||||
|
||||
+5
-5
@@ -1,6 +1,6 @@
|
||||
import { Logger, Player, Server, rpc } from './core'
|
||||
import { FW_Logger, FW_Player, FW_Server, rpc } from './core'
|
||||
|
||||
export type { RageFW_MiddlewareFunction } from './types'
|
||||
export type { FW_MiddlewareFunction } from './types'
|
||||
|
||||
/**
|
||||
* Package used on a server-side of your Rage:MP Server
|
||||
@@ -9,13 +9,13 @@ export type { RageFW_MiddlewareFunction } from './types'
|
||||
*/
|
||||
export const fw = {
|
||||
/** Server-side interactions */
|
||||
event: new Server(),
|
||||
event: new FW_Server(),
|
||||
/** Handles event manipulations that require player to be present in context */
|
||||
player: new Player(),
|
||||
player: new FW_Player(),
|
||||
/** Handles functions used to interact with the client environment */
|
||||
system: {
|
||||
/** Used to log in a server console */
|
||||
log: new Logger(),
|
||||
log: new FW_Logger(),
|
||||
},
|
||||
/** ``rage-fw-rpc`` instance used under the hood. It is highly recommended to use this one if you need it instead of creating a new instance */
|
||||
rpc,
|
||||
|
||||
@@ -1,34 +1,34 @@
|
||||
import type { RageFW_ICustomBrowserEvent } from '@entityseven/rage-fw-shared-types'
|
||||
import type { FW_ICustomBrowserEvent } from '@entityseven/rage-fw-shared-types'
|
||||
|
||||
/**
|
||||
* Union of all available browser event names
|
||||
* These only include custom events
|
||||
*/
|
||||
export type RageFW_BrowserEvent = keyof RageFW_ICustomBrowserEvent
|
||||
export type FW_BrowserEvent = keyof FW_ICustomBrowserEvent
|
||||
|
||||
/**
|
||||
* Array of arguments of an event you pass as a generic
|
||||
* These only include custom events
|
||||
*/
|
||||
export type RageFW_BrowserArgs<K extends RageFW_BrowserEvent> = Parameters<
|
||||
RageFW_ICustomBrowserEvent[K]
|
||||
export type FW_BrowserArgs<K extends FW_BrowserEvent> = Parameters<
|
||||
FW_ICustomBrowserEvent[K]
|
||||
>
|
||||
|
||||
/**
|
||||
* Return type of event you pass as a generic
|
||||
* These only include custom events
|
||||
*/
|
||||
export type RageFW_BrowserReturn<K extends RageFW_BrowserEvent> = ReturnType<
|
||||
RageFW_ICustomBrowserEvent[K]
|
||||
export type FW_BrowserReturn<K extends FW_BrowserEvent> = ReturnType<
|
||||
FW_ICustomBrowserEvent[K]
|
||||
>
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
export type _BrowserEventHasArgs<
|
||||
EventName extends keyof RageFW_ICustomBrowserEvent,
|
||||
> = keyof RageFW_ICustomBrowserEvent extends never
|
||||
EventName extends keyof FW_ICustomBrowserEvent,
|
||||
> = keyof FW_ICustomBrowserEvent extends never
|
||||
? false
|
||||
: Parameters<RageFW_ICustomBrowserEvent[EventName]>[0] extends undefined
|
||||
: Parameters<FW_ICustomBrowserEvent[EventName]>[0] extends undefined
|
||||
? false
|
||||
: true
|
||||
|
||||
@@ -1,38 +1,35 @@
|
||||
/// <reference types="@ragempcommunity/types-server" />
|
||||
|
||||
import type { RageFW_ICustomClientEvent } from '@entityseven/rage-fw-shared-types'
|
||||
import type { FW_ICustomClientEvent } from '@entityseven/rage-fw-shared-types'
|
||||
|
||||
/**
|
||||
* Union of all available client event names
|
||||
* These only include custom events
|
||||
*/
|
||||
export type RageFW_ClientEvent = keyof RageFW_ICustomClientEvent
|
||||
export type FW_ClientEvent = keyof FW_ICustomClientEvent
|
||||
|
||||
/**
|
||||
* Array of arguments of an event you pass as a generic
|
||||
* These only include custom events
|
||||
*/
|
||||
export type RageFW_ClientArgs<K extends RageFW_ClientEvent> =
|
||||
K extends RageFW_ClientEvent
|
||||
? Parameters<RageFW_ICustomClientEvent[K]>
|
||||
export type FW_ClientArgs<K extends FW_ClientEvent> = K extends FW_ClientEvent
|
||||
? Parameters<FW_ICustomClientEvent[K]>
|
||||
: never
|
||||
|
||||
/**
|
||||
* Return type of event you pass as a generic
|
||||
* These only include custom events
|
||||
*/
|
||||
export type RageFW_ClientReturn<K extends RageFW_ClientEvent> =
|
||||
K extends RageFW_ClientEvent
|
||||
? ReturnType<RageFW_ICustomClientEvent[K]>
|
||||
export type FW_ClientReturn<K extends FW_ClientEvent> = K extends FW_ClientEvent
|
||||
? ReturnType<FW_ICustomClientEvent[K]>
|
||||
: never
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
export type _ClientEventHasArgs<
|
||||
EventName extends keyof RageFW_ICustomClientEvent,
|
||||
> = keyof RageFW_ICustomClientEvent extends never
|
||||
export type _ClientEventHasArgs<EventName extends keyof FW_ICustomClientEvent> =
|
||||
keyof FW_ICustomClientEvent extends never
|
||||
? false
|
||||
: Parameters<RageFW_ICustomClientEvent[EventName]>[0] extends undefined
|
||||
: Parameters<FW_ICustomClientEvent[EventName]>[0] extends undefined
|
||||
? false
|
||||
: true
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
export * from './browser'
|
||||
export * from './client'
|
||||
export * from './middleware'
|
||||
export * from './server'
|
||||
export type * from './browser'
|
||||
export type * from './client'
|
||||
export type * from './middleware'
|
||||
export type * from './server'
|
||||
|
||||
@@ -1,26 +1,25 @@
|
||||
import type * as T from './server'
|
||||
|
||||
export type RageFW_MiddlewareResponse =
|
||||
export type FW_MiddlewareResponse =
|
||||
| {
|
||||
success: boolean
|
||||
message?: string
|
||||
}
|
||||
| boolean
|
||||
|
||||
export type RageFW_MiddlewareResponseInternal = {
|
||||
export type FW_MiddlewareResponseInternal = {
|
||||
success: boolean
|
||||
message?: string
|
||||
id?: number
|
||||
}
|
||||
|
||||
export type RageFW_MiddlewareFunction<EventName extends T.RageFW_ServerEvent> =
|
||||
(
|
||||
...args: T.RageFW_ServerArgs<EventName>
|
||||
) => Promise<RageFW_MiddlewareResponse>
|
||||
export type FW_MiddlewareFunction<EventName extends T.FW_ServerEvent> = (
|
||||
...args: T.FW_ServerArgs<EventName>
|
||||
) => Promise<FW_MiddlewareResponse>
|
||||
|
||||
export type RageFW_MiddlewareOptions<EventName extends T.RageFW_ServerEvent> =
|
||||
| RageFW_MiddlewareFunction<EventName>[]
|
||||
export type FW_MiddlewareOptions<EventName extends T.FW_ServerEvent> =
|
||||
| FW_MiddlewareFunction<EventName>[]
|
||||
| {
|
||||
executables: RageFW_MiddlewareFunction<EventName>[]
|
||||
executables: FW_MiddlewareFunction<EventName>[]
|
||||
onError: (error: string) => unknown
|
||||
}
|
||||
|
||||
+17
-21
@@ -1,27 +1,25 @@
|
||||
/// <reference types="@ragempcommunity/types-server" />
|
||||
|
||||
import type {
|
||||
RageFW_ICustomClientEvent,
|
||||
RageFW_ICustomServerEvent,
|
||||
FW_ICustomClientEvent,
|
||||
FW_ICustomServerEvent,
|
||||
} from '@entityseven/rage-fw-shared-types'
|
||||
|
||||
export type { RageFW_ICustomServerEvent } from '@entityseven/rage-fw-shared-types'
|
||||
export type { FW_ICustomServerEvent } from '@entityseven/rage-fw-shared-types'
|
||||
|
||||
/**
|
||||
* Union of all available server event names
|
||||
* These also include system events
|
||||
*/
|
||||
export type RageFW_ServerEvent =
|
||||
| keyof RageFW_ICustomServerEvent
|
||||
| keyof IServerEvents
|
||||
export type FW_ServerEvent = keyof FW_ICustomServerEvent | keyof IServerEvents
|
||||
|
||||
/**
|
||||
* Array of arguments for an event, name of which you pass as a generic
|
||||
* These also include system events
|
||||
*/
|
||||
export type RageFW_ServerArgs<K extends RageFW_ServerEvent> =
|
||||
K extends keyof RageFW_ICustomServerEvent
|
||||
? [PlayerMp, ...Parameters<RageFW_ICustomServerEvent[K]>]
|
||||
export type FW_ServerArgs<K extends FW_ServerEvent> =
|
||||
K extends keyof FW_ICustomServerEvent
|
||||
? [PlayerMp, ...Parameters<FW_ICustomServerEvent[K]>]
|
||||
: K extends keyof IServerEvents
|
||||
? [PlayerMp, Parameters<IServerEvents[K]>]
|
||||
: never
|
||||
@@ -30,9 +28,9 @@ export type RageFW_ServerArgs<K extends RageFW_ServerEvent> =
|
||||
* Return type for an event, name of which you pass as a generic
|
||||
* These include system and custom events
|
||||
*/
|
||||
export type RageFW_ServerReturn<K extends RageFW_ServerEvent> =
|
||||
K extends keyof RageFW_ICustomServerEvent
|
||||
? ReturnType<RageFW_ICustomServerEvent[K]>
|
||||
export type FW_ServerReturn<K extends FW_ServerEvent> =
|
||||
K extends keyof FW_ICustomServerEvent
|
||||
? ReturnType<FW_ICustomServerEvent[K]>
|
||||
: K extends keyof IServerEvents
|
||||
? ReturnType<IServerEvents[K]>
|
||||
: void
|
||||
@@ -41,20 +39,18 @@ export type RageFW_ServerReturn<K extends RageFW_ServerEvent> =
|
||||
* Callback (function) for an event, name of which you pass as a generic
|
||||
* These include system and custom events
|
||||
*/
|
||||
export type RageFW_ServerCallback<K extends RageFW_ServerEvent> = (
|
||||
...args: RageFW_ServerArgs<K>
|
||||
) => Promise<RageFW_ServerReturn<K>>
|
||||
export type FW_ServerCallback<K extends FW_ServerEvent> = (
|
||||
...args: FW_ServerArgs<K>
|
||||
) => Promise<FW_ServerReturn<K>>
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
export type _ServerEventHasArgs<EventName extends RageFW_ServerEvent> =
|
||||
EventName extends keyof RageFW_ICustomServerEvent
|
||||
? keyof RageFW_ICustomClientEvent extends never
|
||||
export type _ServerEventHasArgs<EventName extends FW_ServerEvent> =
|
||||
EventName extends keyof FW_ICustomServerEvent
|
||||
? keyof FW_ICustomClientEvent extends never
|
||||
? false
|
||||
: Parameters<
|
||||
RageFW_ICustomServerEvent[EventName]
|
||||
>[0] extends undefined
|
||||
: Parameters<FW_ICustomServerEvent[EventName]>[0] extends undefined
|
||||
? false
|
||||
: true
|
||||
: EventName extends keyof IServerEvents
|
||||
|
||||
+3
-21
@@ -1,26 +1,8 @@
|
||||
{
|
||||
"$schema": "https://json.schemastore.org/tsconfig",
|
||||
"display": "Base",
|
||||
"exclude": [
|
||||
"node_modules"
|
||||
],
|
||||
"display": "Server",
|
||||
"compilerOptions": {
|
||||
"incremental": false,
|
||||
"composite": false,
|
||||
"target": "ES2022",
|
||||
"experimentalDecorators": true,
|
||||
"moduleDetection": "auto",
|
||||
"module": "CommonJS",
|
||||
"resolveJsonModule": true,
|
||||
"declaration": true,
|
||||
"declarationMap": false,
|
||||
"sourceMap": false,
|
||||
"downlevelIteration": false,
|
||||
"inlineSourceMap": false,
|
||||
"esModuleInterop": true,
|
||||
"forceConsistentCasingInFileNames": true,
|
||||
"strict": true,
|
||||
"skipLibCheck": true,
|
||||
"types": ["./node_modules/@ragempcommunity/types-server/index.d.ts"]
|
||||
}
|
||||
},
|
||||
"extends": ["../tsconfig.ragefw.json"]
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Custom Attribution-NoDerivs Software License
|
||||
# Custom Attribution-NoDerives Software License
|
||||
|
||||
This license allows you to use, copy, and distribute the RageFW (the "Software"), including for commercial purposes, provided that the following conditions are met:
|
||||
|
||||
|
||||
Vendored
+6
-7
@@ -1,14 +1,13 @@
|
||||
declare module '@entityseven/rage-fw-shared-types' {
|
||||
export interface RageFW_ICustomServerEvent {
|
||||
customServerEvent(arg1: string, arg2: number): boolean
|
||||
export interface FW_ICustomServerEvent {
|
||||
// customServerEvent(arg1: string, arg2: number): boolean // example event
|
||||
}
|
||||
|
||||
export interface RageFW_ICustomClientEvent {
|
||||
cefReady(): void
|
||||
customClientEvent(arg1: string, arg2: number): boolean
|
||||
export interface FW_ICustomClientEvent {
|
||||
// customClientEvent(arg1: string, arg2: number): boolean // example event
|
||||
}
|
||||
|
||||
export interface RageFW_ICustomBrowserEvent {
|
||||
customCefEvent(arg1: string, arg2: number): boolean
|
||||
export interface FW_ICustomBrowserEvent {
|
||||
// customCefEvent(arg1: string, arg2: number): boolean // example event
|
||||
}
|
||||
}
|
||||
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
"target": "ESNext",
|
||||
"target": "es2022",
|
||||
"lib": [
|
||||
"ESNext",
|
||||
"ES2019",
|
||||
"es2022",
|
||||
"dom"
|
||||
],
|
||||
"moduleResolution": "node",
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
"incremental": false,
|
||||
"composite": false,
|
||||
|
||||
"target": "es2022",
|
||||
"moduleDetection": "auto",
|
||||
"module": "commonjs",
|
||||
|
||||
"esModuleInterop": true,
|
||||
"experimentalDecorators": true,
|
||||
"forceConsistentCasingInFileNames": true,
|
||||
"noImplicitAny": true,
|
||||
"resolveJsonModule": true,
|
||||
"skipLibCheck": true,
|
||||
"strict": true,
|
||||
|
||||
"declaration": false,
|
||||
"declarationMap": false,
|
||||
"downlevelIteration": false,
|
||||
"inlineSourceMap": false,
|
||||
"sourceMap": false
|
||||
},
|
||||
"exclude": [
|
||||
"node_modules",
|
||||
"dist",
|
||||
".tsup"
|
||||
]
|
||||
}
|
||||
Reference in New Issue
Block a user