Extract defaults (#34)

* Extracted default request flow builder behavior out of the constructor

* Remove init_peer_id variable, which stands in the way when building apps with aquamarine

Author: coder11

src/FluenceClient.ts

@@ -123,6 +123,7 @@ export const checkConnection = async (client: FluenceClient, ttl?: number): Prom
     const callbackService = '_callback';
 
     const [request, promise] = new RequestFlowBuilder()
+        .withDefaults()
         .withRawScript(
             `(seq 
         (call init_relay ("op" "identity") [msg] result)

src/__test__/integration/client.spec.ts

@@ -19,6 +19,7 @@ describe('Typescript usage suite', () => {
 
         // act
         const [request, promise] = new RequestFlowBuilder()
+            .withDefaults()
             .withRawScript(
                 `(seq 
         (call init_relay ("op" "identity") ["hello world!"] result)
@@ -76,7 +77,9 @@ describe('Typescript usage suite', () => {
         data.set('c', 'some c');
         data.set('d', 'some d');
 
-        await client1.initiateFlow(new RequestFlowBuilder().withRawScript(script).withVariables(data).build());
+        await client1.initiateFlow(
+            new RequestFlowBuilder().withDefaults().withRawScript(script).withVariables(data).build(),
+        );
 
         let res = await resMakingPromise;
         expect(res).toEqual(['some a', 'some b', 'some c', 'some d']);
@@ -186,6 +189,7 @@ describe('Typescript usage suite', () => {
     it('xor handling should work with connected client', async function () {
         // arrange
         const [request, promise] = new RequestFlowBuilder()
+            .withDefaults()
             .withRawScript(
                 `
             (seq 
@@ -210,6 +214,7 @@ describe('Typescript usage suite', () => {
     it('xor handling should work with local client', async function () {
         // arrange
         const [request, promise] = new RequestFlowBuilder()
+            .withDefaults()
             .withRawScript(
                 `
             (call %init_peer_id% ("service" "fails") [])

src/__test__/unit/air.spec.ts

@@ -19,6 +19,7 @@ describe('== AIR suite', () => {
 
         // prettier-ignore
         const [request, promise] = new RequestFlowBuilder()
+            .withDefaults()
             .withRawScript(script)
             .buildAsFetch<string[]>(serviceId, fnName);
 
@@ -59,6 +60,7 @@ describe('== AIR suite', () => {
             const script = `(incorrect)`;
             // prettier-ignore
             const [request, error] = new RequestFlowBuilder()
+                .withDefaults()
                 .withRawScript(script)
                 .buildWithErrorHandling();
 
@@ -75,6 +77,7 @@ describe('== AIR suite', () => {
             const script = `(null)`;
             // prettier-ignore
             const [request, promise] = new RequestFlowBuilder()
+                .withDefaults()
                 .withTTL(1)
                 .withRawScript(script)
                 .buildAsFetch();
@@ -96,6 +99,7 @@ describe('== AIR suite', () => {
 
         // prettier-ignore
         const [request, promise] = new RequestFlowBuilder()
+            .withDefaults()
             .withRawScript(script)
             .withVariable('arg1', 'hello')
             .buildAsFetch<string[]>(serviceId, fnName);
@@ -138,7 +142,7 @@ describe('== AIR suite', () => {
             (call %init_peer_id% ("${makeDataServiceId}" "${makeDataFnName}") [] result)
             (call %init_peer_id% ("${getDataServiceId}" "${getDataFnName}") [result.$.field])
         )`;
-        await client.initiateFlow(new RequestFlowBuilder().withRawScript(script).build());
+        await client.initiateFlow(new RequestFlowBuilder().withDefaults().withRawScript(script).build());
 
         // assert
         const tetraplet = res.tetraplets[0][0];
@@ -187,7 +191,7 @@ describe('== AIR suite', () => {
                         (call %init_peer_id% ("${serviceId2}" "${fnName2}") ["${arg2}"] result2))
                        (call %init_peer_id% ("${serviceId3}" "${fnName3}") [result1 result2]))
         `;
-        await client.initiateFlow(new RequestFlowBuilder().withRawScript(script).build());
+        await client.initiateFlow(new RequestFlowBuilder().withDefaults().withRawScript(script).build());
 
         // assert
         expect(res1).toEqual(arg1);

src/api.ts

@@ -44,6 +44,7 @@ export const sendParticle = async (
     onError?: (err) => void,
 ): Promise<string> => {
     const [req, errorPromise] = new RequestFlowBuilder()
+        .withDefaults()
         .withRawScript(particle.script)
         .withVariables(particle.data)
         .withTTL(particle.ttl)
@@ -147,6 +148,7 @@ export const sendParticleAsFetch = async <T>(
     callbackServiceId: string = '_callback',
 ): Promise<T> => {
     const [request, promise] = new RequestFlowBuilder()
+        .withDefaults()
         .withRawScript(particle.script)
         .withVariables(particle.data)
         .withTTL(particle.ttl)