Merge pull request #6 from renatillas/supervised

Supervised added + more error types!

Author: renatillas

.gitignore

@@ -2,3 +2,4 @@
 *.ez
 /build
 erl_crash.dump
+.claude

gleam.toml

@@ -16,6 +16,7 @@ repository = { type = "github", user = "renatillas", repo = "carotte" }
 gleam_stdlib = ">= 0.44.0 and < 2.0.0"
 amqp_client = ">= 4.0.3 and < 5.0.0"
 gleam_erlang = ">= 1.0.0 and < 2.0.0"
+gleam_otp = ">= 1.1.0 and < 2.0.0"
 
 [dev-dependencies]
 gleeunit = ">= 1.0.0 and < 2.0.0"

manifest.toml

@@ -9,6 +9,7 @@ packages = [
   { name = "filepath", version = "1.1.2", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "filepath", source = "hex", outer_checksum = "B06A9AF0BF10E51401D64B98E4B627F1D2E48C154967DA7AF4D0914780A6D40A" },
   { name = "glance", version = "5.0.0", build_tools = ["gleam"], requirements = ["gleam_stdlib", "glexer"], otp_app = "glance", source = "hex", outer_checksum = "FAA3DAC74AF71D47C67D88EB32CE629075169F878D148BB1FF225439BE30070A" },
   { 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.1.0", build_tools = ["gleam"], requirements = ["gleam_erlang", "gleam_stdlib"], otp_app = "gleam_otp", source = "hex", outer_checksum = "7987CBEBC8060B88F14575DEF546253F3116EBE2A5DA6FD82F38243FCE97C54B" },
   { name = "gleam_stdlib", version = "0.62.1", build_tools = ["gleam"], requirements = [], otp_app = "gleam_stdlib", source = "hex", outer_checksum = "0080706D3A5A9A36C40C68481D1D231D243AF602E6D2A2BE67BA8F8F4DFF45EC" },
   { name = "gleeunit", version = "1.6.1", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleeunit", source = "hex", outer_checksum = "FDC68A8C492B1E9B429249062CD9BAC9B5538C6FBF584817205D0998C42E1DAC" },
   { name = "glexer", version = "2.2.1", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "glexer", source = "hex", outer_checksum = "5C235CBDF4DA5203AD5EAB1D6D8B456ED8162C5424FE2309CFFB7EF438B7C269" },
@@ -23,5 +24,6 @@ packages = [
 amqp_client = { version = ">= 4.0.3 and < 5.0.0" }
 asset = { version = ">= 1.2.0 and < 2.0.0" }
 gleam_erlang = { version = ">= 1.0.0 and < 2.0.0" }
+gleam_otp = { version = ">= 1.1.0 and < 2.0.0" }
 gleam_stdlib = { version = ">= 0.44.0 and < 2.0.0" }
 gleeunit = { version = ">= 1.0.0 and < 2.0.0" }

src/carotte.gleam

@@ -1,17 +1,39 @@
-import gleam/erlang/process.{type Pid}
+import gleam/erlang/process
+import gleam/otp/actor
+import gleam/otp/supervision
+import gleam/result
 
-pub type CarotteClient {
-  CarotteClient(pid: Pid)
+pub opaque type Client {
+  Client(name: process.Name(Message))
 }
 
 pub type CarotteError {
   Blocked
   Closed
   AuthFailure(String)
+  ProcessNotFound
+  AlreadyRegistered(String)
+  NotFound(String)
+  AccessRefused(String)
+  PreconditionFailed(String)
+  ResourceLocked(String)
+  ChannelClosed(String)
+  ConnectionRefused(String)
+  ConnectionTimeout(String)
+  FrameError(String)
+  InternalError(String)
+  InvalidPath(String)
+  NoRoute(String)
+  NotAllowed(String)
+  NotImplemented(String)
+  UnexpectedFrame(String)
+  CommandInvalid(String)
+  UnknownError(String)
 }
 
 pub opaque type Builder {
   Builder(
+    name: process.Name(Message),
     username: String,
     password: String,
     virtual_host: String,
@@ -24,8 +46,21 @@ pub opaque type Builder {
   )
 }
 
-pub fn default_client() -> Builder {
-  Builder("guest", "guest", "/", "localhost", 5672, 2074, 0, 10, 60_000)
+pub type Message
+
+pub fn default_client(name name: process.Name(Message)) -> Builder {
+  Builder(
+    name: name,
+    username: "guest",
+    password: "guest",
+    virtual_host: "/",
+    host: "localhost",
+    port: 5672,
+    channel_max: 2074,
+    frame_max: 0,
+    heartbeat: 10,
+    connection_timeout: 60_000,
+  )
 }
 
 pub fn with_username(builder: Builder, username: String) -> Builder {
@@ -67,22 +102,57 @@ pub fn with_connection_timeout(
   Builder(..builder, connection_timeout:)
 }
 
-pub fn start(builder: Builder) -> Result(CarotteClient, CarotteError) {
-  do_start(
-    builder.username,
-    builder.password,
-    builder.virtual_host,
-    builder.host,
-    builder.port,
-    builder.channel_max,
-    builder.frame_max,
-    builder.heartbeat,
-    builder.connection_timeout,
+pub fn start(builder: Builder) -> actor.StartResult(Client) {
+  use pid <- result.try(
+    do_start(
+      builder.name,
+      builder.username,
+      builder.password,
+      builder.virtual_host,
+      builder.host,
+      builder.port,
+      builder.channel_max,
+      builder.frame_max,
+      builder.heartbeat,
+      builder.connection_timeout,
+    )
+    |> result.map_error(with: fn(carotte_error) {
+      case carotte_error {
+        Blocked -> actor.InitFailed("Blocked connection")
+        Closed -> actor.InitFailed("Closed connection")
+        AuthFailure(reason) -> actor.InitFailed("AuthFailure: " <> reason)
+        ProcessNotFound -> actor.InitFailed("Process not found")
+        AlreadyRegistered(reason) ->
+          actor.InitFailed("AlreadyRegistered: " <> reason)
+        NotFound(reason) -> actor.InitFailed("NotFound: " <> reason)
+        AccessRefused(reason) -> actor.InitFailed("AccessRefused: " <> reason)
+        PreconditionFailed(reason) ->
+          actor.InitFailed("PreconditionFailed: " <> reason)
+        ResourceLocked(reason) -> actor.InitFailed("ResourceLocked: " <> reason)
+        ChannelClosed(reason) -> actor.InitFailed("ChannelClosed: " <> reason)
+        ConnectionRefused(reason) ->
+          actor.InitFailed("ConnectionRefused: " <> reason)
+        ConnectionTimeout(reason) ->
+          actor.InitFailed("ConnectionTimeout: " <> reason)
+        FrameError(reason) -> actor.InitFailed("FrameError: " <> reason)
+        InternalError(reason) -> actor.InitFailed("InternalError: " <> reason)
+        InvalidPath(reason) -> actor.InitFailed("InvalidPath: " <> reason)
+        NoRoute(reason) -> actor.InitFailed("NoRoute: " <> reason)
+        NotAllowed(reason) -> actor.InitFailed("NotAllowed: " <> reason)
+        NotImplemented(reason) -> actor.InitFailed("NotImplemented: " <> reason)
+        UnexpectedFrame(reason) ->
+          actor.InitFailed("UnexpectedFrame: " <> reason)
+        CommandInvalid(reason) -> actor.InitFailed("CommandInvalid: " <> reason)
+        UnknownError(reason) -> actor.InitFailed("UnknownError: " <> reason)
+      }
+    }),
   )
+  Ok(actor.Started(pid, named_client(builder.name)))
 }
 
 @external(erlang, "carotte_ffi", "start")
 fn do_start(
+  name: process.Name(Message),
   username: String,
   password: String,
   virtual_host: String,
@@ -92,11 +162,19 @@ fn do_start(
   frame_max: Int,
   heartbeat: Int,
   connection_timeout: Int,
-) -> Result(CarotteClient, CarotteError)
+) -> Result(process.Pid, CarotteError)
 
-pub fn close(client: CarotteClient) -> Result(Nil, CarotteError) {
+pub fn close(client: Client) -> Result(Nil, CarotteError) {
   do_close(client)
 }
 
 @external(erlang, "carotte_ffi", "close")
-fn do_close(client: CarotteClient) -> Result(Nil, CarotteError)
+fn do_close(client: Client) -> Result(Nil, CarotteError)
+
+pub fn supervised(builder: Builder) -> supervision.ChildSpecification(Client) {
+  supervision.worker(fn() { start(builder) })
+}
+
+pub fn named_client(name: process.Name(Message)) -> Client {
+  Client(name)
+}

src/carotte/channel.gleam

@@ -6,11 +6,11 @@ pub type Channel {
 }
 
 /// Open a channel to a RabbitMQ server
-pub fn open_channel(carotte_client: carotte.CarotteClient) {
-  do_open_channel(carotte_client)
+pub fn open_channel(client: carotte.Client) {
+  do_open_channel(client)
 }
 
 @external(erlang, "carotte_ffi", "open_channel")
 fn do_open_channel(
-  carotte_client: carotte.CarotteClient,
+  carotte_client: carotte.Client,
 ) -> Result(Channel, carotte.CarotteError)