fix: streams callbacks

InjectiveLabs · Jul 14, 2021 · 4984cdb · 4984cdb
1 parent 5ddcfd7
commit 4984cdb
Show file tree

Hide file tree

Showing 42 changed files with 379 additions and 137 deletions.
diff --git a/packages/alchemy-api/CHANGELOG.md b/packages/alchemy-api/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.0.4](https://github.com/InjectiveLabs/injective-ts/compare/@injectivelabs/alchemy-api@0.0.3...@injectivelabs/alchemy-api@0.0.4) (2021-07-14)
+
+**Note:** Version bump only for package @injectivelabs/alchemy-api
+
+
+
+
+
 ## [0.0.3](https://github.com/InjectiveLabs/injective-ts/compare/@injectivelabs/alchemy-api@0.0.2...@injectivelabs/alchemy-api@0.0.3) (2021-07-02)
 
 

diff --git a/packages/alchemy-api/package.json b/packages/alchemy-api/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@injectivelabs/alchemy-api",
   "description": "Alchemy API Consumer.",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -28,8 +28,8 @@
   },
   "dependencies": {
     "@alch/alchemy-web3": "^1.1.1",
-    "@injectivelabs/exceptions": "^0.0.28",
-    "@injectivelabs/ts-types": "^0.0.24",
+    "@injectivelabs/exceptions": "^0.0.29",
+    "@injectivelabs/ts-types": "^0.0.25",
     "@types/lodash.values": "^4.3.6",
     "jsonschema": "^1.4.0",
     "link-module-alias": "^1.2.0",

diff --git a/packages/assert/CHANGELOG.md b/packages/assert/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.0.20](https://github.com/InjectiveLabs/injective-ts/compare/@injectivelabs/assert@0.0.19...@injectivelabs/assert@0.0.20) (2021-07-14)
+
+**Note:** Version bump only for package @injectivelabs/assert
+
+
+
+
+
 ## [0.0.19](https://github.com/InjectiveLabs/injective-ts/compare/@injectivelabs/assert@0.0.17...@injectivelabs/assert@0.0.19) (2021-06-25)
 
 

diff --git a/packages/assert/package.json b/packages/assert/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@injectivelabs/assert",
   "description": "Asserting and validating schemas. Can be reused throughout Injective's projects.",
-  "version": "0.0.19",
+  "version": "0.0.20",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -27,9 +27,9 @@
     "start": "node dist/index.js"
   },
   "dependencies": {
-    "@injectivelabs/exceptions": "^0.0.28",
-    "@injectivelabs/ts-types": "^0.0.24",
-    "@injectivelabs/utils": "^0.0.35",
+    "@injectivelabs/exceptions": "^0.0.29",
+    "@injectivelabs/ts-types": "^0.0.25",
+    "@injectivelabs/utils": "^0.0.36",
     "@types/lodash.values": "^4.3.6",
     "jsonschema": "^1.4.0",
     "link-module-alias": "^1.2.0",

diff --git a/packages/contracts/CHANGELOG.md b/packages/contracts/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.0.59](https://github.com/InjectiveLabs/injective-ts/compare/@injectivelabs/contracts@0.0.58...@injectivelabs/contracts@0.0.59) (2021-07-14)
+
+**Note:** Version bump only for package @injectivelabs/contracts
+
+
+
+
+
 ## [0.0.58](https://github.com/InjectiveLabs/injective-ts/compare/@injectivelabs/contracts@0.0.57...@injectivelabs/contracts@0.0.58) (2021-07-12)
 
 **Note:** Version bump only for package @injectivelabs/contracts

diff --git a/packages/contracts/package.json b/packages/contracts/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@injectivelabs/contracts",
   "description": "Contracts wrapper that can be reused throughout Injective's projects.",
-  "version": "0.0.58",
+  "version": "0.0.59",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -29,12 +29,12 @@
   "dependencies": {
     "@commitlint/cli": "^8.1.0",
     "@commitlint/config-conventional": "^8.1.0",
-    "@injectivelabs/exceptions": "^0.0.28",
-    "@injectivelabs/ts-types": "^0.0.24",
-    "@injectivelabs/tx-utils": "^0.0.13",
-    "@injectivelabs/utils": "^0.0.35",
+    "@injectivelabs/exceptions": "^0.0.29",
+    "@injectivelabs/ts-types": "^0.0.25",
+    "@injectivelabs/tx-utils": "^0.0.14",
+    "@injectivelabs/utils": "^0.0.36",
     "@injectivelabs/web3-contract-typings": "^0.1.12",
-    "@injectivelabs/web3-strategy": "^0.0.53",
+    "@injectivelabs/web3-strategy": "^0.0.54",
     "@types/ethereumjs-util": "^6.1.0",
     "@types/jest": "^24.0.23",
     "@types/node": "^12.7.5",

diff --git a/packages/derivatives-consumer/CHANGELOG.md b/packages/derivatives-consumer/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.0.38](https://github.com/InjectiveLabs/injective-ts/compare/@injectivelabs/derivatives-consumer@0.0.37...@injectivelabs/derivatives-consumer@0.0.38) (2021-07-14)
+
+
+### Bug Fixes
+
+* streams callbacks ([073c1fe](https://github.com/InjectiveLabs/injective-ts/commit/073c1feacb59870fdc7182cabb68bd45795123d4))
+
+
+
+
+
 ## [0.0.37](https://github.com/InjectiveLabs/injective-ts/compare/@injectivelabs/derivatives-consumer@0.0.36...@injectivelabs/derivatives-consumer@0.0.37) (2021-07-14)
 
 

diff --git a/packages/derivatives-consumer/package.json b/packages/derivatives-consumer/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@injectivelabs/derivatives-consumer",
   "description": "Derivative Trading on Injective Protocol made easy. Can be reused throughout Injective's projects.",
-  "version": "0.0.37",
+  "version": "0.0.38",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -32,8 +32,8 @@
     "@injectivelabs/chain-api": "^1.4.11",
     "@injectivelabs/exceptions": "^0.0.26",
     "@injectivelabs/exchange-api": "^2.2.9",
-    "@injectivelabs/ts-types": "^0.0.24",
-    "@injectivelabs/utils": "^0.0.35",
+    "@injectivelabs/ts-types": "^0.0.25",
+    "@injectivelabs/utils": "^0.0.36",
     "link-module-alias": "^1.2.0",
     "shx": "^0.3.2",
     "snakecase-keys": "^4.0.1"

diff --git a/packages/derivatives-consumer/src/streams/Streams/OrderStream.ts b/packages/derivatives-consumer/src/streams/Streams/OrderStream.ts
@@ -5,7 +5,7 @@ import {
 import { InjectiveDerivativeExchangeRPCClient } from '@injectivelabs/exchange-api/injective_derivative_exchange_rpc_pb_service'
 import { StreamOperation } from '@injectivelabs/ts-types'
 import { DerivativeTransformer } from '../../transformers/DerivativeTransformer'
-import { DerivativeLimitOrder } from '../../types'
+import { DerivativeLimitOrder, StreamStatusResponse } from '../../types'
 
 export type OrderStreamCallback = ({
   order,
@@ -40,13 +40,13 @@ export class OrderStream {
   start({
     marketId,
     callback,
-    onEndCallback = () => {},
-    onStatusCallback = (_status) => {},
+    onEndCallback,
+    onStatusCallback,
   }: {
     marketId: string
     callback: OrderStreamCallback
-    onEndCallback: () => void
-    onStatusCallback: (status: any) => void
+    onEndCallback?: (status?: StreamStatusResponse) => void
+    onStatusCallback?: (status: StreamStatusResponse) => void
   }) {
     const request = new StreamOrdersRequest()
     request.setMarketId(marketId)
@@ -56,8 +56,14 @@ export class OrderStream {
     stream.on('data', (response: StreamOrdersResponse) => {
       callback(transformer(response))
     })
-    stream.on('end', onEndCallback)
-    stream.on('status', onStatusCallback)
+
+    if (onEndCallback) {
+      stream.on('end', onEndCallback)
+    }
+
+    if (onStatusCallback) {
+      stream.on('status', onStatusCallback)
+    }
 
     return stream
   }
@@ -66,14 +72,14 @@ export class OrderStream {
     marketId,
     subaccountId,
     callback,
-    onEndCallback = () => {},
-    onStatusCallback = (_status) => {},
+    onEndCallback,
+    onStatusCallback,
   }: {
     marketId: string
     subaccountId: string
     callback: OrderStreamCallback
-    onEndCallback: () => void
-    onStatusCallback: (status: any) => void
+    onEndCallback?: (status?: StreamStatusResponse) => void
+    onStatusCallback?: (status: StreamStatusResponse) => void
   }) {
     const request = new StreamOrdersRequest()
     request.setMarketId(marketId)
@@ -84,8 +90,14 @@ export class OrderStream {
     stream.on('data', (response: StreamOrdersResponse) => {
       callback(transformer(response))
     })
-    stream.on('end', onEndCallback)
-    stream.on('status', onStatusCallback)
+
+    if (onEndCallback) {
+      stream.on('end', onEndCallback)
+    }
+
+    if (onStatusCallback) {
+      stream.on('status', onStatusCallback)
+    }
 
     return stream
   }

diff --git a/packages/derivatives-consumer/src/streams/Streams/OrderbookStream.ts b/packages/derivatives-consumer/src/streams/Streams/OrderbookStream.ts
@@ -4,7 +4,7 @@ import {
 } from '@injectivelabs/exchange-api/injective_derivative_exchange_rpc_pb'
 import { InjectiveDerivativeExchangeRPCClient } from '@injectivelabs/exchange-api/injective_derivative_exchange_rpc_pb_service'
 import { StreamOperation } from '@injectivelabs/ts-types'
-import { Orderbook } from '../../types'
+import { Orderbook, StreamStatusResponse } from '../../types'
 import { DerivativeTransformer } from '../../transformers/DerivativeTransformer'
 
 export type OrderbookStreamCallback = ({
@@ -45,13 +45,13 @@ export class OrderbookStream {
   start({
     marketId,
     callback,
-    onEndCallback = () => {},
-    onStatusCallback = (_status) => {},
+    onEndCallback,
+    onStatusCallback,
   }: {
     marketId: string
     callback: OrderbookStreamCallback
-    onEndCallback: () => void
-    onStatusCallback: (status: any) => void
+    onEndCallback?: (status?: StreamStatusResponse) => void
+    onStatusCallback?: (status: StreamStatusResponse) => void
   }) {
     const request = new StreamOrderbookRequest()
     request.setMarketId(marketId)
@@ -61,8 +61,14 @@ export class OrderbookStream {
     stream.on('data', (response: StreamOrderbookResponse) => {
       callback(transformer(response))
     })
-    stream.on('end', onEndCallback)
-    stream.on('status', onStatusCallback)
+
+    if (onEndCallback) {
+      stream.on('end', onEndCallback)
+    }
+
+    if (onStatusCallback) {
+      stream.on('status', onStatusCallback)
+    }
 
     return stream
   }

diff --git a/packages/derivatives-consumer/src/streams/Streams/PositionStream.ts b/packages/derivatives-consumer/src/streams/Streams/PositionStream.ts
@@ -4,7 +4,7 @@ import {
 } from '@injectivelabs/exchange-api/injective_derivative_exchange_rpc_pb'
 import { InjectiveDerivativeExchangeRPCClient } from '@injectivelabs/exchange-api/injective_derivative_exchange_rpc_pb_service'
 import { DerivativeTransformer } from '../../transformers/DerivativeTransformer'
-import { Position } from '../../types'
+import { Position, StreamStatusResponse } from '../../types'
 
 export type PositionStreamCallback = ({
   position,
@@ -38,13 +38,13 @@ export class PositionStream {
   start({
     marketId,
     callback,
-    onEndCallback = () => {},
-    onStatusCallback = (_status) => {},
+    onEndCallback,
+    onStatusCallback,
   }: {
     marketId: string
     callback: PositionStreamCallback
-    onEndCallback: () => void
-    onStatusCallback: (status: any) => void
+    onEndCallback?: (status?: StreamStatusResponse) => void
+    onStatusCallback?: (status: StreamStatusResponse) => void
   }) {
     const request = new StreamPositionsRequest()
     request.setMarketId(marketId)
@@ -54,8 +54,14 @@ export class PositionStream {
     stream.on('data', (response: StreamPositionsResponse) => {
       callback(transformer(response))
     })
-    stream.on('end', onEndCallback)
-    stream.on('status', onStatusCallback)
+
+    if (onEndCallback) {
+      stream.on('end', onEndCallback)
+    }
+
+    if (onStatusCallback) {
+      stream.on('status', onStatusCallback)
+    }
 
     return stream
   }
@@ -64,14 +70,14 @@ export class PositionStream {
     marketId,
     subaccountId,
     callback,
-    onEndCallback = () => {},
-    onStatusCallback = (_status) => {},
+    onEndCallback,
+    onStatusCallback,
   }: {
     marketId: string
     subaccountId: string
     callback: PositionStreamCallback
-    onEndCallback: () => void
-    onStatusCallback: (status: any) => void
+    onEndCallback?: (status?: StreamStatusResponse) => void
+    onStatusCallback?: (status: StreamStatusResponse) => void
   }) {
     const request = new StreamPositionsRequest()
     request.setMarketId(marketId)
@@ -82,8 +88,14 @@ export class PositionStream {
     stream.on('data', (response: StreamPositionsResponse) => {
       callback(transformer(response))
     })
-    stream.on('end', onEndCallback)
-    stream.on('status', onStatusCallback)
+
+    if (onEndCallback) {
+      stream.on('end', onEndCallback)
+    }
+
+    if (onStatusCallback) {
+      stream.on('status', onStatusCallback)
+    }
 
     return stream
   }