reciple 7.2.3 → 7.3.1
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/bin/bin.mjs +9 -6
- package/bin/bin.mjs.map +1 -1
- package/bin/classes/Config.d.ts +1 -0
- package/bin/classes/Config.js +3 -3
- package/bin/classes/Config.js.map +1 -1
- package/bin/utils/cli.d.ts +5 -1
- package/bin/utils/cli.js +7 -3
- package/bin/utils/cli.js.map +1 -1
- package/bin/utils/logger.d.ts +3 -3
- package/bin/utils/logger.js +4 -4
- package/bin/utils/logger.js.map +1 -1
- package/package.json +7 -7
- package/static/config.yml +8 -5
package/bin/bin.mjs
CHANGED
|
@@ -4,21 +4,22 @@ import { getModules } from './utils/modules.js';
|
|
|
4
4
|
import { createLogger, eventLogger } from './utils/logger.js';
|
|
5
5
|
import { existsSync, mkdirSync, readdirSync } from 'fs';
|
|
6
6
|
import { Config } from './classes/Config.js';
|
|
7
|
-
import {
|
|
7
|
+
import { cwd, command, argvOptions } from './utils/cli.js';
|
|
8
8
|
import { RecipleClient } from './index.js';
|
|
9
9
|
import micromatch from 'micromatch';
|
|
10
10
|
import prompts from 'prompts';
|
|
11
11
|
import semver from 'semver';
|
|
12
12
|
import path from 'path';
|
|
13
|
+
command.parse();
|
|
13
14
|
const allowedFiles = ['node_modules', 'reciple.yml', 'package.json', '.*'];
|
|
14
|
-
const configPath =
|
|
15
|
-
? path.isAbsolute(
|
|
16
|
-
? path.resolve(
|
|
17
|
-
: path.join(cwd,
|
|
15
|
+
const configPath = argvOptions().config
|
|
16
|
+
? path.isAbsolute(argvOptions().config)
|
|
17
|
+
? path.resolve(argvOptions().config)
|
|
18
|
+
: path.join(cwd, argvOptions().config)
|
|
18
19
|
: path.join(cwd, 'reciple.yml');
|
|
19
20
|
if (!existsSync(cwd))
|
|
20
21
|
mkdirSync(cwd, { recursive: true });
|
|
21
|
-
if (readdirSync(cwd).filter(f => !micromatch.isMatch(f, allowedFiles)).length && !existsSync(configPath) && !
|
|
22
|
+
if (readdirSync(cwd).filter(f => !micromatch.isMatch(f, allowedFiles)).length && !existsSync(configPath) && !argvOptions().yes) {
|
|
22
23
|
const confirm = await prompts({
|
|
23
24
|
initial: false,
|
|
24
25
|
message: `Would you like to initialize your Reciple app ${cwd !== process.cwd() ? 'in your chosen directory' : 'here'}?`,
|
|
@@ -31,6 +32,8 @@ if (readdirSync(cwd).filter(f => !micromatch.isMatch(f, allowedFiles)).length &&
|
|
|
31
32
|
const configParser = await (new Config(configPath)).parseConfig();
|
|
32
33
|
const config = configParser.getConfig();
|
|
33
34
|
const logger = config.logger?.enabled ? createLogger(config.logger) : undefined;
|
|
35
|
+
if (argvOptions().shardmode)
|
|
36
|
+
config.applicationCommandRegister = { ...config.applicationCommandRegister, enabled: false };
|
|
34
37
|
/**
|
|
35
38
|
* !! BREAKING !!
|
|
36
39
|
* TODO: use reciple cli version instead of client version when checking
|
package/bin/bin.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bin.mjs","sourceRoot":"","sources":["../src/bin.mts"],"names":[],"mappings":";AAEA,OAAO,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC9H,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,IAAI,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"bin.mjs","sourceRoot":"","sources":["../src/bin.mts"],"names":[],"mappings":"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"}
|
package/bin/classes/Config.d.ts
CHANGED
package/bin/classes/Config.js
CHANGED
|
@@ -26,7 +26,7 @@ class Config {
|
|
|
26
26
|
let configYaml = (0, fallout_utility_1.replaceAll)(Config.defaultConfigYaml(), 'VERSION', client_1.version);
|
|
27
27
|
const configData = yaml_1.default.parse(configYaml);
|
|
28
28
|
if (configData.token === 'TOKEN') {
|
|
29
|
-
configData.token = cli_1.
|
|
29
|
+
configData.token = (0, cli_1.argvOptions)().token || (await this.askToken()) || 'TOKEN';
|
|
30
30
|
configYaml = (0, fallout_utility_1.replaceAll)(configYaml, 'token: TOKEN', `token: ${configData.token}`);
|
|
31
31
|
}
|
|
32
32
|
(0, fs_1.writeFileSync)(this.configPath, configYaml, 'utf-8');
|
|
@@ -53,10 +53,10 @@ class Config {
|
|
|
53
53
|
}, { onCancel: () => process.exit(1) })).token;
|
|
54
54
|
}
|
|
55
55
|
parseToken() {
|
|
56
|
-
const token = cli_1.
|
|
56
|
+
const token = (0, cli_1.argvOptions)().token || this.config?.token || null;
|
|
57
57
|
if (!token)
|
|
58
58
|
return token;
|
|
59
|
-
return (0, parseEnvString_1.parseEnvString)(token, cli_1.
|
|
59
|
+
return (0, parseEnvString_1.parseEnvString)(token, (0, cli_1.argvOptions)().env ? path_1.default.resolve((0, cli_1.argvOptions)().env) : path_1.default.join(cli_1.cwd, '.env')) || null;
|
|
60
60
|
}
|
|
61
61
|
static defaultConfig() {
|
|
62
62
|
return yaml_1.default.parse(this.defaultConfigYaml());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Config.js","sourceRoot":"","sources":["../../src/classes/Config.ts"],"names":[],"mappings":";;;;;;AAAA,sEAAmE;AACnE,4CAAgE;AAChE,2BAA6D;AAC7D,4DAAyD;AACzD,qDAA6C;AAE7C,
|
|
1
|
+
{"version":3,"file":"Config.js","sourceRoot":"","sources":["../../src/classes/Config.ts"],"names":[],"mappings":"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"}
|
package/bin/utils/cli.d.ts
CHANGED
|
@@ -1,4 +1,8 @@
|
|
|
1
1
|
import { Command } from 'commander';
|
|
2
|
-
export declare
|
|
2
|
+
export declare let command: Command;
|
|
3
|
+
/**
|
|
4
|
+
* @deprecated Use `argvOptions` function instead
|
|
5
|
+
*/
|
|
3
6
|
export declare const flags: import("commander").OptionValues;
|
|
7
|
+
export declare const argvOptions: () => import("commander").OptionValues;
|
|
4
8
|
export declare const cwd: string;
|
package/bin/utils/cli.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.cwd = exports.flags = exports.command = void 0;
|
|
6
|
+
exports.cwd = exports.argvOptions = exports.flags = exports.command = void 0;
|
|
7
7
|
const client_1 = require("@reciple/client");
|
|
8
8
|
const commander_1 = require("commander");
|
|
9
9
|
const fs_1 = require("fs");
|
|
@@ -20,8 +20,12 @@ exports.command = new commander_1.Command()
|
|
|
20
20
|
.option('-y, --yes', 'Agree to all Reciple confirmation prompts')
|
|
21
21
|
.option('--env <file>', '.env file location')
|
|
22
22
|
.option('--shardmode', 'Modifies some functionalities to support sharding')
|
|
23
|
-
.allowUnknownOption(true)
|
|
24
|
-
|
|
23
|
+
.allowUnknownOption(true);
|
|
24
|
+
/**
|
|
25
|
+
* @deprecated Use `argvOptions` function instead
|
|
26
|
+
*/
|
|
25
27
|
exports.flags = exports.command.opts();
|
|
28
|
+
const argvOptions = () => exports.command.opts();
|
|
29
|
+
exports.argvOptions = argvOptions;
|
|
26
30
|
exports.cwd = exports.command.args[0] ? path_1.default.resolve(exports.command.args[0]) : process.cwd();
|
|
27
31
|
//# sourceMappingURL=cli.js.map
|
package/bin/utils/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/utils/cli.ts"],"names":[],"mappings":";;;;;;AAAA,4CAA8C;AAC9C,yCAAoC;AACpC,2BAAkC;AAClC,gDAAwB;AAExB,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,iBAAY,EAAC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/utils/cli.ts"],"names":[],"mappings":";;;;;;AAAA,4CAA8C;AAC9C,yCAAoC;AACpC,2BAAkC;AAClC,gDAAwB;AAExB,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,iBAAY,EAAC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;AAEpG,QAAA,OAAO,GAAG,IAAI,mBAAO,EAAE;KAC7B,IAAI,CAAC,SAAS,CAAC;KACf,WAAW,CAAC,WAAW,CAAC;KACxB,OAAO,CAAC,gBAAgB,OAAO,qBAAqB,oBAAW,EAAE,EAAE,eAAe,CAAC;KACnF,QAAQ,CAAC,OAAO,EAAE,sCAAsC,CAAC;KACzD,MAAM,CAAC,qBAAqB,EAAE,wBAAwB,CAAC;KACvD,MAAM,CAAC,oBAAoB,EAAE,4BAA4B,CAAC;KAC1D,MAAM,CAAC,iBAAiB,EAAE,mBAAmB,CAAC;KAC9C,MAAM,CAAC,WAAW,EAAE,2CAA2C,CAAC;KAChE,MAAM,CAAC,cAAc,EAAE,oBAAoB,CAAC;KAC5C,MAAM,CAAC,aAAa,EAAE,mDAAmD,CAAC;KAC1E,kBAAkB,CAAC,IAAI,CAAC,CAAC;AAE9B;;GAEG;AACU,QAAA,KAAK,GAAG,eAAO,CAAC,IAAI,EAAE,CAAC;AAC7B,MAAM,WAAW,GAAG,GAAG,EAAE,CAAC,eAAO,CAAC,IAAI,EAAE,CAAC;AAAnC,QAAA,WAAW,eAAwB;AAEnC,QAAA,GAAG,GAAG,eAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,cAAI,CAAC,OAAO,CAAC,eAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC"}
|
package/bin/utils/logger.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { IConfig } from '../classes/Config';
|
|
2
|
-
import { Logger, LoggerLevel } from 'fallout-utility';
|
|
2
|
+
import { Logger, LoggerLevel, PartialDeep } from 'fallout-utility';
|
|
3
3
|
import { RecipleClient } from '../';
|
|
4
|
-
export declare function formatLogMessage(message: string, logger: Logger, config: IConfig['logger']
|
|
5
|
-
export declare function createLogger(config: IConfig['logger']): Logger;
|
|
4
|
+
export declare function formatLogMessage(message: string, logger: Logger, config: PartialDeep<IConfig['logger']>, level: LoggerLevel): string;
|
|
5
|
+
export declare function createLogger(config: PartialDeep<IConfig['logger']>): Logger;
|
|
6
6
|
export declare function eventLogger(client: RecipleClient): void;
|
package/bin/utils/logger.js
CHANGED
|
@@ -24,13 +24,13 @@ function formatLogMessage(message, logger, config, level) {
|
|
|
24
24
|
}
|
|
25
25
|
};
|
|
26
26
|
return color(`[${new Date().toLocaleTimeString(undefined, { hour12: false })} ${fallout_utility_1.LoggerLevel[level]}]` +
|
|
27
|
-
(cli_1.
|
|
27
|
+
((0, cli_1.argvOptions)().shardmode && process.pid ? `[${process.pid}]` : '') +
|
|
28
28
|
(logger.name ? `[${logger.name}]` : '')) + ` ${message}`;
|
|
29
29
|
}
|
|
30
30
|
exports.formatLogMessage = formatLogMessage;
|
|
31
31
|
function createLogger(config) {
|
|
32
32
|
const logger = new fallout_utility_1.Logger({
|
|
33
|
-
enableDebugmode: cli_1.
|
|
33
|
+
enableDebugmode: (0, cli_1.argvOptions)().debugmode || config.debugmode === true,
|
|
34
34
|
forceEmitLogEvents: true,
|
|
35
35
|
formatMessageLines: {
|
|
36
36
|
[fallout_utility_1.LoggerLevel.INFO]: (message, logger) => formatLogMessage(message, logger, config, fallout_utility_1.LoggerLevel.INFO),
|
|
@@ -39,8 +39,8 @@ function createLogger(config) {
|
|
|
39
39
|
[fallout_utility_1.LoggerLevel.DEBUG]: (message, logger) => formatLogMessage(message, logger, config, fallout_utility_1.LoggerLevel.DEBUG),
|
|
40
40
|
}
|
|
41
41
|
});
|
|
42
|
-
if (config.logToFile
|
|
43
|
-
logger.logToFile(path_1.default.join(cli_1.cwd, config.logToFile.
|
|
42
|
+
if (config.logToFile?.enabled)
|
|
43
|
+
logger.logToFile(path_1.default.join(cli_1.cwd, config.logToFile?.logsFolder ?? path_1.default.join(cli_1.cwd, 'logs'), !(0, cli_1.argvOptions)().shardmode ? (config.logToFile?.file ?? 'latest.log') : `${process.pid}.log`));
|
|
44
44
|
return logger;
|
|
45
45
|
}
|
|
46
46
|
exports.createLogger = createLogger;
|
package/bin/utils/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/utils/logger.ts"],"names":[],"mappings":";;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/utils/logger.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
"description": "Reciple is a Discord.js bot framework",
|
|
4
4
|
"homepage": "https://reciple.js.org/docs/reciple",
|
|
5
5
|
"license": "GPL-3.0",
|
|
6
|
-
"version": "7.
|
|
6
|
+
"version": "7.3.1",
|
|
7
7
|
"main": "./bin/index.js",
|
|
8
8
|
"module": "./bin/esm.mjs",
|
|
9
9
|
"types": "./bin/index.d.ts",
|
|
@@ -37,16 +37,16 @@
|
|
|
37
37
|
"README.md"
|
|
38
38
|
],
|
|
39
39
|
"dependencies": {
|
|
40
|
-
"@reciple/client": "^7.
|
|
41
|
-
"commander": "^10.0.
|
|
40
|
+
"@reciple/client": "^7.3.0",
|
|
41
|
+
"commander": "^10.0.1",
|
|
42
42
|
"dotenv": "^16.0.3",
|
|
43
|
-
"fallout-utility": "^2.
|
|
44
|
-
"globby": "^13.1.
|
|
43
|
+
"fallout-utility": "^2.4.0",
|
|
44
|
+
"globby": "^13.1.4",
|
|
45
45
|
"kleur": "^4.1.5",
|
|
46
46
|
"lodash.merge": "^4.6.2",
|
|
47
47
|
"micromatch": "^4.0.5",
|
|
48
48
|
"prompts": "^2.4.2",
|
|
49
|
-
"semver": "^7.
|
|
49
|
+
"semver": "^7.4.0",
|
|
50
50
|
"yaml": "^2.2.1"
|
|
51
51
|
},
|
|
52
52
|
"devDependencies": {
|
|
@@ -59,5 +59,5 @@
|
|
|
59
59
|
"peerDependencies": {
|
|
60
60
|
"discord.js": "^14.7.1"
|
|
61
61
|
},
|
|
62
|
-
"gitHead": "
|
|
62
|
+
"gitHead": "7bd09006258e3a5f0c30bcab34b0d85b64da22a6"
|
|
63
63
|
}
|
package/static/config.yml
CHANGED
|
@@ -77,13 +77,16 @@ logger:
|
|
|
77
77
|
# Enables log file
|
|
78
78
|
enabled: true
|
|
79
79
|
# Sets the log file folder
|
|
80
|
-
logsFolder:
|
|
80
|
+
logsFolder: ./logs
|
|
81
|
+
# Latest log file name
|
|
82
|
+
file: latest.log
|
|
81
83
|
|
|
82
84
|
# Modules config
|
|
83
85
|
modules:
|
|
84
86
|
# Reciple modules folders
|
|
85
87
|
# You can add multiple folders by adding the folder path or using glob patterns
|
|
86
|
-
modulesFolders:
|
|
88
|
+
modulesFolders:
|
|
89
|
+
- ./modules
|
|
87
90
|
# Excluded files or folders
|
|
88
91
|
# You can add the file/folder name or use glob patterns
|
|
89
92
|
exclude: []
|
|
@@ -93,9 +96,9 @@ modules:
|
|
|
93
96
|
# Discord.js client options
|
|
94
97
|
client:
|
|
95
98
|
intents:
|
|
96
|
-
-
|
|
97
|
-
-
|
|
98
|
-
-
|
|
99
|
+
- Guilds
|
|
100
|
+
- GuildMessages
|
|
101
|
+
- MessageContent
|
|
99
102
|
|
|
100
103
|
# Don't change this value
|
|
101
104
|
version: ^VERSION
|