@exodus/atoms 3.3.0 → 3.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/atoms",
-  "version": "3.3.0",
+  "version": "3.4.1",
   "main": "src/index.js",
   "author": "Exodus Movement Inc.",
   "scripts": {
@@ -33,5 +33,5 @@
     "eslint": "^8.33.0",
     "jest": "^29.1.2"
   },
-  "gitHead": "70addd5b9ab78d80753b20fee7ec0d75c5e91b8c"
+  "gitHead": "0c9ed53bfe02b1d0dc0666bc83c0bd1dcd8f5e36"
 }

package/src/countdown-lock.js

@@ -1,15 +1,22 @@
 import pDefer from 'p-defer'
 
-const createCountdownLock = (n) => {
-  if (typeof n !== 'number' || n <= 0) throw new Error('lock number must be positive')
+const createCountdownLock = (keys) => {
+  if (!Array.isArray(keys)) throw new Error('lock keys must be an array')
+
+  for (const key of keys) {
+    if (typeof key !== 'string') throw new Error(`lock keys must be all strings. Invalid ${key}`)
+  }
 
   const deferred = pDefer()
+
+  const unlockedKeys = []
+
   return {
     promise: deferred.promise,
-    unlock: () => {
-      if (n > 0) n--
+    unlock: (key) => {
+      if (!unlockedKeys.includes(key)) unlockedKeys.push(key)
 
-      if (n <= 0) {
+      if (unlockedKeys.length === keys.length) {
         deferred.resolve()
         return true
       }

package/src/enhancers/combine.js

@@ -4,7 +4,7 @@ import createSimpleObserver from '../simple-observer'
 
 const combine = (atoms) => {
   const { notify, observe } = createSimpleObserver()
-  const countdownLock = createCountdownLock(Object.keys(atoms).length)
+  const countdownLock = createCountdownLock(Object.keys(atoms))
 
   let values = {}
 
@@ -14,7 +14,7 @@ const combine = (atoms) => {
         ...values,
         [name]: value,
       }
-      if (countdownLock.unlock()) await notify(values)
+      if (countdownLock.unlock(name)) await notify(values)
     })
   }
 

package/src/factories/keystore.js

@@ -0,0 +1,38 @@
+import enforceObservableRules from '../enforce-rules'
+import createSimpleObserver from '../simple-observer'
+
+const createKeystoreAtom = ({
+  keystore,
+  config: {
+    //
+    key,
+    defaultValue,
+    isSoleWriter,
+    getOpts,
+    setOpts,
+    deleteOpts,
+  },
+}) => {
+  const { notify, observe } = createSimpleObserver({ enable: isSoleWriter })
+
+  const set = async (value) => {
+    if (value == null) {
+      await keystore.deleteSecret(key, deleteOpts)
+    } else {
+      await keystore.setSecret(key, value, setOpts)
+    }
+
+    if (isSoleWriter) await notify(value)
+  }
+
+  const get = () => keystore.getSecret(key, getOpts)
+
+  return enforceObservableRules({
+    get,
+    set,
+    observe,
+    defaultValue,
+  })
+}
+
+export default createKeystoreAtom

package/src/index.js

@@ -4,6 +4,7 @@ export { default as createFusionAtomFactory } from './factories/fusion'
 export { default as createStorageAtomFactory } from './factories/storage'
 export { default as createLocalConfigAtomFactory } from './factories/local-config'
 export { default as createRemoteConfigAtomFactory } from './factories/remote-config'
+export { default as createKeystoreAtom } from './factories/keystore'
 export { default as fromEventEmitter } from './event-emitter'
 export { default as compute } from './enhancers/compute'
 export { default as blockUntil } from './enhancers/block-until'