refactor(ui): consolidate constants — remove timeout duplicate, centralize defaults

- Remove dead duplicate UI_WEBSOCKET_REQUEST_TIMEOUT_MS from ui/web/src/composables/Constants.ts
- Add DEFAULT_HOST ('localhost') and DEFAULT_PORT (8080) to ui/common/src/constants.ts
- Update ui/cli/src/config/defaults.ts and loader.ts to import from ui-common
- Update ui/web/tests/unit/constants.ts to use DEFAULT_HOST/DEFAULT_PORT from ui-common
- Update ui/cli/tests/config.test.ts to import from ui-common

diff --git a/ui/cli/src/config/defaults.ts b/ui/cli/src/config/defaults.ts
index 5e16be882ab6e4d8ee9bc5599d529cc04f147093..90f5114d81303368ea3257c98bc0d83e493b9cd0 100644 (file)
--- a/ui/cli/src/config/defaults.ts
+++ b/ui/cli/src/config/defaults.ts
@@ -1,7 +1,5 @@
 import { Protocol, ProtocolVersion } from 'ui-common'
 
-export const DEFAULT_HOST = 'localhost'
-export const DEFAULT_PORT = 8080
 export const DEFAULT_PROTOCOL = Protocol.UI
 export const DEFAULT_VERSION = ProtocolVersion['0.0.1']
 export const DEFAULT_SECURE = false

diff --git a/ui/cli/src/config/loader.ts b/ui/cli/src/config/loader.ts
index 9b1c6473767648514f2b359d8284e3cee4305abd..423106e1c2d7ff3c7247876c882ee4100ff139ec 100644 (file)
--- a/ui/cli/src/config/loader.ts
+++ b/ui/cli/src/config/loader.ts
@@ -2,15 +2,14 @@ import { readFile } from 'node:fs/promises'
 import { homedir } from 'node:os'
 import { join } from 'node:path'
 import process from 'node:process'
-import { uiServerConfigSchema, type UIServerConfigurationSection } from 'ui-common'
-
 import {
   DEFAULT_HOST,
   DEFAULT_PORT,
-  DEFAULT_PROTOCOL,
-  DEFAULT_SECURE,
-  DEFAULT_VERSION,
-} from './defaults.js'
+  uiServerConfigSchema,
+  type UIServerConfigurationSection,
+} from 'ui-common'
+
+import { DEFAULT_PROTOCOL, DEFAULT_SECURE, DEFAULT_VERSION } from './defaults.js'
 
 interface LoadConfigOptions {
   configPath?: string

diff --git a/ui/cli/tests/config.test.ts b/ui/cli/tests/config.test.ts
index 242c6629d830709f67841ae8bb8ed360e862c481..23026360f6431caa72f340674f02eb2a2f5b1dc4 100644 (file)
--- a/ui/cli/tests/config.test.ts
+++ b/ui/cli/tests/config.test.ts
@@ -3,14 +3,9 @@ import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { afterEach, beforeEach, describe, it } from 'node:test'
+import { DEFAULT_HOST, DEFAULT_PORT } from 'ui-common'
 
-import {
-  DEFAULT_HOST,
-  DEFAULT_PORT,
-  DEFAULT_PROTOCOL,
-  DEFAULT_SECURE,
-  DEFAULT_VERSION,
-} from '../src/config/defaults.js'
+import { DEFAULT_PROTOCOL, DEFAULT_SECURE, DEFAULT_VERSION } from '../src/config/defaults.js'
 import { loadConfig } from '../src/config/loader.js'
 
 let tempDir: string

diff --git a/ui/common/src/constants.ts b/ui/common/src/constants.ts
index 2e5b197274a10fa0c862bfd6a5e5a11cd45dce2c..2c3a3b98335da11bae81cdf8adad671bd65c3a3c 100644 (file)
--- a/ui/common/src/constants.ts
+++ b/ui/common/src/constants.ts
@@ -1 +1,3 @@
+export const DEFAULT_HOST = 'localhost'
+export const DEFAULT_PORT = 8080
 export const UI_WEBSOCKET_REQUEST_TIMEOUT_MS = 60_000

diff --git a/ui/web/src/composables/Constants.ts b/ui/web/src/composables/Constants.ts
index 18e18ea685102fe6a11140b39c846674e8612bdc..83143d648aae8e15e32979a5db0917f71a7893e7 100644 (file)
--- a/ui/web/src/composables/Constants.ts
+++ b/ui/web/src/composables/Constants.ts
@@ -13,4 +13,3 @@ export const ROUTE_NAMES = {
 export const SHARED_TOGGLE_BUTTON_KEY_PREFIX = 'shared-toggle-button-'
 export const TOGGLE_BUTTON_KEY_PREFIX = 'toggle-button-'
 export const UI_SERVER_CONFIGURATION_INDEX_KEY = 'uiServerConfigurationIndex'
-export const UI_WEBSOCKET_REQUEST_TIMEOUT_MS = 60_000

diff --git a/ui/web/tests/unit/constants.ts b/ui/web/tests/unit/constants.ts
index e1c920a986d1b2a15503e688f7428a58959e2a2f..ab8868e18e0dcb8525e23ed29887e215f83c10d3 100644 (file)
--- a/ui/web/tests/unit/constants.ts
+++ b/ui/web/tests/unit/constants.ts
@@ -7,6 +7,8 @@ import {
   type ChargingStationData,
   type ChargingStationInfo,
   type ConnectorStatus,
+  DEFAULT_HOST,
+  DEFAULT_PORT,
   type EvseEntry,
   OCPP16AvailabilityType,
   OCPP16ChargePointStatus,
@@ -22,7 +24,7 @@ import {
 export const TEST_HASH_ID = 'test-hash-id-abc123'
 export const TEST_ID_TAG = 'RFID-TAG-001'
 export const TEST_STATION_ID = 'CS-TEST-001'
-export const TEST_WS_URL = 'ws://localhost:8080'
+export const TEST_WS_URL = `ws://${DEFAULT_HOST}:${DEFAULT_PORT.toString()}`
 
 // ── Factory Functions ─────────────────────────────────────────────────────────
 
@@ -108,8 +110,8 @@ export function createUIServerConfig (
   overrides?: Partial<UIServerConfigurationSection>
 ): UIServerConfigurationSection {
   return {
-    host: 'localhost',
-    port: 8080,
+    host: DEFAULT_HOST,
+    port: DEFAULT_PORT,
     protocol: Protocol.UI,
     version: ProtocolVersion['0.0.1'],
     ...overrides,