@dazn/kopytko-framework 1.3.2 → 1.3.3

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.3.3](https://github.com/getndazn/kopytko-framework/compare/v1.3.2...v1.3.3) (2022-12-09)
+
+
+### Bug Fixes
+
+* subscriptions remove own entries during iteration ([#36](https://github.com/getndazn/kopytko-framework/issues/36)) ([f67b6bd](https://github.com/getndazn/kopytko-framework/commit/f67b6bd5b209bb4ef2aa830b830162ee308a41ce))
+
 ## [1.3.2](https://github.com/getndazn/kopytko-framework/compare/v1.3.1...v1.3.2) (2022-09-01)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dazn/kopytko-framework",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "A modern Roku's Brightscript framework",
   "keywords": [
     "brightscript",

package/src/components/store/Store.facade.brs

@@ -1,4 +1,5 @@
 ' @import /components/getType.brs from @dazn/kopytko-utils
+' @import /components/uuid.brs from @dazn/kopytko-utils
 ' @import /components/utils/KopytkoGlobalNode.brs
 function StoreFacade() as Object
   if (m._store <> Invalid)
@@ -15,7 +16,7 @@ function StoreFacade() as Object
   prototype = {}
 
   prototype._store = _global.store
-  prototype._subscriptions = []
+  prototype._subscriptions = {}
 
   prototype.updateNode = sub (key as String, value as Dynamic)
     data = m.get(key)
@@ -94,20 +95,20 @@ function StoreFacade() as Object
 
   prototype.subscribeOnce = sub (key as String, callback as Function)
     m._handleSubscriber(key)
-    m._subscriptions.push({ key: key, callback: [callback], once: true })
+    m._subscriptions[m._getRandomizedKey(key)] = { key: key, callback: [callback], once: true }
   end sub
 
   prototype.subscribe = sub (key as String, callback as Function)
     m._handleSubscriber(key)
-    m._subscriptions.push({ key: key, callback: [callback], once: false })
+    m._subscriptions[m._getRandomizedKey(key)] = { key: key, callback: [callback], once: false }
   end sub
 
   prototype.unsubscribe = sub (key as String, callback as Function)
-    for i = 0 to m._subscriptions.count() - 1
-      listener = m._subscriptions[i]
+    for each subscriptionKey in m._subscriptions
+      listener = m._subscriptions[subscriptionKey]
 
       if (listener <> Invalid AND listener.key = key AND listener.callback[0] = callback)
-        m._subscriptions.delete(i)
+        m._subscriptions.delete(subscriptionKey)
       end if
     end for
   end sub
@@ -139,14 +140,14 @@ function StoreFacade() as Object
   prototype._notify = sub (key as String, data as Object)
     value = data.value
 
-    for i = 0 to m._subscriptions.count() - 1
-      listener = m._subscriptions[i]
+    for each subscriptionKey in m._subscriptions
+      listener = m._subscriptions[subscriptionKey]
 
-      if (listener.key = key)
+      if (listener <> Invalid AND listener.key = key)
         listener.callback[0](value)
 
         if (listener.once)
-          m._subscriptions.delete(i)
+          m._subscriptions.delete(subscriptionKey)
         end if
       end if
     end for
@@ -164,6 +165,10 @@ function StoreFacade() as Object
     end if
   end sub
 
+  prototype._getRandomizedKey = function (key as String) as String
+    return key + "_" + uuid()
+  end function
+
   m._store = prototype
 
   return m._store