diff --git a/chat.proto b/chat.proto index 0a53bae..afdd1c5 100644 --- a/chat.proto +++ b/chat.proto @@ -28,7 +28,7 @@ message SendMessageRequest { Urgency urgency = 3 [ (tin.field_validation) = "required" ]; - option (tin.message_validation) = "x|.channel|.Belt.Option.getExn != \"#nope\" ? okSome(x) : transFieldError(\"can't send to channel #nope\")"; + option (tin.message_validation) = "x|.channelGet|.Belt.Option.getExn != \"#nope\" ? okSome(x) : transFieldError(\"can't send to channel #nope\")"; } message SendPasswordedMessageRequest { @@ -57,7 +57,9 @@ message ChannelMessage { string channel = 1; string nick = 2; string text = 3; - Urgency urgency = 4; + Urgency urgency = 4 [ + (tin.field_validation) = "required" + ]; }; message ChannelMessages { @@ -86,7 +88,7 @@ message PasswordResetRequest { string passwordConfirm = 2 [ (tin.field_validation) = "required |> minStrLen(10)" ]; - option (tin.message_validation) = "password(x) == passwordConfirm(x) ? okSome(x) : transFieldError(\"passwords don't match\")"; + option (tin.message_validation) = "passwordGet(x) == passwordConfirmGet(x) ? okSome(x) : transFieldError(\"passwords don't match\")"; } service ChatService { diff --git a/package.json b/package.json index f31fea9..4e3fe0b 100644 --- a/package.json +++ b/package.json @@ -11,11 +11,10 @@ ], "author": "", "license": "MIT", - "devDependencies": { - "bs-platform": "^3.1.5" - }, + "devDependencies": {}, "dependencies": { - "bs-grpc": "^0.10.2", + "bs-grpc": "0.11.0-rc.0", + "bs-platform": "4.0.1", "bs-result": "^2.2.0", "grpc": "^1.13.0-pre1", "reason-future": "^2.2.1" diff --git a/src/ChatServerValidated.re b/src/ChatServerValidated.re index 85eb4eb..d9ef0ee 100644 --- a/src/ChatServerValidated.re +++ b/src/ChatServerValidated.re @@ -59,11 +59,13 @@ let sendMessage = (call, request, callback) => { let metaData = call |. Grpc.Chat.ChatService.SendMessageRpc.getMeta; let nick = metaData |. Js.Dict.get("nick"); Js.log2("got metadata nick=", nick); + Js.log2("sendMessageRequest=", request); + Js.log2("sendMessageRequest |. urgency=", request |. Grpc.Chat.SendMessageRequest.urgencyGet); let (channelName, text, urgency) = Grpc.Chat.SendMessageRequest.( Belt.Option.( - request |. channel |. getExn, - request |. text |. getExn, - request |. urgency |. getExn + request |. channelGet |. getExn, + request |. textGet |. getExn, + request |. urgencyGet |. getExn ) ); @@ -94,19 +96,19 @@ let sendPasswordedMessage = (call, request, callback) => { Js.log2("got metadata nick=", nick); let sendMessageRequest = request - |. Grpc.Chat.SendPasswordedMessageRequest.sendMessageRequest + |. Grpc.Chat.SendPasswordedMessageRequest.sendMessageRequestGet |. Belt.Option.getExn; let channelName = sendMessageRequest - |. Grpc.Chat.SendMessageRequest.channel + |. Grpc.Chat.SendMessageRequest.channelGet |. Belt.Option.getExn; let text = sendMessageRequest - |. Grpc.Chat.SendMessageRequest.text + |. Grpc.Chat.SendMessageRequest.textGet |. Belt.Option.getExn; let password = request - |. Grpc.Chat.SendPasswordedMessageRequest.password + |. Grpc.Chat.SendPasswordedMessageRequest.passwordGet |. Belt.Option.getExn; Js.log3( @@ -131,8 +133,8 @@ let poll = (call, request, callback) => { let nick = metaData |. Js.Dict.get("nick"); Js.log2("got metadata nick=", nick); let channelNames = - request |. Grpc.Chat.PollRequest.channels |. Belt.Option.getExn; - let time = request |. Grpc.Chat.PollRequest.time |. Belt.Option.getExn; + request |. Grpc.Chat.PollRequest.channelsGet |. Belt.Option.getExn; + let time = request |. Grpc.Chat.PollRequest.timeGet |. Belt.Option.getExn; Js.log3("ChatServerValidated.re got PollRequest", channelNames, time); diff --git a/src/jschatclient.js b/src/jschatclient.js index 3722e5d..e8b979d 100644 --- a/src/jschatclient.js +++ b/src/jschatclient.js @@ -23,7 +23,7 @@ process.stdin.on('data', chunk => { const msg = { channel: '#random', text: chunk.toString('utf8').trim(), - urgency: 0 + urgency: 2 } const words = text.split(/\s+/g) switch (words[0]) { diff --git a/yarn.lock b/yarn.lock index 0aa6667..b802c8b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -166,12 +166,13 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" -bs-grpc@^0.10.2: - version "0.10.2" - resolved "https://registry.yarnpkg.com/bs-grpc/-/bs-grpc-0.10.2.tgz#1b8b5630bfd90cfd0205087ae60795f0bd09c42d" +bs-grpc@0.11.0-rc.0: + version "0.11.0-rc.0" + resolved "https://registry.yarnpkg.com/bs-grpc/-/bs-grpc-0.11.0-rc.0.tgz#b8e11f4ceba19b52b16fc4e1a5b40a790e6d7c7a" dependencies: "@grpc/grpc-js" "^0.1.0" "@grpc/proto-loader" "^0.1.0" + bs-platform "^4.0.1" grpc-alt-proto-loader "^0.4.1" grpc-tools "^1.6.6" protobufjs "^6.8.6" @@ -180,9 +181,9 @@ bs-grpc@^0.10.2: resolve "^1.8.1" toposort "^2.0.2" -bs-platform@^3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/bs-platform/-/bs-platform-3.1.5.tgz#fb34ee4702bc9163848d5537096c4f31ebaeed40" +bs-platform@4.0.1, bs-platform@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/bs-platform/-/bs-platform-4.0.1.tgz#544b58c2a53299cf406b57477e06389e4adab421" bs-result@^2.2.0: version "2.2.0"