Refactor public API: put default peer API under Fluence facade (#72)

Author: coder11

package-lock.json

@@ -1,18 +1,18 @@
-import { FluencePeer } from '../../index';
+import { Fluence, FluencePeer } from '../../index';
 import { RequestFlowBuilder } from '../../internal/RequestFlowBuilder';
 
-const peer = new FluencePeer();
+const anotherPeer = new FluencePeer();
 
 describe('Avm spec', () => {
     afterEach(async () => {
-        if (peer) {
-            await peer.uninit();
+        if (anotherPeer) {
+            await anotherPeer.stop();
         }
     });
 
     it('Par execution should work', async () => {
         // arrange
-        await peer.init();
+        await Fluence.start();
 
         let request;
         const promise = new Promise<string[]>((resolve) => {
@@ -41,7 +41,7 @@ describe('Avm spec', () => {
         });
 
         // act
-        await peer.internals.initiateFlow(request);
+        await Fluence.getPeer().internals.initiateFlow(request);
         const res = await promise;
 
         // assert

src/__test__/integration/avm.spec.ts

@@ -1,11 +1,11 @@
-import { FluencePeer } from '../../..';
+import { Fluence, FluencePeer } from '../../..';
 import { RequestFlowBuilder } from '../../../internal/RequestFlowBuilder';
 import { callMeBack, registerHelloWorld } from './gen1';
 
 describe('Compiler support infrastructure tests', () => {
     it('Compiled code for function should work', async () => {
         // arrange
-        await FluencePeer.default.init();
+        await Fluence.start();
 
         // act
         const res = new Promise((resolve) => {
@@ -39,12 +39,12 @@ describe('Compiler support infrastructure tests', () => {
             },
         });
 
-        await FluencePeer.default.uninit();
+        await Fluence.stop();
     });
 
     it('Compiled code for service should work', async () => {
         // arrange
-        await FluencePeer.default.init();
+        await Fluence.start();
 
         // act
         const helloPromise = new Promise((resolve) => {
@@ -71,19 +71,19 @@ describe('Compiler support infrastructure tests', () => {
                 )`,
             )
             .buildAsFetch<[string]>('callback', 'callback');
-        await FluencePeer.default.internals.initiateFlow(request);
+        await Fluence.getPeer().internals.initiateFlow(request);
 
         // assert
         expect(await helloPromise).toBe('hello world!');
         expect(await getNumberPromise).toStrictEqual([42]);
 
-        await FluencePeer.default.uninit();
+        await Fluence.stop();
     });
 
     it('Compiled code for function should work with another peer', async () => {
         // arrange
         const peer = new FluencePeer();
-        await peer.init();
+        await peer.start();
 
         // act
         const res = new Promise((resolve) => {
@@ -117,13 +117,13 @@ describe('Compiler support infrastructure tests', () => {
             },
         });
 
-        await peer.uninit();
+        await peer.stop();
     });
 
     it('Compiled code for service should work another peer', async () => {
         // arrange
         const peer = new FluencePeer();
-        await peer.init();
+        await peer.start();
 
         // act
         const helloPromise = new Promise((resolve) => {
@@ -156,6 +156,6 @@ describe('Compiler support infrastructure tests', () => {
         expect(await helloPromise).toBe('hello world!');
         expect(await getNumberPromise).toStrictEqual([42]);
 
-        await peer.uninit();
+        await peer.stop();
     });
 });

src/__test__/integration/compiler/compiler.spec.ts

@@ -1,5 +1,5 @@
 import { ResultCodes, RequestFlow, RequestFlowBuilder, CallParams } from '../../../internal/compilerSupport/v1';
-import { FluencePeer } from '../../../index';
+import { Fluence, FluencePeer } from '../../../index';
 
 /*
 
@@ -41,7 +41,7 @@ export function registerHelloWorld(...args) {
     if (args[0] instanceof FluencePeer) {
         peer = args[0];
     } else {
-        peer = FluencePeer.default;
+        peer = Fluence.getPeer();
     }
 
     if (typeof args[0] === 'string') {
@@ -111,7 +111,7 @@ export function callMeBack(...args) {
         callback = args[1];
         config = args[2];
     } else {
-        peer = FluencePeer.default;
+        peer = Fluence.getPeer();
         callback = args[0];
         config = args[1];
     }
@@ -137,7 +137,7 @@ export function callMeBack(...args) {
             )
             .configHandler((h) => {
                 h.on('getDataSrv', '-relay-', () => {
-                    return peer.connectionInfo.connectedRelay || null;
+                    return peer.getStatus().relayPeerId || null;
                 });
 
                 h.use((req, resp, next) => {