starred/stf
1
0
Fork 0
mirror of https://github.com/DeviceFarmer/stf.git synced 2026-04-18 04:53:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix adb invocations (#202)

Browse Source
This commit is contained in:
Karol Wrótniak
2021-03-10 14:50:33 +01:00
committed by GitHub
parent 50ee38c2ce
commit 5dfdd9ac63
18 changed files with 79 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/units/device/plugins/screen/stream.js
View File

@@ -17,6 +17,7 @@ var BroadcastSet = require('./util/broadcastset')
var StateQueue = require('../../../../util/statequeue')
var RiskyStream = require('../../../../util/riskystream')
var FailCounter = require('../../../../util/failcounter')
var DeviceClient = require('@devicefarmer/adbkit/dist/src/adb/DeviceClient').default
module.exports = syrup.serial()
.dependency(require('../../support/adb'))
@@ -24,6 +25,7 @@ module.exports = syrup.serial()
.dependency(require('../util/display'))
.dependency(require('./options'))
.define(function(options, adb, minicap, display, screenOptions) {
var deviceClient = new DeviceClient(adb, options.serial)
var log = logger.createLogger('device:plugins:screen:stream')
function FrameProducer(config) {
@@ -276,7 +278,7 @@ module.exports = syrup.serial()
FrameProducer.prototype._connectService = function() {
function tryConnect(times, delay) {
return adb.openLocal(options.serial, 'localabstract:minicap')
return deviceClient.openLocal('localabstract:minicap')
.timeout(10000)
.then(function(out) {
return out
@@ -367,7 +369,7 @@ module.exports = syrup.serial()
log.info('Sending %s to minicap', signal)
return Promise.all([
output.waitForEnd()
, adb.shell(options.serial, ['kill', signum, pid])
, deviceClient.shell(['kill', signum, pid])
.then(adbkit.util.readAll)
.return(true)
])