alexa_remotectl 0.4.0 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3641c9d28ab824390ab0dc3aebec594eb204fdb0d09f8536ded7a7efd541e62
-  data.tar.gz: 8afb412ab356140e1289d1df7b49487bbc72e2b0d0593f43106f32dc8e643683
+  metadata.gz: f3390f693c5318ae22b5c79fbe464dacd839ef331c4d3f2a07e9aeed38229be2
+  data.tar.gz: adb89f569f0f47f88304c5032b963e171c556d340f928dd70de0437318c9b09f
 SHA512:
-  metadata.gz: 7bf863c6ae5e8d4426a32d0b57b0c763aaff8534a0bc379eb3a30e0aaaebb564317d6463b4ab0025133d8b720721315a10c7dc00473c70bb79f4567d1961d1d9
-  data.tar.gz: eb8b72c82327e56afc915dbe0ed2400a05db3ea061c5ae478e61b9cfc7f8e36e3f0f0c4b73908a97e45280f618bab40a9645a7d6f02429bc8f7400675d92e0f1
+  metadata.gz: 874e773c33e46ab1843c655ba49f138ffff68f9ef7a088cf550f5791c3e6fa567545f1e1a8fab52083b860c3c512ffdebd86f312059c2fc9d1e5def5a9881539
+  data.tar.gz: f0f91e9861f1cd68e3d2494341f6bbc28f2d482d5766b124b66f65e9cab60fa34d03f199516bc1f75936320e620096f40d9b33c9a98dfb2991575529c1736bbe

data/lib/alexa_remotectl.rb

@@ -22,14 +22,15 @@ class CodeWizard
 
     return 'no curl command found' unless s =~ /curl/
 
-    cookie, serialno, type = parse(s)
+    cookie, csrf, serialno, type = parse(s)
 
 @s =<<EOF
 require 'alexa_remotectl'
 
 cookie = '#{cookie}'
+csrf = '#{csrf}'
 device = {serialno: '#{serialno}', type: '#{type}'}
-alexa = AlexaRemoteCtl.new(cookie: cookie, device: device)
+alexa = AlexaRemoteCtl.new(cookie: cookie, csrf: csrf, device: device)
 alexa.pause
 #alexa.play
 EOF
@@ -50,17 +51,22 @@ EOF
     serialno = s[/deviceSerialNumber=(\w+)/,1]
     type = s[/deviceType=(\w+)/,1]
     cookie = s[/Cookie: ([^']+)/,1]
+    csrf = s[/csrf: ([^']+)/,1]
 
-    [cookie, serialno, type]
+    [cookie, csrf, serialno, type]
 
   end
 end
 
 class AlexaRemoteCtl
 
-  def initialize(domain: 'alexa.amazon.co.uk', device: {}, cookie: '')
+  # note: Added the Cross-site request forgery (crsf) variable
+  #
+  def initialize(domain: 'alexa.amazon.co.uk', device: {}, cookie: '',
+      customerid: '', csrf: '')
 
-    @domain, @device, @cookie = domain, device, cookie
+    @domain, @device, @cookie, @customerid = domain, device, cookie, customerid
+    @csrf = csrf
 
   end
 
@@ -68,6 +74,17 @@ class AlexaRemoteCtl
     device_player()[:playerInfo]
   end
 
+  def list_ebooks()
+    get_json '/api/ebooks/library', "mediaOwnerCustomerId=#{@customerid}" +
+        "&nextToken=&size=50"
+  end
+
+  # list historical queue (hq)
+  #
+  def list_hq()
+    get_json '/api/media/historical-queue', "size=50&offset=-1"
+  end
+
   def mute?()
     info()[:volume][:muted]
   end
@@ -87,6 +104,31 @@ class AlexaRemoteCtl
     pp_cmd('Play')
   end
 
+  def play_ebook(id)
+
+    serialno = @device[:serialno]
+    type = @device[:type]
+
+    url = "https://#{@domain}/api/ebooks/queue-and-play?"
+
+    body = {
+      'asin' => id,
+      'deviceType' => type,
+      'deviceSerialNumber' => serialno,
+      'mediaOwnerCustomerId' => @customerid
+    }.to_json
+
+    post_request url, body
+
+  end
+
+  # play historical queue
+  # note: You can find the queueid from an entry in the list_hq() result
+  #
+  def play_hq(queueid)
+    device_phq(queueid)
+  end
+
   def playing?()
     info()[:state] == 'PLAYING'
   end
@@ -136,18 +178,51 @@ class AlexaRemoteCtl
     serialno = @device[:serialno]
     type = @device[:type]
 
-    url = "https://#{@domain}/api/np/command?deviceSerialNumber=#{serialno}&deviceType=#{type}"
+    url = "https://#{@domain}/api/np/command?deviceSerial" +
+        "Number=#{serialno}&deviceType=#{type}"
     post_command url, body
 
   end
 
+  # play historical queue (PHQ)
+  #
+  def device_phq(queueid)
+
+    serialno = @device[:serialno]
+    type = @device[:type]
+
+    url = "https://#{@domain}/api/media/play-historical-queue"
+
+    body = {
+      'deviceType' => type,
+      'deviceSerialNumber' => serialno,
+      'queueId' => queueid,
+      'startTime' => nil,
+      'service' => nil,
+      'trackSource' => nil,
+      'mediaOwnerCustomerId' => @customerid
+    }.to_json
+
+    post_request url, body
+
+  end
+
   def device_player()
+    get_json '/api/np/player'
+  end
+
+  def get_json(uri, params='')
+
     serialno = @device[:serialno]
     type = @device[:type]
 
-    url = "https://#{@domain}/api/np/player?deviceSerialNumber=#{serialno}&deviceType=#{type}"
-    r = post_request url
+    url = "https://#{@domain}#{uri}?deviceSerial" +
+        "Number=#{serialno}&deviceType=#{type}"
+    url += '&' + params if params.length > 1
+
+    r = get_request url
     JSON.parse(r.body, symbolize_names: true)
+
   end
 
   def make_response(uri, request)
@@ -155,16 +230,17 @@ class AlexaRemoteCtl
     request["Accept"] = "application/json, text/javascript, */*; q=0.01"
     request["Accept-Language"] = "en-GB,en-US;q=0.9,en;q=0.8"
     request["Connection"] = "keep-alive"
-    request["Content-Type"] = "application/x-www-form-urlencoded; charset=UTF-8"
     request["Cookie"] = @cookie
 
     request["Referer"] = "https://#{@domain}/spa/index.html"
     request["Sec-Fetch-Dest"] = "empty"
     request["Sec-Fetch-Mode"] = "cors"
     request["Sec-Fetch-Site"] = "same-origin"
-    request["User-Agent"] = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.4951.64 Safari/537.36"
+    request["User-Agent"] = "Mozilla/5.0 (X11; Linux x86_64) " +
+        "AppleWebKit/537.36 (KHTML, like Gecko) " +
+        "Chrome/101.0.4951.64 Safari/537.36"
     request["X-Requested-With"] = "XMLHttpRequest"
-    request["csrf"] = "-990908140"
+    request["csrf"] = @csrf
     request["dnt"] = "1"
     request["sec-ch-ua"] = "\" Not A;Brand\";v=\"99\", \"Chromium\";v=\"101\""
     request["sec-ch-ua-mobile"] = "?0"
@@ -181,6 +257,7 @@ class AlexaRemoteCtl
   end
 
   def post_command(url, body='')
+
     uri = URI.parse(url)
     request = Net::HTTP::Post.new(uri)
     request.body = body
@@ -193,7 +270,7 @@ class AlexaRemoteCtl
     # response.body
   end
 
-  def post_request(url)
+  def get_request(url)
 
     uri = URI.parse(url)
     request = Net::HTTP::Get.new(uri)
@@ -204,6 +281,19 @@ class AlexaRemoteCtl
 
   end
 
+
+  def post_request(url, body='')
+
+    uri = URI.parse(url)
+    request = Net::HTTP::Post.new(uri)
+    request.body = body
+    response = make_response(uri, request)
+
+    # response.code
+    # response.body
+
+  end
+
 end
 
 class AlexaDevices
@@ -212,59 +302,85 @@ class AlexaDevices
   # note: label can be any identifier you choose e.g. kitchen
   #
   def initialize(devicesx=[], devices: devicesx,
-                 domain: 'alexa.amazon.co.uk', cookie: '')
+                 domain: 'alexa.amazon.co.uk', cookie: '', customerid: '',
+                 csrf: '', debug: false)
 
     @devices, @domain, @cookie = devices, domain, cookie
+    @customerid, @csrf, @debug = customerid, csrf, debug
 
   end
 
+  def info(id=nil)    invoke(:info, id)            end
+  def list_ebooks(id) invoke(:list_ebooks, id)     end
+  def list_hq(id=nil) invoke(:list_hq, id)         end
+  def mute?(id=nil)   invoke2(:mute?, id)          end
+  def next(id)        invoke2(:next, id)           end
+
   def playing()
 
-    @devices.map do |device, label|
-      alexa = AlexaRemoteCtl.new(cookie: @cookie, device: device)
-      alexa.playing? ? [alexa, label] : nil
-    end.compact
+    devices = @devices.map do |device, label|
 
-  end
+      puts 'label: ' + label.inspect if @debug
+      puts 'device: ' + device.inspect if @debug
 
-  def pause(id=nil)
+      alexa = get_alexa device
+      alexa.playing? ? [alexa, label] : nil
 
-    a = playing()
+    end.compact
 
-    if id then
+    puts 'devices: ' + devices.inspect if @debug
+    return devices
 
-      alexa, _ = a.find {|_, label| label.to_sym == id.to_sym}
-      alexa.pause
+  end
 
-    else
+  def pause(id=nil)      invoke2(:pause, id)          end
+  def play(id)           invoke(:play, id)            end
+  def play_ebook(id)     invoke(:list_hq, id)         end
+  def play_hq(id,qid)    invoke(:play_hq, id, qid)    end
+  def playing?(id=nil)   invoke(:playing, id)         end
+  def text1(id=nil)      invoke2(:text1, id)          end
+  def text2(id=nil)      invoke2(:text2, id)          end
+  def title(id=nil)      invoke2(:title, id)          end
+  def vol(id=nil)        invoke(:vol, id)             end
+  def vol=(id=nil)       invoke(:vol=, id)            end
 
-      a.each do |alexa, label|
-        puts 'Pausing @' + label.inspect
-        alexa.pause
-      end
+  private
 
-    end
-  end
+  def get_alexa(device)
 
-  def play(id=nil)
+    AlexaRemoteCtl.new(cookie: @cookie, device: device,
+                       customerid: @customerid, csrf: @csrf)
+  end
 
-    a = @devices
+  def apply_cmd(a, cmd, id, args)
 
     if id then
 
       device, _ = a.find {|_, label| label.to_sym == id.to_sym}
-      alexa = AlexaRemoteCtl.new(cookie: @cookie, device: device)
-      alexa.play
+      alexa = get_alexa device
+      alexa.method(cmd).call(*args)
 
     else
 
-      a.each do |device, label|
-        puts 'Pausing @' + label.inspect
-        alexa = AlexaRemoteCtl.new(cookie: @cookie, device: device)
-        alexa.play
+      a.map do |device, label|
+
+        puts cmd.to_s + ' @' + label.inspect
+        alexa = get_alexa device
+        alexa.method(cmd).call(*args)
+
       end
 
     end
   end
 
+  def invoke(cmd, id, *args)
+    apply_cmd(@devices, cmd, id, args)
+  end
+
+  # apply command to an Alexa device which is currently playing
+  #
+  def invoke2(cmd, id, *args)
+    apply_cmd(playing(), cmd, id, args)
+  end
+
 end

data.tar.gz.sig

@@ -1,2 +1,3 @@
-q�!O��,>�n���$�}���1t�?(��y���?��Ҥ��d]R
-���]�],�\]��v4#�K^²Ed�ϟ�LO��WT�ո{�|ݬrCRR
�P���[�����,a�lxm�Ł�<�q���T���
_
+:�c>j<�;Iy6A�-=�i)�+4��b�
+�"M�b�*��+�jM`|����L_WM�+ѫ�5�GX�T�E>u�T�ehK�[oO�P�ф�^e�)�MƢฮ�$����k�I�9�~b��Ӭ*�Ȩ+�22��,GA-��*ϑ`�[V��8�3ݽ�snf�՜L
+�

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alexa_remotectl
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.3
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   d/gEwBtUmduwWZNX2NOJehf8s1cnH9OBP7s1ziHjdkZCgkQm3QewRRcdfZeYwFi6
   4kVEcApgAgd+04ctE6uiRn5o
   -----END CERTIFICATE-----
-date: 2022-05-22 00:00:00.000000000 Z
+date: 2022-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard