@famir/database 0.0.1 → 0.0.3

package/dist/{repositories → modules}/target/target.schemas.js

@@ -1,9 +1,10 @@
+import { TARGET_ACCESS_LEVELS } from './target.models.js';
 const rawTargetSchema = {
     type: 'object',
     required: [
         'campaign_id',
         'target_id',
-        'is_landing',
+        'access_level',
         'donor_secure',
         'donor_sub',
         'donor_domain',
@@ -12,69 +13,62 @@ const rawTargetSchema = {
         'mirror_sub',
         'mirror_domain',
         'mirror_port',
-        'labels',
         'is_enabled',
         'message_count',
-        'created_at'
+        'created_at',
     ],
     properties: {
         campaign_id: {
-            type: 'string'
+            type: 'string',
         },
         target_id: {
-            type: 'string'
+            type: 'string',
         },
-        is_landing: {
-            type: 'integer'
+        access_level: {
+            type: 'string',
         },
         donor_secure: {
-            type: 'integer'
+            type: 'integer',
         },
         donor_sub: {
-            type: 'string'
+            type: 'string',
         },
         donor_domain: {
-            type: 'string'
+            type: 'string',
         },
         donor_port: {
-            type: 'integer'
+            type: 'integer',
         },
         mirror_secure: {
-            type: 'integer'
+            type: 'integer',
         },
         mirror_sub: {
-            type: 'string'
+            type: 'string',
         },
         mirror_domain: {
-            type: 'string'
+            type: 'string',
         },
         mirror_port: {
-            type: 'integer'
-        },
-        labels: {
-            type: 'array',
-            items: {
-                type: 'string'
-            }
+            type: 'integer',
         },
         is_enabled: {
-            type: 'integer'
+            type: 'integer',
         },
         message_count: {
-            type: 'integer'
+            type: 'integer',
         },
         created_at: {
-            type: 'integer'
-        }
+            type: 'integer',
+        },
     },
-    additionalProperties: false
+    additionalProperties: false,
 };
 const rawFullTargetSchema = {
     type: 'object',
     required: [
         'campaign_id',
         'target_id',
-        'is_landing',
+        'access_level',
         'donor_secure',
         'donor_sub',
         'donor_domain',
@@ -94,148 +88,157 @@ const rawFullTargetSchema = {
         'favicon_ico',
         'robots_txt',
         'sitemap_xml',
+        'allow_websockets',
         'is_enabled',
         'message_count',
-        'created_at'
+        'created_at',
     ],
     properties: {
         campaign_id: {
-            type: 'string'
+            type: 'string',
         },
         target_id: {
-            type: 'string'
+            type: 'string',
         },
-        is_landing: {
-            type: 'integer'
+        access_level: {
+            type: 'string',
         },
         donor_secure: {
-            type: 'integer'
+            type: 'integer',
         },
         donor_sub: {
-            type: 'string'
+            type: 'string',
         },
         donor_domain: {
-            type: 'string'
+            type: 'string',
         },
         donor_port: {
-            type: 'integer'
+            type: 'integer',
         },
         mirror_secure: {
-            type: 'integer'
+            type: 'integer',
         },
         mirror_sub: {
-            type: 'string'
+            type: 'string',
         },
         mirror_domain: {
-            type: 'string'
+            type: 'string',
         },
         mirror_port: {
-            type: 'integer'
+            type: 'integer',
         },
         labels: {
             type: 'array',
             items: {
-                type: 'string'
-            }
+                type: 'string',
+            },
         },
         connect_timeout: {
-            type: 'integer'
+            type: 'integer',
         },
         simple_timeout: {
-            type: 'integer'
+            type: 'integer',
         },
         stream_timeout: {
-            type: 'integer'
+            type: 'integer',
         },
         headers_size_limit: {
-            type: 'integer'
+            type: 'integer',
         },
         body_size_limit: {
-            type: 'integer'
+            type: 'integer',
         },
         main_page: {
-            type: 'string'
+            type: 'string',
         },
         not_found_page: {
-            type: 'string'
+            type: 'string',
         },
         favicon_ico: {
-            type: 'string'
+            type: 'string',
         },
         robots_txt: {
-            type: 'string'
+            type: 'string',
         },
         sitemap_xml: {
-            type: 'string'
+            type: 'string',
+        },
+        allow_websockets: {
+            type: 'number',
         },
         is_enabled: {
-            type: 'integer'
+            type: 'integer',
         },
         message_count: {
-            type: 'integer'
+            type: 'integer',
         },
         created_at: {
-            type: 'integer'
-        }
+            type: 'integer',
+        },
     },
-    additionalProperties: false
+    additionalProperties: false,
 };
-export const targetSchemas = {
-    'database-raw-target': rawTargetSchema,
-    'database-raw-full-target': rawFullTargetSchema
+export const targetAccessLevelSchema = {
+    type: 'string',
+    enum: [...TARGET_ACCESS_LEVELS],
 };
 export const targetSubSchema = {
     type: 'string',
     minLength: 1,
-    maxLength: 128
+    maxLength: 128,
 };
 export const targetDomainSchema = {
     type: 'string',
     minLength: 1,
-    maxLength: 128
+    maxLength: 128,
 };
 export const targetPortSchema = {
     type: 'number',
     minimum: 0,
-    maximum: 65535
+    maximum: 65535,
 };
 export const targetLabelSchema = {
     type: 'string',
     minLength: 3,
-    maxLength: 64
+    maxLength: 64,
 };
 export const targetLabelsSchema = {
     type: 'array',
-    items: targetLabelSchema
+    items: targetLabelSchema,
 };
 export const targetConnectTimeoutSchema = {
     type: 'integer',
     minimum: 1,
-    maximum: 60 * 1000
+    maximum: 60 * 1000,
 };
 export const targetSimpleTimeoutSchema = {
     type: 'integer',
     minimum: 1,
-    maximum: 5 * 60 * 1000
+    maximum: 5 * 60 * 1000,
 };
 export const targetStreamTimeoutSchema = {
     type: 'integer',
     minimum: 1,
-    maximum: 3600 * 1000
+    maximum: 3600 * 1000,
 };
 export const targetHeadersSizeLimitSchema = {
     type: 'integer',
     minimum: 1,
-    maximum: 1024 * 1024
+    maximum: 1024 * 1024,
 };
 export const targetBodySizeLimitSchema = {
     type: 'integer',
     minimum: 1,
-    maximum: 1024 * 1024 * 1024
+    maximum: 1024 * 1024 * 1024,
 };
 export const targetContentSchema = {
     type: 'string',
     minLength: 0,
-    maxLength: 10 * 1024 * 1024
+    maxLength: 10 * 1024 * 1024,
+};
+export const targetSchemas = {
+    'database-raw-target': rawTargetSchema,
+    'database-raw-full-target': rawFullTargetSchema,
+    'database-target-access-level': targetAccessLevelSchema,
 };
 //# 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,12 +3,13 @@ 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 inject(container: DIContainer): void;
+    static register(container: DIContainer): void;
     protected readonly options: RedisDatabaseConnectorOptions;
     protected readonly redis: RedisDatabaseConnection;
     constructor(config: Config<RedisDatabaseConfig>, logger: Logger);
-    connection<T>(): T;
+    getConnection<T>(): T;
     connect(): Promise<void>;
     close(): Promise<void>;
     private buildOptions;

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 inject(container) {
+    static register(container) {
         container.registerSingleton(DATABASE_CONNECTOR, (c) => new RedisDatabaseConnector(c.resolve(CONFIG), c.resolve(LOGGER)));
     }
     options;
     redis;
     constructor(config, logger) {
+        this.config = config;
         this.logger = logger;
         this.options = this.buildOptions(config.data);
         this.redis = createClient({
             url: this.options.connectionUrl,
             functions: databaseFunctions,
             name: 'database',
-            RESP: 3
+            RESP: 3,
         });
         this.redis.on('error', (error) => {
             this.logger.error(`Redis error event`, {
-                error: serializeError(error)
+                error: serializeError(error),
             });
         });
         this.logger.debug(`DatabaseConnector initialized`);
     }
-    connection() {
+    getConnection() {
         return this.redis;
     }
     async connect() {
         await this.redis.connect();
-        this.logger.debug(`Database connected`);
+        this.logger.debug(`DatabaseConnector connected`);
     }
     async close() {
         await this.redis.close();
-        this.logger.debug(`Database closed`);
+        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;AAEtB,MAAM,OAAO,sBAAsB;IAiBZ;IAhBrB,MAAM,CAAC,MAAM,CAAC,SAAsB;QAClC,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;IAGD,UAAU;QACR,OAAO,IAAI,CAAC,KAAU,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAA;QAE1B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAA;IACzC,CAAC;IAED,KAAK,CAAC,KAAK;QACT,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAA;QAExB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAA;IACtC,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;IAeZ;IACA;IAZrB,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;IAEkB,OAAO,CAA+B;IACtC,KAAK,CAAyB;IAEjD,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,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;IAGD,aAAa;QACX,OAAO,IAAI,CAAC,KAAU,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAA;QAE1B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAA;IAClD,CAAC;IAED,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"}

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 connector: DatabaseConnector;
+    static register(container: DIContainer): void;
     protected readonly connection: RedisDatabaseConnection;
-    static inject(container: DIContainer): void;
-    constructor(logger: Logger, connection: RedisDatabaseConnection);
+    constructor(logger: Logger, connector: DatabaseConnector);
     loadFunctions(): Promise<void>;
     cleanup(): Promise<void>;
 }

package/dist/redis-database-manager.js

@@ -1,20 +1,22 @@
 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;
-    static inject(container) {
-        container.registerSingleton(DATABASE_MANAGER, (c) => new RedisDatabaseManager(c.resolve(LOGGER), c.resolve(DATABASE_CONNECTOR).connection()));
+    connector;
+    static register(container) {
+        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()) {
+        for (const [name, data] of redisFunctions) {
             this.logger.info(`Load redis functions: ${name}`);
             await this.connection.FUNCTION_LOAD(data);
         }

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;AAEzD,MAAM,OAAO,oBAAoB;IAaV;IACA;IAbrB,MAAM,CAAC,MAAM,CAAC,SAAsB;QAClC,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,UAAU,EAA2B,CACvF,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;IAED,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;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"}
+{"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;IAcV;IACA;IAXrB,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;IAEkB,UAAU,CAAyB;IAEtD,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,MAAM,CAAC,IAAI,CAAC,yBAAyB,IAAI,EAAE,CAAC,CAAA;YAEjD,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,CAAA;QAC3C,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>;