@famir/database 0.0.2 → 0.0.4

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

@@ -8,14 +8,14 @@ export class MessageModel {
     method;
     url;
     status;
-    processor;
+    analyze;
     startTime;
     finishTime;
     createdAt;
     static isNotNull = (model) => {
         return model != null;
     };
-    constructor(campaignId, messageId, proxyId, targetId, sessionId, type, method, url, status, processor, startTime, finishTime, createdAt) {
+    constructor(campaignId, messageId, proxyId, targetId, sessionId, type, method, url, status, analyze, startTime, finishTime, createdAt) {
         this.campaignId = campaignId;
         this.messageId = messageId;
         this.proxyId = proxyId;
@@ -25,7 +25,7 @@ export class MessageModel {
         this.method = method;
         this.url = url;
         this.status = status;
-        this.processor = processor;
+        this.analyze = analyze;
         this.startTime = startTime;
         this.finishTime = finishTime;
         this.createdAt = createdAt;
@@ -42,8 +42,8 @@ export class FullMessageModel extends MessageModel {
     connection;
     payload;
     errors;
-    constructor(campaignId, messageId, proxyId, targetId, sessionId, type, method, url, requestHeaders, requestBody, status, responseHeaders, responseBody, connection, payload, errors, processor, startTime, finishTime, createdAt) {
-        super(campaignId, messageId, proxyId, targetId, sessionId, type, method, url, status, processor, startTime, finishTime, createdAt);
+    constructor(campaignId, messageId, proxyId, targetId, sessionId, type, method, url, requestHeaders, requestBody, status, responseHeaders, responseBody, connection, payload, errors, analyze, startTime, finishTime, createdAt) {
+        super(campaignId, messageId, proxyId, targetId, sessionId, type, method, url, status, analyze, startTime, finishTime, createdAt);
         this.requestHeaders = requestHeaders;
         this.requestBody = requestBody;
         this.responseHeaders = responseHeaders;
@@ -53,4 +53,4 @@ export class FullMessageModel extends MessageModel {
         this.errors = errors;
     }
 }
-//# sourceMappingURL=message.js.map
+//# sourceMappingURL=message.models.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"message.models.js","sourceRoot":"","sources":["../../../src/modules/message/message.models.ts"],"names":[],"mappings":"AAeA,MAAM,OAAO,YAAY;IA6BZ;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IAlCX,MAAM,CAAC,SAAS,GAAG,CAAyB,KAAe,EAAc,EAAE;QACzE,OAAO,KAAK,IAAI,IAAI,CAAA;IACtB,CAAC,CAAA;IAmBD,YACW,UAAkB,EAClB,SAAiB,EACjB,OAAe,EACf,QAAgB,EAChB,SAAiB,EACjB,IAAc,EACd,MAAkB,EAClB,GAAW,EACX,MAAc,EACd,OAAe,EACf,SAAiB,EACjB,UAAkB,EAClB,SAAe;QAZf,eAAU,GAAV,UAAU,CAAQ;QAClB,cAAS,GAAT,SAAS,CAAQ;QACjB,YAAO,GAAP,OAAO,CAAQ;QACf,aAAQ,GAAR,QAAQ,CAAQ;QAChB,cAAS,GAAT,SAAS,CAAQ;QACjB,SAAI,GAAJ,IAAI,CAAU;QACd,WAAM,GAAN,MAAM,CAAY;QAClB,QAAG,GAAH,GAAG,CAAQ;QACX,WAAM,GAAN,MAAM,CAAQ;QACd,YAAO,GAAP,OAAO,CAAQ;QACf,cAAS,GAAT,SAAS,CAAQ;QACjB,eAAU,GAAV,UAAU,CAAQ;QAClB,cAAS,GAAT,SAAS,CAAM;IACvB,CAAC;IAOJ,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAA;IAChF,CAAC;;AAQH,MAAM,OAAO,gBAAiB,SAAQ,YAAY;IAkCrC;IACA;IAEA;IACA;IACA;IACA;IACA;IAhBX,YACE,UAAkB,EAClB,SAAiB,EACjB,OAAe,EACf,QAAgB,EAChB,SAAiB,EACjB,IAAc,EACd,MAAkB,EAClB,GAAW,EACF,cAA2B,EAC3B,WAAqB,EAC9B,MAAc,EACL,eAA4B,EAC5B,YAAsB,EACtB,UAA0B,EAC1B,OAAoB,EACpB,MAAmB,EAC5B,OAAe,EACf,SAAiB,EACjB,UAAkB,EAClB,SAAe;QAEf,KAAK,CACH,UAAU,EACV,SAAS,EACT,OAAO,EACP,QAAQ,EACR,SAAS,EACT,IAAI,EACJ,MAAM,EACN,GAAG,EACH,MAAM,EACN,OAAO,EACP,SAAS,EACT,UAAU,EACV,SAAS,CACV,CAAA;QA3BQ,mBAAc,GAAd,cAAc,CAAa;QAC3B,gBAAW,GAAX,WAAW,CAAU;QAErB,oBAAe,GAAf,eAAe,CAAa;QAC5B,iBAAY,GAAZ,YAAY,CAAU;QACtB,eAAU,GAAV,UAAU,CAAgB;QAC1B,YAAO,GAAP,OAAO,CAAa;QACpB,WAAM,GAAN,MAAM,CAAa;IAqB9B,CAAC;CACF"}

package/dist/modules/message/message.schemas.js

@@ -0,0 +1,93 @@
+import { httpConnectionSchema, httpErrorsSchema, httpHeadersSchema, httpMethodSchema, httpPayloadSchema, httpRelativeUrlSchema, httpStatusSchema, httpTypeSchema, } from '@famir/http-proto';
+import { customIdentSchema, randomIdentSchema, serializableSchema, timestampSchema, } from '@famir/validator';
+const rawMessageSchema = {
+    type: 'object',
+    required: [
+        'campaign_id',
+        'message_id',
+        'proxy_id',
+        'target_id',
+        'session_id',
+        'type',
+        'method',
+        'url',
+        'status',
+        'analyze',
+        'start_time',
+        'finish_time',
+        'created_at',
+    ],
+    properties: {
+        campaign_id: customIdentSchema,
+        message_id: randomIdentSchema,
+        proxy_id: customIdentSchema,
+        target_id: customIdentSchema,
+        session_id: randomIdentSchema,
+        type: httpTypeSchema,
+        method: httpMethodSchema,
+        url: httpRelativeUrlSchema,
+        status: httpStatusSchema,
+        analyze: customIdentSchema,
+        start_time: timestampSchema,
+        finish_time: timestampSchema,
+        created_at: timestampSchema,
+    },
+    additionalProperties: false,
+};
+const rawFullMessageSchema = {
+    type: 'object',
+    required: [
+        'campaign_id',
+        'message_id',
+        'proxy_id',
+        'target_id',
+        'session_id',
+        'type',
+        'method',
+        'url',
+        'request_headers',
+        'request_body',
+        'status',
+        'response_headers',
+        'response_body',
+        'connection',
+        'payload',
+        'errors',
+        'analyze',
+        'start_time',
+        'finish_time',
+        'created_at',
+    ],
+    properties: {
+        campaign_id: customIdentSchema,
+        message_id: randomIdentSchema,
+        proxy_id: customIdentSchema,
+        target_id: customIdentSchema,
+        session_id: randomIdentSchema,
+        type: httpTypeSchema,
+        method: httpMethodSchema,
+        url: httpRelativeUrlSchema,
+        request_headers: serializableSchema,
+        request_body: serializableSchema,
+        status: httpStatusSchema,
+        response_headers: serializableSchema,
+        response_body: serializableSchema,
+        connection: serializableSchema,
+        payload: serializableSchema,
+        errors: serializableSchema,
+        analyze: customIdentSchema,
+        start_time: timestampSchema,
+        finish_time: timestampSchema,
+        created_at: timestampSchema,
+    },
+    additionalProperties: false,
+};
+export const messageSchemas = {
+    'database-raw-message': rawMessageSchema,
+    'database-raw-full-message': rawFullMessageSchema,
+    'database-message-headers': httpHeadersSchema,
+    'database-message-connection': httpConnectionSchema,
+    'database-message-payload': httpPayloadSchema,
+    'database-message-errors': httpErrorsSchema,
+};
+//# sourceMappingURL=message.schemas.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"message.schemas.js","sourceRoot":"","sources":["../../../src/modules/message/message.schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EACpB,gBAAgB,EAChB,iBAAiB,EACjB,gBAAgB,EAChB,iBAAiB,EACjB,qBAAqB,EACrB,gBAAgB,EAChB,cAAc,GACf,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAGL,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,EAClB,eAAe,GAChB,MAAM,kBAAkB,CAAA;AASzB,MAAM,gBAAgB,GAA+B;IACnD,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE;QACR,aAAa;QACb,YAAY;QACZ,UAAU;QACV,WAAW;QACX,YAAY;QACZ,MAAM;QACN,QAAQ;QACR,KAAK;QACL,QAAQ;QACR,SAAS;QACT,YAAY;QACZ,aAAa;QACb,YAAY;KACb;IACD,UAAU,EAAE;QACV,WAAW,EAAE,iBAAiB;QAC9B,UAAU,EAAE,iBAAiB;QAC7B,QAAQ,EAAE,iBAAiB;QAC3B,SAAS,EAAE,iBAAiB;QAC5B,UAAU,EAAE,iBAAiB;QAC7B,IAAI,EAAE,cAAc;QACpB,MAAM,EAAE,gBAAgB;QACxB,GAAG,EAAE,qBAAqB;QAC1B,MAAM,EAAE,gBAAgB;QACxB,OAAO,EAAE,iBAAiB;QAC1B,UAAU,EAAE,eAAe;QAC3B,WAAW,EAAE,eAAe;QAC5B,UAAU,EAAE,eAAe;KAC5B;IACD,oBAAoB,EAAE,KAAK;CACnB,CAAA;AAQV,MAAM,oBAAoB,GAAmC;IAC3D,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE;QACR,aAAa;QACb,YAAY;QACZ,UAAU;QACV,WAAW;QACX,YAAY;QACZ,MAAM;QACN,QAAQ;QACR,KAAK;QACL,iBAAiB;QACjB,cAAc;QACd,QAAQ;QACR,kBAAkB;QAClB,eAAe;QACf,YAAY;QACZ,SAAS;QACT,QAAQ;QACR,SAAS;QACT,YAAY;QACZ,aAAa;QACb,YAAY;KACb;IACD,UAAU,EAAE;QACV,WAAW,EAAE,iBAAiB;QAC9B,UAAU,EAAE,iBAAiB;QAC7B,QAAQ,EAAE,iBAAiB;QAC3B,SAAS,EAAE,iBAAiB;QAC5B,UAAU,EAAE,iBAAiB;QAC7B,IAAI,EAAE,cAAc;QACpB,MAAM,EAAE,gBAAgB;QACxB,GAAG,EAAE,qBAAqB;QAC1B,eAAe,EAAE,kBAAkB;QACnC,YAAY,EAAE,kBAAkB;QAChC,MAAM,EAAE,gBAAgB;QACxB,gBAAgB,EAAE,kBAAkB;QACpC,aAAa,EAAE,kBAAkB;QACjC,UAAU,EAAE,kBAAkB;QAC9B,OAAO,EAAE,kBAAkB;QAC3B,MAAM,EAAE,kBAAkB;QAC1B,OAAO,EAAE,iBAAiB;QAC1B,UAAU,EAAE,eAAe;QAC3B,WAAW,EAAE,eAAe;QAC5B,UAAU,EAAE,eAAe;KAC5B;IACD,oBAAoB,EAAE,KAAK;CACnB,CAAA;AAQV,MAAM,CAAC,MAAM,cAAc,GAAqB;IAC9C,sBAAsB,EAAE,gBAAgB;IACxC,2BAA2B,EAAE,oBAAoB;IACjD,0BAA0B,EAAE,iBAAiB;IAC7C,6BAA6B,EAAE,oBAAoB;IACnD,0BAA0B,EAAE,iBAAiB;IAC7C,yBAAyB,EAAE,gBAAgB;CACnC,CAAA"}

package/dist/{repositories → modules}/message/redis-message.repository.d.ts

@@ -1,15 +1,16 @@
-import { DIContainer, HttpBody, HttpConnection, HttpError, HttpHeaders, HttpMethod, HttpPayload, HttpType } from '@famir/common';
+import { DIContainer } from '@famir/common';
 import { Config } from '@famir/config';
+import { HttpBody, HttpConnection, HttpError, HttpHeaders, HttpMethod, HttpPayload, HttpType } from '@famir/http-proto';
 import { Logger } from '@famir/logger';
 import { Validator } from '@famir/validator';
-import { RedisDatabaseConfig, RedisDatabaseConnection } from '../../database.js';
-import { FullMessageModel, MessageModel } from '../../models/index.js';
+import { DatabaseConnector, RedisDatabaseConfig } from '../../database.js';
 import { RedisBaseRepository } from '../base/index.js';
 import { MessageRepository } from './message.js';
+import { FullMessageModel, MessageModel } from './message.models.js';
 export declare class RedisMessageRepository extends RedisBaseRepository implements MessageRepository {
     static register(container: DIContainer): void;
-    constructor(validator: Validator, config: Config<RedisDatabaseConfig>, logger: Logger, connection: RedisDatabaseConnection);
-    create(campaignId: string, messageId: string, proxyId: string, targetId: string, sessionId: string, type: HttpType, method: HttpMethod, url: string, requestHeaders: HttpHeaders, requestBody: HttpBody, status: number, responseHeaders: HttpHeaders, responseBody: HttpBody, connection: HttpConnection, payload: HttpPayload, errors: HttpError[], processor: string, startTime: number, finishTime: number): Promise<void>;
+    constructor(validator: Validator, config: Config<RedisDatabaseConfig>, logger: Logger, connector: DatabaseConnector);
+    create(campaignId: string, messageId: string, proxyId: string, targetId: string, sessionId: string, type: HttpType, method: HttpMethod, url: string, requestHeaders: HttpHeaders, requestBody: HttpBody, status: number, responseHeaders: HttpHeaders, responseBody: HttpBody, connection: HttpConnection, payload: HttpPayload, errors: HttpError[], analyze: string, startTime: number, finishTime: number): Promise<void>;
     createDummy(campaignId: string, messageId: string, proxyId: string, targetId: string, sessionId: string): Promise<void>;
     read(campaignId: string, messageId: string): Promise<MessageModel | null>;
     readFull(campaignId: string, messageId: string): Promise<FullMessageModel | null>;

package/dist/{repositories → modules}/message/redis-message.repository.js

@@ -1,24 +1,28 @@
 import { CONFIG } from '@famir/config';
 import { LOGGER } from '@famir/logger';
 import { VALIDATOR } from '@famir/validator';
+import { DatabaseError } from '../../database.error.js';
 import { DATABASE_CONNECTOR } from '../../database.js';
-import { FullMessageModel, MessageModel } from '../../models/index.js';
 import { RedisBaseRepository } from '../base/index.js';
 import { MESSAGE_REPOSITORY } from './message.js';
+import { FullMessageModel, MessageModel } from './message.models.js';
 import { messageSchemas } from './message.schemas.js';
 export class RedisMessageRepository extends RedisBaseRepository {
     static register(container) {
-        container.registerSingleton(MESSAGE_REPOSITORY, (c) => new RedisMessageRepository(c.resolve(VALIDATOR), c.resolve(CONFIG), c.resolve(LOGGER), c.resolve(DATABASE_CONNECTOR).getConnection()));
+        container.registerSingleton(MESSAGE_REPOSITORY, (c) => new RedisMessageRepository(c.resolve(VALIDATOR), c.resolve(CONFIG), c.resolve(LOGGER), c.resolve(DATABASE_CONNECTOR)));
     }
-    constructor(validator, config, logger, connection) {
-        super(validator, config, logger, connection, 'message');
+    constructor(validator, config, logger, connector) {
+        super(validator, config, logger, connector, 'message');
         this.validator.addSchemas(messageSchemas);
         this.logger.debug(`MessageRepository initialized`);
     }
-    async create(campaignId, messageId, proxyId, targetId, sessionId, type, method, url, requestHeaders, requestBody, status, responseHeaders, responseBody, connection, payload, errors, processor, startTime, finishTime) {
+    async create(campaignId, messageId, proxyId, targetId, sessionId, type, method, url, requestHeaders, requestBody, status, responseHeaders, responseBody, connection, payload, errors, analyze, startTime, finishTime) {
         try {
-            const statusReply = await this.connection.message.create_message(this.options.prefix, campaignId, messageId, proxyId, targetId, sessionId, type, method, url, this.encodeJson(requestHeaders), this.encodeBase64(requestBody), status.toString(), this.encodeJson(responseHeaders), this.encodeBase64(responseBody), this.encodeJson(connection), this.encodeJson(payload), this.encodeJson(errors), processor, startTime.toString(), finishTime.toString(), Date.now().toString());
-            const mesg = this.handleStatusReply(statusReply);
+            const statusReply = await this.connection.message.create_message(this.options.prefix, campaignId, messageId, proxyId, targetId, sessionId, type, method, url, this.encodeJson(requestHeaders), this.encodeBase64(requestBody), status, this.encodeJson(responseHeaders), this.encodeBase64(responseBody), this.encodeJson(connection), this.encodeJson(payload), this.encodeJson(errors), analyze, startTime, finishTime, Date.now());
+            const [code, mesg] = this.parseStatusReply(statusReply);
+            if (code !== 'OK') {
+                throw new DatabaseError(mesg, { code });
+            }
             this.logger.info(mesg, { message: { campaignId, messageId, proxyId, targetId, sessionId } });
         }
         catch (error) {
@@ -28,7 +32,10 @@ export class RedisMessageRepository extends RedisBaseRepository {
     async createDummy(campaignId, messageId, proxyId, targetId, sessionId) {
         try {
             const statusReply = await this.connection.message.create_dummy_message(this.options.prefix, campaignId, messageId, proxyId, targetId, sessionId);
-            const mesg = this.handleStatusReply(statusReply);
+            const [code, mesg] = this.parseStatusReply(statusReply);
+            if (code !== 'OK') {
+                throw new DatabaseError(mesg, { code });
+            }
             this.logger.info(mesg, { message: { campaignId, messageId, proxyId, targetId, sessionId } });
         }
         catch (error) {
@@ -58,18 +65,14 @@ export class RedisMessageRepository extends RedisBaseRepository {
             return null;
         }
         this.validateRawData('database-raw-message', rawModel);
-        this.validateRawData('database-message-type', rawModel.type);
-        this.validateRawData('database-message-method', rawModel.method);
-        return new MessageModel(rawModel.campaign_id, rawModel.message_id, rawModel.proxy_id, rawModel.target_id, rawModel.session_id, rawModel.type, rawModel.method, rawModel.url, rawModel.status, rawModel.processor, rawModel.start_time, rawModel.finish_time, new Date(rawModel.created_at));
+        return new MessageModel(rawModel.campaign_id, rawModel.message_id, rawModel.proxy_id, rawModel.target_id, rawModel.session_id, rawModel.type, rawModel.method, rawModel.url, rawModel.status, rawModel.analyze, rawModel.start_time, rawModel.finish_time, new Date(rawModel.created_at));
     }
     buildFullModel(rawModel) {
         if (rawModel === null) {
             return null;
         }
         this.validateRawData('database-raw-full-message', rawModel);
-        this.validateRawData('database-message-type', rawModel.type);
-        this.validateRawData('database-message-method', rawModel.method);
-        return new FullMessageModel(rawModel.campaign_id, rawModel.message_id, rawModel.proxy_id, rawModel.target_id, rawModel.session_id, rawModel.type, rawModel.method, rawModel.url, this.parseHeaders(rawModel.request_headers), this.decodeBase64(rawModel.request_body), rawModel.status, this.parseHeaders(rawModel.response_headers), this.decodeBase64(rawModel.response_body), this.parseConnection(rawModel.connection), this.parsePayload(rawModel.payload), this.parseErrors(rawModel.errors), rawModel.processor, rawModel.start_time, rawModel.finish_time, new Date(rawModel.created_at));
+        return new FullMessageModel(rawModel.campaign_id, rawModel.message_id, rawModel.proxy_id, rawModel.target_id, rawModel.session_id, rawModel.type, rawModel.method, rawModel.url, this.parseHeaders(rawModel.request_headers), this.decodeBase64(rawModel.request_body), rawModel.status, this.parseHeaders(rawModel.response_headers), this.decodeBase64(rawModel.response_body), this.parseConnection(rawModel.connection), this.parsePayload(rawModel.payload), this.parseErrors(rawModel.errors), rawModel.analyze, rawModel.start_time, rawModel.finish_time, new Date(rawModel.created_at));
     }
     parseHeaders(value) {
         const data = this.decodeJson(value);

package/dist/modules/message/redis-message.repository.js.map

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

package/dist/{repositories → modules}/proxy/index.d.ts

@@ -1,3 +1,4 @@
 export * from './proxy.js';
+export * from './proxy.models.js';
 export * from './proxy.schemas.js';
 export * from './redis-proxy.repository.js';

package/dist/{repositories → modules}/proxy/index.js

@@ -1,4 +1,5 @@
 export * from './proxy.js';
+export * from './proxy.models.js';
 export * from './proxy.schemas.js';
 export * from './redis-proxy.repository.js';
 //# sourceMappingURL=index.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/modules/proxy/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAA;AAC1B,cAAc,mBAAmB,CAAA;AACjC,cAAc,oBAAoB,CAAA;AAClC,cAAc,6BAA6B,CAAA"}

package/dist/{repositories → modules}/proxy/proxy.d.ts

@@ -1,4 +1,4 @@
-import { ProxyModel } from '../../models/index.js';
+import { ProxyModel } from './proxy.models.js';
 export declare const PROXY_REPOSITORY: unique symbol;
 export interface ProxyRepository {
     create(campaignId: string, proxyId: string, url: string, lockSecret: string): Promise<void>;

package/dist/{repositories → modules}/proxy/proxy.functions.d.ts

@@ -3,7 +3,7 @@ export interface RawProxy {
     campaign_id: string;
     proxy_id: string;
     url: string;
-    is_enabled: number;
+    is_enabled: boolean;
     message_count: number;
     created_at: number;
 }
@@ -11,7 +11,7 @@ export declare const proxyFunctions: {
     readonly proxy: {
         readonly create_proxy: {
             readonly NUMBER_OF_KEYS: 5;
-            readonly parseCommand: (parser: CommandParser, prefix: string, campaignId: string, proxyId: string, url: string, createdAt: string, lockSecret: string) => void;
+            readonly parseCommand: (parser: CommandParser, prefix: string, campaignId: string, proxyId: string, url: string, createdAt: number, lockSecret: string) => void;
             readonly transformReply: () => unknown;
         };
         readonly read_proxy: {

package/dist/{repositories → modules}/proxy/proxy.functions.js

@@ -1,4 +1,4 @@
-import { campaignKey, campaignLockKey, enabledProxyIndexKey, proxyIndexKey, proxyKey, proxyUrlsKey } from '../../database.keys.js';
+import { campaignKey, campaignLockKey, enabledProxyIndexKey, proxyIndexKey, proxyKey, proxyUrlsKey, } from '../../database.keys.js';
 export const proxyFunctions = {
     proxy: {
         create_proxy: {
@@ -12,10 +12,10 @@ export const proxyFunctions = {
                 parser.push(campaignId);
                 parser.push(proxyId);
                 parser.push(url);
-                parser.push(createdAt);
+                parser.push(createdAt.toString());
                 parser.push(lockSecret);
             },
-            transformReply: undefined
+            transformReply: undefined,
         },
         read_proxy: {
             NUMBER_OF_KEYS: 2,
@@ -23,7 +23,7 @@ export const proxyFunctions = {
                 parser.pushKey(campaignKey(prefix, campaignId));
                 parser.pushKey(proxyKey(prefix, campaignId, proxyId));
             },
-            transformReply: undefined
+            transformReply: undefined,
         },
         read_proxy_index: {
             NUMBER_OF_KEYS: 2,
@@ -31,7 +31,7 @@ export const proxyFunctions = {
                 parser.pushKey(campaignKey(prefix, campaignId));
                 parser.pushKey(proxyIndexKey(prefix, campaignId));
             },
-            transformReply: undefined
+            transformReply: undefined,
         },
         enable_proxy: {
             NUMBER_OF_KEYS: 4,
@@ -42,7 +42,7 @@ export const proxyFunctions = {
                 parser.pushKey(enabledProxyIndexKey(prefix, campaignId));
                 parser.push(lockSecret);
             },
-            transformReply: undefined
+            transformReply: undefined,
         },
         disable_proxy: {
             NUMBER_OF_KEYS: 4,
@@ -53,7 +53,7 @@ export const proxyFunctions = {
                 parser.pushKey(enabledProxyIndexKey(prefix, campaignId));
                 parser.push(lockSecret);
             },
-            transformReply: undefined
+            transformReply: undefined,
         },
         delete_proxy: {
             NUMBER_OF_KEYS: 5,
@@ -65,8 +65,8 @@ export const proxyFunctions = {
                 parser.pushKey(proxyIndexKey(prefix, campaignId));
                 parser.push(lockSecret);
             },
-            transformReply: undefined
-        }
-    }
+            transformReply: undefined,
+        },
+    },
 };
 //# sourceMappingURL=proxy.functions.js.map

package/dist/modules/proxy/proxy.functions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"proxy.functions.js","sourceRoot":"","sources":["../../../src/modules/proxy/proxy.functions.ts"],"names":[],"mappings":"AACA,OAAO,EACL,WAAW,EACX,eAAe,EACf,oBAAoB,EACpB,aAAa,EACb,QAAQ,EACR,YAAY,GACb,MAAM,wBAAwB,CAAA;AAuB/B,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,KAAK,EAAE;QACL,YAAY,EAAE;YACZ,cAAc,EAAE,CAAC;YAEjB,YAAY,CACV,MAAqB,EACrB,MAAc,EACd,UAAkB,EAClB,OAAe,EACf,GAAW,EACX,SAAiB,EACjB,UAAkB;gBAElB,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAA;gBAC/C,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAA;gBACnD,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC,CAAA;gBACrD,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAA;gBAChD,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAA;gBAEjD,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;gBACvB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;gBACpB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;gBAChB,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAA;gBACjC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;YACzB,CAAC;YAED,cAAc,EAAE,SAAqC;SACtD;QAED,UAAU,EAAE;YACV,cAAc,EAAE,CAAC;YAEjB,YAAY,CAAC,MAAqB,EAAE,MAAc,EAAE,UAAkB,EAAE,OAAe;gBACrF,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAA;gBAC/C,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC,CAAA;YACvD,CAAC;YAED,cAAc,EAAE,SAAqC;SACtD;QAED,gBAAgB,EAAE;YAChB,cAAc,EAAE,CAAC;YAEjB,YAAY,CAAC,MAAqB,EAAE,MAAc,EAAE,UAAkB;gBACpE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAA;gBAC/C,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAA;YACnD,CAAC;YAED,cAAc,EAAE,SAAqC;SACtD;QAED,YAAY,EAAE;YACZ,cAAc,EAAE,CAAC;YAEjB,YAAY,CACV,MAAqB,EACrB,MAAc,EACd,UAAkB,EAClB,OAAe,EACf,UAAkB;gBAElB,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAA;gBAC/C,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAA;gBACnD,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC,CAAA;gBACrD,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAA;gBAExD,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;YACzB,CAAC;YAED,cAAc,EAAE,SAAqC;SACtD;QAED,aAAa,EAAE;YACb,cAAc,EAAE,CAAC;YAEjB,YAAY,CACV,MAAqB,EACrB,MAAc,EACd,UAAkB,EAClB,OAAe,EACf,UAAkB;gBAElB,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAA;gBAC/C,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAA;gBACnD,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC,CAAA;gBACrD,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAA;gBAExD,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;YACzB,CAAC;YAED,cAAc,EAAE,SAAqC;SACtD;QAED,YAAY,EAAE;YACZ,cAAc,EAAE,CAAC;YAEjB,YAAY,CACV,MAAqB,EACrB,MAAc,EACd,UAAkB,EAClB,OAAe,EACf,UAAkB;gBAElB,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAA;gBAC/C,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAA;gBACnD,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC,CAAA;gBACrD,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAA;gBAChD,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAA;gBAEjD,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;YACzB,CAAC;YAED,cAAc,EAAE,SAAqC;SACtD;KACF;CACO,CAAA"}

package/dist/modules/proxy/proxy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../src/modules/proxy/proxy.ts"],"names":[],"mappings":"AAQA,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAA"}

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

@@ -20,4 +20,4 @@ export class ProxyModel {
         this.createdAt = createdAt;
     }
 }
-//# sourceMappingURL=proxy.js.map
+//# sourceMappingURL=proxy.models.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"proxy.models.js","sourceRoot":"","sources":["../../../src/modules/proxy/proxy.models.ts"],"names":[],"mappings":"AAKA,MAAM,OAAO,UAAU;IAgCV;IACA;IACA;IACA;IACA;IACA;IA9BX,MAAM,CAAC,SAAS,GAAG,CAAuB,KAAe,EAAc,EAAE;QACvE,OAAO,KAAK,IAAI,IAAI,CAAA;IACtB,CAAC,CAAA;IAQD,MAAM,CAAC,SAAS,GAAG,CAAuB,KAAQ,EAAoC,EAAE;QACtF,OAAO,KAAK,CAAC,SAAS,CAAA;IACxB,CAAC,CAAA;IAYD,YACW,UAAkB,EAClB,OAAe,EACf,GAAW,EACX,SAAkB,EAClB,YAAoB,EACpB,SAAe;QALf,eAAU,GAAV,UAAU,CAAQ;QAClB,YAAO,GAAP,OAAO,CAAQ;QACf,QAAG,GAAH,GAAG,CAAQ;QACX,cAAS,GAAT,SAAS,CAAS;QAClB,iBAAY,GAAZ,YAAY,CAAQ;QACpB,cAAS,GAAT,SAAS,CAAM;IACvB,CAAC"}

package/dist/modules/proxy/proxy.schemas.js

@@ -0,0 +1,23 @@
+import { booleanSchema, counterSchema, customIdentSchema, timestampSchema, } from '@famir/validator';
+export const proxyUrlSchema = {
+    type: 'string',
+    minLength: 1,
+    maxLength: 256,
+};
+const rawProxySchema = {
+    type: 'object',
+    required: ['campaign_id', 'proxy_id', 'url', 'is_enabled', 'message_count', 'created_at'],
+    properties: {
+        campaign_id: customIdentSchema,
+        proxy_id: customIdentSchema,
+        url: proxyUrlSchema,
+        is_enabled: booleanSchema,
+        message_count: counterSchema,
+        created_at: timestampSchema,
+    },
+    additionalProperties: false,
+};
+export const proxySchemas = {
+    'database-raw-proxy': rawProxySchema,
+};
+//# sourceMappingURL=proxy.schemas.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"proxy.schemas.js","sourceRoot":"","sources":["../../../src/modules/proxy/proxy.schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,aAAa,EACb,aAAa,EACb,iBAAiB,EACjB,eAAe,GAChB,MAAM,kBAAkB,CAAA;AASzB,MAAM,CAAC,MAAM,cAAc,GAA2B;IACpD,IAAI,EAAE,QAAQ;IACd,SAAS,EAAE,CAAC;IACZ,SAAS,EAAE,GAAG;CACN,CAAA;AAQV,MAAM,cAAc,GAA6B;IAC/C,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE,CAAC,aAAa,EAAE,UAAU,EAAE,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,YAAY,CAAC;IACzF,UAAU,EAAE;QACV,WAAW,EAAE,iBAAiB;QAC9B,QAAQ,EAAE,iBAAiB;QAC3B,GAAG,EAAE,cAAc;QACnB,UAAU,EAAE,aAAa;QACzB,aAAa,EAAE,aAAa;QAC5B,UAAU,EAAE,eAAe;KAC5B;IACD,oBAAoB,EAAE,KAAK;CACnB,CAAA;AAQV,MAAM,CAAC,MAAM,YAAY,GAAqB;IAC5C,oBAAoB,EAAE,cAAc;CAC5B,CAAA"}

package/dist/{repositories → modules}/proxy/redis-proxy.repository.d.ts

@@ -2,13 +2,13 @@ import { DIContainer } from '@famir/common';
 import { Config } from '@famir/config';
 import { Logger } from '@famir/logger';
 import { Validator } from '@famir/validator';
-import { RedisDatabaseConfig, RedisDatabaseConnection } from '../../database.js';
-import { ProxyModel } from '../../models/index.js';
+import { DatabaseConnector, RedisDatabaseConfig } from '../../database.js';
 import { RedisBaseRepository } from '../base/index.js';
 import { ProxyRepository } from './proxy.js';
+import { ProxyModel } from './proxy.models.js';
 export declare class RedisProxyRepository extends RedisBaseRepository implements ProxyRepository {
     static register(container: DIContainer): void;
-    constructor(validator: Validator, config: Config<RedisDatabaseConfig>, logger: Logger, connection: RedisDatabaseConnection);
+    constructor(validator: Validator, config: Config<RedisDatabaseConfig>, logger: Logger, connector: DatabaseConnector);
     create(campaignId: string, proxyId: string, url: string, lockSecret: string): Promise<void>;
     read(campaignId: string, proxyId: string): Promise<ProxyModel | null>;
     enable(campaignId: string, proxyId: string, lockSecret: string): Promise<void>;

package/dist/{repositories → modules}/proxy/redis-proxy.repository.js

@@ -1,24 +1,28 @@
 import { CONFIG } from '@famir/config';
 import { LOGGER } from '@famir/logger';
 import { VALIDATOR } from '@famir/validator';
+import { DatabaseError } from '../../database.error.js';
 import { DATABASE_CONNECTOR } from '../../database.js';
-import { ProxyModel } from '../../models/index.js';
 import { RedisBaseRepository } from '../base/index.js';
 import { PROXY_REPOSITORY } from './proxy.js';
+import { ProxyModel } from './proxy.models.js';
 import { proxySchemas } from './proxy.schemas.js';
 export class RedisProxyRepository extends RedisBaseRepository {
     static register(container) {
-        container.registerSingleton(PROXY_REPOSITORY, (c) => new RedisProxyRepository(c.resolve(VALIDATOR), c.resolve(CONFIG), c.resolve(LOGGER), c.resolve(DATABASE_CONNECTOR).getConnection()));
+        container.registerSingleton(PROXY_REPOSITORY, (c) => new RedisProxyRepository(c.resolve(VALIDATOR), c.resolve(CONFIG), c.resolve(LOGGER), c.resolve(DATABASE_CONNECTOR)));
     }
-    constructor(validator, config, logger, connection) {
-        super(validator, config, logger, connection, 'proxy');
+    constructor(validator, config, logger, connector) {
+        super(validator, config, logger, connector, 'proxy');
         this.validator.addSchemas(proxySchemas);
         this.logger.debug(`ProxyRepository initialized`);
     }
     async create(campaignId, proxyId, url, lockSecret) {
         try {
-            const statusReply = await this.connection.proxy.create_proxy(this.options.prefix, campaignId, proxyId, url, Date.now().toString(), lockSecret);
-            const mesg = this.handleStatusReply(statusReply);
+            const statusReply = await this.connection.proxy.create_proxy(this.options.prefix, campaignId, proxyId, url, Date.now(), lockSecret);
+            const [code, mesg] = this.parseStatusReply(statusReply);
+            if (code !== 'OK') {
+                throw new DatabaseError(mesg, { code });
+            }
             this.logger.info(mesg, { proxy: { campaignId, proxyId } });
         }
         catch (error) {
@@ -37,7 +41,10 @@ export class RedisProxyRepository extends RedisBaseRepository {
     async enable(campaignId, proxyId, lockSecret) {
         try {
             const statusReply = await this.connection.proxy.enable_proxy(this.options.prefix, campaignId, proxyId, lockSecret);
-            const mesg = this.handleStatusReply(statusReply);
+            const [code, mesg] = this.parseStatusReply(statusReply);
+            if (code !== 'OK') {
+                throw new DatabaseError(mesg, { code });
+            }
             this.logger.info(mesg, { proxy: { campaignId, proxyId } });
         }
         catch (error) {
@@ -47,7 +54,10 @@ export class RedisProxyRepository extends RedisBaseRepository {
     async disable(campaignId, proxyId, lockSecret) {
         try {
             const statusReply = await this.connection.proxy.disable_proxy(this.options.prefix, campaignId, proxyId, lockSecret);
-            const mesg = this.handleStatusReply(statusReply);
+            const [code, mesg] = this.parseStatusReply(statusReply);
+            if (code !== 'OK') {
+                throw new DatabaseError(mesg, { code });
+            }
             this.logger.info(mesg, { proxy: { campaignId, proxyId } });
         }
         catch (error) {
@@ -57,7 +67,10 @@ export class RedisProxyRepository extends RedisBaseRepository {
     async delete(campaignId, proxyId, lockSecret) {
         try {
             const statusReply = await this.connection.proxy.delete_proxy(this.options.prefix, campaignId, proxyId, lockSecret);
-            const mesg = this.handleStatusReply(statusReply);
+            const [code, mesg] = this.parseStatusReply(statusReply);
+            if (code !== 'OK') {
+                throw new DatabaseError(mesg, { code });
+            }
             this.logger.info(mesg, { proxy: { campaignId, proxyId } });
         }
         catch (error) {
@@ -83,7 +96,7 @@ export class RedisProxyRepository extends RedisBaseRepository {
             return null;
         }
         this.validateRawData('database-raw-proxy', rawModel);
-        return new ProxyModel(rawModel.campaign_id, rawModel.proxy_id, rawModel.url, !!rawModel.is_enabled, rawModel.message_count, new Date(rawModel.created_at));
+        return new ProxyModel(rawModel.campaign_id, rawModel.proxy_id, rawModel.url, rawModel.is_enabled, rawModel.message_count, new Date(rawModel.created_at));
     }
     buildCollection(rawCollection) {
         this.validateArrayReply(rawCollection);

package/dist/modules/proxy/redis-proxy.repository.js.map

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

package/dist/{repositories → modules}/redirector/index.d.ts

@@ -1,3 +1,4 @@
 export * from './redirector.js';
+export * from './redirector.models.js';
 export * from './redirector.schemas.js';
 export * from './redis-redirector.repository.js';

package/dist/{repositories → modules}/redirector/index.js

@@ -1,4 +1,5 @@
 export * from './redirector.js';
+export * from './redirector.models.js';
 export * from './redirector.schemas.js';
 export * from './redis-redirector.repository.js';
 //# sourceMappingURL=index.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/modules/redirector/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAA;AAC/B,cAAc,wBAAwB,CAAA;AACtC,cAAc,yBAAyB,CAAA;AACvC,cAAc,kCAAkC,CAAA"}

package/dist/{repositories → modules}/redirector/redirector.d.ts

@@ -1,10 +1,12 @@
-import { FullRedirectorModel, RedirectorModel } from '../../models/index.js';
+import { FullRedirectorModel, RedirectorModel } from './redirector.models.js';
 export declare const REDIRECTOR_REPOSITORY: unique symbol;
 export interface RedirectorRepository {
     create(campaignId: string, redirectorId: string, page: string, lockSecret: string): Promise<void>;
     read(campaignId: string, redirectorId: string): Promise<RedirectorModel | null>;
     readFull(campaignId: string, redirectorId: string): Promise<FullRedirectorModel | null>;
     update(campaignId: string, redirectorId: string, page: string | null | undefined, lockSecret: string): Promise<void>;
+    appendField(campaignId: string, redirectorId: string, field: string, lockSecret: string): Promise<void>;
+    removeField(campaignId: string, redirectorId: string, field: string, lockSecret: string): Promise<void>;
     delete(campaignId: string, redirectorId: string, lockSecret: string): Promise<void>;
     list(campaignId: string): Promise<RedirectorModel[] | null>;
     listFull(campaignId: string): Promise<FullRedirectorModel[] | null>;

package/dist/{repositories → modules}/redirector/redirector.functions.d.ts

@@ -7,12 +7,13 @@ export interface RawRedirector {
 }
 export interface RawFullRedirector extends RawRedirector {
     page: string;
+    fields: string[];
 }
 export declare const redirectorFunctions: {
     readonly redirector: {
         readonly create_redirector: {
             readonly NUMBER_OF_KEYS: 4;
-            readonly parseCommand: (parser: CommandParser, prefix: string, campaignId: string, redirectorId: string, page: string, createdAt: string, lockSecret: string) => void;
+            readonly parseCommand: (parser: CommandParser, prefix: string, campaignId: string, redirectorId: string, page: string, createdAt: number, lockSecret: string) => void;
             readonly transformReply: () => unknown;
         };
         readonly read_redirector: {
@@ -21,7 +22,7 @@ export declare const redirectorFunctions: {
             readonly transformReply: () => unknown;
         };
         readonly read_full_redirector: {
-            readonly NUMBER_OF_KEYS: 2;
+            readonly NUMBER_OF_KEYS: 3;
             readonly parseCommand: (parser: CommandParser, prefix: string, campaignId: string, redirectorId: string) => void;
             readonly transformReply: () => unknown;
         };
@@ -35,8 +36,18 @@ export declare const redirectorFunctions: {
             readonly parseCommand: (parser: CommandParser, prefix: string, campaignId: string, redirectorId: string, page: string | null, lockSecret: string) => void;
             readonly transformReply: () => unknown;
         };
-        readonly delete_redirector: {
+        readonly append_redirector_field: {
             readonly NUMBER_OF_KEYS: 4;
+            readonly parseCommand: (parser: CommandParser, prefix: string, campaignId: string, redirectorId: string, field: string, lockSecret: string) => void;
+            readonly transformReply: () => unknown;
+        };
+        readonly remove_redirector_field: {
+            readonly NUMBER_OF_KEYS: 4;
+            readonly parseCommand: (parser: CommandParser, prefix: string, campaignId: string, redirectorId: string, field: string, lockSecret: string) => void;
+            readonly transformReply: () => unknown;
+        };
+        readonly delete_redirector: {
+            readonly NUMBER_OF_KEYS: 5;
             readonly parseCommand: (parser: CommandParser, prefix: string, campaignId: string, redirectorId: string, lockSecret: string) => void;
             readonly transformReply: () => unknown;
         };