@famir/database 0.0.1 → 0.0.3

package/dist/modules/redirector/redirector.schemas.js

@@ -0,0 +1,73 @@
+const rawRedirectorSchema = {
+    type: 'object',
+    required: ['campaign_id', 'redirector_id', 'lure_count', 'created_at'],
+    properties: {
+        campaign_id: {
+            type: 'string',
+        },
+        redirector_id: {
+            type: 'string',
+        },
+        lure_count: {
+            type: 'integer',
+        },
+        created_at: {
+            type: 'integer',
+        },
+    },
+    additionalProperties: false,
+};
+const rawFullRedirectorSchema = {
+    type: 'object',
+    required: ['campaign_id', 'redirector_id', 'page', 'fields', 'lure_count', 'created_at'],
+    properties: {
+        campaign_id: {
+            type: 'string',
+        },
+        redirector_id: {
+            type: 'string',
+        },
+        page: {
+            type: 'string',
+        },
+        fields: {
+            type: 'array',
+            items: {
+                type: 'string',
+            },
+        },
+        lure_count: {
+            type: 'integer',
+        },
+        created_at: {
+            type: 'integer',
+        },
+    },
+    additionalProperties: false,
+};
+export const redirectorPageSchema = {
+    type: 'string',
+    minLength: 0,
+    maxLength: 10485760,
+};
+export const redirectorFieldSchema = {
+    type: 'string',
+    minLength: 1,
+};
+export const redirectorFieldsSchema = {
+    type: 'array',
+    items: redirectorFieldSchema,
+};
+export const redirectorParamsSchema = {
+    type: 'object',
+    required: [],
+    additionalProperties: {
+        type: 'string',
+        minLength: 1,
+    },
+};
+export const redirectorSchemas = {
+    'database-raw-redirector': rawRedirectorSchema,
+    'database-raw-full-redirector': rawFullRedirectorSchema,
+};
+//# sourceMappingURL=redirector.schemas.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"redirector.schemas.js","sourceRoot":"","sources":["../../../src/modules/redirector/redirector.schemas.ts"],"names":[],"mappings":"AAQA,MAAM,mBAAmB,GAAkC;IACzD,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE,CAAC,aAAa,EAAE,eAAe,EAAE,YAAY,EAAE,YAAY,CAAC;IACtE,UAAU,EAAE;QACV,WAAW,EAAE;YACX,IAAI,EAAE,QAAQ;SACf;QACD,aAAa,EAAE;YACb,IAAI,EAAE,QAAQ;SACf;QACD,UAAU,EAAE;YACV,IAAI,EAAE,SAAS;SAChB;QACD,UAAU,EAAE;YACV,IAAI,EAAE,SAAS;SAChB;KACF;IACD,oBAAoB,EAAE,KAAK;CACnB,CAAA;AAMV,MAAM,uBAAuB,GAAsC;IACjE,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE,CAAC,aAAa,EAAE,eAAe,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,YAAY,CAAC;IACxF,UAAU,EAAE;QACV,WAAW,EAAE;YACX,IAAI,EAAE,QAAQ;SACf;QACD,aAAa,EAAE;YACb,IAAI,EAAE,QAAQ;SACf;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,QAAQ;SACf;QACD,MAAM,EAAE;YACN,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACL,IAAI,EAAE,QAAQ;aACf;SACF;QACD,UAAU,EAAE;YACV,IAAI,EAAE,SAAS;SAChB;QACD,UAAU,EAAE;YACV,IAAI,EAAE,SAAS;SAChB;KACF;IACD,oBAAoB,EAAE,KAAK;CACnB,CAAA;AAMV,MAAM,CAAC,MAAM,oBAAoB,GAA2B;IAC1D,IAAI,EAAE,QAAQ;IACd,SAAS,EAAE,CAAC;IACZ,SAAS,EAAE,QAAQ;CACX,CAAA;AAMV,MAAM,CAAC,MAAM,qBAAqB,GAA2B;IAC3D,IAAI,EAAE,QAAQ;IACd,SAAS,EAAE,CAAC;CACb,CAAA;AAMD,MAAM,CAAC,MAAM,sBAAsB,GAA6B;IAC9D,IAAI,EAAE,OAAO;IACb,KAAK,EAAE,qBAAqB;CACpB,CAAA;AAMV,MAAM,CAAC,MAAM,sBAAsB,GAAqC;IACtE,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE,EAAE;IACZ,oBAAoB,EAAE;QACpB,IAAI,EAAE,QAAQ;QACd,SAAS,EAAE,CAAC;KACb;CACO,CAAA;AAMV,MAAM,CAAC,MAAM,iBAAiB,GAAqB;IACjD,yBAAyB,EAAE,mBAAmB;IAC9C,8BAA8B,EAAE,uBAAuB;CAC/C,CAAA"}

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

@@ -2,17 +2,19 @@ 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 { FullRedirectorModel, RedirectorModel } from '../../models/index.js';
+import { DatabaseConnector, RedisDatabaseConfig } from '../../database.js';
 import { RedisBaseRepository } from '../base/index.js';
 import { RedirectorRepository } from './redirector.js';
+import { FullRedirectorModel, RedirectorModel } from './redirector.models.js';
 export declare class RedisRedirectorRepository extends RedisBaseRepository implements RedirectorRepository {
-    static inject(container: DIContainer): void;
-    constructor(validator: Validator, config: Config<RedisDatabaseConfig>, logger: Logger, connection: RedisDatabaseConnection);
+    static register(container: DIContainer): void;
+    constructor(validator: Validator, config: Config<RedisDatabaseConfig>, logger: Logger, connector: DatabaseConnector);
     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/redis-redirector.repository.js

@@ -2,22 +2,22 @@ import { CONFIG } from '@famir/config';
 import { LOGGER } from '@famir/logger';
 import { VALIDATOR } from '@famir/validator';
 import { DATABASE_CONNECTOR } from '../../database.js';
-import { FullRedirectorModel, RedirectorModel } from '../../models/index.js';
 import { RedisBaseRepository } from '../base/index.js';
 import { REDIRECTOR_REPOSITORY } from './redirector.js';
+import { FullRedirectorModel, RedirectorModel } from './redirector.models.js';
 import { redirectorSchemas } from './redirector.schemas.js';
 export class RedisRedirectorRepository extends RedisBaseRepository {
-    static inject(container) {
-        container.registerSingleton(REDIRECTOR_REPOSITORY, (c) => new RedisRedirectorRepository(c.resolve(VALIDATOR), c.resolve(CONFIG), c.resolve(LOGGER), c.resolve(DATABASE_CONNECTOR).connection()));
+    static register(container) {
+        container.registerSingleton(REDIRECTOR_REPOSITORY, (c) => new RedisRedirectorRepository(c.resolve(VALIDATOR), c.resolve(CONFIG), c.resolve(LOGGER), c.resolve(DATABASE_CONNECTOR)));
     }
-    constructor(validator, config, logger, connection) {
-        super(validator, config, logger, connection, 'redirector');
+    constructor(validator, config, logger, connector) {
+        super(validator, config, logger, connector, 'redirector');
         this.validator.addSchemas(redirectorSchemas);
         this.logger.debug(`RedirectorRepository initialized`);
     }
     async create(campaignId, redirectorId, page, lockSecret) {
         try {
-            const statusReply = await this.connection.redirector.create_redirector(this.options.prefix, campaignId, redirectorId, page, lockSecret);
+            const statusReply = await this.connection.redirector.create_redirector(this.options.prefix, campaignId, redirectorId, page, Date.now().toString(), lockSecret);
             const mesg = this.handleStatusReply(statusReply);
             this.logger.info(mesg, { redirector: { campaignId, redirectorId } });
         }
@@ -45,7 +45,7 @@ export class RedisRedirectorRepository extends RedisBaseRepository {
     }
     async update(campaignId, redirectorId, page, lockSecret) {
         try {
-            const statusReply = await this.connection.redirector.update_redirector(this.options.prefix, campaignId, redirectorId, page, lockSecret);
+            const statusReply = await this.connection.redirector.update_redirector(this.options.prefix, campaignId, redirectorId, page ?? null, lockSecret);
             const mesg = this.handleStatusReply(statusReply);
             this.logger.info(mesg, { redirector: { campaignId, redirectorId } });
         }
@@ -53,6 +53,26 @@ export class RedisRedirectorRepository extends RedisBaseRepository {
             this.raiseError(error, 'update', { campaignId, redirectorId });
         }
     }
+    async appendField(campaignId, redirectorId, field, lockSecret) {
+        try {
+            const statusReply = await this.connection.redirector.append_redirector_field(this.options.prefix, campaignId, redirectorId, field, lockSecret);
+            const mesg = this.handleStatusReply(statusReply);
+            this.logger.info(mesg, { redirector: { campaignId, redirectorId, field } });
+        }
+        catch (error) {
+            this.raiseError(error, 'appendField', { campaignId, redirectorId, field });
+        }
+    }
+    async removeField(campaignId, redirectorId, field, lockSecret) {
+        try {
+            const statusReply = await this.connection.redirector.remove_redirector_field(this.options.prefix, campaignId, redirectorId, field, lockSecret);
+            const mesg = this.handleStatusReply(statusReply);
+            this.logger.info(mesg, { redirector: { campaignId, redirectorId, field } });
+        }
+        catch (error) {
+            this.raiseError(error, 'removeField', { campaignId, redirectorId, field });
+        }
+    }
     async delete(campaignId, redirectorId, lockSecret) {
         try {
             const statusReply = await this.connection.redirector.delete_redirector(this.options.prefix, campaignId, redirectorId, lockSecret);
@@ -103,7 +123,7 @@ export class RedisRedirectorRepository extends RedisBaseRepository {
             return null;
         }
         this.validateRawData('database-raw-full-redirector', rawModel);
-        return new FullRedirectorModel(rawModel.campaign_id, rawModel.redirector_id, rawModel.page, rawModel.lure_count, new Date(rawModel.created_at));
+        return new FullRedirectorModel(rawModel.campaign_id, rawModel.redirector_id, rawModel.page, rawModel.fields, rawModel.lure_count, new Date(rawModel.created_at));
     }
     buildCollection(rawCollection) {
         this.validateArrayReply(rawCollection);

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

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

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

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

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

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/modules/session/index.ts"],"names":[],"mappings":"AAAA,cAAc,+BAA+B,CAAA;AAC7C,cAAc,cAAc,CAAA;AAC5B,cAAc,qBAAqB,CAAA;AACnC,cAAc,sBAAsB,CAAA"}

package/dist/{repositories → modules}/session/redis-session.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 { SessionModel } from '../../models/index.js';
+import { DatabaseConnector, RedisDatabaseConfig } from '../../database.js';
 import { RedisBaseRepository } from '../base/index.js';
 import { SessionRepository } from './session.js';
+import { SessionModel } from './session.models.js';
 export declare class RedisSessionRepository extends RedisBaseRepository implements SessionRepository {
-    static inject(container: DIContainer): void;
-    constructor(validator: Validator, config: Config<RedisDatabaseConfig>, logger: Logger, connection: RedisDatabaseConnection);
+    static register(container: DIContainer): void;
+    constructor(validator: Validator, config: Config<RedisDatabaseConfig>, logger: Logger, connector: DatabaseConnector);
     create(campaignId: string): Promise<SessionModel>;
     read(campaignId: string, sessionId: string): Promise<SessionModel | null>;
     auth(campaignId: string, sessionId: string): Promise<SessionModel>;

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

@@ -4,16 +4,16 @@ import { LOGGER } from '@famir/logger';
 import { VALIDATOR } from '@famir/validator';
 import { DatabaseError } from '../../database.error.js';
 import { DATABASE_CONNECTOR } from '../../database.js';
-import { SessionModel } from '../../models/index.js';
 import { RedisBaseRepository } from '../base/index.js';
 import { SESSION_REPOSITORY } from './session.js';
+import { SessionModel } from './session.models.js';
 import { sessionSchemas } from './session.schemas.js';
 export class RedisSessionRepository extends RedisBaseRepository {
-    static inject(container) {
-        container.registerSingleton(SESSION_REPOSITORY, (c) => new RedisSessionRepository(c.resolve(VALIDATOR), c.resolve(CONFIG), c.resolve(LOGGER), c.resolve(DATABASE_CONNECTOR).connection()));
+    static register(container) {
+        container.registerSingleton(SESSION_REPOSITORY, (c) => new RedisSessionRepository(c.resolve(VALIDATOR), c.resolve(CONFIG), c.resolve(LOGGER), c.resolve(DATABASE_CONNECTOR)));
     }
-    constructor(validator, config, logger, connection) {
-        super(validator, config, logger, connection, 'session');
+    constructor(validator, config, logger, connector) {
+        super(validator, config, logger, connector, 'session');
         this.validator.addSchemas(sessionSchemas);
         this.logger.debug(`SessionRepository initialized`);
     }
@@ -21,8 +21,8 @@ export class RedisSessionRepository extends RedisBaseRepository {
         const [sessionId, secret] = [randomIdent(), randomIdent()];
         try {
             const [statusReply, rawModel] = await Promise.all([
-                this.connection.session.create_session(this.options.prefix, campaignId, sessionId, secret),
-                this.connection.session.read_session(this.options.prefix, campaignId, sessionId)
+                this.connection.session.create_session(this.options.prefix, campaignId, sessionId, secret, Date.now().toString()),
+                this.connection.session.read_session(this.options.prefix, campaignId, sessionId),
             ]);
             const mesg = this.handleStatusReply(statusReply);
             this.logger.info(mesg, { session: { campaignId, sessionId } });
@@ -44,8 +44,8 @@ export class RedisSessionRepository extends RedisBaseRepository {
     async auth(campaignId, sessionId) {
         try {
             const [statusReply, rawModel] = await Promise.all([
-                this.connection.session.auth_session(this.options.prefix, campaignId, sessionId),
-                this.connection.session.read_session(this.options.prefix, campaignId, sessionId)
+                this.connection.session.auth_session(this.options.prefix, campaignId, sessionId, Date.now().toString()),
+                this.connection.session.read_session(this.options.prefix, campaignId, sessionId),
             ]);
             const mesg = this.handleStatusReply(statusReply);
             this.logger.info(mesg, { session: { campaignId, sessionId } });
@@ -70,13 +70,13 @@ export class RedisSessionRepository extends RedisBaseRepository {
             return null;
         }
         this.validateRawData('database-raw-session', rawModel);
-        return new SessionModel(rawModel.campaign_id, rawModel.session_id, rawModel.proxy_id, rawModel.secret, !!rawModel.is_landing, rawModel.message_count, new Date(rawModel.created_at), new Date(rawModel.last_auth_at));
+        return new SessionModel(rawModel.campaign_id, rawModel.session_id, rawModel.proxy_id, rawModel.secret, !!rawModel.is_upgraded, rawModel.message_count, new Date(rawModel.created_at), new Date(rawModel.authorized_at));
     }
     buildModelStrict(rawModel) {
         const model = this.buildModel(rawModel);
         if (!SessionModel.isNotNull(model)) {
             throw new DatabaseError(`Session unexpected lost`, {
-                code: 'INTERNAL_ERROR'
+                code: 'INTERNAL_ERROR',
             });
         }
         return model;

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

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

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

@@ -1,4 +1,4 @@
-import { SessionModel } from '../../models/index.js';
+import { SessionModel } from './session.models.js';
 export declare const SESSION_REPOSITORY: unique symbol;
 export interface SessionRepository {
     create(campaignId: string): Promise<SessionModel>;

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

@@ -4,16 +4,16 @@ export interface RawSession {
     session_id: string;
     proxy_id: string;
     secret: string;
-    is_landing: number;
+    is_upgraded: number;
     message_count: number;
     created_at: number;
-    last_auth_at: number;
+    authorized_at: number;
 }
 export declare const sessionFunctions: {
     readonly session: {
         readonly create_session: {
             readonly NUMBER_OF_KEYS: 3;
-            readonly parseCommand: (parser: CommandParser, prefix: string, campaignId: string, sessionId: string, secret: string) => void;
+            readonly parseCommand: (parser: CommandParser, prefix: string, campaignId: string, sessionId: string, secret: string, createdAt: string) => void;
             readonly transformReply: () => unknown;
         };
         readonly read_session: {
@@ -23,7 +23,7 @@ export declare const sessionFunctions: {
         };
         readonly auth_session: {
             readonly NUMBER_OF_KEYS: 3;
-            readonly parseCommand: (parser: CommandParser, prefix: string, campaignId: string, sessionId: string) => void;
+            readonly parseCommand: (parser: CommandParser, prefix: string, campaignId: string, sessionId: string, authorizedAt: string) => void;
             readonly transformReply: () => unknown;
         };
         readonly upgrade_session: {

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

@@ -3,16 +3,16 @@ export const sessionFunctions = {
     session: {
         create_session: {
             NUMBER_OF_KEYS: 3,
-            parseCommand(parser, prefix, campaignId, sessionId, secret) {
+            parseCommand(parser, prefix, campaignId, sessionId, secret, createdAt) {
                 parser.pushKey(campaignKey(prefix, campaignId));
                 parser.pushKey(sessionKey(prefix, campaignId, sessionId));
                 parser.pushKey(enabledProxyIndexKey(prefix, campaignId));
                 parser.push(campaignId);
                 parser.push(sessionId);
                 parser.push(secret);
-                parser.push(Date.now().toString());
+                parser.push(createdAt);
             },
-            transformReply: undefined
+            transformReply: undefined,
         },
         read_session: {
             NUMBER_OF_KEYS: 2,
@@ -20,17 +20,17 @@ export const sessionFunctions = {
                 parser.pushKey(campaignKey(prefix, campaignId));
                 parser.pushKey(sessionKey(prefix, campaignId, sessionId));
             },
-            transformReply: undefined
+            transformReply: undefined,
         },
         auth_session: {
             NUMBER_OF_KEYS: 3,
-            parseCommand(parser, prefix, campaignId, sessionId) {
+            parseCommand(parser, prefix, campaignId, sessionId, authorizedAt) {
                 parser.pushKey(campaignKey(prefix, campaignId));
                 parser.pushKey(sessionKey(prefix, campaignId, sessionId));
                 parser.pushKey(enabledProxyIndexKey(prefix, campaignId));
-                parser.push(Date.now().toString());
+                parser.push(authorizedAt);
             },
-            transformReply: undefined
+            transformReply: undefined,
         },
         upgrade_session: {
             NUMBER_OF_KEYS: 3,
@@ -40,8 +40,8 @@ export const sessionFunctions = {
                 parser.pushKey(sessionKey(prefix, campaignId, sessionId));
                 parser.push(secret);
             },
-            transformReply: undefined
-        }
-    }
+            transformReply: undefined,
+        },
+    },
 };
 //# sourceMappingURL=session.functions.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"session.functions.js","sourceRoot":"","sources":["../../../src/modules/session/session.functions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAqB/F,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,OAAO,EAAE;QACP,cAAc,EAAE;YACd,cAAc,EAAE,CAAC;YAEjB,YAAY,CACV,MAAqB,EACrB,MAAc,EACd,UAAkB,EAClB,SAAiB,EACjB,MAAc,EACd,SAAiB;gBAEjB,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAA;gBAC/C,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC,CAAA;gBACzD,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAA;gBAExD,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;gBACvB,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;gBACtB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;gBACnB,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YACxB,CAAC;YAED,cAAc,EAAE,SAAqC;SACtD;QAED,YAAY,EAAE;YACZ,cAAc,EAAE,CAAC;YAEjB,YAAY,CAAC,MAAqB,EAAE,MAAc,EAAE,UAAkB,EAAE,SAAiB;gBACvF,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAA;gBAC/C,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC,CAAA;YAC3D,CAAC;YAED,cAAc,EAAE,SAAqC;SACtD;QAED,YAAY,EAAE;YACZ,cAAc,EAAE,CAAC;YAEjB,YAAY,CACV,MAAqB,EACrB,MAAc,EACd,UAAkB,EAClB,SAAiB,EACjB,YAAoB;gBAEpB,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAA;gBAC/C,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC,CAAA;gBACzD,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAA;gBAExD,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;YAC3B,CAAC;YAED,cAAc,EAAE,SAAqC;SACtD;QAED,eAAe,EAAE;YACf,cAAc,EAAE,CAAC;YAEjB,YAAY,CACV,MAAqB,EACrB,MAAc,EACd,UAAkB,EAClB,MAAc,EACd,SAAiB,EACjB,MAAc;gBAEd,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAA;gBAC/C,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,CAAA;gBACnD,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC,CAAA;gBAEzD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YACrB,CAAC;YAED,cAAc,EAAE,SAAqC;SACtD;KACF;CACO,CAAA"}

package/dist/modules/session/session.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/modules/session/session.ts"],"names":[],"mappings":"AAMA,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAA"}

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

@@ -1,13 +1,19 @@
+export interface UpgradeSessionParams {
+    lure_id: string;
+    session_id: string;
+    secret: string;
+    back_url: string;
+}
 export declare class SessionModel {
     readonly campaignId: string;
     readonly sessionId: string;
     readonly proxyId: string;
     readonly secret: string;
-    readonly isLanding: boolean;
+    readonly isUpgraded: boolean;
     readonly messageCount: number;
     readonly createdAt: Date;
-    readonly lastAuthAt: Date;
+    readonly authorizedAt: Date;
     static isNotNull: <T extends SessionModel>(model: T | null) => model is T;
-    constructor(campaignId: string, sessionId: string, proxyId: string, secret: string, isLanding: boolean, messageCount: number, createdAt: Date, lastAuthAt: Date);
+    constructor(campaignId: string, sessionId: string, proxyId: string, secret: string, isUpgraded: boolean, messageCount: number, createdAt: Date, authorizedAt: Date);
     get isNew(): boolean;
 }

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

@@ -3,25 +3,25 @@ export class SessionModel {
     sessionId;
     proxyId;
     secret;
-    isLanding;
+    isUpgraded;
     messageCount;
     createdAt;
-    lastAuthAt;
+    authorizedAt;
     static isNotNull = (model) => {
         return model != null;
     };
-    constructor(campaignId, sessionId, proxyId, secret, isLanding, messageCount, createdAt, lastAuthAt) {
+    constructor(campaignId, sessionId, proxyId, secret, isUpgraded, messageCount, createdAt, authorizedAt) {
         this.campaignId = campaignId;
         this.sessionId = sessionId;
         this.proxyId = proxyId;
         this.secret = secret;
-        this.isLanding = isLanding;
+        this.isUpgraded = isUpgraded;
         this.messageCount = messageCount;
         this.createdAt = createdAt;
-        this.lastAuthAt = lastAuthAt;
+        this.authorizedAt = authorizedAt;
     }
     get isNew() {
         return this.messageCount <= 1;
     }
 }
-//# sourceMappingURL=session.js.map
+//# sourceMappingURL=session.models.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"session.models.js","sourceRoot":"","sources":["../../../src/modules/session/session.models.ts"],"names":[],"mappings":"AAeA,MAAM,OAAO,YAAY;IAMZ;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IAZX,MAAM,CAAC,SAAS,GAAG,CAAyB,KAAe,EAAc,EAAE;QACzE,OAAO,KAAK,IAAI,IAAI,CAAA;IACtB,CAAC,CAAA;IAED,YACW,UAAkB,EAClB,SAAiB,EACjB,OAAe,EACf,MAAc,EACd,UAAmB,EACnB,YAAoB,EACpB,SAAe,EACf,YAAkB;QAPlB,eAAU,GAAV,UAAU,CAAQ;QAClB,cAAS,GAAT,SAAS,CAAQ;QACjB,YAAO,GAAP,OAAO,CAAQ;QACf,WAAM,GAAN,MAAM,CAAQ;QACd,eAAU,GAAV,UAAU,CAAS;QACnB,iBAAY,GAAZ,YAAY,CAAQ;QACpB,cAAS,GAAT,SAAS,CAAM;QACf,iBAAY,GAAZ,YAAY,CAAM;IAC1B,CAAC;IAEJ,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,YAAY,IAAI,CAAC,CAAA;IAC/B,CAAC"}

package/dist/modules/session/session.schemas.d.ts

@@ -0,0 +1,4 @@
+import { JSONSchemaType, ValidatorSchemas } from '@famir/validator';
+import { UpgradeSessionParams } from './session.models.js';
+export declare const upgradeSessionParamsSchema: JSONSchemaType<UpgradeSessionParams>;
+export declare const sessionSchemas: ValidatorSchemas;

package/dist/modules/session/session.schemas.js

@@ -0,0 +1,59 @@
+import { customIdentSchema, randomIdentSchema, } from '@famir/validator';
+const rawSessionSchema = {
+    type: 'object',
+    required: [
+        'campaign_id',
+        'session_id',
+        'proxy_id',
+        'secret',
+        'is_upgraded',
+        'message_count',
+        'created_at',
+        'authorized_at',
+    ],
+    properties: {
+        campaign_id: {
+            type: 'string',
+        },
+        session_id: {
+            type: 'string',
+        },
+        proxy_id: {
+            type: 'string',
+        },
+        secret: {
+            type: 'string',
+        },
+        is_upgraded: {
+            type: 'integer',
+        },
+        message_count: {
+            type: 'integer',
+        },
+        created_at: {
+            type: 'integer',
+        },
+        authorized_at: {
+            type: 'integer',
+        },
+    },
+    additionalProperties: false,
+};
+export const upgradeSessionParamsSchema = {
+    type: 'object',
+    required: ['lure_id', 'session_id', 'secret', 'back_url'],
+    properties: {
+        lure_id: customIdentSchema,
+        session_id: randomIdentSchema,
+        secret: randomIdentSchema,
+        back_url: {
+            type: 'string',
+            minLength: 1,
+        },
+    },
+    additionalProperties: false,
+};
+export const sessionSchemas = {
+    'database-raw-session': rawSessionSchema,
+};
+//# sourceMappingURL=session.schemas.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"session.schemas.js","sourceRoot":"","sources":["../../../src/modules/session/session.schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EACjB,iBAAiB,GAClB,MAAM,kBAAkB,CAAA;AAQzB,MAAM,gBAAgB,GAA+B;IACnD,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE;QACR,aAAa;QACb,YAAY;QACZ,UAAU;QACV,QAAQ;QACR,aAAa;QACb,eAAe;QACf,YAAY;QACZ,eAAe;KAChB;IACD,UAAU,EAAE;QACV,WAAW,EAAE;YACX,IAAI,EAAE,QAAQ;SACf;QACD,UAAU,EAAE;YACV,IAAI,EAAE,QAAQ;SACf;QACD,QAAQ,EAAE;YACR,IAAI,EAAE,QAAQ;SACf;QACD,MAAM,EAAE;YACN,IAAI,EAAE,QAAQ;SACf;QACD,WAAW,EAAE;YACX,IAAI,EAAE,SAAS;SAChB;QACD,aAAa,EAAE;YACb,IAAI,EAAE,SAAS;SAChB;QACD,UAAU,EAAE;YACV,IAAI,EAAE,SAAS;SAChB;QACD,aAAa,EAAE;YACb,IAAI,EAAE,SAAS;SAChB;KACF;IACD,oBAAoB,EAAE,KAAK;CACnB,CAAA;AAMV,MAAM,CAAC,MAAM,0BAA0B,GAAyC;IAC9E,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE,CAAC,SAAS,EAAE,YAAY,EAAE,QAAQ,EAAE,UAAU,CAAC;IACzD,UAAU,EAAE;QACV,OAAO,EAAE,iBAAiB;QAC1B,UAAU,EAAE,iBAAiB;QAC7B,MAAM,EAAE,iBAAiB;QACzB,QAAQ,EAAE;YACR,IAAI,EAAE,QAAQ;YACd,SAAS,EAAE,CAAC;SACb;KACF;IACD,oBAAoB,EAAE,KAAK;CACnB,CAAA;AAMV,MAAM,CAAC,MAAM,cAAc,GAAqB;IAC9C,sBAAsB,EAAE,gBAAgB;CAChC,CAAA"}

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

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

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

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/modules/target/index.ts"],"names":[],"mappings":"AAAA,cAAc,8BAA8B,CAAA;AAC5C,cAAc,aAAa,CAAA;AAC3B,cAAc,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA"}

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

@@ -2,19 +2,19 @@ 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 { FullTargetModel, TargetModel } from '../../models/index.js';
+import { DatabaseConnector, RedisDatabaseConfig } from '../../database.js';
 import { RedisBaseRepository } from '../base/index.js';
 import { TargetRepository } from './target.js';
+import { FullTargetModel, TargetAccessLevel, TargetModel } from './target.models.js';
 export declare class RedisTargetRepository extends RedisBaseRepository implements TargetRepository {
-    static inject(container: DIContainer): void;
-    constructor(validator: Validator, config: Config<RedisDatabaseConfig>, logger: Logger, connection: RedisDatabaseConnection);
-    create(campaignId: string, targetId: string, isLanding: boolean, donorSecure: boolean, donorSub: string, donorDomain: string, donorPort: number, mirrorSecure: boolean, mirrorSub: string, mirrorPort: number, connectTimeout: number, simpleTimeout: number, streamTimeout: number, headersSizeLimit: number, bodySizeLimit: number, mainPage: string, notFoundPage: string, faviconIco: string, robotsTxt: string, sitemapXml: string, lockSecret: string): Promise<void>;
+    static register(container: DIContainer): void;
+    constructor(validator: Validator, config: Config<RedisDatabaseConfig>, logger: Logger, connector: DatabaseConnector);
+    create(campaignId: string, targetId: string, accessLevel: TargetAccessLevel, donorSecure: boolean, donorSub: string, donorDomain: string, donorPort: number, mirrorSecure: boolean, mirrorSub: string, mirrorPort: number, connectTimeout: number, simpleTimeout: number, streamTimeout: number, headersSizeLimit: number, bodySizeLimit: number, mainPage: string, notFoundPage: string, faviconIco: string, robotsTxt: string, sitemapXml: string, allowWebSockets: boolean, lockSecret: string): Promise<void>;
     read(campaignId: string, targetId: string): Promise<TargetModel | null>;
     readFull(campaignId: string, targetId: string): Promise<FullTargetModel | null>;
     find(mirrorHost: string): Promise<TargetModel | null>;
     findFull(mirrorHost: string): Promise<FullTargetModel | null>;
-    update(campaignId: string, targetId: string, connectTimeout: number | null | undefined, simpleTimeout: number | null | undefined, streamTimeout: number | null | undefined, headersSizeLimit: number | null | undefined, bodySizeLimit: number | null | undefined, mainPage: string | null | undefined, notFoundPage: string | null | undefined, faviconIco: string | null | undefined, robotsTxt: string | null | undefined, sitemapXml: string | null | undefined, lockSecret: string): Promise<void>;
+    update(campaignId: string, targetId: string, connectTimeout: number | null | undefined, simpleTimeout: number | null | undefined, streamTimeout: number | null | undefined, headersSizeLimit: number | null | undefined, bodySizeLimit: number | null | undefined, mainPage: string | null | undefined, notFoundPage: string | null | undefined, faviconIco: string | null | undefined, robotsTxt: string | null | undefined, sitemapXml: string | null | undefined, allowWebSockets: boolean | null | undefined, lockSecret: string): Promise<void>;
     enable(campaignId: string, targetId: string, lockSecret: string): Promise<void>;
     disable(campaignId: string, targetId: string, lockSecret: string): Promise<void>;
     appendLabel(campaignId: string, targetId: string, label: string, lockSecret: string): Promise<void>;