APKs can now be drag & dropped to the device screen, which will install the application. Still lacking UI, and the app doesn't get launched.

This commit is contained in:
Simo Kinnunen
2014-03-20 22:00:01 +09:00
parent 5771507fc9
commit dfe3d97de3
12 changed files with 280 additions and 8 deletions

View File

@@ -7,6 +7,7 @@ var validator = require('express-validator')
var socketio = require('socket.io')
var zmq = require('zmq')
var Promise = require('bluebird')
var httpProxy = require('http-proxy')
var _ = require('lodash')
var logger = require('../util/logger')
@@ -20,14 +21,17 @@ var datautil = require('../util/datautil')
var auth = require('../middleware/auth')
var webpack = require('../middleware/webpack')
var cors = require('cors')
module.exports = function(options) {
var log = logger.createLogger('app')
, app = express()
, server = http.createServer(app)
, io = socketio.listen(server)
, channelRouter = new events.EventEmitter()
, proxy = httpProxy.createProxyServer()
proxy.on('error', function(err) {
log.error('Proxy had an error', err.stack)
})
app.set('view engine', 'jade')
app.set('views', pathutil.resource('app/views'))
@@ -38,8 +42,6 @@ module.exports = function(options) {
io.set('log level', 1)
io.set('browser client', false)
app.use(cors())
app.use('/static/bower_components',
express.static(pathutil.resource('bower_components')))
app.use('/static/data', express.static(pathutil.resource('data')))
@@ -181,6 +183,18 @@ module.exports = function(options) {
})
})
app.post('/api/v1/resources', function(req, res) {
proxy.web(req, res, {
target: options.storageUrl
})
})
app.get('/api/v1/resources/:id', function(req, res) {
proxy.web(req, res, {
target: options.storageUrl
})
})
io.set('authorization', (function() {
var parse = Promise.promisify(express.cookieParser(options.secret))
return function(handshake, accept) {
@@ -387,6 +401,16 @@ module.exports = function(options) {
, wireutil.envelope(new wire.ShellKeepAliveMessage(data))
])
})
.on('device.install', function(channel, responseChannel, data) {
joinChannel(responseChannel)
push.send([
channel
, wireutil.transaction(
responseChannel
, new wire.InstallMessage(data)
)
])
})
})
.finally(function() {
// Clean up all listeners and subscriptions

View File

@@ -21,6 +21,7 @@ module.exports = function(options) {
.dependency(require('./device/plugins/logcat'))
.dependency(require('./device/plugins/shell'))
.dependency(require('./device/plugins/touch'))
.dependency(require('./device/plugins/install'))
.dependency(require('./device/plugins/owner'))
.define(function(options, solo) {
if (process.send) {

View File

@@ -0,0 +1,46 @@
var stream = require('stream')
var syrup = require('syrup')
var request = require('request')
var logger = require('../../../util/logger')
var wire = require('../../../wire')
var wireutil = require('../../../wire/util')
module.exports = syrup.serial()
.dependency(require('../support/adb'))
.dependency(require('../support/router'))
.dependency(require('../support/push'))
.define(function(options, adb, router, push) {
var log = logger.createLogger('device:plugins:install')
router.on(wire.InstallMessage, function(channel, message) {
log.info('Installing "%s"', message.url)
var source = new stream.Readable().wrap(request(message.url))
var seq = 0
adb.install(options.serial, source)
.then(function() {
log.info('Installed "%s"', message.url)
push.send([
channel
, wireutil.envelope(new wire.TransactionDoneMessage(
options.serial
, seq++
, true
))
])
})
.catch(function(err) {
log.error('Installation failed', err.stack)
push.send([
channel
, wireutil.envelope(new wire.TransactionDoneMessage(
options.serial
, seq++
, false
, err.message
))
])
})
})
})

71
lib/roles/storage/temp.js Normal file
View File

@@ -0,0 +1,71 @@
var http = require('http')
var util = require('util')
var express = require('express')
var formidable = require('formidable')
var Promise = require('bluebird')
var logger = require('../../util/logger')
var Storage = require('../../util/storage')
module.exports = function(options) {
var log = logger.createLogger('storage-temp')
, app = express()
, server = http.createServer(app)
, storage = new Storage()
app.set('strict routing', true)
app.set('case sensitive routing', true)
app.set('trust proxy', true)
app.use(express.json())
app.use(express.urlencoded())
storage.on('timeout', function(id) {
log.info('Cleaning up inactive resource "%s"', id)
})
app.post('/api/v1/resources', function(req, res) {
var form = Promise.promisifyAll(new formidable.IncomingForm())
form.parseAsync(req)
.spread(function(fields, files) {
if (files.file) {
var id = storage.store(files.file)
res.json(201, {
success: true
, url: util.format(
'http://%s:%s/api/v1/resources/%s'
, options.publicIp
, options.port
, id
)
})
}
else {
res.json(400, {
success: false
})
}
})
.catch(function(err) {
log.error('Failed to save resource: ', err.stack)
res.json(500, {
success: false
})
})
})
app.get('/api/v1/resources/:id', function(req, res) {
var file = storage.retrieve(req.params.id)
if (file) {
res.set('Content-Type', file.type)
res.sendfile(file.path)
}
else {
res.send(404)
}
})
server.listen(options.port)
log.info('Listening on port %d', options.port)
}