@bgord/bun 1.2.8 → 1.2.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bgord/bun",
-  "version": "1.2.8",
+  "version": "1.2.9",
   "license": "MIT",
   "type": "module",
   "author": "Bartosz Gordon",
@@ -37,7 +37,7 @@
   },
   "dependencies": {
     "@axiomhq/winston": "1.3.1",
-    "@bgord/tools": "1.1.13",
+    "@bgord/tools": "1.1.16",
     "@hono/ua-blocker": "0.1.20",
     "better-auth": "1.4.5",
     "croner": "9.1.0",

package/src/encryption-key.vo.ts

@@ -5,7 +5,8 @@ export const EncryptionKeyError = {
   InvalidHex: "encryption.key.invalid.hex",
 } as const;
 
-const CHARS_WHITELIST = /^[0-9a-fA-F]{64}$/;
+// 64 hex chars allowed
+const CHARS_WHITELIST = /^[a-fA-F0-9]{64}$/;
 
 export const EncryptionKey = z
   .string(EncryptionKeyError.Type)

package/src/event-store-like.types.ts

@@ -1,5 +1,7 @@
+import type * as tools from "@bgord/tools";
+
 export type EventStoreLike<E extends { name: string }> = {
   save(events: E[]): Promise<unknown>;
 
-  saveAfter(events: E[], delay: { ms: number }): Promise<unknown>;
+  saveAfter(events: E[], offset: tools.Duration): Promise<unknown>;
 };

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

@@ -4,11 +4,12 @@ import { ZipFile } from "yazl";
 import { FileDraft } from "./file-draft.service";
 
 export class FileDraftZip extends FileDraft {
-  private readonly parts: FileDraft[];
-
-  constructor(config: { filename: tools.Filename; parts: FileDraft[] }) {
-    super({ filename: config.filename, mime: tools.MIMES.text });
-    this.parts = config.parts;
+  constructor(
+    basename: tools.BasenameType,
+    private readonly parts: FileDraft[],
+  ) {
+    super(basename, tools.MIMES.zip);
+    this.parts = parts;
   }
 
   // @ts-expect-error
@@ -17,7 +18,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.get());
+      zip.addReadStream((await part.create()) as Readable, part.filename.get());
     }
     zip.end();
 

package/src/file-draft.service.ts

@@ -1,15 +1,19 @@
 import type { ReadableStream } from "node:stream/web";
-import type * as tools from "@bgord/tools";
+import * as tools from "@bgord/tools";
 
 export type DraftBody = BodyInit | NodeJS.ReadableStream | ReadableStream;
 
 export abstract class FileDraft {
-  constructor(readonly config: { filename: tools.Filename; mime: tools.Mime }) {}
+  readonly filename: tools.Filename;
+
+  constructor(basename: tools.BasenameType, mime: tools.Mime) {
+    this.filename = tools.Filename.fromPartsSafe(basename, mime.toExtension());
+  }
 
   getHeaders(): Headers {
     return new Headers({
-      "Content-Type": this.config.mime.toString(),
-      "Content-Disposition": `attachment; filename="${this.config.filename.get()}"`,
+      "Content-Type": this.filename.getMime().toString(),
+      "Content-Disposition": `attachment; filename="${this.filename.get()}"`,
     });
   }
 
@@ -24,6 +28,6 @@ export abstract class FileDraft {
   async toAttachment() {
     const body = await this.create();
 
-    return { filename: this.config.filename, content: body, contentType: this.config.mime.toString() };
+    return { filename: this.filename, content: body, contentType: this.filename.getMime().toString() };
   }
 }