Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions gleam.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ repository = { type = "github", user = "rawhat", repo = "grammy" }

[dependencies]
gleam_stdlib = ">= 0.60.0 and < 2.0.0"
gleam_otp = "1.0.0-rc3"
gleam_erlang = "1.0.0-rc1"
gleam_otp = ">= 1.2.0 and < 2.0.0"
gleam_erlang = ">= 1.3.0 and < 2.0.0"
logging = ">= 1.1.0 and < 2.0.0"

[dev-dependencies]
Expand Down
12 changes: 6 additions & 6 deletions manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
# You typically do not need to edit this file

packages = [
{ name = "gleam_erlang", version = "1.0.0-rc1", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_erlang", source = "hex", outer_checksum = "6E0CF4E1F66E2C9226B7554589544F00F12CE14858440EB1BF7EFDACDE1BBC64" },
{ name = "gleam_otp", version = "1.0.0-rc3", build_tools = ["gleam"], requirements = ["gleam_erlang", "gleam_stdlib"], otp_app = "gleam_otp", source = "hex", outer_checksum = "317733C0DFE6223FE2988D5B30294810EED25B8C3AE0B54D44D8D708DB4070DA" },
{ name = "gleam_stdlib", version = "0.60.0", build_tools = ["gleam"], requirements = [], otp_app = "gleam_stdlib", source = "hex", outer_checksum = "621D600BB134BC239CB2537630899817B1A42E60A1D46C5E9F3FAE39F88C800B" },
{ name = "gleeunit", version = "1.3.1", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleeunit", source = "hex", outer_checksum = "A7DD6C07B7DA49A6E28796058AA89E651D233B357D5607006D70619CD89DAAAB" },
{ name = "gleam_erlang", version = "1.3.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_erlang", source = "hex", outer_checksum = "1124AD3AA21143E5AF0FC5CF3D9529F6DB8CA03E43A55711B60B6B7B3874375C" },
{ name = "gleam_otp", version = "1.2.0", build_tools = ["gleam"], requirements = ["gleam_erlang", "gleam_stdlib"], otp_app = "gleam_otp", source = "hex", outer_checksum = "BA6A294E295E428EC1562DC1C11EA7530DCB981E8359134BEABC8493B7B2258E" },
{ name = "gleam_stdlib", version = "0.69.0", build_tools = ["gleam"], requirements = [], otp_app = "gleam_stdlib", source = "hex", outer_checksum = "AAB0962BEBFAA67A2FBEE9EEE218B057756808DC9AF77430F5182C6115B3A315" },
{ name = "gleeunit", version = "1.9.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleeunit", source = "hex", outer_checksum = "DA9553CE58B67924B3C631F96FE3370C49EB6D6DC6B384EC4862CC4AAA718F3C" },
{ name = "logging", version = "1.3.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "logging", source = "hex", outer_checksum = "1098FBF10B54B44C2C7FDF0B01C1253CAFACDACABEFB4B0D027803246753E06D" },
]

[requirements]
gleam_erlang = { version = "1.0.0-rc1" }
gleam_otp = { version = "1.0.0-rc3" }
gleam_erlang = { version = ">= 1.3.0 and < 2.0.0" }
gleam_otp = { version = ">= 1.2.0 and < 2.0.0" }
gleam_stdlib = { version = ">= 0.60.0 and < 2.0.0" }
gleeunit = { version = ">= 1.3.1 and < 2.0.0" }
logging = { version = ">= 1.1.0 and < 2.0.0" }
50 changes: 27 additions & 23 deletions src/grammy.gleam
Original file line number Diff line number Diff line change
Expand Up @@ -90,29 +90,33 @@ pub fn start(
builder.handler(Packet(address, port, data), conn, state.user)
case resp {
Continue(new_state, user_selector) -> {
state.socket
|> set_active
|> result.map(fn(_nil) {
let selector =
option.map(user_selector, fn(selector) {
selector
|> process.map_selector(InternalUser)
|> process.merge_selector(udp_message_selector())
})
let next = actor.continue(State(..state, user: new_state))
case selector {
Some(selector) -> actor.with_selector(next, selector)
_ -> next
}
})
|> result.map_error(fn(err) {
logging.log(
logging.Error,
"Failed to set UDP socket active: " <> string.inspect(err),
)
actor.stop_abnormal("Failed to set UDP socket active")
})
|> result.unwrap_both
let result =
state.socket
|> set_active
|> result.map(fn(_nil) {
let selector =
option.map(user_selector, fn(selector) {
selector
|> process.map_selector(InternalUser)
|> process.merge_selector(udp_message_selector())
})
let next = actor.continue(State(..state, user: new_state))
case selector {
Some(selector) -> actor.with_selector(next, selector)
_ -> next
}
})
|> result.map_error(fn(err) {
logging.log(
logging.Error,
"Failed to set UDP socket active: " <> string.inspect(err),
)
actor.stop_abnormal("Failed to set UDP socket active")
})

case result {
Ok(next) | Error(next) -> next
}
}
NormalStop -> actor.stop()
AbnormalStop(reason) -> actor.stop_abnormal(reason)
Expand Down