fix: Don't use waitForCondition outside test, doesn't wait for async, uses browser-incompatible setImmediate.

Author: timoxley

src/stream/index.ts

@@ -1,7 +1,6 @@
 import fetch from 'node-fetch'
 import { getAddress } from '@ethersproject/address'
-import { waitForCondition } from 'streamr-test-utils'
-import { getEndpointUrl } from '../utils'
+import { getEndpointUrl, until } from '../utils'
 import authFetch from '../rest/authFetch'
 
 import { StorageNode } from './StorageNode'
@@ -224,7 +223,7 @@ export class Stream {
         await this.update()
     }
 
-    async addToStorageNode(address: string) {
+    async addToStorageNode(address: string, { timeout = 30000 }: { timeout: number } = { timeout: 30000 }) {
         // currently we support only one storage node
         // -> we can validate that the given address is that address
         // -> remove this comparison when we start to support multiple storage nodes
@@ -233,8 +232,7 @@ export class Stream {
         }
         await authFetch(
             getEndpointUrl(this._client.options.restUrl, 'streams', this.id, 'storageNodes'),
-            this._client.session,
-            {
+            this._client.session, {
                 method: 'POST',
                 body: JSON.stringify({
                     address
@@ -243,9 +241,8 @@ export class Stream {
         )
         // wait for propagation: the storage node sees the database change in E&E and
         // is ready to store the any stream data which we publish
-        const TIMEOUT = 30 * 1000
         const POLL_INTERVAL = 500
-        await waitForCondition(() => this.isStreamStoredInStorageNode(this.id), TIMEOUT, POLL_INTERVAL,
+        await until(() => this.isStreamStoredInStorageNode(this.id), timeout, POLL_INTERVAL,
             () => `Propagation timeout when adding stream to a storage node: ${this.id}`)
     }
 

src/utils/index.ts

@@ -494,7 +494,8 @@ export async function sleep(ms: number = 0) {
  * @param timeOutMs - stop waiting after that many milliseconds, -1 for disable
  * @param pollingIntervalMs - check condition between so many milliseconds
  */
-export async function until(condition: MaybeAsync<() => boolean>, timeOutMs = 10000, pollingIntervalMs = 100) {
+export async function until(condition: MaybeAsync<() => boolean>, timeOutMs = 10000, pollingIntervalMs = 100, failedMsgFn?: () => string) {
+    const err = new Error(`Timeout after ${timeOutMs} milliseconds`)
     let timeout = false
     if (timeOutMs > 0) {
         setTimeout(() => { timeout = true }, timeOutMs)
@@ -503,8 +504,12 @@ export async function until(condition: MaybeAsync<() => boolean>, timeOutMs = 10
     // Promise wrapped condition function works for normal functions just the same as Promises
     while (!await Promise.resolve().then(condition)) { // eslint-disable-line no-await-in-loop
         if (timeout) {
-            throw new Error(`Timeout after ${timeOutMs} milliseconds`)
+            if (failedMsgFn) {
+                err.message += ` ${failedMsgFn()}`
+            }
+            throw err
         }
+
         await sleep(pollingIntervalMs) // eslint-disable-line no-await-in-loop
     }
     return condition()