Merge branch 'feature/order-watcher-v2' into feature/order-watcher-erc721-tests

3 files changed, 41 insertions, 2 deletions

diff --git a/packages/utils/package.json b/packages/utils/package.json
index 489be2ad1..ebecd3a3b 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -35,14 +35,15 @@
         "typescript": "2.7.1"
     },
     "dependencies": {
-        "ethereum-types": "^0.0.2",
+        "@0xproject/types": "^1.0.0",
         "@0xproject/typescript-typings": "^0.4.2",
         "@types/node": "^8.0.53",
-        "ethereumjs-util": "^5.1.1",
         "bignumber.js": "~4.1.0",
+        "detect-node": "2.0.3",
         "ethereum-types": "^0.0.2",
         "ethereumjs-util": "^5.1.1",
         "ethers": "3.0.22",
+        "isomorphic-fetch": "^2.2.1",
         "js-sha3": "^0.7.0",
         "lodash": "^4.17.4"
     },
diff --git a/packages/utils/src/fetchAsync.ts b/packages/utils/src/fetchAsync.ts
new file mode 100644
index 000000000..c02e5baba
--- /dev/null
+++ b/packages/utils/src/fetchAsync.ts
@@ -0,0 +1,37 @@
+import isNode = require('detect-node');
+import 'isomorphic-fetch';
+
+export const fetchAsync = async (
+    endpoint: string,
+    options: RequestInit = {},
+    timeoutMs: number = 20000,
+): Promise<Response> => {
+    if (options.signal || (options as any).timeout) {
+        throw new Error(
+            'Cannot call fetchAsync with options.signal or options.timeout. To set a timeout, please use the supplied "timeoutMs" parameter.',
+        );
+    }
+    let optionsWithAbortParam;
+    if (!isNode) {
+        const controller = new AbortController();
+        const signal = controller.signal;
+        setTimeout(() => {
+            controller.abort();
+        }, timeoutMs);
+        optionsWithAbortParam = {
+            signal,
+            ...options,
+        };
+    } else {
+        // HACK: the `timeout` param only exists in `node-fetch`, and not on the `isomorphic-fetch`
+        // `RequestInit` type. Since `isomorphic-fetch` conditionally wraps `node-fetch` when the
+        // execution environment is `Node.js`, we need to cast it to `any` in that scenario.
+        optionsWithAbortParam = {
+            timeout: timeoutMs,
+            ...options,
+        } as any;
+    }
+
+    const response = await fetch(endpoint, optionsWithAbortParam);
+    return response;
+};
diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts
index fd102cecb..b8e0b1775 100644
--- a/packages/utils/src/index.ts
+++ b/packages/utils/src/index.ts
@@ -8,3 +8,4 @@ export { logUtils } from './log_utils';
 export { abiUtils } from './abi_utils';
 export { NULL_BYTES } from './constants';
 export { errorUtils } from './error_utils';
+export { fetchAsync } from './fetchAsync';