bunch of improvements

async/dune

@@ -1,7 +1,4 @@
 (library
  (name httpun_ws_async)
  (public_name httpun-ws-async)
- (libraries async core faraday-async gluten-async httpun-ws digestif.ocaml
-   base64)
- (flags
-  (:standard -safe-string)))
+ (libraries async core gluten-async httpun-ws digestif.ocaml))

dune-project

@@ -1,3 +1,96 @@
 (lang dune 3.0)
 
 (name httpun-ws)
+
+(generate_opam_files true)
+
+(source
+ (github anmonteiro/httpun-ws))
+
+(authors
+ "Spiros Eliopoulos <spiros@inhabitedtype.com>"
+ "Antonio Nuno Monteiro <anmonteiro@gmail.com>")
+
+(maintainers "Antonio Nuno Monteiro <anmonteiro@gmail.com>")
+
+(homepage "https://github.com/anmonteiro/httpun-ws")
+
+(bug_reports "https://github.com/anmonteiro/httpun-ws/issues")
+
+(license "BSD-3-clause")
+
+(package
+ (name httpun-ws)
+ (synopsis "Websocket implementation for httpun")
+ (depends
+  (ocaml
+   (>= "4.08"))
+  (base64
+   (>= "3.0.0"))
+  bigstringaf
+  (angstrom
+   (>= "0.14.0"))
+  (faraday
+   (>= "0.8.0"))
+  (gluten
+   (>= "0.2.0"))
+  httpun
+  (alcotest :with-test)))
+
+(package
+ (name httpun-ws-lwt)
+ (synopsis "Lwt support for httpun")
+ (depends
+  (ocaml
+   (>= "4.08"))
+  httpun-ws
+  lwt
+  digestif
+  (gluten-lwt
+   (>= "0.2.0"))))
+
+(package
+ (name httpun-ws-lwt-unix)
+ (synopsis "Lwt + unix support for httpun-ws")
+ (depends
+  (ocaml
+   (>= "4.08"))
+  httpun-ws-lwt
+  (gluten-lwt-unix
+   (>= "0.2.0"))))
+
+(package
+ (name httpun-ws-eio)
+ (synopsis "Eio support for httpun")
+ (depends
+  (ocaml
+   (>= "4.08"))
+  httpun-ws
+  digestif
+  (gluten-eio
+   (>= "0.2.1"))))
+
+(package
+ (name httpun-ws-mirage)
+ (synopsis "Mirage support for httpun")
+ (depends
+  (ocaml
+   (>= "4.08"))
+  httpun-ws-lwt
+  (gluten-mirage
+   (>= "0.2.0"))
+  (mirage-flow
+   (>= "2.0.0"))
+  cstruct))
+
+(package
+ (name httpun-ws-async)
+ (synopsis "Mirage support for httpun")
+ (depends
+  (ocaml
+   (>= "4.08"))
+  httpun-ws
+  (async
+   (>= "v0.15.0"))
+  gluten-async
+  digestif))

flake.nix

@@ -11,12 +11,12 @@
     flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = nixpkgs.legacyPackages.${system}.extend (self: super: {
-          ocamlPackages = super.ocaml-ng.ocamlPackages_5_1;
+          ocamlPackages = super.ocaml-ng.ocamlPackages_5_2;
         });
       in
       rec {
         packages = pkgs.callPackage ./nix { nix-filter = nix-filter.lib; };
         defaultPackage = packages.httpun-ws;
-        devShell = pkgs.callPackage ./shell.nix { inherit packages; };
+        devShell = pkgs.callPackage ./nix/shell.nix { inherit packages; };
       });
 }

httpun-ws-async.opam

@@ -1,23 +1,35 @@
+# This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
-name: "httpun-ws-async"
-maintainer: "Spiros Eliopoulos <spiros@inhabitedtype.com>"
-authors: [ "Antonio N. Monteiro <anmonteiro@gmail.com>" ]
+synopsis: "Mirage support for httpun"
+maintainer: ["Antonio Nuno Monteiro <anmonteiro@gmail.com>"]
+authors: [
+  "Spiros Eliopoulos <spiros@inhabitedtype.com>"
+  "Antonio Nuno Monteiro <anmonteiro@gmail.com>"
+]
 license: "BSD-3-clause"
 homepage: "https://github.com/anmonteiro/httpun-ws"
 bug-reports: "https://github.com/anmonteiro/httpun-ws/issues"
-dev-repo: "git+https://github.com/anmonteiro/httpun-ws.git"
-build: [
-  ["jbuilder" "subst" "-p" name] {pinned}
-  ["jbuilder" "build" "-p" name "-j" jobs]
-]
 depends: [
-  "ocaml" {>= "4.03.0"}
+  "dune" {>= "3.0"}
+  "ocaml" {>= "4.08"}
   "httpun-ws"
-  "dune"
-  "faraday-async"
   "async" {>= "v0.15.0"}
   "gluten-async"
   "digestif"
-  "base64"
+  "odoc" {with-doc}
 ]
-synopsis: "Async support for websocket/af"
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
+dev-repo: "git+https://github.com/anmonteiro/httpun-ws.git"

httpun-ws-eio.opam

@@ -1,20 +1,34 @@
+# This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
-name: "httpun-ws-eio"
-maintainer: "Antonio Nuno Monteiro <anmonteiro@gmail.com>"
-authors: [ "Antonio Nuno Monteiro <anmonteiro@gmail.com>" ]
+synopsis: "Eio support for httpun"
+maintainer: ["Antonio Nuno Monteiro <anmonteiro@gmail.com>"]
+authors: [
+  "Spiros Eliopoulos <spiros@inhabitedtype.com>"
+  "Antonio Nuno Monteiro <anmonteiro@gmail.com>"
+]
 license: "BSD-3-clause"
 homepage: "https://github.com/anmonteiro/httpun-ws"
 bug-reports: "https://github.com/anmonteiro/httpun-ws/issues"
-dev-repo: "git+https://github.com/anmonteiro/httpun-ws.git"
-build: [
-  ["dune" "subst" "-p" name] {pinned}
-  ["dune" "build" "-p" name "-j" jobs]
-]
 depends: [
-  "ocaml" {>= "4.03.0"}
+  "dune" {>= "3.0"}
+  "ocaml" {>= "4.08"}
   "httpun-ws"
-  "dune" {build}
   "digestif"
-  "gluten-eio"
+  "gluten-eio" {>= "0.2.1"}
+  "odoc" {with-doc}
 ]
-synopsis: "Lwt support for websocket/af"
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
+dev-repo: "git+https://github.com/anmonteiro/httpun-ws.git"

httpun-ws-lwt-unix.opam

@@ -1,23 +1,33 @@
+# This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
-name: "httpun-ws-lwt-unix"
-maintainer: "Antonio Nuno Monteiro <anmonteiro@gmail.com>"
-authors: [ "Andreas Garnæs <andreas.garnaes@gmail.com>"
-           "Antonio Nuno Monteiro <anmonteiro@gmail.com>" ]
+synopsis: "Lwt + unix support for httpun-ws"
+maintainer: ["Antonio Nuno Monteiro <anmonteiro@gmail.com>"]
+authors: [
+  "Spiros Eliopoulos <spiros@inhabitedtype.com>"
+  "Antonio Nuno Monteiro <anmonteiro@gmail.com>"
+]
 license: "BSD-3-clause"
 homepage: "https://github.com/anmonteiro/httpun-ws"
 bug-reports: "https://github.com/anmonteiro/httpun-ws/issues"
-dev-repo: "git+https://github.com/anmonteiro/httpun-ws.git"
-build: [
-  ["dune" "subst" "-p" name] {pinned}
-  ["dune" "build" "-p" name "-j" jobs]
-]
 depends: [
-  "ocaml" {>= "4.03.0"}
-  "faraday-lwt-unix"
-  "httpun-ws"
+  "dune" {>= "3.0"}
+  "ocaml" {>= "4.08"}
   "httpun-ws-lwt"
-  "dune" {build}
-  "lwt"
   "gluten-lwt-unix" {>= "0.2.0"}
+  "odoc" {with-doc}
 ]
-synopsis: "Lwt support for websocket/af"
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
+dev-repo: "git+https://github.com/anmonteiro/httpun-ws.git"

httpun-ws-lwt.opam

@@ -1,22 +1,35 @@
+# This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
-name: "httpun-ws-lwt"
-maintainer: "Antonio Nuno Monteiro <anmonteiro@gmail.com>"
-authors: [ "Andreas Garnæs <andreas.garnaes@gmail.com>"
-           "Antonio Nuno Monteiro <anmonteiro@gmail.com>" ]
+synopsis: "Lwt support for httpun"
+maintainer: ["Antonio Nuno Monteiro <anmonteiro@gmail.com>"]
+authors: [
+  "Spiros Eliopoulos <spiros@inhabitedtype.com>"
+  "Antonio Nuno Monteiro <anmonteiro@gmail.com>"
+]
 license: "BSD-3-clause"
 homepage: "https://github.com/anmonteiro/httpun-ws"
 bug-reports: "https://github.com/anmonteiro/httpun-ws/issues"
-dev-repo: "git+https://github.com/anmonteiro/httpun-ws.git"
-build: [
-  ["dune" "subst" "-p" name] {pinned}
-  ["dune" "build" "-p" name "-j" jobs]
-]
 depends: [
-  "ocaml" {>= "4.03.0"}
+  "dune" {>= "3.0"}
+  "ocaml" {>= "4.08"}
   "httpun-ws"
-  "dune" {build}
   "lwt"
   "digestif"
   "gluten-lwt" {>= "0.2.0"}
+  "odoc" {with-doc}
 ]
-synopsis: "Lwt support for websocket/af"
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
+dev-repo: "git+https://github.com/anmonteiro/httpun-ws.git"