advanced-tls-client 3.0.3 → 4.0.0

package/dist/index.d.ts

@@ -148,8 +148,6 @@ interface Response extends EventEmitter {
 declare class ProfileRegistry {
     private static getGrease;
     static chromeMobile143Android(): ChromeProfile;
-    static chrome133PSK(): ChromeProfile;
-    static chrome133(): ChromeProfile;
     static get(name: string): ChromeProfile;
     static get latest(): ChromeProfile;
     static get latestMobile(): ChromeProfile;
@@ -164,7 +162,8 @@ declare class AdvancedTLSClient {
     private defaults;
     constructor(profileName?: string);
     private setup;
-    request(uri: string, data?: any, options?: RequestOptions, callback?: (err: any, res?: Response) => void): Promise<FullResponse | PassThrough>;
+    private isRequestOptions;
+    request(uri: string, dataOrOptions?: any, optionsOrCallback?: RequestOptions | ((err: any, res?: Response) => void), callback?: (err: any, res?: Response) => void): Promise<FullResponse | PassThrough>;
     private generateJA3;
     private buildMultipart;
     private generateMultipart;

package/dist/index.js

@@ -36,7 +36,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProfileRegistry = exports.AdvancedTLSClient = void 0;
 const tls = __importStar(require("tls"));
 const net = __importStar(require("net"));
-const https = __importStar(require("https"));
 const http2 = __importStar(require("http2"));
 const crypto = __importStar(require("crypto"));
 const events_1 = require("events");
@@ -178,249 +177,8 @@ class ProfileRegistry {
             priority: 'u=0, i'
         };
     }
-    static chrome133PSK() {
-        const grease1 = this.getGrease();
-        const grease2 = this.getGrease();
-        const grease3 = this.getGrease();
-        const grease4 = this.getGrease();
-        return {
-            name: 'chrome_133_psk',
-            version: '133.0.0.0',
-            tls: {
-                cipherSuites: [
-                    grease1,
-                    4865,
-                    4866,
-                    4867,
-                    49195,
-                    49199,
-                    49196,
-                    49200,
-                    52393,
-                    52392,
-                    49171,
-                    49172,
-                    156,
-                    157,
-                    47,
-                    53
-                ],
-                extensions: [
-                    grease2,
-                    0,
-                    23,
-                    65281,
-                    10,
-                    11,
-                    35,
-                    16,
-                    5,
-                    13,
-                    18,
-                    51,
-                    45,
-                    43,
-                    27,
-                    21,
-                    grease3
-                ],
-                supportedGroups: [
-                    grease4,
-                    25497,
-                    29,
-                    23,
-                    24
-                ],
-                signatureAlgorithms: [
-                    1027,
-                    2052,
-                    1025,
-                    1283,
-                    2053,
-                    1281,
-                    2054,
-                    1537
-                ],
-                supportedVersions: [
-                    grease2,
-                    772,
-                    771
-                ],
-                ecPointFormats: [0],
-                alpnProtocols: ['h2', 'http/1.1'],
-                pskKeyExchangeModes: [1],
-                compressionMethods: [0],
-                grease: true,
-                recordSizeLimit: 16385
-            },
-            http2: {
-                windowUpdate: 15663105,
-                headerTableSize: 65536,
-                enablePush: 0,
-                initialWindowSize: 6291456,
-                maxFrameSize: 16384,
-                maxHeaderListSize: 262144,
-                settingsOrder: [1, 2, 4, 6],
-                connectionPreface: Buffer.from('PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n'),
-                priorityFrames: [
-                    {
-                        streamId: 0,
-                        weight: 256,
-                        dependency: 0,
-                        exclusive: true
-                    }
-                ],
-                pseudoHeaderOrder: [':method', ':authority', ':scheme', ':path'],
-                headerOrder: [
-                    'cache-control',
-                    'sec-ch-ua',
-                    'sec-ch-ua-mobile',
-                    'sec-ch-ua-platform',
-                    'upgrade-insecure-requests',
-                    'user-agent',
-                    'accept',
-                    'sec-fetch-site',
-                    'sec-fetch-mode',
-                    'sec-fetch-user',
-                    'sec-fetch-dest',
-                    'accept-encoding',
-                    'accept-language'
-                ]
-            },
-            userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/133.0.0.0 Safari/537.36',
-            secChUa: '"Google Chrome";v="133", "Chromium";v="133", "Not_A Brand";v="24"',
-            secChUaPlatform: '"Windows"',
-            secChUaMobile: '?0',
-            secFetchSite: 'none',
-            secFetchMode: 'navigate',
-            secFetchDest: 'document'
-        };
-    }
-    static chrome133() {
-        const grease1 = this.getGrease();
-        const grease2 = this.getGrease();
-        const grease3 = this.getGrease();
-        const grease4 = this.getGrease();
-        return {
-            name: 'chrome_133',
-            version: '133.0.0.0',
-            tls: {
-                cipherSuites: [
-                    grease1,
-                    4865,
-                    4866,
-                    4867,
-                    49195,
-                    49199,
-                    49196,
-                    49200,
-                    52393,
-                    52392,
-                    49171,
-                    49172,
-                    156,
-                    157,
-                    47,
-                    53
-                ],
-                extensions: [
-                    grease2,
-                    0,
-                    23,
-                    65281,
-                    10,
-                    11,
-                    35,
-                    16,
-                    5,
-                    13,
-                    18,
-                    51,
-                    45,
-                    43,
-                    27,
-                    21,
-                    grease3
-                ],
-                supportedGroups: [
-                    grease4,
-                    25497,
-                    29,
-                    23,
-                    24
-                ],
-                signatureAlgorithms: [
-                    1027,
-                    2052,
-                    1025,
-                    1283,
-                    2053,
-                    1281,
-                    2054,
-                    1537
-                ],
-                supportedVersions: [
-                    grease2,
-                    772,
-                    771
-                ],
-                ecPointFormats: [0],
-                alpnProtocols: ['h2', 'http/1.1'],
-                pskKeyExchangeModes: [1],
-                compressionMethods: [0],
-                grease: true,
-                recordSizeLimit: 16385
-            },
-            http2: {
-                windowUpdate: 15663105,
-                headerTableSize: 65536,
-                enablePush: 0,
-                initialWindowSize: 6291456,
-                maxFrameSize: 16384,
-                maxHeaderListSize: 262144,
-                settingsOrder: [1, 2, 4, 6],
-                connectionPreface: Buffer.from('PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n'),
-                priorityFrames: [
-                    {
-                        streamId: 0,
-                        weight: 256,
-                        dependency: 0,
-                        exclusive: true
-                    }
-                ],
-                pseudoHeaderOrder: [':method', ':authority', ':scheme', ':path'],
-                headerOrder: [
-                    'cache-control',
-                    'sec-ch-ua',
-                    'sec-ch-ua-mobile',
-                    'sec-ch-ua-platform',
-                    'upgrade-insecure-requests',
-                    'user-agent',
-                    'accept',
-                    'sec-fetch-site',
-                    'sec-fetch-mode',
-                    'sec-fetch-user',
-                    'sec-fetch-dest',
-                    'accept-encoding',
-                    'accept-language'
-                ]
-            },
-            userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/133.0.0.0 Safari/537.36',
-            secChUa: '"Google Chrome";v="133", "Chromium";v="133", "Not_A Brand";v="24"',
-            secChUaPlatform: '"Windows"',
-            secChUaMobile: '?0',
-            secFetchSite: 'none',
-            secFetchMode: 'navigate',
-            secFetchDest: 'document'
-        };
-    }
     static get(name) {
-        switch (name.toLowerCase()) {
-            case 'chrome_mobile_143_android': return this.chromeMobile143Android();
-            case 'chrome_133_psk': return this.chrome133PSK();
-            case 'chrome_133': return this.chrome133();
-            default: return this.chromeMobile143Android();
-        }
+        return this.chromeMobile143Android();
     }
     static get latest() {
         return this.chromeMobile143Android();
@@ -581,7 +339,6 @@ class UnifiedClientManager extends events_1.EventEmitter {
         const chunks = [];
         const rawChunks = [];
         let finished = false;
-        let hasHeaders = false;
         const finish = async (error) => {
             if (finished)
                 return;
@@ -622,9 +379,10 @@ class UnifiedClientManager extends events_1.EventEmitter {
             response.timing.total = response.timing.end;
             if (!out.writableEnded && !out.destroyed)
                 out.end();
+            if (callback)
+                setImmediate(() => callback(null, response, response.body));
         };
         stream.once('response', (hdrs) => {
-            hasHeaders = true;
             response.statusCode = hdrs[':status'];
             response.headers = hdrs;
             if (hdrs['set-cookie'])
@@ -632,8 +390,6 @@ class UnifiedClientManager extends events_1.EventEmitter {
             response.timing.response = Date.now() - timingStart;
             out.emit('header', response.statusCode, hdrs);
             out.emit('headers', hdrs);
-            if (callback)
-                setImmediate(() => callback(null, response));
         });
         stream.on('data', (chunk) => {
             if (finished || out.destroyed || out.writableEnded)
@@ -686,7 +442,7 @@ class UnifiedClientManager extends events_1.EventEmitter {
             headers: { host: this.hostname, ...headers },
             createConnection: () => this.tlsSocket
         };
-        const req = https.request(reqOptions);
+        const req = require('https').request(reqOptions);
         const response = new events_1.EventEmitter();
         response.timing = { socket: timingStart, lookup: 0, connect: 0, secureConnect: 0, response: 0, end: 0, total: 0 };
         response.fingerprints = {
@@ -697,7 +453,6 @@ class UnifiedClientManager extends events_1.EventEmitter {
         const chunks = [];
         const rawChunks = [];
         let finished = false;
-        let hasHeaders = false;
         const finish = async (error, res) => {
             if (finished)
                 return;
@@ -740,9 +495,10 @@ class UnifiedClientManager extends events_1.EventEmitter {
             response.timing.total = response.timing.end;
             if (!out.writableEnded && !out.destroyed)
                 out.end();
+            if (callback)
+                setImmediate(() => callback(null, response, response.body));
         };
         req.once('response', (res) => {
-            hasHeaders = true;
             response.statusCode = res.statusCode;
             response.headers = res.headers;
             if (res.headers['set-cookie'])
@@ -750,8 +506,6 @@ class UnifiedClientManager extends events_1.EventEmitter {
             response.timing.response = Date.now() - timingStart;
             out.emit('header', response.statusCode, res.headers);
             out.emit('headers', res.headers);
-            if (callback)
-                setImmediate(() => callback(null, response));
             res.on('data', (chunk) => {
                 if (finished || out.destroyed || out.writableEnded)
                     return;
@@ -985,16 +739,43 @@ class AdvancedTLSClient {
             config.headers['upgrade-insecure-requests'] = this.profile.upgradeInsecureRequests;
         if (this.profile.priority)
             config.headers['priority'] = this.profile.priority;
-        // Override with user headers
         if (options.headers) {
             Object.assign(config.headers, options.headers);
         }
         return config;
     }
-    async request(uri, data, options = {}, callback) {
-        if (typeof options === 'function') {
-            callback = options;
-            options = {};
+    isRequestOptions(obj) {
+        if (typeof obj !== 'object' || obj === null)
+            return false;
+        if (Buffer.isBuffer(obj) || obj instanceof stream_1.Readable)
+            return false;
+        const optionKeys = ['method', 'headers', 'proxy', 'decompress', 'stream', 'multipart', 'boundary', 'json', 'timeout'];
+        const keys = Object.keys(obj);
+        return keys.some(key => optionKeys.includes(key));
+    }
+    async request(uri, dataOrOptions, optionsOrCallback, callback) {
+        let data = null;
+        let options = {};
+        let cb = undefined;
+        if (typeof dataOrOptions === 'function') {
+            cb = dataOrOptions;
+        }
+        else if (dataOrOptions !== undefined && dataOrOptions !== null) {
+            if (this.isRequestOptions(dataOrOptions)) {
+                options = dataOrOptions;
+            }
+            else {
+                data = dataOrOptions;
+            }
+        }
+        if (typeof optionsOrCallback === 'function') {
+            cb = optionsOrCallback;
+        }
+        else if (optionsOrCallback !== undefined && optionsOrCallback !== null) {
+            options = optionsOrCallback;
+        }
+        if (callback !== undefined) {
+            cb = callback;
         }
         if (data && typeof data !== 'object' && !Buffer.isBuffer(data) && !(data instanceof stream_1.Readable)) {
             throw new Error('Invalid data type');
@@ -1062,10 +843,10 @@ class AdvancedTLSClient {
             session.clientManager.request(path, options, startTime, config.headers, post_data, out);
             return out;
         }
-        if (callback) {
-            session.clientManager.request(path, options, startTime, config.headers, post_data, out, callback).catch(err => {
-                if (callback)
-                    callback(err);
+        if (cb) {
+            session.clientManager.request(path, options, startTime, config.headers, post_data, out, cb).catch(err => {
+                if (cb)
+                    cb(err);
             });
             return out;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "advanced-tls-client",
-  "version": "3.0.3",
+  "version": "4.0.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {