@waline/vercel 1.13.3 → 1.13.6

package/package.json

@@ -1,14 +1,23 @@
 {
   "name": "@waline/vercel",
-  "version": "1.13.3",
+  "version": "1.13.6",
   "description": "vercel server for waline comment system",
-  "repository": "https://github.com/walinejs/waline",
+  "keywords": [
+    "waline",
+    "vercel",
+    "comment",
+    "blog"
+  ],
+  "repository": {
+    "url": "https://github.com/walinejs/waline",
+    "directory": "packages/server"
+  },
   "license": "MIT",
   "author": "lizheming <i@imnerd.org>",
   "dependencies": {
     "@cloudbase/node-sdk": "^2.9.0",
-    "@koa/cors": "^3.2.0",
-    "akismet": "^2.0.6",
+    "@koa/cors": "^3.3.0",
+    "akismet": "^2.0.7",
     "deta": "^1.1.0",
     "dompurify": "^2.3.6",
     "fast-csv": "^4.3.6",
@@ -32,7 +41,7 @@
     "think-model": "^1.5.4",
     "think-model-mysql": "^1.1.7",
     "think-model-postgresql": "1.1.6",
-    "think-model-sqlite": "^1.2.2",
+    "think-model-sqlite": "^1.2.3",
     "think-mongo": "^2.1.2",
     "think-router-rest": "^1.0.5",
     "thinkjs": "^3.2.14",

package/src/config/extend.js

@@ -7,8 +7,13 @@ module.exports = [
   {
     context: {
       get serverURL() {
-        const { protocol, host, path, controller } = this;
-        return `${protocol}://${host}${path.slice(0, -controller.length)}`;
+        const { SERVER_URL } = process.env;
+        if (SERVER_URL) {
+          return SERVER_URL;
+        }
+
+        const { protocol, host } = this;
+        return `${protocol}://${host}`;
       },
     },
     controller: {

package/src/controller/comment.js

@@ -218,7 +218,12 @@ module.exports = class extends BaseRest {
           };
         }
 
-        const comments = await this.modelInstance.select(where, {
+        const totalCount = await this.modelInstance.count(where);
+        const pageOffset = Math.max((page - 1) * pageSize, 0);
+        let comments = [];
+        let rootComments = [];
+        let rootCount = 0;
+        const selectOptions = {
           desc: 'insertedAt',
           field: [
             'status',
@@ -233,7 +238,54 @@ module.exports = class extends BaseRest {
             'user_id',
             'sticky',
           ],
-        });
+        };
+
+        /**
+         * most of case we have just little comments
+         * while if we want get rootComments, rootCount, childComments with pagination
+         * we have to query three times from storage service
+         * That's so expensive for user, especially in the serverless.
+         * so we have a comments length check
+         * If you have less than 1000 comments, then we'll get all comments one time
+         * then we'll compute rootComment, rootCount, childComments in program to reduce http request query
+         *
+         * Why we have limit and the limit is 1000?
+         * Many serverless storages have fetch data limit, for example LeanCloud is 100, and CloudBase is 1000
+         * If we have much commments, We should use more request to fetch all comments
+         * If we have 3000 comments, We have to use 30 http request to fetch comments, things go athwart.
+         * And Serverless Service like vercel have excute time limit
+         * if we have more http requests in a serverless function, it may timeout easily.
+         * so we use limit to avoid it.
+         */
+        if (totalCount < 1000) {
+          comments = await this.modelInstance.select(where, selectOptions);
+          rootCount = comments.filter(({ rid }) => !rid).length;
+          rootComments = [
+            ...comments.filter(({ rid, sticky }) => !rid && sticky),
+            ...comments.filter(({ rid, sticky }) => !rid && !sticky),
+          ].slice(pageOffset, pageOffset + pageSize);
+        } else {
+          rootComments = await this.modelInstance.select(
+            { ...where, rid: undefined },
+            {
+              ...selectOptions,
+              offset: pageOffset,
+              limit: pageSize,
+            }
+          );
+          const children = await this.modelInstance.select(
+            {
+              ...where,
+              rid: ['IN', rootComments.map(({ objectId }) => objectId)],
+            },
+            selectOptions
+          );
+          comments = [...rootComments, ...children];
+          rootCount = await this.modelInstance.count({
+            ...where,
+            rid: undefined,
+          });
+        }
 
         const userModel = this.service(
           `storage/${this.config('storage')}`,
@@ -253,18 +305,11 @@ module.exports = class extends BaseRest {
           );
         }
 
-        const rootCount = comments.filter(({ rid }) => !rid).length;
-        const pageOffset = Math.max((page - 1) * pageSize, 0);
-        const rootComments = [
-          ...comments.filter(({ rid, sticky }) => !rid && sticky),
-          ...comments.filter(({ rid, sticky }) => !rid && !sticky),
-        ].slice(pageOffset, pageOffset + pageSize);
-
         return this.json({
           page,
           totalPages: Math.ceil(rootCount / pageSize),
           pageSize,
-          count: comments.length,
+          count: totalCount,
           data: await Promise.all(
             rootComments.map(async (comment) => {
               const cmt = await formatCmt(

package/src/controller/db.js

@@ -19,10 +19,9 @@ module.exports = class extends BaseRest {
 
     for (let i = 0; i < exportData.tables.length; i++) {
       const tableName = exportData.tables[i];
-      const model = this.service(
-        `storage/${this.config('storage')}`,
-        tableName
-      );
+      const storage = this.config('storage');
+      const model = this.service(`storage/${storage}`, tableName);
+
       const data = await model.select({});
       exportData.data[tableName] = data;
     }
@@ -41,7 +40,8 @@ module.exports = class extends BaseRest {
 
       for (let i = 0; i < importData.tables.length; i++) {
         const tableName = importData.tables[i];
-        const model = this.model(tableName);
+        const storage = this.config('storage');
+        const model = this.service(`storage/${storage}`, tableName);
 
         // delete all data at first
         await model.delete({});

package/src/controller/index.js

@@ -12,7 +12,9 @@ module.exports = class extends think.Controller {
       <title>Waline Example</title>
     </head>
     <body>
-      <div id="waline" style="max-width: 800px;margin: 0 auto;"></div> <script src="https://cdn.jsdelivr.net/npm/@waline/client/dist/Waline.min.js"></script>
+      <div id="waline" style="max-width: 800px;margin: 0 auto;"></div>
+      <script src="https://unpkg.com/@waline/client@v2/dist/waline.js"></script>
+      <link href='//unpkg.com/@waline/client@v2/dist/waline.css' rel='stylesheet' />
       <script>
         console.log(
           '%c @waline/server %c v${version} ',
@@ -20,7 +22,7 @@ module.exports = class extends think.Controller {
           'padding:4px;border:1px solid #0078E7;'
         );
         const params = new URLSearchParams(location.search.slice(1));
-        const waline = new Waline({
+        const waline = Waline.init({
           el: '#waline',
           path: params.get('path') || '/',
           lang: params.get('lng'),

package/src/middleware/dashboard.js

@@ -14,8 +14,7 @@ module.exports = function () {
     window.SITE_NAME = ${JSON.stringify(process.env.SITE_NAME)};
     </script>
     <script src="${
-      process.env.WALINE_ADMIN_MODULE_ASSET_URL ||
-      'https://cdn.jsdelivr.net/npm/@waline/admin'
+      process.env.WALINE_ADMIN_MODULE_ASSET_URL || '//unpkg.com/@waline/admin'
     }"></script>
   </body>
 </html>`;

package/src/service/notify.js

@@ -354,7 +354,7 @@ module.exports = class extends think.Service {
   }
 
   async run(comment, parent, disableAuthorNotify = false) {
-    const { AUTHOR_EMAIL, BLOGGER_EMAIL } = process.env;
+    const { AUTHOR_EMAIL, BLOGGER_EMAIL, DISABLE_AUTHOR_NOTIFY } = process.env;
     const { mailSubject, mailTemplate, mailSubjectAdmin, mailTemplateAdmin } =
       think.config();
     const AUTHOR = AUTHOR_EMAIL || BLOGGER_EMAIL;
@@ -383,7 +383,7 @@ module.exports = class extends think.Service {
       <br/>
     </div>`;
 
-    if (!isAuthorComment && !disableAuthorNotify) {
+    if (!DISABLE_AUTHOR_NOTIFY && !isAuthorComment && !disableAuthorNotify) {
       const wechat = await this.wechat({ title, content }, comment, parent);
       const qywxAmWechat = await this.qywxAmWechat(
         { title, content },

package/src/service/storage/cloudbase.js

@@ -154,6 +154,11 @@ module.exports = class extends Base {
   }
 
   async add(data) {
+    if (data.objectId) {
+      data._id = data.objectId;
+      delete data.objectId;
+    }
+
     const instance = await this.collection(this.tableName);
     const { id } = await instance.add(data);
     return { ...data, objectId: id };

package/src/service/storage/mongodb.js

@@ -121,6 +121,11 @@ module.exports = class extends Base {
   }
 
   async add(data) {
+    if (data.objectId) {
+      data._id = data.objectId;
+      delete data.objectId;
+    }
+
     const instance = this.mongo(this.tableName);
     const id = await instance.add(data);
     return { ...data, objectId: id.toString() };

package/src/service/storage/mysql.js

@@ -57,6 +57,11 @@ module.exports = class extends Base {
   }
 
   async add(data) {
+    if (data.objectId) {
+      data.id = data.objectId;
+      delete data.objectId;
+    }
+
     const instance = this.model(this.tableName);
     const id = await instance.add(data);
     return { ...data, objectId: id };