@push.rocks/smartproxy 18.0.1 → 18.1.0
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_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/core/utils/route-utils.d.ts +3 -3
- package/dist_ts/core/utils/route-utils.js +9 -9
- package/dist_ts/proxies/network-proxy/websocket-handler.js +27 -4
- package/dist_ts/proxies/nftables-proxy/models/interfaces.d.ts +2 -2
- package/dist_ts/proxies/nftables-proxy/nftables-proxy.js +21 -21
- package/dist_ts/proxies/smart-proxy/index.d.ts +1 -0
- package/dist_ts/proxies/smart-proxy/index.js +2 -1
- package/dist_ts/proxies/smart-proxy/models/interfaces.d.ts +1 -0
- package/dist_ts/proxies/smart-proxy/models/route-types.d.ts +14 -0
- package/dist_ts/proxies/smart-proxy/models/route-types.js +1 -1
- package/dist_ts/proxies/smart-proxy/nftables-manager.d.ts +82 -0
- package/dist_ts/proxies/smart-proxy/nftables-manager.js +235 -0
- package/dist_ts/proxies/smart-proxy/route-connection-handler.js +42 -1
- package/dist_ts/proxies/smart-proxy/smart-proxy.d.ts +6 -1
- package/dist_ts/proxies/smart-proxy/smart-proxy.js +46 -2
- package/dist_ts/proxies/smart-proxy/utils/index.d.ts +1 -0
- package/dist_ts/proxies/smart-proxy/utils/index.js +3 -2
- package/dist_ts/proxies/smart-proxy/utils/route-helpers.d.ts +77 -0
- package/dist_ts/proxies/smart-proxy/utils/route-helpers.js +119 -1
- package/package.json +4 -4
- package/readme.md +224 -10
- package/readme.plan.md +616 -148
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/core/utils/route-utils.ts +9 -9
- package/ts/proxies/network-proxy/websocket-handler.ts +26 -3
- package/ts/proxies/nftables-proxy/models/interfaces.ts +2 -2
- package/ts/proxies/nftables-proxy/nftables-proxy.ts +20 -20
- package/ts/proxies/smart-proxy/index.ts +1 -0
- package/ts/proxies/smart-proxy/models/interfaces.ts +3 -0
- package/ts/proxies/smart-proxy/models/route-types.ts +20 -0
- package/ts/proxies/smart-proxy/nftables-manager.ts +268 -0
- package/ts/proxies/smart-proxy/route-connection-handler.ts +55 -0
- package/ts/proxies/smart-proxy/smart-proxy.ts +60 -1
- package/ts/proxies/smart-proxy/utils/index.ts +2 -1
- package/ts/proxies/smart-proxy/utils/route-helpers.ts +192 -0
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartproxy',
|
|
6
|
-
version: '18.0
|
|
6
|
+
version: '18.1.0',
|
|
7
7
|
description: 'A powerful proxy package with unified route-based configuration for high traffic management. Features include SSL/TLS support, flexible routing patterns, WebSocket handling, advanced security options, and automatic ACME certificate management.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLHFQQUFxUDtDQUNuUSxDQUFBIn0=
|
|
@@ -65,11 +65,11 @@ export declare function matchIpPattern(pattern: string, ip: string): boolean;
|
|
|
65
65
|
* Match an IP against allowed and blocked IP patterns
|
|
66
66
|
*
|
|
67
67
|
* @param ip IP to check
|
|
68
|
-
* @param
|
|
69
|
-
* @param
|
|
68
|
+
* @param ipAllowList Array of allowed IP patterns
|
|
69
|
+
* @param ipBlockList Array of blocked IP patterns
|
|
70
70
|
* @returns Whether the IP is allowed
|
|
71
71
|
*/
|
|
72
|
-
export declare function isIpAuthorized(ip: string,
|
|
72
|
+
export declare function isIpAuthorized(ip: string, ipAllowList?: string[], ipBlockList?: string[]): boolean;
|
|
73
73
|
/**
|
|
74
74
|
* Match an HTTP header pattern against a header value
|
|
75
75
|
*
|
|
@@ -180,26 +180,26 @@ export function matchIpPattern(pattern, ip) {
|
|
|
180
180
|
* Match an IP against allowed and blocked IP patterns
|
|
181
181
|
*
|
|
182
182
|
* @param ip IP to check
|
|
183
|
-
* @param
|
|
184
|
-
* @param
|
|
183
|
+
* @param ipAllowList Array of allowed IP patterns
|
|
184
|
+
* @param ipBlockList Array of blocked IP patterns
|
|
185
185
|
* @returns Whether the IP is allowed
|
|
186
186
|
*/
|
|
187
|
-
export function isIpAuthorized(ip,
|
|
187
|
+
export function isIpAuthorized(ip, ipAllowList = ['*'], ipBlockList = []) {
|
|
188
188
|
// Check blocked IPs first
|
|
189
|
-
if (
|
|
190
|
-
for (const pattern of
|
|
189
|
+
if (ipBlockList.length > 0) {
|
|
190
|
+
for (const pattern of ipBlockList) {
|
|
191
191
|
if (matchIpPattern(pattern, ip)) {
|
|
192
192
|
return false; // IP is blocked
|
|
193
193
|
}
|
|
194
194
|
}
|
|
195
195
|
}
|
|
196
196
|
// If there are allowed IPs, check them
|
|
197
|
-
if (
|
|
197
|
+
if (ipAllowList.length > 0) {
|
|
198
198
|
// Special case: if '*' is in allowed IPs, all non-blocked IPs are allowed
|
|
199
|
-
if (
|
|
199
|
+
if (ipAllowList.includes('*')) {
|
|
200
200
|
return true;
|
|
201
201
|
}
|
|
202
|
-
for (const pattern of
|
|
202
|
+
for (const pattern of ipAllowList) {
|
|
203
203
|
if (matchIpPattern(pattern, ip)) {
|
|
204
204
|
return true; // IP is allowed
|
|
205
205
|
}
|
|
@@ -261,4 +261,4 @@ export function calculateRouteSpecificity(match) {
|
|
|
261
261
|
}
|
|
262
262
|
return score;
|
|
263
263
|
}
|
|
264
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
264
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"route-utils.js","sourceRoot":"","sources":["../../../ts/core/utils/route-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -95,6 +95,7 @@ export class WebSocketHandler {
|
|
|
95
95
|
* Handle a new WebSocket connection
|
|
96
96
|
*/
|
|
97
97
|
handleWebSocketConnection(wsIncoming, req) {
|
|
98
|
+
this.logger.debug(`WebSocket connection initiated from ${req.headers.host}`);
|
|
98
99
|
try {
|
|
99
100
|
// Initialize heartbeat tracking
|
|
100
101
|
wsIncoming.isAlive = true;
|
|
@@ -185,6 +186,7 @@ export class WebSocketHandler {
|
|
|
185
186
|
host: selectedHost,
|
|
186
187
|
port: targetPort
|
|
187
188
|
};
|
|
189
|
+
this.logger.debug(`WebSocket destination resolved: ${selectedHost}:${targetPort}`);
|
|
188
190
|
}
|
|
189
191
|
catch (err) {
|
|
190
192
|
this.logger.error(`Error evaluating function-based target for WebSocket: ${err}`);
|
|
@@ -204,7 +206,10 @@ export class WebSocketHandler {
|
|
|
204
206
|
destination = this.connectionPool.getNextTarget(proxyConfig.destinationIps, proxyConfig.destinationPorts[0]);
|
|
205
207
|
}
|
|
206
208
|
// Build target URL with potential path rewriting
|
|
207
|
-
|
|
209
|
+
// Determine protocol based on the target's configuration
|
|
210
|
+
// For WebSocket connections, we use ws for HTTP backends and wss for HTTPS backends
|
|
211
|
+
const isTargetSecure = destination.port === 443;
|
|
212
|
+
const protocol = isTargetSecure ? 'wss' : 'ws';
|
|
208
213
|
let targetPath = req.url || '/';
|
|
209
214
|
// Apply path rewriting if configured
|
|
210
215
|
if (route?.action.websocket?.rewritePath) {
|
|
@@ -269,7 +274,12 @@ export class WebSocketHandler {
|
|
|
269
274
|
wsOptions.protocols = req.headers['sec-websocket-protocol'].split(',').map(p => p.trim());
|
|
270
275
|
}
|
|
271
276
|
// Create outgoing WebSocket connection
|
|
277
|
+
this.logger.debug(`Creating WebSocket connection to ${targetUrl} with options:`, {
|
|
278
|
+
headers: wsOptions.headers,
|
|
279
|
+
protocols: wsOptions.protocols
|
|
280
|
+
});
|
|
272
281
|
const wsOutgoing = new plugins.wsDefault(targetUrl, wsOptions);
|
|
282
|
+
this.logger.debug(`WebSocket instance created, waiting for connection...`);
|
|
273
283
|
// Handle connection errors
|
|
274
284
|
wsOutgoing.on('error', (err) => {
|
|
275
285
|
this.logger.error(`WebSocket target connection error: ${err.message}`);
|
|
@@ -279,6 +289,7 @@ export class WebSocketHandler {
|
|
|
279
289
|
});
|
|
280
290
|
// Handle outgoing connection open
|
|
281
291
|
wsOutgoing.on('open', () => {
|
|
292
|
+
this.logger.debug(`WebSocket target connection opened to ${targetUrl}`);
|
|
282
293
|
// Set up custom ping interval if configured
|
|
283
294
|
let pingInterval = null;
|
|
284
295
|
if (route?.action.websocket?.pingInterval && route.action.websocket.pingInterval > 0) {
|
|
@@ -319,6 +330,7 @@ export class WebSocketHandler {
|
|
|
319
330
|
const maxSize = route?.action.websocket?.maxPayloadSize || 0;
|
|
320
331
|
// Forward incoming messages to outgoing connection
|
|
321
332
|
wsIncoming.on('message', (data, isBinary) => {
|
|
333
|
+
this.logger.debug(`WebSocket forwarding message from client to target: ${data.toString()}`);
|
|
322
334
|
if (wsOutgoing.readyState === wsOutgoing.OPEN) {
|
|
323
335
|
// Check message size if limit is set
|
|
324
336
|
const messageSize = getMessageSize(data);
|
|
@@ -329,18 +341,27 @@ export class WebSocketHandler {
|
|
|
329
341
|
}
|
|
330
342
|
wsOutgoing.send(data, { binary: isBinary });
|
|
331
343
|
}
|
|
344
|
+
else {
|
|
345
|
+
this.logger.warn(`WebSocket target connection not open (state: ${wsOutgoing.readyState})`);
|
|
346
|
+
}
|
|
332
347
|
});
|
|
333
348
|
// Forward outgoing messages to incoming connection
|
|
334
349
|
wsOutgoing.on('message', (data, isBinary) => {
|
|
350
|
+
this.logger.debug(`WebSocket forwarding message from target to client: ${data.toString()}`);
|
|
335
351
|
if (wsIncoming.readyState === wsIncoming.OPEN) {
|
|
336
352
|
wsIncoming.send(data, { binary: isBinary });
|
|
337
353
|
}
|
|
354
|
+
else {
|
|
355
|
+
this.logger.warn(`WebSocket client connection not open (state: ${wsIncoming.readyState})`);
|
|
356
|
+
}
|
|
338
357
|
});
|
|
339
358
|
// Handle closing of connections
|
|
340
359
|
wsIncoming.on('close', (code, reason) => {
|
|
341
360
|
this.logger.debug(`WebSocket client connection closed: ${code} ${reason}`);
|
|
342
361
|
if (wsOutgoing.readyState === wsOutgoing.OPEN) {
|
|
343
|
-
|
|
362
|
+
const validCode = code || 1000;
|
|
363
|
+
const reasonString = toBuffer(reason).toString();
|
|
364
|
+
wsOutgoing.close(validCode, reasonString);
|
|
344
365
|
}
|
|
345
366
|
// Clean up timers
|
|
346
367
|
if (pingInterval)
|
|
@@ -351,7 +372,9 @@ export class WebSocketHandler {
|
|
|
351
372
|
wsOutgoing.on('close', (code, reason) => {
|
|
352
373
|
this.logger.debug(`WebSocket target connection closed: ${code} ${reason}`);
|
|
353
374
|
if (wsIncoming.readyState === wsIncoming.OPEN) {
|
|
354
|
-
|
|
375
|
+
const validCode = code || 1000;
|
|
376
|
+
const reasonString = toBuffer(reason).toString();
|
|
377
|
+
wsIncoming.close(validCode, reasonString);
|
|
355
378
|
}
|
|
356
379
|
// Clean up timers
|
|
357
380
|
if (pingInterval)
|
|
@@ -403,4 +426,4 @@ export class WebSocketHandler {
|
|
|
403
426
|
}
|
|
404
427
|
}
|
|
405
428
|
}
|
|
406
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"websocket-handler.js","sourceRoot":"","sources":["../../../ts/proxies/network-proxy/websocket-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAC;AAC5C,OAAO,0CAA0C,CAAC;AAClD,OAAO,EAAyE,YAAY,EAA4B,MAAM,mBAAmB,CAAC;AAClJ,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAGtE,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAE/E;;GAEG;AACH,MAAM,OAAO,gBAAgB;IAQ3B,YACU,OAA6B,EAC7B,cAA8B,EAC9B,YAAyB,EAAE,2CAA2C;IACtE,SAAyB,EAAE,CAAC,2BAA2B;;QAHvD,YAAO,GAAP,OAAO,CAAsB;QAC7B,mBAAc,GAAd,cAAc,CAAgB;QAC9B,iBAAY,GAAZ,YAAY,CAAa;QACzB,WAAM,GAAN,MAAM,CAAqB;QAX7B,sBAAiB,GAA0B,IAAI,CAAC;QAChD,aAAQ,GAAsC,IAAI,CAAC;QAEnD,mBAAc,GAAmB,IAAI,cAAc,EAAE,CAAC;QACtD,gBAAW,GAAuB,IAAI,CAAC;QAS7C,IAAI,CAAC,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,QAAQ,IAAI,MAAM,CAAC,CAAC;QACvD,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAEhE,6CAA6C;QAC7C,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtB,IAAI,CAAC,WAAW,GAAG,IAAI,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC;IAED;;OAEG;IACI,SAAS,CAAC,MAAsB;QACrC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,wCAAwC;QACxC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,IAAI,CAAC,WAAW,GAAG,IAAI,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAC1D,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACrC,CAAC;QAED,8BAA8B;QAC9B,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC;IAED;;OAEG;IACI,UAAU,CAAC,MAA4B;QAC5C,0BAA0B;QAC1B,IAAI,CAAC,QAAQ,GAAG,IAAI,OAAO,CAAC,EAAE,CAAC,eAAe,CAAC;YAC7C,MAAM,EAAE,MAAM;YACd,cAAc,EAAE,IAAI;SACrB,CAAC,CAAC;QAEH,+BAA+B;QAC/B,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,UAAmC,EAAE,GAAiC,EAAE,EAAE;YACxG,IAAI,CAAC,yBAAyB,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;QAEH,+BAA+B;QAC/B,IAAI,CAAC,cAAc,EAAE,CAAC;QAEtB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;IACpD,CAAC;IAED;;OAEG;IACK,cAAc;QACpB,oCAAoC;QACpC,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3B,aAAa,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACxC,CAAC;QAED,yDAAyD;QACzD,IAAI,CAAC,iBAAiB,GAAG,WAAW,CAAC,GAAG,EAAE;YACxC,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;gBACvD,OAAO,CAAC,gCAAgC;YAC1C,CAAC;YAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iCAAiC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,UAAU,CAAC,CAAC;YAEzF,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,EAAqB,EAAE,EAAE;gBACtD,MAAM,eAAe,GAAG,EAA6B,CAAC;gBAEtD,IAAI,eAAe,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;oBACtC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;oBAC/D,OAAO,eAAe,CAAC,SAAS,EAAE,CAAC;gBACrC,CAAC;gBAED,eAAe,CAAC,OAAO,GAAG,KAAK,CAAC;gBAChC,eAAe,CAAC,IAAI,EAAE,CAAC;YACzB,CAAC,CAAC,CAAC;QACL,CAAC,EAAE,KAAK,CAAC,CAAC;QAEV,wDAAwD;QACxD,IAAI,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,CAAC;YACjC,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,CAAC;QACjC,CAAC;IACH,CAAC;IAED;;OAEG;IACK,yBAAyB,CAAC,UAAmC,EAAE,GAAiC;QACtG,IAAI,CAAC;YACH,gCAAgC;YAChC,UAAU,CAAC,OAAO,GAAG,IAAI,CAAC;YAC1B,UAAU,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAEjC,yCAAyC;YACzC,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;gBACzB,UAAU,CAAC,OAAO,GAAG,IAAI,CAAC;gBAC1B,UAAU,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACnC,CAAC,CAAC,CAAC;YAEH,+BAA+B;YAC/B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC;YAC7E,MAAM,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,sBAAsB,CAAC,GAAG,EAAE;gBACnE,YAAY;gBACZ,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,aAAa,EAAE,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,SAAS;gBACvE,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,SAAS;gBACtE,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,aAAa,EAAE,EAAE,IAAI,SAAS;aACtD,CAAC,CAAC;YAEH,uCAAuC;YACvC,IAAI,KAA+B,CAAC;YACpC,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;gBACrB,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;YACzC,CAAC;YAED,+BAA+B;YAC/B,IAAI,WAA2C,CAAC;YAEhD,qDAAqD;YACrD,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,SAAS,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gBACpE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,KAAK,CAAC,IAAI,IAAI,SAAS,EAAE,CAAC,CAAC;gBAEhF,iDAAiD;gBACjD,IAAI,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,KAAK,KAAK,EAAE,CAAC;oBAC9C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sCAAsC,KAAK,CAAC,IAAI,IAAI,SAAS,EAAE,CAAC,CAAC;oBACnF,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,yCAAyC,CAAC,CAAC;oBAClE,OAAO;gBACT,CAAC;gBAED,+EAA+E;gBAC/E,IAAI,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,mBAAmB,KAAK,KAAK,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;oBAC5E,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,KAAK,EAAE,aAAa,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC;wBACxE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,sDAAsD,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC;wBAChG,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,kCAAkC,CAAC,CAAC;wBAC3D,OAAO;oBACT,CAAC;oBAED,0CAA0C;oBAC1C,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC;oBAClC,IAAI,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,cAAc,IAAI,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBACzG,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE;4BAC3E,0CAA0C;4BAC1C,IAAI,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gCAC/D,MAAM,OAAO,GAAG,aAAa,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;gCACnD,MAAM,eAAe,GAAG,aAAa,CAAC,wBAAwB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;gCACtF,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,IAAI,eAAe,GAAG,CAAC,CAAC;gCACjD,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;4BAC5B,CAAC;4BACD,OAAO,aAAa,KAAK,MAAM,CAAC;wBAClC,CAAC,CAAC,CAAC;wBAEH,IAAI,CAAC,SAAS,EAAE,CAAC;4BACf,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAoB,MAAM,2BAA2B,KAAK,CAAC,IAAI,IAAI,SAAS,EAAE,CAAC,CAAC;4BACjG,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC;4BAC7C,OAAO;wBACT,CAAC;oBACH,CAAC;gBACH,CAAC;gBAED,4DAA4D;gBAC5D,IAAI,UAA6B,CAAC;gBAClC,IAAI,UAAkB,CAAC;gBAEvB,IAAI,CAAC;oBACH,kCAAkC;oBAClC,IAAI,OAAO,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;wBACnD,MAAM,YAAY,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,CAAC;wBAC3E,UAAU,GAAG,YAAY,CAAC;wBAC1B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+CAA+C,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC;oBAC3I,CAAC;yBAAM,CAAC;wBACN,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;oBACxC,CAAC;oBAED,kCAAkC;oBAClC,IAAI,OAAO,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;wBACnD,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,CAAC;wBACnE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+CAA+C,UAAU,EAAE,CAAC,CAAC;oBACjF,CAAC;yBAAM,CAAC;wBACN,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAc,CAAC;oBAChH,CAAC;oBAED,gDAAgD;oBAChD,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC;wBAC5C,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;wBAC3D,CAAC,CAAC,UAAU,CAAC;oBAEf,oDAAoD;oBACpD,WAAW,GAAG;wBACZ,IAAI,EAAE,YAAY;wBAClB,IAAI,EAAE,UAAU;qBACjB,CAAC;gBACJ,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yDAAyD,GAAG,EAAE,CAAC,CAAC;oBAClF,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAC;oBAChD,OAAO;gBACT,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,2EAA2E;gBAC3E,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;gBAEpD,IAAI,CAAC,WAAW,EAAE,CAAC;oBACjB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,8CAA8C,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;oBACnF,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,sCAAsC,CAAC,CAAC;oBAC/D,OAAO;gBACT,CAAC;gBAED,+DAA+D;gBAC/D,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,aAAa,CAC7C,WAAW,CAAC,cAAc,EAC1B,WAAW,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAChC,CAAC;YACJ,CAAC;YAED,iDAAiD;YACjD,MAAM,QAAQ,GAAI,GAAG,CAAC,MAAc,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;YAC9D,IAAI,UAAU,GAAG,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC;YAEhC,qCAAqC;YACrC,IAAI,KAAK,EAAE,MAAM,CAAC,SAAS,EAAE,WAAW,EAAE,CAAC;gBACzC,MAAM,YAAY,GAAG,UAAU,CAAC;gBAChC,UAAU,GAAG,aAAa,CAAC,wBAAwB,CACjD,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,WAAW,EAClC,EAAC,GAAG,YAAY,EAAE,IAAI,EAAE,UAAU,EAAC,CACpC,CAAC;gBACF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,YAAY,OAAO,UAAU,EAAE,CAAC,CAAC;YAClF,CAAC;YAED,MAAM,SAAS,GAAG,GAAG,QAAQ,MAAM,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,IAAI,GAAG,UAAU,EAAE,CAAC;YAEvF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,GAAG,CAAC,MAAM,CAAC,aAAa,OAAO,SAAS,EAAE,CAAC,CAAC;YAE3F,mDAAmD;YACnD,MAAM,OAAO,GAA8B,EAAE,CAAC;YAE9C,8CAA8C;YAC9C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;gBACvD,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;oBAClC,GAAG,CAAC,WAAW,EAAE,KAAK,YAAY;oBAClC,GAAG,CAAC,WAAW,EAAE,KAAK,SAAS;oBAC/B,GAAG,CAAC,WAAW,EAAE,KAAK,mBAAmB;oBACzC,GAAG,CAAC,WAAW,EAAE,KAAK,uBAAuB,EAAE,CAAC;oBAClD,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;gBACvB,CAAC;YACH,CAAC;YAED,4DAA4D;YAC5D,OAAO,CAAC,MAAM,CAAC,GAAG,GAAG,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC;YAE5D,8CAA8C;YAC9C,IAAI,KAAK,EAAE,MAAM,CAAC,SAAS,EAAE,aAAa,EAAE,CAAC;gBAC3C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,CAAC;oBAChF,yDAAyD;oBACzD,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;wBACzD,SAAS;oBACX,CAAC;oBAED,4CAA4C;oBAC5C,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;wBACxB,OAAO,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;wBAClC,SAAS;oBACX,CAAC;oBAED,kCAAkC;oBAClC,IAAI,UAAkB,CAAC;oBACvB,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;wBACjD,mDAAmD;wBACnD,MAAM,aAAa,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;wBACzC,UAAU,GAAG,GAAG,GAAG,aAAa,CAAC,wBAAwB,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;oBACzF,CAAC;yBAAM,CAAC;wBACN,wCAAwC;wBACxC,UAAU,GAAG,aAAa,CAAC,wBAAwB,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;oBAC3E,CAAC;oBAED,iBAAiB;oBACjB,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,GAAG,UAAU,CAAC;gBAC1C,CAAC;YACH,CAAC;YAED,sCAAsC;YACtC,MAAM,SAAS,GAAQ;gBACrB,OAAO,EAAE,OAAO;gBAChB,eAAe,EAAE,IAAI;aACtB,CAAC;YAEF,iCAAiC;YACjC,IAAI,KAAK,EAAE,MAAM,CAAC,SAAS,EAAE,YAAY,IAAI,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC5F,SAAS,CAAC,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC;YAC5D,CAAC;iBAAM,IAAI,GAAG,CAAC,OAAO,CAAC,wBAAwB,CAAC,EAAE,CAAC;gBACjD,0CAA0C;gBAC1C,SAAS,CAAC,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;YAC5F,CAAC;YAED,uCAAuC;YACvC,MAAM,UAAU,GAAG,IAAI,OAAO,CAAC,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;YAE/D,2BAA2B;YAC3B,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;gBAC7B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sCAAsC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;gBACvE,IAAI,UAAU,CAAC,UAAU,KAAK,UAAU,CAAC,IAAI,EAAE,CAAC;oBAC9C,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAC;gBAClD,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,kCAAkC;YAClC,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;gBACzB,4CAA4C;gBAC5C,IAAI,YAAY,GAA0B,IAAI,CAAC;gBAC/C,IAAI,KAAK,EAAE,MAAM,CAAC,SAAS,EAAE,YAAY,IAAI,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,GAAG,CAAC,EAAE,CAAC;oBACrF,YAAY,GAAG,WAAW,CAAC,GAAG,EAAE;wBAC9B,IAAI,UAAU,CAAC,UAAU,KAAK,UAAU,CAAC,IAAI,EAAE,CAAC;4BAC9C,UAAU,CAAC,IAAI,EAAE,CAAC;4BAClB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4CAA4C,KAAK,CAAC,IAAI,IAAI,SAAS,EAAE,CAAC,CAAC;wBAC3F,CAAC;oBACH,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;oBAExC,0CAA0C;oBAC1C,IAAI,YAAY,CAAC,KAAK;wBAAE,YAAY,CAAC,KAAK,EAAE,CAAC;gBAC/C,CAAC;gBAED,2CAA2C;gBAC3C,IAAI,WAAW,GAA0B,IAAI,CAAC;gBAC9C,MAAM,aAAa,GAAG,KAAK,EAAE,MAAM,CAAC,SAAS,EAAE,WAAW,IAAI,KAAK,CAAC,CAAC,cAAc;gBAEnF,2CAA2C;gBAC3C,MAAM,gBAAgB,GAAG,GAAG,EAAE;oBAC5B,IAAI,WAAW;wBAAE,YAAY,CAAC,WAAW,CAAC,CAAC;oBAC3C,WAAW,GAAG,UAAU,CAAC,GAAG,EAAE;wBAC5B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0DAA0D,KAAK,EAAE,IAAI,IAAI,SAAS,EAAE,CAAC,CAAC;wBACxG,UAAU,CAAC,SAAS,EAAE,CAAC;oBACzB,CAAC,EAAE,aAAa,CAAC,CAAC;oBAElB,6CAA6C;oBAC7C,IAAI,WAAW,CAAC,KAAK;wBAAE,WAAW,CAAC,KAAK,EAAE,CAAC;gBAC7C,CAAC,CAAC;gBAEF,wBAAwB;gBACxB,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;oBACzB,UAAU,CAAC,OAAO,GAAG,IAAI,CAAC;oBAC1B,UAAU,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;oBACjC,gBAAgB,EAAE,CAAC;gBACrB,CAAC,CAAC,CAAC;gBAEH,uBAAuB;gBACvB,gBAAgB,EAAE,CAAC;gBAEnB,uCAAuC;gBACvC,MAAM,OAAO,GAAG,KAAK,EAAE,MAAM,CAAC,SAAS,EAAE,cAAc,IAAI,CAAC,CAAC;gBAE7D,mDAAmD;gBACnD,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE;oBAC1C,IAAI,UAAU,CAAC,UAAU,KAAK,UAAU,CAAC,IAAI,EAAE,CAAC;wBAC9C,qCAAqC;wBACrC,MAAM,WAAW,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;wBACzC,IAAI,OAAO,GAAG,CAAC,IAAI,WAAW,GAAG,OAAO,EAAE,CAAC;4BACzC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,uCAAuC,WAAW,MAAM,OAAO,GAAG,CAAC,CAAC;4BACrF,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;4BAC1C,OAAO;wBACT,CAAC;wBAED,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;oBAC9C,CAAC;gBACH,CAAC,CAAC,CAAC;gBAEH,mDAAmD;gBACnD,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE;oBAC1C,IAAI,UAAU,CAAC,UAAU,KAAK,UAAU,CAAC,IAAI,EAAE,CAAC;wBAC9C,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;oBAC9C,CAAC;gBACH,CAAC,CAAC,CAAC;gBAEH,gCAAgC;gBAChC,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;oBACtC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uCAAuC,IAAI,IAAI,MAAM,EAAE,CAAC,CAAC;oBAC3E,IAAI,UAAU,CAAC,UAAU,KAAK,UAAU,CAAC,IAAI,EAAE,CAAC;wBAC9C,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;oBACjC,CAAC;oBAED,kBAAkB;oBAClB,IAAI,YAAY;wBAAE,aAAa,CAAC,YAAY,CAAC,CAAC;oBAC9C,IAAI,WAAW;wBAAE,YAAY,CAAC,WAAW,CAAC,CAAC;gBAC7C,CAAC,CAAC,CAAC;gBAEH,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;oBACtC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uCAAuC,IAAI,IAAI,MAAM,EAAE,CAAC,CAAC;oBAC3E,IAAI,UAAU,CAAC,UAAU,KAAK,UAAU,CAAC,IAAI,EAAE,CAAC;wBAC9C,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;oBACjC,CAAC;oBAED,kBAAkB;oBAClB,IAAI,YAAY;wBAAE,aAAa,CAAC,YAAY,CAAC,CAAC;oBAC9C,IAAI,WAAW;wBAAE,YAAY,CAAC,WAAW,CAAC,CAAC;gBAC7C,CAAC,CAAC,CAAC;gBAEH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qCAAqC,GAAG,CAAC,OAAO,CAAC,IAAI,OAAO,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;YACxH,CAAC,CAAC,CAAC;QAEL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wCAAwC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAC3E,IAAI,UAAU,CAAC,UAAU,KAAK,UAAU,CAAC,IAAI,EAAE,CAAC;gBAC9C,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAC;YAClD,CAAC;QACH,CAAC;IACH,CAAC;IAED;;OAEG;IACI,iBAAiB;QACtB,OAAO;YACL,iBAAiB,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SAClE,CAAC;IACJ,CAAC;IAED;;OAEG;IACI,QAAQ;QACb,0BAA0B;QAC1B,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3B,aAAa,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YACtC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;QAChC,CAAC;QAED,kCAAkC;QAClC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,wBAAwB,CAAC,CAAC;YAEhF,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;gBAC3C,IAAI,CAAC;oBACH,MAAM,CAAC,SAAS,EAAE,CAAC;gBACrB,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;gBACjE,CAAC;YACH,CAAC;YAED,mBAAmB;YACnB,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;YACtB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACvB,CAAC;IACH,CAAC;CACF"}
|
|
429
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"websocket-handler.js","sourceRoot":"","sources":["../../../ts/proxies/network-proxy/websocket-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAC;AAC5C,OAAO,0CAA0C,CAAC;AAClD,OAAO,EAAyE,YAAY,EAA4B,MAAM,mBAAmB,CAAC;AAClJ,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAGtE,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAE/E;;GAEG;AACH,MAAM,OAAO,gBAAgB;IAQ3B,YACU,OAA6B,EAC7B,cAA8B,EAC9B,YAAyB,EAAE,2CAA2C;IACtE,SAAyB,EAAE,CAAC,2BAA2B;;QAHvD,YAAO,GAAP,OAAO,CAAsB;QAC7B,mBAAc,GAAd,cAAc,CAAgB;QAC9B,iBAAY,GAAZ,YAAY,CAAa;QACzB,WAAM,GAAN,MAAM,CAAqB;QAX7B,sBAAiB,GAA0B,IAAI,CAAC;QAChD,aAAQ,GAAsC,IAAI,CAAC;QAEnD,mBAAc,GAAmB,IAAI,cAAc,EAAE,CAAC;QACtD,gBAAW,GAAuB,IAAI,CAAC;QAS7C,IAAI,CAAC,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,QAAQ,IAAI,MAAM,CAAC,CAAC;QACvD,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAEhE,6CAA6C;QAC7C,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtB,IAAI,CAAC,WAAW,GAAG,IAAI,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC;IAED;;OAEG;IACI,SAAS,CAAC,MAAsB;QACrC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,wCAAwC;QACxC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,IAAI,CAAC,WAAW,GAAG,IAAI,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAC1D,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACrC,CAAC;QAED,8BAA8B;QAC9B,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC;IAED;;OAEG;IACI,UAAU,CAAC,MAA4B;QAC5C,0BAA0B;QAC1B,IAAI,CAAC,QAAQ,GAAG,IAAI,OAAO,CAAC,EAAE,CAAC,eAAe,CAAC;YAC7C,MAAM,EAAE,MAAM;YACd,cAAc,EAAE,IAAI;SACrB,CAAC,CAAC;QAEH,+BAA+B;QAC/B,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,UAAmC,EAAE,GAAiC,EAAE,EAAE;YACxG,IAAI,CAAC,yBAAyB,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;QAEH,+BAA+B;QAC/B,IAAI,CAAC,cAAc,EAAE,CAAC;QAEtB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;IACpD,CAAC;IAED;;OAEG;IACK,cAAc;QACpB,oCAAoC;QACpC,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3B,aAAa,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACxC,CAAC;QAED,yDAAyD;QACzD,IAAI,CAAC,iBAAiB,GAAG,WAAW,CAAC,GAAG,EAAE;YACxC,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;gBACvD,OAAO,CAAC,gCAAgC;YAC1C,CAAC;YAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iCAAiC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,UAAU,CAAC,CAAC;YAEzF,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,EAAqB,EAAE,EAAE;gBACtD,MAAM,eAAe,GAAG,EAA6B,CAAC;gBAEtD,IAAI,eAAe,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;oBACtC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;oBAC/D,OAAO,eAAe,CAAC,SAAS,EAAE,CAAC;gBACrC,CAAC;gBAED,eAAe,CAAC,OAAO,GAAG,KAAK,CAAC;gBAChC,eAAe,CAAC,IAAI,EAAE,CAAC;YACzB,CAAC,CAAC,CAAC;QACL,CAAC,EAAE,KAAK,CAAC,CAAC;QAEV,wDAAwD;QACxD,IAAI,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,CAAC;YACjC,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,CAAC;QACjC,CAAC;IACH,CAAC;IAED;;OAEG;IACK,yBAAyB,CAAC,UAAmC,EAAE,GAAiC;QACtG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uCAAuC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QAE7E,IAAI,CAAC;YACH,gCAAgC;YAChC,UAAU,CAAC,OAAO,GAAG,IAAI,CAAC;YAC1B,UAAU,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAEjC,yCAAyC;YACzC,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;gBACzB,UAAU,CAAC,OAAO,GAAG,IAAI,CAAC;gBAC1B,UAAU,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACnC,CAAC,CAAC,CAAC;YAEH,+BAA+B;YAC/B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC;YAC7E,MAAM,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,sBAAsB,CAAC,GAAG,EAAE;gBACnE,YAAY;gBACZ,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,aAAa,EAAE,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,SAAS;gBACvE,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,SAAS;gBACtE,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,aAAa,EAAE,EAAE,IAAI,SAAS;aACtD,CAAC,CAAC;YAEH,uCAAuC;YACvC,IAAI,KAA+B,CAAC;YACpC,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;gBACrB,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;YACzC,CAAC;YAED,+BAA+B;YAC/B,IAAI,WAA2C,CAAC;YAEhD,qDAAqD;YACrD,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,SAAS,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gBACpE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,KAAK,CAAC,IAAI,IAAI,SAAS,EAAE,CAAC,CAAC;gBAEhF,iDAAiD;gBACjD,IAAI,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,KAAK,KAAK,EAAE,CAAC;oBAC9C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sCAAsC,KAAK,CAAC,IAAI,IAAI,SAAS,EAAE,CAAC,CAAC;oBACnF,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,yCAAyC,CAAC,CAAC;oBAClE,OAAO;gBACT,CAAC;gBAED,+EAA+E;gBAC/E,IAAI,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,mBAAmB,KAAK,KAAK,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;oBAC5E,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,KAAK,EAAE,aAAa,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC;wBACxE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,sDAAsD,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC;wBAChG,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,kCAAkC,CAAC,CAAC;wBAC3D,OAAO;oBACT,CAAC;oBAED,0CAA0C;oBAC1C,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC;oBAClC,IAAI,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,cAAc,IAAI,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBACzG,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE;4BAC3E,0CAA0C;4BAC1C,IAAI,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gCAC/D,MAAM,OAAO,GAAG,aAAa,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;gCACnD,MAAM,eAAe,GAAG,aAAa,CAAC,wBAAwB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;gCACtF,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,IAAI,eAAe,GAAG,CAAC,CAAC;gCACjD,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;4BAC5B,CAAC;4BACD,OAAO,aAAa,KAAK,MAAM,CAAC;wBAClC,CAAC,CAAC,CAAC;wBAEH,IAAI,CAAC,SAAS,EAAE,CAAC;4BACf,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAoB,MAAM,2BAA2B,KAAK,CAAC,IAAI,IAAI,SAAS,EAAE,CAAC,CAAC;4BACjG,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC;4BAC7C,OAAO;wBACT,CAAC;oBACH,CAAC;gBACH,CAAC;gBAED,4DAA4D;gBAC5D,IAAI,UAA6B,CAAC;gBAClC,IAAI,UAAkB,CAAC;gBAEvB,IAAI,CAAC;oBACH,kCAAkC;oBAClC,IAAI,OAAO,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;wBACnD,MAAM,YAAY,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,CAAC;wBAC3E,UAAU,GAAG,YAAY,CAAC;wBAC1B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+CAA+C,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC;oBAC3I,CAAC;yBAAM,CAAC;wBACN,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;oBACxC,CAAC;oBAED,kCAAkC;oBAClC,IAAI,OAAO,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;wBACnD,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,CAAC;wBACnE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+CAA+C,UAAU,EAAE,CAAC,CAAC;oBACjF,CAAC;yBAAM,CAAC;wBACN,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAc,CAAC;oBAChH,CAAC;oBAED,gDAAgD;oBAChD,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC;wBAC5C,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;wBAC3D,CAAC,CAAC,UAAU,CAAC;oBAEf,oDAAoD;oBACpD,WAAW,GAAG;wBACZ,IAAI,EAAE,YAAY;wBAClB,IAAI,EAAE,UAAU;qBACjB,CAAC;oBAEF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,YAAY,IAAI,UAAU,EAAE,CAAC,CAAC;gBACrF,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yDAAyD,GAAG,EAAE,CAAC,CAAC;oBAClF,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAC;oBAChD,OAAO;gBACT,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,2EAA2E;gBAC3E,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;gBAEpD,IAAI,CAAC,WAAW,EAAE,CAAC;oBACjB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,8CAA8C,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;oBACnF,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,sCAAsC,CAAC,CAAC;oBAC/D,OAAO;gBACT,CAAC;gBAED,+DAA+D;gBAC/D,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,aAAa,CAC7C,WAAW,CAAC,cAAc,EAC1B,WAAW,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAChC,CAAC;YACJ,CAAC;YAED,iDAAiD;YACjD,yDAAyD;YACzD,oFAAoF;YACpF,MAAM,cAAc,GAAG,WAAW,CAAC,IAAI,KAAK,GAAG,CAAC;YAChD,MAAM,QAAQ,GAAG,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;YAC/C,IAAI,UAAU,GAAG,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC;YAEhC,qCAAqC;YACrC,IAAI,KAAK,EAAE,MAAM,CAAC,SAAS,EAAE,WAAW,EAAE,CAAC;gBACzC,MAAM,YAAY,GAAG,UAAU,CAAC;gBAChC,UAAU,GAAG,aAAa,CAAC,wBAAwB,CACjD,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,WAAW,EAClC,EAAC,GAAG,YAAY,EAAE,IAAI,EAAE,UAAU,EAAC,CACpC,CAAC;gBACF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,YAAY,OAAO,UAAU,EAAE,CAAC,CAAC;YAClF,CAAC;YAED,MAAM,SAAS,GAAG,GAAG,QAAQ,MAAM,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,IAAI,GAAG,UAAU,EAAE,CAAC;YAEvF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,GAAG,CAAC,MAAM,CAAC,aAAa,OAAO,SAAS,EAAE,CAAC,CAAC;YAE3F,mDAAmD;YACnD,MAAM,OAAO,GAA8B,EAAE,CAAC;YAE9C,8CAA8C;YAC9C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;gBACvD,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;oBAClC,GAAG,CAAC,WAAW,EAAE,KAAK,YAAY;oBAClC,GAAG,CAAC,WAAW,EAAE,KAAK,SAAS;oBAC/B,GAAG,CAAC,WAAW,EAAE,KAAK,mBAAmB;oBACzC,GAAG,CAAC,WAAW,EAAE,KAAK,uBAAuB,EAAE,CAAC;oBAClD,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;gBACvB,CAAC;YACH,CAAC;YAED,4DAA4D;YAC5D,OAAO,CAAC,MAAM,CAAC,GAAG,GAAG,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC;YAE5D,8CAA8C;YAC9C,IAAI,KAAK,EAAE,MAAM,CAAC,SAAS,EAAE,aAAa,EAAE,CAAC;gBAC3C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,CAAC;oBAChF,yDAAyD;oBACzD,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;wBACzD,SAAS;oBACX,CAAC;oBAED,4CAA4C;oBAC5C,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;wBACxB,OAAO,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;wBAClC,SAAS;oBACX,CAAC;oBAED,kCAAkC;oBAClC,IAAI,UAAkB,CAAC;oBACvB,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;wBACjD,mDAAmD;wBACnD,MAAM,aAAa,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;wBACzC,UAAU,GAAG,GAAG,GAAG,aAAa,CAAC,wBAAwB,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;oBACzF,CAAC;yBAAM,CAAC;wBACN,wCAAwC;wBACxC,UAAU,GAAG,aAAa,CAAC,wBAAwB,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;oBAC3E,CAAC;oBAED,iBAAiB;oBACjB,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,GAAG,UAAU,CAAC;gBAC1C,CAAC;YACH,CAAC;YAED,sCAAsC;YACtC,MAAM,SAAS,GAAQ;gBACrB,OAAO,EAAE,OAAO;gBAChB,eAAe,EAAE,IAAI;aACtB,CAAC;YAEF,iCAAiC;YACjC,IAAI,KAAK,EAAE,MAAM,CAAC,SAAS,EAAE,YAAY,IAAI,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC5F,SAAS,CAAC,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC;YAC5D,CAAC;iBAAM,IAAI,GAAG,CAAC,OAAO,CAAC,wBAAwB,CAAC,EAAE,CAAC;gBACjD,0CAA0C;gBAC1C,SAAS,CAAC,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;YAC5F,CAAC;YAED,uCAAuC;YACvC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAoC,SAAS,gBAAgB,EAAE;gBAC/E,OAAO,EAAE,SAAS,CAAC,OAAO;gBAC1B,SAAS,EAAE,SAAS,CAAC,SAAS;aAC/B,CAAC,CAAC;YACH,MAAM,UAAU,GAAG,IAAI,OAAO,CAAC,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;YAC/D,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uDAAuD,CAAC,CAAC;YAE3E,2BAA2B;YAC3B,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;gBAC7B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sCAAsC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;gBACvE,IAAI,UAAU,CAAC,UAAU,KAAK,UAAU,CAAC,IAAI,EAAE,CAAC;oBAC9C,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAC;gBAClD,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,kCAAkC;YAClC,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;gBACzB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yCAAyC,SAAS,EAAE,CAAC,CAAC;gBACxE,4CAA4C;gBAC5C,IAAI,YAAY,GAA0B,IAAI,CAAC;gBAC/C,IAAI,KAAK,EAAE,MAAM,CAAC,SAAS,EAAE,YAAY,IAAI,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,GAAG,CAAC,EAAE,CAAC;oBACrF,YAAY,GAAG,WAAW,CAAC,GAAG,EAAE;wBAC9B,IAAI,UAAU,CAAC,UAAU,KAAK,UAAU,CAAC,IAAI,EAAE,CAAC;4BAC9C,UAAU,CAAC,IAAI,EAAE,CAAC;4BAClB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4CAA4C,KAAK,CAAC,IAAI,IAAI,SAAS,EAAE,CAAC,CAAC;wBAC3F,CAAC;oBACH,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;oBAExC,0CAA0C;oBAC1C,IAAI,YAAY,CAAC,KAAK;wBAAE,YAAY,CAAC,KAAK,EAAE,CAAC;gBAC/C,CAAC;gBAED,2CAA2C;gBAC3C,IAAI,WAAW,GAA0B,IAAI,CAAC;gBAC9C,MAAM,aAAa,GAAG,KAAK,EAAE,MAAM,CAAC,SAAS,EAAE,WAAW,IAAI,KAAK,CAAC,CAAC,cAAc;gBAEnF,2CAA2C;gBAC3C,MAAM,gBAAgB,GAAG,GAAG,EAAE;oBAC5B,IAAI,WAAW;wBAAE,YAAY,CAAC,WAAW,CAAC,CAAC;oBAC3C,WAAW,GAAG,UAAU,CAAC,GAAG,EAAE;wBAC5B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0DAA0D,KAAK,EAAE,IAAI,IAAI,SAAS,EAAE,CAAC,CAAC;wBACxG,UAAU,CAAC,SAAS,EAAE,CAAC;oBACzB,CAAC,EAAE,aAAa,CAAC,CAAC;oBAElB,6CAA6C;oBAC7C,IAAI,WAAW,CAAC,KAAK;wBAAE,WAAW,CAAC,KAAK,EAAE,CAAC;gBAC7C,CAAC,CAAC;gBAEF,wBAAwB;gBACxB,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;oBACzB,UAAU,CAAC,OAAO,GAAG,IAAI,CAAC;oBAC1B,UAAU,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;oBACjC,gBAAgB,EAAE,CAAC;gBACrB,CAAC,CAAC,CAAC;gBAEH,uBAAuB;gBACvB,gBAAgB,EAAE,CAAC;gBAEnB,uCAAuC;gBACvC,MAAM,OAAO,GAAG,KAAK,EAAE,MAAM,CAAC,SAAS,EAAE,cAAc,IAAI,CAAC,CAAC;gBAE7D,mDAAmD;gBACnD,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE;oBAC1C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uDAAuD,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;oBAC5F,IAAI,UAAU,CAAC,UAAU,KAAK,UAAU,CAAC,IAAI,EAAE,CAAC;wBAC9C,qCAAqC;wBACrC,MAAM,WAAW,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;wBACzC,IAAI,OAAO,GAAG,CAAC,IAAI,WAAW,GAAG,OAAO,EAAE,CAAC;4BACzC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,uCAAuC,WAAW,MAAM,OAAO,GAAG,CAAC,CAAC;4BACrF,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;4BAC1C,OAAO;wBACT,CAAC;wBAED,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;oBAC9C,CAAC;yBAAM,CAAC;wBACN,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gDAAgD,UAAU,CAAC,UAAU,GAAG,CAAC,CAAC;oBAC7F,CAAC;gBACH,CAAC,CAAC,CAAC;gBAEH,mDAAmD;gBACnD,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE;oBAC1C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uDAAuD,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;oBAC5F,IAAI,UAAU,CAAC,UAAU,KAAK,UAAU,CAAC,IAAI,EAAE,CAAC;wBAC9C,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;oBAC9C,CAAC;yBAAM,CAAC;wBACN,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gDAAgD,UAAU,CAAC,UAAU,GAAG,CAAC,CAAC;oBAC7F,CAAC;gBACH,CAAC,CAAC,CAAC;gBAEH,gCAAgC;gBAChC,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;oBACtC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uCAAuC,IAAI,IAAI,MAAM,EAAE,CAAC,CAAC;oBAC3E,IAAI,UAAU,CAAC,UAAU,KAAK,UAAU,CAAC,IAAI,EAAE,CAAC;wBAC9C,MAAM,SAAS,GAAG,IAAI,IAAI,IAAI,CAAC;wBAC/B,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC;wBACjD,UAAU,CAAC,KAAK,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;oBAC5C,CAAC;oBAED,kBAAkB;oBAClB,IAAI,YAAY;wBAAE,aAAa,CAAC,YAAY,CAAC,CAAC;oBAC9C,IAAI,WAAW;wBAAE,YAAY,CAAC,WAAW,CAAC,CAAC;gBAC7C,CAAC,CAAC,CAAC;gBAEH,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;oBACtC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uCAAuC,IAAI,IAAI,MAAM,EAAE,CAAC,CAAC;oBAC3E,IAAI,UAAU,CAAC,UAAU,KAAK,UAAU,CAAC,IAAI,EAAE,CAAC;wBAC9C,MAAM,SAAS,GAAG,IAAI,IAAI,IAAI,CAAC;wBAC/B,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC;wBACjD,UAAU,CAAC,KAAK,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;oBAC5C,CAAC;oBAED,kBAAkB;oBAClB,IAAI,YAAY;wBAAE,aAAa,CAAC,YAAY,CAAC,CAAC;oBAC9C,IAAI,WAAW;wBAAE,YAAY,CAAC,WAAW,CAAC,CAAC;gBAC7C,CAAC,CAAC,CAAC;gBAEH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qCAAqC,GAAG,CAAC,OAAO,CAAC,IAAI,OAAO,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;YACxH,CAAC,CAAC,CAAC;QAEL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wCAAwC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAC3E,IAAI,UAAU,CAAC,UAAU,KAAK,UAAU,CAAC,IAAI,EAAE,CAAC;gBAC9C,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAC;YAClD,CAAC;QACH,CAAC;IACH,CAAC;IAED;;OAEG;IACI,iBAAiB;QACtB,OAAO;YACL,iBAAiB,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SAClE,CAAC;IACJ,CAAC;IAED;;OAEG;IACI,QAAQ;QACb,0BAA0B;QAC1B,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3B,aAAa,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YACtC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;QAChC,CAAC;QAED,kCAAkC;QAClC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,wBAAwB,CAAC,CAAC;YAEhF,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;gBAC3C,IAAI,CAAC;oBACH,MAAM,CAAC,SAAS,EAAE,CAAC;gBACrB,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;gBACjE,CAAC;YACH,CAAC;YAED,mBAAmB;YACnB,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;YACtB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACvB,CAAC;IACH,CAAC;CACF"}
|
|
@@ -22,8 +22,8 @@ export interface NfTableProxyOptions {
|
|
|
22
22
|
enableLogging?: boolean;
|
|
23
23
|
ipv6Support?: boolean;
|
|
24
24
|
logFormat?: 'plain' | 'json';
|
|
25
|
-
|
|
26
|
-
|
|
25
|
+
ipAllowList?: string[];
|
|
26
|
+
ipBlockList?: string[];
|
|
27
27
|
useIPSets?: boolean;
|
|
28
28
|
forceCleanSlate?: boolean;
|
|
29
29
|
tableName?: string;
|