@quantform/core 0.3.257 → 0.3.263

package/src/session/session.ts

@@ -146,19 +146,29 @@ export class Session {
   }
 
   /**
-   * Opens collection of orders.
+   * Opens a new order.
    * Example:
    * session.open(Order.buyMarket(instrument, 100));
    */
-  async open(...orders: Order[]): Promise<void> {
-    await Promise.all(orders.map(it => this.aggregate.open(it)));
+  open(order: Order): Observable<Order> {
+    return from(this.aggregate.open(order)).pipe(
+      switchMap(it =>
+        this.store.changes$.pipe(filter(it => it instanceof Order && it.id == it.id))
+      ),
+      map(it => it as Order)
+    );
   }
 
   /**
    * Cancels specific order.
    */
-  cancel(order: Order): Promise<void> {
-    return this.aggregate.cancel(order);
+  cancel(order: Order): Observable<Order> {
+    return from(this.aggregate.cancel(order)).pipe(
+      switchMap(it =>
+        this.store.changes$.pipe(filter(it => it instanceof Order && it.id == it.id))
+      ),
+      map(it => it as Order)
+    );
   }
 
   /**
@@ -261,57 +271,30 @@ export class Session {
     );
   }
 
-  private ordersOf(
-    orders: Order[],
-    states: OrderState[],
-    selector?: InstrumentSelector
-  ): Observable<Order[]> {
+  orders(selector: InstrumentSelector, states?: OrderState[]): Observable<Order[]> {
     this.subscribe([selector]);
 
     return this.store.changes$.pipe(
       filter(
         it =>
           it instanceof Order &&
-          (!selector || it.instrument.toString() == selector.toString()) &&
-          (states.indexOf(it.state) >= 0 || states.length == 0)
+          it.instrument.toString() == selector.toString() &&
+          (!states || states.includes(it.state))
       ),
-      map(() =>
-        Object.values(orders)
-          .filter(it => !selector || it.instrument.toString() == selector.toString())
-          .sort((lhs, rhs) => rhs.createdAt - lhs.createdAt)
-      ),
-      startWith(
-        Object.values(orders)
-          .filter(it => !selector || it.instrument.toString() == selector.toString())
+      map(() => this.store.snapshot.order),
+      startWith(this.store.snapshot.order),
+      map(it =>
+        Object.values(it)
+          .filter(
+            it =>
+              it.instrument.toString() == selector.toString() &&
+              (states ? states.includes(it.state) : true)
+          )
           .sort((lhs, rhs) => rhs.createdAt - lhs.createdAt)
       )
     );
   }
 
-  pending(selector?: InstrumentSelector): Observable<Order[]> {
-    return this.ordersOf(
-      Object.values(this.store.snapshot.order.pending),
-      ['PENDING', 'NEW'],
-      selector
-    );
-  }
-
-  filled(selector?: InstrumentSelector): Observable<Order[]> {
-    return this.ordersOf(
-      Object.values(this.store.snapshot.order.filled),
-      ['FILLED'],
-      selector
-    );
-  }
-
-  canceled(selector?: InstrumentSelector): Observable<Order[]> {
-    return this.ordersOf(
-      Object.values(this.store.snapshot.order.canceled),
-      ['CANCELING', 'CANCELED'],
-      selector
-    );
-  }
-
   balance(selector: AssetSelector): Observable<Balance> {
     return this.store.changes$.pipe(
       startWith(this.store.snapshot.balance[selector.toString()]),
@@ -332,7 +315,9 @@ export class Session {
     return this.store.changes$.pipe(
       startWith(this.store.snapshot.universe.instrument[selector.toString()]),
       filter(it => it instanceof Instrument && it.toString() == selector.toString()),
-      switchMap(() => from(this.aggregate.history(selector, timeframe, length))),
+      switchMap(() =>
+        from(this.aggregate.history({ instrument: selector, timeframe, length }))
+      ),
       take(1),
       shareReplay(),
       mergeMap(it => it)

package/src/store/event/store-order.event.spec.ts

@@ -22,7 +22,7 @@ describe('order load event tests', () => {
 
     store.dispatch(new OrderLoadEvent(order, timestamp));
 
-    expect(Object.keys(store.snapshot.order.pending).length).toEqual(1);
-    expect(store.snapshot.order.pending[order.id]).toEqual(order);
+    expect(Object.keys(store.snapshot.order).length).toEqual(1);
+    expect(store.snapshot.order[order.id]).toEqual(order);
   });
 });

package/src/store/event/store-order.event.ts

@@ -18,22 +18,7 @@ export function OrderLoadEventHandler(
 ) {
   event.order.timestamp = event.timestamp;
 
-  switch (event.order.state) {
-    case 'NEW':
-    case 'PENDING':
-      state.order.pending[event.order.id] = event.order;
-      break;
-    case 'FILLED':
-      state.order.filled[event.order.id] = event.order;
-      break;
-    case 'CANCELING':
-    case 'CANCELED':
-      state.order.canceled[event.order.id] = event.order;
-      break;
-    case 'REJECTED':
-      state.order.rejected[event.order.id] = event.order;
-      break;
-  }
+  state.order[event.order.id] = event.order;
 
   changes.commit(event.order);
 }
@@ -57,7 +42,7 @@ export function OrderNewEventHandler(
   event.order.createdAt = event.timestamp;
   event.order.timestamp = event.timestamp;
 
-  state.order.pending[event.order.id] = event.order;
+  state.order[event.order.id] = event.order;
 
   changes.commit(event.order);
 }
@@ -74,11 +59,11 @@ export function OrderPendingEventHandler(
   state: State,
   changes: StateChangeTracker
 ) {
-  if (!(event.id in state.order.pending)) {
+  if (!(event.id in state.order)) {
     throw new Error(`Trying to patch unknown order: ${event.id}`);
   }
 
-  const order = state.order.pending[event.id];
+  const order = state.order[event.id];
 
   if (order.state != 'NEW') {
     throw new Error(`Order is not new`);
@@ -106,11 +91,11 @@ export function OrderFilledEventHandler(
   state: State,
   changes: StateChangeTracker
 ) {
-  if (!(event.id in state.order.pending)) {
+  if (!(event.id in state.order)) {
     throw new Error(`Trying to patch unknown order: ${event.id}`);
   }
 
-  const order = state.order.pending[event.id];
+  const order = state.order[event.id];
 
   if (order.state != 'PENDING' && order.state != 'CANCELING') {
     throw new Error('Order is not pending');
@@ -121,10 +106,6 @@ export function OrderFilledEventHandler(
   order.quantityExecuted = order.quantity;
   order.averageExecutionRate = event.averageExecutionRate;
 
-  delete state.order.pending[event.id];
-
-  state.order.filled[event.id] = order;
-
   changes.commit(order);
 }
 
@@ -140,11 +121,11 @@ export function OrderCancelingEventHandler(
   state: State,
   changes: StateChangeTracker
 ) {
-  if (!(event.id in state.order.pending)) {
+  if (!(event.id in state.order)) {
     throw new Error(`Trying to patch unknown order: ${event.id}`);
   }
 
-  const order = state.order.pending[event.id];
+  const order = state.order[event.id];
 
   if (order.state == 'CANCELING' || order.state == 'CANCELED') {
     return;
@@ -172,7 +153,7 @@ export function OrderCanceledEventHandler(
   state: State,
   changes: StateChangeTracker
 ) {
-  const order = state.order.pending[event.id];
+  const order = state.order[event.id];
 
   if (order.state == 'CANCELED') {
     return;
@@ -185,10 +166,6 @@ export function OrderCanceledEventHandler(
   order.state = 'CANCELED';
   order.timestamp = event.timestamp;
 
-  delete state.order.pending[event.id];
-
-  state.order.canceled[event.id] = order;
-
   changes.commit(order);
 }
 
@@ -204,7 +181,7 @@ export function OrderCancelFailedEventHandler(
   state: State,
   changes: StateChangeTracker
 ) {
-  const order = state.order.pending[event.id];
+  const order = state.order[event.id];
 
   if (order.state != 'CANCELING') {
     return;
@@ -228,7 +205,7 @@ export function OrderRejectedEventHandler(
   state: State,
   changes: StateChangeTracker
 ) {
-  const order = state.order.pending[event.id];
+  const order = state.order[event.id];
 
   if (order.state != 'NEW') {
     throw new Error('Order is not new.');
@@ -237,9 +214,5 @@ export function OrderRejectedEventHandler(
   order.state = 'REJECTED';
   order.timestamp = event.timestamp;
 
-  delete state.order.pending[event.id];
-
-  state.order.rejected[event.id] = order;
-
   changes.commit(order);
 }

package/src/store/store.state.ts

@@ -39,16 +39,5 @@ export class State {
   trade: Record<string, Trade> = {};
   orderbook: Record<string, Orderbook> = {};
   balance: Record<string, Balance> = {};
-
-  order: {
-    pending: Record<string, Order>;
-    filled: Record<string, Order>;
-    canceled: Record<string, Order>;
-    rejected: Record<string, Order>;
-  } = {
-    pending: {},
-    filled: {},
-    canceled: {},
-    rejected: {}
-  };
+  order: Record<string, Order> = {};
 }

package/src/tests/backtester-adapter.spec.ts

@@ -1,5 +1,3 @@
-import { AdapterAwakeCommand } from '../adapter';
-import { AdapterSubscribeCommand } from '../adapter';
 import { Asset, Commission, instrumentOf } from '../domain';
 import { InMemoryStorage, Feed } from '../storage';
 import { Store } from '../store';
@@ -10,7 +8,6 @@ import { PaperExecutor } from '../adapter/paper/executor/paper-executor';
 import { PaperAdapter } from '../adapter/paper/paper-adapter';
 import { BacktesterAdapter } from '../adapter/backtester/backtester-adapter';
 import { BacktesterStreamer } from '../adapter/backtester/backtester-streamer';
-import { handler } from '../shared';
 
 const base = new Asset('btc', 'binance', 8);
 const quote = new Asset('usdt', 'binance', 4);
@@ -26,9 +23,10 @@ class DefaultAdapter extends Adapter {
     return new PaperSpotExecutor(adapter);
   }
 
-  @handler(AdapterAwakeCommand)
-  onAwake(command: AdapterAwakeCommand, context: AdapterContext) {
-    context.store.dispatch(
+  async awake(context: AdapterContext): Promise<void> {
+    await super.awake(context);
+
+    context.dispatch(
       new InstrumentPatchEvent(
         context.timestamp,
         base,
@@ -88,12 +86,8 @@ describe('backtester adapter tests', () => {
 
     const sut = new BacktesterAdapter(adapter, streamer);
 
-    sut.dispatch(new AdapterAwakeCommand(), new AdapterContext(sut, store));
-
-    sut.dispatch(
-      new AdapterSubscribeCommand([instrument]),
-      new AdapterContext(sut, store)
-    );
+    sut.awake(new AdapterContext(sut, store));
+    sut.subscribe([instrument]);
 
     expect(sut.name).toEqual('default');
   });

package/dist/adapter/adapter.event.d.ts

@@ -1,43 +0,0 @@
-import { Feed } from '../storage';
-import { timestamp } from '../shared';
-import { InstrumentSelector, Order } from '../domain';
-export declare class AdapterAwakeCommand {
-    type: string;
-}
-export declare class AdapterDisposeCommand {
-    type: string;
-}
-export declare class AdapterAccountCommand {
-    type: string;
-}
-export declare class AdapterSubscribeCommand {
-    readonly instrument: Array<InstrumentSelector>;
-    type: string;
-    constructor(instrument: Array<InstrumentSelector>);
-}
-export declare class AdapterOrderOpenCommand {
-    readonly order: Order;
-    type: string;
-    constructor(order: Order);
-}
-export declare class AdapterOrderCancelCommand {
-    readonly order: Order;
-    type: string;
-    constructor(order: Order);
-}
-export declare class AdapterHistoryQuery {
-    readonly instrument: InstrumentSelector;
-    readonly timeframe: number;
-    readonly length: number;
-    type: string;
-    constructor(instrument: InstrumentSelector, timeframe: number, length: number);
-}
-export declare class AdapterFeedCommand {
-    readonly instrument: InstrumentSelector;
-    readonly from: timestamp;
-    readonly to: timestamp;
-    readonly feed: Feed;
-    readonly progress: (timestamp: number) => void;
-    type: string;
-    constructor(instrument: InstrumentSelector, from: timestamp, to: timestamp, feed: Feed, progress: (timestamp: number) => void);
-}

package/dist/adapter/adapter.event.js

@@ -1,104 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AdapterFeedCommand = exports.AdapterHistoryQuery = exports.AdapterOrderCancelCommand = exports.AdapterOrderOpenCommand = exports.AdapterSubscribeCommand = exports.AdapterAccountCommand = exports.AdapterDisposeCommand = exports.AdapterAwakeCommand = void 0;
-const storage_1 = require("../storage");
-const domain_1 = require("../domain");
-const topic_1 = require("../shared/topic");
-let AdapterAwakeCommand = class AdapterAwakeCommand {
-    constructor() {
-        this.type = 'awake';
-    }
-};
-AdapterAwakeCommand = __decorate([
-    topic_1.event
-], AdapterAwakeCommand);
-exports.AdapterAwakeCommand = AdapterAwakeCommand;
-let AdapterDisposeCommand = class AdapterDisposeCommand {
-    constructor() {
-        this.type = 'dispose';
-    }
-};
-AdapterDisposeCommand = __decorate([
-    topic_1.event
-], AdapterDisposeCommand);
-exports.AdapterDisposeCommand = AdapterDisposeCommand;
-let AdapterAccountCommand = class AdapterAccountCommand {
-    constructor() {
-        this.type = 'account';
-    }
-};
-AdapterAccountCommand = __decorate([
-    topic_1.event
-], AdapterAccountCommand);
-exports.AdapterAccountCommand = AdapterAccountCommand;
-let AdapterSubscribeCommand = class AdapterSubscribeCommand {
-    constructor(instrument) {
-        this.instrument = instrument;
-        this.type = 'subscribe';
-    }
-};
-AdapterSubscribeCommand = __decorate([
-    topic_1.event,
-    __metadata("design:paramtypes", [Array])
-], AdapterSubscribeCommand);
-exports.AdapterSubscribeCommand = AdapterSubscribeCommand;
-let AdapterOrderOpenCommand = class AdapterOrderOpenCommand {
-    constructor(order) {
-        this.order = order;
-        this.type = 'order-open';
-    }
-};
-AdapterOrderOpenCommand = __decorate([
-    topic_1.event,
-    __metadata("design:paramtypes", [domain_1.Order])
-], AdapterOrderOpenCommand);
-exports.AdapterOrderOpenCommand = AdapterOrderOpenCommand;
-let AdapterOrderCancelCommand = class AdapterOrderCancelCommand {
-    constructor(order) {
-        this.order = order;
-        this.type = 'order-cancel';
-    }
-};
-AdapterOrderCancelCommand = __decorate([
-    topic_1.event,
-    __metadata("design:paramtypes", [domain_1.Order])
-], AdapterOrderCancelCommand);
-exports.AdapterOrderCancelCommand = AdapterOrderCancelCommand;
-let AdapterHistoryQuery = class AdapterHistoryQuery {
-    constructor(instrument, timeframe, length) {
-        this.instrument = instrument;
-        this.timeframe = timeframe;
-        this.length = length;
-        this.type = 'history';
-    }
-};
-AdapterHistoryQuery = __decorate([
-    topic_1.event,
-    __metadata("design:paramtypes", [domain_1.InstrumentSelector, Number, Number])
-], AdapterHistoryQuery);
-exports.AdapterHistoryQuery = AdapterHistoryQuery;
-let AdapterFeedCommand = class AdapterFeedCommand {
-    constructor(instrument, from, to, feed, progress) {
-        this.instrument = instrument;
-        this.from = from;
-        this.to = to;
-        this.feed = feed;
-        this.progress = progress;
-        this.type = 'feed';
-    }
-};
-AdapterFeedCommand = __decorate([
-    topic_1.event,
-    __metadata("design:paramtypes", [domain_1.InstrumentSelector, Number, Number, storage_1.Feed, Function])
-], AdapterFeedCommand);
-exports.AdapterFeedCommand = AdapterFeedCommand;
-//# sourceMappingURL=adapter.event.js.map

package/dist/adapter/adapter.event.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"adapter.event.js","sourceRoot":"","sources":["../../src/adapter/adapter.event.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAAkC;AAElC,sCAAsD;AACtD,2CAAwC;AAGxC,IAAa,mBAAmB,GAAhC,MAAa,mBAAmB;IAAhC;QACE,SAAI,GAAG,OAAO,CAAC;IACjB,CAAC;CAAA,CAAA;AAFY,mBAAmB;IAD/B,aAAK;GACO,mBAAmB,CAE/B;AAFY,kDAAmB;AAKhC,IAAa,qBAAqB,GAAlC,MAAa,qBAAqB;IAAlC;QACE,SAAI,GAAG,SAAS,CAAC;IACnB,CAAC;CAAA,CAAA;AAFY,qBAAqB;IADjC,aAAK;GACO,qBAAqB,CAEjC;AAFY,sDAAqB;AAKlC,IAAa,qBAAqB,GAAlC,MAAa,qBAAqB;IAAlC;QACE,SAAI,GAAG,SAAS,CAAC;IACnB,CAAC;CAAA,CAAA;AAFY,qBAAqB;IADjC,aAAK;GACO,qBAAqB,CAEjC;AAFY,sDAAqB;AAKlC,IAAa,uBAAuB,GAApC,MAAa,uBAAuB;IAGlC,YAAqB,UAAqC;QAArC,eAAU,GAAV,UAAU,CAA2B;QAF1D,SAAI,GAAG,WAAW,CAAC;IAE0C,CAAC;CAC/D,CAAA;AAJY,uBAAuB;IADnC,aAAK;qCAI6B,KAAK;GAH3B,uBAAuB,CAInC;AAJY,0DAAuB;AAOpC,IAAa,uBAAuB,GAApC,MAAa,uBAAuB;IAGlC,YAAqB,KAAY;QAAZ,UAAK,GAAL,KAAK,CAAO;QAFjC,SAAI,GAAG,YAAY,CAAC;IAEgB,CAAC;CACtC,CAAA;AAJY,uBAAuB;IADnC,aAAK;qCAIwB,cAAK;GAHtB,uBAAuB,CAInC;AAJY,0DAAuB;AAOpC,IAAa,yBAAyB,GAAtC,MAAa,yBAAyB;IAGpC,YAAqB,KAAY;QAAZ,UAAK,GAAL,KAAK,CAAO;QAFjC,SAAI,GAAG,cAAc,CAAC;IAEc,CAAC;CACtC,CAAA;AAJY,yBAAyB;IADrC,aAAK;qCAIwB,cAAK;GAHtB,yBAAyB,CAIrC;AAJY,8DAAyB;AAOtC,IAAa,mBAAmB,GAAhC,MAAa,mBAAmB;IAG9B,YACW,UAA8B,EAC9B,SAAiB,EACjB,MAAc;QAFd,eAAU,GAAV,UAAU,CAAoB;QAC9B,cAAS,GAAT,SAAS,CAAQ;QACjB,WAAM,GAAN,MAAM,CAAQ;QALzB,SAAI,GAAG,SAAS,CAAC;IAMd,CAAC;CACL,CAAA;AARY,mBAAmB;IAD/B,aAAK;qCAKmB,2BAAkB;GAJ9B,mBAAmB,CAQ/B;AARY,kDAAmB;AAWhC,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAG7B,YACW,UAA8B,EAC9B,IAAe,EACf,EAAa,EACb,IAAU,EACV,QAAqC;QAJrC,eAAU,GAAV,UAAU,CAAoB;QAC9B,SAAI,GAAJ,IAAI,CAAW;QACf,OAAE,GAAF,EAAE,CAAW;QACb,SAAI,GAAJ,IAAI,CAAM;QACV,aAAQ,GAAR,QAAQ,CAA6B;QAPhD,SAAI,GAAG,MAAM,CAAC;IAQX,CAAC;CACL,CAAA;AAVY,kBAAkB;IAD9B,aAAK;qCAKmB,2BAAkB,kBAGxB,cAAI;GAPV,kBAAkB,CAU9B;AAVY,gDAAkB"}

package/src/adapter/adapter.event.ts

@@ -1,64 +0,0 @@
-import { Feed } from '../storage';
-import { timestamp } from '../shared';
-import { InstrumentSelector, Order } from '../domain';
-import { event } from '../shared/topic';
-
-@event
-export class AdapterAwakeCommand {
-  type = 'awake';
-}
-
-@event
-export class AdapterDisposeCommand {
-  type = 'dispose';
-}
-
-@event
-export class AdapterAccountCommand {
-  type = 'account';
-}
-
-@event
-export class AdapterSubscribeCommand {
-  type = 'subscribe';
-
-  constructor(readonly instrument: Array<InstrumentSelector>) {}
-}
-
-@event
-export class AdapterOrderOpenCommand {
-  type = 'order-open';
-
-  constructor(readonly order: Order) {}
-}
-
-@event
-export class AdapterOrderCancelCommand {
-  type = 'order-cancel';
-
-  constructor(readonly order: Order) {}
-}
-
-@event
-export class AdapterHistoryQuery {
-  type = 'history';
-
-  constructor(
-    readonly instrument: InstrumentSelector,
-    readonly timeframe: number,
-    readonly length: number
-  ) {}
-}
-
-@event
-export class AdapterFeedCommand {
-  type = 'feed';
-
-  constructor(
-    readonly instrument: InstrumentSelector,
-    readonly from: timestamp,
-    readonly to: timestamp,
-    readonly feed: Feed,
-    readonly progress: (timestamp: number) => void
-  ) {}
-}