From b9ca8b04e1eee020715f6bef4389d7953394aa9f Mon Sep 17 00:00:00 2001 From: Simo Kinnunen Date: Sun, 2 Feb 2014 20:00:29 +0900 Subject: [PATCH] Make wireutil a bit more normal. It now requires wire on its own. --- lib/db/api.js | 2 +- lib/roles/app.js | 2 +- lib/roles/console.js | 2 +- lib/roles/device.js | 2 +- lib/roles/notify/hipchat.js | 2 +- lib/roles/processor.js | 2 +- lib/roles/provider.js | 2 +- lib/util/wireutil.js | 140 ------------------------------------ lib/wire/util.js | 140 ++++++++++++++++++++++++++++++++++++ 9 files changed, 147 insertions(+), 147 deletions(-) delete mode 100644 lib/util/wireutil.js create mode 100644 lib/wire/util.js diff --git a/lib/db/api.js b/lib/db/api.js index a4e11931..0d201ac7 100644 --- a/lib/db/api.js +++ b/lib/db/api.js @@ -2,7 +2,7 @@ var r = require('rethinkdb') var db = require('./') var wire = require('../wire') -var wireutil = require('../util/wireutil')(wire) +var wireutil = require('../wire/util') module.exports.saveUserAfterLogin = function(user) { return db.run(r.table('users').get(user.email).update({ diff --git a/lib/roles/app.js b/lib/roles/app.js index a77989a8..b6761d9a 100644 --- a/lib/roles/app.js +++ b/lib/roles/app.js @@ -11,7 +11,7 @@ var Promise = require('bluebird') var logger = require('../util/logger') var pathutil = require('../util/pathutil') var wire = require('../wire') -var wireutil = require('../util/wireutil')(wire) +var wireutil = require('../wire/util') var dbapi = require('../db/api') var auth = require('../middleware/auth') diff --git a/lib/roles/console.js b/lib/roles/console.js index d82758f9..1ee3746f 100644 --- a/lib/roles/console.js +++ b/lib/roles/console.js @@ -6,7 +6,7 @@ var Promise = require('bluebird') var logger = require('../util/logger') var tx = require('../util/tx') var wire = require('../wire') -var wireutil = require('../util/wireutil')(wire) +var wireutil = require('../wire/util') module.exports = function(options) { var log = logger.createLogger('console') diff --git a/lib/roles/device.js b/lib/roles/device.js index cc000147..5d48189d 100644 --- a/lib/roles/device.js +++ b/lib/roles/device.js @@ -12,7 +12,7 @@ var split = require('split') var logger = require('../util/logger') var wire = require('../wire') -var wireutil = require('../util/wireutil')(wire) +var wireutil = require('../wire/util') var wirerouter = require('../wire/router') var devutil = require('../util/devutil') var pathutil = require('../util/pathutil') diff --git a/lib/roles/notify/hipchat.js b/lib/roles/notify/hipchat.js index 223e3a20..efc58ca4 100644 --- a/lib/roles/notify/hipchat.js +++ b/lib/roles/notify/hipchat.js @@ -7,7 +7,7 @@ var zmq = require('zmq') var logger = require('../../util/logger') var wire = require('../../wire') var wirerouter = require('../../wire/router') -var wireutil = require('../../util/wireutil')(wire) +var wireutil = require('../../wire/util') module.exports = function(options) { var log = logger.createLogger('notify-hipchat') diff --git a/lib/roles/processor.js b/lib/roles/processor.js index e2943cdd..90ba6fba 100644 --- a/lib/roles/processor.js +++ b/lib/roles/processor.js @@ -3,7 +3,7 @@ var zmq = require('zmq') var logger = require('../util/logger') var wire = require('../wire') var wirerouter = require('../wire/router') -var wireutil = require('../util/wireutil')(wire) +var wireutil = require('../wire/util') var dbapi = require('../db/api') module.exports = function(options) { diff --git a/lib/roles/provider.js b/lib/roles/provider.js index 8a569202..bc661048 100644 --- a/lib/roles/provider.js +++ b/lib/roles/provider.js @@ -8,7 +8,7 @@ var _ = require('lodash') var logger = require('../util/logger') var wire = require('../wire') -var wireutil = require('../util/wireutil')(wire) +var wireutil = require('../wire/util') module.exports = function(options) { var log = logger.createLogger('provider') diff --git a/lib/util/wireutil.js b/lib/util/wireutil.js deleted file mode 100644 index 0fbf50dc..00000000 --- a/lib/util/wireutil.js +++ /dev/null @@ -1,140 +0,0 @@ -var uuid = require('node-uuid') - -module.exports = function(wire) { - var wireutil = { - global: '*ALL' - , log: '*LOG' - , makePrivateChannel: function() { - return uuid.v4(null, new Buffer(16)).toString('base64') - } - , toDeviceStatus: function(type) { - return wire.DeviceStatus[{ - device: 'ONLINE' - , emulator: 'ONLINE' - , unauthorized: 'UNAUTHORIZED' - , offline: 'OFFLINE' - , absent: 'ABSENT' - }[type]] - } - , envelope: function(type, message) { - return new wire.Envelope(type, message.encode()).encodeNB() - } - , makeDeviceLogMessage: function(serial, entry) { - var message = new wire.DeviceLogMessage( - serial - , entry.timestamp / 1000 - , entry.priority - , entry.tag - , entry.pid - , entry.message - , entry.identifier - ) - - return wireutil.envelope(wire.MessageType.DeviceLogMessage, message) - } - , makeGroupMessage: function(channel, timeout, requirements) { - var message = new wire.GroupMessage( - channel - , timeout - , requirements - ) - - return wireutil.envelope(wire.MessageType.GroupMessage, message) - } - , makeUngroupMessage: function(requirements) { - var message = new wire.UngroupMessage(requirements) - return wireutil.envelope(wire.MessageType.UngroupMessage, message) - } - , makeJoinGroupMessage: function(serial) { - var message = new wire.JoinGroupMessage(serial) - return wireutil.envelope(wire.MessageType.JoinGroupMessage, message) - } - , makeLeaveGroupMessage: function(serial) { - var message = new wire.LeaveGroupMessage(serial) - return wireutil.envelope(wire.MessageType.LeaveGroupMessage, message) - } - , makeDevicePokeMessage: function(serial, channel) { - var message = new wire.DevicePokeMessage(serial, channel) - return wireutil.envelope(wire.MessageType.DevicePokeMessage, message) - } - , makeDeviceIdentityMessage: function(serial, identity) { - var message = new wire.DeviceIdentityMessage( - serial - , identity.platform - , identity.manufacturer - , identity.operator - , identity.model - , identity.version - , identity.abi - , identity.sdk - , new wire.DeviceDisplayMessage( - identity.display.id - , identity.display.width - , identity.display.height - , identity.display.orientation - , identity.display.xdpi - , identity.display.ydpi - , identity.display.fps - , identity.display.density - , identity.display.secure - , identity.display.url - ) - ) - - return wireutil.envelope(wire.MessageType.DeviceIdentityMessage, message) - } - , makeDevicePropertiesMessage: function(serial, properties) { - var message = new wire.DevicePropertiesMessage( - serial - , Object.keys(properties).map(function(key) { - return new wire.DeviceProperty(key, properties[key]) - }) - ) - - return wireutil.envelope( - wire.MessageType.DevicePropertiesMessage - , message - ) - } - , makeDeviceStatusMessage: function(serial, type, provider) { - var message = new wire.DeviceStatusMessage( - serial - , wireutil.toDeviceStatus(type) - , provider - ) - - return wireutil.envelope(wire.MessageType.DeviceStatusMessage, message) - } - , makeProbeMessage: function() { - var message = new wire.ProbeMessage() - return wireutil.envelope(wire.MessageType.ProbeMessage, message) - } - , makeShellCommandMessage: function(channel, command) { - var message = new wire.ShellCommandMessage(channel, command) - return wireutil.envelope(wire.MessageType.ShellCommandMessage, message) - } - , makeShellCommandDataMessage: function(serial, seq, chunk) { - var message = new wire.ShellCommandDataMessage(serial, seq, chunk) - return wireutil.envelope( - wire.MessageType.ShellCommandDataMessage - , message - ) - } - , makeShellCommandDoneMessage: function(serial) { - var message = new wire.ShellCommandDoneMessage(serial) - return wireutil.envelope( - wire.MessageType.ShellCommandDoneMessage - , message - ) - } - , makeShellCommandFailMessage: function(serial, reason) { - var message = new wire.ShellCommandFailMessage(serial, reason) - return wireutil.envelope( - wire.MessageType.ShellCommandFailMessage - , message - ) - } - } - - return wireutil -} diff --git a/lib/wire/util.js b/lib/wire/util.js new file mode 100644 index 00000000..638b221a --- /dev/null +++ b/lib/wire/util.js @@ -0,0 +1,140 @@ +var uuid = require('node-uuid') + +var wire = require('./') + +var wireutil = { + global: '*ALL' +, log: '*LOG' +, makePrivateChannel: function() { + return uuid.v4(null, new Buffer(16)).toString('base64') + } +, toDeviceStatus: function(type) { + return wire.DeviceStatus[{ + device: 'ONLINE' + , emulator: 'ONLINE' + , unauthorized: 'UNAUTHORIZED' + , offline: 'OFFLINE' + , absent: 'ABSENT' + }[type]] + } +, envelope: function(type, message) { + return new wire.Envelope(type, message.encode()).encodeNB() + } +, makeDeviceLogMessage: function(serial, entry) { + var message = new wire.DeviceLogMessage( + serial + , entry.timestamp / 1000 + , entry.priority + , entry.tag + , entry.pid + , entry.message + , entry.identifier + ) + + return wireutil.envelope(wire.MessageType.DeviceLogMessage, message) + } +, makeGroupMessage: function(channel, timeout, requirements) { + var message = new wire.GroupMessage( + channel + , timeout + , requirements + ) + + return wireutil.envelope(wire.MessageType.GroupMessage, message) + } +, makeUngroupMessage: function(requirements) { + var message = new wire.UngroupMessage(requirements) + return wireutil.envelope(wire.MessageType.UngroupMessage, message) + } +, makeJoinGroupMessage: function(serial) { + var message = new wire.JoinGroupMessage(serial) + return wireutil.envelope(wire.MessageType.JoinGroupMessage, message) + } +, makeLeaveGroupMessage: function(serial) { + var message = new wire.LeaveGroupMessage(serial) + return wireutil.envelope(wire.MessageType.LeaveGroupMessage, message) + } +, makeDevicePokeMessage: function(serial, channel) { + var message = new wire.DevicePokeMessage(serial, channel) + return wireutil.envelope(wire.MessageType.DevicePokeMessage, message) + } +, makeDeviceIdentityMessage: function(serial, identity) { + var message = new wire.DeviceIdentityMessage( + serial + , identity.platform + , identity.manufacturer + , identity.operator + , identity.model + , identity.version + , identity.abi + , identity.sdk + , new wire.DeviceDisplayMessage( + identity.display.id + , identity.display.width + , identity.display.height + , identity.display.orientation + , identity.display.xdpi + , identity.display.ydpi + , identity.display.fps + , identity.display.density + , identity.display.secure + , identity.display.url + ) + ) + + return wireutil.envelope(wire.MessageType.DeviceIdentityMessage, message) + } +, makeDevicePropertiesMessage: function(serial, properties) { + var message = new wire.DevicePropertiesMessage( + serial + , Object.keys(properties).map(function(key) { + return new wire.DeviceProperty(key, properties[key]) + }) + ) + + return wireutil.envelope( + wire.MessageType.DevicePropertiesMessage + , message + ) + } +, makeDeviceStatusMessage: function(serial, type, provider) { + var message = new wire.DeviceStatusMessage( + serial + , wireutil.toDeviceStatus(type) + , provider + ) + + return wireutil.envelope(wire.MessageType.DeviceStatusMessage, message) + } +, makeProbeMessage: function() { + var message = new wire.ProbeMessage() + return wireutil.envelope(wire.MessageType.ProbeMessage, message) + } +, makeShellCommandMessage: function(channel, command) { + var message = new wire.ShellCommandMessage(channel, command) + return wireutil.envelope(wire.MessageType.ShellCommandMessage, message) + } +, makeShellCommandDataMessage: function(serial, seq, chunk) { + var message = new wire.ShellCommandDataMessage(serial, seq, chunk) + return wireutil.envelope( + wire.MessageType.ShellCommandDataMessage + , message + ) + } +, makeShellCommandDoneMessage: function(serial) { + var message = new wire.ShellCommandDoneMessage(serial) + return wireutil.envelope( + wire.MessageType.ShellCommandDoneMessage + , message + ) + } +, makeShellCommandFailMessage: function(serial, reason) { + var message = new wire.ShellCommandFailMessage(serial, reason) + return wireutil.envelope( + wire.MessageType.ShellCommandFailMessage + , message + ) + } +} + +module.exports = wireutil