From: Christopher Date: Fri, 17 Apr 2020 00:14:59 +0000 (-0500) Subject: use msgpax lib X-Git-Url: http://git.entropealabs.com/?a=commitdiff_plain;h=025c0a17c5889a833b654edb57aed2c22e86c71b;p=wampex.git use msgpax lib --- diff --git a/lib/serializers/message_pack.ex b/lib/serializers/message_pack.ex index 107441a..6e82d5f 100644 --- a/lib/serializers/message_pack.ex +++ b/lib/serializers/message_pack.ex @@ -5,16 +5,11 @@ defmodule Wampex.Serializers.MessagePack do @impl true def data_type, do: :binary @impl true - def serialize!(data), do: :msgpack.pack(data, [{:pack_str, :from_binary}]) + def serialize!(data), do: Msgpax.pack!(data) @impl true - def serialize(data), do: {:ok, :msgpack.pack(data, [{:pack_str, :from_binary}])} + def serialize(data), do: Msgpax.pack(data) @impl true - def deserialize!(data) do - {:ok, res} = :msgpack.unpack(data, [{:validate_string, true}, {:unpack_str, :as_binary}]) - res - end - + def deserialize!(data), do: Msgpax.unpack!(data) @impl true - def deserialize(data), - do: :msgpack.unpack(data, [{:validate_string, true}, {:unpack_str, :as_binary}]) + def deserialize(data), do: Msgpax.unpack(data) end diff --git a/mix.exs b/mix.exs index a9756d7..a6834ec 100644 --- a/mix.exs +++ b/mix.exs @@ -41,6 +41,7 @@ defmodule Wampex.MixProject do {:ex_doc, "~> 0.21", only: :dev, runtime: false}, {:excoveralls, "~> 0.12.2", only: [:dev, :test], runtime: false}, {:jason, "~> 1.1"}, + {:msgpax, "~> 2.2"}, {:msgpack, "~> 0.7.0"}, {:pbkdf2, "~> 2.0"} ] diff --git a/mix.lock b/mix.lock index 3bae761..9c0017e 100644 --- a/mix.lock +++ b/mix.lock @@ -31,6 +31,7 @@ "mime": {:hex, :mime, "1.3.1", "30ce04ab3175b6ad0bdce0035cba77bba68b813d523d1aac73d9781b4d193cf8", [:mix], [], "hexpm", "6cbe761d6a0ca5a31a0931bf4c63204bceb64538e664a8ecf784a9a6f3b875f1"}, "mimerl": {:hex, :mimerl, "1.2.0", "67e2d3f571088d5cfd3e550c383094b47159f3eee8ffa08e64106cdf5e981be3", [:rebar3], [], "hexpm", "f278585650aa581986264638ebf698f8bb19df297f66ad91b18910dfc6e19323"}, "msgpack": {:hex, :msgpack, "0.7.0", "128ae0a2227c7e7a2847c0f0f73551c268464f8c1ee96bffb920bc0a5712b295", [:rebar3], [], "hexpm", "4649353da003e6f438d105e4b1e0f17757f6f5ec8687a6f30875ff3ac4ce2a51"}, + "msgpax": {:hex, :msgpax, "2.2.4", "7b3790ef684089076b63c0f08c2f4b079c6311daeb006b69e4ed2bf67518291e", [:mix], [{:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "b351b6d992d79624a8430a99d21a41b36b1b90edf84326a294e9f4a2de11f089"}, "nimble_parsec": {:hex, :nimble_parsec, "0.5.3", "def21c10a9ed70ce22754fdeea0810dafd53c2db3219a0cd54cf5526377af1c6", [:mix], [], "hexpm", "589b5af56f4afca65217a1f3eb3fee7e79b09c40c742fddc1c312b3ac0b3399f"}, "parse_trans": {:hex, :parse_trans, "3.3.0", "09765507a3c7590a784615cfd421d101aec25098d50b89d7aa1d66646bc571c1", [:rebar3], [], "hexpm", "17ef63abde837ad30680ea7f857dd9e7ced9476cdd7b0394432af4bfc241b960"}, "pbkdf2": {:hex, :pbkdf2, "2.0.0", "11c23279fded5c0027ab3996cfae77805521d7ef4babde2bd7ec04a9086cf499", [:rebar3], [], "hexpm", "1e793ce6fdb0576613115714deae9dfc1d1537eaba74f07efb36de139774488d"},