@famir/database 0.0.2 → 0.0.4

package/dist/{models/target/target.d.ts → modules/target/target.models.d.ts}

@@ -1,6 +1,6 @@
 export declare const TARGET_ACCESS_LEVELS: readonly ["transparent", "landing"];
 export type TargetAccessLevel = (typeof TARGET_ACCESS_LEVELS)[number];
-export declare const TARGET_SUB_ROOT = ".";
+export declare const TARGET_SUB_APEX = "@";
 export declare class TargetModel {
     readonly campaignId: string;
     readonly targetId: string;
@@ -13,7 +13,6 @@ export declare class TargetModel {
     readonly mirrorSub: string;
     readonly mirrorDomain: string;
     readonly mirrorPort: number;
-    readonly labels: string[];
     readonly isEnabled: boolean;
     readonly messageCount: number;
     readonly createdAt: Date;
@@ -21,7 +20,7 @@ export declare class TargetModel {
     static isEnabled: <T extends TargetModel>(model: T) => model is T & {
         isEnabled: true;
     };
-    constructor(campaignId: string, targetId: string, accessLevel: TargetAccessLevel, donorSecure: boolean, donorSub: string, donorDomain: string, donorPort: number, mirrorSecure: boolean, mirrorSub: string, mirrorDomain: string, mirrorPort: number, labels: string[], isEnabled: boolean, messageCount: number, createdAt: Date);
+    constructor(campaignId: string, targetId: string, accessLevel: TargetAccessLevel, donorSecure: boolean, donorSub: string, donorDomain: string, donorPort: number, mirrorSecure: boolean, mirrorSub: string, mirrorDomain: string, mirrorPort: number, isEnabled: boolean, messageCount: number, createdAt: Date);
     get donorProtocol(): string;
     get donorHostname(): string;
     get donorHost(): string;
@@ -30,9 +29,9 @@ export declare class TargetModel {
     get mirrorHostname(): string;
     get mirrorHost(): string;
     get mirrorUrl(): string;
-    hasLabel(value: string): boolean;
 }
 export declare class FullTargetModel extends TargetModel {
+    readonly labels: string[];
     readonly connectTimeout: number;
     readonly simpleTimeout: number;
     readonly streamTimeout: number;
@@ -45,6 +44,7 @@ export declare class FullTargetModel extends TargetModel {
     readonly sitemapXml: string;
     readonly allowWebSockets: boolean;
     constructor(campaignId: string, targetId: string, accessLevel: TargetAccessLevel, donorSecure: boolean, donorSub: string, donorDomain: string, donorPort: number, mirrorSecure: boolean, mirrorSub: string, mirrorDomain: string, mirrorPort: number, labels: string[], connectTimeout: number, simpleTimeout: number, streamTimeout: number, headersSizeLimit: number, bodySizeLimit: number, mainPage: string, notFoundPage: string, faviconIco: string, robotsTxt: string, sitemapXml: string, allowWebSockets: boolean, isEnabled: boolean, messageCount: number, createdAt: Date);
+    hasLabel(value: string): boolean;
 }
 export interface EnabledTargetModel extends TargetModel {
     isEnabled: true;
@@ -52,3 +52,5 @@ export interface EnabledTargetModel extends TargetModel {
 export interface EnabledFullTargetModel extends FullTargetModel {
     isEnabled: true;
 }
+export type TargetLink = [string, string];
+export type TargetHosts = Record<string, TargetLink>;

package/dist/{models/target/target.js → modules/target/target.models.js}

@@ -1,5 +1,5 @@
 export const TARGET_ACCESS_LEVELS = ['transparent', 'landing'];
-export const TARGET_SUB_ROOT = '.';
+export const TARGET_SUB_APEX = '@';
 export class TargetModel {
     campaignId;
     targetId;
@@ -12,7 +12,6 @@ export class TargetModel {
     mirrorSub;
     mirrorDomain;
     mirrorPort;
-    labels;
     isEnabled;
     messageCount;
     createdAt;
@@ -22,7 +21,7 @@ export class TargetModel {
     static isEnabled = (model) => {
         return model.isEnabled;
     };
-    constructor(campaignId, targetId, accessLevel, donorSecure, donorSub, donorDomain, donorPort, mirrorSecure, mirrorSub, mirrorDomain, mirrorPort, labels, isEnabled, messageCount, createdAt) {
+    constructor(campaignId, targetId, accessLevel, donorSecure, donorSub, donorDomain, donorPort, mirrorSecure, mirrorSub, mirrorDomain, mirrorPort, isEnabled, messageCount, createdAt) {
         this.campaignId = campaignId;
         this.targetId = targetId;
         this.accessLevel = accessLevel;
@@ -34,7 +33,6 @@ export class TargetModel {
         this.mirrorSub = mirrorSub;
         this.mirrorDomain = mirrorDomain;
         this.mirrorPort = mirrorPort;
-        this.labels = labels;
         this.isEnabled = isEnabled;
         this.messageCount = messageCount;
         this.createdAt = createdAt;
@@ -43,7 +41,7 @@ export class TargetModel {
         return this.donorSecure ? 'https:' : 'http:';
     }
     get donorHostname() {
-        return this.donorSub !== TARGET_SUB_ROOT
+        return this.donorSub !== TARGET_SUB_APEX
             ? [this.donorSub, this.donorDomain].join('.')
             : this.donorDomain;
     }
@@ -63,7 +61,7 @@ export class TargetModel {
         return this.mirrorSecure ? 'https:' : 'http:';
     }
     get mirrorHostname() {
-        return this.mirrorSub !== TARGET_SUB_ROOT
+        return this.mirrorSub !== TARGET_SUB_APEX
             ? [this.mirrorSub, this.mirrorDomain].join('.')
             : this.mirrorDomain;
     }
@@ -79,11 +77,9 @@ export class TargetModel {
     get mirrorUrl() {
         return [this.mirrorProtocol, '//', this.mirrorHost].join('');
     }
-    hasLabel(value) {
-        return this.labels.includes(value);
-    }
 }
 export class FullTargetModel extends TargetModel {
+    labels;
     connectTimeout;
     simpleTimeout;
     streamTimeout;
@@ -96,7 +92,8 @@ export class FullTargetModel extends TargetModel {
     sitemapXml;
     allowWebSockets;
     constructor(campaignId, targetId, accessLevel, donorSecure, donorSub, donorDomain, donorPort, mirrorSecure, mirrorSub, mirrorDomain, mirrorPort, labels, connectTimeout, simpleTimeout, streamTimeout, headersSizeLimit, bodySizeLimit, mainPage, notFoundPage, faviconIco, robotsTxt, sitemapXml, allowWebSockets, isEnabled, messageCount, createdAt) {
-        super(campaignId, targetId, accessLevel, donorSecure, donorSub, donorDomain, donorPort, mirrorSecure, mirrorSub, mirrorDomain, mirrorPort, labels, isEnabled, messageCount, createdAt);
+        super(campaignId, targetId, accessLevel, donorSecure, donorSub, donorDomain, donorPort, mirrorSecure, mirrorSub, mirrorDomain, mirrorPort, isEnabled, messageCount, createdAt);
+        this.labels = labels;
         this.connectTimeout = connectTimeout;
         this.simpleTimeout = simpleTimeout;
         this.streamTimeout = streamTimeout;
@@ -109,5 +106,8 @@ export class FullTargetModel extends TargetModel {
         this.sitemapXml = sitemapXml;
         this.allowWebSockets = allowWebSockets;
     }
+    hasLabel(value) {
+        return this.labels.includes(value);
+    }
 }
-//# sourceMappingURL=target.js.map
+//# sourceMappingURL=target.models.js.map

package/dist/modules/target/target.models.js.map

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

package/dist/{repositories → modules}/target/target.schemas.d.ts

@@ -1,5 +1,5 @@
 import { JSONSchemaType, ValidatorSchemas } from '@famir/validator';
-import { TargetAccessLevel } from '../../models/index.js';
+import { TargetAccessLevel, TargetHosts, TargetLink } from './target.models.js';
 export declare const targetAccessLevelSchema: JSONSchemaType<TargetAccessLevel>;
 export declare const targetSubSchema: JSONSchemaType<string>;
 export declare const targetDomainSchema: JSONSchemaType<string>;
@@ -12,4 +12,6 @@ export declare const targetStreamTimeoutSchema: JSONSchemaType<number>;
 export declare const targetHeadersSizeLimitSchema: JSONSchemaType<number>;
 export declare const targetBodySizeLimitSchema: JSONSchemaType<number>;
 export declare const targetContentSchema: JSONSchemaType<string>;
+export declare const targetLinkSchema: JSONSchemaType<TargetLink>;
+export declare const targetHostsSchema: JSONSchemaType<TargetHosts>;
 export declare const targetSchemas: ValidatorSchemas;

package/dist/modules/target/target.schemas.js

@@ -0,0 +1,174 @@
+import { booleanSchema, counterSchema, customIdentSchema, timestampSchema, } from '@famir/validator';
+import { TARGET_ACCESS_LEVELS, } from './target.models.js';
+export const targetAccessLevelSchema = {
+    type: 'string',
+    enum: [...TARGET_ACCESS_LEVELS],
+};
+export const targetSubSchema = {
+    type: 'string',
+    minLength: 1,
+    maxLength: 256,
+};
+export const targetDomainSchema = {
+    type: 'string',
+    minLength: 1,
+    maxLength: 256,
+};
+export const targetPortSchema = {
+    type: 'number',
+    minimum: 0,
+    maximum: 65535,
+};
+export const targetLabelSchema = {
+    type: 'string',
+    minLength: 3,
+    maxLength: 64,
+};
+export const targetLabelsSchema = {
+    type: 'array',
+    items: targetLabelSchema,
+};
+export const targetConnectTimeoutSchema = {
+    type: 'integer',
+    minimum: 1,
+    maximum: 60 * 1000,
+};
+export const targetSimpleTimeoutSchema = {
+    type: 'integer',
+    minimum: 1,
+    maximum: 300 * 1000,
+};
+export const targetStreamTimeoutSchema = {
+    type: 'integer',
+    minimum: 1,
+    maximum: 3600 * 1000,
+};
+export const targetHeadersSizeLimitSchema = {
+    type: 'integer',
+    minimum: 1,
+    maximum: 1024 * 1024,
+};
+export const targetBodySizeLimitSchema = {
+    type: 'integer',
+    minimum: 1,
+    maximum: 1024 * 1024 * 1024,
+};
+export const targetContentSchema = {
+    type: 'string',
+    minLength: 0,
+    maxLength: 10 * 1024 * 1024,
+};
+const rawTargetSchema = {
+    type: 'object',
+    required: [
+        'campaign_id',
+        'target_id',
+        'access_level',
+        'donor_secure',
+        'donor_sub',
+        'donor_domain',
+        'donor_port',
+        'mirror_secure',
+        'mirror_sub',
+        'mirror_domain',
+        'mirror_port',
+        'is_enabled',
+        'message_count',
+        'created_at',
+    ],
+    properties: {
+        campaign_id: customIdentSchema,
+        target_id: customIdentSchema,
+        access_level: targetAccessLevelSchema,
+        donor_secure: booleanSchema,
+        donor_sub: targetSubSchema,
+        donor_domain: targetDomainSchema,
+        donor_port: targetPortSchema,
+        mirror_secure: booleanSchema,
+        mirror_sub: targetSubSchema,
+        mirror_domain: targetDomainSchema,
+        mirror_port: targetPortSchema,
+        is_enabled: booleanSchema,
+        message_count: counterSchema,
+        created_at: timestampSchema,
+    },
+    additionalProperties: false,
+};
+const rawFullTargetSchema = {
+    type: 'object',
+    required: [
+        'campaign_id',
+        'target_id',
+        'access_level',
+        'donor_secure',
+        'donor_sub',
+        'donor_domain',
+        'donor_port',
+        'mirror_secure',
+        'mirror_sub',
+        'mirror_domain',
+        'mirror_port',
+        'labels',
+        'connect_timeout',
+        'simple_timeout',
+        'stream_timeout',
+        'headers_size_limit',
+        'body_size_limit',
+        'main_page',
+        'not_found_page',
+        'favicon_ico',
+        'robots_txt',
+        'sitemap_xml',
+        'allow_websockets',
+        'is_enabled',
+        'message_count',
+        'created_at',
+    ],
+    properties: {
+        campaign_id: customIdentSchema,
+        target_id: customIdentSchema,
+        access_level: targetAccessLevelSchema,
+        donor_secure: booleanSchema,
+        donor_sub: targetSubSchema,
+        donor_domain: targetDomainSchema,
+        donor_port: targetPortSchema,
+        mirror_secure: booleanSchema,
+        mirror_sub: targetSubSchema,
+        mirror_domain: targetDomainSchema,
+        mirror_port: targetPortSchema,
+        labels: targetLabelsSchema,
+        connect_timeout: targetConnectTimeoutSchema,
+        simple_timeout: targetSimpleTimeoutSchema,
+        stream_timeout: targetStreamTimeoutSchema,
+        headers_size_limit: targetHeadersSizeLimitSchema,
+        body_size_limit: targetBodySizeLimitSchema,
+        main_page: targetContentSchema,
+        not_found_page: targetContentSchema,
+        favicon_ico: targetContentSchema,
+        robots_txt: targetContentSchema,
+        sitemap_xml: targetContentSchema,
+        allow_websockets: booleanSchema,
+        is_enabled: booleanSchema,
+        message_count: counterSchema,
+        created_at: timestampSchema,
+    },
+    additionalProperties: false,
+};
+export const targetLinkSchema = {
+    type: 'array',
+    items: [customIdentSchema, customIdentSchema],
+    minItems: 2,
+    maxItems: 2,
+};
+export const targetHostsSchema = {
+    type: 'object',
+    required: [],
+    additionalProperties: targetLinkSchema,
+};
+export const targetSchemas = {
+    'database-raw-target': rawTargetSchema,
+    'database-raw-full-target': rawFullTargetSchema,
+    'database-target-link': targetLinkSchema,
+    'database-target-hosts': targetHostsSchema,
+};
+//# sourceMappingURL=target.schemas.js.map

package/dist/modules/target/target.schemas.js.map

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

package/dist/redis-database-connector.d.ts

@@ -3,10 +3,11 @@ import { Config } from '@famir/config';
 import { Logger } from '@famir/logger';
 import { DatabaseConnector, RedisDatabaseConfig, RedisDatabaseConnection, RedisDatabaseConnectorOptions } from './database.js';
 export declare class RedisDatabaseConnector implements DatabaseConnector {
+    protected readonly config: Config<RedisDatabaseConfig>;
     protected readonly logger: Logger;
     static register(container: DIContainer): void;
     protected readonly options: RedisDatabaseConnectorOptions;
-    protected readonly redis: RedisDatabaseConnection;
+    protected readonly connection: RedisDatabaseConnection;
     constructor(config: Config<RedisDatabaseConfig>, logger: Logger);
     getConnection<T>(): T;
     connect(): Promise<void>;

package/dist/redis-database-connector.js

@@ -3,44 +3,46 @@ import { CONFIG } from '@famir/config';
 import { LOGGER } from '@famir/logger';
 import { createClient } from 'redis';
 import { databaseFunctions } from './database.functions.js';
-import { DATABASE_CONNECTOR } from './database.js';
+import { DATABASE_CONNECTOR, } from './database.js';
 export class RedisDatabaseConnector {
+    config;
     logger;
     static register(container) {
         container.registerSingleton(DATABASE_CONNECTOR, (c) => new RedisDatabaseConnector(c.resolve(CONFIG), c.resolve(LOGGER)));
     }
     options;
-    redis;
+    connection;
     constructor(config, logger) {
+        this.config = config;
         this.logger = logger;
         this.options = this.buildOptions(config.data);
-        this.redis = createClient({
+        this.connection = createClient({
             url: this.options.connectionUrl,
             functions: databaseFunctions,
             name: 'database',
-            RESP: 3
+            RESP: 3,
         });
-        this.redis.on('error', (error) => {
+        this.connection.on('error', (error) => {
             this.logger.error(`Redis error event`, {
-                error: serializeError(error)
+                error: serializeError(error),
             });
         });
         this.logger.debug(`DatabaseConnector initialized`);
     }
     getConnection() {
-        return this.redis;
+        return this.connection;
     }
     async connect() {
-        await this.redis.connect();
+        await this.connection.connect();
         this.logger.debug(`DatabaseConnector connected`);
     }
     async close() {
-        await this.redis.close();
+        await this.connection.close();
         this.logger.debug(`DatabaseConnector closed`);
     }
     buildOptions(config) {
         return {
-            connectionUrl: config.DATABASE_CONNECTION_URL
+            connectionUrl: config.DATABASE_CONNECTION_URL,
         };
     }
 }

package/dist/redis-database-connector.js.map

@@ -1 +1 @@
-{"version":3,"file":"redis-database-connector.js","sourceRoot":"","sources":["../src/redis-database-connector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,cAAc,EAAE,MAAM,eAAe,CAAA;AAC3D,OAAO,EAAU,MAAM,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,EAAU,MAAM,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAA;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAC3D,OAAO,EACL,kBAAkB,EAKnB,MAAM,eAAe,CAAA;AAKtB,MAAM,OAAO,sBAAsB;IAoBZ;IAhBrB,MAAM,CAAC,QAAQ,CAAC,SAAsB;QACpC,SAAS,CAAC,iBAAiB,CACzB,kBAAkB,EAClB,CAAC,CAAC,EAAE,EAAE,CACJ,IAAI,sBAAsB,CACxB,CAAC,CAAC,OAAO,CAA8B,MAAM,CAAC,EAC9C,CAAC,CAAC,OAAO,CAAS,MAAM,CAAC,CAC1B,CACJ,CAAA;IACH,CAAC;IAEkB,OAAO,CAA+B;IACtC,KAAK,CAAyB;IAEjD,YACE,MAAmC,EAChB,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;QAEjC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAE7C,IAAI,CAAC,KAAK,GAAG,YAAY,CAAC;YACxB,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,aAAa;YAC/B,SAAS,EAAE,iBAAiB;YAC5B,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,CAAC;SACR,CAAC,CAAA;QAEF,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YAC/B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,EAAE;gBACrC,KAAK,EAAE,cAAc,CAAC,KAAK,CAAC;aAC7B,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAA;IACpD,CAAC;IAMD,aAAa;QACX,OAAO,IAAI,CAAC,KAAU,CAAA;IACxB,CAAC;IAKD,KAAK,CAAC,OAAO;QACX,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAA;QAE1B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAA;IAClD,CAAC;IAKD,KAAK,CAAC,KAAK;QACT,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAA;QAExB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAA;IAC/C,CAAC;IAEO,YAAY,CAAC,MAA2B;QAC9C,OAAO;YACL,aAAa,EAAE,MAAM,CAAC,uBAAuB;SAC9C,CAAA;IACH,CAAC;CACF"}
+{"version":3,"file":"redis-database-connector.js","sourceRoot":"","sources":["../src/redis-database-connector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,cAAc,EAAE,MAAM,eAAe,CAAA;AAC3D,OAAO,EAAU,MAAM,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,EAAU,MAAM,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAA;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAC3D,OAAO,EACL,kBAAkB,GAKnB,MAAM,eAAe,CAAA;AAStB,MAAM,OAAO,sBAAsB;IAyBZ;IACA;IApBrB,MAAM,CAAC,QAAQ,CAAC,SAAsB;QACpC,SAAS,CAAC,iBAAiB,CACzB,kBAAkB,EAClB,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,sBAAsB,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CACxE,CAAA;IACH,CAAC;IAGkB,OAAO,CAA+B;IAEtC,UAAU,CAAyB;IAQtD,YACqB,MAAmC,EACnC,MAAc;QADd,WAAM,GAAN,MAAM,CAA6B;QACnC,WAAM,GAAN,MAAM,CAAQ;QAEjC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAE7C,IAAI,CAAC,UAAU,GAAG,YAAY,CAAC;YAC7B,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,aAAa;YAC/B,SAAS,EAAE,iBAAiB;YAC5B,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,CAAC;SACR,CAAC,CAAA;QAEF,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YACpC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,EAAE;gBACrC,KAAK,EAAE,cAAc,CAAC,KAAK,CAAC;aAC7B,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAA;IACpD,CAAC;IAGD,aAAa;QACX,OAAO,IAAI,CAAC,UAAe,CAAA;IAC7B,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAA;QAE/B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAA;IAClD,CAAC;IAED,KAAK,CAAC,KAAK;QACT,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAA;QAE7B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAA;IAC/C,CAAC;IASO,YAAY,CAAC,MAA2B;QAC9C,OAAO;YACL,aAAa,EAAE,MAAM,CAAC,uBAAuB;SAC9C,CAAA;IACH,CAAC;CACF"}

package/dist/redis-database-manager.d.ts

@@ -1,11 +1,12 @@
 import { DIContainer } from '@famir/common';
 import { Logger } from '@famir/logger';
-import { DatabaseManager, RedisDatabaseConnection } from './database.js';
+import { DatabaseConnector, DatabaseManager, RedisDatabaseConnection } from './database.js';
 export declare class RedisDatabaseManager implements DatabaseManager {
     protected readonly logger: Logger;
-    protected readonly connection: RedisDatabaseConnection;
+    protected readonly connector: DatabaseConnector;
     static register(container: DIContainer): void;
-    constructor(logger: Logger, connection: RedisDatabaseConnection);
+    protected readonly connection: RedisDatabaseConnection;
+    constructor(logger: Logger, connector: DatabaseConnector);
     loadFunctions(): Promise<void>;
     cleanup(): Promise<void>;
 }

package/dist/redis-database-manager.js

@@ -1,22 +1,29 @@
 import { LOGGER } from '@famir/logger';
-import { DATABASE_CONNECTOR, DATABASE_MANAGER } from './database.js';
-import { makeRedisFunctions } from './redis-functions.js';
+import { DATABASE_CONNECTOR, DATABASE_MANAGER, } from './database.js';
+import { redisFunctions } from './redis-functions.js';
 export class RedisDatabaseManager {
     logger;
-    connection;
+    connector;
     static register(container) {
-        container.registerSingleton(DATABASE_MANAGER, (c) => new RedisDatabaseManager(c.resolve(LOGGER), c.resolve(DATABASE_CONNECTOR).getConnection()));
+        container.registerSingleton(DATABASE_MANAGER, (c) => new RedisDatabaseManager(c.resolve(LOGGER), c.resolve(DATABASE_CONNECTOR)));
     }
-    constructor(logger, connection) {
+    connection;
+    constructor(logger, connector) {
         this.logger = logger;
-        this.connection = connection;
+        this.connector = connector;
+        this.connection = connector.getConnection();
         this.logger.debug(`DatabaseManager initialized`);
     }
     async loadFunctions() {
         await this.connection.FUNCTION_FLUSH();
-        for (const [name, data] of makeRedisFunctions()) {
-            this.logger.info(`Load redis functions: ${name}`);
-            await this.connection.FUNCTION_LOAD(data);
+        for (const [name, data] of redisFunctions) {
+            try {
+                await this.connection.FUNCTION_LOAD(data);
+                this.logger.info(`Load redis functions`, { name });
+            }
+            catch (error) {
+                this.logger.info(`Load redis functions error`, { name, error });
+            }
         }
     }
     async cleanup() {

package/dist/redis-database-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"redis-database-manager.js","sourceRoot":"","sources":["../src/redis-database-manager.ts"],"names":[],"mappings":"AACA,OAAO,EAAU,MAAM,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAIjB,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAKzD,MAAM,OAAO,oBAAoB;IAgBV;IACA;IAbrB,MAAM,CAAC,QAAQ,CAAC,SAAsB;QACpC,SAAS,CAAC,iBAAiB,CACzB,gBAAgB,EAChB,CAAC,CAAC,EAAE,EAAE,CACJ,IAAI,oBAAoB,CACtB,CAAC,CAAC,OAAO,CAAS,MAAM,CAAC,EACzB,CAAC,CAAC,OAAO,CAAoB,kBAAkB,CAAC,CAAC,aAAa,EAA2B,CAC1F,CACJ,CAAA;IACH,CAAC;IAED,YACqB,MAAc,EACd,UAAmC;QADnC,WAAM,GAAN,MAAM,CAAQ;QACd,eAAU,GAAV,UAAU,CAAyB;QAEtD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAA;IAClD,CAAC;IAKD,KAAK,CAAC,aAAa;QACjB,MAAM,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,CAAA;QAEtC,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,kBAAkB,EAAE,EAAE,CAAC;YAChD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,yBAAyB,IAAI,EAAE,CAAC,CAAA;YAEjD,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,CAAA;QAC3C,CAAC;IACH,CAAC;IAKD,KAAK,CAAC,OAAO;QACX,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAA;QAE/B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAA;IACzC,CAAC;CACF"}
+{"version":3,"file":"redis-database-manager.js","sourceRoot":"","sources":["../src/redis-database-manager.ts"],"names":[],"mappings":"AACA,OAAO,EAAU,MAAM,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,EACL,kBAAkB,EAClB,gBAAgB,GAIjB,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAOrD,MAAM,OAAO,oBAAoB;IAuBV;IACA;IAlBrB,MAAM,CAAC,QAAQ,CAAC,SAAsB;QACpC,SAAS,CAAC,iBAAiB,CACzB,gBAAgB,EAChB,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,oBAAoB,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAClF,CAAA;IACH,CAAC;IAGkB,UAAU,CAAyB;IAQtD,YACqB,MAAc,EACd,SAA4B;QAD5B,WAAM,GAAN,MAAM,CAAQ;QACd,cAAS,GAAT,SAAS,CAAmB;QAE/C,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC,aAAa,EAA2B,CAAA;QAEpE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAA;IAClD,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,MAAM,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,CAAA;QAEtC,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,cAAc,EAAE,CAAC;YAC1C,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,CAAA;gBAEzC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;YACpD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,4BAA4B,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;YACjE,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAA;QAE/B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAA;IACzC,CAAC;CACF"}

package/dist/redis-functions.d.ts

@@ -1 +1 @@
-export declare function makeRedisFunctions(): [string, string][];
+export declare const redisFunctions: Map<string, string>;