@zetra/citrineos-util 1.8.3-fork.2 → 1.8.3-fork.20

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.
Files changed (52) hide show
  1. package/dist/authorization/ApiAuthPlugin.d.ts +1 -1
  2. package/dist/authorization/ApiAuthPlugin.js +1 -1
  3. package/dist/authorization/provider/LocalByPassAuthProvider.d.ts +2 -2
  4. package/dist/authorization/provider/LocalByPassAuthProvider.js +1 -1
  5. package/dist/authorization/provider/OIDCAuthProvider.d.ts +2 -2
  6. package/dist/authorization/provider/OIDCAuthProvider.js +1 -1
  7. package/dist/authorization/rbac/RbacRulesLoader.js +1 -1
  8. package/dist/authorizer/RealTimeAuthorizer.d.ts +2 -2
  9. package/dist/authorizer/RealTimeAuthorizer.js +1 -1
  10. package/dist/cache/memory.d.ts +1 -1
  11. package/dist/cache/redis.d.ts +1 -1
  12. package/dist/certificate/CertificateAuthority.d.ts +2 -2
  13. package/dist/certificate/CertificateAuthority.js +1 -1
  14. package/dist/certificate/CertificateUtil.d.ts +1 -1
  15. package/dist/certificate/CertificateUtil.js +1 -1
  16. package/dist/certificate/client/acme.d.ts +1 -1
  17. package/dist/certificate/client/hubject.d.ts +1 -1
  18. package/dist/certificate/client/hubject.js +1 -1
  19. package/dist/files/ftpServer.d.ts +1 -1
  20. package/dist/files/gcpCloudStorage.d.ts +1 -1
  21. package/dist/files/localStorage.d.ts +1 -1
  22. package/dist/files/s3Storage.d.ts +1 -1
  23. package/dist/networkconnection/WebsocketNetworkConnection.d.ts +1 -1
  24. package/dist/networkconnection/WebsocketNetworkConnection.js +1 -1
  25. package/dist/networkconnection/authenticator/Authenticator.d.ts +1 -1
  26. package/dist/networkconnection/authenticator/AuthenticatorFilter.d.ts +1 -1
  27. package/dist/networkconnection/authenticator/BasicAuthenticationFilter.d.ts +2 -2
  28. package/dist/networkconnection/authenticator/BasicAuthenticationFilter.js +2 -2
  29. package/dist/networkconnection/authenticator/ConnectedStationFilter.d.ts +1 -1
  30. package/dist/networkconnection/authenticator/ConnectedStationFilter.js +1 -1
  31. package/dist/networkconnection/authenticator/NetworkProfileFilter.d.ts +2 -2
  32. package/dist/networkconnection/authenticator/NetworkProfileFilter.js +2 -2
  33. package/dist/networkconnection/authenticator/UnknownStationFilter.d.ts +2 -2
  34. package/dist/queue/kafka/receiver.d.ts +2 -2
  35. package/dist/queue/kafka/receiver.js +1 -1
  36. package/dist/queue/kafka/sender.d.ts +2 -2
  37. package/dist/queue/kafka/sender.js +1 -1
  38. package/dist/queue/rabbit-mq/receiver.d.ts +3 -2
  39. package/dist/queue/rabbit-mq/receiver.js +81 -21
  40. package/dist/queue/rabbit-mq/receiver.js.map +1 -1
  41. package/dist/queue/rabbit-mq/sender.d.ts +2 -2
  42. package/dist/queue/rabbit-mq/sender.js +7 -2
  43. package/dist/queue/rabbit-mq/sender.js.map +1 -1
  44. package/dist/security/SignedMeterValuesUtil.d.ts +2 -2
  45. package/dist/security/SignedMeterValuesUtil.js +2 -2
  46. package/dist/util/idGenerator.d.ts +2 -2
  47. package/dist/util/parser.d.ts +1 -1
  48. package/dist/util/swagger.d.ts +1 -1
  49. package/dist/util/swagger.js +1 -1
  50. package/dist/util/validator.d.ts +2 -2
  51. package/dist/util/validator.js +2 -2
  52. package/package.json +3 -3
@@ -1,7 +1,7 @@
1
1
  import type { FastifyPluginAsync, FastifyReply } from 'fastify';
2
2
  import type { ILogObj } from 'tslog';
3
3
  import { Logger } from 'tslog';
4
- import type { IApiAuthProvider, UserInfo } from '@citrineos/base';
4
+ import type { IApiAuthProvider, UserInfo } from '@zetra/citrineos-base';
5
5
  /**
6
6
  * Options for the authentication plugin
7
7
  */
@@ -3,7 +3,7 @@
3
3
  // SPDX-License-Identifier: Apache-2.0
4
4
  import { Logger } from 'tslog';
5
5
  import fp from 'fastify-plugin';
6
- import { HttpStatus } from '@citrineos/base';
6
+ import { HttpStatus } from '@zetra/citrineos-base';
7
7
  /**
8
8
  * Authentication plugin for Fastify
9
9
  * This plugin adds authentication and authorization capabilities to Fastify
@@ -1,8 +1,8 @@
1
1
  import type { FastifyRequest } from 'fastify';
2
2
  import type { ILogObj } from 'tslog';
3
3
  import { Logger } from 'tslog';
4
- import type { IApiAuthProvider, UserInfo } from '@citrineos/base';
5
- import { ApiAuthenticationResult, ApiAuthorizationResult } from '@citrineos/base';
4
+ import type { IApiAuthProvider, UserInfo } from '@zetra/citrineos-base';
5
+ import { ApiAuthenticationResult, ApiAuthorizationResult } from '@zetra/citrineos-base';
6
6
  /**
7
7
  * A local bypass authentication provider that doesn't perform actual authentication
8
8
  * Only for development and testing environments
@@ -2,7 +2,7 @@
2
2
  //
3
3
  // SPDX-License-Identifier: Apache-2.0
4
4
  import { Logger } from 'tslog';
5
- import { ApiAuthenticationResult, ApiAuthorizationResult } from '@citrineos/base';
5
+ import { ApiAuthenticationResult, ApiAuthorizationResult } from '@zetra/citrineos-base';
6
6
  /**
7
7
  * A local bypass authentication provider that doesn't perform actual authentication
8
8
  * Only for development and testing environments
@@ -1,8 +1,8 @@
1
1
  import type { FastifyRequest } from 'fastify';
2
2
  import type { ILogObj } from 'tslog';
3
3
  import { Logger } from 'tslog';
4
- import type { IApiAuthProvider, UserInfo } from '@citrineos/base';
5
- import { ApiAuthenticationResult, ApiAuthorizationResult } from '@citrineos/base';
4
+ import type { IApiAuthProvider, UserInfo } from '@zetra/citrineos-base';
5
+ import { ApiAuthenticationResult, ApiAuthorizationResult } from '@zetra/citrineos-base';
6
6
  export interface OIDCConfig {
7
7
  jwksUri: string;
8
8
  issuer: string;
@@ -5,7 +5,7 @@ import { Logger } from 'tslog';
5
5
  import jwt from 'jsonwebtoken';
6
6
  import jwksClient from 'jwks-rsa';
7
7
  import JwksRsa from 'jwks-rsa';
8
- import { ApiAuthenticationResult, ApiAuthorizationResult } from '@citrineos/base';
8
+ import { ApiAuthenticationResult, ApiAuthorizationResult } from '@zetra/citrineos-base';
9
9
  import { createPublicKey } from 'crypto';
10
10
  import { RbacRulesLoader } from '../rbac/RbacRulesLoader.js';
11
11
  /**
@@ -3,7 +3,7 @@
3
3
  // SPDX-License-Identifier: Apache-2.0
4
4
  import * as fs from 'fs';
5
5
  import { Logger } from 'tslog';
6
- import { RbacRulesSchema } from '@citrineos/base';
6
+ import { RbacRulesSchema } from '@zetra/citrineos-base';
7
7
  import { UrlMatcher } from './UrlMatcher.js';
8
8
  import path from 'path';
9
9
  /**
@@ -1,5 +1,5 @@
1
- import { type AuthorizationStatusEnumType, type ConnectorDto, type EvseDto, type IAuthorizer, type IdTokenEnumType, type IMessageContext, type SystemConfig } from '@citrineos/base';
2
- import type { Authorization, ILocationRepository } from '@citrineos/data';
1
+ import { type AuthorizationStatusEnumType, type ConnectorDto, type EvseDto, type IAuthorizer, type IdTokenEnumType, type IMessageContext, type SystemConfig } from '@zetra/citrineos-base';
2
+ import type { Authorization, ILocationRepository } from '@zetra/citrineos-data';
3
3
  import type { ILogObj } from 'tslog';
4
4
  import { Logger } from 'tslog';
5
5
  export interface RealTimeAuthorizationRequestBody {
@@ -1,7 +1,7 @@
1
1
  // SPDX-FileCopyrightText: 2025 Contributors to the CitrineOS Project
2
2
  //
3
3
  // SPDX-License-Identifier: Apache-2.0
4
- import { AuthorizationStatusEnum, AuthorizationWhitelistEnum, } from '@citrineos/base';
4
+ import { AuthorizationStatusEnum, AuthorizationWhitelistEnum, } from '@zetra/citrineos-base';
5
5
  import { Logger } from 'tslog';
6
6
  import { OidcTokenProvider } from '../authorization/index.js';
7
7
  export class RealTimeAuthorizer {
@@ -1,4 +1,4 @@
1
- import type { ICache } from '@citrineos/base';
1
+ import type { ICache } from '@zetra/citrineos-base';
2
2
  import type { ClassConstructor } from 'class-transformer';
3
3
  /**
4
4
  * Implementation of cache interface with memory storage
@@ -1,4 +1,4 @@
1
- import type { ICache } from '@citrineos/base';
1
+ import type { ICache } from '@zetra/citrineos-base';
2
2
  import type { ClassConstructor } from 'class-transformer';
3
3
  import type { RedisClientOptions } from 'redis';
4
4
  /**
@@ -1,5 +1,5 @@
1
- import type { ICache, SystemConfig } from '@citrineos/base';
2
- import { OCPP2_0_1 } from '@citrineos/base';
1
+ import type { ICache, SystemConfig } from '@zetra/citrineos-base';
2
+ import { OCPP2_0_1 } from '@zetra/citrineos-base';
3
3
  import type { IChargingStationCertificateAuthorityClient, IV2GCertificateAuthorityClient } from './client/interface.js';
4
4
  import type { ILogObj } from 'tslog';
5
5
  import { Logger } from 'tslog';
@@ -1,4 +1,4 @@
1
- import { OCPP2_0_1 } from '@citrineos/base';
1
+ import { OCPP2_0_1 } from '@zetra/citrineos-base';
2
2
  import { Hubject } from './client/hubject.js';
3
3
  import { Acme } from './client/acme.js';
4
4
  import { Logger } from 'tslog';
@@ -1,6 +1,6 @@
1
1
  import * as pkijs from 'pkijs';
2
2
  import { CertificationRequest } from 'pkijs';
3
- import { Certificate, CountryNameEnumType, SignatureAlgorithmEnumType } from '@citrineos/data';
3
+ import { Certificate, CountryNameEnumType, SignatureAlgorithmEnumType } from '@zetra/citrineos-data';
4
4
  import jsrsasign from 'jsrsasign';
5
5
  import moment from 'moment';
6
6
  import type { ILogObj } from 'tslog';
@@ -5,7 +5,7 @@ import * as pkijs from 'pkijs';
5
5
  import { CertificationRequest } from 'pkijs';
6
6
  import * as asn1js from 'asn1js';
7
7
  import { fromBER } from 'asn1js';
8
- import { Certificate, CountryNameEnumType, SignatureAlgorithmEnumType } from '@citrineos/data';
8
+ import { Certificate, CountryNameEnumType, SignatureAlgorithmEnumType } from '@zetra/citrineos-data';
9
9
  import jsrsasign from 'jsrsasign';
10
10
  import { fromBase64, stringToArrayBuffer } from 'pvutils';
11
11
  import moment from 'moment';
@@ -1,5 +1,5 @@
1
1
  import type { IChargingStationCertificateAuthorityClient } from './interface.js';
2
- import type { SystemConfig } from '@citrineos/base';
2
+ import type { SystemConfig } from '@zetra/citrineos-base';
3
3
  import { Client } from 'acme-client';
4
4
  import type { ILogObj } from 'tslog';
5
5
  import { Logger } from 'tslog';
@@ -1,5 +1,5 @@
1
1
  import type { IV2GCertificateAuthorityClient } from './interface.js';
2
- import { type ICache, type SystemConfig } from '@citrineos/base';
2
+ import { type ICache, type SystemConfig } from '@zetra/citrineos-base';
3
3
  import type { ILogObj } from 'tslog';
4
4
  import { Logger } from 'tslog';
5
5
  export declare class Hubject implements IV2GCertificateAuthorityClient {
@@ -1,7 +1,7 @@
1
1
  // SPDX-FileCopyrightText: 2025 Contributors to the CitrineOS Project
2
2
  //
3
3
  // SPDX-License-Identifier: Apache-2.0
4
- import { HttpMethod, HttpStatus, HUBJECT_DEFAULT_AUTH_TOKEN, HUBJECT_DEFAULT_BASEURL, HUBJECT_DEFAULT_CLIENTID, HUBJECT_DEFAULT_CLIENTSECRET, HUBJECT_DEFAULT_TOKENURL, } from '@citrineos/base';
4
+ import { HttpMethod, HttpStatus, HUBJECT_DEFAULT_AUTH_TOKEN, HUBJECT_DEFAULT_BASEURL, HUBJECT_DEFAULT_CLIENTID, HUBJECT_DEFAULT_CLIENTSECRET, HUBJECT_DEFAULT_TOKENURL, } from '@zetra/citrineos-base';
5
5
  import { Logger } from 'tslog';
6
6
  import { createPemBlock } from '../CertificateUtil.js';
7
7
  export class Hubject {
@@ -1,4 +1,4 @@
1
- import type { IFileAccess } from '@citrineos/base';
1
+ import type { IFileAccess } from '@zetra/citrineos-base';
2
2
  export declare class FtpServer implements IFileAccess {
3
3
  getFileURL(): string;
4
4
  }
@@ -1,4 +1,4 @@
1
- import type { BootstrapConfig, ConfigStore, SystemConfig } from '@citrineos/base';
1
+ import type { BootstrapConfig, ConfigStore, SystemConfig } from '@zetra/citrineos-base';
2
2
  import type { ILogObj } from 'tslog';
3
3
  import { Logger } from 'tslog';
4
4
  export declare class GcpCloudStorage implements ConfigStore {
@@ -1,4 +1,4 @@
1
- import type { ConfigStore, SystemConfig } from '@citrineos/base';
1
+ import type { ConfigStore, SystemConfig } from '@zetra/citrineos-base';
2
2
  import type { ILogObj } from 'tslog';
3
3
  import { Logger } from 'tslog';
4
4
  export declare class LocalStorage implements ConfigStore {
@@ -1,4 +1,4 @@
1
- import type { BootstrapConfig, ConfigStore, SystemConfig } from '@citrineos/base';
1
+ import type { BootstrapConfig, ConfigStore, SystemConfig } from '@zetra/citrineos-base';
2
2
  import type { ILogObj } from 'tslog';
3
3
  import { Logger } from 'tslog';
4
4
  export declare class S3Storage implements ConfigStore {
@@ -1,4 +1,4 @@
1
- import type { IAuthenticator, ICache, IMessageRouter, INetworkConnection, SystemConfig, WebsocketServerConfig } from '@citrineos/base';
1
+ import type { IAuthenticator, ICache, IMessageRouter, INetworkConnection, SystemConfig, WebsocketServerConfig } from '@zetra/citrineos-base';
2
2
  import type { ILogObj } from 'tslog';
3
3
  import { Logger } from 'tslog';
4
4
  export declare class WebsocketNetworkConnection implements INetworkConnection {
@@ -1,4 +1,4 @@
1
- import { CacheNamespace, createIdentifier, getStationIdFromIdentifier, getTenantIdFromIdentifier, } from '@citrineos/base';
1
+ import { CacheNamespace, createIdentifier, getStationIdFromIdentifier, getTenantIdFromIdentifier, } from '@zetra/citrineos-base';
2
2
  import fs from 'fs';
3
3
  import * as http from 'http';
4
4
  import * as https from 'https';
@@ -1,4 +1,4 @@
1
- import type { AuthenticationOptions, IAuthenticator } from '@citrineos/base';
1
+ import type { AuthenticationOptions, IAuthenticator } from '@zetra/citrineos-base';
2
2
  import type { ILogObj } from 'tslog';
3
3
  import { Logger } from 'tslog';
4
4
  import { IncomingMessage } from 'http';
@@ -1,7 +1,7 @@
1
1
  import { IncomingMessage } from 'http';
2
2
  import type { ILogObj } from 'tslog';
3
3
  import { Logger } from 'tslog';
4
- import type { AuthenticationOptions } from '@citrineos/base';
4
+ import type { AuthenticationOptions } from '@zetra/citrineos-base';
5
5
  export declare abstract class AuthenticatorFilter {
6
6
  protected _logger: Logger<ILogObj>;
7
7
  protected constructor(logger?: Logger<ILogObj>);
@@ -1,9 +1,9 @@
1
1
  import type { ILogObj } from 'tslog';
2
2
  import { Logger } from 'tslog';
3
- import type { IDeviceModelRepository } from '@citrineos/data';
3
+ import type { IDeviceModelRepository } from '@zetra/citrineos-data';
4
4
  import { IncomingMessage } from 'http';
5
5
  import { AuthenticatorFilter } from './AuthenticatorFilter.js';
6
- import type { AuthenticationOptions } from '@citrineos/base';
6
+ import type { AuthenticationOptions } from '@zetra/citrineos-base';
7
7
  /**
8
8
  * Filter used to authenticate incoming HTTP requests based on basic authorization header.
9
9
  * It only applies when the security profile is set to 1 or 2.
@@ -1,9 +1,9 @@
1
1
  import { Logger } from 'tslog';
2
- import { CryptoUtils } from '@citrineos/data';
2
+ import { CryptoUtils } from '@zetra/citrineos-data';
3
3
  import { IncomingMessage } from 'http';
4
4
  import { extractBasicCredentials } from '../../util/RequestOperations.js';
5
5
  import { AuthenticatorFilter } from './AuthenticatorFilter.js';
6
- import { OCPP2_0_1 } from '@citrineos/base';
6
+ import { OCPP2_0_1 } from '@zetra/citrineos-base';
7
7
  import { UpgradeAuthenticationError } from './errors/AuthenticationError.js';
8
8
  /**
9
9
  * Filter used to authenticate incoming HTTP requests based on basic authorization header.
@@ -1,4 +1,4 @@
1
- import type { AuthenticationOptions, ICache } from '@citrineos/base';
1
+ import type { AuthenticationOptions, ICache } from '@zetra/citrineos-base';
2
2
  import type { ILogObj } from 'tslog';
3
3
  import { Logger } from 'tslog';
4
4
  import { IncomingMessage } from 'http';
@@ -1,4 +1,4 @@
1
- import { CacheNamespace, notNull } from '@citrineos/base';
1
+ import { CacheNamespace, notNull } from '@zetra/citrineos-base';
2
2
  import { Logger } from 'tslog';
3
3
  import { IncomingMessage } from 'http';
4
4
  import { AuthenticatorFilter } from './AuthenticatorFilter.js';
@@ -1,9 +1,9 @@
1
1
  import type { ILogObj } from 'tslog';
2
2
  import { Logger } from 'tslog';
3
- import type { IDeviceModelRepository } from '@citrineos/data';
3
+ import type { IDeviceModelRepository } from '@zetra/citrineos-data';
4
4
  import { IncomingMessage } from 'http';
5
5
  import { AuthenticatorFilter } from './AuthenticatorFilter.js';
6
- import type { AuthenticationOptions } from '@citrineos/base';
6
+ import type { AuthenticationOptions } from '@zetra/citrineos-base';
7
7
  /**
8
8
  * Filter used to block connections when charging stations attempt to connect to disallowed security profiles
9
9
  */
@@ -1,8 +1,8 @@
1
1
  import { Logger } from 'tslog';
2
- import { ChargingStationNetworkProfile, ServerNetworkProfile } from '@citrineos/data';
2
+ import { ChargingStationNetworkProfile, ServerNetworkProfile } from '@zetra/citrineos-data';
3
3
  import { IncomingMessage } from 'http';
4
4
  import { AuthenticatorFilter } from './AuthenticatorFilter.js';
5
- import { OCPP2_0_1 } from '@citrineos/base';
5
+ import { OCPP2_0_1 } from '@zetra/citrineos-base';
6
6
  import { UpgradeAuthenticationError } from './errors/AuthenticationError.js';
7
7
  /**
8
8
  * Filter used to block connections when charging stations attempt to connect to disallowed security profiles
@@ -1,9 +1,9 @@
1
1
  import type { ILogObj } from 'tslog';
2
2
  import { Logger } from 'tslog';
3
- import type { ILocationRepository } from '@citrineos/data';
3
+ import type { ILocationRepository } from '@zetra/citrineos-data';
4
4
  import { IncomingMessage } from 'http';
5
5
  import { AuthenticatorFilter } from './AuthenticatorFilter.js';
6
- import type { AuthenticationOptions } from '@citrineos/base';
6
+ import type { AuthenticationOptions } from '@zetra/citrineos-base';
7
7
  /**
8
8
  * Filter used to block connections from charging stations that are not recognized in the system.
9
9
  * It only applies when unknown charging stations are not allowed.
@@ -1,5 +1,5 @@
1
- import type { CallAction, IMessageHandler, IModule, SystemConfig } from '@citrineos/base';
2
- import { AbstractMessageHandler, CircuitBreaker } from '@citrineos/base';
1
+ import type { CallAction, IMessageHandler, IModule, SystemConfig } from '@zetra/citrineos-base';
2
+ import { AbstractMessageHandler, CircuitBreaker } from '@zetra/citrineos-base';
3
3
  import type { ILogObj } from 'tslog';
4
4
  import { Logger } from 'tslog';
5
5
  /**
@@ -1,4 +1,4 @@
1
- import { AbstractMessageHandler, CircuitBreaker, Message, OcppError, RetryMessageError, } from '@citrineos/base';
1
+ import { AbstractMessageHandler, CircuitBreaker, Message, OcppError, RetryMessageError, } from '@zetra/citrineos-base';
2
2
  import { plainToInstance } from 'class-transformer';
3
3
  import { Kafka } from 'kafkajs';
4
4
  import { Logger } from 'tslog';
@@ -1,5 +1,5 @@
1
- import type { IMessage, IMessageConfirmation, IMessageSender, OcppRequest, OcppResponse, SystemConfig } from '@citrineos/base';
2
- import { AbstractMessageSender, CircuitBreaker, MessageState, OcppError } from '@citrineos/base';
1
+ import type { IMessage, IMessageConfirmation, IMessageSender, OcppRequest, OcppResponse, SystemConfig } from '@zetra/citrineos-base';
2
+ import { AbstractMessageSender, CircuitBreaker, MessageState, OcppError } from '@zetra/citrineos-base';
3
3
  import type { ILogObj } from 'tslog';
4
4
  import { Logger } from 'tslog';
5
5
  /**
@@ -1,4 +1,4 @@
1
- import { AbstractMessageSender, CircuitBreaker, MessageState, OcppError } from '@citrineos/base';
1
+ import { AbstractMessageSender, CircuitBreaker, MessageState, OcppError } from '@zetra/citrineos-base';
2
2
  import { Kafka } from 'kafkajs';
3
3
  import { Logger } from 'tslog';
4
4
  /**
@@ -1,5 +1,5 @@
1
- import type { CallAction, ICache, IModule, SystemConfig } from '@citrineos/base';
2
- import { AbstractMessageHandler, CircuitBreaker } from '@citrineos/base';
1
+ import type { CallAction, ICache, IModule, SystemConfig } from '@zetra/citrineos-base';
2
+ import { AbstractMessageHandler, CircuitBreaker } from '@zetra/citrineos-base';
3
3
  import * as amqplib from 'amqplib';
4
4
  import type { ILogObj } from 'tslog';
5
5
  import { Logger } from 'tslog';
@@ -79,6 +79,7 @@ export declare class RabbitMqReceiver extends AbstractMessageHandler {
79
79
  * Used during reconnection to recreate queues.
80
80
  */
81
81
  private _resubscribe;
82
+ private _resubscribeBindings;
82
83
  /**
83
84
  * Underlying RabbitMQ message handler.
84
85
  *
@@ -1,7 +1,7 @@
1
1
  // SPDX-FileCopyrightText: 2025 Contributors to the CitrineOS Project
2
2
  //
3
3
  // SPDX-License-Identifier: Apache-2.0
4
- import { AbstractMessageHandler, CacheNamespace, CircuitBreaker, Message, RetryMessageError, } from '@citrineos/base';
4
+ import { AbstractMessageHandler, CacheNamespace, CircuitBreaker, Message, RetryMessageError, } from '@zetra/citrineos-base';
5
5
  import * as amqplib from 'amqplib';
6
6
  import { Logger } from 'tslog';
7
7
  import { MemoryCache } from '../../index.js';
@@ -104,7 +104,9 @@ export class RabbitMqReceiver extends AbstractMessageHandler {
104
104
  .get(cacheKey, CacheNamespace.Other, () => Array)
105
105
  .then((value) => {
106
106
  if (value) {
107
- value.push(queueName);
107
+ if (!value.includes(queueName)) {
108
+ value.push(queueName);
109
+ }
108
110
  return value;
109
111
  }
110
112
  return new Array(queueName);
@@ -117,7 +119,26 @@ export class RabbitMqReceiver extends AbstractMessageHandler {
117
119
  actions,
118
120
  filter,
119
121
  };
120
- await this._cache.set(metadataKey, JSON.stringify(subscriptionMetadata), CacheNamespace.Other);
122
+ // Multiple subscriptions can exist for the same identifier (e.g., OcppRouter registers request + response
123
+ // bindings using the same connectionIdentifier). Persist them as a list so reconnect can restore all.
124
+ const existingMetadataJson = await this._cache.get(metadataKey, CacheNamespace.Other);
125
+ let metadataList = [];
126
+ if (existingMetadataJson) {
127
+ try {
128
+ const parsed = JSON.parse(existingMetadataJson);
129
+ metadataList = Array.isArray(parsed) ? parsed : [parsed];
130
+ }
131
+ catch {
132
+ // Ignore corrupt metadata and overwrite with fresh list.
133
+ metadataList = [];
134
+ }
135
+ }
136
+ const candidateKey = JSON.stringify({ actions, filter });
137
+ const alreadyPresent = metadataList.some((m) => JSON.stringify({ actions: m.actions, filter: m.filter }) === candidateKey);
138
+ if (!alreadyPresent) {
139
+ metadataList.push(subscriptionMetadata);
140
+ }
141
+ await this._cache.set(metadataKey, JSON.stringify(metadataList), CacheNamespace.Other);
121
142
  // Add identifier to registry (list of all active subscriptions)
122
143
  const registry = await this._cache
123
144
  .get(RabbitMqReceiver.REGISTRY_KEY, CacheNamespace.Other, () => Array)
@@ -204,6 +225,8 @@ export class RabbitMqReceiver extends AbstractMessageHandler {
204
225
  const connection = await amqplib.connect(url, { heartbeat: 10 });
205
226
  this._connection = connection;
206
227
  const channel = await connection.createChannel();
228
+ // Assign channel immediately so post-reconnect resubscription can use it.
229
+ this._channel = channel;
207
230
  const exchange = this._config.util.messageBroker.amqp?.exchange;
208
231
  if (exchange) {
209
232
  await channel.assertExchange(exchange, 'headers', { durable: false });
@@ -350,15 +373,18 @@ export class RabbitMqReceiver extends AbstractMessageHandler {
350
373
  continue;
351
374
  }
352
375
  try {
353
- // Parse the JSON metadata to ensure proper deserialization
354
- const metadata = JSON.parse(metadataJson);
355
- // Validate metadata structure
356
- if (!metadata.identifier || metadata.identifier !== identifier) {
357
- this._logger.warn(`Subscription metadata identifier mismatch for ${identifier}, skipping re-subscription.`);
376
+ const parsed = JSON.parse(metadataJson);
377
+ const metadataList = Array.isArray(parsed)
378
+ ? parsed
379
+ : [parsed];
380
+ const validMetadata = metadataList.filter((m) => m?.identifier === identifier);
381
+ if (validMetadata.length === 0) {
382
+ this._logger.warn(`No valid subscription metadata entries found for ${identifier}, skipping re-subscription.`);
358
383
  continue;
359
384
  }
360
- this._logger.debug(`Re-subscribing identifier: ${identifier} with actions: ${JSON.stringify(metadata.actions)} and filter: ${JSON.stringify(metadata.filter)}`);
361
- resubscribePromises.push(this._resubscribe(identifier, metadata.actions, metadata.filter).catch((error) => {
385
+ this._logger.debug(`Re-subscribing identifier: ${identifier} with ${validMetadata.length} binding(s).`);
386
+ // Recreate queue + consumer once, then apply all bindings.
387
+ resubscribePromises.push(this._resubscribeBindings(identifier, validMetadata).catch((error) => {
362
388
  this._logger.error(`Failed to re-subscribe ${identifier}:`, error);
363
389
  return false;
364
390
  }));
@@ -391,7 +417,8 @@ export class RabbitMqReceiver extends AbstractMessageHandler {
391
417
  this._logger.warn(`Re-subscribing module subscription ${identifier} without actions filter - this may cause messages to be routed incorrectly!`);
392
418
  }
393
419
  const exchange = this._config.util.messageBroker.amqp?.exchange;
394
- const queueName = `${RabbitMqReceiver.QUEUE_PREFIX}${identifier}_${Date.now()}`;
420
+ // Recreate the exact same queue name so bindings and cache remain stable.
421
+ const queueName = `${RabbitMqReceiver.QUEUE_PREFIX}${identifier}`;
395
422
  // Ensure that filter includes the x-match header set to all
396
423
  filter = filter
397
424
  ? {
@@ -425,19 +452,52 @@ export class RabbitMqReceiver extends AbstractMessageHandler {
425
452
  await channel.consume(queueName, (msg) => this._onMessage(msg, channel));
426
453
  // Update cache with new queue name
427
454
  const cacheKey = `${RabbitMqReceiver.CACHE_PREFIX}${identifier}`;
428
- const cachedQueues = await this._cache
429
- .get(cacheKey, CacheNamespace.Other, () => Array)
430
- .then((value) => {
431
- if (value) {
432
- value.push(queueName);
433
- return value;
434
- }
435
- return new Array(queueName);
436
- });
437
- await this._cache.set(cacheKey, JSON.stringify(cachedQueues), CacheNamespace.Other);
455
+ // After reconnect, old auto-delete queues are gone; replace with the recreated queue.
456
+ await this._cache.set(cacheKey, JSON.stringify([queueName]), CacheNamespace.Other);
438
457
  this._logger.debug(`Successfully re-subscribed ${identifier} with queue ${queueName}`);
439
458
  return true;
440
459
  }
460
+ async _resubscribeBindings(identifier, metadataList) {
461
+ const exchange = this._config.util.messageBroker.amqp?.exchange;
462
+ const queueName = `${RabbitMqReceiver.QUEUE_PREFIX}${identifier}`;
463
+ if (!this._channel) {
464
+ throw new Error('RabbitMQ is down: cannot re-subscribe.');
465
+ }
466
+ const channel = this._channel;
467
+ await channel.assertExchange(exchange, 'headers', { durable: false });
468
+ await channel.assertQueue(queueName, {
469
+ durable: false,
470
+ autoDelete: true,
471
+ exclusive: false,
472
+ });
473
+ for (const meta of metadataList) {
474
+ // If actions are a defined but empty list, skip (modules with no actions shouldn't have queues)
475
+ if (meta.actions && meta.actions.length === 0) {
476
+ this._logger.debug(`Skipping re-subscription for ${identifier}: actions array is empty.`);
477
+ continue;
478
+ }
479
+ let filter = meta.filter;
480
+ filter = filter
481
+ ? {
482
+ 'x-match': 'all',
483
+ ...filter,
484
+ }
485
+ : { 'x-match': 'all' };
486
+ if (meta.actions && meta.actions.length > 0) {
487
+ for (const action of meta.actions) {
488
+ await channel.bindQueue(queueName, exchange, '', { action, ...filter });
489
+ }
490
+ }
491
+ else {
492
+ await channel.bindQueue(queueName, exchange, '', filter);
493
+ }
494
+ }
495
+ await channel.consume(queueName, (msg) => this._onMessage(msg, channel));
496
+ const cacheKey = `${RabbitMqReceiver.CACHE_PREFIX}${identifier}`;
497
+ await this._cache.set(cacheKey, JSON.stringify([queueName]), CacheNamespace.Other);
498
+ this._logger.debug(`Successfully re-subscribed ${identifier} with queue ${queueName} and ${metadataList.length} binding(s)`);
499
+ return true;
500
+ }
441
501
  /**
442
502
  * Underlying RabbitMQ message handler.
443
503
  *
@@ -1 +1 @@
1
- {"version":3,"file":"receiver.js","sourceRoot":"","sources":["../../../src/queue/rabbit-mq/receiver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"receiver.js","sourceRoot":"","sources":["../../../src/queue/rabbit-mq/receiver.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
- import type { IMessage, IMessageConfirmation, IMessageSender, OcppRequest, OcppResponse, SystemConfig } from '@citrineos/base';
2
- import { AbstractMessageSender, CircuitBreaker, MessageState, OcppError } from '@citrineos/base';
1
+ import type { IMessage, IMessageConfirmation, IMessageSender, OcppRequest, OcppResponse, SystemConfig } from '@zetra/citrineos-base';
2
+ import { AbstractMessageSender, CircuitBreaker, MessageState, OcppError } from '@zetra/citrineos-base';
3
3
  import * as amqplib from 'amqplib';
4
4
  import type { ILogObj } from 'tslog';
5
5
  import { Logger } from 'tslog';
@@ -1,4 +1,4 @@
1
- import { AbstractMessageSender, CircuitBreaker, MessageState, OcppError } from '@citrineos/base';
1
+ import { AbstractMessageSender, CircuitBreaker, MessageState, OcppError } from '@zetra/citrineos-base';
2
2
  import * as amqplib from 'amqplib';
3
3
  import { instanceToPlain } from 'class-transformer';
4
4
  import { Logger } from 'tslog';
@@ -87,7 +87,7 @@ export class RabbitMqSender extends AbstractMessageSender {
87
87
  }
88
88
  const exchange = this._config.util.messageBroker.amqp?.exchange;
89
89
  if (!this._channel) {
90
- throw new Error('RabbitMQ is down: cannot unsubscribe.');
90
+ throw new Error('RabbitMQ is down: cannot publish.');
91
91
  }
92
92
  const channel = this._channel;
93
93
  this._logger.debug(`Publishing to ${exchange}:`, message);
@@ -141,9 +141,14 @@ export class RabbitMqSender extends AbstractMessageSender {
141
141
  const connection = await amqplib.connect(url);
142
142
  this._connection = connection;
143
143
  const channel = await connection.createChannel();
144
+ const exchange = this._config.util.messageBroker.amqp?.exchange;
145
+ if (exchange) {
146
+ await channel.assertExchange(exchange, 'headers', { durable: false });
147
+ }
144
148
  channel.on('error', (err) => {
145
149
  this._logger.error('AMQP channel error', err);
146
150
  });
151
+ channel.on('close', () => this._handleDisconnect());
147
152
  this._setupConnectionListeners();
148
153
  this._circuitBreaker.triggerSuccess();
149
154
  return channel;
@@ -1 +1 @@
1
- {"version":3,"file":"sender.js","sourceRoot":"","sources":["../../../src/queue/rabbit-mq/sender.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sender.js","sourceRoot":"","sources":["../../../src/queue/rabbit-mq/sender.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
- import type { BootstrapConfig, IFileStorage, SystemConfig } from '@citrineos/base';
2
- import { OCPP2_0_1 } from '@citrineos/base';
1
+ import type { BootstrapConfig, IFileStorage, SystemConfig } from '@zetra/citrineos-base';
2
+ import { OCPP2_0_1 } from '@zetra/citrineos-base';
3
3
  import type { ILogObj } from 'tslog';
4
4
  import { Logger } from 'tslog';
5
5
  /**
@@ -1,5 +1,5 @@
1
- import { sequelize } from '@citrineos/data';
2
- import { OCPP2_0_1, SignedMeterValuesConfig } from '@citrineos/base';
1
+ import { sequelize } from '@zetra/citrineos-data';
2
+ import { OCPP2_0_1, SignedMeterValuesConfig } from '@zetra/citrineos-base';
3
3
  import { Logger } from 'tslog';
4
4
  import * as crypto from 'node:crypto';
5
5
  import { stringToArrayBuffer } from 'pvutils';
@@ -1,5 +1,5 @@
1
- import type { ChargingStationSequenceTypeEnumType } from '@citrineos/base';
2
- import type { IChargingStationSequenceRepository } from '@citrineos/data';
1
+ import type { ChargingStationSequenceTypeEnumType } from '@zetra/citrineos-base';
2
+ import type { IChargingStationSequenceRepository } from '@zetra/citrineos-data';
3
3
  export declare class IdGenerator {
4
4
  private _stationSequenceRepository;
5
5
  constructor(stationSequenceRepository: IChargingStationSequenceRepository);
@@ -1,4 +1,4 @@
1
- import type { OcppRequest } from '@citrineos/base';
1
+ import type { OcppRequest } from '@zetra/citrineos-base';
2
2
  /**
3
3
  * Calculate the size of a request.
4
4
  *
@@ -1,4 +1,4 @@
1
- import type { SystemConfig } from '@citrineos/base';
1
+ import type { SystemConfig } from '@zetra/citrineos-base';
2
2
  import type { FastifyInstance, FastifyRequest } from 'fastify';
3
3
  export declare const getHeaderValue: (headers: string[], key: string) => string | undefined;
4
4
  export declare const getAuthorizationTokenFromRequest: (request: FastifyRequest) => string;
@@ -1,7 +1,7 @@
1
1
  // SPDX-FileCopyrightText: 2025 Contributors to the CitrineOS Project
2
2
  //
3
3
  // SPDX-License-Identifier: Apache-2.0
4
- import { HttpHeader, HttpStatus, UnauthorizedError } from '@citrineos/base';
4
+ import { HttpHeader, HttpStatus, UnauthorizedError } from '@zetra/citrineos-base';
5
5
  import * as FastifyAuth from '@fastify/auth';
6
6
  import fastifySwagger from '@fastify/swagger';
7
7
  import fastifySwaggerUi from '@fastify/swagger-ui';
@@ -1,5 +1,5 @@
1
- import { OCPP2_0_1 } from '@citrineos/base';
2
- import type { IChargingProfileRepository, IDeviceModelRepository, ITransactionEventRepository } from '@citrineos/data';
1
+ import { OCPP2_0_1 } from '@zetra/citrineos-base';
2
+ import type { IChargingProfileRepository, IDeviceModelRepository, ITransactionEventRepository } from '@zetra/citrineos-data';
3
3
  import type { ILogObj } from 'tslog';
4
4
  import { Logger } from 'tslog';
5
5
  /**
@@ -1,8 +1,8 @@
1
1
  // SPDX-FileCopyrightText: 2025 Contributors to the CitrineOS Project
2
2
  //
3
3
  // SPDX-License-Identifier: Apache-2.0
4
- import { OCPP2_0_1 } from '@citrineos/base';
5
- import { VariableAttribute } from '@citrineos/data';
4
+ import { OCPP2_0_1 } from '@zetra/citrineos-base';
5
+ import { VariableAttribute } from '@zetra/citrineos-data';
6
6
  import { Logger } from 'tslog';
7
7
  import { calculateCheckDigit } from './emaidCheckDigitCalculator.js';
8
8
  import { getNumberOfFractionDigit } from './parser.js';
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zetra/citrineos-util",
3
- "version": "1.8.3-fork.2",
3
+ "version": "1.8.3-fork.20",
4
4
  "description": "The OCPP util module which supplies helpful utilities like cache and queue connectors, etc.",
5
5
  "type": "module",
6
6
  "main": "dist/index.js",
@@ -24,8 +24,8 @@
24
24
  "@types/jsrsasign": "10.5.14"
25
25
  },
26
26
  "dependencies": {
27
- "@zetra/citrineos-base": "1.8.3-fork.2",
28
- "@zetra/citrineos-data": "1.8.3-fork.2",
27
+ "@zetra/citrineos-base": "1.8.3-fork.20",
28
+ "@zetra/citrineos-data": "1.8.3-fork.20",
29
29
  "@fastify/swagger": "9.4.0",
30
30
  "@fastify/swagger-ui": "5.2.0",
31
31
  "@google-cloud/storage": "7.18.0",