@waline/vercel 1.36.4 → 1.37.0

package/src/service/markdown/mathjax.js

@@ -60,8 +60,7 @@ const mathjaxPlugin = (md) => {
 
   md.renderer.rules.inlineTeX = (tokens, idx) => inline(tokens[idx].content);
 
-  md.renderer.rules.blockTeX = (tokens, idx) =>
-    `${block(tokens[idx].content)}\n`;
+  md.renderer.rules.blockTeX = (tokens, idx) => `${block(tokens[idx].content)}\n`;
 };
 
 module.exports = {

package/src/service/markdown/utils.js

@@ -1,10 +1,10 @@
 const escapeHtml = (unsafeHTML) =>
   unsafeHTML
-    .replace(/&/gu, '&')
-    .replace(/</gu, '&lt;')
-    .replace(/>/gu, '&gt;')
-    .replace(/"/gu, '&quot;')
-    .replace(/'/gu, '&#039;');
+    .replaceAll('&', '&amp;')
+    .replaceAll('<', '&lt;')
+    .replaceAll('>', '&gt;')
+    .replaceAll('"', '&quot;')
+    .replaceAll("'", '&#039;');
 
 module.exports = {
   escapeHtml,

package/src/service/markdown/xss.js

@@ -28,16 +28,11 @@ DOMPurify.addHook('afterSanitizeAttributes', (node) => {
 });
 
 const sanitize = (content) =>
-  DOMPurify.sanitize(
-    content,
-    Object.assign(
-      {
-        FORBID_TAGS: ['form', 'input', 'style'],
-        FORBID_ATTR: ['autoplay', 'style'],
-      },
-      think.config('domPurify') || {},
-    ),
-  );
+  DOMPurify.sanitize(content, {
+    FORBID_TAGS: ['form', 'input', 'style'],
+    FORBID_ATTR: ['autoplay', 'style'],
+    ...think.config('domPurify'),
+  });
 
 module.exports = {
   sanitize,

package/src/service/notify.js

@@ -4,19 +4,12 @@ const FormData = require('form-data');
 const nodemailer = require('nodemailer');
 const nunjucks = require('nunjucks');
 
-module.exports = class extends think.Service {
+module.exports = class NotifyService extends think.Service {
   constructor(controller) {
     super(controller);
 
     this.controller = controller;
-    const {
-      SMTP_USER,
-      SMTP_PASS,
-      SMTP_HOST,
-      SMTP_PORT,
-      SMTP_SECURE,
-      SMTP_SERVICE,
-    } = process.env;
+    const { SMTP_USER, SMTP_PASS, SMTP_HOST, SMTP_PORT, SMTP_SECURE, SMTP_SERVICE } = process.env;
 
     if (SMTP_HOST || SMTP_SERVICE) {
       const config = {
@@ -27,7 +20,7 @@ module.exports = class extends think.Service {
         config.service = SMTP_SERVICE;
       } else {
         config.host = SMTP_HOST;
-        config.port = parseInt(SMTP_PORT);
+        config.port = Number.parseInt(SMTP_PORT, 10);
         config.secure = SMTP_SECURE && SMTP_SECURE !== 'false';
       }
       this.transporter = nodemailer.createTransport(config);
@@ -35,7 +28,9 @@ module.exports = class extends think.Service {
   }
 
   async sleep(second) {
-    return new Promise((resolve) => setTimeout(resolve, second * 1000));
+    return new Promise((resolve) => {
+      setTimeout(resolve, second * 1000);
+    });
   }
 
   async mail({ to, title, content }, self, parent) {
@@ -43,15 +38,14 @@ module.exports = class extends think.Service {
       return;
     }
 
-    const { SITE_NAME, SITE_URL, SMTP_USER, SENDER_EMAIL, SENDER_NAME } =
-      process.env;
+    const { SITE_NAME, SITE_URL, SMTP_USER, SENDER_EMAIL, SENDER_NAME } = process.env;
     const data = {
       self,
       parent,
       site: {
         name: SITE_NAME,
         url: SITE_URL,
-        postUrl: SITE_URL + self.url + '#' + self.objectId,
+        postUrl: `${SITE_URL}${self.url}#${self.objectId}`,
       },
     };
 
@@ -59,10 +53,7 @@ module.exports = class extends think.Service {
     content = this.controller.locale(content, data);
 
     return this.transporter.sendMail({
-      from:
-        SENDER_EMAIL && SENDER_NAME
-          ? `"${SENDER_NAME}" <${SENDER_EMAIL}>`
-          : SMTP_USER,
+      from: SENDER_EMAIL && SENDER_NAME ? `"${SENDER_NAME}" <${SENDER_EMAIL}>` : SMTP_USER,
       to,
       subject: title,
       html: content,
@@ -82,7 +73,7 @@ module.exports = class extends think.Service {
       site: {
         name: SITE_NAME,
         url: SITE_URL,
-        postUrl: SITE_URL + self.url + '#' + self.objectId,
+        postUrl: `${SITE_URL}${self.url}#${self.objectId}`,
       },
     };
 
@@ -110,8 +101,7 @@ module.exports = class extends think.Service {
   }
 
   async qywxAmWechat({ title, content }, self, parent) {
-    const { QYWX_AM, QYWX_PROXY, QYWX_PROXY_PORT, SITE_NAME, SITE_URL } =
-      process.env;
+    const { QYWX_AM, QYWX_PROXY, QYWX_PROXY_PORT, SITE_NAME, SITE_URL } = process.env;
 
     if (!QYWX_AM) {
       return false;
@@ -119,8 +109,8 @@ module.exports = class extends think.Service {
 
     const QYWX_AM_AY = QYWX_AM.split(',');
     const comment = self.comment
-      .replace(/<a href="(.*?)">(.*?)<\/a>/g, '\n[$2] $1\n')
-      .replace(/<[^>]+>/g, '');
+      .replaceAll(/<a href="(.*?)">(.*?)<\/a>/g, '\n[$2] $1\n')
+      .replaceAll(/<[^>]+>/g, '');
     const postName = self.url;
 
     const data = {
@@ -133,7 +123,7 @@ module.exports = class extends think.Service {
       site: {
         name: SITE_NAME,
         url: SITE_URL,
-        postUrl: SITE_URL + self.url + '#' + self.objectId,
+        postUrl: `${SITE_URL}${self.url}#${self.objectId}`,
       },
     };
 
@@ -148,7 +138,7 @@ module.exports = class extends think.Service {
     title = this.controller.locale(title, data);
     const desp = this.controller.locale(contentWechat, data);
 
-    content = desp.replace(/\n/g, '<br/>');
+    content = desp.replaceAll('\n', '<br/>');
 
     const querystring = new URLSearchParams();
 
@@ -158,48 +148,38 @@ module.exports = class extends think.Service {
     let baseUrl = 'https://qyapi.weixin.qq.com';
 
     if (QYWX_PROXY) {
-      if (!QYWX_PROXY_PORT) {
-        baseUrl = `http://${QYWX_PROXY}`;
-      } else {
-        baseUrl = `http://${QYWX_PROXY}:${QYWX_PROXY_PORT}`;
-      }
+      baseUrl = `http://${QYWX_PROXY}${QYWX_PROXY_PORT ? `:${QYWX_PROXY_PORT}` : ''}`;
     }
 
-    const { access_token } = await fetch(
-      `${baseUrl}/cgi-bin/gettoken?${querystring.toString()}`,
-      {
-        headers: {
-          'content-type': 'application/json',
-        },
+    const { access_token } = await fetch(`${baseUrl}/cgi-bin/gettoken?${querystring.toString()}`, {
+      headers: {
+        'content-type': 'application/json',
       },
-    ).then((resp) => resp.json());
-
-    return fetch(
-      `${baseUrl}/cgi-bin/message/send?access_token=${access_token}`,
-      {
-        method: 'POST',
-        headers: {
-          'content-type': 'application/json',
-        },
-        body: JSON.stringify({
-          touser: `${QYWX_AM_AY[2]}`,
-          agentid: `${QYWX_AM_AY[3]}`,
-          msgtype: 'mpnews',
-          mpnews: {
-            articles: [
-              {
-                title,
-                thumb_media_id: `${QYWX_AM_AY[4]}`,
-                author: `Waline Comment`,
-                content_source_url: `${data.site.postUrl}`,
-                content: `${content}`,
-                digest: `${desp}`,
-              },
-            ],
-          },
-        }),
+    }).then((resp) => resp.json());
+
+    return fetch(`${baseUrl}/cgi-bin/message/send?access_token=${access_token}`, {
+      method: 'POST',
+      headers: {
+        'content-type': 'application/json',
       },
-    ).then((resp) => resp.json());
+      body: JSON.stringify({
+        touser: `${QYWX_AM_AY[2]}`,
+        agentid: `${QYWX_AM_AY[3]}`,
+        msgtype: 'mpnews',
+        mpnews: {
+          articles: [
+            {
+              title,
+              thumb_media_id: `${QYWX_AM_AY[4]}`,
+              author: `Waline Comment`,
+              content_source_url: `${data.site.postUrl}`,
+              content: `${content}`,
+              digest: `${desp}`,
+            },
+          ],
+        },
+      }),
+    }).then((resp) => resp.json());
   }
 
   async qq(self, parent) {
@@ -210,8 +190,8 @@ module.exports = class extends think.Service {
     }
 
     const comment = self.comment
-      .replace(/<a href="(.*?)">(.*?)<\/a>/g, '')
-      .replace(/<[^>]+>/g, '');
+      .replaceAll(/<a href="(.*?)">(.*?)<\/a>/g, '')
+      .replaceAll(/<[^>]+>/g, '');
 
     const data = {
       self: {
@@ -222,7 +202,7 @@ module.exports = class extends think.Service {
       site: {
         name: SITE_NAME,
         url: SITE_URL,
-        postUrl: SITE_URL + self.url + '#' + self.objectId,
+        postUrl: `${SITE_URL}${self.url}#${self.objectId}`,
       },
     };
 
@@ -233,20 +213,29 @@ module.exports = class extends think.Service {
 {{self.comment}}
 仅供预览评论，请前往上述页面查看完整內容。`;
 
-    const form = new FormData();
-
-    form.append('msg', this.controller.locale(contentQQ, data));
-    form.append('qq', QQ_ID);
+    const qmsgHost = QMSG_HOST ? QMSG_HOST.replace(/\/$/, '') : 'https://qmsg.zendee.cn';
 
-    const qmsgHost = QMSG_HOST
-      ? QMSG_HOST.replace(/\/$/, '')
-      : 'https://qmsg.zendee.cn';
+    const postBodyData = {
+      qq: QQ_ID,
+      msg: this.controller.locale(contentQQ, data),
+    };
+    const postBody = Object.keys(postBodyData)
+      .map((key) => encodeURIComponent(key) + '=' + encodeURIComponent(postBodyData[key]))
+      .join('&');
 
     return fetch(`${qmsgHost}/send/${QMSG_KEY}`, {
       method: 'POST',
-      headers: form.getHeaders(),
-      body: form,
-    }).then((resp) => resp.json());
+      headers: {
+        'Content-Type': 'application/x-www-form-urlencoded',
+      },
+      body: postBody,
+    }).then((resp) =>
+      resp.json().then((json) => {
+        think.logger.debug(`qq notify response: ${JSON.stringify(json)}`);
+
+        return json;
+      }),
+    );
   }
 
   async telegram(self, parent) {
@@ -259,23 +248,19 @@ module.exports = class extends think.Service {
     let commentLink = '';
     const href = self.comment.match(/<a href="(.*?)">(.*?)<\/a>/g);
 
-    if (href !== null) {
+    if (href != null) {
       for (let i = 0; i < href.length; i++) {
         href[i] =
-          '[Link: ' +
-          href[i].replace(/<a href="(.*?)">(.*?)<\/a>/g, '$2') +
-          '](' +
-          href[i].replace(/<a href="(.*?)">(.*?)<\/a>/g, '$1') +
-          ')  ';
-        commentLink = commentLink + href[i];
+          `[Link: ${href[i].replaceAll(/<a href="(.*?)">(.*?)<\/a>/g, '$2')}](${href[i].replaceAll(/<a href="(.*?)">(.*?)<\/a>/g, '$1')})  `;
+        commentLink += href[i];
       }
     }
     if (commentLink !== '') {
-      commentLink = `\n` + commentLink + `\n`;
+      commentLink = `\n${commentLink}\n`;
     }
     const comment = self.comment
-      .replace(/<a href="(.*?)">(.*?)<\/a>/g, '[Link:$2]')
-      .replace(/<[^>]+>/g, '');
+      .replaceAll(/<a href="(.*?)">(.*?)<\/a>/g, '[Link:$2]')
+      .replaceAll(/<[^>]+>/g, '');
 
     const contentTG =
       think.config('TGTemplate') ||
@@ -302,27 +287,24 @@ module.exports = class extends think.Service {
       site: {
         name: SITE_NAME,
         url: SITE_URL,
-        postUrl: SITE_URL + self.url + '#' + self.objectId,
+        postUrl: `${SITE_URL}${self.url}#${self.objectId}`,
       },
     };
 
-    const resp = await fetch(
-      `https://api.telegram.org/bot${TG_BOT_TOKEN}/sendMessage`,
-      {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
-          chat_id: TG_CHAT_ID,
-          text: this.controller.locale(contentTG, data),
-          parse_mode: 'MarkdownV2',
-        }),
+    const resp = await fetch(`https://api.telegram.org/bot${TG_BOT_TOKEN}/sendMessage`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
       },
-    ).then((resp) => resp.json());
+      body: JSON.stringify({
+        chat_id: TG_CHAT_ID,
+        text: this.controller.locale(contentTG, data),
+        parse_mode: 'MarkdownV2',
+      }),
+    }).then((resp) => resp.json());
 
     if (!resp.ok) {
-      console.log('Telegram Notification Failed:' + JSON.stringify(resp));
+      console.log(`Telegram Notification Failed:${JSON.stringify(resp)}`);
     }
   }
 
@@ -348,27 +330,29 @@ module.exports = class extends think.Service {
       site: {
         name: SITE_NAME,
         url: SITE_URL,
-        postUrl: SITE_URL + self.url + '#' + self.objectId,
+        postUrl: `${SITE_URL}${self.url}#${self.objectId}`,
       },
     };
 
     title = this.controller.locale(title, data);
     content = this.controller.locale(content, data);
 
-    const form = new FormData();
+    const form = new URLSearchParams();
 
-    if (topic) form.append('topic', topic);
-    if (template) form.append('template', template);
-    if (channel) form.append('channel', channel);
-    if (webhook) form.append('webhook', webhook);
-    if (callbackUrl) form.append('callbackUrl', callbackUrl);
-    if (title) form.append('title', title);
-    if (content) form.append('content', content);
+    if (topic) form.set('topic', topic);
+    if (template) form.set('template', template);
+    if (channel) form.set('channel', channel);
+    if (webhook) form.set('webhook', webhook);
+    if (callbackUrl) form.set('callbackUrl', callbackUrl);
+    if (title) form.set('title', title);
+    if (content) form.set('content', content);
 
     return fetch(`http://www.pushplus.plus/send/${PUSH_PLUS_KEY}`, {
       method: 'POST',
-      headers: form.getHeaders(),
-      body: form,
+      headers: {
+        'Content-Type': 'application/x-www-form-urlencoded',
+      },
+      body: form.toString(),
     }).then((resp) => resp.json());
   }
 
@@ -385,7 +369,7 @@ module.exports = class extends think.Service {
       site: {
         name: SITE_NAME,
         url: SITE_URL,
-        postUrl: SITE_URL + self.url + '#' + self.objectId,
+        postUrl: `${SITE_URL}${self.url}#${self.objectId}`,
       },
     };
 
@@ -420,7 +404,7 @@ module.exports = class extends think.Service {
       return false;
     }
 
-    self.comment = self.comment.replace(/(<([^>]+)>)/gi, '');
+    self.comment = self.comment.replaceAll(/(<([^>]+)>)/gi, '');
 
     const data = {
       self,
@@ -428,7 +412,7 @@ module.exports = class extends think.Service {
       site: {
         name: SITE_NAME,
         url: SITE_URL,
-        postUrl: SITE_URL + self.url + '#' + self.objectId,
+        postUrl: `${SITE_URL}${self.url}#${self.objectId}`,
       },
     };
 
@@ -461,13 +445,13 @@ module.exports = class extends think.Service {
     };
 
     const sign = (timestamp, secret) => {
-      const signStr = timestamp + '\n' + secret;
+      const signStr = `${timestamp}\n${secret}`;
 
       return crypto.createHmac('sha256', signStr).update('').digest('base64');
     };
 
     if (LARK_SECRET) {
-      const timestamp = parseInt(+new Date() / 1000);
+      const timestamp = Number.parseInt(Date.now() / 1000, 10);
 
       signData = { timestamp: timestamp, sign: sign(timestamp, LARK_SECRET) };
     }
@@ -484,16 +468,15 @@ module.exports = class extends think.Service {
     }).then((resp) => resp.json());
 
     if (resp.status !== 200) {
-      console.log('Lark Notification Failed:' + JSON.stringify(resp));
+      console.log(`Lark Notification Failed:${JSON.stringify(resp)}`);
     }
 
-    console.log('FeiShu Notification Success:' + JSON.stringify(resp));
+    console.log(`FeiShu Notification Success:${JSON.stringify(resp)}`);
   }
 
   async run(comment, parent, disableAuthorNotify = false) {
     const { AUTHOR_EMAIL, DISABLE_AUTHOR_NOTIFY } = process.env;
-    const { mailSubject, mailTemplate, mailSubjectAdmin, mailTemplateAdmin } =
-      think.config();
+    const { mailSubject, mailTemplate, mailSubjectAdmin, mailTemplateAdmin } = think.config();
     const AUTHOR = AUTHOR_EMAIL;
 
     const mailList = [];
@@ -504,19 +487,14 @@ module.exports = class extends think.Service {
       ? parent && (parent.mail || '').toLowerCase() === AUTHOR.toLowerCase()
       : false;
     const isCommentSelf =
-      parent &&
-      (parent.mail || '').toLowerCase() === (comment.mail || '').toLowerCase();
+      parent && (parent.mail || '').toLowerCase() === (comment.mail || '').toLowerCase();
 
     const title = mailSubjectAdmin || 'MAIL_SUBJECT_ADMIN';
     const content = mailTemplateAdmin || 'MAIL_TEMPLATE_ADMIN';
 
     if (!DISABLE_AUTHOR_NOTIFY && !isAuthorComment && !disableAuthorNotify) {
       const wechat = await this.wechat({ title, content }, comment, parent);
-      const qywxAmWechat = await this.qywxAmWechat(
-        { title, content },
-        comment,
-        parent,
-      );
+      const qywxAmWechat = await this.qywxAmWechat({ title, content }, comment, parent);
       const qq = await this.qq(comment, parent);
       const telegram = await this.telegram(comment, parent);
       const pushplus = await this.pushplus({ title, content }, comment, parent);
@@ -524,17 +502,15 @@ module.exports = class extends think.Service {
       const lark = await this.lark({ title, content }, comment, parent);
 
       if (
-        [wechat, qq, telegram, qywxAmWechat, pushplus, discord, lark].every(
-          think.isEmpty,
+        [wechat, qq, telegram, qywxAmWechat, pushplus, discord, lark].every((item) =>
+          think.isEmpty(item),
         )
       ) {
         mailList.push({ to: AUTHOR, title, content });
       }
     }
 
-    const disallowList = this.controller.ctx.state.oauthServices.map(
-      ({ name }) => 'mail.' + name,
-    );
+    const disallowList = this.controller.ctx.state.oauthServices.map(({ name }) => `mail.${name}`);
     const fakeMail = new RegExp(`@(${disallowList.join('|')})$`, 'i');
 
     if (
@@ -556,8 +532,8 @@ module.exports = class extends think.Service {
         const response = await this.mail(mail, comment, parent);
 
         console.log('Notification mail send success: %s', response);
-      } catch (e) {
-        console.log('Mail send fail:', e);
+      } catch (err) {
+        console.log('Mail send fail:', err);
       }
     }
   }

package/src/service/storage/base.js

@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
+/* eslint-disable typescript/no-unused-vars */
 
 module.exports = class extends think.Service {
   constructor(tableName) {
@@ -14,12 +14,7 @@ module.exports = class extends think.Service {
     //to be implemented
   }
 
-  async add(
-    data,
-    {
-      access: { read = true, write = true } = { read: true, write: true },
-    } = {},
-  ) {
+  async add(data, { access: { read = true, write = true } = { read: true, write: true } } = {}) {
     //to be implemented
   }
 

package/src/service/storage/cloudbase.js

@@ -27,14 +27,14 @@ module.exports = class extends Base {
       collections[tableName] = true;
 
       return db.collection(tableName);
-    } catch (e) {
-      if (e.code === 'DATABASE_COLLECTION_NOT_EXIST') {
+    } catch (err) {
+      if (err.code === 'DATABASE_COLLECTION_NOT_EXIST') {
         await db.createCollection(tableName);
         collections[tableName] = true;
 
         return db.collection(tableName);
       }
-      throw e;
+      throw err;
     }
   }
 
@@ -46,7 +46,7 @@ module.exports = class extends Base {
     const filter = {};
     const parseKey = (k) => (k === 'objectId' ? '_id' : k);
 
-    for (let k in where) {
+    for (const k in where) {
       if (k === '_complex') {
         continue;
       }
@@ -62,12 +62,14 @@ module.exports = class extends Base {
           const handler = where[k][0].toUpperCase();
 
           switch (handler) {
-            case 'IN':
+            case 'IN': {
               filter[parseKey(k)] = _.in(where[k][1]);
               break;
-            case 'NOT IN':
+            }
+            case 'NOT IN': {
               filter[parseKey(k)] = _.nin(where[k][1]);
               break;
+            }
             case 'LIKE': {
               const first = where[k][1][0];
               const last = where[k][1].slice(-1);
@@ -152,7 +154,7 @@ module.exports = class extends Base {
   async select(where, options = {}) {
     let data = [];
     let ret = [];
-    let offset = options.offset || 0;
+    const offset = options.offset ?? 0;
 
     do {
       options.offset = offset + data.length;