Other files sync

Author: irdkwmnsb

docker-compose-test.yaml

@@ -5,23 +5,26 @@ services:
     image: mongo:6.0.10
     hostname: mongo1
     container_name: mongo1
-    entrypoint: ["mongod", "--replSet", "myReplicaSet", "--bind_ip", "localhost,mongo1"]
+    entrypoint:
+      ["mongod", "--replSet", "myReplicaSet", "--bind_ip", "localhost,mongo1"]
     networks:
       default:
         ipv4_address: 172.88.0.2
   mongo2:
     image: mongo:6.0.10
     hostname: mongo2
     container_name: mongo2
-    entrypoint: ["mongod", "--replSet", "myReplicaSet", "--bind_ip", "localhost,mongo2"]
+    entrypoint:
+      ["mongod", "--replSet", "myReplicaSet", "--bind_ip", "localhost,mongo2"]
     networks:
       default:
         ipv4_address: 172.88.0.3
   mongo3:
     image: mongo:6.0.10
     hostname: mongo3
     container_name: mongo3
-    entrypoint: ["mongod", "--replSet", "myReplicaSet", "--bind_ip", "localhost,mongo3"]
+    entrypoint:
+      ["mongod", "--replSet", "myReplicaSet", "--bind_ip", "localhost,mongo3"]
     networks:
       default:
         ipv4_address: 172.88.0.4
@@ -34,7 +37,7 @@ services:
     volumes:
       - ./scripts/mongo_setup.sh:/scripts/mongo_setup.sh
     restart: "no"
-    entrypoint: [ "bash", "/scripts/mongo_setup.sh"]
+    entrypoint: ["bash", "/scripts/mongo_setup.sh"]
   adb:
     container_name: adb
     image: devicefarmer/adb:latest

lib/cli/device/index.js

@@ -179,6 +179,11 @@ export const builder = function(yargs) {
         , demand: true
         , default: '127.0.0.1'
     })
+    .option('url-without-adb-port', {
+      describe: 'If there isnt adbPort in DB use baseUrl.'
+      , type: 'boolean'
+      , default: true
+    })
 }
 export const handler = function(argv) {
     return device({
@@ -214,5 +219,6 @@ export const handler = function(argv) {
         , needScrcpy: argv.needScrcpy
         , deviceName: argv.deviceName
         , host: argv.host
-    })
+        , urlWithoutAdbPort: argv.urlWithoutAdbPort
+  })
 }

lib/cli/index.js

@@ -17,6 +17,7 @@ import * as authSaml2 from './auth-saml2/index.js'
 import * as groupsEngine from './groups-engine/index.js'
 import * as device from './device/index.js'
 import * as iosDevice from './ios-device/index.js'
+import * as vncDevice from './vnc-device/index.js'
 import * as doctor from './doctor/index.js'
 import * as generateFakeDevice from './generate-fake-device/index.js'
 import * as generateFakeUser from './generate-fake-user/index.js'
@@ -49,6 +50,7 @@ yargs(hideBin(process.argv)).usage('Usage: $0 <command> [options]')
   .command(groupsEngine)
   .command(device)
   .command(iosDevice)
+  .command(vncDevice)
   .command(doctor)
   .command(generateFakeDevice)
   .command(generateFakeUser)

lib/cli/ios-device/run-wda.sh

@@ -0,0 +1,67 @@
+#!/bin/bash
+# Example to run WDA with pymobiledevice3
+
+echo "This script is a mere example. Please do not run it without modifications"
+read -p "Press enter to continue"
+
+set -o pipefail
+
+cd "$(git rev-parse --show-toplevel)" || exit
+
+
+if [ -n "$1" ]; then
+  deviceId=$1
+else
+  deviceId=$(idb list-targets | grep "device" | awk -F '|' '{ gsub(/ /, "", $0); print $2 }' | head -1)
+fi
+
+trap exit EXIT
+
+deviceName=$(idb list-targets | grep "$deviceId" | awk -F '|' '{ gsub(/ $/, "", $0); print $1 }' | head -1)
+echo "Using device $deviceId ($deviceName)"  >&2
+pushd WebDriverAgent || exit
+xcodebuild \
+  -project WebDriverAgent.xcodeproj \
+  -scheme WebDriverAgentRunner \
+  -destination "id=$deviceId" \
+  build
+
+xcodebuild \
+  -project WebDriverAgent.xcodeproj \
+  -scheme WebDriverAgentRunner \
+  -destination "id=$deviceId" \
+  test  &
+wdapid=$!
+
+source /path/to/pymobiledevice3/venv
+pymobiledevice3 usbmux forward 9100 9100 &
+mjpegpid=$!
+pymobiledevice3 usbmux forward 8100 8100 &
+wdaproxypic=$!
+
+function exit() {
+  kill $wdapid
+  kill $mjpegpid
+  kill $wdaproxypic
+  wait
+}
+
+read -p "Press enter to continue"
+
+MONGODB_PORT_27017_TCP=mongodburl stf ios-device \
+    --serial "$deviceId" \
+    --device-name "$deviceName" \
+    --host localhost \
+    --screen-port 18000 \
+    --mjpeg-port  9100 \
+    --provider providerName \
+    --public-ip localhost \
+    --screen-ws-url-pattern "wss://accessibleurlforfrontend/ios-device/18000/" \
+    --storage-url http://storageurl/ \
+    --connect-sub "tcp://ip:22003" \
+    --connect-push "tcp://ip:22005" \
+    --connect-app-dealer tcp://ip:22001 \
+    --connect-dev-dealer  tcp://ip:22004 \
+    --wda-host 127.0.0.1 \
+    --wda-port 8100
+

lib/cli/ios-device/start-ios.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+stf ios-device \
+    --serial ios-device \
+    --device-name "ios device" \
+    --host localhost \
+    --screen-port 7409 \
+    --mjpeg-port 9100 \
+    --provider local-provider \
+    --public-ip localhost \
+    --screen-ws-url-pattern "ws://localhost:7409" \
+    --storage-url http://localhost:7100/ \
+    --connect-sub tcp://127.0.0.1:7114 \
+    --connect-push tcp://127.0.0.1:7116 \
+    --connect-app-dealer tcp://127.0.0.1:7112 \
+    --connect-dev-dealer tcp://127.0.0.1:7115 \
+    --wda-host 127.0.0.1 \
+    --wda-port 8100

lib/cli/local/index.js

@@ -301,6 +301,11 @@ export const builder = function(yargs) {
         .option('websocket-url', {
         describe: 'Publicly accessible URL to the websocket unit.'
         , type: 'string'
+    })
+        .option('url-without-adb-port', {
+      describe: 'If there isnt adbPort in DB use baseUrl.'
+      , type: 'boolean'
+      , default: true
     })
         .epilog('Each option can be be overwritten with an environment variable ' +
         'by converting the option to uppercase, replacing dashes with ' +
@@ -360,7 +365,8 @@ export const handler = function(argv) {
                 , '--mute-master', argv.muteMaster
                 , '--need-scrcpy', argv.needScrcpy
                 , '--screen-ws-url-pattern', argv.screenWsUrlPattern
-            ]
+            , '--url-without-adb-port', argv.urlWithoutAdbPort
+        ]
                 .concat(argv.allowRemote ? ['--allow-remote'] : [])
                 .concat(argv.lockRotation ? ['--lock-rotation'] : [])
                 .concat(!argv.cleanup ? ['--no-cleanup'] : [])

lib/cli/provider/index.js

@@ -194,6 +194,11 @@ export const builder = function(yargs) {
         , demand: true
         , default: '127.0.0.1'
     })
+        .option('url-without-adb-port', {
+          describe: 'If there isnt adbPort in DB use baseUrl.'
+          , type: 'boolean'
+          , default: true
+        })
         .epilog('Each option can be be overwritten with an environment variable ' +
         'by converting the option to uppercase, replacing dashes with ' +
         'underscores and prefixing it with `STF_PROVIDER_` (e.g. ' +
@@ -242,7 +247,8 @@ export const handler = function(argv) {
                 , '--mute-master', argv.muteMaster
                 , '--need-scrcpy', argv.needScrcpy
                 , '--host', argv.host
-            ]
+                , '--url-without-adb-port', argv.urlWithoutAdbPort
+      ]
                 .concat(argv.connectSub.reduce(function(all, val) {
                 return all.concat(['--connect-sub', val])
             }, []))

lib/cli/vnc-device/example

@@ -0,0 +1,14 @@
+stf vnc-device \
+    --serial vnc-device \
+    --device-name "Generic VNC" \
+    --host localhost \
+    --screen-port 7409 \
+    --vnc-port 5900 \
+    --provider local-provider \
+    --public-ip localhost \
+    --screen-ws-url-pattern "ws://localhost:7409" \
+    --storage-url http://localhost:7100/ \
+    --connect-sub tcp://127.0.0.1:7114 \
+    --connect-push tcp://127.0.0.1:7116 \
+    --connect-app-dealer tcp://127.0.0.1:7112 \
+    --connect-dev-dealer  tcp://127.0.0.1:7115 \

lib/cli/vnc-device/index.js

@@ -0,0 +1,174 @@
+import vncDevice from '../../units/vnc-device/index.js'
+export const command = 'vnc-device'
+
+export const describe = 'Start an vnc device provider.'
+
+
+export function builder(yargs) {
+  return yargs
+    .strict()
+    .option('connect-push', {
+      alias: 'p'
+      , describe: 'ZeroMQ PULL endpoint to connect to.'
+      , array: true
+      , demand: true
+    })
+    .option('connect-sub', {
+      alias: 's'
+      , describe: 'ZeroMQ PUB endpoint to connect to.'
+      , array: true
+      , demand: true
+    })
+    .option('connect-url-pattern', {
+      describe: 'The URL pattern to use for `adb connect`.'
+      , type: 'string'
+      , default: '${publicIp}:${publicPort}'
+    })
+    .option('group-timeout', {
+      alias: 't'
+      , describe: 'Timeout in seconds for automatic release of inactive devices.'
+      , type: 'number'
+      , default: 900
+    })
+    .option('heartbeat-interval', {
+      describe: 'Send interval in milliseconds for heartbeat messages.'
+      , type: 'number'
+      , default: 10000
+    })
+    .option('lock-rotation', {
+      describe: 'Whether to lock rotation when devices are being used. ' +
+      'Otherwise changing device orientation may not always work due to ' +
+      'sensitive sensors quickly or immediately reverting it back to the ' +
+      'physical orientation.'
+      , type: 'boolean'
+    })
+    .option('provider', {
+      alias: 'n'
+      , describe: 'Name of the provider.'
+      , type: 'string'
+      , demand: true
+    })
+    .option('public-ip', {
+      describe: 'The IP or hostname to use in URLs.'
+      , type: 'string'
+      , demand: true
+    })
+    .option('screen-jpeg-quality', {
+      describe: 'The JPG quality to use for the screen.'
+      , type: 'number'
+      , default: process.env.SCREEN_JPEG_QUALITY || 80
+    })
+    .option('screen-ping-interval', {
+      describe: 'The interval at which to send ping messages to keep the ' +
+      'screen WebSocket alive.'
+      , type: 'number'
+      , default: 30000
+    })
+    .option('screen-port', {
+      describe: 'Port allocated to the screen WebSocket.'
+      , type: 'number'
+      , demand: true
+    })
+    .option('screen-ws-url-pattern', {
+      describe: 'The URL pattern to use for the screen WebSocket.'
+      , type: 'string'
+      , default: 'ws://${publicIp}:${publicPort}'
+    })
+    .option('serial', {
+      describe: 'The USB serial number of the device.'
+      , type: 'string'
+      , demand: true
+    })
+    .option('storage-url', {
+      alias: 'r'
+      , describe: 'The URL to the storage unit.'
+      , type: 'string'
+      , demand: true
+    })
+    .option('connect-app-dealer', {
+      describe: 'App-side ZeroMQ DEALER endpoint to connect to.'
+      , array: true
+      , demand: true
+    })
+    .option('connect-dev-dealer', {
+      describe: 'Device-side ZeroMQ DEALER endpoint to connect to.'
+      , array: true
+      , demand: true
+    })
+    .option('vnc-port', {
+        describe: 'The port where vnc is started.'
+      , type: 'number'
+      , default: 9001
+      , demand: true
+    })
+    .option('device-url', {
+      describe: 'url for device'
+      , type: 'string'
+      , default: '127.0.0.1'
+      , demand: true
+    })
+    .option('device-name', {
+      describe: 'Device name'
+      , type: 'string'
+      , default: 'Generic VNC Device'
+    })
+    .option('device-os', {
+      describe: 'Device os'
+      , type: 'string'
+      , default: 'VNC Device'
+    })
+    .option('device-password', {
+      describe: 'device password'
+      , type: 'string'
+      , default: 'Password'
+    })
+    .option('device-type', {
+      describe: 'device type'
+      , type: 'string'
+      , default: 'VNC'
+    })
+    .option('host', {
+      describe: 'Provider hostname.'
+    , type: 'string'
+    , demand: true
+    , default: '127.0.0.1'
+  })
+}
+
+export function handler(argv) {
+  return vncDevice({
+    serial: argv.serial
+    , provider: argv.provider
+    , publicIp: argv.publicIp
+    , endpoints: {
+      sub: argv.connectSub
+      , push: argv.connectPush
+      , appDealer: argv.connectAppDealer
+      , devDealer: argv.connectDevDealer
+    }
+    , groupTimeout: argv.groupTimeout * 1000 // change to ms
+    , storageUrl: argv.storageUrl
+    , screenJpegQuality: argv.screenJpegQuality
+    , screenPingInterval: argv.screenPingInterval
+    , screenPort: argv.screenPort
+    , screenWsUrlPattern: argv.screenWsUrlPattern
+    , connectUrlPattern: argv.connectUrlPattern
+    , mjpegPort: argv.vncPort
+    , deviceUrl: argv.deviceUrl
+    , deviceOs: argv.deviceOs
+    , devicePassword: argv.devicePassword
+    , deviceType: argv.deviceType
+    , heartbeatInterval: argv.heartbeatInterval
+    , lockRotation: argv.lockRotation
+    , cleanup: argv.cleanup
+    , screenReset: argv.screenReset
+    , deviceName: argv.deviceName
+    , host: argv.host
+  })
+}
+export default {
+  command
+  , describe
+  , builder
+  , handler
+}