diff --git a/config/default.js b/config/default.js index 7542a434..acd1f53d 100755 --- a/config/default.js +++ b/config/default.js @@ -346,6 +346,7 @@ module.exports = { bypass: { browser: { enable: false, + clientRetirement: 20, hostnames: [ // these can run in the same browser session 'www.kink.com', 'store2.psmcdn.net', // Team Skeet API diff --git a/package-lock.json b/package-lock.json index bcbbb5a4..9be6c68b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -94,7 +94,7 @@ "tunnel": "0.0.6", "ua-parser-js": "^1.0.37", "undici": "^5.28.1", - "unprint": "^0.18.21", + "unprint": "^0.18.24", "url-pattern": "^1.0.3", "v-tooltip": "^2.1.3", "video.js": "^8.6.1", @@ -20380,9 +20380,9 @@ } }, "node_modules/unprint": { - "version": "0.18.21", - "resolved": "https://registry.npmjs.org/unprint/-/unprint-0.18.21.tgz", - "integrity": "sha512-JPGhU0BWEBttZejVHLWb5mfUCX6yuEcTHdu8Vqsk+WfIhNlGkNgHeZ4N2yvOPlIH7AkXo+3pa0EslaqTREX1DA==", + "version": "0.18.24", + "resolved": "https://registry.npmjs.org/unprint/-/unprint-0.18.24.tgz", + "integrity": "sha512-n3493Y5ysY/XdL4QBydReLN2sQTF89Nb75jErCQN0A2U6MC+MS4E4NXrMFYrb2GFetNqp9Nw0zGKkk6bCPS1Ug==", "dependencies": { "bottleneck": "^2.19.5", "cookie": "^1.1.1", diff --git a/package.json b/package.json index 9e9d5867..9ab2ccb0 100755 --- a/package.json +++ b/package.json @@ -153,7 +153,7 @@ "tunnel": "0.0.6", "ua-parser-js": "^1.0.37", "undici": "^5.28.1", - "unprint": "^0.18.21", + "unprint": "^0.18.24", "url-pattern": "^1.0.3", "v-tooltip": "^2.1.3", "video.js": "^8.6.1", diff --git a/src/app.js b/src/app.js index a7029221..78d480fc 100755 --- a/src/app.js +++ b/src/app.js @@ -36,6 +36,7 @@ unprint.options({ userAgent: 'traxxx', browserUserAgent: 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/141.0.0.0 Safari/537.36', apiUserAgent: 'traxxx', + clientRetirement: config.bypass.browser.clientRetirement, limits: { ...config.limits, default: { @@ -50,7 +51,8 @@ unprint.options({ unprint.on('requestInit', (event) => logger.debug(`Unprint ${event.method} (${event.interval}ms/${event.concurrency}p${event.isProxied ? ' proxied' : ''}${event.isBrowser ? ' browser' : ''}) ${event.url}`)); unprint.on('requestError', (event) => logger.error(`Unprint failed ${event.isProxied ? 'proxied ' : ''}${event.isBrowser ? 'browser ' : ''}${event.method} ${event.url} (${event.status}): ${event.statusText}`)); -unprint.on('browser', (event) => logger.debug(`Unprint ${event.action === 'open' ? 'opened' : 'closed'} browsers ${event.keys} (${event.active})`)); +unprint.on('browserOpen', (event) => logger.debug(`Unprint opened browsers ${event.keys} (${event.active}/${config.bypass.browser.clientRetirement} active, ${event.clients} clients)`)); +unprint.on('browserClose', (event) => logger.debug(`Unprint closed ${event.retired ? ' retired' : ''} browsers ${event.keys} (${event.active}/${config.bypass.browser.clientRetirement} active, ${event.clients} clients)`)); function logActive() { setTimeout(() => {