@futdevpro/nts-dynamo 1.15.443 → 1.15.446
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/build/_collections/client-ip.util.d.ts +6 -0
- package/build/_collections/client-ip.util.d.ts.map +1 -1
- package/build/_collections/client-ip.util.js +25 -0
- package/build/_collections/client-ip.util.js.map +1 -1
- package/build/_modules/scheduler/scheduler.service.d.ts +8 -0
- package/build/_modules/scheduler/scheduler.service.d.ts.map +1 -1
- package/build/_modules/scheduler/scheduler.service.js +16 -0
- package/build/_modules/scheduler/scheduler.service.js.map +1 -1
- package/build/_modules/usage/usage.data-service.d.ts +6 -0
- package/build/_modules/usage/usage.data-service.d.ts.map +1 -1
- package/build/_modules/usage/usage.data-service.js +22 -2
- package/build/_modules/usage/usage.data-service.js.map +1 -1
- package/package.json +2 -2
|
@@ -21,6 +21,12 @@ export declare class DyNTS_ClientIp_Util {
|
|
|
21
21
|
* 192.168/16), link-local (169.254/16, fe80::/10) or IPv6 unique-local (fc00::/7).
|
|
22
22
|
*/
|
|
23
23
|
static isTrustedProxyPeer(address: string): boolean;
|
|
24
|
+
/**
|
|
25
|
+
* BFR-FUTDEVPRO-069 ⓒ — a PSEUDONYMISED form of an IP for statistics: IPv4 keeps the /24 network (`203.0.113.7` →
|
|
26
|
+
* `203.0.113.0`), IPv6 the /48 (`2001:db8:85a3:8d3::1` → `2001:db8:85a3::`); anything else → `'unknown'`. Never the
|
|
27
|
+
* full address.
|
|
28
|
+
*/
|
|
29
|
+
static truncate(address: string): string;
|
|
24
30
|
/** The last non-empty `X-Forwarded-For` entry (the one the nearest proxy appended), or `undefined`. */
|
|
25
31
|
private static lastForwarded;
|
|
26
32
|
/** `::ffff:10.0.0.1` → `10.0.0.1` (an IPv4 peer seen through an IPv6 socket). */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-ip.util.d.ts","sourceRoot":"","sources":["../../src/_collections/client-ip.util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC;;;;;;;;;;;;;GAaG;AACH,qBAAa,mBAAmB;IAE9B,0GAA0G;IAC1G,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM;IAexC;;;OAGG;IACH,MAAM,CAAC,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAgBnD,uGAAuG;IACvG,OAAO,CAAC,MAAM,CAAC,aAAa;IAQ5B,iFAAiF;IACjF,OAAO,CAAC,MAAM,CAAC,SAAS;IAMxB,OAAO,CAAC,MAAM,CAAC,OAAO;CASvB"}
|
|
1
|
+
{"version":3,"file":"client-ip.util.d.ts","sourceRoot":"","sources":["../../src/_collections/client-ip.util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC;;;;;;;;;;;;;GAaG;AACH,qBAAa,mBAAmB;IAE9B,0GAA0G;IAC1G,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM;IAexC;;;OAGG;IACH,MAAM,CAAC,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAgBnD;;;;OAIG;IACH,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAwBxC,uGAAuG;IACvG,OAAO,CAAC,MAAM,CAAC,aAAa;IAQ5B,iFAAiF;IACjF,OAAO,CAAC,MAAM,CAAC,SAAS;IAMxB,OAAO,CAAC,MAAM,CAAC,OAAO;CASvB"}
|
|
@@ -45,6 +45,31 @@ class DyNTS_ClientIp_Util {
|
|
|
45
45
|
const lower = ip.toLowerCase();
|
|
46
46
|
return lower === '::1' || /^f[cd][0-9a-f]{2}:/.test(lower) || /^fe[89ab][0-9a-f]:/.test(lower);
|
|
47
47
|
}
|
|
48
|
+
/**
|
|
49
|
+
* BFR-FUTDEVPRO-069 ⓒ — a PSEUDONYMISED form of an IP for statistics: IPv4 keeps the /24 network (`203.0.113.7` →
|
|
50
|
+
* `203.0.113.0`), IPv6 the /48 (`2001:db8:85a3:8d3::1` → `2001:db8:85a3::`); anything else → `'unknown'`. Never the
|
|
51
|
+
* full address.
|
|
52
|
+
*/
|
|
53
|
+
static truncate(address) {
|
|
54
|
+
const ip = DyNTS_ClientIp_Util.normalize(address);
|
|
55
|
+
const v4 = DyNTS_ClientIp_Util.parseV4(ip);
|
|
56
|
+
if (v4) {
|
|
57
|
+
return `${v4[0]}.${v4[1]}.${v4[2]}.0`;
|
|
58
|
+
}
|
|
59
|
+
if (/^[0-9a-f:]+$/i.test(ip) && ip.includes(':')) {
|
|
60
|
+
// expand the `::` so the first three groups are the real ones
|
|
61
|
+
const [head, tail] = ip.toLowerCase().split('::');
|
|
62
|
+
const headGroups = head ? head.split(':') : [];
|
|
63
|
+
const tailGroups = tail !== undefined && tail ? tail.split(':') : [];
|
|
64
|
+
const groups = tail === undefined
|
|
65
|
+
? headGroups
|
|
66
|
+
: [...headGroups, ...new Array(Math.max(0, 8 - headGroups.length - tailGroups.length)).fill('0'), ...tailGroups];
|
|
67
|
+
if (groups.length === 8 && groups.every((group) => /^[0-9a-f]{1,4}$/.test(group))) {
|
|
68
|
+
return `${groups.slice(0, 3).map((group) => group.replace(/^0+(?=.)/, '')).join(':')}::`;
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
return 'unknown';
|
|
72
|
+
}
|
|
48
73
|
/** The last non-empty `X-Forwarded-For` entry (the one the nearest proxy appended), or `undefined`. */
|
|
49
74
|
static lastForwarded(header) {
|
|
50
75
|
const raw = Array.isArray(header) ? header.join(',') : (header ?? '');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-ip.util.js","sourceRoot":"","sources":["../../src/_collections/client-ip.util.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"client-ip.util.js","sourceRoot":"","sources":["../../src/_collections/client-ip.util.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,6 +27,14 @@ export declare class DyNTS_Scheduler_Service extends DyNTS_SingletonServiceBase
|
|
|
27
27
|
* azonnal elindul. Duplikalt kulcs / hibas intervalMs eseten hibat dob.
|
|
28
28
|
*/
|
|
29
29
|
registerJob(job: DyNTS_ScheduledJob): void;
|
|
30
|
+
/**
|
|
31
|
+
* BFR-MASTERPROMPTER-133 — registers the job ONLY if its key is not registered yet, then starts the scheduler
|
|
32
|
+
* (idempotent: a second call with the same key neither throws nor registers a second job). The pattern every
|
|
33
|
+
* background service wrote by hand (`getJobKeys().includes(key)` → `registerJob` → `start()`; 6× in the MP).
|
|
34
|
+
*
|
|
35
|
+
* @returns `true` when THIS call registered the job, `false` when the key was already there (the first job stays)
|
|
36
|
+
*/
|
|
37
|
+
ensureJob(job: DyNTS_ScheduledJob): boolean;
|
|
30
38
|
/** Job leiratkoztatasa + eltavolitasa. Ismeretlen kulcs eseten no-op. */
|
|
31
39
|
unregisterJob(key: string): void;
|
|
32
40
|
/** Minden regisztralt job timer-enek inditasa. Idempotens. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scheduler.service.d.ts","sourceRoot":"","sources":["../../../src/_modules/scheduler/scheduler.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,0BAA0B,EAAE,MAAM,6CAA6C,CAAC;AACzF,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EACtB,MAAM,mCAAmC,CAAC;AAS3C;;;;;;;;;;;;;;;GAeG;AACH,qBAAa,uBAAwB,SAAQ,0BAA0B;IAErE,MAAM,CAAC,WAAW,IAAI,uBAAuB;IAI7C,OAAO,CAAC,QAAQ,CAAC,IAAI,CAA4E;IACjG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAA+B;IACpD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAe;IACvC,OAAO,CAAC,kBAAkB,CAAkB;IAE5C;;;OAGG;IACH,WAAW,CAAC,GAAG,EAAE,kBAAkB,GAAG,IAAI;IAsB1C,yEAAyE;IACzE,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAUhC,8DAA8D;IAC9D,KAAK,IAAI,IAAI;IAQb,sEAAsE;IACtE,IAAI,IAAI,IAAI;IAQZ,wFAAwF;IAClF,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASxC,oCAAoC;IACpC,SAAS,IAAI,OAAO;IAIpB,gCAAgC;IAChC,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAI/B,iCAAiC;IACjC,UAAU,IAAI,MAAM,EAAE;IAItB,wCAAwC;IACxC,OAAO,CAAC,KAAK,GAAE,MAAY,GAAG,qBAAqB,EAAE;IAMrD,+EAA+E;IAC/E,gBAAgB,IAAI,IAAI;IAMxB,OAAO,CAAC,QAAQ;YAYF,UAAU;IA2BxB,OAAO,CAAC,OAAO;IAQf,OAAO,CAAC,cAAc;IAWtB,OAAO,CAAC,QAAQ;CAMjB"}
|
|
1
|
+
{"version":3,"file":"scheduler.service.d.ts","sourceRoot":"","sources":["../../../src/_modules/scheduler/scheduler.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,0BAA0B,EAAE,MAAM,6CAA6C,CAAC;AACzF,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EACtB,MAAM,mCAAmC,CAAC;AAS3C;;;;;;;;;;;;;;;GAeG;AACH,qBAAa,uBAAwB,SAAQ,0BAA0B;IAErE,MAAM,CAAC,WAAW,IAAI,uBAAuB;IAI7C,OAAO,CAAC,QAAQ,CAAC,IAAI,CAA4E;IACjG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAA+B;IACpD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAe;IACvC,OAAO,CAAC,kBAAkB,CAAkB;IAE5C;;;OAGG;IACH,WAAW,CAAC,GAAG,EAAE,kBAAkB,GAAG,IAAI;IAsB1C;;;;;;OAMG;IACH,SAAS,CAAC,GAAG,EAAE,kBAAkB,GAAG,OAAO;IAY3C,yEAAyE;IACzE,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAUhC,8DAA8D;IAC9D,KAAK,IAAI,IAAI;IAQb,sEAAsE;IACtE,IAAI,IAAI,IAAI;IAQZ,wFAAwF;IAClF,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASxC,oCAAoC;IACpC,SAAS,IAAI,OAAO;IAIpB,gCAAgC;IAChC,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAI/B,iCAAiC;IACjC,UAAU,IAAI,MAAM,EAAE;IAItB,wCAAwC;IACxC,OAAO,CAAC,KAAK,GAAE,MAAY,GAAG,qBAAqB,EAAE;IAMrD,+EAA+E;IAC/E,gBAAgB,IAAI,IAAI;IAMxB,OAAO,CAAC,QAAQ;YAYF,UAAU;IA2BxB,OAAO,CAAC,OAAO;IAQf,OAAO,CAAC,cAAc;IAWtB,OAAO,CAAC,QAAQ;CAMjB"}
|
|
@@ -47,6 +47,22 @@ class DyNTS_Scheduler_Service extends singleton_service_base_1.DyNTS_SingletonSe
|
|
|
47
47
|
this.startJob(registered);
|
|
48
48
|
}
|
|
49
49
|
}
|
|
50
|
+
/**
|
|
51
|
+
* BFR-MASTERPROMPTER-133 — registers the job ONLY if its key is not registered yet, then starts the scheduler
|
|
52
|
+
* (idempotent: a second call with the same key neither throws nor registers a second job). The pattern every
|
|
53
|
+
* background service wrote by hand (`getJobKeys().includes(key)` → `registerJob` → `start()`; 6× in the MP).
|
|
54
|
+
*
|
|
55
|
+
* @returns `true` when THIS call registered the job, `false` when the key was already there (the first job stays)
|
|
56
|
+
*/
|
|
57
|
+
ensureJob(job) {
|
|
58
|
+
const isNew = !this.jobs.has(job?.key);
|
|
59
|
+
if (isNew) {
|
|
60
|
+
// a missing key / a wrong interval still throws, named (registerJob)
|
|
61
|
+
this.registerJob(job);
|
|
62
|
+
}
|
|
63
|
+
this.start();
|
|
64
|
+
return isNew;
|
|
65
|
+
}
|
|
50
66
|
/** Job leiratkoztatasa + eltavolitasa. Ismeretlen kulcs eseten no-op. */
|
|
51
67
|
unregisterJob(key) {
|
|
52
68
|
const registered = this.jobs.get(key);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scheduler.service.js","sourceRoot":"","sources":["../../../src/_modules/scheduler/scheduler.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"scheduler.service.js","sourceRoot":"","sources":["../../../src/_modules/scheduler/scheduler.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,12 @@ export declare class DyNTS_Usage_DataService extends DyNTS_DataService<DyFM_Usag
|
|
|
11
11
|
usageData?: DyFM_UsageData[];
|
|
12
12
|
issuer: string;
|
|
13
13
|
});
|
|
14
|
+
/**
|
|
15
|
+
* ⚖️ BFR-FUTDEVPRO-069 ⓒ — the session keeps only a PSEUDONYMISED location (the notice promises statistics
|
|
16
|
+
* "aggregated, pseudonymised"): the IP truncated to its /24 (IPv4) or /48 (IPv6) network, and of the geo lookup only the
|
|
17
|
+
* country, the EU flag and the time zone. The full IP, the coordinates, the city / region and the IP range are not
|
|
18
|
+
* stored (measured before: all of them were).
|
|
19
|
+
*/
|
|
14
20
|
getLocationDataFromRequest(req: Request): void;
|
|
15
21
|
/**
|
|
16
22
|
* Builds the filter that matches every session of one account (BFR-FUTDEVPRO-015, `L-24`):
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usage.data-service.d.ts","sourceRoot":"","sources":["../../../src/_modules/usage/usage.data-service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC,OAAO,EAAE,aAAa,EAAwB,iBAAiB,EAAa,MAAM,uBAAuB,CAAC;AAC1G,OAAO,EACL,mBAAmB,EACnB,cAAc,EACd,iBAAiB,EAClB,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"usage.data-service.d.ts","sourceRoot":"","sources":["../../../src/_modules/usage/usage.data-service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC,OAAO,EAAE,aAAa,EAAwB,iBAAiB,EAAa,MAAM,uBAAuB,CAAC;AAC1G,OAAO,EACL,mBAAmB,EACnB,cAAc,EACd,iBAAiB,EAClB,MAAM,6BAA6B,CAAC;AAKrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAEtE,OAAO,EAAE,+BAA+B,EAAE,MAAM,yCAAyC,CAAC;AAQ1F,qBAAa,uBAAwB,SAAQ,iBAAiB,CAAC,iBAAiB,CAAC;IAC/E,SAAS,EAAE,cAAc,EAAE,CAAM;IACjC,oBAAoB,EAAE,mBAAmB,EAAE,CAAM;gBAG/C,GAAG,EAAE;QACH,YAAY,CAAC,EAAE,iBAAiB,CAAC;QACjC,SAAS,CAAC,EAAE,cAAc,EAAE,CAAC;QAC7B,MAAM,EAAE,MAAM,CAAC;KAChB;IAUH;;;;;OAKG;IACH,0BAA0B,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;IA8B9C;;;;;;;;;;;OAWG;IACH,MAAM,CAAC,uBAAuB,CAAC,GAAG,EAAE,+BAA+B,GAAG,aAAa,CAAC,iBAAiB,CAAC;IA6BtG;;;;;OAKG;IACG,qBAAqB,CAAC,GAAG,EAAE,+BAA+B,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAe/F;;;;;;OAMG;IACG,uBAAuB,CAAC,GAAG,EAAE,+BAA+B,GAAG,OAAO,CAAC,MAAM,CAAC;IAmBpF;;;;;;OAMG;IACG,oBAAoB,CAAC,GAAG,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAiCvF;;;;;;;;;;;;OAYG;IACG,QAAQ,CAAC,KAAK,GAAE,iBAA8C,GAAG,OAAO,CAAC,IAAI,CAAC;IAuE9E,eAAe,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAuC5C,YAAY,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CA2ChD"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.DyNTS_Usage_DataService = void 0;
|
|
4
4
|
const fsm_dynamo_1 = require("@futdevpro/fsm-dynamo");
|
|
5
5
|
const usage_1 = require("@futdevpro/fsm-dynamo/usage");
|
|
6
|
+
const client_ip_util_1 = require("../../_collections/client-ip.util");
|
|
6
7
|
const global_settings_const_1 = require("../../_collections/global-settings.const");
|
|
7
8
|
const data_service_1 = require("../../_services/base/data.service");
|
|
8
9
|
const shared_static_service_1 = require("../../_services/shared.static-service");
|
|
@@ -18,10 +19,29 @@ class DyNTS_Usage_DataService extends data_service_1.DyNTS_DataService {
|
|
|
18
19
|
super(new usage_1.DyFM_UsageSession(set?.usageSession), usage_1.DyFM_usageSession_dataParams, set.issuer);
|
|
19
20
|
this.usageData = set?.usageData ?? [];
|
|
20
21
|
}
|
|
22
|
+
/**
|
|
23
|
+
* ⚖️ BFR-FUTDEVPRO-069 ⓒ — the session keeps only a PSEUDONYMISED location (the notice promises statistics
|
|
24
|
+
* "aggregated, pseudonymised"): the IP truncated to its /24 (IPv4) or /48 (IPv6) network, and of the geo lookup only the
|
|
25
|
+
* country, the EU flag and the time zone. The full IP, the coordinates, the city / region and the IP range are not
|
|
26
|
+
* stored (measured before: all of them were).
|
|
27
|
+
*/
|
|
21
28
|
getLocationDataFromRequest(req) {
|
|
22
29
|
try {
|
|
23
|
-
|
|
24
|
-
|
|
30
|
+
const ip = shared_static_service_1.DyNTS_Shared.getIpFromRequest(req);
|
|
31
|
+
const location = shared_static_service_1.DyNTS_Shared.getLocationByIp(ip);
|
|
32
|
+
this.data.address = client_ip_util_1.DyNTS_ClientIp_Util.truncate(ip);
|
|
33
|
+
this.data.locationData = location ? {
|
|
34
|
+
country: location.country,
|
|
35
|
+
eu: location.eu,
|
|
36
|
+
timezone: location.timezone,
|
|
37
|
+
// the precise parts are dropped (kept typed, emptied)
|
|
38
|
+
range: [0, 0],
|
|
39
|
+
region: '',
|
|
40
|
+
city: '',
|
|
41
|
+
ll: [0, 0],
|
|
42
|
+
metro: 0,
|
|
43
|
+
area: 0,
|
|
44
|
+
} : null;
|
|
25
45
|
/* console.log(`...getLocationDataFromRequest... ip: ${this.data.address}`, this.data.locationData); */
|
|
26
46
|
}
|
|
27
47
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usage.data-service.js","sourceRoot":"","sources":["../../../src/_modules/usage/usage.data-service.ts"],"names":[],"mappings":";;;AAGA,sDAA0G;AAC1G,uDAIqC;
|
|
1
|
+
{"version":3,"file":"usage.data-service.js","sourceRoot":"","sources":["../../../src/_modules/usage/usage.data-service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@futdevpro/nts-dynamo",
|
|
3
|
-
"version": "01.15.
|
|
3
|
+
"version": "01.15.446",
|
|
4
4
|
"description": "Dynamic NodeTS (NodeJS-Typescript), MongoDB Backend System Framework by Future Development Program Ltd.",
|
|
5
5
|
"DyBu_settings": {
|
|
6
6
|
"packageType": "server-package",
|
|
@@ -553,7 +553,7 @@
|
|
|
553
553
|
}
|
|
554
554
|
},
|
|
555
555
|
"devDependencies": {
|
|
556
|
-
"@futdevpro/fsm-dynamo": "1.20.
|
|
556
|
+
"@futdevpro/fsm-dynamo": "1.20.139",
|
|
557
557
|
"@futdevpro/dynamo-eslint": "1.20.74",
|
|
558
558
|
"@discordjs/opus": "^0.10.0",
|
|
559
559
|
"@discordjs/voice": "^0.18.0",
|