Simpler timeout mechanis in sendSpontPayment..

services/gunDB/contact-api/actions.js

@@ -389,10 +389,13 @@ const sendSpontaneousPayment = async (
     logger.info('ORDER ID')
     logger.info(orderID)
     /** @type {import('shock-common').Schema.OrderResponse} */
-    const encryptedOrderRes = await Utils.tryAndWait(
-      gun =>
-        new Promise(res => {
-          gun
+    const encryptedOrderRes = await Common.makePromise((res, rej) => {
+      setTimeout(() => {
+        rej(new Error('Timeout of 20s passed when awaiting order response.'))
+      }, 20000)
+
+      require('../Mediator')
+        .getGun()
         .user(to)
         .get(Key.ORDER_TO_RESPONSE)
         .get(orderID)
@@ -402,9 +405,7 @@ const sendSpontaneousPayment = async (
             res(orderResponse)
           }
         })
-        }),
-      v => Schema.isOrderResponse(v)
-    )
+    })
 
     if (!Schema.isOrderResponse(encryptedOrderRes)) {
       const e = TypeError(
@@ -479,10 +480,17 @@ const sendSpontaneousPayment = async (
     logger.info('ACK NODE')
     logger.info(orderResponse.ackNode)
     /** @type {import('shock-common').Schema.OrderResponse} */
-    const encryptedOrderAckRes = await Utils.tryAndWait(
-      gun =>
-        new Promise(res => {
-          gun
+    const encryptedOrderAckRes = await Common.makePromise((res, rej) => {
+      setTimeout(() => {
+        rej(
+          new Error(
+            "Timeout of 20s exceeded when waiting for order response's ack."
+          )
+        )
+      }, 20000)
+
+      require('../Mediator')
+        .getGun()
         .user(to)
         .get(Key.ORDER_TO_RESPONSE)
         .get(orderResponse.ackNode)
@@ -496,10 +504,7 @@ const sendSpontaneousPayment = async (
             res(orderResponse)
           }
         })
-        }),
-      //@ts-expect-error
-      v => !v || !v.type
-    )
+    })
 
     if (!encryptedOrderAckRes || !encryptedOrderAckRes.type) {
       const e = TypeError(