refa: migrate Header and Error.is

satorijs · Feb 18, 2024 · 3224f5d · 3224f5d
1 parent 6b50991
commit 3224f5d
Show file tree

Hide file tree

Showing 17 changed files with 26 additions and 26 deletions.
diff --git a/adapters/dingtalk/src/internal.ts b/adapters/dingtalk/src/internal.ts
@@ -36,7 +36,7 @@ export class Internal {
             try {
               return await quester(method, url, config)
             } catch (error) {
-              if (!Quester.isAxiosError(error) || !error.response) throw error
+              if (!Quester.Error.is(error) || !error.response) throw error
               throw new Error(`[${error.response.status}] ${JSON.stringify(error.response.data)}`)
             }
           }

diff --git a/adapters/discord/src/message.ts b/adapters/discord/src/message.ts
@@ -70,7 +70,7 @@ export class DiscordMessageEncoder<C extends Context = Context> extends MessageE
 
       return message
     } catch (e) {
-      if (Quester.isAxiosError(e) && e.response) {
+      if (Quester.Error.is(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
@@ -133,7 +133,7 @@ export class DiscordMessageEncoder<C extends Context = Context> extends MessageE
       headers: { accept: type + '/*' },
       timeout: 1000,
     }).then(
-      (headers) => headers['content-type'].startsWith(type),
+      (headers) => headers.get('content-type').startsWith(type),
       () => false,
     )
   }

diff --git a/adapters/discord/src/types/internal.ts b/adapters/discord/src/types/internal.ts
@@ -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.isAxiosError(error) || !error.response) throw error
+              if (!Quester.Error.is(error) || !error.response) throw error
               throw new Error(`[${error.response.status}] ${JSON.stringify(error.response.data)}`)
             }
           }

diff --git a/adapters/lark/src/http.ts b/adapters/lark/src/http.ts
@@ -92,7 +92,7 @@ export class HttpServer<C extends Context = Context> extends Adapter<C, FeishuBo
       })
 
       ctx.status = 200
-      ctx.response.headers['Content-Type'] = resp.headers['content-type']
+      ctx.response.headers['Content-Type'] = resp.headers.get('content-type')
       ctx.response.body = resp.data
     })
   }

diff --git a/adapters/lark/src/message.ts b/adapters/lark/src/message.ts
@@ -32,7 +32,7 @@ export class LarkMessageEncoder<C extends Context = Context> extends MessageEnco
       this.results.push(session.event.message)
     } catch (e) {
       // try to extract error message from Lark API
-      if (Quester.isAxiosError(e)) {
+      if (Quester.Error.is(e)) {
         if (e.response?.data?.code) {
           const generalErrorMsg = `Check error code at https://open.larksuite.com/document/server-docs/getting-started/server-error-codes`
           e.message += ` (Lark error code ${e.response.data.code}: ${e.response.data.msg ?? generalErrorMsg})`

diff --git a/adapters/line/src/http.ts b/adapters/line/src/http.ts
@@ -38,8 +38,8 @@ export class HttpServer<C extends Context = Context> extends Adapter<C, LineBot<
         method: 'GET',
         responseType: 'stream',
       })
-      ctx.type = resp.headers['content-type']
-      ctx.set('cache-control', resp.headers['cache-control'])
+      ctx.type = resp.headers.get('content-type')
+      ctx.set('cache-control', resp.headers.get('cache-control'))
       ctx.response.body = resp.data
       ctx.status = 200
     })

diff --git a/adapters/line/src/types/internal.ts b/adapters/line/src/types/internal.ts
@@ -30,7 +30,7 @@ export class Internal {
             try {
               return (await this.http(method, url, config)).data
             } catch (error) {
-              if (!Quester.isAxiosError(error) || !error.response) throw error
+              if (!Quester.Error.is(error) || !error.response) throw error
               throw new Error(`[${error.response.status}] ${JSON.stringify(error.response.data)}`)
             }
           }

diff --git a/adapters/qq/src/bot/index.ts b/adapters/qq/src/bot/index.ts
@@ -91,7 +91,7 @@ export class QQBot<C extends Context = Context> extends Bot<C, QQBot.Config> {
         this._ensureAccessToken()
       }, (result.data.expires_in - 40) * 1000)
     } catch (e) {
-      if (!Quester.isAxiosError(e) || !e.response) throw e
+      if (!Quester.Error.is(e) || !e.response) throw e
       this.logger.warn(`POST https://bots.qq.com/app/getAppAccessToken response: %o, trace id: %s`, e.response.data, e.response.headers.get('x-tps-trace-id'))
       throw e
     }

diff --git a/adapters/qq/src/message.ts b/adapters/qq/src/message.ts
@@ -72,7 +72,7 @@ export class QQGuildMessageEncoder<C extends Context = Context> extends MessageE
         else r = await this.bot.internal.sendMessage(this.channelId, payload)
       }
     } catch (e) {
-      if (Quester.isAxiosError(e)) {
+      if (Quester.Error.is(e)) {
         if (this.bot.parent.config.retryWhen.includes(e.response.data.code) && !this.retry && this.fileUrl) {
           this.bot.logger.warn('retry image sending')
           this.retry = true
@@ -265,7 +265,7 @@ export class QQMessageEncoder<C extends Context = Context> extends MessageEncode
           }
         }
       } catch (e) {
-        if (!Quester.isAxiosError(e)) throw e
+        if (!Quester.Error.is(e)) throw e
         this.errors.push(e)
         if (!this.retry && this.bot.config.retryWhen.includes(e.response.data.code)) {
           this.bot.logger.warn('%s retry message sending', this.session.cid)
@@ -329,7 +329,7 @@ export class QQMessageEncoder<C extends Context = Context> extends MessageEncode
         res = await this.bot.internal.sendFileGuild(this.session.guildId, data)
       }
     } catch (e) {
-      if (!Quester.isAxiosError(e)) throw e
+      if (!Quester.Error.is(e)) throw e
       this.errors.push(e)
       if (!this.retry && this.bot.config.retryWhen.includes(e.response.data.code)) {
         this.bot.logger.warn('%s retry message sending', this.session.cid)

diff --git a/adapters/slack/src/types/internal.ts b/adapters/slack/src/types/internal.ts
@@ -46,7 +46,7 @@ export class Internal {
             try {
               return (await this.http(method, path, config)).data
             } catch (error) {
-              if (!Quester.isAxiosError(error) || !error.response) throw error
+              if (!Quester.Error.is(error) || !error.response) throw error
               throw new Error(`[${error.response.status}] ${JSON.stringify(error.response.data)}`)
             }
           }

diff --git a/adapters/telegram/src/polling.ts b/adapters/telegram/src/polling.ts
@@ -45,7 +45,7 @@ export class HttpPolling<C extends Context = Context> extends Adapter<C, Telegra
           }
           this.timeout = setTimeout(polling, 0)
         } catch (e) {
-          if (!Quester.isAxiosError(e) || !e.response?.data) {
+          if (!Quester.Error.is(e) || !e.response?.data) {
             // Other error
             bot.logger.warn('failed to get updates. reason: %s', e.message)
           } else {

diff --git a/adapters/wechat-official/src/http.ts b/adapters/wechat-official/src/http.ts
@@ -116,9 +116,9 @@ export class HttpServer<C extends Context = Context> extends Adapter<C, WechatOf
           media_id: mediaId,
         },
       })
-      ctx.type = resp.headers['content-type']
-      ctx.set('date', resp.headers['date'])
-      ctx.set('cache-control', resp.headers['cache-control'])
+      ctx.type = resp.headers.get('content-type')
+      ctx.set('date', resp.headers.get('date'))
+      ctx.set('cache-control', resp.headers.get('cache-control'))
       ctx.response.body = resp.data
       ctx.status = 200
     })

diff --git a/adapters/wecom/src/http.ts b/adapters/wecom/src/http.ts
@@ -77,9 +77,9 @@ export class HttpServer<C extends Context = Context> extends Adapter<C, WecomBot
           media_id: mediaId,
         },
       })
-      ctx.type = resp.headers['content-type']
-      ctx.set('date', resp.headers['date'])
-      ctx.set('cache-control', resp.headers['cache-control'])
+      ctx.type = resp.headers.get('content-type')
+      ctx.set('date', resp.headers.get('date'))
+      ctx.set('cache-control', resp.headers.get('cache-control'))
       ctx.response.body = resp.data
       ctx.status = 200
     })

diff --git a/adapters/whatsapp/src/adapter.ts b/adapters/whatsapp/src/adapter.ts
@@ -72,8 +72,8 @@ class HttpServer {
         method: 'GET',
         responseType: 'stream',
       })
-      ctx.type = resp.headers['content-type']
-      ctx.set('cache-control', resp.headers['cache-control'])
+      ctx.type = resp.headers.get('content-type')
+      ctx.set('cache-control', resp.headers.get('cache-control'))
       ctx.response.body = resp.data
       ctx.status = 200
     })

diff --git a/adapters/zulip/src/polling.ts b/adapters/zulip/src/polling.ts
@@ -38,7 +38,7 @@ export class HttpPolling<C extends Context = Context> extends Adapter<C, ZulipBo
         }
         setTimeout(polling, 0)
       } catch (e) {
-        if (!Quester.isAxiosError(e) || !e.response?.data) {
+        if (!Quester.Error.is(e) || !e.response?.data) {
           bot.logger.warn('failed to get updates. reason: %s', e.stack)
         } else {
           bot.logger.error(e.stack)

diff --git a/adapters/zulip/src/types/internal.ts b/adapters/zulip/src/types/internal.ts
@@ -30,7 +30,7 @@ export class Internal {
             try {
               return (await this.http(method, url, config)).data
             } catch (error) {
-              if (!Quester.isAxiosError(error) || !error.response) throw error
+              if (!Quester.Error.is(error) || !error.response) throw error
               throw new Error(`[${error.response.status}] ${JSON.stringify(error.response.data)}`)
             }
           }

diff --git a/packages/server-proxy/src/index.ts b/packages/server-proxy/src/index.ts
@@ -24,7 +24,7 @@ class ProxyServer {
       try {
         koa.body = await ctx.http.get<internal.Readable>(koa.params.url, { responseType: 'stream' })
       } catch (error) {
-        if (!Quester.isAxiosError(error) || !error.response) throw error
+        if (!Quester.Error.is(error) || !error.response) throw error
         koa.status = error.response.status
         koa.body = error.response.data
       }