improved received requests

services/gunDB/contact-api/events/onReceivedReqs.js

@@ -1,128 +1,138 @@
 /** @format */
+const debounce = require('lodash/debounce')
+
 const Key = require('../key')
 const Schema = require('../schema')
 const Streams = require('../streams')
-/**
- * @typedef {import('../schema').HandshakeRequest} HandshakeRequest
- * @typedef {import('../schema').SimpleReceivedRequest} SimpleReceivedRequest
- */
 
 /**
- * @typedef {(reqs: SimpleReceivedRequest[]) => void} Listener
+ * @typedef {Readonly<Schema.SimpleReceivedRequest>} SimpleReceivedRequest
+ * @typedef {(reqs: ReadonlyArray<SimpleReceivedRequest>) => void} Listener
  */
 
 /** @type {Set<Listener>} */
 const listeners = new Set()
 
-/** @type {SimpleReceivedRequest[]} */
-let currentReqs = []
-
 /** @type {string|null} */
 let currentAddress = null
 
-/** @type {Record<string, HandshakeRequest>} */
+/** @type {Record<string, SimpleReceivedRequest>} */
-let currentNode = {}
+let currReceivedReqsMap = {}
 
-const react = () => {
+/**
-  /** @type {SimpleReceivedRequest[]} */
+ * Unprocessed requests in current handshake node.
-  const finalReqs = []
+ * @type {Record<string, Schema.HandshakeRequest>}
-  const pubToIncoming = Streams.getPubToIncoming()
+ */
+let currAddressData = {}
+
+/** @returns {SimpleReceivedRequest[]} */
+const getReceivedReqs = () => Object.values(currReceivedReqsMap)
+/** @param {Record<string, SimpleReceivedRequest>} reqs */
+const setReceivedReqsMap = reqs => {
+  currReceivedReqsMap = reqs
+  listeners.forEach(l => l(getReceivedReqs()))
+}
+
+const react = debounce(() => {
+  /** @type {Record<string, SimpleReceivedRequest>} */
+  const newReceivedReqsMap = {}
+
+  const pubToFeed = Streams.getPubToFeed()
   const pubToAvatar = Streams.getPubToAvatar()
   const pubToDn = Streams.getPubToDn()
 
-  for (const [id, req] of Object.entries(currentNode)) {
+  for (const [id, req] of Object.entries(currAddressData)) {
-    // HERE
+    const inContact = Array.isArray(pubToFeed[req.from])
-    const notAccepted = typeof pubToIncoming[req.from] === 'undefined'
 
-    if (notAccepted) {
+    if (typeof pubToAvatar[req.from] === 'undefined') {
-      if (typeof pubToAvatar[req.from] === 'undefined') {
+      // eslint-disable-next-line no-empty-function
-        // eslint-disable-next-line no-empty-function
+      Streams.onAvatar(() => {}, req.from)()
-        Streams.onAvatar(() => {}, req.from)()
+    }
-      }
+    if (typeof pubToDn[req.from] === 'undefined') {
-      if (typeof pubToDn[req.from] === 'undefined') {
+      // eslint-disable-next-line no-empty-function
-        // eslint-disable-next-line no-empty-function
+      Streams.onDisplayName(() => {}, req.from)()
-        Streams.onDisplayName(() => {}, req.from)()
+    }
-      }
 
-      finalReqs.push({
+    if (!inContact) {
+      newReceivedReqsMap[req.from] = {
         id,
         requestorAvatar: pubToAvatar[req.from] || null,
         requestorDisplayName: pubToDn[req.from] || null,
         requestorPK: req.from,
-        response: req.response,
         timestamp: req.timestamp
-      })
+      }
     }
   }
 
-  currentReqs = finalReqs
+  setReceivedReqsMap(newReceivedReqsMap)
-
+}, 750)
-  listeners.forEach(l => l(currentReqs))
-}
 
 /**
  * @param {string} addr
  * @returns {(data: import('../SimpleGUN').OpenListenerData) => void}
  */
 const listenerForAddr = addr => data => {
+  // did invalidate
   if (addr !== currentAddress) {
     return
   }
 
-  if (typeof data === 'object' && data !== null) {
+  if (typeof data !== 'object' || data === null) {
+    currAddressData = {}
+  } else {
     for (const [id, req] of Object.entries(data)) {
-      if (!Schema.isHandshakeRequest(req)) {
+      // no need to update them just write them once
-        return
+      if (Schema.isHandshakeRequest(req) && !currAddressData[id]) {
+        currAddressData[id] = req
       }
-
-      currentNode[id] = req
     }
-
-    react()
   }
+
+  react()
 }
 
 let subbed = false
 
 /**
- * Massages all of the more primitive data structures into a more manageable
- * 'Chat' paradigm.
  * @param {Listener} cb
  * @returns {() => void}
  */
 const onReceivedReqs = cb => {
   listeners.add(cb)
+  cb(getReceivedReqs())
 
   if (!subbed) {
     require('./index').onCurrentHandshakeAddress(addr => {
-      if (currentAddress !== addr) {
+      if (currentAddress === addr) {
-        currentAddress = addr
+        return
-        currentNode = {}
+      }
 
-        if (typeof addr === 'string') {
+      currentAddress = addr
-          require('../../Mediator')
+      currAddressData = {}
-            .getGun()
+      setReceivedReqsMap({})
-            .get(Key.HANDSHAKE_NODES)
-            .get(addr)
-            .open(listenerForAddr(addr))
-        }
 
-        react()
+      if (typeof addr === 'string') {
+        require('../../Mediator')
+          .getGun()
+          .get(Key.HANDSHAKE_NODES)
+          .get(addr)
+          .open(listenerForAddr(addr))
       }
     }, require('../../Mediator').getUser())
 
     Streams.onAvatar(react)
     Streams.onDisplayName(react)
-    Streams.onIncoming(react)
+    Streams.onPubToFeed(react)
 
     subbed = true
   }
 
-  cb(currentReqs)
-
   return () => {
     listeners.delete(cb)
   }
 }
 
-module.exports = onReceivedReqs
+module.exports = {
+  getReceivedReqs,
+  onReceivedReqs
+}

services/gunDB/contact-api/schema.js

@@ -213,7 +213,6 @@ exports.isSimpleSentRequest = item => {
  * @prop {string|null} requestorAvatar
  * @prop {string|null} requestorDisplayName
  * @prop {string} requestorPK
- * @prop {string} response
  * @prop {number} timestamp
  */
 
@@ -251,10 +250,6 @@ exports.isSimpleReceivedRequest = item => {
     return false
   }
 
-  if (typeof obj.response !== 'string') {
-    return false
-  }
-
   if (typeof obj.timestamp !== 'number') {
     return false
   }