From ee5ffa6f246e6e2c12a0bd55da420c7ff31d0ce7 Mon Sep 17 00:00:00 2001 From: PalmDevs Date: Sun, 14 Jan 2024 21:52:07 +0700 Subject: [PATCH] fix(packages/shared): fix weird log dates and clean up imports --- .../src/constants/HumanizedDisconnectReason.ts | 2 +- packages/shared/src/constants/index.ts | 6 +++--- packages/shared/src/index.ts | 6 +++--- packages/shared/src/schemas/Packet.ts | 6 +++--- packages/shared/src/schemas/index.ts | 2 +- packages/shared/src/utils/environment.ts | 13 +++++++++++++ packages/shared/src/utils/guard.ts | 4 ++-- packages/shared/src/utils/index.ts | 9 +++++---- packages/shared/src/utils/logger.ts | 12 +++++------- packages/shared/src/utils/serialization.ts | 4 ++-- 10 files changed, 38 insertions(+), 26 deletions(-) create mode 100644 packages/shared/src/utils/environment.ts diff --git a/packages/shared/src/constants/HumanizedDisconnectReason.ts b/packages/shared/src/constants/HumanizedDisconnectReason.ts index fb0c070..0db27c2 100755 --- a/packages/shared/src/constants/HumanizedDisconnectReason.ts +++ b/packages/shared/src/constants/HumanizedDisconnectReason.ts @@ -1,4 +1,4 @@ -import DisconnectReason from './DisconnectReason.js' +import DisconnectReason from './DisconnectReason' /** * Humanized disconnect reasons for logs diff --git a/packages/shared/src/constants/index.ts b/packages/shared/src/constants/index.ts index 98ae4d4..a353663 100755 --- a/packages/shared/src/constants/index.ts +++ b/packages/shared/src/constants/index.ts @@ -1,3 +1,3 @@ -export { default as DisconnectReason } from './DisconnectReason.js' -export { default as HumanizedDisconnectReason } from './HumanizedDisconnectReason.js' -export * from './Operation.js' +export { default as DisconnectReason } from './DisconnectReason' +export { default as HumanizedDisconnectReason } from './HumanizedDisconnectReason' +export * from './Operation' diff --git a/packages/shared/src/index.ts b/packages/shared/src/index.ts index b143126..ab1d8b0 100755 --- a/packages/shared/src/index.ts +++ b/packages/shared/src/index.ts @@ -1,3 +1,3 @@ -export * from './constants/index.js' -export * from './schemas/index.js' -export * from './utils/index.js' +export * from './constants/index' +export * from './schemas/index' +export * from './utils/index' diff --git a/packages/shared/src/schemas/Packet.ts b/packages/shared/src/schemas/Packet.ts index 9e41554..e1f93f9 100755 --- a/packages/shared/src/schemas/Packet.ts +++ b/packages/shared/src/schemas/Packet.ts @@ -14,8 +14,8 @@ import { string, // merge } from 'valibot' -import DisconnectReason from '../constants/DisconnectReason.js' -import { ClientOperation, Operation, ServerOperation } from '../constants/Operation.js' +import DisconnectReason from '../constants/DisconnectReason' +import { ClientOperation, Operation, ServerOperation } from '../constants/Operation' /** * Schema to validate packets @@ -90,5 +90,5 @@ export const PacketDataSchemas = { export type Packet = { op: TOp - d: Output + d: Output<(typeof PacketDataSchemas)[TOp]> } diff --git a/packages/shared/src/schemas/index.ts b/packages/shared/src/schemas/index.ts index 8b93531..e23a5a9 100755 --- a/packages/shared/src/schemas/index.ts +++ b/packages/shared/src/schemas/index.ts @@ -1 +1 @@ -export * from './Packet.js' +export * from './Packet' diff --git a/packages/shared/src/utils/environment.ts b/packages/shared/src/utils/environment.ts new file mode 100644 index 0000000..b0c1d61 --- /dev/null +++ b/packages/shared/src/utils/environment.ts @@ -0,0 +1,13 @@ +export function getMissingEnvironmentVariables(keys: string[]) { + return keys.filter(key => !process.env[key]) +} + +export function getEnvironmentType() { + const environmentValue = process.env['NODE_ENV'] + // @ts-expect-error https://github.com/microsoft/TypeScript/issues/26255 + if (!NodeEnvironments.includes(environmentValue)) return null + return process.env['NODE_ENV'] as NodeEnvironment +} + +const NodeEnvironments = ['development', 'production'] as const +export type NodeEnvironment = (typeof NodeEnvironments)[number] diff --git a/packages/shared/src/utils/guard.ts b/packages/shared/src/utils/guard.ts index b58983b..9b92cba 100755 --- a/packages/shared/src/utils/guard.ts +++ b/packages/shared/src/utils/guard.ts @@ -1,5 +1,5 @@ -import { ClientOperation, Operation, ServerOperation } from '../constants/Operation.js' -import { Packet } from '../schemas/Packet.js' +import { ClientOperation, Operation, ServerOperation } from '../constants/Operation' +import { Packet } from '../schemas/Packet' /** * Checks whether a packet is trying to do the given operation diff --git a/packages/shared/src/utils/index.ts b/packages/shared/src/utils/index.ts index 9d276ca..7b06030 100755 --- a/packages/shared/src/utils/index.ts +++ b/packages/shared/src/utils/index.ts @@ -1,4 +1,5 @@ -export * from './guard.js' -export * from './logger.js' -export * from './serialization.js' -export * from './string.js' +export * from './environment' +export * from './guard' +export * from './logger' +export * from './serialization' +export * from './string' diff --git a/packages/shared/src/utils/logger.ts b/packages/shared/src/utils/logger.ts index ad065a8..7125f7f 100644 --- a/packages/shared/src/utils/logger.ts +++ b/packages/shared/src/utils/logger.ts @@ -1,15 +1,13 @@ -import { colorConsole, console as uncoloredConsole, Tracer } from 'tracer' import { Chalk, supportsColor, supportsColorStderr } from 'chalk' +import { console as uncoloredConsole, Tracer, colorConsole } from 'tracer' const chalk = new Chalk() const DefaultConfig = { - dateformat: 'DD/MM/YYYY HH:mm:ss.sss Z', + dateformat: 'dd/mm/yyyy HH:mm:ss.sss Z', format: [ '{{message}}', { - error: `${chalk.bgRedBright.whiteBright(' ERROR ')} {{message}}\n${chalk.gray( - '{{stack}}', - )}`, + error: `${chalk.bgRedBright.whiteBright(' ERROR ')} {{message}}\n${chalk.gray('{{stack}}')}`, debug: chalk.gray('DEBUG: {{message}}\n{{stack}}'), warn: `${chalk.bgYellowBright.whiteBright(' WARN ')} ${chalk.yellowBright('{{message}}')}\n${chalk.gray( '{{stack}}', @@ -26,7 +24,7 @@ const DefaultConfig = { filters: [], } satisfies Tracer.LoggerConfig -export function createLogger(config: Omit) { +export function createLogger(config?: Omit) { const combinedConfig = { ...DefaultConfig, ...config } if ( @@ -37,7 +35,7 @@ export function createLogger(config: Omit diff --git a/packages/shared/src/utils/serialization.ts b/packages/shared/src/utils/serialization.ts index 92b274f..a906c17 100755 --- a/packages/shared/src/utils/serialization.ts +++ b/packages/shared/src/utils/serialization.ts @@ -1,7 +1,7 @@ import * as BSON from 'bson' import { parse } from 'valibot' -import { Operation } from '../constants/index.js' -import { Packet, PacketSchema } from '../schemas/index.js' +import { Operation } from '../constants/index' +import { Packet, PacketSchema } from '../schemas/index' /** * Compresses a packet into a buffer