diff --git a/native-messaging/app/ping_pong.py b/native-messaging/app/ping_pong.py index 895d5e5..39e3d11 100755 --- a/native-messaging/app/ping_pong.py +++ b/native-messaging/app/ping_pong.py @@ -4,70 +4,33 @@ import sys import json import struct -try: - # Python 3.x version - # Read a message from stdin and decode it. - def getMessage(): - rawLength = sys.stdin.buffer.read(4) - if len(rawLength) == 0: - sys.exit(0) - messageLength = struct.unpack('@I', rawLength)[0] - message = sys.stdin.buffer.read(messageLength).decode('utf-8') - return json.loads(message) +# Read a message from stdin and decode it. +def getMessage(): + rawLength = sys.stdin.buffer.read(4) + if len(rawLength) == 0: + sys.exit(0) + messageLength = struct.unpack('@I', rawLength)[0] + message = sys.stdin.buffer.read(messageLength).decode('utf-8') + return json.loads(message) - # Encode a message for transmission, - # given its content. - def encodeMessage(messageContent): - # https://docs.python.org/3/library/json.html#basic-usage - # To get the most compact JSON representation, you should specify - # (',', ':') to eliminate whitespace. - # We want the most compact representation because the browser rejects - # messages that exceed 1 MB. - encodedContent = json.dumps(messageContent, separators=(',', ':')).encode('utf-8') - encodedLength = struct.pack('@I', len(encodedContent)) - return {'length': encodedLength, 'content': encodedContent} +# Encode a message for transmission, given its content. +def encodeMessage(messageContent): + # https://docs.python.org/3/library/json.html#basic-usage + # To get the most compact JSON representation, you should specify + # (',', ':') to eliminate whitespace. + # We want the most compact representation because the browser rejects + # messages that exceed 1 MB. + encodedContent = json.dumps(messageContent, separators=(',', ':')).encode('utf-8') + encodedLength = struct.pack('@I', len(encodedContent)) + return {'length': encodedLength, 'content': encodedContent} - # Send an encoded message to stdout - def sendMessage(encodedMessage): - sys.stdout.buffer.write(encodedMessage['length']) - sys.stdout.buffer.write(encodedMessage['content']) - sys.stdout.buffer.flush() +# Send an encoded message to stdout +def sendMessage(encodedMessage): + sys.stdout.buffer.write(encodedMessage['length']) + sys.stdout.buffer.write(encodedMessage['content']) + sys.stdout.buffer.flush() - while True: - receivedMessage = getMessage() - if receivedMessage == "ping": - sendMessage(encodeMessage("pong3")) - -except AttributeError: - # Python 2.x version (if sys.stdin.buffer is not defined) - # Read a message from stdin and decode it. - def getMessage(): - rawLength = sys.stdin.read(4) - if len(rawLength) == 0: - sys.exit(0) - messageLength = struct.unpack('@I', rawLength)[0] - message = sys.stdin.read(messageLength) - return json.loads(message) - - # Encode a message for transmission, - # given its content. - def encodeMessage(messageContent): - # https://docs.python.org/3/library/json.html#basic-usage - # To get the most compact JSON representation, you should specify - # (',', ':') to eliminate whitespace. - # We want the most compact representation because the browser rejects - # messages that exceed 1 MB. - encodedContent = json.dumps(messageContent, separators=(',', ':')) - encodedLength = struct.pack('@I', len(encodedContent)) - return {'length': encodedLength, 'content': encodedContent} - - # Send an encoded message to stdout - def sendMessage(encodedMessage): - sys.stdout.write(encodedMessage['length']) - sys.stdout.write(encodedMessage['content']) - sys.stdout.flush() - - while True: - receivedMessage = getMessage() - if receivedMessage == "ping": - sendMessage(encodeMessage("pong2")) +while True: + receivedMessage = getMessage() + if receivedMessage == "ping": + sendMessage(encodeMessage("pong"))