Skip to content

Commit

Permalink
Cleanup in old API
Browse files Browse the repository at this point in the history
  • Loading branch information
@msprotz
msprotz committed Jun 14, 2024
1 parent 3c89fd0 commit e48da1b
Showing 1 changed file with 69 additions and 108 deletions.
177 changes: 69 additions & 108 deletions js/MLS_JS.ml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
open Js_of_ocaml
open JsHelpers

let (let*) r f =
match r with
| MLS_Result.Success s ->
f s
| InternalError s ->
print_endline ("InternalError: " ^ s);
Js.null
| ProtocolError s ->
print_endline ("ProtocolError: " ^ s);
Js.null

let _ =
Js.export_all (object%js
Expand All @@ -12,36 +22,22 @@ let _ =

method freshKeyPair1 (e: Typed_array.uint8Array Js.t) =
let e = bytes_of_uint8array e in
match MLS.fresh_key_pair e with
| Success (pub_key, priv_key) ->
Js.some (object%js
val pubKey = uint8array_of_bytes pub_key
val privKey = priv_key
end)
| InternalError s ->
print_endline ("InternalError: " ^ s);
Js.null
| ProtocolError s ->
print_endline ("ProtocolError: " ^ s);
Js.null
let* pub_key, priv_key = MLS.fresh_key_pair e in
Js.some (object%js
val pubKey = uint8array_of_bytes pub_key
val privKey = priv_key
end)

method freshKeyPackage1 (e: Typed_array.uint8Array Js.t) (credential: _ Js.t) (priv: MLS.signature_key) =
let e = bytes_of_uint8array e in
let identity = bytes_of_js_string credential##.identity in
let signature_key = bytes_of_uint8array credential##.signPubKey in
match MLS.fresh_key_package e { MLS.identity; signature_key } (priv) with
| Success (key_package, hash, priv_key) ->
Js.some (object%js
val keyPackage = uint8array_of_bytes key_package
val privKey = uint8array_of_bytes priv_key
val hash = uint8array_of_bytes hash
end)
| InternalError s ->
print_endline ("InternalError: " ^ s);
Js.null
| ProtocolError s ->
print_endline ("ProtocolError: " ^ s);
Js.null
let* key_package, hash, priv_key = MLS.fresh_key_package e { MLS.identity; signature_key } priv in
Js.some (object%js
val keyPackage = uint8array_of_bytes key_package
val privKey = uint8array_of_bytes priv_key
val hash = uint8array_of_bytes hash
end)

method currentEpoch (s: MLS.state) =
Z.to_int (MLS.current_epoch s)
Expand All @@ -53,109 +49,74 @@ let _ =
let identity = bytes_of_js_string credential##.identity in
let signature_key = bytes_of_uint8array credential##.signPubKey in
let group_id = bytes_of_js_string group_id in
match MLS.create e { MLS.identity; signature_key } priv group_id with
| Success s ->
Js.some s
| InternalError s ->
print_endline ("InternalError: " ^ s);
Js.null
| ProtocolError s ->
print_endline ("ProtocolError: " ^ s);
Js.null
(* Relying on the side-effect of printing errors *)
let* s = MLS.create e { MLS.identity; signature_key } priv group_id in
Js.some s

method add1 (s: MLS.state) (key_package: Typed_array.uint8Array Js.t) (e: Typed_array.uint8Array Js.t) =
let key_package = bytes_of_uint8array key_package in
let e = bytes_of_uint8array e in
match MLS.add s key_package e with
| Success (state, (group_message, welcome_message)) ->
Js.some (object%js
val groupMessage = object%js
val groupId = js_string_of_bytes (fst group_message)
val payload = uint8array_of_bytes (snd group_message)
end
val welcomeMessage = object%js
val identity = js_string_of_bytes (fst welcome_message)
val payload = uint8array_of_bytes (snd welcome_message)
end
val state = state
end)
| InternalError s ->
print_endline ("InternalError: " ^ s);
Js.null
| ProtocolError s ->
print_endline ("ProtocolError: " ^ s);
Js.null
let* state, (group_message, welcome_message) = MLS.add s key_package e in
Js.some (object%js
val groupMessage = object%js
val groupId = js_string_of_bytes (fst group_message)
val payload = uint8array_of_bytes (snd group_message)
end
val welcomeMessage = object%js
val identity = js_string_of_bytes (fst welcome_message)
val payload = uint8array_of_bytes (snd welcome_message)
end
val state = state
end)

method send1 (s: MLS.state) (e: Typed_array.uint8Array Js.t) (data: Js.js_string Js.t) =
let e = bytes_of_uint8array e in
let data = bytes_of_js_string data in
match MLS.send s e data with
| Success (state, group_message) ->
Js.some (object%js
val groupMessage = object%js
val groupId = js_string_of_bytes (fst group_message)
val payload = uint8array_of_bytes (snd group_message)
end
val state = state
end)
| InternalError s ->
print_endline ("InternalError: " ^ s);
Js.null
| ProtocolError s ->
print_endline ("ProtocolError: " ^ s);
Js.null
let* state, group_message = MLS.send s e data in
Js.some (object%js
val groupMessage = object%js
val groupId = js_string_of_bytes (fst group_message)
val payload = uint8array_of_bytes (snd group_message)
end
val state = state
end)

method processGroupMessage1 (s: MLS.state) (payload: Typed_array.uint8Array Js.t) =
let payload = bytes_of_uint8array payload in
match MLS.process_group_message s payload with
| Success (state, outcome) ->
Js.some (object%js
val outcome = match outcome with
| MLS.MsgData data ->
Obj.magic (object%js
val kind = "data"
val payload = js_string_of_bytes data
end)
| MLS.MsgAdd identity ->
Obj.magic (object%js
val kind = "add"
val identity = js_string_of_bytes identity
end)
| MLS.MsgRemove identity ->
Obj.magic (object%js
val kind = "remove"
val identity = js_string_of_bytes identity
end)
val state = state
end)
| InternalError s ->
print_endline ("InternalError: " ^ s);
Js.null
| ProtocolError s ->
print_endline ("ProtocolError: " ^ s);
Js.null
let* state, outcome = MLS.process_group_message s payload in
Js.some (object%js
val outcome = match outcome with
| MLS.MsgData data ->
Obj.magic (object%js
val kind = "data"
val payload = js_string_of_bytes data
end)
| MLS.MsgAdd identity ->
Obj.magic (object%js
val kind = "add"
val identity = js_string_of_bytes identity
end)
| MLS.MsgRemove identity ->
Obj.magic (object%js
val kind = "remove"
val identity = js_string_of_bytes identity
end)
val state = state
end)

method processWelcomeMessage1 (payload: Typed_array.uint8Array Js.t) (keyPair: _ Js.t) (lookup: _ Js.t) =
let payload = bytes_of_uint8array payload in
let lookup hash =
let priv: _ Js.Opt.t = Js.Unsafe.fun_call lookup [| Js.Unsafe.inject (uint8array_of_bytes hash) |] in
let priv = Js.Opt.to_option priv in
Printf.printf "lookup was successful? %b\n" (Option.is_some priv);
Option.map bytes_of_uint8array priv
in
let key_pair = bytes_of_uint8array keyPair##.pubKey, keyPair##.privKey in
match MLS.process_welcome_message (FStar_Seq_Base.empty (), payload) key_pair lookup with
| Success (group_id, state) ->
Js.some (object%js
val groupId = js_string_of_bytes group_id
val state = state
end)
| InternalError s ->
print_endline ("InternalError: " ^ s);
Js.null
| ProtocolError s ->
print_endline ("ProtocolError: " ^ s);
Js.null
let* group_id, state = MLS.process_welcome_message (FStar_Seq_Base.empty (), payload) key_pair lookup in
Js.some (object%js
val groupId = js_string_of_bytes group_id
val state = state
end)
end)

let _ =
Expand Down

0 comments on commit e48da1b

Please sign in to comment.