hotsock-turbo 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b34d411b6586100a7331fb9a42bcdbe06410cffc9d0657fed5834a973a30324
-  data.tar.gz: 1ce7d77b5026c991d42d4d8f4f6e0c3928d6df72b3ac906feefd12624f0a8043
+  metadata.gz: 855667dd61bba20964a93972d108e1ae299df990c157670b6005f979ac736c2a
+  data.tar.gz: cde85dbe0e22fa654230f283efcbfa460541daa87f6efa0992cf6c94063df7b2
 SHA512:
-  metadata.gz: 045abe5e27e4ee970f3655702ba4d4c6f0b9abdd3573d75ed85dab4cf081847334f09e41b8ed6d40f296f5bbaabb979fc774cdd27d2b399eac03a234fc126758
-  data.tar.gz: 8c119eb0cedfd340810fb279817126234baf8b01800afb6943fa1631b6e3880ce9fcbfc3f30a18b93cff3d94873c48c198fc63ab1f1ee984456c8c840d74f762
+  metadata.gz: 61e34a6b641bb36ea43fab13fadde47c034b9080dd9ebaec35686742526c8115e0cde07cfe5569333b6759e25473e88b83580d139590ac5dc65acf36cf0faf50
+  data.tar.gz: efcd9736e449b9043f96449918f4145040bd9c8649117881c5f5ae4ab025e8d050e9590bb5e870e4af7506830fb9c930b9e189be76a6b73719c7e2902ce4e9a4

data/Gemfile

@@ -11,6 +11,6 @@ group :development, :test do
 end
 
 group :test do
-  gem "maxitest"
+  gem "maxitest", "< 7"
   gem "ostruct"
 end

data/README.md

@@ -64,14 +64,26 @@ import "@hotsock/hotsock-js"
 import "hotsock-turbo"
 ```
 
+### Mount the Engine
+
+Add to your `config/routes.rb`:
+
+```ruby
+mount Hotsock::Turbo::Engine => "/hotsock"
+```
+
+This provides a `POST /hotsock/connect` endpoint that returns connection tokens for the WebSocket client.
+
 ## Configuration
 
 Create an initializer at `config/initializers/hotsock_turbo.rb`:
 
 ```ruby
 Hotsock::Turbo.configure do |config|
-  # Required: Path to an endpoint that returns Hotsock connection tokens
-  config.connect_token_path = "/hotsock/connect_token"
+  # Required: Path to the engine's connect endpoint (or your own custom
+  # endpoint). This path must accept a POST request and return a JSON object
+  # with a `token` field that contains a connect-scoped JWT. {"token":"ey..."}
+  config.connect_token_path = "/hotsock/connect"
 
   # Required: Your Hotsock WebSocket URL
   config.wss_url = "wss://your-hotsock-instance.example.com"

data/app/assets/javascripts/hotsock-turbo.js

@@ -32,10 +32,19 @@ function createHotsockClient() {
 const hotsockClient = window.Hotsock || createHotsockClient()
 window.Hotsock = hotsockClient
 
-// Track active subscriptions by channel
 const subscriptions = new Map() // channel -> { binding, elements: Set, unsubscribeTimer }
+const lastMessageIds = new Map() // channel -> lastMessageId (ULID)
 const UNSUBSCRIBE_DELAY_MS = 250
 
+function isReplaceOrUpdateAction(html) {
+  return /<turbo-stream[^>]+action=["'](replace|update)["']/.test(html)
+}
+
+function isNewerMessage(newId, lastId) {
+  if (!lastId) return true
+  return newId > lastId
+}
+
 class HotsockTurboStreamSourceElement extends HTMLElement {
   #channel = null
 
@@ -75,8 +84,17 @@ class HotsockTurboStreamSourceElement extends HTMLElement {
       const { Turbo } = window
       const binding = hotsockClient.bind(
         "turbo_stream",
-        ({ data }) => {
+        ({ id, data }) => {
           if (!data?.html) return
+
+          if (isReplaceOrUpdateAction(data.html)) {
+            const lastId = lastMessageIds.get(channel)
+            if (!isNewerMessage(id, lastId)) {
+              return
+            }
+            lastMessageIds.set(channel, id)
+          }
+
           try {
             Turbo.renderStreamMessage(data.html)
           } catch (error) {
@@ -115,6 +133,7 @@ class HotsockTurboStreamSourceElement extends HTMLElement {
         if (sub.elements.size === 0) {
           sub.binding.unbind()
           subscriptions.delete(channel)
+          lastMessageIds.delete(channel)
         }
       }, UNSUBSCRIBE_DELAY_MS)
     }

data/lib/hotsock/turbo/streams_helper.rb

@@ -27,7 +27,7 @@ module Hotsock
       def create_subscription_token(channel_name)
         Hotsock.issue_token(
           scope: "subscribe",
-          channels: {channel_name => {omitSubCount: true, subscribe: true}},
+          channels: {channel_name => {omitFromSubCount: true, subscribe: true}},
           uid:,
           exp: 1.week.from_now.to_i
         )

data/lib/hotsock/turbo/version.rb

@@ -2,6 +2,6 @@
 
 module Hotsock
   module Turbo
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hotsock-turbo
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - James Miller