Merge pull request #442 from NEMStudios/task/g440_open_api

Applied latest OpenAPI v0.8.2

Author: rg911

e2e/infrastructure/DiagnosticHttp.spec.ts

@@ -48,4 +48,29 @@ describe('NodeHttp', () => {
             expect(nodeTime.sendTimeStamp).not.to.be.undefined;
         });
     });
+
+    describe('getStorageInfo', () => {
+        it('should return storage info', async () => {
+            const blockchainStorageInfo = await nodeRepository.getStorageInfo().toPromise();
+            expect(blockchainStorageInfo.numBlocks).to.be.greaterThan(0);
+            expect(blockchainStorageInfo.numTransactions).to.be.greaterThan(0);
+            expect(blockchainStorageInfo.numAccounts).to.be.greaterThan(0);
+        });
+    });
+
+    describe('getServerInfo', () => {
+        it('should return server info', async () => {
+            const serverInfo = await nodeRepository.getServerInfo().toPromise();
+            expect(serverInfo.restVersion).not.to.be.null;
+            expect(serverInfo.sdkVersion).not.to.be.null;
+        });
+    });
+
+    describe('getNodeHealth', () => {
+        it('should return node health', async () => {
+            const health = await nodeRepository.getNodeHealth().toPromise();
+            expect(health.apiNode).not.to.be.null;
+            expect(health.db).not.to.be.null;
+        });
+    });
 });

e2e/infrastructure/NodeHttp.spec.ts

@@ -66,7 +66,7 @@
     "js-sha3": "^0.8.0",
     "long": "^4.0.0",
     "merkletreejs": "^0.1.7",
-    "nem2-sdk-openapi-typescript-node-client": "0.7.22",
+    "nem2-sdk-openapi-typescript-node-client": "0.8.2",
     "request": "^2.88.0",
     "request-promise-native": "^1.0.5",
     "ripemd160": "^2.0.2",

package-lock.json

@@ -17,8 +17,11 @@
 import { NodeRoutesApi } from 'nem2-sdk-openapi-typescript-node-client';
 import { from as observableFrom, Observable, throwError } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
+import { StorageInfo } from '../model/blockchain/StorageInfo';
+import { NodeHealth } from '../model/node/NodeHealth';
 import { NodeInfo } from '../model/node/NodeInfo';
 import { NodeTime } from '../model/node/NodeTime';
+import { ServerInfo } from '../model/node/ServerInfo';
 import { UInt64 } from '../model/UInt64';
 import { Http } from './Http';
 import { NodeRepository } from './NodeRepository';
@@ -81,4 +84,44 @@ export class NodeHttp extends Http implements NodeRepository {
             catchError((error) =>  throwError(this.errorHandling(error))),
         );
     }
+
+    /**
+     * Gets blockchain storage info.
+     * @returns Observable<BlockchainStorageInfo>
+     */
+    public getStorageInfo(): Observable<StorageInfo> {
+        return observableFrom(
+            this.nodeRoutesApi.getNodeStorage()).pipe(
+                map(({body}) => new StorageInfo(
+                        body.numBlocks,
+                        body.numTransactions,
+                        body.numAccounts,
+                    )),
+                catchError((error) =>  throwError(this.errorHandling(error))),
+        );
+    }
+
+    /**
+     * Gets blockchain server info.
+     * @returns Observable<Server>
+     */
+    public getServerInfo(): Observable<ServerInfo> {
+        return observableFrom(
+            this.nodeRoutesApi.getServerInfo()).pipe(
+                map(({body}) => new ServerInfo(body.serverInfo.restVersion, body.serverInfo.sdkVersion)),
+                catchError((error) =>  throwError(this.errorHandling(error))),
+        );
+    }
+
+    /**
+     * Gets blockchain server info.
+     * @returns Observable<Server>
+     */
+    public getNodeHealth(): Observable<NodeHealth> {
+        return observableFrom(
+            this.nodeRoutesApi.getNodeHealth()).pipe(
+                map(({body}) => new NodeHealth(body.status.apiNode, body.status.db)),
+                catchError((error) =>  throwError(this.errorHandling(error))),
+        );
+    }
 }

package.json

@@ -15,8 +15,11 @@
  */
 
 import {Observable} from 'rxjs';
+import { StorageInfo } from '../model/blockchain/StorageInfo';
+import { NodeHealth } from '../model/node/NodeHealth';
 import { NodeInfo } from '../model/node/NodeInfo';
 import { NodeTime } from '../model/node/NodeTime';
+import { ServerInfo } from '../model/node/ServerInfo';
 
 /**
  * Node interface repository.
@@ -36,4 +39,24 @@ export interface NodeRepository {
      * @summary Get the node time
      */
     getNodeTime(): Observable<NodeTime>;
+
+    /**
+     * Get node health information
+     *
+     * @return {@link NodeHealth} of NodeHealth
+     */
+    getNodeHealth(): Observable<NodeHealth>;
+
+    /**
+     * Gets blockchain storage info.
+     * @returns Observable<StorageInfo>
+     */
+    getStorageInfo(): Observable<StorageInfo>;
+
+    /**
+     * Gets blockchain server info.
+     * @returns Observable<Server>
+     */
+    getServerInfo(): Observable<ServerInfo>;
+
 }

src/infrastructure/DiagnosticHttp.ts

@@ -19,7 +19,6 @@ import { NetworkType } from '../model/blockchain/NetworkType';
 import { AccountRepository } from './AccountRepository';
 import { BlockRepository } from './BlockRepository';
 import { ChainRepository } from './ChainRepository';
-import { DiagnosticRepository } from './DiagnosticRepository';
 import { IListener } from './IListener';
 import { MetadataRepository } from './MetadataRepository';
 import { MosaicRepository } from './MosaicRepository';
@@ -76,11 +75,6 @@ export interface RepositoryFactory {
      */
     createChainRepository(): ChainRepository;
 
-    /**
-     * @returns a newly created {@link DiagnosticRepository}
-     */
-    createDiagnosticRepository(): DiagnosticRepository;
-
     /**
      * @returns a newly created {@link MosaicRepository}
      */

src/infrastructure/NodeHttp.ts

@@ -24,8 +24,6 @@ import { BlockHttp } from './BlockHttp';
 import { BlockRepository } from './BlockRepository';
 import { ChainHttp } from './ChainHttp';
 import { ChainRepository } from './ChainRepository';
-import { DiagnosticHttp } from './DiagnosticHttp';
-import { DiagnosticRepository } from './DiagnosticRepository';
 import { IListener } from './IListener';
 import { Listener } from './Listener';
 import { MetadataHttp } from './MetadataHttp';
@@ -85,10 +83,6 @@ export class RepositoryFactoryHttp implements RepositoryFactory {
         return new ChainHttp(this.url);
     }
 
-    createDiagnosticRepository(): DiagnosticRepository {
-        return new DiagnosticHttp(this.url);
-    }
-
     createMetadataRepository(): MetadataRepository {
         return new MetadataHttp(this.url);
     }

src/infrastructure/NodeRepository.ts

@@ -17,7 +17,6 @@
 export * from './AccountHttp';
 export * from './BlockHttp';
 export * from './ChainHttp';
-export * from './DiagnosticHttp';
 export * from './Http';
 export * from './MosaicHttp';
 export * from './MetadataHttp';
@@ -36,7 +35,6 @@ export * from './transaction/NamespaceMosaicIdGenerator';
 export * from './AccountRepository';
 export * from './BlockRepository';
 export * from './ChainRepository';
-export * from './DiagnosticRepository';
 export * from './IListener';
 export * from './MetadataRepository';
 export * from './MosaicRepository';