@venizia/ignis-helpers 0.4.8-9 → 0.4.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -3
- package/dist/esm/common/constants/app.d.ts +1 -3
- package/dist/esm/common/constants/app.js +1 -11
- package/dist/esm/common/constants/app.js.map +1 -1
- package/dist/esm/common/constants/http.d.ts +2 -0
- package/dist/esm/common/constants/http.js +3 -0
- package/dist/esm/common/constants/http.js.map +1 -1
- package/dist/esm/common/constants/mime.d.ts +0 -2
- package/dist/esm/common/constants/mime.js +0 -4
- package/dist/esm/common/constants/mime.js.map +1 -1
- package/dist/esm/common/redact.js.map +1 -1
- package/dist/esm/common/types/class.d.ts +14 -12
- package/dist/esm/common/types/class.js.map +1 -1
- package/dist/esm/common/types/const-value.d.ts +3 -3
- package/dist/esm/common/types/const-value.js.map +1 -1
- package/dist/esm/common/types/field-mapping.d.ts +6 -8
- package/dist/esm/common/types/field-mapping.js +0 -10
- package/dist/esm/common/types/field-mapping.js.map +1 -1
- package/dist/esm/common/types/index.d.ts +1 -0
- package/dist/esm/common/types/index.js +1 -0
- package/dist/esm/common/types/index.js.map +1 -1
- package/dist/esm/common/types/injection.d.ts +1 -1
- package/dist/esm/common/types/injection.js.map +1 -1
- package/dist/esm/common/types/json.d.ts +14 -0
- package/dist/esm/common/types/json.js +2 -0
- package/dist/esm/common/types/json.js.map +1 -0
- package/dist/esm/common/types/utility.d.ts +0 -4
- package/dist/esm/common/types/utility.js.map +1 -1
- package/dist/esm/modules/env/app-env.d.ts +17 -8
- package/dist/esm/modules/env/app-env.js +18 -15
- package/dist/esm/modules/env/app-env.js.map +1 -1
- package/dist/esm/modules/env/common/types.d.ts +22 -6
- package/dist/esm/modules/env/common/types.js.map +1 -1
- package/dist/esm/modules/logger/base/abstract.d.ts +6 -7
- package/dist/esm/modules/logger/base/abstract.js.map +1 -1
- package/dist/esm/modules/logger/base/base.d.ts +7 -8
- package/dist/esm/modules/logger/base/base.js.map +1 -1
- package/dist/esm/modules/logger/base/console.d.ts +6 -7
- package/dist/esm/modules/logger/base/console.js.map +1 -1
- package/dist/esm/modules/logger/common/types.d.ts +7 -7
- package/dist/esm/modules/logger/common/types.js.map +1 -1
- package/dist/esm/modules/logger/factory.js.map +1 -1
- package/dist/esm/modules/logger/hf/flusher.js.map +1 -1
- package/dist/esm/modules/logger/hf/logger.d.ts +6 -7
- package/dist/esm/modules/logger/hf/logger.js.map +1 -1
- package/dist/esm/modules/logger/pino/backing.js.map +1 -1
- package/dist/esm/modules/logger/pino/destination.d.ts +1 -1
- package/dist/esm/modules/logger/pino/destination.js.map +1 -1
- package/dist/esm/modules/logger/pino/logger.d.ts +1 -2
- package/dist/esm/modules/logger/pino/logger.js.map +1 -1
- package/dist/esm/modules/logger/winston/formats.js +2 -2
- package/dist/esm/modules/logger/winston/formats.js.map +1 -1
- package/dist/esm/modules/logger/winston/logger.d.ts +1 -2
- package/dist/esm/modules/logger/winston/logger.js.map +1 -1
- package/dist/esm/modules/logger/winston/transports/dgram.transport.d.ts +1 -1
- package/dist/esm/modules/logger/winston/transports/dgram.transport.js +1 -1
- package/dist/esm/modules/logger/winston/transports/dgram.transport.js.map +1 -1
- package/dist/esm/modules/network/http-request/common/constants.d.ts +0 -2
- package/dist/esm/modules/network/http-request/common/constants.js +0 -4
- package/dist/esm/modules/network/http-request/common/constants.js.map +1 -1
- package/dist/esm/modules/network/http-request/fetcher/axios-fetcher.d.ts +6 -6
- package/dist/esm/modules/network/http-request/fetcher/axios-fetcher.js.map +1 -1
- package/dist/esm/modules/network/http-request/fetcher/base-fetcher.d.ts +2 -3
- package/dist/esm/modules/network/http-request/fetcher/base-fetcher.js.map +1 -1
- package/dist/esm/modules/network/http-request/fetcher/common/types.d.ts +1 -1
- package/dist/esm/modules/network/http-request/fetcher/common/types.js.map +1 -1
- package/dist/esm/modules/network/http-request/fetcher/node-fetcher.d.ts +1 -2
- package/dist/esm/modules/network/http-request/fetcher/node-fetcher.js +5 -6
- package/dist/esm/modules/network/http-request/fetcher/node-fetcher.js.map +1 -1
- package/dist/esm/modules/network/tcp-socket/base-tcp-client.helper.d.ts +4 -4
- package/dist/esm/modules/network/tcp-socket/base-tcp-client.helper.js +1 -1
- package/dist/esm/modules/network/tcp-socket/base-tcp-client.helper.js.map +1 -1
- package/dist/esm/modules/network/tcp-socket/base-tcp-server.helper.d.ts +3 -5
- package/dist/esm/modules/network/tcp-socket/base-tcp-server.helper.js +0 -8
- package/dist/esm/modules/network/tcp-socket/base-tcp-server.helper.js.map +1 -1
- package/dist/esm/modules/network/utilities/query-string.d.ts +2 -2
- package/dist/esm/modules/network/utilities/query-string.js.map +1 -1
- package/dist/esm/modules/network/utilities/url-safety/common/constants.d.ts +0 -2
- package/dist/esm/modules/network/utilities/url-safety/common/constants.js +0 -4
- package/dist/esm/modules/network/utilities/url-safety/common/constants.js.map +1 -1
- package/dist/esm/modules/network/utilities/url-safety/ingest.js.map +1 -1
- package/dist/esm/modules/queue/bullmq/helper.d.ts +23 -10
- package/dist/esm/modules/queue/bullmq/helper.js +57 -10
- package/dist/esm/modules/queue/bullmq/helper.js.map +1 -1
- package/dist/esm/modules/queue/common/constants.d.ts +6 -2
- package/dist/esm/modules/queue/common/constants.js +6 -4
- package/dist/esm/modules/queue/common/constants.js.map +1 -1
- package/dist/esm/modules/queue/internal/sequential/common/types.d.ts +2 -4
- package/dist/esm/modules/queue/internal/sequential/common/types.js +0 -4
- package/dist/esm/modules/queue/internal/sequential/common/types.js.map +1 -1
- package/dist/esm/modules/queue/kafka/base.d.ts +1 -1
- package/dist/esm/modules/queue/kafka/base.js +13 -2
- package/dist/esm/modules/queue/kafka/base.js.map +1 -1
- package/dist/esm/modules/queue/kafka/common/constants.d.ts +0 -4
- package/dist/esm/modules/queue/kafka/common/constants.js +0 -8
- package/dist/esm/modules/queue/kafka/common/constants.js.map +1 -1
- package/dist/esm/modules/redis/base/abstract.helper.d.ts +13 -2
- package/dist/esm/modules/redis/base/abstract.helper.js +53 -45
- package/dist/esm/modules/redis/base/abstract.helper.js.map +1 -1
- package/dist/esm/modules/redis/cluster/cluster.helper.d.ts +1 -2
- package/dist/esm/modules/redis/cluster/cluster.helper.js +21 -9
- package/dist/esm/modules/redis/cluster/cluster.helper.js.map +1 -1
- package/dist/esm/modules/redis/cluster/index.d.ts +1 -0
- package/dist/esm/modules/redis/cluster/index.js +1 -0
- package/dist/esm/modules/redis/cluster/index.js.map +1 -1
- package/dist/esm/modules/redis/cluster/types.d.ts +20 -0
- package/dist/esm/modules/redis/cluster/types.js +2 -0
- package/dist/esm/modules/redis/cluster/types.js.map +1 -0
- package/dist/esm/modules/redis/common/constants.d.ts +15 -19
- package/dist/esm/modules/redis/common/constants.js +16 -18
- package/dist/esm/modules/redis/common/constants.js.map +1 -1
- package/dist/esm/modules/redis/common/types.d.ts +10 -60
- package/dist/esm/modules/redis/common/types.js.map +1 -1
- package/dist/esm/modules/redis/factory.d.ts +7 -25
- package/dist/esm/modules/redis/factory.js +9 -18
- package/dist/esm/modules/redis/factory.js.map +1 -1
- package/dist/esm/modules/redis/sentinel/constants.d.ts +14 -0
- package/dist/esm/modules/redis/sentinel/constants.js +11 -0
- package/dist/esm/modules/redis/sentinel/constants.js.map +1 -0
- package/dist/esm/modules/redis/sentinel/index.d.ts +2 -0
- package/dist/esm/modules/redis/sentinel/index.js +2 -0
- package/dist/esm/modules/redis/sentinel/index.js.map +1 -1
- package/dist/esm/modules/redis/sentinel/sentinel.helper.d.ts +1 -2
- package/dist/esm/modules/redis/sentinel/sentinel.helper.js +25 -15
- package/dist/esm/modules/redis/sentinel/sentinel.helper.js.map +1 -1
- package/dist/esm/modules/redis/sentinel/types.d.ts +26 -0
- package/dist/esm/modules/redis/sentinel/types.js +2 -0
- package/dist/esm/modules/redis/sentinel/types.js.map +1 -0
- package/dist/esm/modules/redis/single/index.d.ts +1 -0
- package/dist/esm/modules/redis/single/index.js +1 -0
- package/dist/esm/modules/redis/single/index.js.map +1 -1
- package/dist/esm/modules/redis/single/single.helper.d.ts +1 -2
- package/dist/esm/modules/redis/single/single.helper.js +5 -6
- package/dist/esm/modules/redis/single/single.helper.js.map +1 -1
- package/dist/esm/modules/redis/single/types.d.ts +15 -0
- package/dist/esm/modules/redis/single/types.js +2 -0
- package/dist/esm/modules/redis/single/types.js.map +1 -0
- package/dist/esm/modules/secrets/base/abstract.helper.js +6 -1
- package/dist/esm/modules/secrets/base/abstract.helper.js.map +1 -1
- package/dist/esm/modules/secrets/common/types/registration.d.ts +25 -6
- package/dist/esm/modules/secrets/common/types/registration.js.map +1 -1
- package/dist/esm/modules/secrets/dotenv/dotenv.helper.js +1 -1
- package/dist/esm/modules/secrets/dotenv/dotenv.helper.js.map +1 -1
- package/dist/esm/modules/secrets/factory.js +7 -6
- package/dist/esm/modules/secrets/factory.js.map +1 -1
- package/dist/esm/modules/secrets/hashicorp/hashicorp.helper.d.ts +12 -10
- package/dist/esm/modules/secrets/hashicorp/hashicorp.helper.js +50 -25
- package/dist/esm/modules/secrets/hashicorp/hashicorp.helper.js.map +1 -1
- package/dist/esm/modules/socket/socket-io/client/browser-helper.js.map +1 -1
- package/dist/esm/modules/socket/socket-io/common/types/client.d.ts +2 -2
- package/dist/esm/modules/socket/socket-io/common/types/client.js.map +1 -1
- package/dist/esm/modules/socket/socket-io/common/types/server.d.ts +3 -1
- package/dist/esm/modules/socket/socket-io/common/types/server.js.map +1 -1
- package/dist/esm/modules/socket/socket-io/server/helper.d.ts +2 -2
- package/dist/esm/modules/socket/socket-io/server/helper.js.map +1 -1
- package/dist/esm/modules/storage/base.d.ts +24 -60
- package/dist/esm/modules/storage/base.js +66 -123
- package/dist/esm/modules/storage/base.js.map +1 -1
- package/dist/esm/modules/storage/bun-s3/helper.d.ts +21 -35
- package/dist/esm/modules/storage/bun-s3/helper.js +126 -128
- package/dist/esm/modules/storage/bun-s3/helper.js.map +1 -1
- package/dist/esm/modules/storage/bun-s3/utility.d.ts +13 -7
- package/dist/esm/modules/storage/bun-s3/utility.js +63 -45
- package/dist/esm/modules/storage/bun-s3/utility.js.map +1 -1
- package/dist/esm/modules/storage/common/constants.d.ts +29 -2
- package/dist/esm/modules/storage/common/constants.js +29 -4
- package/dist/esm/modules/storage/common/constants.js.map +1 -1
- package/dist/esm/modules/storage/common/errors.d.ts +9 -0
- package/dist/esm/modules/storage/common/errors.js +9 -0
- package/dist/esm/modules/storage/common/errors.js.map +1 -1
- package/dist/esm/modules/storage/common/types.d.ts +90 -61
- package/dist/esm/modules/storage/common/types.js.map +1 -1
- package/dist/esm/modules/storage/common/utility.d.ts +8 -0
- package/dist/esm/modules/storage/common/utility.js +14 -2
- package/dist/esm/modules/storage/common/utility.js.map +1 -1
- package/dist/esm/modules/storage/disk/helper.d.ts +3 -8
- package/dist/esm/modules/storage/disk/helper.js +1 -0
- package/dist/esm/modules/storage/disk/helper.js.map +1 -1
- package/dist/esm/modules/storage/in-memory/helper.d.ts +2 -3
- package/dist/esm/modules/storage/in-memory/helper.js.map +1 -1
- package/dist/esm/modules/worker-thread/common/types.d.ts +2 -2
- package/dist/esm/modules/worker-thread/common/types.js.map +1 -1
- package/dist/esm/modules/worker-thread/thread/abstract.d.ts +2 -2
- package/dist/esm/modules/worker-thread/thread/abstract.js.map +1 -1
- package/dist/esm/modules/worker-thread/worker-pool.d.ts +1 -1
- package/dist/esm/modules/worker-thread/worker-pool.js.map +1 -1
- package/dist/esm/utilities/module.utility.d.ts +8 -5
- package/dist/esm/utilities/module.utility.js +5 -1
- package/dist/esm/utilities/module.utility.js.map +1 -1
- package/dist/esm/utilities/parse.utility.d.ts +34 -6
- package/dist/esm/utilities/parse.utility.js +82 -15
- package/dist/esm/utilities/parse.utility.js.map +1 -1
- package/dist/esm/utilities/performance.utility.d.ts +3 -3
- package/dist/esm/utilities/performance.utility.js.map +1 -1
- package/dist/esm/utilities/promise.utility.d.ts +1 -1
- package/dist/esm/utilities/promise.utility.js.map +1 -1
- package/dist/esm/utilities/request.utility.d.ts +9 -11
- package/dist/esm/utilities/request.utility.js.map +1 -1
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"destination.js","sourceRoot":"","sources":["../../../../../src/modules/logger/pino/destination.ts"],"names":[],"mappings":"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","sourcesContent":["import { Defaults } from '@/common/constants';\nimport { ParseUtility } from '@/utilities/parse.utility';\nimport { ModuleUtility } from '@/utilities/module.utility';\nimport path from 'node:path';\nimport pino from 'pino';\nimport { LoggerFormats, LoggerConfigUtility } from '../common';\n\nimport { PinoFrequencies, type TFrequency } from './common';\n\n/** Pure description of where pino should write, derived from env; `PinoDestination.build()` is the impure half that acts on it. */\nexport type TDestinationPlan =\n | { kind: 'stdout' }\n | { kind: 'pretty' }\n | {\n kind: 'roll';\n options: {\n file: string;\n frequency: TFrequency;\n size: string;\n limit: { count: number };\n mkdir: true;\n };\n };\n\n/** Reads `APP_ENV_LOGGER_*` and turns it into a destination. Warning prefixes name the operation, not the class - the tests and the published API still call these `mapFrequency`/`mapMaxFilesToCount`. */\nexport class PinoDestination {\n private static readonly DEFAULT_FREQUENCY: TFrequency = PinoFrequencies.HOURLY;\n private static readonly DEFAULT_MAX_FILES = '5d';\n\n /** `APP_ENV_LOGGER_FILE_FREQUENCY` -> pino-roll's `frequency`; an unrecognized value warns and falls back rather than throwing, so the app still boots. */\n static mapFrequency(opts: { value?: string }): TFrequency {\n const { value } = opts;\n const normalized = (value ?? '1h').trim().toLowerCase();\n\n switch (normalized) {\n case '1h': {\n return PinoFrequencies.HOURLY;\n }\n case '1d':\n case '24h': {\n return PinoFrequencies.DAILY;\n }\n default: {\n console.warn(\n '[mapFrequency] Invalid logger file frequency | value: %s | fallback: %s',\n value,\n PinoDestination.DEFAULT_FREQUENCY,\n );\n\n return PinoDestination.DEFAULT_FREQUENCY;\n }\n }\n }\n\n /** `null` means \"not a recognized shape\" - the caller decides what default to fall back to. */\n private static parseMaxFilesValue(value: string, frequency: TFrequency): number | null {\n const dayMatch = /^(\\d+)d$/i.exec(value);\n\n if (dayMatch) {\n const days = Number.parseInt(dayMatch[1], 10);\n\n return frequency === 'hourly' ? days * 24 : days;\n }\n\n const bareMatch = /^\\d+$/.exec(value);\n\n if (bareMatch) {\n return Number.parseInt(value, 10);\n }\n\n return null;\n }\n\n /** `APP_ENV_LOGGER_FILE_MAX_FILES` -> pino-roll's `limit.count`: `'<n>d'` scales by frequency (hourly: days*24), a bare integer is a literal count, unrecognized falls back to `'5d'`. */\n static mapMaxFilesToCount(opts: { value?: string; frequency: TFrequency }): number {\n const { value, frequency } = opts;\n const normalized = value?.trim();\n\n if (normalized) {\n const parsed = PinoDestination.parseMaxFilesValue(normalized, frequency);\n\n if (parsed !== null) {\n return parsed;\n }\n }\n\n // Unset is a normal configuration (mirror the sibling defaults) - only a PROVIDED value that failed to parse deserves a warning.\n if (normalized && normalized !== PinoDestination.DEFAULT_MAX_FILES) {\n console.warn(\n '[mapMaxFilesToCount] Invalid logger file max files value | value: %s | fallback: %s',\n value,\n PinoDestination.DEFAULT_MAX_FILES,\n );\n }\n\n return PinoDestination.parseMaxFilesValue(\n PinoDestination.DEFAULT_MAX_FILES,\n frequency,\n ) as number;\n }\n\n /** Pure: which destination pino should write to, derived from `APP_ENV_LOGGER_*` at CALL time. `DATE_PATTERN` is deliberately not read - pino-roll has no equivalent. */\n static resolvePlan(): TDestinationPlan {\n const folderPath = process.env.APP_ENV_LOGGER_FOLDER_PATH;\n\n if (folderPath && folderPath.trim() !== '') {\n const frequency = PinoDestination.mapFrequency({\n value: process.env.APP_ENV_LOGGER_FILE_FREQUENCY,\n });\n const count = PinoDestination.mapMaxFilesToCount({\n value: process.env.APP_ENV_LOGGER_FILE_MAX_FILES,\n frequency,\n });\n\n return {\n kind: 'roll',\n options: {\n file: path.join(folderPath, Defaults.APPLICATION_NAME),\n frequency,\n size:\n ParseUtility.blankToUndefined({ input: process.env.APP_ENV_LOGGER_FILE_MAX_SIZE }) ??\n '100m',\n limit: { count },\n mkdir: true,\n },\n };\n }\n\n // UNSET means NDJSON to stdout, the locked default for this provider; only an EXPLICIT `text` opts into pino-pretty, and falling back to TEXT here (winston's default) would make the documented minimal install (pino only, no pino-pretty) crash on its first log line.\n if (process.env.APP_ENV_LOGGER_FORMAT === LoggerFormats.TEXT) {\n return { kind: 'pretty' };\n }\n\n return { kind: 'stdout' };\n }\n\n /** `pino.transport()` is SYNCHRONOUS - it returns a `ThreadStream` that BUFFERS writes until its worker thread loads, so no async gating is needed; `ModuleUtility.assertInstalled` runs first so a missing optional peer fails loudly here, not as an opaque worker-thread crash. */\n static build(opts: { plan: TDestinationPlan }): pino.DestinationStream | undefined {\n const { plan } = opts;\n\n switch (plan.kind) {\n case 'stdout': {\n return undefined;\n }\n case 'pretty': {\n ModuleUtility.assertInstalled({ scope: 'PinoLogger', modules: ['pino-pretty'] });\n\n // Only a decision is forwarded. Left alone, pino-pretty's own `isColorSupported` still\n // suppresses color when stdout is not a terminal - a check winston has no equivalent of.\n const colorize = LoggerConfigUtility.resolveColorize();\n\n return pino.transport({\n target: 'pino-pretty',\n ...(colorize === undefined ? {} : { options: { colorize } }),\n });\n }\n case 'roll': {\n ModuleUtility.assertInstalled({ scope: 'PinoLogger', modules: ['pino-roll'] });\n\n return pino.transport({ target: 'pino-roll', options: plan.options });\n }\n default: {\n return undefined;\n }\n }\n }\n}\n"]}
|
|
1
|
+
{"version":3,"file":"destination.js","sourceRoot":"","sources":["../../../../../src/modules/logger/pino/destination.ts"],"names":[],"mappings":"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","sourcesContent":["import { Defaults } from '@/common/constants';\nimport { ParseUtility } from '@/utilities/parse.utility';\nimport { ModuleUtility } from '@/utilities/module.utility';\nimport path from 'node:path';\nimport pino from 'pino';\nimport { LoggerFormats, LoggerConfigUtility } from '../common';\n\nimport { PinoFrequencies, type TFrequency } from './common';\n\n/** Pure description of where pino should write, derived from env; `PinoDestination.build()` is the impure half that acts on it. */\nexport type TDestinationPlan =\n | { kind: 'stdout' }\n | { kind: 'pretty' }\n | {\n kind: 'roll';\n options: {\n file: string;\n frequency: TFrequency;\n size: string;\n limit: { count: number };\n mkdir: true;\n };\n };\n\n/** Reads `APP_ENV_LOGGER_*` and turns it into a destination. Warning prefixes name the operation, not the class - the tests and the published API still call these `mapFrequency`/`mapMaxFilesToCount`. */\nexport class PinoDestination {\n private static readonly DEFAULT_FREQUENCY: TFrequency = PinoFrequencies.HOURLY;\n private static readonly DEFAULT_MAX_FILES = '5d';\n\n /** `APP_ENV_LOGGER_FILE_FREQUENCY` -> pino-roll's `frequency`; an unrecognized value warns and falls back rather than throwing, so the app still boots. */\n static mapFrequency(opts: { value?: string }): TFrequency {\n const { value } = opts;\n const normalized = (value ?? '1h').trim().toLowerCase();\n\n switch (normalized) {\n case '1h': {\n return PinoFrequencies.HOURLY;\n }\n case '1d':\n case '24h': {\n return PinoFrequencies.DAILY;\n }\n default: {\n console.warn(\n '[mapFrequency] Invalid logger file frequency | value: %s | fallback: %s',\n value,\n PinoDestination.DEFAULT_FREQUENCY,\n );\n\n return PinoDestination.DEFAULT_FREQUENCY;\n }\n }\n }\n\n /** `null` means \"not a recognized shape\" - the caller decides what default to fall back to. */\n private static parseMaxFilesValue(value: string, frequency: TFrequency): number | null {\n const dayMatch = /^(\\d+)d$/i.exec(value);\n\n if (dayMatch) {\n const days = Number.parseInt(dayMatch[1], 10);\n\n return frequency === 'hourly' ? days * 24 : days;\n }\n\n const bareMatch = /^\\d+$/.exec(value);\n\n if (bareMatch) {\n return Number.parseInt(value, 10);\n }\n\n return null;\n }\n\n /** `APP_ENV_LOGGER_FILE_MAX_FILES` -> pino-roll's `limit.count`: `'<n>d'` scales by frequency (hourly: days*24), a bare integer is a literal count, unrecognized falls back to `'5d'`. */\n static mapMaxFilesToCount(opts: { value?: string; frequency: TFrequency }): number {\n const { value, frequency } = opts;\n const normalized = value?.trim();\n\n if (normalized) {\n const parsed = PinoDestination.parseMaxFilesValue(normalized, frequency);\n\n if (parsed !== null) {\n return parsed;\n }\n }\n\n // Unset is a normal configuration (mirror the sibling defaults) - only a PROVIDED value that failed to parse deserves a warning.\n if (normalized && normalized !== PinoDestination.DEFAULT_MAX_FILES) {\n console.warn(\n '[mapMaxFilesToCount] Invalid logger file max files value | value: %s | fallback: %s',\n value,\n PinoDestination.DEFAULT_MAX_FILES,\n );\n }\n\n return PinoDestination.parseMaxFilesValue(\n PinoDestination.DEFAULT_MAX_FILES,\n frequency,\n ) as number;\n }\n\n /** Pure: which destination pino should write to, derived from `APP_ENV_LOGGER_*` at CALL time. `DATE_PATTERN` is deliberately not read - pino-roll has no equivalent. */\n static resolvePlan(): TDestinationPlan {\n const folderPath = process.env.APP_ENV_LOGGER_FOLDER_PATH;\n\n if (folderPath && folderPath.trim() !== '') {\n const frequency = PinoDestination.mapFrequency({\n value: process.env.APP_ENV_LOGGER_FILE_FREQUENCY,\n });\n const count = PinoDestination.mapMaxFilesToCount({\n value: process.env.APP_ENV_LOGGER_FILE_MAX_FILES,\n frequency,\n });\n\n return {\n kind: 'roll',\n options: {\n file: path.join(folderPath, Defaults.APPLICATION_NAME),\n frequency,\n size:\n ParseUtility.blankToUndefined({ input: process.env.APP_ENV_LOGGER_FILE_MAX_SIZE }) ??\n '100m',\n limit: { count },\n mkdir: true,\n },\n };\n }\n\n // UNSET means NDJSON to stdout, the locked default for this provider; only an EXPLICIT `text` opts into pino-pretty, and falling back to TEXT here (winston's default) would make the documented minimal install (pino only, no pino-pretty) crash on its first log line.\n if (process.env.APP_ENV_LOGGER_FORMAT === LoggerFormats.TEXT) {\n return { kind: 'pretty' };\n }\n\n return { kind: 'stdout' };\n }\n\n /** `pino.transport()` is SYNCHRONOUS - it returns a `ThreadStream` that BUFFERS writes until its worker thread loads, so no async gating is needed; `ModuleUtility.assertInstalled` runs first so a missing optional peer fails loudly here, not as an opaque worker-thread crash. */\n static build(opts: { plan: TDestinationPlan }): ReturnType<typeof pino.transport> | undefined {\n const { plan } = opts;\n\n switch (plan.kind) {\n case 'stdout': {\n return undefined;\n }\n case 'pretty': {\n ModuleUtility.assertInstalled({ scope: 'PinoLogger', modules: ['pino-pretty'] });\n\n // Only a decision is forwarded. Left alone, pino-pretty's own `isColorSupported` still\n // suppresses color when stdout is not a terminal - a check winston has no equivalent of.\n const colorize = LoggerConfigUtility.resolveColorize();\n\n return pino.transport({\n target: 'pino-pretty',\n ...(colorize === undefined ? {} : { options: { colorize } }),\n });\n }\n case 'roll': {\n ModuleUtility.assertInstalled({ scope: 'PinoLogger', modules: ['pino-roll'] });\n\n return pino.transport({ target: 'pino-roll', options: plan.options });\n }\n default: {\n return undefined;\n }\n }\n }\n}\n"]}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { type AnyType } from '../../../common/types/index.js';
|
|
2
1
|
import { BaseLogger } from '../base/index.js';
|
|
3
2
|
import { type ILogger, type TLogLevel } from '../common/index.js';
|
|
4
3
|
/** pino provider satisfying `ILoggerProvider`, staying pino-native: numeric levels, `msg`, epoch `time`, pid/hostname pass through unchanged. No custom-instance param on `get()` unlike `WinstonLogger.get` - advanced/test injection goes through `PinoBackingLogger.set()`. */
|
|
@@ -10,7 +9,7 @@ export declare class PinoLogger extends BaseLogger {
|
|
|
10
9
|
protected write(opts: {
|
|
11
10
|
level: TLogLevel;
|
|
12
11
|
message: string;
|
|
13
|
-
args:
|
|
12
|
+
args: unknown[];
|
|
14
13
|
}): void;
|
|
15
14
|
protected child(opts: {
|
|
16
15
|
scope: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../../src/modules/logger/pino/logger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../../src/modules/logger/pino/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAErC,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAE9C,kRAAkR;AAClR,MAAM,OAAO,UAAW,SAAQ,UAAU;aACzB,UAAK,GAAG,IAAI,GAAG,EAAsB,CAAC;IAErD,YAAoB,KAAa;QAC/B,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IACnB,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,KAAa;QACtB,IAAI,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAEnC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,GAAG,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC;YAC/B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAChC,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,6JAA6J;IACnJ,KAAK,CAAC,IAA4D;QAC1E,MAAM,IAAI,GACR,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC;YAClB,CAAC,CAAC,gBAAgB,CAAC,aAAa,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;YAC5E,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;QAEnB,MAAM,OAAO,GAAG,iBAAiB,CAAC,GAAG,EAAE,CAAC;QACxC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAC;IACpD,CAAC;IAES,KAAK,CAAC,IAAuB;QACrC,OAAO,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC","sourcesContent":["import { BaseLogger } from '../base';\nimport { type ILogger, type TLogLevel } from '../common';\nimport { LogFormatUtility } from '../formatting';\nimport { PinoBackingLogger } from './backing';\n\n/** pino provider satisfying `ILoggerProvider`, staying pino-native: numeric levels, `msg`, epoch `time`, pid/hostname pass through unchanged. No custom-instance param on `get()` unlike `WinstonLogger.get` - advanced/test injection goes through `PinoBackingLogger.set()`. */\nexport class PinoLogger extends BaseLogger {\n private static cache = new Map<string, PinoLogger>();\n\n private constructor(scope: string) {\n super({ scope });\n }\n\n static get(scope: string): PinoLogger {\n let cached = this.cache.get(scope);\n\n if (!cached) {\n cached = new PinoLogger(scope);\n this.cache.set(scope, cached);\n }\n\n return cached;\n }\n\n /** Resolves the backing instance at WRITE time and never caches it, so `PinoBackingLogger.set()` takes effect for every already-issued scope immediately. */\n protected write(opts: { level: TLogLevel; message: string; args: unknown[] }) {\n const line =\n opts.args.length > 0\n ? LogFormatUtility.formatMessage({ message: opts.message, args: opts.args })\n : opts.message;\n\n const backing = PinoBackingLogger.get();\n backing[opts.level](this._formattedPrefix + line);\n }\n\n protected child(opts: { scope: string }): ILogger {\n return PinoLogger.get(opts.scope);\n }\n}\n"]}
|
|
@@ -18,8 +18,8 @@ export class WinstonFormatFactory {
|
|
|
18
18
|
/** Drop-in replacement for `winston.format.splat()` that formats through {@link LogFormatUtility.formatMessage}; every transport reads `info.message`, so widening it here widens console, file and dgram at once. */
|
|
19
19
|
static deepSplat() {
|
|
20
20
|
return f((info) => {
|
|
21
|
-
const args = info
|
|
22
|
-
if (!args
|
|
21
|
+
const args = Reflect.get(info, SPLAT);
|
|
22
|
+
if (!Array.isArray(args) || !args.length || typeof info.message !== 'string') {
|
|
23
23
|
return info;
|
|
24
24
|
}
|
|
25
25
|
info.message = LogFormatUtility.formatMessage({ message: info.message, args });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formats.js","sourceRoot":"","sources":["../../../../../src/modules/logger/winston/formats.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,OAAO,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"formats.js","sourceRoot":"","sources":["../../../../../src/modules/logger/winston/formats.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAsB,MAAM,WAAW,CAAC;AACnF,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEjD,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;AAEzB,qGAAqG;AACrG,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AAElC;;;GAGG;AACH,MAAM,OAAO,oBAAoB;IAC/B,yKAAyK;IACzK,MAAM,CAAC,IAAI,CAAC,IAAuB;QACjC,OAAO,CAAC,CAAC,OAAO,CACd,CAAC,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,EAC9B,CAAC,CAAC,SAAS,EAAE,EACb,CAAC,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,EACzB,oBAAoB,CAAC,SAAS,EAAE,CACjC,CAAC;IACJ,CAAC;IAED,sNAAsN;IACtN,MAAM,CAAC,SAAS;QACd,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE;YAChB,MAAM,IAAI,GAAY,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAE/C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,OAAO,IAAI,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;gBAC7E,OAAO,IAAI,CAAC;YACd,CAAC;YAED,IAAI,CAAC,OAAO,GAAG,gBAAgB,CAAC,aAAa,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;YAE/E,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,EAAE,CAAC;IACP,CAAC;IAED,MAAM,CAAC,QAAQ;QACb,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE;YACvD,OAAO,GAAG,SAAS,KAAK,KAAK,KAAK,KAAK,KAAK,OAAO,EAAE,CAAC;QACxD,CAAC,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,IAAuB;QACjC,OAAO,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAC/E,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,IAA2C;QACvD,8FAA8F;QAC9F,MAAM,EAAE,KAAK,EAAE,QAAQ,GAAG,mBAAmB,CAAC,eAAe,EAAE,IAAI,IAAI,EAAE,GAAG,IAAI,CAAC;QAEjF,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,CAAC,CAAC,OAAO,CACd,oBAAoB,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,EACpC,CAAC,CAAC,KAAK,EAAE,EACT,CAAC,CAAC,QAAQ,EAAE,EACZ,oBAAoB,CAAC,QAAQ,EAAE,CAChC,CAAC;QACJ,CAAC;QAED,OAAO,CAAC,CAAC,OAAO,CACd,oBAAoB,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,EACpC,CAAC,CAAC,KAAK,EAAE,EACT,oBAAoB,CAAC,QAAQ,EAAE,CAChC,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,IAA+C;QACxD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAK,aAA+B,CAAC;QAE/D,QAAQ,MAAM,EAAE,CAAC;YACf,KAAK,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;gBACxB,OAAO,oBAAoB,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;YAC1D,CAAC;YACD,KAAK,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;gBACxB,OAAO,oBAAoB,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;YAC5D,CAAC;YACD,OAAO,CAAC,CAAC,CAAC;gBACR,MAAM,QAAQ,CAAC;oBACb,OAAO,EAAE,kDAAkD,MAAM,cAAc,CAAC,GAAG,aAAa,CAAC,UAAU,CAAC,EAAE;iBAC/G,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC;IAED,oJAAoJ;IACpJ,MAAM,CAAC,QAAQ,CAAC,IAAkD;QAChE,QAAQ,IAAI,CAAC,MAAM,EAAE,CAAC;YACpB,KAAK,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;gBACxB,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;YAC/C,CAAC;YACD,KAAK,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;gBACxB,OAAO;oBACL,OAAO,EAAE,IAAI,CAAC,QAAQ;wBACpB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,QAAQ,EAAE,EAAE,oBAAoB,CAAC,QAAQ,EAAE,CAAC;wBACrE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,oBAAoB,CAAC,QAAQ,EAAE,CAAC;oBACzD,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,oBAAoB,CAAC,QAAQ,EAAE,CAAC;iBAC5D,CAAC;YACJ,CAAC;YACD,OAAO,CAAC,CAAC,CAAC;gBACR,MAAM,QAAQ,CAAC;oBACb,OAAO,EAAE,wDAAwD,IAAI,CAAC,MAAM,cAAc,CAAC,GAAG,aAAa,CAAC,UAAU,CAAC,EAAE;iBAC1H,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC;aAEe,4BAAuB,GAA2B,oBAAoB,CAAC,GAAG,CAAC;QACzF,KAAK,EAAE,aAAa;KACrB,CAAC,CAAC","sourcesContent":["import { getError } from '@venizia/ignis-inversion';\nimport winston from 'winston';\nimport { LOGGER_FORMAT, LOGGER_PREFIX } from './common/constants';\nimport { LoggerFormats, LoggerConfigUtility, type TLoggerFormat } from '../common';\nimport { LogFormatUtility } from '../formatting';\n\nconst f = winston.format;\n\n/** Winston stashes the extra arguments of `logger.error(msg, ...args)` under this well-known key. */\nconst SPLAT = Symbol.for('splat');\n\n/**\n * Static methods never reach a sibling through `this` - the exported names in `define.ts` are\n * unbound aliases (`WinstonFormatFactory.method`), so `this` would be `undefined` there.\n */\nexport class WinstonFormatFactory {\n /** Per-line prep: label, timestamp, error normalization, deep splat. Final-string assembly is per-transport, so console can colorize while files/UDP get plain lines. */\n static prep(opts: { label: string }) {\n return f.combine(\n f.label({ label: opts.label }),\n f.timestamp(),\n f.errors({ stack: true }),\n WinstonFormatFactory.deepSplat(),\n );\n }\n\n /** Drop-in replacement for `winston.format.splat()` that formats through {@link LogFormatUtility.formatMessage}; every transport reads `info.message`, so widening it here widens console, file and dgram at once. */\n static deepSplat() {\n return f((info) => {\n const args: unknown = Reflect.get(info, SPLAT);\n\n if (!Array.isArray(args) || !args.length || typeof info.message !== 'string') {\n return info;\n }\n\n info.message = LogFormatUtility.formatMessage({ message: info.message, args });\n\n return info;\n })();\n }\n\n static textLine() {\n return f.printf(({ level, message, label, timestamp }) => {\n return `${timestamp} [${label}] ${level}: ${message}`;\n });\n }\n\n static json(opts: { label: string }) {\n return f.combine(WinstonFormatFactory.prep({ label: opts.label }), f.json());\n }\n\n static pretty(opts: { label: string; colorize?: boolean }) {\n // winston has no terminal detection of its own, so \"no opinion\" keeps the historical default.\n const { label, colorize = LoggerConfigUtility.resolveColorize() ?? true } = opts;\n\n if (colorize) {\n return f.combine(\n WinstonFormatFactory.prep({ label }),\n f.align(),\n f.colorize(),\n WinstonFormatFactory.textLine(),\n );\n }\n\n return f.combine(\n WinstonFormatFactory.prep({ label }),\n f.align(),\n WinstonFormatFactory.textLine(),\n );\n }\n\n static log(opts: { label: string; format?: TLoggerFormat }) {\n const format = opts.format ?? (LOGGER_FORMAT as TLoggerFormat);\n\n switch (format) {\n case LoggerFormats.JSON: {\n return WinstonFormatFactory.json({ label: opts.label });\n }\n case LoggerFormats.TEXT: {\n return WinstonFormatFactory.pretty({ label: opts.label });\n }\n default: {\n throw getError({\n message: `[defineLogger] Invalid logger format | format: ${format} | valids: ${[...LoggerFormats.SCHEME_SET]}`,\n });\n }\n }\n }\n\n /** Per-transport assembly formats: console may colorize, a file never does - ANSI bytes in a rotated log file are noise every grep has to strip. */\n static assembly(opts: { format: TLoggerFormat; colorize: boolean }) {\n switch (opts.format) {\n case LoggerFormats.JSON: {\n return { console: f.json(), file: f.json() };\n }\n case LoggerFormats.TEXT: {\n return {\n console: opts.colorize\n ? f.combine(f.align(), f.colorize(), WinstonFormatFactory.textLine())\n : f.combine(f.align(), WinstonFormatFactory.textLine()),\n file: f.combine(f.align(), WinstonFormatFactory.textLine()),\n };\n }\n default: {\n throw getError({\n message: `[defineCustomLogger] Invalid logger format | format: ${opts.format} | valids: ${[...LoggerFormats.SCHEME_SET]}`,\n });\n }\n }\n }\n\n static readonly applicationLogFormatter: winston.Logform.Format = WinstonFormatFactory.log({\n label: LOGGER_PREFIX,\n });\n}\n"]}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import type winston from 'winston';
|
|
2
|
-
import { type AnyType } from '../../../common/types/index.js';
|
|
3
2
|
import { BaseLogger } from '../base/index.js';
|
|
4
3
|
import { type ILogger, type TLogLevel } from '../common/index.js';
|
|
5
4
|
/** `ILogger` backed by winston, obtained with `get(scope)`; also exported as `Logger`. Lines below the winston logger level are skipped before formatting. */
|
|
@@ -12,7 +11,7 @@ export declare class WinstonLogger extends BaseLogger {
|
|
|
12
11
|
protected write(opts: {
|
|
13
12
|
level: TLogLevel;
|
|
14
13
|
message: string;
|
|
15
|
-
args:
|
|
14
|
+
args: unknown[];
|
|
16
15
|
}): void;
|
|
17
16
|
protected child(opts: {
|
|
18
17
|
scope: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../../src/modules/logger/winston/logger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../../src/modules/logger/winston/logger.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAErC,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAEhD,8JAA8J;AAC9J,MAAM,OAAO,aAAc,SAAQ,UAAU;aAC5B,UAAK,GAAG,IAAI,GAAG,EAAyB,CAAC;IAGxD,YAAoB,KAAa,EAAE,MAAsB;QACvD,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAED,4KAA4K;IAC5K,MAAM,CAAC,GAAG,CAAC,KAAa,EAAE,YAA6B;QACrD,IAAI,YAAY,EAAE,CAAC;YACjB,OAAO,IAAI,aAAa,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;QAChD,CAAC;QAED,IAAI,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAEnC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,GAAG,IAAI,aAAa,CAAC,KAAK,EAAE,oBAAoB,CAAC,CAAC;YACxD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAChC,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAES,KAAK,CAAC,IAA4D;QAC1E,mFAAmF;QACnF,+FAA+F;QAC/F,6FAA6F;QAC7F,oCAAoC;QACpC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAC7C,OAAO;QACT,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;IACnF,CAAC;IAES,KAAK,CAAC,IAAuB;QACrC,IAAI,IAAI,CAAC,OAAO,KAAK,oBAAoB,EAAE,CAAC;YAC1C,OAAO,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvC,CAAC;QAED,OAAO,IAAI,aAAa,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACrD,CAAC;;AAGH,OAAO,EAAE,aAAa,IAAI,MAAM,EAAE,CAAC","sourcesContent":["import type winston from 'winston';\nimport { BaseLogger } from '../base';\nimport { type ILogger, type TLogLevel } from '../common';\nimport { defaultWinstonLogger } from './define';\n\n/** `ILogger` backed by winston, obtained with `get(scope)`; also exported as `Logger`. Lines below the winston logger level are skipped before formatting. */\nexport class WinstonLogger extends BaseLogger {\n private static cache = new Map<string, WinstonLogger>();\n private readonly _logger: winston.Logger;\n\n private constructor(scope: string, logger: winston.Logger) {\n super({ scope });\n this._logger = logger;\n }\n\n /** Default-backed loggers are cached per scope; a custom-backed logger is a fresh wrapper every call - a scope-keyed cache can't tell different winston instances apart. */\n static get(scope: string, customLogger?: winston.Logger): WinstonLogger {\n if (customLogger) {\n return new WinstonLogger(scope, customLogger);\n }\n\n let cached = this.cache.get(scope);\n\n if (!cached) {\n cached = new WinstonLogger(scope, defaultWinstonLogger);\n this.cache.set(scope, cached);\n }\n\n return cached;\n }\n\n protected write(opts: { level: TLogLevel; message: string; args: unknown[] }) {\n // Asked BEFORE handing the line to winston. The deep-splat format - redaction plus\n // `util.inspect` over the whole argument graph - runs as part of winston's pipeline, so a line\n // the level was going to discard was formatted in full first. Measured: 3.6 us per discarded\n // line, against 0.08 us once gated.\n if (!this._logger.isLevelEnabled(opts.level)) {\n return;\n }\n\n this._logger.log(opts.level, this._formattedPrefix + opts.message, ...opts.args);\n }\n\n protected child(opts: { scope: string }): ILogger {\n if (this._logger === defaultWinstonLogger) {\n return WinstonLogger.get(opts.scope);\n }\n\n return new WinstonLogger(opts.scope, this._logger);\n }\n}\n\nexport { WinstonLogger as Logger };\n"]}
|
|
@@ -17,7 +17,7 @@ export declare class DgramTransport extends Transport {
|
|
|
17
17
|
message: string;
|
|
18
18
|
label?: string;
|
|
19
19
|
timestamp?: string;
|
|
20
|
-
[extra: symbol]:
|
|
20
|
+
[extra: symbol]: unknown;
|
|
21
21
|
}, callback: () => void): void;
|
|
22
22
|
}
|
|
23
23
|
//# sourceMappingURL=dgram.transport.d.ts.map
|
|
@@ -39,7 +39,7 @@ export class DgramTransport extends Transport {
|
|
|
39
39
|
this.emit('logged', opts);
|
|
40
40
|
});
|
|
41
41
|
const logLevel = opts[Symbol.for('level')];
|
|
42
|
-
if (!this.triggerLevels.has(logLevel)) {
|
|
42
|
+
if (typeof logLevel !== 'string' || !this.triggerLevels.has(logLevel)) {
|
|
43
43
|
callback();
|
|
44
44
|
return;
|
|
45
45
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dgram.transport.js","sourceRoot":"","sources":["../../../../../../src/modules/logger/winston/transports/dgram.transport.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,YAAY,CAAC;AAC/B,OAAO,SAAS,MAAM,mBAAmB,CAAC;AAG1C,mSAAmS;AACnS,MAAM,OAAO,cAAe,SAAQ,SAAS;IAS3C,YAAY,IAA4B;QACtC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,uBAAuB,EAAE,GAAG,IAAI,CAAC;QACtF,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAE/B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,aAAa,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC;QACrC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QAEnC,IAAI,CAAC,SAAS,CAAC,EAAE,aAAa,EAAE,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;IACxD,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,IAAsC;QACvD,IACE,CAAC,IAAI,EAAE,KAAK;YACZ,CAAC,IAAI,EAAE,IAAI;YACX,CAAC,IAAI,EAAE,IAAI;YACX,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM;YACrB,CAAC,IAAI,EAAE,aAAa,EACpB,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,IAAI,cAAc,CAAC,IAA8B,CAAC,CAAC;IAC5D,CAAC;IAEO,SAAS,CAAC,IAA4C;QAC5D,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAErD,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YAChC,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC;YACrB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;YAEnB,OAAO,CAAC,KAAK,CAAC,wBAAwB,EAAE,KAAK,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,aAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"dgram.transport.js","sourceRoot":"","sources":["../../../../../../src/modules/logger/winston/transports/dgram.transport.ts"],"names":[],"mappings":"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","sourcesContent":["import dgram from 'node:dgram';\nimport Transport from 'winston-transport';\nimport { type IDgramTransportOptions } from '../common';\n\n/** Winston transport that sends the lines of the configured levels as UDP datagrams. A send failure is reported to the console and the socket is reopened on the next line; it never throws. `fromPartial` returns `null` when `label`, `host`, `port`, `levels` or `socketOptions` is missing. */\nexport class DgramTransport extends Transport {\n private label: string;\n private host: string;\n private port: number;\n private triggerLevels: Set<string>;\n private socketOptions: dgram.SocketOptions;\n\n private client: dgram.Socket | null;\n\n constructor(opts: IDgramTransportOptions) {\n const { label, host, port, levels, socketOptions, ...defaultTransportOptions } = opts;\n super(defaultTransportOptions);\n\n this.label = label;\n this.host = host;\n this.port = port;\n this.triggerLevels = new Set(levels);\n this.socketOptions = socketOptions;\n\n this.establish({ socketOptions: this.socketOptions });\n }\n\n static fromPartial(opts?: Partial<IDgramTransportOptions>): DgramTransport | null {\n if (\n !opts?.label ||\n !opts?.host ||\n !opts?.port ||\n !opts?.levels?.length ||\n !opts?.socketOptions\n ) {\n return null;\n }\n\n return new DgramTransport(opts as IDgramTransportOptions);\n }\n\n private establish(opts: { socketOptions: dgram.SocketOptions }) {\n this.client = dgram.createSocket(opts.socketOptions);\n\n this.client.on('error', (error) => {\n this.client?.close();\n this.client = null;\n\n console.error('[dgram][error] Error: ', error);\n });\n }\n\n private formatMessage(opts: { [extra: string | symbol]: unknown }) {\n const { timestamp, label, message, ...rest } = opts;\n\n return [timestamp, `[${this.label ?? label}]`, rest[Symbol.for('level')], message].join(' ');\n }\n\n override log(\n opts: {\n level: string;\n message: string;\n label?: string;\n timestamp?: string;\n [extra: symbol]: unknown;\n },\n callback: () => void,\n ) {\n setImmediate(() => {\n this.emit('logged', opts);\n });\n\n const logLevel = opts[Symbol.for('level')];\n\n if (typeof logLevel !== 'string' || !this.triggerLevels.has(logLevel)) {\n callback();\n\n return;\n }\n\n if (!this.client) {\n this.establish({ socketOptions: this.socketOptions });\n }\n\n const message = this.formatMessage(opts);\n this.client?.send(message, this.port, this.host, (error) => {\n if (error) {\n // console, not the Logger and not an 'error' EVENT: routing through the Logger would re-enter this very transport, and emitting 'error' with no listener attached kills the process over one lost UDP log line. Drop the socket so the next line reconnects.\n console.error('[DgramTransport][log] Failed to ship log line | error: ', error);\n this.client?.close();\n this.client = null;\n }\n\n callback();\n });\n }\n}\n"]}
|
|
@@ -3,8 +3,6 @@ import type { TConstValue } from '../../../../common/types/index.js';
|
|
|
3
3
|
export declare class FetcherVariants {
|
|
4
4
|
static readonly NODE_FETCH = "node-fetch";
|
|
5
5
|
static readonly AXIOS = "axios";
|
|
6
|
-
static readonly SCHEME_SET: Set<string>;
|
|
7
|
-
static isValid(value: string): boolean;
|
|
8
6
|
}
|
|
9
7
|
/** Valid fetcher variant values. */
|
|
10
8
|
export type TFetcherVariant = TConstValue<typeof FetcherVariants>;
|
|
@@ -2,9 +2,5 @@
|
|
|
2
2
|
export class FetcherVariants {
|
|
3
3
|
static { this.NODE_FETCH = 'node-fetch'; }
|
|
4
4
|
static { this.AXIOS = 'axios'; }
|
|
5
|
-
static { this.SCHEME_SET = new Set([this.NODE_FETCH, this.AXIOS]); }
|
|
6
|
-
static isValid(value) {
|
|
7
|
-
return this.SCHEME_SET.has(value);
|
|
8
|
-
}
|
|
9
5
|
}
|
|
10
6
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../src/modules/network/http-request/common/constants.ts"],"names":[],"mappings":"AAEA,kDAAkD;AAClD,MAAM,OAAO,eAAe;aACV,eAAU,GAAG,YAAY,CAAC;aAC1B,UAAK,GAAG,OAAO,CAAC
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../src/modules/network/http-request/common/constants.ts"],"names":[],"mappings":"AAEA,kDAAkD;AAClD,MAAM,OAAO,eAAe;aACV,eAAU,GAAG,YAAY,CAAC;aAC1B,UAAK,GAAG,OAAO,CAAC","sourcesContent":["import type { TConstValue } from '@/common/types';\n\n/** The HTTP clients a fetcher can be built on. */\nexport class FetcherVariants {\n static readonly NODE_FETCH = 'node-fetch';\n static readonly AXIOS = 'axios';\n}\n\n/** Valid fetcher variant values. */\nexport type TFetcherVariant = TConstValue<typeof FetcherVariants>;\n"]}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type
|
|
1
|
+
import { type THttpMethod } from '../../../../common/index.js';
|
|
2
2
|
import { type AxiosInstance, type AxiosRequestConfig, type AxiosResponse } from 'axios';
|
|
3
3
|
import { BaseNetworkRequest } from '../base-network-request.helper.js';
|
|
4
4
|
import type { ILogger } from '../../../logger/common/types.js';
|
|
@@ -7,14 +7,14 @@ import { AbstractNetworkFetchableHelper, type IRequestOptions } from './base-fet
|
|
|
7
7
|
export interface IAxiosRequestOptions extends AxiosRequestConfig, IRequestOptions {
|
|
8
8
|
url: string;
|
|
9
9
|
method?: THttpMethod;
|
|
10
|
-
params?:
|
|
11
|
-
body?:
|
|
12
|
-
headers?:
|
|
10
|
+
params?: Record<string, unknown>;
|
|
11
|
+
body?: Record<string, unknown>;
|
|
12
|
+
headers?: Record<string, string>;
|
|
13
13
|
/** Whether this call rejects an HTTPS server whose certificate fails verification; `false` turns verification off for this call. */
|
|
14
14
|
rejectUnauthorized?: boolean;
|
|
15
15
|
}
|
|
16
16
|
/** Fetcher over an axios instance (`getWorker()`). HTTPS calls share one keep-alive agent that verifies certificates unless `rejectUnauthorized` is `false`; an `httpsAgent` passed in the request wins. */
|
|
17
|
-
export declare class AxiosFetcher extends AbstractNetworkFetchableHelper<'axios', IAxiosRequestOptions, AxiosResponse<
|
|
17
|
+
export declare class AxiosFetcher extends AbstractNetworkFetchableHelper<'axios', IAxiosRequestOptions, AxiosResponse<unknown>, AxiosInstance> {
|
|
18
18
|
/**
|
|
19
19
|
* One agent for the instance, not one per request. Built here so TLS verification is decided
|
|
20
20
|
* ONCE, at construction, rather than per call - and so connections are actually reused: a fresh
|
|
@@ -33,7 +33,7 @@ export declare class AxiosFetcher extends AbstractNetworkFetchableHelper<'axios'
|
|
|
33
33
|
*/
|
|
34
34
|
rejectUnauthorized?: boolean;
|
|
35
35
|
});
|
|
36
|
-
send<T =
|
|
36
|
+
send<T = unknown>(opts: IAxiosRequestOptions, logger?: ILogger): Promise<AxiosResponse<T, any, {}, any>>;
|
|
37
37
|
}
|
|
38
38
|
/** Options of `AxiosNetworkRequest`: an axios config with `baseUrl` in place of `baseURL`. */
|
|
39
39
|
export interface IAxiosNetworkRequestOptions {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"axios-fetcher.js","sourceRoot":"","sources":["../../../../../../src/modules/network/http-request/fetcher/axios-fetcher.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"axios-fetcher.js","sourceRoot":"","sources":["../../../../../../src/modules/network/http-request/fetcher/axios-fetcher.ts"],"names":[],"mappings":"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","sourcesContent":["import { HTTP, type THttpMethod } from '@/common';\nimport { RedactUtility } from '@/common/redact';\nimport axios, { type AxiosInstance, type AxiosRequestConfig, type AxiosResponse } from 'axios';\nimport https from 'node:https';\nimport { stringify } from 'node:querystring';\nimport { BaseNetworkRequest } from '../base-network-request.helper';\nimport type { ILogger } from '@/modules/logger/common/types';\nimport { AbstractNetworkFetchableHelper, type IRequestOptions } from './base-fetcher';\n\n/** Request accepted by `AxiosFetcher`: an axios config where `body` is sent as the axios `data`. `rejectUnauthorized` set here overrides the instance setting for this call. */\nexport interface IAxiosRequestOptions extends AxiosRequestConfig, IRequestOptions {\n url: string;\n method?: THttpMethod;\n params?: Record<string, unknown>;\n body?: Record<string, unknown>;\n headers?: Record<string, string>;\n /** Whether this call rejects an HTTPS server whose certificate fails verification; `false` turns verification off for this call. */\n rejectUnauthorized?: boolean;\n}\n\n/** Fetcher over an axios instance (`getWorker()`). HTTPS calls share one keep-alive agent that verifies certificates unless `rejectUnauthorized` is `false`; an `httpsAgent` passed in the request wins. */\nexport class AxiosFetcher extends AbstractNetworkFetchableHelper<\n 'axios',\n IAxiosRequestOptions,\n // The named type, not the `axios.` NAMESPACE: the namespace form resolves only under node16\n // module resolution, and this package also emits an ESM build under `bundler` resolution.\n AxiosResponse<unknown>,\n AxiosInstance\n> {\n /**\n * One agent for the instance, not one per request. Built here so TLS verification is decided\n * ONCE, at construction, rather than per call - and so connections are actually reused: a fresh\n * agent per request forces a new TCP and TLS handshake every time (measured: 10 handshakes for 10\n * requests, versus 1).\n */\n private readonly httpsAgent: https.Agent;\n\n constructor(opts: {\n name: string;\n defaultConfigs: AxiosRequestConfig;\n logger?: ILogger;\n /**\n * Whether this instance rejects an HTTPS server whose certificate fails verification.\n * `false` turns verification off.\n * @default true\n */\n rejectUnauthorized?: boolean;\n }) {\n super({ name: opts.name, variant: 'axios' });\n const { defaultConfigs } = opts;\n opts?.logger?.info('Creating new network request worker instance! Name: %s', this.name);\n\n this.httpsAgent = new https.Agent({\n keepAlive: true,\n rejectUnauthorized: opts.rejectUnauthorized ?? true,\n });\n\n this.worker = axios.create({ ...defaultConfigs });\n }\n\n override send<T = unknown>(opts: IAxiosRequestOptions, logger?: ILogger) {\n const { url, method = HTTP.Methods.GET, params = {}, body: data, headers, ...rest } = opts;\n const props: AxiosRequestConfig = {\n url,\n method: method.toUpperCase(),\n params,\n data,\n headers,\n paramsSerializer: { serialize: (p) => stringify(p) },\n ...rest,\n };\n\n const protocol = this.getProtocol(url);\n\n if (protocol === HTTP.Protocols.HTTPS) {\n // A caller's own agent WINS. The previous code assigned after the `...rest` spread, so a\n // hardened agent - custom CA, pinning, mTLS - was overwritten and the secure path was\n // unreachable through the public seam.\n props.httpsAgent =\n rest.httpsAgent ??\n (opts.rejectUnauthorized === undefined\n ? this.httpsAgent\n : new https.Agent({ keepAlive: true, rejectUnauthorized: opts.rejectUnauthorized }));\n }\n\n logger\n ?.for(this.send.name)\n .info('URL: %s | Props: %s', url, RedactUtility.redactSecrets({ value: props }));\n\n return this.worker.request<T>(props);\n }\n}\n\n/** Options of `AxiosNetworkRequest`: an axios config with `baseUrl` in place of `baseURL`. */\nexport interface IAxiosNetworkRequestOptions {\n name: string;\n networkOptions: Omit<AxiosRequestConfig, 'baseURL'> & {\n baseUrl?: string;\n };\n}\n\n/** `BaseNetworkRequest` over an `AxiosFetcher`. Defaults: JSON content type, 60000 ms `timeout`, and no rejection for status below 500 (`validateStatus`). */\nexport class AxiosNetworkRequest extends BaseNetworkRequest<'axios'> {\n constructor(opts: IAxiosNetworkRequestOptions) {\n const { name, networkOptions } = opts;\n const { headers, baseUrl, timeout, ...rest } = networkOptions;\n\n const mergedHeaders: NonNullable<AxiosRequestConfig['headers']> = {\n ['content-type']: 'application/json; charset=utf-8',\n ...headers,\n };\n\n const defaultConfigs: AxiosRequestConfig = {\n withCredentials: true,\n validateStatus: (status: number) => status < 500,\n timeout: timeout ?? 60 * 1000,\n ...rest,\n baseURL: baseUrl,\n headers: mergedHeaders,\n };\n\n super({\n name,\n baseUrl,\n fetcher: new AxiosFetcher({ name, defaultConfigs }),\n });\n }\n}\n"]}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { type THttpMethod } from '../../../../common/constants/http.js';
|
|
2
|
-
import { type AnyObject } from '../../../../common/types/index.js';
|
|
3
2
|
import type { ILogger } from '../../../logger/common/types.js';
|
|
4
3
|
import { type TFetcherVariant } from '../common/index.js';
|
|
5
4
|
/** What a fetcher calls on the logger it is handed, so a host logger with only these two (a browser app's) is accepted as is. */
|
|
@@ -8,9 +7,9 @@ export type TFetcherLogger = Pick<ILogger, 'debug' | 'info'>;
|
|
|
8
7
|
export interface IRequestOptions {
|
|
9
8
|
url: string;
|
|
10
9
|
method?: THttpMethod;
|
|
11
|
-
params?:
|
|
10
|
+
params?: Record<string, unknown>;
|
|
12
11
|
timeout?: number;
|
|
13
|
-
[extra: symbol | string]:
|
|
12
|
+
[extra: symbol | string]: unknown;
|
|
14
13
|
}
|
|
15
14
|
/** Contract of an HTTP fetcher: `send` takes the method from the options, the verb methods fix it, and `getWorker` returns the underlying client (`W`). */
|
|
16
15
|
export interface IFetchable<V extends TFetcherVariant, RQ extends IRequestOptions, RS, W = unknown> {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-fetcher.js","sourceRoot":"","sources":["../../../../../../src/modules/network/http-request/fetcher/base-fetcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAoB,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"base-fetcher.js","sourceRoot":"","sources":["../../../../../../src/modules/network/http-request/fetcher/base-fetcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAoB,MAAM,yBAAyB,CAAC;AAqCjE,yNAAyN;AACzN,MAAM,OAAgB,8BAA8B;IAUlD,YAAY,IAA8C;QACxD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACtB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAE5B,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAC9B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC5B,CAAC;IACH,CAAC;IAID,WAAW,CAAC,GAAW;QACrB,OAAO,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;IAC9E,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,GAAG,CAAC,IAAQ,EAAE,MAAuB;QACnC,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC;QAEzB,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC;IAClE,CAAC;IAED,IAAI,CAAC,IAAQ,EAAE,MAAuB;QACpC,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC;QAEzB,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,MAAM,CAAC,CAAC;IACnE,CAAC;IAED,GAAG,CAAC,IAAQ,EAAE,MAAuB;QACnC,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC;QAEzB,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC;IAClE,CAAC;IAED,KAAK,CAAC,IAAQ,EAAE,MAAuB;QACrC,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC;QAEzB,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,MAAM,CAAC,CAAC;IACpE,CAAC;IAED,MAAM,CAAC,IAAQ,EAAE,MAAuB;QACtC,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC;QAEzB,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,MAAM,CAAC,CAAC;IACrE,CAAC;IAED,KAAK,CAAC,IAAQ,EAAE,MAAuB;QACrC,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC;QAEzB,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,MAAM,CAAC,CAAC;IACpE,CAAC;CACF","sourcesContent":["import { HTTP, type THttpMethod } from '@/common/constants/http';\n// The leaf file, never the logger BARREL: that barrel reaches `node:module` and would drag this\n// browser-pure fetcher contract with it.\nimport type { ILogger } from '@/modules/logger/common/types';\nimport { type TFetcherVariant } from '../common';\n\n/** What a fetcher calls on the logger it is handed, so a host logger with only these two (a browser app's) is accepted as is. */\nexport type TFetcherLogger = Pick<ILogger, 'debug' | 'info'>;\n\n/** Options every fetcher accepts. `timeout` is in milliseconds; other keys pass through to the underlying client. */\nexport interface IRequestOptions {\n url: string;\n method?: THttpMethod;\n params?: Record<string, unknown>;\n timeout?: number;\n [extra: symbol | string]: unknown;\n}\n\n/** Contract of an HTTP fetcher: `send` takes the method from the options, the verb methods fix it, and `getWorker` returns the underlying client (`W`). */\nexport interface IFetchable<\n V extends TFetcherVariant,\n RQ extends IRequestOptions,\n RS,\n W = unknown,\n> {\n send(opts: RQ, logger?: TFetcherLogger): Promise<RS>;\n get(opts: RQ, logger?: TFetcherLogger): Promise<RS>;\n post(opts: RQ, logger?: TFetcherLogger): Promise<RS>;\n put(opts: RQ, logger?: TFetcherLogger): Promise<RS>;\n patch(opts: RQ, logger?: TFetcherLogger): Promise<RS>;\n delete(opts: RQ, logger?: TFetcherLogger): Promise<RS>;\n query(opts: RQ, logger?: TFetcherLogger): Promise<RS>;\n\n getVariant(): V;\n getWorker(): W;\n}\n\n/** `W` defaults to `unknown` so this stays free of `axios` - a concrete fetcher binds it to its real worker type (`AxiosInstance`, `typeof fetch`), which is then inherited on `this.worker` with no override needed. */\nexport abstract class AbstractNetworkFetchableHelper<\n V extends TFetcherVariant,\n RQ extends IRequestOptions,\n RS,\n W = unknown,\n> implements IFetchable<V, RQ, RS, W> {\n protected name: string;\n protected variant: V;\n protected worker: W;\n\n constructor(opts: { name: string; variant: V; worker?: W }) {\n this.name = opts.name;\n this.variant = opts.variant;\n\n if (opts.worker !== undefined) {\n this.worker = opts.worker;\n }\n }\n\n abstract send(opts: RQ, logger?: TFetcherLogger): Promise<RS>;\n\n getProtocol(url: string) {\n return url.startsWith('http:') ? HTTP.Protocols.HTTP : HTTP.Protocols.HTTPS;\n }\n\n getVariant() {\n return this.variant;\n }\n\n getWorker(): W {\n return this.worker;\n }\n\n get(opts: RQ, logger?: TFetcherLogger) {\n const { ...rest } = opts;\n\n return this.send({ ...rest, method: HTTP.Methods.GET }, logger);\n }\n\n post(opts: RQ, logger?: TFetcherLogger) {\n const { ...rest } = opts;\n\n return this.send({ ...rest, method: HTTP.Methods.POST }, logger);\n }\n\n put(opts: RQ, logger?: TFetcherLogger) {\n const { ...rest } = opts;\n\n return this.send({ ...rest, method: HTTP.Methods.PUT }, logger);\n }\n\n patch(opts: RQ, logger?: TFetcherLogger) {\n const { ...rest } = opts;\n\n return this.send({ ...rest, method: HTTP.Methods.PATCH }, logger);\n }\n\n delete(opts: RQ, logger?: TFetcherLogger) {\n const { ...rest } = opts;\n\n return this.send({ ...rest, method: HTTP.Methods.DELETE }, logger);\n }\n\n query(opts: RQ, logger?: TFetcherLogger) {\n const { ...rest } = opts;\n\n return this.send({ ...rest, method: HTTP.Methods.QUERY }, logger);\n }\n}\n"]}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { AxiosInstance, AxiosResponse } from 'axios';
|
|
2
2
|
import type { TFetcherVariant } from '../../common/index.js';
|
|
3
|
-
export type TFetcherResponse<T extends TFetcherVariant> = T extends 'node-fetch' ? Response : AxiosResponse
|
|
3
|
+
export type TFetcherResponse<T extends TFetcherVariant> = T extends 'node-fetch' ? Response : AxiosResponse<unknown>;
|
|
4
4
|
export type TFetcherWorker<T extends TFetcherVariant> = T extends 'axios' ? AxiosInstance : typeof fetch;
|
|
5
5
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../../../src/modules/network/http-request/fetcher/common/types.ts"],"names":[],"mappings":"","sourcesContent":["import type { AxiosInstance, AxiosResponse } from 'axios';\nimport type { TFetcherVariant } from '../../common';\n\nexport type TFetcherResponse<T extends TFetcherVariant> = T extends 'node-fetch'\n ? Response\n : AxiosResponse
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../../../src/modules/network/http-request/fetcher/common/types.ts"],"names":[],"mappings":"","sourcesContent":["import type { AxiosInstance, AxiosResponse } from 'axios';\nimport type { TFetcherVariant } from '../../common';\n\nexport type TFetcherResponse<T extends TFetcherVariant> = T extends 'node-fetch'\n ? Response\n : AxiosResponse<unknown>;\n\nexport type TFetcherWorker<T extends TFetcherVariant> = T extends 'axios'\n ? AxiosInstance\n : typeof fetch;\n"]}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { type THttpMethod } from '../../../../common/constants/http.js';
|
|
2
|
-
import { type AnyObject } from '../../../../common/types/index.js';
|
|
3
2
|
import { type IQueryStringOptions } from '../../utilities/query-string.js';
|
|
4
3
|
import { BaseNetworkRequest } from '../base-network-request.helper.js';
|
|
5
4
|
import { AbstractNetworkFetchableHelper, type IRequestOptions, type TFetcherLogger } from './base-fetcher.js';
|
|
@@ -7,7 +6,7 @@ import { AbstractNetworkFetchableHelper, type IRequestOptions, type TFetcherLogg
|
|
|
7
6
|
export interface INodeFetchRequestOptions extends RequestInit, IRequestOptions {
|
|
8
7
|
url: string;
|
|
9
8
|
method?: THttpMethod;
|
|
10
|
-
params?:
|
|
9
|
+
params?: Record<string, unknown>;
|
|
11
10
|
}
|
|
12
11
|
/** Fetcher over the global `fetch` (`getWorker()`). `timeout` (milliseconds) aborts the request and is combined with a `signal` the caller passes. */
|
|
13
12
|
export declare class NodeFetcher extends AbstractNetworkFetchableHelper<'node-fetch', INodeFetchRequestOptions, Awaited<ReturnType<typeof fetch>>, typeof fetch> {
|
|
@@ -93,14 +93,13 @@ export class NodeFetchNetworkRequest extends BaseNetworkRequest {
|
|
|
93
93
|
constructor(opts) {
|
|
94
94
|
const { name, networkOptions } = opts;
|
|
95
95
|
const { headers, baseUrl, queryString, ...rest } = networkOptions;
|
|
96
|
-
|
|
97
|
-
const mergedHeaders = {
|
|
98
|
-
|
|
99
|
-
...userHeaders,
|
|
100
|
-
};
|
|
96
|
+
// Case-insensitive, like the wire: a caller's `Content-Type` replaces the default one.
|
|
97
|
+
const mergedHeaders = new Headers({ 'content-type': 'application/json; charset=utf-8' });
|
|
98
|
+
new Headers(headers).forEach((value, key) => mergedHeaders.set(key, value));
|
|
101
99
|
const defaultConfigs = {
|
|
102
100
|
...rest,
|
|
103
|
-
|
|
101
|
+
// A plain object, so the request log (which redacts by key) can read it; a `Headers` instance has no own entries.
|
|
102
|
+
headers: Object.fromEntries(mergedHeaders),
|
|
104
103
|
};
|
|
105
104
|
super({
|
|
106
105
|
name,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-fetcher.js","sourceRoot":"","sources":["../../../../../../src/modules/network/http-request/fetcher/node-fetcher.ts"],"names":[],"mappings":"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","sourcesContent":["import { RedactUtility } from '@/common/redact';\nimport { HTTP, type THttpMethod } from '@/common/constants/http';\nimport { type AnyObject } from '@/common/types';\nimport {\n type IQueryStringOptions,\n QueryStringSeparators,\n QueryStringUtility,\n} from '../../utilities/query-string';\n\nimport { BaseNetworkRequest } from '../base-network-request.helper';\nimport {\n AbstractNetworkFetchableHelper,\n type IRequestOptions,\n type TFetcherLogger,\n} from './base-fetcher';\n\n/** Request accepted by `NodeFetcher`: `RequestInit` plus `url`; `params` are written into the url query. */\nexport interface INodeFetchRequestOptions extends RequestInit, IRequestOptions {\n url: string;\n method?: THttpMethod;\n params?: AnyObject;\n}\n\n/** What `fetch` takes as a body as it is: encoding any of these again would change the bytes sent. A constructor is looked up on `globalThis` so a runtime without one (no `FormData`) just never matches it. */\nconst isRawBody = (body: unknown): boolean => {\n if (typeof body === 'string' || ArrayBuffer.isView(body) || body instanceof ArrayBuffer) {\n return true;\n }\n\n return ['Blob', 'FormData', 'URLSearchParams', 'ReadableStream'].some((name) => {\n const ctor = Reflect.get(globalThis, name);\n\n return typeof ctor === 'function' && body instanceof ctor;\n });\n};\n\n/** Fetcher over the global `fetch` (`getWorker()`). `timeout` (milliseconds) aborts the request and is combined with a `signal` the caller passes. */\nexport class NodeFetcher extends AbstractNetworkFetchableHelper<\n 'node-fetch',\n INodeFetchRequestOptions,\n Awaited<ReturnType<typeof fetch>>,\n typeof fetch\n> {\n private defaultConfigs: RequestInit;\n private queryString: IQueryStringOptions;\n\n constructor(opts: {\n name: string;\n defaultConfigs: RequestInit;\n /** How `params` are written into the url; unset fields behave as `node:querystring` does. */\n queryString?: IQueryStringOptions;\n logger?: TFetcherLogger;\n }) {\n super({ name: opts.name, variant: 'node-fetch', worker: fetch });\n const { name, defaultConfigs } = opts;\n this.name = name;\n opts?.logger?.info('Creating new network request worker instance! Name: %s', this.name);\n\n this.defaultConfigs = defaultConfigs;\n this.queryString = opts.queryString ?? {};\n }\n\n /** A raw body passes through; a plain object or an array is JSON-encoded; no body stays no body. */\n protected serializeBody(opts: { body: unknown }): RequestInit['body'] | undefined {\n const { body } = opts;\n\n if (body === undefined || body === null) {\n return undefined;\n }\n\n return isRawBody(body) ? (body as RequestInit['body']) : JSON.stringify(body);\n }\n\n override async send(opts: INodeFetchRequestOptions, logger?: TFetcherLogger) {\n const {\n url,\n method = HTTP.Methods.GET,\n params,\n body,\n headers,\n timeout,\n signal,\n ...rest\n } = opts;\n\n let timeoutId: ReturnType<typeof setTimeout> | undefined;\n let timeoutController: AbortController | undefined;\n let effectiveSignal = signal;\n\n if (timeout) {\n timeoutController = new AbortController();\n timeoutId = setTimeout(() => {\n timeoutController?.abort();\n }, timeout);\n\n // Composed, never substituted: a timeout must not silently swallow the caller's own signal, or the caller would believe it cancelled a request that is in fact still running. Either source - and a signal already aborted before the call - aborts the request.\n effectiveSignal = signal\n ? AbortSignal.any([signal, timeoutController.signal])\n : timeoutController.signal;\n }\n\n const requestConfigs: RequestInit = {\n ...this.defaultConfigs,\n ...rest,\n method: method.toUpperCase(),\n body: this.serializeBody({ body }),\n // The call's headers REPLACE the defaults (a caller that sends a multipart body leaves the content type out so `fetch` can write the boundary); a call with none keeps them. Spreading an absent `headers` over the config used to erase the defaults.\n headers: headers ?? this.defaultConfigs.headers,\n signal: effectiveSignal,\n };\n\n // `?` only when the url carries no query string of its own - a second `?` is not a separator, so the server would read the previous parameter's value as `1?extra=2`.\n const serializedParams = params\n ? QueryStringUtility.toQueryString({ params, ...this.queryString })\n : '';\n const requestUrl = serializedParams\n ? `${url}${url.includes(QueryStringSeparators.START) ? QueryStringSeparators.PAIR : QueryStringSeparators.START}${serializedParams}`\n : url;\n\n // The body is NEVER logged, only its size. `fetch` bodies are strings, and `redactSecrets` walks\n // object keys - so a JSON credential payload passed straight through as a string was printed in\n // full, with no key for the redactor to match on. Headers are normalised through `Headers` first\n // because the `string[][]` form is a list of tuples, which key matching cannot see either.\n const loggableConfigs = {\n ...requestConfigs,\n body:\n typeof requestConfigs.body === 'string'\n ? `[body ${requestConfigs.body.length} chars]`\n : requestConfigs.body\n ? '[body]'\n : undefined,\n headers: requestConfigs.headers,\n };\n\n // Straight on the logger it was handed, never `logger.for(...)`: a host logger may carry only `debug` and `info`. With none handed, nothing is logged - no default logger is built, so a browser never reaches the node-only provider.\n logger?.debug(\n '[%s] URL: %s | Props: %s | Timeout: %s',\n this.send.name,\n url,\n RedactUtility.redactSecrets({ value: loggableConfigs }),\n timeout,\n );\n\n try {\n const rs = await fetch(requestUrl, requestConfigs);\n\n return rs;\n } finally {\n if (timeoutId) {\n clearTimeout(timeoutId);\n }\n }\n }\n}\n\n/** Options of `NodeFetchNetworkRequest`: `RequestInit` plus `baseUrl` and `queryString`, which sets how `params` are written into every url. */\nexport interface INodeFetchNetworkRequestOptions {\n name: string;\n networkOptions: RequestInit & {\n baseUrl?: string;\n /** How `params` are written into every url this request sends; see {@link IQueryStringOptions}. */\n queryString?: IQueryStringOptions;\n };\n}\n\n/** `BaseNetworkRequest` over a `NodeFetcher`. Request headers default to a JSON content type, and the caller's headers win. */\nexport class NodeFetchNetworkRequest extends BaseNetworkRequest<'node-fetch'> {\n constructor(opts: INodeFetchNetworkRequestOptions) {\n const { name, networkOptions } = opts;\n const { headers, baseUrl, queryString, ...rest } = networkOptions;\n\n const userHeaders =\n headers instanceof Headers ? Object.fromEntries(headers.entries()) : headers;\n const mergedHeaders: AnyObject = {\n ['content-type']: 'application/json; charset=utf-8',\n ...userHeaders,\n };\n\n const defaultConfigs: Partial<RequestInit> = {\n ...rest,\n headers: mergedHeaders,\n };\n\n super({\n name,\n baseUrl,\n fetcher: new NodeFetcher({ name, defaultConfigs, queryString }),\n });\n }\n}\n"]}
|
|
1
|
+
{"version":3,"file":"node-fetcher.js","sourceRoot":"","sources":["../../../../../../src/modules/network/http-request/fetcher/node-fetcher.ts"],"names":[],"mappings":"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","sourcesContent":["import { RedactUtility } from '@/common/redact';\nimport { HTTP, type THttpMethod } from '@/common/constants/http';\nimport {\n type IQueryStringOptions,\n QueryStringSeparators,\n QueryStringUtility,\n} from '../../utilities/query-string';\n\nimport { BaseNetworkRequest } from '../base-network-request.helper';\nimport {\n AbstractNetworkFetchableHelper,\n type IRequestOptions,\n type TFetcherLogger,\n} from './base-fetcher';\n\n/** Request accepted by `NodeFetcher`: `RequestInit` plus `url`; `params` are written into the url query. */\nexport interface INodeFetchRequestOptions extends RequestInit, IRequestOptions {\n url: string;\n method?: THttpMethod;\n params?: Record<string, unknown>;\n}\n\n/** What `fetch` takes as a body as it is: encoding any of these again would change the bytes sent. A constructor is looked up on `globalThis` so a runtime without one (no `FormData`) just never matches it. */\nconst isRawBody = (body: unknown): boolean => {\n if (typeof body === 'string' || ArrayBuffer.isView(body) || body instanceof ArrayBuffer) {\n return true;\n }\n\n return ['Blob', 'FormData', 'URLSearchParams', 'ReadableStream'].some((name) => {\n const ctor = Reflect.get(globalThis, name);\n\n return typeof ctor === 'function' && body instanceof ctor;\n });\n};\n\n/** Fetcher over the global `fetch` (`getWorker()`). `timeout` (milliseconds) aborts the request and is combined with a `signal` the caller passes. */\nexport class NodeFetcher extends AbstractNetworkFetchableHelper<\n 'node-fetch',\n INodeFetchRequestOptions,\n Awaited<ReturnType<typeof fetch>>,\n typeof fetch\n> {\n private defaultConfigs: RequestInit;\n private queryString: IQueryStringOptions;\n\n constructor(opts: {\n name: string;\n defaultConfigs: RequestInit;\n /** How `params` are written into the url; unset fields behave as `node:querystring` does. */\n queryString?: IQueryStringOptions;\n logger?: TFetcherLogger;\n }) {\n super({ name: opts.name, variant: 'node-fetch', worker: fetch });\n const { name, defaultConfigs } = opts;\n this.name = name;\n opts?.logger?.info('Creating new network request worker instance! Name: %s', this.name);\n\n this.defaultConfigs = defaultConfigs;\n this.queryString = opts.queryString ?? {};\n }\n\n /** A raw body passes through; a plain object or an array is JSON-encoded; no body stays no body. */\n protected serializeBody(opts: { body: unknown }): RequestInit['body'] | undefined {\n const { body } = opts;\n\n if (body === undefined || body === null) {\n return undefined;\n }\n\n return isRawBody(body) ? (body as RequestInit['body']) : JSON.stringify(body);\n }\n\n override async send(opts: INodeFetchRequestOptions, logger?: TFetcherLogger) {\n const {\n url,\n method = HTTP.Methods.GET,\n params,\n body,\n headers,\n timeout,\n signal,\n ...rest\n } = opts;\n\n let timeoutId: ReturnType<typeof setTimeout> | undefined;\n let timeoutController: AbortController | undefined;\n let effectiveSignal = signal;\n\n if (timeout) {\n timeoutController = new AbortController();\n timeoutId = setTimeout(() => {\n timeoutController?.abort();\n }, timeout);\n\n // Composed, never substituted: a timeout must not silently swallow the caller's own signal, or the caller would believe it cancelled a request that is in fact still running. Either source - and a signal already aborted before the call - aborts the request.\n effectiveSignal = signal\n ? AbortSignal.any([signal, timeoutController.signal])\n : timeoutController.signal;\n }\n\n const requestConfigs: RequestInit = {\n ...this.defaultConfigs,\n ...rest,\n method: method.toUpperCase(),\n body: this.serializeBody({ body }),\n // The call's headers REPLACE the defaults (a caller that sends a multipart body leaves the content type out so `fetch` can write the boundary); a call with none keeps them. Spreading an absent `headers` over the config used to erase the defaults.\n headers: headers ?? this.defaultConfigs.headers,\n signal: effectiveSignal,\n };\n\n // `?` only when the url carries no query string of its own - a second `?` is not a separator, so the server would read the previous parameter's value as `1?extra=2`.\n const serializedParams = params\n ? QueryStringUtility.toQueryString({ params, ...this.queryString })\n : '';\n const requestUrl = serializedParams\n ? `${url}${url.includes(QueryStringSeparators.START) ? QueryStringSeparators.PAIR : QueryStringSeparators.START}${serializedParams}`\n : url;\n\n // The body is NEVER logged, only its size. `fetch` bodies are strings, and `redactSecrets` walks\n // object keys - so a JSON credential payload passed straight through as a string was printed in\n // full, with no key for the redactor to match on. Headers are normalised through `Headers` first\n // because the `string[][]` form is a list of tuples, which key matching cannot see either.\n const loggableConfigs = {\n ...requestConfigs,\n body:\n typeof requestConfigs.body === 'string'\n ? `[body ${requestConfigs.body.length} chars]`\n : requestConfigs.body\n ? '[body]'\n : undefined,\n headers: requestConfigs.headers,\n };\n\n // Straight on the logger it was handed, never `logger.for(...)`: a host logger may carry only `debug` and `info`. With none handed, nothing is logged - no default logger is built, so a browser never reaches the node-only provider.\n logger?.debug(\n '[%s] URL: %s | Props: %s | Timeout: %s',\n this.send.name,\n url,\n RedactUtility.redactSecrets({ value: loggableConfigs }),\n timeout,\n );\n\n try {\n const rs = await fetch(requestUrl, requestConfigs);\n\n return rs;\n } finally {\n if (timeoutId) {\n clearTimeout(timeoutId);\n }\n }\n }\n}\n\n/** Options of `NodeFetchNetworkRequest`: `RequestInit` plus `baseUrl` and `queryString`, which sets how `params` are written into every url. */\nexport interface INodeFetchNetworkRequestOptions {\n name: string;\n networkOptions: RequestInit & {\n baseUrl?: string;\n /** How `params` are written into every url this request sends; see {@link IQueryStringOptions}. */\n queryString?: IQueryStringOptions;\n };\n}\n\n/** `BaseNetworkRequest` over a `NodeFetcher`. Request headers default to a JSON content type, and the caller's headers win. */\nexport class NodeFetchNetworkRequest extends BaseNetworkRequest<'node-fetch'> {\n constructor(opts: INodeFetchNetworkRequestOptions) {\n const { name, networkOptions } = opts;\n const { headers, baseUrl, queryString, ...rest } = networkOptions;\n\n // Case-insensitive, like the wire: a caller's `Content-Type` replaces the default one.\n const mergedHeaders = new Headers({ 'content-type': 'application/json; charset=utf-8' });\n\n new Headers(headers).forEach((value, key) => mergedHeaders.set(key, value));\n\n const defaultConfigs: Partial<RequestInit> = {\n ...rest,\n // A plain object, so the request log (which redacts by key) can read it; a `Headers` instance has no own entries.\n headers: Object.fromEntries(mergedHeaders),\n };\n\n super({\n name,\n baseUrl,\n fetcher: new NodeFetcher({ name, defaultConfigs, queryString }),\n });\n }\n}\n"]}
|
|
@@ -30,7 +30,7 @@ export interface INetworkTcpClientProps<SocketClientOptions extends PlainConnect
|
|
|
30
30
|
onClosed?: (opts: {
|
|
31
31
|
client: SocketClientType;
|
|
32
32
|
}) => void;
|
|
33
|
-
onError?: (error:
|
|
33
|
+
onError?: (error: unknown) => void;
|
|
34
34
|
}
|
|
35
35
|
/** TCP or TLS client that opens its socket through `createClientFn`, reports connect, data, close and error to the `on*` callbacks, and reconnects when enabled. */
|
|
36
36
|
export declare class BaseNetworkTcpClient<SocketClientOptions extends PlainConnectionOptions | TlsConnectionOptions, SocketClientType extends PlainSocketClient | TlsSocketClient> extends BaseHelper {
|
|
@@ -41,7 +41,7 @@ export declare class BaseNetworkTcpClient<SocketClientOptions extends PlainConne
|
|
|
41
41
|
maxReconnect: number;
|
|
42
42
|
currentReconnect: number;
|
|
43
43
|
};
|
|
44
|
-
protected reconnectTimeout
|
|
44
|
+
protected reconnectTimeout?: ReturnType<typeof setTimeout> | null;
|
|
45
45
|
protected encoding?: BufferEncoding;
|
|
46
46
|
protected createClientFn: (options: SocketClientOptions, connectionListener?: () => void) => SocketClientType;
|
|
47
47
|
protected onConnected: (opts: {
|
|
@@ -54,7 +54,7 @@ export declare class BaseNetworkTcpClient<SocketClientOptions extends PlainConne
|
|
|
54
54
|
protected onClosed?: (opts: {
|
|
55
55
|
client: SocketClientType;
|
|
56
56
|
}) => void;
|
|
57
|
-
protected onError?: (error:
|
|
57
|
+
protected onError?: (error: unknown) => void;
|
|
58
58
|
constructor(opts: INetworkTcpClientProps<SocketClientOptions, SocketClientType>);
|
|
59
59
|
getClient(): SocketClientType | null | undefined;
|
|
60
60
|
/** Redacts before logging - a TLS client's options ARE its private key (`key`/`cert`/`passphrase`). */
|
|
@@ -65,7 +65,7 @@ export declare class BaseNetworkTcpClient<SocketClientOptions extends PlainConne
|
|
|
65
65
|
message: string | Buffer;
|
|
66
66
|
}): void;
|
|
67
67
|
handleClosed(): void;
|
|
68
|
-
handleError(error:
|
|
68
|
+
handleError(error: unknown): void;
|
|
69
69
|
connect(opts: {
|
|
70
70
|
resetReconnectCounter: boolean;
|
|
71
71
|
}): void;
|
|
@@ -119,7 +119,7 @@ export class BaseNetworkTcpClient extends BaseHelper {
|
|
|
119
119
|
}
|
|
120
120
|
this.client?.destroy();
|
|
121
121
|
this.client = null;
|
|
122
|
-
clearTimeout(this.reconnectTimeout);
|
|
122
|
+
clearTimeout(this.reconnectTimeout ?? undefined);
|
|
123
123
|
this.reconnectTimeout = null;
|
|
124
124
|
this.logger
|
|
125
125
|
.for(this.disconnect.name)
|