whatsapp_notifier 0.9.1 → 0.9.3

data/lib/whatsapp_notifier/web_adapter.rb

@@ -34,7 +34,12 @@ module WhatsAppNotifier
       media_size: %w[mediaSize media_size],
       sender_name: %w[senderName sender_name],
       to: %w[to],
-      from_me: %w[fromMe from_me]
+      from_me: %w[fromMe from_me],
+      # 0.9.3: the `<digits>@lid` privacy id the counterparty above was
+      # RESOLVED FROM, present only for a privacy-keyed chat. The phone in
+      # from/to is always a real phone — this says where it came from, so a
+      # host can audit a thread's origin. Never a value to thread on.
+      sender_lid: %w[senderLid sender_lid]
     }.freeze
 
     def self.default_base_url
@@ -183,6 +188,27 @@ module WhatsAppNotifier
       Array(response["messages"]).map { |m| map_inbound_message(m) }
     end
 
+    # Resolves ONE WhatsApp privacy id (`@lid`) to the phone number behind it,
+    # returning the bare digits or nil when nothing is recoverable.
+    #
+    # Hosts need this to repair conversations they keyed on an unresolved
+    # privacy id — rows written when the service still fabricated a "phone"
+    # out of the LID's own digits (fixed in 0.9.3). Live capture resolves on
+    # its own; this is the backward-looking half.
+    #
+    # nil is a real answer ("no phone behind this id"), not an error: the
+    # service replies 200 with pn: null, and only a transport/gate failure
+    # raises.
+    def resolve_lid(lid:, metadata: {})
+      user_id = user_id_from(metadata)
+      digits = lid.to_s.split("@").first.to_s.gsub(/\D/, "")
+      return nil if digits.empty?
+
+      response = request(:get, "/contacts/lid/#{user_id}?lid=#{digits}")
+      resolved = response["pn"].to_s.split("@").first.to_s.gsub(/\D/, "")
+      resolved.empty? ? nil : resolved
+    end
+
     # Logs the user out of WhatsApp and clears their saved session on the service.
     def logout(metadata: {})
       user_id = user_id_from(metadata)

data/lib/whatsapp_notifier.rb

@@ -97,6 +97,10 @@ module WhatsAppNotifier
       client.fetch_history(chat_id: chat_id, limit: limit, provider: provider, metadata: metadata)
     end
 
+    def resolve_lid(lid:, provider: nil, metadata: {})
+      client.resolve_lid(lid: lid, provider: provider, metadata: metadata)
+    end
+
     def logout(provider: nil, metadata: {})
       client.logout(provider: provider, metadata: metadata)
     end

data/spec/client_spec.rb

@@ -91,7 +91,7 @@ RSpec.describe WhatsAppNotifier::Client do
     end
   end
 
-  it "delegates list_chats and fetch_history to the provider" do
+  it "delegates list_chats, fetch_history and resolve_lid to the provider" do
     Dir.mktmpdir do |dir|
       config.provider = :web_automation
       config.web_automation_enabled = true
@@ -101,7 +101,8 @@ RSpec.describe WhatsAppNotifier::Client do
         fetch_qr_code: "qr",
         connection_status: { state: "AUTHENTICATED", authenticated: true },
         list_chats: [{ id: "919@c.us", name: "Asha", last_message_at: 9 }],
-        fetch_history: [{ from: "919@c.us", body: "old", message_id: "h1" }]
+        fetch_history: [{ from: "919@c.us", body: "old", message_id: "h1" }],
+        resolve_lid: "919882536803"
       )
       config.web_adapter = adapter
       client = described_class.new(configuration: config)
@@ -110,6 +111,8 @@ RSpec.describe WhatsAppNotifier::Client do
         .to eq([{ id: "919@c.us", name: "Asha", last_message_at: 9 }])
       expect(client.fetch_history(chat_id: "919@c.us", provider: :web_automation, metadata: { user_id: 1 }))
         .to eq([{ from: "919@c.us", body: "old", message_id: "h1" }])
+      expect(client.resolve_lid(lid: "125417440686124@lid", provider: :web_automation, metadata: { user_id: 1 }))
+        .to eq("919882536803")
       # The default page size survives the delegation chain untouched.
       expect(adapter).to have_received(:fetch_history).with(chat_id: "919@c.us", limit: 50, metadata: { user_id: 1 })
     end

data/spec/providers/web_automation_spec.rb

@@ -249,11 +249,13 @@ RSpec.describe WhatsAppNotifier::Providers::WebAutomation do
       adapter = double(
         fetch_qr_code: "qr", connection_status: {},
         list_chats: [{ id: "919@c.us", name: "Asha", last_message_at: 9 }],
-        fetch_history: [{ from: "919@c.us", body: "old", message_id: "h1" }]
+        fetch_history: [{ from: "919@c.us", body: "old", message_id: "h1" }],
+        resolve_lid: "919882536803"
       )
       config = build_config(path: File.join(dir, "session.json"), adapter: adapter)
       provider = described_class.new(configuration: config)
 
+      expect(provider.resolve_lid(lid: "125417440686124@lid", metadata: { user_id: 1 })).to eq("919882536803")
       expect(provider.list_chats(metadata: { user_id: 1 })).to eq([{ id: "919@c.us", name: "Asha", last_message_at: 9 }])
       expect(provider.fetch_history(chat_id: "919@c.us", limit: 20, metadata: { user_id: 1 }))
         .to eq([{ from: "919@c.us", body: "old", message_id: "h1" }])
@@ -282,6 +284,7 @@ RSpec.describe WhatsAppNotifier::Providers::WebAutomation do
 
       expect { provider.list_chats }.to raise_error(WhatsAppNotifier::ConfigurationError, /disabled/)
       expect { provider.fetch_history(chat_id: "919@c.us") }.to raise_error(WhatsAppNotifier::ConfigurationError, /disabled/)
+      expect { provider.resolve_lid(lid: "1@lid") }.to raise_error(WhatsAppNotifier::ConfigurationError, /disabled/)
     end
   end
 
@@ -293,6 +296,7 @@ RSpec.describe WhatsAppNotifier::Providers::WebAutomation do
 
       expect { provider.list_chats }.to raise_error(WhatsAppNotifier::ConfigurationError, /chat listing/)
       expect { provider.fetch_history(chat_id: "919@c.us") }.to raise_error(WhatsAppNotifier::ConfigurationError, /history replay/)
+      expect { provider.resolve_lid(lid: "1@lid") }.to raise_error(WhatsAppNotifier::ConfigurationError, /@lid resolution/)
     end
   end
 

data/spec/web_adapter_spec.rb

@@ -454,6 +454,37 @@ RSpec.describe WhatsAppNotifier::WebAdapter do
       .to raise_error(/service request failed \(401\): User not authenticated/)
   end
 
+  # Privacy-id resolution (0.9.3): the half a host needs to repair threads it
+  # already keyed on an unresolved @lid.
+  it "resolves a privacy id to bare phone digits" do
+    allow(ENV).to receive(:[]).and_call_original
+    allow(ENV).to receive(:[]).with("WHATSAPP_WEBHOOK_TOKEN").and_return("sekrit")
+    response = http_success(body: { "success" => true, "lid" => "125417440686124@lid", "pn" => "919882536803@c.us" })
+    captured = nil
+    http = double("http")
+    allow(http).to receive(:request) { |req| captured = req; response }
+    allow(Net::HTTP).to receive(:start) { |*_args, **_kwargs, &blk| blk.call(http) }
+
+    expect(adapter.resolve_lid(lid: "125417440686124@lid", metadata: { user_id: "u-1" }))
+      .to eq("919882536803")
+    expect(captured).to be_a(Net::HTTP::Get)
+    expect(captured.path).to eq("/contacts/lid/u-1?lid=125417440686124")
+    expect(captured["X-WA-Token"]).to eq("sekrit")
+  end
+
+  it "returns nil when the privacy id has no phone behind it" do
+    allow(Net::HTTP).to receive(:start)
+      .and_return(http_success(body: { "success" => true, "lid" => "1@lid", "pn" => nil }))
+
+    expect(adapter.resolve_lid(lid: "125417440686124", metadata: {})).to be_nil
+  end
+
+  it "does not call the service for a lid with no digits" do
+    expect(Net::HTTP).not_to receive(:start)
+
+    expect(adapter.resolve_lid(lid: "@lid", metadata: {})).to be_nil
+  end
+
   it "fetches history with the token, posting the chat id and clamped limit" do
     allow(ENV).to receive(:[]).and_call_original
     allow(ENV).to receive(:[]).with("WHATSAPP_WEBHOOK_TOKEN").and_return("sekrit")

data/spec/whatsapp_notifier_spec.rb

@@ -99,6 +99,7 @@ RSpec.describe WhatsAppNotifier do
     allow(fake_client).to receive(:refetch_media).and_return(mime: "image/jpeg", filename: nil, size: 5, status: "available")
     allow(fake_client).to receive(:list_chats).and_return([{ id: "919@c.us", name: "Asha", last_message_at: 9 }])
     allow(fake_client).to receive(:fetch_history).and_return([{ from: "919@c.us", body: "old", message_id: "h1" }])
+    allow(fake_client).to receive(:resolve_lid).and_return("919882536803")
     allow(fake_client).to receive(:logout).and_return(success: true)
     described_class.instance_variable_set(:@client, fake_client)
 
@@ -111,6 +112,7 @@ RSpec.describe WhatsAppNotifier do
     expect(described_class.refetch_media(message_id: "m1", chat_id: "919@c.us", provider: :web_automation, metadata: { user_id: 1 })).to include(status: "available")
     expect(described_class.list_chats(provider: :web_automation, metadata: { user_id: 1 })).to eq([{ id: "919@c.us", name: "Asha", last_message_at: 9 }])
     expect(described_class.fetch_history(chat_id: "919@c.us", limit: 20, provider: :web_automation, metadata: { user_id: 1 })).to eq([{ from: "919@c.us", body: "old", message_id: "h1" }])
+    expect(described_class.resolve_lid(lid: "125417440686124@lid", provider: :web_automation, metadata: { user_id: 1 })).to eq("919882536803")
     expect(described_class.logout(provider: :web_automation, metadata: { user_id: 1 })).to eq(success: true)
     expect(fake_client).to have_received(:fetch_media).with(message_id: "m1", provider: :web_automation, metadata: { user_id: 1 })
     expect(fake_client).to have_received(:delete_media).with(message_id: "m1", provider: :web_automation, metadata: { user_id: 1 })

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whatsapp_notifier
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.3
 platform: ruby
 authors:
 - Kshitiz Sinha