@trippler/tr_lib 2.2.7 → 2.2.8

package/client/promise/onPromise/index.js

@@ -1,8 +1,5 @@
 import { fatal } from '../../../shared/console';
 const promises = [];
-onNet('__tr_promise_self_request_client', (endpoint) => {
-    emitNet('__tr_promise_self_client_response', source, promises.includes(endpoint));
-});
 onNet('__tr_promise_on_self_client_lua_backward_compatibility', (endpoint) => {
     promises.push(endpoint);
 });

package/client/promise/triggerPromise/index.js

@@ -1,7 +1,6 @@
-import { trace, fatal } from '../../../shared/console';
+import { trace } from '../../../shared/console';
 const pendingPromises = {};
 const patienceLimit = 5000;
-const averageServerResponseTime = 1000;
 const promises = [];
 let promiseId = 0;
 export const triggerPromise = async (options, endpoint, ...parameters) => {
@@ -14,28 +13,6 @@ export const triggerPromise = async (options, endpoint, ...parameters) => {
     if (typeof options === 'boolean') {
         return triggerPromise([patienceLimit, options], endpoint, ...parameters);
     }
-    await new Promise(resolve => {
-        if (!promises.includes(endpoint)) {
-            const handler = (defined) => {
-                removeEventListener('__tr_promise_self_server_response', handler);
-                if (!defined) {
-                    fatal(`promise ${endpoint} is not defined`);
-                    resolve(false);
-                    return;
-                }
-                promises.push(endpoint);
-                resolve(true);
-            };
-            onNet('__tr_promise_self_server_response', handler);
-            emitNet('__tr_promise_self_request_server', endpoint);
-            setTimeout(() => {
-                removeEventListener('__tr_promise_self_server_response', handler);
-                resolve(false);
-            }, averageServerResponseTime);
-        }
-        else
-            resolve(true);
-    });
     const timeout = options?.[0] ?? patienceLimit;
     const debug = options?.[1] ?? false;
     const promise = () => {
@@ -71,7 +48,7 @@ export const triggerPromise = async (options, endpoint, ...parameters) => {
     }
     else {
         if (debug) {
-            trace(`server promise ${endpoint} timed out after ${timeout}ms`);
+            trace(`server promise ${endpoint} timed out after ${timeout}ms, possible slow respose or promise does not exist`);
         }
     }
     return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trippler/tr_lib",
-  "version": "2.2.7",
+  "version": "2.2.8",
   "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.js

@@ -1,8 +1,5 @@
 import { fatal } from '../../../shared/console';
 const promises = [];
-onNet('__tr_promise_self_request_server', (endpoint) => {
-    emitNet('__tr_promise_self_server_response', source, promises.includes(endpoint));
-});
 onNet('__tr_promise_on_self_server_lua_backward_compatibility', (endpoint) => {
     promises.push(endpoint);
 });
@@ -16,16 +13,16 @@ export default (endpoint, Function) => {
     if (typeof Function !== 'function')
         return false;
     promises.push(endpoint);
+    emitNet('__tr_promise_on_self_server_ts_backward_compatibility', -1, endpoint);
     onNet(`__tr_promise_on:${endpoint}`, (promiseId, ...parameters) => {
         const clientSource = source;
-        emitNet('__tr_promise_on_self_server_ts_backward_compatibility', clientSource, endpoint);
         try {
             const result = Function(clientSource, ...parameters);
             emitNet(`__tr_promise_trigger:${endpoint}`, source, promiseId, result);
         }
         catch (error) {
             emitNet(`__tr_promise_trigger:${endpoint}`, source, promiseId);
-            console.trace(`server promise '${endpoint}' (client ${source}) threw error: ${error}`);
+            console.trace(`server promise '${endpoint}' (client id: ${source}) threw error: ${error}`);
         }
     });
     return true;