@famir/database 0.0.3 → 0.0.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +187 -0
- package/dist/database.d.ts +0 -1
- package/dist/database.error.js.map +1 -1
- package/dist/database.functions.d.ts +16 -11
- package/dist/database.functions.js.map +1 -1
- package/dist/database.js +0 -1
- package/dist/database.js.map +1 -1
- package/dist/database.keys.d.ts +1 -1
- package/dist/database.keys.js +3 -3
- package/dist/database.keys.js.map +1 -1
- package/dist/database.schemas.js.map +1 -1
- package/dist/modules/base/redis-base.repository.d.ts +7 -7
- package/dist/modules/base/redis-base.repository.js +64 -44
- package/dist/modules/base/redis-base.repository.js.map +1 -1
- package/dist/modules/campaign/campaign.d.ts +2 -1
- package/dist/modules/campaign/campaign.functions.d.ts +4 -4
- package/dist/modules/campaign/campaign.functions.js +8 -8
- package/dist/modules/campaign/campaign.functions.js.map +1 -1
- package/dist/modules/campaign/campaign.js +1 -0
- package/dist/modules/campaign/campaign.js.map +1 -1
- package/dist/modules/campaign/campaign.models.js.map +1 -1
- package/dist/modules/campaign/campaign.schemas.d.ts +1 -0
- package/dist/modules/campaign/campaign.schemas.js +64 -110
- package/dist/modules/campaign/campaign.schemas.js.map +1 -1
- package/dist/modules/campaign/redis-campaign.repository.js +28 -12
- package/dist/modules/campaign/redis-campaign.repository.js.map +1 -1
- package/dist/modules/index.d.ts +1 -0
- package/dist/modules/index.js +1 -0
- package/dist/modules/index.js.map +1 -1
- package/dist/modules/lure/lure.functions.d.ts +2 -2
- package/dist/modules/lure/lure.functions.js +1 -1
- package/dist/modules/lure/lure.functions.js.map +1 -1
- package/dist/modules/lure/lure.js.map +1 -1
- package/dist/modules/lure/lure.models.js.map +1 -1
- package/dist/modules/lure/lure.schemas.js +13 -26
- package/dist/modules/lure/lure.schemas.js.map +1 -1
- package/dist/modules/lure/redis-lure.repository.js +19 -6
- package/dist/modules/lure/redis-lure.repository.js.map +1 -1
- package/dist/modules/message/message.functions.d.ts +4 -3
- package/dist/modules/message/message.functions.js +4 -4
- package/dist/modules/message/message.functions.js.map +1 -1
- package/dist/modules/message/message.js.map +1 -1
- package/dist/modules/message/message.models.js.map +1 -1
- package/dist/modules/message/message.schemas.js +35 -102
- package/dist/modules/message/message.schemas.js.map +1 -1
- package/dist/modules/message/redis-message.repository.js +10 -7
- package/dist/modules/message/redis-message.repository.js.map +1 -1
- package/dist/modules/proxy/proxy.functions.d.ts +2 -2
- package/dist/modules/proxy/proxy.functions.js +1 -1
- package/dist/modules/proxy/proxy.functions.js.map +1 -1
- package/dist/modules/proxy/proxy.js.map +1 -1
- package/dist/modules/proxy/proxy.models.js.map +1 -1
- package/dist/modules/proxy/proxy.schemas.js +12 -23
- package/dist/modules/proxy/proxy.schemas.js.map +1 -1
- package/dist/modules/proxy/redis-proxy.repository.js +19 -6
- package/dist/modules/proxy/redis-proxy.repository.js.map +1 -1
- package/dist/modules/redirector/redirector.functions.d.ts +1 -1
- package/dist/modules/redirector/redirector.functions.js +1 -1
- package/dist/modules/redirector/redirector.functions.js.map +1 -1
- package/dist/modules/redirector/redirector.js.map +1 -1
- package/dist/modules/redirector/redirector.models.js.map +1 -1
- package/dist/modules/redirector/redirector.schemas.js +26 -48
- package/dist/modules/redirector/redirector.schemas.js.map +1 -1
- package/dist/modules/redirector/redis-redirector.repository.js +22 -6
- package/dist/modules/redirector/redis-redirector.repository.js.map +1 -1
- package/dist/modules/session/redis-session.repository.js +15 -6
- package/dist/modules/session/redis-session.repository.js.map +1 -1
- package/dist/modules/session/session.functions.d.ts +3 -3
- package/dist/modules/session/session.functions.js +2 -2
- package/dist/modules/session/session.functions.js.map +1 -1
- package/dist/modules/session/session.js.map +1 -1
- package/dist/modules/session/session.models.js.map +1 -1
- package/dist/modules/session/session.schemas.js +21 -37
- package/dist/modules/session/session.schemas.js.map +1 -1
- package/dist/modules/target/redis-target.repository.d.ts +2 -2
- package/dist/modules/target/redis-target.repository.js +51 -30
- package/dist/modules/target/redis-target.repository.js.map +1 -1
- package/dist/modules/target/target.d.ts +2 -1
- package/dist/modules/target/target.functions.d.ts +13 -7
- package/dist/modules/target/target.functions.js +28 -21
- package/dist/modules/target/target.functions.js.map +1 -1
- package/dist/modules/target/target.js.map +1 -1
- package/dist/modules/target/target.models.d.ts +3 -1
- package/dist/modules/target/target.models.js +3 -3
- package/dist/modules/target/target.models.js.map +1 -1
- package/dist/modules/target/target.schemas.d.ts +3 -1
- package/dist/modules/target/target.schemas.js +110 -180
- package/dist/modules/target/target.schemas.js.map +1 -1
- package/dist/redis-database-connector.d.ts +1 -1
- package/dist/redis-database-connector.js +6 -6
- package/dist/redis-database-connector.js.map +1 -1
- package/dist/redis-database-manager.js +7 -2
- package/dist/redis-database-manager.js.map +1 -1
- package/dist/redis-functions.js +7 -7
- package/dist/redis-functions.js.map +1 -1
- package/package.json +7 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redis-proxy.repository.js","sourceRoot":"","sources":["../../../src/modules/proxy/redis-proxy.repository.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAU,MAAM,eAAe,CAAA;AAC9C,OAAO,EAAE,MAAM,EAAU,MAAM,eAAe,CAAA;AAC9C,OAAO,EAAa,SAAS,EAAE,MAAM,kBAAkB,CAAA;AACvD,OAAO,EAAE,kBAAkB,EAA0C,MAAM,mBAAmB,CAAA;AAC9F,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAA;AAEtD,OAAO,EAAE,gBAAgB,EAAmB,MAAM,YAAY,CAAA;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAOjD,MAAM,OAAO,oBAAqB,SAAQ,mBAAmB;
|
|
1
|
+
{"version":3,"file":"redis-proxy.repository.js","sourceRoot":"","sources":["../../../src/modules/proxy/redis-proxy.repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ export declare const redirectorFunctions: {
|
|
|
13
13
|
readonly redirector: {
|
|
14
14
|
readonly create_redirector: {
|
|
15
15
|
readonly NUMBER_OF_KEYS: 4;
|
|
16
|
-
readonly parseCommand: (parser: CommandParser, prefix: string, campaignId: string, redirectorId: string, page: string, createdAt:
|
|
16
|
+
readonly parseCommand: (parser: CommandParser, prefix: string, campaignId: string, redirectorId: string, page: string, createdAt: number, lockSecret: string) => void;
|
|
17
17
|
readonly transformReply: () => unknown;
|
|
18
18
|
};
|
|
19
19
|
readonly read_redirector: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redirector.functions.js","sourceRoot":"","sources":["../../../src/modules/redirector/redirector.functions.ts"],"names":[],"mappings":"AACA,OAAO,EACL,WAAW,EACX,eAAe,EACf,mBAAmB,EACnB,kBAAkB,EAClB,aAAa,GACd,MAAM,wBAAwB,CAAA;
|
|
1
|
+
{"version":3,"file":"redirector.functions.js","sourceRoot":"","sources":["../../../src/modules/redirector/redirector.functions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redirector.js","sourceRoot":"","sources":["../../../src/modules/redirector/redirector.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"redirector.js","sourceRoot":"","sources":["../../../src/modules/redirector/redirector.ts"],"names":[],"mappings":"AAQA,MAAM,CAAC,MAAM,qBAAqB,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redirector.models.js","sourceRoot":"","sources":["../../../src/modules/redirector/redirector.models.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"redirector.models.js","sourceRoot":"","sources":["../../../src/modules/redirector/redirector.models.ts"],"names":[],"mappings":"AAYA,MAAM,OAAO,eAAe;IAoBf;IACA;IACA;IACA;IAhBX,MAAM,CAAC,SAAS,GAAG,CAA4B,KAAe,EAAc,EAAE;QAC5E,OAAO,KAAK,IAAI,IAAI,CAAA;IACtB,CAAC,CAAA;IAUD,YACW,UAAkB,EAClB,YAAoB,EACpB,SAAiB,EACjB,SAAe;QAHf,eAAU,GAAV,UAAU,CAAQ;QAClB,iBAAY,GAAZ,YAAY,CAAQ;QACpB,cAAS,GAAT,SAAS,CAAQ;QACjB,cAAS,GAAT,SAAS,CAAM;IACvB,CAAC;;AAQN,MAAM,OAAO,mBAAoB,SAAQ,eAAe;IAc3C;IACA;IAJX,YACE,UAAkB,EAClB,YAAoB,EACX,IAAY,EACZ,MAAgB,EACzB,SAAiB,EACjB,SAAe;QAEf,KAAK,CAAC,UAAU,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS,CAAC,CAAA;QAL5C,SAAI,GAAJ,IAAI,CAAQ;QACZ,WAAM,GAAN,MAAM,CAAU;IAK3B,CAAC;IASD,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,CAAA;IACjC,CAAC;IAYD,WAAW,CAAC,MAAwB;QAClC,OAAO,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,CAAA;IAC5E,CAAC;CACF"}
|
|
@@ -1,54 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
type: 'object',
|
|
3
|
-
required: ['campaign_id', 'redirector_id', 'lure_count', 'created_at'],
|
|
4
|
-
properties: {
|
|
5
|
-
campaign_id: {
|
|
6
|
-
type: 'string',
|
|
7
|
-
},
|
|
8
|
-
redirector_id: {
|
|
9
|
-
type: 'string',
|
|
10
|
-
},
|
|
11
|
-
lure_count: {
|
|
12
|
-
type: 'integer',
|
|
13
|
-
},
|
|
14
|
-
created_at: {
|
|
15
|
-
type: 'integer',
|
|
16
|
-
},
|
|
17
|
-
},
|
|
18
|
-
additionalProperties: false,
|
|
19
|
-
};
|
|
20
|
-
const rawFullRedirectorSchema = {
|
|
21
|
-
type: 'object',
|
|
22
|
-
required: ['campaign_id', 'redirector_id', 'page', 'fields', 'lure_count', 'created_at'],
|
|
23
|
-
properties: {
|
|
24
|
-
campaign_id: {
|
|
25
|
-
type: 'string',
|
|
26
|
-
},
|
|
27
|
-
redirector_id: {
|
|
28
|
-
type: 'string',
|
|
29
|
-
},
|
|
30
|
-
page: {
|
|
31
|
-
type: 'string',
|
|
32
|
-
},
|
|
33
|
-
fields: {
|
|
34
|
-
type: 'array',
|
|
35
|
-
items: {
|
|
36
|
-
type: 'string',
|
|
37
|
-
},
|
|
38
|
-
},
|
|
39
|
-
lure_count: {
|
|
40
|
-
type: 'integer',
|
|
41
|
-
},
|
|
42
|
-
created_at: {
|
|
43
|
-
type: 'integer',
|
|
44
|
-
},
|
|
45
|
-
},
|
|
46
|
-
additionalProperties: false,
|
|
47
|
-
};
|
|
1
|
+
import { counterSchema, customIdentSchema, timestampSchema, } from '@famir/validator';
|
|
48
2
|
export const redirectorPageSchema = {
|
|
49
3
|
type: 'string',
|
|
50
4
|
minLength: 0,
|
|
51
|
-
maxLength:
|
|
5
|
+
maxLength: 10 * 1024 * 1024,
|
|
52
6
|
};
|
|
53
7
|
export const redirectorFieldSchema = {
|
|
54
8
|
type: 'string',
|
|
@@ -66,6 +20,30 @@ export const redirectorParamsSchema = {
|
|
|
66
20
|
minLength: 1,
|
|
67
21
|
},
|
|
68
22
|
};
|
|
23
|
+
const rawRedirectorSchema = {
|
|
24
|
+
type: 'object',
|
|
25
|
+
required: ['campaign_id', 'redirector_id', 'lure_count', 'created_at'],
|
|
26
|
+
properties: {
|
|
27
|
+
campaign_id: customIdentSchema,
|
|
28
|
+
redirector_id: customIdentSchema,
|
|
29
|
+
lure_count: counterSchema,
|
|
30
|
+
created_at: timestampSchema,
|
|
31
|
+
},
|
|
32
|
+
additionalProperties: false,
|
|
33
|
+
};
|
|
34
|
+
const rawFullRedirectorSchema = {
|
|
35
|
+
type: 'object',
|
|
36
|
+
required: ['campaign_id', 'redirector_id', 'page', 'fields', 'lure_count', 'created_at'],
|
|
37
|
+
properties: {
|
|
38
|
+
campaign_id: customIdentSchema,
|
|
39
|
+
redirector_id: customIdentSchema,
|
|
40
|
+
page: redirectorPageSchema,
|
|
41
|
+
fields: redirectorFieldsSchema,
|
|
42
|
+
lure_count: counterSchema,
|
|
43
|
+
created_at: timestampSchema,
|
|
44
|
+
},
|
|
45
|
+
additionalProperties: false,
|
|
46
|
+
};
|
|
69
47
|
export const redirectorSchemas = {
|
|
70
48
|
'database-raw-redirector': rawRedirectorSchema,
|
|
71
49
|
'database-raw-full-redirector': rawFullRedirectorSchema,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redirector.schemas.js","sourceRoot":"","sources":["../../../src/modules/redirector/redirector.schemas.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"redirector.schemas.js","sourceRoot":"","sources":["../../../src/modules/redirector/redirector.schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,aAAa,EACb,iBAAiB,EACjB,eAAe,GAChB,MAAM,kBAAkB,CAAA;AAUzB,MAAM,CAAC,MAAM,oBAAoB,GAA2B;IAC1D,IAAI,EAAE,QAAQ;IACd,SAAS,EAAE,CAAC;IACZ,SAAS,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI;CACnB,CAAA;AAQV,MAAM,CAAC,MAAM,qBAAqB,GAA2B;IAC3D,IAAI,EAAE,QAAQ;IACd,SAAS,EAAE,CAAC;CACb,CAAA;AAQD,MAAM,CAAC,MAAM,sBAAsB,GAA6B;IAC9D,IAAI,EAAE,OAAO;IACb,KAAK,EAAE,qBAAqB;CACpB,CAAA;AAQV,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;AAQV,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,iBAAiB;QAC9B,aAAa,EAAE,iBAAiB;QAChC,UAAU,EAAE,aAAa;QACzB,UAAU,EAAE,eAAe;KAC5B;IACD,oBAAoB,EAAE,KAAK;CACnB,CAAA;AAQV,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,iBAAiB;QAC9B,aAAa,EAAE,iBAAiB;QAChC,IAAI,EAAE,oBAAoB;QAC1B,MAAM,EAAE,sBAAsB;QAC9B,UAAU,EAAE,aAAa;QACzB,UAAU,EAAE,eAAe;KAC5B;IACD,oBAAoB,EAAE,KAAK;CACnB,CAAA;AAQV,MAAM,CAAC,MAAM,iBAAiB,GAAqB;IACjD,yBAAyB,EAAE,mBAAmB;IAC9C,8BAA8B,EAAE,uBAAuB;CAC/C,CAAA"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { CONFIG } from '@famir/config';
|
|
2
2
|
import { LOGGER } from '@famir/logger';
|
|
3
3
|
import { VALIDATOR } from '@famir/validator';
|
|
4
|
+
import { DatabaseError } from '../../database.error.js';
|
|
4
5
|
import { DATABASE_CONNECTOR } from '../../database.js';
|
|
5
6
|
import { RedisBaseRepository } from '../base/index.js';
|
|
6
7
|
import { REDIRECTOR_REPOSITORY } from './redirector.js';
|
|
@@ -17,8 +18,11 @@ export class RedisRedirectorRepository extends RedisBaseRepository {
|
|
|
17
18
|
}
|
|
18
19
|
async create(campaignId, redirectorId, page, lockSecret) {
|
|
19
20
|
try {
|
|
20
|
-
const statusReply = await this.connection.redirector.create_redirector(this.options.prefix, campaignId, redirectorId, page, Date.now()
|
|
21
|
-
const mesg = this.
|
|
21
|
+
const statusReply = await this.connection.redirector.create_redirector(this.options.prefix, campaignId, redirectorId, page, Date.now(), lockSecret);
|
|
22
|
+
const [code, mesg] = this.parseStatusReply(statusReply);
|
|
23
|
+
if (code !== 'OK') {
|
|
24
|
+
throw new DatabaseError(mesg, { code });
|
|
25
|
+
}
|
|
22
26
|
this.logger.info(mesg, { redirector: { campaignId, redirectorId } });
|
|
23
27
|
}
|
|
24
28
|
catch (error) {
|
|
@@ -46,7 +50,10 @@ export class RedisRedirectorRepository extends RedisBaseRepository {
|
|
|
46
50
|
async update(campaignId, redirectorId, page, lockSecret) {
|
|
47
51
|
try {
|
|
48
52
|
const statusReply = await this.connection.redirector.update_redirector(this.options.prefix, campaignId, redirectorId, page ?? null, lockSecret);
|
|
49
|
-
const mesg = this.
|
|
53
|
+
const [code, mesg] = this.parseStatusReply(statusReply);
|
|
54
|
+
if (code !== 'OK') {
|
|
55
|
+
throw new DatabaseError(mesg, { code });
|
|
56
|
+
}
|
|
50
57
|
this.logger.info(mesg, { redirector: { campaignId, redirectorId } });
|
|
51
58
|
}
|
|
52
59
|
catch (error) {
|
|
@@ -56,7 +63,10 @@ export class RedisRedirectorRepository extends RedisBaseRepository {
|
|
|
56
63
|
async appendField(campaignId, redirectorId, field, lockSecret) {
|
|
57
64
|
try {
|
|
58
65
|
const statusReply = await this.connection.redirector.append_redirector_field(this.options.prefix, campaignId, redirectorId, field, lockSecret);
|
|
59
|
-
const mesg = this.
|
|
66
|
+
const [code, mesg] = this.parseStatusReply(statusReply);
|
|
67
|
+
if (code !== 'OK') {
|
|
68
|
+
throw new DatabaseError(mesg, { code });
|
|
69
|
+
}
|
|
60
70
|
this.logger.info(mesg, { redirector: { campaignId, redirectorId, field } });
|
|
61
71
|
}
|
|
62
72
|
catch (error) {
|
|
@@ -66,7 +76,10 @@ export class RedisRedirectorRepository extends RedisBaseRepository {
|
|
|
66
76
|
async removeField(campaignId, redirectorId, field, lockSecret) {
|
|
67
77
|
try {
|
|
68
78
|
const statusReply = await this.connection.redirector.remove_redirector_field(this.options.prefix, campaignId, redirectorId, field, lockSecret);
|
|
69
|
-
const mesg = this.
|
|
79
|
+
const [code, mesg] = this.parseStatusReply(statusReply);
|
|
80
|
+
if (code !== 'OK') {
|
|
81
|
+
throw new DatabaseError(mesg, { code });
|
|
82
|
+
}
|
|
70
83
|
this.logger.info(mesg, { redirector: { campaignId, redirectorId, field } });
|
|
71
84
|
}
|
|
72
85
|
catch (error) {
|
|
@@ -76,7 +89,10 @@ export class RedisRedirectorRepository extends RedisBaseRepository {
|
|
|
76
89
|
async delete(campaignId, redirectorId, lockSecret) {
|
|
77
90
|
try {
|
|
78
91
|
const statusReply = await this.connection.redirector.delete_redirector(this.options.prefix, campaignId, redirectorId, lockSecret);
|
|
79
|
-
const mesg = this.
|
|
92
|
+
const [code, mesg] = this.parseStatusReply(statusReply);
|
|
93
|
+
if (code !== 'OK') {
|
|
94
|
+
throw new DatabaseError(mesg, { code });
|
|
95
|
+
}
|
|
80
96
|
this.logger.info(mesg, { redirector: { campaignId, redirectorId } });
|
|
81
97
|
}
|
|
82
98
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redis-redirector.repository.js","sourceRoot":"","sources":["../../../src/modules/redirector/redis-redirector.repository.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAU,MAAM,eAAe,CAAA;AAC9C,OAAO,EAAE,MAAM,EAAU,MAAM,eAAe,CAAA;AAC9C,OAAO,EAAa,SAAS,EAAE,MAAM,kBAAkB,CAAA;AACvD,OAAO,EAAE,kBAAkB,EAA0C,MAAM,mBAAmB,CAAA;AAC9F,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAA;AAEtD,OAAO,EAAE,qBAAqB,EAAwB,MAAM,iBAAiB,CAAA;AAC7E,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAC7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAO3D,MAAM,OAAO,yBAA0B,SAAQ,mBAAmB;
|
|
1
|
+
{"version":3,"file":"redis-redirector.repository.js","sourceRoot":"","sources":["../../../src/modules/redirector/redis-redirector.repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,10 +21,13 @@ export class RedisSessionRepository extends RedisBaseRepository {
|
|
|
21
21
|
const [sessionId, secret] = [randomIdent(), randomIdent()];
|
|
22
22
|
try {
|
|
23
23
|
const [statusReply, rawModel] = await Promise.all([
|
|
24
|
-
this.connection.session.create_session(this.options.prefix, campaignId, sessionId, secret, Date.now()
|
|
24
|
+
this.connection.session.create_session(this.options.prefix, campaignId, sessionId, secret, Date.now()),
|
|
25
25
|
this.connection.session.read_session(this.options.prefix, campaignId, sessionId),
|
|
26
26
|
]);
|
|
27
|
-
const mesg = this.
|
|
27
|
+
const [code, mesg] = this.parseStatusReply(statusReply);
|
|
28
|
+
if (code !== 'OK') {
|
|
29
|
+
throw new DatabaseError(mesg, { code });
|
|
30
|
+
}
|
|
28
31
|
this.logger.info(mesg, { session: { campaignId, sessionId } });
|
|
29
32
|
return this.buildModelStrict(rawModel);
|
|
30
33
|
}
|
|
@@ -44,10 +47,13 @@ export class RedisSessionRepository extends RedisBaseRepository {
|
|
|
44
47
|
async auth(campaignId, sessionId) {
|
|
45
48
|
try {
|
|
46
49
|
const [statusReply, rawModel] = await Promise.all([
|
|
47
|
-
this.connection.session.auth_session(this.options.prefix, campaignId, sessionId, Date.now()
|
|
50
|
+
this.connection.session.auth_session(this.options.prefix, campaignId, sessionId, Date.now()),
|
|
48
51
|
this.connection.session.read_session(this.options.prefix, campaignId, sessionId),
|
|
49
52
|
]);
|
|
50
|
-
const mesg = this.
|
|
53
|
+
const [code, mesg] = this.parseStatusReply(statusReply);
|
|
54
|
+
if (code !== 'OK') {
|
|
55
|
+
throw new DatabaseError(mesg, { code });
|
|
56
|
+
}
|
|
51
57
|
this.logger.info(mesg, { session: { campaignId, sessionId } });
|
|
52
58
|
return this.buildModelStrict(rawModel);
|
|
53
59
|
}
|
|
@@ -58,7 +64,10 @@ export class RedisSessionRepository extends RedisBaseRepository {
|
|
|
58
64
|
async upgrade(campaignId, lureId, sessionId, secret) {
|
|
59
65
|
try {
|
|
60
66
|
const statusReply = await this.connection.session.upgrade_session(this.options.prefix, campaignId, lureId, sessionId, secret);
|
|
61
|
-
const mesg = this.
|
|
67
|
+
const [code, mesg] = this.parseStatusReply(statusReply);
|
|
68
|
+
if (code !== 'OK') {
|
|
69
|
+
throw new DatabaseError(mesg, { code });
|
|
70
|
+
}
|
|
62
71
|
this.logger.info(mesg, { session: { campaignId, lureId, sessionId } });
|
|
63
72
|
}
|
|
64
73
|
catch (error) {
|
|
@@ -70,7 +79,7 @@ export class RedisSessionRepository extends RedisBaseRepository {
|
|
|
70
79
|
return null;
|
|
71
80
|
}
|
|
72
81
|
this.validateRawData('database-raw-session', rawModel);
|
|
73
|
-
return new SessionModel(rawModel.campaign_id, rawModel.session_id, rawModel.proxy_id, rawModel.secret,
|
|
82
|
+
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));
|
|
74
83
|
}
|
|
75
84
|
buildModelStrict(rawModel) {
|
|
76
85
|
const model = this.buildModel(rawModel);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redis-session.repository.js","sourceRoot":"","sources":["../../../src/modules/session/redis-session.repository.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,WAAW,EAAE,MAAM,eAAe,CAAA;AACxD,OAAO,EAAE,MAAM,EAAU,MAAM,eAAe,CAAA;AAC9C,OAAO,EAAE,MAAM,EAAU,MAAM,eAAe,CAAA;AAC9C,OAAO,EAAa,SAAS,EAAE,MAAM,kBAAkB,CAAA;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;AACvD,OAAO,EAAE,kBAAkB,EAA0C,MAAM,mBAAmB,CAAA;AAC9F,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAA;AAEtD,OAAO,EAAE,kBAAkB,EAAqB,MAAM,cAAc,CAAA;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAOrD,MAAM,OAAO,sBAAuB,SAAQ,mBAAmB;
|
|
1
|
+
{"version":3,"file":"redis-session.repository.js","sourceRoot":"","sources":["../../../src/modules/session/redis-session.repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ export interface RawSession {
|
|
|
4
4
|
session_id: string;
|
|
5
5
|
proxy_id: string;
|
|
6
6
|
secret: string;
|
|
7
|
-
is_upgraded:
|
|
7
|
+
is_upgraded: boolean;
|
|
8
8
|
message_count: number;
|
|
9
9
|
created_at: number;
|
|
10
10
|
authorized_at: number;
|
|
@@ -13,7 +13,7 @@ export declare const sessionFunctions: {
|
|
|
13
13
|
readonly session: {
|
|
14
14
|
readonly create_session: {
|
|
15
15
|
readonly NUMBER_OF_KEYS: 3;
|
|
16
|
-
readonly parseCommand: (parser: CommandParser, prefix: string, campaignId: string, sessionId: string, secret: string, createdAt:
|
|
16
|
+
readonly parseCommand: (parser: CommandParser, prefix: string, campaignId: string, sessionId: string, secret: string, createdAt: number) => void;
|
|
17
17
|
readonly transformReply: () => unknown;
|
|
18
18
|
};
|
|
19
19
|
readonly read_session: {
|
|
@@ -23,7 +23,7 @@ export declare const sessionFunctions: {
|
|
|
23
23
|
};
|
|
24
24
|
readonly auth_session: {
|
|
25
25
|
readonly NUMBER_OF_KEYS: 3;
|
|
26
|
-
readonly parseCommand: (parser: CommandParser, prefix: string, campaignId: string, sessionId: string, authorizedAt:
|
|
26
|
+
readonly parseCommand: (parser: CommandParser, prefix: string, campaignId: string, sessionId: string, authorizedAt: number) => void;
|
|
27
27
|
readonly transformReply: () => unknown;
|
|
28
28
|
};
|
|
29
29
|
readonly upgrade_session: {
|
|
@@ -10,7 +10,7 @@ export const sessionFunctions = {
|
|
|
10
10
|
parser.push(campaignId);
|
|
11
11
|
parser.push(sessionId);
|
|
12
12
|
parser.push(secret);
|
|
13
|
-
parser.push(createdAt);
|
|
13
|
+
parser.push(createdAt.toString());
|
|
14
14
|
},
|
|
15
15
|
transformReply: undefined,
|
|
16
16
|
},
|
|
@@ -28,7 +28,7 @@ export const sessionFunctions = {
|
|
|
28
28
|
parser.pushKey(campaignKey(prefix, campaignId));
|
|
29
29
|
parser.pushKey(sessionKey(prefix, campaignId, sessionId));
|
|
30
30
|
parser.pushKey(enabledProxyIndexKey(prefix, campaignId));
|
|
31
|
-
parser.push(authorizedAt);
|
|
31
|
+
parser.push(authorizedAt.toString());
|
|
32
32
|
},
|
|
33
33
|
transformReply: undefined,
|
|
34
34
|
},
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
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;AAyB/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,QAAQ,EAAE,CAAC,CAAA;YACnC,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,QAAQ,EAAE,CAAC,CAAA;YACtC,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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/modules/session/session.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/modules/session/session.ts"],"names":[],"mappings":"AAQA,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.models.js","sourceRoot":"","sources":["../../../src/modules/session/session.models.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"session.models.js","sourceRoot":"","sources":["../../../src/modules/session/session.models.ts"],"names":[],"mappings":"AAiBA,MAAM,OAAO,YAAY;IAwBZ;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IAxBX,MAAM,CAAC,SAAS,GAAG,CAAyB,KAAe,EAAc,EAAE;QACzE,OAAO,KAAK,IAAI,IAAI,CAAA;IACtB,CAAC,CAAA;IAcD,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;IAOJ,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,YAAY,IAAI,CAAC,CAAA;IAC/B,CAAC"}
|
|
@@ -1,4 +1,18 @@
|
|
|
1
|
-
import { customIdentSchema, randomIdentSchema, } from '@famir/validator';
|
|
1
|
+
import { booleanSchema, counterSchema, customIdentSchema, randomIdentSchema, timestampSchema, } from '@famir/validator';
|
|
2
|
+
export const upgradeSessionParamsSchema = {
|
|
3
|
+
type: 'object',
|
|
4
|
+
required: ['lure_id', 'session_id', 'secret', 'back_url'],
|
|
5
|
+
properties: {
|
|
6
|
+
lure_id: customIdentSchema,
|
|
7
|
+
session_id: randomIdentSchema,
|
|
8
|
+
secret: randomIdentSchema,
|
|
9
|
+
back_url: {
|
|
10
|
+
type: 'string',
|
|
11
|
+
minLength: 1,
|
|
12
|
+
},
|
|
13
|
+
},
|
|
14
|
+
additionalProperties: false,
|
|
15
|
+
};
|
|
2
16
|
const rawSessionSchema = {
|
|
3
17
|
type: 'object',
|
|
4
18
|
required: [
|
|
@@ -12,44 +26,14 @@ const rawSessionSchema = {
|
|
|
12
26
|
'authorized_at',
|
|
13
27
|
],
|
|
14
28
|
properties: {
|
|
15
|
-
campaign_id:
|
|
16
|
-
type: 'string',
|
|
17
|
-
},
|
|
18
|
-
session_id: {
|
|
19
|
-
type: 'string',
|
|
20
|
-
},
|
|
21
|
-
proxy_id: {
|
|
22
|
-
type: 'string',
|
|
23
|
-
},
|
|
24
|
-
secret: {
|
|
25
|
-
type: 'string',
|
|
26
|
-
},
|
|
27
|
-
is_upgraded: {
|
|
28
|
-
type: 'integer',
|
|
29
|
-
},
|
|
30
|
-
message_count: {
|
|
31
|
-
type: 'integer',
|
|
32
|
-
},
|
|
33
|
-
created_at: {
|
|
34
|
-
type: 'integer',
|
|
35
|
-
},
|
|
36
|
-
authorized_at: {
|
|
37
|
-
type: 'integer',
|
|
38
|
-
},
|
|
39
|
-
},
|
|
40
|
-
additionalProperties: false,
|
|
41
|
-
};
|
|
42
|
-
export const upgradeSessionParamsSchema = {
|
|
43
|
-
type: 'object',
|
|
44
|
-
required: ['lure_id', 'session_id', 'secret', 'back_url'],
|
|
45
|
-
properties: {
|
|
46
|
-
lure_id: customIdentSchema,
|
|
29
|
+
campaign_id: customIdentSchema,
|
|
47
30
|
session_id: randomIdentSchema,
|
|
31
|
+
proxy_id: customIdentSchema,
|
|
48
32
|
secret: randomIdentSchema,
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
33
|
+
is_upgraded: booleanSchema,
|
|
34
|
+
message_count: counterSchema,
|
|
35
|
+
created_at: timestampSchema,
|
|
36
|
+
authorized_at: timestampSchema,
|
|
53
37
|
},
|
|
54
38
|
additionalProperties: false,
|
|
55
39
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.schemas.js","sourceRoot":"","sources":["../../../src/modules/session/session.schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EACjB,iBAAiB,
|
|
1
|
+
{"version":3,"file":"session.schemas.js","sourceRoot":"","sources":["../../../src/modules/session/session.schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,aAAa,EACb,aAAa,EACb,iBAAiB,EACjB,iBAAiB,EACjB,eAAe,GAChB,MAAM,kBAAkB,CAAA;AAUzB,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;AAQV,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,iBAAiB;QAC9B,UAAU,EAAE,iBAAiB;QAC7B,QAAQ,EAAE,iBAAiB;QAC3B,MAAM,EAAE,iBAAiB;QACzB,WAAW,EAAE,aAAa;QAC1B,aAAa,EAAE,aAAa;QAC5B,UAAU,EAAE,eAAe;QAC3B,aAAa,EAAE,eAAe;KAC/B;IACD,oBAAoB,EAAE,KAAK;CACnB,CAAA;AAQV,MAAM,CAAC,MAAM,cAAc,GAAqB;IAC9C,sBAAsB,EAAE,gBAAgB;CAChC,CAAA"}
|
|
@@ -5,13 +5,14 @@ import { Validator } from '@famir/validator';
|
|
|
5
5
|
import { DatabaseConnector, RedisDatabaseConfig } from '../../database.js';
|
|
6
6
|
import { RedisBaseRepository } from '../base/index.js';
|
|
7
7
|
import { TargetRepository } from './target.js';
|
|
8
|
-
import { FullTargetModel, TargetAccessLevel, TargetModel } from './target.models.js';
|
|
8
|
+
import { FullTargetModel, TargetAccessLevel, TargetHosts, TargetModel } from './target.models.js';
|
|
9
9
|
export declare class RedisTargetRepository extends RedisBaseRepository implements TargetRepository {
|
|
10
10
|
static register(container: DIContainer): void;
|
|
11
11
|
constructor(validator: Validator, config: Config<RedisDatabaseConfig>, logger: Logger, connector: DatabaseConnector);
|
|
12
12
|
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>;
|
|
13
13
|
read(campaignId: string, targetId: string): Promise<TargetModel | null>;
|
|
14
14
|
readFull(campaignId: string, targetId: string): Promise<FullTargetModel | null>;
|
|
15
|
+
readHosts(): Promise<TargetHosts>;
|
|
15
16
|
find(mirrorHost: string): Promise<TargetModel | null>;
|
|
16
17
|
findFull(mirrorHost: string): Promise<FullTargetModel | null>;
|
|
17
18
|
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>;
|
|
@@ -26,5 +27,4 @@ export declare class RedisTargetRepository extends RedisBaseRepository implement
|
|
|
26
27
|
protected buildFullModel(rawModel: unknown): FullTargetModel | null;
|
|
27
28
|
protected buildCollection(rawCollection: unknown): TargetModel[];
|
|
28
29
|
protected buildFullCollection(rawCollection: unknown): FullTargetModel[];
|
|
29
|
-
protected buildTargetLink(value: unknown): [string, string];
|
|
30
30
|
}
|