@jayfong/x-server 2.52.2 → 2.54.0

package/lib/_cjs/core/define_handler.js

@@ -38,4 +38,11 @@ defineHandler.XML = options => {
     requestMethod: 'XML'
   });
   return handler;
+};
+defineHandler.ANY = options => {
+  const handler = new _handler.Handler({
+    ...options,
+    requestMethod: 'ANY'
+  });
+  return handler;
 };

package/lib/_cjs/core/http_method.js

@@ -7,5 +7,6 @@ const HandlerMethodToHttpMethod = exports.HandlerMethodToHttpMethod = {
   POST: 'POST',
   FILE: 'POST',
   WS: 'GET',
-  XML: 'POST'
+  XML: 'POST',
+  ANY: 'POST'
 };

package/lib/_cjs/core/server.js

@@ -104,7 +104,7 @@ class Server {
             return res;
           }, {});
         }
-        const data = await item.handler.handle({
+        const data = await item.handler.handle(handlerMethod === 'ANY' ? {} : {
           // @ts-ignore
           ...req.params,
           // @ts-ignore
@@ -113,7 +113,7 @@ class Server {
           ...req.body,
           ...files
         }, {
-          url: url,
+          url,
           headers: req.headers,
           setHeader: (k, v) => res.header(k, v),
           redirect: (url, permanently) => res.redirect(permanently ? 301 : 302, url),
@@ -129,7 +129,7 @@ class Server {
         const isWS = handlerMethod === 'WS';
         const serverMethod = isWS ? 'GET' : _http_method.HandlerMethodToHttpMethod[handlerMethod];
         fastify.route({
-          method: serverMethod,
+          method: handlerMethod === 'ANY' ? ['GET', 'HEAD', 'TRACE', 'DELETE', 'OPTIONS', 'PATCH', 'PUT', 'POST'] : serverMethod,
           url: item.path,
           constraints: handlerOptions.requestHost ? {
             host: handlerOptions.requestHost

package/lib/_cjs/index.js

@@ -145,6 +145,12 @@ Object.keys(_captcha).forEach(function (key) {
   if (key in exports && exports[key] === _captcha[key]) return;
   exports[key] = _captcha[key];
 });
+var _db_value = require("./services/db_value");
+Object.keys(_db_value).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _db_value[key]) return;
+  exports[key] = _db_value[key];
+});
 var _dingtalk = require("./services/dingtalk");
 Object.keys(_dingtalk).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/lib/_cjs/services/db_value.js

@@ -0,0 +1,59 @@
+"use strict";
+
+exports.__esModule = true;
+exports.DbValueService = void 0;
+var _vtils = require("vtils");
+class DbValueService {
+  constructor() {
+    this.serviceName = 'dbValue';
+    this.SimpleArray = class {
+      constructor(options) {
+        this.separator = void 0;
+        this.affix = void 0;
+        this.number = void 0;
+        this.add = (value, defaultValue = []) => {
+          const text = (!value || !Array.isArray(value) ? defaultValue : value.filter(v => v != null && v !== '')).join(this.separator);
+          return !text || !this.affix ? text : `${this.affix}${text}${this.affix}`;
+        };
+        this.get = value => {
+          const res = !value ? [] : String(!this.affix ? value : value.substring(this.affix.length, value.length - this.affix.length)).split(this.separator).filter(v => v !== '');
+          return this.number ? res.map(Number) : res;
+        };
+        this.update = value => {
+          const text = !value || !Array.isArray(value) ? undefined : value.filter(v => v != null && v !== '').join(this.separator);
+          return !text || !this.affix ? text : `${this.affix}${text}${this.affix}`;
+        };
+        this.separator = (options == null ? void 0 : options.separator) || ',';
+        this.affix = (options == null ? void 0 : options.affix) || '';
+        this.number = !!(options != null && options.number);
+      }
+    };
+    this.JsonArray = class {
+      constructor() {
+        this.add = (value, defaultValue = []) => {
+          return JSON.stringify(!value || !Array.isArray(value) ? defaultValue : value);
+        };
+        this.get = value => {
+          return !value ? [] : JSON.parse(value);
+        };
+        this.update = value => {
+          return !value || !Array.isArray(value) ? undefined : JSON.stringify(value);
+        };
+      }
+    };
+    this.JsonObject = class {
+      constructor() {
+        this.add = (value, defaultValue = {}) => {
+          return JSON.stringify(!value || !(0, _vtils.isPlainObject)(value) ? defaultValue : value);
+        };
+        this.get = value => {
+          return !value ? {} : JSON.parse(value);
+        };
+        this.update = value => {
+          return !value || !(0, _vtils.isPlainObject)(value) ? undefined : JSON.stringify(value);
+        };
+      }
+    };
+  }
+}
+exports.DbValueService = DbValueService;

package/lib/_cjs/x.js

@@ -3,9 +3,10 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.x = void 0;
-var _fsExtra = _interopRequireDefault(require("fs-extra"));
 var _os = _interopRequireDefault(require("os"));
 var _path = _interopRequireDefault(require("path"));
+var _fsExtra = _interopRequireDefault(require("fs-extra"));
+var _db_value = require("./services/db_value");
 var _dispose = require("./services/dispose");
 var _emoji = require("./services/emoji");
 var _log = require("./services/log");
@@ -24,4 +25,4 @@ const x = exports.x = {
 _fsExtra.default.ensureDirSync(x.dataDir);
 x.register(new _dispose.DisposeService({
   disposeOnExit: true
-}), new _log.LogService(), new _emoji.EmojiService());
+}), new _log.LogService(), new _emoji.EmojiService(), new _db_value.DbValueService());

package/lib/core/define_handler.d.ts

@@ -13,4 +13,5 @@ export declare namespace defineHandler {
         response: TReqData[K][1];
     }; }, void, "WS">;
     var XML: <TReqData extends unknown = void, TResData extends unknown = void>(options: XHandler.Options<TReqData, TResData, "XML">) => Handler<TReqData, TResData, "XML">;
+    var ANY: <TReqData extends unknown = void, TResData extends unknown = void>(options: XHandler.Options<TReqData, TResData, "ANY">) => Handler<TReqData, TResData, "ANY">;
 }

package/lib/core/define_handler.js

@@ -34,4 +34,11 @@ defineHandler.XML = options => {
     requestMethod: 'XML'
   });
   return handler;
+};
+defineHandler.ANY = options => {
+  const handler = new Handler({
+    ...options,
+    requestMethod: 'ANY'
+  });
+  return handler;
 };

package/lib/core/http_method.js

@@ -3,5 +3,6 @@ export const HandlerMethodToHttpMethod = {
   POST: 'POST',
   FILE: 'POST',
   WS: 'GET',
-  XML: 'POST'
+  XML: 'POST',
+  ANY: 'POST'
 };

package/lib/core/server.js

@@ -98,7 +98,7 @@ export class Server {
             return res;
           }, {});
         }
-        const data = await item.handler.handle({
+        const data = await item.handler.handle(handlerMethod === 'ANY' ? {} : {
           // @ts-ignore
           ...req.params,
           // @ts-ignore
@@ -107,7 +107,7 @@ export class Server {
           ...req.body,
           ...files
         }, {
-          url: url,
+          url,
           headers: req.headers,
           setHeader: (k, v) => res.header(k, v),
           redirect: (url, permanently) => res.redirect(permanently ? 301 : 302, url),
@@ -123,7 +123,7 @@ export class Server {
         const isWS = handlerMethod === 'WS';
         const serverMethod = isWS ? 'GET' : HandlerMethodToHttpMethod[handlerMethod];
         fastify.route({
-          method: serverMethod,
+          method: handlerMethod === 'ANY' ? ['GET', 'HEAD', 'TRACE', 'DELETE', 'OPTIONS', 'PATCH', 'PUT', 'POST'] : serverMethod,
           url: item.path,
           constraints: handlerOptions.requestHost ? {
             host: handlerOptions.requestHost

package/lib/core/types.d.ts

@@ -59,7 +59,7 @@ export declare namespace XServer {
     }
 }
 export declare namespace XHandler {
-    type Method = 'GET' | 'POST' | 'FILE' | 'WS' | 'XML';
+    type Method = 'GET' | 'POST' | 'FILE' | 'WS' | 'XML' | 'ANY';
     interface ExtraContext {
     }
     interface Context extends ExtraContext {

package/lib/index.d.ts

@@ -22,6 +22,7 @@ export * from './plugins/xml_parser';
 export * from './services/base';
 export * from './services/cache';
 export * from './services/captcha';
+export * from './services/db_value';
 export * from './services/dingtalk';
 export * from './services/dispose';
 export * from './services/emoji';

package/lib/index.js

@@ -23,6 +23,7 @@ export * from "./plugins/xml_parser";
 export * from "./services/base";
 export * from "./services/cache";
 export * from "./services/captcha";
+export * from "./services/db_value";
 export * from "./services/dingtalk";
 export * from "./services/dispose";
 export * from "./services/emoji";

package/lib/services/db_value.d.ts

@@ -0,0 +1,49 @@
+import { BaseService } from './base';
+export type DbValueServiceSimpleArrayOptions = {
+    /**
+     * 分隔符
+     *
+     * @default ,
+     */
+    separator?: string;
+    /**
+     * 前缀后缀
+     */
+    affix?: string;
+    /**
+     * 是否数字
+     */
+    number?: boolean;
+};
+export declare class DbValueService implements BaseService {
+    serviceName: string;
+    SimpleArray: {
+        new <T extends string | number = string>(options?: DbValueServiceSimpleArrayOptions): {
+            separator: string;
+            affix: string;
+            number: boolean;
+            add: (value?: T[], defaultValue?: T[]) => string;
+            get: (value?: string) => T[];
+            update: (value?: T[]) => string | undefined;
+        };
+    };
+    JsonArray: {
+        new <T = string>(): {
+            add: (value?: T[], defaultValue?: T[]) => string;
+            get: (value?: string) => T[];
+            update: (value?: T[]) => string | undefined;
+        };
+    };
+    JsonObject: {
+        new <T>(): {
+            add: (value?: T, defaultValue?: T) => string;
+            get: (value?: string) => T;
+            update: (value?: T) => string | undefined;
+        };
+    };
+}
+declare module '../x' {
+    interface X {
+        dbValue: DbValueService;
+    }
+}

package/lib/services/db_value.js

@@ -0,0 +1,54 @@
+import { isPlainObject } from 'vtils';
+export class DbValueService {
+  constructor() {
+    this.serviceName = 'dbValue';
+    this.SimpleArray = class {
+      constructor(options) {
+        this.separator = void 0;
+        this.affix = void 0;
+        this.number = void 0;
+        this.add = (value, defaultValue = []) => {
+          const text = (!value || !Array.isArray(value) ? defaultValue : value.filter(v => v != null && v !== '')).join(this.separator);
+          return !text || !this.affix ? text : `${this.affix}${text}${this.affix}`;
+        };
+        this.get = value => {
+          const res = !value ? [] : String(!this.affix ? value : value.substring(this.affix.length, value.length - this.affix.length)).split(this.separator).filter(v => v !== '');
+          return this.number ? res.map(Number) : res;
+        };
+        this.update = value => {
+          const text = !value || !Array.isArray(value) ? undefined : value.filter(v => v != null && v !== '').join(this.separator);
+          return !text || !this.affix ? text : `${this.affix}${text}${this.affix}`;
+        };
+        this.separator = (options == null ? void 0 : options.separator) || ',';
+        this.affix = (options == null ? void 0 : options.affix) || '';
+        this.number = !!(options != null && options.number);
+      }
+    };
+    this.JsonArray = class {
+      constructor() {
+        this.add = (value, defaultValue = []) => {
+          return JSON.stringify(!value || !Array.isArray(value) ? defaultValue : value);
+        };
+        this.get = value => {
+          return !value ? [] : JSON.parse(value);
+        };
+        this.update = value => {
+          return !value || !Array.isArray(value) ? undefined : JSON.stringify(value);
+        };
+      }
+    };
+    this.JsonObject = class {
+      constructor() {
+        this.add = (value, defaultValue = {}) => {
+          return JSON.stringify(!value || !isPlainObject(value) ? defaultValue : value);
+        };
+        this.get = value => {
+          return !value ? {} : JSON.parse(value);
+        };
+        this.update = value => {
+          return !value || !isPlainObject(value) ? undefined : JSON.stringify(value);
+        };
+      }
+    };
+  }
+}

package/lib/x.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" />
 import { BaseService } from './services/base';
+import './services/db_value';
 import './services/dispose';
 import './services/emoji';
 import './services/log';

package/lib/x.js

@@ -1,6 +1,7 @@
-import fs from 'fs-extra';
 import os from 'os';
 import path from 'path';
+import fs from 'fs-extra';
+import { DbValueService } from "./services/db_value";
 import { DisposeService } from "./services/dispose";
 import { EmojiService } from "./services/emoji";
 import { LogService } from "./services/log";
@@ -19,4 +20,4 @@ export const x = {
 fs.ensureDirSync(x.dataDir);
 x.register(new DisposeService({
   disposeOnExit: true
-}), new LogService(), new EmojiService());
+}), new LogService(), new EmojiService(), new DbValueService());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.52.2",
+  "version": "2.54.0",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",