@waline/vercel 1.27.0 → 1.27.1

package/dist/index.js

@@ -8981,7 +8981,7 @@ function parseTokenList (str) {
 "use strict";
 
 
-const fs = __nccwpck_require__(5998)
+const fs = __nccwpck_require__(7763)
 const path = __nccwpck_require__(1017)
 const mkdirpSync = (__nccwpck_require__(586).mkdirsSync)
 const utimesSync = (__nccwpck_require__(142).utimesMillisSync)
@@ -9166,7 +9166,7 @@ module.exports = {
 "use strict";
 
 
-const fs = __nccwpck_require__(5998)
+const fs = __nccwpck_require__(7763)
 const path = __nccwpck_require__(1017)
 const mkdirp = (__nccwpck_require__(586).mkdirs)
 const pathExists = (__nccwpck_require__(9086).pathExists)
@@ -9401,7 +9401,7 @@ module.exports = {
 
 
 const u = (__nccwpck_require__(2469)/* .fromCallback */ .E)
-const fs = __nccwpck_require__(5998)
+const fs = __nccwpck_require__(7763)
 const path = __nccwpck_require__(1017)
 const mkdir = __nccwpck_require__(586)
 const remove = __nccwpck_require__(9982)
@@ -9458,7 +9458,7 @@ module.exports = {
 
 const u = (__nccwpck_require__(2469)/* .fromCallback */ .E)
 const path = __nccwpck_require__(1017)
-const fs = __nccwpck_require__(5998)
+const fs = __nccwpck_require__(7763)
 const mkdir = __nccwpck_require__(586)
 const pathExists = (__nccwpck_require__(9086).pathExists)
 
@@ -9546,7 +9546,7 @@ module.exports = {
 
 const u = (__nccwpck_require__(2469)/* .fromCallback */ .E)
 const path = __nccwpck_require__(1017)
-const fs = __nccwpck_require__(5998)
+const fs = __nccwpck_require__(7763)
 const mkdir = __nccwpck_require__(586)
 const pathExists = (__nccwpck_require__(9086).pathExists)
 
@@ -9614,7 +9614,7 @@ module.exports = {
 
 
 const path = __nccwpck_require__(1017)
-const fs = __nccwpck_require__(5998)
+const fs = __nccwpck_require__(7763)
 const pathExists = (__nccwpck_require__(9086).pathExists)
 
 /**
@@ -9720,7 +9720,7 @@ module.exports = {
 "use strict";
 
 
-const fs = __nccwpck_require__(5998)
+const fs = __nccwpck_require__(7763)
 
 function symlinkType (srcpath, type, callback) {
   callback = (typeof type === 'function') ? type : callback
@@ -9761,7 +9761,7 @@ module.exports = {
 
 const u = (__nccwpck_require__(2469)/* .fromCallback */ .E)
 const path = __nccwpck_require__(1017)
-const fs = __nccwpck_require__(5998)
+const fs = __nccwpck_require__(7763)
 const _mkdirs = __nccwpck_require__(586)
 const mkdirs = _mkdirs.mkdirs
 const mkdirsSync = _mkdirs.mkdirsSync
@@ -9832,7 +9832,7 @@ module.exports = {
 // This is adapted from https://github.com/normalize/mz
 // Copyright (c) 2014-2016 Jonathan Ong me@jongleberry.com and Contributors
 const u = (__nccwpck_require__(2469)/* .fromCallback */ .E)
-const fs = __nccwpck_require__(5998)
+const fs = __nccwpck_require__(7763)
 
 const api = [
   'access',
@@ -10027,7 +10027,7 @@ module.exports = {
 "use strict";
 
 
-const fs = __nccwpck_require__(5998)
+const fs = __nccwpck_require__(7763)
 const path = __nccwpck_require__(1017)
 const mkdir = __nccwpck_require__(586)
 const jsonFile = __nccwpck_require__(4747)
@@ -10110,7 +10110,7 @@ module.exports = {
 "use strict";
 
 
-const fs = __nccwpck_require__(5998)
+const fs = __nccwpck_require__(7763)
 const path = __nccwpck_require__(1017)
 const invalidWin32Path = (__nccwpck_require__(4830).invalidWin32Path)
 
@@ -10172,7 +10172,7 @@ module.exports = mkdirsSync
 "use strict";
 
 
-const fs = __nccwpck_require__(5998)
+const fs = __nccwpck_require__(7763)
 const path = __nccwpck_require__(1017)
 const invalidWin32Path = (__nccwpck_require__(4830).invalidWin32Path)
 
@@ -10289,7 +10289,7 @@ module.exports = {
 "use strict";
 
 
-const fs = __nccwpck_require__(5998)
+const fs = __nccwpck_require__(7763)
 const path = __nccwpck_require__(1017)
 const copySync = (__nccwpck_require__(6785).copySync)
 const removeSync = (__nccwpck_require__(9982).removeSync)
@@ -10358,7 +10358,7 @@ module.exports = {
 "use strict";
 
 
-const fs = __nccwpck_require__(5998)
+const fs = __nccwpck_require__(7763)
 const path = __nccwpck_require__(1017)
 const copy = (__nccwpck_require__(7154).copy)
 const remove = (__nccwpck_require__(9982).remove)
@@ -10432,7 +10432,7 @@ module.exports = move
 
 
 const u = (__nccwpck_require__(2469)/* .fromCallback */ .E)
-const fs = __nccwpck_require__(5998)
+const fs = __nccwpck_require__(7763)
 const path = __nccwpck_require__(1017)
 const mkdir = __nccwpck_require__(586)
 const pathExists = (__nccwpck_require__(9086).pathExists)
@@ -10516,7 +10516,7 @@ module.exports = {
 "use strict";
 
 
-const fs = __nccwpck_require__(5998)
+const fs = __nccwpck_require__(7763)
 const path = __nccwpck_require__(1017)
 const assert = __nccwpck_require__(9491)
 
@@ -10858,7 +10858,7 @@ module.exports = function (size) {
 "use strict";
 
 
-const fs = __nccwpck_require__(5998)
+const fs = __nccwpck_require__(7763)
 const path = __nccwpck_require__(1017)
 
 const NODE_VERSION_MAJOR_WITH_BIGINT = 10
@@ -11038,7 +11038,7 @@ module.exports = {
 "use strict";
 
 
-const fs = __nccwpck_require__(5998)
+const fs = __nccwpck_require__(7763)
 const os = __nccwpck_require__(2037)
 const path = __nccwpck_require__(1017)
 
@@ -11544,7 +11544,7 @@ module.exports = function GetIntrinsic(name, allowMissing) {
 
 /***/ }),
 
-/***/ 8118:
+/***/ 481:
 /***/ ((module) => {
 
 "use strict";
@@ -11575,13 +11575,13 @@ function clone (obj) {
 
 /***/ }),
 
-/***/ 5998:
+/***/ 7763:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
 var fs = __nccwpck_require__(7147)
-var polyfills = __nccwpck_require__(7941)
-var legacy = __nccwpck_require__(6288)
-var clone = __nccwpck_require__(8118)
+var polyfills = __nccwpck_require__(2850)
+var legacy = __nccwpck_require__(2606)
+var clone = __nccwpck_require__(481)
 
 var util = __nccwpck_require__(3837)
 
@@ -12030,7 +12030,7 @@ function retry () {
 
 /***/ }),
 
-/***/ 6288:
+/***/ 2606:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
 var Stream = (__nccwpck_require__(2781).Stream)
@@ -12155,7 +12155,7 @@ function legacy (fs) {
 
 /***/ }),
 
-/***/ 7941:
+/***/ 2850:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
 var constants = __nccwpck_require__(2057)
@@ -12261,7 +12261,7 @@ function patch (fs) {
         var backoff = 0;
         fs$rename(from, to, function CB (er) {
           if (er
-              && (er.code === "EACCES" || er.code === "EPERM")
+              && (er.code === "EACCES" || er.code === "EPERM" || er.code === "EBUSY")
               && Date.now() - start < 60000) {
             setTimeout(function() {
               fs.stat(to, function (stater, st) {
@@ -16622,7 +16622,7 @@ module.exports = Array.isArray || function (arr) {
 
 var _fs
 try {
-  _fs = __nccwpck_require__(5998)
+  _fs = __nccwpck_require__(7763)
 } catch (_) {
   _fs = __nccwpck_require__(7147)
 }
@@ -21050,14 +21050,14 @@ module.exports = merge;
 
 /***/ }),
 
-/***/ 1796:
+/***/ 5037:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
 /* eslint max-classes-per-file: ["error", 2] */
 /* eslint no-underscore-dangle: ["error", { "allow": ["_getLocationKeys"] }] */
 
 const flatted = __nccwpck_require__(8522);
-const levels = __nccwpck_require__(4985);
+const levels = __nccwpck_require__(5634);
 
 class SerDe {
   constructor() {
@@ -21214,7 +21214,7 @@ module.exports = LoggingEvent;
 
 /***/ }),
 
-/***/ 3382:
+/***/ 5717:
 /***/ ((module) => {
 
 function maxFileSizeUnitTransform(maxLogSize) {
@@ -21267,7 +21267,7 @@ module.exports.modifyConfig = (config) =>
 
 /***/ }),
 
-/***/ 1545:
+/***/ 6894:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
 const debug = __nccwpck_require__(5299)('log4js:categoryFilter');
@@ -21293,7 +21293,7 @@ module.exports.configure = configure;
 
 /***/ }),
 
-/***/ 9863:
+/***/ 1428:
 /***/ ((module) => {
 
 // eslint-disable-next-line no-console
@@ -21318,7 +21318,7 @@ module.exports.configure = configure;
 
 /***/ }),
 
-/***/ 7672:
+/***/ 9575:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
 const streams = __nccwpck_require__(5709);
@@ -21401,7 +21401,7 @@ module.exports.configure = configure;
 
 /***/ }),
 
-/***/ 6307:
+/***/ 3668:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
 const debug = __nccwpck_require__(5299)('log4js:file');
@@ -21562,7 +21562,7 @@ module.exports.configure = configure;
 
 /***/ }),
 
-/***/ 8740:
+/***/ 5564:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
 const debug = __nccwpck_require__(5299)('log4js:fileSync');
@@ -21827,29 +21827,29 @@ module.exports.configure = configure;
 
 /***/ }),
 
-/***/ 3447:
+/***/ 5921:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
 const path = __nccwpck_require__(1017);
 const debug = __nccwpck_require__(5299)('log4js:appenders');
-const configuration = __nccwpck_require__(3845);
-const clustering = __nccwpck_require__(5422);
-const levels = __nccwpck_require__(4985);
-const layouts = __nccwpck_require__(8061);
-const adapters = __nccwpck_require__(3382);
+const configuration = __nccwpck_require__(2990);
+const clustering = __nccwpck_require__(8027);
+const levels = __nccwpck_require__(5634);
+const layouts = __nccwpck_require__(8695);
+const adapters = __nccwpck_require__(5717);
 
 // pre-load the core appenders so that webpack can find them
 const coreAppenders = new Map();
-coreAppenders.set('console', __nccwpck_require__(9863));
-coreAppenders.set('stdout', __nccwpck_require__(1549));
-coreAppenders.set('stderr', __nccwpck_require__(3630));
-coreAppenders.set('logLevelFilter', __nccwpck_require__(3816));
-coreAppenders.set('categoryFilter', __nccwpck_require__(1545));
-coreAppenders.set('noLogFilter', __nccwpck_require__(8507));
-coreAppenders.set('file', __nccwpck_require__(6307));
-coreAppenders.set('dateFile', __nccwpck_require__(7672));
-coreAppenders.set('fileSync', __nccwpck_require__(8740));
-coreAppenders.set('tcp', __nccwpck_require__(9010));
+coreAppenders.set('console', __nccwpck_require__(1428));
+coreAppenders.set('stdout', __nccwpck_require__(6285));
+coreAppenders.set('stderr', __nccwpck_require__(8978));
+coreAppenders.set('logLevelFilter', __nccwpck_require__(7464));
+coreAppenders.set('categoryFilter', __nccwpck_require__(6894));
+coreAppenders.set('noLogFilter', __nccwpck_require__(3181));
+coreAppenders.set('file', __nccwpck_require__(3668));
+coreAppenders.set('dateFile', __nccwpck_require__(9575));
+coreAppenders.set('fileSync', __nccwpck_require__(5564));
+coreAppenders.set('tcp', __nccwpck_require__(3040));
 
 const appenders = new Map();
 
@@ -22016,7 +22016,7 @@ module.exports.init = init;
 
 /***/ }),
 
-/***/ 3816:
+/***/ 7464:
 /***/ ((module) => {
 
 function logLevelFilter(minLevelString, maxLevelString, appender, levels) {
@@ -22043,7 +22043,7 @@ module.exports.configure = configure;
 
 /***/ }),
 
-/***/ 8507:
+/***/ 3181:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
 const debug = __nccwpck_require__(5299)('log4js:noLogFilter');
@@ -22093,7 +22093,7 @@ module.exports.configure = configure;
 
 /***/ }),
 
-/***/ 3569:
+/***/ 9668:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
 const debug = __nccwpck_require__(5299)('log4js:recording');
@@ -22129,7 +22129,7 @@ module.exports = {
 
 /***/ }),
 
-/***/ 3630:
+/***/ 8978:
 /***/ ((module) => {
 
 function stderrAppender(layout, timezoneOffset) {
@@ -22151,7 +22151,7 @@ module.exports.configure = configure;
 
 /***/ }),
 
-/***/ 1549:
+/***/ 6285:
 /***/ ((__unused_webpack_module, exports) => {
 
 function stdoutAppender(layout, timezoneOffset) {
@@ -22173,7 +22173,7 @@ exports.configure = configure;
 
 /***/ }),
 
-/***/ 9010:
+/***/ 3040:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
 const debug = __nccwpck_require__(5299)('log4js:tcp');
@@ -22272,13 +22272,13 @@ module.exports.configure = configure;
 
 /***/ }),
 
-/***/ 232:
+/***/ 5228:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
 const debug = __nccwpck_require__(5299)('log4js:categories');
-const configuration = __nccwpck_require__(3845);
-const levels = __nccwpck_require__(4985);
-const appenders = __nccwpck_require__(3447);
+const configuration = __nccwpck_require__(2990);
+const levels = __nccwpck_require__(5634);
+const appenders = __nccwpck_require__(5921);
 
 const categories = new Map();
 
@@ -22498,12 +22498,12 @@ module.exports = Object.assign(module.exports, {
 
 /***/ }),
 
-/***/ 5422:
+/***/ 8027:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
 const debug = __nccwpck_require__(5299)('log4js:clustering');
-const LoggingEvent = __nccwpck_require__(1796);
-const configuration = __nccwpck_require__(3845);
+const LoggingEvent = __nccwpck_require__(5037);
+const configuration = __nccwpck_require__(2990);
 
 let disabled = false;
 let cluster = null;
@@ -22610,7 +22610,7 @@ module.exports = {
 
 /***/ }),
 
-/***/ 3845:
+/***/ 2990:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
 const util = __nccwpck_require__(3837);
@@ -22681,12 +22681,12 @@ module.exports = {
 
 /***/ }),
 
-/***/ 9435:
+/***/ 2009:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
 /* eslint no-underscore-dangle: ["error", { "allow": ["__statusCode", "_remoteAddress", "__headers", "_logging"] }] */
 
-const levels = __nccwpck_require__(4985);
+const levels = __nccwpck_require__(5634);
 
 const DEFAULT_FORMAT =
   ':remote-addr - -' +
@@ -23011,7 +23011,7 @@ module.exports = function getLogger(logger4js, options) {
 
 /***/ }),
 
-/***/ 8061:
+/***/ 8695:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
 const dateFormat = __nccwpck_require__(2149);
@@ -23504,10 +23504,10 @@ module.exports = {
 
 /***/ }),
 
-/***/ 4985:
+/***/ 5634:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
-const configuration = __nccwpck_require__(3845);
+const configuration = __nccwpck_require__(2990);
 
 const validColours = [
   'white',
@@ -23666,7 +23666,7 @@ module.exports = Level;
 
 /***/ }),
 
-/***/ 391:
+/***/ 9569:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
 /**
@@ -23692,15 +23692,15 @@ module.exports = Level;
 const debug = __nccwpck_require__(5299)('log4js:main');
 const fs = __nccwpck_require__(7147);
 const deepClone = __nccwpck_require__(6121)({ proto: true });
-const configuration = __nccwpck_require__(3845);
-const layouts = __nccwpck_require__(8061);
-const levels = __nccwpck_require__(4985);
-const appenders = __nccwpck_require__(3447);
-const categories = __nccwpck_require__(232);
-const Logger = __nccwpck_require__(1847);
-const clustering = __nccwpck_require__(5422);
-const connectLogger = __nccwpck_require__(9435);
-const recordingModule = __nccwpck_require__(3569);
+const configuration = __nccwpck_require__(2990);
+const layouts = __nccwpck_require__(8695);
+const levels = __nccwpck_require__(5634);
+const appenders = __nccwpck_require__(5921);
+const categories = __nccwpck_require__(5228);
+const Logger = __nccwpck_require__(5291);
+const clustering = __nccwpck_require__(8027);
+const connectLogger = __nccwpck_require__(2009);
+const recordingModule = __nccwpck_require__(9668);
 
 let enabled = false;
 
@@ -23859,19 +23859,19 @@ module.exports = log4js;
 
 /***/ }),
 
-/***/ 1847:
+/***/ 5291:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
 /* eslint no-underscore-dangle: ["error", { "allow": ["_log"] }] */
 
 const debug = __nccwpck_require__(5299)('log4js:logger');
-const LoggingEvent = __nccwpck_require__(1796);
-const levels = __nccwpck_require__(4985);
-const clustering = __nccwpck_require__(5422);
-const categories = __nccwpck_require__(232);
-const configuration = __nccwpck_require__(3845);
+const LoggingEvent = __nccwpck_require__(5037);
+const levels = __nccwpck_require__(5634);
+const clustering = __nccwpck_require__(8027);
+const categories = __nccwpck_require__(5228);
+const configuration = __nccwpck_require__(2990);
 
-const stackReg = /^(?:\s*) at (?:(.+) \()?(?:([^(]+?):(\d+):(\d+))\)?$/;
+const stackReg = /^(?:\s*)at (?:(.+) \()?(?:([^(]+?):(\d+):(\d+))\)?$/;
 /**
  * The top entry is the Error
  */
@@ -31778,7 +31778,7 @@ function plural(ms, msAbs, n, name) {
 var Promise = __nccwpck_require__(8573)
 var fs
 try {
-  fs = __nccwpck_require__(5998)
+  fs = __nccwpck_require__(7763)
 } catch(err) {
   fs = __nccwpck_require__(7147)
 }
@@ -44433,7 +44433,7 @@ module.exports = function load(appPath, modules) {
 /***/ 8840:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
-const log4js = __nccwpck_require__(391);
+const log4js = __nccwpck_require__(9569);
 const _logger = Symbol('_logger');
 
 module.exports = class {
@@ -49564,7 +49564,7 @@ var _isPort = __nccwpck_require__(6194);
 
 var _isPort2 = _interopRequireDefault(_isPort);
 
-var _isLowercase = __nccwpck_require__(5717);
+var _isLowercase = __nccwpck_require__(4927);
 
 var _isLowercase2 = _interopRequireDefault(_isLowercase);
 
@@ -51509,7 +51509,7 @@ module.exports = exports['default'];
 
 /***/ }),
 
-/***/ 5717:
+/***/ 4927:
 /***/ ((module, exports, __nccwpck_require__) => {
 
 "use strict";
@@ -58037,6 +58037,7 @@ module.exports = LRU;
 
 const os = __nccwpck_require__(2037);
 const path = __nccwpck_require__(1017);
+
 const Application = __nccwpck_require__(9409);
 const Loader = __nccwpck_require__(2209);
 

package/dist/package.json

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

package/dist/src/config/middleware.js

@@ -1,5 +1,6 @@
 const cors = require('@koa/cors');
 const routerREST = require('think-router-rest');
+
 const isDev = think.env === 'development';
 const isTcb = think.env === 'cloudbase';
 const isDeta = think.env === 'deta' || process.env.DETA_RUNTIME === 'true';

package/dist/src/controller/token/2fa.js

@@ -1,4 +1,5 @@
 const speakeasy = require('speakeasy');
+
 const BaseRest = require('../rest');
 
 module.exports = class extends BaseRest {

package/dist/src/controller/token.js

@@ -1,7 +1,8 @@
-const speakeasy = require('speakeasy');
 const jwt = require('jsonwebtoken');
-const helper = require('think-helper');
 const { PasswordHash } = require('phpass');
+const speakeasy = require('speakeasy');
+const helper = require('think-helper');
+
 const BaseRest = require('./rest');
 
 module.exports = class extends BaseRest {

package/dist/src/controller/user/password.js

@@ -1,4 +1,5 @@
 const jwt = require('jsonwebtoken');
+
 const BaseRest = require('../rest');
 
 module.exports = class extends BaseRest {

package/dist/src/controller/user.js

@@ -1,4 +1,5 @@
 const { PasswordHash } = require('phpass');
+
 const BaseRest = require('./rest');
 
 module.exports = class extends BaseRest {

package/dist/src/extend/controller.js

@@ -1,4 +1,5 @@
 const nunjucks = require('nunjucks');
+
 const locales = require('../locales');
 
 module.exports = {

package/dist/src/extend/think.js

@@ -1,6 +1,7 @@
-const parser = require('ua-parser-js');
 const ip2region = require('dy-node-ip2region');
 const helper = require('think-helper');
+const parser = require('ua-parser-js');
+
 const preventMessage = 'PREVENT_NEXT_PROCESS';
 
 const regionSearch = ip2region.create(process.env.IP2REGION_DB);

package/dist/src/logic/base.js

@@ -1,7 +1,8 @@
 const path = require('path');
 const qs = require('querystring');
-const fetch = require('node-fetch');
+
 const jwt = require('jsonwebtoken');
+const fetch = require('node-fetch');
 const helper = require('think-helper');
 
 module.exports = class extends think.Logic {

package/dist/src/service/akismet.js

@@ -1,4 +1,5 @@
 const Akismet = require('akismet');
+
 const DEFAULT_KEY = '70542d86693e';
 
 module.exports = function (comment, blog) {

package/dist/src/service/avatar.js

@@ -1,5 +1,6 @@
 const nunjucks = require('nunjucks');
 const helper = require('think-helper');
+
 const { GRAVATAR_STR } = process.env;
 
 const env = new nunjucks.Environment();

package/dist/src/service/markdown/index.js

@@ -2,9 +2,10 @@ const MarkdownIt = require('markdown-it');
 const emojiPlugin = require('markdown-it-emoji');
 const subPlugin = require('markdown-it-sub');
 const supPlugin = require('markdown-it-sup');
+
+const { resolveHighlighter } = require('./highlight');
 const { katexPlugin } = require('./katex');
 const { mathjaxPlugin } = require('./mathjax');
-const { resolveHighlighter } = require('./highlight');
 const { sanitize } = require('./xss');
 
 const getMarkdownParser = () => {

package/dist/src/service/markdown/katex.js

@@ -1,6 +1,7 @@
 const katex = require('katex');
-const { escapeHtml } = require('./utils');
+
 const { inlineTex, blockTex } = require('./mathCommon');
+const { escapeHtml } = require('./utils');
 
 // set KaTeX as the renderer for markdown-it-simplemath
 const katexInline = (tex, options) => {

package/dist/src/service/markdown/mathjax.js

@@ -1,12 +1,12 @@
-const { mathjax } = require('mathjax-full/js/mathjax');
-const { TeX } = require('mathjax-full/js/input/tex.js');
-const { SVG } = require('mathjax-full/js/output/svg.js');
 const { liteAdaptor } = require('mathjax-full/js/adaptors/liteAdaptor.js');
 const { RegisterHTMLHandler } = require('mathjax-full/js/handlers/html.js');
 const { AllPackages } = require('mathjax-full/js/input/tex/AllPackages.js');
+const { TeX } = require('mathjax-full/js/input/tex.js');
+const { mathjax } = require('mathjax-full/js/mathjax');
+const { SVG } = require('mathjax-full/js/output/svg.js');
 
-const { escapeHtml } = require('./utils');
 const { inlineTex, blockTex } = require('./mathCommon');
+const { escapeHtml } = require('./utils');
 
 // set MathJax as the renderer
 class MathToSvg {

package/dist/src/service/notify.js

@@ -1,8 +1,9 @@
+const crypto = require('crypto');
+
 const FormData = require('form-data');
-const nodemailer = require('nodemailer');
 const fetch = require('node-fetch');
+const nodemailer = require('nodemailer');
 const nunjucks = require('nunjucks');
-const crypto = require('crypto');
 
 module.exports = class extends think.Service {
   constructor(ctx) {

package/dist/src/service/storage/cloudbase.js

@@ -1,4 +1,5 @@
 const cloudbase = require('@cloudbase/node-sdk');
+
 const Base = require('./base');
 
 const { TCB_ENV, TCB_ID, TCB_KEY } = process.env;

package/dist/src/service/storage/deta.js

@@ -1,5 +1,7 @@
-const { Deta } = require('deta');
 const { performance } = require('perf_hooks');
+
+const { Deta } = require('deta');
+
 const Base = require('./base');
 
 module.exports = class extends Base {

package/dist/src/service/storage/github.js

@@ -1,6 +1,8 @@
+const path = require('path');
+
 const { parseString, writeToString } = require('fast-csv');
 const fetch = require('node-fetch');
-const path = require('path');
+
 const Base = require('./base');
 
 const CSV_HEADERS = {

package/dist/src/service/storage/leancloud.js

@@ -1,5 +1,7 @@
 const AV = require('leancloud-storage');
+
 const Base = require('./base');
+
 const { LEAN_ID, LEAN_KEY, LEAN_MASTER_KEY, LEAN_SERVER } = process.env;
 
 if (LEAN_ID && LEAN_KEY && LEAN_MASTER_KEY) {

package/dist/src/service/storage/mongodb.js

@@ -1,4 +1,5 @@
 const { ObjectID: ObjectId } = require('think-mongo/lib/model');
+
 const Base = require('./base');
 
 module.exports = class extends Base {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.27.0",
+  "version": "1.27.1",
   "description": "vercel server for waline comment system",
   "keywords": [
     "waline",
@@ -8,9 +8,6 @@
     "comment",
     "blog"
   ],
-  "scripts": {
-    "postpublish": "sh ./deta.build.sh"
-  },
   "repository": {
     "url": "https://github.com/walinejs/waline",
     "directory": "packages/server"

package/src/config/middleware.js

@@ -13,6 +13,10 @@ module.exports = [
     match: /^\/ui/,
   },
 
+  {
+    handle: 'prefix-warning',
+  },
+  
   {
     handle: 'meta',
     options: {
@@ -57,7 +61,9 @@ module.exports = [
 
   {
     handle: 'router',
-    options: {},
+    options: {
+      prefix: ['/api']
+    },
   },
 
   { handle: routerREST },

package/src/controller/article.js

@@ -11,10 +11,11 @@ module.exports = class extends BaseRest {
 
   async getAction() {
     const { path, type } = this.get();
+    const { deprecated } = this.ctx.state;
 
     // path is required
     if (!Array.isArray(path) || !path.length) {
-      return this.json(0);
+      return this.jsonOrSuccess(0);
     }
 
     const resp = await this.modelInstance.select({ url: ['IN', path] });
@@ -26,7 +27,7 @@ module.exports = class extends BaseRest {
         return o;
       }, {});
 
-      return this.json(type.length === 1 ? data[type[0]] : data);
+      return this.jsonOrSuccess((type.length === 1 && deprecated) ? data[type[0]] : data);
     }
 
     const respObj = resp.reduce((o, n) => {
@@ -48,22 +49,23 @@ module.exports = class extends BaseRest {
           respObj[url] && respObj[url][field] ? respObj[url][field] : 0;
       }
 
-      if (type.length === 1) {
+      if (type.length === 1 && deprecated) {
         counters = counters[type[0]];
       }
       data.push(counters);
     }
 
-    return this.json(path.length === 1 ? data[0] : data);
+    return this.jsonOrSuccess(path.length === 1 && deprecated ? data[0] : data);
   }
 
   async postAction() {
     const { path, type, action } = this.post();
     const resp = await this.modelInstance.select({ url: path });
+    const { deprecated } = this.ctx.state;
 
     if (think.isEmpty(resp)) {
       if (action === 'desc') {
-        return this.json(0);
+        return this.jsonOrSuccess(deprecated ? 0 : [0]);
       }
 
       const count = 1;
@@ -73,7 +75,7 @@ module.exports = class extends BaseRest {
         { access: { read: true, write: true } }
       );
 
-      return this.json(count);
+      return this.jsonOrSuccess(deprecated ? count : [count]);
     }
 
     const ret = await this.modelInstance.update(
@@ -86,6 +88,6 @@ module.exports = class extends BaseRest {
       { objectId: ['IN', resp.map(({ objectId }) => objectId)] }
     );
 
-    return this.json(ret[0][type]);
+    return this.jsonOrSuccess(deprecated ? ret[0][type] : [ret[0][type]]);
   }
 };

package/src/controller/comment.js

@@ -7,7 +7,7 @@ const markdownParser = getMarkdownParser();
 async function formatCmt(
   { ua, ip, ...comment },
   users = [],
-  { avatarProxy },
+  { avatarProxy, deprecated },
   loginUser
 ) {
   ua = think.uaParser(ua);
@@ -61,6 +61,13 @@ async function formatCmt(
   if (typeof comment.sticky === 'string') {
     comment.sticky = Boolean(Number(comment.sticky));
   }
+  
+  comment.time = new Date(comment.insertedAt).getTime();
+  if (!deprecated) {
+    delete comment.insertedAt;
+  }
+  delete comment.createdAt;
+  delete comment.updatedAt;
 
   return comment;
 }
@@ -140,10 +147,10 @@ module.exports = class extends BaseRest {
           );
         }
 
-        return this.json(
+        return this.jsonOrSuccess(
           await Promise.all(
             comments.map((cmt) =>
-              formatCmt(cmt, users, this.config(), userInfo)
+              formatCmt(cmt, users, { ...this.config(), deprecated: this.ctx.state.deprecated }, userInfo)
             )
           )
         );
@@ -164,18 +171,18 @@ module.exports = class extends BaseRest {
           };
         }
 
-        if (Array.isArray(url) && url.length > 1) {
+        if (Array.isArray(url) && (url.length > 1 || !this.ctx.state.deprecated)) {
           const data = await this.modelInstance.select(where, {
             field: ['url'],
           });
 
-          return this.json(
+          return this.jsonOrSuccess(
             url.map((u) => data.filter(({ url }) => url === u).length)
           );
         }
         const data = await this.modelInstance.count(where);
 
-        return this.json(data);
+        return this.jsonOrSuccess(data);
       }
 
       case 'list': {
@@ -246,7 +253,7 @@ module.exports = class extends BaseRest {
           waitingCount,
           data: await Promise.all(
             comments.map((cmt) =>
-              formatCmt(cmt, users, this.config(), userInfo)
+              formatCmt(cmt, users, { ...this.config(), deprecated: this.ctx.state.deprecated }, userInfo)
             )
           ),
         });
@@ -332,14 +339,13 @@ module.exports = class extends BaseRest {
             (cmt) => rootIds[cmt.objectId] || rootIds[cmt.rid]
           );
         } else {
-          rootComments = await this.modelInstance.select(
-            { ...where, rid: undefined },
-            {
-              ...selectOptions,
-              offset: pageOffset,
-              limit: pageSize,
-            }
-          );
+          comments = await this.modelInstance.select({ ...where, rid: undefined }, {...selectOptions});
+          rootCount = comments.length;
+          rootComments = [
+            ...comments.filter(({ rid, sticky }) => !rid && sticky),
+            ...comments.filter(({ rid, sticky }) => !rid && !sticky),
+          ].slice(pageOffset, pageOffset + pageSize);
+
           const children = await this.modelInstance.select(
             {
               ...where,
@@ -349,10 +355,6 @@ module.exports = class extends BaseRest {
           );
 
           comments = [...rootComments, ...children];
-          rootCount = await this.modelInstance.count({
-            ...where,
-            rid: undefined,
-          });
         }
 
         const userModel = this.service(
@@ -430,7 +432,7 @@ module.exports = class extends BaseRest {
           });
         }
 
-        return this.json({
+        return this[this.ctx.state.deprecated ? 'json' : 'success']({
           page,
           totalPages: Math.ceil(rootCount / pageSize),
           pageSize,
@@ -440,14 +442,14 @@ module.exports = class extends BaseRest {
               const cmt = await formatCmt(
                 comment,
                 users,
-                this.config(),
-                userInfo
+                { ...this.config(), deprecated: this.ctx.state.deprecated },
+                userInfo,
               );
 
               cmt.children = await Promise.all(
                 comments
                   .filter(({ rid }) => rid === cmt.objectId)
-                  .map((cmt) => formatCmt(cmt, users, this.config(), userInfo))
+                  .map((cmt) => formatCmt(cmt, users, { ...this.config(), deprecated: this.ctx.state.deprecated }, userInfo))
                   .reverse()
               );
 
@@ -477,7 +479,7 @@ module.exports = class extends BaseRest {
       user_id: this.ctx.state.userInfo.objectId,
     };
 
-    if (pid) {
+    if (pid && this.ctx.deprecated) {
       data.comment = `[@${at}](#${pid}): ` + data.comment;
     }
 
@@ -610,14 +612,14 @@ module.exports = class extends BaseRest {
     const cmtReturn = await formatCmt(
       resp,
       [userInfo],
-      this.config(),
+      { ...this.config(), deprecated: this.ctx.state.deprecated },
       userInfo
     );
     const parentReturn = parentComment
       ? await formatCmt(
           parentComment,
           parentUser ? [parentUser] : [],
-          this.config(),
+          { ...this.config(), deprecated: this.ctx.state.deprecated },
           userInfo
         )
       : undefined;
@@ -638,7 +640,7 @@ module.exports = class extends BaseRest {
     think.logger.debug(`Comment post hooks postSave done!`);
 
     return this.success(
-      await formatCmt(resp, [userInfo], this.config(), userInfo)
+      await formatCmt(resp, [userInfo], { ...this.config(), deprecated: this.ctx.state.deprecated }, userInfo)
     );
   }
 
@@ -688,7 +690,7 @@ module.exports = class extends BaseRest {
     const cmtReturn = await formatCmt(
       newData[0],
       cmtUser ? [cmtUser] : [],
-      this.config(),
+      { ...this.config(), deprecated: this.ctx.state.deprecated },
       userInfo
     );
 
@@ -719,7 +721,7 @@ module.exports = class extends BaseRest {
       const pcmtReturn = await formatCmt(
         pComment,
         pUser ? [pUser] : [],
-        this.config(),
+        { ...this.config(), deprecated: this.ctx.state.deprecated },
         userInfo
       );
 

package/src/controller/oauth.js

@@ -20,7 +20,7 @@ module.exports = class extends think.Controller {
 
     if (!hasCode) {
       const { serverURL } = this.ctx;
-      const redirectUrl = `${serverURL}/oauth?${new URLSearchParams({
+      const redirectUrl = `${serverURL}/api/oauth?${new URLSearchParams({
         redirect,
         type,
       }).toString()}`;
@@ -40,7 +40,7 @@ module.exports = class extends think.Controller {
 
     if (type === 'facebook') {
       const { serverURL } = this.ctx;
-      const redirectUrl = `${serverURL}/oauth?${new URLSearchParams({
+      const redirectUrl = `${serverURL}/api/oauth?${new URLSearchParams({
         redirect,
         type,
       }).toString()}`;

package/src/extend/controller.js

@@ -13,6 +13,9 @@ module.exports = {
 
     return think.prevent();
   },
+  jsonOrSuccess(...args) {
+    return this[this.ctx.state.deprecated ? 'json' : 'success'](...args);
+  },
   locale(message, variables) {
     const { lang } = this.get();
     const locale = locales[(lang || 'zh-cn').toLowerCase()] || locales['zh-cn'];

package/src/logic/comment.js

@@ -14,7 +14,7 @@ module.exports = class extends Base {
   }
 
   /**
-   * @api {GET} /comment Get comment list for client
+   * @api {GET} /api/comment Get comment list for client
    * @apiGroup Comment
    * @apiVersion  0.0.1
    *
@@ -48,7 +48,7 @@ module.exports = class extends Base {
    * @apiSuccess  (200) {String}  data.children.type comment login user type
    */
   /**
-   * @api {GET} /comment?type=list Get comment list for admin
+   * @api {GET} /api/comment?type=list Get comment list for admin
    * @apiGroup Comment
    * @apiVersion  0.0.1
    *
@@ -77,7 +77,7 @@ module.exports = class extends Base {
    * @apiSuccess  (200) {String}  data.data.url comment article link
    */
   /**
-   * @api {GET} /comment?type=count Get comment count for articles
+   * @api {GET} /api/comment?type=count Get comment count for articles
    * @apiGroup Comment
    * @apiVersion  0.0.1
    *
@@ -90,7 +90,7 @@ module.exports = class extends Base {
    * [300, 100]
    */
   /**
-   * @api {GET} /comment?type=recent Get recent comments
+   * @api {GET} /api/comment?type=recent Get recent comments
    * @apiGroup Comment
    * @apiVersion  0.0.1
    *
@@ -177,7 +177,7 @@ module.exports = class extends Base {
   }
 
   /**
-   * @api {POST} /comment post comment
+   * @api {POST} /api/comment post comment
    * @apiGroup Comment
    * @apiVersion  0.0.1
    *
@@ -221,7 +221,7 @@ module.exports = class extends Base {
   }
 
   /**
-   * @api {PUT} /comment/:id update comment data
+   * @api {PUT} /api/comment/:id update comment data
    * @apiGroup Comment
    * @apiVersion  0.0.1
    *
@@ -279,7 +279,7 @@ module.exports = class extends Base {
   }
 
   /**
-   * @api {DELETE} /comment/:id delete comment
+   * @api {DELETE} /api/comment/:id delete comment
    * @apiGroup Comment
    * @apiVersion  0.0.1
    *

package/src/logic/db.js

@@ -16,7 +16,7 @@ module.exports = class extends Base {
   }
 
   /**
-   * @api {GET} /db export site data
+   * @api {GET} /api/db export site data
    * @apiGroup Site
    * @apiVersion  0.0.1
    *
@@ -25,7 +25,7 @@ module.exports = class extends Base {
   async getAction() {}
 
   /**
-   * @api {POST} /db import site data
+   * @api {POST} /api/db import site data
    * @apiGroup Site
    * @apiVersion  0.0.1
    *
@@ -42,7 +42,7 @@ module.exports = class extends Base {
   }
 
   /**
-   * @api {PUT} /db update site table data
+   * @api {PUT} /api/db update site table data
    * @apiGroup Site
    * @apiVersion  0.0.1
    *
@@ -63,7 +63,7 @@ module.exports = class extends Base {
   }
 
   /**
-   * @api {DELETE} /db clean site data
+   * @api {DELETE} /api/db clean site data
    * @apiGroup Site
    * @apiVersion  0.0.1
    *

package/src/logic/oauth.js

@@ -2,7 +2,7 @@ const Base = require('./base');
 
 module.exports = class extends Base {
   /**
-   * @api {GET} /oauth oauth api
+   * @api {GET} /api/oauth oauth api
    * @apiGroup  OAuth
    * @apiVersion  0.0.1
    */

package/src/logic/token.js

@@ -2,7 +2,7 @@ const Base = require('./base');
 
 module.exports = class extends Base {
   /**
-   * @api {GET} /token  get login user info
+   * @api {GET} /api/token  get login user info
    * @apiGroup User
    * @apiVersion  0.0.1
    *
@@ -24,7 +24,7 @@ module.exports = class extends Base {
   getAction() {}
 
   /**
-   * @api {POST} /token user login
+   * @api {POST} /api/token user login
    * @apiGroup User
    * @apiVersion  0.0.1
    *
@@ -40,7 +40,7 @@ module.exports = class extends Base {
   }
 
   /**
-   * @api {DELETE} /token  user logout
+   * @api {DELETE} /api/token  user logout
    * @apiGroup User
    * @apiVersion  0.0.1
    *

package/src/logic/user.js

@@ -2,7 +2,7 @@ const Base = require('./base');
 
 module.exports = class extends Base {
   /**
-   * @api {GET} /user user top list without admin
+   * @api {GET} /api/user user top list without admin
    * @apiGroup User
    * @apiVersion  0.0.1
    *
@@ -19,7 +19,7 @@ module.exports = class extends Base {
    * @apiSuccess  (200) {String}  data.count user comment count
    */
   /**
-   * @api {GET} /user?token user list with admin login
+   * @api {GET} /api/user?token user list with admin login
    * @apiGroup User
    * @apiVersion  0.0.1
    *
@@ -70,7 +70,7 @@ module.exports = class extends Base {
   }
 
   /**
-   * @api {POST} /user user register
+   * @api {POST} /api/user user register
    * @apiGroup User
    * @apiVersion  0.0.1
    *
@@ -88,7 +88,7 @@ module.exports = class extends Base {
   }
 
   /**
-   * @api {PUT} /user update user profile
+   * @api {PUT} /api/user update user profile
    * @apiGroup User
    * @apiVersion  0.0.1
    *

package/src/middleware/dashboard.js

@@ -13,6 +13,7 @@ module.exports = function () {
     window.SITE_URL = ${JSON.stringify(process.env.SITE_URL)};
     window.SITE_NAME = ${JSON.stringify(process.env.SITE_NAME)};
     window.recaptchaV3Key = ${JSON.stringify(process.env.RECAPTCHA_V3_KEY)};
+    window.serverURL = '${ctx.serverURL}/api/';
     </script>
     <script src="${
       process.env.WALINE_ADMIN_MODULE_ASSET_URL || '//unpkg.com/@waline/admin'

package/src/middleware/prefix-warning.js

@@ -0,0 +1,19 @@
+const DEPRECATE_ROUTER_NEXT_VERSION = [
+  '/comment',
+  '/db',
+  '/oauth',
+  '/token',
+  '/user',
+  '/verification',
+  '/token/2fa',
+  '/user/password'
+];
+
+module.exports = () => async (ctx, next) => {
+  ctx.state.deprecated = DEPRECATE_ROUTER_NEXT_VERSION.some(prefix => ctx.path.indexOf(prefix) === 0);
+  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.`)
+  }
+
+  await next();
+};

package/deta.build.sh

@@ -1,3 +0,0 @@
-ncc build index.js
-node -e "pkg = require('./package.json'); pkg.version += '-deta'; delete pkg.dependencies['think-model-sqlite']; delete pkg.scripts; console.log(JSON.stringify(pkg, null, '\t'));" > ./dist/package.json
-cd dist && npm publish --tag deta