adspower-client 1.0.14 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8651920c7a5df1c4fdda39fd7c02617c0966b52cc53dcffa12e0ece7b1183063
-  data.tar.gz: a96b2d9886d8ae404ec7fd9a02af4687ae5bb6c77b7dd8f00133e77488c1d1ba
+  metadata.gz: 0b196d617707b812d5e87b904ccd55beb1230522d8d5b2bc81c38ac390e19083
+  data.tar.gz: a5a2da96222347a99953c923a31fa34d73f9c5b1cbff0426cd31b00c095cd9a1
 SHA512:
-  metadata.gz: 4006c80cdb711dd9f260da80c5b27d9e585c6b7b86bc898aafc9aef79c8b859ad5bac6cc1ef9ebef7ba576441d10e2c6772e80b613be7abf138c851378738989
-  data.tar.gz: 1ab657b853fb51acffcab69850eb8fe4506d0ca9fe56b5982d5bbd8b9210bbeb83c5e33564e4614f73596f706c12ef62b3b04e45a6ce13a89a229d441d79575b
+  metadata.gz: ea9fc969ed0823856448a27a66ad1bf1b96553d85fa710772abd7035449111f3e430f2bcead285b05c3bad3ad74f716620fb1f065b04e1a2d4a81351e3553767
+  data.tar.gz: 9b46991822d21c1ea0c2ac3f107a083fb0d77d7e776a9cfbb2a9ab79a19050cf74bf5e55078e7e16581a3df240d9265b00f83525a19a2c7950bbab88a1e561a6

data/adspower-client.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
     s.name        = 'adspower-client'
-    s.version     = '1.0.14'
-    s.date        = '2024-10-29'
+    s.version     = '1.0.16'
+    s.date        = '2025-07-27'
     s.summary     = "Ruby library for operating AdsPower API."
     s.description = "Ruby library for operating AdsPower API."
     s.authors     = ["Leandro Daniel Sardi"]
@@ -19,6 +19,8 @@ Gem::Specification.new do |s|
     s.add_runtime_dependency 'selenium-webdriver', '~> 4.10.0', '>= 4.10.0'
     s.add_runtime_dependency 'watir', '~> 7.3.0', '>= 7.3.0'
     #s.add_runtime_dependency 'sequel', '~> 5.75.0', '>= 5.75.0'
+    s.add_runtime_dependency 'fileutils', '~> 1.6.0', '>= 1.6.0'
     s.add_runtime_dependency 'colorize', '~> 0.8.1', '>= 0.8.1'
     s.add_runtime_dependency 'simple_cloud_logging', '~> 1.2.2', '>= 1.2.2'
+    s.add_runtime_dependency 'countries', '~> 7.1.1', '>= 7.1.1'
 end

data/lib/adspower-client.rb

@@ -5,11 +5,22 @@ require 'blackstack-core'
 require 'selenium-webdriver'
 require 'watir'
 require 'fileutils'
+require 'countries'
+
+class AdsPowerClient  
+    CLOUD_API_BASE = 'https://api.adspower.com/v1'
+
+    # Constante generada en tiempo de ejecución:
+    COUNTRY_LANG = ISO3166::Country.all.each_with_object({}) do |country, h|
+        # El primer idioma oficial (ISO 639-1) que encuentre:
+        language_code = country.languages&.first || 'en'
+        # Construimos la etiqueta BCP47 Language-Region:
+        h[country.alpha2] = "#{language_code}-#{country.alpha2}"
+    end.freeze
 
-class AdsPowerClient    
     # reference: https://localapi-doc-en.adspower.com/
     # reference: https://localapi-doc-en.adspower.com/docs/Rdw7Iu
-    attr_accessor :key, :port, :server_log, :adspower_listener, :adspower_default_browser_version
+    attr_accessor :key, :port, :server_log, :adspower_listener, :adspower_default_browser_version, :cloud_token
 
     # control over the drivers created, in order to not create the same driver twice and not generate memory leaks.
     # reference: https://github.com/leandrosardi/adspower-client/issues/4
@@ -22,7 +33,12 @@ class AdsPowerClient
         self.port = h[:port] || '50325'
         self.server_log = h[:server_log] || '~/adspower-client.log'
         self.adspower_listener = h[:adspower_listener] || 'http://127.0.0.1'
+        
+        # DEPRECATED
         self.adspower_default_browser_version = h[:adspower_default_browser_version] || '116'
+
+        # PENDING
+        self.cloud_token = h[:cloud_token]
     end
 
     # Acquire the lock
@@ -89,6 +105,54 @@ class AdsPowerClient
         end
     end
 
+    # Count current profiles (optionally filtered by group)
+    def profile_count(group_id: nil)
+        count = 0
+        page  = 1
+
+        loop do
+        params = { page: page, limit: 100 }
+        params[:group_id] = group_id if group_id
+        url   = "#{adspower_listener}:#{port}/api/v2/browser-profile/list"
+        res   = BlackStack::Netting.call_post(url, params)
+        data  = JSON.parse(res.body)
+        raise "Error listing profiles: #{data['msg']}" unless data['code'] == 0
+
+        list = data['data']['list']
+        count += list.size
+        break if list.size < 100
+
+        page += 1
+        end
+
+        count
+    end
+
+    # Return a hash with:
+    #  • :limit     ⇒ total profile slots allowed (-1 = unlimited)
+    #  • :used      ⇒ number of profiles currently created
+    #  • :remaining ⇒ slots left (nil if unlimited)
+    # Fetch your real profile quota from the Cloud API
+    def cloud_profile_quota
+        uri = URI("#{CLOUD_API_BASE}/account/get_info")
+        req = Net::HTTP::Get.new(uri)
+        req['Authorization'] = "Bearer #{self.cloud_token}"
+
+        res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
+            http.request(req)
+        end
+        data = JSON.parse(res.body)
+        raise "Cloud API error: #{data['msg']}" unless data['code'] == 0
+
+        allowed = data['data']['total_profiles_allowed'].to_i
+        used    = data['data']['profiles_used'].to_i
+        remaining = allowed < 0 ? nil : (allowed - used)
+
+        { limit:     allowed,
+        used:      used,
+        remaining: remaining }
+    end # cloud_profile_quota
+
     # Create a new user profile via API call and return the ID of the created user.
     def create
         with_lock do
@@ -106,8 +170,194 @@ class AdsPowerClient
             raise "Error: #{ret.to_s}" if ret['msg'].to_s.downcase != 'success'
             ret['data']['id']
         end
+    end # def create
+
+
+    # Lookup GeoIP gratuito (freegeoip.app) y parseo básico
+    def geolocate(ip)
+        uri = URI("https://freegeoip.app/json/#{ip}")
+        res = Net::HTTP.get(uri)
+        h = JSON.parse(res)
+        {
+        country_code: h["country_code"],
+        time_zone:    h["time_zone"],
+        latitude:     h["latitude"],
+        longitude:    h["longitude"]
+        }
+    rescue
+        # Fallback genérico
+        { country_code: "US", time_zone: "America/New_York", latitude: 38.9, longitude: -77.0 }
     end
 
+    # Create a new desktop profile with:
+    #  • name, proxy, fingerprint, etc (unchanged)
+    #  • platform (e.g. "linkedin.com")
+    #  • tabs     (Array of URLs to open)
+    #  • username / password / fakey for that platform
+    #
+    # @param name            [String] the profile’s display name
+    # @param proxy_config    [Hash]   keys: :ip, :port, :user, :password, :proxy_soft (default 'other'), :proxy_type (default 'http')
+    # @param group_id        [String] which AdsPower group to assign (default '0')
+    # @param browser_version [String] optional Chrome version to use (must match Chromedriver). Only applies if `fingerprint` is nil, as custom fingerprints override kernel settings.
+    # @param fingerprint     [Hash, nil] optional fingerprint configuration. If not provided, a stealth-ready default is applied with DNS-over-HTTPS, spoofed WebGL/Canvas/audio, consistent User-Agent and locale, and hardening flags to minimize detection risks from tools like BrowserScan, Cloudflare, and Arkose Labs.
+    # @param platform        [String] (optional) target site domain, e.g. 'linkedin.com'
+    # @param tabs            [Array<String>] (optional) array of URLs to open on launch
+    # @param username        [String] (optional) platform login username
+    # @param password        [String] (optional) platform login password
+    # @param fakey           [String,nil] optional 2FA key
+    # @return String the new profile’s ID
+    def create2(
+        name:, 
+        proxy_config:, 
+        group_id: '0', 
+        browser_version: nil,
+        fingerprint: nil,
+        platform:        '',       # default: no platform
+        tabs:            [],       # default: no tabs to open
+        username:        '',       # default: no login
+        password:        '',       # default: no password
+        fakey:           ''        # leave blank if no 2FA
+    )
+        browser_version ||= adspower_default_browser_version
+        
+        # 0) Resolve full Chrome version ─────────────────────────────
+        # Fetch the list of known-good Chrome versions and pick the highest
+        uri = URI('https://googlechromelabs.github.io/chrome-for-testing/known-good-versions-with-downloads.json')
+        resp = Net::HTTP.get_response(uri)
+        unless resp.is_a?(Net::HTTPSuccess)
+            raise "Error fetching Chrome versions: HTTP #{resp.code}"
+        end
+        listing = JSON.parse(resp.body)
+        versions = listing['versions'] || []
+        # find all entries matching the major.minor prefix
+        matches = versions.map { |v| v['version'] }
+                            .select { |ver| ver.start_with?("#{browser_version}.") }
+        if matches.empty?
+            raise "Chrome version '#{browser_version}' not found in known-good versions list"
+        end
+        # pick the highest patch/build by semantic compare
+        full_version = matches
+            .map { |ver| ver.split('.').map(&:to_i) }
+            .max
+            .join('.')
+
+        # 1) Hacemos GeoIP sobre la IP del proxy
+        geo = geolocate(proxy_config[:ip])
+        lang = COUNTRY_LANG[geo[:country_code]] || "en-US"
+        screen_res = "1920_1080"
+
+        with_lock do
+            url = "#{adspower_listener}:#{port}/api/v2/browser-profile/create"
+            body = {
+                # ─── GENERAL & PROXY ─────────────────────────────
+                'name'            => name,
+                'group_id'        => group_id,
+                'user_proxy_config' => {
+                    'proxy_soft'     => proxy_config[:proxy_soft]     || 'other',
+                    'proxy_type'     => proxy_config[:proxy_type]     || 'socks5',
+                    'proxy_host'     => proxy_config[:ip],
+                    'proxy_port'     => proxy_config[:port].to_s,
+                    'proxy_user'     => proxy_config[:user],
+                    'proxy_password' => proxy_config[:password],
+
+                    # ─── FORCE ALL DNS THROUGH PROXY ─────────────────
+                    # Avoid DNS-Leak
+                    "proxy_dns":        1,                           # 1 = yes, 0 = no
+                    "dns_servers":     ["8.8.8.8","8.8.4.4"]         # optional: your choice of DNS
+                },
+
+                # ─── PLATFORM ─────────────────────────────────────
+                'platform'          => platform,  # must be one of AdsPower’s supported “sites”
+                'tabs'              => tabs,      # array of URLs to open
+                'username'          => username,
+                'password'          => password,
+                'fakey'             => fakey,     # 2FA, if any
+
+                # ─── FINGERPRINT ──────────────────────────────────
+                "fingerprint_config" => fingerprint || {
+
+                    # ─── 0) DNS Leak Prevention ───────────────────────────
+                    # Even with “proxy_dns” forced on, a few ISPs will still 
+                    # silently intercept every UDP:53 out of your AdsPower VPS 
+                    # and shove it into their own resolver farm (the classic 
+                    # “transparent DNS proxy” attack that BrowserScan is warning you about). 
+                    #
+                    # Because you refuse to hot-patch your Chrome via extra args or CDP, 
+                    # the only way to survive an ISP-level hijack is to push all name lookups 
+                    # into an encrypted channel that the ISP simply can’t touch: DNS-over-HTTPS (DoH).
+                    #
+                    # Here’s the minimal change you need to bake into your AdsPower profile at 
+                    # creation time so that every DNS query happens inside Chrome’s DoH stack:
+                    # 
+                    "extra_launch_flags" => [
+                        # === DNS over HTTPS only ===
+                        "--enable-features=DnsOverHttps",
+                        "--dns-over-https-mode=secure",
+                        "--dns-over-https-templates=https://cloudflare-dns.com/dns-query",
+                        "--disable-ipv6",
+
+                        # === hide “Chrome is being controlled…” banner ===
+                        #
+                        # Even though you baked in the DoH flags under extra_launch_flags, 
+                        # you never told Chrome to hide its “automation” banners or black-hole 
+                        # all other DNS lookups — and BrowserScan still sees those UDP:53 calls 
+                        # leaking out.
+                        # 
+                        # What you need is to push three more flags into your profile creation, 
+                        # and then attach with the exact same flags when Selenium hooks in.
+                        # 
+                        "--disable-blink-features=AutomationControlled",
+                        "--disable-infobars",
+                        "--disable-features=TranslateUI",            # optional but reduces tell-tale infobars
+                        "--host-resolver-rules=MAP * 0.0.0.0,EXCLUDE localhost,EXCLUDE cloudflare-dns.com"
+                    ],
+
+                    # ─── 1) Kernel & versión ───────────────────────────
+                    "browser_kernel_config" => {
+                        "version" => browser_version,   # aquí usamos el parámetro
+                        "type"    => "chrome"
+                    },
+
+                    # ─── 2) Timezone & locale ──────────────────────────
+                    "automatic_timezone" => "1",
+                    #"timezone"           => geo[:time_zone],
+                    "language"           => [ lang ],
+
+                    # ─── 3) User-Agent coherente ───────────────────────
+                    "ua_category" => "desktop",
+                    'ua' => "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/#{full_version} Safari/537.36",
+                    "is_mobile"   => false,
+
+                    # ─── 4) Pantalla y plataforma ──────────────────────
+                    # It turns out that “Based on User-Agent” is purely a UI setting
+                    #"screen_resolution" => screen_res, "1920_1080"
+                    "platform"          => "Linux x86_64",
+
+                    # ─── 5) Canvas & WebGL custom ─────────────────────
+                    "canvas"        => "1",
+                    "webgl_image"   => "1",
+                    "webgl"         => "0",    # 0=deshabilitado, 2=modo custom, 3=modo random-match
+                    "webgl_config"  => {
+                        "unmasked_vendor"   => "Intel Inc.",
+                        "unmasked_renderer" => "ANGLE (Intel, Mesa Intel(R) Xe Graphics (TGL GT2), OpenGL 4.6)",
+                        "webgpu"            => { "webgpu_switch" => "1" }
+                    },
+
+                    # ─── 6) Resto de ajustes ───────────────────────────
+                    "webrtc"   => "disabled",   # WebRTC sí admite “disabled”
+                    "flash"    => "block",      # Flash únicamente “allow” o “block”
+                    "fonts"    => []            # usar fonts por defecto
+                }
+            }
+
+            res = BlackStack::Netting.call_post(url, body)
+            ret = JSON.parse(res.body)
+            raise "Error creating profile: #{ret['msg']}" unless ret['code'] == 0
+
+            ret['data']['profile_id']
+        end
+    end # def create2
+    
     # Delete a user profile via API call.
     def delete(id)
         with_lock do
@@ -186,34 +436,47 @@ class AdsPowerClient
         driver
     end
 
-    # Attach to the existing browser session with Selenium WebDriver.
     def driver2(id, headless: false, read_timeout: 180)
-        # Return the existing driver if it's still active.
-        old = @@drivers[id]
-        return old if old
-
-        # Otherwise, start the driver
-        ret = self.start(id, headless)
-
-        # Attach test execution to the existing browser
-        url = ret['data']['ws']['selenium']
+        return @@drivers[id] if @@drivers[id]
+      
+        # 1) start the AdsPower profile / grab its WebSocket URL
+        data = start(id, headless)['data']
+        ws   = data['ws']['selenium']  # e.g. "127.0.0.1:XXXXX"
+      
+        # 2) attach with DevTools (no more excludeSwitches or caps!)
         opts = Selenium::WebDriver::Chrome::Options.new
-        opts.add_option("debuggerAddress", url)
-
-        # Set up the custom HTTP client with a longer timeout
-        client = Selenium::WebDriver::Remote::Http::Default.new
-        client.read_timeout = read_timeout # Set this to the desired timeout in seconds
+        opts.debugger_address = ws
+        opts.add_argument('--headless') if headless
+      
+        http = Selenium::WebDriver::Remote::Http::Default.new
+        http.read_timeout = read_timeout
+      
+        driver = Selenium::WebDriver.for(:chrome, options: opts, http_client: http)
+
+        driver.execute_cdp(
+            'Page.addScriptToEvaluateOnNewDocument',
+            source: <<~JS
+                // 1) remove any leftover cdc_… / webdriver hooks
+                for (const k of Object.getOwnPropertyNames(window)) {
+                if (k.startsWith('cdc_') || k.includes('webdriver')) {
+                    try { delete window[k]; } catch(e){}
+                }
+                }
 
-        # Connect to the existing browser
-        driver = Selenium::WebDriver.for(:chrome, options: opts, http_client: client)
+                // 2) stub out window.chrome so Chrome-based detection thinks this is “normal” Chrome
+                window.chrome = { runtime: {} };
+            JS
+        )
 
-        # Save the driver
         @@drivers[id] = driver
-
-        # Return the driver
         driver
     end
+      
+            
+                        
 
+    # DEPRECATED - Use Zyte instead of this method.
+    #
     # Create a new profile, start the browser, visit a page, grab the HTML, and clean up.
     def html(url)
         ret = {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adspower-client
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.16
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-29 00:00:00.000000000 Z
+date: 2025-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uri
@@ -130,6 +130,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 7.3.0
+- !ruby/object:Gem::Dependency
+  name: fileutils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -170,6 +190,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.2
+- !ruby/object:Gem::Dependency
+  name: countries
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 7.1.1
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 7.1.1
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.1.1
 description: Ruby library for operating AdsPower API.
 email: leandro@connectionsphere.com
 executables: []