@open-core/ragemp-adapter 0.1.1 → 1.0.0

package/dist/shared/transport/helpers.js

@@ -2,6 +2,29 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onNet = onNet;
 exports.emitNet = emitNet;
+const JSON_WIRE_PREFIX = '__OPENCORE_JSON__:';
+function serializeWireValue(value) {
+    if (value === null || value === undefined)
+        return value;
+    if (Array.isArray(value) || (typeof value === 'object' && value.constructor === Object)) {
+        return `${JSON_WIRE_PREFIX}${JSON.stringify(value)}`;
+    }
+    return value;
+}
+function deserializeWireValue(value) {
+    if (typeof value !== 'string' || !value.startsWith(JSON_WIRE_PREFIX)) {
+        return value;
+    }
+    try {
+        return JSON.parse(value.slice(JSON_WIRE_PREFIX.length));
+    }
+    catch {
+        return value;
+    }
+}
+function deserializeWireArgs(args) {
+    return args.map((arg) => deserializeWireValue(arg));
+}
 /**
  * Resolves a player by numeric ID, returning undefined when the player no
  * longer exists (disconnected, invalid handle, etc.).
@@ -21,7 +44,7 @@ function resolvePlayer(id) {
  *
  * Analogous to FiveM's `onNet`:
  * - Server: RageMP prepends the PlayerMp as the first native argument.
- *   We expose it as-is so callers can read player.id before any await.
+ *   We expose it as-is so callers can read player.id before awaiting.
  * - Client: no source argument; we pass undefined to keep the signature uniform.
  */
 function onNet(context, event, handler) {
@@ -32,11 +55,13 @@ function onNet(context, event, handler) {
             // all other events should be safe to guard this way.
             if (!mp.players.exists(player.id))
                 return;
-            handler(player, ...args);
+            handler(player, ...deserializeWireArgs(args));
         });
     }
     else {
-        mp.events.add(event, (...args) => handler(undefined, ...args));
+        mp.events.add(event, (...args) => {
+            handler(undefined, ...deserializeWireArgs(args));
+        });
     }
 }
 /**
@@ -52,19 +77,20 @@ function onNet(context, event, handler) {
  * network targets, matching FiveM's TriggerClientEvent semantics.
  */
 function emitNet(context, event, target, ...payload) {
+    const serializedPayload = payload.map((item) => serializeWireValue(item));
     if (context !== 'server') {
-        mp.events.callRemote(event, ...payload);
+        mp.events.callRemote(event, ...serializedPayload);
         return;
     }
     if (target === -1) {
-        mp.players.call(event, payload);
+        mp.players.call(event, serializedPayload);
         return;
     }
     if (Array.isArray(target)) {
         for (const id of target) {
-            resolvePlayer(id)?.call(event, payload);
+            resolvePlayer(id)?.call(event, serializedPayload);
         }
         return;
     }
-    resolvePlayer(target)?.call(event, payload);
+    resolvePlayer(target)?.call(event, serializedPayload);
 }

package/dist/shared/transport/ragemp.events.d.ts

@@ -2,9 +2,9 @@ import { EventsAPI, type RuntimeContext } from '@open-core/framework/contracts';
 export declare class RageMPEvents extends EventsAPI<RuntimeContext> {
     private readonly context;
     constructor(context: RuntimeContext);
-    on(event: string, handler: (source: {
+    on<TArgs extends readonly unknown[]>(event: string, handler: (source: {
         clientId: number | undefined;
         raw: PlayerMp | undefined;
-    }, ...args: any[]) => void): void;
-    emit(event: string, ...args: any[]): void;
+    }, ...args: TArgs) => void | Promise<void>): void;
+    emit(event: string, ...args: unknown[]): void;
 }

package/dist/shared/transport/ragemp.events.js

@@ -16,7 +16,7 @@ class RageMPEvents extends contracts_1.EventsAPI {
     }
     on(event, handler) {
         (0, helpers_1.onNet)(this.context, event, (source, ...args) => {
-            handler({ clientId: source?.id, raw: source }, ...args);
+            void handler({ clientId: source?.id, raw: source }, ...args);
         });
     }
     emit(event, ...args) {
@@ -39,7 +39,9 @@ class RageMPEvents extends contracts_1.EventsAPI {
             (0, helpers_1.emitNet)(this.context, event, target.clientID, ...payload);
             return;
         }
-        (0, helpers_1.emitNet)(this.context, event, target, ...payload);
+        if (typeof target === 'number') {
+            (0, helpers_1.emitNet)(this.context, event, target, ...payload);
+        }
     }
 }
 exports.RageMPEvents = RageMPEvents;

package/dist/shared/transport/ragemp.rpc.d.ts

@@ -1,4 +1,4 @@
-import { RpcAPI, type RuntimeContext } from '@open-core/framework/contracts';
+import { RpcAPI, type RpcContext, type RuntimeContext } from '@open-core/framework/contracts';
 export declare class RageMPRpc<C extends RuntimeContext = RuntimeContext> extends RpcAPI<C> {
     private readonly context;
     private readonly pending;
@@ -9,13 +9,9 @@ export declare class RageMPRpc<C extends RuntimeContext = RuntimeContext> extend
     private readonly responseEvent;
     private readonly defaultTimeoutMs;
     constructor(context: C);
-    on<TArgs extends any[], TResult>(name: string, handler: (ctx: {
-        requestId: string;
-        clientId?: number;
-        raw?: unknown;
-    }, ...args: TArgs) => TResult | Promise<TResult>): void;
-    call<TResult = unknown>(name: string, ...args: any[]): Promise<TResult>;
-    notify(name: string, ...args: any[]): Promise<void>;
+    on<TArgs extends readonly unknown[], TResult>(name: string, handler: (ctx: RpcContext, ...args: TArgs) => TResult | Promise<TResult>): void;
+    call<TResult = unknown>(name: string, ...args: unknown[]): Promise<TResult>;
+    notify(name: string, ...args: unknown[]): Promise<void>;
     private normalizeInvocation;
     private isValidTarget;
     private sendAndWait;

package/dist/shared/transport/ragemp.rpc.js

@@ -3,7 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RageMPRpc = void 0;
 const contracts_1 = require("@open-core/framework/contracts");
 const helpers_1 = require("./helpers");
+function asErrorInfo(error) {
+    if (error instanceof Error) {
+        return { message: error.message, name: error.name };
+    }
+    return { message: String(error) };
+}
 function getCurrentResourceNameSafe() {
+    if (typeof __OPENCORE_RESOURCE_NAME__ === 'string' && __OPENCORE_RESOURCE_NAME__.trim()) {
+        return __OPENCORE_RESOURCE_NAME__;
+    }
     if (typeof __dirname !== 'string')
         return 'default';
     const parts = __dirname.replace(/\\/g, '/').split('/');
@@ -28,7 +37,7 @@ class RageMPRpc extends contracts_1.RpcAPI {
         });
     }
     on(name, handler) {
-        this.handlers.set(name, handler);
+        this.handlers.set(name, (ctx, ...args) => handler(ctx, ...args));
     }
     call(name, ...args) {
         const { target, payload } = this.normalizeInvocation(name, 'call', args);
@@ -76,7 +85,7 @@ class RageMPRpc extends contracts_1.RpcAPI {
                 this.pending.delete(id);
                 reject(new Error(`RageMPRpc: timeout waiting for '${input.kind}' response for '${input.name}' (${id})`));
             }, this.defaultTimeoutMs);
-            this.pending.set(id, { resolve: resolve, reject, timeout });
+            this.pending.set(id, { resolve: (value) => resolve(value), reject, timeout });
             if (this.context === 'server') {
                 const resolvedTarget = this.resolveServerTarget(target, input.kind, input.name);
                 (0, helpers_1.emitNet)(this.context, this.requestEvent, resolvedTarget, msg);
@@ -139,6 +148,7 @@ class RageMPRpc extends contracts_1.RpcAPI {
             }
         }
         catch (err) {
+            const errorInfo = asErrorInfo(err);
             if (msg.kind === 'notify') {
                 this.emitResponse(replyTarget, { kind: 'ack', id: msg.id });
                 return;
@@ -148,8 +158,8 @@ class RageMPRpc extends contracts_1.RpcAPI {
                 id: msg.id,
                 ok: false,
                 error: {
-                    message: err?.message ? String(err.message) : String(err),
-                    name: err?.name ? String(err.name) : undefined,
+                    message: errorInfo.message,
+                    name: errorInfo.name,
                 },
             });
         }
@@ -171,7 +181,13 @@ class RageMPRpc extends contracts_1.RpcAPI {
             return;
         }
         const error = new Error(msg.error?.message ?? 'RageMPRpc: remote error');
-        error.name = msg.error?.name ?? error.name;
+        if (msg.error?.name) {
+            Object.defineProperty(error, 'name', {
+                value: msg.error.name,
+                configurable: true,
+                writable: true,
+            });
+        }
         pending.reject(error);
     }
     emitResponse(target, msg) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-core/ragemp-adapter",
-  "version": "0.1.1",
+  "version": "1.0.0",
   "description": "External Rage Multiplayer adapter for OpenCore framework.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -37,20 +37,18 @@
     "adapter"
   ],
   "license": "MPL-2.0",
-  "dependencies": {
-    "@open-core/framework": "v1.0.5-beta.2"
-  },
   "peerDependencies": {
     "reflect-metadata": "^0.2.2",
     "tsyringe": "^4.10.0",
     "zod": "^4.3.5"
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.3.11",
+    "@biomejs/biome": "^2.4.8",
+    "@open-core/framework": "latest",
     "@ragempcommunity/types-client": "^2.1.9",
     "@ragempcommunity/types-server": "^2.1.9",
-    "@types/node": "^25.0.3",
-    "typescript": "^5.9.3"
+    "@types/node": "^25.5.0",
+    "typescript": "^6.0.2"
   },
   "scripts": {
     "build": "tsc -b",