@zetra/citrineos-util 1.8.3-fork.1 → 1.8.3-fork.100

package/dist/authorization/ApiAuthPlugin.d.ts

@@ -1,7 +1,7 @@
 import type { FastifyPluginAsync, FastifyReply } from 'fastify';
 import type { ILogObj } from 'tslog';
 import { Logger } from 'tslog';
-import type { IApiAuthProvider, UserInfo } from '@citrineos/base';
+import type { IApiAuthProvider, UserInfo } from '@zetra/citrineos-base';
 /**
  * Options for the authentication plugin
  */

package/dist/authorization/ApiAuthPlugin.js

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 import { Logger } from 'tslog';
 import fp from 'fastify-plugin';
-import { HttpStatus } from '@citrineos/base';
+import { HttpStatus } from '@zetra/citrineos-base';
 /**
  * Authentication plugin for Fastify
  * This plugin adds authentication and authorization capabilities to Fastify

package/dist/authorization/OidcTokenProvider.d.ts

@@ -1,15 +1,2 @@
-import type { ILogObj } from 'tslog';
-import { Logger } from 'tslog';
-export interface OidcTokenProviderConfig {
-    tokenUrl: string;
-    clientId: string;
-    clientSecret: string;
-    audience: string;
-}
-export declare class OidcTokenProvider {
-    private config;
-    private oidcToken?;
-    private readonly _logger;
-    constructor(config: OidcTokenProviderConfig, logger?: Logger<ILogObj>);
-    getToken(): Promise<string>;
-}
+export { OidcTokenProvider } from '@zetra/citrineos-base';
+export type { OidcTokenProviderConfig } from '@zetra/citrineos-base';

package/dist/authorization/OidcTokenProvider.js

@@ -1,47 +1,8 @@
 // SPDX-FileCopyrightText: 2025 Contributors to the CitrineOS Project
 //
 // SPDX-License-Identifier: Apache-2.0
-import { Logger } from 'tslog';
-export class OidcTokenProvider {
-    config;
-    oidcToken;
-    _logger;
-    constructor(config, logger) {
-        this.config = config;
-        this._logger = logger
-            ? logger.getSubLogger({ name: this.constructor.name })
-            : new Logger({ name: this.constructor.name });
-    }
-    async getToken() {
-        if (this.oidcToken && this.oidcToken.expiresAt > Date.now()) {
-            this._logger.debug('Returning cached OIDC token');
-            return this.oidcToken.accessToken;
-        }
-        this._logger.debug('Fetching new OIDC token');
-        const response = await fetch(this.config.tokenUrl, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/x-www-form-urlencoded',
-            },
-            body: new URLSearchParams({
-                grant_type: 'client_credentials',
-                client_id: this.config.clientId,
-                client_secret: this.config.clientSecret,
-                audience: this.config.audience,
-            }),
-        });
-        if (!response.ok) {
-            const errorText = await response.text();
-            this._logger.error('Failed to fetch OIDC token:', errorText);
-            throw new Error(`Failed to fetch OIDC token: ${response.statusText}`);
-        }
-        const tokenData = await response.json();
-        this.oidcToken = {
-            accessToken: tokenData.access_token,
-            // Set expiry to 1 minute before actual expiration to be safe
-            expiresAt: Date.now() + (tokenData.expires_in - 60) * 1000,
-        };
-        return this.oidcToken.accessToken;
-    }
-}
+// The OidcTokenProvider now lives in @zetra/citrineos-base so that base-level modules
+// (e.g. AbstractModule message API callbacks) can authenticate callbacks as well.
+// Re-exported here to preserve existing import paths.
+export { OidcTokenProvider } from '@zetra/citrineos-base';
 //# sourceMappingURL=OidcTokenProvider.js.map

package/dist/authorization/OidcTokenProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"OidcTokenProvider.js","sourceRoot":"","sources":["../../src/authorization/OidcTokenProvider.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,EAAE;AACF,sCAAsC;AAGtC,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAc/B,MAAM,OAAO,iBAAiB;IAKlB;IAJF,SAAS,CAAa;IACb,OAAO,CAAkB;IAE1C,YACU,MAA+B,EACvC,MAAwB;QADhB,WAAM,GAAN,MAAM,CAAyB;QAGvC,IAAI,CAAC,OAAO,GAAG,MAAM;YACnB,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;YACtD,CAAC,CAAC,IAAI,MAAM,CAAU,EAAE,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;IAC3D,CAAC;IAEM,KAAK,CAAC,QAAQ;QACnB,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;YAC5D,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;YAClD,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC;QACpC,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;QAC9C,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;YACjD,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,mCAAmC;aACpD;YACD,IAAI,EAAE,IAAI,eAAe,CAAC;gBACxB,UAAU,EAAE,oBAAoB;gBAChC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ;gBAC/B,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY;gBACvC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ;aAC/B,CAAC;SACH,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YACxC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,6BAA6B,EAAE,SAAS,CAAC,CAAC;YAC7D,MAAM,IAAI,KAAK,CAAC,+BAA+B,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC;QACxE,CAAC;QAED,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACxC,IAAI,CAAC,SAAS,GAAG;YACf,WAAW,EAAE,SAAS,CAAC,YAAY;YACnC,6DAA6D;YAC7D,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,SAAS,CAAC,UAAU,GAAG,EAAE,CAAC,GAAG,IAAI;SAC3D,CAAC;QAEF,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC;IACpC,CAAC;CACF"}
+{"version":3,"file":"OidcTokenProvider.js","sourceRoot":"","sources":["../../src/authorization/OidcTokenProvider.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,EAAE;AACF,sCAAsC;AAEtC,gFAAgF;AAChF,kFAAkF;AAClF,sDAAsD;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC"}

package/dist/authorization/provider/LocalByPassAuthProvider.d.ts

@@ -1,8 +1,8 @@
 import type { FastifyRequest } from 'fastify';
 import type { ILogObj } from 'tslog';
 import { Logger } from 'tslog';
-import type { IApiAuthProvider, UserInfo } from '@citrineos/base';
-import { ApiAuthenticationResult, ApiAuthorizationResult } from '@citrineos/base';
+import type { IApiAuthProvider, UserInfo } from '@zetra/citrineos-base';
+import { ApiAuthenticationResult, ApiAuthorizationResult } from '@zetra/citrineos-base';
 /**
  * A local bypass authentication provider that doesn't perform actual authentication
  * Only for development and testing environments

package/dist/authorization/provider/LocalByPassAuthProvider.js

@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 import { Logger } from 'tslog';
-import { ApiAuthenticationResult, ApiAuthorizationResult } from '@citrineos/base';
+import { ApiAuthenticationResult, ApiAuthorizationResult } from '@zetra/citrineos-base';
 /**
  * A local bypass authentication provider that doesn't perform actual authentication
  * Only for development and testing environments

package/dist/authorization/provider/OIDCAuthProvider.d.ts

@@ -1,8 +1,8 @@
 import type { FastifyRequest } from 'fastify';
 import type { ILogObj } from 'tslog';
 import { Logger } from 'tslog';
-import type { IApiAuthProvider, UserInfo } from '@citrineos/base';
-import { ApiAuthenticationResult, ApiAuthorizationResult } from '@citrineos/base';
+import type { IApiAuthProvider, UserInfo } from '@zetra/citrineos-base';
+import { ApiAuthenticationResult, ApiAuthorizationResult } from '@zetra/citrineos-base';
 export interface OIDCConfig {
     jwksUri: string;
     issuer: string;

package/dist/authorization/provider/OIDCAuthProvider.js

@@ -5,7 +5,7 @@ import { Logger } from 'tslog';
 import jwt from 'jsonwebtoken';
 import jwksClient from 'jwks-rsa';
 import JwksRsa from 'jwks-rsa';
-import { ApiAuthenticationResult, ApiAuthorizationResult } from '@citrineos/base';
+import { ApiAuthenticationResult, ApiAuthorizationResult } from '@zetra/citrineos-base';
 import { createPublicKey } from 'crypto';
 import { RbacRulesLoader } from '../rbac/RbacRulesLoader.js';
 /**

package/dist/authorization/rbac/RbacRulesLoader.js

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 import * as fs from 'fs';
 import { Logger } from 'tslog';
-import { RbacRulesSchema } from '@citrineos/base';
+import { RbacRulesSchema } from '@zetra/citrineos-base';
 import { UrlMatcher } from './UrlMatcher.js';
 import path from 'path';
 /**

package/dist/authorizer/RealTimeAuthorizer.d.ts

@@ -1,5 +1,5 @@
-import { type AuthorizationStatusEnumType, type ConnectorDto, type EvseDto, type IAuthorizer, type IdTokenEnumType, type IMessageContext, type SystemConfig } from '@citrineos/base';
-import type { Authorization, ILocationRepository } from '@citrineos/data';
+import { type AuthorizationStatusEnumType, type ConnectorDto, type EvseDto, type IAuthorizer, type IdTokenEnumType, type IMessageContext, type SystemConfig } from '@zetra/citrineos-base';
+import type { Authorization, ILocationRepository } from '@zetra/citrineos-data';
 import type { ILogObj } from 'tslog';
 import { Logger } from 'tslog';
 export interface RealTimeAuthorizationRequestBody {
@@ -8,8 +8,8 @@ export interface RealTimeAuthorizationRequestBody {
     idTokenType: IdTokenEnumType;
     locationId?: string;
     stationId: string;
-    evseId: number;
-    connectorId: number;
+    evseId?: number;
+    connectorId?: number;
 }
 export interface RealTimeAuthorizationResponse {
     timestamp: string;

package/dist/authorizer/RealTimeAuthorizer.js

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2025 Contributors to the CitrineOS Project
 //
 // SPDX-License-Identifier: Apache-2.0
-import { AuthorizationStatusEnum, AuthorizationWhitelistEnum, } from '@citrineos/base';
+import { AuthorizationStatusEnum, AuthorizationWhitelistEnum, } from '@zetra/citrineos-base';
 import { Logger } from 'tslog';
 import { OidcTokenProvider } from '../authorization/index.js';
 export class RealTimeAuthorizer {

package/dist/authorizer/UnknownTokenOcpiAuthorizer.d.ts

@@ -0,0 +1,18 @@
+import { type AuthorizationStatusEnumType, type IdTokenEnumType, type IMessageContext, type SystemConfig } from '@zetra/citrineos-base';
+import type { ILocationRepository, ITenantPartnerRepository } from '@zetra/citrineos-data';
+import type { ILogObj } from 'tslog';
+import { Logger } from 'tslog';
+/**
+ * Delegates real-time authorization of unknown tokens to the OCPI module's
+ * `/realTimeAuth` endpoint, which performs the OCPI `POST /authorize` against the eMSP.
+ */
+export declare class UnknownTokenOcpiAuthorizer {
+    private readonly _locationRepository;
+    private readonly _tenantPartnerRepository;
+    private readonly _config;
+    private readonly _logger;
+    private readonly _oidcTokenProvider?;
+    constructor(locationRepository: ILocationRepository, tenantPartnerRepository: ITenantPartnerRepository, config: SystemConfig, logger?: Logger<ILogObj>);
+    authorize(idToken: string, idTokenType: IdTokenEnumType, context: IMessageContext): Promise<AuthorizationStatusEnumType>;
+    private _buildRealTimeAuthUrl;
+}

package/dist/authorizer/UnknownTokenOcpiAuthorizer.js

@@ -0,0 +1,107 @@
+// SPDX-FileCopyrightText: 2025 Contributors to the CitrineOS Project
+//
+// SPDX-License-Identifier: Apache-2.0
+import { AuthorizationStatusEnum, } from '@zetra/citrineos-base';
+import { Logger } from 'tslog';
+import { OidcTokenProvider } from '../authorization/index.js';
+// The hub TenantPartner that unknown tokens are delegated to for real-time authorization.
+// Warning : As of now, only one hub partner is supported. In case of several partners, need for a rework to send authorization to all partners.
+const HUB_PARTNER_COUNTRY_CODE = 'FR';
+const HUB_PARTNER_PARTY_IDS = ['007', '107'];
+/**
+ * Delegates real-time authorization of unknown tokens to the OCPI module's
+ * `/realTimeAuth` endpoint, which performs the OCPI `POST /authorize` against the eMSP.
+ */
+export class UnknownTokenOcpiAuthorizer {
+    _locationRepository;
+    _tenantPartnerRepository;
+    _config;
+    _logger;
+    _oidcTokenProvider;
+    constructor(locationRepository, tenantPartnerRepository, config, logger) {
+        this._locationRepository = locationRepository;
+        this._tenantPartnerRepository = tenantPartnerRepository;
+        this._config = config;
+        this._logger = logger
+            ? logger.getSubLogger({ name: this.constructor.name })
+            : new Logger({ name: this.constructor.name });
+        if (config.oidcClient) {
+            this._oidcTokenProvider = new OidcTokenProvider(config.oidcClient, this._logger);
+        }
+    }
+    async authorize(idToken, idTokenType, context) {
+        const hubPartner = await this._tenantPartnerRepository.getHubPartner(context.tenantId, HUB_PARTNER_COUNTRY_CODE, HUB_PARTNER_PARTY_IDS);
+        if (!hubPartner?.id) {
+            this._logger.debug(`No hub TenantPartner found for tenant ${context.tenantId} (${HUB_PARTNER_COUNTRY_CODE} ${HUB_PARTNER_PARTY_IDS.join('/')}); cannot delegate real-time authorization`);
+            return AuthorizationStatusEnum.Unknown;
+        }
+        const chargingStation = await this._locationRepository.readChargingStationByStationId(context.tenantId, context.stationId);
+        const payload = {
+            tenantPartnerId: hubPartner.id,
+            idToken,
+            idTokenType,
+            locationId: chargingStation?.locationId?.toString(),
+            stationId: context.stationId,
+        };
+        const url = this._buildRealTimeAuthUrl();
+        this._logger.debug(`Delegating unknown-token real-time authorization for partner ${hubPartner.id} to ${url}`);
+        try {
+            const headers = {
+                'Content-Type': 'application/json',
+            };
+            // The OCPI `/realTimeAuth` endpoint is an admin endpoint. When citrineos-ocpi is
+            // configured with OIDC, it expects a Bearer JWT (client-credentials); otherwise we
+            // fall back to the legacy `Token <adminToken>` scheme.
+            if (this._oidcTokenProvider) {
+                try {
+                    const token = await this._oidcTokenProvider.getToken();
+                    headers['Authorization'] = `Bearer ${token}`;
+                }
+                catch (error) {
+                    this._logger.error('Failed to get OIDC token for real-time authorization:', error);
+                    return AuthorizationStatusEnum.Unknown;
+                }
+            }
+            else if (this._config.ocpiServer.adminToken) {
+                headers['Authorization'] = `Token ${this._config.ocpiServer.adminToken}`;
+            }
+            const response = await fetch(url, {
+                method: 'POST',
+                headers,
+                body: JSON.stringify(payload),
+            });
+            if (!response.ok) {
+                const responseBody = await response.text();
+                this._logger.error(`Real-time authorization request to ${url} failed: HTTP ${response.status} ${responseBody}`);
+                return AuthorizationStatusEnum.Unknown;
+            }
+            const responseJson = (await response.json());
+            this._logger.debug(`Real-time auth response: ${responseJson?.data?.allowed}`);
+            switch (responseJson?.data?.allowed) {
+                case 'ALLOWED':
+                    return AuthorizationStatusEnum.Accepted;
+                case 'BLOCKED':
+                    return AuthorizationStatusEnum.Blocked;
+                case 'EXPIRED':
+                    return AuthorizationStatusEnum.Expired;
+                case 'NO_CREDIT':
+                    return AuthorizationStatusEnum.NoCredit;
+                case 'NOT_ALLOWED':
+                    return AuthorizationStatusEnum.NotAtThisLocation;
+                default:
+                    return AuthorizationStatusEnum.Unknown;
+            }
+        }
+        catch (error) {
+            this._logger.error(`Real-time authorization for unknown token failed: ${error}`);
+            return AuthorizationStatusEnum.Unknown;
+        }
+    }
+    _buildRealTimeAuthUrl() {
+        const { host, port, version } = this._config.ocpiServer;
+        // Mirrors the citrineos-ocpi route: global '/ocpi' prefix + Tokens controller
+        // base '/:role(cpo|emsp)/:versionId/tokens' + the '/realTimeAuth' admin endpoint.
+        return `http://${host}:${port}/ocpi/emsp/${version}/tokens/realTimeAuth`;
+    }
+}
+//# sourceMappingURL=UnknownTokenOcpiAuthorizer.js.map

package/dist/authorizer/UnknownTokenOcpiAuthorizer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"UnknownTokenOcpiAuthorizer.js","sourceRoot":"","sources":["../../src/authorizer/UnknownTokenOcpiAuthorizer.ts"],"names":[],"mappings":"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"}

package/dist/authorizer/index.d.ts

@@ -1 +1,2 @@
 export * from './RealTimeAuthorizer.js';
+export * from './UnknownTokenOcpiAuthorizer.js';

package/dist/authorizer/index.js

@@ -2,4 +2,5 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 export * from './RealTimeAuthorizer.js';
+export * from './UnknownTokenOcpiAuthorizer.js';
 //# sourceMappingURL=index.js.map

package/dist/authorizer/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/authorizer/index.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,EAAE;AACF,sCAAsC;AACtC,cAAc,yBAAyB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/authorizer/index.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,EAAE;AACF,sCAAsC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,iCAAiC,CAAC"}

package/dist/cache/memory.d.ts

@@ -1,4 +1,4 @@
-import type { ICache } from '@citrineos/base';
+import type { ICache } from '@zetra/citrineos-base';
 import type { ClassConstructor } from 'class-transformer';
 /**
  * Implementation of cache interface with memory storage

package/dist/cache/memory.js

@@ -52,7 +52,15 @@ export class MemoryCache {
     async remove(key, namespace) {
         namespace = namespace || 'default';
         const namespaceKey = `${namespace}:${key}`;
-        return this._cache.delete(namespaceKey);
+        if (this._timeoutMap.has(namespaceKey)) {
+            clearTimeout(this._timeoutMap.get(namespaceKey));
+            this._timeoutMap.delete(namespaceKey);
+        }
+        const deleted = this._cache.delete(namespaceKey);
+        if (deleted) {
+            this.resolveOnChange(namespaceKey, null);
+        }
+        return deleted;
     }
     onChange(key, waitSeconds, namespace, classConstructor) {
         namespace = namespace || 'default';
@@ -113,7 +121,7 @@ export class MemoryCache {
         }
         if (expireSeconds) {
             this._timeoutMap.set(namespaceKey, setTimeout(() => {
-                this._cache.delete(namespaceKey);
+                void this.remove(key, namespace);
             }, expireSeconds * 1000));
         }
         this.resolveOnChange(namespaceKey, value);
@@ -131,7 +139,7 @@ export class MemoryCache {
         }
         if (expireSeconds) {
             this._timeoutMap.set(namespaceKey, setTimeout(() => {
-                this._cache.delete(namespaceKey);
+                void this.remove(key, namespace);
             }, expireSeconds * 1000));
         }
         this.resolveOnChange(namespaceKey, value);

package/dist/cache/memory.js.map

@@ -1 +1 @@
-{"version":3,"file":"memory.js","sourceRoot":"","sources":["../../src/cache/memory.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"memory.js","sourceRoot":"","sources":["../../src/cache/memory.ts"],"names":[],"mappings":"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"}

package/dist/cache/redis.d.ts

@@ -1,4 +1,4 @@
-import type { ICache } from '@citrineos/base';
+import type { ICache } from '@zetra/citrineos-base';
 import type { ClassConstructor } from 'class-transformer';
 import type { RedisClientOptions } from 'redis';
 /**

package/dist/cache/redis.js

@@ -37,28 +37,30 @@ export class RedisCache {
         return new Promise((resolve) => {
             // Create a Redis subscriber to listen for operations affecting the key
             const subscriber = createClient();
+            let closed = false;
+            // Cancel the fallback timer and close the subscriber, exactly once
+            const cleanup = () => {
+                if (closed)
+                    return;
+                closed = true;
+                if (timer)
+                    clearTimeout(timer);
+                subscriber.quit().catch((error) => {
+                    console.log('Error quitting subscriber', error);
+                });
+            };
             // Channel: Key-space, message: the name of the event, which is the command executed on the key
             subscriber
                 .subscribe(`__keyspace@0__:${key}`, (channel, message) => {
                 switch (message) {
                     case 'set':
                         resolve(this.get(key, namespace, classConstructor));
-                        subscriber
-                            .quit()
-                            .then()
-                            .catch((error) => {
-                            console.log('Error quitting subscriber', error);
-                        });
+                        cleanup();
                         break;
                     case 'del':
                     case 'expire':
                         resolve(null);
-                        subscriber
-                            .quit()
-                            .then()
-                            .catch((error) => {
-                            console.log('Error quitting subscriber', error);
-                        });
+                        cleanup();
                         break;
                     default:
                         // Do nothing
@@ -69,14 +71,9 @@ export class RedisCache {
                 .catch((error) => {
                 console.log('Error creating Redis subscriber', error);
             });
-            setTimeout(() => {
+            const timer = setTimeout(() => {
                 resolve(this.get(key, namespace, classConstructor));
-                subscriber
-                    .quit()
-                    .then()
-                    .catch((error) => {
-                    console.log('Error closing Redis subscriber', error);
-                });
+                cleanup();
             }, waitSeconds * 1000);
         });
     }

package/dist/cache/redis.js.map

@@ -1 +1 @@
-{"version":3,"file":"redis.js","sourceRoot":"","sources":["../../src/cache/redis.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"redis.js","sourceRoot":"","sources":["../../src/cache/redis.ts"],"names":[],"mappings":"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"}

package/dist/certificate/CertificateAuthority.d.ts

@@ -1,5 +1,5 @@
-import type { ICache, SystemConfig } from '@citrineos/base';
-import { OCPP2_0_1 } from '@citrineos/base';
+import type { ICache, SystemConfig } from '@zetra/citrineos-base';
+import { OCPP2_0_1 } from '@zetra/citrineos-base';
 import type { IChargingStationCertificateAuthorityClient, IV2GCertificateAuthorityClient } from './client/interface.js';
 import type { ILogObj } from 'tslog';
 import { Logger } from 'tslog';

package/dist/certificate/CertificateAuthority.js

@@ -1,4 +1,4 @@
-import { OCPP2_0_1 } from '@citrineos/base';
+import { OCPP2_0_1 } from '@zetra/citrineos-base';
 import { Hubject } from './client/hubject.js';
 import { Acme } from './client/acme.js';
 import { Logger } from 'tslog';

package/dist/certificate/CertificateUtil.d.ts

@@ -1,6 +1,6 @@
 import * as pkijs from 'pkijs';
 import { CertificationRequest } from 'pkijs';
-import { Certificate, CountryNameEnumType, SignatureAlgorithmEnumType } from '@citrineos/data';
+import { Certificate, CountryNameEnumType, SignatureAlgorithmEnumType } from '@zetra/citrineos-data';
 import jsrsasign from 'jsrsasign';
 import moment from 'moment';
 import type { ILogObj } from 'tslog';

package/dist/certificate/CertificateUtil.js

@@ -5,7 +5,7 @@ import * as pkijs from 'pkijs';
 import { CertificationRequest } from 'pkijs';
 import * as asn1js from 'asn1js';
 import { fromBER } from 'asn1js';
-import { Certificate, CountryNameEnumType, SignatureAlgorithmEnumType } from '@citrineos/data';
+import { Certificate, CountryNameEnumType, SignatureAlgorithmEnumType } from '@zetra/citrineos-data';
 import jsrsasign from 'jsrsasign';
 import { fromBase64, stringToArrayBuffer } from 'pvutils';
 import moment from 'moment';

package/dist/certificate/client/acme.d.ts

@@ -1,5 +1,5 @@
 import type { IChargingStationCertificateAuthorityClient } from './interface.js';
-import type { SystemConfig } from '@citrineos/base';
+import type { SystemConfig } from '@zetra/citrineos-base';
 import { Client } from 'acme-client';
 import type { ILogObj } from 'tslog';
 import { Logger } from 'tslog';

package/dist/certificate/client/hubject.d.ts

@@ -1,5 +1,5 @@
 import type { IV2GCertificateAuthorityClient } from './interface.js';
-import { type ICache, type SystemConfig } from '@citrineos/base';
+import { type ICache, type SystemConfig } from '@zetra/citrineos-base';
 import type { ILogObj } from 'tslog';
 import { Logger } from 'tslog';
 export declare class Hubject implements IV2GCertificateAuthorityClient {

package/dist/certificate/client/hubject.js

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2025 Contributors to the CitrineOS Project
 //
 // SPDX-License-Identifier: Apache-2.0
-import { HttpMethod, HttpStatus, HUBJECT_DEFAULT_AUTH_TOKEN, HUBJECT_DEFAULT_BASEURL, HUBJECT_DEFAULT_CLIENTID, HUBJECT_DEFAULT_CLIENTSECRET, HUBJECT_DEFAULT_TOKENURL, } from '@citrineos/base';
+import { HttpMethod, HttpStatus, HUBJECT_DEFAULT_AUTH_TOKEN, HUBJECT_DEFAULT_BASEURL, HUBJECT_DEFAULT_CLIENTID, HUBJECT_DEFAULT_CLIENTSECRET, HUBJECT_DEFAULT_TOKENURL, } from '@zetra/citrineos-base';
 import { Logger } from 'tslog';
 import { createPemBlock } from '../CertificateUtil.js';
 export class Hubject {

package/dist/files/ftpServer.d.ts

@@ -1,4 +1,4 @@
-import type { IFileAccess } from '@citrineos/base';
+import type { IFileAccess } from '@zetra/citrineos-base';
 export declare class FtpServer implements IFileAccess {
     getFileURL(): string;
 }

package/dist/files/gcpCloudStorage.d.ts

@@ -1,4 +1,4 @@
-import type { BootstrapConfig, ConfigStore, SystemConfig } from '@citrineos/base';
+import type { BootstrapConfig, ConfigStore, SystemConfig } from '@zetra/citrineos-base';
 import type { ILogObj } from 'tslog';
 import { Logger } from 'tslog';
 export declare class GcpCloudStorage implements ConfigStore {

package/dist/files/localStorage.d.ts

@@ -1,4 +1,4 @@
-import type { ConfigStore, SystemConfig } from '@citrineos/base';
+import type { ConfigStore, SystemConfig } from '@zetra/citrineos-base';
 import type { ILogObj } from 'tslog';
 import { Logger } from 'tslog';
 export declare class LocalStorage implements ConfigStore {

package/dist/files/s3Storage.d.ts

@@ -1,4 +1,4 @@
-import type { BootstrapConfig, ConfigStore, SystemConfig } from '@citrineos/base';
+import type { BootstrapConfig, ConfigStore, SystemConfig } from '@zetra/citrineos-base';
 import type { ILogObj } from 'tslog';
 import { Logger } from 'tslog';
 export declare class S3Storage implements ConfigStore {

package/dist/networkconnection/WebsocketNetworkConnection.d.ts

@@ -1,7 +1,8 @@
-import type { IAuthenticator, ICache, IMessageRouter, INetworkConnection, SystemConfig, WebsocketServerConfig } from '@citrineos/base';
+import type { IAuthenticator, ICache, IMessageRouter, INetworkConnection, SystemConfig, WebsocketServerConfig } from '@zetra/citrineos-base';
 import type { ILogObj } from 'tslog';
 import { Logger } from 'tslog';
 export declare class WebsocketNetworkConnection implements INetworkConnection {
+    private static readonly CONNECTION_TTL_PING_INTERVAL_MULTIPLIER;
     protected _cache: ICache;
     protected _config: SystemConfig;
     protected _logger: Logger<ILogObj>;
@@ -22,6 +23,14 @@ export declare class WebsocketNetworkConnection implements INetworkConnection {
     bindNetworkHook(): (identifier: string, message: string) => Promise<void>;
     disconnect(tenantId: number, stationId: string): Promise<boolean>;
     shutdown(): Promise<void>;
+    /**
+     * Closes every currently established websocket connection, waiting for each
+     * to complete its close handshake (up to `gracePeriodMs`) before terminating
+     * it, so the 'close' event handler runs and cleans up the cache/router state.
+     *
+     * @param {number} gracePeriodMs - Time to wait for a graceful close before forcing termination.
+     */
+    private _closeActiveConnections;
     /**
      * Updates certificates for a specific server with the provided TLS key, certificate chain, and optional
      * root CA.