Rework provider flow & rewtrite to TS

lib/units/device/index.js → lib/units/device/index.ts

@@ -1,5 +1,4 @@
 import syrup from '@devicefarmer/stf-syrup'
-import logger from '../../util/logger.js'
 import lifecycle from '../../util/lifecycle.js'
 import logger$0 from '../base-device/support/logger.js'
 import heartbeat from '../base-device/plugins/heartbeat.js'
@@ -36,7 +35,7 @@ import push from '../base-device/support/push.js'
 import adb from './support/adb.js'
 import router from '../base-device/support/router.js'
 
-export default (function(options) {
+export default (function(options: any) {
     return syrup.serial()
         // We want to send logs before anything else starts happening
         .dependency(logger$0)
@@ -49,10 +48,10 @@ export default (function(options) {
             log.info('Preparing device')
 
             if (!options.provider) {
-                let listener
+                let listener: ((...args: any[]) => void) | null = null
                 const waitRegister = Promise.race([
                     new Promise(resolve =>
-                        router.on(wire.DeviceRegisteredMessage, listener = (...args) => resolve(args))
+                        router.on(wire.DeviceRegisteredMessage, listener = (...args: any[]) => resolve(args))
                     ),
                     new Promise(r => setTimeout(r, 15000))
                 ])
@@ -64,7 +63,7 @@ export default (function(options) {
                 ])
 
                 await waitRegister
-                router.removeListener(wire.DeviceRegisteredMessage, listener)
+                router.removeListener(wire.DeviceRegisteredMessage, listener!)
                 listener = null
             }
 
@@ -95,7 +94,7 @@ export default (function(options) {
                 .dependency(trackModuleReadyness('filesystem', filesystem))
                 .dependency(trackModuleReadyness('mobileService', mobileService))
                 .dependency(trackModuleReadyness('remotedebug', remotedebug))
-                .define(function(options, heartbeat) {
+                .define((options, heartbeat) => {
                     if (process.send) {
                         // Only if we have a parent process
                         process.send('ready')
@@ -106,7 +105,7 @@ export default (function(options) {
                 .consume(options)
         })
         .consume(options)
-        .catch(function(err) {
+        .catch((err) => {
             if (err.stack.includes('no service started')) {
                 return lifecycle.graceful(err.stack)
             }

lib/units/device/readyness.js → lib/units/device/readyness.ts

@@ -1,8 +1,8 @@
 import logger from '../../util/logger.js'
 import _ from 'lodash'
 
-const readyModules = []
-const preparingModules = []
+const readyModules: string[] = []
+const preparingModules: any[] = []
 
 const log = logger.createLogger('device:readyness')
 
@@ -11,11 +11,12 @@ const printReadyness = () => {
     log.info(`Modules not ready: ${_.difference(preparingModules, readyModules)}`)
 }
 
-export const trackModuleReadyness = (name, module) => {
-    const origBody = module.body
-    module.body = async(...args) => {
+export const trackModuleReadyness = <T extends {}>(name: string, module: T): T => { // @ts-ignore
+    const origBody = module.body // @ts-ignore
+    module.body = async(...args: any[]) => {
         preparingModules.push(name)
         printReadyness()
+
         const res = await origBody(...args)
         readyModules.push(name)
         printReadyness()