Merge pull request #774 from ignacionar/#770

#770 Fixing Landscape when closing device (reset to Portrait mode)
zebrunner · Aug 17, 2023 · b9bacd1 · b9bacd1
2 parents efd402c + f5b74c6
commit b9bacd1
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 8 deletions.
diff --git a/lib/units/ios-device/plugins/screen/stream.js b/lib/units/ios-device/plugins/screen/stream.js
@@ -92,10 +92,28 @@ module.exports = syrup.serial()
 
         ws.on('close', function() {
           // @TODO handle close event
-          //stream.socket.onclose()
-          WdaClient.stopSession()
-          isConnectionAlive = false
-          log.important('ws on close event')
+          // stream.socket.onclose()
+            const orientation = WdaClient.orientation
+
+            const stoppingSession = () => {
+              WdaClient.stopSession()
+              isConnectionAlive = false
+              log.important('ws on close event')
+            }
+
+            if (orientation === 'PORTRAIT') {
+              return stoppingSession()
+            } 
+
+            // #770: Reset rotation to Portrait when closing device
+
+            const rotationPromise = new Promise((resolve, reject) => {
+              // Ensure that rotation is done, then stop session
+              WdaClient.rotation({orientation: 'PORTRAIT'})
+              resolve()
+            })
+
+            rotationPromise.then(() => stoppingSession())
         })
         ws.on('error', function() {
           // @TODO handle error event

diff --git a/lib/units/ios-device/plugins/util/iosutil.js b/lib/units/ios-device/plugins/util/iosutil.js
@@ -42,6 +42,18 @@ let iosutil = {
         return 'UIA_DEVICE_ORIENTATION_LANDSCAPERIGHT'
     }
   },
+  orientationToDegrees: function(orientation) {
+    switch (orientation) {
+      case 'PORTRAIT':
+        return 0
+      case 'LANDSCAPE':
+        return 90
+      case 'UIA_DEVICE_ORIENTATION_PORTRAIT_UPSIDEDOWN':
+        return 180
+      case 'UIA_DEVICE_ORIENTATION_LANDSCAPERIGHT':
+        return 270
+    }
+  },
   pressButton: function(key) {
     switch (key) {
       case 'volume_up':

diff --git a/lib/units/ios-device/plugins/wda/WdaClient.js b/lib/units/ios-device/plugins/wda/WdaClient.js
@@ -113,10 +113,11 @@ module.exports = syrup.serial()
           return Promise.resolve()
         }
 
-        this.handleRequest({
+        return this.handleRequest({
           method: 'DELETE',
           uri: `${this.baseUrl}/session/${currentSessionId}`
         })
+
       },
       typeKey: function(params) {
 
@@ -533,8 +534,17 @@ module.exports = syrup.serial()
           this.getOrientation()
 
           this.size()
-        })
 
+          const rotationDegrees = iosutil.orientationToDegrees(this.orientation)
+
+          push.send([
+            wireutil.global,
+            wireutil.envelope(new wire.RotationEvent(
+              options.serial,
+              rotationDegrees
+            ))
+          ])
+        })
       },
       batteryIosEvent: function() {
         return this.handleRequest({
@@ -636,13 +646,23 @@ module.exports = syrup.serial()
               return resolve(response)
             })
             .catch(err => {
+              let errMes = err.error.value.message
+
               // #762: Skip lock error message 
-              if (err.error.value.message.includes('Timed out while waiting until the screen gets locked')) {
+              if (errMes.includes('Timed out while waiting until the screen gets locked')) {
                 return
               }
-              if (err.error.value.message.includes('Unable To Rotate Device')) {
+
+              // #765: Skip rotation error message 
+              if (errMes.includes('Unable To Rotate Device')) {
                 return log.info('The current application does not support rotation')
               }
+
+              // #770 Skip session crash, immediately restart after Portrait mode reset
+              if (errMes.includes('Session does not exist')) {
+                return this.startSession()
+              }
+
               recoverDevice()
               // #409: capture wda/appium crash asap and exit with status 1 from stf
               //notifier.setDeviceTemporaryUnavialable(err)