Merge branch 'master' into puppeteer

package-lock.json

 {
   "name": "koishi-bootstrap",
-  "version": "7.6.1",
+  "version": "7.7.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "koishi-bootstrap",
-      "version": "7.6.1",
+      "version": "7.7.0",
       "license": "MIT",
       "dependencies": {
-        "@koishijs/loader": "^2.5.0",
+        "@koishijs/loader": "^3.1.1",
         "koishi": "^4.12.1",
         "koishi-plugin-puppeteer": "^3.4.11",
         "load-json-file": "^6.2.0",
@@ -188,30 +188,29 @@
       }
     },
     "node_modules/@koishijs/core": {
-      "version": "4.11.4",
-      "resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.11.4.tgz",
-      "integrity": "sha512-biwbprUTBreFgCyRaJc46Oenp/xcrWkxrrQ/9+YxWgSTQ7AF/a1Qz5XW3fN5wGdeHV/MhBTNdoS2y/+0V8Ew0g==",
-      "peer": true,
-      "dependencies": {
-        "@koishijs/utils": "^7.0.0",
-        "@minatojs/core": "^2.1.2",
-        "@satorijs/core": "^2.1.0",
-        "cordis": "^2.7.2",
-        "cosmokit": "^1.4.0",
+      "version": "4.12.1",
+      "resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.12.1.tgz",
+      "integrity": "sha512-y8Pmfnzd4a+p6+cyMWUxPrMCf6rrzS/tbWAsabf3EMH2O09xPcY+BYXhBxsymvtVP6Hhcb/OUDS99h+pvaXoTQ==",
+      "dependencies": {
+        "@koishijs/utils": "^7.0.1",
+        "@minatojs/core": "^2.3.1",
+        "@satorijs/core": "^2.2.2",
+        "cordis": "^2.7.4",
+        "cosmokit": "^1.4.1",
         "fastest-levenshtein": "^1.0.16"
       }
     },
     "node_modules/@koishijs/loader": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@koishijs/loader/-/loader-2.5.4.tgz",
-      "integrity": "sha512-MAXhmVsXch7d4RkO3enXC/RG2GXcdu8wm/Vsmv1/G7B21e3UUSr6fubY/b84NA8mfxlpW11jYPh8Y51j7vCsVQ==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@koishijs/loader/-/loader-3.1.1.tgz",
+      "integrity": "sha512-Vcrw0OaDC5Z5fr8C/gPy/TT2Ajs0DM6Wk3K9WqEe0eto/Dspn7uLv83347pWoNTAGIsjIMWW9VFZtrsn1gbuKw==",
       "dependencies": {
         "dotenv": "^16.0.3",
         "js-yaml": "^4.1.0",
         "ns-require": "^1.1.4"
       },
       "peerDependencies": {
-        "@koishijs/core": "4.11.4"
+        "@koishijs/core": "4.12.1"
       }
     },
     "node_modules/@koishijs/loader/node_modules/argparse": {
@@ -2245,48 +2244,6 @@
         "koishi": "^4.11.0"
       }
     },
-    "node_modules/koishi/node_modules/@koishijs/core": {
-      "version": "4.12.1",
-      "resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.12.1.tgz",
-      "integrity": "sha512-y8Pmfnzd4a+p6+cyMWUxPrMCf6rrzS/tbWAsabf3EMH2O09xPcY+BYXhBxsymvtVP6Hhcb/OUDS99h+pvaXoTQ==",
-      "dependencies": {
-        "@koishijs/utils": "^7.0.1",
-        "@minatojs/core": "^2.3.1",
-        "@satorijs/core": "^2.2.2",
-        "cordis": "^2.7.4",
-        "cosmokit": "^1.4.1",
-        "fastest-levenshtein": "^1.0.16"
-      }
-    },
-    "node_modules/koishi/node_modules/@koishijs/loader": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@koishijs/loader/-/loader-3.1.1.tgz",
-      "integrity": "sha512-Vcrw0OaDC5Z5fr8C/gPy/TT2Ajs0DM6Wk3K9WqEe0eto/Dspn7uLv83347pWoNTAGIsjIMWW9VFZtrsn1gbuKw==",
-      "dependencies": {
-        "dotenv": "^16.0.3",
-        "js-yaml": "^4.1.0",
-        "ns-require": "^1.1.4"
-      },
-      "peerDependencies": {
-        "@koishijs/core": "4.12.1"
-      }
-    },
-    "node_modules/koishi/node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
-    },
-    "node_modules/koishi/node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
     "node_modules/levn": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",

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",
     "koishi-plugin-puppeteer": "^3.4.11",
     "load-json-file": "^6.2.0",

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;
+}