@waline/vercel 1.27.1 → 1.28.0-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.27.1",
+  "version": "1.28.0-alpha.1",
   "description": "vercel server for waline comment system",
   "keywords": [
     "waline",

package/src/config/middleware.js

@@ -6,23 +6,28 @@ const isTcb = think.env === 'cloudbase';
 const isDeta = think.env === 'deta' || process.env.DETA_RUNTIME === 'true';
 const isAliyunFC =
   think.env === 'aliyun-fc' || Boolean(process.env.FC_RUNTIME_VERSION);
+const isNetlify = process.env.NETLIFY_IMAGES_CDN_DOMAIN && process.env._HANDLER;
+const netlifyFunctionPrefix = `/.netlify/functions/${process.env._HANDLER.replace(
+  /\.handler$/,
+  ''
+)}`;
 
 module.exports = [
   {
     handle: 'dashboard',
-    match: /^\/ui/,
+    match: isNetlify ? new RegExp(`${netlifyFunctionPrefix}/ui`, 'i') : /^\/ui/,
   },
 
   {
     handle: 'prefix-warning',
   },
-  
   {
     handle: 'meta',
     options: {
       logRequest: isDev,
       sendResponseTime: isDev,
-      requestTimeoutCallback: isTcb || isDeta || isAliyunFC ? false : () => {},
+      requestTimeoutCallback:
+        isTcb || isDeta || isAliyunFC || isNetlify ? false : () => {},
     },
   },
 
@@ -62,7 +67,7 @@ module.exports = [
   {
     handle: 'router',
     options: {
-      prefix: ['/api']
+      prefix: ['/api', netlifyFunctionPrefix, `${netlifyFunctionPrefix}/api`],
     },
   },
 

package/src/controller/comment.js

@@ -171,7 +171,10 @@ module.exports = class extends BaseRest {
           };
         }
 
-        if (Array.isArray(url) && (url.length > 1 || !this.ctx.state.deprecated)) {
+        if (
+          Array.isArray(url) &&
+          (url.length > 1 || !this.ctx.state.deprecated)
+        ) {
           const data = await this.modelInstance.select(where, {
             field: ['url'],
           });
@@ -339,7 +342,10 @@ module.exports = class extends BaseRest {
             (cmt) => rootIds[cmt.objectId] || rootIds[cmt.rid]
           );
         } else {
-          comments = await this.modelInstance.select({ ...where, rid: undefined }, {...selectOptions});
+          comments = await this.modelInstance.select(
+            { ...where, rid: undefined },
+            { ...selectOptions }
+          );
           rootCount = comments.length;
           rootComments = [
             ...comments.filter(({ rid, sticky }) => !rid && sticky),
@@ -449,7 +455,17 @@ module.exports = class extends BaseRest {
               cmt.children = await Promise.all(
                 comments
                   .filter(({ rid }) => rid === cmt.objectId)
-                  .map((cmt) => formatCmt(cmt, users, { ...this.config(), deprecated: this.ctx.state.deprecated }, userInfo))
+                  .map((cmt) =>
+                    formatCmt(
+                      cmt,
+                      users,
+                      {
+                        ...this.config(),
+                        deprecated: this.ctx.state.deprecated,
+                      },
+                      userInfo
+                    )
+                  )
                   .reverse()
               );
 

package/src/middleware/prefix-warning.js

@@ -6,13 +6,21 @@ const DEPRECATE_ROUTER_NEXT_VERSION = [
   '/user',
   '/verification',
   '/token/2fa',
-  '/user/password'
+  '/user/password',
 ];
 
 module.exports = () => async (ctx, next) => {
-  ctx.state.deprecated = DEPRECATE_ROUTER_NEXT_VERSION.some(prefix => ctx.path.indexOf(prefix) === 0);
+  ctx.state.deprecated = DEPRECATE_ROUTER_NEXT_VERSION.some((prefix) => {
+    const oldAPI = new RegExp(`${prefix}$`, 'i');
+    const newAPI = new RegExp(`/api${prefix}$`, 'i');
+
+    return !newAPI.test(ctx.path) && oldAPI.test(ctx.path);
+  });
+
   if (ctx.state.deprecated) {
-    think.logger.warn(`[Deprecated] ${ctx.path} API will be deprecated in the next major version, please don't use it anymore. If you are using \`@waline/client\` please upgrade to \`@waline/client@3\`. For other scenarios, you can use \`/api${ctx.path}\` to replace it.`)
+    think.logger.warn(
+      `[Deprecated] ${ctx.path} API will be deprecated in the next major version, please don't use it anymore. If you are using \`@waline/client\` please upgrade to \`@waline/client@3\`. For other scenarios, you can use \`/api${ctx.path}\` to replace it.`
+    );
   }
 
   await next();