Merge remote-tracking branch 'upstream/master'

.github/workflows/check-httpd-api-unit-test.yml → .github/workflows/check-http-client-unit-test.yml

@@ -1,8 +1,8 @@
-name: check-httpd-api-unit-test
+name: check-http-client-unit-test
 on: push
 
 jobs:
-  check-httpd-api-unit-test:
+  check-http-client-unit-test:
     runs-on: ubuntu-latest
     steps:
       - name: Setup Node
@@ -18,4 +18,4 @@ jobs:
           ./scripts/install-binaries;
           ./scripts/install-binaries --show-path >> $GITHUB_PATH;
       - run: |
-          npm run test:httpd-api:unit
+          npm run test:http-client:unit

.github/workflows/check-http-server.yml

@@ -0,0 +1,50 @@
+name: check-http-server
+on: push
+
+jobs:
+  test:
+    name: Build & Test
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./http-server
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+      - uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: http-server -> target
+      - name: Build
+        run: cargo build --all-features
+      - name: Run tests
+        run: cargo test --all-features
+  docs:
+    name: Docs
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./http-server
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+      - uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: http-server -> target
+      - name: Docs
+        run: cargo doc --all --all-features
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./http-server
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+      - uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: http-server -> target
+      - name: Run clippy
+        run: cargo clippy --all --tests
+      - name: Check formatting
+        run: cargo fmt --all --check

.gitignore

@@ -2,6 +2,7 @@
 node_modules/
 NOTES
 config/local*
+http-server/target
 
 # KaTeX files
 *.min.css

eslint.config.js

@@ -133,6 +133,11 @@ export default [
     },
   },
   {
-    ignores: ["node_modules/**/*", "build/**/*", "public/**/*"],
+    ignores: [
+      "node_modules/**/*",
+      "build/**/*",
+      "public/**/*",
+      "http-server/**/*",
+    ],
   },
 ];

flake.nix

@@ -93,7 +93,7 @@
             scripts/check
             {
               npm run test:unit
-              npm run test:httpd-api:unit
+              npm run test:http-client:unit
             } | tee /dev/null
             runHook postCheck
           '';

httpd-client/tests/client.test.ts → http-client/tests/client.test.ts

@@ -1,6 +1,6 @@
 import { describe, test } from "vitest";
 
-import { HttpdClient } from "@httpd-client";
+import { HttpdClient } from "@http-client";
 import { defaultHttpdPort } from "@tests/support/fixtures";
 
 const api = new HttpdClient({

httpd-client/tests/project.test.ts → http-client/tests/project.test.ts

@@ -1,6 +1,6 @@
 import { describe, test } from "vitest";
 
-import { HttpdClient } from "@httpd-client";
+import { HttpdClient } from "@http-client";
 import {
   aliceMainHead,
   aliceRemote,
@@ -14,9 +14,9 @@ import {
   assertPatch,
   createIssueToBeModified,
   createPatchToBeModified,
-} from "@httpd-client/tests/support/support";
-import { authenticate } from "@httpd-client/tests/support/httpd.js";
-import { testFixture as testWithAPI } from "@httpd-client/tests/support/fixtures.js";
+} from "@http-client/tests/support/support";
+import { authenticate } from "@http-client/tests/support/httpd.js";
+import { testFixture as testWithAPI } from "@http-client/tests/support/fixtures.js";
 
 describe("project", () => {
   const api = new HttpdClient({

httpd-client/tests/session.test.ts → http-client/tests/session.test.ts

@@ -2,8 +2,8 @@ import * as FsSync from "node:fs";
 import * as Path from "node:path";
 import { describe, test } from "vitest";
 
-import { HttpdClient } from "@httpd-client";
-import { authenticate } from "@httpd-client/tests/support/httpd.js";
+import { HttpdClient } from "@http-client";
+import { authenticate } from "@http-client/tests/support/httpd.js";
 import { createPeerManager } from "@tests/support/peerManager.js";
 import { gitOptions } from "@tests/support/fixtures.js";
 import { tmpDir } from "@tests/support/support.js";

httpd-client/tests/support/fixtures.ts → http-client/tests/support/fixtures.ts

@@ -2,7 +2,7 @@ import * as FsSync from "node:fs";
 import * as Path from "node:path";
 import { test } from "vitest";
 
-import { HttpdClient } from "@httpd-client";
+import { HttpdClient } from "@http-client";
 import { RadiclePeer, createPeerManager } from "@tests/support/peerManager.js";
 import { gitOptions } from "@tests/support/fixtures.js";
 import { tmpDir } from "@tests/support/support.js";

httpd-client/tests/support/httpd.ts → http-client/tests/support/httpd.ts

@@ -1,4 +1,4 @@
-import type { HttpdClient } from "@httpd-client";
+import type { HttpdClient } from "@http-client";
 import type { RadiclePeer } from "@tests/support/peerManager.js";
 
 import assert from "node:assert";

httpd-client/tests/support/support.ts → http-client/tests/support/support.ts

@@ -1,4 +1,4 @@
-import type { HttpdClient } from "@httpd-client";
+import type { HttpdClient } from "@http-client";
 
 import { expect } from "vitest";
 import isMatch from "lodash/isMatch";

httpd-client/vite.config.ts → http-client/vite.config.ts

@@ -11,15 +11,15 @@ export default defineConfig({
   ],
   test: {
     environment: "node",
-    include: ["httpd-client/tests/*.test.ts"],
+    include: ["http-client/tests/*.test.ts"],
     reporters: "verbose",
     globalSetup: "./tests/support/globalSetup",
   },
   resolve: {
     alias: {
       "@tests": path.resolve("./tests"),
       "@app": path.resolve("./src"),
-      "@httpd-client": path.resolve("./httpd-client"),
+      "@http-client": path.resolve("./http-client"),
     },
   },
 });