feat(http): extract http plugin

packages/koishi/package.json

@@ -47,16 +47,18 @@
   "dependencies": {
     "@koishijs/core": "4.17.5",
     "@koishijs/loader": "4.5.5",
+    "@koishijs/plugin-http": "^0.4.2",
     "@koishijs/plugin-proxy-agent": "^0.3.0",
     "@koishijs/plugin-server": "^3.2.1",
     "@koishijs/utils": "^7.2.1",
-    "@satorijs/satori": "^3.7.0",
+    "@satorijs/core": "^4.0.0",
     "cac": "^6.7.14",
     "kleur": "^4.1.5"
   },
   "yakumo": {
     "tsc": {
       "ignore": [
+        "@koishijs/plugin-http",
         "@koishijs/plugin-proxy-agent",
         "@koishijs/plugin-server"
       ]

packages/loader/src/index.ts

@@ -45,15 +45,25 @@ export default class NodeLoader extends Loader {
   async migrate() {
     try {
       let isDirty = false
-      const manifest = JSON.parse(await fs.readFile('package.json', 'utf8'))
+      const meta = JSON.parse(await fs.readFile('package.json', 'utf8'))
       const require = createRequire(__filename)
       const deps = require('koishi/package.json').dependencies
       function addDep(name: string) {
-        manifest.dependencies[name] = deps[name]
+        meta.dependencies[name] = deps[name]
         isDirty = true
       }
 
-      if (!manifest.dependencies['@koishijs/plugin-proxy-agent']) {
+      if (!meta.dependencies['@koishijs/plugin-http']) {
+        const { request = {} } = this.config as any
+        delete this.config['request']
+        this.config.plugins = {
+          http: request,
+          ...this.config.plugins,
+        }
+        addDep('@koishijs/plugin-http')
+      }
+
+      if (!meta.dependencies['@koishijs/plugin-proxy-agent']) {
         this.config.plugins = {
           'proxy-agent': {},
           ...this.config.plugins,
@@ -75,8 +85,8 @@ export default class NodeLoader extends Loader {
       }
 
       if (isDirty) {
-        manifest.dependencies = Object.fromEntries(Object.entries(manifest.dependencies).sort(([a], [b]) => a.localeCompare(b)))
-        await fs.writeFile('package.json', JSON.stringify(manifest, null, 2) + '\n')
+        meta.dependencies = Object.fromEntries(Object.entries(meta.dependencies).sort(([a], [b]) => a.localeCompare(b)))
+        await fs.writeFile('package.json', JSON.stringify(meta, null, 2) + '\n')
       }
     } catch (error) {
       logger.warn('failed to migrate manifest')

plugins/http/index.cjs

@@ -0,0 +1 @@
+module.exports = require('@cordisjs/plugin-http')

plugins/http/index.d.ts

@@ -0,0 +1 @@
+export * from '@cordisjs/plugin-http'

plugins/http/index.mjs

@@ -0,0 +1 @@
+export * from '@cordisjs/plugin-http'

plugins/http/package.json

@@ -0,0 +1,59 @@
+{
+  "name": "@koishijs/plugin-http",
+  "description": "HTTP and WebSocket client for Koishi",
+  "version": "0.4.2",
+  "type": "module",
+  "main": "index.cjs",
+  "module": "index.mjs",
+  "types": "index.d.ts",
+  "exports": {
+    ".": {
+      "require": "./index.cjs",
+      "import": "./index.mjs",
+      "types": "./index.d.ts"
+    },
+    "./package.json": "./package.json"
+  },
+  "files": [
+    "index.cjs",
+    "index.mjs",
+    "index.d.ts"
+  ],
+  "author": "Shigma <[email protected]>",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/cordiverse/http.git",
+    "directory": "packages/core"
+  },
+  "bugs": {
+    "url": "https://github.com/cordiverse/http/issues"
+  },
+  "homepage": "https://github.com/cordiverse/http",
+  "keywords": [
+    "http",
+    "fetch",
+    "axios",
+    "http",
+    "undici",
+    "client",
+    "request",
+    "cordis",
+    "plugin"
+  ],
+  "koishi": {
+    "description": {
+      "en": "HTTP and WebSocket client for Koishi",
+      "zh": "HTTP 与 WebSocket 基础服务"
+    }
+  },
+  "peerDependencies": {
+    "koishi": "^4.17.6"
+  },
+  "devDependencies": {
+    "koishi": "^4.17.6"
+  },
+  "dependencies": {
+    "@cordisjs/plugin-http": "^0.4.2"
+  }
+}

plugins/http/readme.md

@@ -0,0 +1,3 @@
+# @koishijs/plugin-http
+
+Fetch-based axios-style HTTP client for [Koishi](https://koishi.chat).