Command line message as hex.

README.rst

@@ -70,7 +70,7 @@ messages are printed to standard output.
 .. code-block:: text
 
    $ mqttools subscribe /test/#
-   Connecting to 'broker.hivemq.com:1883'.
+   Connecting to 'localhost:1883'.
 
    Topic:   /test
    Message: 11
@@ -85,7 +85,7 @@ Connect to given MQTT broker and publish a message to a topic.
 .. code-block:: text
 
    $ mqttools publish /test/mqttools/foo bar
-   Connecting to 'broker.hivemq.com:1883'.
+   Connecting to 'localhost:1883'.
 
    Published 1 message(s) in 0 seconds from 1 concurrent task(s).
 
@@ -95,7 +95,7 @@ benchmark the client and the broker.
 .. code-block:: text
 
    $ mqttools publish --count 100 /test/mqttools/foo
-   Connecting to 'broker.hivemq.com:1883'.
+   Connecting to 'localhost:1883'.
 
    Published 100 message(s) in 0.39 seconds from 10 concurrent task(s).
 
@@ -142,7 +142,7 @@ An example connecting to an MQTT broker, subscribing to the topic
    import mqttools
 
    async def subscriber():
-       client = mqttools.Client('broker.hivemq.com', 1883)
+       client = mqttools.Client('localhost', 1883)
 
        await client.start()
        await client.subscribe('/test/#')
@@ -171,7 +171,7 @@ An example connecting to an MQTT broker and publishing the message
    import mqttools
 
    async def publisher():
-       client = mqttools.Client('broker.hivemq.com', 1883)
+       client = mqttools.Client('localhost', 1883)
 
        await client.start()
        client.publish('/test/mqttools/foo', b'bar')

mqttools/common.py

@@ -3,7 +3,7 @@
 import enum
 from io import BytesIO
 import bitstruct
-from binascii import hexlify
+import binascii
 
 
 # Connection flags.
@@ -16,6 +16,10 @@
 USER_NAME_FLAG = 0x80
 
 
+def hexlify(data):
+    return binascii.hexlify(data).decode('ascii').upper()
+
+
 # Control packet types.
 class ControlPacketType(enum.IntEnum):
     CONNECT     = 1
@@ -781,7 +785,7 @@ def format_connect(payload):
         f'  ClientId:    {client_id}',
         f'  CleanStart:  {clean_start}',
         f'  WillTopic:   {will_topic}',
-        f'  WillMessage: {will_message}',
+        f'  WillMessage: {hexlify(will_message)}',
         f'  KeepAlive:   {keep_alive_s}',
         f'  UserName:    {user_name}',
         f'  Password:    {password}'
@@ -808,7 +812,7 @@ def format_publish(flags, payload):
         f'  QoSLevel:   {qos}',
         f'  Retain:     {retain}',
         f'  Topic:      {topic}',
-        f'  Message:    {message}',
+        f'  Message:    {hexlify(message)}',
         '  Properties:'
     ] + format_properties(properties)
 

mqttools/subparsers/__init__.py

@@ -1,5 +0,0 @@
-def try_decode(data):
-    try:
-        return data.decode('utf-8')
-    except UnicodeDecodeError:
-        return data

mqttools/subparsers/monitor.py

@@ -10,6 +10,7 @@
 from queue import Empty as QueueEmpty
 
 from ..client import Client
+from ..common import hexlify
 
 
 class QuitError(Exception):
@@ -160,17 +161,10 @@ def try_update_message(self):
 
         lines = []
         row_length = max(1, self._ncols - 12)
+        message = hexlify(message)
 
-        try:
-            message = message.decode('utf-8')
-
-            for line in message.splitlines():
-                lines.extend(textwrap.wrap(line, row_length))
-        except UnicodeDecodeError:
-            message = str(message)
-
-            for i in range(0, len(message), row_length):
-                lines.append(message[i:i + row_length])
+        for i in range(0, len(message), row_length):
+            lines.append(message[i:i + row_length])
 
         formatted = [' {}  {}'.format(timestamp, topic)]
         formatted += [11 * ' ' + line for line in lines]
@@ -225,7 +219,7 @@ def add_subparser(subparsers):
     subparser = subparsers.add_parser('monitor',
                                       description='Monitor given topics.')
     subparser.add_argument('--host',
-                           default='broker.hivemq.com',
+                           default='localhost',
                            help='Broker host (default: %(default)s).')
     subparser.add_argument('--port',
                            type=int,

mqttools/subparsers/publish.py

@@ -1,11 +1,20 @@
 import asyncio
 import time
+import binascii
 from humanfriendly import format_timespan
 
 from ..client import Client
+from ..common import Error
 
 
-def create_message_bytes(message, size, number, fmt):
+def encode_message(message):
+    try:
+        return binascii.unhexlify(message)
+    except ValueError:
+        raise Error(f"Invalid hex string '{message}'.")
+
+
+def create_message(message, size, number, fmt):
     if message is None:
         message_bytes = fmt.format(number).encode('ascii')
         extra = (size - len(message_bytes))
@@ -15,7 +24,7 @@ def create_message_bytes(message, size, number, fmt):
         else:
             message_bytes = message_bytes[:size]
     else:
-        message_bytes = message.encode('ascii')
+        message_bytes = encode_message(message)
 
     return message_bytes
 
@@ -30,7 +39,7 @@ async def publisher(host,
                     topic,
                     message):
     if will_message is not None:
-        will_message = will_message.encode('utf-8')
+        will_message = encode_message(will_message)
 
     client = Client(host,
                     port,
@@ -47,7 +56,7 @@ async def publisher(host,
     start_time = time.time()
 
     for number in range(count):
-        message_bytes = create_message_bytes(message, size, number, fmt)
+        message_bytes = create_message(message, size, number, fmt)
         client.publish(topic, message_bytes)
 
     elapsed_time = format_timespan(time.time() - start_time)
@@ -72,7 +81,7 @@ def add_subparser(subparsers):
     subparser = subparsers.add_parser('publish',
                                       description='Publish given topic.')
     subparser.add_argument('--host',
-                           default='broker.hivemq.com',
+                           default='localhost',
                            help='Broker host (default: %(default)s).')
     subparser.add_argument('--port',
                            type=int,

mqttools/subparsers/subscribe.py

@@ -1,7 +1,7 @@
 import asyncio
 
 from ..client import Client
-from . import try_decode
+from ..common import hexlify
 
 
 async def subscriber(host, port, client_id, topic, keep_alive_s):
@@ -25,7 +25,7 @@ async def subscriber(host, port, client_id, topic, keep_alive_s):
                 break
 
             print(f'Topic:   {topic}')
-            print(f'Message: {try_decode(message)}')
+            print(f'Message: {hexlify(message)}')
 
         await client.stop()
 
@@ -42,7 +42,7 @@ def add_subparser(subparsers):
     subparser = subparsers.add_parser('subscribe',
                                       description='Subscribe for given topic.')
     subparser.add_argument('--host',
-                           default='broker.hivemq.com',
+                           default='localhost',
                            help='Broker host (default: %(default)s).')
     subparser.add_argument('--port',
                            type=int,

mqttools/version.py

@@ -1 +1 @@
-__version__ = '0.26.0'
+__version__ = '0.27.0'

tests/test_mqttools.py

@@ -232,7 +232,7 @@ def test_command_line_publish_qos_0(self):
             '--port', str(self.broker.address[1]),
             '--client-id', 'mqttools_publish',
             '/a/b',
-            'apa'
+            '617061'
         ]
 
         stdout = StringIO()