@famir/database 0.0.2 → 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 -1
- package/dist/database.d.ts +0 -1
- package/dist/database.error.js +1 -1
- package/dist/database.error.js.map +1 -1
- package/dist/database.functions.d.ts +30 -25
- package/dist/database.functions.js +8 -8
- 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 +2 -1
- package/dist/database.keys.js +6 -3
- package/dist/database.keys.js.map +1 -1
- package/dist/database.schemas.js +2 -2
- package/dist/database.schemas.js.map +1 -1
- package/dist/index.d.ts +1 -2
- package/dist/index.js +1 -2
- package/dist/index.js.map +1 -1
- package/dist/modules/base/index.js.map +1 -0
- package/dist/{repositories → modules}/base/redis-base.repository.d.ts +11 -9
- package/dist/modules/base/redis-base.repository.js +164 -0
- package/dist/modules/base/redis-base.repository.js.map +1 -0
- package/dist/{repositories → modules}/campaign/campaign.d.ts +4 -8
- package/dist/{repositories → modules}/campaign/campaign.functions.d.ts +7 -16
- package/dist/{repositories → modules}/campaign/campaign.functions.js +23 -36
- package/dist/modules/campaign/campaign.functions.js.map +1 -0
- package/dist/modules/campaign/campaign.js +3 -0
- package/dist/modules/campaign/campaign.js.map +1 -0
- package/dist/{models/campaign/campaign.d.ts → modules/campaign/campaign.models.d.ts} +3 -2
- package/dist/{models/campaign/campaign.js → modules/campaign/campaign.models.js} +6 -4
- package/dist/modules/campaign/campaign.models.js.map +1 -0
- package/dist/{repositories → modules}/campaign/campaign.schemas.d.ts +3 -2
- package/dist/modules/campaign/campaign.schemas.js +109 -0
- package/dist/modules/campaign/campaign.schemas.js.map +1 -0
- package/dist/{repositories → modules}/campaign/index.d.ts +1 -0
- package/dist/{repositories → modules}/campaign/index.js +1 -0
- package/dist/modules/campaign/index.js.map +1 -0
- package/dist/{repositories → modules}/campaign/redis-campaign.repository.d.ts +5 -6
- package/dist/{repositories → modules}/campaign/redis-campaign.repository.js +33 -34
- package/dist/modules/campaign/redis-campaign.repository.js.map +1 -0
- package/dist/modules/index.js.map +1 -0
- package/dist/{repositories → modules}/lure/index.d.ts +1 -0
- package/dist/{repositories → modules}/lure/index.js +1 -0
- package/dist/modules/lure/index.js.map +1 -0
- package/dist/{repositories → modules}/lure/lure.d.ts +1 -1
- package/dist/{repositories → modules}/lure/lure.functions.d.ts +2 -2
- package/dist/{repositories → modules}/lure/lure.functions.js +11 -11
- package/dist/modules/lure/lure.functions.js.map +1 -0
- package/dist/modules/lure/lure.js.map +1 -0
- package/dist/{models/lure/lure.js → modules/lure/lure.models.js} +1 -1
- package/dist/modules/lure/lure.models.js.map +1 -0
- package/dist/modules/lure/lure.schemas.js +32 -0
- package/dist/modules/lure/lure.schemas.js.map +1 -0
- package/dist/{repositories → modules}/lure/redis-lure.repository.d.ts +3 -3
- package/dist/{repositories → modules}/lure/redis-lure.repository.js +23 -10
- package/dist/modules/lure/redis-lure.repository.js.map +1 -0
- package/dist/{repositories → modules}/message/index.d.ts +1 -0
- package/dist/{repositories → modules}/message/index.js +1 -0
- package/dist/modules/message/index.js.map +1 -0
- package/dist/{repositories → modules}/message/message.d.ts +3 -3
- package/dist/{repositories → modules}/message/message.functions.d.ts +5 -4
- package/dist/{repositories → modules}/message/message.functions.js +12 -12
- package/dist/modules/message/message.functions.js.map +1 -0
- package/dist/modules/message/message.js.map +1 -0
- package/dist/{models/message/message.d.ts → modules/message/message.models.d.ts} +4 -4
- package/dist/{models/message/message.js → modules/message/message.models.js} +6 -6
- package/dist/modules/message/message.models.js.map +1 -0
- package/dist/modules/message/message.schemas.js +93 -0
- package/dist/modules/message/message.schemas.js.map +1 -0
- package/dist/{repositories → modules}/message/redis-message.repository.d.ts +6 -5
- package/dist/{repositories → modules}/message/redis-message.repository.js +17 -14
- package/dist/modules/message/redis-message.repository.js.map +1 -0
- package/dist/{repositories → modules}/proxy/index.d.ts +1 -0
- package/dist/{repositories → modules}/proxy/index.js +1 -0
- package/dist/modules/proxy/index.js.map +1 -0
- package/dist/{repositories → modules}/proxy/proxy.d.ts +1 -1
- package/dist/{repositories → modules}/proxy/proxy.functions.d.ts +2 -2
- package/dist/{repositories → modules}/proxy/proxy.functions.js +10 -10
- package/dist/modules/proxy/proxy.functions.js.map +1 -0
- package/dist/modules/proxy/proxy.js.map +1 -0
- package/dist/{models/proxy/proxy.js → modules/proxy/proxy.models.js} +1 -1
- package/dist/modules/proxy/proxy.models.js.map +1 -0
- package/dist/modules/proxy/proxy.schemas.js +23 -0
- package/dist/modules/proxy/proxy.schemas.js.map +1 -0
- package/dist/{repositories → modules}/proxy/redis-proxy.repository.d.ts +3 -3
- package/dist/{repositories → modules}/proxy/redis-proxy.repository.js +23 -10
- package/dist/modules/proxy/redis-proxy.repository.js.map +1 -0
- package/dist/{repositories → modules}/redirector/index.d.ts +1 -0
- package/dist/{repositories → modules}/redirector/index.js +1 -0
- package/dist/modules/redirector/index.js.map +1 -0
- package/dist/{repositories → modules}/redirector/redirector.d.ts +3 -1
- package/dist/{repositories → modules}/redirector/redirector.functions.d.ts +14 -3
- package/dist/{repositories → modules}/redirector/redirector.functions.js +38 -12
- package/dist/modules/redirector/redirector.functions.js.map +1 -0
- package/dist/modules/redirector/redirector.js.map +1 -0
- package/dist/{models/redirector/redirector.d.ts → modules/redirector/redirector.models.d.ts} +5 -1
- package/dist/{models/redirector/redirector.js → modules/redirector/redirector.models.js} +10 -2
- package/dist/modules/redirector/redirector.models.js.map +1 -0
- package/dist/modules/redirector/redirector.schemas.d.ts +7 -0
- package/dist/modules/redirector/redirector.schemas.js +51 -0
- package/dist/modules/redirector/redirector.schemas.js.map +1 -0
- package/dist/{repositories → modules}/redirector/redis-redirector.repository.d.ts +5 -3
- package/dist/{repositories → modules}/redirector/redis-redirector.repository.js +45 -9
- package/dist/modules/redirector/redis-redirector.repository.js.map +1 -0
- package/dist/{repositories → modules}/session/index.d.ts +1 -0
- package/dist/{repositories → modules}/session/index.js +1 -0
- package/dist/modules/session/index.js.map +1 -0
- package/dist/{repositories → modules}/session/redis-session.repository.d.ts +3 -3
- package/dist/{repositories → modules}/session/redis-session.repository.js +22 -13
- package/dist/modules/session/redis-session.repository.js.map +1 -0
- package/dist/{repositories → modules}/session/session.d.ts +1 -1
- package/dist/{repositories → modules}/session/session.functions.d.ts +3 -3
- package/dist/{repositories → modules}/session/session.functions.js +8 -8
- package/dist/modules/session/session.functions.js.map +1 -0
- package/dist/modules/session/session.js.map +1 -0
- package/dist/{models/session/session.d.ts → modules/session/session.models.d.ts} +6 -0
- package/dist/{models/session/session.js → modules/session/session.models.js} +1 -1
- package/dist/modules/session/session.models.js.map +1 -0
- package/dist/modules/session/session.schemas.d.ts +4 -0
- package/dist/modules/session/session.schemas.js +43 -0
- package/dist/modules/session/session.schemas.js.map +1 -0
- package/dist/{repositories → modules}/target/index.d.ts +1 -0
- package/dist/{repositories → modules}/target/index.js +1 -0
- package/dist/modules/target/index.js.map +1 -0
- package/dist/{repositories → modules}/target/redis-target.repository.d.ts +4 -4
- package/dist/{repositories → modules}/target/redis-target.repository.js +56 -35
- package/dist/modules/target/redis-target.repository.js.map +1 -0
- package/dist/{repositories → modules}/target/target.d.ts +2 -1
- package/dist/{repositories → modules}/target/target.functions.d.ts +15 -9
- package/dist/{repositories → modules}/target/target.functions.js +44 -38
- package/dist/modules/target/target.functions.js.map +1 -0
- package/dist/modules/target/target.js.map +1 -0
- package/dist/{models/target/target.d.ts → modules/target/target.models.d.ts} +6 -4
- package/dist/{models/target/target.js → modules/target/target.models.js} +11 -11
- package/dist/modules/target/target.models.js.map +1 -0
- package/dist/{repositories → modules}/target/target.schemas.d.ts +3 -1
- package/dist/modules/target/target.schemas.js +174 -0
- package/dist/modules/target/target.schemas.js.map +1 -0
- package/dist/redis-database-connector.d.ts +2 -1
- package/dist/redis-database-connector.js +12 -10
- package/dist/redis-database-connector.js.map +1 -1
- package/dist/redis-database-manager.d.ts +4 -3
- package/dist/redis-database-manager.js +16 -9
- package/dist/redis-database-manager.js.map +1 -1
- package/dist/redis-functions.d.ts +1 -1
- package/dist/redis-functions.js +30 -1455
- package/dist/redis-functions.js.map +1 -1
- package/package.json +17 -10
- package/dist/models/campaign/campaign.js.map +0 -1
- package/dist/models/campaign/index.d.ts +0 -1
- package/dist/models/campaign/index.js +0 -2
- package/dist/models/campaign/index.js.map +0 -1
- package/dist/models/index.d.ts +0 -7
- package/dist/models/index.js +0 -8
- package/dist/models/index.js.map +0 -1
- package/dist/models/lure/index.d.ts +0 -1
- package/dist/models/lure/index.js +0 -2
- package/dist/models/lure/index.js.map +0 -1
- package/dist/models/lure/lure.js.map +0 -1
- package/dist/models/message/index.d.ts +0 -1
- package/dist/models/message/index.js +0 -2
- package/dist/models/message/index.js.map +0 -1
- package/dist/models/message/message.js.map +0 -1
- package/dist/models/proxy/index.d.ts +0 -1
- package/dist/models/proxy/index.js +0 -2
- package/dist/models/proxy/index.js.map +0 -1
- package/dist/models/proxy/proxy.js.map +0 -1
- package/dist/models/redirector/index.d.ts +0 -1
- package/dist/models/redirector/index.js +0 -2
- package/dist/models/redirector/index.js.map +0 -1
- package/dist/models/redirector/redirector.js.map +0 -1
- package/dist/models/session/index.d.ts +0 -1
- package/dist/models/session/index.js +0 -2
- package/dist/models/session/index.js.map +0 -1
- package/dist/models/session/session.js.map +0 -1
- package/dist/models/target/index.d.ts +0 -1
- package/dist/models/target/index.js +0 -2
- package/dist/models/target/index.js.map +0 -1
- package/dist/models/target/target.js.map +0 -1
- package/dist/repositories/base/index.js.map +0 -1
- package/dist/repositories/base/redis-base.repository.js +0 -140
- package/dist/repositories/base/redis-base.repository.js.map +0 -1
- package/dist/repositories/campaign/campaign.functions.js.map +0 -1
- package/dist/repositories/campaign/campaign.js +0 -2
- package/dist/repositories/campaign/campaign.js.map +0 -1
- package/dist/repositories/campaign/campaign.schemas.js +0 -148
- package/dist/repositories/campaign/campaign.schemas.js.map +0 -1
- package/dist/repositories/campaign/index.js.map +0 -1
- package/dist/repositories/campaign/redis-campaign.repository.js.map +0 -1
- package/dist/repositories/index.js.map +0 -1
- package/dist/repositories/lure/index.js.map +0 -1
- package/dist/repositories/lure/lure.functions.js.map +0 -1
- package/dist/repositories/lure/lure.js.map +0 -1
- package/dist/repositories/lure/lure.schemas.js +0 -45
- package/dist/repositories/lure/lure.schemas.js.map +0 -1
- package/dist/repositories/lure/redis-lure.repository.js.map +0 -1
- package/dist/repositories/message/index.js.map +0 -1
- package/dist/repositories/message/message.functions.js.map +0 -1
- package/dist/repositories/message/message.js.map +0 -1
- package/dist/repositories/message/message.schemas.js +0 -160
- package/dist/repositories/message/message.schemas.js.map +0 -1
- package/dist/repositories/message/redis-message.repository.js.map +0 -1
- package/dist/repositories/proxy/index.js.map +0 -1
- package/dist/repositories/proxy/proxy.functions.js.map +0 -1
- package/dist/repositories/proxy/proxy.js.map +0 -1
- package/dist/repositories/proxy/proxy.schemas.js +0 -34
- package/dist/repositories/proxy/proxy.schemas.js.map +0 -1
- package/dist/repositories/proxy/redis-proxy.repository.js.map +0 -1
- package/dist/repositories/redirector/index.js.map +0 -1
- package/dist/repositories/redirector/redirector.functions.js.map +0 -1
- package/dist/repositories/redirector/redirector.js.map +0 -1
- package/dist/repositories/redirector/redirector.schemas.d.ts +0 -3
- package/dist/repositories/redirector/redirector.schemas.js +0 -51
- package/dist/repositories/redirector/redirector.schemas.js.map +0 -1
- package/dist/repositories/redirector/redis-redirector.repository.js.map +0 -1
- package/dist/repositories/session/index.js.map +0 -1
- package/dist/repositories/session/redis-session.repository.js.map +0 -1
- package/dist/repositories/session/session.functions.js.map +0 -1
- package/dist/repositories/session/session.js.map +0 -1
- package/dist/repositories/session/session.schemas.d.ts +0 -2
- package/dist/repositories/session/session.schemas.js +0 -44
- package/dist/repositories/session/session.schemas.js.map +0 -1
- package/dist/repositories/target/index.js.map +0 -1
- package/dist/repositories/target/redis-target.repository.js.map +0 -1
- package/dist/repositories/target/target.functions.js.map +0 -1
- package/dist/repositories/target/target.js.map +0 -1
- package/dist/repositories/target/target.schemas.js +0 -251
- package/dist/repositories/target/target.schemas.js.map +0 -1
- package/dist/{repositories → modules}/base/index.d.ts +0 -0
- package/dist/{repositories → modules}/base/index.js +0 -0
- package/dist/{repositories → modules}/index.d.ts +0 -0
- package/dist/{repositories → modules}/index.js +0 -0
- package/dist/{repositories → modules}/lure/lure.js +0 -0
- package/dist/{models/lure/lure.d.ts → modules/lure/lure.models.d.ts} +0 -0
- package/dist/{repositories → modules}/lure/lure.schemas.d.ts +1 -1
- package/dist/{repositories → modules}/message/message.js +0 -0
- package/dist/{repositories → modules}/message/message.schemas.d.ts +0 -0
- package/dist/{repositories → modules}/proxy/proxy.js +0 -0
- package/dist/{models/proxy/proxy.d.ts → modules/proxy/proxy.models.d.ts} +0 -0
- package/dist/{repositories → modules}/proxy/proxy.schemas.d.ts +1 -1
- /package/dist/{repositories → modules}/redirector/redirector.js +0 -0
- /package/dist/{repositories → modules}/session/session.js +0 -0
- /package/dist/{repositories → modules}/target/target.js +0 -0
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { campaignKey, campaignLockKey, redirectorIndexKey, redirectorKey } from '../../database.keys.js';
|
|
1
|
+
import { campaignKey, campaignLockKey, redirectorFieldsKey, redirectorIndexKey, redirectorKey, } from '../../database.keys.js';
|
|
2
2
|
export const redirectorFunctions = {
|
|
3
3
|
redirector: {
|
|
4
4
|
create_redirector: {
|
|
@@ -11,10 +11,10 @@ export const redirectorFunctions = {
|
|
|
11
11
|
parser.push(campaignId);
|
|
12
12
|
parser.push(redirectorId);
|
|
13
13
|
parser.push(page);
|
|
14
|
-
parser.push(createdAt);
|
|
14
|
+
parser.push(createdAt.toString());
|
|
15
15
|
parser.push(lockSecret);
|
|
16
16
|
},
|
|
17
|
-
transformReply: undefined
|
|
17
|
+
transformReply: undefined,
|
|
18
18
|
},
|
|
19
19
|
read_redirector: {
|
|
20
20
|
NUMBER_OF_KEYS: 2,
|
|
@@ -22,15 +22,16 @@ export const redirectorFunctions = {
|
|
|
22
22
|
parser.pushKey(campaignKey(prefix, campaignId));
|
|
23
23
|
parser.pushKey(redirectorKey(prefix, campaignId, redirectorId));
|
|
24
24
|
},
|
|
25
|
-
transformReply: undefined
|
|
25
|
+
transformReply: undefined,
|
|
26
26
|
},
|
|
27
27
|
read_full_redirector: {
|
|
28
|
-
NUMBER_OF_KEYS:
|
|
28
|
+
NUMBER_OF_KEYS: 3,
|
|
29
29
|
parseCommand(parser, prefix, campaignId, redirectorId) {
|
|
30
30
|
parser.pushKey(campaignKey(prefix, campaignId));
|
|
31
31
|
parser.pushKey(redirectorKey(prefix, campaignId, redirectorId));
|
|
32
|
+
parser.pushKey(redirectorFieldsKey(prefix, campaignId, redirectorId));
|
|
32
33
|
},
|
|
33
|
-
transformReply: undefined
|
|
34
|
+
transformReply: undefined,
|
|
34
35
|
},
|
|
35
36
|
read_redirector_index: {
|
|
36
37
|
NUMBER_OF_KEYS: 2,
|
|
@@ -38,7 +39,7 @@ export const redirectorFunctions = {
|
|
|
38
39
|
parser.pushKey(campaignKey(prefix, campaignId));
|
|
39
40
|
parser.pushKey(redirectorIndexKey(prefix, campaignId));
|
|
40
41
|
},
|
|
41
|
-
transformReply: undefined
|
|
42
|
+
transformReply: undefined,
|
|
42
43
|
},
|
|
43
44
|
update_redirector: {
|
|
44
45
|
NUMBER_OF_KEYS: 3,
|
|
@@ -52,19 +53,44 @@ export const redirectorFunctions = {
|
|
|
52
53
|
}
|
|
53
54
|
parser.push(lockSecret);
|
|
54
55
|
},
|
|
55
|
-
transformReply: undefined
|
|
56
|
+
transformReply: undefined,
|
|
56
57
|
},
|
|
57
|
-
|
|
58
|
+
append_redirector_field: {
|
|
59
|
+
NUMBER_OF_KEYS: 4,
|
|
60
|
+
parseCommand(parser, prefix, campaignId, redirectorId, field, lockSecret) {
|
|
61
|
+
parser.pushKey(campaignKey(prefix, campaignId));
|
|
62
|
+
parser.pushKey(campaignLockKey(prefix, campaignId));
|
|
63
|
+
parser.pushKey(redirectorKey(prefix, campaignId, redirectorId));
|
|
64
|
+
parser.pushKey(redirectorFieldsKey(prefix, campaignId, redirectorId));
|
|
65
|
+
parser.push(field);
|
|
66
|
+
parser.push(lockSecret);
|
|
67
|
+
},
|
|
68
|
+
transformReply: undefined,
|
|
69
|
+
},
|
|
70
|
+
remove_redirector_field: {
|
|
58
71
|
NUMBER_OF_KEYS: 4,
|
|
72
|
+
parseCommand(parser, prefix, campaignId, redirectorId, field, lockSecret) {
|
|
73
|
+
parser.pushKey(campaignKey(prefix, campaignId));
|
|
74
|
+
parser.pushKey(campaignLockKey(prefix, campaignId));
|
|
75
|
+
parser.pushKey(redirectorKey(prefix, campaignId, redirectorId));
|
|
76
|
+
parser.pushKey(redirectorFieldsKey(prefix, campaignId, redirectorId));
|
|
77
|
+
parser.push(field);
|
|
78
|
+
parser.push(lockSecret);
|
|
79
|
+
},
|
|
80
|
+
transformReply: undefined,
|
|
81
|
+
},
|
|
82
|
+
delete_redirector: {
|
|
83
|
+
NUMBER_OF_KEYS: 5,
|
|
59
84
|
parseCommand(parser, prefix, campaignId, redirectorId, lockSecret) {
|
|
60
85
|
parser.pushKey(campaignKey(prefix, campaignId));
|
|
61
86
|
parser.pushKey(campaignLockKey(prefix, campaignId));
|
|
62
87
|
parser.pushKey(redirectorKey(prefix, campaignId, redirectorId));
|
|
88
|
+
parser.pushKey(redirectorFieldsKey(prefix, campaignId, redirectorId));
|
|
63
89
|
parser.pushKey(redirectorIndexKey(prefix, campaignId));
|
|
64
90
|
parser.push(lockSecret);
|
|
65
91
|
},
|
|
66
|
-
transformReply: undefined
|
|
67
|
-
}
|
|
68
|
-
}
|
|
92
|
+
transformReply: undefined,
|
|
93
|
+
},
|
|
94
|
+
},
|
|
69
95
|
};
|
|
70
96
|
//# sourceMappingURL=redirector.functions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"redirector.functions.js","sourceRoot":"","sources":["../../../src/modules/redirector/redirector.functions.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
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"}
|
package/dist/{models/redirector/redirector.d.ts → modules/redirector/redirector.models.d.ts}
RENAMED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
export type RedirectorParams = Record<string, string>;
|
|
1
2
|
export declare class RedirectorModel {
|
|
2
3
|
readonly campaignId: string;
|
|
3
4
|
readonly redirectorId: string;
|
|
@@ -8,5 +9,8 @@ export declare class RedirectorModel {
|
|
|
8
9
|
}
|
|
9
10
|
export declare class FullRedirectorModel extends RedirectorModel {
|
|
10
11
|
readonly page: string;
|
|
11
|
-
|
|
12
|
+
readonly fields: string[];
|
|
13
|
+
constructor(campaignId: string, redirectorId: string, page: string, fields: string[], lureCount: number, createdAt: Date);
|
|
14
|
+
get isLoose(): boolean;
|
|
15
|
+
checkParams(params: RedirectorParams): boolean;
|
|
12
16
|
}
|
|
@@ -15,9 +15,17 @@ export class RedirectorModel {
|
|
|
15
15
|
}
|
|
16
16
|
export class FullRedirectorModel extends RedirectorModel {
|
|
17
17
|
page;
|
|
18
|
-
|
|
18
|
+
fields;
|
|
19
|
+
constructor(campaignId, redirectorId, page, fields, lureCount, createdAt) {
|
|
19
20
|
super(campaignId, redirectorId, lureCount, createdAt);
|
|
20
21
|
this.page = page;
|
|
22
|
+
this.fields = fields;
|
|
23
|
+
}
|
|
24
|
+
get isLoose() {
|
|
25
|
+
return this.fields.length === 0;
|
|
26
|
+
}
|
|
27
|
+
checkParams(params) {
|
|
28
|
+
return this.isLoose || this.fields.every((field) => params[field] != null);
|
|
21
29
|
}
|
|
22
30
|
}
|
|
23
|
-
//# sourceMappingURL=redirector.js.map
|
|
31
|
+
//# sourceMappingURL=redirector.models.js.map
|
|
@@ -0,0 +1 @@
|
|
|
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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { JSONSchemaType, ValidatorSchemas } from '@famir/validator';
|
|
2
|
+
import { RedirectorParams } from './redirector.models.js';
|
|
3
|
+
export declare const redirectorPageSchema: JSONSchemaType<string>;
|
|
4
|
+
export declare const redirectorFieldSchema: JSONSchemaType<string>;
|
|
5
|
+
export declare const redirectorFieldsSchema: JSONSchemaType<string[]>;
|
|
6
|
+
export declare const redirectorParamsSchema: JSONSchemaType<RedirectorParams>;
|
|
7
|
+
export declare const redirectorSchemas: ValidatorSchemas;
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
import { counterSchema, customIdentSchema, timestampSchema, } from '@famir/validator';
|
|
2
|
+
export const redirectorPageSchema = {
|
|
3
|
+
type: 'string',
|
|
4
|
+
minLength: 0,
|
|
5
|
+
maxLength: 10 * 1024 * 1024,
|
|
6
|
+
};
|
|
7
|
+
export const redirectorFieldSchema = {
|
|
8
|
+
type: 'string',
|
|
9
|
+
minLength: 1,
|
|
10
|
+
};
|
|
11
|
+
export const redirectorFieldsSchema = {
|
|
12
|
+
type: 'array',
|
|
13
|
+
items: redirectorFieldSchema,
|
|
14
|
+
};
|
|
15
|
+
export const redirectorParamsSchema = {
|
|
16
|
+
type: 'object',
|
|
17
|
+
required: [],
|
|
18
|
+
additionalProperties: {
|
|
19
|
+
type: 'string',
|
|
20
|
+
minLength: 1,
|
|
21
|
+
},
|
|
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
|
+
};
|
|
47
|
+
export const redirectorSchemas = {
|
|
48
|
+
'database-raw-redirector': rawRedirectorSchema,
|
|
49
|
+
'database-raw-full-redirector': rawFullRedirectorSchema,
|
|
50
|
+
};
|
|
51
|
+
//# sourceMappingURL=redirector.schemas.js.map
|
|
@@ -0,0 +1 @@
|
|
|
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"}
|
|
@@ -2,17 +2,19 @@ import { DIContainer } from '@famir/common';
|
|
|
2
2
|
import { Config } from '@famir/config';
|
|
3
3
|
import { Logger } from '@famir/logger';
|
|
4
4
|
import { Validator } from '@famir/validator';
|
|
5
|
-
import {
|
|
6
|
-
import { FullRedirectorModel, RedirectorModel } from '../../models/index.js';
|
|
5
|
+
import { DatabaseConnector, RedisDatabaseConfig } from '../../database.js';
|
|
7
6
|
import { RedisBaseRepository } from '../base/index.js';
|
|
8
7
|
import { RedirectorRepository } from './redirector.js';
|
|
8
|
+
import { FullRedirectorModel, RedirectorModel } from './redirector.models.js';
|
|
9
9
|
export declare class RedisRedirectorRepository extends RedisBaseRepository implements RedirectorRepository {
|
|
10
10
|
static register(container: DIContainer): void;
|
|
11
|
-
constructor(validator: Validator, config: Config<RedisDatabaseConfig>, logger: Logger,
|
|
11
|
+
constructor(validator: Validator, config: Config<RedisDatabaseConfig>, logger: Logger, connector: DatabaseConnector);
|
|
12
12
|
create(campaignId: string, redirectorId: string, page: string, lockSecret: string): Promise<void>;
|
|
13
13
|
read(campaignId: string, redirectorId: string): Promise<RedirectorModel | null>;
|
|
14
14
|
readFull(campaignId: string, redirectorId: string): Promise<FullRedirectorModel | null>;
|
|
15
15
|
update(campaignId: string, redirectorId: string, page: string | null | undefined, lockSecret: string): Promise<void>;
|
|
16
|
+
appendField(campaignId: string, redirectorId: string, field: string, lockSecret: string): Promise<void>;
|
|
17
|
+
removeField(campaignId: string, redirectorId: string, field: string, lockSecret: string): Promise<void>;
|
|
16
18
|
delete(campaignId: string, redirectorId: string, lockSecret: string): Promise<void>;
|
|
17
19
|
list(campaignId: string): Promise<RedirectorModel[] | null>;
|
|
18
20
|
listFull(campaignId: string): Promise<FullRedirectorModel[] | null>;
|
|
@@ -1,24 +1,28 @@
|
|
|
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
|
-
import { FullRedirectorModel, RedirectorModel } from '../../models/index.js';
|
|
6
6
|
import { RedisBaseRepository } from '../base/index.js';
|
|
7
7
|
import { REDIRECTOR_REPOSITORY } from './redirector.js';
|
|
8
|
+
import { FullRedirectorModel, RedirectorModel } from './redirector.models.js';
|
|
8
9
|
import { redirectorSchemas } from './redirector.schemas.js';
|
|
9
10
|
export class RedisRedirectorRepository extends RedisBaseRepository {
|
|
10
11
|
static register(container) {
|
|
11
|
-
container.registerSingleton(REDIRECTOR_REPOSITORY, (c) => new RedisRedirectorRepository(c.resolve(VALIDATOR), c.resolve(CONFIG), c.resolve(LOGGER), c.resolve(DATABASE_CONNECTOR)
|
|
12
|
+
container.registerSingleton(REDIRECTOR_REPOSITORY, (c) => new RedisRedirectorRepository(c.resolve(VALIDATOR), c.resolve(CONFIG), c.resolve(LOGGER), c.resolve(DATABASE_CONNECTOR)));
|
|
12
13
|
}
|
|
13
|
-
constructor(validator, config, logger,
|
|
14
|
-
super(validator, config, logger,
|
|
14
|
+
constructor(validator, config, logger, connector) {
|
|
15
|
+
super(validator, config, logger, connector, 'redirector');
|
|
15
16
|
this.validator.addSchemas(redirectorSchemas);
|
|
16
17
|
this.logger.debug(`RedirectorRepository initialized`);
|
|
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,17 +50,49 @@ 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) {
|
|
53
60
|
this.raiseError(error, 'update', { campaignId, redirectorId });
|
|
54
61
|
}
|
|
55
62
|
}
|
|
63
|
+
async appendField(campaignId, redirectorId, field, lockSecret) {
|
|
64
|
+
try {
|
|
65
|
+
const statusReply = await this.connection.redirector.append_redirector_field(this.options.prefix, campaignId, redirectorId, field, lockSecret);
|
|
66
|
+
const [code, mesg] = this.parseStatusReply(statusReply);
|
|
67
|
+
if (code !== 'OK') {
|
|
68
|
+
throw new DatabaseError(mesg, { code });
|
|
69
|
+
}
|
|
70
|
+
this.logger.info(mesg, { redirector: { campaignId, redirectorId, field } });
|
|
71
|
+
}
|
|
72
|
+
catch (error) {
|
|
73
|
+
this.raiseError(error, 'appendField', { campaignId, redirectorId, field });
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
async removeField(campaignId, redirectorId, field, lockSecret) {
|
|
77
|
+
try {
|
|
78
|
+
const statusReply = await this.connection.redirector.remove_redirector_field(this.options.prefix, campaignId, redirectorId, field, lockSecret);
|
|
79
|
+
const [code, mesg] = this.parseStatusReply(statusReply);
|
|
80
|
+
if (code !== 'OK') {
|
|
81
|
+
throw new DatabaseError(mesg, { code });
|
|
82
|
+
}
|
|
83
|
+
this.logger.info(mesg, { redirector: { campaignId, redirectorId, field } });
|
|
84
|
+
}
|
|
85
|
+
catch (error) {
|
|
86
|
+
this.raiseError(error, 'removeField', { campaignId, redirectorId, field });
|
|
87
|
+
}
|
|
88
|
+
}
|
|
56
89
|
async delete(campaignId, redirectorId, lockSecret) {
|
|
57
90
|
try {
|
|
58
91
|
const statusReply = await this.connection.redirector.delete_redirector(this.options.prefix, campaignId, redirectorId, lockSecret);
|
|
59
|
-
const mesg = this.
|
|
92
|
+
const [code, mesg] = this.parseStatusReply(statusReply);
|
|
93
|
+
if (code !== 'OK') {
|
|
94
|
+
throw new DatabaseError(mesg, { code });
|
|
95
|
+
}
|
|
60
96
|
this.logger.info(mesg, { redirector: { campaignId, redirectorId } });
|
|
61
97
|
}
|
|
62
98
|
catch (error) {
|
|
@@ -103,7 +139,7 @@ export class RedisRedirectorRepository extends RedisBaseRepository {
|
|
|
103
139
|
return null;
|
|
104
140
|
}
|
|
105
141
|
this.validateRawData('database-raw-full-redirector', rawModel);
|
|
106
|
-
return new FullRedirectorModel(rawModel.campaign_id, rawModel.redirector_id, rawModel.page, rawModel.lure_count, new Date(rawModel.created_at));
|
|
142
|
+
return new FullRedirectorModel(rawModel.campaign_id, rawModel.redirector_id, rawModel.page, rawModel.fields, rawModel.lure_count, new Date(rawModel.created_at));
|
|
107
143
|
}
|
|
108
144
|
buildCollection(rawCollection) {
|
|
109
145
|
this.validateArrayReply(rawCollection);
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"redis-redirector.repository.js","sourceRoot":"","sources":["../../../src/modules/redirector/redis-redirector.repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
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"}
|
|
@@ -2,13 +2,13 @@ import { DIContainer } from '@famir/common';
|
|
|
2
2
|
import { Config } from '@famir/config';
|
|
3
3
|
import { Logger } from '@famir/logger';
|
|
4
4
|
import { Validator } from '@famir/validator';
|
|
5
|
-
import {
|
|
6
|
-
import { SessionModel } from '../../models/index.js';
|
|
5
|
+
import { DatabaseConnector, RedisDatabaseConfig } from '../../database.js';
|
|
7
6
|
import { RedisBaseRepository } from '../base/index.js';
|
|
8
7
|
import { SessionRepository } from './session.js';
|
|
8
|
+
import { SessionModel } from './session.models.js';
|
|
9
9
|
export declare class RedisSessionRepository extends RedisBaseRepository implements SessionRepository {
|
|
10
10
|
static register(container: DIContainer): void;
|
|
11
|
-
constructor(validator: Validator, config: Config<RedisDatabaseConfig>, logger: Logger,
|
|
11
|
+
constructor(validator: Validator, config: Config<RedisDatabaseConfig>, logger: Logger, connector: DatabaseConnector);
|
|
12
12
|
create(campaignId: string): Promise<SessionModel>;
|
|
13
13
|
read(campaignId: string, sessionId: string): Promise<SessionModel | null>;
|
|
14
14
|
auth(campaignId: string, sessionId: string): Promise<SessionModel>;
|
|
@@ -4,16 +4,16 @@ import { LOGGER } from '@famir/logger';
|
|
|
4
4
|
import { VALIDATOR } from '@famir/validator';
|
|
5
5
|
import { DatabaseError } from '../../database.error.js';
|
|
6
6
|
import { DATABASE_CONNECTOR } from '../../database.js';
|
|
7
|
-
import { SessionModel } from '../../models/index.js';
|
|
8
7
|
import { RedisBaseRepository } from '../base/index.js';
|
|
9
8
|
import { SESSION_REPOSITORY } from './session.js';
|
|
9
|
+
import { SessionModel } from './session.models.js';
|
|
10
10
|
import { sessionSchemas } from './session.schemas.js';
|
|
11
11
|
export class RedisSessionRepository extends RedisBaseRepository {
|
|
12
12
|
static register(container) {
|
|
13
|
-
container.registerSingleton(SESSION_REPOSITORY, (c) => new RedisSessionRepository(c.resolve(VALIDATOR), c.resolve(CONFIG), c.resolve(LOGGER), c.resolve(DATABASE_CONNECTOR)
|
|
13
|
+
container.registerSingleton(SESSION_REPOSITORY, (c) => new RedisSessionRepository(c.resolve(VALIDATOR), c.resolve(CONFIG), c.resolve(LOGGER), c.resolve(DATABASE_CONNECTOR)));
|
|
14
14
|
}
|
|
15
|
-
constructor(validator, config, logger,
|
|
16
|
-
super(validator, config, logger,
|
|
15
|
+
constructor(validator, config, logger, connector) {
|
|
16
|
+
super(validator, config, logger, connector, 'session');
|
|
17
17
|
this.validator.addSchemas(sessionSchemas);
|
|
18
18
|
this.logger.debug(`SessionRepository initialized`);
|
|
19
19
|
}
|
|
@@ -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()
|
|
25
|
-
this.connection.session.read_session(this.options.prefix, campaignId, sessionId)
|
|
24
|
+
this.connection.session.create_session(this.options.prefix, campaignId, sessionId, secret, Date.now()),
|
|
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()
|
|
48
|
-
this.connection.session.read_session(this.options.prefix, campaignId, sessionId)
|
|
50
|
+
this.connection.session.auth_session(this.options.prefix, campaignId, sessionId, Date.now()),
|
|
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,13 +79,13 @@ 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);
|
|
77
86
|
if (!SessionModel.isNotNull(model)) {
|
|
78
87
|
throw new DatabaseError(`Session unexpected lost`, {
|
|
79
|
-
code: 'INTERNAL_ERROR'
|
|
88
|
+
code: 'INTERNAL_ERROR',
|
|
80
89
|
});
|
|
81
90
|
}
|
|
82
91
|
return model;
|
|
@@ -0,0 +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;IAM7D,MAAM,CAAC,QAAQ,CAAC,SAAsB;QACpC,SAAS,CAAC,iBAAiB,CACzB,kBAAkB,EAClB,CAAC,CAAC,EAAE,EAAE,CACJ,IAAI,sBAAsB,CACxB,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,EACpB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EACjB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EACjB,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAC9B,CACJ,CAAA;IACH,CAAC;IAUD,YACE,SAAoB,EACpB,MAAmC,EACnC,MAAc,EACd,SAA4B;QAE5B,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC,CAAA;QAEtD,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,cAAc,CAAC,CAAA;QAEzC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAA;IACpD,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,UAAkB;QAC7B,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,WAAW,EAAE,CAAC,CAAA;QAE1D,IAAI,CAAC;YACH,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBAChD,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,cAAc,CACpC,IAAI,CAAC,OAAO,CAAC,MAAM,EACnB,UAAU,EACV,SAAS,EACT,MAAM,EACN,IAAI,CAAC,GAAG,EAAE,CACX;gBAED,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAC;aACjF,CAAC,CAAA;YAEF,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAA;YAEvD,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;gBAClB,MAAM,IAAI,aAAa,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;YACzC,CAAC;YAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,CAAC,CAAA;YAE9D,OAAO,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAA;QACxC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC,CAAA;QAC7D,CAAC;IACH,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,UAAkB,EAAE,SAAiB;QAC9C,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,YAAY,CACzD,IAAI,CAAC,OAAO,CAAC,MAAM,EACnB,UAAU,EACV,SAAS,CACV,CAAA;YAED,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;QAClC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC,CAAA;QAC3D,CAAC;IACH,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,UAAkB,EAAE,SAAiB;QAC9C,IAAI,CAAC;YACH,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBAChD,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,YAAY,CAClC,IAAI,CAAC,OAAO,CAAC,MAAM,EACnB,UAAU,EACV,SAAS,EACT,IAAI,CAAC,GAAG,EAAE,CACX;gBAED,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAC;aACjF,CAAC,CAAA;YAEF,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAA;YAEvD,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;gBAClB,MAAM,IAAI,aAAa,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;YACzC,CAAC;YAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,CAAC,CAAA;YAE9D,OAAO,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAA;QACxC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC,CAAA;QAC3D,CAAC;IACH,CAAC;IAED,KAAK,CAAC,OAAO,CACX,UAAkB,EAClB,MAAc,EACd,SAAiB,EACjB,MAAc;QAEd,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,eAAe,CAC/D,IAAI,CAAC,OAAO,CAAC,MAAM,EACnB,UAAU,EACV,MAAM,EACN,SAAS,EACT,MAAM,CACP,CAAA;YAED,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAA;YAEvD,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;gBAClB,MAAM,IAAI,aAAa,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;YACzC,CAAC;YAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,CAAC,CAAA;QACxE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAA;QACtE,CAAC;IACH,CAAC;IAUS,UAAU,CAAC,QAAiB;QACpC,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;YACtB,OAAO,IAAI,CAAA;QACb,CAAC;QAED,IAAI,CAAC,eAAe,CAAa,sBAAsB,EAAE,QAAQ,CAAC,CAAA;QAElE,OAAO,IAAI,YAAY,CACrB,QAAQ,CAAC,WAAW,EACpB,QAAQ,CAAC,UAAU,EACnB,QAAQ,CAAC,QAAQ,EACjB,QAAQ,CAAC,MAAM,EACf,QAAQ,CAAC,WAAW,EACpB,QAAQ,CAAC,aAAa,EACtB,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,EAC7B,IAAI,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CACjC,CAAA;IACH,CAAC;IAUS,gBAAgB,CAAC,QAAiB;QAC1C,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;QAEvC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;YACnC,MAAM,IAAI,aAAa,CAAC,yBAAyB,EAAE;gBACjD,IAAI,EAAE,gBAAgB;aACvB,CAAC,CAAA;QACJ,CAAC;QAED,OAAO,KAAK,CAAA;IACd,CAAC;CACF"}
|
|
@@ -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,9 +10,9 @@ 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
|
-
transformReply: undefined
|
|
15
|
+
transformReply: undefined,
|
|
16
16
|
},
|
|
17
17
|
read_session: {
|
|
18
18
|
NUMBER_OF_KEYS: 2,
|
|
@@ -20,7 +20,7 @@ export const sessionFunctions = {
|
|
|
20
20
|
parser.pushKey(campaignKey(prefix, campaignId));
|
|
21
21
|
parser.pushKey(sessionKey(prefix, campaignId, sessionId));
|
|
22
22
|
},
|
|
23
|
-
transformReply: undefined
|
|
23
|
+
transformReply: undefined,
|
|
24
24
|
},
|
|
25
25
|
auth_session: {
|
|
26
26
|
NUMBER_OF_KEYS: 3,
|
|
@@ -28,9 +28,9 @@ 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
|
-
transformReply: undefined
|
|
33
|
+
transformReply: undefined,
|
|
34
34
|
},
|
|
35
35
|
upgrade_session: {
|
|
36
36
|
NUMBER_OF_KEYS: 3,
|
|
@@ -40,8 +40,8 @@ export const sessionFunctions = {
|
|
|
40
40
|
parser.pushKey(sessionKey(prefix, campaignId, sessionId));
|
|
41
41
|
parser.push(secret);
|
|
42
42
|
},
|
|
43
|
-
transformReply: undefined
|
|
44
|
-
}
|
|
45
|
-
}
|
|
43
|
+
transformReply: undefined,
|
|
44
|
+
},
|
|
45
|
+
},
|
|
46
46
|
};
|
|
47
47
|
//# sourceMappingURL=session.functions.js.map
|
|
@@ -0,0 +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;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"}
|
|
@@ -0,0 +1 @@
|
|
|
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"}
|
|
@@ -0,0 +1 @@
|
|
|
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"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import { JSONSchemaType, ValidatorSchemas } from '@famir/validator';
|
|
2
|
+
import { UpgradeSessionParams } from './session.models.js';
|
|
3
|
+
export declare const upgradeSessionParamsSchema: JSONSchemaType<UpgradeSessionParams>;
|
|
4
|
+
export declare const sessionSchemas: ValidatorSchemas;
|