@waline/vercel 1.36.5 → 1.37.0

package/src/logic/comment.js

@@ -1,6 +1,6 @@
 const Base = require('./base.js');
 
-module.exports = class extends Base {
+module.exports = class CommentLogic extends Base {
   checkAdmin() {
     const { userInfo } = this.ctx.state;
 
@@ -117,7 +117,7 @@ module.exports = class extends Base {
     }
 
     switch (type) {
-      case 'recent':
+      case 'recent': {
         this.rules = {
           count: {
             int: { max: 50 },
@@ -125,14 +125,16 @@ module.exports = class extends Base {
           },
         };
         break;
+      }
 
-      case 'count':
+      case 'count': {
         this.rules = {
           url: {
             array: true,
           },
         };
         break;
+      }
 
       case 'list': {
         const { userInfo } = this.ctx.state;
@@ -153,7 +155,7 @@ module.exports = class extends Base {
         break;
       }
 
-      default:
+      default: {
         this.rules = {
           path: {
             string: true,
@@ -173,6 +175,7 @@ module.exports = class extends Base {
           },
         };
         break;
+      }
     }
   }
 

package/src/logic/db.js

@@ -1,6 +1,6 @@
 const Base = require('./base.js');
 
-module.exports = class extends Base {
+module.exports = class DatabaseLogic extends Base {
   async __before(...args) {
     await super.__before(...args);
 

package/src/logic/token.js

@@ -34,8 +34,8 @@ module.exports = class extends Base {
    * @apiSuccess  (200) {Number}  errno 0
    * @apiSuccess  (200) {String}  errmsg  return error message if error
    */
-  postAction() {
-    return this.useCaptchaCheck();
+  async postAction() {
+    await this.useCaptchaCheck();
   }
 
   /**

package/src/middleware/dashboard.js

@@ -1,3 +1,4 @@
+// oxlint-disable-next-line func-names
 module.exports = function () {
   return (ctx) => {
     ctx.type = 'html';

package/src/middleware/plugin.js

@@ -3,7 +3,7 @@ const compose = require('koa-compose');
 module.exports = () => async (ctx, next) => {
   const middlewares = think.getPluginMiddlewares();
 
-  if (!think.isArray(middlewares) || !middlewares.length) {
+  if (!think.isArray(middlewares) || middlewares.length === 0) {
     return next();
   }
 

package/src/service/akismet.js

@@ -2,6 +2,7 @@ const Akismet = require('akismet');
 
 const DEFAULT_KEY = '70542d86693e';
 
+// oxlint-disable-next-line func-names
 module.exports = function (comment, blog) {
   let { AKISMET_KEY, SITE_URL } = process.env;
 
@@ -13,14 +14,18 @@ module.exports = function (comment, blog) {
     return Promise.resolve(false);
   }
 
+  // oxlint-disable-next-line func-names
   return new Promise(function (resolve, reject) {
     const akismet = Akismet.client({ blog, apiKey: AKISMET_KEY });
 
+    // oxlint-disable-next-line func-names
     akismet.verifyKey(function (err, verifyKey) {
       if (err) {
-        return reject(err);
+        reject(err);
+        return;
       } else if (!verifyKey) {
-        return reject(new Error('Akismet API_KEY verify failed!'));
+        reject(new Error('Akismet API_KEY verify failed!'));
+        return;
       }
 
       akismet.checkComment(
@@ -30,9 +35,11 @@ module.exports = function (comment, blog) {
           comment_author: comment.nick,
           comment_content: comment.comment,
         },
+        // oxlint-disable-next-line func-names
         function (err, spam) {
           if (err) {
-            return reject(err);
+            reject(err);
+            return;
           }
           resolve(spam);
         },

package/src/service/avatar.js

@@ -1,4 +1,4 @@
-const crypto = require('crypto');
+const crypto = require('node:crypto');
 
 const nunjucks = require('nunjucks');
 const helper = require('think-helper');

package/src/service/markdown/highlight.js

@@ -7,7 +7,7 @@ rawLoadLanguages.silent = true;
 const loadLanguages = (languages = []) => {
   const langsToLoad = languages.filter((item) => !prism.languages[item]);
 
-  if (langsToLoad.length) {
+  if (langsToLoad.length > 0) {
     rawLoadLanguages(langsToLoad);
   }
 };

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,7 +4,7 @@ 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);
 
@@ -20,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);
@@ -28,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,7 +45,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}`,
       },
     };
 
@@ -71,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}`,
       },
     };
 
@@ -107,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 = {
@@ -121,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}`,
       },
     };
 
@@ -136,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();
 
@@ -146,11 +148,7 @@ 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()}`, {
@@ -191,7 +189,9 @@ module.exports = class extends think.Service {
       return false;
     }
 
-    const comment = self.comment.replace(/<a href="(.*?)">(.*?)<\/a>/g, '').replace(/<[^>]+>/g, '');
+    const comment = self.comment
+      .replaceAll(/<a href="(.*?)">(.*?)<\/a>/g, '')
+      .replaceAll(/<[^>]+>/g, '');
 
     const data = {
       self: {
@@ -202,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}`,
       },
     };
 
@@ -229,13 +229,13 @@ module.exports = class extends think.Service {
         'Content-Type': 'application/x-www-form-urlencoded',
       },
       body: postBody,
-    }).then((resp) => {
-      return resp.json().then((json) => {
+    }).then((resp) =>
+      resp.json().then((json) => {
         think.logger.debug(`qq notify response: ${JSON.stringify(json)}`);
 
         return json;
-      });
-    });
+      }),
+    );
   }
 
   async telegram(self, parent) {
@@ -248,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') ||
@@ -291,7 +287,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}`,
       },
     };
 
@@ -308,7 +304,7 @@ module.exports = class extends think.Service {
     }).then((resp) => resp.json());
 
     if (!resp.ok) {
-      console.log('Telegram Notification Failed:' + JSON.stringify(resp));
+      console.log(`Telegram Notification Failed:${JSON.stringify(resp)}`);
     }
   }
 
@@ -334,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());
   }
 
@@ -371,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}`,
       },
     };
 
@@ -406,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,
@@ -414,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}`,
       },
     };
 
@@ -447,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) };
     }
@@ -470,10 +468,10 @@ 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) {
@@ -503,12 +501,16 @@ module.exports = class extends think.Service {
       const discord = await this.discord({ title, content }, comment, parent);
       const lark = await this.lark({ title, content }, comment, parent);
 
-      if ([wechat, qq, telegram, qywxAmWechat, pushplus, discord, lark].every(think.isEmpty)) {
+      if (
+        [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 (
@@ -530,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) {

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;

package/src/service/storage/github.js

@@ -63,11 +63,11 @@ class Github {
       },
     )
       .then((resp) => resp.json())
-      .catch((e) => {
-        const isTooLarge = e.message.includes('"too_large"');
+      .catch((err) => {
+        const isTooLarge = err.message.includes('"too_large"');
 
         if (!isTooLarge) {
-          throw e;
+          throw err;
         }
 
         return this.getLargeFile(filename);
@@ -140,11 +140,11 @@ module.exports = class extends Base {
 
   async collection(tableName) {
     const filename = path.join(this.basePath, tableName + '.csv');
-    const file = await this.git.get(filename).catch((e) => {
-      if (e.statusCode === 404) {
+    const file = await this.git.get(filename).catch((err) => {
+      if (err.statusCode === 404) {
         return '';
       }
-      throw e;
+      throw err;
     });
 
     return new Promise((resolve, reject) => {
@@ -157,7 +157,9 @@ module.exports = class extends Base {
       })
         .on('error', reject)
         .on('data', (row) => data.push(row))
-        .on('end', () => resolve(data));
+        .on('end', () => {
+          resolve(data);
+        });
     });
   }
 
@@ -180,7 +182,7 @@ module.exports = class extends Base {
 
     const filters = [];
 
-    for (let k in where) {
+    for (const k in where) {
       if (k === '_complex') {
         continue;
       }
@@ -203,12 +205,14 @@ module.exports = class extends Base {
       const handler = where[k][0].toUpperCase();
 
       switch (handler) {
-        case 'IN':
+        case 'IN': {
           filters.push((item) => where[k][1].includes(item[k]));
           break;
-        case 'NOT IN':
+        }
+        case 'NOT IN': {
           filters.push((item) => !where[k][1].includes(item[k]));
           break;
+        }
         case 'LIKE': {
           const first = where[k][1][0];
           const last = where[k][1].slice(-1);
@@ -224,12 +228,14 @@ module.exports = class extends Base {
           filters.push((item) => reg.test(item[k]));
           break;
         }
-        case '!=':
+        case '!=': {
           filters.push((item) => item[k] !== where[k][1]);
           break;
-        case '>':
+        }
+        case '>': {
           filters.push((item) => item[k] >= where[k][1]);
           break;
+        }
       }
     }
 
@@ -279,7 +285,7 @@ module.exports = class extends Base {
       });
     }
 
-    data = data.slice(limit || 0, offset || data.length);
+    data = data.slice(limit ?? 0, offset ?? data.length);
     if (field) {
       field.push('id');
       const fieldObj = {};
@@ -312,9 +318,9 @@ module.exports = class extends Base {
     const counts = {};
 
     // FIXME: The loop is weird @lizheming
-    // eslint-disable-next-line @typescript-eslint/prefer-for-of
+    // oxlint-disable-next-line typescript/prefer-for-of
     for (let i = 0; i < data.length; i++) {
-      const key = group.map((field) => data[field]).join();
+      const key = group.map((field) => data[field]).join(',');
 
       if (!counts[key]) {
         counts[key] = { count: 0 };
@@ -333,7 +339,7 @@ module.exports = class extends Base {
     // { access: { read = true, write = true } = { read: true, write: true } } = {}
   ) {
     const instance = await this.collection(this.tableName);
-    const id = Math.random().toString(36).substr(2, 15);
+    const id = Math.random().toString(36).slice(2, 15);
 
     instance.push({ ...data, id });
     await this.save(this.tableName, instance, instance.sha);
@@ -364,8 +370,8 @@ module.exports = class extends Base {
   async delete(where) {
     const instance = await this.collection(this.tableName);
     const deleteData = this.where(instance, where);
-    const deleteId = deleteData.map(({ id }) => id);
-    const data = instance.filter((data) => !deleteId.includes(data.id));
+    const deleteId = new Set(deleteData.map(({ id }) => id));
+    const data = instance.filter((data) => !deleteId.has(data.id));
 
     await this.save(this.tableName, data, instance.sha);
   }