@raspberryvarg/bot-kit 1.0.4 → 1.0.6
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/dist/app/appLogger.d.ts +18 -0
- package/dist/app/appLogger.d.ts.map +1 -0
- package/dist/app/appLogger.js +9 -0
- package/dist/app/appLogger.js.map +1 -0
- package/dist/app/bootstrapApp.d.ts +10 -0
- package/dist/app/bootstrapApp.d.ts.map +1 -0
- package/dist/app/bootstrapApp.js +118 -0
- package/dist/app/bootstrapApp.js.map +1 -0
- package/dist/app/config.d.ts +32 -0
- package/dist/app/config.d.ts.map +1 -0
- package/dist/app/config.js +9 -0
- package/dist/app/config.js.map +1 -0
- package/dist/app/defaultAppLogger.d.ts +4 -0
- package/dist/app/defaultAppLogger.d.ts.map +1 -0
- package/dist/app/defaultAppLogger.js +48 -0
- package/dist/app/defaultAppLogger.js.map +1 -0
- package/dist/app/index.d.ts +3 -0
- package/dist/app/index.d.ts.map +1 -0
- package/dist/app/index.js +2 -0
- package/dist/app/index.js.map +1 -0
- package/dist/core/bootstrap.d.ts +7 -2
- package/dist/core/bootstrap.d.ts.map +1 -1
- package/dist/core/bootstrap.js +17 -10
- package/dist/core/bootstrap.js.map +1 -1
- package/dist/core/config.d.ts +28 -37
- package/dist/core/config.d.ts.map +1 -1
- package/dist/core/config.js +14 -58
- package/dist/core/config.js.map +1 -1
- package/dist/core/index.d.ts +0 -2
- package/dist/core/index.d.ts.map +1 -1
- package/dist/core/index.js +0 -2
- package/dist/core/index.js.map +1 -1
- package/dist/di/container.d.ts +38 -0
- package/dist/di/container.d.ts.map +1 -0
- package/dist/di/container.js +88 -0
- package/dist/di/container.js.map +1 -0
- package/dist/di/index.d.ts +3 -0
- package/dist/di/index.d.ts.map +1 -0
- package/dist/di/index.js +3 -0
- package/dist/di/index.js.map +1 -0
- package/dist/di/logger.d.ts +2 -0
- package/dist/di/logger.d.ts.map +1 -0
- package/dist/di/logger.js +3 -0
- package/dist/di/logger.js.map +1 -0
- package/dist/di/token.d.ts.map +1 -0
- package/dist/di/token.js.map +1 -0
- package/dist/discord/load.d.ts.map +1 -1
- package/dist/discord/load.js +19 -26
- package/dist/discord/load.js.map +1 -1
- package/dist/discord/logger.d.ts +2 -0
- package/dist/discord/logger.d.ts.map +1 -0
- package/dist/discord/logger.js +3 -0
- package/dist/discord/logger.js.map +1 -0
- package/dist/discord/registry.d.ts.map +1 -1
- package/dist/discord/registry.js +1 -0
- package/dist/discord/registry.js.map +1 -1
- package/dist/discord/router.d.ts +2 -1
- package/dist/discord/router.d.ts.map +1 -1
- package/dist/discord/router.js +39 -18
- package/dist/discord/router.js.map +1 -1
- package/dist/index.d.ts +3 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -0
- package/dist/index.js.map +1 -1
- package/dist/internal/internalLogger.d.ts +7 -8
- package/dist/internal/internalLogger.d.ts.map +1 -1
- package/dist/internal/internalLogger.js +5 -10
- package/dist/internal/internalLogger.js.map +1 -1
- package/dist/modules/index.d.ts +2 -0
- package/dist/modules/index.d.ts.map +1 -0
- package/dist/modules/index.js +2 -0
- package/dist/modules/index.js.map +1 -0
- package/dist/modules/module.d.ts +43 -0
- package/dist/modules/module.d.ts.map +1 -0
- package/dist/modules/module.js +7 -0
- package/dist/modules/module.js.map +1 -0
- package/dist/util/serializableOr.d.ts +2 -2
- package/dist/util/serializableOr.d.ts.map +1 -1
- package/dist/util/serializableOr.js.map +1 -1
- package/dist/util/topologicalSort.d.ts +2 -0
- package/dist/util/topologicalSort.d.ts.map +1 -0
- package/dist/util/topologicalSort.js +40 -0
- package/dist/util/topologicalSort.js.map +1 -0
- package/package.json +1 -1
- package/dist/core/container.d.ts +0 -17
- package/dist/core/container.d.ts.map +0 -1
- package/dist/core/container.js +0 -55
- package/dist/core/container.js.map +0 -1
- package/dist/core/token.d.ts.map +0 -1
- package/dist/core/token.js.map +0 -1
- /package/dist/{core → di}/token.d.ts +0 -0
- /package/dist/{core → di}/token.js +0 -0
package/dist/core/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import type { Token } from './token.js';
|
|
2
|
+
type ImplFactory<T> = (container: Container) => T;
|
|
3
|
+
type Lifetime = 'singleton' | 'transient';
|
|
4
|
+
/**
|
|
5
|
+
* Dependency injection container. One is provided globally.
|
|
6
|
+
*/
|
|
7
|
+
export declare class Container {
|
|
8
|
+
private registry;
|
|
9
|
+
private singletons;
|
|
10
|
+
/**
|
|
11
|
+
* @deprecated Please explicitly define lifetime, or use {@link singleton} as a direct
|
|
12
|
+
* replacement as the default is to register as a singleton as the previous behavior.
|
|
13
|
+
*/
|
|
14
|
+
register<T>(token: Token<T>, factory: ImplFactory<T>): this;
|
|
15
|
+
/**
|
|
16
|
+
* Register an implementation factory for a given token.
|
|
17
|
+
*/
|
|
18
|
+
register<T>(token: Token<T>, factory: ImplFactory<T>, lifetime: Lifetime): this;
|
|
19
|
+
/**
|
|
20
|
+
* Registers an implementation for a singleton, returning a cached instance per {@link resolve}.
|
|
21
|
+
*/
|
|
22
|
+
singleton<T>(token: Token<T>, factory: ImplFactory<T>): this;
|
|
23
|
+
/**
|
|
24
|
+
* Registers an implementation for a transient dependency, creating a new instance each time it is
|
|
25
|
+
* resolved.
|
|
26
|
+
*/
|
|
27
|
+
transient<T>(token: Token<T>, factory: ImplFactory<T>): this;
|
|
28
|
+
resolve<T>(token: Token<T>): T;
|
|
29
|
+
}
|
|
30
|
+
export declare function setGlobalContainer(container: Container): void;
|
|
31
|
+
/**
|
|
32
|
+
* Inject a registered dependency.
|
|
33
|
+
*
|
|
34
|
+
* @throws {Error} If the dependency is not registered.
|
|
35
|
+
*/
|
|
36
|
+
export declare function inject<T>(token: Token<T>): T;
|
|
37
|
+
export {};
|
|
38
|
+
//# sourceMappingURL=container.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../../src/di/container.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAExC,KAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,KAAK,CAAC,CAAC;AAClD,KAAK,QAAQ,GAAG,WAAW,GAAG,WAAW,CAAC;AAO1C;;GAEG;AACH,qBAAa,SAAS;IACpB,OAAO,CAAC,QAAQ,CAAoC;IACpD,OAAO,CAAC,UAAU,CAAsC;IAExD;;;OAGG;IACH,QAAQ,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAC5D;;OAEG;IACH,QAAQ,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAAC;IA8BhF;;OAEG;IACH,SAAS,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,IAAI,CAE3D;IAED;;;OAGG;IACH,SAAS,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,IAAI,CAE3D;IAED,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAsB7B;CACF;AAID,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,CAE7D;AAED;;;;GAIG;AACH,wBAAgB,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAK5C"}
|
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
import { getConfig } from '../core/index.js';
|
|
2
|
+
import { diLogger } from './logger.js';
|
|
3
|
+
/**
|
|
4
|
+
* Dependency injection container. One is provided globally.
|
|
5
|
+
*/
|
|
6
|
+
export class Container {
|
|
7
|
+
registry = new Map();
|
|
8
|
+
singletons = new Map();
|
|
9
|
+
register(token, factory, lifetime = 'singleton') {
|
|
10
|
+
if (typeof token === 'function') {
|
|
11
|
+
token = token.token;
|
|
12
|
+
}
|
|
13
|
+
if (getConfig().supportHotReloading) {
|
|
14
|
+
if (this.registry.delete(token)) {
|
|
15
|
+
diLogger.verbose(`HMR: Overriding inject for ${tokenToString(token)}`);
|
|
16
|
+
}
|
|
17
|
+
if (this.singletons.delete(token)) {
|
|
18
|
+
diLogger.verbose(`HMR: Invalidating singleton instance for ${tokenToString(token)}`);
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
if (this.registry.has(token)) {
|
|
22
|
+
throw new Error(`Injectable factory has already been registered with the token: ${tokenToString(token)}`);
|
|
23
|
+
}
|
|
24
|
+
if (this.singletons.has(token)) {
|
|
25
|
+
throw new Error(`Injectable has already been resolved with the token: ${tokenToString(token)}`);
|
|
26
|
+
}
|
|
27
|
+
this.registry.set(token, { factory, lifetime });
|
|
28
|
+
return this;
|
|
29
|
+
}
|
|
30
|
+
/**
|
|
31
|
+
* Registers an implementation for a singleton, returning a cached instance per {@link resolve}.
|
|
32
|
+
*/
|
|
33
|
+
singleton(token, factory) {
|
|
34
|
+
return this.register(token, factory, 'singleton');
|
|
35
|
+
}
|
|
36
|
+
/**
|
|
37
|
+
* Registers an implementation for a transient dependency, creating a new instance each time it is
|
|
38
|
+
* resolved.
|
|
39
|
+
*/
|
|
40
|
+
transient(token, factory) {
|
|
41
|
+
return this.register(token, factory, 'transient');
|
|
42
|
+
}
|
|
43
|
+
resolve(token) {
|
|
44
|
+
if (typeof token === 'function') {
|
|
45
|
+
token = token.token;
|
|
46
|
+
}
|
|
47
|
+
if (this.singletons.has(token)) {
|
|
48
|
+
// oxlint-disable-next-line no-unsafe-type-assertion
|
|
49
|
+
return this.singletons.get(token);
|
|
50
|
+
}
|
|
51
|
+
const entry = this.registry.get(token);
|
|
52
|
+
if (!entry) {
|
|
53
|
+
throw new Error(`Missing dependency: ${tokenToString(token)}`);
|
|
54
|
+
}
|
|
55
|
+
diLogger.verbose(`Resolving ${tokenToString(token)}`);
|
|
56
|
+
const instance = entry.factory(this);
|
|
57
|
+
if (entry.lifetime === 'singleton') {
|
|
58
|
+
this.singletons.set(token, instance);
|
|
59
|
+
}
|
|
60
|
+
// oxlint-disable-next-line no-unsafe-type-assertion
|
|
61
|
+
return instance;
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
let globalContainer;
|
|
65
|
+
export function setGlobalContainer(container) {
|
|
66
|
+
globalContainer = container;
|
|
67
|
+
}
|
|
68
|
+
/**
|
|
69
|
+
* Inject a registered dependency.
|
|
70
|
+
*
|
|
71
|
+
* @throws {Error} If the dependency is not registered.
|
|
72
|
+
*/
|
|
73
|
+
export function inject(token) {
|
|
74
|
+
if (!globalContainer) {
|
|
75
|
+
throw new Error('Global container is not set');
|
|
76
|
+
}
|
|
77
|
+
return globalContainer.resolve(token);
|
|
78
|
+
}
|
|
79
|
+
function tokenToString(token) {
|
|
80
|
+
if (typeof token === 'object') {
|
|
81
|
+
token = token.token;
|
|
82
|
+
}
|
|
83
|
+
if (typeof token === 'function') {
|
|
84
|
+
token = token.token || token.constructor.name;
|
|
85
|
+
}
|
|
86
|
+
return String(token);
|
|
87
|
+
}
|
|
88
|
+
//# sourceMappingURL=container.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"container.js","sourceRoot":"","sources":["../../src/di/container.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/di/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC"}
|
package/dist/di/index.js
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/di/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/di/logger.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,QAAQ,wDAA2B,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/di/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,MAAM,CAAC,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../../src/di/token.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;CACjC;AAED;;GAEG;AACH,MAAM,WAAW,cAAc,CAAC,CAAC,CAAE,SAAQ,UAAU;IACnD,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,MAAM,yBAAyB,CAAC,CAAC,IAAI,CAAC,QAAQ,MAAM,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,GAAG,UAAU,CAAC;AAEjG;;GAEG;AACH,MAAM,MAAM,KAAK,CAAC,CAAC,IAAI,yBAAyB,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,MAAM,CAAC;AAE1F;;GAEG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,cAAc,CAAC,CAAC,CAAC,CAExE"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../src/di/token.ts"],"names":[],"mappings":"AAwBA;;GAEG;AACH,MAAM,UAAU,WAAW,CAAI,KAAsB;IACnD,OAAO,EAAE,KAAK,EAAE,CAAC;AACnB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load.d.ts","sourceRoot":"","sources":["../../src/discord/load.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,MAAM,
|
|
1
|
+
{"version":3,"file":"load.d.ts","sourceRoot":"","sources":["../../src/discord/load.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,MAAM,EAAqB,MAAM,YAAY,CAAC;AAS5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAIrD,wBAAsB,mBAAmB,CAAC,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,iBAwC7E"}
|
package/dist/discord/load.js
CHANGED
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
import * as path from 'node:path';
|
|
2
2
|
import * as bun from 'bun';
|
|
3
|
-
import { coreLog } from '../internal/coreLog.js';
|
|
4
3
|
import { resolveSerializableOr } from '../util/serializableOr.js';
|
|
5
4
|
import { isContextMenuCommandHandler, isSlashCommandHandler } from './command.js';
|
|
6
5
|
import { isEventHandler } from './event.js';
|
|
6
|
+
import { discordLogger } from './logger.js';
|
|
7
7
|
import * as registry from './registry.js';
|
|
8
|
-
const
|
|
8
|
+
const logger = discordLogger.namespaced('loader');
|
|
9
9
|
export async function loadAllInteractions(config, client) {
|
|
10
|
-
if (!config.paths
|
|
10
|
+
if (!config.paths.length) {
|
|
11
11
|
return;
|
|
12
12
|
}
|
|
13
|
-
await Promise.allSettled(config.paths.map((p) => loadFolder(p, (module) => {
|
|
13
|
+
await Promise.allSettled(config.paths.map((p) => loadFolder(p, config, (module) => {
|
|
14
14
|
for (const exported of Object.values(module)) {
|
|
15
15
|
if (isSlashCommandHandler(exported)) {
|
|
16
16
|
const data = resolveSerializableOr(exported.data);
|
|
@@ -24,56 +24,49 @@ export async function loadAllInteractions(config, client) {
|
|
|
24
24
|
}
|
|
25
25
|
else if (isEventHandler(exported)) {
|
|
26
26
|
const { event, once, execute } = exported;
|
|
27
|
-
const
|
|
28
|
-
const prev = registry.events.get(name);
|
|
27
|
+
const prev = registry.events.get(event);
|
|
29
28
|
if (prev) {
|
|
30
|
-
client.off(
|
|
31
|
-
registry.events.delete(
|
|
29
|
+
client.off(event, prev.execute);
|
|
30
|
+
registry.events.delete(event);
|
|
32
31
|
}
|
|
33
32
|
const ctx = {
|
|
34
33
|
client,
|
|
35
34
|
};
|
|
36
35
|
const handler = (...args) => execute(...args, ctx);
|
|
37
36
|
if (once) {
|
|
38
|
-
client.once(
|
|
37
|
+
client.once(event, handler);
|
|
39
38
|
}
|
|
40
39
|
else {
|
|
41
|
-
client.on(
|
|
40
|
+
client.on(event, handler);
|
|
42
41
|
}
|
|
43
42
|
registry.events.set(event, exported);
|
|
44
43
|
}
|
|
45
44
|
}
|
|
46
45
|
})));
|
|
47
46
|
}
|
|
48
|
-
async function loadFolder(dirPath, cb) {
|
|
47
|
+
async function loadFolder(dirPath, config, cb) {
|
|
49
48
|
const glob = new bun.Glob(`**/*.{ts,js,tsx,jsx}`);
|
|
50
49
|
const filePaths = glob.scan(dirPath);
|
|
51
50
|
const importOps = [];
|
|
52
51
|
let successCount = 0;
|
|
53
52
|
for await (const file of filePaths) {
|
|
54
53
|
const fullPath = path.join(dirPath, file);
|
|
55
|
-
importOps.push(loadOne(fullPath, cb)
|
|
54
|
+
importOps.push(loadOne(fullPath, config, cb)
|
|
56
55
|
.then(() => {
|
|
57
56
|
successCount++;
|
|
58
|
-
|
|
57
|
+
logger.verbose(`Loaded ${fullPath}`);
|
|
59
58
|
})
|
|
60
59
|
.catch((e) => {
|
|
61
|
-
|
|
60
|
+
logger.error(`Failed to load ${fullPath}`, e);
|
|
62
61
|
}));
|
|
63
62
|
}
|
|
64
|
-
|
|
63
|
+
logger.verbose(`Kicked off ${importOps.length} import load operations in parallel for ${dirPath}`);
|
|
65
64
|
await Promise.all(importOps);
|
|
66
|
-
|
|
65
|
+
logger.info(`Loaded ${successCount} files from ${dirPath}`);
|
|
67
66
|
}
|
|
68
|
-
async function loadOne(filePath, cb) {
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
cb(module);
|
|
73
|
-
coreLog.verbose(`Loaded ${importPath}`);
|
|
74
|
-
}
|
|
75
|
-
catch (error) {
|
|
76
|
-
coreLog.error(`Failed to hot-load command: ${filePath}`, error);
|
|
77
|
-
}
|
|
67
|
+
async function loadOne(filePath, config, cb) {
|
|
68
|
+
const importPath = config.supportHotReloading ? `${filePath}?update=${Date.now()}` : filePath;
|
|
69
|
+
const module = await import(importPath);
|
|
70
|
+
cb(module);
|
|
78
71
|
}
|
|
79
72
|
//# sourceMappingURL=load.js.map
|
package/dist/discord/load.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load.js","sourceRoot":"","sources":["../../src/discord/load.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAElC,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAG3B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"load.js","sourceRoot":"","sources":["../../src/discord/load.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAElC,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAG3B,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAElE,OAAO,EAAE,2BAA2B,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAClF,OAAO,EAAqB,cAAc,EAAE,MAAM,YAAY,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAC;AAI1C,MAAM,MAAM,GAAG,aAAa,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;AAElD,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,MAAoB,EAAE,MAAc;IAC5E,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QACzB,OAAO;IACT,CAAC;IAED,MAAM,OAAO,CAAC,UAAU,CACtB,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACrB,UAAU,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE;QAC/B,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;YAC7C,IAAI,qBAAqB,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACpC,MAAM,IAAI,GAAG,qBAAqB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBAClD,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC;gBACrB,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAClD,CAAC;iBAAM,IAAI,2BAA2B,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACjD,MAAM,IAAI,GAAG,qBAAqB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBAClD,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC;gBACrB,QAAQ,CAAC,mBAAmB,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YACxD,CAAC;iBAAM,IAAI,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACpC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC;gBAC1C,MAAM,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBACxC,IAAI,IAAI,EAAE,CAAC;oBACT,MAAM,CAAC,GAAG,CAAC,KAAe,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;oBAC1C,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBAChC,CAAC;gBAED,MAAM,GAAG,GAAiB;oBACxB,MAAM;iBACP,CAAC;gBACF,MAAM,OAAO,GAAG,CAAC,GAAG,IAAsC,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,IAAI,EAAE,GAAG,CAAC,CAAC;gBACrF,IAAI,IAAI,EAAE,CAAC;oBACT,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;gBAC9B,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;gBAC5B,CAAC;gBACD,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YACvC,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CACH,CACF,CAAC;AACJ,CAAC;AAID,KAAK,UAAU,UAAU,CAAC,OAAe,EAAE,MAAoB,EAAE,EAAoB;IACnF,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;IAClD,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACrC,MAAM,SAAS,GAAyB,EAAE,CAAC;IAE3C,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;QACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC1C,SAAS,CAAC,IAAI,CACZ,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,CAAC;aAC1B,IAAI,CAAC,GAAG,EAAE;YACT,YAAY,EAAE,CAAC;YACf,MAAM,CAAC,OAAO,CAAC,UAAU,QAAQ,EAAE,CAAC,CAAC;QACvC,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,CAAU,EAAE,EAAE;YACpB,MAAM,CAAC,KAAK,CAAC,kBAAkB,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;QAChD,CAAC,CAAC,CACL,CAAC;IACJ,CAAC;IACD,MAAM,CAAC,OAAO,CACZ,cAAc,SAAS,CAAC,MAAM,2CAA2C,OAAO,EAAE,CACnF,CAAC;IACF,MAAM,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC7B,MAAM,CAAC,IAAI,CAAC,UAAU,YAAY,eAAe,OAAO,EAAE,CAAC,CAAC;AAC9D,CAAC;AAED,KAAK,UAAU,OAAO,CAAC,QAAgB,EAAE,MAAoB,EAAE,EAAoB;IACjF,MAAM,UAAU,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC,CAAC,GAAG,QAAQ,WAAW,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;IAC9F,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC;IACxC,EAAE,CAAC,MAAM,CAAC,CAAC;AACb,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/discord/logger.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,aAAa,wDAAgC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/discord/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,MAAM,CAAC,MAAM,aAAa,GAAG,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/discord/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,KAAK,+CAA+C,EACpD,KAAK,iDAAiD,EACvD,MAAM,YAAY,CAAC;AAKpB,OAAO,EAAE,KAAK,yBAAyB,EAAE,KAAK,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAExF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/discord/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,KAAK,+CAA+C,EACpD,KAAK,iDAAiD,EACvD,MAAM,YAAY,CAAC;AAKpB,OAAO,EAAE,KAAK,yBAAyB,EAAE,KAAK,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAExF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAsB/C,eAAO,MAAM,aAAa,yCAEqB,CAAC;AAEhD,eAAO,MAAM,mBAAmB,+CAEqB,CAAC;AAEtD,eAAO,MAAM,MAAM,2EACwE,CAAC;AAE5F,MAAM,MAAM,8BAA8B,GACtC,iDAAiD,GACjD,+CAA+C,CAAC;AAEpD,wBAAgB,oBAAoB,IAAI,aAAa,CAAC,8BAA8B,CAAC,CAKpF"}
|
package/dist/discord/registry.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Collection, } from 'discord.js';
|
|
2
2
|
import { coreLog } from '../internal/coreLog.js';
|
|
3
3
|
import { resolveSerializableOr } from '../util/serializableOr.js';
|
|
4
|
+
// TODO: Make registry creation lazy so we can use getConfig().supportHotReloading
|
|
4
5
|
const isDev = process.env.NODE_ENV === 'development';
|
|
5
6
|
const hmr = globalThis;
|
|
6
7
|
if (isDev && !hmr.hotReloadCommandRegistry) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/discord/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,GAGX,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAMlE,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,CAAC;AAErD,MAAM,GAAG,GAAG,UAMX,CAAC;AAEF,IAAI,KAAK,IAAI,CAAC,GAAG,CAAC,wBAAwB,EAAE,CAAC;IAC3C,OAAO,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC;IACpD,GAAG,CAAC,wBAAwB,GAAG;QAC7B,aAAa,EAAE,IAAI,UAAU,EAAE;QAC/B,mBAAmB,EAAE,IAAI,UAAU,EAAE;QACrC,MAAM,EAAE,IAAI,UAAU,EAAE;KACzB,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,aAAa,GACxB,CAAC,KAAK,IAAI,GAAG,CAAC,wBAAyB,CAAC,aAAa,CAAC;IACtD,IAAI,UAAU,EAA+B,CAAC;AAEhD,MAAM,CAAC,MAAM,mBAAmB,GAC9B,CAAC,KAAK,IAAI,GAAG,CAAC,wBAAyB,CAAC,mBAAmB,CAAC;IAC5D,IAAI,UAAU,EAAqC,CAAC;AAEtD,MAAM,CAAC,MAAM,MAAM,GACjB,CAAC,KAAK,IAAI,GAAG,CAAC,wBAAyB,CAAC,MAAM,CAAC,IAAI,IAAI,UAAU,EAAwB,CAAC;AAM5F,MAAM,UAAU,oBAAoB;IAClC,OAAO;QACL,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;QAC/C,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;KACtD,CAAC,GAAG,CAAC,CAAC,cAAc,EAAE,EAAE,CAAC,qBAAqB,CAAC,cAAc,CAAC,CAAC,CAAC;AACnE,CAAC"}
|
|
1
|
+
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/discord/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,GAGX,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAMlE,kFAAkF;AAClF,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,CAAC;AAErD,MAAM,GAAG,GAAG,UAMX,CAAC;AAEF,IAAI,KAAK,IAAI,CAAC,GAAG,CAAC,wBAAwB,EAAE,CAAC;IAC3C,OAAO,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC;IACpD,GAAG,CAAC,wBAAwB,GAAG;QAC7B,aAAa,EAAE,IAAI,UAAU,EAAE;QAC/B,mBAAmB,EAAE,IAAI,UAAU,EAAE;QACrC,MAAM,EAAE,IAAI,UAAU,EAAE;KACzB,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,aAAa,GACxB,CAAC,KAAK,IAAI,GAAG,CAAC,wBAAyB,CAAC,aAAa,CAAC;IACtD,IAAI,UAAU,EAA+B,CAAC;AAEhD,MAAM,CAAC,MAAM,mBAAmB,GAC9B,CAAC,KAAK,IAAI,GAAG,CAAC,wBAAyB,CAAC,mBAAmB,CAAC;IAC5D,IAAI,UAAU,EAAqC,CAAC;AAEtD,MAAM,CAAC,MAAM,MAAM,GACjB,CAAC,KAAK,IAAI,GAAG,CAAC,wBAAyB,CAAC,MAAM,CAAC,IAAI,IAAI,UAAU,EAAwB,CAAC;AAM5F,MAAM,UAAU,oBAAoB;IAClC,OAAO;QACL,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;QAC/C,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;KACtD,CAAC,GAAG,CAAC,CAAC,cAAc,EAAE,EAAE,CAAC,qBAAqB,CAAC,cAAc,CAAC,CAAC,CAAC;AACnE,CAAC"}
|
package/dist/discord/router.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type BotKitConfig } from '../core/config.js';
|
|
1
2
|
import type { Client } from 'discord.js';
|
|
2
|
-
export declare function initializeRouter(client: Client): void;
|
|
3
|
+
export declare function initializeRouter(config: BotKitConfig, client: Client): void;
|
|
3
4
|
//# sourceMappingURL=router.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/discord/router.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/discord/router.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAyC,MAAM,mBAAmB,CAAC;AAK7F,OAAO,KAAK,EAAE,MAAM,EAAe,MAAM,YAAY,CAAC;AAOtD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAW3E"}
|
package/dist/discord/router.js
CHANGED
|
@@ -1,24 +1,30 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { getConfig } from '../core/config.js';
|
|
2
|
+
import { discordLogger } from './logger.js';
|
|
2
3
|
import * as registry from './registry.js';
|
|
3
|
-
const
|
|
4
|
+
const logger = discordLogger.namespaced('router');
|
|
4
5
|
const hmr = globalThis;
|
|
5
|
-
export function initializeRouter(client) {
|
|
6
|
-
const handler = (
|
|
7
|
-
if (
|
|
8
|
-
client.off('interactionCreate', hmr.
|
|
6
|
+
export function initializeRouter(config, client) {
|
|
7
|
+
const handler = (config.supportHotReloading && hmr.hmr__onInteractionCreateHandler) || handle;
|
|
8
|
+
if (config.supportHotReloading && hmr.hmr__onInteractionCreateHandler) {
|
|
9
|
+
client.off('interactionCreate', hmr.hmr__onInteractionCreateHandler);
|
|
9
10
|
}
|
|
10
11
|
client.on('interactionCreate', handler);
|
|
11
|
-
if (
|
|
12
|
-
hmr.
|
|
12
|
+
if (config.supportHotReloading) {
|
|
13
|
+
hmr.hmr__onInteractionCreateHandler = handler;
|
|
13
14
|
}
|
|
14
15
|
}
|
|
15
16
|
async function handle(interaction) {
|
|
17
|
+
const middlewares = getConfig().interactionMiddleware;
|
|
16
18
|
try {
|
|
17
|
-
|
|
18
|
-
|
|
19
|
+
if (middlewares.length === 0) {
|
|
20
|
+
await doHandle(interaction);
|
|
21
|
+
}
|
|
22
|
+
else {
|
|
23
|
+
await executeMiddlewares(middlewares, interaction, doHandle);
|
|
24
|
+
}
|
|
19
25
|
}
|
|
20
26
|
catch (error) {
|
|
21
|
-
|
|
27
|
+
logger.error('Error while handling interaction', error, {
|
|
22
28
|
id: interaction.id,
|
|
23
29
|
type: interaction.type,
|
|
24
30
|
userId: interaction.user.id,
|
|
@@ -27,10 +33,10 @@ async function handle(interaction) {
|
|
|
27
33
|
}
|
|
28
34
|
async function doHandle(interaction) {
|
|
29
35
|
if (interaction.isChatInputCommand()) {
|
|
30
|
-
|
|
36
|
+
logger.verbose(`Received chat input command: ${interaction.commandName}`);
|
|
31
37
|
const handler = registry.slashCommands.get(interaction.commandName);
|
|
32
38
|
if (!handler) {
|
|
33
|
-
|
|
39
|
+
logger.warn(`No handler found for command: ${interaction.commandName}`);
|
|
34
40
|
return;
|
|
35
41
|
}
|
|
36
42
|
if (handler.autocomplete && interaction.isAutocomplete()) {
|
|
@@ -41,26 +47,41 @@ async function doHandle(interaction) {
|
|
|
41
47
|
}
|
|
42
48
|
}
|
|
43
49
|
if (interaction.isAutocomplete()) {
|
|
44
|
-
|
|
50
|
+
logger.verbose(`Received autocomplete request: ${interaction.commandName}`);
|
|
45
51
|
const handler = registry.slashCommands.get(interaction.commandName);
|
|
46
52
|
if (!handler) {
|
|
47
|
-
|
|
53
|
+
logger.warn(`No handler found for command: ${interaction.commandName}`);
|
|
48
54
|
return;
|
|
49
55
|
}
|
|
50
56
|
if (!handler.autocomplete) {
|
|
51
|
-
|
|
57
|
+
logger.warn(`No autocomplete handler found for command: ${interaction.commandName}`);
|
|
52
58
|
return;
|
|
53
59
|
}
|
|
54
60
|
await handler.autocomplete(interaction);
|
|
55
61
|
}
|
|
56
62
|
if (interaction.isContextMenuCommand()) {
|
|
57
|
-
|
|
63
|
+
logger.verbose(`Received context menu command: ${interaction.commandName}`);
|
|
58
64
|
const handler = registry.contextMenuCommands.get(interaction.commandName);
|
|
59
65
|
if (!handler) {
|
|
60
|
-
|
|
66
|
+
logger.warn(`No handler found for command: ${interaction.commandName}`);
|
|
61
67
|
return;
|
|
62
68
|
}
|
|
63
69
|
await handler.execute(interaction);
|
|
64
70
|
}
|
|
65
71
|
}
|
|
72
|
+
async function executeMiddlewares(pipeline, interaction, finalStep) {
|
|
73
|
+
let index = -1;
|
|
74
|
+
const dispatch = async (i) => {
|
|
75
|
+
if (i <= index)
|
|
76
|
+
throw new Error('next() called multiple times in middleware');
|
|
77
|
+
index = i;
|
|
78
|
+
if (i === pipeline.length) {
|
|
79
|
+
await finalStep(interaction);
|
|
80
|
+
return;
|
|
81
|
+
}
|
|
82
|
+
const middleware = pipeline[i];
|
|
83
|
+
await middleware(interaction, () => dispatch(i + 1));
|
|
84
|
+
};
|
|
85
|
+
await dispatch(0);
|
|
86
|
+
}
|
|
66
87
|
//# sourceMappingURL=router.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/discord/router.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/discord/router.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,4 +1,7 @@
|
|
|
1
|
+
export * from './app/index.js';
|
|
1
2
|
export * from './core/index.js';
|
|
3
|
+
export * from './di/index.js';
|
|
4
|
+
export * from './modules/index.js';
|
|
2
5
|
export { SerializableOr } from './util/serializableOr.js';
|
|
3
6
|
export { resolveSerializableOr } from './util/serializableOr.js';
|
|
4
7
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,oBAAoB,CAAC;AACnC,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC"}
|
package/dist/index.js
CHANGED
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,oBAAoB,CAAC;AAEnC,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC"}
|
|
@@ -1,19 +1,18 @@
|
|
|
1
|
-
import { LogLevel, type LogLevelString
|
|
1
|
+
import { type LoggerMeta, LogLevel, type LogLevelString } from '../app/appLogger.js';
|
|
2
2
|
export declare function shouldLog(level: (typeof LogLevel)[LogLevelString]): boolean;
|
|
3
3
|
/**
|
|
4
4
|
* @internal
|
|
5
5
|
*/
|
|
6
6
|
export declare class InternalLogger {
|
|
7
7
|
private readonly scope;
|
|
8
|
-
|
|
9
|
-
constructor(scope: string, ns?: string);
|
|
8
|
+
constructor(scope: string);
|
|
10
9
|
namespaced(ns: string): InternalLogger;
|
|
11
10
|
private fmtMsg;
|
|
12
|
-
verbose(msg: string, meta?:
|
|
13
|
-
debug(msg: string, maybeLazyMeta?:
|
|
14
|
-
info(msg: string, meta?:
|
|
15
|
-
warn(msg: string, meta?:
|
|
16
|
-
error(msg: string, error?: unknown, meta?:
|
|
11
|
+
verbose(msg: string, meta?: LoggerMeta): void;
|
|
12
|
+
debug(msg: string, maybeLazyMeta?: LoggerMeta | (() => LoggerMeta)): void;
|
|
13
|
+
info(msg: string, meta?: LoggerMeta): void;
|
|
14
|
+
warn(msg: string, meta?: LoggerMeta): void;
|
|
15
|
+
error(msg: string, error?: unknown, meta?: LoggerMeta): void;
|
|
17
16
|
}
|
|
18
17
|
/**
|
|
19
18
|
* @internal
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"internalLogger.d.ts","sourceRoot":"","sources":["../../src/internal/internalLogger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,KAAK,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"internalLogger.d.ts","sourceRoot":"","sources":["../../src/internal/internalLogger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,QAAQ,EAAE,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAGrF,wBAAgB,SAAS,CAAC,KAAK,EAAE,CAAC,OAAO,QAAQ,CAAC,CAAC,cAAc,CAAC,GAAG,OAAO,CAE3E;AAED;;GAEG;AACH,qBAAa,cAAc;IACb,OAAO,CAAC,QAAQ,CAAC,KAAK;IAAlC,YAA6B,KAAK,EAAE,MAAM,EAAI;IAE9C,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,cAAc,CAErC;IAED,OAAO,CAAC,MAAM;IAId,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,UAAU,QAIrC;IAED,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,UAAU,GAAG,CAAC,MAAM,UAAU,CAAC,QAKjE;IAED,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,UAAU,QAIlC;IAED,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,UAAU,QAIlC;IAED,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,UAAU,QAIpD;CACF;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,cAAc,CAElE"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { LogLevel
|
|
1
|
+
import { LogLevel } from '../app/appLogger.js';
|
|
2
|
+
import { getConfig } from '../core/config.js';
|
|
2
3
|
export function shouldLog(level) {
|
|
3
4
|
return LogLevel[getConfig().logLevel] >= level;
|
|
4
5
|
}
|
|
@@ -7,20 +8,14 @@ export function shouldLog(level) {
|
|
|
7
8
|
*/
|
|
8
9
|
export class InternalLogger {
|
|
9
10
|
scope;
|
|
10
|
-
|
|
11
|
-
constructor(scope, ns = '') {
|
|
11
|
+
constructor(scope) {
|
|
12
12
|
this.scope = scope;
|
|
13
|
-
this.ns = ns;
|
|
14
13
|
}
|
|
15
14
|
namespaced(ns) {
|
|
16
|
-
return new InternalLogger(this.scope
|
|
15
|
+
return new InternalLogger(this.scope ? `${this.scope}:${ns}` : ns);
|
|
17
16
|
}
|
|
18
17
|
fmtMsg(msg) {
|
|
19
|
-
|
|
20
|
-
if (this.ns) {
|
|
21
|
-
str += `:${this.ns}`;
|
|
22
|
-
}
|
|
23
|
-
return `${str}] ${msg}`;
|
|
18
|
+
return `[${this.scope}] ${msg}`;
|
|
24
19
|
}
|
|
25
20
|
verbose(msg, meta) {
|
|
26
21
|
if (shouldLog(LogLevel.verbose)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"internalLogger.js","sourceRoot":"","sources":["../../src/internal/internalLogger.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"internalLogger.js","sourceRoot":"","sources":["../../src/internal/internalLogger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,QAAQ,EAAuB,MAAM,qBAAqB,CAAC;AACrF,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9C,MAAM,UAAU,SAAS,CAAC,KAAwC;IAChE,OAAO,QAAQ,CAAC,SAAS,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,CAAC;AACjD,CAAC;AAED;;GAEG;AACH,MAAM,OAAO,cAAc;IACI,KAAK;IAAlC,YAA6B,KAAa;qBAAb,KAAK;IAAW,CAAC;IAE9C,UAAU,CAAC,EAAU;QACnB,OAAO,IAAI,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACrE,CAAC;IAEO,MAAM,CAAC,GAAW;QACxB,OAAO,IAAI,IAAI,CAAC,KAAK,KAAK,GAAG,EAAE,CAAC;IAClC,CAAC;IAED,OAAO,CAAC,GAAW,EAAE,IAAiB;QACpC,IAAI,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YAChC,SAAS,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;QACvD,CAAC;IACH,CAAC;IAED,KAAK,CAAC,GAAW,EAAE,aAA+C;QAChE,IAAI,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAC9B,MAAM,IAAI,GAAG,OAAO,aAAa,KAAK,UAAU,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC;YACnF,SAAS,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;QACrD,CAAC;IACH,CAAC;IAED,IAAI,CAAC,GAAW,EAAE,IAAiB;QACjC,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7B,SAAS,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;QACpD,CAAC;IACH,CAAC;IAED,IAAI,CAAC,GAAW,EAAE,IAAiB;QACjC,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7B,SAAS,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;QAClD,CAAC;IACH,CAAC;IAED,KAAK,CAAC,GAAW,EAAE,KAAe,EAAE,IAAiB;QACnD,IAAI,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAC9B,SAAS,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC;CACF;AAED;;GAEG;AACH,MAAM,UAAU,oBAAoB,CAAC,KAAa;IAChD,OAAO,IAAI,cAAc,CAAC,KAAK,CAAC,CAAC;AACnC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/modules/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/modules/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC"}
|