Skip to content

Remove deprecated pkg_resources references #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
paveldudka wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove deprecated pkg_resources references #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 59 additions & 54 deletions playwright_stealth/stealth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,40 @@
# -*- coding: utf-8 -*-
import json
import os
from dataclasses import dataclass
from typing import Tuple, Optional, Dict

import pkg_resources
from playwright.async_api import Page as AsyncPage
from playwright.sync_api import Page as SyncPage


def from_file(name):
def from_file(name) -> str:
"""Read script from ./js directory"""
return pkg_resources.resource_string('playwright_stealth', f'js/{name}').decode()
filename = os.path.join(os.path.dirname(__file__), "js", name)
with open(filename, encoding="utf-8") as f:
return f.read()


SCRIPTS: Dict[str, str] = {
'chrome_csi': from_file('chrome.csi.js'),
'chrome_app': from_file('chrome.app.js'),
'chrome_runtime': from_file('chrome.runtime.js'),
'chrome_load_times': from_file('chrome.load.times.js'),
'chrome_hairline': from_file('chrome.hairline.js'),
'generate_magic_arrays': from_file('generate.magic.arrays.js'),
'iframe_content_window': from_file('iframe.contentWindow.js'),
'media_codecs': from_file('media.codecs.js'),
'navigator_vendor': from_file('navigator.vendor.js'),
'navigator_plugins': from_file('navigator.plugins.js'),
'navigator_permissions': from_file('navigator.permissions.js'),
'navigator_languages': from_file('navigator.languages.js'),
'navigator_platform': from_file('navigator.platform.js'),
'navigator_user_agent': from_file('navigator.userAgent.js'),
'navigator_hardware_concurrency': from_file('navigator.hardwareConcurrency.js'),
'outerdimensions': from_file('window.outerdimensions.js'),
'utils': from_file('utils.js'),
'webdriver': from_file('navigator.webdriver.js'),
'webgl_vendor': from_file('webgl.vendor.js'),
"chrome_csi": from_file("chrome.csi.js"),
"chrome_app": from_file("chrome.app.js"),
"chrome_runtime": from_file("chrome.runtime.js"),
"chrome_load_times": from_file("chrome.load.times.js"),
"chrome_hairline": from_file("chrome.hairline.js"),
"generate_magic_arrays": from_file("generate.magic.arrays.js"),
"iframe_content_window": from_file("iframe.contentWindow.js"),
"media_codecs": from_file("media.codecs.js"),
"navigator_vendor": from_file("navigator.vendor.js"),
"navigator_plugins": from_file("navigator.plugins.js"),
"navigator_permissions": from_file("navigator.permissions.js"),
"navigator_languages": from_file("navigator.languages.js"),
"navigator_platform": from_file("navigator.platform.js"),
"navigator_user_agent": from_file("navigator.userAgent.js"),
"navigator_hardware_concurrency": from_file("navigator.hardwareConcurrency.js"),
"outerdimensions": from_file("window.outerdimensions.js"),
"utils": from_file("utils.js"),
"webdriver": from_file("navigator.webdriver.js"),
"webgl_vendor": from_file("webgl.vendor.js"),
}


Expand All @@ -54,6 +56,7 @@ def enabled_scripts():
yield 'console.log("last script")'
```
"""

# load script options
webdriver: bool = True
webgl_vendor: bool = True
Expand All @@ -74,63 +77,65 @@ def enabled_scripts():
hairline: bool = True

# options
vendor: str = 'Intel Inc.'
renderer: str = 'Intel Iris OpenGL Engine'
nav_vendor: str = 'Google Inc.'
vendor: str = "Intel Inc."
renderer: str = "Intel Iris OpenGL Engine"
nav_vendor: str = "Google Inc."
nav_user_agent: str = None
nav_platform: str = None
languages: Tuple[str] = ('en-US', 'en')
languages: Tuple[str] = ("en-US", "en")
runOnInsecureOrigins: Optional[bool] = None

@property
def enabled_scripts(self):
opts = json.dumps({
'webgl_vendor': self.vendor,
'webgl_renderer': self.renderer,
'navigator_vendor': self.nav_vendor,
'navigator_platform': self.nav_platform,
'navigator_user_agent': self.nav_user_agent,
'languages': list(self.languages),
'runOnInsecureOrigins': self.runOnInsecureOrigins,
})
opts = json.dumps(
{
"webgl_vendor": self.vendor,
"webgl_renderer": self.renderer,
"navigator_vendor": self.nav_vendor,
"navigator_platform": self.nav_platform,
"navigator_user_agent": self.nav_user_agent,
"languages": list(self.languages),
"runOnInsecureOrigins": self.runOnInsecureOrigins,
}
)
# defined options constant
yield f'const opts = {opts}'
yield f"const opts = {opts}"
# init utils and generate_magic_arrays helper
yield SCRIPTS['utils']
yield SCRIPTS['generate_magic_arrays']
yield SCRIPTS["utils"]
yield SCRIPTS["generate_magic_arrays"]

if self.chrome_app:
yield SCRIPTS['chrome_app']
yield SCRIPTS["chrome_app"]
if self.chrome_csi:
yield SCRIPTS['chrome_csi']
yield SCRIPTS["chrome_csi"]
if self.hairline:
yield SCRIPTS['chrome_hairline']
yield SCRIPTS["chrome_hairline"]
if self.chrome_load_times:
yield SCRIPTS['chrome_load_times']
yield SCRIPTS["chrome_load_times"]
if self.chrome_runtime:
yield SCRIPTS['chrome_runtime']
yield SCRIPTS["chrome_runtime"]
if self.iframe_content_window:
yield SCRIPTS['iframe_content_window']
yield SCRIPTS["iframe_content_window"]
if self.media_codecs:
yield SCRIPTS['media_codecs']
yield SCRIPTS["media_codecs"]
if self.navigator_languages:
yield SCRIPTS['navigator_languages']
yield SCRIPTS["navigator_languages"]
if self.navigator_permissions:
yield SCRIPTS['navigator_permissions']
yield SCRIPTS["navigator_permissions"]
if self.navigator_platform:
yield SCRIPTS['navigator_platform']
yield SCRIPTS["navigator_platform"]
if self.navigator_plugins:
yield SCRIPTS['navigator_plugins']
yield SCRIPTS["navigator_plugins"]
if self.navigator_user_agent:
yield SCRIPTS['navigator_user_agent']
yield SCRIPTS["navigator_user_agent"]
if self.navigator_vendor:
yield SCRIPTS['navigator_vendor']
yield SCRIPTS["navigator_vendor"]
if self.webdriver:
yield SCRIPTS['webdriver']
yield SCRIPTS["webdriver"]
if self.outerdimensions:
yield SCRIPTS['outerdimensions']
yield SCRIPTS["outerdimensions"]
if self.webgl_vendor:
yield SCRIPTS['webgl_vendor']
yield SCRIPTS["webgl_vendor"]


def stealth_sync(page: SyncPage, config: StealthConfig = None):
Expand Down
12 changes: 8 additions & 4 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

setuptools.setup(
name="playwright-stealth",
version="1.0.6",
version="1.0.7",
author="AtuboDad",
author_email="[email protected]",
description="playwright stealth",
Expand All @@ -19,9 +19,13 @@
"Operating System :: OS Independent",
],
package_data={"playwright_stealth": ["js/*.js"]},
python_requires='>=3, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*',
python_requires=">=3, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*",
install_requires=[
'playwright',
"playwright",
],
extras_require={"test": ["pytest", ]},
extras_require={
"test": [
"pytest",
]
},
)