Merge pull request #4 from bugbytesinc/vnext-0.31.7

Mirror Updates and Bug Fixes

packages/hapi-connect/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bugbytes/hapi-connect",
-  "version": "0.31.6",
+  "version": "0.31.7",
   "description": "Lightweight HashConnect Browser Side Client Library",
   "main": "./lib/index.js",
   "exports": "./lib/index.js",
@@ -25,8 +25,8 @@
   },
   "homepage": "https://github.com/bugbytesinc/hapi-proto#readme",
   "peerDependencies": {    
-    "@bugbytes/hapi-proto": "0.31.6",
-    "@bugbytes/hapi-util": "0.31.6",
+    "@bugbytes/hapi-proto": "0.31.7",
+    "@bugbytes/hapi-util": "0.31.7",
     "long": ">=5.2.0",
     "protobufjs": ">=7.1.2",
     "simple-crypto-js": "^3.0.1",

packages/hapi-connect/src/client.ts

@@ -14,11 +14,14 @@ declare global {
 declare type Handler = (value: RelayMessage) => boolean;
 
 export class HashConnectClient {
+
   private readonly relay: Relay;
-  private topics = new Map<string, string>();
-  private pending: Handler[] = [];
+  private readonly topics: Map<string, string>;
+  private readonly pending: Handler[];
 
   constructor(relay = new Relay()) {
+    this.topics = new Map<string, string>();
+    this.pending = [];
     this.relay = relay;
     this.relay.connected.on(() => {
       for (const topic of this.topics.keys()) {

packages/hapi-connect/src/relay.ts

@@ -1,21 +1,29 @@
-import { createEmitter } from "ts-typed-events";
+import { createEmitter, Emitter, SealedEvent } from "ts-typed-events";
 
 
 export class Relay {
+
   private readonly url: string;
   private socket!: WebSocket;
-  private readonly emitConnected = createEmitter();
-  private readonly emitDisconnected = createEmitter();
-  private readonly emitReceived = createEmitter<string>();
-  public readonly received = this.emitReceived.event;
-  public readonly connected = this.emitConnected.event;
-  public readonly disconnected = this.emitDisconnected.event;
+  private readonly emitConnected: Emitter<undefined, SealedEvent<undefined>>;
+  private readonly emitDisconnected: Emitter<undefined, SealedEvent<undefined>>;
+  private readonly emitReceived: Emitter<string, SealedEvent<string>>;
+  public readonly received: SealedEvent<string>;
+  public readonly connected: SealedEvent<undefined>;
+  public readonly disconnected: SealedEvent<undefined>;
+
   public get isOpen() {
     return this.socket.readyState === WebSocket.OPEN;
   }
 
   constructor(url = "wss://hashconnect.hashpack.app") {
     this.url = url;
+    this.emitConnected = createEmitter();
+    this.emitDisconnected = createEmitter();
+    this.emitReceived = createEmitter<string>();
+    this.received = this.emitReceived.event;
+    this.connected = this.emitConnected.event;
+    this.disconnected = this.emitDisconnected.event;  
     this.connect();
   }
 

packages/hapi-mirror/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bugbytes/hapi-mirror",
-  "version": "0.31.6",
+  "version": "0.31.7",
   "description": "Hedera Mirror Node Client",
   "main": "./lib/index.js",
   "exports": "./lib/index.js",
@@ -24,8 +24,8 @@
   },
   "homepage": "https://github.com/bugbytesinc/hapi-proto#readme",
   "peerDependencies": {
-    "@bugbytes/hapi-proto": "0.31.6",
-    "@bugbytes/hapi-util": "0.31.6",
+    "@bugbytes/hapi-proto": "0.31.7",
+    "@bugbytes/hapi-util": "0.31.7",
     "long": ">=5.2.0",
     "protobufjs": ">=7.1.2"
   }

packages/hapi-mirror/src/client.ts

@@ -12,13 +12,20 @@ export type ContractResult = components["schemas"]["ContractResult"];
 export type MessageInfo = components["schemas"]["TopicMessage"];
 export type TransactionInfo = components["schemas"]["Transaction"];
 export type TokenBalanceInfo = { timestamp: TimestampKeyString, account: EntityIdKeyString, token: EntityIdKeyString, balance: number };
+export type TokenRelationship = components["schemas"]["TokenRelationship"]
+export type TokenRelationshipIterator = AsyncGenerator<TokenRelationship, void, unknown>;
+export type Nft = components["schemas"]["Nft"]
+export type NftIterator = AsyncGenerator<Nft, void, unknown>;
 
 type NodeInfoListResponse = components["schemas"]["NetworkNodesResponse"];
 type MessageInfoListResponse = components["schemas"]["TopicMessagesResponse"];
 type TokenBalanceListResponse = components["schemas"]["TokenBalancesResponse"];
 type TransactionsListResponse = components["schemas"]["TransactionsResponse"];
+type TokenRelationshipListResponse = components["schemas"]["TokenRelationshipResponse"];
+type NftListResponse = components["schemas"]["Nfts"];
 
 export class MirrorRestClient {
+
 	private readonly mirrorHostname: string;
 
 	constructor(mirrorHostname: string) {
@@ -67,6 +74,42 @@ export class MirrorRestClient {
 		return await response.json() as AccountInfo;
 	}
 
+	async * getAccountTokens(accountId: EntityIdKeyString | AccountID): TokenRelationshipIterator {
+		const accountKey = (typeof accountId === 'string') ? accountId : accountID_to_keyString(accountId);
+		let path = `/api/v1/accounts/${accountKey}/tokens`;
+		while (path) {
+			const response = await fetch(this.mirrorHostname + path);
+			if (!response.ok) {
+				throw new MirrorError(response.statusText, response.status);
+			}
+			const payload = await response.json() as TokenRelationshipListResponse;
+			if (payload.tokens) {
+				for (const item of payload.tokens) {
+					yield item;
+				}
+			}
+			path = payload.links?.next || '';
+		}
+	}
+
+	async * getAccountNfts(accountId: EntityIdKeyString | AccountID): NftIterator {
+		const accountKey = (typeof accountId === 'string') ? accountId : accountID_to_keyString(accountId);
+		let path = `/api/v1/accounts/${accountKey}/nfts`;
+		while (path) {
+			const response = await fetch(this.mirrorHostname + path);
+			if (!response.ok) {
+				throw new MirrorError(response.statusText, response.status);
+			}
+			const payload = await response.json() as NftListResponse;
+			if (payload.nfts) {
+				for (const item of payload.nfts) {
+					yield item;
+				}
+			}
+			path = payload.links?.next || '';
+		}
+	}
+
 	async getContractInfo(contractId: EntityIdKeyString | ContractID): Promise<ContractInfo> {
 		const contractKey = (typeof contractId === 'string') ? contractId : contractID_to_keyString(contractId);
 		const path = `/api/v1/contracts/${contractKey}`;
@@ -147,5 +190,4 @@ export class MirrorRestClient {
 		}
 		throw new MirrorError('No Messages Found.', 404);
 	}
-
 }

packages/hapi-mirror/src/mirror-error.ts

@@ -1,4 +1,5 @@
 export class MirrorError extends Error {
+
     readonly status: number;
     readonly innerError: Error | undefined