wabot 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e96e8a02aeaef68a60dc7e638c9eb8637fc25f86afe36f81555561a33e8c3a58
-  data.tar.gz: e0c61166fa7fc809faee830e6d67858debc1f22188a5b01e7a280c35a32505ce
+  metadata.gz: f07b179733062731ea76f1ffb30943949fe49d5d8343de859fd41b58c8f46494
+  data.tar.gz: 32b9957527498cda3b574358d424447b078fecf3f17c595b5a4195e301d09c1f
 SHA512:
-  metadata.gz: 965fab9cc5d205aac8d580d9dbecbb179fee23da4aec50f3bd600fa157a8857bf289708f42dc5b4e808512191406856a5170b8c7e37c54be8d985118057fad5f
-  data.tar.gz: 4943649a2276720c5fa5486cb605760716c2596c645f3119f6c65f9e12543e0324bc0b55e06ecb0b2aefac5223aaec7558732f700d575e2ffed2be24064ffd0d
+  metadata.gz: 624dfeb7730f1f1f316ae6b393ddd07ff968579b6c143c993872ba3ecb3542a3b6968e7c416bb44dd5fecea5cac741cb66f05e39537603e996d6131fcb1ec4f6
+  data.tar.gz: 9a92b158e50f703fcafa3c02b8c71c1b85142ca7bc9c4e939c27e405e9c43fbc7de6f1aec009a76aad996402f006b29c965c9aea9e529aba4f7581e93f9312bd

data/README.md

@@ -47,7 +47,7 @@ Notes:
  - Selenium Manager will handle downloading a compatible chromedriver automatically
 
 ## Security
-- Local user passwords are hashed with bcrypt and stored in `storage/users.json`
+- Local users are username-only (no passwords) and stored in `storage/users.json`
 - The current CLI login session is stored in `storage/session.json`
 - Your WhatsApp Web cookies/tokens live inside `profiles/<username>`; keep this folder private
 

data/lib/wabot/bot.rb

@@ -58,6 +58,8 @@ module WaBot
       encoded_text = URI.encode_www_form_component(message)
       chat_url = "#{BASE_URL}/send?phone=#{digits_phone}&text=#{encoded_text}"
       @driver.navigate.to(chat_url)
+      # Some dialogs (e.g., notifications prompts) can appear after navigation; try to close them.
+      dismiss_overlays
 
       wait = Selenium::WebDriver::Wait.new(timeout: 60)
       begin
@@ -67,7 +69,14 @@ module WaBot
         # Always attempt to type the message explicitly to avoid relying on URL prefill
         box = find_message_box
         if box
-          box.click
+          begin
+            # Focus composer via JS to avoid click interception
+            @driver.execute_script("arguments[0].focus();", box)
+          rescue Selenium::WebDriver::Error::ElementClickInterceptedError
+            # If some overlay intercepted, try dismissing and continue
+            dismiss_overlays
+            @driver.execute_script("arguments[0].focus();", box)
+          end
           sleep 0.15
           # Select-all + delete to clear any previous text
           modifier = (RUBY_PLATFORM =~ /darwin/i ? :command : :control)
@@ -83,7 +92,13 @@ module WaBot
           begin
             @driver.execute_script("arguments[0].click();", btn)
           rescue
-            btn.click
+            begin
+              btn.click
+            rescue Selenium::WebDriver::Error::ElementClickInterceptedError
+              # Dismiss overlays and retry JS click once
+              dismiss_overlays
+              @driver.execute_script("arguments[0].click();", btn)
+            end
           end
         else
           # If no button, try Enter/Return inside the composer
@@ -209,5 +224,50 @@ module WaBot
         false
       end
     end
+
+    def overlay_present?
+      begin
+        @driver.find_elements(css: "div[role='dialog']").any? { |el| el.displayed? }
+      rescue
+        false
+      end
+    end
+
+    def dismiss_overlays
+      # Best-effort: press ESC, click common dismiss buttons, and wait briefly
+      begin
+        # Press ESC up to 2 times
+        body = @driver.find_element(tag_name: "body")
+        2.times { body.send_keys(:escape) }
+      rescue
+      end
+      # Try common close buttons
+      buttons_css = [
+        "div[role='dialog'] button[aria-label='Close']",
+        "div[role='dialog'] button[aria-label='close']",
+        "div[role='dialog'] button[title='Close']"
+      ]
+      buttons_css.each do |css|
+        @driver.find_elements(css: css).each do |btn|
+          begin
+            @driver.execute_script("arguments[0].click();", btn)
+          rescue
+          end
+        end
+      end
+      # Try common text buttons
+      texts = ["Not now", "No thanks", "Cancel", "Close", "Got it", "OK"]
+      texts.each do |txt|
+        begin
+          el = @driver.find_element(xpath: "//div[@role='dialog']//button[normalize-space(text())='#{txt}']")
+          @driver.execute_script("arguments[0].click();", el)
+        rescue
+        end
+      end
+      # Small wait to allow overlay to disappear
+      Selenium::WebDriver::Wait.new(timeout: 3).until { !overlay_present? }
+    rescue
+      # ignore
+    end
   end
 end

data/lib/wabot/cli.rb

@@ -11,11 +11,10 @@ module WaBot
   class CLI < Thor
     desc "register", "Register a new local user"
     method_option :username, aliases: "-u", type: :string, required: true, desc: "Username"
-    method_option :password, aliases: "-p", type: :string, required: true, desc: "Password"
     def register
       store = UserStore.new
       begin
-        store.register(options[:username], options[:password])
+        store.register(options[:username])
         puts "User registered: #{options[:username]}".green
       rescue => e
         puts "Error: #{e.message}".red
@@ -25,11 +24,10 @@ module WaBot
 
     desc "login", "Login as a local user"
     method_option :username, aliases: "-u", type: :string, required: true
-    method_option :password, aliases: "-p", type: :string, required: true
     def login
       store = UserStore.new
-      unless store.authenticate(options[:username], options[:password])
-        puts "Invalid username or password".red
+      unless store.authenticate(options[:username])
+        puts "User not found. Please register first.".red
         exit 1
       end
       session = SessionStore.new

data/lib/wabot/user_store.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "json"
-require "bcrypt"
 require "fileutils"
 
 module WaBot
@@ -13,29 +12,20 @@ module WaBot
       initialize_file
     end
 
-    def register(username, password)
+    def register(username)
       raise "Username is required" if username.to_s.strip.empty?
-      raise "Password is required" if password.to_s.strip.empty?
 
       users = read_users
       raise "User already exists" if users.any? { |u| u["username"] == username }
 
-      password_hash = BCrypt::Password.create(password)
-      users << { "username" => username, "password_hash" => password_hash }
+      users << { "username" => username }
       write_users(users)
       true
     end
 
-    def authenticate(username, password)
+    def authenticate(username)
       users = read_users
-      user = users.find { |u| u["username"] == username }
-      return false unless user
-
-      begin
-        BCrypt::Password.new(user["password_hash"]) == password
-      rescue
-        false
-      end
+      users.any? { |u| u["username"] == username }
     end
 
     def users

data/lib/wabot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WaBot
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wabot
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Vikas Kumar
@@ -37,20 +37,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: bcrypt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +68,7 @@ files:
 - lib/wabot/session_store.rb
 - lib/wabot/user_store.rb
 - lib/wabot/version.rb
-homepage: https://github.com/vikas-0/whatsapp_bot_ruby
+homepage: https://github.com/vikas-0/wabot
 licenses:
 - MIT
 metadata: {}