Use wireutil.reply() where possible.

lib/roles/app.js

@@ -474,16 +474,12 @@ module.exports = function(options) {
               }
             })
             .catch(function(err) {
+              var reply = wireutil.reply('storage')
               log.error('Storage upload had an error', err.stack)
               leaveChannel(responseChannel)
               push.send([
                 channel
-              , wireutil.envelope(new wire.TransactionDoneMessage(
+              , reply.fail('fail')
-                  'storage'
-                , 0
-                , false
-                , 'fail'
-                ))
               ])
             })
         })

lib/roles/device/plugins/clipboard.js

@@ -13,57 +13,38 @@ module.exports = syrup.serial()
 
     router.on(wire.PasteMessage, function(channel, message) {
       log.info('Pasting "%s" to clipboard', message.text)
-      var seq = 0
+      var reply = wireutil.reply(options.serial)
       input.paste(message.text)
         .then(function() {
           push.send([
             channel
-          , wireutil.envelope(new wire.TransactionDoneMessage(
+          , reply.okay()
-              options.serial
-            , seq++
-            , true
-            ))
           ])
         })
         .catch(function(err) {
           log.error('Paste failed', err.stack)
           push.send([
             channel
-          , wireutil.envelope(new wire.TransactionDoneMessage(
+          , reply.fail(err.message)
-              options.serial
-            , seq++
-            , false
-            , err.message
-            ))
           ])
         })
     })
 
     router.on(wire.CopyMessage, function(channel) {
       log.info('Copying clipboard contents')
-      var seq = 0
+      var reply = wireutil.reply(options.serial)
       input.copy()
         .then(function(content) {
           push.send([
             channel
-          , wireutil.envelope(new wire.TransactionDoneMessage(
+          , reply.okay(content)
-              options.serial
-            , seq++
-            , true
-            , content
-            ))
           ])
         })
         .catch(function(err) {
           log.error('Copy failed', err.stack)
           push.send([
             channel
-          , wireutil.envelope(new wire.TransactionDoneMessage(
+          , reply.fail(err.message)
-              options.serial
-            , seq++
-            , false
-            , err.message
-            ))
           ])
         })
     })

lib/roles/device/plugins/input.js

@@ -337,14 +337,11 @@ module.exports = syrup.serial()
       .then(function() {
         router
           .on(wire.PhysicalIdentifyMessage, function(channel) {
+            var reply = wireutil.reply(options.serial)
             identity()
             push.send([
               channel
-            , wireutil.envelope(new wire.TransactionDoneMessage(
+            , reply.okay()
-                options.serial
-              , 0
-              , true
-              ))
             ])
           })
           .on(wire.KeyDownMessage, function(channel, message) {

lib/roles/device/plugins/install.js

@@ -19,17 +19,12 @@ module.exports = syrup.serial()
     router.on(wire.InstallMessage, function(channel, message) {
       log.info('Installing "%s"', message.url)
 
-      var seq = 0
+      var reply = wireutil.reply(options.serial)
 
       function sendProgress(data, progress) {
         push.send([
           channel
-        , wireutil.envelope(new wire.TransactionProgressMessage(
+        , reply.progress(data, progress)
-            options.serial
-          , seq++
-          , data
-          , progress
-          ))
         ])
       }
 
@@ -124,24 +119,14 @@ module.exports = syrup.serial()
         .then(function() {
           push.send([
             channel
-          , wireutil.envelope(new wire.TransactionDoneMessage(
+          , reply.okay('success')
-              options.serial
-            , seq++
-            , true
-            , 'success'
-            ))
           ])
         })
         .catch(function(err) {
           log.error('Installation failed', err.stack)
           push.send([
             channel
-          , wireutil.envelope(new wire.TransactionDoneMessage(
+          , reply.fail('fail')
-              options.serial
-            , seq++
-            , false
-            , 'fail'
-            ))
           ])
         })
     })
@@ -149,30 +134,20 @@ module.exports = syrup.serial()
     router.on(wire.UninstallMessage, function(channel, message) {
       log.info('Uninstalling "%s"', message.packageName)
 
-      var seq = 0
+      var reply = wireutil.reply(options.serial)
 
       adb.uninstall(options.serial, message.packageName)
         .then(function() {
           push.send([
             channel
-          , wireutil.envelope(new wire.TransactionDoneMessage(
+          , reply.okay('success')
-              options.serial
-            , seq++
-            , true
-            , 'success'
-            ))
           ])
         })
         .catch(function(err) {
           log.error('Uninstallation failed', err.stack)
           push.send([
             channel
-          , wireutil.envelope(new wire.TransactionDoneMessage(
+          , reply.fail('fail')
-              options.serial
-            , seq++
-            , false
-            , 'fail'
-            ))
           ])
         })
     })

lib/roles/device/plugins/owner.js

@@ -68,63 +68,43 @@ module.exports = syrup.serial()
 
     router
       .on(wire.GroupMessage, function(channel, message) {
-        var seq = 0
+        var reply = wireutil.reply(options.serial)
         if (devutil.matchesRequirements(identity, message.requirements)) {
           if (!isGrouped()) {
             joinGroup(message.owner, message.timeout)
             push.send([
               channel
-            , wireutil.envelope(new wire.TransactionDoneMessage(
+            , reply.okay()
-                options.serial
-              , seq++
-              , true
-              ))
             ])
           }
           else if (isOwnedBy(message.owner)) {
             push.send([
               channel
-            , wireutil.envelope(new wire.TransactionDoneMessage(
+            , reply.okay()
-                options.serial
-              , seq++
-              , true
-              ))
             ])
           }
           else {
             push.send([
               channel
-            , wireutil.envelope(new wire.TransactionDoneMessage(
+            , reply.fail()
-                options.serial
-              , seq++
-              , false
-              ))
             ])
           }
         }
       })
       .on(wire.UngroupMessage, function(channel, message) {
-        var seq = 0
+        var reply = wireutil.reply(options.serial)
         if (devutil.matchesRequirements(identity, message.requirements)) {
           if (isGrouped()) {
             leaveGroup()
             push.send([
               channel
-            , wireutil.envelope(new wire.TransactionDoneMessage(
+            , reply.okay()
-                options.serial
-              , seq++
-              , true
-              ))
             ])
           }
           else {
             push.send([
               channel
-            , wireutil.envelope(new wire.TransactionDoneMessage(
+            , reply.okay()
-                options.serial
-              , seq++
-              , true
-              ))
             ])
           }
         }

lib/roles/device/plugins/shell.js

@@ -14,7 +14,7 @@ module.exports = syrup.serial()
     var log = logger.createLogger('device:plugins:shell')
 
     router.on(wire.ShellCommandMessage, function(channel, message) {
-      var seq = 0
+      var reply = wireutil.reply(options.serial)
 
       log.info('Running shell command "%s"', message.command)
 
@@ -34,11 +34,7 @@ module.exports = syrup.serial()
             while ((chunk = stream.read())) {
               push.send([
                 channel
-              , wireutil.envelope(new wire.TransactionProgressMessage(
+              , reply.progress(chunk)
-                  options.serial
-                , seq++
-                , chunk
-                ))
               ])
             }
           }
@@ -46,11 +42,7 @@ module.exports = syrup.serial()
           function endListener() {
             push.send([
               channel
-            , wireutil.envelope(new wire.TransactionDoneMessage(
+            , reply.okay()
-                options.serial
-              , seq++
-              , true
-              ))
             ])
             resolver.resolve()
           }
@@ -85,12 +77,7 @@ module.exports = syrup.serial()
           log.error('Shell command "%s" failed', message.command, err.stack)
           push.send([
             channel
-          , wireutil.envelope(new wire.TransactionDoneMessage(
+          , reply.fail(err.message)
-              options.serial
-            , seq++
-            , false
-            , err.message
-            ))
           ])
         })
     })

lib/roles/storage/temp.js

@@ -15,7 +15,6 @@ var zmq = require('zmq')
 var logger = require('../../util/logger')
 var requtil = require('../../util/requtil')
 var Storage = require('../../util/storage')
-var wire = require('../../wire')
 var wireutil = require('../../wire/util')
 
 module.exports = function(options) {
@@ -129,18 +128,13 @@ module.exports = function(options) {
   }
 
   app.post('/api/v1/resources', function(req, res) {
-    var seq = 0
+    var reply = wireutil.reply(options.id)
 
     function sendProgress(data, progress) {
       if (req.query.channel) {
         push.send([
           req.query.channel
-        , wireutil.envelope(new wire.TransactionProgressMessage(
+        , reply.progress(data, progress)
-            options.id
-          , seq++
-          , data
-          , progress
-          ))
         ])
       }
     }
@@ -149,13 +143,7 @@ module.exports = function(options) {
       if (req.query.channel) {
         push.send([
           req.query.channel
-        , wireutil.envelope(new wire.TransactionDoneMessage(
+        , reply.okay(data, body)
-            options.id
-          , seq++
-          , success
-          , data
-          , body ? JSON.stringify(body) : null
-          ))
         ])
       }
     }

lib/wire/util.js

@@ -37,7 +37,7 @@ var wireutil = {
       )
       .encodeNB()
   }
-, response: function(source) {
+, reply: function(source) {
     var seq = 0
     return {
       okay: function(data, body) {