rocksky 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e27b27d24d5d5c59963b65031fb641ecb90cb322a9107f3a62a431e6d1973a0c
-  data.tar.gz: 4a314bfa67627103279e453ab7f3563f3c0265c02ca0c1db1ca88259ca26cb33
+  metadata.gz: 506387a27a8e92d1310a65f855110efff853b6079d9dbb65d6a3e1e56932cc18
+  data.tar.gz: 9d190b167472ba41881d547b527e501e446a75d844cefd4ff5b3200cd461cc94
 SHA512:
-  metadata.gz: 498b7790bd6961f4a5e118ab4485bf124afb9283fb838a38f6c21195fa50ba47e22bc10ae98518e6804401e3b8de63e5580cb8957a3690f0dcf39a4e72d18de9
-  data.tar.gz: 3f1bb359b30802470a0c7d59ea921850ee43060bba3c67ba8f672eebb1d01c3d6814135462b47c029104bbfb3f5bb32de2b592ffab590c6521f703c3b37995f9
+  metadata.gz: 1a82ef8bb90f40689b29067ba2debfe55eb8e099ed0897c3a69b795a3f03e76c49b10ba42d2035377027ea6701b53ac7be2195b2aead08f0a609ebd4e3058e9c
+  data.tar.gz: 78ca04c14127de3ae2b6993a942129ad1d9118679f1c8458807d315744e703932ae3c861fb32349fb615dff4d4086207bc38e19a2361d27a8fa047291576addf

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## 0.10.0
+
+- Remote-player protocol: now-playing records accept optional audio info —
+  `codec` (audio codec/container, e.g. "mp3", "flac") and `sampleRate` (sample
+  rate in Hz, e.g. 44100). A player includes them in the `track` payload when
+  set (`codec` / `sample_rate` on the wire, omitted otherwise); a controller's
+  `:now_playing` event exposes them on the `:track` hash.
+
+## 0.9.1
+
+- Fix a segfault when tearing down a `RemotePlayer` / `RemoteController`.
+  `#close` freed the native handle while the `#listen` background thread was
+  still blocked inside `#next_command` / `#next_event` (a use-after-free). It now
+  stops the background task and **joins** the listen thread — so the poll has
+  returned — before freeing. `#next_command` / `#next_event` also no-op once the
+  handle is released.
+
 ## 0.3.0
 
 - `feed.get_stories` now accepts optional `feed:` (at-uri) and `following:`

data/lib/rocksky/manifest.json

@@ -1,12 +1,12 @@
 {
   "repo": "tsirysndr/rocksky",
-  "tag": "bindings-v0.6.0",
+  "tag": "bindings-v0.7.0",
   "checksums": {
-    "aarch64-apple-darwin": "e2de89af96e1330427898524254ddb57728453947b607c4dd29fb8ed7c513b27",
-    "aarch64-linux-gnu": "37b8f5ec3812cb15f7eeb75beb44ffe857cca95c11064d1e781eaff6edf7c14d",
-    "x86_64-apple-darwin": "7a550b51fc75e1e4d7c5393423f2920dda980ea8f026c9bde8edd926d18d3795",
-    "x86_64-linux-gnu": "683e9c14579041c77fa69b53f73b43a44432719c608d7af74f950c9263c5c53b",
-    "x86_64-unknown-freebsd": "4ecf5a61000b46111aef2c66e241c97e712c8ef6af386a01afddfe2c05136893",
-    "x86_64-unknown-netbsd": "0c619e60f6cf95c42bbe61adb26be8550024c8cbea08be6de9fb3127db627900"
+    "aarch64-apple-darwin": "e9a772586564269dccf8448d46162b85fe5290307b818b3a4fc26ff634c2ab57",
+    "aarch64-linux-gnu": "fbfc5d12a8c532f437577f1c2e36c794760e78bb66749af33eef17d14a60cafc",
+    "x86_64-apple-darwin": "81e5628ea2f269ac8efefce85fa5eae093b1d49848aba580da9f267a36f85115",
+    "x86_64-linux-gnu": "3d3de1e3b691416676dd1c09879b14944a5c85d1d8911650113e6ee7783326e2",
+    "x86_64-unknown-freebsd": "b0ad8071e2a6baf1096d4f82221c440e56bf9426e435244ade8687f08edabf69",
+    "x86_64-unknown-netbsd": "08e9ff48d6273e63d6ebdc5eb3882777bc9bd227bc9126478a98c5041e2f1f05"
   }
 }

data/lib/rocksky/remote.rb

@@ -27,7 +27,8 @@ module Rocksky
   #
   # Records (now-playing / queue items) are passed as Hashes with camelCase keys
   # (title, artist, album, albumArtist, albumArt, durationMs, elapsedMs,
-  # isPlaying / songUri, albumUri, trackNumber), matching the wire record shape.
+  # isPlaying, codec, sampleRate / songUri, albumUri, trackNumber), matching the
+  # wire record shape.
   class RemotePlayer
     # Connect and register a controllable player in the background. +token+ is a
     # Rocksky access token (JWT); +name+ is the device-picker label; +url+
@@ -57,6 +58,8 @@ module Rocksky
     # Block until the next controller command, returned as a symbol-keyed Hash
     # (e.g. +{ action: "play" }+), or +nil+ once disconnected.
     def next_command
+      return nil if @ptr.null?
+
       cmd = Rocksky.unwrap(C.rocksky_remote_player_next_command(@ptr))
       cmd && Rocksky.symbolize(cmd)
     end
@@ -77,7 +80,10 @@ module Rocksky
 
     # Advertise the currently-playing track. Call whenever it changes, and
     # periodically (~every 1–4s) with a fresh +elapsedMs+ so controllers show
-    # smooth progress. +track+ is a camelCase Hash.
+    # smooth progress. +track+ is a camelCase Hash. Optional audio info —
+    # +codec+ (audio codec/container, e.g. "mp3", "flac") and +sampleRate+
+    # (sample rate in Hz, e.g. 44100) — is included in the track payload when
+    # set, and omitted otherwise.
     def set_now_playing(track)
       Rocksky.unwrap(C.rocksky_remote_player_set_now_playing(@ptr, JSON.generate(track)))
     end
@@ -103,7 +109,12 @@ module Rocksky
     def close
       return if @ptr.null?
 
-      @thread&.kill
+      # Stop the background task so a blocked #next_command returns nil and the
+      # #listen loop exits, then WAIT for that thread to leave the native call
+      # before freeing — freeing the handle while a poll is in flight is a
+      # use-after-free (segfault).
+      C.rocksky_remote_player_disconnect(@ptr)
+      @thread&.join unless @thread == Thread.current
       @thread = nil
       C.rocksky_remote_player_free(@ptr)
       @ptr = Fiddle::Pointer.new(0)
@@ -157,7 +168,9 @@ module Rocksky
     # Register a handler for a server event type, one of +:devices+,
     # +:device_registered+, +:device_unregistered+, +:primary_changed+,
     # +:now_playing+, +:status+, +:queue+. The block receives the full
-    # symbol-keyed event Hash. Returns +self+ for chaining.
+    # symbol-keyed event Hash. A +:now_playing+ event carries the advertised
+    # track under +:track+, including optional +:codec+ / +:sampleRate+ audio
+    # info when the player supplied it. Returns +self+ for chaining.
     def on(event_type, &block)
       @handlers[event_type.to_sym] = block
       self
@@ -166,6 +179,8 @@ module Rocksky
     # Block until the next update, returned as a symbol-keyed Hash (each carries a
     # +:type+), or +nil+ once disconnected.
     def next_event
+      return nil if @ptr.null?
+
       ev = Rocksky.unwrap(C.rocksky_remote_controller_next_event(@ptr))
       ev && Rocksky.symbolize(ev)
     end
@@ -244,7 +259,12 @@ module Rocksky
     def close
       return if @ptr.null?
 
-      @thread&.kill
+      # Stop the background task so a blocked #next_event returns nil and the
+      # #listen loop exits, then WAIT for that thread to leave the native call
+      # before freeing — freeing the handle while a poll is in flight is a
+      # use-after-free (segfault).
+      C.rocksky_remote_controller_disconnect(@ptr)
+      @thread&.join unless @thread == Thread.current
       @thread = nil
       C.rocksky_remote_controller_free(@ptr)
       @ptr = Fiddle::Pointer.new(0)

data/lib/rocksky/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rocksky
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rocksky
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Rocksky