@hz-9/a5-core 0.2.0-alpha.41 → 0.2.0-alpha.43

package/dist/all.d.ts

@@ -1,13 +1,17 @@
+/// <reference types="node" />
+
 import { FastifyReply as FastifyReply_2 } from 'fastify';
 import { FastifyRequest as FastifyRequest_2 } from 'fastify';
+import { IncomingHttpHeaders } from 'node:http';
 import { Logger } from '@nestjs/common';
 import { LoggerService } from '@nestjs/common/services/logger.service';
 import { LoggerService as LoggerService_2 } from '@nestjs/common';
 import { LogLevel } from '@nestjs/common/services/logger.service';
-import { nanoid } from 'nanoid';
 import { NestFactoryStatic } from '@nestjs/core/nest-factory';
 import { NestFastifyApplication } from '@nestjs/platform-fastify';
 import { NestMiddleware } from '@nestjs/common';
+import { V4Options } from 'uuid';
+import { V7Options } from 'uuid';
 
 /**
  * @public
@@ -454,6 +458,15 @@ export declare class A5Util {
      * @returns 资源路径的绝对路径。
      */
     static tryWithAbsolutePath(sourcePath: string, basePath: string): string;
+    static nanoid(size?: number): string;
+    static uuidV4(options?: V4Options): string;
+    static uuidV7(options?: V7Options): string;
+    static getReqIdFromRequest(req: FastifyRequest): string;
+    static getReqHeadersFromRequest(req: FastifyRequest): IncomingHttpHeaders;
+    static getReqIdAndHeadersFromRequest(req: FastifyRequest): {
+        reqId: string;
+        reqHeaders: IncomingHttpHeaders;
+    };
 }
 
 /**
@@ -759,8 +772,6 @@ export declare const MODULE_CONFIG_PATH_A5_CONFIG: <T extends string>(str: T) =>
  */
 export declare const MODULE_CONFIG_PATH_A5_LOG: <T extends string>(str: T) => `A5.log.${T}`;
 
-export { nanoid }
-
 /**
  * 类型断言工具 - 判断不是 any 类型
  *

package/dist/core/a5-application.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.A5Application = void 0;
 const common_1 = require("@nestjs/common");
 const core_1 = require("@nestjs/core");
-const nanoid_1 = require("nanoid");
 const index_1 = require("../const/index");
 const log_1 = require("../module/log");
 const util_1 = require("../util");
@@ -75,7 +74,7 @@ class A5Application {
          * setExtraUrl 及 getUrls 函数用于保存数据的数组
          */
         this.extraUrls = [];
-        this.instanceId = (0, nanoid_1.nanoid)();
+        this.instanceId = util_1.A5Util.nanoid();
         this.nestApp = nestApp;
         this.options = {
             logger: options.logger ?? this._getA5LoggerService(),

package/dist/core/a5-console-logger.js

@@ -11,6 +11,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 var A5ConsoleLogger_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.A5ConsoleLogger = exports.DEFAULT_LOG_LEVELS = void 0;
@@ -20,19 +23,11 @@ const optional_decorator_1 = require("@nestjs/common/decorators/core/optional.de
 const is_log_level_enabled_util_1 = require("@nestjs/common/services/utils/is-log-level-enabled.util");
 const cli_colors_util_1 = require("@nestjs/common/utils/cli-colors.util");
 const shared_utils_1 = require("@nestjs/common/utils/shared.utils");
+const dayjs_1 = __importDefault(require("dayjs"));
 /**
  * @public
  */
 exports.DEFAULT_LOG_LEVELS = ['log', 'error', 'warn', 'debug', 'verbose', 'fatal'];
-const dateTimeFormatter = new Intl.DateTimeFormat(undefined, {
-    year: 'numeric',
-    month: '2-digit',
-    day: '2-digit',
-    hour: 'numeric',
-    minute: 'numeric',
-    second: 'numeric',
-    fractionalSecondDigits: 3,
-});
 /**
  * @public
  */
@@ -185,7 +180,7 @@ let A5ConsoleLogger = A5ConsoleLogger_1 = class A5ConsoleLogger {
         return logLevel.toUpperCase().padStart(7, ' ');
     }
     formatTimestamp(dateMilliseconds) {
-        return dateTimeFormatter.format(dateMilliseconds).replace(/ /g, 'T').replace(/\//g, '-');
+        return (0, dayjs_1.default)(dateMilliseconds).format('YYYY-MM-DDTHH:mm:ss.SSS');
     }
     formatContext(context) {
         if (context.length === 0)

package/dist/core/a5-factory.js

@@ -35,7 +35,10 @@ class A5FactoryStatic {
         const nestOptions = {
             bufferLogs: true,
         };
-        const nestApplication = await this.nestFactoryStatic.create(module, new platform_fastify_1.FastifyAdapter(), nestOptions);
+        const nestApplication = await this.nestFactoryStatic.create(module, new platform_fastify_1.FastifyAdapter({
+            // 生成 Req Id
+            genReqId: (req) => util_1.A5Util.uuidV7(),
+        }), nestOptions);
         // this.initBodyParser(nestApplication, options)
         const app = new a5_application_1.A5Application(nestApplication);
         await app.init();

package/dist/index.d.ts

@@ -4,5 +4,4 @@ export * from './errors';
 export * from './interface';
 export * from './module';
 export * from './middleware';
-export * from './plugins';
 export * from './util';

package/dist/index.js

@@ -20,6 +20,5 @@ __exportStar(require("./errors"), exports);
 __exportStar(require("./interface"), exports);
 __exportStar(require("./module"), exports);
 __exportStar(require("./middleware"), exports);
-__exportStar(require("./plugins"), exports);
 __exportStar(require("./util"), exports);
 //# sourceMappingURL=index.js.map

package/dist/util/a5.util.d.ts

@@ -1,3 +1,7 @@
+/// <reference types="node" />
+import { IncomingHttpHeaders } from 'node:http';
+import { V4Options, V7Options } from 'uuid';
+import { FastifyRequest } from '../interface/http';
 /**
  *
  * @public
@@ -24,4 +28,13 @@ export declare class A5Util {
      * @returns 资源路径的绝对路径。
      */
     static tryWithAbsolutePath(sourcePath: string, basePath: string): string;
+    static nanoid(size?: number): string;
+    static uuidV4(options?: V4Options): string;
+    static uuidV7(options?: V7Options): string;
+    static getReqIdFromRequest(req: FastifyRequest): string;
+    static getReqHeadersFromRequest(req: FastifyRequest): IncomingHttpHeaders;
+    static getReqIdAndHeadersFromRequest(req: FastifyRequest): {
+        reqId: string;
+        reqHeaders: IncomingHttpHeaders;
+    };
 }

package/dist/util/a5.util.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.A5Util = void 0;
+const nanoid_1 = require("nanoid");
 const upath_1 = require("upath");
+const uuid_1 = require("uuid");
 /**
  *
  * @public
@@ -36,6 +38,28 @@ class A5Util {
             ? (0, upath_1.normalize)(sourcePath)
             : (0, upath_1.resolve)((0, upath_1.normalize)(basePath), (0, upath_1.normalize)(sourcePath));
     }
+    static nanoid(size) {
+        return (0, nanoid_1.nanoid)(size);
+    }
+    static uuidV4(options) {
+        return (0, uuid_1.v4)(options);
+    }
+    static uuidV7(options) {
+        return (0, uuid_1.v7)(options);
+    }
+    static getReqIdFromRequest(req) {
+        return req.id;
+    }
+    static getReqHeadersFromRequest(req) {
+        // TODO 支持 HTTP2
+        return req.headers;
+    }
+    static getReqIdAndHeadersFromRequest(req) {
+        return {
+            reqId: req.id,
+            reqHeaders: req.headers,
+        };
+    }
 }
 exports.A5Util = A5Util;
 //# sourceMappingURL=a5.util.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hz-9/a5-core",
-  "version": "0.2.0-alpha.41",
+  "version": "0.2.0-alpha.43",
   "description": "The core library for the `@hz-9/a5-*` series of repositories.",
   "keywords": [
     "nest",
@@ -38,23 +38,24 @@
   ],
   "dependencies": {
     "@nestjs/platform-fastify": "^10.0.0",
-    "fastify": "4.28.1",
     "@types/fs-extra": "~11.0.3",
     "@types/heft-jest": "~1.0.3",
     "@types/lodash": "~4.17.4",
     "@types/node": "~20.3.1",
     "@types/pug": "~2.0.10",
-    "@types/uuid": "~9.0.8",
+    "@types/uuid": "^10.0.0",
     "axios": "~1.7.2",
     "body-parser": "~1.20.2",
     "dayjs": "~1.11.10",
+    "fastify": "4.28.1",
     "fs-extra": "~11.1.1",
     "lodash": "~4.17.21",
     "nanoid": "^3.3.7",
     "pug": "~3.0.3",
     "type-fest": "~4.20.0",
     "upath": "~2.0.1",
-    "ua-parser-js": "~1.0.38"
+    "ua-parser-js": "~1.0.38",
+    "uuid": "^10.0.0"
   },
   "devDependencies": {
     "@hz-9/eslint-config-airbnb-ts": "~0.6.0",

package/dist/plugins/index.d.ts

@@ -1 +0,0 @@
-export * from './nanoid';

package/dist/plugins/index.js

@@ -1,18 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./nanoid"), exports);
-//# sourceMappingURL=index.js.map

package/dist/plugins/nanoid.d.ts

@@ -1 +0,0 @@
-export { nanoid } from 'nanoid';

package/dist/plugins/nanoid.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.nanoid = void 0;
-var nanoid_1 = require("nanoid");
-Object.defineProperty(exports, "nanoid", { enumerable: true, get: function () { return nanoid_1.nanoid; } });
-//# sourceMappingURL=nanoid.js.map