@push.rocks/smartproxy 3.37.2 → 3.37.3

package/dist_ts/00_commitinfo_data.js

@@ -3,7 +3,7 @@
  */
 export const commitinfo = {
     name: '@push.rocks/smartproxy',
-    version: '3.37.2',
+    version: '3.37.3',
     description: 'A powerful proxy package that effectively handles high traffic, with features such as SSL/TLS support, port proxying, WebSocket handling, dynamic routing with authentication options, and automatic ACME certificate management.'
 };
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLG1PQUFtTztDQUNqUCxDQUFBIn0=

package/dist_ts/classes.snihandler.d.ts

@@ -9,6 +9,8 @@ export declare class SniHandler {
     private static readonly TLS_SNI_EXTENSION_TYPE;
     private static readonly TLS_SESSION_TICKET_EXTENSION_TYPE;
     private static readonly TLS_SNI_HOST_NAME_TYPE;
+    private static readonly TLS_PSK_EXTENSION_TYPE;
+    private static readonly TLS_PSK_KE_MODES_EXTENSION_TYPE;
     /**
      * Checks if a buffer contains a TLS handshake message (record type 22)
      * @param buffer - The buffer to check
@@ -30,12 +32,25 @@ export declare class SniHandler {
      * @returns The extracted server name or undefined if not found
      */
     static extractSNI(buffer: Buffer, enableLogging?: boolean): string | undefined;
+    /**
+     * Attempts to extract SNI from the PSK extension in a TLS 1.3 ClientHello.
+     *
+     * In TLS 1.3, when a client attempts to resume a session, it may include
+     * the server name in the PSK identity hint rather than in the SNI extension.
+     *
+     * @param buffer - The buffer containing the TLS ClientHello message
+     * @param enableLogging - Whether to enable detailed debug logging
+     * @returns The extracted server name or undefined if not found
+     */
+    static extractSNIFromPSKExtension(buffer: Buffer, enableLogging?: boolean): string | undefined;
     /**
      * Attempts to extract SNI from an initial ClientHello packet and handles
      * session resumption edge cases more robustly than the standard extraction.
      *
-     * This method is specifically designed for Chrome and other browsers that
-     * may send different ClientHello formats during session resumption.
+     * This method handles:
+     * 1. Standard SNI extraction
+     * 2. TLS 1.3 PSK-based resumption (Chrome, Firefox, etc.)
+     * 3. Session ticket-based resumption
      *
      * @param buffer - The buffer containing the TLS ClientHello message
      * @param enableLogging - Whether to enable detailed debug logging

package/dist_ts/classes.snihandler.js

@@ -10,6 +10,8 @@ export class SniHandler {
     static { this.TLS_SNI_EXTENSION_TYPE = 0x0000; }
     static { this.TLS_SESSION_TICKET_EXTENSION_TYPE = 0x0023; }
     static { this.TLS_SNI_HOST_NAME_TYPE = 0; }
+    static { this.TLS_PSK_EXTENSION_TYPE = 0x0029; } // Pre-Shared Key extension type for TLS 1.3
+    static { this.TLS_PSK_KE_MODES_EXTENSION_TYPE = 0x002D; } // PSK Key Exchange Modes
     /**
      * Checks if a buffer contains a TLS handshake message (record type 22)
      * @param buffer - The buffer to check
@@ -144,6 +146,7 @@ export class SniHandler {
             }
             // Track if we found session tickets (for improved resumption handling)
             let hasSessionTicket = false;
+            let hasPskExtension = false;
             // Iterate through extensions
             while (pos + 4 <= extensionsEnd) {
                 // Parse extension type (2 bytes, big-endian)
@@ -225,14 +228,21 @@ export class SniHandler {
                     hasSessionTicket = true;
                     pos += extensionLength; // Skip this extension
                 }
+                else if (extensionType === this.TLS_PSK_EXTENSION_TYPE) {
+                    // TLS 1.3 PSK extension - mark for resumption support
+                    log('Found PSK extension (TLS 1.3 resumption indicator)');
+                    hasPskExtension = true;
+                    // We'll skip the extension here and process it separately if needed
+                    pos += extensionLength;
+                }
                 else {
                     // Skip this extension
                     pos += extensionLength;
                 }
             }
-            // Log if we found a session ticket but no SNI
-            if (hasSessionTicket) {
-                log('Session ticket present but no SNI found - possible resumption scenario');
+            // Log if we found session resumption indicators but no SNI
+            if (hasSessionTicket || hasPskExtension) {
+                log('Session resumption indicators present but no SNI found');
             }
             log('No SNI extension found in ClientHello');
             return undefined;
@@ -242,12 +252,157 @@ export class SniHandler {
             return undefined;
         }
     }
+    /**
+     * Attempts to extract SNI from the PSK extension in a TLS 1.3 ClientHello.
+     *
+     * In TLS 1.3, when a client attempts to resume a session, it may include
+     * the server name in the PSK identity hint rather than in the SNI extension.
+     *
+     * @param buffer - The buffer containing the TLS ClientHello message
+     * @param enableLogging - Whether to enable detailed debug logging
+     * @returns The extracted server name or undefined if not found
+     */
+    static extractSNIFromPSKExtension(buffer, enableLogging = false) {
+        const log = (message) => {
+            if (enableLogging) {
+                console.log(`[PSK-SNI Extraction] ${message}`);
+            }
+        };
+        try {
+            // Ensure this is a ClientHello
+            if (!this.isClientHello(buffer)) {
+                log('Not a ClientHello message');
+                return undefined;
+            }
+            // Find the start position of extensions
+            let pos = 5; // Start after record header
+            // Skip handshake type (1 byte)
+            pos += 1;
+            // Skip handshake length (3 bytes)
+            pos += 3;
+            // Skip client version (2 bytes)
+            pos += 2;
+            // Skip client random (32 bytes)
+            pos += 32;
+            // Skip session ID
+            if (pos + 1 > buffer.length)
+                return undefined;
+            const sessionIdLength = buffer[pos];
+            pos += 1 + sessionIdLength;
+            // Skip cipher suites
+            if (pos + 2 > buffer.length)
+                return undefined;
+            const cipherSuitesLength = (buffer[pos] << 8) + buffer[pos + 1];
+            pos += 2 + cipherSuitesLength;
+            // Skip compression methods
+            if (pos + 1 > buffer.length)
+                return undefined;
+            const compressionMethodsLength = buffer[pos];
+            pos += 1 + compressionMethodsLength;
+            // Check if we have extensions
+            if (pos + 2 > buffer.length) {
+                log('No extensions present');
+                return undefined;
+            }
+            // Get extensions length
+            const extensionsLength = (buffer[pos] << 8) + buffer[pos + 1];
+            pos += 2;
+            // Extensions end position
+            const extensionsEnd = pos + extensionsLength;
+            if (extensionsEnd > buffer.length)
+                return undefined;
+            // Look for PSK extension
+            while (pos + 4 <= extensionsEnd) {
+                const extensionType = (buffer[pos] << 8) + buffer[pos + 1];
+                pos += 2;
+                const extensionLength = (buffer[pos] << 8) + buffer[pos + 1];
+                pos += 2;
+                if (extensionType === this.TLS_PSK_EXTENSION_TYPE) {
+                    log('Found PSK extension');
+                    // PSK extension structure:
+                    // 2 bytes: identities list length
+                    if (pos + 2 > extensionsEnd)
+                        break;
+                    const identitiesLength = (buffer[pos] << 8) + buffer[pos + 1];
+                    pos += 2;
+                    // End of identities list
+                    const identitiesEnd = pos + identitiesLength;
+                    if (identitiesEnd > extensionsEnd)
+                        break;
+                    // Process each PSK identity
+                    while (pos + 2 <= identitiesEnd) {
+                        // Identity length (2 bytes)
+                        if (pos + 2 > identitiesEnd)
+                            break;
+                        const identityLength = (buffer[pos] << 8) + buffer[pos + 1];
+                        pos += 2;
+                        if (pos + identityLength > identitiesEnd)
+                            break;
+                        // Try to extract hostname from identity
+                        // Chrome often embeds the hostname in the PSK identity
+                        // This is a heuristic as there's no standard format
+                        if (identityLength > 0) {
+                            const identity = buffer.slice(pos, pos + identityLength);
+                            // Skip identity bytes
+                            pos += identityLength;
+                            // Skip obfuscated ticket age (4 bytes)
+                            pos += 4;
+                            // Try to parse the identity as UTF-8
+                            try {
+                                const identityStr = identity.toString('utf8');
+                                log(`PSK identity: ${identityStr}`);
+                                // Check if the identity contains hostname hints
+                                // Chrome often embeds the hostname in a known format
+                                // Try to extract using common patterns
+                                // Pattern 1: Look for domain name pattern
+                                const domainPattern = /([a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?\.)+[a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?/i;
+                                const domainMatch = identityStr.match(domainPattern);
+                                if (domainMatch && domainMatch[0]) {
+                                    log(`Found domain in PSK identity: ${domainMatch[0]}`);
+                                    return domainMatch[0];
+                                }
+                                // Pattern 2: Chrome sometimes uses a specific format with delimiters
+                                // This is a heuristic approach since the format isn't standardized
+                                const parts = identityStr.split('|');
+                                if (parts.length > 1) {
+                                    for (const part of parts) {
+                                        if (part.includes('.') && !part.includes('/')) {
+                                            const possibleDomain = part.trim();
+                                            if (/^[a-z0-9.-]+$/i.test(possibleDomain)) {
+                                                log(`Found possible domain in PSK delimiter format: ${possibleDomain}`);
+                                                return possibleDomain;
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                            catch (e) {
+                                log('Failed to parse PSK identity as UTF-8');
+                            }
+                        }
+                    }
+                }
+                else {
+                    // Skip this extension
+                    pos += extensionLength;
+                }
+            }
+            log('No hostname found in PSK extension');
+            return undefined;
+        }
+        catch (error) {
+            log(`Error parsing PSK: ${error instanceof Error ? error.message : String(error)}`);
+            return undefined;
+        }
+    }
     /**
      * Attempts to extract SNI from an initial ClientHello packet and handles
      * session resumption edge cases more robustly than the standard extraction.
      *
-     * This method is specifically designed for Chrome and other browsers that
-     * may send different ClientHello formats during session resumption.
+     * This method handles:
+     * 1. Standard SNI extraction
+     * 2. TLS 1.3 PSK-based resumption (Chrome, Firefox, etc.)
+     * 3. Session ticket-based resumption
      *
      * @param buffer - The buffer containing the TLS ClientHello message
      * @param enableLogging - Whether to enable detailed debug logging
@@ -257,6 +412,9 @@ export class SniHandler {
         // First try the standard SNI extraction
         const standardSni = this.extractSNI(buffer, enableLogging);
         if (standardSni) {
+            if (enableLogging) {
+                console.log(`[SNI Extraction] Found standard SNI: ${standardSni}`);
+            }
             return standardSni;
         }
         // If standard extraction failed and we have a valid ClientHello,
@@ -265,10 +423,20 @@ export class SniHandler {
             if (enableLogging) {
                 console.log('[SNI Extraction] Detected ClientHello without standard SNI, possible session resumption');
             }
-            // Additional handling could be implemented here for specific browser behaviors
-            // For now, this is a placeholder for future improvements
+            // Try to extract from PSK extension (TLS 1.3 resumption)
+            const pskSni = this.extractSNIFromPSKExtension(buffer, enableLogging);
+            if (pskSni) {
+                if (enableLogging) {
+                    console.log(`[SNI Extraction] Extracted SNI from PSK extension: ${pskSni}`);
+                }
+                return pskSni;
+            }
+            // Could add more browser-specific heuristics here if needed
+            if (enableLogging) {
+                console.log('[SNI Extraction] Failed to extract SNI from resumption mechanisms');
+            }
         }
         return undefined;
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.snihandler.js","sourceRoot":"","sources":["../ts/classes.snihandler.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.snihandler.js","sourceRoot":"","sources":["../ts/classes.snihandler.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@push.rocks/smartproxy",
-  "version": "3.37.2",
+  "version": "3.37.3",
   "private": false,
   "description": "A powerful proxy package that effectively handles high traffic, with features such as SSL/TLS support, port proxying, WebSocket handling, dynamic routing with authentication options, and automatic ACME certificate management.",
   "main": "dist_ts/index.js",

package/ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@push.rocks/smartproxy',
-  version: '3.37.2',
+  version: '3.37.3',
   description: 'A powerful proxy package that effectively handles high traffic, with features such as SSL/TLS support, port proxying, WebSocket handling, dynamic routing with authentication options, and automatic ACME certificate management.'
 }

package/ts/classes.snihandler.ts

@@ -11,6 +11,8 @@ export class SniHandler {
   private static readonly TLS_SNI_EXTENSION_TYPE = 0x0000;
   private static readonly TLS_SESSION_TICKET_EXTENSION_TYPE = 0x0023;
   private static readonly TLS_SNI_HOST_NAME_TYPE = 0;
+  private static readonly TLS_PSK_EXTENSION_TYPE = 0x0029; // Pre-Shared Key extension type for TLS 1.3
+  private static readonly TLS_PSK_KE_MODES_EXTENSION_TYPE = 0x002D; // PSK Key Exchange Modes
 
   /**
    * Checks if a buffer contains a TLS handshake message (record type 22)
@@ -178,6 +180,7 @@ export class SniHandler {
 
       // Track if we found session tickets (for improved resumption handling)
       let hasSessionTicket = false;
+      let hasPskExtension = false;
 
       // Iterate through extensions
       while (pos + 4 <= extensionsEnd) {
@@ -275,15 +278,21 @@ export class SniHandler {
           log('Found session ticket extension');
           hasSessionTicket = true;
           pos += extensionLength; // Skip this extension
+        } else if (extensionType === this.TLS_PSK_EXTENSION_TYPE) {
+          // TLS 1.3 PSK extension - mark for resumption support
+          log('Found PSK extension (TLS 1.3 resumption indicator)');
+          hasPskExtension = true;
+          // We'll skip the extension here and process it separately if needed
+          pos += extensionLength;
         } else {
           // Skip this extension
           pos += extensionLength;
         }
       }
 
-      // Log if we found a session ticket but no SNI
-      if (hasSessionTicket) {
-        log('Session ticket present but no SNI found - possible resumption scenario');
+      // Log if we found session resumption indicators but no SNI
+      if (hasSessionTicket || hasPskExtension) {
+        log('Session resumption indicators present but no SNI found');
       }
 
       log('No SNI extension found in ClientHello');
@@ -294,12 +303,177 @@ export class SniHandler {
     }
   }
 
+  /**
+   * Attempts to extract SNI from the PSK extension in a TLS 1.3 ClientHello.
+   * 
+   * In TLS 1.3, when a client attempts to resume a session, it may include 
+   * the server name in the PSK identity hint rather than in the SNI extension.
+   * 
+   * @param buffer - The buffer containing the TLS ClientHello message
+   * @param enableLogging - Whether to enable detailed debug logging
+   * @returns The extracted server name or undefined if not found
+   */
+  public static extractSNIFromPSKExtension(
+    buffer: Buffer,
+    enableLogging: boolean = false
+  ): string | undefined {
+    const log = (message: string) => {
+      if (enableLogging) {
+        console.log(`[PSK-SNI Extraction] ${message}`);
+      }
+    };
+
+    try {
+      // Ensure this is a ClientHello
+      if (!this.isClientHello(buffer)) {
+        log('Not a ClientHello message');
+        return undefined;
+      }
+
+      // Find the start position of extensions
+      let pos = 5; // Start after record header
+      
+      // Skip handshake type (1 byte)
+      pos += 1;
+      
+      // Skip handshake length (3 bytes)
+      pos += 3;
+      
+      // Skip client version (2 bytes)
+      pos += 2;
+      
+      // Skip client random (32 bytes)
+      pos += 32;
+      
+      // Skip session ID
+      if (pos + 1 > buffer.length) return undefined;
+      const sessionIdLength = buffer[pos];
+      pos += 1 + sessionIdLength;
+      
+      // Skip cipher suites
+      if (pos + 2 > buffer.length) return undefined;
+      const cipherSuitesLength = (buffer[pos] << 8) + buffer[pos + 1];
+      pos += 2 + cipherSuitesLength;
+      
+      // Skip compression methods
+      if (pos + 1 > buffer.length) return undefined;
+      const compressionMethodsLength = buffer[pos];
+      pos += 1 + compressionMethodsLength;
+      
+      // Check if we have extensions
+      if (pos + 2 > buffer.length) {
+        log('No extensions present');
+        return undefined;
+      }
+      
+      // Get extensions length
+      const extensionsLength = (buffer[pos] << 8) + buffer[pos + 1];
+      pos += 2;
+      
+      // Extensions end position
+      const extensionsEnd = pos + extensionsLength;
+      if (extensionsEnd > buffer.length) return undefined;
+
+      // Look for PSK extension
+      while (pos + 4 <= extensionsEnd) {
+        const extensionType = (buffer[pos] << 8) + buffer[pos + 1];
+        pos += 2;
+        
+        const extensionLength = (buffer[pos] << 8) + buffer[pos + 1];
+        pos += 2;
+        
+        if (extensionType === this.TLS_PSK_EXTENSION_TYPE) {
+          log('Found PSK extension');
+          
+          // PSK extension structure:
+          // 2 bytes: identities list length
+          if (pos + 2 > extensionsEnd) break;
+          const identitiesLength = (buffer[pos] << 8) + buffer[pos + 1];
+          pos += 2;
+          
+          // End of identities list
+          const identitiesEnd = pos + identitiesLength;
+          if (identitiesEnd > extensionsEnd) break;
+          
+          // Process each PSK identity
+          while (pos + 2 <= identitiesEnd) {
+            // Identity length (2 bytes)
+            if (pos + 2 > identitiesEnd) break;
+            const identityLength = (buffer[pos] << 8) + buffer[pos + 1];
+            pos += 2;
+            
+            if (pos + identityLength > identitiesEnd) break;
+            
+            // Try to extract hostname from identity
+            // Chrome often embeds the hostname in the PSK identity
+            // This is a heuristic as there's no standard format
+            if (identityLength > 0) {
+              const identity = buffer.slice(pos, pos + identityLength);
+              
+              // Skip identity bytes
+              pos += identityLength;
+              
+              // Skip obfuscated ticket age (4 bytes)
+              pos += 4;
+              
+              // Try to parse the identity as UTF-8
+              try {
+                const identityStr = identity.toString('utf8');
+                log(`PSK identity: ${identityStr}`);
+                
+                // Check if the identity contains hostname hints
+                // Chrome often embeds the hostname in a known format
+                // Try to extract using common patterns
+                
+                // Pattern 1: Look for domain name pattern
+                const domainPattern = /([a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?\.)+[a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?/i;
+                const domainMatch = identityStr.match(domainPattern);
+                if (domainMatch && domainMatch[0]) {
+                  log(`Found domain in PSK identity: ${domainMatch[0]}`);
+                  return domainMatch[0];
+                }
+                
+                // Pattern 2: Chrome sometimes uses a specific format with delimiters
+                // This is a heuristic approach since the format isn't standardized
+                const parts = identityStr.split('|');
+                if (parts.length > 1) {
+                  for (const part of parts) {
+                    if (part.includes('.') && !part.includes('/')) {
+                      const possibleDomain = part.trim();
+                      if (/^[a-z0-9.-]+$/i.test(possibleDomain)) {
+                        log(`Found possible domain in PSK delimiter format: ${possibleDomain}`);
+                        return possibleDomain;
+                      }
+                    }
+                  }
+                }
+              } catch (e) {
+                log('Failed to parse PSK identity as UTF-8');
+              }
+            }
+          }
+        } else {
+          // Skip this extension
+          pos += extensionLength;
+        }
+      }
+      
+      log('No hostname found in PSK extension');
+      return undefined;
+    } catch (error) {
+      log(`Error parsing PSK: ${error instanceof Error ? error.message : String(error)}`);
+      return undefined;
+    }
+  }
+
   /**
    * Attempts to extract SNI from an initial ClientHello packet and handles
    * session resumption edge cases more robustly than the standard extraction.
    * 
-   * This method is specifically designed for Chrome and other browsers that
-   * may send different ClientHello formats during session resumption.
+   * This method handles:
+   * 1. Standard SNI extraction
+   * 2. TLS 1.3 PSK-based resumption (Chrome, Firefox, etc.)
+   * 3. Session ticket-based resumption
    * 
    * @param buffer - The buffer containing the TLS ClientHello message
    * @param enableLogging - Whether to enable detailed debug logging
@@ -312,6 +486,9 @@ export class SniHandler {
     // First try the standard SNI extraction
     const standardSni = this.extractSNI(buffer, enableLogging);
     if (standardSni) {
+      if (enableLogging) {
+        console.log(`[SNI Extraction] Found standard SNI: ${standardSni}`);
+      }
       return standardSni;
     }
     
@@ -322,8 +499,19 @@ export class SniHandler {
         console.log('[SNI Extraction] Detected ClientHello without standard SNI, possible session resumption');
       }
       
-      // Additional handling could be implemented here for specific browser behaviors
-      // For now, this is a placeholder for future improvements
+      // Try to extract from PSK extension (TLS 1.3 resumption)
+      const pskSni = this.extractSNIFromPSKExtension(buffer, enableLogging);
+      if (pskSni) {
+        if (enableLogging) {
+          console.log(`[SNI Extraction] Extracted SNI from PSK extension: ${pskSni}`);
+        }
+        return pskSni;
+      }
+      
+      // Could add more browser-specific heuristics here if needed
+      if (enableLogging) {
+        console.log('[SNI Extraction] Failed to extract SNI from resumption mechanisms');
+      }
     }
     
     return undefined;