Merge branch 'master' of git.mycard.moe:3rdeye/koishi-bootstrap

package.json

 {
   "name": "koishi-bootstrap",
   "description": "Koishi bootstraper, for Docker.",
-  "version": "7.6.1",
+  "version": "7.7.0",
   "scripts": {
     "lint": "eslint --fix .",
     "build": "tsc",
@@ -36,7 +36,7 @@
     "typescript": "^4.8.2"
   },
   "dependencies": {
-    "@koishijs/loader": "^2.5.0",
+    "@koishijs/loader": "^3.1.1",
     "koishi": "^4.12.1",
     "load-json-file": "^6.2.0",
     "ws": "^8.2.3",

src/install-plugin.ts

@@ -6,6 +6,7 @@ import path from 'path';
 import { getPackageJsonPackages } from './utils/read-package-json';
 import ConfigLoader from '@koishijs/loader';
 import { KoishiConfig, PluginInstallConfig } from './def/interfaces';
+import { loadConfig } from './utils/read-config';
 const execFileAsync = promisify(execFile);
 
 const logger = new Logger('bootstrap-install-plugin');
@@ -134,7 +135,7 @@ async function installPlugin(name: string, info: PluginInstallConfig) {
 
 export async function installPluginEntry() {
   logger.info(`Bootstrapping...`);
-  const config = new ConfigLoader().readConfig() as KoishiConfig;
+  const config = await loadConfig();
   const plugins = config?.plugins;
   if (!plugins) {
     logger.warn(`No plugins found, exiting.`);

src/prod.ts

@@ -3,6 +3,7 @@ import fs from 'fs';
 import { Logger } from 'koishi';
 import ConfigLoader from '@koishijs/loader';
 import { KoishiConfig } from './def/interfaces';
+import { loadConfig } from './utils/read-config';
 
 const logger = new Logger('bootstrap-prod');
 
@@ -23,7 +24,7 @@ async function handlePackageEntry(packagePath: string) {
 
 export async function prodEntry() {
   logger.info(`Running production preparations...`);
-  const config = new ConfigLoader().readConfig() as KoishiConfig;
+  const config = await loadConfig();
   const plugins = config?.plugins;
   if (!plugins) {
     logger.warn(`No plugins found, exiting.`);

src/utils/read-config.ts

+import { KoishiConfig } from '../def/interfaces';
+import ConfigLoader from '@koishijs/loader';
+
+export async function loadConfig(): Promise<KoishiConfig> {
+  const loader = new ConfigLoader();
+  await loader.init(process.env.KOISHI_CONFIG_FILE);
+  return loader.readConfig() as unknown as KoishiConfig;
+}