jason-rails 0.7.5.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0ca4e6c931fdf041e8bd13a516e11d89699396691ff6328c73a0241f5672cc9
-  data.tar.gz: a0a6680af3dc06b0a5f96ee4f96513c172e12cf84cccc70339c0d46f7f0b742a
+  metadata.gz: 592a7eab8028ae28815abbf0d401d98b2ceabc0009f30713f68795da21adb165
+  data.tar.gz: 315f5088e258dcab9755dc92f4de03f3f2f016cf6698d3619f022c1e7d601e9d
 SHA512:
-  metadata.gz: f39c46227135319c3c9bfe81fce8cbda84769bd9de3d14103604c95cb4106dc0ff00a362a340c2f9a981f412947116848b569d64d33c879b094c2bdd8a24a990
-  data.tar.gz: c9cd5cf85a36769697b50f7d68c4204b6d61db2169a3378000bab6b8f1a6c05f3ecc42322c6480ea22a3dced1cbcd4625c8b64eb554ed21b3611a92f203c92fc
+  metadata.gz: a33fdc1d57462a97b7dd571222ff314cc77338e5172fcfc662f3e1fd5f008deed299abcd870900d0b50805944af822b462f6adee46953895499ce49f69df6680
+  data.tar.gz: 8ec1a59761856754f09bb7b6431d3d45d319daf9d4c7f030b8c7c2301c28ab2d0393952c4d7339a4d6310da2689c3cba8c71048deed931e0d3c4b0cf5c2fc2f1

data/CHANGELOG.md

@@ -1,5 +1,7 @@
-## v0.7.5.1
-- Fix bug where axios errors get swallowed
+## v0.8.0
+- Cold cache handling:
+ - Expiry is now set on all cached models of one week
+ - Code now handles case where cached model is missing and repopulates the cache
 
 ## v0.7.5
 - Fixed JS errors when payloads arrive on websockets after the subscription has been unmounted

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jason-rails (0.7.1)
+    jason-rails (0.7.5)
       connection_pool (>= 2.2.3)
       jsondiff
       rails (>= 5)

data/README.md

@@ -21,7 +21,7 @@ An alternative way of thinking about Jason is "what if we applied the Flux/Redux
 Add the gem and the NPM package
 
 ```ruby
-gem 'jason-rails'
+gem 'jason-rails', require: 'jason'
 ```
 
 ```bash

data/client/lib/createOptDis.js

@@ -29,7 +29,6 @@ function createOptDis(schema, dispatch, restClient, serverActionQueue) {
             .catch(error => {
             dispatch({ type: 'jason/upsert', payload: { error } });
             serverActionQueue.itemFailed(id, error);
-            Promise.reject(error);
         });
     }
     setInterval(dispatchServerAction, 10);

data/client/lib/transportAdapters/actionCableAdapter.js

@@ -34,10 +34,7 @@ function actionCableAdapter(jasonConfig, handlePayload, dispatch, onConnected, t
     }
     function removeSubscription(config) {
         restClient_1.default.post('/jason/api/remove_subscription', { config, consumerId })
-            .catch(e => {
-            console.error(e);
-            Promise.reject(e);
-        });
+            .catch(e => console.error(e));
     }
     function getPayload(config, options) {
         restClient_1.default.post('/jason/api/get_payload', {
@@ -49,10 +46,7 @@ function actionCableAdapter(jasonConfig, handlePayload, dispatch, onConnected, t
                 handlePayload(payload);
             });
         })
-            .catch(e => {
-            console.error(e);
-            Promise.reject(e);
-        });
+            .catch(e => console.error(e));
     }
     function fullChannelName(channelName) {
         return channelName;

data/client/lib/transportAdapters/pusherAdapter.js

@@ -33,19 +33,13 @@ function pusherAdapter(jasonConfig, handlePayload, dispatch) {
             configToChannel[JSON.stringify(config)] = channelName;
             subscribeToChannel(channelName);
         })
-            .catch(e => {
-            console.error(e);
-            Promise.reject(e);
-        });
+            .catch(e => console.error(e));
     }
     function removeSubscription(config) {
         const channelName = configToChannel[JSON.stringify(config)];
         unsubscribeFromChannel(fullChannelName(channelName));
         restClient_1.default.post('/jason/api/remove_subscription', { config, consumerId })
-            .catch(e => {
-            console.error(e);
-            Promise.reject(e);
-        });
+            .catch(e => console.error(e));
     }
     function getPayload(config, options) {
         restClient_1.default.post('/jason/api/get_payload', {
@@ -57,10 +51,7 @@ function pusherAdapter(jasonConfig, handlePayload, dispatch) {
                 handlePayload(payload);
             });
         })
-            .catch(e => {
-            console.error(e);
-            Promise.reject(e);
-        });
+            .catch(e => console.error(e));
     }
     function subscribeToChannel(channelName) {
         const channel = pusher.subscribe(fullChannelName(channelName));

data/client/package.json

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

data/client/src/createOptDis.ts

@@ -29,8 +29,6 @@ export default function createOptDis(schema, dispatch, restClient, serverActionQ
     .catch(error => {
       dispatch({ type: 'jason/upsert', payload: { error } })
       serverActionQueue.itemFailed(id, error)
-
-      Promise.reject(error)
     })
   }
 

data/client/src/transportAdapters/actionCableAdapter.ts

@@ -35,10 +35,7 @@ export default function actionCableAdapter(jasonConfig, handlePayload, dispatch,
 
   function removeSubscription(config) {
     restClient.post('/jason/api/remove_subscription', { config, consumerId })
-    .catch(e => {
-      console.error(e)
-      Promise.reject(e)
-    })
+    .catch(e => console.error(e))
   }
 
   function getPayload(config, options) {
@@ -51,10 +48,7 @@ export default function actionCableAdapter(jasonConfig, handlePayload, dispatch,
         handlePayload(payload)
       })
     })
-    .catch(e => {
-      console.error(e)
-      Promise.reject(e)
-    })
+    .catch(e => console.error(e))
   }
 
   function fullChannelName(channelName) {

data/client/src/transportAdapters/pusherAdapter.ts

@@ -31,20 +31,14 @@ export default function pusherAdapter(jasonConfig, handlePayload, dispatch) {
       configToChannel[JSON.stringify(config)] = channelName
       subscribeToChannel(channelName)
     })
-    .catch(e => {
-      console.error(e)
-      Promise.reject(e)
-    })
+    .catch(e => console.error(e))
   }
 
   function removeSubscription(config) {
     const channelName = configToChannel[JSON.stringify(config)]
     unsubscribeFromChannel(fullChannelName(channelName))
     restClient.post('/jason/api/remove_subscription', { config, consumerId })
-    .catch(e => {
-      console.error(e)
-      Promise.reject(e)
-    })
+    .catch(e => console.error(e))
   }
 
   function getPayload(config, options) {
@@ -57,10 +51,7 @@ export default function pusherAdapter(jasonConfig, handlePayload, dispatch) {
         handlePayload(payload)
       })
     })
-    .catch(e => {
-      console.error(e)
-      Promise.reject(e)
-    })
+    .catch(e => console.error(e))
   }
 
   function subscribeToChannel(channelName) {

data/lib/jason/lua_generator.rb

@@ -1,10 +1,13 @@
 class Jason::LuaGenerator
   ## TODO load these scripts and evalsha
   def cache_json(model_name, id, payload)
+    expiry = 7*24*60*60 + rand(6*60*60)
+
+    # ensure the content expires first
     cmd = <<~LUA
       local gidx = redis.call('INCR', 'jason:gidx')
-      redis.call( 'set', 'jason:cache:' .. ARGV[1] .. ':' .. ARGV[2] .. ':gidx', gidx )
-      redis.call( 'hset', 'jason:cache:' .. ARGV[1], ARGV[2], ARGV[3] )
+      redis.call( 'setex', 'jason:cache:' .. ARGV[1] .. ':' .. ARGV[2] .. ':gidx', #{expiry}, gidx )
+      redis.call( 'setex', 'jason:cache:' .. ARGV[1] .. ':' .. ARGV[2], #{expiry - 60}, ARGV[3] )
       return gidx
     LUA
 
@@ -15,15 +18,26 @@ class Jason::LuaGenerator
     # If value has changed, return old value and new idx. Otherwise do nothing.
     cmd = <<~LUA
       local t = {}
-      local models = {}
+      local insts = {}
+      local miss_ids = {}
       local ids = redis.call('smembers', 'jason:subscriptions:' .. ARGV[2] .. ':ids:' .. ARGV[1])
 
       for k,id in pairs(ids) do
-        models[#models+1] = redis.call( 'hget', 'jason:cache:' .. ARGV[1], id)
+        local result = redis.call( 'get', 'jason:cache:' .. ARGV[1] .. ':' .. id)
+        if (result == false) then
+          miss_ids[#miss_ids+1] = id
+        else
+          insts[#insts+1] = result
+        end
       end
 
-      t[#t+1] = models
-      t[#t+1] = redis.call( 'get', 'jason:subscription:' .. ARGV[2] .. ':' .. ARGV[1] .. ':idx' )
+      if next(miss_ids) == nil then
+        t[#t+1] = insts
+        t[#t+1] = redis.call( 'get', 'jason:subscription:' .. ARGV[2] .. ':' .. ARGV[1] .. ':idx' )
+      else
+        t[#t+1] = miss_ids
+        t[#t+1] = 'missing'
+      end
 
       return t
     LUA

data/lib/jason/publisher.rb

@@ -124,7 +124,7 @@ module Jason::Publisher
   end
 
   def jason_cached_value
-    JSON.parse($redis_jason.hget("jason:cache:#{self.class.name.underscore}", id) || '{}')
+    JSON.parse($redis_jason.get("jason:cache:#{self.class.name.underscore}:#{id}") || '{}')
   end
 
   class_methods do
@@ -132,6 +132,10 @@ module Jason::Publisher
       all.find_each(&:cache_json)
     end
 
+    def cache_for(ids)
+      where(id: ids).find_each(&:cache_json)
+    end
+
     def has_jason?
       true
     end

data/lib/jason/subscription.rb

@@ -399,16 +399,17 @@ class Jason::Subscription
   end
 
   def get_for_model(model_name)
-    if $redis_jason.sismember("jason:models:#{model_name}:all:subscriptions", id)
-      instance_jsons_hash, idx = $redis_jason.multi do |r|
-        r.hgetall("jason:cache:#{model_name}")
-        r.get("jason:subscription:#{id}:#{model_name}:idx")
-      end
-      instance_jsons = instance_jsons_hash.values
-    else
+    instance_jsons, idx = Jason::LuaGenerator.new.get_payload(model_name, id)
+    if idx == 'missing'
+      # warm cache and then retry
+      model_klass(model_name).cache_for(instance_jsons)
       instance_jsons, idx = Jason::LuaGenerator.new.get_payload(model_name, id)
     end
 
+    if instance_jsons.any? { |json| json.blank? }
+      raise Jason::MissingCacheError
+    end
+
     payload = instance_jsons.map do |instance_json|
       instance_json ? JSON.parse(instance_json) : {}
     end
@@ -437,7 +438,7 @@ class Jason::Subscription
 
   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) || '{}')
+    payload = JSON.parse($redis_jason.get("jason:cache:#{model_name}:#{instance_id}") || '{}')
 
     payload = {
       id: instance_id,
@@ -479,3 +480,5 @@ class Jason::Subscription
     broadcaster.broadcast(payload)
   end
 end
+
+class Jason::MissingCacheError < StandardError; end

data/lib/jason/version.rb

@@ -1,3 +1,3 @@
 module Jason
-  VERSION = "0.7.5.1"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jason-rails
 version: !ruby/object:Gem::Version
-  version: 0.7.5.1
+  version: 0.8.0
 platform: ruby
 authors:
 - James Rees
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-12 00:00:00.000000000 Z
+date: 2022-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails