First commit of what proto_json, which is to complement proto_bert. Now sends commands from client to server. Server to client does not yet work

10 files changed, 750 insertions, 0 deletions

diff --git a/components/proto_json/.gitignore b/components/proto_json/.gitignore
new file mode 100644
index 0000000..cfb2329
--- /dev/null
+++ b/components/proto_json/.gitignore
@@ -0,0 +1 @@
+ebin
diff --git a/components/proto_json/LICENSE b/components/proto_json/LICENSE
new file mode 100644
index 0000000..c33dcc7
--- /dev/null
+++ b/components/proto_json/LICENSE
@@ -0,0 +1,354 @@
+Mozilla Public License, version 2.0
+
+1. Definitions
+
+1.1. “Contributor”
+
+     means each individual or legal entity that creates, contributes to the
+     creation of, or owns Covered Software.
+
+1.2. “Contributor Version”
+
+     means the combination of the Contributions of others (if any) used by a
+     Contributor and that particular Contributor’s Contribution.
+
+1.3. “Contribution”
+
+     means Covered Software of a particular Contributor.
+
+1.4. “Covered Software”
+
+     means Source Code Form to which the initial Contributor has attached the
+     notice in Exhibit A, the Executable Form of such Source Code Form, and
+     Modifications of such Source Code Form, in each case including portions
+     thereof.
+
+1.5. “Incompatible With Secondary Licenses”
+     means
+
+     a. that the initial Contributor has attached the notice described in
+        Exhibit B to the Covered Software; or
+
+     b. that the Covered Software was made available under the terms of version
+        1.1 or earlier of the License, but not also under the terms of a
+        Secondary License.
+
+1.6. “Executable Form”
+
+     means any form of the work other than Source Code Form.
+
+1.7. “Larger Work”
+
+     means a work that combines Covered Software with other material, in a separate
+     file or files, that is not Covered Software.
+
+1.8. “License”
+
+     means this document.
+
+1.9. “Licensable”
+
+     means having the right to grant, to the maximum extent possible, whether at the
+     time of the initial grant or subsequently, any and all of the rights conveyed by
+     this License.
+
+1.10. “Modifications”
+
+     means any of the following:
+
+     a. any file in Source Code Form that results from an addition to, deletion
+        from, or modification of the contents of Covered Software; or
+
+     b. any new file in Source Code Form that contains any Covered Software.
+
+1.11. “Patent Claims” of a Contributor
+
+      means any patent claim(s), including without limitation, method, process,
+      and apparatus claims, in any patent Licensable by such Contributor that
+      would be infringed, but for the grant of the License, by the making,
+      using, selling, offering for sale, having made, import, or transfer of
+      either its Contributions or its Contributor Version.
+
+1.12. “Secondary License”
+
+      means either the GNU General Public License, Version 2.0, the GNU Lesser
+      General Public License, Version 2.1, the GNU Affero General Public
+      License, Version 3.0, or any later versions of those licenses.
+
+1.13. “Source Code Form”
+
+      means the form of the work preferred for making modifications.
+
+1.14. “You” (or “Your”)
+
+      means an individual or a legal entity exercising rights under this
+      License. For legal entities, “You” includes any entity that controls, is
+      controlled by, or is under common control with You. For purposes of this
+      definition, “control” means (a) the power, direct or indirect, to cause
+      the direction or management of such entity, whether by contract or
+      otherwise, or (b) ownership of more than fifty percent (50%) of the
+      outstanding shares or beneficial ownership of such entity.
+
+
+2. License Grants and Conditions
+
+2.1. Grants
+
+     Each Contributor hereby grants You a world-wide, royalty-free,
+     non-exclusive license:
+
+     a. under intellectual property rights (other than patent or trademark)
+        Licensable by such Contributor to use, reproduce, make available,
+        modify, display, perform, distribute, and otherwise exploit its
+        Contributions, either on an unmodified basis, with Modifications, or as
+        part of a Larger Work; and
+
+     b. under Patent Claims of such Contributor to make, use, sell, offer for
+        sale, have made, import, and otherwise transfer either its Contributions
+        or its Contributor Version.
+
+2.2. Effective Date
+
+     The licenses granted in Section 2.1 with respect to any Contribution become
+     effective for each Contribution on the date the Contributor first distributes
+     such Contribution.
+
+2.3. Limitations on Grant Scope
+
+     The licenses granted in this Section 2 are the only rights granted under this
+     License. No additional rights or licenses will be implied from the distribution
+     or licensing of Covered Software under this License. Notwithstanding Section
+     2.1(b) above, no patent license is granted by a Contributor:
+
+     a. for any code that a Contributor has removed from Covered Software; or
+
+     b. for infringements caused by: (i) Your and any other third party’s
+        modifications of Covered Software, or (ii) the combination of its
+        Contributions with other software (except as part of its Contributor
+        Version); or
+
+     c. under Patent Claims infringed by Covered Software in the absence of its
+        Contributions.
+
+     This License does not grant any rights in the trademarks, service marks, or
+     logos of any Contributor (except as may be necessary to comply with the
+     notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+     No Contributor makes additional grants as a result of Your choice to
+     distribute the Covered Software under a subsequent version of this License
+     (see Section 10.2) or under the terms of a Secondary License (if permitted
+     under the terms of Section 3.3).
+
+2.5. Representation
+
+     Each Contributor represents that the Contributor believes its Contributions
+     are its original creation(s) or it has sufficient rights to grant the
+     rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+     This License is not intended to limit any rights You have under applicable
+     copyright doctrines of fair use, fair dealing, or other equivalents.
+
+2.7. Conditions
+
+     Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
+     Section 2.1.
+
+
+3. Responsibilities
+
+3.1. Distribution of Source Form
+
+     All distribution of Covered Software in Source Code Form, including any
+     Modifications that You create or to which You contribute, must be under the
+     terms of this License. You must inform recipients that the Source Code Form
+     of the Covered Software is governed by the terms of this License, and how
+     they can obtain a copy of this License. You may not attempt to alter or
+     restrict the recipients’ rights in the Source Code Form.
+
+3.2. Distribution of Executable Form
+
+     If You distribute Covered Software in Executable Form then:
+
+     a. such Covered Software must also be made available in Source Code Form,
+        as described in Section 3.1, and You must inform recipients of the
+        Executable Form how they can obtain a copy of such Source Code Form by
+        reasonable means in a timely manner, at a charge no more than the cost
+        of distribution to the recipient; and
+
+     b. You may distribute such Executable Form under the terms of this License,
+        or sublicense it under different terms, provided that the license for
+        the Executable Form does not attempt to limit or alter the recipients’
+        rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+     You may create and distribute a Larger Work under terms of Your choice,
+     provided that You also comply with the requirements of this License for the
+     Covered Software. If the Larger Work is a combination of Covered Software
+     with a work governed by one or more Secondary Licenses, and the Covered
+     Software is not Incompatible With Secondary Licenses, this License permits
+     You to additionally distribute such Covered Software under the terms of
+     such Secondary License(s), so that the recipient of the Larger Work may, at
+     their option, further distribute the Covered Software under the terms of
+     either this License or such Secondary License(s).
+
+3.4. Notices
+
+     You may not remove or alter the substance of any license notices (including
+     copyright notices, patent notices, disclaimers of warranty, or limitations
+     of liability) contained within the Source Code Form of the Covered
+     Software, except that You may alter any license notices to the extent
+     required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+     You may choose to offer, and to charge a fee for, warranty, support,
+     indemnity or liability obligations to one or more recipients of Covered
+     Software. However, You may do so only on Your own behalf, and not on behalf
+     of any Contributor. You must make it absolutely clear that any such
+     warranty, support, indemnity, or liability obligation is offered by You
+     alone, and You hereby agree to indemnify every Contributor for any
+     liability incurred by such Contributor as a result of warranty, support,
+     indemnity or liability terms You offer. You may include additional
+     disclaimers of warranty and limitations of liability specific to any
+     jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+
+   If it is impossible for You to comply with any of the terms of this License
+   with respect to some or all of the Covered Software due to statute, judicial
+   order, or regulation then You must: (a) comply with the terms of this License
+   to the maximum extent possible; and (b) describe the limitations and the code
+   they affect. Such description must be placed in a text file included with all
+   distributions of the Covered Software under this License. Except to the
+   extent prohibited by statute or regulation, such description must be
+   sufficiently detailed for a recipient of ordinary skill to be able to
+   understand it.
+
+5. Termination
+
+5.1. The rights granted under this License will terminate automatically if You
+     fail to comply with any of its terms. However, if You become compliant,
+     then the rights granted under this License from a particular Contributor
+     are reinstated (a) provisionally, unless and until such Contributor
+     explicitly and finally terminates Your grants, and (b) on an ongoing basis,
+     if such Contributor fails to notify You of the non-compliance by some
+     reasonable means prior to 60 days after You have come back into compliance.
+     Moreover, Your grants from a particular Contributor are reinstated on an
+     ongoing basis if such Contributor notifies You of the non-compliance by
+     some reasonable means, this is the first time You have received notice of
+     non-compliance with this License from such Contributor, and You become
+     compliant prior to 30 days after Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+     infringement claim (excluding declaratory judgment actions, counter-claims,
+     and cross-claims) alleging that a Contributor Version directly or
+     indirectly infringes any patent, then the rights granted to You by any and
+     all Contributors for the Covered Software under Section 2.1 of this License
+     shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user
+     license agreements (excluding distributors and resellers) which have been
+     validly granted by You or Your distributors under this License prior to
+     termination shall survive termination.
+
+6. Disclaimer of Warranty
+
+   Covered Software is provided under this License on an “as is” basis, without
+   warranty of any kind, either expressed, implied, or statutory, including,
+   without limitation, warranties that the Covered Software is free of defects,
+   merchantable, fit for a particular purpose or non-infringing. The entire
+   risk as to the quality and performance of the Covered Software is with You.
+   Should any Covered Software prove defective in any respect, You (not any
+   Contributor) assume the cost of any necessary servicing, repair, or
+   correction. This disclaimer of warranty constitutes an essential part of this
+   License. No use of  any Covered Software is authorized under this License
+   except under this disclaimer.
+
+7. Limitation of Liability
+
+   Under no circumstances and under no legal theory, whether tort (including
+   negligence), contract, or otherwise, shall any Contributor, or anyone who
+   distributes Covered Software as permitted above, be liable to You for any
+   direct, indirect, special, incidental, or consequential damages of any
+   character including, without limitation, damages for lost profits, loss of
+   goodwill, work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses, even if such party shall have been
+   informed of the possibility of such damages. This limitation of liability
+   shall not apply to liability for death or personal injury resulting from such
+   party’s negligence to the extent applicable law prohibits such limitation.
+   Some jurisdictions do not allow the exclusion or limitation of incidental or
+   consequential damages, so this exclusion and limitation may not apply to You.
+
+8. Litigation
+
+   Any litigation relating to this License may be brought only in the courts of
+   a jurisdiction where the defendant maintains its principal place of business
+   and such litigation shall be governed by laws of that jurisdiction, without
+   reference to its conflict-of-law provisions. Nothing in this Section shall
+   prevent a party’s ability to bring cross-claims or counter-claims.
+
+9. Miscellaneous
+
+   This License represents the complete agreement concerning the subject matter
+   hereof. If any provision of this License is held to be unenforceable, such
+   provision shall be reformed only to the extent necessary to make it
+   enforceable. Any law or regulation which provides that the language of a
+   contract shall be construed against the drafter shall not be used to construe
+   this License against a Contributor.
+
+
+10. Versions of the License
+
+10.1. New Versions
+
+      Mozilla Foundation is the license steward. Except as provided in Section
+      10.3, no one other than the license steward has the right to modify or
+      publish new versions of this License. Each version will be given a
+      distinguishing version number.
+
+10.2. Effect of New Versions
+
+      You may distribute the Covered Software under the terms of the version of
+      the License under which You originally received the Covered Software, or
+      under the terms of any subsequent version published by the license
+      steward.
+
+10.3. Modified Versions
+
+      If you create software not governed by this License, and you want to
+      create a new license for such software, you may create and use a modified
+      version of this License if you rename the license and remove any
+      references to the name of the license steward (except to note that such
+      modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses
+      If You choose to distribute Source Code Form that is Incompatible With
+      Secondary Licenses under the terms of this version of the License, the
+      notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+
+      This Source Code Form is subject to the
+      terms of the Mozilla Public License, v.
+      2.0. If a copy of the MPL was not
+      distributed with this file, You can
+      obtain one at
+      http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular file, then
+You may include the notice in a location (such as a LICENSE file in a relevant
+directory) where a recipient would be likely to look for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - “Incompatible With Secondary Licenses” Notice
+
+      This Source Code Form is “Incompatible
+      With Secondary Licenses”, as defined by
+      the Mozilla Public License, v. 2.0.
+
diff --git a/components/proto_json/Makefile b/components/proto_json/Makefile
new file mode 100644
index 0000000..89b2129
--- /dev/null
+++ b/components/proto_json/Makefile
@@ -0,0 +1,37 @@
+.PHONY:	all deps compile setup clean doc
+
+
+NAME=proto_json
+export KVDB_BACKENDS=ets
+
+SETUP_GEN=$(shell ./find_setup_gen.sh)
+
+all: deps compile
+
+deps:
+	rebar get-deps
+
+compile:
+	rebar compile
+
+recomp:
+	rebar compile skip_deps=true
+
+setup:
+	ERL_LIBS=$(PWD)/deps:$(ERL_LIBS):$(PWD) \
+	$(SETUP_GEN) $(NAME) priv/setup.config setup
+
+target:
+	ERL_LIBS=$(PWD)/deps:$(ERL_LIBS) \
+	$(SETUP_GEN) $(NAME) priv/setup.config setup -pz $(PWD)/ebin \
+	-target rel -vsn 0.1
+
+run: setup
+	erl -boot setup/start -config setup/sys
+
+doc:
+        REBAR_DOC=1 rebar skip_deps=true get-deps doc
+
+clean:
+	rebar clean
+
diff --git a/components/proto_json/README.md b/components/proto_json/README.md
new file mode 100644
index 0000000..9c0852f
--- /dev/null
+++ b/components/proto_json/README.md
@@ -0,0 +1 @@
+Better documentation will come.
diff --git a/components/proto_json/find_setup_gen.sh b/components/proto_json/find_setup_gen.sh
new file mode 100755
index 0000000..72cc213
--- /dev/null
+++ b/components/proto_json/find_setup_gen.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+if [ -z $ERL_LIBS ]; then
+    L=`pwd`/deps
+else
+    L=`pwd`/deps:$ERL_LIBS
+fi
+
+dirs=`echo $L | sed 's/\:/ /g'`
+
+for d in $dirs; do
+    f=$d/setup/setup_gen
+    if [ -f $f ]; then
+	echo "$f"
+	exit 0
+    fi
+done
diff --git a/components/proto_json/priv/setup.config b/components/proto_json/priv/setup.config
new file mode 100644
index 0000000..094bb12
--- /dev/null
+++ b/components/proto_json/priv/setup.config
@@ -0,0 +1,46 @@
+%% -*- erlang -*-
+[
+ %% Put include first, making it possible to override any defaults below
+ {include_lib, "exoport/priv/setup.config"},
+ %%
+ %% Add our own app(s)
+ {add_apps, [asn1, 
+	     ssl,
+	     rvi_common,
+	     protocol]},
+ %%
+ %% Custom environment settings
+ {env,
+  [
+   {setup, [{data_dir, "db"}]},
+   %% Tell exoport where to find our config file
+   {exoport,
+    [
+     {bert_port, 9991}, %% 9999 was taken.
+     {config, filename:join(CWD, "exoport.config")},
+     {access,
+      [{redirect, [{protocol, authorize_rpc}]},
+       {accept, protocol_rpc}
+      ]},
+     {exo_http,
+      [{port, 8801},
+       {appmod, {exoport_exo_http, protocol_rpc}}]},
+     {kvdb_databases,
+      [{kvdb_conf,
+	[{file,"$DATA_DIR/kvdb_conf.db"},
+	 {backend,ets},
+	 {log_dir, "$DATA_DIR/kvdb_conf.log"},
+	 {log_threshold, [{writes, 1000}]},
+	 {save_mode, [on_switch, on_close]},
+	 {tables,[data]},
+	 {encoding,{raw,term,term}},
+	 {schema,kvdb_schema_events}]}
+      ]}
+    ]}
+   %% %% We run with a logging ETS backend in the database
+   %% {kvdb,
+   %%  [
+   %%    ]}
+   %%  ]}
+  ]}
+].
diff --git a/components/proto_json/src/proto_json.app.src b/components/proto_json/src/proto_json.app.src
new file mode 100644
index 0000000..d3b70be
--- /dev/null
+++ b/components/proto_json/src/proto_json.app.src
@@ -0,0 +1,23 @@
+%%
+%% Copyright (C) 2014, Jaguar Land Rover
+%%
+%% This program is licensed under the terms and conditions of the
+%% Mozilla Public License, version 2.0.  The full text of the 
+%% Mozilla Public License is at https://www.mozilla.org/MPL/2.0/
+%%
+
+
+%% -*- erlang -*-
+{application, proto_json,
+ [
+  {description, ""},
+  {vsn, "0.1"},
+  {registered, []},
+  {applications, [
+                  kernel,
+                  stdlib,
+		  rvi_common
+                 ]},
+  {mod, { proto_json_app, []}},
+  {start_phases, [{json_rpc, []}]}
+ ]}.
diff --git a/components/proto_json/src/proto_json_app.erl b/components/proto_json/src/proto_json_app.erl
new file mode 100644
index 0000000..8278a9f
--- /dev/null
+++ b/components/proto_json/src/proto_json_app.erl
@@ -0,0 +1,35 @@
+%%
+%% Copyright (C) 2014, Jaguar Land Rover
+%%
+%% This program is licensed under the terms and conditions of the
+%% Mozilla Public License, version 2.0.  The full text of the 
+%% Mozilla Public License is at https://www.mozilla.org/MPL/2.0/
+%%
+
+
+-module(proto_json_app).
+
+-behaviour(application).
+
+%% Application callbacks
+-export([start/2,
+	 start_phase/3,
+	 stop/1]).
+
+%% ===================================================================
+%% Application callbacks
+%% ===================================================================
+
+start(_StartType, _StartArgs) ->
+    proto_json_sup:start_link().
+
+start_phase(init, _, _) ->
+    proto_json_rpc:init_rvi_component(),
+    ok;
+
+start_phase(json_rpc, _, _) ->
+    proto_json_rpc:start_json_server(),
+    ok.
+
+stop(_State) ->
+    ok.
diff --git a/components/proto_json/src/proto_json_rpc.erl b/components/proto_json/src/proto_json_rpc.erl
new file mode 100644
index 0000000..7e28728
--- /dev/null
+++ b/components/proto_json/src/proto_json_rpc.erl
@@ -0,0 +1,197 @@
+%%
+%% Copyright (C) 2014, Jaguar Land Rover
+%%
+%% This program is licensed under the terms and conditions of the
+%% Mozilla Public License, version 2.0.  The full text of the 
+%% Mozilla Public License is at https://www.mozilla.org/MPL/2.0/
+%%
+
+
+-module(proto_json_rpc).
+-behaviour(gen_server).
+
+-export([handle_rpc/2,
+	 handle_notification/2]).
+-export([start_link/0]).
+-export([init/1, handle_call/3, handle_cast/2, handle_info/2,
+	 terminate/2, code_change/3]).
+
+
+-include_lib("lager/include/log.hrl").
+-include_lib("rvi_common/include/rvi_common.hrl").
+
+-define(SERVER, ?MODULE). 
+-export([start_json_server/0]).
+-export([send_message/9,
+	 receive_message/2]).
+
+-record(st, { 
+	  %% Component specification
+	  cs = #component_spec{}
+	  }).
+
+start_link() ->
+    gen_server:start_link({local, ?SERVER}, ?MODULE, [], []).
+
+init([]) ->
+    ?debug("proto_json_rpc:init(): called."),
+    {ok, #st { cs = rvi_common:get_component_specification() } }.
+
+start_json_server() ->
+    rvi_common:start_json_rpc_server(protocol, ?MODULE, proto_json_sup).
+
+
+
+send_message(CompSpec, 
+	     ServiceName, 
+	     Timeout, 
+	     ProtoOpts,
+	     DataLinkMod,
+	     DataLinkOpts,
+	     Parameters, 
+	     Signature, 
+	     Certificate) ->
+    rvi_common:request(protocol, ?MODULE, send_message,
+		       [ { service, ServiceName },
+			 { timeout, Timeout },
+			 { protocol_opts, ProtoOpts },
+			 { data_link_mod, DataLinkMod },
+			 { data_link_opts, DataLinkOpts },
+			 { parameters, Parameters },
+			 { signature, Signature },
+			 { certificate, Certificate }],
+		       [ status ], CompSpec).
+
+receive_message(CompSpec, Data) ->
+    rvi_common:notification(protocol, ?MODULE, receive_message, 
+			    [ {data, Data } ],
+			    CompSpec).
+
+%% JSON-RPC entry point
+
+%% CAlled by local exo http server
+handle_rpc("send_message", Args) ->
+    {ok, ServiceName} = rvi_common:get_json_element(["service_name"], Args),
+    {ok, Timeout} = rvi_common:get_json_element(["timeout"], Args),
+    {ok, ProtoOpts} = rvi_common:get_json_element(["protocol_opts"], Args),
+    {ok, DataLinkMod} = rvi_common:get_json_element(["data_link_mod"], Args),
+    {ok, DataLinkOpts} = rvi_common:get_json_element(["data_link_opts"], Args),
+    {ok, Parameters} = rvi_common:get_json_element(["parameters"], Args),
+    {ok, Signature} = rvi_common:get_json_element(["signature"], Args),
+    {ok, Certificate} = rvi_common:get_json_element(["certificate"], Args),
+    [ ok ] = gen_server:call(?SERVER, { rvi, send_message, 
+					[ServiceName,
+					 Timeout,
+					 ProtoOpts,
+					 DataLinkMod,
+					 DataLinkOpts,
+					 Parameters,
+					 Signature, 
+					 Certificate]}),
+    {ok, [ {status, rvi_common:json_rpc_status(ok)} ]};
+				 
+
+
+handle_rpc(Other, _Args) ->
+    ?warning("proto_json_rpc:handle_rpc(~p): Unknown~n", [ Other ]),
+    { ok, [ { status, rvi_common:json_rpc_status(invalid_command)} ] }.
+
+
+handle_notification("receive_message", Args) ->
+    {ok, Data} = rvi_common:get_json_element(["data"], Args),
+
+    gen_server:cast(?SERVER, { rvi, receive_message, [Data]}),
+    ok;
+
+handle_notification(Other, _Args) ->
+    ?debug("proto_json_rpc:handle_other(~p): unknown", [ Other ]),
+    ok.
+
+
+handle_call({rvi, send_message, 
+	     [ServiceName,
+	      Timeout,
+	      ProtoOpts,
+	      DataLinkMod,
+	      DataLinkOpts,
+	      Parameters,
+	      Signature,
+	      Certificate]}, _From, St) ->
+    ?debug("    protocol:send(): service name:    ~p~n", [ServiceName]),
+    ?debug("    protocol:send(): timeout:         ~p~n", [Timeout]),
+    ?debug("    protocol:send(): opts:            ~p~n", [ProtoOpts]),
+    ?debug("    protocol:send(): data_link_mod:   ~p~n", [DataLinkMod]),
+    ?debug("    protocol:send(): data_link_opts:  ~p~n", [DataLinkOpts]),
+%%    ?debug("    protocol:send(): parameters:      ~p~n", [Parameters]),
+    ?debug("    protocol:send(): signature:       ~p~n", [Signature]),
+    ?debug("    protocol:send(): certificate:     ~p~n", [Certificate]),
+
+    
+    Data = term_to_json({ struct, 
+			  [
+			   { "service", ServiceName },
+			   { "timeout", Timeout }, 
+			   { "parameters", {array, Parameters} },
+			   { "signature", Signature },
+			   { "certificate", Certificate }
+			  ]
+			}),
+
+    Res = DataLinkMod:send_data(St#st.cs, ?MODULE, ServiceName, DataLinkOpts, Data),
+
+    { reply, Res, St };
+
+
+handle_call(Other, _From, St) ->
+    ?warning("proto_json_rpc:handle_call(~p): unknown", [ Other ]),
+    { reply, [ invalid_command ], St}.
+
+%% Convert list-based data to binary.
+handle_cast({rvi, receive_message, [Data]}, St) when is_list(Data)->
+    handle_cast({ rvi, receive_message, [ list_to_binary(Data) ] }, St);
+
+handle_cast({rvi, receive_message, [Payload]}, St) ->
+    {ok, {struct, Elems}} = exo_json:decode_string(binary_to_list(Payload)),
+
+    [ ServiceName, Timeout, {array, Parameters}, Signature, Certificate ] = 
+	opts(["service", "timeout", "parameters", 
+	      "signature", "certificate"], Elems, undefined),
+
+    ?debug("    protocol:rcv(): service name:    ~p~n", [ServiceName]),
+    ?debug("    protocol:rcv(): timeout:         ~p~n", [Timeout]),
+%%    ?debug("    protocol:rcv(): parameters:      ~p~n", [Parameters]),
+    ?debug("    protocol:rcv(): signature:       ~p~n", [Signature]),
+    ?debug("    protocol:rcv(): certificate:     ~p~n", [Certificate]),
+
+    service_edge_rpc:handle_remote_message(St#st.cs, 
+					   ServiceName,
+					   Timeout,
+					   Parameters,
+					   Signature,
+					   Certificate),
+    {noreply, St};
+
+
+handle_cast(Other, St) ->
+    ?warning("proto_json_rpc:handle_cast(~p): unknown", [ Other ]),
+    {noreply, St}.
+
+handle_info(_Info, St) ->
+    {noreply, St}.
+
+terminate(_Reason, _St) ->
+    ok.
+code_change(_OldVsn, St, _Extra) ->
+    {ok, St}.
+
+term_to_json(Term) ->
+    binary_to_list(iolist_to_binary(exo_json:encode(Term))).
+
+opt(K, L, Def) ->
+    case lists:keyfind(K, 1, L) of
+	{_, V} -> V;
+	false  -> Def
+    end.
+
+opts(Keys, Elems, Def) ->
+    [ opt(K, Elems, Def) || K <- Keys].
diff --git a/components/proto_json/src/proto_json_sup.erl b/components/proto_json/src/proto_json_sup.erl
new file mode 100644
index 0000000..8fec09c
--- /dev/null
+++ b/components/proto_json/src/proto_json_sup.erl
@@ -0,0 +1,39 @@
+%%
+%% Copyright (C) 2014, Jaguar Land Rover
+%%
+%% This program is licensed under the terms and conditions of the
+%% Mozilla Public License, version 2.0.  The full text of the 
+%% Mozilla Public License is at https://www.mozilla.org/MPL/2.0/
+%%
+
+
+-module(proto_json_sup).
+
+-behaviour(supervisor).
+
+%% API
+-export([start_link/0]).
+
+%% Supervisor callbacks
+-export([init/1]).
+
+%% Helper macro for declaring children of supervisor
+-define(CHILD(I, Type), {I, {I, start_link, []}, permanent, 5000, Type, [I]}).
+
+%% ===================================================================
+%% API functions
+%% ===================================================================
+
+start_link() ->
+    supervisor:start_link({local, ?MODULE}, ?MODULE, []).
+
+%% ===================================================================
+%% Supervisor callbacks
+%% ===================================================================
+
+init([]) ->
+    {ok, { {one_for_one, 5, 10},
+	   [
+	    ?CHILD(proto_json_rpc, worker)
+	   ]} }.
+