@bgord/bun 1.0.2 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bgord/bun",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "license": "MIT",
   "type": "module",
   "author": "Bartosz Gordon",
@@ -20,17 +20,17 @@
     "preinstall": "bunx only-allow bun"
   },
   "devDependencies": {
-    "@biomejs/biome": "2.2.7",
+    "@biomejs/biome": "2.3.0",
     "@commitlint/cli": "20.1.0",
     "@commitlint/config-conventional": "20.0.0",
-    "@types/bun": "1.3.0",
+    "@types/bun": "1.3.1",
     "@types/lodash": "4.17.20",
     "@types/mime-types": "3.0.1",
-    "@types/nodemailer": "7.0.2",
+    "@types/nodemailer": "7.0.3",
     "@types/yazl": "3.3.0",
     "cspell": "9.2.2",
-    "knip": "5.66.2",
-    "lefthook": "2.0.0",
+    "knip": "5.66.3",
+    "lefthook": "2.0.1",
     "only-allow": "1.2.1",
     "shellcheck": "4.1.0",
     "typescript": "5.9.3",
@@ -38,14 +38,14 @@
   },
   "dependencies": {
     "@axiomhq/winston": "1.3.1",
-    "@bgord/tools": "1.0.1",
-    "@hono/ua-blocker": "0.1.14",
-    "better-auth": "1.3.29",
+    "@bgord/tools": "1.0.2",
+    "@hono/ua-blocker": "0.1.15",
+    "better-auth": "1.3.32",
     "check-disk-space": "3.4.0",
     "croner": "9.1.0",
     "csv": "6.4.1",
     "hcaptcha": "0.2.0",
-    "hono": "4.10.2",
+    "hono": "4.10.3",
     "lodash": "4.17.21",
     "mime-types": "3.0.1",
     "node-cache": "5.1.2",

package/readme.md

@@ -55,6 +55,10 @@ src/
 ├── csv-stringifier.adapter.ts
 ├── csv-stringifier.port.ts
 ├── decorators.service.ts
+├── disk-space-checker-bun.adapter.ts
+├── disk-space-checker-noop.adapter.ts
+├── disk-space-checker-package.adapter.ts
+├── disk-space-checker.port.ts
 ├── dispatching-event-store.ts
 ├── env-validator.service.ts
 ├── etag-extractor.middleware.ts

package/src/cache-response.middleware.ts

@@ -1,5 +1,4 @@
 import { createMiddleware } from "hono/factory";
-import _ from "lodash";
 import type NodeCache from "node-cache";
 import { CacheHitEnum } from "./cache-resolver.service";
 
@@ -9,7 +8,7 @@ export class CacheResponse {
   constructor(private readonly cache: NodeCache) {}
 
   handle = createMiddleware(async (c, next) => {
-    const url = _.escape(c.req.url);
+    const url = c.req.url;
 
     if (this.cache.has(url)) {
       c.res.headers.set(CacheResponse.CACHE_HIT_HEADER, CacheHitEnum.hit);

package/src/disk-space-checker-bun.adapter.ts

@@ -0,0 +1,18 @@
+import bun from "bun";
+import * as tools from "@bgord/tools";
+import type { DiskSpaceCheckerPort } from "./disk-space-checker.port";
+
+// Example command output:
+// Filesystem     1024-blocks      Used Available Capacity  Mounted on
+// /dev/disk3s1s1   239362496  10997540  43650948    21%    /
+
+export class DiskSpaceCheckerBunAdapter implements DiskSpaceCheckerPort {
+  async get(root: string) {
+    const stdout = await bun.$`df -kP ${root}`.text();
+
+    const line = stdout.trim().split(/\r?\n/)[1]; // Select the second line
+    const free = Number(line?.trim().split(/\s+/)[3]); // Get the fourth block
+
+    return tools.Size.fromKb(free);
+  }
+}

package/src/disk-space-checker-noop.adapter.ts

@@ -0,0 +1,10 @@
+import type * as tools from "@bgord/tools";
+import type { DiskSpaceCheckerPort } from "./disk-space-checker.port";
+
+export class DiskSpaceCheckerNoopAdapter implements DiskSpaceCheckerPort {
+  constructor(private readonly value: tools.Size) {}
+
+  async get(_root: string) {
+    return this.value;
+  }
+}

package/src/disk-space-checker-package.adapter.ts

@@ -0,0 +1,11 @@
+import * as tools from "@bgord/tools";
+import checkDiskSpace from "check-disk-space";
+import type { DiskSpaceCheckerPort } from "./disk-space-checker.port";
+
+export class DiskSpaceCheckerPackageAdapter implements DiskSpaceCheckerPort {
+  async get(root: string) {
+    const result = await checkDiskSpace(root);
+
+    return tools.Size.fromBytes(result.free);
+  }
+}

package/src/disk-space-checker.port.ts

@@ -0,0 +1,5 @@
+import type * as tools from "@bgord/tools";
+
+export interface DiskSpaceCheckerPort {
+  get(root: string): Promise<tools.Size>;
+}

package/src/http-logger.middleware.ts

@@ -1,6 +1,5 @@
 import * as tools from "@bgord/tools";
 import { createMiddleware } from "hono/factory";
-import _ from "lodash";
 import { CacheHitEnum } from "./cache-resolver.service";
 import { CacheResponse } from "./cache-response.middleware";
 import { ClientFromHonoAdapter } from "./client-from-hono.adapter";
@@ -50,8 +49,11 @@ export class HttpLogger {
 
       const httpRequestBeforeMetadata = {
         params: context.req.param(),
-        // @ts-expect-error
-        headers: _.omit(Object.fromEntries(request.headers), UNINFORMATIVE_HEADERS),
+        headers: Object.fromEntries(
+          Object.entries(request.headers.toJSON()).filter(
+            ([header]) => !UNINFORMATIVE_HEADERS.includes(header),
+          ),
+        ),
         body: await HttpLogger.parseJSON(request),
         query: context.req.queries(),
       };
@@ -64,7 +66,15 @@ export class HttpLogger {
         method: request.method,
         url: request.url,
         client,
-        metadata: _.pickBy(httpRequestBeforeMetadata, (value) => !_.isEmpty(value)),
+        metadata: Object.fromEntries(
+          Object.entries(httpRequestBeforeMetadata).filter(
+            ([, value]) =>
+              value !== undefined &&
+              value !== null &&
+              typeof value === "object" &&
+              Object.keys(value).length > 0,
+          ),
+        ),
       });
 
       const stopwatch = new tools.Stopwatch(deps.Clock.nowMs());

package/src/index.ts

@@ -29,6 +29,10 @@ export * from "./correlation-storage.service";
 export * from "./csv-stringifier.adapter";
 export * from "./csv-stringifier.port";
 export * from "./decorators.service";
+export * from "./disk-space-checker.port";
+export * from "./disk-space-checker-bun.adapter";
+export * from "./disk-space-checker-noop.adapter";
+export * from "./disk-space-checker-package.adapter";
 export * from "./dispatching-event-store";
 export * from "./env-validator.service";
 export * from "./etag-extractor.middleware";

package/src/prerequisites/space.ts

@@ -1,28 +1,32 @@
 import path from "node:path";
 import * as tools from "@bgord/tools";
-import checkDiskSpace from "check-disk-space";
+import type { DiskSpaceCheckerPort } from "../disk-space-checker.port";
 import * as prereqs from "../prerequisites.service";
 
 export class PrerequisiteSpace implements prereqs.Prerequisite {
   readonly kind = "space";
   readonly label: prereqs.PrerequisiteLabelType;
   readonly enabled?: boolean = true;
+
   private readonly minimum: tools.Size;
+  private readonly checker: DiskSpaceCheckerPort;
 
-  constructor(config: prereqs.PrerequisiteConfigType & { minimum: tools.Size }) {
+  constructor(
+    config: prereqs.PrerequisiteConfigType & { minimum: tools.Size; checker: DiskSpaceCheckerPort },
+  ) {
     this.label = config.label;
     this.enabled = config.enabled === undefined ? true : config.enabled;
 
     this.minimum = config.minimum;
+    this.checker = config.checker;
   }
 
   async verify(): Promise<prereqs.VerifyOutcome> {
     if (!this.enabled) return prereqs.Verification.undetermined();
 
     try {
-      const fsRoot = path.sep;
-      const bytes = await checkDiskSpace(fsRoot);
-      const freeDiskSpace = tools.Size.fromBytes(bytes.free);
+      const root = path.sep;
+      const freeDiskSpace = await this.checker.get(root);
 
       if (freeDiskSpace.isGreaterThan(this.minimum)) return prereqs.Verification.success();
       return prereqs.Verification.failure({