diff --git a/adapters/dingtalk/src/http.ts b/adapters/dingtalk/src/http.ts index 58493a36..f3016061 100644 --- a/adapters/dingtalk/src/http.ts +++ b/adapters/dingtalk/src/http.ts @@ -31,9 +31,9 @@ export class HttpServer extends Adapter { if (computedSign !== sign) return ctx.status = 403 const body = ctx.request.body as Message - this.logger.debug(require('util').inspect(body, false, null, true)) + this.logger.debug(body) const session = await decodeMessage(bot, body) - this.logger.debug(require('util').inspect(session, false, null, true)) + this.logger.debug(session) if (session) bot.dispatch(session) }) } diff --git a/adapters/dingtalk/src/ws.ts b/adapters/dingtalk/src/ws.ts index 6b5fb84e..6be9f177 100644 --- a/adapters/dingtalk/src/ws.ts +++ b/adapters/dingtalk/src/ws.ts @@ -26,7 +26,7 @@ export class WsClient extends Adapter.WsClient { this.bot.online() this.socket.addEventListener('message', async ({ data }) => { const parsed = JSON.parse(data.toString()) - this.ctx.logger('dingtalk').debug(require('util').inspect(parsed, false, null, true)) + this.ctx.logger('dingtalk').debug(parsed) if (parsed.type === 'SYSTEM') { if (parsed.headers.topic === 'ping') { this.socket.send(JSON.stringify({ @@ -37,10 +37,10 @@ export class WsClient extends Adapter.WsClient { })) } } else if (parsed.type === 'CALLBACK') { - this.ctx.logger('dingtalk').debug(require('util').inspect(JSON.parse(parsed.data), false, null, true)) + this.ctx.logger('dingtalk').debug(JSON.parse(parsed.data)) const session = await decodeMessage(this.bot, JSON.parse(parsed.data)) if (session) this.bot.dispatch(session) - this.ctx.logger('dingtalk').debug(require('util').inspect(session, false, null, true)) + this.ctx.logger('dingtalk').debug(session) } }) } diff --git a/adapters/discord/src/bot.ts b/adapters/discord/src/bot.ts index 4425da31..359be4dd 100644 --- a/adapters/discord/src/bot.ts +++ b/adapters/discord/src/bot.ts @@ -1,4 +1,4 @@ -import { Bot, Context, Fragment, h, isNullable, Logger, Quester, Schema, Universal } from '@satorijs/satori' +import { Bot, Context, Fragment, h, Logger, Quester, Schema, Universal } from '@satorijs/satori' import * as Discord from './utils' import { DiscordMessageEncoder } from './message' import { Internal, Webhook } from './types' diff --git a/adapters/discord/src/types/internal.ts b/adapters/discord/src/types/internal.ts index 17e77ebc..af634dc1 100644 --- a/adapters/discord/src/types/internal.ts +++ b/adapters/discord/src/types/internal.ts @@ -1,4 +1,6 @@ -import { Dict, makeArray, Quester } from '@satorijs/satori' +import { Dict, Logger, makeArray, Quester } from '@satorijs/satori' + +const logger = new Logger('discord') export class Internal { constructor(private http: Quester) {} @@ -28,6 +30,7 @@ export class Internal { throw new Error(`too many arguments for ${path}, received ${raw}`) } try { + logger.debug(`${method} ${url}`, config) return await this.http(method, url, config) } catch (error) { if (!Quester.isAxiosError(error) || !error.response) throw error diff --git a/adapters/discord/src/ws.ts b/adapters/discord/src/ws.ts index 3f98fd80..6659792e 100644 --- a/adapters/discord/src/ws.ts +++ b/adapters/discord/src/ws.ts @@ -35,7 +35,7 @@ export class WsClient extends Adapter.WsClient { } catch (error) { return logger.warn('cannot parse message', data) } - logger.debug(require('util').inspect(parsed, false, null, true)) + logger.debug(parsed) if (parsed.s) { this._d = parsed.s } diff --git a/adapters/line/src/http.ts b/adapters/line/src/http.ts index b5bcbb03..e9c18abe 100644 --- a/adapters/line/src/http.ts +++ b/adapters/line/src/http.ts @@ -23,11 +23,11 @@ export class HttpServer extends Adapter { if (hash !== sign) { return ctx.status = 403 } - this.logger.debug(require('util').inspect(parsed, false, null, true)) + this.logger.debug(parsed) for (const event of parsed.events) { const sessions = await adaptSessions(bot, event) if (sessions.length) sessions.forEach(bot.dispatch.bind(bot)) - this.logger.debug(require('util').inspect(sessions, false, null, true)) + this.logger.debug(sessions) } ctx.status = 200 ctx.body = 'ok' diff --git a/adapters/qq/src/message.ts b/adapters/qq/src/message.ts index 5a2df217..ffba469b 100644 --- a/adapters/qq/src/message.ts +++ b/adapters/qq/src/message.ts @@ -70,7 +70,7 @@ export class QQGuildMessageEncoder extends MessageEncoder { } } - this.bot.ctx.logger('qq').debug(require('util').inspect(r, false, null, true)) + this.bot.ctx.logger('qq').debug(r) const session = this.bot.session() session.type = 'send' // await decodeMessage(this.bot, r, session.event.message = {}, session.event) diff --git a/adapters/qq/src/ws.ts b/adapters/qq/src/ws.ts index 100683c2..ebede986 100644 --- a/adapters/qq/src/ws.ts +++ b/adapters/qq/src/ws.ts @@ -27,7 +27,7 @@ export class WsClient extends Adapter.WsClient { async accept() { this.socket.addEventListener('message', async ({ data }) => { const parsed: Payload = JSON.parse(data.toString()) - logger.debug(require('util').inspect(parsed, false, null, true)) + logger.debug(parsed) if (parsed.op === Opcode.HELLO) { const token = await this.bot.getAccessToken() if (this._sessionId) { @@ -79,7 +79,7 @@ export class WsClient extends Adapter.WsClient { } const session = await adaptSession(this.bot, parsed) if (session) this.bot.dispatch(session) - logger.debug(require('util').inspect(session, false, null, true)) + logger.debug(session) } }) diff --git a/adapters/slack/src/http.ts b/adapters/slack/src/http.ts index 642ae10d..ec9af821 100644 --- a/adapters/slack/src/http.ts +++ b/adapters/slack/src/http.ts @@ -40,9 +40,9 @@ export class HttpServer extends Adapter { ctx.status = 200 ctx.body = 'ok' const payload: EnvelopedEvent = ctx.request.body - this.logger.debug(require('util').inspect(payload, false, null, true)) + this.logger.debug(payload) const session = await adaptSession(bot, payload) - this.logger.debug(require('util').inspect(session, false, null, true)) + this.logger.debug(session) if (session) bot.dispatch(session) } }) diff --git a/adapters/slack/src/ws.ts b/adapters/slack/src/ws.ts index f676b271..4478ba7e 100644 --- a/adapters/slack/src/ws.ts +++ b/adapters/slack/src/ws.ts @@ -17,7 +17,7 @@ export class WsClient extends Adapter.WsClient { const parsed: SocketEvent = JSON.parse(data.toString()) - logger.debug(require('util').inspect(parsed, false, null, true)) + logger.debug(parsed) const { type } = parsed if (type === 'hello') { // @ts-ignore @@ -32,7 +32,7 @@ export class WsClient extends Adapter.WsClient { const { xml: data2 } = await xml2js.parseStringPromise(message, { explicitArray: false, }) - bot.logger.debug('decrypted %c', require('util').inspect(data2, false, null, true)) + bot.logger.debug('decrypted %c', data2) data = data2 } - bot.logger.debug('%c', require('util').inspect(ctx.request.rawBody, false, null, true)) + bot.logger.debug('%c', ctx.request.rawBody) const session = await decodeMessage(localBot, data) @@ -73,7 +73,7 @@ export class HttpServer extends Adapter { if (session) { session.wechatOfficialResolve = resolveFunction localBot.dispatch(session) - // localBot.logger.debug(require('util').inspect(session, false, null, true)) + // localBot.logger.debug(session) } try { const result: any = await promise diff --git a/adapters/wecom/src/http.ts b/adapters/wecom/src/http.ts index 2ede6574..124b2a60 100644 --- a/adapters/wecom/src/http.ts +++ b/adapters/wecom/src/http.ts @@ -49,16 +49,16 @@ export class HttpServer extends Adapter { const { xml: data2 } = await xml2js.parseStringPromise(message, { explicitArray: false, }) - bot.logger.debug('decrypted %c', require('util').inspect(data2, false, null, true)) + bot.logger.debug('decrypted %c', data2) data = data2 } - bot.logger.debug('%c', require('util').inspect(ctx.request.rawBody, false, null, true)) + bot.logger.debug('%c', ctx.request.rawBody) const session = await decodeMessage(localBot, data) if (session) { localBot.dispatch(session) - localBot.logger.debug(require('util').inspect(session, false, null, true)) + localBot.logger.debug(session) } ctx.status = 200 ctx.body = 'success' diff --git a/adapters/whatsapp/src/adapter.ts b/adapters/whatsapp/src/adapter.ts index 56e0f85f..465fe0de 100644 --- a/adapters/whatsapp/src/adapter.ts +++ b/adapters/whatsapp/src/adapter.ts @@ -28,7 +28,7 @@ class HttpServer { if (!adapters.length) return ctx.status = 403 const parsed = ctx.request.body as WebhookBody - this.logger.debug(require('util').inspect(parsed, false, null, true)) + this.logger.debug(parsed) ctx.body = 'ok' ctx.status = 200 if (parsed.object !== 'whatsapp_business_account') return @@ -38,12 +38,12 @@ class HttpServer { const session = await decodeMessage(bot, entry) if (session.length) session.forEach(bot.dispatch.bind(bot)) this.logger.debug('handling bot: %s', bot.sid) - this.logger.debug(require('util').inspect(session, false, null, true)) + this.logger.debug(session) } }) ctx.router.get('/whatsapp', async (ctx) => { - this.logger.debug(require('util').inspect(ctx.query, false, null, true)) + this.logger.debug(ctx.query) const verifyToken = ctx.query['hub.verify_token'] const challenge = ctx.query['hub.challenge'] for (const adapter of this.adapters) {