alexa_remotectl 0.4.2 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 769f37b93490b3ab472fea0e8bc15dc1ce3c2e34cb3b4c01ce0ddc6c296fdff9
-  data.tar.gz: 66bdfb5add38d18635c34469ebd2a508a152daa76319c043ccfc81c67569781d
+  metadata.gz: e6f8ae020909ff7e55ed461f0abd1d5be5030f4a0a33e59bca9d679d9d317cdb
+  data.tar.gz: 2ca248fe25642502eb143de03d3ef64297b24618eea71b630fba347a040e6682
 SHA512:
-  metadata.gz: 50ae6554ebe0f56317439880759316c90cfcd154d564cf45db4d517c5471115a10d0f4bad197e74090f96cc952fa9bf8f5f1dd43c0889285c78822022fd488ad
-  data.tar.gz: ab6a5c377f4575298d29dbe02592a7a3a20949a7a88326926ab968d725cd2a3e9ec7ccc3cf71aca1300f2fa56dd14964653aff09f9d501538031639ca04fe07f
+  metadata.gz: 3a6b48bedafcc463138aeb96b7eb1450a048f60a8f886494bcdb7b0b7abb658a658d707b2820d6586eb4c0a776704a650b79e728d06e3a7bcea917144852ea14
+  data.tar.gz: 7370ca7ac96b4c72dddaa0967d24d78d0267b7746ec533a96c68062dc5b5cac487040230432bf298c85d60e316c65e26223a39bcdc1f5677011afbcf2aba4962

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
@@ -62,20 +62,43 @@ class AlexaRemoteCtl
 
   # note: Added the Cross-site request forgery (crsf) variable
   #
-  def initialize(domain: 'alexa.amazon.co.uk', device: {}, cookie: '', customerid: '', csrf: '')
+  def initialize(domain: 'alexa.amazon.co.uk', device: {}, cookie: '',
+      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
+
   def info()
     device_player()[:playerInfo]
   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?()
@@ -97,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]
@@ -115,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?()
@@ -154,6 +194,8 @@ class AlexaRemoteCtl
     device_cmd(body)
   end
 
+  alias setvol vol=
+
   private
 
   # play, pause, or next
@@ -293,70 +335,85 @@ class AlexaDevices
   #
   def initialize(devicesx=[], devices: devicesx,
                  domain: 'alexa.amazon.co.uk', cookie: '', customerid: '',
-                 csrf: '')
+                 csrf: '', debug: false)
 
     @devices, @domain, @cookie = devices, domain, cookie
-    @customerid, @csrf = customerid, csrf
+    @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 setvol(id=nil, level)  invoke(:setvol, id, level) 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, csrf: @csrf)
+  # 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,3 +1,3 @@
-�Z�?.
-V�{��Ȏ��d��ïAr�Ѯp
-�z�%7�9GA�A���f�y�8*a���y����R��
+
+������\G�y<�x��yxk?8Ά��(�����E�6���-ubA�ځe##T�a.�ޟ��tC�IC�]O�

E��|X��?I%@>��/�Ɗ�Q�#�
I��v�́T-=��׳]����V)亏S���X�e��}���1�r
+Ԙ
k�'��1���ҕ�‘�Y��/��:E�@��8�lݫ�h�u�

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alexa_remotectl
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.5
 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-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard