@wavemaker/rn-codegen 11.9.1-next.27517 → 11.9.1-next.27523

rn-codegen/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wavemaker/rn-codegen",
-  "version": "11.9.1-next.27517",
+  "version": "11.9.1-next.27523",
   "description": "",
   "main": "index.js",
   "bin": {

rn-codegen/src/templates/app.template

@@ -336,9 +336,14 @@ class App extends BaseApp {
         connectionData = await this.confirmWavePulseConnect(connectionData);
       }
       if (connectionData) {
-        this.wavepulseAgent.connect(connectionData.url, connectionData.channelId);
+        this.wavepulseAgent
+          .connect(connectionData.url, connectionData.channelId)
+          .then(() => {
+            StorageService.setItem('wavepulse.server', JSON.stringify(connectionData));
+          }, () => {
+            StorageService.removeItem('wavepulse.server');
+          });
         BASE_THEME.enableTrace(true);
-        StorageService.setItem('wavepulse.server', JSON.stringify(connectionData));
         LogBox.ignoreAllLogs();
       }
     } catch(e) {

rn-codegen/src/templates/package.web.json

@@ -9,10 +9,10 @@
         "postinstall": "echo \"\""
     },
     "dependencies": {
-        "@wavemaker/app-rn-runtime": "11.9.1-next.27517",
-        "@wavemaker/variables": "11.9.1-next.27517",
-        "@wavemaker/rn-codegen": "11.9.1-next.27517",
-        "@wavemaker/wavepulse-agent": "1.0.9",
+        "@wavemaker/app-rn-runtime": "11.9.1-next.27523",
+        "@wavemaker/variables": "11.9.1-next.27523",
+        "@wavemaker/rn-codegen": "11.9.1-next.27523",
+        "@wavemaker/wavepulse-agent": "1.0.11",
         "deprecated-react-native-prop-types": "4.1.0",
         "expo": "50.0.17",
         "expo-build-properties": "0.12.0",

rn-codegen/src/templates/project/package.json

@@ -9,10 +9,10 @@
         "postinstall": "node ./scripts/post-build.js"
     },
     "dependencies": {
-        "@wavemaker/app-rn-runtime": "11.9.1-next.27517",
-        "@wavemaker/variables": "11.9.1-next.27517",
-        "@wavemaker/rn-codegen": "11.9.1-next.27517",
-        "@wavemaker/wavepulse-agent": "1.0.9",
+        "@wavemaker/app-rn-runtime": "11.9.1-next.27523",
+        "@wavemaker/variables": "11.9.1-next.27523",
+        "@wavemaker/rn-codegen": "11.9.1-next.27523",
+        "@wavemaker/wavepulse-agent": "1.0.11",
         "deprecated-react-native-prop-types": "4.1.0",
         "expo": "50.0.17",
         "expo-build-properties": "0.12.0",

rn-codegen/src/templates/project/wavepulse/constants.js

@@ -0,0 +1,61 @@
+export const EVENTS = {
+    CONSOLE: {
+        LOG: 'console-log'
+    },
+    DOM: {
+        REFRESH: 'refresh'
+    },
+    VARIABLE: {
+        BEFORE_INVOKE: 'variable-before-invoke',
+        AFTER_INVOKE: 'variable-after-invoke'
+    },
+    SERVICE: {
+        BEFORE_CALL: 'service_before_call',
+        AFTER_CALL: 'service_after_call'
+    },
+    TIMELINE: {
+        EVENT: 'timeline-event'
+    }
+};
+
+export const CALLS = {
+    APP: {
+        INFO: 'GET_APP_INFO',
+    },
+    PLATFORM: {
+        INFO: 'GET_PLATFORM_INFO',
+    },
+    HANDSHAKE: {
+        RELOAD: 'RELOAD',
+        WISH: 'SAY_HELLO'
+    },
+    WIDGET: {
+        GET: 'GET_WIDGET',
+        HIGHLIGHT: 'HIGHLIGHT',
+        GET_PROPERTIES_N_STYLES: 'GET_PROPERTIES_N_STYLES',
+        TREE: 'GET_WIDGET_TREE'
+    },
+    EXPRESSION: {
+        EVAL: 'EVAL'
+    },
+    UI: {
+        REFRESH: 'REFRESH'
+    },
+    STATS: {
+        START_UP: 'START_UP_METRICS',
+        NAVIGATION: 'NAVIGATION_METRICS'
+    },
+    THEME: {
+        GET: 'GET_THEME',
+        GET_ACTIVE_THEME: 'GET_ACTIVE_THEME'
+    },
+    STORAGE: {
+        GET: 'GET',
+        SET: 'SET',
+        REMOVE: 'REMOVE',
+        GET_ALL: 'GET_ALL'
+    },
+    LOCALE: {
+        GET: 'GET_LOCALE'
+    }
+};

rn-codegen/src/templates/project/wavepulse/wavepulse.agent.js

@@ -1,20 +1,17 @@
 "use strict";
-import { Agent, WebSocketChannel, EVENTS, CALLS} from '@wavemaker/wavepulse-agent/index';
+import { Agent, WebSocketChannel } from '@wavemaker/wavepulse-agent/index';
+import { EVENTS, CALLS } from './constants';
 import axios from 'axios';
 import RN2CSS from './rn2css.json';
 
 const MAX_WAITING_TIME_FOR_CONNECTION = 30 * 1000;
 let wavePulseAgent = new (class WavePulseAgent extends Agent {
+    onConnection;
+    onConnectionFailed;
     constructor() {
         super(...arguments);
         this.isConnected = false;
         this.closed = false;
-        setTimeout(() => {
-            if (!this.isConnected) {
-                this.closed = true;
-                this.buffer = [];
-            }
-        }, MAX_WAITING_TIME_FOR_CONNECTION);
     }
     isFlushAllowed() {
         return this.isConnected;
@@ -28,6 +25,27 @@ let wavePulseAgent = new (class WavePulseAgent extends Agent {
             'path': contextPath + '/socket.io',
             'channelId': channelId
         }));
+        this.onConnectionFailed && this.onConnectionFailed();
+        setTimeout(() => {
+            this.invoke(CALLS.HANDSHAKE.RELOAD);
+        }, 1000);
+        setTimeout(() => {
+            if (!this.isConnected) {
+                this.closed = true;
+                this.buffer = [];
+                this.onConnectionFailed && this.onConnectionFailed();
+            }
+        }, MAX_WAITING_TIME_FOR_CONNECTION);
+        return new Promise((resolve, reject) => {
+            this.onConnection = () => {
+                this.onConnection = undefined;
+                resolve();
+            };
+            this.onConnectionFailed = () => {
+                this.onConnectionFailed = undefined;
+                reject();
+            };
+        });
     }
     notify(event, type, args, buffer) {
         if (!this.closed) {
@@ -255,6 +273,7 @@ function bindCalls() {
         setTimeout(() => {
             wavePulseAgent.isConnected = true;
             wavePulseAgent.isClosed = false;
+            wavePulseAgent.onConnection && wavePulseAgent.onConnection();
             wavePulseAgent.processBuffer();
         }, 2000);
         return Promise.resolve('Hello');