@push.rocks/smartproxy 19.3.1 → 19.3.3

package/dist_ts/classes.pp.connectionmanager.d.ts

@@ -1,78 +0,0 @@
-import * as plugins from './plugins.js';
-import type { IConnectionRecord, IPortProxySettings } from './classes.pp.interfaces.js';
-import { SecurityManager } from './classes.pp.securitymanager.js';
-import { TimeoutManager } from './classes.pp.timeoutmanager.js';
-/**
- * Manages connection lifecycle, tracking, and cleanup
- */
-export declare class ConnectionManager {
-    private settings;
-    private securityManager;
-    private timeoutManager;
-    private connectionRecords;
-    private terminationStats;
-    constructor(settings: IPortProxySettings, securityManager: SecurityManager, timeoutManager: TimeoutManager);
-    /**
-     * Generate a unique connection ID
-     */
-    generateConnectionId(): string;
-    /**
-     * Create and track a new connection
-     */
-    createConnection(socket: plugins.net.Socket): IConnectionRecord;
-    /**
-     * Track an existing connection
-     */
-    trackConnection(connectionId: string, record: IConnectionRecord): void;
-    /**
-     * Get a connection by ID
-     */
-    getConnection(connectionId: string): IConnectionRecord | undefined;
-    /**
-     * Get all active connections
-     */
-    getConnections(): Map<string, IConnectionRecord>;
-    /**
-     * Get count of active connections
-     */
-    getConnectionCount(): number;
-    /**
-     * Initiates cleanup once for a connection
-     */
-    initiateCleanupOnce(record: IConnectionRecord, reason?: string): void;
-    /**
-     * Clean up a connection record
-     */
-    cleanupConnection(record: IConnectionRecord, reason?: string): void;
-    /**
-     * Helper method to clean up a socket
-     */
-    private cleanupSocket;
-    /**
-     * Creates a generic error handler for incoming or outgoing sockets
-     */
-    handleError(side: 'incoming' | 'outgoing', record: IConnectionRecord): (err: Error) => void;
-    /**
-     * Creates a generic close handler for incoming or outgoing sockets
-     */
-    handleClose(side: 'incoming' | 'outgoing', record: IConnectionRecord): () => void;
-    /**
-     * Increment termination statistics
-     */
-    incrementTerminationStat(side: 'incoming' | 'outgoing', reason: string): void;
-    /**
-     * Get termination statistics
-     */
-    getTerminationStats(): {
-        incoming: Record<string, number>;
-        outgoing: Record<string, number>;
-    };
-    /**
-     * Check for stalled/inactive connections
-     */
-    performInactivityCheck(): void;
-    /**
-     * Clear all connections (for shutdown)
-     */
-    clearConnections(): void;
-}

package/dist_ts/classes.pp.connectionmanager.js

@@ -1,378 +0,0 @@
-import * as plugins from './plugins.js';
-import { SecurityManager } from './classes.pp.securitymanager.js';
-import { TimeoutManager } from './classes.pp.timeoutmanager.js';
-/**
- * Manages connection lifecycle, tracking, and cleanup
- */
-export class ConnectionManager {
-    constructor(settings, securityManager, timeoutManager) {
-        this.settings = settings;
-        this.securityManager = securityManager;
-        this.timeoutManager = timeoutManager;
-        this.connectionRecords = new Map();
-        this.terminationStats = { incoming: {}, outgoing: {} };
-    }
-    /**
-     * Generate a unique connection ID
-     */
-    generateConnectionId() {
-        return Math.random().toString(36).substring(2, 15) +
-            Math.random().toString(36).substring(2, 15);
-    }
-    /**
-     * Create and track a new connection
-     */
-    createConnection(socket) {
-        const connectionId = this.generateConnectionId();
-        const remoteIP = socket.remoteAddress || '';
-        const localPort = socket.localPort || 0;
-        const record = {
-            id: connectionId,
-            incoming: socket,
-            outgoing: null,
-            incomingStartTime: Date.now(),
-            lastActivity: Date.now(),
-            connectionClosed: false,
-            pendingData: [],
-            pendingDataSize: 0,
-            bytesReceived: 0,
-            bytesSent: 0,
-            remoteIP,
-            localPort,
-            isTLS: false,
-            tlsHandshakeComplete: false,
-            hasReceivedInitialData: false,
-            hasKeepAlive: false,
-            incomingTerminationReason: null,
-            outgoingTerminationReason: null,
-            usingNetworkProxy: false,
-            isBrowserConnection: false,
-            domainSwitches: 0
-        };
-        this.trackConnection(connectionId, record);
-        return record;
-    }
-    /**
-     * Track an existing connection
-     */
-    trackConnection(connectionId, record) {
-        this.connectionRecords.set(connectionId, record);
-        this.securityManager.trackConnectionByIP(record.remoteIP, connectionId);
-    }
-    /**
-     * Get a connection by ID
-     */
-    getConnection(connectionId) {
-        return this.connectionRecords.get(connectionId);
-    }
-    /**
-     * Get all active connections
-     */
-    getConnections() {
-        return this.connectionRecords;
-    }
-    /**
-     * Get count of active connections
-     */
-    getConnectionCount() {
-        return this.connectionRecords.size;
-    }
-    /**
-     * Initiates cleanup once for a connection
-     */
-    initiateCleanupOnce(record, reason = 'normal') {
-        if (this.settings.enableDetailedLogging) {
-            console.log(`[${record.id}] Connection cleanup initiated for ${record.remoteIP} (${reason})`);
-        }
-        if (record.incomingTerminationReason === null ||
-            record.incomingTerminationReason === undefined) {
-            record.incomingTerminationReason = reason;
-            this.incrementTerminationStat('incoming', reason);
-        }
-        this.cleanupConnection(record, reason);
-    }
-    /**
-     * Clean up a connection record
-     */
-    cleanupConnection(record, reason = 'normal') {
-        if (!record.connectionClosed) {
-            record.connectionClosed = true;
-            // Track connection termination
-            this.securityManager.removeConnectionByIP(record.remoteIP, record.id);
-            if (record.cleanupTimer) {
-                clearTimeout(record.cleanupTimer);
-                record.cleanupTimer = undefined;
-            }
-            // Detailed logging data
-            const duration = Date.now() - record.incomingStartTime;
-            const bytesReceived = record.bytesReceived;
-            const bytesSent = record.bytesSent;
-            // Remove all data handlers to make sure we clean up properly
-            if (record.incoming) {
-                try {
-                    // Remove our safe data handler
-                    record.incoming.removeAllListeners('data');
-                    // Reset the handler references
-                    record.renegotiationHandler = undefined;
-                }
-                catch (err) {
-                    console.log(`[${record.id}] Error removing data handlers: ${err}`);
-                }
-            }
-            // Handle incoming socket
-            this.cleanupSocket(record, 'incoming', record.incoming);
-            // Handle outgoing socket
-            if (record.outgoing) {
-                this.cleanupSocket(record, 'outgoing', record.outgoing);
-            }
-            // Clear pendingData to avoid memory leaks
-            record.pendingData = [];
-            record.pendingDataSize = 0;
-            // Remove the record from the tracking map
-            this.connectionRecords.delete(record.id);
-            // Log connection details
-            if (this.settings.enableDetailedLogging) {
-                console.log(`[${record.id}] Connection from ${record.remoteIP} on port ${record.localPort} terminated (${reason}).` +
-                    ` Duration: ${plugins.prettyMs(duration)}, Bytes IN: ${bytesReceived}, OUT: ${bytesSent}, ` +
-                    `TLS: ${record.isTLS ? 'Yes' : 'No'}, Keep-Alive: ${record.hasKeepAlive ? 'Yes' : 'No'}` +
-                    `${record.usingNetworkProxy ? ', Using NetworkProxy' : ''}` +
-                    `${record.domainSwitches ? `, Domain switches: ${record.domainSwitches}` : ''}`);
-            }
-            else {
-                console.log(`[${record.id}] Connection from ${record.remoteIP} terminated (${reason}). Active connections: ${this.connectionRecords.size}`);
-            }
-        }
-    }
-    /**
-     * Helper method to clean up a socket
-     */
-    cleanupSocket(record, side, socket) {
-        try {
-            if (!socket.destroyed) {
-                // Try graceful shutdown first, then force destroy after a short timeout
-                socket.end();
-                const socketTimeout = setTimeout(() => {
-                    try {
-                        if (!socket.destroyed) {
-                            socket.destroy();
-                        }
-                    }
-                    catch (err) {
-                        console.log(`[${record.id}] Error destroying ${side} socket: ${err}`);
-                    }
-                }, 1000);
-                // Ensure the timeout doesn't block Node from exiting
-                if (socketTimeout.unref) {
-                    socketTimeout.unref();
-                }
-            }
-        }
-        catch (err) {
-            console.log(`[${record.id}] Error closing ${side} socket: ${err}`);
-            try {
-                if (!socket.destroyed) {
-                    socket.destroy();
-                }
-            }
-            catch (destroyErr) {
-                console.log(`[${record.id}] Error destroying ${side} socket: ${destroyErr}`);
-            }
-        }
-    }
-    /**
-     * Creates a generic error handler for incoming or outgoing sockets
-     */
-    handleError(side, record) {
-        return (err) => {
-            const code = err.code;
-            let reason = 'error';
-            const now = Date.now();
-            const connectionDuration = now - record.incomingStartTime;
-            const lastActivityAge = now - record.lastActivity;
-            if (code === 'ECONNRESET') {
-                reason = 'econnreset';
-                console.log(`[${record.id}] ECONNRESET on ${side} side from ${record.remoteIP}: ${err.message}. ` +
-                    `Duration: ${plugins.prettyMs(connectionDuration)}, Last activity: ${plugins.prettyMs(lastActivityAge)} ago`);
-            }
-            else if (code === 'ETIMEDOUT') {
-                reason = 'etimedout';
-                console.log(`[${record.id}] ETIMEDOUT on ${side} side from ${record.remoteIP}: ${err.message}. ` +
-                    `Duration: ${plugins.prettyMs(connectionDuration)}, Last activity: ${plugins.prettyMs(lastActivityAge)} ago`);
-            }
-            else {
-                console.log(`[${record.id}] Error on ${side} side from ${record.remoteIP}: ${err.message}. ` +
-                    `Duration: ${plugins.prettyMs(connectionDuration)}, Last activity: ${plugins.prettyMs(lastActivityAge)} ago`);
-            }
-            if (side === 'incoming' && record.incomingTerminationReason === null) {
-                record.incomingTerminationReason = reason;
-                this.incrementTerminationStat('incoming', reason);
-            }
-            else if (side === 'outgoing' && record.outgoingTerminationReason === null) {
-                record.outgoingTerminationReason = reason;
-                this.incrementTerminationStat('outgoing', reason);
-            }
-            this.initiateCleanupOnce(record, reason);
-        };
-    }
-    /**
-     * Creates a generic close handler for incoming or outgoing sockets
-     */
-    handleClose(side, record) {
-        return () => {
-            if (this.settings.enableDetailedLogging) {
-                console.log(`[${record.id}] Connection closed on ${side} side from ${record.remoteIP}`);
-            }
-            if (side === 'incoming' && record.incomingTerminationReason === null) {
-                record.incomingTerminationReason = 'normal';
-                this.incrementTerminationStat('incoming', 'normal');
-            }
-            else if (side === 'outgoing' && record.outgoingTerminationReason === null) {
-                record.outgoingTerminationReason = 'normal';
-                this.incrementTerminationStat('outgoing', 'normal');
-                // Record the time when outgoing socket closed.
-                record.outgoingClosedTime = Date.now();
-            }
-            this.initiateCleanupOnce(record, 'closed_' + side);
-        };
-    }
-    /**
-     * Increment termination statistics
-     */
-    incrementTerminationStat(side, reason) {
-        this.terminationStats[side][reason] = (this.terminationStats[side][reason] || 0) + 1;
-    }
-    /**
-     * Get termination statistics
-     */
-    getTerminationStats() {
-        return this.terminationStats;
-    }
-    /**
-     * Check for stalled/inactive connections
-     */
-    performInactivityCheck() {
-        const now = Date.now();
-        const connectionIds = [...this.connectionRecords.keys()];
-        for (const id of connectionIds) {
-            const record = this.connectionRecords.get(id);
-            if (!record)
-                continue;
-            // Skip inactivity check if disabled or for immortal keep-alive connections
-            if (this.settings.disableInactivityCheck ||
-                (record.hasKeepAlive && this.settings.keepAliveTreatment === 'immortal')) {
-                continue;
-            }
-            const inactivityTime = now - record.lastActivity;
-            // Use extended timeout for extended-treatment keep-alive connections
-            let effectiveTimeout = this.settings.inactivityTimeout;
-            if (record.hasKeepAlive && this.settings.keepAliveTreatment === 'extended') {
-                const multiplier = this.settings.keepAliveInactivityMultiplier || 6;
-                effectiveTimeout = effectiveTimeout * multiplier;
-            }
-            if (inactivityTime > effectiveTimeout && !record.connectionClosed) {
-                // For keep-alive connections, issue a warning first
-                if (record.hasKeepAlive && !record.inactivityWarningIssued) {
-                    console.log(`[${id}] Warning: Keep-alive connection from ${record.remoteIP} inactive for ${plugins.prettyMs(inactivityTime)}. Will close in 10 minutes if no activity.`);
-                    // Set warning flag and add grace period
-                    record.inactivityWarningIssued = true;
-                    record.lastActivity = now - (effectiveTimeout - 600000);
-                    // Try to stimulate activity with a probe packet
-                    if (record.outgoing && !record.outgoing.destroyed) {
-                        try {
-                            record.outgoing.write(Buffer.alloc(0));
-                            if (this.settings.enableDetailedLogging) {
-                                console.log(`[${id}] Sent probe packet to test keep-alive connection`);
-                            }
-                        }
-                        catch (err) {
-                            console.log(`[${id}] Error sending probe packet: ${err}`);
-                        }
-                    }
-                }
-                else {
-                    // For non-keep-alive or after warning, close the connection
-                    console.log(`[${id}] Inactivity check: No activity on connection from ${record.remoteIP} ` +
-                        `for ${plugins.prettyMs(inactivityTime)}.` +
-                        (record.hasKeepAlive ? ' Despite keep-alive being enabled.' : ''));
-                    this.cleanupConnection(record, 'inactivity');
-                }
-            }
-            else if (inactivityTime <= effectiveTimeout && record.inactivityWarningIssued) {
-                // If activity detected after warning, clear the warning
-                if (this.settings.enableDetailedLogging) {
-                    console.log(`[${id}] Connection activity detected after inactivity warning, resetting warning`);
-                }
-                record.inactivityWarningIssued = false;
-            }
-            // Parity check: if outgoing socket closed and incoming remains active
-            if (record.outgoingClosedTime &&
-                !record.incoming.destroyed &&
-                !record.connectionClosed &&
-                now - record.outgoingClosedTime > 120000) {
-                console.log(`[${id}] Parity check: Incoming socket for ${record.remoteIP} still active ${plugins.prettyMs(now - record.outgoingClosedTime)} after outgoing closed.`);
-                this.cleanupConnection(record, 'parity_check');
-            }
-        }
-    }
-    /**
-     * Clear all connections (for shutdown)
-     */
-    clearConnections() {
-        // Create a copy of the keys to avoid modification during iteration
-        const connectionIds = [...this.connectionRecords.keys()];
-        // First pass: End all connections gracefully
-        for (const id of connectionIds) {
-            const record = this.connectionRecords.get(id);
-            if (record) {
-                try {
-                    // Clear any timers
-                    if (record.cleanupTimer) {
-                        clearTimeout(record.cleanupTimer);
-                        record.cleanupTimer = undefined;
-                    }
-                    // End sockets gracefully
-                    if (record.incoming && !record.incoming.destroyed) {
-                        record.incoming.end();
-                    }
-                    if (record.outgoing && !record.outgoing.destroyed) {
-                        record.outgoing.end();
-                    }
-                }
-                catch (err) {
-                    console.log(`Error during graceful connection end for ${id}: ${err}`);
-                }
-            }
-        }
-        // Short delay to allow graceful ends to process
-        setTimeout(() => {
-            // Second pass: Force destroy everything
-            for (const id of connectionIds) {
-                const record = this.connectionRecords.get(id);
-                if (record) {
-                    try {
-                        // Remove all listeners to prevent memory leaks
-                        if (record.incoming) {
-                            record.incoming.removeAllListeners();
-                            if (!record.incoming.destroyed) {
-                                record.incoming.destroy();
-                            }
-                        }
-                        if (record.outgoing) {
-                            record.outgoing.removeAllListeners();
-                            if (!record.outgoing.destroyed) {
-                                record.outgoing.destroy();
-                            }
-                        }
-                    }
-                    catch (err) {
-                        console.log(`Error during forced connection destruction for ${id}: ${err}`);
-                    }
-                }
-            }
-            // Clear all maps
-            this.connectionRecords.clear();
-            this.terminationStats = { incoming: {}, outgoing: {} };
-        }, 100);
-    }
-}
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.pp.connectionmanager.js","sourceRoot":"","sources":["../ts/classes.pp.connectionmanager.ts"],"names":[],"mappings":"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"}

package/dist_ts/classes.pp.domainconfigmanager.d.ts

@@ -1,55 +0,0 @@
-import type { IDomainConfig, IPortProxySettings } from './classes.pp.interfaces.js';
-/**
- * Manages domain configurations and target selection
- */
-export declare class DomainConfigManager {
-    private settings;
-    private domainTargetIndices;
-    constructor(settings: IPortProxySettings);
-    /**
-     * Updates the domain configurations
-     */
-    updateDomainConfigs(newDomainConfigs: IDomainConfig[]): void;
-    /**
-     * Get all domain configurations
-     */
-    getDomainConfigs(): IDomainConfig[];
-    /**
-     * Find domain config matching a server name
-     */
-    findDomainConfig(serverName: string): IDomainConfig | undefined;
-    /**
-     * Find domain config for a specific port
-     */
-    findDomainConfigForPort(port: number): IDomainConfig | undefined;
-    /**
-     * Check if a port is within any of the given ranges
-     */
-    isPortInRanges(port: number, ranges: Array<{
-        from: number;
-        to: number;
-    }>): boolean;
-    /**
-     * Get target IP with round-robin support
-     */
-    getTargetIP(domainConfig: IDomainConfig): string;
-    /**
-     * Checks if a domain should use NetworkProxy
-     */
-    shouldUseNetworkProxy(domainConfig: IDomainConfig): boolean;
-    /**
-     * Gets the NetworkProxy port for a domain
-     */
-    getNetworkProxyPort(domainConfig: IDomainConfig): number | undefined;
-    /**
-     * Get effective allowed and blocked IPs for a domain
-     */
-    getEffectiveIPRules(domainConfig: IDomainConfig): {
-        allowedIPs: string[];
-        blockedIPs: string[];
-    };
-    /**
-     * Get connection timeout for a domain
-     */
-    getConnectionTimeout(domainConfig?: IDomainConfig): number;
-}

package/dist_ts/classes.pp.domainconfigmanager.js

@@ -1,103 +0,0 @@
-import * as plugins from './plugins.js';
-/**
- * Manages domain configurations and target selection
- */
-export class DomainConfigManager {
-    constructor(settings) {
-        this.settings = settings;
-        // Track round-robin indices for domain configs
-        this.domainTargetIndices = new Map();
-    }
-    /**
-     * Updates the domain configurations
-     */
-    updateDomainConfigs(newDomainConfigs) {
-        this.settings.domainConfigs = newDomainConfigs;
-        // Reset target indices for removed configs
-        const currentConfigSet = new Set(newDomainConfigs);
-        for (const [config] of this.domainTargetIndices) {
-            if (!currentConfigSet.has(config)) {
-                this.domainTargetIndices.delete(config);
-            }
-        }
-    }
-    /**
-     * Get all domain configurations
-     */
-    getDomainConfigs() {
-        return this.settings.domainConfigs;
-    }
-    /**
-     * Find domain config matching a server name
-     */
-    findDomainConfig(serverName) {
-        if (!serverName)
-            return undefined;
-        return this.settings.domainConfigs.find((config) => config.domains.some((d) => plugins.minimatch(serverName, d)));
-    }
-    /**
-     * Find domain config for a specific port
-     */
-    findDomainConfigForPort(port) {
-        return this.settings.domainConfigs.find((domain) => domain.portRanges &&
-            domain.portRanges.length > 0 &&
-            this.isPortInRanges(port, domain.portRanges));
-    }
-    /**
-     * Check if a port is within any of the given ranges
-     */
-    isPortInRanges(port, ranges) {
-        return ranges.some((range) => port >= range.from && port <= range.to);
-    }
-    /**
-     * Get target IP with round-robin support
-     */
-    getTargetIP(domainConfig) {
-        if (domainConfig.targetIPs && domainConfig.targetIPs.length > 0) {
-            const currentIndex = this.domainTargetIndices.get(domainConfig) || 0;
-            const ip = domainConfig.targetIPs[currentIndex % domainConfig.targetIPs.length];
-            this.domainTargetIndices.set(domainConfig, currentIndex + 1);
-            return ip;
-        }
-        return this.settings.targetIP || 'localhost';
-    }
-    /**
-     * Checks if a domain should use NetworkProxy
-     */
-    shouldUseNetworkProxy(domainConfig) {
-        return !!domainConfig.useNetworkProxy;
-    }
-    /**
-     * Gets the NetworkProxy port for a domain
-     */
-    getNetworkProxyPort(domainConfig) {
-        return domainConfig.useNetworkProxy
-            ? (domainConfig.networkProxyPort || this.settings.networkProxyPort)
-            : undefined;
-    }
-    /**
-     * Get effective allowed and blocked IPs for a domain
-     */
-    getEffectiveIPRules(domainConfig) {
-        return {
-            allowedIPs: [
-                ...domainConfig.allowedIPs,
-                ...(this.settings.defaultAllowedIPs || [])
-            ],
-            blockedIPs: [
-                ...(domainConfig.blockedIPs || []),
-                ...(this.settings.defaultBlockedIPs || [])
-            ]
-        };
-    }
-    /**
-     * Get connection timeout for a domain
-     */
-    getConnectionTimeout(domainConfig) {
-        if (domainConfig?.connectionTimeout) {
-            return domainConfig.connectionTimeout;
-        }
-        return this.settings.maxConnectionLifetime || 86400000; // 24 hours default
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5wcC5kb21haW5jb25maWdtYW5hZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvY2xhc3Nlcy5wcC5kb21haW5jb25maWdtYW5hZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sY0FBYyxDQUFDO0FBR3hDOztHQUVHO0FBQ0gsTUFBTSxPQUFPLG1CQUFtQjtJQUk5QixZQUFvQixRQUE0QjtRQUE1QixhQUFRLEdBQVIsUUFBUSxDQUFvQjtRQUhoRCwrQ0FBK0M7UUFDdkMsd0JBQW1CLEdBQStCLElBQUksR0FBRyxFQUFFLENBQUM7SUFFakIsQ0FBQztJQUVwRDs7T0FFRztJQUNJLG1CQUFtQixDQUFDLGdCQUFpQztRQUMxRCxJQUFJLENBQUMsUUFBUSxDQUFDLGFBQWEsR0FBRyxnQkFBZ0IsQ0FBQztRQUUvQywyQ0FBMkM7UUFDM0MsTUFBTSxnQkFBZ0IsR0FBRyxJQUFJLEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO1FBQ25ELEtBQUssTUFBTSxDQUFDLE1BQU0sQ0FBQyxJQUFJLElBQUksQ0FBQyxtQkFBbUIsRUFBRSxDQUFDO1lBQ2hELElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQztnQkFDbEMsSUFBSSxDQUFDLG1CQUFtQixDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQztZQUMxQyxDQUFDO1FBQ0gsQ0FBQztJQUNILENBQUM7SUFFRDs7T0FFRztJQUNJLGdCQUFnQjtRQUNyQixPQUFPLElBQUksQ0FBQyxRQUFRLENBQUMsYUFBYSxDQUFDO0lBQ3JDLENBQUM7SUFFRDs7T0FFRztJQUNJLGdCQUFnQixDQUFDLFVBQWtCO1FBQ3hDLElBQUksQ0FBQyxVQUFVO1lBQUUsT0FBTyxTQUFTLENBQUM7UUFFbEMsT0FBTyxJQUFJLENBQUMsUUFBUSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUNqRCxNQUFNLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxVQUFVLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FDN0QsQ0FBQztJQUNKLENBQUM7SUFFRDs7T0FFRztJQUNJLHVCQUF1QixDQUFDLElBQVk7UUFDekMsT0FBTyxJQUFJLENBQUMsUUFBUSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQ3JDLENBQUMsTUFBTSxFQUFFLEVBQUUsQ0FDVCxNQUFNLENBQUMsVUFBVTtZQUNqQixNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sR0FBRyxDQUFDO1lBQzVCLElBQUksQ0FBQyxjQUFjLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxVQUFVLENBQUMsQ0FDL0MsQ0FBQztJQUNKLENBQUM7SUFFRDs7T0FFRztJQUNJLGNBQWMsQ0FBQyxJQUFZLEVBQUUsTUFBMkM7UUFDN0UsT0FBTyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxJQUFJLElBQUksS0FBSyxDQUFDLElBQUksSUFBSSxJQUFJLElBQUksS0FBSyxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBQ3hFLENBQUM7SUFFRDs7T0FFRztJQUNJLFdBQVcsQ0FBQyxZQUEyQjtRQUM1QyxJQUFJLFlBQVksQ0FBQyxTQUFTLElBQUksWUFBWSxDQUFDLFNBQVMsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFLENBQUM7WUFDaEUsTUFBTSxZQUFZLEdBQUcsSUFBSSxDQUFDLG1CQUFtQixDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDckUsTUFBTSxFQUFFLEdBQUcsWUFBWSxDQUFDLFNBQVMsQ0FBQyxZQUFZLEdBQUcsWUFBWSxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsQ0FBQztZQUNoRixJQUFJLENBQUMsbUJBQW1CLENBQUMsR0FBRyxDQUFDLFlBQVksRUFBRSxZQUFZLEdBQUcsQ0FBQyxDQUFDLENBQUM7WUFDN0QsT0FBTyxFQUFFLENBQUM7UUFDWixDQUFDO1FBRUQsT0FBTyxJQUFJLENBQUMsUUFBUSxDQUFDLFFBQVEsSUFBSSxXQUFXLENBQUM7SUFDL0MsQ0FBQztJQUVEOztPQUVHO0lBQ0kscUJBQXFCLENBQUMsWUFBMkI7UUFDdEQsT0FBTyxDQUFDLENBQUMsWUFBWSxDQUFDLGVBQWUsQ0FBQztJQUN4QyxDQUFDO0lBRUQ7O09BRUc7SUFDSSxtQkFBbUIsQ0FBQyxZQUEyQjtRQUNwRCxPQUFPLFlBQVksQ0FBQyxlQUFlO1lBQ2pDLENBQUMsQ0FBQyxDQUFDLFlBQVksQ0FBQyxnQkFBZ0IsSUFBSSxJQUFJLENBQUMsUUFBUSxDQUFDLGdCQUFnQixDQUFDO1lBQ25FLENBQUMsQ0FBQyxTQUFTLENBQUM7SUFDaEIsQ0FBQztJQUVEOztPQUVHO0lBQ0ksbUJBQW1CLENBQUMsWUFBMkI7UUFJcEQsT0FBTztZQUNMLFVBQVUsRUFBRTtnQkFDVixHQUFHLFlBQVksQ0FBQyxVQUFVO2dCQUMxQixHQUFHLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxpQkFBaUIsSUFBSSxFQUFFLENBQUM7YUFDM0M7WUFDRCxVQUFVLEVBQUU7Z0JBQ1YsR0FBRyxDQUFDLFlBQVksQ0FBQyxVQUFVLElBQUksRUFBRSxDQUFDO2dCQUNsQyxHQUFHLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxpQkFBaUIsSUFBSSxFQUFFLENBQUM7YUFDM0M7U0FDRixDQUFDO0lBQ0osQ0FBQztJQUVEOztPQUVHO0lBQ0ksb0JBQW9CLENBQUMsWUFBNEI7UUFDdEQsSUFBSSxZQUFZLEVBQUUsaUJBQWlCLEVBQUUsQ0FBQztZQUNwQyxPQUFPLFlBQVksQ0FBQyxpQkFBaUIsQ0FBQztRQUN4QyxDQUFDO1FBQ0QsT0FBTyxJQUFJLENBQUMsUUFBUSxDQUFDLHFCQUFxQixJQUFJLFFBQVEsQ0FBQyxDQUFDLG1CQUFtQjtJQUM3RSxDQUFDO0NBQ0YifQ==