From 21334a4d0a9e46f2551ea79742485931294bc221 Mon Sep 17 00:00:00 2001 From: Karchnu Date: Wed, 2 Dec 2020 16:23:27 +0100 Subject: [PATCH] CBOR messages. --- src/ipc/message.cr | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/src/ipc/message.cr b/src/ipc/message.cr index eff8eb4..07479fd 100644 --- a/src/ipc/message.cr +++ b/src/ipc/message.cr @@ -1,3 +1,4 @@ +require "cbor" require "json" # JSON is currently used for messages over websockets @@ -9,6 +10,8 @@ class IPC::Message property utype : UInt8 # libipc user message type property payload : Bytes + + # Clients send and receive JSON (or CBOR) payloads. struct JSONMessage include JSON::Serializable @@ -20,16 +23,37 @@ class IPC::Message end end - def self.from_json (str : String) + def self.from_json (str : String) : IPC::Message jsonmessage = JSONMessage.from_json str - IPC::Message.new 0, jsonmessage.mtype, jsonmessage.utype, jsonmessage.payload end - def to_json + def to_json : String JSONMessage.new(@utype, String.new(@payload), @mtype).to_json end + struct CBORMessage + include CBOR::Serializable + + property mtype : UInt8 = 1 # libipc message type + property utype : UInt8 # libipc user message type + property payload : Bytes + + def initialize(@utype, @payload, @mtype = 1) + end + end + + def self.from_cbor (m : Bytes) : IPC::Message + cbor_message = CBORMessage.from_cbor m + IPC::Message.new 0, cbor_message.mtype, cbor_message.utype, cbor_message.payload + end + + def to_cbor : Bytes + CBORMessage.new(@utype, @payload, @mtype).to_cbor + end + + + def initialize(message : Pointer(LibIPC::Message)) if message.null? @mtype = LibIPC::MessageType::Error.to_u8