From cad35d95095c0bb3b7ee5ccdbee4900719e21926 Mon Sep 17 00:00:00 2001
From: Shigma <shigma10826@gmail.com>
Date: Sat, 28 Oct 2023 03:54:00 +0800
Subject: [PATCH] chore: enhance logger scope

---
 adapters/line/src/types/.eslintrc.yml |  2 ++
 adapters/wechat-official/src/bot.ts   |  3 ++-
 adapters/wecom/src/bot.ts             |  3 ++-
 adapters/whatsapp/src/adapter.ts      |  5 +++--
 adapters/whatsapp/src/types.ts        |  2 +-
 adapters/whatsapp/src/utils.ts        |  2 +-
 packages/core/package.json            |  6 +++---
 packages/router/src/index.ts          | 11 +++++++----
 packages/server/src/index.ts          |  6 +++---
 9 files changed, 24 insertions(+), 16 deletions(-)
 create mode 100644 adapters/line/src/types/.eslintrc.yml

diff --git a/adapters/line/src/types/.eslintrc.yml b/adapters/line/src/types/.eslintrc.yml
new file mode 100644
index 00000000..772595db
--- /dev/null
+++ b/adapters/line/src/types/.eslintrc.yml
@@ -0,0 +1,2 @@
+rules:
+  max-len: off
diff --git a/adapters/wechat-official/src/bot.ts b/adapters/wechat-official/src/bot.ts
index 3ff85c02..9a0ae914 100644
--- a/adapters/wechat-official/src/bot.ts
+++ b/adapters/wechat-official/src/bot.ts
@@ -10,10 +10,11 @@ export class WechatOfficialBot<C extends Context = Context> extends Bot<C, Wecha
   http: Quester
   // internal: Internal
   refreshTokenTimer: NodeJS.Timeout
-  logger = new Logger('wo')
+  logger: Logger
 
   constructor(ctx: C, config: WechatOfficialBot.Config) {
     super(ctx, config)
+    this.logger = ctx.logger('wechat-official')
     this.platform = 'wechat-official'
     this.selfId = config.account
     this.http = ctx.http.extend(config)
diff --git a/adapters/wecom/src/bot.ts b/adapters/wecom/src/bot.ts
index 7f0c35d9..39889191 100644
--- a/adapters/wecom/src/bot.ts
+++ b/adapters/wecom/src/bot.ts
@@ -9,10 +9,11 @@ export class WecomBot<C extends Context = Context> extends Bot<C, WecomBot.Confi
   http: Quester
   // internal: Internal
   refreshTokenTimer: NodeJS.Timeout
-  logger = new Logger('wecom')
+  logger: Logger
 
   constructor(ctx: C, config: WecomBot.Config) {
     super(ctx, config)
+    this.logger = ctx.logger('wecom')
     this.selfId = config.agentId
     this.platform = 'wecom'
     this.http = ctx.http.extend(config)
diff --git a/adapters/whatsapp/src/adapter.ts b/adapters/whatsapp/src/adapter.ts
index e27fa465..b12118c9 100644
--- a/adapters/whatsapp/src/adapter.ts
+++ b/adapters/whatsapp/src/adapter.ts
@@ -10,10 +10,11 @@ import crypto from 'crypto'
 class HttpServer {
   static inject = ['router']
 
-  private logger = new Logger('whatsapp')
+  private logger: Logger
   private adapters: WhatsAppAdapter[] = []
 
   constructor(private ctx: Context) {
+    this.logger = ctx.logger('whatsapp')
     // https://developers.facebook.com/docs/graph-api/webhooks/getting-started
     // https://developers.facebook.com/docs/graph-api/webhooks/getting-started/webhooks-for-whatsapp/
     ctx.router.post('/whatsapp', async (ctx) => {
@@ -97,7 +98,7 @@ class HttpServer {
 
 export class WhatsAppAdapter<C extends Context = Context> extends Adapter<C, WhatsAppBot<C>> {
   static inject = ['router']
-  static schema = true
+  static schema = true as any
   static reusable = true
 
   constructor(ctx: C, public config: WhatsAppAdapter.Config) {
diff --git a/adapters/whatsapp/src/types.ts b/adapters/whatsapp/src/types.ts
index e52ac6fe..aa2b7222 100644
--- a/adapters/whatsapp/src/types.ts
+++ b/adapters/whatsapp/src/types.ts
@@ -119,7 +119,7 @@ export interface SendTextMessage extends SendMessageBase {
 }
 
 export interface Button {
-  type: "reply"
+  type: 'reply'
   title: string
   id: string
 }
diff --git a/adapters/whatsapp/src/utils.ts b/adapters/whatsapp/src/utils.ts
index 0f70ff02..2b1b9c1e 100644
--- a/adapters/whatsapp/src/utils.ts
+++ b/adapters/whatsapp/src/utils.ts
@@ -53,7 +53,7 @@ export async function decodeMessage(bot: WhatsAppBot, entry: Entry) {
       } else if (message.type === 'interactive' && message.interactive.type === 'button_reply') {
         session.type = 'interaction/button'
         session.event.button = {
-          id: message.interactive.button_reply.id
+          id: message.interactive.button_reply.id,
         }
       } else {
         continue
diff --git a/packages/core/package.json b/packages/core/package.json
index bff6315b..486040bb 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@satorijs/core",
   "description": "Core components of Satorijs",
-  "version": "4.0.0",
+  "version": "3.1.0",
   "main": "lib/index.cjs",
   "module": "lib/index.mjs",
   "typings": "lib/index.d.ts",
@@ -37,11 +37,11 @@
   "dependencies": {
     "@satorijs/element": "^2.5.1",
     "@satorijs/protocol": "^1.1.1",
-    "cordis": "^3.0.2",
+    "cordis": "^3.1.1",
     "cordis-axios": "^4.0.1",
     "cosmokit": "^1.5.1",
     "ws": "^8.14.2",
-    "reggol": "^1.6.0",
+    "reggol": "^1.6.3",
     "schemastery": "^3.14.0"
   }
 }
diff --git a/packages/router/src/index.ts b/packages/router/src/index.ts
index 717e2254..9df2348a 100644
--- a/packages/router/src/index.ts
+++ b/packages/router/src/index.ts
@@ -8,8 +8,6 @@ import KoaRouter from '@koa/router'
 import Koa from 'koa'
 import { listen } from './listen'
 
-const logger = new Logger('app')
-
 declare module 'koa' {
   // koa-bodyparser
   interface Request {
@@ -60,8 +58,11 @@ export class Router extends KoaRouter {
   public host!: string
   public port!: number
 
+  private logger: Logger
+
   constructor(ctx: Context, public config: Router.Config) {
     super()
+    this.logger = ctx.logger('router')
 
     // create server
     const koa = new Koa()
@@ -95,11 +96,13 @@ export class Router extends KoaRouter {
       this.host = host
       this.port = await listen(config)
       this._http.listen(this.port, host)
-      logger.info('server listening at %c', this.selfUrl)
+      this.logger.info('server listening at %c', this.selfUrl)
     }, true)
 
     ctx.on('dispose', () => {
-      logger.info('http server closing')
+      if (config.port) {
+        this.logger.info('http server closing')
+      }
       this._ws?.close()
       this._http?.close()
     })
diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts
index d822a33e..40a6382b 100644
--- a/packages/server/src/index.ts
+++ b/packages/server/src/index.ts
@@ -1,9 +1,7 @@
-import { camelCase, Context, Logger, Schema, Session, snakeCase, Time, Universal } from '@satorijs/satori'
+import { camelCase, Context, Schema, Session, snakeCase, Time, Universal } from '@satorijs/satori'
 import {} from '@satorijs/router'
 import WebSocket from 'ws'
 
-const logger = new Logger('server')
-
 export const name = 'server'
 export const inject = ['router']
 
@@ -65,6 +63,8 @@ function transformKey(source: any, callback: (key: string) => string) {
 }
 
 export function apply(ctx: Context, config: Config) {
+  const logger = ctx.logger('server')
+
   ctx.router.get(config.path + '/v1(/.+)*', async (koa) => {
     koa.body = 'Please use POST method to send requests.'
     koa.status = 405