Skip to content

Upgrade to gleam_stdlib 0.60.0 and use gleam/dynamic/decode #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bchase wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Upgrade to gleam_stdlib 0.60.0 and use gleam/dynamic/decode #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1d1e71
run `gleam update`
bchase May 20, 2025
1b62db1
use `gleam/dynamic/decode`
bchase May 20, 2025
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
6 changes: 3 additions & 3 deletions manifest.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# You typically do not need to edit this file

packages = [
{ name = "gleam_erlang", version = "0.25.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_erlang", source = "hex", outer_checksum = "054D571A7092D2A9727B3E5D183B7507DAB0DA41556EC9133606F09C15497373" },
{ name = "gleam_stdlib", version = "0.36.0", build_tools = ["gleam"], requirements = [], otp_app = "gleam_stdlib", source = "hex", outer_checksum = "C0D14D807FEC6F8A08A7C9EF8DFDE6AE5C10E40E21325B2B29365965D82EB3D4" },
{ name = "gleeunit", version = "1.1.2", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleeunit", source = "hex", outer_checksum = "72CDC3D3F719478F26C4E2C5FED3E657AC81EC14A47D2D2DEBB8693CA3220C3B" },
{ name = "gleam_erlang", version = "0.34.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_erlang", source = "hex", outer_checksum = "0C38F2A128BAA0CEF17C3000BD2097EB80634E239CE31A86400C4416A5D0FDCC" },
{ 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" },
]

[requirements]
Expand Down
63 changes: 31 additions & 32 deletions src/nessie.gleam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@
//// `inet_res` and `inet` modules. Most of the functions and types are simply
//// Gleam representations of their Erlang counterparts.

import gleam/list
import gleam/function
import gleam/result
import gleam/dynamic.{type Decoder, type Dynamic}
import gleam/dynamic.{type Dynamic}
import gleam/dynamic/decode.{type DecodeError, type Decoder}
import gleam/erlang/atom.{type Atom}
import gleam/erlang/charlist.{type Charlist}
import gleam/function
import gleam/list
import gleam/result

/// Nameserver address and port.
pub type Nameserver =
Expand Down Expand Up @@ -126,39 +127,37 @@ pub fn string_to_ip(ip_addr: String) -> Result(IPAddress, String) {
|> result.map_error(atom.to_string)
|> result.map(fn(dyn) {
dyn
|> dynamic.tuple4(dynamic.int, dynamic.int, dynamic.int, dynamic.int)
|> result.map(IPV4)
|> result.or(
dyn
|> ip_decoder(),
)
|> decode.run(ip_decoder())
|> result.replace_error("decode_error")
})
|> result.flatten()
}

/// Returns a `gleam/dynamic.Decoder` for decoding an IP address tuple.
/// Returns a `gleam/dynamic/decode.Decoder` for decoding an IP address tuple.
pub fn ip_decoder() -> Decoder(IPAddress) {
fn(value) {
value
|> dynamic.tuple4(dynamic.int, dynamic.int, dynamic.int, dynamic.int)
|> result.map(IPV4)
|> result.lazy_or(fn() {
value
|> dynamic.decode8(
fn(i1, i2, i3, i4, i5, i6, i7, i8) { #(i1, i2, i3, i4, i5, i6, i7, i8) },
dynamic.element(0, dynamic.int),
dynamic.element(1, dynamic.int),
dynamic.element(2, dynamic.int),
dynamic.element(3, dynamic.int),
dynamic.element(4, dynamic.int),
dynamic.element(5, dynamic.int),
dynamic.element(6, dynamic.int),
dynamic.element(7, dynamic.int),
)
|> result.map(IPV6)
})
}
decode.one_of(ipv6_decoder(), [ipv4_decoder()])
}

fn ipv4_decoder() -> Decoder(IPAddress) {
use x1 <- decode.field(0, decode.int)
use x2 <- decode.field(1, decode.int)
use x3 <- decode.field(2, decode.int)
use x4 <- decode.field(3, decode.int)

decode.success(IPV4(#(x1, x2, x3, x4)))
}

fn ipv6_decoder() -> Decoder(IPAddress) {
use x1 <- decode.field(0, decode.int)
use x2 <- decode.field(1, decode.int)
use x3 <- decode.field(2, decode.int)
use x4 <- decode.field(3, decode.int)
use x5 <- decode.field(4, decode.int)
use x6 <- decode.field(5, decode.int)
use x7 <- decode.field(6, decode.int)
use x8 <- decode.field(7, decode.int)

decode.success(IPV6(#(x1, x2, x3, x4, x5, x6, x7, x8)))
}

/// Looks up a record of the specified type for the given name.
Expand Down Expand Up @@ -390,7 +389,7 @@ fn to_soa(erl_soa: ErlSoa) -> SOARecord {
}

@external(erlang, "nessie_inet_res_ffi", "charlist_from_dynamic")
fn charlist_from_dynamic(d: Dynamic) -> Result(Charlist, dynamic.DecodeErrors)
fn charlist_from_dynamic(d: Dynamic) -> Result(Charlist, List(DecodeError))

@external(erlang, "nessie_inet_res_ffi", "getbyname")
fn do_getbyname_string(
Expand Down