@quantform/core 0.7.0-beta.20 → 0.7.0-beta.22

package/dist/with-request.d.ts

@@ -1,16 +1,17 @@
+import { Observable } from 'rxjs';
 export type RequestMethod = 'GET' | 'HEAD' | 'POST' | 'PUT' | 'DELETE' | 'CONNECT' | 'OPTIONS' | 'TRACE' | 'PATCH';
 export declare class RequestNetworkError extends Error {
     readonly statusCode: number;
     readonly json: () => Promise<string>;
     constructor(statusCode: number, json: () => Promise<string>);
 }
-export declare function withRequest(args: {
+export declare function withRequest({ method, url, headers, body }: {
     method: RequestMethod;
     url: string;
     headers?: Record<string, any>;
     body?: string;
-}): import("rxjs").Observable<{
+}): Observable<{
     timestamp: number;
-    payload: any;
+    payload: unknown;
 }>;
 //# sourceMappingURL=with-request.d.ts.map

package/dist/with-request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"with-request.d.ts","sourceRoot":"","sources":["../src/with-request.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,aAAa,GACrB,KAAK,GACL,MAAM,GACN,MAAM,GACN,KAAK,GACL,QAAQ,GACR,SAAS,GACT,SAAS,GACT,OAAO,GACP,OAAO,CAAC;AAEZ,qBAAa,mBAAoB,SAAQ,KAAK;IAChC,QAAQ,CAAC,UAAU,EAAE,MAAM;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC;gBAAxD,UAAU,EAAE,MAAM,EAAW,IAAI,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC;CAG9E;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE;IAChC,MAAM,EAAE,aAAa,CAAC;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;;;GAsBA"}
+{"version":3,"file":"with-request.d.ts","sourceRoot":"","sources":["../src/with-request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAMlC,MAAM,MAAM,aAAa,GACrB,KAAK,GACL,MAAM,GACN,MAAM,GACN,KAAK,GACL,QAAQ,GACR,SAAS,GACT,SAAS,GACT,OAAO,GACP,OAAO,CAAC;AAEZ,qBAAa,mBAAoB,SAAQ,KAAK;IAChC,QAAQ,CAAC,UAAU,EAAE,MAAM;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC;gBAAxD,UAAU,EAAE,MAAM,EAAW,IAAI,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC;CAG9E;AAED,wBAAgB,WAAW,CAAC,EAC1B,MAAM,EACN,GAAG,EACH,OAAO,EACP,IAAI,EACL,EAAE;IACD,MAAM,EAAE,aAAa,CAAC;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;eAGoC,MAAM;aAAW,OAAO;GA8B5D"}

package/dist/with-request.js

@@ -13,14 +13,36 @@ class RequestNetworkError extends Error {
     }
 }
 exports.RequestNetworkError = RequestNetworkError;
-function withRequest(args) {
+function withRequest({ method, url, headers, body }) {
     const { error } = (0, use_logger_1.useLogger)(withRequest.name);
-    return (0, rxjs_1.defer)(() => (0, rxjs_1.from)((0, undici_1.request)(args.url, args)).pipe((0, rxjs_1.switchMap)(it => {
-        if (it.statusCode !== 200) {
-            error(`errored`, Object.assign(Object.assign({}, args), { statusCode: it.statusCode }));
-            return (0, rxjs_1.throwError)(() => new RequestNetworkError(it.statusCode, () => it.body.json()));
-        }
-        return (0, rxjs_1.from)(it.body.json());
-    }), (0, rxjs_1.map)(payload => ({ timestamp: (0, use_timestamp_1.useTimestamp)(), payload }))));
+    return new rxjs_1.Observable(subscriber => {
+        (0, undici_1.request)(url, { method, headers, body })
+            .then(({ statusCode, body }) => {
+            if (statusCode !== 200) {
+                error(`errored`, {
+                    method,
+                    url,
+                    headers,
+                    body,
+                    statusCode
+                });
+                subscriber.error(new RequestNetworkError(statusCode, () => body.json()));
+            }
+            else {
+                subscriber.next({ timestamp: (0, use_timestamp_1.useTimestamp)(), payload: body.json() });
+            }
+        })
+            .catch((e) => {
+            error(`errored`, {
+                method,
+                url,
+                headers,
+                body,
+                error: e
+            });
+            subscriber.error(error);
+        })
+            .finally(() => subscriber.complete());
+    });
 }
 exports.withRequest = withRequest;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quantform/core",
-  "version": "0.7.0-beta.20",
+  "version": "0.7.0-beta.22",
   "license": "MIT",
   "author": "Mateusz Majchrzak",
   "description": "Node.js library for building systematic trading strategies in reactive way.",

package/src/with-request.ts

@@ -1,4 +1,4 @@
-import { defer, from, map, switchMap, throwError } from 'rxjs';
+import { Observable } from 'rxjs';
 import { request } from 'undici';
 
 import { useLogger } from './use-logger';
@@ -21,7 +21,12 @@ export class RequestNetworkError extends Error {
   }
 }
 
-export function withRequest(args: {
+export function withRequest({
+  method,
+  url,
+  headers,
+  body
+}: {
   method: RequestMethod;
   url: string;
   headers?: Record<string, any>;
@@ -29,23 +34,34 @@ export function withRequest(args: {
 }) {
   const { error } = useLogger(withRequest.name);
 
-  return defer(() =>
-    from(request(args.url, args)).pipe(
-      switchMap(it => {
-        if (it.statusCode !== 200) {
+  return new Observable<{ timestamp: number; payload: unknown }>(subscriber => {
+    request(url, { method, headers, body })
+      .then(({ statusCode, body }) => {
+        if (statusCode !== 200) {
           error(`errored`, {
-            ...args,
-            statusCode: it.statusCode
+            method,
+            url,
+            headers,
+            body,
+            statusCode
           });
 
-          return throwError(
-            () => new RequestNetworkError(it.statusCode, () => it.body.json())
-          );
+          subscriber.error(new RequestNetworkError(statusCode, () => body.json()));
+        } else {
+          subscriber.next({ timestamp: useTimestamp(), payload: body.json() });
         }
+      })
+      .catch((e: Error) => {
+        error(`errored`, {
+          method,
+          url,
+          headers,
+          body,
+          error: e
+        });
 
-        return from(it.body.json());
-      }),
-      map(payload => ({ timestamp: useTimestamp(), payload }))
-    )
-  );
+        subscriber.error(error);
+      })
+      .finally(() => subscriber.complete());
+  });
 }