Skip to content

Commit

Permalink
Merge pull request #774 from nemtech/dev
Browse files Browse the repository at this point in the history
Dev -> Main
  • Loading branch information
rg911 committed Mar 13, 2021
2 parents 3208d6e + e6f186c commit cf36b4c
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 7 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file.

The changelog format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [1.0.0] - 13-Mar-2021

**Milestone**: Symbol Mainnet
Package | Version | Link
---|---|---
SDK Core| v1.0.0 | [symbol-sdk](https://www.npmjs.com/package/symbol-sdk)
Catbuffer | v0.1.1 | [catbuffer-typescript](https://www.npmjs.com/package/catbuffer-typescript)
Client Library | v0.11.1 | [symbol-openapi-typescript-fetch-client](https://www.npmjs.com/package/symbol-openapi-typescript-fetch-client)

- Added callback function in websocket listener for client to handle unsolicited websocket close event.
- Release for Symbol mainnet.

## [0.23.3] - 5-Mar-2021

**Milestone**: Catapult-server main(0.10.0.8)
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "symbol-sdk",
"version": "0.23.4",
"version": "1.0.0",
"description": "Reactive symbol sdk for typescript and javascript",
"scripts": {
"pretest": "npm run build",
Expand Down
4 changes: 3 additions & 1 deletion src/infrastructure/IListener.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ import { CosignatureSignedTransaction } from '../model/transaction/CosignatureSi
import { Transaction } from '../model/transaction/Transaction';
import { TransactionStatusError } from '../model/transaction/TransactionStatusError';

export type OnWsCloseCallback = (event: { client: string; code: any; reason: any }) => void;

/**
* Listener service
*/
Expand All @@ -35,7 +37,7 @@ export interface IListener {
* Open web socket connection.
* @returns Promise<Void>
*/
open(): Promise<void>;
open(onUnsolicitedCloseCallback?: OnWsCloseCallback): Promise<void>;

/**
* returns a boolean that repressents the open state
Expand Down
13 changes: 9 additions & 4 deletions src/infrastructure/Listener.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { Deadline } from '../model/transaction/Deadline';
import { Transaction } from '../model/transaction/Transaction';
import { TransactionStatusError } from '../model/transaction/TransactionStatusError';
import { UInt64 } from '../model/UInt64';
import { IListener } from './IListener';
import { IListener, OnWsCloseCallback } from './IListener';
import { MultisigHttp } from './MultisigHttp';
import { MultisigRepository } from './MultisigRepository';
import { NamespaceRepository } from './NamespaceRepository';
Expand Down Expand Up @@ -109,7 +109,7 @@ export class Listener implements IListener {
* Open web socket connection.
* @returns Promise<Void>
*/
public open(): Promise<void> {
public open(onUnsolicitedCloseCallback?: OnWsCloseCallback): Promise<void> {
return new Promise((resolve, reject) => {
if (this.webSocket === undefined || this.webSocket.readyState === this.webSocket.CLOSED) {
if (this.websocketInjected) {
Expand All @@ -127,11 +127,16 @@ export class Listener implements IListener {
return;
}
if (closeEvent) {
reject({
const event = {
client: this.uid,
code: closeEvent.code,
reason: closeEvent.reason,
});
};
if (onUnsolicitedCloseCallback) {
onUnsolicitedCloseCallback(event);
} else {
reject(event);
}
}
};
this.webSocket.onmessage = (msg: any): void => {
Expand Down

0 comments on commit cf36b4c

Please sign in to comment.