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

Fix all lib/ files with ESLint rules with 0 errors.

Browse Source
This commit is contained in:
Gunther Brunner
2016-01-19 20:52:38 +09:00
parent 994977ea94
commit 434f63b3a9
69 changed files with 793 additions and 764 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/units/app/index.js
View File

@@ -26,8 +26,8 @@ var markdownServe = require('markdown-serve')
module.exports = function(options) {
var log = logger.createLogger('app')
, app = express()
, server = http.createServer(app)
var app = express()
var server = http.createServer(app)
app.use('/static/wiki', markdownServe.middleware({
rootDirectory: pathutil.root('node_modules/stf-wiki')
@@ -50,9 +50,9 @@ module.exports = function(options) {
}))
}
else {
log.info('Using webpack')
// Keep webpack-related requires here, as our prebuilt package won't
// have them at all.
log.info('Using webpack')
var webpackServerConfig = require('./../../../webpack.config').webpackServer
app.use('/static/app/build',
require('./middleware/webpack')(webpackServerConfig))
@@ -115,7 +115,7 @@ module.exports = function(options) {
}
if (options.userProfileUrl) {
state.config.userProfileUrl = (function () {
state.config.userProfileUrl = (function() {
return options.userProfileUrl
})()
}

2
lib/units/app/middleware/auth.js
View File

@@ -8,7 +8,7 @@ module.exports = function(options) {
if (req.query.jwt) {
// Coming from auth client
var data = jwtutil.decode(req.query.jwt, options.secret)
, redir = urlutil.removeParam(req.url, 'jwt')
var redir = urlutil.removeParam(req.url, 'jwt')
if (data) {
// Redirect once to get rid of the token
dbapi.saveUserAfterLogin({

15
lib/units/app/middleware/webpack.js
View File

@@ -14,9 +14,9 @@ var globalOptions = require('../../../../webpack.config').webpack
// Similar to webpack-dev-middleware, but integrates with our custom
// lifecycle, behaves more like normal express middleware, and removes
// all unnecessary features.
module.exports = function(options) {
module.exports = function(localOptions) {
var log = logger.createLogger('middleware:webpack')
options = _.defaults(options || {}, globalOptions)
var options = _.defaults(localOptions || {}, globalOptions)
var compiler = webpack(options)
var fs = compiler.outputFileSystem = new MemoryFileSystem()
@@ -77,12 +77,11 @@ module.exports = function(options) {
if (valid) {
return Promise.resolve()
}
else {
log.info('Waiting for bundle to finish')
var resolver = Promise.defer()
queue.push(resolver)
return resolver.promise
}
log.info('Waiting for bundle to finish')
var resolver = Promise.defer()
queue.push(resolver)
return resolver.promise
}
return function(req, res, next) {

6
lib/units/auth/ldap.js
View File

@@ -18,8 +18,8 @@ var lifecycle = require('../../util/lifecycle')
module.exports = function(options) {
var log = logger.createLogger('auth-ldap')
, app = express()
, server = Promise.promisifyAll(http.createServer(app))
var app = express()
var server = Promise.promisifyAll(http.createServer(app))
lifecycle.observe(function() {
log.info('Waiting for client connections to end')
@@ -46,7 +46,7 @@ module.exports = function(options) {
app.use('/static/auth/ldap', serveStatic(pathutil.resource('auth/ldap')))
app.use(function(req, res, next) {
res.cookie('XSRF-TOKEN', req.csrfToken());
res.cookie('XSRF-TOKEN', req.csrfToken())
next()
})

6
lib/units/auth/mock.js
View File

@@ -17,8 +17,8 @@ var lifecycle = require('../../util/lifecycle')
module.exports = function(options) {
var log = logger.createLogger('auth-mock')
, app = express()
, server = Promise.promisifyAll(http.createServer(app))
var app = express()
var server = Promise.promisifyAll(http.createServer(app))
lifecycle.observe(function() {
log.info('Waiting for client connections to end')
@@ -45,7 +45,7 @@ module.exports = function(options) {
app.use('/static/auth/mock', serveStatic(pathutil.resource('auth/mock')))
app.use(function(req, res, next) {
res.cookie('XSRF-TOKEN', req.csrfToken());
res.cookie('XSRF-TOKEN', req.csrfToken())
next()
})

4
lib/units/auth/oauth2/index.js
View File

@@ -10,8 +10,8 @@ var Strategy = require('./strategy')
module.exports = function(options) {
var log = logger.createLogger('auth-oauth2')
, app = express()
, server = http.createServer(app)
var app = express()
var server = http.createServer(app)
app.set('strict routing', true)
app.set('case sensitive routing', true)

13
lib/units/auth/oauth2/strategy.js
View File

@@ -18,13 +18,12 @@ Strategy.prototype.userProfile = function(accessToken, callback) {
if (err) {
return callback(err)
}
else {
try {
return callback(null, JSON.parse(data))
}
catch (err) {
return callback(err)
}
try {
return callback(null, JSON.parse(data))
}
catch (err) {
return callback(err)
}
})
}

14
lib/units/auth/saml2.js
View File

@@ -13,20 +13,20 @@ var jwtutil = require('../../util/jwtutil')
module.exports = function(options) {
var log = logger.createLogger('auth-saml2')
, app = express()
, server = http.createServer(app)
var app = express()
var server = http.createServer(app)
app.set('strict routing', true)
app.set('case sensitive routing', true)
app.use(bodyParser.urlencoded({ extended: false }))
app.use(bodyParser.urlencoded({extended: false}))
app.use(passport.initialize())
passport.serializeUser(function(user, done) {
done(null, user);
});
done(null, user)
})
passport.deserializeUser(function(user, done) {
done(null, user);
});
done(null, user)
})
var verify = function(profile, done) {
return done(null, profile)

22
lib/units/device/plugins/account.js
View File

@@ -18,7 +18,7 @@ module.exports = syrup.serial()
return service.getAccounts({type: type})
.timeout(30000)
.then(function(accounts) {
if(accounts.indexOf(account) >= 0) {
if (accounts.indexOf(account) >= 0) {
return true
}
throw new Error('The account is not added')
@@ -28,7 +28,7 @@ module.exports = syrup.serial()
router.on(wire.AccountCheckMessage, function(channel, message) {
var reply = wireutil.reply(options.serial)
log.info('Checking if account "%s" is added',message.account)
log.info('Checking if account "%s" is added', message.account)
checkAccount(message.type, message.account)
.then(function() {
push.send([
@@ -55,7 +55,7 @@ module.exports = syrup.serial()
.then(function(accounts) {
push.send([
channel
, reply.okay('success',accounts)
, reply.okay('success', accounts)
])
})
.catch(function(err) {
@@ -113,12 +113,12 @@ module.exports = syrup.serial()
router.on(wire.AccountAddMessage, function(channel, message) {
var reply = wireutil.reply(options.serial)
var type = "com.google"
var account = message.user + "@gmail.com";
var type = 'com.google'
var account = message.user + '@gmail.com'
log.info('Adding Google Account automatedly')
var version = identity.version.substring(0,3)
var version = identity.version.substring(0, 3)
function automation() {
switch (version) {
@@ -235,8 +235,8 @@ module.exports = syrup.serial()
.then(function() {
return service.pressKey('enter')
})
//case '4.3': // tested: 4.3
//case '4.4': // tested: 4.4.2
// case '4.3': // tested: 4.3
// case '4.4': // tested: 4.4.2
default:
return service.pressKey('tab').delay(1000)
.then(function() {
@@ -293,17 +293,17 @@ module.exports = syrup.serial()
.delay(5000)
.then(function() {
// Just in case the add account menu has any button focused
return touch.tap({x:0, y:0.9})
return touch.tap({x: 0, y: 0.9})
})
.delay(500)
.then(function() {
return automation()
})
.delay(3000)
.then(function () {
.then(function() {
return service.pressKey('home')
})
.then(function () {
.then(function() {
return checkAccount(type, account)
})
.then(function() {

13
lib/units/device/plugins/browser.js
View File

@@ -51,8 +51,17 @@ module.exports = syrup.serial()
function compareIgnoreCase(a, b) {
var la = (a || '').toLowerCase()
, lb = (b || '').toLowerCase()
return la === lb ? 0 : (la < lb ? -1 : 1)
var lb = (b || '').toLowerCase()
if (la === lb) {
return 0
}
else if (la < lb) {
return -1
}
else {
return 1
}
}
function updateBrowsers(data) {

1
lib/units/device/plugins/cleanup.js
View File

@@ -40,7 +40,6 @@ module.exports = syrup.serial()
group.on('leave', function() {
plugin.removePackages()
})
})
.return(plugin)
})

4
lib/units/device/plugins/connect.js
View File

@@ -18,8 +18,8 @@ module.exports = syrup.serial()
.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
var plugin = Object.create(null)
var activeServer = null
plugin.port = options.connectPort
plugin.url = urlformat(options.connectUrlPattern, plugin.port)

2
lib/units/device/plugins/forward/index.js
View File

@@ -44,7 +44,7 @@ module.exports = syrup.serial()
if (/closed/.test(err.message) && times > 1) {
return Promise.delay(delay)
.then(function() {
return tryConnect(--times, delay * 2)
return tryConnect(times - 1, delay * 2)
})
}
return Promise.reject(err)

218
lib/units/device/plugins/forward/util/manager.js
View File

@@ -5,6 +5,115 @@ var net = require('net')
var ForwardReader = require('./reader')
var ForwardWriter = require('./writer')
// Handles a single connection
function DestHandler(id, conn, options) {
var dest = net.connect({
host: options.targetHost
, port: options.targetPort
})
var writer = dest.pipe(new ForwardWriter(id))
// We can't just pipe to conn because we don't want to end it
// when the dest closes. Instead we'll send a special packet
// to it (which is handled by the writer).
function maybePipeManually() {
var chunk
while ((chunk = writer.read())) {
if (!conn.write(chunk)) {
break
}
}
}
function readableListener() {
maybePipeManually()
}
function drainListener() {
maybePipeManually()
}
function endListener() {
conn.removeListener('drain', drainListener)
writer.removeListener('readable', readableListener)
this.emit('end')
}
function errorListener() {
writer.end()
}
writer.on('end', endListener.bind(this))
writer.on('readable', readableListener)
dest.on('error', errorListener)
conn.on('drain', drainListener)
this.end = function() {
dest.end()
}
this.write = function(chunk) {
dest.write(chunk)
}
events.EventEmitter.call(this)
}
util.inherits(DestHandler, events.EventEmitter)
// Handles a single port
function ForwardHandler(conn, options) {
var destHandlersById = Object.create(null)
function endListener() {
this.emit('end')
}
function packetEndListener(id) {
delete destHandlersById[id]
}
function packetListener(id, packet) {
var dest = destHandlersById[id]
if (packet) {
if (!dest) {
// Let's create a new connection
dest = destHandlersById[id] = new DestHandler(id, conn, options)
dest.on('end', packetEndListener.bind(null, id))
}
dest.write(packet)
}
else {
// It's a simulated fin packet
if (dest) {
dest.end()
}
}
}
function readableListener() {
// No-op but must exist so that we get the 'end' event.
}
conn.pipe(new ForwardReader())
.on('end', endListener.bind(this))
.on('packet', packetListener)
.on('readable', readableListener)
this.options = options
this.end = function() {
conn.end()
}
events.EventEmitter.call(this)
}
util.inherits(ForwardHandler, events.EventEmitter)
// Handles multiple ports
function ForwardManager() {
var handlersById = Object.create(null)
@@ -61,113 +170,4 @@ function ForwardManager() {
util.inherits(ForwardManager, events.EventEmitter)
// Handles a single port
function ForwardHandler(conn, options) {
var destHandlersById = Object.create(null)
function endListener() {
this.emit('end')
}
function packetEndListener(id) {
delete destHandlersById[id]
}
function packetListener(id, packet) {
var dest = destHandlersById[id]
if (packet) {
if (!dest) {
// Let's create a new connection
dest = destHandlersById[id] = new DestHandler(id, conn, options)
dest.on('end', packetEndListener.bind(null, id))
}
dest.write(packet)
}
else {
// It's a simulated fin packet
if (dest) {
dest.end()
}
}
}
function readableListener() {
// No-op but must exist so that we get the 'end' event.
}
conn.pipe(new ForwardReader())
.on('end', endListener.bind(this))
.on('packet', packetListener)
.on('readable', readableListener)
this.options = options
this.end = function() {
conn.end()
}
events.EventEmitter.call(this)
}
util.inherits(ForwardHandler, events.EventEmitter)
// Handles a single connection
function DestHandler(id, conn, options) {
function endListener() {
conn.removeListener('drain', drainListener)
writer.removeListener('readable', readableListener)
this.emit('end')
}
function errorListener() {
writer.end()
}
function readableListener() {
maybePipeManually()
}
function drainListener() {
maybePipeManually()
}
// We can't just pipe to conn because we don't want to end it
// when the dest closes. Instead we'll send a special packet
// to it (which is handled by the writer).
function maybePipeManually() {
var chunk
while ((chunk = writer.read())) {
if (!conn.write(chunk)) {
break
}
}
}
var dest = net.connect({
host: options.targetHost
, port: options.targetPort
})
.on('error', errorListener)
var writer = dest.pipe(new ForwardWriter(id))
.on('end', endListener.bind(this))
.on('readable', readableListener)
conn.on('drain', drainListener)
this.end = function() {
dest.end()
}
this.write = function(chunk) {
dest.write(chunk)
}
events.EventEmitter.call(this)
}
util.inherits(DestHandler, events.EventEmitter)
module.exports = ForwardManager

6
lib/units/device/plugins/forward/util/writer.js
View File

@@ -11,9 +11,9 @@ function ForwardWriter(target) {
util.inherits(ForwardWriter, stream.Transform)
ForwardWriter.prototype._transform = function(chunk, encoding, done) {
var header
, length
ForwardWriter.prototype._transform = function(fullChunk, encoding, done) {
var chunk = fullChunk
var header, length
do {
length = Math.min(MAX_PACKET_SIZE, chunk.length)

4
lib/units/device/plugins/group.js
View File

@@ -19,8 +19,8 @@ module.exports = syrup.serial()
.dependency(require('../support/channels'))
.define(function(options, solo, ident, service, router, push, sub, channels) {
var log = logger.createLogger('device:plugins:group')
, currentGroup = null
, plugin = new events.EventEmitter()
var currentGroup = null
var plugin = new events.EventEmitter()
plugin.get = Promise.method(function() {
if (!currentGroup) {

6
lib/units/device/plugins/install.js
View File

@@ -27,7 +27,7 @@ module.exports = syrup.serial()
router.on(wire.InstallMessage, function(channel, message) {
var manifest = JSON.parse(message.manifest)
, pkg = manifest.package
var pkg = manifest.package
log.info('Installing package "%s" from "%s"', pkg, message.href)
@@ -98,8 +98,8 @@ module.exports = syrup.serial()
pushApp()
.then(function(apk) {
var start = 50
, end = 90
, guesstimate = start
var end = 90
var guesstimate = start
sendProgress('installing_app', guesstimate)
return promiseutil.periodicNotify(

4
lib/units/device/plugins/logcat.js
View File

@@ -13,8 +13,8 @@ module.exports = syrup.serial()
.dependency(require('./group'))
.define(function(options, adb, router, push, group) {
var log = logger.createLogger('device:plugins:logcat')
, plugin = Object.create(null)
, activeLogcat = null
var plugin = Object.create(null)
var activeLogcat = null
plugin.start = function(filters) {
return group.get()

4
lib/units/device/plugins/mute.js
View File

@@ -13,12 +13,12 @@ module.exports = syrup.serial()
log.info('Will mute master volume during use')
group.on('join', function() {
log.info('Muting master volume');
log.info('Muting master volume')
service.setMasterMute(true)
})
group.on('leave', function() {
log.info('Unmuting master volume');
log.info('Unmuting master volume')
service.setMasterMute(false)
})
}

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

@@ -176,11 +176,13 @@ module.exports = syrup.serial()
}
FrameProducer.prototype.nextFrame = function() {
var frame = null, chunk
var frame = null
var chunk
if (this.parser) {
while ((frame = this.parser.nextFrame()) === null) {
if ((chunk = this.socket.stream.read())) {
chunk = this.socket.stream.read()
if (chunk) {
this.parser.push(chunk)
}
else {
@@ -243,9 +245,9 @@ module.exports = syrup.serial()
return lifecycle.fatal()
}
var match
if ((match = /^PID: (\d+)$/.exec(line))) {
this.pid = +match[1]
var match = /^PID: (\d+)$/.exec(line)
if (match) {
this.pid = Number(match[1])
this.emit('pid', this.pid)
}
@@ -259,7 +261,7 @@ module.exports = syrup.serial()
}
var pidListener
return new Promise(function(resolve/*, reject*/) {
return new Promise(function(resolve) {
this.on('pid', pidListener = resolve)
}.bind(this)).bind(this)
.timeout(2000)
@@ -279,7 +281,7 @@ module.exports = syrup.serial()
if (/closed/.test(err.message) && times > 1) {
return Promise.delay(delay)
.then(function() {
return tryConnect(--times, delay * 2)
return tryConnect(times - 1, delay * 2)
})
}
return Promise.reject(err)
@@ -326,7 +328,7 @@ module.exports = syrup.serial()
socket.stream.removeListener('readable', this.readableListener)
var endListener
return new Promise(function(resolve/*, reject*/) {
return new Promise(function(resolve) {
socket.on('end', endListener = function() {
resolve(true)
})
@@ -354,8 +356,8 @@ module.exports = syrup.serial()
}
var signum = {
'SIGTERM': -15
, 'SIGKILL': -9
SIGTERM: -15
, SIGKILL: -9
}[signal]
log.info('Sending %s to minicap', signal)
@@ -478,8 +480,8 @@ module.exports = syrup.serial()
})
frameProducer.on('readable', function next() {
var frame
if ((frame = frameProducer.nextFrame())) {
var frame = frameProducer.nextFrame()
if (frame) {
Promise.settle([broadcastSet.keys().map(function(id) {
return broadcastSet.get(id).onFrame(frame)
})]).then(next)
@@ -557,8 +559,8 @@ module.exports = syrup.serial()
}
ws.on('message', function(data) {
var match
if ((match = /^(on|off|(size) ([0-9]+)x([0-9]+))$/.exec(data))) {
var match = /^(on|off|(size) ([0-9]+)x([0-9]+))$/.exec(data)
if (match) {
switch (match[2] || match[1]) {
case 'on':
broadcastSet.insert(id, {
@@ -570,7 +572,8 @@ module.exports = syrup.serial()
broadcastSet.remove(id)
break
case 'size':
frameProducer.updateProjection(+match[3], +match[4])
frameProducer.updateProjection(
Number(match[3]), Number(match[4]))
break
}
}

25
lib/units/device/plugins/screen/util/frameparser.js
View File

@@ -30,12 +30,17 @@ FrameParser.prototype.nextFrame = function() {
var bytesLeft = len - this.cursor
if (bytesLeft >= this.frameBodyLength) {
var completeBody = this.frameBody
? Buffer.concat([
this.frameBody
var completeBody
if (this.frameBody) {
completeBody = Buffer.concat([
this.frameBody
, this.chunk.slice(this.cursor, this.cursor + this.frameBodyLength)
])
: this.chunk.slice(this.cursor, this.cursor + this.frameBodyLength)
])
}
else {
completeBody = this.chunk.slice(this.cursor,
this.cursor + this.frameBodyLength)
}
this.cursor += this.frameBodyLength
this.frameBodyLength = this.readFrameBytes = 0
@@ -46,9 +51,13 @@ FrameParser.prototype.nextFrame = function() {
else {
// @todo Consider/benchmark continuation frames to prevent
// potential Buffer thrashing.
this.frameBody = this.frameBody
? Buffer.concat([this.frameBody, this.chunk.slice(this.cursor, len)])
: this.chunk.slice(this.cursor, len)
if (this.frameBody) {
this.frameBody =
Buffer.concat([this.frameBody, this.chunk.slice(this.cursor, len)])
}
else {
this.frameBody = this.chunk.slice(this.cursor, len)
}
this.frameBodyLength -= bytesLeft
this.readFrameBytes += bytesLeft

466
lib/units/device/plugins/service.js
View File

@@ -52,6 +52,219 @@ module.exports = syrup.serial()
, port: 1100
}
function stopAgent() {
return devutil.killProcsByComm(
adb
, options.serial
, 'stf.agent'
, 'stf.agent'
)
}
function callService(intent) {
return adb.shell(options.serial, util.format(
'am startservice --user 0 %s'
, intent
))
.timeout(15000)
.then(function(out) {
return streamutil.findLine(out, /^Error/)
.finally(function() {
out.end()
})
.timeout(10000)
.then(function(line) {
if (line.indexOf('--user') !== -1) {
return adb.shell(options.serial, util.format(
'am startservice %s'
, intent
))
.timeout(15000)
.then(function() {
return streamutil.findLine(out, /^Error/)
.finally(function() {
out.end()
})
.timeout(10000)
.then(function(line) {
throw new Error(util.format(
'Service had an error: "%s"'
, line
))
})
.catch(streamutil.NoSuchLineError, function() {
return true
})
})
}
else {
throw new Error(util.format(
'Service had an error: "%s"'
, line
))
}
})
.catch(streamutil.NoSuchLineError, function() {
return true
})
})
}
function prepareForServiceDeath(conn) {
function endListener() {
var startTime = Date.now()
log.important('Service connection ended, attempting to relaunch')
/* eslint no-use-before-define: 0 */
openService()
.timeout(5000)
.then(function() {
log.important('Service relaunched in %dms', Date.now() - startTime)
})
.catch(function(err) {
log.fatal('Service connection could not be relaunched', err.stack)
lifecycle.fatal()
})
}
conn.once('end', endListener)
conn.on('error', function(err) {
log.fatal('Service connection had an error', err.stack)
lifecycle.fatal()
})
}
function handleEnvelope(data) {
var envelope = apk.wire.Envelope.decode(data)
var message
if (envelope.id !== null) {
messageResolver.resolve(envelope.id, envelope.message)
}
else {
switch (envelope.type) {
case apk.wire.MessageType.EVENT_AIRPLANE_MODE:
message = apk.wire.AirplaneModeEvent.decode(envelope.message)
push.send([
wireutil.global
, wireutil.envelope(new wire.AirplaneModeEvent(
options.serial
, message.enabled
))
])
plugin.emit('airplaneModeChange', message)
break
case apk.wire.MessageType.EVENT_BATTERY:
message = apk.wire.BatteryEvent.decode(envelope.message)
push.send([
wireutil.global
, wireutil.envelope(new wire.BatteryEvent(
options.serial
, message.status
, message.health
, message.source
, message.level
, message.scale
, message.temp
, message.voltage
))
])
plugin.emit('batteryChange', message)
break
case apk.wire.MessageType.EVENT_BROWSER_PACKAGE:
message = apk.wire.BrowserPackageEvent.decode(envelope.message)
plugin.emit('browserPackageChange', message)
break
case apk.wire.MessageType.EVENT_CONNECTIVITY:
message = apk.wire.ConnectivityEvent.decode(envelope.message)
push.send([
wireutil.global
, wireutil.envelope(new wire.ConnectivityEvent(
options.serial
, message.connected
, message.type
, message.subtype
, message.failover
, message.roaming
))
])
plugin.emit('connectivityChange', message)
break
case apk.wire.MessageType.EVENT_PHONE_STATE:
message = apk.wire.PhoneStateEvent.decode(envelope.message)
push.send([
wireutil.global
, wireutil.envelope(new wire.PhoneStateEvent(
options.serial
, message.state
, message.manual
, message.operator
))
])
plugin.emit('phoneStateChange', message)
break
case apk.wire.MessageType.EVENT_ROTATION:
message = apk.wire.RotationEvent.decode(envelope.message)
push.send([
wireutil.global
, wireutil.envelope(new wire.RotationEvent(
options.serial
, message.rotation
))
])
plugin.emit('rotationChange', message)
break
}
}
}
// The APK should be up to date at this point. If it was reinstalled, the
// service should have been automatically stopped while it was happening.
// So, we should be good to go.
function openService() {
log.info('Launching service')
return callService(util.format(
"-a '%s' -n '%s'"
, apk.startIntent.action
, apk.startIntent.component
))
.then(function() {
return devutil.waitForPort(adb, options.serial, service.port)
.timeout(15000)
})
.then(function(conn) {
service.socket = conn
service.reader = conn.pipe(new ms.DelimitedStream())
service.reader.on('data', handleEnvelope)
service.writer = new ms.DelimitingStream()
service.writer.pipe(conn)
return prepareForServiceDeath(conn)
})
}
function prepareForAgentDeath(conn) {
function endListener() {
var startTime = Date.now()
log.important('Agent connection ended, attempting to relaunch')
openService()
.timeout(5000)
.then(function() {
log.important('Agent relaunched in %dms', Date.now() - startTime)
})
.catch(function(err) {
log.fatal('Agent connection could not be relaunched', err.stack)
lifecycle.fatal()
})
}
conn.once('end', endListener)
conn.on('error', function(err) {
log.fatal('Agent connection had an error', err.stack)
lifecycle.fatal()
})
}
function openAgent() {
log.info('Launching agent')
return stopAgent()
@@ -83,215 +296,12 @@ module.exports = syrup.serial()
})
}
function prepareForAgentDeath(conn) {
function endListener() {
var startTime = Date.now()
log.important('Agent connection ended, attempting to relaunch')
openService()
.timeout(5000)
.then(function() {
log.important('Agent relaunched in %dms', Date.now() - startTime)
})
.catch(function(err) {
log.fatal('Agent connection could not be relaunched', err.stack)
lifecycle.fatal()
})
}
conn.once('end', endListener)
conn.on('error', function(err) {
log.fatal('Agent connection had an error', err.stack)
lifecycle.fatal()
})
}
function stopAgent() {
return devutil.killProcsByComm(
adb
, options.serial
, 'stf.agent'
, 'stf.agent'
)
}
function callService(intent) {
return adb.shell(options.serial, util.format(
'am startservice --user 0 %s'
, intent
))
.timeout(15000)
.then(function(out) {
return streamutil.findLine(out, /^Error/)
.finally(function() {
out.end()
})
.timeout(10000)
.then(function(line) {
if (line.indexOf('--user') !== -1) {
return adb.shell(options.serial, util.format(
'am startservice %s'
, intent
))
.timeout(15000)
.then(function() {
return streamutil.findLine(out, /^Error/)
.finally(function() {
out.end()
})
.timeout(10000)
.then(function(line) {
throw new Error(util.format(
'Service had an error: "%s"'
, line
))
})
.catch(streamutil.NoSuchLineError, function() {
return true
})
})
}
else {
throw new Error(util.format(
'Service had an error: "%s"'
, line
))
}
})
.catch(streamutil.NoSuchLineError, function() {
return true
})
})
}
// The APK should be up to date at this point. If it was reinstalled, the
// service should have been automatically stopped while it was happening.
// So, we should be good to go.
function openService() {
log.info('Launching service')
return callService(util.format(
"-a '%s' -n '%s'"
, apk.startIntent.action
, apk.startIntent.component
))
.then(function() {
return devutil.waitForPort(adb, options.serial, service.port)
.timeout(15000)
})
.then(function(conn) {
service.socket = conn
service.reader = conn.pipe(new ms.DelimitedStream())
service.reader.on('data', handleEnvelope)
service.writer = new ms.DelimitingStream()
service.writer.pipe(conn)
return prepareForServiceDeath(conn)
})
}
function prepareForServiceDeath(conn) {
function endListener() {
var startTime = Date.now()
log.important('Service connection ended, attempting to relaunch')
openService()
.timeout(5000)
.then(function() {
log.important('Service relaunched in %dms', Date.now() - startTime)
})
.catch(function(err) {
log.fatal('Service connection could not be relaunched', err.stack)
lifecycle.fatal()
})
}
conn.once('end', endListener)
conn.on('error', function(err) {
log.fatal('Service connection had an error', err.stack)
lifecycle.fatal()
})
}
function handleEnvelope(data) {
var envelope = apk.wire.Envelope.decode(data)
, message
if (envelope.id !== null) {
messageResolver.resolve(envelope.id, envelope.message)
}
else {
switch (envelope.type) {
case apk.wire.MessageType.EVENT_AIRPLANE_MODE:
message = apk.wire.AirplaneModeEvent.decode(envelope.message)
push.send([
wireutil.global
, wireutil.envelope(new wire.AirplaneModeEvent(
options.serial
, message.enabled
))
])
plugin.emit('airplaneModeChange', message)
break
case apk.wire.MessageType.EVENT_BATTERY:
message = apk.wire.BatteryEvent.decode(envelope.message)
push.send([
wireutil.global
, wireutil.envelope(new wire.BatteryEvent(
options.serial
, message.status
, message.health
, message.source
, message.level
, message.scale
, message.temp
, message.voltage
))
])
plugin.emit('batteryChange', message)
break
case apk.wire.MessageType.EVENT_BROWSER_PACKAGE:
message = apk.wire.BrowserPackageEvent.decode(envelope.message)
plugin.emit('browserPackageChange', message)
break
case apk.wire.MessageType.EVENT_CONNECTIVITY:
message = apk.wire.ConnectivityEvent.decode(envelope.message)
push.send([
wireutil.global
, wireutil.envelope(new wire.ConnectivityEvent(
options.serial
, message.connected
, message.type
, message.subtype
, message.failover
, message.roaming
))
])
plugin.emit('connectivityChange', message)
break
case apk.wire.MessageType.EVENT_PHONE_STATE:
message = apk.wire.PhoneStateEvent.decode(envelope.message)
push.send([
wireutil.global
, wireutil.envelope(new wire.PhoneStateEvent(
options.serial
, message.state
, message.manual
, message.operator
))
])
plugin.emit('phoneStateChange', message)
break
case apk.wire.MessageType.EVENT_ROTATION:
message = apk.wire.RotationEvent.decode(envelope.message)
push.send([
wireutil.global
, wireutil.envelope(new wire.RotationEvent(
options.serial
, message.rotation
))
])
plugin.emit('rotationChange', message)
break
}
}
function runAgentCommand(type, cmd) {
agent.writer.write(new apk.wire.Envelope(
null
, type
, cmd.encodeNB()
).encodeNB())
}
function keyEvent(data) {
@@ -326,6 +336,17 @@ module.exports = syrup.serial()
return plugin.getClipboard()
}
function runServiceCommand(type, cmd) {
var resolver = Promise.defer()
var id = Math.floor(Math.random() * 0xFFFFFF)
service.writer.write(new apk.wire.Envelope(
id
, type
, cmd.encodeNB()
).encodeNB())
return messageResolver.await(id, resolver)
}
plugin.getDisplay = function(id) {
return runServiceCommand(
apk.wire.MessageType.GET_DISPLAY
@@ -651,7 +672,7 @@ module.exports = syrup.serial()
})
}
plugin.getSdStatus = function () {
plugin.getSdStatus = function() {
return runServiceCommand(
apk.wire.MessageType.GET_SD_STATUS
, new apk.wire.GetSdStatusRequest()
@@ -685,25 +706,6 @@ module.exports = syrup.serial()
})
}
function runServiceCommand(type, cmd) {
var resolver = Promise.defer()
var id = Math.floor(Math.random() * 0xFFFFFF)
service.writer.write(new apk.wire.Envelope(
id
, type
, cmd.encodeNB()
).encodeNB())
return messageResolver.await(id, resolver)
}
function runAgentCommand(type, cmd) {
agent.writer.write(new apk.wire.Envelope(
null
, type
, cmd.encodeNB()
).encodeNB())
}
return openAgent()
.then(openService)
.then(function() {
@@ -723,7 +725,7 @@ module.exports = syrup.serial()
, keyCode: keyutil.namedKey(message.key)
})
}
catch(e) {
catch (e) {
log.warn(e.message)
}
})
@@ -734,7 +736,7 @@ module.exports = syrup.serial()
, keyCode: keyutil.namedKey(message.key)
})
}
catch(e) {
catch (e) {
log.warn(e.message)
}
})
@@ -745,7 +747,7 @@ module.exports = syrup.serial()
, keyCode: keyutil.namedKey(message.key)
})
}
catch(e) {
catch (e) {
log.warn(e.message)
}
})

10
lib/units/device/plugins/shell.js
View File

@@ -22,7 +22,11 @@ module.exports = syrup.serial()
.timeout(10000)
.then(function(stream) {
var resolver = Promise.defer()
, timer
var timer
function forceStop() {
stream.end()
}
function keepAliveListener(channel, message) {
clearTimeout(timer)
@@ -51,10 +55,6 @@ module.exports = syrup.serial()
resolver.reject(err)
}
function forceStop() {
stream.end()
}
stream.setEncoding('utf8')
stream.on('readable', readableListener)

12
lib/units/device/plugins/touch/index.js
View File

@@ -268,7 +268,7 @@ module.exports = syrup.serial()
if (/closed/.test(err.message) && times > 1) {
return Promise.delay(delay)
.then(function() {
return tryConnect(--times, delay * 2)
return tryConnect(times - 1, delay * 2)
})
}
return Promise.reject(err)
@@ -315,7 +315,7 @@ module.exports = syrup.serial()
socket.stream.removeListener('readable', this.readableListener)
var endListener
return new Promise(function(resolve/*, reject*/) {
return new Promise(function(resolve) {
socket.on('end', endListener = function() {
resolve(true)
})
@@ -343,8 +343,8 @@ module.exports = syrup.serial()
}
var signum = {
'SIGTERM': -15
, 'SIGKILL': -9
SIGTERM: -15
, SIGKILL: -9
}[signal]
log.info('Sending %s to minitouch', signal)
@@ -395,7 +395,7 @@ module.exports = syrup.serial()
var args = chunk.toString().split(/ /g)
switch (args[0]) {
case 'v':
banner.version = +args[1]
banner.version = Number(args[1])
break
default:
throw new Error(util.format(
@@ -432,7 +432,7 @@ module.exports = syrup.serial()
var args = chunk.toString().split(/ /g)
switch (args[0]) {
case '$':
banner.pid = +args[1]
banner.pid = Number(args[1])
break
default:
throw new Error(util.format(

6
lib/units/device/plugins/util/flags.js
View File

@@ -8,9 +8,9 @@ module.exports = syrup.serial()
return data && data.flags && !!data.flags[flag]
}
, get: function(flag, defaultValue) {
return data && data.flags && data.flags[flag] !== void 0
? data.flags[flag]
: defaultValue
return data && data.flags && typeof data.flags[flag] !== 'undefined' ?
data.flags[flag] :
defaultValue
}
}
})

8
lib/units/device/plugins/util/urlformat.js
View File

@@ -8,11 +8,11 @@ module.exports = syrup.serial()
.define(function(options, identity, data) {
function createSlug() {
var model = identity.model
, name = data ? data.name.id : ''
var name = data ? data.name.id : ''
return (name === '' || model.toLowerCase() === name.toLowerCase())
? tr.slugify(model)
: tr.slugify(name + ' ' + model)
return (name === '' || model.toLowerCase() === name.toLowerCase()) ?
tr.slugify(model) :
tr.slugify(name + ' ' + model)
}
var defaults = {

36
lib/units/device/plugins/vnc/index.js
View File

@@ -182,15 +182,16 @@ module.exports = syrup.serial()
var decoded = jpeg.decompressSync(
connState.lastFrame, connState.frameConfig)
conn.writeFramebufferUpdate([
{ xPosition: 0
conn.writeFramebufferUpdate([{
xPosition: 0
, yPosition: 0
, width: decoded.width
, height: decoded.height
, encodingType: VncConnection.ENCODING_RAW
, data: decoded.data
}
, { xPosition: 0
, {
xPosition: 0
, yPosition: 0
, width: decoded.width
, height: decoded.height
@@ -203,7 +204,7 @@ module.exports = syrup.serial()
}
function vncStartListener(frameProducer) {
return new Promise(function(resolve/*, reject*/) {
return new Promise(function(resolve) {
connState.frameWidth = frameProducer.banner.virtualWidth
connState.frameHeight = frameProducer.banner.virtualHeight
resolve()
@@ -211,7 +212,7 @@ module.exports = syrup.serial()
}
function vncFrameListener(frame) {
return new Promise(function(resolve/*, reject*/) {
return new Promise(function(resolve) {
connState.lastFrame = frame
connState.lastFrameTime = Date.now()
maybeSendFrame()
@@ -238,8 +239,10 @@ module.exports = syrup.serial()
})
conn.on('formatchange', function(format) {
var same = os.endianness() === 'BE'
=== Boolean(format.bigEndianFlag)
var same = os.endianness() === 'BE' ===
Boolean(format.bigEndianFlag)
var formatOrder = (format.redShift > format.blueShift) === same
switch (format.bitsPerPixel) {
case 8:
connState.frameConfig = {
@@ -248,20 +251,19 @@ module.exports = syrup.serial()
break
case 24:
connState.frameConfig = {
format: ((format.redShift > format.blueShift) === same)
? jpeg.FORMAT_BGR
: jpeg.FORMAT_RGB
format: formatOrder ? jpeg.FORMAT_BGR : jpeg.FORMAT_RGB
}
break
case 32:
var f
if (formatOrder) {
f = format.blueShift === 0 ? jpeg.FORMAT_BGRX : jpeg.FORMAT_XBGR
}
else {
f = format.redShift === 0 ? jpeg.FORMAT_RGBX : jpeg.FORMAT_XRGB
}
connState.frameConfig = {
format: ((format.redShift > format.blueShift) === same)
? (format.blueShift === 0
? jpeg.FORMAT_BGRX
: jpeg.FORMAT_XBGR)
: (format.redShift === 0
? jpeg.FORMAT_RGBX
: jpeg.FORMAT_XRGB)
format: f
}
break
}

3
lib/units/device/plugins/vnc/util/connection.js
View File

@@ -90,7 +90,8 @@ VncConnection.CLIENT_MESSAGE_CLIENTCUTTEXT = 6
VncConnection.SERVER_MESSAGE_FBUPDATE = 0
var StateReverse = Object.create(null), State = {
var StateReverse = Object.create(null)
var State = {
STATE_NEED_CLIENT_VERSION: 10
, STATE_NEED_CLIENT_SECURITY: 20
, STATE_NEED_CLIENT_INIT: 30

2
lib/units/device/plugins/wifi.js
View File

@@ -31,7 +31,7 @@ module.exports = syrup.serial()
})
})
router.on(wire.WifiGetStatusMessage, function(channel){
router.on(wire.WifiGetStatusMessage, function(channel) {
var reply = wireutil.reply(options.serial)
log.info('Getting Wifi status')
service.getWifiStatus()

2
lib/units/device/resources/minitouch.js
View File

@@ -12,7 +12,7 @@ module.exports = syrup.serial()
.dependency(require('../support/adb'))
.dependency(require('../support/abi'))
.define(function(options, adb, abi) {
var log = logger.createLogger('device:resources:minitouch') // jshint ignore:line
logger.createLogger('device:resources:minitouch')
var resources = {
bin: {

6
lib/units/device/resources/service.js
View File

@@ -85,9 +85,9 @@ module.exports = syrup.serial()
})
.progressed(function() {
log.warn(
'STFService installation is taking a long time; '
+ 'perhaps you have to accept 3rd party app installation '
+ 'on the device?'
'STFService installation is taking a long time; ' +
'perhaps you have to accept 3rd party app installation ' +
'on the device?'
)
})
.then(function() {

2
lib/units/device/support/abi.js
View File

@@ -7,7 +7,6 @@ module.exports = syrup.serial()
.define(function(options, properties) {
var log = logger.createLogger('device:support:abi')
return (function() {
function split(list) {
return list ? list.split(',') : []
}
@@ -39,6 +38,5 @@ module.exports = syrup.serial()
log.info('Supports ABIs %s', abi.all.join(', '))
return abi
})()
})

2
lib/units/device/support/sub.js
View File

@@ -26,7 +26,7 @@ module.exports = syrup.serial()
})
.then(function() {
// Establish always-on channels
;[wireutil.global].forEach(function(channel) {
[wireutil.global].forEach(function(channel) {
log.info('Subscribing to permanent channel "%s"', channel)
sub.subscribe(channel)
})

40
lib/units/notify/hipchat.js
View File

@@ -25,7 +25,7 @@ module.exports = function(options) {
var log = logger.createLogger('notify-hipchat')
var client = Promise.promisifyAll(new Hipchatter(options.token))
var buffer = []
, timer
var timer
// Input
var sub = zmqutil.socket('sub')
@@ -45,6 +45,25 @@ module.exports = function(options) {
sub.subscribe(channel)
})
function push() {
buffer.splice(0).forEach(function(entry) {
client.notifyAsync(options.room, {
message: util.format(
'<strong>%s</strong>/<strong>%s</strong> %d [<strong>%s</strong>] %s'
, logger.LevelLabel[entry.priority]
, entry.tag
, entry.pid
, entry.identifier
, entry.message
)
, color: COLORS[entry.priority]
, notify: entry.priority >= options.notifyPriority
, message_format: 'html'
, token: options.token
})
})
}
sub.on('message', wirerouter()
.on(wire.DeviceLogMessage, function(channel, message) {
if (message.priority >= options.priority) {
@@ -55,25 +74,6 @@ module.exports = function(options) {
})
.handler())
function push() {
buffer.splice(0).forEach(function(entry) {
client.notifyAsync(options.room, {
message: util.format(
'<strong>%s</strong>/<strong>%s</strong> %d [<strong>%s</strong>] %s'
, logger.LevelLabel[entry.priority]
, entry.tag
, entry.pid
, entry.identifier
, entry.message
)
, color: COLORS[entry.priority]
, notify: entry.priority >= options.notifyPriority
, 'message_format': 'html'
, token: options.token
})
})
}
log.info('Listening for %s (or higher) level log messages',
logger.LevelLabel[options.priority])

6
lib/units/poorxy/index.js
View File

@@ -7,9 +7,9 @@ var logger = require('../../util/logger')
module.exports = function(options) {
var log = logger.createLogger('poorxy')
, app = express()
, server = http.createServer(app)
, proxy = httpProxy.createProxyServer()
var app = express()
var server = http.createServer(app)
var proxy = httpProxy.createProxyServer()
proxy.on('error', function(err) {
log.error('Proxy had an error', err.stack)

5
lib/units/processor/index.js
View File

@@ -32,12 +32,13 @@ module.exports = function(options) {
lifecycle.fatal()
})
// Device side
var devDealer = zmqutil.socket('dealer')
appDealer.on('message', function(channel, data) {
devDealer.send([channel, data])
})
// Device side
var devDealer = zmqutil.socket('dealer')
Promise.map(options.endpoints.devDealer, function(endpoint) {
return srv.resolve(endpoint).then(function(records) {
return srv.attempt(records, function(record) {

302
lib/units/provider/index.js
View File

@@ -154,9 +154,8 @@ module.exports = function(options) {
log.info('Found device "%s" (%s)', device.id, device.type)
var privateTracker = new EventEmitter()
, willStop = false
, timer
, worker
var willStop = false
var timer, worker
// Wait for others to acknowledge the device
var register = new Promise(function(resolve) {
@@ -176,6 +175,155 @@ module.exports = function(options) {
privateTracker.once('register', resolve)
})
// Spawn a device worker
function spawn() {
var allocatedPorts = ports.splice(0, 4)
var proc = options.fork(device, allocatedPorts.slice())
var resolver = Promise.defer()
function exitListener(code, signal) {
if (signal) {
log.warn(
'Device worker "%s" was killed with signal %s, assuming ' +
'deliberate action and not restarting'
, device.id
, signal
)
resolver.resolve()
}
else if (code === 0) {
log.info('Device worker "%s" stopped cleanly', device.id)
resolver.resolve()
}
else {
resolver.reject(new procutil.ExitError(code))
}
}
function errorListener(err) {
log.error(
'Device worker "%s" had an error: %s'
, device.id
, err.message
)
}
function messageListener(message) {
switch (message) {
case 'ready':
_.pull(lists.waiting, device.id)
lists.ready.push(device.id)
break
default:
log.warn(
'Unknown message from device worker "%s": "%s"'
, device.id
, message
)
break
}
}
proc.on('exit', exitListener)
proc.on('error', errorListener)
proc.on('message', messageListener)
lists.waiting.push(device.id)
return resolver.promise
.finally(function() {
log.info('Cleaning up device worker "%s"', device.id)
proc.removeListener('exit', exitListener)
proc.removeListener('error', errorListener)
proc.removeListener('message', messageListener)
// Return used ports to the main pool
Array.prototype.push.apply(ports, allocatedPorts)
// Update lists
_.pull(lists.ready, device.id)
_.pull(lists.waiting, device.id)
})
.cancellable()
.catch(Promise.CancellationError, function() {
log.info('Gracefully killing device worker "%s"', device.id)
return procutil.gracefullyKill(proc, options.killTimeout)
})
.catch(Promise.TimeoutError, function(err) {
log.error(
'Device worker "%s" did not stop in time: %s'
, device.id
, err.message
)
})
}
// Starts a device worker and keeps it alive
function work() {
return (worker = workers[device.id] = spawn())
.then(function() {
log.info('Device worker "%s" has retired', device.id)
delete workers[device.id]
worker = null
// Tell others the device is gone
push.send([
wireutil.global
, wireutil.envelope(new wire.DeviceAbsentMessage(
device.id
))
])
})
.catch(procutil.ExitError, function(err) {
if (!willStop) {
log.error(
'Device worker "%s" died with code %s'
, device.id
, err.code
)
log.info('Restarting device worker "%s"', device.id)
return Promise.delay(500)
.then(function() {
return work()
})
}
})
}
// No more work required
function stop() {
if (worker) {
log.info('Shutting down device worker "%s"', device.id)
worker.cancel()
}
}
// Check if we can do anything with the device
function check() {
clearTimeout(timer)
if (device.present) {
// We might get multiple status updates in rapid succession,
// so let's wait for a while
switch (device.type) {
case 'device':
case 'emulator':
willStop = false
timer = setTimeout(work, 100)
break
default:
willStop = true
timer = setTimeout(stop, 100)
break
}
}
else {
stop()
}
}
register.then(function() {
log.info('Registered device "%s"', device.id)
check()
@@ -250,154 +398,6 @@ module.exports = function(options) {
})
}
// Check if we can do anything with the device
function check() {
clearTimeout(timer)
if (device.present) {
// We might get multiple status updates in rapid succession,
// so let's wait for a while
switch (device.type) {
case 'device':
case 'emulator':
willStop = false
timer = setTimeout(work, 100)
break
default:
willStop = true
timer = setTimeout(stop, 100)
break
}
}
else {
stop()
}
}
// Starts a device worker and keeps it alive
function work() {
return (worker = workers[device.id] = spawn())
.then(function() {
log.info('Device worker "%s" has retired', device.id)
delete workers[device.id]
worker = null
// Tell others the device is gone
push.send([
wireutil.global
, wireutil.envelope(new wire.DeviceAbsentMessage(
device.id
))
])
})
.catch(procutil.ExitError, function(err) {
if (!willStop) {
log.error(
'Device worker "%s" died with code %s'
, device.id
, err.code
)
log.info('Restarting device worker "%s"', device.id)
return Promise.delay(500)
.then(function() {
return work()
})
}
})
}
// No more work required
function stop() {
if (worker) {
log.info('Shutting down device worker "%s"', device.id)
worker.cancel()
}
}
// Spawn a device worker
function spawn() {
var allocatedPorts = ports.splice(0, 4)
, proc = options.fork(device, allocatedPorts.slice())
, resolver = Promise.defer()
function exitListener(code, signal) {
if (signal) {
log.warn(
'Device worker "%s" was killed with signal %s, assuming ' +
'deliberate action and not restarting'
, device.id
, signal
)
resolver.resolve()
}
else if (code === 0) {
log.info('Device worker "%s" stopped cleanly', device.id)
resolver.resolve()
}
else {
resolver.reject(new procutil.ExitError(code))
}
}
function errorListener(err) {
log.error(
'Device worker "%s" had an error: %s'
, device.id
, err.message
)
}
function messageListener(message) {
switch (message) {
case 'ready':
_.pull(lists.waiting, device.id)
lists.ready.push(device.id)
break
default:
log.warn(
'Unknown message from device worker "%s": "%s"'
, device.id
, message
)
break
}
}
proc.on('exit', exitListener)
proc.on('error', errorListener)
proc.on('message', messageListener)
lists.waiting.push(device.id)
return resolver.promise
.finally(function() {
log.info('Cleaning up device worker "%s"', device.id)
proc.removeListener('exit', exitListener)
proc.removeListener('error', errorListener)
proc.removeListener('message', messageListener)
// Return used ports to the main pool
Array.prototype.push.apply(ports, allocatedPorts)
// Update lists
_.pull(lists.ready, device.id)
_.pull(lists.waiting, device.id)
})
.cancellable()
.catch(Promise.CancellationError, function() {
log.info('Gracefully killing device worker "%s"', device.id)
return procutil.gracefullyKill(proc, options.killTimeout)
})
.catch(Promise.TimeoutError, function(err) {
log.error(
'Device worker "%s" did not stop in time: %s'
, device.id
, err.message
)
})
}
flippedTracker.on(device.id, deviceListener)
privateTracker.on('change', changeListener)
privateTracker.on('remove', removeListener)

4
lib/units/storage/plugins/apk/index.js
View File

@@ -11,8 +11,8 @@ var manifest = require('./task/manifest')
module.exports = function(options) {
var log = logger.createLogger('storage:plugins:apk')
, app = express()
, server = http.createServer(app)
var app = express()
var server = http.createServer(app)
app.set('strict routing', true)
app.set('case sensitive routing', true)

4
lib/units/storage/plugins/image/index.js
View File

@@ -13,8 +13,8 @@ var transform = require('./task/transform')
module.exports = function(options) {
var log = logger.createLogger('storage:plugins:image')
, app = express()
, server = http.createServer(app)
var app = express()
var server = http.createServer(app)
app.set('strict routing', true)
app.set('case sensitive routing', true)

4
lib/units/storage/plugins/image/param/crop.js
View File

@@ -5,8 +5,8 @@ module.exports = function(raw) {
if (raw && (parsed = RE_CROP.exec(raw))) {
return {
width: +parsed[1] || 0
, height: +parsed[2] || 0
width: Number(parsed[1]) || 0
, height: Number(parsed[2]) || 0
}
}

2
lib/units/storage/plugins/image/task/get.js
View File

@@ -8,7 +8,7 @@ var request = require('request')
module.exports = function(path, options) {
return new Promise(function(resolve, reject) {
var res = request.get(url.resolve(options.storageUrl, path))
, ret = new stream.Readable().wrap(res) // Wrap old-style stream
var ret = new stream.Readable().wrap(res) // Wrap old-style stream
res.on('response', function(res) {
if (res.statusCode !== 200) {

8
lib/units/storage/s3.js
View File

@@ -15,8 +15,8 @@ var logger = require('../../util/logger')
module.exports = function(options) {
var log = logger.createLogger('storage:s3')
, app = express()
, server = http.createServer(app)
var app = express()
var server = http.createServer(app)
var s3 = new AWS.S3({
credentials: new AWS.SharedIniFileCredentials({
@@ -80,7 +80,7 @@ module.exports = function(options) {
var file = files[field]
log.info('Uploaded "%s" to "%s"', file.name, file.path)
return putObject(plugin, file)
.then(function (id) {
.then(function(id) {
return {
field: field
, id: id
@@ -151,5 +151,5 @@ module.exports = function(options) {
})
server.listen(options.port)
console.log('Listening on port %d', options.port)
log.info('Listening on port %d', options.port)
}

16
lib/units/storage/temp.js
View File

@@ -15,9 +15,9 @@ var download = require('../../util/download')
module.exports = function(options) {
var log = logger.createLogger('storage:temp')
, app = express()
, server = http.createServer(app)
, storage = new Storage()
var app = express()
var server = http.createServer(app)
var storage = new Storage()
app.set('strict routing', true)
app.set('case sensitive routing', true)
@@ -59,9 +59,7 @@ module.exports = function(options) {
'/s/%s/%s%s'
, plugin
, file.id
, file.name
? util.format('/%s', path.basename(file.name))
: ''
, file.name ? util.format('/%s', path.basename(file.name)) : ''
)
}
})
@@ -115,9 +113,9 @@ module.exports = function(options) {
'/s/%s/%s%s'
, plugin
, file.id
, file.name
? util.format('/%s', path.basename(file.name))
: ''
, file.name ?
util.format('/%s', path.basename(file.name)) :
''
)
}
})

22
lib/units/websocket/index.js
View File

@@ -25,12 +25,12 @@ var jwtutil = require('../../util/jwtutil')
module.exports = function(options) {
var log = logger.createLogger('websocket')
, server = http.createServer()
, io = socketio.listen(server, {
var server = http.createServer()
var io = socketio.listen(server, {
serveClient: false
, transports: ['websocket']
})
, channelRouter = new events.EventEmitter()
var channelRouter = new events.EventEmitter()
// Output
var push = zmqutil.socket('push')
@@ -89,12 +89,14 @@ module.exports = function(options) {
io.on('connection', function(socket) {
var req = socket.request
, user = req.user
, channels = []
var user = req.user
var channels = []
user.ip = socket.handshake.query.uip || req.ip
socket.emit('socket.ip', user.ip)
var messageListener = wirerouter()
function joinChannel(channel) {
channels.push(channel)
channelRouter.on(channel, messageListener)
@@ -118,7 +120,7 @@ module.exports = function(options) {
}
}
var messageListener = wirerouter()
messageListener
.on(wire.DeviceLogMessage, function(channel, message) {
socket.emit('device.log', message)
})
@@ -316,7 +318,7 @@ module.exports = function(options) {
return dbapi.loadDevice(data.serial)
})
.then(function(device) {
if(device) {
if (device) {
io.emit('device.change', {
important: true
, data: {
@@ -346,7 +348,7 @@ module.exports = function(options) {
})
var tokenId = util.format('%s-%s', uuid.v4(), uuid.v4()).replace(/-/g, '')
, title = data.title
var title = data.title
return dbapi.saveUserAccessToken(user.email, {
title: title
@@ -565,7 +567,7 @@ module.exports = function(options) {
)
])
})
.on('account.check', function(channel, responseChannel, data){
.on('account.check', function(channel, responseChannel, data) {
joinChannel(responseChannel)
push.send([
channel
@@ -890,7 +892,7 @@ module.exports = function(options) {
)
])
})
.on('fs.list', function(channel, responseChannel, data){
.on('fs.list', function(channel, responseChannel, data) {
joinChannel(responseChannel)
push.send([
channel

2
lib/units/websocket/middleware/auth.js
View File

@@ -2,7 +2,7 @@ var dbapi = require('../../../db/api')
module.exports = function(socket, next) {
var req = socket.request
, token = req.session.jwt
var token = req.session.jwt
if (token) {
return dbapi.loadUser(token.email)
.then(function(user) {

2
lib/units/websocket/middleware/cookie-session.js
View File

@@ -4,7 +4,7 @@ module.exports = function(options) {
var session = cookieSession(options)
return function(socket, next) {
var req = socket.request
, res = Object.create(null)
var res = Object.create(null)
session(req, res, next)
}
}