@waline/vercel 1.36.5 → 1.37.0

package/development.js

@@ -21,6 +21,7 @@ instance.run();
 let config = {};
 
 try {
+  // oxlint-disable-next-line node/global-require
   config = require('./config.js');
 } catch {
   // do nothing

package/index.js

@@ -4,7 +4,7 @@ const path = require('node:path');
 const Application = require('thinkjs');
 const Loader = require('thinkjs/lib/loader');
 
-module.exports = function (configParams = {}) {
+module.exports = function main(configParams = {}) {
   const { env, ...config } = configParams;
 
   const app = new Application({
@@ -20,10 +20,11 @@ module.exports = function (configParams = {}) {
 
   loader.loadAll('worker');
 
+  // oxlint-disable-next-line func-names
   return function (req, res) {
-    for (const k in config) {
+    for (const key in config) {
       // fix https://github.com/walinejs/waline/issues/2649 with alias model config name
-      think.config(k === 'model' ? 'customModel' : k, config[k]);
+      think.config(key === 'model' ? 'customModel' : key, config[key]);
     }
 
     return think

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.36.5",
+  "version": "1.37.0",
   "description": "vercel server for waline comment system",
   "keywords": [
     "blog",
@@ -29,9 +29,9 @@
     "@mdit/plugin-sup": "0.22.5-cjs.0",
     "akismet": "^2.0.7",
     "dompurify": "^3.3.1",
-    "dy-node-ip2region": "^1.0.1",
     "fast-csv": "^5.0.5",
     "form-data": "^4.0.5",
+    "ip2region": "^2.3.0",
     "jsdom": "^19.0.0",
     "jsonwebtoken": "^9.0.3",
     "koa-compose": "^4.1.0",

package/src/config/adapter.js

@@ -6,9 +6,10 @@ const Postgresql = require('think-model-postgresql');
 let Sqlite;
 
 try {
+  // oxlint-disable-next-line node/global-require
   Sqlite = require('think-model-sqlite');
 } catch (err) {
-  // eslint-disable-next-line @typescript-eslint/no-extraneous-class
+  // oxlint-disable-next-line typescript/no-extraneous-class
   Sqlite = class {};
   console.log(err);
 }
@@ -65,11 +66,11 @@ if (MONGO_AUTHSOURCE) mongoOpt.authSource = MONGO_AUTHSOURCE;
 if (MONGO_DB) {
   type = 'mongo';
   for (const envKeys in process.env) {
-    if (/MONGO_OPT_/.test(envKeys)) {
+    if (envKeys.includes('MONGO_OPT_')) {
       const key = envKeys
         .slice(10)
         .toLocaleLowerCase()
-        .replace(/_([a-z])/g, (_, b) => b.toUpperCase());
+        .replaceAll(/_([a-z])/g, (_, b) => b.toUpperCase());
 
       mongoOpt[key] = process.env[envKeys];
     }
@@ -88,7 +89,9 @@ exports.model = {
   type,
   common: {
     logSql: true,
-    logger: (msg) => think.logger.info(msg),
+    logger: (msg) => {
+      think.logger.info(msg);
+    },
   },
 
   mongo: {
@@ -114,7 +117,7 @@ exports.model = {
     connectionLimit: 1,
     prefix: PG_PREFIX || POSTGRES_PREFIX || 'wl_',
     ssl:
-      (PG_SSL || POSTGRES_SSL) == 'true' || POSTGRES_URL?.includes('sslmode=require')
+      (PG_SSL || POSTGRES_SSL) === 'true' || POSTGRES_URL?.includes('sslmode=require')
         ? {
             rejectUnauthorized: false,
           }

package/src/config/config.js

@@ -100,7 +100,7 @@ if (isFalse(MARKDOWN_HIGHLIGHT)) markdown.config.highlight = false;
 let avatarProxy = '';
 
 if (AVATAR_PROXY) {
-  avatarProxy = !isFalse(AVATAR_PROXY) ? AVATAR_PROXY : '';
+  avatarProxy = isFalse(AVATAR_PROXY) ? '' : AVATAR_PROXY;
 }
 
 const oauthUrl = OAUTH_URL || 'https://oauth.lithub.cc';
@@ -111,10 +111,10 @@ module.exports = {
   jwtKey,
   forbiddenWords,
   disallowIPList: [],
-  secureDomains: SECURE_DOMAINS ? SECURE_DOMAINS.split(/\s*,\s*/) : undefined,
+  secureDomains: SECURE_DOMAINS ? SECURE_DOMAINS.split(/\s*,\s*/) : null,
   disableUserAgent: DISABLE_USERAGENT && !isFalse(DISABLE_USERAGENT),
   disableRegion: DISABLE_REGION && !isFalse(DISABLE_REGION),
-  levels: !LEVELS || isFalse(LEVELS) ? false : LEVELS.split(/\s*,\s*/).map((v) => Number(v)),
+  levels: !LEVELS || isFalse(LEVELS) ? false : LEVELS.split(/\s*,\s*/).map(Number),
 
   audit: COMMENT_AUDIT && !isFalse(COMMENT_AUDIT),
   avatarProxy,

package/src/controller/article.js

@@ -11,14 +11,14 @@ module.exports = class extends BaseRest {
     const { deprecated } = this.ctx.state;
 
     // path is required
-    if (!Array.isArray(path) || !path.length) {
+    if (!Array.isArray(path) || path.length === 0) {
       return this.jsonOrSuccess(0);
     }
 
     const resp = await this.modelInstance.select({ url: ['IN', path] });
 
     if (think.isEmpty(resp)) {
-      const counters = new Array(path.length).fill(
+      const counters = Array(path.length).fill(
         type.length === 1 && deprecated
           ? 0
           : type.reduce((o, field) => {

package/src/controller/comment.js

@@ -4,12 +4,13 @@ const { getMarkdownParser } = require('../service/markdown/index.js');
 
 const markdownParser = getMarkdownParser();
 
-async function formatCmt(
+// oxlint-disable-next-line max-statements
+const formatCmt = async (
   { ua, ip, ...comment },
   users = [],
   { avatarProxy, deprecated },
   loginUser,
-) {
+) => {
   ua = think.uaParser(ua);
   if (!think.config('disableUserAgent')) {
     comment.browser = `${ua.browser.name || ''}${(ua.browser.version || '')
@@ -33,7 +34,7 @@ async function formatCmt(
 
   comment.avatar =
     avatarProxy && !avatarUrl.includes(avatarProxy)
-      ? avatarProxy + '?url=' + encodeURIComponent(avatarUrl)
+      ? `${avatarProxy}?url=${encodeURIComponent(avatarUrl)}`
       : avatarUrl;
 
   const isAdmin = loginUser && loginUser.type === 'administrator';
@@ -67,7 +68,7 @@ async function formatCmt(
   delete comment.updatedAt;
 
   return comment;
-}
+};
 
 module.exports = class extends BaseRest {
   constructor(ctx) {
@@ -79,12 +80,12 @@ module.exports = class extends BaseRest {
     const { type } = this.get();
 
     const fnMap = {
-      recent: this.getRecentCommentList,
-      count: this.getCommentCount,
-      list: this.getAdminCommentList,
+      recent: this['getRecentCommentList'],
+      count: this['getCommentCount'],
+      list: this['getAdminCommentList'],
     };
 
-    const fn = fnMap[type] || this.getCommentList;
+    const fn = fnMap[type] || this['getCommentList'];
     const data = await fn.call(this);
 
     return this.jsonOrSuccess(data);
@@ -122,7 +123,7 @@ module.exports = class extends BaseRest {
 
       if (
         think.isArray(disallowIPList) &&
-        disallowIPList.length &&
+        disallowIPList.length > 0 &&
         disallowIPList.includes(data.ip)
       ) {
         think.logger.debug(`Comment IP ${data.ip} is in disallowIPList`);
@@ -171,7 +172,9 @@ module.exports = class extends BaseRest {
       think.logger.debug(`Comment initial status is ${data.status}`);
 
       if (data.status === 'approved') {
-        const spam = await akismet(data, this.ctx.serverURL).catch((err) => console.log(err)); // ignore akismet error
+        const spam = await akismet(data, this.ctx.serverURL).catch((err) => {
+          console.log(err);
+        }); // ignore akismet error
 
         if (spam === true) {
           data.status = 'spam';
@@ -272,7 +275,7 @@ module.exports = class extends BaseRest {
   async putAction() {
     const { userInfo } = this.ctx.state;
     const isAdmin = userInfo.type === 'administrator';
-    let data = isAdmin ? this.post() : this.post('comment,like');
+    const data = isAdmin ? this.post() : this.post('comment,like');
     let oldData = await this.modelInstance.select({ objectId: this.id });
 
     if (think.isEmpty(oldData) || think.isEmpty(data)) {
@@ -473,10 +476,10 @@ module.exports = class extends BaseRest {
     }
 
     const userModel = this.getModel('Users');
-    const user_ids = Array.from(new Set(comments.map(({ user_id }) => user_id).filter((v) => v)));
+    const user_ids = [...new Set(comments.map(({ user_id }) => user_id).filter((v) => v))];
     let users = [];
 
-    if (user_ids.length) {
+    if (user_ids.length > 0) {
       users = await userModel.select(
         { objectId: ['IN', user_ids] },
         {
@@ -491,12 +494,12 @@ module.exports = class extends BaseRest {
         _complex: {},
       };
 
-      if (user_ids.length) {
+      if (user_ids.length > 0) {
         countWhere._complex.user_id = ['IN', user_ids];
       }
-      const mails = Array.from(new Set(comments.map(({ mail }) => mail).filter((v) => v)));
+      const mails = [...new Set(comments.map(({ mail }) => mail).filter((v) => v))];
 
-      if (mails.length) {
+      if (mails.length > 0) {
         countWhere._complex.mail = ['IN', mails];
       }
       if (!think.isEmpty(countWhere._complex)) {
@@ -610,11 +613,11 @@ module.exports = class extends BaseRest {
     });
 
     const userModel = this.getModel('Users');
-    const user_ids = Array.from(new Set(comments.map(({ user_id }) => user_id).filter((v) => v)));
+    const user_ids = [...new Set(comments.map(({ user_id }) => user_id).filter((v) => v))];
 
     let users = [];
 
-    if (user_ids.length) {
+    if (user_ids.length > 0) {
       users = await userModel.select(
         { objectId: ['IN', user_ids] },
         {
@@ -679,11 +682,11 @@ module.exports = class extends BaseRest {
     });
 
     const userModel = this.getModel('Users');
-    const user_ids = Array.from(new Set(comments.map(({ user_id }) => user_id).filter((v) => v)));
+    const user_ids = [...new Set(comments.map(({ user_id }) => user_id).filter((v) => v))];
 
     let users = [];
 
-    if (user_ids.length) {
+    if (user_ids.length > 0) {
       users = await userModel.select(
         { objectId: ['IN', user_ids] },
         {
@@ -707,7 +710,7 @@ module.exports = class extends BaseRest {
   async getCommentCount() {
     const { url } = this.get();
     const { userInfo } = this.ctx.state;
-    const where = Array.isArray(url) && url.length ? { url: ['IN', url] } : {};
+    const where = Array.isArray(url) && url.length > 0 ? { url: ['IN', url] } : {};
 
     if (think.isEmpty(userInfo)) {
       where.status = ['NOT IN', ['waiting', 'spam']];

package/src/controller/oauth.js

@@ -19,12 +19,13 @@ module.exports = class extends think.Controller {
         type,
       });
 
-      return this.redirect(
+      this.redirect(
         think.buildUrl(`${oauthUrl}/${type}`, {
           redirect: redirectUrl,
           state: this.ctx.state.token || '',
         }),
       );
+      return;
     }
 
     /**
@@ -64,7 +65,8 @@ module.exports = class extends think.Controller {
       const token = jwt.sign(userBySocial[0].objectId, this.config('jwtKey'));
 
       if (redirect) {
-        return this.redirect(think.buildUrl(redirect, { token }));
+        this.redirect(think.buildUrl(redirect, { token }));
+        return;
       }
 
       return this.success();
@@ -84,7 +86,8 @@ module.exports = class extends think.Controller {
         objectId: current.objectId,
       });
 
-      return this.redirect('/ui/profile');
+      this.redirect('/ui/profile');
+      return;
     }
 
     // when user has not login, then we create account by the social type!
@@ -108,6 +111,6 @@ module.exports = class extends think.Controller {
     // and then generate token!
     const token = jwt.sign(user.objectId, this.config('jwtKey'));
 
-    return this.redirect(redirect + (redirect.includes('?') ? '&' : '?') + 'token=' + token);
+    this.redirect(redirect + (redirect.includes('?') ? '&' : '?') + 'token=' + token);
   }
 };

package/src/controller/rest.js

@@ -21,7 +21,7 @@ module.exports = class extends think.Controller {
     const filename = this.__filename || __filename;
     const last = filename.lastIndexOf(path.sep);
 
-    return filename.substr(last + 1, filename.length - last - 4);
+    return filename.slice(last + 1, filename.length - last - 4);
   }
 
   getId() {

package/src/controller/user.js

@@ -1,6 +1,6 @@
 const BaseRest = require('./rest.js');
 
-module.exports = class extends BaseRest {
+module.exports = class UserController extends BaseRest {
   constructor(...args) {
     super(...args);
     this.modelInstance = this.getModel('Users');
@@ -80,7 +80,7 @@ module.exports = class extends BaseRest {
 
     try {
       const notify = this.service('notify', this);
-      const apiUrl = think.buildUrl(this.ctx.serverURL + '/verification', {
+      const apiUrl = think.buildUrl(`${this.ctx.serverURL}/verification`, {
         token,
         email: data.email,
       });
@@ -179,6 +179,7 @@ module.exports = class extends BaseRest {
     return this.success();
   }
 
+  // oxlint-disable-next-line max-statements
   async getUsersListByCount() {
     const { pageSize } = this.get();
     const commentModel = this.getModel('Comment');
@@ -196,9 +197,9 @@ module.exports = class extends BaseRest {
 
     const userIds = counts.filter(({ user_id }) => user_id).map(({ user_id }) => user_id);
 
-    let usersMap = {};
+    const usersMap = {};
 
-    if (userIds.length) {
+    if (userIds.length > 0) {
       const users = await this.modelInstance.select({
         objectId: ['IN', userIds],
       });
@@ -220,7 +221,7 @@ module.exports = class extends BaseRest {
         let level = 0;
 
         if (user.count) {
-          const _level = think.findLastIndex(this.config('levels'), (l) => l <= user.count);
+          const _level = think.findLastIndex(this.config('levels'), (level) => level <= user.count);
 
           if (_level !== -1) {
             level = _level;
@@ -233,7 +234,7 @@ module.exports = class extends BaseRest {
         const { display_name: nick, url: link, avatar: avatarUrl, label } = users[count.user_id];
         const avatar =
           avatarProxy && !avatarUrl.includes(avatarProxy)
-            ? avatarProxy + '?url=' + encodeURIComponent(avatarUrl)
+            ? `${avatarProxy}?url=${encodeURIComponent(avatarUrl)}`
             : avatarUrl;
 
         Object.assign(user, { nick, link, avatar, label });
@@ -246,7 +247,7 @@ module.exports = class extends BaseRest {
       if (think.isEmpty(comments)) {
         continue;
       }
-      const comment = comments[0];
+      const [comment] = comments;
 
       if (think.isEmpty(comment)) {
         continue;
@@ -255,7 +256,7 @@ module.exports = class extends BaseRest {
       const avatarUrl = await think.service('avatar').stringify(comment);
       const avatar =
         avatarProxy && !avatarUrl.includes(avatarProxy)
-          ? avatarProxy + '?url=' + encodeURIComponent(avatarUrl)
+          ? `${avatarProxy}?url=${encodeURIComponent(avatarUrl)}`
           : avatarUrl;
 
       Object.assign(user, { nick, link, avatar });

package/src/controller/verification.js

@@ -21,10 +21,11 @@ module.exports = class extends BaseRest {
       return this.fail(this.locale('USER_REGISTERED'));
     }
 
-    if (token === match[1] && Date.now() < parseInt(match[2])) {
+    if (token === match[1] && Date.now() < Number.parseInt(match[2])) {
       await this.modelInstance.update({ type: 'guest' }, { email });
 
-      return this.redirect('/ui/login');
+      this.redirect('/ui/login');
+      return;
     }
 
     return this.fail(this.locale('TOKEN_EXPIRED'));

package/src/extend/think.js

@@ -1,10 +1,24 @@
-const ip2region = require('dy-node-ip2region');
-const helper = require('think-helper');
+const IP2Region = require('ip2region').default;
 const parser = require('ua-parser-js');
 
 const preventMessage = 'PREVENT_NEXT_PROCESS';
 
-const regionSearch = ip2region.create(process.env.IP2REGION_DB);
+// Cached IP2Region instance using IIFE closure pattern
+// Instance is created on first access and reused for all subsequent calls
+const getIP2RegionInstance = (() => {
+  let instance = null;
+
+  return () => {
+    if (!instance) {
+      instance = new IP2Region({
+        ipv4db: process.env.IP2REGION_DB_V4 || process.env.IP2REGION_DB,
+        ipv6db: process.env.IP2REGION_DB_V6,
+      });
+    }
+
+    return instance;
+  };
+})();
 
 const OS_VERSION_MAP = {
   Windows: {
@@ -34,15 +48,17 @@ module.exports = {
   },
   promiseAllQueue(promises, taskNum) {
     return new Promise((resolve, reject) => {
-      if (!promises.length) {
-        return resolve();
+      if (promises.length === 0) {
+        resolve();
+
+        return;
       }
 
       const ret = [];
       let index = 0;
       let count = 0;
 
-      function runTask() {
+      const runTask = () => {
         const idx = index;
 
         index += 1;
@@ -59,7 +75,7 @@ module.exports = {
 
           return runTask();
         }, reject);
-      }
+      };
 
       for (let i = 0; i < taskNum; i++) {
         runTask();
@@ -67,19 +83,17 @@ module.exports = {
     });
   },
   async ip2region(ip, { depth = 1 }) {
-    if (!ip || ip.includes(':')) return '';
+    if (!ip) return '';
 
     try {
-      const search = helper.promisify(regionSearch.btreeSearch, regionSearch);
-      const result = await search(ip);
+      const res = getIP2RegionInstance().search(ip);
 
-      if (!result) {
+      if (!res) {
         return '';
       }
-      const { region } = result;
-      const [, , province, city, isp] = region.split('|');
-      const address = Array.from(new Set([province, city, isp].filter((v) => v)));
 
+      const { province, city, isp } = res;
+      const address = [...new Set([province, city, isp].filter(Boolean))];
       return address.slice(0, depth).join(' ');
     } catch (err) {
       console.log(err);
@@ -104,7 +118,7 @@ module.exports = {
       return defaultLevel;
     }
 
-    const level = think.findLastIndex(levels, (l) => l <= val);
+    const level = think.findLastIndex(levels, (level) => level <= val);
 
     return level === -1 ? defaultLevel : level;
   },
@@ -139,7 +153,7 @@ module.exports = {
       }
 
       if (think.isArray(middleware)) {
-        return middleware.filter((m) => think.isFunction(m));
+        return middleware.filter((middleware) => think.isFunction(middleware));
       }
     });
 
@@ -147,8 +161,8 @@ module.exports = {
   },
   getPluginHook(hookName) {
     return think
-      .pluginMap('hooks', (hook) => (think.isFunction(hook[hookName]) ? hook[hookName] : undefined))
-      .filter((v) => v);
+      .pluginMap('hooks', (hook) => (think.isFunction(hook[hookName]) ? hook[hookName] : null))
+      .filter(Boolean);
   },
   buildUrl(path, query = {}) {
     const notEmptyQuery = {};
@@ -165,7 +179,7 @@ module.exports = {
     let destUrl = path;
 
     if (destUrl && notEmptyQueryStr) {
-      destUrl += destUrl.indexOf('?') !== -1 ? '&' : '?';
+      destUrl += destUrl.includes('?') ? '&' : '?';
     }
     if (notEmptyQueryStr) {
       destUrl += notEmptyQueryStr;

package/src/logic/base.js

@@ -3,7 +3,7 @@ const qs = require('node:querystring');
 
 const jwt = require('jsonwebtoken');
 
-module.exports = class extends think.Logic {
+module.exports = class BaseLogic extends think.Logic {
   constructor(...args) {
     super(...args);
     this.modelInstance = this.getModel('Users');
@@ -11,17 +11,18 @@ module.exports = class extends think.Logic {
     this.id = this.getId();
   }
 
+  // oxlint-disable-next-line max-statements
   async __before() {
     const referrer = this.ctx.referrer(true);
-    let origin = this.ctx.origin;
+    let { origin } = this.ctx;
 
     if (origin) {
       try {
         const parsedOrigin = new URL(origin);
 
         origin = parsedOrigin.hostname;
-      } catch (e) {
-        console.error('Invalid origin format:', origin, e);
+      } catch (err) {
+        console.error('Invalid origin format:', origin, err);
       }
     }
 
@@ -39,9 +40,10 @@ module.exports = class extends think.Logic {
         // 'api.weibo.com',
         // 'graph.qq.com',
       );
-      secureDomains = secureDomains.concat(
-        this.ctx.state.oauthServices.map(({ origin }) => origin),
-      );
+      secureDomains = [
+        ...secureDomains,
+        ...this.ctx.state.oauthServices.map(({ origin }) => origin),
+      ];
 
       // 转换可能的正则表达式字符串为正则表达式对象
       secureDomains = secureDomains
@@ -50,8 +52,8 @@ module.exports = class extends think.Logic {
           if (typeof domain === 'string' && domain.startsWith('/') && domain.endsWith('/')) {
             try {
               return new RegExp(domain.slice(1, -1)); // 去掉斜杠并创建 RegExp 对象
-            } catch (e) {
-              console.error('Invalid regex pattern in secureDomains:', domain, e);
+            } catch (err) {
+              console.error('Invalid regex pattern in secureDomains:', domain, err);
 
               return null;
             }
@@ -62,7 +64,7 @@ module.exports = class extends think.Logic {
         .filter(Boolean); // 过滤掉无效的正则表达式
 
       // 有 referrer 检查 referrer，没有则检查 origin
-      const checking = referrer ? referrer : origin;
+      const checking = referrer || origin;
       const isSafe = secureDomains.some((domain) =>
         think.isFunction(domain.test) ? domain.test(checking) : domain === checking,
       );
@@ -84,8 +86,8 @@ module.exports = class extends think.Logic {
 
     try {
       userId = jwt.verify(token, think.config('jwtKey'));
-    } catch (e) {
-      think.logger.debug(e);
+    } catch (err) {
+      think.logger.debug(err);
     }
 
     if (think.isEmpty(userId) || !think.isString(userId)) {
@@ -113,19 +115,19 @@ module.exports = class extends think.Logic {
       return;
     }
 
-    const userInfo = user[0];
+    const [userInfo] = user;
 
-    let avatarUrl = userInfo.avatar
-      ? userInfo.avatar
-      : await think.service('avatar').stringify({
-          mail: userInfo.email,
-          nick: userInfo.display_name,
-          link: userInfo.url,
-        });
+    let avatarUrl =
+      userInfo.avatar ||
+      (await think.service('avatar').stringify({
+        mail: userInfo.email,
+        nick: userInfo.display_name,
+        link: userInfo.url,
+      }));
     const { avatarProxy } = think.config();
 
     if (avatarProxy) {
-      avatarUrl = avatarProxy + '?url=' + encodeURIComponent(avatarUrl);
+      avatarUrl = `${avatarProxy}?url=${encodeURIComponent(avatarUrl)}`;
     }
     userInfo.avatar = avatarUrl;
     this.ctx.state.userInfo = userInfo;
@@ -136,7 +138,7 @@ module.exports = class extends think.Logic {
     const filename = this.__filename || __filename;
     const last = filename.lastIndexOf(path.sep);
 
-    return filename.substr(last + 1, filename.length - last - 4);
+    return filename.slice(last + 1, filename.length - last - 4);
   }
 
   getId() {
@@ -193,7 +195,7 @@ module.exports = class extends think.Logic {
       remoteip: this.ctx.ip,
     });
 
-    const requestUrl = method === 'GET' ? api + '?' + query : api;
+    const requestUrl = method === 'GET' ? `${api}?${query}` : api;
     const options =
       method === 'GET'
         ? {}