typings: Update RPC.send + fix RPC.register

altmp · Oct 31, 2023 · 9549e08 · 9549e08
1 parent 3f2665c
commit 9549e08
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/types/client/index.d.ts b/types/client/index.d.ts
@@ -1420,12 +1420,13 @@ declare module "@altv/client" {
     }
 
     export namespace RPC {
-        export type GenericRpcEventHandler<T extends unknown[]> = (...args: T) => Promise<unknown> | unknown;
+        export type GenericRpcEventHandler<T extends unknown[] = unknown[], U = unknown> = (...args: T) => Promise<U> | U;
 
         export function send<E extends keyof altShared.RPC.CustomPlayerToServerRpcEvent>(rpcName: E, ...args: Parameters<altShared.RPC.CustomPlayerToServerRpcEvent[E]>): Promise<ReturnType<altShared.RPC.CustomPlayerToServerRpcEvent[E]>>;
+        export function send<E extends string>(rpcName: Exclude<E, keyof altShared.RPC.CustomPlayerToServerRpcEvent>, ...args: unknown[]): Promise<unknown>;
 
-        export function register<E extends keyof altShared.RPC.CustomServerToPlayerRpcEvent>(rpcName: E, handler: GenericRpcEventHandler<Parameters<altShared.RPC.CustomServerToPlayerRpcEvent[E]>>): RPCHandler;
-        export function register<E extends string>(rpcName: Exclude<E, keyof altShared.RPC.CustomServerToPlayerRpcEvent>, handler: GenericRpcEventHandler<unknown[]>): RPCHandler;
+        export function register<E extends keyof altShared.RPC.CustomServerToPlayerRpcEvent>(rpcName: E, handler: GenericRpcEventHandler<Parameters<altShared.RPC.CustomServerToPlayerRpcEvent[E]>, ReturnType<altShared.RPC.CustomServerToPlayerRpcEvent[E]>>): RPCHandler;
+        export function register<E extends string>(rpcName: Exclude<E, keyof altShared.RPC.CustomServerToPlayerRpcEvent>, handler: GenericRpcEventHandler): RPCHandler;
     }
 
     // DO NOT TOUCH THIS - This is only here so client / server can extend Utils namespace using merging

diff --git a/types/client/package.json b/types/client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@altv/client",
-    "version": "0.0.7",
+    "version": "0.0.8",
     "description": "This package contains the type definitions for the alt:V JS module v2 client types",
     "types": "index.d.ts",
     "files": [

diff --git a/types/server/index.d.ts b/types/server/index.d.ts
@@ -536,6 +536,7 @@ declare module "@altv/server" {
         playScenario(name: string): void;
 
         sendRPC<E extends keyof altShared.RPC.CustomServerToPlayerRpcEvent>(rpcName: E, ...args: Parameters<altShared.RPC.CustomServerToPlayerRpcEvent[E]>): Promise<ReturnType<altShared.RPC.CustomServerToPlayerRpcEvent[E]>>;
+        sendRPC<E extends string>(rpcName: Exclude<E, keyof altShared.RPC.CustomServerToPlayerRpcEvent>, ...args: unknown[]): Promise<unknown>;
 
         readonly meta: PlayerMeta;
         readonly localMeta: PlayerLocalMeta;
@@ -915,10 +916,13 @@ declare module "@altv/server" {
     }
 
     export namespace RPC {
-        export type CustomPlayerRpcEventHandler<T extends unknown[], U extends Player = Player> = (player: U, ...args: T) => unknown | Promise<unknown>;
+        export type CustomPlayerRpcEventHandler<T extends unknown[], U extends Player = Player, V = unknown> = (player: U, ...args: T) => Promise<V> | V;
 
-        export function register<U extends Player = Player, E extends keyof altShared.RPC.CustomPlayerToServerRpcEvent>(rpcName: E, handler: CustomPlayerRpcEventHandler<Parameters<altShared.RPC.CustomPlayerToServerRpcEvent[E]>, U>): RPCHandler;
-        export function register<U extends Player = Player, E extends string>(rpcName: Exclude<E, keyof altShared.RPC.CustomPlayerToServerRpcEvent>, handler: CustomPlayerRpcEventHandler<unknown[], U>): RPCHandler;
+        export function register<U extends Player, E extends keyof altShared.RPC.CustomPlayerToServerRpcEvent = keyof altShared.RPC.CustomPlayerToServerRpcEvent>(
+            rpcName: E,
+            handler: CustomPlayerRpcEventHandler<Parameters<altShared.RPC.CustomPlayerToServerRpcEvent[E]>, U, ReturnType<altShared.RPC.CustomPlayerToServerRpcEvent[E]>>
+        ): RPCHandler;
+        export function register<U extends Player, E extends string = string>(rpcName: Exclude<E, keyof altShared.RPC.CustomPlayerToServerRpcEvent>, handler: CustomPlayerRpcEventHandler<unknown[], U>): RPCHandler;
     }
 
     export abstract class ConnectionInfo {

diff --git a/types/server/package.json b/types/server/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@altv/server",
-    "version": "0.0.7",
+    "version": "0.0.8",
     "description": "This package contains the type definitions for the alt:V JS module v2 server types",
     "types": "index.d.ts",
     "files": [