@jayfong/x-server 2.119.0 → 3.1.1

package/lib/types/dto.d.mts

@@ -0,0 +1,30 @@
+import { Merge, OmitStrict, PartialBy, RequiredBy, RequiredDeep, Simplify } from "vtils/types";
+/** 选中的必填，同时能将部分选填，并能覆盖 */
+export type MakeDtoRequired<TRawData extends Record<any, any>, TPickKey extends keyof TRawData = never, TPartialKey extends [TPickKey] extends [never] ? keyof TRawData : TPickKey = never, TOverride extends { [K in [TPickKey] extends [never] ? keyof TRawData : TPickKey]?: any; } = never> = Simplify<Merge<PartialBy<Pick<RequiredDeep<TRawData>, [TPickKey] extends [never] ? keyof TRawData : TPickKey>, TPartialKey>, [TOverride] extends [never] ? {} : TOverride>>;
+/** 没排除的必填，同时能将部分选填，并能覆盖 */
+export type MakeDtoRequiredByExclude<TRawData extends Record<any, any>, TExcludeKey extends keyof TRawData = never, TPartialKey extends Exclude<keyof TRawData, TExcludeKey> = never, TOverride extends { [K in Exclude<keyof TRawData, TExcludeKey>]?: any; } = never> = Simplify<Merge<PartialBy<Omit<RequiredDeep<TRawData>, [TExcludeKey] extends [never] ? never : TExcludeKey>, TPartialKey>, [TOverride] extends [never] ? {} : TOverride>>;
+/** 选中的选填，同时能将部分必填，并能覆盖 */
+export type MakeDtoPartial<TRawData extends Record<any, any>, TPickKey extends keyof TRawData = never, TRequiredKey extends [TPickKey] extends [never] ? keyof TRawData : TPickKey = never, TOverride extends { [K in [TPickKey] extends [never] ? keyof TRawData : TPickKey]?: any; } = never> = Simplify<Merge<RequiredBy<Pick<Partial<TRawData>, [TPickKey] extends [never] ? keyof TRawData : TPickKey>, TRequiredKey>, [TOverride] extends [never] ? {} : TOverride>>;
+/** 没排除的选填，同时能将部分必填，并能覆盖 */
+export type MakeDtoPartialByExclude<TRawData extends Record<any, any>, TExcludeKey extends keyof TRawData = never, TRequiredKey extends Exclude<keyof TRawData, TExcludeKey> = never, TOverride extends { [K in Exclude<keyof TRawData, TExcludeKey>]?: any; } = never> = Simplify<Merge<RequiredBy<Omit<Partial<TRawData>, [TExcludeKey] extends [never] ? never : TExcludeKey>, TRequiredKey>, [TOverride] extends [never] ? {} : TOverride>>;
+/** 排除选中的，并能覆盖 */
+export type MakeDtoExclude<TRawData extends Record<any, any>, TExcludeKey extends keyof TRawData, TOverride extends { [K in Exclude<keyof TRawData, TExcludeKey>]?: any; } = never> = Simplify<Merge<OmitStrict<TRawData, TExcludeKey>, [TOverride] extends [never] ? {} : TOverride>>;
+/** 排除选中的，同时能将部分必填，并能覆盖 */
+export type MakeDtoExcludeWithRequired<TRawData extends Record<any, any>, TExcludeKey extends keyof TRawData, TRequiredKey extends Exclude<keyof TRawData, TExcludeKey> = never, TOverride extends { [K in Exclude<keyof TRawData, TExcludeKey>]?: any; } = never> = Simplify<Merge<RequiredBy<OmitStrict<TRawData, TExcludeKey>, TRequiredKey>, [TOverride] extends [never] ? {} : TOverride>>;
+/** 排除选中的，同时能将部分选填，并能覆盖 */
+export type MakeDtoExcludeWithPartial<TRawData extends Record<any, any>, TExcludeKey extends keyof TRawData, TPartialKey extends Exclude<keyof TRawData, TExcludeKey> = never, TOverride extends { [K in Exclude<keyof TRawData, TExcludeKey>]?: any; } = never> = Simplify<Merge<PartialBy<OmitStrict<TRawData, TExcludeKey>, TPartialKey>, [TOverride] extends [never] ? {} : TOverride>>;
+/** 排除选中的，同时能将部分必填然后选填，并能覆盖 */
+export type MakeDtoExcludeWithRequiredAndPartial<TRawData extends Record<any, any>, TExcludeKey extends keyof TRawData, TRequiredKey extends Exclude<keyof TRawData, TExcludeKey> = never, TPartialKey extends Exclude<Exclude<keyof TRawData, TExcludeKey>, TRequiredKey> = never, TOverride extends { [K in Exclude<keyof TRawData, TExcludeKey>]?: any; } = never> = Simplify<Merge<PartialBy<RequiredBy<OmitStrict<TRawData, TExcludeKey>, TRequiredKey>, TPartialKey>, [TOverride] extends [never] ? {} : TOverride>>;
+/** 包含选中的，并能覆盖 */
+export type MakeDtoInclude<TRawData extends Record<any, any>, TIncludeKey extends keyof TRawData, TOverride extends { [K in TIncludeKey]?: any; } = never> = Simplify<Merge<Pick<TRawData, TIncludeKey>, [TOverride] extends [never] ? {} : TOverride>>;
+/** 包含选中的，同时能部分必填，并能覆盖 */
+export type MakeDtoIncludeWithRequired<TRawData extends Record<any, any>, TIncludeKey extends keyof TRawData, TRequiredKey extends TIncludeKey = never, TOverride extends { [K in TIncludeKey]?: any; } = never> = Simplify<Merge<RequiredBy<Pick<TRawData, TIncludeKey>, TRequiredKey>, [TOverride] extends [never] ? {} : TOverride>>;
+/** 包含选中的，同时能部分选填，并能覆盖 */
+export type MakeDtoIncludeWithPartial<TRawData extends Record<any, any>, TIncludeKey extends keyof TRawData, TPartialKey extends TIncludeKey = never, TOverride extends { [K in TIncludeKey]?: any; } = never> = Simplify<Merge<PartialBy<Pick<TRawData, TIncludeKey>, TPartialKey>, [TOverride] extends [never] ? {} : TOverride>>;
+/** 包含选中的，同时能部分必填然后选填，并能覆盖 */
+export type MakeDtoIncludeWithRequiredAndPartial<TRawData extends Record<any, any>, TIncludeKey extends keyof TRawData, TRequiredKey extends TIncludeKey = never, TPartialKey extends Exclude<TIncludeKey, TRequiredKey> = never, TOverride extends { [K in TIncludeKey]?: any; } = never> = Simplify<Merge<PartialBy<RequiredBy<Pick<TRawData, TIncludeKey>, TRequiredKey>, TPartialKey>, [TOverride] extends [never] ? {} : TOverride>>;
+/** 添加分页参数 */
+export type MakeDtoWithPagination<TRawData extends Record<any, any>> = TRawData & {
+  pageNumber: number;
+  pageSize: number;
+};

package/lib/types/dto.mjs

@@ -0,0 +1 @@
+export {};

package/lib/x.d.mts

@@ -0,0 +1,11 @@
+import { XHandler } from "./core/types.mjs";
+import { BaseService } from "./services/base.mjs";
+import "./services/dispose.mjs";
+export interface X {
+  readonly appId: string;
+  readonly env: NodeJS.ProcessEnv;
+  readonly dataDir: string;
+  readonly ctx: XHandler.Context;
+  readonly register: (...services: BaseService[]) => void;
+}
+export declare const x: X;

package/lib/x.mjs

@@ -0,0 +1,21 @@
+import { ctxStorage } from "./core/ctx_storage.mjs";
+import { DisposeService } from "./services/dispose.mjs";
+import os from "node:os";
+import path from "node:path";
+import fs from "fs-extra";
+// src/x.ts
+const env = JSON.parse(process.env.X_SERVER_ENVS || "{}");
+const x = {
+	appId: env.APP_ID,
+	env,
+	dataDir: path.join(os.homedir(), `.xs/${env.APP_ID}`),
+	get ctx() {
+		return ctxStorage.getStore();
+	},
+	register: (...services) => {
+		for (const service of services) x[service.serviceName] = service;
+	}
+};
+fs.ensureDirSync(x.dataDir);
+x.register(new DisposeService({ disposeOnExit: true }));
+export { x };

package/lib/x_init.d.mts

@@ -0,0 +1 @@
+export {}

package/lib/x_init.mjs

@@ -0,0 +1,10 @@
+import { CryptoService } from "./services/crypto.mjs";
+import { DbValueService } from "./services/db_value.mjs";
+import { EmojiService } from "./services/emoji.mjs";
+import { HtmlService } from "./services/html.mjs";
+import { LogService } from "./services/log.mjs";
+import { RandomService } from "./services/random.mjs";
+import { x } from "./x.mjs";
+// src/x_init.ts
+x.register(new LogService(), new EmojiService(), new DbValueService(), new CryptoService(), new HtmlService(), new RandomService());
+export {};

package/package.json

@@ -1,13 +1,11 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.119.0",
+  "version": "3.1.1",
   "license": "ISC",
-  "sideEffects": false,
-  "main": "lib/_cjs/index.js",
-  "module": "lib/index.js",
-  "types": "lib/index.d.ts",
+  "sideEffects": true,
+  "type": "module",
   "bin": {
-    "xs": "lib/_cjs/cli/cli.js"
+    "xs": "./lib/cli/cli.mjs"
   },
   "files": [
     "lib"
@@ -21,45 +19,44 @@
     "@fastify/formbody": "^9.0.1",
     "@fastify/multipart": "^10.1.8",
     "@fastify/websocket": "^11.3.7",
-    "@jayfong/x-request": "2.119.0",
+    "@jayfong/x-request": "^3.1.1",
     "@paralleldrive/cuid2": "^3.3.0",
     "@prisma/adapter-mariadb": "^7.10.1",
     "@prisma/client": "^7.10.1",
     "@types/busboy": "^0.3.2",
     "@types/http-errors": "^2.0.5",
+    "@types/json-schema": "^7.0.11",
     "@types/jsonwebtoken": "^8.5.8",
     "@types/nodemailer": "^6.4.4",
     "@types/ws": "^8.18.2",
-    "alipay-sdk": "^3.2.0",
-    "bufferutil": "^4.0.6",
+    "alipay-sdk": "^4.14.0",
     "bull": "^4.16.5",
-    "chokidar": "^3.5.3",
+    "chokidar": "^6.0.0",
     "comment-parser": "^1.3.1",
     "compressing": "^1.5.1",
     "cron": "^4.4.0",
     "cuid": "^2.1.8",
     "debug": "^4.3.4",
     "esbuild": "^0.28.2",
-    "esbuild-register": "^3.6.0",
-    "execa": "^5.1.1",
-    "exit-hook": "^2.2.1",
+    "execa": "^10.2.1",
+    "exit-hook": "^5.1.0",
     "fast-escape-html": "^1.1.0",
     "fast-xml-parser": "^5.12.0",
     "fastify": "^5.12.8",
-    "fs-extra": "^10.0.1",
-    "globby": "^11",
-    "got": "^11.8.2",
+    "fs-extra": "^11.4.1",
+    "globby": "^16.2.4",
     "http-errors": "^2.0.1",
-    "inquirer": "^12.5.0",
+    "inquirer": "^14.3.0",
     "inquirer-autocomplete-standalone": "^0.8.1",
-    "ioredis": "^5.3.2",
-    "jsonwebtoken": "^8.5.1",
-    "lru-cache": "^10.0.0",
+    "ioredis": "^6.0.0",
+    "jsonwebtoken": "^9.0.3",
+    "lru-cache": "^11.5.3",
     "lz-string": "^1.4.4",
     "mime": "^4.1.2",
     "mini-svg-data-uri": "^1.4.4",
-    "node-ssh": "^13.1.0",
-    "nodemailer": "^6.7.3",
+    "node-ssh": "^13.2.1",
+    "nodemailer": "^10.5.0",
+    "openapi-types": "^12.1.3",
     "pino-pretty": "^13.2.0",
     "pinyin-pro": "^3.26.0",
     "pirates": "^4.0.6",
@@ -70,19 +67,17 @@
     "supports-color": "^8",
     "svg-captcha": "^1.4.0",
     "tencentcloud-sdk-nodejs-sms": "^4.0.681",
-    "ts-morph": "^27.0.2",
+    "ts-morph": "^28.0.0",
     "tsx": "^4.23.15",
     "unplugin-macros": "^0.16.0",
-    "utf-8-validate": "^5.0.9",
     "vscode-generate-index-standalone": "^1.7.1",
     "vtils": "^4.138.0",
     "yaml": "^2.9.1",
-    "yargs": "^17.4.1"
+    "yargs": "^18.2.0"
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",
     "@types/fs-extra": "^9.0.13",
-    "@types/json-schema": "^7.0.11",
     "@types/lz-string": "^1.3.34",
     "@types/randomstring": "^1.3.0",
     "@types/yargs": "^17.0.35",
@@ -90,17 +85,72 @@
     "ioredis-mock": "^8.7.0",
     "json-xml-parse": "^1.2.4",
     "node-fetch": "^3.3.1",
-    "npm-check-updates": "^12.5.9",
-    "openapi-types": "^12.1.3"
+    "npm-check-updates": "^12.5.9"
   },
   "publishConfig": {
     "access": "public"
   },
+  "exports": {
+    ".": "./lib/index.mjs",
+    "./cli/api_generator": "./lib/cli/api_generator.mjs",
+    "./cli/build_util": "./lib/cli/build_util.mjs",
+    "./cli/cli": "./lib/cli/cli.mjs",
+    "./cli/css_register": "./lib/cli/css_register.mjs",
+    "./cli/deploy_util": "./lib/cli/deploy_util.mjs",
+    "./cli/dev_util": "./lib/cli/dev_util.mjs",
+    "./cli/env_util": "./lib/cli/env_util.mjs",
+    "./cli/template_util": "./lib/cli/template_util.mjs",
+    "./core/ctx_storage": "./lib/core/ctx_storage.mjs",
+    "./core/define_bus": "./lib/core/define_bus.mjs",
+    "./core/define_cron": "./lib/core/define_cron.mjs",
+    "./core/define_handler": "./lib/core/define_handler.mjs",
+    "./core/define_hook": "./lib/core/define_hook.mjs",
+    "./core/define_server": "./lib/core/define_server.mjs",
+    "./core/define_task": "./lib/core/define_task.mjs",
+    "./core/get_handler_url": "./lib/core/get_handler_url.mjs",
+    "./core/handler": "./lib/core/handler.mjs",
+    "./core/http_error": "./lib/core/http_error.mjs",
+    "./core/http_header": "./lib/core/http_header.mjs",
+    "./core/http_method": "./lib/core/http_method.mjs",
+    "./core/http_redirect": "./lib/core/http_redirect.mjs",
+    "./core/server": "./lib/core/server.mjs",
+    "./core/types": "./lib/core/types.mjs",
+    "./exports": "./lib/exports.mjs",
+    "./plugins/base": "./lib/plugins/base.mjs",
+    "./plugins/compress": "./lib/plugins/compress.mjs",
+    "./plugins/cookie": "./lib/plugins/cookie.mjs",
+    "./plugins/cors": "./lib/plugins/cors.mjs",
+    "./plugins/file_parser": "./lib/plugins/file_parser.mjs",
+    "./plugins/form_body_parser": "./lib/plugins/form_body_parser.mjs",
+    "./plugins/ws_parser": "./lib/plugins/ws_parser.mjs",
+    "./plugins/xml_parser": "./lib/plugins/xml_parser.mjs",
+    "./services/ai": "./lib/services/ai.mjs",
+    "./services/base": "./lib/services/base.mjs",
+    "./services/cache": "./lib/services/cache.mjs",
+    "./services/captcha": "./lib/services/captcha.mjs",
+    "./services/crypto": "./lib/services/crypto.mjs",
+    "./services/db_value": "./lib/services/db_value.mjs",
+    "./services/dingtalk": "./lib/services/dingtalk.mjs",
+    "./services/dispose": "./lib/services/dispose.mjs",
+    "./services/emoji": "./lib/services/emoji.mjs",
+    "./services/file_store": "./lib/services/file_store.mjs",
+    "./services/html": "./lib/services/html.mjs",
+    "./services/jwt": "./lib/services/jwt.mjs",
+    "./services/log": "./lib/services/log.mjs",
+    "./services/mail": "./lib/services/mail.mjs",
+    "./services/pay": "./lib/services/pay.mjs",
+    "./services/random": "./lib/services/random.mjs",
+    "./services/rate_limit": "./lib/services/rate_limit.mjs",
+    "./services/redis": "./lib/services/redis.mjs",
+    "./services/sensitive_words": "./lib/services/sensitive_words.mjs",
+    "./services/sms": "./lib/services/sms.mjs",
+    "./types/dto": "./lib/types/dto.mjs",
+    "./x": "./lib/x.mjs",
+    "./x_init": "./lib/x_init.mjs",
+    "./package.json": "./package.json"
+  },
   "scripts": {
-    "build": "mv ./node_modules/.x ./node_modules/.x2 || true && haoma compile && mv ./node_modules/.x2 ./node_modules/.x || true",
-    "build_test_pkg": "tyn build && rm -rf ./lib_test && mkdir -p ./lib_test && cp -r ./lib ./lib_test/lib && cp ./package.json ./lib_test/package.json && cd ./tests/app && tyn add file:../../lib_test",
-    "test": "tsc --noEmit -p ./tsconfig.build.json && jest \"$(pwd)/src/\"",
-    "test_all": "tsc --noEmit -p ./tsconfig.build.json && jest",
+    "build": "mv ./node_modules/@a ./node_modules/@a2 || true && tsdown && mv ./node_modules/@a2 ./node_modules/@a || true",
     "test_api_bot": "cd /Users/admin/Documents/jfWorks/qiqi-bot && DEBUG=api tsx /Users/admin/Documents/jfWorks/x/packages/x-server/src/cli/cli.ts api",
     "test_api_qiqi": "cd /Users/admin/Documents/jfWorks/qiqi-server && DEBUG=api tsx /Users/admin/Documents/jfWorks/x/packages/x-server/src/cli/cli.ts api",
     "up_prisma": "tpm dlx npm-check-updates '/.*prisma.*/' -i --target semver",