@adtrackify/at-service-common 2.0.0 → 2.0.2
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/dist/cjs/clients/generic/dynamodb-client.js +1 -1
- package/dist/cjs/clients/generic/dynamodb-client.js.map +1 -1
- package/dist/cjs/libs/clickId-parser.js +15 -8
- package/dist/cjs/libs/clickId-parser.js.map +1 -1
- package/dist/cjs/services/ipdata-lookup-service.js +5 -1
- package/dist/cjs/services/ipdata-lookup-service.js.map +1 -1
- package/dist/esm/clients/generic/dynamodb-client.js +1 -1
- package/dist/esm/clients/generic/dynamodb-client.js.map +1 -1
- package/dist/esm/libs/clickId-parser.js +15 -8
- package/dist/esm/libs/clickId-parser.js.map +1 -1
- package/dist/esm/services/ipdata-lookup-service.js +5 -1
- package/dist/esm/services/ipdata-lookup-service.js.map +1 -1
- package/package.json +1 -1
|
@@ -6,7 +6,7 @@ const lib_dynamodb_1 = require("@aws-sdk/lib-dynamodb");
|
|
|
6
6
|
const index_js_1 = require("../../index.js");
|
|
7
7
|
const marshallOptions = {
|
|
8
8
|
convertEmptyValues: false,
|
|
9
|
-
removeUndefinedValues:
|
|
9
|
+
removeUndefinedValues: true,
|
|
10
10
|
convertClassInstanceToMap: true
|
|
11
11
|
};
|
|
12
12
|
const unmarshallOptions = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamodb-client.js","sourceRoot":"","sources":["../../../../src/clients/generic/dynamodb-client.ts"],"names":[],"mappings":";;;AAAA,8DAAuE;AACvE,wDAAyD;AACzD,6CAAwC;AAExC,MAAM,eAAe,GAAG;IACtB,kBAAkB,EAAE,KAAK;IACzB,qBAAqB,EAAE,
|
|
1
|
+
{"version":3,"file":"dynamodb-client.js","sourceRoot":"","sources":["../../../../src/clients/generic/dynamodb-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.parseClickId = exports.ClickIdDictionary = void 0;
|
|
4
4
|
const at_shared_utils_1 = require("@adtrackify/at-shared-utils");
|
|
5
|
+
const helpers_1 = require("../helpers");
|
|
5
6
|
exports.ClickIdDictionary = {
|
|
6
7
|
'gclid': 'Google',
|
|
7
8
|
'dclid': 'Google',
|
|
@@ -16,17 +17,23 @@ exports.ClickIdDictionary = {
|
|
|
16
17
|
'microsoftclickid': 'Microsoft',
|
|
17
18
|
};
|
|
18
19
|
const parseClickId = (qsp) => {
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
20
|
+
try {
|
|
21
|
+
if (!(0, at_shared_utils_1.isEmpty)(qsp)) {
|
|
22
|
+
for (const item of Object.entries(exports.ClickIdDictionary)) {
|
|
23
|
+
if (qsp.has(item?.[0])) {
|
|
24
|
+
return {
|
|
25
|
+
mktClickParam: item[0],
|
|
26
|
+
mktClickId: qsp.get(item[0]),
|
|
27
|
+
mktClickNetwork: item[1]
|
|
28
|
+
};
|
|
29
|
+
}
|
|
27
30
|
}
|
|
28
31
|
}
|
|
29
32
|
}
|
|
33
|
+
catch (error) {
|
|
34
|
+
helpers_1.Logger.warn('Unable to parse click ID', { error });
|
|
35
|
+
return undefined;
|
|
36
|
+
}
|
|
30
37
|
};
|
|
31
38
|
exports.parseClickId = parseClickId;
|
|
32
39
|
//# sourceMappingURL=clickId-parser.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clickId-parser.js","sourceRoot":"","sources":["../../../src/libs/clickId-parser.ts"],"names":[],"mappings":";;;AAAA,iEAAsD;
|
|
1
|
+
{"version":3,"file":"clickId-parser.js","sourceRoot":"","sources":["../../../src/libs/clickId-parser.ts"],"names":[],"mappings":";;;AAAA,iEAAsD;AACtD,wCAAoC;AAEvB,QAAA,iBAAiB,GAAG;IAC/B,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,QAAQ;IACjB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,SAAS;IACnB,OAAO,EAAE,UAAU;IACnB,kBAAkB,EAAE,SAAS;IAC7B,aAAa,EAAE,UAAU;IACzB,kBAAkB,EAAE,WAAW;CAChC,CAAC;AAEK,MAAM,YAAY,GAAG,CAAC,GAAoB,EAAE,EAAE;IACnD,IAAI;QACF,IAAI,CAAC,IAAA,yBAAO,EAAC,GAAG,CAAC,EAAE;YACjB,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,OAAO,CAAC,yBAAiB,CAAC,EAAE;gBACpD,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE;oBACtB,OAAO;wBACL,aAAa,EAAE,IAAI,CAAC,CAAC,CAAC;wBACtB,UAAU,EAAE,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;wBAC5B,eAAe,EAAE,IAAI,CAAC,CAAC,CAAC;qBACzB,CAAC;iBACH;aACF;SACF;KACF;IAAC,OAAO,KAAK,EAAE;QACd,gBAAM,CAAC,IAAI,CAAC,0BAA0B,EAAE,EAAE,KAAK,EAAE,CAAC,CAAA;QAClD,OAAO,SAAS,CAAA;KACjB;AACH,CAAC,CAAC;AAjBW,QAAA,YAAY,gBAiBvB"}
|
|
@@ -5,6 +5,7 @@ const luxon_1 = require("luxon");
|
|
|
5
5
|
const clients_1 = require("../clients");
|
|
6
6
|
const helpers_1 = require("../helpers");
|
|
7
7
|
const libs_1 = require("../libs");
|
|
8
|
+
const net_1 = require("net");
|
|
8
9
|
const API_KEY = 'aae45f1e1f97ecf79bdc2bef3e96ef71961c4cb977c3085429b421bc';
|
|
9
10
|
const IP_LOOKUP_TABLE_NAME = process.env.IP_LOOKUP_TABLE_NAME;
|
|
10
11
|
const getLookupApi = async (ipAddress) => {
|
|
@@ -21,6 +22,9 @@ const getLookupApi = async (ipAddress) => {
|
|
|
21
22
|
};
|
|
22
23
|
const lookupIP = async (ipAddress) => {
|
|
23
24
|
try {
|
|
25
|
+
if ((0, net_1.isIP)(ipAddress) === 0) {
|
|
26
|
+
helpers_1.Logger.warn('Unable to lookup IP. Invalid Ip Address', { ipAddress });
|
|
27
|
+
}
|
|
24
28
|
const cachedResult = await clients_1.DynamoDbClient.safeGet(IP_LOOKUP_TABLE_NAME, 'ipAddress', ipAddress);
|
|
25
29
|
const cacheExpirationDate = luxon_1.DateTime.utc().minus({ days: 2 }).toJSDate().toISOString();
|
|
26
30
|
if (cachedResult && cachedResult?.updatedAt > cacheExpirationDate) {
|
|
@@ -48,8 +52,8 @@ const lookupIP = async (ipAddress) => {
|
|
|
48
52
|
}
|
|
49
53
|
catch (e) {
|
|
50
54
|
helpers_1.Logger.error('Failed to lookup IP', { error: e });
|
|
55
|
+
return null;
|
|
51
56
|
}
|
|
52
|
-
return null;
|
|
53
57
|
};
|
|
54
58
|
exports.lookupIP = lookupIP;
|
|
55
59
|
//# sourceMappingURL=ipdata-lookup-service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ipdata-lookup-service.js","sourceRoot":"","sources":["../../../src/services/ipdata-lookup-service.ts"],"names":[],"mappings":";;;AACA,iCAAiC;AAEjC,wCAA8D;AAC9D,wCAAoC;AACpC,kCAA8C;
|
|
1
|
+
{"version":3,"file":"ipdata-lookup-service.js","sourceRoot":"","sources":["../../../src/services/ipdata-lookup-service.ts"],"names":[],"mappings":";;;AACA,iCAAiC;AAEjC,wCAA8D;AAC9D,wCAAoC;AACpC,kCAA8C;AAC9C,6BAA2B;AAE3B,MAAM,OAAO,GAAG,0DAA0D,CAAC;AAC3E,MAAM,oBAAoB,GAAG,OAAO,CAAC,GAAG,CAAC,oBAA8B,CAAC;AASxE,MAAM,YAAY,GAAG,KAAK,EAAE,SAAiB,EAAkC,EAAE;IAC/E,IAAI;QACF,MAAM,MAAM,GAAG,IAAA,0BAAgB,GAAE,CAAC;QAClC,MAAM,GAAG,GAAG,yBAAyB,SAAS,YAAY,OAAO,EAAE,CAAC;QACpE,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAClC,OAAO,GAAG,EAAE,IAAsB,CAAC;KACpC;IAAC,OAAO,KAAK,EAAE;QACd,gBAAM,CAAC,KAAK,CAAC,0BAA0B,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QACpD,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAC;AAEK,MAAM,QAAQ,GAAG,KAAK,EAAE,SAAiB,EAAkC,EAAE;IAClF,IAAI;QACF,IAAI,IAAA,UAAI,EAAC,SAAS,CAAC,KAAK,CAAC,EAAE;YACzB,gBAAM,CAAC,IAAI,CAAC,0CAA0C,EAAE,EAAE,SAAS,EAAE,CAAC,CAAA;SACvE;QACD,MAAM,YAAY,GAAG,MAAM,wBAAc,CAAC,OAAO,CAAC,oBAAoB,EAAE,WAAW,EAAE,SAAS,CAAwB,CAAC;QACvH,MAAM,mBAAmB,GAAG,gBAAQ,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,WAAW,EAAE,CAAC;QACvF,IAAI,YAAY,IAAI,YAAY,EAAE,SAAS,GAAG,mBAAmB,EAAE;YACjE,OAAO,YAAY,CAAC,cAAc,CAAC;SACpC;QAED,MAAM,cAAc,GAA0B,MAAM,YAAY,CAAC,SAAS,CAAC,CAAC;QAE5E,IAAI,iBAAsC,CAAC;QAC3C,IAAI,YAAY,EAAE;YAChB,iBAAiB,GAAG;gBAClB,GAAG,YAAY;gBACf,cAAc;gBACd,SAAS,EAAE,IAAA,0BAAmB,GAAE;aACjC,CAAC;SACH;aAAM;YACL,iBAAiB,GAAG;gBAClB,SAAS;gBACT,cAAc;gBACd,SAAS,EAAE,IAAA,0BAAmB,GAAE;gBAChC,SAAS,EAAE,IAAA,0BAAmB,GAAE;aACjC,CAAC;SACH;QACD,MAAM,wBAAc,CAAC,OAAO,CAAC,oBAAoB,EAAE,iBAAiB,CAAC,CAAC;QACtE,OAAO,cAAc,CAAC;KACvB;IAAC,OAAO,CAAC,EAAE;QACV,gBAAM,CAAC,KAAK,CAAC,qBAAqB,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;QAClD,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAC;AAlCW,QAAA,QAAQ,YAkCnB"}
|
|
@@ -3,7 +3,7 @@ import { DynamoDBDocument } from '@aws-sdk/lib-dynamodb';
|
|
|
3
3
|
import { Logger } from '../../index.js';
|
|
4
4
|
const marshallOptions = {
|
|
5
5
|
convertEmptyValues: false,
|
|
6
|
-
removeUndefinedValues:
|
|
6
|
+
removeUndefinedValues: true,
|
|
7
7
|
convertClassInstanceToMap: true
|
|
8
8
|
};
|
|
9
9
|
const unmarshallOptions = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamodb-client.js","sourceRoot":"","sources":["../../../../src/clients/generic/dynamodb-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAe,MAAM,0BAA0B,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAExC,MAAM,eAAe,GAAG;IACtB,kBAAkB,EAAE,KAAK;IACzB,qBAAqB,EAAE,
|
|
1
|
+
{"version":3,"file":"dynamodb-client.js","sourceRoot":"","sources":["../../../../src/clients/generic/dynamodb-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { isEmpty } from '@adtrackify/at-shared-utils';
|
|
2
|
+
import { Logger } from '../helpers';
|
|
2
3
|
export const ClickIdDictionary = {
|
|
3
4
|
'gclid': 'Google',
|
|
4
5
|
'dclid': 'Google',
|
|
@@ -13,16 +14,22 @@ export const ClickIdDictionary = {
|
|
|
13
14
|
'microsoftclickid': 'Microsoft',
|
|
14
15
|
};
|
|
15
16
|
export const parseClickId = (qsp) => {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
17
|
+
try {
|
|
18
|
+
if (!isEmpty(qsp)) {
|
|
19
|
+
for (const item of Object.entries(ClickIdDictionary)) {
|
|
20
|
+
if (qsp.has(item?.[0])) {
|
|
21
|
+
return {
|
|
22
|
+
mktClickParam: item[0],
|
|
23
|
+
mktClickId: qsp.get(item[0]),
|
|
24
|
+
mktClickNetwork: item[1]
|
|
25
|
+
};
|
|
26
|
+
}
|
|
24
27
|
}
|
|
25
28
|
}
|
|
26
29
|
}
|
|
30
|
+
catch (error) {
|
|
31
|
+
Logger.warn('Unable to parse click ID', { error });
|
|
32
|
+
return undefined;
|
|
33
|
+
}
|
|
27
34
|
};
|
|
28
35
|
//# sourceMappingURL=clickId-parser.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clickId-parser.js","sourceRoot":"","sources":["../../../src/libs/clickId-parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"clickId-parser.js","sourceRoot":"","sources":["../../../src/libs/clickId-parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEpC,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,QAAQ;IACjB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,SAAS;IACnB,OAAO,EAAE,UAAU;IACnB,kBAAkB,EAAE,SAAS;IAC7B,aAAa,EAAE,UAAU;IACzB,kBAAkB,EAAE,WAAW;CAChC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,GAAoB,EAAE,EAAE;IACnD,IAAI;QACF,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YACjB,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE;gBACpD,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE;oBACtB,OAAO;wBACL,aAAa,EAAE,IAAI,CAAC,CAAC,CAAC;wBACtB,UAAU,EAAE,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;wBAC5B,eAAe,EAAE,IAAI,CAAC,CAAC,CAAC;qBACzB,CAAC;iBACH;aACF;SACF;KACF;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,CAAC,IAAI,CAAC,0BAA0B,EAAE,EAAE,KAAK,EAAE,CAAC,CAAA;QAClD,OAAO,SAAS,CAAA;KACjB;AACH,CAAC,CAAC"}
|
|
@@ -2,6 +2,7 @@ import { DateTime } from 'luxon';
|
|
|
2
2
|
import { axiosHttpService, DynamoDbClient } from '../clients';
|
|
3
3
|
import { Logger } from '../helpers';
|
|
4
4
|
import { getCurrentTimestamp } from '../libs';
|
|
5
|
+
import { isIP } from 'net';
|
|
5
6
|
const API_KEY = 'aae45f1e1f97ecf79bdc2bef3e96ef71961c4cb977c3085429b421bc';
|
|
6
7
|
const IP_LOOKUP_TABLE_NAME = process.env.IP_LOOKUP_TABLE_NAME;
|
|
7
8
|
const getLookupApi = async (ipAddress) => {
|
|
@@ -18,6 +19,9 @@ const getLookupApi = async (ipAddress) => {
|
|
|
18
19
|
};
|
|
19
20
|
export const lookupIP = async (ipAddress) => {
|
|
20
21
|
try {
|
|
22
|
+
if (isIP(ipAddress) === 0) {
|
|
23
|
+
Logger.warn('Unable to lookup IP. Invalid Ip Address', { ipAddress });
|
|
24
|
+
}
|
|
21
25
|
const cachedResult = await DynamoDbClient.safeGet(IP_LOOKUP_TABLE_NAME, 'ipAddress', ipAddress);
|
|
22
26
|
const cacheExpirationDate = DateTime.utc().minus({ days: 2 }).toJSDate().toISOString();
|
|
23
27
|
if (cachedResult && cachedResult?.updatedAt > cacheExpirationDate) {
|
|
@@ -45,7 +49,7 @@ export const lookupIP = async (ipAddress) => {
|
|
|
45
49
|
}
|
|
46
50
|
catch (e) {
|
|
47
51
|
Logger.error('Failed to lookup IP', { error: e });
|
|
52
|
+
return null;
|
|
48
53
|
}
|
|
49
|
-
return null;
|
|
50
54
|
};
|
|
51
55
|
//# sourceMappingURL=ipdata-lookup-service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ipdata-lookup-service.js","sourceRoot":"","sources":["../../../src/services/ipdata-lookup-service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEjC,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"ipdata-lookup-service.js","sourceRoot":"","sources":["../../../src/services/ipdata-lookup-service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEjC,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAE3B,MAAM,OAAO,GAAG,0DAA0D,CAAC;AAC3E,MAAM,oBAAoB,GAAG,OAAO,CAAC,GAAG,CAAC,oBAA8B,CAAC;AASxE,MAAM,YAAY,GAAG,KAAK,EAAE,SAAiB,EAAkC,EAAE;IAC/E,IAAI;QACF,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAC;QAClC,MAAM,GAAG,GAAG,yBAAyB,SAAS,YAAY,OAAO,EAAE,CAAC;QACpE,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAClC,OAAO,GAAG,EAAE,IAAsB,CAAC;KACpC;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,CAAC,KAAK,CAAC,0BAA0B,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QACpD,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,EAAE,SAAiB,EAAkC,EAAE;IAClF,IAAI;QACF,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;YACzB,MAAM,CAAC,IAAI,CAAC,0CAA0C,EAAE,EAAE,SAAS,EAAE,CAAC,CAAA;SACvE;QACD,MAAM,YAAY,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,oBAAoB,EAAE,WAAW,EAAE,SAAS,CAAwB,CAAC;QACvH,MAAM,mBAAmB,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,WAAW,EAAE,CAAC;QACvF,IAAI,YAAY,IAAI,YAAY,EAAE,SAAS,GAAG,mBAAmB,EAAE;YACjE,OAAO,YAAY,CAAC,cAAc,CAAC;SACpC;QAED,MAAM,cAAc,GAA0B,MAAM,YAAY,CAAC,SAAS,CAAC,CAAC;QAE5E,IAAI,iBAAsC,CAAC;QAC3C,IAAI,YAAY,EAAE;YAChB,iBAAiB,GAAG;gBAClB,GAAG,YAAY;gBACf,cAAc;gBACd,SAAS,EAAE,mBAAmB,EAAE;aACjC,CAAC;SACH;aAAM;YACL,iBAAiB,GAAG;gBAClB,SAAS;gBACT,cAAc;gBACd,SAAS,EAAE,mBAAmB,EAAE;gBAChC,SAAS,EAAE,mBAAmB,EAAE;aACjC,CAAC;SACH;QACD,MAAM,cAAc,CAAC,OAAO,CAAC,oBAAoB,EAAE,iBAAiB,CAAC,CAAC;QACtE,OAAO,cAAc,CAAC;KACvB;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,CAAC,KAAK,CAAC,qBAAqB,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;QAClD,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAC"}
|