jason-rails 0.8.4 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1459a38f9838d91a9e0c85f5993bcc8d49e5ec123261afb84ac344a5ab3e248
-  data.tar.gz: c6f0176ff3d0f7c25c6b3046cb683d9d549eff89d4015e371cd29a5fc8f68efa
+  metadata.gz: b766be80d826748b141369620c08ecd14c107b5473e47b5da61bcc30587f1f91
+  data.tar.gz: d3b7c5fbfe078bd6235ad623add82bc64b3f8ea3c022241b089b25604b5a657a
 SHA512:
-  metadata.gz: 55e9e8e7421fd503b8b1941569846f9265f0ae16bd24c45905cf84e44443718c1f0175fb9c4893498dac4fd1b510b78b6d0fb2845acda0b441dc4afbb6bcffc7
-  data.tar.gz: 1afd0c07a6829a85c0fbb6152cb13225a63ae19ea786fab28c773116c6e739bb8b25a8714c5681a8a8cada9a2aa4565b327972749ec768d5de5b0ec8f3b86c60
+  metadata.gz: feeb87b727b1517b22885b94c0b88f35baa886caefb5514d30c919d7902f520f5530273887badff425cb14c6ba0e067ecc17106299d2f823bb51e0d0e740c1de
+  data.tar.gz: 179e9ea89836b4dae0f3402e99a640642e5b5dd06e47587e79fe20d0e672099f8df74b56242e200d403fd4de1cca17c305c4a2ff0d7c65c898daec7bdc6f913d

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## v0.8.6
+- Fix config usage, to allow changing websocket provider
+
 ## v0.8.4
 - Fix implicit kwargs that fail in Ruby 3+
 
@@ -63,4 +66,4 @@ act.posts.add({ name: 'new post' })
 ## v0.6.5
 - Added `reset!` and `reset!(hard: true)` methods to `Subscription`. Reset will load the IDs that should be part of the subscription from the database, and ensure that the graph matches those. It then re-broadcasts the payloads to all connected clients. Hard reset will do the same, but also clear all cached IDs and subscription hooks on instances - this is equivalent from starting from scratch.
 - Added `enforce: boolean` option to GraphHelper
-- When subscriptions are re-activated they now set the IDs with `enforce: true`, as there could be conditions where updates that were made while a subscription was not active would not be properly registered.
+- When subscriptions are re-activated they now set the IDs with `enforce: true`, as there could be conditions where updates that were made while a subscription was not active would not be properly registered.

data/app/controllers/jason/jason_controller.rb

@@ -11,6 +11,7 @@ class Jason::JasonController < ::ApplicationController
       payload.merge!({
         pusherKey: Jason.pusher_key,
         pusherRegion: Jason.pusher_region,
+        pusherHost: Jason.pusher_host || nil,
         pusherChannelPrefix: Jason.pusher_channel_prefix
       })
     end

data/client/lib/transportAdapters/pusherAdapter.js

@@ -9,12 +9,16 @@ const uuid_1 = require("uuid");
 const lodash_1 = __importDefault(require("lodash"));
 function pusherAdapter(jasonConfig, handlePayload, dispatch) {
     const consumerId = uuid_1.v4();
-    const { pusherKey, pusherRegion, pusherChannelPrefix } = jasonConfig;
-    const pusher = new pusher_js_1.default(pusherKey, {
-        cluster: 'eu',
+    const { pusherHost, pusherKey, pusherRegion, pusherChannelPrefix } = jasonConfig;
+    let config = {
+        cluster: pusherRegion,
         forceTLS: true,
-        authEndpoint: '/jason/api/pusher/auth'
-    });
+        authEndpoint: '/jason/api/pusher/auth',
+    };
+    if (pusherHost) {
+        config = Object.assign(Object.assign({}, config), { wsHost: pusherHost, httpHost: pusherHost });
+    }
+    const pusher = new pusher_js_1.default(pusherKey, config);
     pusher.connection.bind('state_change', ({ current }) => {
         if (current === 'connected') {
             dispatch({ type: 'jason/upsert', payload: { connected: true } });

data/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jamesr2323/jason",
-  "version": "0.8.3",
+  "version": "0.8.6",
   "module": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "scripts": {

data/client/src/transportAdapters/pusherAdapter.ts

@@ -6,12 +6,20 @@ import _ from 'lodash'
 export default function pusherAdapter(jasonConfig, handlePayload, dispatch) {
   const consumerId = uuidv4()
 
-  const { pusherKey, pusherRegion, pusherChannelPrefix } = jasonConfig
-  const pusher = new Pusher(pusherKey, {
-    cluster: 'eu',
+  const { pusherHost, pusherKey, pusherRegion, pusherChannelPrefix } = jasonConfig
+  let config : any = {
+    cluster: pusherRegion,
     forceTLS: true,
-    authEndpoint: '/jason/api/pusher/auth'
-  })
+    authEndpoint: '/jason/api/pusher/auth',
+  }
+  if (pusherHost) {
+    config = {
+      ...config,
+      wsHost: pusherHost,
+      httpHost: pusherHost,
+    }
+  }
+  const pusher = new Pusher(pusherKey, config)
   pusher.connection.bind('state_change', ({ current }) => {
     if (current === 'connected') {
       dispatch({ type: 'jason/upsert', payload: { connected: true } })
@@ -68,4 +76,4 @@ export default function pusherAdapter(jasonConfig, handlePayload, dispatch) {
   }
 
   return { getPayload, createSubscription, removeSubscription }
-}
+}

data/lib/jason/version.rb

@@ -1,3 +1,3 @@
 module Jason
-  VERSION = "0.8.4"
+  VERSION = "0.8.7"
 end

data/lib/jason.rb

@@ -22,6 +22,7 @@ module Jason
   self.mattr_accessor :transport_service
   self.mattr_accessor :redis
   self.mattr_accessor :pusher
+  self.mattr_accessor :pusher_host
   self.mattr_accessor :pusher_key
   self.mattr_accessor :pusher_region
   self.mattr_accessor :pusher_channel_prefix

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jason-rails
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.7
 platform: ruby
 authors:
 - James Rees
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-31 00:00:00.000000000 Z
+date: 2023-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -262,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Reactive user interfaces with minimal boilerplate, using Rails + Redux