@wavemaker/rn-codegen 11.8.5-patch.5 → 11.8.5-patch.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wavemaker/rn-codegen",
-  "version": "11.8.5-patch.5",
+  "version": "11.8.5-patch.7",
   "description": "",
   "main": "index.js",
   "bin": {

package/src/templates/app.template

@@ -275,52 +275,75 @@ class App extends BaseApp {
 
 
   {{#if enableWavePulse}}
-  tryToconnectWavepulse(url) {
-    this.wavepulseAgent = createWavePulseAgent({
-      handler: this
+  confirmWavePulseConnect(connectionData) {
+    return new Promise((resolve, reject) => {
+      Alert.alert(
+        'Confirm',
+        'This app is going to connect to WavePulse for debugging remotely.' +
+        ' Please tap on \'Yes\' button to confirm the connection.' +
+        ' If you are not sure, what WavePulse is or if you don\'t want' + 
+        ' to connect to WavePulse, press on \'no\' button.',
+        [
+          {
+            text: 'No',
+            onPress: () => {
+              StorageService.removeItem('wavepulse.server');
+              resolve();
+            },
+            style: 'positive'
+          }, {
+            text: 'Yes',
+            onPress: () => resolve(connectionData),
+            style: 'negative'
+          }
+        ],
+        [{
+          cancelable: true,
+          onDismiss: () => {
+            StorageService.removeItem('wavepulse.server');
+            resolve();
+          }
+        }]
+      )
     });
-    Promise.resolve(url).then(url => {
-      return url || Linking.getInitialURL()
-        .then(url => {
-          return url.split('://wavepulse/connect?url=')[1];
-        }, () => {})
-    }).then(url => url || StorageService.getItem('wavepulse.server'))
-    .then(url => {
-        if (!url || isWebPreviewMode() || this.appConfig.preferences.autoConfirmWavePulse === true) {
-          return url;
-        }
-        return new Promise((resolve, reject) => {
-          Alert.alert(
-            'Confirm',
-            'This app is going to connect to WavePulse for debugging remotely.' +
-            ' Please tap on \'Yes\' button to confirm the connection.' +
-            ' If you are not sure, what WavePulse is or if you don\'t want' + 
-            ' to connect to WavePulse, press on \'no\' button.',
-            [
-              {
-                text: 'No',
-                onPress: () => resolve(),
-                style: 'positive'
-              }, {
-                text: 'Yes',
-                onPress: () => resolve(url),
-                style: 'negative'
-              }
-            ],
-            [{
-              cancelable: true,
-              onDismiss: () => resolve()
-            }]
-          )
-        });
-    }).then(url => {
-      if (url) {
-        this.wavepulseAgent.connect(url);
+  }
+
+  async tryToconnectWavepulse(connectionData) {
+    try{
+      this.wavepulseAgent = createWavePulseAgent({
+        handler: this
+      });
+      if (!connectionData) {
+        connectionData = await Linking.getInitialURL()
+          .then(url => {
+            const paramStr = url?.split('://wavepulse/connect?')[1];
+            return paramStr?.split('&')
+              .map(v => v?.split('='))
+              .reduce((r, v) => {
+                r[v[0]] = v[1]; 
+                return r;
+              }, {})
+          }, () => {});
+      }
+      if (!connectionData || !connectionData.url) {
+        connectionData = await StorageService.getItem('wavepulse.server')
+          .then(d => d && JSON.parse(d));
+      }
+      if (!connectionData) {
+        return;
+      } 
+      if (!(isWebPreviewMode() || this.appConfig.preferences.autoConfirmWavePulse === true)) {
+        connectionData = await this.confirmWavePulseConnect(connectionData);
+      }
+      if (connectionData) {
+        this.wavepulseAgent.connect(connectionData.url, connectionData.channelId);
         BASE_THEME.enableTrace(true);
-        StorageService.setItem('wavepulse.server', url);
+        StorageService.setItem('wavepulse.server', JSON.stringify(connectionData));
         LogBox.ignoreAllLogs();
       }
-    });
+    } catch(e) {
+      console.error(e);
+    }
   }
   {{/if}}
 

package/src/templates/package.web.json

@@ -9,10 +9,10 @@
         "postinstall": "echo \"\""
     },
     "dependencies": {
-        "@wavemaker/app-rn-runtime": "11.8.5-patch.5",
-        "@wavemaker/variables": "11.8.5-patch.5",
-        "@wavemaker/rn-codegen": "11.8.5-patch.5",
-        "@wavemaker/wavepulse-agent": "1.0.1",
+        "@wavemaker/app-rn-runtime": "11.8.5-patch.7",
+        "@wavemaker/variables": "11.8.5-patch.7",
+        "@wavemaker/rn-codegen": "11.8.5-patch.7",
+        "@wavemaker/wavepulse-agent": "1.0.9",
         "deprecated-react-native-prop-types": "4.1.0",
         "expo": "50.0.17",
         "expo-build-properties": "0.12.0",

package/src/templates/project/package.json

@@ -9,10 +9,10 @@
     "postinstall": "node ./scripts/post-build.js"
   },
   "dependencies": {
-    "@wavemaker/app-rn-runtime": "11.8.5-patch.5",
-    "@wavemaker/variables": "11.8.5-patch.5",
-    "@wavemaker/rn-codegen": "11.8.5-patch.5",
-    "@wavemaker/wavepulse-agent": "1.0.1",
+    "@wavemaker/app-rn-runtime": "11.8.5-patch.7",
+    "@wavemaker/variables": "11.8.5-patch.7",
+    "@wavemaker/rn-codegen": "11.8.5-patch.7",
+    "@wavemaker/wavepulse-agent": "1.0.9",
     "deprecated-react-native-prop-types": "4.1.0",
     "expo": "50.0.17",
     "expo-build-properties": "0.12.0",

package/src/templates/project/wavepulse.agent.js

@@ -10,9 +10,14 @@ let wavePulseAgent = new (class WavePulseAgent extends Agent {
     isFlushAllowed() {
         return this.isConnected;
     }
-    connect(debugServerUrl) {
+    connect(serverUrl, channelId) {
+        const pathIndex = serverUrl.indexOf('/', serverUrl.indexOf('//') + 2);
+        const serverOrigin = pathIndex > 0 ? serverUrl.substring(0, pathIndex) : serverUrl;
+        const contextPath = pathIndex > 0  ? serverUrl.substring(pathIndex) : undefined;
         this.setChannel(WebSocketChannel.connect({
-            'url': debugServerUrl || ''
+            'url': serverOrigin || '',
+            'path': contextPath + '/socket.io',
+            'channelId': channelId
         }));
     }
 })();