@zetra/citrineos-base 1.8.3-fork.1

package/dist/interfaces/modules/CircuitBreaker.js

@@ -0,0 +1,46 @@
+export class CircuitBreaker {
+    _state = 'OPEN';
+    onStateChangeCbs = [];
+    lastReason;
+    constructor(options) {
+        if (options?.onStateChange)
+            this.onStateChangeCbs.push(options.onStateChange);
+    }
+    get state() {
+        return this._state;
+    }
+    triggerFailure(reason) {
+        if (this._state === 'CLOSED')
+            return;
+        this.lastReason = reason;
+        if (this._state === 'OPEN') {
+            this._state = 'FAILING';
+            this.emitStateChange('FAILING', reason);
+        }
+    }
+    triggerSuccess() {
+        if (this._state !== 'OPEN') {
+            this._state = 'OPEN';
+            this.emitStateChange('OPEN');
+        }
+    }
+    onStateChange(cb) {
+        this.onStateChangeCbs.push(cb);
+    }
+    reset() {
+        this._state = 'OPEN';
+        this.emitStateChange('OPEN');
+    }
+    close(reason) {
+        if (this._state !== 'CLOSED') {
+            this._state = 'CLOSED';
+            this.emitStateChange('CLOSED', reason);
+        }
+    }
+    emitStateChange(state, reason) {
+        console.log(`[CircuitBreaker] State changed to ${state}${reason ? `: ${reason}` : ''}`);
+        for (const cb of this.onStateChangeCbs)
+            cb(state, reason);
+    }
+}
+//# sourceMappingURL=CircuitBreaker.js.map

package/dist/interfaces/modules/CircuitBreaker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"CircuitBreaker.js","sourceRoot":"","sources":["../../../src/interfaces/modules/CircuitBreaker.ts"],"names":[],"mappings":"AAUA,MAAM,OAAO,cAAc;IACjB,MAAM,GAAwB,MAAM,CAAC;IACrC,gBAAgB,GAAiE,EAAE,CAAC;IACpF,UAAU,CAAU;IAE5B,YAAY,OAA+B;QACzC,IAAI,OAAO,EAAE,aAAa;YAAE,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAChF,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,cAAc,CAAC,MAAe;QAC5B,IAAI,IAAI,CAAC,MAAM,KAAK,QAAQ;YAAE,OAAO;QACrC,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC;QACzB,IAAI,IAAI,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YAC3B,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;YACxB,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;IAED,cAAc;QACZ,IAAI,IAAI,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YAC3B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;YACrB,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC;IAED,aAAa,CAAC,EAAyD;QACrE,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACjC,CAAC;IAED,KAAK;QACH,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,MAAe;QACnB,IAAI,IAAI,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC7B,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC;YACvB,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAEO,eAAe,CAAC,KAA0B,EAAE,MAAe;QACjE,OAAO,CAAC,GAAG,CAAC,qCAAqC,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACxF,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,gBAAgB;YAAE,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC5D,CAAC;CACF"}

package/dist/interfaces/modules/HandlerDefinition.d.ts

@@ -0,0 +1,11 @@
+import type { CallAction } from '../../ocpp/rpc/message.js';
+import { OCPPVersion } from '../../ocpp/rpc/message.js';
+/**
+ * Interface for usage in {@link AsHandler} decorator.
+ */
+export interface IHandlerDefinition {
+    protocol: OCPPVersion;
+    action: CallAction;
+    method: (...args: any[]) => any;
+    methodName: string;
+}

package/dist/interfaces/modules/HandlerDefinition.js

@@ -0,0 +1,5 @@
+// SPDX-FileCopyrightText: 2025 Contributors to the CitrineOS Project
+//
+// SPDX-License-Identifier: Apache-2.0
+import { OCPPVersion } from '../../ocpp/rpc/message.js';
+//# sourceMappingURL=HandlerDefinition.js.map

package/dist/interfaces/modules/HandlerDefinition.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"HandlerDefinition.js","sourceRoot":"","sources":["../../../src/interfaces/modules/HandlerDefinition.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,EAAE;AACF,sCAAsC;AAGtC,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC"}

package/dist/interfaces/modules/Module.d.ts

@@ -0,0 +1,22 @@
+import type { ICache, OcppRequest, OcppResponse, SystemConfig } from '../../index.js';
+import { OcppError } from '../../index.js';
+import type { CallAction, OCPPVersionType } from '../../ocpp/rpc/message.js';
+import type { HandlerProperties, IMessage, IMessageConfirmation, IMessageHandler, IMessageSender } from '../messages/index.js';
+import { MessageOrigin } from '../messages/index.js';
+import type { OCPPValidator } from './OCPPValidator.js';
+/**
+ * Base interface for all OCPP modules.
+ *
+ */
+export interface IModule {
+    config: SystemConfig;
+    ocppValidator: OCPPValidator;
+    cache: ICache;
+    sender: IMessageSender;
+    handler: IMessageHandler;
+    sendCall(stationId: string, tenantId: number, protocol: OCPPVersionType, action: CallAction, payload: OcppRequest, correlationId?: string, origin?: MessageOrigin): Promise<IMessageConfirmation>;
+    sendCallResult(correlationId: string, stationId: string, tenantId: number, protocol: OCPPVersionType, action: CallAction, payload: OcppResponse, origin?: MessageOrigin): Promise<IMessageConfirmation>;
+    sendCallError(correlationId: string, stationId: string, tenantId: number, protocol: OCPPVersionType, action: CallAction, error: OcppError, origin?: MessageOrigin): Promise<IMessageConfirmation>;
+    handle(message: IMessage<OcppRequest | OcppResponse>, props?: HandlerProperties): Promise<void>;
+    shutdown(): Promise<void>;
+}

package/dist/interfaces/modules/Module.js

@@ -0,0 +1,6 @@
+// SPDX-FileCopyrightText: 2025 Contributors to the CitrineOS Project
+//
+// SPDX-License-Identifier: Apache-2.0
+import { OcppError } from '../../index.js';
+import { MessageOrigin } from '../messages/index.js';
+//# sourceMappingURL=Module.js.map

package/dist/interfaces/modules/Module.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Module.js","sourceRoot":"","sources":["../../../src/interfaces/modules/Module.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,EAAE;AACF,sCAAsC;AAGtC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAS3C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC"}

package/dist/interfaces/modules/OCPPValidator.d.ts

@@ -0,0 +1,74 @@
+import { Ajv, type ErrorObject } from 'ajv';
+import type { ILogObj } from 'tslog';
+import { Logger } from 'tslog';
+import { type OcppRequest, type OcppResponse } from '../../index.js';
+import { type CallAction, OcppError, OCPPVersion } from '../../ocpp/rpc/message.js';
+export declare class OCPPValidator {
+    protected _ajv: Ajv;
+    protected readonly _logger: Logger<ILogObj>;
+    constructor(logger?: Logger<ILogObj>, ajv?: Ajv);
+    /**
+     * Creates an Ajv instance configured for Fastify HTTP schema compilation.
+     * Enables type coercion since HTTP query/path params arrive as strings,
+     * and does not include OCPP-specific keywords.
+     *
+     * @param ajv - Optional existing Ajv instance to use instead of creating a new one
+     * @returns Configured Ajv instance for Fastify schema compilation
+     */
+    static createServerAjvInstance(ajv?: Ajv): Ajv;
+    /**
+     * Creates an Ajv instance configured for OCPP message validation.
+     * Does not coerce types since OCPP messages arrive as parsed JSON with correct types.
+     * Includes OCPP-specific schema keywords and strict number/required validation.
+     *
+     * @param ajv - Optional existing Ajv instance to use instead of creating a new one
+     * @returns Configured Ajv instance for OCPP message validation
+     */
+    static createValidatorAjvInstance(ajv?: Ajv): Ajv;
+    /**
+     * Adds custom keywords for OCPP schema metadata to an Ajv instance.
+     * These keywords are used in OCPP JSON schemas but don't affect validation.
+     *
+     * @param ajv - The Ajv instance to add keywords to
+     */
+    static addOcppKeywords(ajv: Ajv): void;
+    /**
+     * Adds format validation for date-time and URI formats to an Ajv instance.
+     *
+     * @param ajv - The Ajv instance to add formats to
+     */
+    static addFormats(ajv: Ajv): void;
+    /**
+     * Validates an OCPP Request object against its schema.
+     *
+     * @param {CallAction} action - The original CallAction.
+     * @param {OcppRequest} payload - The OCPP Request object to validate.
+     * @param {OCPPVersion} protocol - The OCPP protocol version.
+     * @return {boolean} - Returns true if the OCPP Request object is valid, false otherwise.
+     */
+    validateOCPPRequest(action: CallAction, payload: OcppRequest, protocol: OCPPVersion): {
+        isValid: boolean;
+        errors?: ErrorObject[] | null;
+    };
+    /**
+     * Validates an OCPP Response against its schema.
+     *
+     * @param {CallAction} action - The original CallAction.
+     * @param {OcppResponse} payload - The OCPPResponse object to validate.
+     * @param {OCPPVersion} protocol - The OCPP protocol version.
+     * @return {boolean} - Returns true if the OCPPResponse object is valid, false otherwise.
+     */
+    validateOCPPResponse(action: CallAction, payload: OcppResponse | OcppError, protocol: OCPPVersion): {
+        isValid: boolean;
+        errors?: ErrorObject[] | null;
+    };
+    /**
+     * Prepares an OCPP Payload for sending by removing any null values, as OCPP does not allow null values in its messages.
+     *
+     * @param message OCPP Payload, as an object
+     * @returns The sanitized OCPP Payload, with null values removed
+     */
+    sanitizeOCPPPayload<T extends OcppRequest | OcppResponse>(message: T): T;
+    private removeNulls;
+    private fixRefs;
+}

package/dist/interfaces/modules/OCPPValidator.js

@@ -0,0 +1,249 @@
+// SPDX-FileCopyrightText: 2026 Contributors to the CitrineOS Project
+//
+// SPDX-License-Identifier: Apache-2.0
+import { Ajv } from 'ajv';
+import addFormats from 'ajv-formats';
+import { Logger } from 'tslog';
+import { OCPP1_6_CALL_RESULT_SCHEMA_MAP, OCPP1_6_CALL_SCHEMA_MAP, OCPP2_0_1_CALL_RESULT_SCHEMA_MAP, OCPP2_0_1_CALL_SCHEMA_MAP, } from '../../index.js';
+import { OCPP1_6_CallAction, OCPP2_0_1_CallAction, OcppError, OCPPVersion, } from '../../ocpp/rpc/message.js';
+export class OCPPValidator {
+    _ajv;
+    _logger;
+    constructor(logger, ajv) {
+        this._ajv = ajv || OCPPValidator.createValidatorAjvInstance();
+        this._logger = logger
+            ? logger.getSubLogger({ name: this.constructor.name })
+            : new Logger({ name: this.constructor.name });
+    }
+    /**
+     * Creates an Ajv instance configured for Fastify HTTP schema compilation.
+     * Enables type coercion since HTTP query/path params arrive as strings,
+     * and does not include OCPP-specific keywords.
+     *
+     * @param ajv - Optional existing Ajv instance to use instead of creating a new one
+     * @returns Configured Ajv instance for Fastify schema compilation
+     */
+    static createServerAjvInstance(ajv) {
+        const ajvInstance = ajv ||
+            new Ajv({
+                removeAdditional: 'failing',
+                useDefaults: true,
+                coerceTypes: true, // HTTP query/path params arrive as strings and need coercion
+                strict: false,
+                allErrors: true,
+            });
+        OCPPValidator.addFormats(ajvInstance);
+        return ajvInstance;
+    }
+    /**
+     * Creates an Ajv instance configured for OCPP message validation.
+     * Does not coerce types since OCPP messages arrive as parsed JSON with correct types.
+     * Includes OCPP-specific schema keywords and strict number/required validation.
+     *
+     * @param ajv - Optional existing Ajv instance to use instead of creating a new one
+     * @returns Configured Ajv instance for OCPP message validation
+     */
+    static createValidatorAjvInstance(ajv) {
+        const ajvInstance = ajv ||
+            new Ajv({
+                useDefaults: true,
+                // No coerceTypes: OCPP messages are parsed JSON — types are already correct,
+                // and coercion could silently corrupt data that should instead be rejected.
+                strict: false,
+                strictNumbers: true, // Reject numeric strings where a number is required
+                validateFormats: true,
+                allErrors: true,
+            });
+        OCPPValidator.addOcppKeywords(ajvInstance);
+        OCPPValidator.addFormats(ajvInstance);
+        return ajvInstance;
+    }
+    /**
+     * Adds custom keywords for OCPP schema metadata to an Ajv instance.
+     * These keywords are used in OCPP JSON schemas but don't affect validation.
+     *
+     * @param ajv - The Ajv instance to add keywords to
+     */
+    static addOcppKeywords(ajv) {
+        // Add custom keywords for OCPP schema metadata
+        ajv.addKeyword({
+            keyword: 'comment',
+            compile: () => () => true,
+        });
+        ajv.addKeyword({
+            keyword: 'javaType',
+            compile: () => () => true,
+        });
+        ajv.addKeyword({
+            keyword: 'tsEnumNames',
+            compile: () => () => true,
+        });
+    }
+    /**
+     * Adds format validation for date-time and URI formats to an Ajv instance.
+     *
+     * @param ajv - The Ajv instance to add formats to
+     */
+    static addFormats(ajv) {
+        addFormats.default(ajv, {
+            mode: 'fast',
+            formats: ['date-time', 'uri'],
+        });
+    }
+    /**
+     * Validates an OCPP Request object against its schema.
+     *
+     * @param {CallAction} action - The original CallAction.
+     * @param {OcppRequest} payload - The OCPP Request object to validate.
+     * @param {OCPPVersion} protocol - The OCPP protocol version.
+     * @return {boolean} - Returns true if the OCPP Request object is valid, false otherwise.
+     */
+    validateOCPPRequest(action, payload, protocol) {
+        let schema;
+        switch (protocol) {
+            case OCPPVersion.OCPP1_6:
+                schema = OCPP1_6_CALL_SCHEMA_MAP.get(action);
+                break;
+            case OCPPVersion.OCPP2_0_1:
+                schema = OCPP2_0_1_CALL_SCHEMA_MAP.get(action);
+                break;
+            default:
+                this._logger.error('Unknown subprotocol', protocol);
+                return { isValid: false };
+        }
+        if (schema) {
+            let validate = this._ajv.getSchema(schema['$id']);
+            if (!validate) {
+                schema['$id'] = `${protocol}-${schema['$id']}`;
+                this._logger.debug(`Updated call result schema id: ${schema['$id']}`);
+                this.fixRefs(schema);
+                validate = this._ajv.compile(schema);
+            }
+            const result = validate(payload);
+            if (!result) {
+                const validationErrorsDeepCopy = JSON.parse(JSON.stringify(validate.errors));
+                this._logger.debug('Validate Call failed', validationErrorsDeepCopy);
+                return { isValid: false, errors: validationErrorsDeepCopy };
+            }
+            else {
+                if (action === OCPP1_6_CallAction.DataTransfer ||
+                    action === OCPP2_0_1_CallAction.DataTransfer) {
+                    const dataTransferRequest = payload;
+                    const dataTransferPayloadValidate = this._ajv.getSchema(`${protocol}-${dataTransferRequest.vendorId}${dataTransferRequest.messageId ? `-${dataTransferRequest.messageId}` : ''}`);
+                    if (dataTransferPayloadValidate) {
+                        const dataTransferPayloadResult = dataTransferPayloadValidate(JSON.parse(dataTransferRequest.data));
+                        if (!dataTransferPayloadResult) {
+                            const validationErrorsDeepCopy = JSON.parse(JSON.stringify(dataTransferPayloadValidate.errors));
+                            this._logger.debug('Validate DataTransfer payload failed', validationErrorsDeepCopy);
+                            return { isValid: false, errors: validationErrorsDeepCopy };
+                        }
+                    }
+                }
+                return { isValid: true };
+            }
+        }
+        else {
+            this._logger.error('No schema found for action', action, payload);
+            return { isValid: false };
+        }
+    }
+    /**
+     * Validates an OCPP Response against its schema.
+     *
+     * @param {CallAction} action - The original CallAction.
+     * @param {OcppResponse} payload - The OCPPResponse object to validate.
+     * @param {OCPPVersion} protocol - The OCPP protocol version.
+     * @return {boolean} - Returns true if the OCPPResponse object is valid, false otherwise.
+     */
+    validateOCPPResponse(action, payload, protocol) {
+        if (payload instanceof OcppError || payload.name === 'OcppError') {
+            this._logger.debug('OcppError payload, skipping schema validation', payload);
+            return { isValid: true };
+        }
+        let schema;
+        switch (protocol) {
+            case OCPPVersion.OCPP1_6:
+                schema = OCPP1_6_CALL_RESULT_SCHEMA_MAP.get(action);
+                break;
+            case OCPPVersion.OCPP2_0_1:
+                schema = OCPP2_0_1_CALL_RESULT_SCHEMA_MAP.get(action);
+                break;
+            default:
+                this._logger.error('Unknown subprotocol', protocol);
+                return { isValid: false };
+        }
+        if (schema) {
+            let validate = this._ajv.getSchema(schema['$id']);
+            if (!validate) {
+                schema['$id'] = `${protocol}-${schema['$id']}`;
+                this._logger.debug(`Updated call result schema id: ${schema['$id']}`);
+                // this.addSchemaDefinitionsRecursively(schema);
+                validate = this._ajv.compile(schema);
+            }
+            const result = validate(payload);
+            if (!result) {
+                const validationErrorsDeepCopy = JSON.parse(JSON.stringify(validate.errors));
+                this._logger.debug('Validate CallResult failed', validationErrorsDeepCopy);
+                return { isValid: false, errors: validationErrorsDeepCopy };
+            }
+            else {
+                return { isValid: true };
+            }
+        }
+        else {
+            this._logger.error('No schema found for call result with action', action, payload);
+            return { isValid: false };
+        }
+    }
+    /**
+     * Prepares an OCPP Payload for sending by removing any null values, as OCPP does not allow null values in its messages.
+     *
+     * @param message OCPP Payload, as an object
+     * @returns The sanitized OCPP Payload, with null values removed
+     */
+    sanitizeOCPPPayload(message) {
+        this._logger.debug('Sanitizing OCPP message: ', message);
+        const sanitizedMessage = this.removeNulls(message);
+        this._logger.debug('Sanitized OCPP message: ', sanitizedMessage);
+        return sanitizedMessage;
+    }
+    // Intentionally removing NULL values from object for OCPP conformity
+    removeNulls(obj) {
+        if (obj === null)
+            return undefined;
+        if (typeof obj !== 'object')
+            return obj;
+        if (Array.isArray(obj)) {
+            return obj.filter((item) => item !== null).map((item) => this.removeNulls(item));
+        }
+        const result = {};
+        for (const [key, value] of Object.entries(obj)) {
+            result[key] = this.removeNulls(value);
+        }
+        return result;
+    }
+    // Recursively fix $ref in schema to ensure they are compatible with Ajv when compiling
+    fixRefs(schema) {
+        if (!schema.properties)
+            return;
+        Object.keys(schema.properties).forEach((key) => {
+            const property = schema.properties[key];
+            if (property.$ref) {
+                property.$ref = property.$ref.replace('#/definitions/', '');
+            }
+            if (property.items && property.items.$ref) {
+                property.items.$ref = property.items.$ref.replace('#/definitions/', '');
+            }
+        });
+        if (schema.definitions) {
+            Object.keys(schema.definitions).forEach((key) => {
+                const definition = schema.definitions[key];
+                if (!definition['$id']) {
+                    definition['$id'] = key;
+                }
+                this.fixRefs(definition);
+            });
+        }
+    }
+}
+//# sourceMappingURL=OCPPValidator.js.map

package/dist/interfaces/modules/OCPPValidator.js.map

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

package/dist/interfaces/modules/index.d.ts

@@ -0,0 +1,7 @@
+export { AbstractModule } from './AbstractModule.js';
+export { AS_HANDLER_METADATA, AsHandler } from './AsHandler.js';
+export { CircuitBreaker } from './CircuitBreaker.js';
+export type { CircuitBreakerOptions, CircuitBreakerState } from './CircuitBreaker.js';
+export type { IHandlerDefinition } from './HandlerDefinition.js';
+export type { IModule } from './Module.js';
+export { OCPPValidator } from './OCPPValidator.js';

package/dist/interfaces/modules/index.js

@@ -0,0 +1,8 @@
+// SPDX-FileCopyrightText: 2025 Contributors to the CitrineOS Project
+//
+// SPDX-License-Identifier: Apache-2.0
+export { AbstractModule } from './AbstractModule.js';
+export { AS_HANDLER_METADATA, AsHandler } from './AsHandler.js';
+export { CircuitBreaker } from './CircuitBreaker.js';
+export { OCPPValidator } from './OCPPValidator.js';
+//# sourceMappingURL=index.js.map

package/dist/interfaces/modules/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/interfaces/modules/index.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,EAAE;AACF,sCAAsC;AAEtC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAIrD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC"}

package/dist/interfaces/repository.d.ts

@@ -0,0 +1,170 @@
+import { EventEmitter } from 'events';
+export interface CrudEvent<T> {
+    created: [T[]];
+    updated: [T[]];
+    deleted: [T[]];
+}
+/**
+ * Represents a generic CRUD repository.
+ *
+ * @template T - The type of the values stored in the repository.
+ */
+export declare abstract class CrudRepository<T> extends EventEmitter {
+    constructor();
+    /**
+     * On method overridden to handle events from {@link CrudEvent}.
+     * @param event The name of the event. Must be a key in {@link CrudEvent}.
+     * @param listener The callback for the event. Argument types correspond to the contents of the event key in {@link CrudEvent}.
+     *
+     * @see {@link EventEmitter#on} for the original method.
+     */
+    on<K extends keyof CrudEvent<T>>(event: K, listener: (...args: CrudEvent<T>[K]) => void): this;
+    /**
+     * Emit method overridden to emit events from {@link CrudEvent}.
+     * @param event The name of the event. Must be a key in {@link CrudEvent}.
+     * @param args The arguments to pass with the event. Allowed types correspond to the contents of the event key in {@link CrudEvent}.
+     *
+     * @see {@link EventEmitter#emit} for the original method.
+     */
+    emit<K extends keyof CrudEvent<T>>(event: K, ...args: CrudEvent<T>[K]): boolean;
+    /**
+     * Creates a new entry in the database with the specified value.
+     *
+     * @param tenantId - The tenant ID for which to create the entry.
+     * @param value - The value of the entry.
+     * @param namespace - The optional namespace to create the entry in.
+     * @returns A Promise that resolves to the created entry.
+     */
+    create(tenantId: number, value: T, namespace?: string): Promise<T>;
+    /**
+     * Creates multiple entries in the database.
+     *
+     * @param tenantId - The tenant ID for which to create the entries.
+     * @param values - The values of the entries.
+     * @param clazz - The class of the model.
+     * @param namespace - The optional namespace to create the entries in.
+     * @returns A Promise that resolves to the created entries.
+     */
+    bulkCreate(tenantId: number, values: T[], clazz: any, namespace?: string): Promise<T[]>;
+    /**
+     * Creates a new entry in the database with the specified value and key.
+     *
+     * @param tenantId - The tenant ID for which to create the entry.
+     * @param value - The value of the entry.
+     * @param key - The key of the entry.
+     * @param namespace - The optional namespace to create the entry in.
+     * @returns A Promise that resolves to the created entry.
+     */
+    createByKey(tenantId: number, value: T, key: string, namespace?: string): Promise<T>;
+    /**
+     * Attempts to read a value from storage based on the given query, or throws an exception if more than one value is found.
+     *
+     * @param tenantId - The tenant ID for which to read the entry.
+     * @param query - The query to use.
+     * @param namespace - Optional namespace for the query.
+     * @returns A promise that resolves to the value associated with the query if it exists. An exception is thrown if more than one value is found.
+     */
+    readOnlyOneByQuery(tenantId: number, query: object, namespace?: string): Promise<T | undefined>;
+    /**
+     * Reads the first matching value from storage based on the given query, or creates a matching value if none exists.
+     *
+     * @param tenantId - The tenant ID for which to read or create the entry.
+     * @param query - The query to use.
+     * @param namespace - Optional namespace for the query.
+     * @returns A promise that resolves to an array where the first element is the value associated with the query, either an existing value or the newly created value, and the second element is a boolean indicating whether the entry was created.
+     */
+    readOrCreateByQuery(tenantId: number, query: object, namespace?: string): Promise<[T, boolean]>;
+    /**
+     * Updates the value associated with the given key.
+     *
+     * @param tenantId - The tenant ID for which to update the entry.
+     * @param value - The new value to associate with the key.
+     * @param key - The key to update.
+     * @param namespace - The namespace in which to update the key.
+     * @returns A promise that resolves to the updated value, or undefined if the key does not exist.
+     */
+    updateByKey(tenantId: number, value: Partial<T>, key: string, namespace?: string): Promise<T | undefined>;
+    /**
+     * Updates the values associated with the given query.
+     *
+     * @param tenantId - The tenant ID for which to update the entries.
+     * @param value - The new value to associate with the query.
+     * @param query - The query to use.
+     * @param namespace - Optional namespace for the query.
+     * @returns A promise that resolves to the updated values associated with the query.
+     */
+    updateAllByQuery(tenantId: number, value: Partial<T>, query: object, namespace?: string): Promise<T[]>;
+    /**
+     * Deletes a key from the specified namespace.
+     *
+     * @param tenantId - The tenant ID for which to delete the entry.
+     * @param key - The key to delete.
+     * @param namespace - Optional. The namespace from which to delete the key.
+     * @returns A Promise that resolves to the deleted entry, or undefined there was no matching entry.
+     */
+    deleteByKey(tenantId: number, key: string, namespace?: string): Promise<T | undefined>;
+    /**
+     * Deletes all values associated with a query from the specified namespace.
+     *
+     * @param tenantId - The tenant ID for which to delete the entries.
+     * @param query - The query to use.
+     * @param namespace - Optional. The namespace from which to delete the values.
+     * @returns A Promise that resolves to the deleted entries.
+     */
+    deleteAllByQuery(tenantId: number, query: object, namespace?: string): Promise<T[]>;
+    /**
+     * Reads a value from storage based on the given key.
+     *
+     * @param tenantId - The tenant ID for which to read the entry.
+     * @param key - The key to look up in storage.
+     * @param namespace - Optional namespace for the key.
+     * @returns A promise that resolves to the value associated with the key, or undefined if the key does not exist.
+     */
+    abstract readByKey(tenantId: number, key: string | number, namespace?: string): Promise<T | undefined>;
+    /**
+     * Reads values from storage based on the given query.
+     *
+     * @param tenantId - The tenant ID for which to read the entries.
+     * @param query - The query to use.
+     * @param namespace - Optional namespace for the query.
+     * @returns A promise that resolves to the values associated with the query.
+     */
+    abstract readAllByQuery(tenantId: number, query: object, namespace?: string): Promise<T[]>;
+    /**
+     * Attempts to read next id.
+     *
+     * @param tenantId - The tenant ID for which to read the next value.
+     * @param columnName - The name of the column which needs a next value. The column must be integer.
+     * @param query - The query to use.
+     * @param startValue - If no existing value is found, this value will be used. By default, it is 1.
+     * @param namespace - Optional namespace for the query.
+     * @returns An integer that is the next id to use
+     */
+    abstract readNextValue(tenantId: number, columnName: string, query?: object, startValue?: number, namespace?: string): Promise<number>;
+    /**
+     * Checks if a key exists in the specified namespace.
+     *
+     * @param tenantId - The tenant ID for which to check the key.
+     * @param key - The key to check.
+     * @param namespace - Optional. The namespace in which to check the key.
+     * @returns A Promise that resolves to a boolean indicating whether the key exists.
+     */
+    abstract existsByKey(tenantId: number, key: string, namespace?: string): Promise<boolean>;
+    /**
+     * Checks how many values associated with a query exists in the specified namespace.
+     *
+     * @param tenantId - The tenant ID for which to check the query.
+     * @param query - The query to use.
+     * @param namespace - Optional. The namespace in which to check the query.
+     * @returns A Promise that resolves to the number of values matching the query.
+     */
+    abstract existByQuery(tenantId: number, query: object, namespace?: string): Promise<number>;
+    protected abstract _create(tenantId: number, value: T, namespace?: string): Promise<T>;
+    protected abstract _bulkCreate(tenantId: number, value: T[], namespace?: string): Promise<T[]>;
+    protected abstract _createByKey(tenantId: number, value: T, key: string, namespace?: string): Promise<T>;
+    protected abstract _readOrCreateByQuery(tenantId: number, query: object, namespace?: string): Promise<[T, boolean]>;
+    protected abstract _updateByKey(tenantId: number, value: Partial<T>, key: string, namespace?: string): Promise<T | undefined>;
+    protected abstract _updateAllByQuery(tenantId: number, value: Partial<T>, query: object, namespace?: string): Promise<T[]>;
+    protected abstract _deleteByKey(tenantId: number, key: string, namespace?: string): Promise<T | undefined>;
+    protected abstract _deleteAllByQuery(tenantId: number, query: object, namespace?: string): Promise<T[]>;
+}