refa: migrate framework API

1. HTTP.Error.is -> ctx.http.isError
2. @satorijs/satori -> @satorijs/core

README.md

@@ -31,7 +31,7 @@
 ### Basic usage
 
 ```ts
-import { Context } from '@satorijs/satori'
+import { Context } from '@satorijs/core'
 import discord from '@satorijs/adapter-discord'
 
 // create a new context
@@ -54,7 +54,7 @@ await ctx.start()
 ### Specifying protocol
 
 ```ts
-import { Context } from '@satorijs/satori'
+import { Context } from '@satorijs/core'
 import router from '@cordisjs/plugin-server'
 import telegram from '@satorijs/adapter-telegram'
 

adapters/dingtalk/package.json

@@ -2,7 +2,8 @@
   "name": "@satorijs/adapter-dingtalk",
   "description": "DingTalk (钉钉) Adapter for Satorijs",
   "version": "2.3.1",
-  "main": "lib/index.js",
+  "type": "module",
+  "main": "lib/index.cjs",
   "typings": "lib/index.d.ts",
   "files": [
     "lib",
@@ -30,10 +31,10 @@
     "chat"
   ],
   "devDependencies": {
-    "@cordisjs/plugin-server": "^0.2.0",
+    "@cordisjs/plugin-server": "^0.2.1",
     "@cordisjs/plugin-server-temp": "^0.4.0"
   },
   "peerDependencies": {
-    "@satorijs/satori": "^3.7.0"
+    "@satorijs/core": "^3.7.0"
   }
 }

adapters/dingtalk/src/bot.ts

@@ -1,4 +1,4 @@
-import { Bot, Context, Quester, Schema } from '@satorijs/satori'
+import { Bot, Context, HTTP, Schema } from '@satorijs/core'
 import { HttpServer } from './http'
 import { DingtalkMessageEncoder } from './message'
 import { WsClient } from './ws'
@@ -9,8 +9,8 @@ export class DingtalkBot<C extends Context = Context> extends Bot<C, DingtalkBot
   static MessageEncoder = DingtalkMessageEncoder
   static inject = ['http']
 
-  public oldHttp: Quester
-  public http: Quester
+  public oldHttp: HTTP
+  public http: HTTP
   public internal: Internal
   private refreshTokenTimer: NodeJS.Timeout
 
@@ -108,8 +108,8 @@ export namespace DingtalkBot {
     protocol: string
     appkey: string
     agentId?: number
-    api: Quester.Config
-    oldApi: Quester.Config
+    api: HTTP.Config
+    oldApi: HTTP.Config
   }
 
   export const Config: Schema<Config> = Schema.intersect([
@@ -122,8 +122,8 @@ export namespace DingtalkBot {
       secret: Schema.string().required().description('机器人密钥。'),
       agentId: Schema.number().description('AgentId'),
       appkey: Schema.string().required(),
-      api: Quester.createConfig('https://api.dingtalk.com/v1.0/'),
-      oldApi: Quester.createConfig('https://oapi.dingtalk.com/'),
+      api: HTTP.createConfig('https://api.dingtalk.com/v1.0/'),
+      oldApi: HTTP.createConfig('https://oapi.dingtalk.com/'),
     }),
     WsClient.Options,
   ])

adapters/dingtalk/src/http.ts

@@ -1,4 +1,4 @@
-import { Adapter, Context, Logger } from '@satorijs/satori'
+import { Adapter, Context, Logger } from '@satorijs/core'
 import {} from '@cordisjs/plugin-server'
 import { DingtalkBot } from './bot'
 import crypto from 'node:crypto'

adapters/dingtalk/src/internal.ts

@@ -1,13 +1,13 @@
-import { Dict, Quester } from '@satorijs/satori'
+import { Dict, HTTP } from '@satorijs/core'
 import { DingtalkBot } from './bot'
 
 export class Internal {
   constructor(private bot: DingtalkBot) { }
 
-  static define(routes: Dict<Partial<Record<Quester.Method, Record<string, boolean>>>>) {
+  static define(routes: Dict<Partial<Record<HTTP.Method, Record<string, boolean>>>>) {
     for (const path in routes) {
       for (const key in routes[path]) {
-        const method = key as Quester.Method
+        const method = key as HTTP.Method
         for (const name of Object.keys(routes[path][method])) {
           const isOldApi = routes[path][method][name]
           Internal.prototype[name] = async function (this: Internal, ...args: any[]) {
@@ -16,7 +16,7 @@ export class Internal {
               if (!args.length) throw new Error(`too few arguments for ${path}, received ${raw}`)
               return args.shift()
             })
-            const config: Quester.RequestConfig = {}
+            const config: HTTP.RequestConfig = {}
             if (args.length === 1) {
               if (method === 'GET' || method === 'DELETE') {
                 config.params = args[0]
@@ -36,7 +36,7 @@ export class Internal {
             try {
               return (await quester(method, url, config)).data
             } catch (error) {
-              if (!Quester.Error.is(error) || !error.response) throw error
+              if (!this.bot.http.isError(error) || !error.response) throw error
               throw new Error(`[${error.response.status}] ${JSON.stringify(error.response.data)}`)
             }
           }

adapters/dingtalk/src/message.ts

@@ -1,4 +1,4 @@
-import { Context, Dict, h, MessageEncoder } from '@satorijs/satori'
+import { Context, Dict, h, MessageEncoder } from '@satorijs/core'
 import { DingtalkBot } from './bot'
 import { SendMessageData } from './types'
 import { Entry } from '@cordisjs/plugin-server-temp'

adapters/dingtalk/src/utils.ts

@@ -1,4 +1,4 @@
-import { Context, h } from '@satorijs/satori'
+import { Context, h } from '@satorijs/core'
 import { Message } from './types'
 import { DingtalkBot } from './bot'
 

adapters/dingtalk/src/ws.ts

@@ -1,4 +1,4 @@
-import { Adapter, Context, Schema } from '@satorijs/satori'
+import { Adapter, Context, Schema } from '@satorijs/core'
 import { DingtalkBot } from './bot'
 import { decodeMessage } from './utils'
 

adapters/discord/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@satorijs/adapter-discord",
   "description": "Discord Adapter for Satorijs",
-  "version": "4.3.1",
-  "main": "lib/index.js",
+  "version": "4.4.0",
+  "type": "module",
+  "main": "lib/index.cjs",
   "typings": "lib/index.d.ts",
   "files": [
     "lib",
@@ -32,6 +33,6 @@
     "chat"
   ],
   "peerDependencies": {
-    "@satorijs/satori": "^3.7.0"
+    "@satorijs/core": "^3.7.0"
   }
 }

adapters/discord/src/bot.ts

@@ -1,4 +1,4 @@
-import { Bot, Context, Fragment, h, Quester, Schema, Universal } from '@satorijs/satori'
+import { Bot, Context, Fragment, h, HTTP, Schema, Universal } from '@satorijs/core'
 import * as Discord from './utils'
 import { DiscordMessageEncoder } from './message'
 import { Internal, Webhook } from './types'
@@ -11,7 +11,7 @@ export class DiscordBot<C extends Context = Context> extends Bot<C, DiscordBot.C
   static MessageEncoder = DiscordMessageEncoder
   static inject = ['http']
 
-  public http: Quester
+  public http: HTTP
   public internal: Internal
   public webhooks: Record<string, Webhook> = {}
   public webhookLock: Record<string, Promise<Webhook>> = {}
@@ -85,10 +85,22 @@ export class DiscordBot<C extends Context = Context> extends Bot<C, DiscordBot.C
     return await Discord.decodeMessage(this, data, {}, undefined, recursive)
   }
 
-  async getMessageList(channelId: string, before?: string) {
-    const messages = await this.internal.getChannelMessages(channelId, { before, limit: 100 })
+  async getMessageList(
+    channelId: string,
+    messageId?: string,
+    direction: Universal.Direction = 'before',
+    limit?: number,
+    order: Universal.Order = 'asc',
+  ) {
+    const messages = await this.internal.getChannelMessages(channelId, {
+      [direction]: messageId,
+      limit: limit && Math.min(limit, 100),
+    })
     const data = await Promise.all(messages.reverse().map(data => Discord.decodeMessage(this, data, {}, undefined, false)))
-    return { data, next: data[0]?.id }
+    const prev = data.at(direction === 'after' ? -1 : 0)?.id
+    const next = data.at(direction === 'before' ? 0 : -1)?.id
+    if (order === 'desc') data.reverse()
+    return { data, prev, next }
   }
 
   async getUser(userId: string) {
@@ -200,7 +212,7 @@ export class DiscordBot<C extends Context = Context> extends Bot<C, DiscordBot.C
 }
 
 export namespace DiscordBot {
-  export interface Config extends Quester.Config, DiscordMessageEncoder.Config, WsClient.Options {
+  export interface Config extends HTTP.Config, DiscordMessageEncoder.Config, WsClient.Options {
     token: string
     slash?: boolean
   }
@@ -214,6 +226,6 @@ export namespace DiscordBot {
     }).description('功能设置'),
     WsClient.Options,
     DiscordMessageEncoder.Config,
-    Quester.createConfig('https://discord.com/api/v10'),
+    HTTP.createConfig('https://discord.com/api/v10'),
   ])
 }

adapters/discord/src/message.ts

@@ -1,4 +1,4 @@
-import { Context, Dict, h, MessageEncoder, Quester, Schema, Universal } from '@satorijs/satori'
+import { Context, Dict, h, MessageEncoder, Schema, Universal } from '@satorijs/core'
 import { DiscordBot } from './bot'
 import { ActionRow, Button, ButtonStyles, Channel, ComponentType, Message } from './types'
 import { decodeMessage, sanitize } from './utils'
@@ -70,7 +70,7 @@ export class DiscordMessageEncoder<C extends Context = Context> extends MessageE
 
       return message
     } catch (e) {
-      if (Quester.Error.is(e) && e.response) {
+      if (this.bot.http.isError(e) && e.response) {
         if (e.response.data?.code === 10015) {
           this.bot.logger.debug('webhook has been deleted, recreating..., %o', e.response.data)
           if (!this.bot.webhookLock[this.channelId]) this.bot.webhooks[this.channelId] = null

adapters/discord/src/types/internal.ts

@@ -1,21 +1,21 @@
-import { Dict, makeArray, Quester } from '@satorijs/satori'
+import { Dict, HTTP, makeArray } from '@satorijs/core'
 import { DiscordBot } from '../bot'
 
 export class Internal {
   constructor(private bot: DiscordBot) {}
 
-  static define(routes: Dict<Partial<Record<Quester.Method, string | string[]>>>) {
+  static define(routes: Dict<Partial<Record<HTTP.Method, string | string[]>>>) {
     for (const path in routes) {
       for (const key in routes[path]) {
-        const method = key as Quester.Method
+        const method = key as HTTP.Method
         for (const name of makeArray(routes[path][method])) {
           Internal.prototype[name] = async function (this: Internal, ...args: any[]) {
             const raw = args.join(', ')
             const url = path.replace(/\{([^}]+)\}/g, () => {
               if (!args.length) throw new Error(`too few arguments for ${path}, received ${raw}`)
               return args.shift()
             })
-            const config: Quester.RequestConfig = {}
+            const config: HTTP.RequestConfig = {}
             if (args.length === 1) {
               if (method === 'GET' || method === 'DELETE') {
                 config.params = args[0]
@@ -32,7 +32,7 @@ export class Internal {
               this.bot.logger.debug(`${method} ${url}`, config)
               return (await this.bot.http(method, url, config)).data
             } catch (error) {
-              if (!Quester.Error.is(error) || !error.response) throw error
+              if (!this.bot.http.isError(error) || !error.response) throw error
               throw new Error(`[${error.response.status}] ${JSON.stringify(error.response.data)}`)
             }
           }

adapters/discord/src/utils.ts

@@ -1,4 +1,4 @@
-import { Context, Dict, h, pick, Session, Universal, valueMap } from '@satorijs/satori'
+import { Context, Dict, h, pick, Session, Universal, valueMap } from '@satorijs/core'
 import { DiscordBot } from './bot'
 import * as Discord from './types'
 

adapters/discord/src/ws.ts

@@ -1,4 +1,4 @@
-import { Adapter, Context, Schema } from '@satorijs/satori'
+import { Adapter, Context, Schema } from '@satorijs/core'
 import { Gateway } from './types'
 import { adaptSession, decodeUser } from './utils'
 import { DiscordBot } from './bot'

adapters/kook/package.json

@@ -2,7 +2,8 @@
   "name": "@satorijs/adapter-kook",
   "description": "KOOK (开黑啦) Adapter for Satorijs",
   "version": "4.5.1",
-  "main": "lib/index.js",
+  "type": "module",
+  "main": "lib/index.cjs",
   "typings": "lib/index.d.ts",
   "files": [
     "lib",
@@ -29,9 +30,9 @@
     "chat"
   ],
   "devDependencies": {
-    "@cordisjs/plugin-server": "^0.2.0"
+    "@cordisjs/plugin-server": "^0.2.1"
   },
   "peerDependencies": {
-    "@satorijs/satori": "^3.7.0"
+    "@satorijs/core": "^3.7.0"
   }
 }

adapters/kook/src/bot.ts

@@ -1,4 +1,4 @@
-import { Bot, Context, Fragment, h, Quester, Schema, Universal } from '@satorijs/satori'
+import { Bot, Context, Fragment, h, HTTP, Schema, Universal } from '@satorijs/core'
 import { adaptGroup, adaptMessage, adaptUser, decodeGuildMember, decodeRole, encodeRole } from './utils'
 import * as Kook from './types'
 import { WsClient } from './ws'
@@ -9,7 +9,7 @@ export class KookBot<C extends Context = Context, T extends KookBot.Config = Koo
   static MessageEncoder = KookMessageEncoder
   static inject = ['http']
 
-  http: Quester
+  http: HTTP
   internal: Kook.Internal
 
   constructor(ctx: C, config: T) {
@@ -28,7 +28,7 @@ export class KookBot<C extends Context = Context, T extends KookBot.Config = Koo
     }
   }
 
-  async request<T = any>(method: Quester.Method, path: string, data = {}, headers: any = {}): Promise<T> {
+  async request<T = any>(method: HTTP.Method, path: string, data = {}, headers: any = {}): Promise<T> {
     if (method === 'GET') {
       return (await this.http.get(path, { params: data, headers })).data
     } else {
@@ -170,7 +170,7 @@ export class KookBot<C extends Context = Context, T extends KookBot.Config = Koo
 }
 
 export namespace KookBot {
-  export interface BaseConfig extends Quester.Config, KookMessageEncoder.Config {}
+  export interface BaseConfig extends HTTP.Config, KookMessageEncoder.Config {}
 
   export type Config = BaseConfig & (HttpServer.Options | WsClient.Options)
 
@@ -185,6 +185,6 @@ export namespace KookBot {
       HttpServer.Options,
     ]),
     KookMessageEncoder.Config,
-    Quester.createConfig('https://www.kookapp.cn/api/v3'),
+    HTTP.createConfig('https://www.kookapp.cn/api/v3'),
   ] as const)
 }

adapters/kook/src/http.ts

@@ -1,4 +1,4 @@
-import { Adapter, Context, Logger, sanitize, Schema } from '@satorijs/satori'
+import { Adapter, Context, Logger, sanitize, Schema } from '@satorijs/core'
 import {} from '@cordisjs/plugin-server'
 import { KookBot } from './bot'
 import { adaptSession } from './utils'

adapters/kook/src/message.ts

@@ -1,4 +1,4 @@
-import { Context, h, MessageEncoder, Schema } from '@satorijs/satori'
+import { Context, h, MessageEncoder, Schema } from '@satorijs/core'
 import { KookBot } from './bot'
 import * as Kook from './types'
 

adapters/kook/src/types.ts

@@ -1,5 +1,5 @@
 /* eslint-disable max-len */
-import { Quester } from '@satorijs/satori'
+import { HTTP } from '@satorijs/core'
 import { KookBot } from './bot'
 
 export enum Signal {
@@ -661,11 +661,11 @@ export interface Events {
 }
 
 export class Internal {
-  constructor(private http: Quester) {}
+  constructor(private http: HTTP) {}
 
-  static define(name: string, method: Quester.Method, path: string) {
+  static define(name: string, method: HTTP.Method, path: string) {
     Internal.prototype[name] = async function (this: Internal, ...args: any[]) {
-      const config: Quester.RequestConfig = {}
+      const config: HTTP.RequestConfig = {}
       if (method === 'GET' || method === 'DELETE') {
         config.params = args[0]
       } else {

adapters/kook/src/utils.ts

@@ -1,4 +1,4 @@
-import { Context, h, isNullable, Session, Universal } from '@satorijs/satori'
+import { Context, h, isNullable, Session, Universal } from '@satorijs/core'
 import * as Kook from './types'
 import { KookBot } from './bot'
 

adapters/kook/src/ws.ts

@@ -1,4 +1,4 @@
-import { Adapter, Context, Schema, Time, Universal } from '@satorijs/satori'
+import { Adapter, Context, Schema, Time, Universal } from '@satorijs/core'
 import { KookBot } from './bot'
 import { adaptSession } from './utils'
 import { Payload, Signal } from './types'