@trippler/tr_lib 2.0.11 → 2.0.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/client/index.d.ts +1 -1
- package/client/index.js +1 -1
- package/client/promise/triggerPromise/index.d.ts +1 -1
- package/client/promise/triggerPromise/index.js +2 -2
- package/package.json +1 -1
- package/server/index.d.ts +1 -1
- package/server/index.js +1 -1
- package/server/promise/onPromise/index.d.ts +2 -1
- package/server/promise/onPromise/index.js +1 -1
- package/client/async/listen/index.d.ts +0 -1
- package/client/async/listen/index.js +0 -78
- package/client/async/promise/index.d.ts +0 -2
- package/client/async/promise/index.js +0 -1
- package/server/async/listen/index.d.ts +0 -2
- package/server/async/listen/index.js +0 -1
- package/server/async/promise/index.d.ts +0 -1
- package/server/async/promise/index.js +0 -29
package/client/index.d.ts
CHANGED
package/client/index.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const triggerPromise: <T = unknown>(options: [number, boolean] | number | boolean | string, endpoint
|
|
1
|
+
export declare const triggerPromise: <T = unknown>(options: [number, boolean] | number | boolean | string, endpoint?: string | any, ...parameters: any[]) => Promise<T | null>;
|
|
@@ -36,8 +36,8 @@ export const triggerPromise = async (options, endpoint, ...parameters) => {
|
|
|
36
36
|
else
|
|
37
37
|
resolve(true);
|
|
38
38
|
});
|
|
39
|
-
const timeout = options[0] ?? patienceLimit;
|
|
40
|
-
const debug = options[1] ?? false;
|
|
39
|
+
const timeout = options?.[0] ?? patienceLimit;
|
|
40
|
+
const debug = options?.[1] ?? false;
|
|
41
41
|
const promise = () => {
|
|
42
42
|
return new Promise(resolve => {
|
|
43
43
|
promiseId = promiseId + 1;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@trippler/tr_lib",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.12",
|
|
4
4
|
"description": "A lightweight utility & helper library for FiveM developers. Designed to improve code reusability, consistency, and performance across and outcross Trippler resources.",
|
|
5
5
|
"author": "Trippler",
|
|
6
6
|
"license": "GPL-3.0",
|
package/server/index.d.ts
CHANGED
package/server/index.js
CHANGED
|
@@ -1 +1,2 @@
|
|
|
1
|
-
|
|
1
|
+
declare const _default: <T extends (...args: any) => ReturnType<T>>(endpoint: string, Function: T) => boolean;
|
|
2
|
+
export default _default;
|
|
@@ -6,7 +6,7 @@ onNet('__tr_promise_self_request_server', (endpoint) => {
|
|
|
6
6
|
onNet('__tr_promise_on_self_server_lua_backward_compatibility', (endpoint) => {
|
|
7
7
|
promises.push(endpoint);
|
|
8
8
|
});
|
|
9
|
-
export
|
|
9
|
+
export default (endpoint, Function) => {
|
|
10
10
|
if (typeof endpoint !== 'string')
|
|
11
11
|
return false;
|
|
12
12
|
if (promises.includes(endpoint)) {
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export declare const listen: (options: [number, boolean] | number | boolean, endpoint: string, ...parameters: any[]) => Promise<any>;
|
|
@@ -1,78 +0,0 @@
|
|
|
1
|
-
import { trace, fatal } from '../../../shared/console';
|
|
2
|
-
const pendingPromises = {};
|
|
3
|
-
const definedAddress = [];
|
|
4
|
-
const awaitLimit = 5000;
|
|
5
|
-
let promiseId = 0;
|
|
6
|
-
const promises = [];
|
|
7
|
-
export const listen = async (options, endpoint, ...parameters) => {
|
|
8
|
-
if (typeof options === 'string') {
|
|
9
|
-
return listen([awaitLimit, false], options, endpoint, ...parameters);
|
|
10
|
-
}
|
|
11
|
-
if (typeof options === 'number') {
|
|
12
|
-
return listen([options, false], endpoint, ...parameters);
|
|
13
|
-
}
|
|
14
|
-
if (typeof options === 'boolean') {
|
|
15
|
-
return listen([awaitLimit, options], endpoint, ...parameters);
|
|
16
|
-
}
|
|
17
|
-
await new Promise(resolve => {
|
|
18
|
-
if (!promises.includes(endpoint)) {
|
|
19
|
-
const handler = (defined) => {
|
|
20
|
-
removeEventListener('__tr_async_self_server_response', handler);
|
|
21
|
-
if (!defined) {
|
|
22
|
-
fatal(`async ${endpoint} is not defined`);
|
|
23
|
-
resolve(false);
|
|
24
|
-
}
|
|
25
|
-
promises.push(endpoint);
|
|
26
|
-
resolve(true);
|
|
27
|
-
return;
|
|
28
|
-
};
|
|
29
|
-
onNet('__tr_async_self_server_response', handler);
|
|
30
|
-
emitNet('__tr_async_self_request_server', endpoint);
|
|
31
|
-
setTimeout(() => {
|
|
32
|
-
removeEventListener('__tr_async_self_server_response', handler);
|
|
33
|
-
resolve(false);
|
|
34
|
-
}, awaitLimit);
|
|
35
|
-
}
|
|
36
|
-
else
|
|
37
|
-
resolve(true);
|
|
38
|
-
});
|
|
39
|
-
const timeout = options[0] ?? awaitLimit;
|
|
40
|
-
const debug = options[1] ?? false;
|
|
41
|
-
const promise = () => {
|
|
42
|
-
return new Promise(resolve => {
|
|
43
|
-
promiseId = promiseId + 1;
|
|
44
|
-
const currentPromiseId = promiseId;
|
|
45
|
-
pendingPromises[currentPromiseId] = { resolve };
|
|
46
|
-
const responseEvent = `__tr_async_await:${endpoint}`;
|
|
47
|
-
if (!definedAddress.includes(responseEvent)) {
|
|
48
|
-
definedAddress.push(responseEvent);
|
|
49
|
-
onNet(responseEvent, (selfpromiseId, response) => {
|
|
50
|
-
if (pendingPromises[selfpromiseId]) {
|
|
51
|
-
pendingPromises[selfpromiseId].resolve({ success: true, returned: response });
|
|
52
|
-
delete pendingPromises[selfpromiseId];
|
|
53
|
-
}
|
|
54
|
-
});
|
|
55
|
-
}
|
|
56
|
-
emitNet(`__tr_async_define:${endpoint}`, currentPromiseId, ...parameters);
|
|
57
|
-
setTimeout(() => {
|
|
58
|
-
if (pendingPromises[currentPromiseId]) {
|
|
59
|
-
pendingPromises[currentPromiseId].resolve({ success: false });
|
|
60
|
-
delete pendingPromises[currentPromiseId];
|
|
61
|
-
}
|
|
62
|
-
}, timeout);
|
|
63
|
-
});
|
|
64
|
-
};
|
|
65
|
-
const response = await promise();
|
|
66
|
-
if (response.success) {
|
|
67
|
-
if (debug) {
|
|
68
|
-
trace(`server async ${endpoint} returned ${Object.keys(response.returned).length} values`);
|
|
69
|
-
}
|
|
70
|
-
return response.returned;
|
|
71
|
-
}
|
|
72
|
-
else {
|
|
73
|
-
if (debug) {
|
|
74
|
-
trace(`server async ${endpoint} timed out after ${timeout}ms`);
|
|
75
|
-
}
|
|
76
|
-
}
|
|
77
|
-
return null;
|
|
78
|
-
};
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export default true;
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export default true;
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export declare const promise: (endpoint: string, FUNCTION: Function) => boolean;
|
|
@@ -1,29 +0,0 @@
|
|
|
1
|
-
import { fatal } from '../../../shared/console';
|
|
2
|
-
const promises = [];
|
|
3
|
-
onNet('__tr_async_self_request_server', (endpoint) => {
|
|
4
|
-
emitNet('__tr_async_self_server_response', source, promises.includes(endpoint));
|
|
5
|
-
});
|
|
6
|
-
export const promise = (endpoint, FUNCTION) => {
|
|
7
|
-
if (typeof endpoint !== 'string')
|
|
8
|
-
return false;
|
|
9
|
-
if (promises.includes(endpoint)) {
|
|
10
|
-
fatal(`server async '${endpoint}' is already defined`);
|
|
11
|
-
return false;
|
|
12
|
-
}
|
|
13
|
-
if (typeof FUNCTION !== 'function')
|
|
14
|
-
return false;
|
|
15
|
-
promises.push(endpoint);
|
|
16
|
-
onNet(`__tr_async_define:${endpoint}`, (promiseId, ...parameters) => {
|
|
17
|
-
const clientSource = source;
|
|
18
|
-
const invocation = FUNCTION(clientSource, ...parameters);
|
|
19
|
-
console.log(invocation);
|
|
20
|
-
if (invocation) {
|
|
21
|
-
emitNet(`__tr_async_await:${endpoint}`, source, promiseId, invocation);
|
|
22
|
-
}
|
|
23
|
-
else {
|
|
24
|
-
emitNet(`__tr_async_await:${endpoint}`, source, promiseId);
|
|
25
|
-
console.trace(`server async '${endpoint}' (client ${source}) threw error: ${invocation}`);
|
|
26
|
-
}
|
|
27
|
-
});
|
|
28
|
-
return true;
|
|
29
|
-
};
|