@trippler/tr_lib 2.0.10 → 2.0.11

package/client/promise/triggerPromise/index.d.ts

@@ -1 +1 @@
-export declare const triggerPromise: (options: [number, boolean] | number | boolean, endpoint: string, ...parameters: any[]) => Promise<any>;
+export declare const triggerPromise: <T = unknown>(options: [number, boolean] | number | boolean | string, endpoint: string | any, ...parameters: any[]) => Promise<T | null>;

package/client/promise/triggerPromise/index.js

@@ -1,10 +1,9 @@
 import { trace, fatal } from '../../../shared/console';
 const pendingPromises = {};
-const definedAddress = [];
 const patienceLimit = 5000;
 const averageServerResponseTime = 1000;
-let promiseId = 0;
 const promises = [];
+let promiseId = 0;
 export const triggerPromise = async (options, endpoint, ...parameters) => {
     if (typeof options === 'string') {
         return triggerPromise([patienceLimit, false], options, endpoint, ...parameters);
@@ -22,10 +21,10 @@ export const triggerPromise = async (options, endpoint, ...parameters) => {
                 if (!defined) {
                     fatal(`promise ${endpoint} is not defined`);
                     resolve(false);
+                    return;
                 }
                 promises.push(endpoint);
                 resolve(true);
-                return;
             };
             onNet('__tr_promise_self_server_response', handler);
             emitNet('__tr_promise_self_request_server', endpoint);
@@ -44,9 +43,9 @@ export const triggerPromise = async (options, endpoint, ...parameters) => {
             promiseId = promiseId + 1;
             const currentPromiseId = promiseId;
             pendingPromises[currentPromiseId] = { resolve };
-            const responseEvent = `__tr_promise_on:${endpoint}`;
-            if (!definedAddress.includes(responseEvent)) {
-                definedAddress.push(responseEvent);
+            const responseEvent = `__tr_promise_await:${endpoint}`;
+            if (!promises.includes(endpoint)) {
+                promises.push(endpoint);
                 onNet(responseEvent, (selfpromiseId, response) => {
                     if (pendingPromises[selfpromiseId]) {
                         pendingPromises[selfpromiseId].resolve({ success: true, returned: response });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trippler/tr_lib",
-  "version": "2.0.10",
+  "version": "2.0.11",
   "description": "A lightweight utility & helper library for FiveM developers. Designed to improve code reusability, consistency, and performance across and outcross Trippler resources.",
   "author": "Trippler",
   "license": "GPL-3.0",

package/server/promise/onPromise/index.d.ts

@@ -1 +1 @@
-export declare const onPromise: (endpoint: string, FUNCTION: Function) => boolean;
+export declare const onPromise: <T extends (...args: any) => ReturnType<T>>(endpoint: string, Function: T) => boolean;

package/server/promise/onPromise/index.js

@@ -6,27 +6,26 @@ onNet('__tr_promise_self_request_server', (endpoint) => {
 onNet('__tr_promise_on_self_server_lua_backward_compatibility', (endpoint) => {
     promises.push(endpoint);
 });
-export const onPromise = (endpoint, FUNCTION) => {
+export const onPromise = (endpoint, Function) => {
     if (typeof endpoint !== 'string')
         return false;
     if (promises.includes(endpoint)) {
         fatal(`server promise '${endpoint}' is already defined`);
         return false;
     }
-    if (typeof FUNCTION !== 'function')
+    if (typeof Function !== 'function')
         return false;
     promises.push(endpoint);
     emitNet('__tr_promise_on_self_server_ts_backward_compatibility', source, endpoint);
     onNet(`__tr_promise_on:${endpoint}`, (promiseId, ...parameters) => {
         const clientSource = source;
-        const invocation = FUNCTION(clientSource, ...parameters);
-        console.log(invocation);
-        if (invocation) {
-            emitNet(`__tr_promise_on:${endpoint}`, source, promiseId, invocation);
+        try {
+            const result = Function(clientSource, ...parameters);
+            emitNet(`__tr_promise_on:${endpoint}`, source, promiseId, result);
         }
-        else {
+        catch (error) {
             emitNet(`__tr_promise_on:${endpoint}`, source, promiseId);
-            console.trace(`server promise '${endpoint}' (client ${source}) threw error: ${invocation}`);
+            console.trace(`server promise '${endpoint}' (client ${source}) threw error: ${error}`);
         }
     });
     return true;