mirror of
https://github.com/DeviceFarmer/stf.git
synced 2026-04-18 08:03:30 +02:00
Allow adb connect URL to be customized.
This commit is contained in:
@@ -15,13 +15,14 @@ module.exports = syrup.serial()
|
||||
.dependency(require('../support/push'))
|
||||
.dependency(require('./group'))
|
||||
.dependency(require('./solo'))
|
||||
.define(function(options, adb, router, push, group, solo) {
|
||||
.dependency(require('./util/urlformat'))
|
||||
.define(function(options, adb, router, push, group, solo, urlformat) {
|
||||
var log = logger.createLogger('device:plugins:connect')
|
||||
, plugin = Object.create(null)
|
||||
, activeServer = null
|
||||
|
||||
plugin.port = options.connectPort
|
||||
plugin.url = util.format('%s:%s', options.publicIp, plugin.port)
|
||||
plugin.url = urlformat(options.connectUrlPattern, plugin.port)
|
||||
|
||||
plugin.start = function() {
|
||||
return new Promise(function(resolve, reject) {
|
||||
|
||||
33
lib/units/device/plugins/util/urlformat.js
Normal file
33
lib/units/device/plugins/util/urlformat.js
Normal file
@@ -0,0 +1,33 @@
|
||||
var syrup = require('stf-syrup')
|
||||
var _ = require('lodash')
|
||||
var tr = require('transliteration')
|
||||
|
||||
module.exports = syrup.serial()
|
||||
.dependency(require('../identity'))
|
||||
.dependency(require('../data'))
|
||||
.define(function(options, identity, data) {
|
||||
function createSlug() {
|
||||
var model = identity.model
|
||||
, name = data ? data.name.id : ''
|
||||
|
||||
return (name === '' || model.toLowerCase() === name.toLowerCase())
|
||||
? tr.slugify(model)
|
||||
: tr.slugify(name + ' ' + model)
|
||||
}
|
||||
|
||||
var defaults = {
|
||||
publicIp: options.publicIp
|
||||
, serial: options.serial
|
||||
, model: identity.model
|
||||
, name: data ? data.name.id : ''
|
||||
, slug: createSlug()
|
||||
}
|
||||
|
||||
return function(template, port) {
|
||||
return _.template(template, {
|
||||
imports: {
|
||||
slugify: tr.slugify
|
||||
}
|
||||
})(_.defaults({publicPort: port}, defaults))
|
||||
}
|
||||
})
|
||||
Reference in New Issue
Block a user