add finalize to close connection

.devcontainer/Dockerfile

@@ -1,29 +1,20 @@
-FROM ocaml/opam:debian-12-ocaml-4.14
+FROM ocaml/opam:debian-12-ocaml-5.3
+COPY --from=hadolint/hadolint:latest-alpine /bin/hadolint /bin/hadolint
 
 USER root
 
-# copy hadolint
-COPY --from=hadolint/hadolint:latest-alpine /bin/hadolint /bin/hadolint
-
 # Avoid warnings by switching to noninteractive
-ENV DEBIAN_FRONTEND noninteractive
-ENV SIHL_ENV development
+ENV DEBIAN_FRONTEND=noninteractive
 
 # install packages
+# hadolint ignore=DL3008
 RUN apt-get update -q && apt-get install -yqq --no-install-recommends \
   # development dependencies
   inotify-tools \
-  zsh \
-  m4 \
-  wget \
-  #
-  # build dependencies (would also be installed by opam depext)
-  gcc \
-  jq \
-  libev-dev \
   libgmp-dev \
-  libssl-dev \
   pkg-config \
+  wget \
+  zsh \
   #
   # cleanup installations
   && apt-get autoremove -y \
@@ -33,9 +24,9 @@ RUN apt-get update -q && apt-get install -yqq --no-install-recommends \
 # add timezone
 RUN ln -fs /usr/share/zoneinfo/Europe/Zurich /etc/localtime
 
-# WTF: https://github.com/mirage/ocaml-cohttp/issues/675
-RUN bash -c 'echo "http		80/tcp	www		# WorldWideWeb HTTP" >> /etc/services' \
-  && bash -c 'echo "https		443/tcp	www		# WorldWideWeb HTTPS" >> /etc/services'
+# link opam version
+# hadolint ignore=DL3059
+RUN ln -fs /usr/bin/opam-2.2 /usr/bin/opam
 
 USER opam
 

.devcontainer/devcontainer.json

@@ -1,14 +1,10 @@
-// For format details, see https://aka.ms/vscode-remote/devcontainer.json or the definition README at
-// https://github.com/microsoft/vscode-dev-containers/tree/master/containers/python-3 or the
-// devcontainer docu https://code.visualstudio.com/docs/remote/containers#_devcontainerjson-reference
 {
     "name": "letters",
     "dockerComposeFile": "./docker-compose.yml",
     "service": "dev",
     "workspaceFolder": "/workspace",
     "privileged": true,
-    "postCreateCommand": "/bin/bash .devcontainer/postCreate.sh",
-    // Supported customizations: https://containers.dev/supporting
+    "postCreateCommand": ".devcontainer/postCreate.sh",
     "customizations": {
         "vscode": {
             "settings": {
@@ -27,7 +23,6 @@
                     "kind": "global"
                 }
             },
-            // Add the IDs of extensions you want installed when the container is created in the array below.
             "extensions": [
                 "donjayamanne.githistory",
                 "eamodio.gitlens",

.devcontainer/docker-compose.yml

@@ -10,14 +10,19 @@ services:
       - ..:/workspace:cached
       - opam:/home/opam/.opam:cached
       - build:/workspace/_build:cached
-      - ${HOME}${USERPROFILE}/.ssh:/home/opam/.ssh
-      - ${HOME}${USERPROFILE}/.gitconfig:/home/opam/.gitconfig
-      - ${HOME}${USERPROFILE}/.gitignore_global:/home/opam/.gitignore_global
     environment:
-      - OPAMSOLVERTIMEOUT=180
-      - VERSION=dev
+      OPAMSOLVERTIMEOUT: 180
+      VERSION: dev
     command: sleep infinity
 
+  mailtrap:
+    image: mailhog/mailhog
+    container_name: mailtrap-letters
+    hostname: mailtrap-letters
+    ports:
+      - "1025:1025" # SMTP server
+      - "8025:8025" # Web UI
+
 volumes:
   opam:
   build:

.devcontainer/postCreate.sh

@@ -3,19 +3,8 @@
 # immediately when a command fails and print each command
 set -ex
 
-# When possible to create cached docker volume,
 sudo chown -R opam: _build
 
 opam init -a --shell=zsh
 
-# get newest opam packages
-opam remote remove --all default
-opam remote add default https://opam.ocaml.org
-
-opam pin add -yn letters .
-opam depext -y letters
-
-# install opam packages used for vscode ocaml platform package
-# e.g. when developing with emax, add also: utop merlin ocamlformat
-opam install -y ocaml-lsp-server
 make deps

.gitignore

@@ -3,3 +3,5 @@
 .merlin
 *_account.json
 .vscode
+.env
+.DS_Store

Makefile

@@ -1,6 +1,6 @@
 .PHONY: deps
 deps: ## Install development dependencies
-	opam install --deps-only --with-test --with-doc -y .
+	opam install --working-dir --with-dev-setup --with-test --with-doc --update-invariant -y .
 	eval $(opam env)
 
 .PHONY: create_switch

dune-project

@@ -68,6 +68,7 @@
   ;; Documentation dependencies
   (odoc :with-doc)
   ;; Dev dependencies
-  (ocamlformat :dev)))
+  (ocamlformat :with-dev-setup)
+  (ocaml-lsp-server :with-dev-setup)))
 
 (implicit_transitive_deps false)

letters.opam

@@ -28,7 +28,8 @@ depends: [
   "alcotest-lwt" {>= "1.1.0" & with-test}
   "yojson" {>= "1.7.0" & with-test}
   "odoc" {with-doc}
-  "ocamlformat" {dev}
+  "ocamlformat" {with-dev-setup}
+  "ocaml-lsp-server" {with-dev-setup}
 ]
 build: [
   ["dune" "subst"] {dev}

lib/dune

@@ -19,6 +19,7 @@
   sendmail.starttls
   tls
   tls-lwt
+  unix
   x509))
 
 (env

lib/sendmail_handler.ml

@@ -96,11 +96,14 @@ let run_with_starttls
         recipients
         mail_stream
     in
-    Lwt_scheduler.prj fiber)
+    Lwt.finalize
+      (fun () -> Lwt_scheduler.prj fiber)
+      (fun () -> Lwt_io.close ic >>= fun () -> Lwt_io.close oc))
 ;;
 
 let run ~hostname ?port ~domain ?authentication ~tls_authenticator ~from ~recipients ~mail
   =
+  let open Lwt.Infix in
   let ( let* ) = Lwt_result.bind in
   let port =
     match port with
@@ -129,5 +132,7 @@ let run ~hostname ?port ~domain ?authentication ~tls_authenticator ~from ~recipi
       recipients
       mail_stream
   in
-  Lwt_scheduler.prj fiber
+  Lwt.finalize
+    (fun () -> Lwt_scheduler.prj fiber)
+    (fun () -> Lwt_io.close ic >>= fun () -> Lwt_io.close oc)
 ;;