@satorijs/adapter-lark 3.1.6 → 3.2.0

package/lib/index.js

@@ -67,7 +67,7 @@ __name(adaptSender, "adaptSender");
 function adaptMessage(bot, data, session) {
   var _a, _b;
   const json = JSON.parse(data.message.content);
-  const assetEndpoint = (0, import_satori.trimSlash)((_a = bot.config.selfUrl) != null ? _a : bot.ctx.router.config.selfUrl) + bot.config.path + "/assets";
+  const assetEndpoint = (0, import_satori.trimSlash)((_a = bot.config.selfUrl) != null ? _a : bot.ctx.server.config.selfUrl) + bot.config.path + "/assets";
   const content = [];
   switch (data.message.message_type) {
     case "text": {
@@ -126,7 +126,7 @@ __name(adaptSession, "adaptSession");
 async function decodeMessage(bot, body) {
   var _a, _b;
   const json = JSON.parse(body.body.content);
-  const assetEndpoint = (0, import_satori.trimSlash)((_a = bot.config.selfUrl) != null ? _a : bot.ctx.router.config.selfUrl) + bot.config.path + "/assets";
+  const assetEndpoint = (0, import_satori.trimSlash)((_a = bot.config.selfUrl) != null ? _a : bot.ctx.server.config.selfUrl) + bot.config.path + "/assets";
   const content = [];
   switch (body.msg_type) {
     case "text": {
@@ -248,7 +248,7 @@ var _HttpServer = class _HttpServer extends import_satori2.Adapter {
   }
   async connect(bot) {
     const { path } = bot.config;
-    bot.ctx.router.post(path, (ctx) => {
+    bot.ctx.server.post(path, (ctx) => {
       var _a;
       this._refreshCipher();
       const signature = ctx.get("X-Lark-Signature");
@@ -291,7 +291,7 @@ var _HttpServer = class _HttpServer extends import_satori2.Adapter {
       this.dispatchSession(body);
       return ctx.status = 200;
     });
-    bot.ctx.router.get(path + "/assets/:type/:message_id/:key", async (ctx) => {
+    bot.ctx.server.get(path + "/assets/:type/:message_id/:key", async (ctx) => {
       const type = ctx.params.type === "image" ? "image" : "file";
       const key = ctx.params.key;
       const messageId = ctx.params.message_id;
@@ -348,7 +348,7 @@ var _HttpServer = class _HttpServer extends import_satori2.Adapter {
   }
 };
 __name(_HttpServer, "HttpServer");
-__publicField(_HttpServer, "inject", ["router"]);
+__publicField(_HttpServer, "inject", ["server"]);
 var HttpServer = _HttpServer;
 ((HttpServer2) => {
   HttpServer2.createConfig = /* @__PURE__ */ __name((path) => import_satori2.Schema.object({
@@ -649,7 +649,7 @@ var _LarkBot = class _LarkBot extends import_satori5.Bot {
   internal;
   constructor(ctx, config) {
     super(ctx, config, "lark");
-    if (!config.selfUrl && !ctx.router.config.selfUrl) {
+    if (!config.selfUrl && !ctx.server.config.selfUrl) {
       this.logger.warn("selfUrl is not set, some features may not work");
     }
     this.selfId = config.appId;
@@ -731,7 +731,7 @@ var _LarkBot = class _LarkBot extends import_satori5.Bot {
   }
 };
 __name(_LarkBot, "LarkBot");
-__publicField(_LarkBot, "inject", ["router"]);
+__publicField(_LarkBot, "inject", ["server"]);
 __publicField(_LarkBot, "MessageEncoder", LarkMessageEncoder);
 var LarkBot = _LarkBot;
 ((LarkBot2) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@satorijs/adapter-lark",
   "description": "Lark (飞书) Adapter for Satorijs",
-  "version": "3.1.6",
+  "version": "3.2.0",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -33,10 +33,10 @@
     "chat"
   ],
   "devDependencies": {
-    "@satorijs/router": "^1.1.2"
+    "@cordisjs/server": "^0.1.3"
   },
   "peerDependencies": {
-    "@satorijs/satori": "^3.2.0"
+    "@satorijs/satori": "^3.3.0"
   },
   "dependencies": {
     "form-data": "^4.0.0"

package/src/bot.ts

@@ -6,7 +6,7 @@ import { Internal } from './types'
 import * as Utils from './utils'
 
 export class LarkBot<C extends Context = Context> extends Bot<C, LarkBot.Config> {
-  static inject = ['router']
+  static inject = ['server']
   static MessageEncoder = LarkMessageEncoder
 
   _token?: string
@@ -19,7 +19,7 @@ export class LarkBot<C extends Context = Context> extends Bot<C, LarkBot.Config>
     super(ctx, config, 'lark')
 
     // lark bot needs config.selfUrl to be set as it should be serve on a public url
-    if (!config.selfUrl && !ctx.router.config.selfUrl) {
+    if (!config.selfUrl && !ctx.server.config.selfUrl) {
       this.logger.warn('selfUrl is not set, some features may not work')
     }
 

package/src/http.ts

@@ -1,13 +1,13 @@
 import internal from 'stream'
 import { Adapter, Context, Logger, Schema } from '@satorijs/satori'
-import {} from '@satorijs/router'
+import {} from '@cordisjs/server'
 
 import { FeishuBot } from './bot'
 import { AllEvents } from './types'
 import { adaptSession, Cipher } from './utils'
 
 export class HttpServer<C extends Context = Context> extends Adapter<C, FeishuBot<C>> {
-  static inject = ['router']
+  static inject = ['server']
 
   private logger: Logger
   private ciphers: Record<string, Cipher> = {}
@@ -26,7 +26,7 @@ export class HttpServer<C extends Context = Context> extends Adapter<C, FeishuBo
 
   async connect(bot: FeishuBot) {
     const { path } = bot.config
-    bot.ctx.router.post(path, (ctx) => {
+    bot.ctx.server.post(path, (ctx) => {
       this._refreshCipher()
 
       // compare signature if encryptKey is set
@@ -77,7 +77,7 @@ export class HttpServer<C extends Context = Context> extends Adapter<C, FeishuBo
       return ctx.status = 200
     })
 
-    bot.ctx.router.get(path + '/assets/:type/:message_id/:key', async (ctx) => {
+    bot.ctx.server.get(path + '/assets/:type/:message_id/:key', async (ctx) => {
       const type = ctx.params.type === 'image' ? 'image' : 'file'
       const key = ctx.params.key
       const messageId = ctx.params.message_id

package/src/utils.ts

@@ -25,7 +25,7 @@ export function adaptSender(sender: Sender, session: Session): Session {
 
 export function adaptMessage(bot: FeishuBot, data: Events['im.message.receive_v1']['event'], session: Session): Session {
   const json = JSON.parse(data.message.content) as MessageContentType<MessageType>
-  const assetEndpoint = trimSlash(bot.config.selfUrl ?? bot.ctx.router.config.selfUrl) + bot.config.path + '/assets'
+  const assetEndpoint = trimSlash(bot.config.selfUrl ?? bot.ctx.server.config.selfUrl) + bot.config.path + '/assets'
   const content: (string | h)[] = []
   switch (data.message.message_type) {
     case 'text': {
@@ -88,7 +88,7 @@ export function adaptSession<C extends Context>(bot: FeishuBot<C>, body: AllEven
 // TODO: This function has many duplicated code with `adaptMessage`, should refactor them
 export async function decodeMessage(bot: LarkBot, body: LarkMessage): Promise<Message> {
   const json = JSON.parse(body.body.content) as MessageContentType<MessageType>
-  const assetEndpoint = trimSlash(bot.config.selfUrl ?? bot.ctx.router.config.selfUrl) + bot.config.path + '/assets'
+  const assetEndpoint = trimSlash(bot.config.selfUrl ?? bot.ctx.server.config.selfUrl) + bot.config.path + '/assets'
   const content: h[] = []
   switch (body.msg_type) {
     case 'text': {