@bgord/bun 1.2.6 → 1.2.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bgord/bun",
-  "version": "1.2.6",
+  "version": "1.2.8",
   "license": "MIT",
   "type": "module",
   "author": "Bartosz Gordon",
@@ -29,7 +29,7 @@
     "@types/yazl": "3.3.0",
     "cspell": "9.4.0",
     "knip": "5.71.0",
-    "lefthook": "2.0.6",
+    "lefthook": "2.0.7",
     "only-allow": "1.2.2",
     "shellcheck": "4.1.0",
     "typescript": "5.9.3",
@@ -37,14 +37,16 @@
   },
   "dependencies": {
     "@axiomhq/winston": "1.3.1",
-    "@bgord/tools": "1.1.9",
+    "@bgord/tools": "1.1.13",
     "@hono/ua-blocker": "0.1.20",
     "better-auth": "1.4.5",
     "croner": "9.1.0",
     "csv": "6.4.1",
     "hcaptcha": "0.2.0",
     "hono": "4.10.7",
+    "isomorphic-dompurify": "2.33.0",
     "lodash": "4.17.21",
+    "marked": "17.0.1",
     "node-cache": "5.1.2",
     "nodemailer": "7.0.11",
     "sharp": "0.34.5",

package/readme.md

@@ -50,6 +50,9 @@ src/
 ├── command-envelope.ts
 ├── command-logger.service.ts
 ├── command.types.ts
+├── content-hash-noop.adapter.ts
+├── content-hash-sha256-bun.adapter.ts
+├── content-hash.port.ts
 ├── context.middleware.ts
 ├── correlation-id.vo.ts
 ├── correlation-storage.service.ts
@@ -148,6 +151,9 @@ src/
 ├── mailer-smtp.adapter.ts
 ├── mailer.port.ts
 ├── mailer.vo.ts
+├── markdown-generator-marked.adapter.ts
+├── markdown-generator-noop.adapter.ts
+├── markdown-generator.port.ts
 ├── memory-consumption.service.ts
 ├── modules
 │   ├── history
@@ -194,6 +200,7 @@ src/
 │   ├── clock-drift.ts
 │   ├── dependency-vulnerabilities.ts
 │   ├── directory.ts
+│   ├── dns.ts
 │   ├── external-api.ts
 │   ├── jobs.ts
 │   ├── log-file.ts

package/src/content-hash-noop.adapter.ts

@@ -0,0 +1,7 @@
+import type { ContentHashPort } from "./content-hash.port";
+
+export class ContentHashNoopAdapter implements ContentHashPort {
+  async hash(_content: string) {
+    return { etag: "noop" };
+  }
+}

package/src/content-hash-sha256-bun.adapter.ts

@@ -0,0 +1,10 @@
+import type { ContentHashPort } from "./content-hash.port";
+
+export class ContentHashSha256BunAdapter implements ContentHashPort {
+  async hash(content: string) {
+    const digest = await crypto.subtle.digest("SHA-256", new TextEncoder().encode(content));
+    const etag = Buffer.from(digest).toString("hex");
+
+    return { etag };
+  }
+}

package/src/content-hash.port.ts

@@ -0,0 +1,5 @@
+export type ContentHashResult = { etag: string };
+
+export interface ContentHashPort {
+  hash(content: string): Promise<ContentHashResult>;
+}

package/src/decorators.service.ts

@@ -1,8 +1,6 @@
 import * as tools from "@bgord/tools";
 import type { LoggerPort } from "./logger.port";
 
-export class DecoratorTimeoutError extends Error {}
-
 export class Decorators {
   private readonly rounding = new tools.RoundToDecimal(2);
 
@@ -63,17 +61,4 @@ export class Decorators {
       };
     };
   }
-
-  timeout(ms: number) {
-    return (_target: any, _key: string, descriptor: PropertyDescriptor) => {
-      const original: (...args: unknown[]) => unknown = descriptor.value;
-
-      descriptor.value = async function (...args: any[]) {
-        return await Promise.race([
-          original.apply(this, args),
-          new Promise((_, reject) => setTimeout(() => reject(new DecoratorTimeoutError()), ms)),
-        ]);
-      };
-    };
-  }
 }

package/src/file-draft-zip.service.ts

@@ -6,8 +6,8 @@ import { FileDraft } from "./file-draft.service";
 export class FileDraftZip extends FileDraft {
   private readonly parts: FileDraft[];
 
-  constructor(config: { filename: string; parts: FileDraft[] }) {
-    super({ filename: config.filename, mime: new tools.Mime("application/zip") });
+  constructor(config: { filename: tools.Filename; parts: FileDraft[] }) {
+    super({ filename: config.filename, mime: tools.MIMES.text });
     this.parts = config.parts;
   }
 
@@ -17,7 +17,7 @@ export class FileDraftZip extends FileDraft {
     const chunks: Buffer[] = [];
 
     for (const part of this.parts) {
-      zip.addReadStream((await part.create()) as Readable, part.config.filename);
+      zip.addReadStream((await part.create()) as Readable, part.config.filename.get());
     }
     zip.end();
 

package/src/file-draft.service.ts

@@ -4,12 +4,12 @@ import type * as tools from "@bgord/tools";
 export type DraftBody = BodyInit | NodeJS.ReadableStream | ReadableStream;
 
 export abstract class FileDraft {
-  constructor(readonly config: { filename: string; mime: tools.Mime }) {}
+  constructor(readonly config: { filename: tools.Filename; mime: tools.Mime }) {}
 
   getHeaders(): Headers {
     return new Headers({
       "Content-Type": this.config.mime.toString(),
-      "Content-Disposition": `attachment; filename="${this.config.filename}"`,
+      "Content-Disposition": `attachment; filename="${this.config.filename.get()}"`,
     });
   }
 

package/src/file-hash-noop.adapter.ts

@@ -7,7 +7,7 @@ export class FileHashNoopAdapter implements FileHashPort {
       etag: "noop",
       size: tools.Size.fromBytes(10),
       lastModified: tools.Timestamp.fromNumber(1000),
-      mime: new tools.Mime("text/plain"),
+      mime: tools.MIMES.text,
     };
   }
 }

package/src/file-uploader.middleware.ts

@@ -3,7 +3,7 @@ import { bodyLimit } from "hono/body-limit";
 import { createMiddleware } from "hono/factory";
 import { HTTPException } from "hono/http-exception";
 
-type FileUploaderConfigType = { mimeTypes: string[]; maxFilesSize: tools.Size };
+type FileUploaderConfigType = { mimeTypes: tools.Mime[]; maxFilesSize: tools.Size };
 
 export const InvalidFileMimeTypeError = new HTTPException(400, { message: "invalid_file_mime_type_error" });
 export const FileTooBigError = new HTTPException(400, { message: "file_too_big_error" });
@@ -25,10 +25,8 @@ export class FileUploader {
 
         if (!(file instanceof File)) throw InvalidFileMimeTypeError;
 
-        const contentType = new tools.Mime(file.type);
-        const accepted = config.mimeTypes.some((acceptedMimeType) =>
-          new tools.Mime(acceptedMimeType).isSatisfiedBy(contentType),
-        );
+        const contentType = tools.Mime.fromString(file.type);
+        const accepted = config.mimeTypes.some((accepted) => accepted.isSatisfiedBy(contentType));
 
         if (!accepted) throw InvalidFileMimeTypeError;
         return next();

package/src/index.ts

@@ -23,6 +23,9 @@ export * from "./clock-system.adapter";
 export * from "./command.types";
 export * from "./command-envelope";
 export * from "./command-logger.service";
+export * from "./content-hash.port";
+export * from "./content-hash-noop.adapter";
+export * from "./content-hash-sha256-bun.adapter";
 export * from "./context.middleware";
 export * from "./correlation-id.vo";
 export * from "./correlation-storage.service";
@@ -124,6 +127,9 @@ export * from "./mailer.vo";
 export * from "./mailer-noop.adapter";
 export * from "./mailer-smtp.adapter";
 export * from "./mailer-smtp-with-logger.adapter";
+export * from "./markdown-generator.port";
+export * from "./markdown-generator-marked.adapter";
+export * from "./markdown-generator-noop.adapter";
 export * from "./memory-consumption.service";
 export * as History from "./modules/history";
 export * as Preferences from "./modules/preferences";

package/src/markdown-generator-marked.adapter.ts

@@ -0,0 +1,15 @@
+import DOMPurify from "isomorphic-dompurify";
+import { Marked } from "marked";
+import type { MarkdownGeneratorPort } from "./markdown-generator.port";
+
+export class MarkdownGeneratorMarkedAdapter implements MarkdownGeneratorPort {
+  private readonly instance: Marked;
+
+  constructor() {
+    this.instance = new Marked();
+  }
+
+  async generate(content: string) {
+    return DOMPurify.sanitize(await this.instance.parse(content));
+  }
+}

package/src/markdown-generator-noop.adapter.ts

@@ -0,0 +1,7 @@
+import type { MarkdownGeneratorPort } from "./markdown-generator.port";
+
+export class MarkdownGeneratorNoopAdapter implements MarkdownGeneratorPort {
+  async generate(_content: string) {
+    return "<p>noop</p>";
+  }
+}

package/src/markdown-generator.port.ts

@@ -0,0 +1,3 @@
+export abstract class MarkdownGeneratorPort {
+  abstract generate(input: string): Promise<string>;
+}

package/src/prerequisites/dns.ts

@@ -0,0 +1,36 @@
+import dns from "dns/promises";
+import * as tools from "@bgord/tools";
+import type { ClockPort } from "../clock.port";
+import * as prereqs from "../prerequisites.service";
+import { Timeout } from "../timeout.service";
+
+export class PrerequisiteDNS implements prereqs.Prerequisite {
+  readonly kind = "dns";
+  readonly label: prereqs.PrerequisiteLabelType;
+  readonly enabled?: boolean = true;
+
+  private readonly hostname: string;
+  readonly timeout: tools.Duration;
+
+  constructor(config: prereqs.PrerequisiteConfigType & { hostname: string; timeout?: tools.Duration }) {
+    this.label = config.label;
+    this.enabled = config.enabled === undefined ? true : config.enabled;
+
+    this.hostname = config.hostname;
+    this.timeout = config.timeout ?? tools.Duration.Seconds(1);
+  }
+
+  async verify(clock: ClockPort): Promise<prereqs.VerifyOutcome> {
+    const stopwatch = new tools.Stopwatch(clock.now());
+
+    if (!this.enabled) return prereqs.Verification.undetermined(stopwatch.stop());
+
+    try {
+      await Timeout.run(dns.lookup(this.hostname), this.timeout);
+
+      return prereqs.Verification.success(stopwatch.stop());
+    } catch (error) {
+      return prereqs.Verification.failure(stopwatch.stop(), error as Error);
+    }
+  }
+}

package/src/prerequisites/index.ts

@@ -3,6 +3,7 @@ export * from "./bun";
 export * from "./clock-drift";
 export * from "./dependency-vulnerabilities";
 export * from "./directory";
+export * from "./dns";
 export * from "./external-api";
 export * from "./jobs";
 export * from "./log-file";

package/src/prerequisites/ssl-certificate-expiry.ts

@@ -8,13 +8,13 @@ export class PrerequisiteSSLCertificateExpiry implements prereqs.Prerequisite {
   readonly label: prereqs.PrerequisiteLabelType;
   readonly enabled?: boolean = true;
 
-  private readonly host: string;
+  private readonly hostname: string;
   private readonly days: number;
   private readonly CertificateInspector: CertificateInspectorPort;
 
   constructor(
     config: prereqs.PrerequisiteConfigType & {
-      host: string;
+      hostname: string;
       days: number;
       CertificateInspector: CertificateInspectorPort;
     },
@@ -22,7 +22,7 @@ export class PrerequisiteSSLCertificateExpiry implements prereqs.Prerequisite {
     this.label = config.label;
     this.enabled = config.enabled === undefined ? true : config.enabled;
 
-    this.host = config.host;
+    this.hostname = config.hostname;
     this.days = config.days;
     this.CertificateInspector = config.CertificateInspector;
   }
@@ -32,7 +32,7 @@ export class PrerequisiteSSLCertificateExpiry implements prereqs.Prerequisite {
 
     if (!this.enabled) return prereqs.Verification.undetermined(stopwatch.stop());
 
-    const result = await this.CertificateInspector.inspect(this.host);
+    const result = await this.CertificateInspector.inspect(this.hostname);
 
     if (!result.success)
       return prereqs.Verification.failure(stopwatch.stop(), { message: "Certificate unavailable" });

package/src/remote-file-storage-noop.adapter.ts

@@ -35,7 +35,7 @@ export class RemoteFileStorageNoopAdapter implements RemoteFileStoragePort {
       etag: "noop",
       size: tools.Size.fromBytes(10),
       lastModified: this.deps.Clock.now(),
-      mime: new tools.Mime("text/plain"),
+      mime: tools.MIMES.text,
     };
   }