@waline/vercel 1.15.1 → 1.16.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.15.1",
+  "version": "1.16.0",
   "description": "vercel server for waline comment system",
   "keywords": [
     "waline",
@@ -20,6 +20,7 @@
     "akismet": "^2.0.7",
     "deta": "^1.1.0",
     "dompurify": "^2.3.6",
+    "dy-node-ip2region": "^1.0.1",
     "fast-csv": "^4.3.6",
     "jsdom": "^19.0.0",
     "jsonwebtoken": "^8.5.1",

package/src/config/config.js

@@ -14,6 +14,7 @@ const {
   TCB_KEY,
   SECURE_DOMAINS,
   DISABLE_USERAGENT,
+  DISABLE_REGION,
   AVATAR_PROXY,
   GITHUB_TOKEN,
   DETA_PROJECT_KEY,
@@ -106,6 +107,7 @@ module.exports = {
   disallowIPList: [],
   secureDomains: SECURE_DOMAINS ? SECURE_DOMAINS.split(/\s*,\s*/) : undefined,
   disableUserAgent: DISABLE_USERAGENT && !isFalse(DISABLE_USERAGENT),
+  disableReigon: DISABLE_REGION && !isFalse(DISABLE_REGION),
   levels:
     !LEVELS || isFalse(LEVELS)
       ? false

package/src/controller/comment.js

@@ -5,7 +5,7 @@ const { getMarkdownParser } = require('../service/markdown');
 
 const markdownParser = getMarkdownParser();
 async function formatCmt(
-  { ua, user_id, ...comment },
+  { ua, user_id, ip, ...comment },
   users = [],
   { avatarProxy },
   loginUser
@@ -41,8 +41,13 @@ async function formatCmt(
     delete comment.mail;
   } else {
     comment.orig = comment.comment;
+    comment.ip = ip;
   }
 
+  // administrator can always show region
+  if (isAdmin || !think.config('disableRegion')) {
+    comment.addr = await think.ip2region(ip, { depth: isAdmin ? 3 : 1 });
+  }
   comment.comment = markdownParser(comment.comment);
   return comment;
 }
@@ -88,6 +93,7 @@ module.exports = class extends BaseRest {
             'pid',
             'rid',
             'ua',
+            'ip',
             'user_id',
             'sticky',
           ],
@@ -235,6 +241,7 @@ module.exports = class extends BaseRest {
             'pid',
             'rid',
             'ua',
+            'ip',
             'user_id',
             'sticky',
           ],
@@ -264,6 +271,13 @@ module.exports = class extends BaseRest {
             ...comments.filter(({ rid, sticky }) => !rid && sticky),
             ...comments.filter(({ rid, sticky }) => !rid && !sticky),
           ].slice(pageOffset, pageOffset + pageSize);
+          const rootIds = {};
+          rootComments.forEach(({ objectId }) => {
+            rootIds[objectId] = true;
+          });
+          comments = comments.filter(
+            (cmt) => rootIds[cmt.objectId] || rootIds[cmt.rid]
+          );
         } else {
           rootComments = await this.modelInstance.select(
             { ...where, rid: undefined },

package/src/extend/think.js

@@ -1,5 +1,9 @@
+const ip2region = require('dy-node-ip2region');
+const helper = require('think-helper');
 const preventMessage = 'PREVENT_NEXT_PROCESS';
 
+const regionSearch = ip2region.create();
+
 module.exports = {
   prevent() {
     throw new Error(preventMessage);
@@ -18,4 +22,46 @@ module.exports = {
 
     return -1;
   },
+  promiseAllQueue(promises, taskNum) {
+    return new Promise((resolve, reject) => {
+      const ret = [];
+      let index = 0;
+      let count = 0;
+
+      function runTask() {
+        const idx = index;
+        index += 1;
+        if (index > promises.length) {
+          return Promise.resolve();
+        }
+
+        return promises[idx].then((data) => {
+          ret[idx] = data;
+          count += 1;
+          if (count === promises.length) {
+            resolve(ret);
+          }
+          return runTask();
+        }, reject);
+      }
+
+      for (let i = 0; i < taskNum; i++) {
+        runTask();
+      }
+    });
+  },
+  async ip2region(ip, { depth = 1 }) {
+    if (!ip) return '';
+
+    try {
+      const search = helper.promisify(regionSearch.btreeSearch, regionSearch);
+      const { region } = await search(ip);
+      const [,, province, city, isp] = region.split('|');
+      const address = Array.from(new Set([province, city, isp]));
+      return address.slice(0, depth).join(' ');
+    } catch(e) {
+      console.log(e);
+      return '';
+    }
+  }
 };

package/src/service/storage/leancloud.js

@@ -139,6 +139,7 @@ module.exports = class extends Base {
 
     // todo: query optimize
     const counts = [];
+    const countsPromise = [];
     for (let i = 0; i < options.group.length; i++) {
       const groupName = options.group[i];
       if (!where._complex || !Array.isArray(where._complex[groupName])) {
@@ -157,17 +158,21 @@ module.exports = class extends Base {
           _complex: undefined,
           [groupName]: where._complex[groupName][1][j],
         };
-        const num = await this.count(groupWhere, {
+        const countPromise = this.count(groupWhere, {
           ...options,
           group: undefined,
+        }).then((num) => {
+          counts.push({
+            ...groupFlatValue,
+            [groupName]: where._complex[groupName][1][j],
+            count: num,
+          });
         });
-        counts.push({
-          ...groupFlatValue,
-          [groupName]: where._complex[groupName][1][j],
-          count: num,
-        });
+        countsPromise.push(countPromise);
       }
     }
+
+    await think.promiseAllQueue(countsPromise, 3);
     return counts;
   }