@iobroker/js-controller-common 4.0.21 → 4.1.0-alpha.0-20220819-74ceeddc
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/build/index.d.ts +5 -0
- package/build/index.js +34 -0
- package/build/lib/common/exitCodes.d.ts +59 -0
- package/build/lib/common/exitCodes.d.ts.map +1 -0
- package/build/lib/common/exitCodes.js +63 -0
- package/build/lib/common/exitCodes.js.map +1 -0
- package/build/lib/common/logger.d.ts +14 -0
- package/build/lib/common/logger.d.ts.map +1 -0
- package/{lib → build/lib}/common/logger.js +191 -193
- package/build/lib/common/logger.js.map +1 -0
- package/build/lib/common/maybeCallback.d.ts +17 -0
- package/build/lib/common/maybeCallback.d.ts.map +1 -0
- package/build/lib/common/maybeCallback.js +65 -0
- package/build/lib/common/maybeCallback.js.map +1 -0
- package/build/lib/common/password.d.ts +37 -0
- package/build/lib/common/password.d.ts.map +1 -0
- package/{lib → build/lib}/common/password.js +26 -46
- package/build/lib/common/password.js.map +1 -0
- package/build/lib/common/tools.d.ts +559 -0
- package/build/lib/common/tools.d.ts.map +1 -0
- package/{lib → build/lib}/common/tools.js +1122 -1501
- package/build/lib/common/tools.js.map +1 -0
- package/package.json +30 -14
- package/index.js +0 -6
- package/lib/common/exitCodes.js +0 -65
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/lib/common/logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
declare type MaybeCbCallback<T extends any[]> = (...args: T) => void;
|
|
2
|
+
declare type MaybeCbErrCallback<T extends any[]> = (error: Error | null | undefined, ...args: T) => void;
|
|
3
|
+
declare type MaybeCbErrReturnType<TCb extends MaybeCbErrCallback<any> | null | undefined, TErr extends Error | string | null | undefined, TArgs extends any[]> = TCb extends MaybeCbErrCallback<any> ? void : TErr extends Error | string ? Promise<never> : Promise<[
|
|
4
|
+
] extends TArgs ? void : [any] extends TArgs ? TArgs[0] : TArgs>;
|
|
5
|
+
declare type MaybeCbErrCallbackParameters<CB extends MaybeCbErrCallback<any> | null | undefined, TErr extends Error | string | null | undefined> = Exclude<CB, undefined | null> extends MaybeCbErrCallback<infer U> ? TErr extends Error | string ? // don't require arguments, but allow passing them
|
|
6
|
+
U | [] : U : any[];
|
|
7
|
+
declare type MaybeCbCallbackParameters<CB extends MaybeCbCallback<any> | null | undefined> = Exclude<CB, undefined | null> extends MaybeCbCallback<infer U> ? U : any[];
|
|
8
|
+
declare type MaybeCbReturnType<TCb extends MaybeCbErrCallback<any> | null | undefined, TArgs extends any[]> = TCb extends MaybeCbCallback<any> ? void : Promise<[
|
|
9
|
+
] extends TArgs ? void : [any] extends TArgs ? TArgs[0] : TArgs>;
|
|
10
|
+
declare type NoInfer<T> = T & {
|
|
11
|
+
[K in keyof T]: T[K];
|
|
12
|
+
};
|
|
13
|
+
export declare function maybeCallback<TCb extends MaybeCbCallback<any> | null | undefined, TArgs extends MaybeCbCallbackParameters<TCb> = MaybeCbCallbackParameters<TCb>>(callback: TCb, ...args: NoInfer<TArgs>): MaybeCbReturnType<TCb, TArgs>;
|
|
14
|
+
export declare function maybeCallbackWithError<TCb extends MaybeCbErrCallback<any> | null | undefined, TErr extends Error | string | null | undefined, TArgs extends MaybeCbErrCallbackParameters<TCb, TErr> = MaybeCbErrCallbackParameters<TCb, TErr>>(callback: TCb, error: TErr, ...args: NoInfer<TArgs>): MaybeCbErrReturnType<TCb, TErr, TArgs>;
|
|
15
|
+
export declare function maybeCallbackWithRedisError<TCb extends MaybeCbErrCallback<any> | null | undefined, TErr extends Error | string | null | undefined, TArgs extends MaybeCbErrCallbackParameters<TCb, TErr> = MaybeCbErrCallbackParameters<TCb, TErr>>(callback: TCb, error: TErr, ...args: NoInfer<TArgs>): MaybeCbErrReturnType<TCb, TErr, TArgs>;
|
|
16
|
+
export {};
|
|
17
|
+
//# sourceMappingURL=maybeCallback.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"maybeCallback.d.ts","sourceRoot":"","sources":["../../../src/lib/common/maybeCallback.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// Beware, below be TypeScript dragons!
|
|
3
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
+
exports.maybeCallbackWithRedisError = exports.maybeCallbackWithError = exports.maybeCallback = void 0;
|
|
5
|
+
const tools_1 = require("./tools");
|
|
6
|
+
/**
|
|
7
|
+
* Checks if the given callback is a function and if so calls it with the given parameter immediately, else a resolved Promise is returned
|
|
8
|
+
*
|
|
9
|
+
* @param callback - callback function to be executed
|
|
10
|
+
* @param args - as many arguments as needed, which will be returned by the callback function or by the Promise
|
|
11
|
+
* @returns if Promise is resolved with multiple arguments, an array is returned
|
|
12
|
+
*/
|
|
13
|
+
function maybeCallback(callback, ...args) {
|
|
14
|
+
if (typeof callback === 'function') {
|
|
15
|
+
// if function we call it with given param
|
|
16
|
+
setImmediate(callback, ...args);
|
|
17
|
+
}
|
|
18
|
+
else {
|
|
19
|
+
return Promise.resolve(args.length > 1 ? args : args[0]);
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
exports.maybeCallback = maybeCallback;
|
|
23
|
+
/**
|
|
24
|
+
* Checks if the given callback is a function and if so calls it with the given error and parameter immediately, else a resolved or rejected Promise is returned. Error ERROR_DB_CLOSED are not rejecting the promise
|
|
25
|
+
*
|
|
26
|
+
* @param callback - callback function to be executed
|
|
27
|
+
* @param error - error which will be used by the callback function. If callback is not a function and
|
|
28
|
+
* error is given, a rejected Promise is returned. If error is given but it is not an instance of Error, it is converted into one.
|
|
29
|
+
* @param args - as many arguments as needed, which will be returned by the callback function or by the Promise
|
|
30
|
+
* @returns if Promise is resolved with multiple arguments, an array is returned
|
|
31
|
+
*/
|
|
32
|
+
function maybeCallbackWithError(callback, error, ...args) {
|
|
33
|
+
if (error !== undefined && error !== null && !(error instanceof Error)) {
|
|
34
|
+
// if it's not a real Error, we convert it into one
|
|
35
|
+
error = new Error(error);
|
|
36
|
+
}
|
|
37
|
+
const isDbError = error ? error.message === tools_1.ERRORS.ERROR_DB_CLOSED : false;
|
|
38
|
+
if (typeof callback === 'function') {
|
|
39
|
+
setImmediate(callback, error, ...args);
|
|
40
|
+
}
|
|
41
|
+
else if (error && !isDbError) {
|
|
42
|
+
return Promise.reject(error);
|
|
43
|
+
}
|
|
44
|
+
else {
|
|
45
|
+
return Promise.resolve(args.length > 1 ? args : args[0]);
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
exports.maybeCallbackWithError = maybeCallbackWithError;
|
|
49
|
+
/**
|
|
50
|
+
* Checks if the given callback is a function and if so calls it with the given error and parameter immediately, else a resolved or rejected Promise is returned. Redis-Error "Connection is closed." is converted into ERROR_DB_CLOSED
|
|
51
|
+
*
|
|
52
|
+
* @param callback - callback function to be executed
|
|
53
|
+
* @param error - error which will be used by the callback function. If callback is not a function and
|
|
54
|
+
* error is given, a rejected Promise is returned. If error is given but it is not an instance of Error, it is converted into one.
|
|
55
|
+
* @param args - as many arguments as needed, which will be returned by the callback function or by the Promise
|
|
56
|
+
* @returns Promise if Promise is resolved with multiple arguments, an array is returned
|
|
57
|
+
*/
|
|
58
|
+
function maybeCallbackWithRedisError(callback, error, ...args) {
|
|
59
|
+
if (error instanceof Error && error.message.includes('Connection is closed')) {
|
|
60
|
+
error.message = tools_1.ERRORS.ERROR_DB_CLOSED;
|
|
61
|
+
}
|
|
62
|
+
return maybeCallbackWithError(callback, error, ...args);
|
|
63
|
+
}
|
|
64
|
+
exports.maybeCallbackWithRedisError = maybeCallbackWithRedisError;
|
|
65
|
+
//# sourceMappingURL=maybeCallback.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"maybeCallback.js","sourceRoot":"","sources":["../../../src/lib/common/maybeCallback.ts"],"names":[],"mappings":";AAAA,uCAAuC;;;AAEvC,mCAAiC;AAkFjC;;;;;;GAMG;AACH,SAAgB,aAAa,CACzB,QAAgD,EAChD,GAAG,IAAO;IAEV,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE;QAChC,0CAA0C;QAC1C,YAAY,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,CAAC;KACnC;SAAM;QACH,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;KAC5D;AACL,CAAC;AAVD,sCAUC;AAkBD;;;;;;;;GAQG;AACH,SAAgB,sBAAsB,CAClC,QAAkD,EAClD,KAAwC,EACxC,GAAG,IAAO;IAEV,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,CAAC,KAAK,YAAY,KAAK,CAAC,EAAE;QACpE,mDAAmD;QACnD,KAAK,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC;KAC5B;IACD,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,KAAK,cAAM,CAAC,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC;IAE3E,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE;QAChC,YAAY,CAAC,QAAQ,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC;KAC1C;SAAM,IAAI,KAAK,IAAI,CAAC,SAAS,EAAE;QAC5B,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KAChC;SAAM;QACH,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;KAC5D;AACL,CAAC;AAlBD,wDAkBC;AAkBD;;;;;;;;GAQG;AACH,SAAgB,2BAA2B,CACvC,QAAkD,EAClD,KAAwC,EACxC,GAAG,IAAO;IAEV,IAAI,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EAAE;QAC1E,KAAK,CAAC,OAAO,GAAG,cAAM,CAAC,eAAe,CAAC;KAC1C;IACD,OAAO,sBAAsB,CAAC,QAAQ,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC;AAC5D,CAAC;AATD,kEASC"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
/**
|
|
2
|
+
*
|
|
3
|
+
* password hash and check
|
|
4
|
+
*
|
|
5
|
+
* 7'2014-2022 Bluefox <dogafox@gmail.com>
|
|
6
|
+
* 2014 hobbyquaker <hq@ccu.io>
|
|
7
|
+
*
|
|
8
|
+
* derived from https://github.com/florianheinemann/password-hash-and-salt/ (MIT License)
|
|
9
|
+
*
|
|
10
|
+
* The created hash is of the following format: <algorithm>$<iterations>$<hash>$<salt>
|
|
11
|
+
*
|
|
12
|
+
* Usage Example:
|
|
13
|
+
|
|
14
|
+
var password = require('./lib/password.js');
|
|
15
|
+
|
|
16
|
+
password('test').hash(null, null, function (err, res) {
|
|
17
|
+
console.log(res);
|
|
18
|
+
|
|
19
|
+
password('test').check(res, function (err, res) {
|
|
20
|
+
console.log('test: ' + res);
|
|
21
|
+
});
|
|
22
|
+
|
|
23
|
+
password('muh').check(res, function (err, res) {
|
|
24
|
+
console.log('muh: ' + res);
|
|
25
|
+
});
|
|
26
|
+
|
|
27
|
+
});
|
|
28
|
+
|
|
29
|
+
*
|
|
30
|
+
*/
|
|
31
|
+
export interface PasswordReturnValue {
|
|
32
|
+
complexity: (password: string, callback: (isComplex: boolean) => void) => boolean;
|
|
33
|
+
check: (hashedPassword: string, callback: (err?: Error | null, isOk?: boolean) => void) => void;
|
|
34
|
+
hash: (salt: string | null, iterations: number | null, callback: (err?: Error | null, hash?: string) => void) => void;
|
|
35
|
+
}
|
|
36
|
+
export declare function password(pw: string): PasswordReturnValue;
|
|
37
|
+
//# sourceMappingURL=password.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"password.d.ts","sourceRoot":"","sources":["../../../src/lib/common/password.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AAIH,MAAM,WAAW,mBAAmB;IAChC,UAAU,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,KAAK,OAAO,CAAC;IAClF,KAAK,EAAE,CAAC,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,GAAG,IAAI,EAAE,IAAI,CAAC,EAAE,OAAO,KAAK,IAAI,KAAK,IAAI,CAAC;IAChG,IAAI,EAAE,CACF,IAAI,EAAE,MAAM,GAAG,IAAI,EACnB,UAAU,EAAE,MAAM,GAAG,IAAI,EACzB,QAAQ,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,GAAG,IAAI,EAAE,IAAI,CAAC,EAAE,MAAM,KAAK,IAAI,KACpD,IAAI,CAAC;CACb;AAED,wBAAgB,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,mBAAmB,CA+CxD"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
"use strict";
|
|
1
2
|
/**
|
|
2
3
|
*
|
|
3
4
|
* password hash and check
|
|
@@ -28,61 +29,40 @@
|
|
|
28
29
|
|
|
29
30
|
*
|
|
30
31
|
*/
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
let version = null;
|
|
39
|
-
|
|
40
|
-
const password = pw => {
|
|
32
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
33
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
34
|
+
};
|
|
35
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
exports.password = void 0;
|
|
37
|
+
const crypto_1 = __importDefault(require("crypto"));
|
|
38
|
+
function password(pw) {
|
|
41
39
|
return {
|
|
42
40
|
hash: (salt, iterations, callback) => {
|
|
43
|
-
salt = salt ||
|
|
41
|
+
salt = salt || crypto_1.default.randomBytes(16).toString('hex');
|
|
44
42
|
iterations = iterations || 10000;
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
}
|
|
51
|
-
|
|
52
|
-
if (version) {
|
|
53
|
-
crypto.pbkdf2(pw, salt, iterations, 256, 'sha256', (err, key) => {
|
|
54
|
-
if (err) {
|
|
55
|
-
return callback(err);
|
|
56
|
-
}
|
|
57
|
-
|
|
58
|
-
callback(null, `pbkdf2$${iterations}$${key.toString('hex')}$${salt}`);
|
|
59
|
-
});
|
|
60
|
-
} else {
|
|
61
|
-
crypto.pbkdf2(pw, salt, iterations, 64, 'sha1', (err, key) => {
|
|
62
|
-
if (err) {
|
|
63
|
-
return callback(err);
|
|
64
|
-
}
|
|
65
|
-
|
|
66
|
-
callback(null, `pbkdf2$${iterations}$${key.toString('hex')}$${salt}`);
|
|
67
|
-
});
|
|
68
|
-
}
|
|
43
|
+
crypto_1.default.pbkdf2(pw, salt, iterations, 256, 'sha256', (err, key) => {
|
|
44
|
+
if (err) {
|
|
45
|
+
return callback(err);
|
|
46
|
+
}
|
|
47
|
+
callback(null, `pbkdf2$${iterations}$${key.toString('hex')}$${salt}`);
|
|
48
|
+
});
|
|
69
49
|
},
|
|
70
50
|
check: function (hashedPassword, callback) {
|
|
71
|
-
if (!hashedPassword
|
|
51
|
+
if (!hashedPassword) {
|
|
72
52
|
return callback(null, false);
|
|
73
53
|
}
|
|
74
54
|
const key = hashedPassword.split('$');
|
|
75
55
|
if (key.length !== 4 || !key[2] || !key[3]) {
|
|
76
|
-
return callback('Hash not formatted correctly');
|
|
56
|
+
return callback(new Error('Hash not formatted correctly'));
|
|
77
57
|
}
|
|
78
58
|
if (key[0] !== 'pbkdf2') {
|
|
79
|
-
return callback('Unknown');
|
|
59
|
+
return callback(new Error('Unknown'));
|
|
80
60
|
}
|
|
81
|
-
|
|
82
61
|
this.hash(key[3], parseInt(key[1], 10), (error, newHash) => {
|
|
83
62
|
if (error) {
|
|
84
63
|
callback(error);
|
|
85
|
-
}
|
|
64
|
+
}
|
|
65
|
+
else {
|
|
86
66
|
callback(null, newHash === hashedPassword);
|
|
87
67
|
}
|
|
88
68
|
});
|
|
@@ -92,14 +72,14 @@ const password = pw => {
|
|
|
92
72
|
if (typeof password === 'string') {
|
|
93
73
|
result =
|
|
94
74
|
password.length >= 8 && // minimum length is 8
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
75
|
+
/\d/.test(password) && // contains at least one digit
|
|
76
|
+
/[a-z]/.test(password) && // contains at least one lower case letter
|
|
77
|
+
/[A-Z]/.test(password); // contains at least one upper case letter
|
|
98
78
|
}
|
|
99
79
|
typeof callback === 'function' && callback(result);
|
|
100
80
|
return result; // true if the complexity OK
|
|
101
81
|
}
|
|
102
82
|
};
|
|
103
|
-
}
|
|
104
|
-
|
|
105
|
-
|
|
83
|
+
}
|
|
84
|
+
exports.password = password;
|
|
85
|
+
//# sourceMappingURL=password.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"password.js","sourceRoot":"","sources":["../../../src/lib/common/password.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;;;;;;AAEH,oDAA4B;AAY5B,SAAgB,QAAQ,CAAC,EAAU;IAC/B,OAAO;QACH,IAAI,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE;YACjC,IAAI,GAAG,IAAI,IAAI,gBAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YACtD,UAAU,GAAG,UAAU,IAAI,KAAK,CAAC;YAEjC,gBAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;gBAC5D,IAAI,GAAG,EAAE;oBACL,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC;iBACxB;gBAED,QAAQ,CAAC,IAAI,EAAE,UAAU,UAAU,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;YAC1E,CAAC,CAAC,CAAC;QACP,CAAC;QACD,KAAK,EAAE,UAAU,cAAc,EAAE,QAAQ;YACrC,IAAI,CAAC,cAAc,EAAE;gBACjB,OAAO,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;aAChC;YACD,MAAM,GAAG,GAAG,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACtC,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;gBACxC,OAAO,QAAQ,CAAC,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC,CAAC;aAC9D;YACD,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE;gBACrB,OAAO,QAAQ,CAAC,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;aACzC;YAED,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;gBACvD,IAAI,KAAK,EAAE;oBACP,QAAQ,CAAC,KAAK,CAAC,CAAC;iBACnB;qBAAM;oBACH,QAAQ,CAAC,IAAI,EAAE,OAAO,KAAK,cAAc,CAAC,CAAC;iBAC9C;YACL,CAAC,CAAC,CAAC;QACP,CAAC;QACD,UAAU,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE;YAC/B,IAAI,MAAM,GAAG,KAAK,CAAC;YACnB,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;gBAC9B,MAAM;oBACF,QAAQ,CAAC,MAAM,IAAI,CAAC,IAAI,sBAAsB;wBAC9C,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,8BAA8B;wBACrD,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,0CAA0C;wBACpE,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,0CAA0C;aACzE;YACD,OAAO,QAAQ,KAAK,UAAU,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC;YACnD,OAAO,MAAM,CAAC,CAAC,4BAA4B;QAC/C,CAAC;KACJ,CAAC;AACN,CAAC;AA/CD,4BA+CC"}
|