@jayfong/x-server 2.106.6 → 2.108.0

package/lib/_cjs/core/define_handler.js

@@ -2,6 +2,10 @@
 
 exports.__esModule = true;
 exports.defineHandler = defineHandler;
+exports.defineHandlerANY = defineHandlerANY;
+exports.defineHandlerFILE = defineHandlerFILE;
+exports.defineHandlerGET = defineHandlerGET;
+exports.defineHandlerXML = defineHandlerXML;
 var _handler = require("./handler");
 function defineHandler(options) {
   const handler = new _handler.Handler({
@@ -11,20 +15,22 @@ function defineHandler(options) {
   return handler;
 }
 defineHandler.POST = defineHandler;
-defineHandler.GET = options => {
+function defineHandlerGET(options) {
   const handler = new _handler.Handler({
     ...options,
     requestMethod: 'GET'
   });
   return handler;
-};
-defineHandler.FILE = options => {
+}
+defineHandler.GET = defineHandlerGET;
+function defineHandlerFILE(options) {
   const handler = new _handler.Handler({
     ...options,
     requestMethod: 'FILE'
   });
   return handler;
-};
+}
+defineHandler.FILE = defineHandlerFILE;
 defineHandler.WS = options => {
   const handler = new _handler.Handler({
     ...options,
@@ -32,17 +38,19 @@ defineHandler.WS = options => {
   });
   return handler;
 };
-defineHandler.XML = options => {
+function defineHandlerXML(options) {
   const handler = new _handler.Handler({
     ...options,
     requestMethod: 'XML'
   });
   return handler;
-};
-defineHandler.ANY = options => {
+}
+defineHandler.XML = defineHandlerXML;
+function defineHandlerANY(options) {
   const handler = new _handler.Handler({
     ...options,
     requestMethod: 'ANY'
   });
   return handler;
-};
+}
+defineHandler.ANY = defineHandlerANY;

package/lib/_cjs/services/random.js

@@ -0,0 +1,51 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+exports.__esModule = true;
+exports.RandomService = void 0;
+var _cuid = require("@paralleldrive/cuid2");
+var _randomstring = _interopRequireDefault(require("randomstring"));
+class RandomService {
+  constructor() {
+    this.serviceName = 'random';
+  }
+  /**
+   * 24位。
+   *
+   * @see https://github.com/paralleldrive/cuid2
+   */
+  cuid2() {
+    return (0, _cuid.createId)();
+  }
+
+  /**
+   * [0-9 a-z A-Z]
+   */
+  generateAlphanumeric(length) {
+    return _randomstring.default.generate({
+      charset: 'alphanumeric',
+      length: length
+    });
+  }
+
+  /**
+   * [a-z A-Z]
+   */
+  generateAlphabetic(length) {
+    return _randomstring.default.generate({
+      charset: 'alphabetic',
+      length: length
+    });
+  }
+
+  /**
+   * [0-9]
+   */
+  generateNumeric(length) {
+    return _randomstring.default.generate({
+      charset: 'numeric',
+      length: length
+    });
+  }
+}
+exports.RandomService = RandomService;

package/lib/_cjs/x.js

@@ -3,8 +3,8 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.x = void 0;
-var _os = _interopRequireDefault(require("os"));
-var _path = _interopRequireDefault(require("path"));
+var _nodeOs = _interopRequireDefault(require("node:os"));
+var _nodePath = _interopRequireDefault(require("node:path"));
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 var _ctx_storage = require("./core/ctx_storage");
 var _crypto = require("./services/crypto");
@@ -13,11 +13,12 @@ var _dispose = require("./services/dispose");
 var _emoji = require("./services/emoji");
 var _html = require("./services/html");
 var _log = require("./services/log");
+var _random = require("./services/random");
 const env = JSON.parse(process.env.X_SERVER_ENVS || '{}');
 const x = exports.x = {
   appId: env.APP_ID,
   env: env,
-  dataDir: _path.default.join(_os.default.homedir(), `.xs/${env.APP_ID}`),
+  dataDir: _nodePath.default.join(_nodeOs.default.homedir(), `.xs/${env.APP_ID}`),
   get ctx() {
     return _ctx_storage.ctxStorage.getStore();
   },
@@ -31,4 +32,4 @@ const x = exports.x = {
 _fsExtra.default.ensureDirSync(x.dataDir);
 x.register(new _dispose.DisposeService({
   disposeOnExit: true
-}), new _log.LogService(), new _emoji.EmojiService(), new _db_value.DbValueService(), new _crypto.CryptoService(), new _html.HtmlService());
+}), new _log.LogService(), new _emoji.EmojiService(), new _db_value.DbValueService(), new _crypto.CryptoService(), new _html.HtmlService(), new _random.RandomService());

package/lib/core/define_handler.d.ts

@@ -1,10 +1,12 @@
+import type { FirstParameter } from 'vtils/types';
 import { Handler } from './handler';
 import type { XHandler } from './types';
-export declare function defineHandler<TReqData extends any = void, TResData extends any = void>(options: XHandler.Options<TReqData, TResData, 'POST'>): Handler<TReqData, TResData, "POST">;
+export declare function defineHandler<TFn extends (...args: any[]) => Promise<any>, TReqData = FirstParameter<TFn>, TResData = Awaited<ReturnType<TFn>>>(options: XHandler.Options<TReqData, TResData, 'POST'>): Handler<TReqData, TResData, 'POST'>;
+export declare function defineHandler<TReqData extends any = void, TResData extends any = void>(options: XHandler.Options<TReqData, TResData, 'POST'>): Handler<TReqData, TResData, 'POST'>;
 export declare namespace defineHandler {
     var POST: typeof defineHandler;
-    var GET: <TReqData extends unknown = void, TResData extends unknown = void>(options: XHandler.Options<TReqData, TResData, "GET">) => Handler<TReqData, TResData, "GET">;
-    var FILE: <TReqData extends unknown = void, TResData extends unknown = void>(options: XHandler.Options<TReqData, TResData, "FILE">) => Handler<TReqData, TResData, "FILE">;
+    var GET: typeof defineHandlerGET;
+    var FILE: typeof defineHandlerFILE;
     var WS: <TReqData extends Record<string, [any, any]>>(options: XHandler.Options<{ [K in keyof TReqData]: {
         request: TReqData[K][0];
         response: TReqData[K][1];
@@ -12,6 +14,14 @@ export declare namespace defineHandler {
         request: TReqData[K][0];
         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">;
+    var XML: typeof defineHandlerXML;
+    var ANY: typeof defineHandlerANY;
 }
+export declare function defineHandlerGET<TFn extends (...args: any[]) => Promise<any>, TReqData = FirstParameter<TFn>, TResData = Awaited<ReturnType<TFn>>>(options: XHandler.Options<TReqData, TResData, 'GET'>): Handler<TReqData, TResData, 'GET'>;
+export declare function defineHandlerGET<TReqData extends any = void, TResData extends any = void>(options: XHandler.Options<TReqData, TResData, 'GET'>): Handler<TReqData, TResData, 'GET'>;
+export declare function defineHandlerFILE<TFn extends (...args: any[]) => Promise<any>, TReqData = FirstParameter<TFn>, TResData = Awaited<ReturnType<TFn>>>(options: XHandler.Options<TReqData, TResData, 'FILE'>): Handler<TReqData, TResData, 'FILE'>;
+export declare function defineHandlerFILE<TReqData extends any = void, TResData extends any = void>(options: XHandler.Options<TReqData, TResData, 'FILE'>): Handler<TReqData, TResData, 'FILE'>;
+export declare function defineHandlerXML<TFn extends (...args: any[]) => Promise<any>, TReqData = FirstParameter<TFn>, TResData = Awaited<ReturnType<TFn>>>(options: XHandler.Options<TReqData, TResData, 'XML'>): Handler<TReqData, TResData, 'XML'>;
+export declare function defineHandlerXML<TReqData extends any = void, TResData extends any = void>(options: XHandler.Options<TReqData, TResData, 'XML'>): Handler<TReqData, TResData, 'XML'>;
+export declare function defineHandlerANY<TFn extends (...args: any[]) => Promise<any>, TReqData = FirstParameter<TFn>, TResData = Awaited<ReturnType<TFn>>>(options: XHandler.Options<TReqData, TResData, 'ANY'>): Handler<TReqData, TResData, 'ANY'>;
+export declare function defineHandlerANY<TReqData extends any = void, TResData extends any = void>(options: XHandler.Options<TReqData, TResData, 'ANY'>): Handler<TReqData, TResData, 'ANY'>;

package/lib/core/define_handler.js

@@ -7,20 +7,22 @@ export function defineHandler(options) {
   return handler;
 }
 defineHandler.POST = defineHandler;
-defineHandler.GET = options => {
+export function defineHandlerGET(options) {
   const handler = new Handler({
     ...options,
     requestMethod: 'GET'
   });
   return handler;
-};
-defineHandler.FILE = options => {
+}
+defineHandler.GET = defineHandlerGET;
+export function defineHandlerFILE(options) {
   const handler = new Handler({
     ...options,
     requestMethod: 'FILE'
   });
   return handler;
-};
+}
+defineHandler.FILE = defineHandlerFILE;
 defineHandler.WS = options => {
   const handler = new Handler({
     ...options,
@@ -28,17 +30,19 @@ defineHandler.WS = options => {
   });
   return handler;
 };
-defineHandler.XML = options => {
+export function defineHandlerXML(options) {
   const handler = new Handler({
     ...options,
     requestMethod: 'XML'
   });
   return handler;
-};
-defineHandler.ANY = options => {
+}
+defineHandler.XML = defineHandlerXML;
+export function defineHandlerANY(options) {
   const handler = new Handler({
     ...options,
     requestMethod: 'ANY'
   });
   return handler;
-};
+}
+defineHandler.ANY = defineHandlerANY;

package/lib/services/random.d.ts

@@ -0,0 +1,27 @@
+import type { BaseService } from './base';
+export declare class RandomService implements BaseService {
+    serviceName: string;
+    /**
+     * 24位。
+     *
+     * @see https://github.com/paralleldrive/cuid2
+     */
+    cuid2(): string;
+    /**
+     * [0-9 a-z A-Z]
+     */
+    generateAlphanumeric(length: number): string;
+    /**
+     * [a-z A-Z]
+     */
+    generateAlphabetic(length: number): string;
+    /**
+     * [0-9]
+     */
+    generateNumeric(length: number): string;
+}
+declare module '../x' {
+    interface X {
+        random: RandomService;
+    }
+}

package/lib/services/random.js

@@ -0,0 +1,45 @@
+import { createId as cuid2 } from '@paralleldrive/cuid2';
+import randomstring from 'randomstring';
+export class RandomService {
+  constructor() {
+    this.serviceName = 'random';
+  }
+  /**
+   * 24位。
+   *
+   * @see https://github.com/paralleldrive/cuid2
+   */
+  cuid2() {
+    return cuid2();
+  }
+
+  /**
+   * [0-9 a-z A-Z]
+   */
+  generateAlphanumeric(length) {
+    return randomstring.generate({
+      charset: 'alphanumeric',
+      length: length
+    });
+  }
+
+  /**
+   * [a-z A-Z]
+   */
+  generateAlphabetic(length) {
+    return randomstring.generate({
+      charset: 'alphabetic',
+      length: length
+    });
+  }
+
+  /**
+   * [0-9]
+   */
+  generateNumeric(length) {
+    return randomstring.generate({
+      charset: 'numeric',
+      length: length
+    });
+  }
+}

package/lib/x.d.ts

@@ -1,11 +1,12 @@
-import { XHandler } from './core/types';
-import { BaseService } from './services/base';
+import type { XHandler } from './core/types';
+import type { BaseService } from './services/base';
 import './services/crypto';
 import './services/db_value';
 import './services/dispose';
 import './services/emoji';
 import './services/html';
 import './services/log';
+import './services/random';
 export interface X {
     readonly appId: string;
     readonly env: NodeJS.ProcessEnv;

package/lib/x.js

@@ -1,5 +1,5 @@
-import os from 'os';
-import path from 'path';
+import os from 'node:os';
+import path from 'node:path';
 import fs from 'fs-extra';
 import { ctxStorage } from "./core/ctx_storage";
 import { CryptoService } from "./services/crypto";
@@ -8,6 +8,7 @@ import { DisposeService } from "./services/dispose";
 import { EmojiService } from "./services/emoji";
 import { HtmlService } from "./services/html";
 import { LogService } from "./services/log";
+import { RandomService } from "./services/random";
 const env = JSON.parse(process.env.X_SERVER_ENVS || '{}');
 export const x = {
   appId: env.APP_ID,
@@ -26,4 +27,4 @@ export const x = {
 fs.ensureDirSync(x.dataDir);
 x.register(new DisposeService({
   disposeOnExit: true
-}), new LogService(), new EmojiService(), new DbValueService(), new CryptoService(), new HtmlService());
+}), new LogService(), new EmojiService(), new DbValueService(), new CryptoService(), new HtmlService(), new RandomService());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.106.6",
+  "version": "2.108.0",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",
@@ -27,8 +27,9 @@
     "@fastify/formbody": "^7.4.0",
     "@fastify/multipart": "^7.7.0",
     "@fastify/websocket": "^8.1.0",
-    "@prisma/adapter-mariadb": "^7.1.0",
-    "@prisma/client": "^7.1.0",
+    "@paralleldrive/cuid2": "^3.0.4",
+    "@prisma/adapter-mariadb": "^7.2.0",
+    "@prisma/client": "^7.2.0",
     "@types/busboy": "^0.3.2",
     "@types/http-errors": "^1.8.2",
     "@types/jsonwebtoken": "^8.5.8",
@@ -66,7 +67,8 @@
     "pino-pretty": "^10.0.1",
     "pinyin-pro": "^3.26.0",
     "pirates": "^4.0.6",
-    "prisma": "^7.1.0",
+    "prisma": "^7.2.0",
+    "randomstring": "^1.3.1",
     "select-run": "^1.1.2",
     "supports-color": "^8",
     "svg-captcha": "^1.4.0",
@@ -83,9 +85,9 @@
   "devDependencies": {
     "@types/debug": "^4.1.7",
     "@types/fs-extra": "^9.0.13",
-    "@types/ioredis": "^5.0.0",
     "@types/json-schema": "^7.0.11",
     "@types/lz-string": "^1.3.34",
+    "@types/randomstring": "^1.3.0",
     "axios": "^1.4.0",
     "ioredis-mock": "^8.7.0",
     "json-xml-parse": "^1.2.4",