Merge pull request #87 from VKCOM/malzhanov/fix-adb-remote-connect-with-u4

Replace u4 with a custom fork

Author: DaniilSmirnov

lib/units/api/controllers/user.js

@@ -1,7 +1,7 @@
 import util from 'util'
 import _ from 'lodash'
 import {v4 as uuidv4} from 'uuid'
-import adbkit from '@u4/adbkit'
+import adbkit from '@irdk/adbkit'
 import * as dbapi from '../../../db/api.js'
 import logger from '../../../util/logger.js'
 import datautil from '../../../util/datautil.js'

lib/units/device/plugins/connect.js

@@ -27,6 +27,7 @@ export default syrup.serial()
         plugin.port = options.connectPort
         plugin.url = urlformat(options.connectUrlPattern, plugin.port)
         plugin.start = function() {
+            log.info('Starting connect plugin')
             return new Promise(function(resolve, reject) {
                 if (plugin.isRunning()) {
                     return resolve(plugin.url)

lib/units/device/plugins/install.js

@@ -8,7 +8,7 @@ import logger from '../../../util/logger.js'
 import wire from '../../../wire/index.js'
 import wireutil from '../../../wire/util.js'
 import * as promiseutil from '../../../util/promiseutil.js'
-import adbkit from '@u4/adbkit'
+import adbkit from '@irdk/adbkit'
 import * as apiutil from '../../../util/apiutil.js'
 import adb from '../support/adb.js'
 import router from '../../base-device/support/router.js'

lib/units/device/plugins/screen/capture.js

@@ -1,6 +1,6 @@
 import util from 'util'
 import syrup from '@devicefarmer/stf-syrup'
-import adbkit from '@u4/adbkit'
+import adbkit from '@irdk/adbkit'
 import logger from '../../../../util/logger.js'
 import wire from '../../../../wire/index.js'
 import wireutil from '../../../../wire/util.js'

lib/units/device/plugins/screen/stream.js

@@ -5,7 +5,7 @@ import WebSocket from 'ws'
 import {v4 as uuidv4} from 'uuid'
 import EventEmitter from 'eventemitter3'
 import split from 'split'
-import adbkit from '@u4/adbkit'
+import adbkit from '@irdk/adbkit'
 import logger from '../../../../util/logger.js'
 import lifecycle from '../../../../util/lifecycle.js'
 import * as bannerutil from './util/banner.js'

lib/units/device/plugins/touch/index.js

@@ -3,7 +3,7 @@ import Promise from 'bluebird'
 import syrup from '@devicefarmer/stf-syrup'
 import split from 'split'
 import EventEmitter from 'eventemitter3'
-import adbkit from '@u4/adbkit'
+import adbkit from '@irdk/adbkit'
 import wire from '../../../../wire/index.js'
 import logger from '../../../../util/logger.js'
 import lifecycle from '../../../../util/lifecycle.js'

lib/units/device/resources/service.js

@@ -5,7 +5,7 @@ import semver from 'semver'
 import * as pathutil from '../../../util/pathutil.cjs'
 import * as streamutil from '../../../util/streamutil.js'
 import logger from '../../../util/logger.js'
-import adbkit from '@u4/adbkit'
+import adbkit from '@irdk/adbkit'
 import adb from '../support/adb.js'
 export default syrup.serial()
     .dependency(adb)

lib/units/device/support/adb.js

@@ -1,6 +1,6 @@
 import syrup from '@devicefarmer/stf-syrup'
-import {createClient} from '@u4/adbkit'
-import adbkit from '@u4/adbkit'
+import {createClient} from '@irdk/adbkit'
+import adbkit from '@irdk/adbkit'
 import logger from '../../../util/logger.js'
 import * as promiseutil from '../../../util/promiseutil.js'
 export default syrup.serial()

lib/units/provider/index.js

@@ -1,4 +1,4 @@
-import adb from '@u4/adbkit'
+import adb from '@irdk/adbkit'
 import Promise from 'bluebird'
 import _ from 'lodash'
 import EventEmitter from 'eventemitter3'

lib/units/websocket/index.js

@@ -8,7 +8,7 @@ import util from 'util'
 import Promise from 'bluebird'
 import _ from 'lodash'
 import postmanRequest from 'postman-request'
-import adbkit from '@u4/adbkit'
+import adbkit from '@irdk/adbkit'
 import {v4 as uuidv4} from 'uuid'
 import logger from '../../util/logger.js'
 import wire from '../../wire/index.js'