@smuzi/logger-ui 0.0.5 → 0.0.6

package/build/handlers.js

@@ -1,6 +1,6 @@
 import { readFile } from "node:fs/promises";
 import { asObject, asString, HttpResponse, ResponseHttpHeaders, Some } from "@smuzi/std";
-import { parseLogsQuery } from "./query.js";
+import { logIdFromPath, logRetryAction as loggerLogRetryAction, logsQueryAction as loggerLogsQueryAction, } from "@smuzi/logger";
 // Resolves to <package>/build/ui both from src/ (workspace) and from build/ (published).
 const UI_DIR = new URL("../build/ui/", import.meta.url);
 export var UiAsset;
@@ -44,6 +44,9 @@ async function htmlPageResponse(file, base_path) {
     }
     return textResponse(html.replaceAll("{{base}}", escapeHtmlAttribute(base_path)), "text/html; charset=utf-8");
 }
+function unauthorizedResponse() {
+    return HttpResponse.asJson({ error: "Unauthorized" }, 401);
+}
 function authErrorResponse(message) {
     return HttpResponse.asJson({ error: message }, 500);
 }
@@ -108,64 +111,8 @@ export function uiAssetAction(asset) {
     };
 }
 export function logsQueryAction(auth, reader) {
-    return authenticated(auth, async (context) => {
-        const body = await context.request.body();
-        if (body.isErr()) {
-            return HttpResponse.asJson({ error: "Unable to read request body" }, 400);
-        }
-        const query = parseLogsQuery(body.unwrap());
-        if (query.isErr()) {
-            return HttpResponse.asJson({ error: query.unsafeSource() }, 422);
-        }
-        const page = await reader.queryGroups(query.unwrap());
-        return page.match({
-            Ok: (value) => HttpResponse.asJson(value),
-            Err: (error) => HttpResponse.asJson({ error: error.message }, 500),
-        });
-    }, () => HttpResponse.asJson({ error: "Unauthorized" }, 401));
-}
-function pathParam(context, name) {
-    return context.pathParams.get(name);
+    return authenticated(auth, loggerLogsQueryAction(reader), unauthorizedResponse);
 }
 export function logRetryAction(auth, reader, http_client) {
-    return authenticated(auth, async (context) => {
-        const id = Number(pathParam(context, "id").someOr(""));
-        if (!Number.isInteger(id) || id <= 0) {
-            return HttpResponse.asJson({ error: "Invalid log id" }, 400);
-        }
-        const found = await reader.getById(id);
-        if (found.isErr()) {
-            return HttpResponse.asJson({ error: found.unsafeSource().message }, 500);
-        }
-        const log = found.unwrap();
-        if (log.isNone()) {
-            return HttpResponse.asJson({ error: "Log not found" }, 404);
-        }
-        const retry = log.unwrap().retry;
-        if (retry === null) {
-            return HttpResponse.asJson({ error: "Log has no retry configuration" }, 422);
-        }
-        // Resends the original message as-is (raw string body, no wrapping). Uses plain
-        // fetch, so this goes out over HTTP/1 by default (no HTTP/2 dispatcher configured).
-        const response = await http_client.post(retry.url, {
-            body: Some(log.unwrap().message),
-            rawResponse: true,
-        });
-        const retries_count = await reader.incrementRetryCount(id);
-        const retries_count_value = retries_count.okOr(log.unwrap().retries_count);
-        return response.match({
-            Ok: (ok_response) => HttpResponse.asJson({
-                status: ok_response.status,
-                body: ok_response.body.someOr(""),
-                retries_count: retries_count_value,
-            }),
-            Err: (error) => error instanceof HttpResponse
-                ? HttpResponse.asJson({
-                    status: error.status,
-                    body: error.body.someOr(""),
-                    retries_count: retries_count_value,
-                })
-                : HttpResponse.asJson({ error: "Retry request failed: " + String(error) }, 502),
-        });
-    }, () => HttpResponse.asJson({ error: "Unauthorized" }, 401));
+    return authenticated(auth, loggerLogRetryAction(reader, http_client, logIdFromPath), unauthorizedResponse);
 }

package/build/index.d.ts

@@ -2,7 +2,6 @@ export * from "./auth.js";
 export * from "./commands.js";
 export * from "./handlers.js";
 export * from "./password.js";
-export * from "./query.js";
 export * from "./routes.js";
 export * from "./server.js";
 export * from "./users.js";

package/build/index.js

@@ -2,7 +2,6 @@ export * from "./auth.js";
 export * from "./commands.js";
 export * from "./handlers.js";
 export * from "./password.js";
-export * from "./query.js";
 export * from "./routes.js";
 export * from "./server.js";
 export * from "./users.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smuzi/logger-ui",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "Web UI for browsing logs",
   "type": "module",
   "types": "./build/index.d.ts",
@@ -40,7 +40,7 @@
     "@smuzi/database": "^0.0.15",
     "@smuzi/http-client": "^0.0.13",
     "@smuzi/http-server": "^0.0.14",
-    "@smuzi/logger": "^0.0.8",
+    "@smuzi/logger": "^0.0.9",
     "@smuzi/std": "^0.2.16"
   },
   "devDependencies": {