alexa_remotectl 0.4.1 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b1f56f3518e257c26d3d00ac9e63dde021474827abb5461fdb11114f95196a2
-  data.tar.gz: 3dbe1a051f41b9b11f77e0f82c392f90c72d23ee4ba0314cc6ebc3c0deb31adc
+  metadata.gz: ee085eb3e18299edb7c08f01ca1eac8f90ca30f6cc125b64deb18ff9af848662
+  data.tar.gz: 48225e18ed743504662f52f6abd3ba17bad63fa3035bfb04a29a85b1d176a0a4
 SHA512:
-  metadata.gz: ff774816c05f4c379b0563f83ff5b9036161c58975438898723d2460aadbb29fe554fa6b84f6c5c12208fb1e375ccdaccac5d006944b7262c321c9a5b4abe724
-  data.tar.gz: 236d52c95e7421ee51af2d425523ddb85d193290398b4886bfae7c718a8e16f6b1450a316301dc8a077ba0436d59ecb2b7faa301041865ff179505a3001c3594
+  metadata.gz: efbd977b60c72d374cb8b3f7864030dc772fbd1fb6369e3a5ee74f1dc7ba41276c2df2b2640b983deccad8273a8a1cf6ca26237a60b72fc59e61cb489bac5a42
+  data.tar.gz: 2e40d366bb49d53f9808117034cfa87c276d4ddb212ee321320ce9f9dc7ead6a50db66e3f88b341a505ad322e0aee045f6a495162508fd105d79bfd37b4d9b33

checksums.yaml.gz.sig

@@ -1,2 +1,4 @@
-�t$45Y!%=�z�o����V�[�X&�Fǡ�wh)���aU%��S�dd(C�߅�/�k�b�r�x�&�J]r��c9k��h)/E�Jz�?4���w_Kc��h�.+�S�W��/O�8��G���q��XR����%�#yz=2�wg����lJ�4~j�VO7Y�xS�FH`�����v�Z��X�&r��%�~�J��t/�
-�@\x=M��	�/���,�۶�L�^��	yz*�p���q��{����9S�����ժ{��*A���V�q�K��?��)�*�*�oR+Pm[{޼!.Aⓡ��7�S��|�%�F ~�q�8p}������+�E�}�Zn������_/�a�}5���?��y�Kt����-���(Z7;>�O
+�����$�
+�������� �" �,���i�׻�&��E��'q>��2�rZ]l�FB(��?_I�퓾N����*��M���|�[��8^����G�d��^j��R�qW�7ܸ�_p�
+U-3YԤ�57�C��H�S߭
+�'���.D�Q)Sզ\��<�N���f���4rϼ.՛,���u;<I�\�T�V���F��8�s�F}j��a�u���قU>��co�)��J�pc����������kd̜|)��s9픃4*O�gC��SM���F;<f8�go��L`�}�i=���A&5�L�ӭ������C��)�
��:4�3?Z����	J�;�!k�!���B���3
�1���z�МԪ�##��A�0�2Y

data/lib/alexa_remotectl.rb

@@ -13,7 +13,7 @@ require 'json'
 # Use the CodeWizard with the cURL command you've copied using Developer
 # tools on Alexa's SPA page (within the web browser).
 #
-# note: to find the correct url to convert, try clickin on pause or play to
+# note: to find the correct url to convert, try clicking on pause or play to
 #       invoke an AJAX request
 
 class CodeWizard
@@ -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,18 +51,37 @@ 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
 
+  # note: Added the Cross-site request forgery (crsf) variable
+  #
   def initialize(domain: 'alexa.amazon.co.uk', device: {}, cookie: '',
-                 customerid: '')
+      customerid: '', csrf: '')
 
     @domain, @device, @cookie, @customerid = domain, device, cookie, customerid
+    @csrf = csrf
+
+  end
+
+  # Some audio streams can't be paused through the SPA API. Playing a
+  # historical queue, and then pausing it, is the best next option.
+  #
+  def force_pause()
+
+    r = list_hq()
+    queueid = r[:media][0][:queueId]
+
+    play_hq queueid
+    sleep 1
+
+    pause()
 
   end
 
@@ -70,8 +90,15 @@ class AlexaRemoteCtl
   end
 
   def list_ebooks()
-    get_json '/api/ebooks/library', "mediaOwnerCustomerId=#{@customerid}" +
+    r = get_json '/api/ebooks/library', "mediaOwnerCustomerId=#{@customerid}" +
         "&nextToken=&size=50"
+    r[:metadataList]
+  end
+
+  # list historical queue (hq)
+  #
+  def list_hq()
+    get_json '/api/media/historical-queue', "size=50&offset=-1"
   end
 
   def mute?()
@@ -93,7 +120,13 @@ class AlexaRemoteCtl
     pp_cmd('Play')
   end
 
-  def play_ebook(id)
+  def play_ebook(obj)
+
+    id = if obj.is_a? Integer then
+      list_ebook()[obj][:asin]
+    else
+      obj
+    end
 
     serialno = @device[:serialno]
     type = @device[:type]
@@ -111,8 +144,19 @@ class AlexaRemoteCtl
 
   end
 
-  def play_hq(id)
-    device_phq(id)
+  # play historical queue
+  # note: You can find the queueid from an entry in the list_hq() result
+  #
+  def play_hq(obj)
+
+    queueid = if obj.is_a? Integer then
+      r = list_hq()
+      r[:media][obj][:queueId]
+    else
+      obj
+    end
+
+    device_phq(queueid)
   end
 
   def playing?()
@@ -150,6 +194,8 @@ class AlexaRemoteCtl
     device_cmd(body)
   end
 
+  alias setvol vol=
+
   private
 
   # play, pause, or next
@@ -226,7 +272,7 @@ class AlexaRemoteCtl
         "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"
@@ -288,70 +334,86 @@ class AlexaDevices
   # note: label can be any identifier you choose e.g. kitchen
   #
   def initialize(devicesx=[], devices: devicesx,
-                 domain: 'alexa.amazon.co.uk', cookie: '', customerid: '')
+                 domain: 'alexa.amazon.co.uk', cookie: '', customerid: '',
+                 csrf: '', debug: false)
 
     @devices, @domain, @cookie = devices, domain, cookie
-    @customerid = customerid
+    @customerid, @csrf, @debug = customerid, csrf, debug
 
   end
 
+  def force_pause(id) invoke(:force_pause, id)     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|
+    devices = @devices.map do |device, label|
+
+      puts 'label: ' + label.inspect if @debug
+      puts 'device: ' + device.inspect if @debug
+
       alexa = get_alexa device
       alexa.playing? ? [alexa, label] : nil
-    end.compact
 
-  end
-
-  def pause(id=nil)
+    end.compact
 
-    a = playing()
+    puts 'devices: ' + devices.inspect if @debug
+    return devices
 
-    if id then
+  end
 
-      alexa, _ = a.find {|_, label| label.to_sym == id.to_sym}
-      alexa.pause
+  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
 
-    else
+  private
 
-      a.each do |alexa, label|
-        puts 'Pausing @' + label.inspect
-        alexa.pause
-      end
+  def get_alexa(device)
 
-    end
+    AlexaRemoteCtl.new(cookie: @cookie, device: device,
+                       customerid: @customerid, csrf: @csrf)
   end
 
-  def play(id=nil)
-
-    a = @devices
+  def apply_cmd(a, cmd, id, args)
 
     if id then
 
       device, _ = a.find {|_, label| label.to_sym == id.to_sym}
       alexa = get_alexa device
-      alexa.play
+      alexa.method(cmd).call(*args)
 
     else
 
-      a.each do |device, label|
+      a.map do |device, label|
 
-        puts 'Pausing @' + label.inspect
+        puts cmd.to_s + ' @' + label.inspect
         alexa = get_alexa device
-        alexa.play
+        alexa.method(cmd).call(*args)
 
       end
 
     end
   end
 
-  private
-
-  def get_alexa(device)
+  def invoke(cmd, id, *args)
+    apply_cmd(@devices, cmd, id, args)
+  end
 
-    AlexaRemoteCtl.new(cookie: @cookie, device: device,
-                       customerid: @customerid)
+  # apply command to an Alexa device which is currently playing
+  #
+  def invoke2(cmd, id, *args)
+    apply_cmd(playing(), cmd, id, args)
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alexa_remotectl
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.4
 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