@waline/vercel 1.15.0 → 1.15.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.15.0",
+  "version": "1.15.3",
   "description": "vercel server for waline comment system",
   "keywords": [
     "waline",

package/src/config/config.js

@@ -106,9 +106,10 @@ module.exports = {
   disallowIPList: [],
   secureDomains: SECURE_DOMAINS ? SECURE_DOMAINS.split(/\s*,\s*/) : undefined,
   disableUserAgent: DISABLE_USERAGENT && !isFalse(DISABLE_USERAGENT),
-  levels: isFalse(LEVELS)
-    ? false
-    : LEVELS.split(/\s*,\s*/).map((v) => Number(v)),
+  levels:
+    !LEVELS || isFalse(LEVELS)
+      ? false
+      : LEVELS.split(/\s*,\s*/).map((v) => Number(v)),
   avatarProxy,
   oauthUrl,
   markdown,

package/src/controller/comment.js

@@ -264,6 +264,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

@@ -18,4 +18,32 @@ 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();
+      }
+    });
+  },
 };

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;
   }