jason-rails 0.6.2 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dae8eb61f7d3966c7e34ed81120a16e5c58f84d50ff6ea16ec87340d52cbf0ec
-  data.tar.gz: cd4bc1d677ec413e2368c235632410e744ab3d47f94e7c65160b7665d3a6db45
+  metadata.gz: 48abc57aac9f4529a93812d46422ac21d48e58432fc21e570f1801b84a3ac436
+  data.tar.gz: ac21dab5464e5dd254a1a223a80581c1410c928bab4c0fbc9fe32cdfedb7c474
 SHA512:
-  metadata.gz: 88130bf9bd8d557478de06bcdcb8901799425e3eeaf10a47a969152c13334659c8ffe36911fa2f3c18903a81c4291118e5f0c6daa72ac7a20545c095ab19f918
-  data.tar.gz: 3e708e8b214b74cce9dc87ec07b04bf5a4d1453c7398050be657dfe0c34f7668708352d7bef7d9305ffbb1321728267cbab9ab61f03460af3f7987f7d0381253
+  metadata.gz: '09c42d2b035af32efdc006224e3e81fa398d2327199845640ff7c710c7cecbd0c5edd9d18e441b5b3fefb2a356f45159c77194ed72f866880171071fb302c422'
+  data.tar.gz: 1b5f4f16a5032ca96f8106dc4fff8c8a1a1d5792392b4ed28ad9f1c8974848dec5359e4bb0bc675463cc923e5f77552b6bcfda6c733bf72bb66f156648ce521c

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+## v0.6.6
+- Fix: don't run the schema change detection and cache rebuild inside rake tasks or migrations
+
+## 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.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jason-rails (0.6.0)
+    jason-rails (0.6.6)
       connection_pool (>= 2.2.3)
       jsondiff
       rails (>= 5)
@@ -93,7 +93,7 @@ GEM
     mini_mime (1.0.2)
     mini_portile2 (2.5.0)
     minitest (5.14.3)
-    nio4r (2.5.4)
+    nio4r (2.5.5)
     nokogiri (1.11.1)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
@@ -153,6 +153,10 @@ GEM
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
     rspec-support (3.10.0)
+    sidekiq (6.1.3)
+      connection_pool (>= 2.2.2)
+      rack (~> 2.0)
+      redis (>= 4.2.0)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -178,6 +182,7 @@ DEPENDENCIES
   rake (~> 12.0)
   rspec (~> 3.0)
   rspec-rails
+  sidekiq
   sqlite3
 
 BUNDLED WITH

data/README.md

@@ -1,6 +1,6 @@
 # Jason
 
-Jason is still in a highly experimental phase with a rapidly changing API. Production use not recommended - but please give it a try!
+Jason is still in an experimental phase with a rapidly changing API. It is being used in some production applications, however it is still in 0.x.x series versions, which means that any 0.x version bump could introduce breaking changes.
 
 ## The goal
 
@@ -14,6 +14,8 @@ I also wanted to avoid writing essentially the same code multiple times in diffe
 
 Jason attempts to minimize this repitition by auto-generating API endpoints, redux stores and actions from a single schema definition. Further it adds listeners to ActiveRecord models allowing the redux store to be subscribed to updates from a model or set of models.
 
+An alternative way of thinking about Jason is "what if we applied the Flux/Redux state update pattern to make the _database_ the store?".
+
 ## Installation
 
 Add the gem and the NPM package
@@ -81,7 +83,7 @@ function extraActions(dispatch, store, restClient, act) {
 - `middleware` - Passed directly to `configureStore` with additional Jason middleware
 
 ## Usage
-Jason provides two custom hooks to access functionality.
+Jason provides three custom hooks to access functionality.
 
 ### useAct
 This returns an object which allows you to access actions which both update models on the server, and perform an optimistic update to the Redux store.
@@ -126,6 +128,28 @@ export default function PostsList() {
 }
 ```
 
+### useEager
+Jason stores all the data in a normalized form - one redux slice per model. Often you might want to get nested data from several slices for use in components. The `useEager` hook provides an API for doing that. Under the hood it's just a wrapper around useSelector, which aims to mimic the behaviour of Rails eager loading.
+
+Example
+This will fetch the comment as well as the post and user linked to it.
+
+```jsx
+import React from 'react'
+import { useSelector } from 'react-redux'
+import { useEager } from '@jamesr2323/jason'
+import _ from 'lodash'
+
+export default function Comment({ id }) {
+  const comment = useEager('comments', id, ['post', 'user'])
+
+  return <div>
+    <p>{ comment.body }</p>
+    <p>Made on post { comment.post.name } by { comment.user.name }</p>
+  </div>
+}
+```
+
 ## Authorization
 
 By default all models can be subscribed to and updated without authentication or authorization. Probably you want to lock down access.
@@ -143,6 +167,7 @@ Development is primarily driven by the needs of projects we're using Jason in. I
 - Authorization - more thorough authorization integration, with utility functions for common authorizations. Allowing authorization of access to particular fields such as restricting the fields of a user that are publicly broadcast.
 - Utilities for "Draft editing" - both storing client-side copies of model trees which can be committed or discarded, as well as persisting a shadow copy to the database (to allow resumable editing, or possibly collaborative editing features)
 - Benchmark and migrate if necessary ConnectionPool::Wrapper vs ConnectionPool
+- Assess using RedisGraph for the graph diffing functionality, to see if this would provide a performance boost
 
 ## Development
 

data/app/controllers/jason/{api_controller.rb → jason_controller.rb}

@@ -1,4 +1,4 @@
-class Jason::ApiController < ::ApplicationController
+class Jason::JasonController < ::ApplicationController
   before_action :load_and_authorize_subscription, only: [:create_subscription, :remove_subscription, :get_payload]
   # config seems to be a reserved name, resulting in infinite loop
   def configuration
@@ -35,10 +35,10 @@ class Jason::ApiController < ::ApplicationController
       all_instance_ids.insert(priority.to_i, instance.id)
 
       all_instance_ids.each_with_index do |id, i|
-        model.find(id).update!(priority: i, skip_publish_json: true)
+        model.find(id).update!(priority: i)
       end
 
-      model.publish_all(model.find(all_instance_ids))
+      model.find(all_instance_ids).each(&:force_publish_json)
     elsif action == 'upsert' || action == 'add'
       payload = api_model.permit(params)
       return render json: model.find_or_create_by_id!(payload).as_json(api_model.as_json_config)

data/app/controllers/jason/{api/pusher_controller.rb → pusher_controller.rb}

@@ -1,4 +1,4 @@
- class Jason::Api::PusherController < ApplicationController
+ class Jason::PusherController < ApplicationController
   skip_before_action :verify_authenticity_token
 
   def auth

data/app/workers/jason/outbound_message_queue_worker.rb

@@ -0,0 +1,21 @@
+class Jason::OutboundMessageQueueWorker
+  include Sidekiq::Worker
+
+  def perform
+    batch = get_batch
+    return if batch.size == 0
+
+    Jason.pusher.trigger_batch(batch)
+  end
+
+  private
+
+  def get_batch
+    batch_json = $redis_jason.multi do |r|
+      r.lrange("jason:outbound_message_queue", 0, 9) # get first 10 elements
+      r.ltrim("jason:outbound_message_queue", 10, -1) # delete first 10 elements
+    end[0]
+
+    batch_json.map { |event| JSON.parse(event).with_indifferent_access } # Pusher wants symbol keys
+  end
+end

data/client/lib/createJasonReducers.js

@@ -42,18 +42,17 @@ function generateJasonSlices(models) {
             setSubscriptionIds(s, a) {
                 const { payload } = a;
                 const { subscriptionId, model, ids } = payload;
-                console.log({ initialState });
-                s[model][subscriptionId] = ids;
+                s[model][subscriptionId] = ids.map(id => String(id));
             },
             addSubscriptionId(s, a) {
                 const { payload } = a;
                 const { subscriptionId, model, id } = payload;
-                s[model][subscriptionId] = lodash_1.default.union(s[model][subscriptionId] || [], [id]);
+                s[model][subscriptionId] = lodash_1.default.union(s[model][subscriptionId] || [], [String(id)]);
             },
             removeSubscriptionId(s, a) {
                 const { payload } = a;
                 const { subscriptionId, model, id } = payload;
-                s[model][subscriptionId] = lodash_1.default.remove(s[model][subscriptionId] || [], id);
+                s[model][subscriptionId] = lodash_1.default.difference(s[model][subscriptionId] || [], [String(id)]);
             },
             removeSubscription(s, a) {
                 const { payload: { subscriptionId } } = a;

data/client/lib/createPayloadHandler.js

@@ -36,7 +36,7 @@ function createPayloadHandler({ dispatch, serverActionQueue, transportAdapter, c
             }
             const { payload, destroy, id, type } = patchQueue[model][idx[model]];
             if (type === 'payload') {
-                dispatch({ type: `${pluralize_1.default(model)}/upsertMany`, payload });
+                dispatch({ type: `${pluralize_1.default(model)}/upsertMany`, payload: payload.map(m => (Object.assign(Object.assign({}, m), { id: String(m.id) }))) });
                 const ids = payload.map(instance => instance.id);
                 dispatch({ type: `jasonModels/setSubscriptionIds`, payload: { model, subscriptionId, ids } });
             }
@@ -45,7 +45,7 @@ function createPayloadHandler({ dispatch, serverActionQueue, transportAdapter, c
                 dispatch({ type: `jasonModels/removeSubscriptionId`, payload: { model, subscriptionId, id } });
             }
             else {
-                dispatch({ type: `${pluralize_1.default(model)}/upsert`, payload });
+                dispatch({ type: `${pluralize_1.default(model)}/upsert`, payload: Object.assign(Object.assign({}, payload), { id: String(payload.id) }) });
                 dispatch({ type: `jasonModels/addSubscriptionId`, payload: { model, subscriptionId, id } });
             }
             delete patchQueue[model][idx[model]];

data/client/lib/pruneIdsMiddleware.js

@@ -9,7 +9,7 @@ const pruneIdsMiddleware = schema => store => next => action => {
     const { type, payload } = action;
     const result = next(action);
     const state = store.getState();
-    if (type === 'jasonModels/setSubscriptionIds' || type === 'jasonModels/removeSubscriptionIds') {
+    if (type === 'jasonModels/setSubscriptionIds' || type === 'jasonModels/removeSubscriptionId') {
         const { model, ids } = payload;
         let idsInSubs = [];
         lodash_1.default.map(state.jasonModels[model], (subscribedIds, k) => {

data/client/lib/useEager.d.ts

@@ -0,0 +1 @@
+export default function useEager(entity: any, id?: null, relations?: never[]): void;

data/client/lib/useEager.js

@@ -0,0 +1,12 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const JasonContext_1 = __importDefault(require("./JasonContext"));
+const react_1 = require("react");
+function useEager(entity, id = null, relations = []) {
+    const { eager } = react_1.useContext(JasonContext_1.default);
+    return eager(entity, id, relations);
+}
+exports.default = useEager;

data/client/lib/useJason.test.js

@@ -81,5 +81,37 @@ test('pruning IDs', () => __awaiter(void 0, void 0, void 0, function* () {
         idx: 2
     });
     // The ID 4 should have been pruned
-    expect(store.getState().posts.ids).toStrictEqual([5]);
+    expect(store.getState().posts.ids).toStrictEqual(['5']);
+}));
+test('pruning IDs by destroy', () => __awaiter(void 0, void 0, void 0, function* () {
+    const resp = { data: {
+            schema: { post: {} },
+            transportService: 'action_cable'
+        } };
+    // @ts-ignore
+    restClient_1.default.get.mockResolvedValue(resp);
+    const { result, waitForNextUpdate } = react_hooks_1.renderHook(() => useJason_1.default({ reducers: {
+            test: (s, a) => s || {}
+        } }));
+    yield waitForNextUpdate();
+    const [store, value, connected] = result.current;
+    const { handlePayload, subscribe } = value;
+    const subscription = subscribe({ post: {} });
+    handlePayload({
+        type: 'payload',
+        model: 'post',
+        payload: [{ id: 4, name: 'test' }, { id: 5, name: 'test it out' }],
+        md5Hash: subscription.md5Hash,
+        idx: 1
+    });
+    expect(store.getState().posts.ids).toStrictEqual(['4', '5']);
+    handlePayload({
+        destroy: true,
+        model: 'post',
+        id: 5,
+        md5Hash: subscription.md5Hash,
+        idx: 2
+    });
+    // The ID 4 should have been pruned
+    expect(store.getState().posts.ids).toStrictEqual(['4']);
 }));

data/client/package.json

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

data/client/src/createJasonReducers.ts

@@ -42,18 +42,17 @@ function generateJasonSlices(models) {
       setSubscriptionIds(s,a) {
         const { payload } = a
         const { subscriptionId, model, ids } = payload
-        console.log({ initialState })
-        s[model][subscriptionId] = ids
+        s[model][subscriptionId] = ids.map(id => String(id))
       },
       addSubscriptionId(s,a) {
         const { payload } = a
         const { subscriptionId, model, id } = payload
-        s[model][subscriptionId] = _.union(s[model][subscriptionId] || [], [id])
+        s[model][subscriptionId] = _.union(s[model][subscriptionId] || [], [String(id)])
       },
       removeSubscriptionId(s,a) {
         const { payload } = a
         const { subscriptionId, model, id } = payload
-        s[model][subscriptionId] = _.remove(s[model][subscriptionId] || [], id)
+        s[model][subscriptionId] = _.difference(s[model][subscriptionId] || [], [String(id)])
       },
       removeSubscription(s, a) {
         const { payload: { subscriptionId } } = a

data/client/src/createPayloadHandler.ts

@@ -42,14 +42,14 @@ export default function createPayloadHandler({ dispatch, serverActionQueue, tran
       const { payload, destroy, id, type } = patchQueue[model][idx[model]]
 
       if (type === 'payload') {
-        dispatch({ type: `${pluralize(model)}/upsertMany`, payload })
+        dispatch({ type: `${pluralize(model)}/upsertMany`, payload: payload.map(m => ({ ...m, id: String(m.id) })) })
         const ids = payload.map(instance => instance.id)
         dispatch({ type: `jasonModels/setSubscriptionIds`, payload: { model, subscriptionId, ids }})
       } else if (destroy) {
         // Middleware will determine if this model should be removed if it isn't in any other subscriptions
         dispatch({ type: `jasonModels/removeSubscriptionId`, payload: { model, subscriptionId, id }})
       } else {
-        dispatch({ type: `${pluralize(model)}/upsert`, payload })
+        dispatch({ type: `${pluralize(model)}/upsert`, payload: { ...payload, id: String(payload.id) } })
         dispatch({ type: `jasonModels/addSubscriptionId`, payload: { model, subscriptionId, id }})
       }
 

data/client/src/pruneIdsMiddleware.ts

@@ -6,13 +6,14 @@ const pruneIdsMiddleware = schema => store => next => action => {
   const result = next(action)
 
   const state = store.getState()
-  if (type === 'jasonModels/setSubscriptionIds' || type === 'jasonModels/removeSubscriptionIds') {
+  if (type === 'jasonModels/setSubscriptionIds' || type === 'jasonModels/removeSubscriptionId') {
     const { model, ids } = payload
 
     let idsInSubs = []
     _.map(state.jasonModels[model], (subscribedIds, k) => {
       idsInSubs = _.union(idsInSubs, subscribedIds)
     })
+
     // Find IDs currently in Redux that aren't in any subscription
     const idsToRemove = _.difference(state[pluralize(model)].ids, idsInSubs)
     store.dispatch({ type: `${pluralize(model)}/removeMany`, payload: idsToRemove })

data/client/src/useEager.ts

@@ -0,0 +1,9 @@
+import JasonContext from './JasonContext'
+import { useContext } from 'react'
+
+export default function useEager(entity, id = null, relations = []) {
+  const { eager } = useContext(JasonContext)
+
+  return eager(entity, id, relations)
+}
+

data/client/src/useJason.test.ts

@@ -83,5 +83,45 @@ test('pruning IDs', async () => {
   })
 
   // The ID 4 should have been pruned
-  expect(store.getState().posts.ids).toStrictEqual([5])
+  expect(store.getState().posts.ids).toStrictEqual(['5'])
+})
+
+test('pruning IDs by destroy', async () => {
+  const resp = { data: {
+    schema: { post: {} },
+    transportService: 'action_cable'
+  } };
+
+  // @ts-ignore
+  restClient.get.mockResolvedValue(resp);
+
+  const { result, waitForNextUpdate } = renderHook(() => useJason({ reducers: {
+    test: (s,a) => s || {}
+  }}));
+
+  await waitForNextUpdate()
+  const [store, value, connected] = result.current
+  const { handlePayload, subscribe } = value
+
+  const subscription = subscribe({ post: {} })
+
+  handlePayload({
+    type: 'payload',
+    model: 'post',
+    payload: [{ id: 4, name: 'test' }, { id: 5, name: 'test it out' }],
+    md5Hash: subscription.md5Hash,
+    idx: 1
+  })
+  expect(store.getState().posts.ids).toStrictEqual(['4', '5'])
+
+  handlePayload({
+    destroy: true,
+    model: 'post',
+    id: 5,
+    md5Hash: subscription.md5Hash,
+    idx: 2
+  })
+
+  // The ID 4 should have been pruned
+  expect(store.getState().posts.ids).toStrictEqual(['4'])
 })

data/config/routes.rb

@@ -1,8 +1,8 @@
 Jason::Engine.routes.draw do
-  get '/api/config', to: 'api#configuration'
-  post '/api/action', to: 'api#action'
-  post '/api/create_subscription', to: 'api#create_subscription'
-  post '/api/remove_subscription', to: 'api#remove_subscription'
-  post '/api/get_payload', to: 'api#get_payload'
-  post '/api/pusher/auth', to: 'api/pusher#auth'
+  get '/api/config', to: 'jason#configuration'
+  post '/api/action', to: 'jason#action'
+  post '/api/create_subscription', to: 'jason#create_subscription'
+  post '/api/remove_subscription', to: 'jason#remove_subscription'
+  post '/api/get_payload', to: 'jason#get_payload'
+  post '/api/pusher/auth', to: 'pusher#auth'
 end

data/jason-rails.gemspec

@@ -31,4 +31,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec-rails"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "sidekiq"
 end

data/lib/jason.rb

@@ -24,20 +24,24 @@ module Jason
   self.mattr_accessor :pusher_region
   self.mattr_accessor :pusher_channel_prefix
   self.mattr_accessor :authorization_service
+  self.mattr_accessor :sidekiq_queue
 
   self.schema = {}
   self.transport_service = :action_cable
   self.pusher_region = 'eu'
   self.pusher_channel_prefix = 'jason'
+  self.sidekiq_queue = 'default'
 
   def self.init
+    # Don't run in AR migration / generator etc.
+    return if $PROGRAM_NAME == '-e' || ActiveRecord::Base.connection.migration_context.needs_migration?
+
     # Check if the schema has changed since last time app was started. If so, do some work to ensure cache contains the correct data
     got_lock = $redis_jason.set('jason:schema:lock', nx: true, ex: 3600) # Basic lock mechanism for multi-process environments
     return if !got_lock
 
     previous_schema = JSON.parse($redis_jason.get('jason:last_schema') || '{}')
     current_schema = Jason.schema.deep_stringify_keys.deep_transform_values { |v| v.is_a?(Symbol) ? v.to_s : v }
-    pp current_schema
     current_schema.each do |model, config|
       if config != previous_schema[model]
         puts "Config changed for #{model}"
@@ -52,8 +56,6 @@ module Jason
     $redis_jason.set('jason:last_schema', current_schema.to_json)
   ensure
     $redis_jason.del('jason:schema:lock')
-
-    previous_config = 'test'
   end
 
 

data/lib/jason/broadcaster.rb

@@ -13,7 +13,8 @@ class Jason::Broadcaster
     if Jason.transport_service == :action_cable
       ActionCable.server.broadcast(channel, message)
     elsif Jason.transport_service == :pusher
-      Jason.pusher.trigger(pusher_channel_name, 'changed', message)
+      $redis_jason.rpush("jason:outbound_message_queue", { channel: pusher_channel_name, name: 'changed', data: message }.to_json)
+      Jason::OutboundMessageQueueWorker.perform_async
     end
   end
 end

data/lib/jason/graph_helper.rb

@@ -33,7 +33,8 @@ class Jason::GraphHelper
   end
 
   # Add and remove edges, return graph before and after
-  def apply_update(add: nil, remove: nil)
+  # Enforce means make the graph contain only the add_edges
+  def apply_update(add: nil, remove: nil, enforce: false)
     add_edges = []
     remove_edges = []
 
@@ -48,11 +49,21 @@ class Jason::GraphHelper
         remove_edges += build_edges(edge_set[:model_names], edge_set[:instance_ids], include_root: false)
       end
     end
-    diff_edges_from_graph(add_edges: add_edges, remove_edges: remove_edges)
+
+    diff_edges_from_graph(add_edges: add_edges, remove_edges: remove_edges, enforce: enforce)
   end
 
-  def diff_edges_from_graph(add_edges: [], remove_edges: [])
-    old_edges, new_edges = Jason::LuaGenerator.new.update_set_with_diff("jason:subscriptions:#{id}:graph", add_edges.flatten, remove_edges.flatten)
+  def diff_edges_from_graph(add_edges: [], remove_edges: [], enforce: false)
+    if enforce
+      old_edges = $redis_jason.multi do |r|
+        r.smembers("jason:subscriptions:#{id}:graph")
+        r.del("jason:subscriptions:#{id}:graph")
+        r.sadd("jason:subscriptions:#{id}:graph", add_edges) if add_edges.present?
+      end[0]
+      new_edges = add_edges
+    else
+      old_edges, new_edges = Jason::LuaGenerator.new.update_set_with_diff("jason:subscriptions:#{id}:graph", add_edges.flatten, remove_edges.flatten)
+    end
 
     old_graph = build_graph_from_edges(old_edges)
     new_graph = build_graph_from_edges(new_edges)

data/lib/jason/publisher.rb

@@ -42,7 +42,9 @@ module Jason::Publisher
     # - TODO: The value of an instance changes so that it enters/leaves a subscription
 
     # TODO: Optimize this, by caching associations rather than checking each time instance is saved
-    jason_assocs = self.class.reflect_on_all_associations(:belongs_to).select { |assoc| assoc.klass.respond_to?(:has_jason?) }
+    jason_assocs = self.class.reflect_on_all_associations(:belongs_to)
+      .reject { |assoc| assoc.polymorphic? } # Can't get the class name of a polymorphic association, by
+      .select { |assoc| assoc.klass.respond_to?(:has_jason?) }
     jason_assocs.each do |assoc|
       if previous_changes[assoc.foreign_key].present?
         Jason::Subscription.update_ids(

data/lib/jason/subscription.rb

@@ -269,7 +269,8 @@ class Jason::Subscription
 
     # Build the tree
     id_changeset = graph_helper.apply_update({
-      add: [edge_set]
+      add: [edge_set],
+      enforce: enforce
     })
     apply_id_changeset(id_changeset)
   end
@@ -320,7 +321,7 @@ class Jason::Subscription
     $redis_jason.hset("jason:consumers", consumer_id, Time.now.utc)
 
     if before_consumer_count == 0
-      set_ids_for_sub_models
+      set_ids_for_sub_models(enforce: true)
     end
   end
 
@@ -375,6 +376,20 @@ class Jason::Subscription
     }
   end
 
+  # To be used as a fallback when some corruption of the subscription has taken place
+  def reset!(hard: false)
+    # Remove subscription state
+    if hard
+      clear_all_ids
+      $redis_jason.del("jason:subscriptions:#{id}:graph")
+    end
+
+    set_ids_for_sub_models(enforce: true)
+    includes_helper.all_models.each do |model_name|
+      broadcaster.broadcast(get_for_model(model_name))
+    end
+  end
+
   def add(model_name, instance_id)
     idx = $redis_jason.incr("jason:subscription:#{id}:#{model_name}:idx")
     payload = JSON.parse($redis_jason.hget("jason:cache:#{model_name}", instance_id) || '{}')

data/lib/jason/version.rb

@@ -1,3 +1,3 @@
 module Jason
-  VERSION = "0.6.2"
+  VERSION = "0.6.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jason-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.7
 platform: ruby
 authors:
 - James Rees
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-16 00:00:00.000000000 Z
+date: 2021-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sidekiq
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description:
 email:
 - jarees@gmail.com
@@ -119,14 +133,16 @@ files:
 - ".rspec"
 - ".ruby-version"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
-- app/controllers/jason/api/pusher_controller.rb
-- app/controllers/jason/api_controller.rb
+- app/controllers/jason/jason_controller.rb
+- app/controllers/jason/pusher_controller.rb
+- app/workers/jason/outbound_message_queue_worker.rb
 - bin/console
 - bin/setup
 - client/babel.config.js
@@ -168,6 +184,8 @@ files:
 - client/lib/transportAdapters/pusherAdapter.js
 - client/lib/useAct.d.ts
 - client/lib/useAct.js
+- client/lib/useEager.d.ts
+- client/lib/useEager.js
 - client/lib/useJason.d.ts
 - client/lib/useJason.js
 - client/lib/useJason.test.d.ts
@@ -194,6 +212,7 @@ files:
 - client/src/transportAdapters/actionCableAdapter.ts
 - client/src/transportAdapters/pusherAdapter.ts
 - client/src/useAct.ts
+- client/src/useEager.ts
 - client/src/useJason.test.ts
 - client/src/useJason.ts
 - client/src/useSub.ts