@trippler/tr_lib 2.0.11 → 2.0.13

package/client/index.d.ts

@@ -1,3 +1,3 @@
-export * from './promise/onPromise';
+export { default as onPromise } from './promise/onPromise';
 export * from './promise/triggerPromise';
 export * from '../shared/console';

package/client/index.js

@@ -1,3 +1,3 @@
-export * from './promise/onPromise';
+export { default as onPromise } from './promise/onPromise';
 export * from './promise/triggerPromise';
 export * from '../shared/console';

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

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

package/client/promise/onPromise/index.js

@@ -1 +1,31 @@
-export default true;
+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);
+});
+export default (endpoint, Function) => {
+    if (typeof endpoint !== 'string')
+        return false;
+    if (promises.includes(endpoint)) {
+        fatal(`client promise '${endpoint}' is already defined`);
+        return false;
+    }
+    if (typeof Function !== 'function')
+        return false;
+    promises.push(endpoint);
+    emitNet('__tr_promise_on_self_client_ts_backward_compatibility', endpoint);
+    onNet(`__tr_promise_on:${endpoint}`, (promiseId, ...parameters) => {
+        try {
+            const result = Function(...parameters);
+            emitNet(`__tr_promise_on:${endpoint}`, promiseId, result);
+        }
+        catch (error) {
+            emitNet(`__tr_promise_on:${endpoint}`, promiseId);
+            console.trace(`client promise '${endpoint}' (server (promise: ${promiseId}) threw error: ${error}`);
+        }
+    });
+    return true;
+};

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

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

@@ -36,8 +36,8 @@ export const triggerPromise = async (options, endpoint, ...parameters) => {
         else
             resolve(true);
     });
-    const timeout = options[0] ?? patienceLimit;
-    const debug = options[1] ?? false;
+    const timeout = options?.[0] ?? patienceLimit;
+    const debug = options?.[1] ?? false;
     const promise = () => {
         return new Promise(resolve => {
             promiseId = promiseId + 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trippler/tr_lib",
-  "version": "2.0.11",
+  "version": "2.0.13",
   "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/index.d.ts

@@ -1,3 +1,3 @@
-export * from './promise/onPromise';
+export { default as onPromise } from './promise/onPromise';
 export * from './promise/triggerPromise';
 export * from '../shared/console';

package/server/index.js

@@ -1,3 +1,3 @@
-export * from './promise/onPromise';
+export { default as onPromise } from './promise/onPromise';
 export * from './promise/triggerPromise';
 export * from '../shared/console';

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

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

package/server/promise/onPromise/index.js

@@ -6,7 +6,7 @@ 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 default (endpoint, Function) => {
     if (typeof endpoint !== 'string')
         return false;
     if (promises.includes(endpoint)) {

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

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

package/server/promise/triggerPromise/index.js

@@ -1 +1,78 @@
-export default true;
+import { trace, fatal } from '../../../shared/console';
+const pendingPromises = {};
+const patienceLimit = 5000;
+const averageServerResponseTime = 1000;
+const promises = [];
+let promiseId = 0;
+export const triggerPromise = async (options, endpoint, ...parameters) => {
+    if (typeof options === 'string') {
+        return triggerPromise([patienceLimit, false], options, endpoint, ...parameters);
+    }
+    if (typeof options === 'number') {
+        return triggerPromise([options, false], 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_client_response', handler);
+                if (!defined) {
+                    fatal(`promise ${endpoint} is not defined`);
+                    resolve(false);
+                    return;
+                }
+                promises.push(endpoint);
+                resolve(true);
+            };
+            onNet('__tr_promise_self_client_response', handler);
+            emitNet('__tr_promise_self_request_client', endpoint);
+            setTimeout(() => {
+                removeEventListener('__tr_promise_self_client_response', handler);
+                resolve(false);
+            }, averageServerResponseTime);
+        }
+        else
+            resolve(true);
+    });
+    const timeout = options?.[0] ?? patienceLimit;
+    const debug = options?.[1] ?? false;
+    const promise = () => {
+        return new Promise(resolve => {
+            promiseId = promiseId + 1;
+            const currentPromiseId = promiseId;
+            pendingPromises[currentPromiseId] = { resolve };
+            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 });
+                        delete pendingPromises[selfpromiseId];
+                    }
+                });
+            }
+            emitNet(`__tr_promise_on:${endpoint}`, currentPromiseId, ...parameters);
+            setTimeout(() => {
+                if (pendingPromises[currentPromiseId]) {
+                    pendingPromises[currentPromiseId].resolve({ success: false });
+                    delete pendingPromises[currentPromiseId];
+                }
+            }, timeout);
+        });
+    };
+    const response = await promise();
+    if (response.success) {
+        if (debug) {
+            trace(`client promise ${endpoint} returned ${Object.keys(response.returned).length} values`);
+        }
+        return response.returned;
+    }
+    else {
+        if (debug) {
+            trace(`client promise ${endpoint} timed out after ${timeout}ms`);
+        }
+    }
+    return null;
+};

package/client/async/listen/index.d.ts

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

package/client/async/listen/index.js

@@ -1,78 +0,0 @@
-import { trace, fatal } from '../../../shared/console';
-const pendingPromises = {};
-const definedAddress = [];
-const awaitLimit = 5000;
-let promiseId = 0;
-const promises = [];
-export const listen = async (options, endpoint, ...parameters) => {
-    if (typeof options === 'string') {
-        return listen([awaitLimit, false], options, endpoint, ...parameters);
-    }
-    if (typeof options === 'number') {
-        return listen([options, false], endpoint, ...parameters);
-    }
-    if (typeof options === 'boolean') {
-        return listen([awaitLimit, options], endpoint, ...parameters);
-    }
-    await new Promise(resolve => {
-        if (!promises.includes(endpoint)) {
-            const handler = (defined) => {
-                removeEventListener('__tr_async_self_server_response', handler);
-                if (!defined) {
-                    fatal(`async ${endpoint} is not defined`);
-                    resolve(false);
-                }
-                promises.push(endpoint);
-                resolve(true);
-                return;
-            };
-            onNet('__tr_async_self_server_response', handler);
-            emitNet('__tr_async_self_request_server', endpoint);
-            setTimeout(() => {
-                removeEventListener('__tr_async_self_server_response', handler);
-                resolve(false);
-            }, awaitLimit);
-        }
-        else
-            resolve(true);
-    });
-    const timeout = options[0] ?? awaitLimit;
-    const debug = options[1] ?? false;
-    const promise = () => {
-        return new Promise(resolve => {
-            promiseId = promiseId + 1;
-            const currentPromiseId = promiseId;
-            pendingPromises[currentPromiseId] = { resolve };
-            const responseEvent = `__tr_async_await:${endpoint}`;
-            if (!definedAddress.includes(responseEvent)) {
-                definedAddress.push(responseEvent);
-                onNet(responseEvent, (selfpromiseId, response) => {
-                    if (pendingPromises[selfpromiseId]) {
-                        pendingPromises[selfpromiseId].resolve({ success: true, returned: response });
-                        delete pendingPromises[selfpromiseId];
-                    }
-                });
-            }
-            emitNet(`__tr_async_define:${endpoint}`, currentPromiseId, ...parameters);
-            setTimeout(() => {
-                if (pendingPromises[currentPromiseId]) {
-                    pendingPromises[currentPromiseId].resolve({ success: false });
-                    delete pendingPromises[currentPromiseId];
-                }
-            }, timeout);
-        });
-    };
-    const response = await promise();
-    if (response.success) {
-        if (debug) {
-            trace(`server async ${endpoint} returned ${Object.keys(response.returned).length} values`);
-        }
-        return response.returned;
-    }
-    else {
-        if (debug) {
-            trace(`server async ${endpoint} timed out after ${timeout}ms`);
-        }
-    }
-    return null;
-};

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

@@ -1,2 +0,0 @@
-declare const _default: true;
-export default _default;

package/client/async/promise/index.js

@@ -1 +0,0 @@
-export default true;

package/server/async/listen/index.d.ts

@@ -1,2 +0,0 @@
-declare const _default: true;
-export default _default;

package/server/async/listen/index.js

@@ -1 +0,0 @@
-export default true;

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

@@ -1 +0,0 @@
-export declare const promise: (endpoint: string, FUNCTION: Function) => boolean;

package/server/async/promise/index.js

@@ -1,29 +0,0 @@
-import { fatal } from '../../../shared/console';
-const promises = [];
-onNet('__tr_async_self_request_server', (endpoint) => {
-    emitNet('__tr_async_self_server_response', source, promises.includes(endpoint));
-});
-export const promise = (endpoint, FUNCTION) => {
-    if (typeof endpoint !== 'string')
-        return false;
-    if (promises.includes(endpoint)) {
-        fatal(`server async '${endpoint}' is already defined`);
-        return false;
-    }
-    if (typeof FUNCTION !== 'function')
-        return false;
-    promises.push(endpoint);
-    onNet(`__tr_async_define:${endpoint}`, (promiseId, ...parameters) => {
-        const clientSource = source;
-        const invocation = FUNCTION(clientSource, ...parameters);
-        console.log(invocation);
-        if (invocation) {
-            emitNet(`__tr_async_await:${endpoint}`, source, promiseId, invocation);
-        }
-        else {
-            emitNet(`__tr_async_await:${endpoint}`, source, promiseId);
-            console.trace(`server async '${endpoint}' (client ${source}) threw error: ${invocation}`);
-        }
-    });
-    return true;
-};