@bgord/bun 1.6.5 → 1.6.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bgord/bun",
-  "version": "1.6.5",
+  "version": "1.6.7",
   "license": "MIT",
   "type": "module",
   "author": "Bartosz Gordon",
@@ -38,18 +38,14 @@
     "zod": "4.2.1"
   },
   "dependencies": {
-    "@axiomhq/winston": "1.3.1",
     "@bgord/tools": "1.2.3",
-    "@hono/ua-blocker": "0.1.22",
     "better-auth": "1.4.7",
     "croner": "9.1.0",
     "csv": "6.4.1",
     "dotenv": "17.2.3",
     "hcaptcha": "0.2.0",
     "hono": "4.11.1",
-    "isomorphic-dompurify": "2.34.0",
     "lodash": "4.17.21",
-    "marked": "17.0.1",
     "node-cache": "5.1.2",
     "nodemailer": "7.0.11",
     "winston": "3.19.0",

package/readme.md

@@ -215,6 +215,10 @@ src/
 │   └── system
 │       ├── events
 │       │   ├── HOUR_HAS_PASSED_EVENT.ts
+│       │   ├── MINUTE_HAS_PASSED_EVENT.ts
+│       └── services
+│           ├── passage-of-time-hourly.service.ts
+│           └── passage-of-time-minute.service.ts
 ├── node-env.vo.ts
 ├── pdf-generator-noop.adapter.ts
 ├── pdf-generator.port.ts
@@ -269,6 +273,7 @@ src/
 ├── shield-noop.adapter.ts
 ├── shield-rate-limit.adapter.ts
 ├── shield-timeout.adapter.ts
+├── shield-user-agent-blocker.adapter.ts
 ├── shield.port.ts
 ├── simulated-error.middleware.ts
 ├── slower.middleware.ts

package/src/bots.vo.ts

@@ -1,3 +1,132 @@
-export const BOTS_REGEX =
-  // cspell:disable-next-line
-  /(AI2BOT|AI2BOT-DOLMA|AIHITBOT|AMAZONBOT|ANDIBOT|ANTHROPIC-AI|APPLEBOT|APPLEBOT-EXTENDED|BEDROCKBOT|BRIGHTBOT 1.0|BYTESPIDER|CCBOT|CHATGPT-USER|CLAUDE-SEARCHBOT|CLAUDE-USER|CLAUDE-WEB|CLAUDEBOT|COHERE-AI|COHERE-TRAINING-DATA-CRAWLER|COTOYOGI|CRAWLSPACE|DIFFBOT|DUCKASSISTBOT|ECHOBOXBOT|FACEBOOKBOT|FACEBOOKEXTERNALHIT|FACTSET_SPYDERBOT|FIRECRAWLAGENT|FRIENDLYCRAWLER|GOOGLE-CLOUDVERTEXBOT|GOOGLE-EXTENDED|GOOGLEOTHER|GOOGLEOTHER-IMAGE|GOOGLEOTHER-VIDEO|GPTBOT|IASKSPIDER\/2.0|ICC-CRAWLER|IMAGESIFTBOT|IMG2DATASET|ISSCYBERRISKCRAWLER|KANGAROO BOT|META-EXTERNALAGENT|META-EXTERNALAGENT|META-EXTERNALFETCHER|META-EXTERNALFETCHER|MISTRALAI-USER\/1.0|MYCENTRALAISCRAPERBOT|NOVAACT|OAI-SEARCHBOT|OMGILI|OMGILIBOT|OPERATOR|PANGUBOT|PANSCIENT|PANSCIENT.COM|PERPLEXITY-USER|PERPLEXITYBOT|PETALBOT|PHINDBOT|POSEIDON RESEARCH CRAWLER|QUALIFIEDBOT|QUILLBOT|QUILLBOT.COM|SBINTUITIONSBOT|SCRAPY|SEMRUSHBOT|SEMRUSHBOT-BA|SEMRUSHBOT-CT|SEMRUSHBOT-OCOB|SEMRUSHBOT-SI|SEMRUSHBOT-SWA|SIDETRADE INDEXER BOT|TIKTOKSPIDER|TIMPIBOT|VELENPUBLICWEBCRAWLER|WEBZIO-EXTENDED|WPBOT|YANDEXADDITIONAL|YANDEXADDITIONALBOT|YOUBOT)/;
+// Source: https://github.com/honojs/middleware/blob/main/packages/ua-blocker/src/generated.ts
+export const ALL_BOTS = [
+  "AddSearchBot",
+  "AI2Bot",
+  "AI2Bot-DeepResearchEval",
+  "Ai2Bot-Dolma",
+  "aiHitBot",
+  "amazon-kendra",
+  "Amazonbot",
+  "AmazonBuyForMe",
+  "Andibot",
+  "Anomura",
+  "anthropic-ai",
+  "Applebot",
+  "Applebot-Extended",
+  "atlassian-bot",
+  "Awario",
+  "bedrockbot",
+  "bigsur.ai",
+  "Bravebot",
+  "Brightbot 1.0",
+  "BuddyBot",
+  "Bytespider",
+  "CCBot",
+  "Channel3Bot",
+  "ChatGLM-Spider",
+  "ChatGPT Agent",
+  "ChatGPT-User",
+  "Claude-SearchBot",
+  "Claude-User",
+  "Claude-Web",
+  "ClaudeBot",
+  "Cloudflare-AutoRAG",
+  "CloudVertexBot",
+  "cohere-ai",
+  "cohere-training-data-crawler",
+  "Cotoyogi",
+  "Crawl4AI",
+  "Crawlspace",
+  "Datenbank Crawler",
+  "DeepSeekBot",
+  "Devin",
+  "Diffbot",
+  "DuckAssistBot",
+  "Echobot Bot",
+  "EchoboxBot",
+  "FacebookBot",
+  "facebookexternalhit",
+  "Factset_spyderbot",
+  "FirecrawlAgent",
+  "FriendlyCrawler",
+  "Gemini-Deep-Research",
+  "Google-CloudVertexBot",
+  "Google-Extended",
+  "Google-Firebase",
+  "Google-NotebookLM",
+  "GoogleAgent-Mariner",
+  "GoogleOther",
+  "GoogleOther-Image",
+  "GoogleOther-Video",
+  "GPTBot",
+  "iAskBot",
+  "iaskspider",
+  "iaskspider/2.0",
+  "IbouBot",
+  "ICC-Crawler",
+  "ImagesiftBot",
+  "imageSpider",
+  "img2dataset",
+  "ISSCyberRiskCrawler",
+  "Kangaroo Bot",
+  "KlaviyoAIBot",
+  "KunatoCrawler",
+  "laion-huggingface-processor",
+  "LAIONDownloader",
+  "LCC",
+  "LinerBot",
+  "Linguee Bot",
+  "LinkupBot",
+  "Manus-User",
+  "meta-externalagent",
+  "Meta-ExternalAgent",
+  "meta-externalfetcher",
+  "Meta-ExternalFetcher",
+  "meta-webindexer",
+  "MistralAI-User",
+  "MistralAI-User/1.0",
+  "MyCentralAIScraperBot",
+  "netEstate Imprint Crawler",
+  "NotebookLM",
+  "NovaAct",
+  "OAI-SearchBot",
+  "omgili",
+  "omgilibot",
+  "OpenAI",
+  "Operator",
+  "PanguBot",
+  "Panscient",
+  "panscient.com",
+  "Perplexity-User",
+  "PerplexityBot",
+  "PetalBot",
+  "PhindBot",
+  "Poggio-Citations",
+  "Poseidon Research Crawler",
+  "QualifiedBot",
+  "QuillBot",
+  "quillbot.com",
+  "SBIntuitionsBot",
+  "Scrapy",
+  "SemrushBot-OCOB",
+  "SemrushBot-SWA",
+  "ShapBot",
+  "Sidetrade indexer bot",
+  "Spider",
+  "TerraCotta",
+  "Thinkbot",
+  "TikTokSpider",
+  "Timpibot",
+  "TwinAgent",
+  "VelenPublicWebCrawler",
+  "WARDBot",
+  "Webzio-Extended",
+  "webzio-extended",
+  "wpbot",
+  "WRTNBot",
+  "YaK",
+  "YandexAdditional",
+  "YandexAdditionalBot",
+  "YouBot",
+  "ZanistaBot",
+];

package/src/client.vo.ts

@@ -9,7 +9,7 @@ export class Client {
   private constructor(private readonly value: ClientType) {}
 
   static fromParts(ip: ClientIpType | null | undefined, ua: ClientUaType | null | undefined): Client {
-    return new Client({ ip: ip ?? "anon", ua: ua ?? "anon" });
+    return new Client({ ip: ip ?? "anon", ua: (ua ?? "anon").toLowerCase() });
   }
 
   static fromHonoContext(context: Context): Client {
@@ -23,6 +23,26 @@ export class Client {
     return Client.fromParts(ip, ua);
   }
 
+  equals(another: Client): boolean {
+    return this.value.ip === another.value.ip && this.value.ua === another.value.ua;
+  }
+
+  matchesUa(ua: ClientUaType): boolean {
+    return this.value.ua.includes(ua.toLowerCase());
+  }
+
+  matchesIp(ip: ClientIpType): boolean {
+    return this.value.ip.includes(ip.toLowerCase());
+  }
+
+  get ip(): ClientIpType {
+    return this.value.ip;
+  }
+
+  get ua(): ClientUaType {
+    return this.value.ua;
+  }
+
   toJSON(): ClientType {
     return this.value;
   }

package/src/index.ts

@@ -187,6 +187,7 @@ export * from "./shield-captcha-recaptcha.adapter";
 export * from "./shield-noop.adapter";
 export * from "./shield-rate-limit.adapter";
 export * from "./shield-timeout.adapter";
+export * from "./shield-user-agent-blocker.adapter";
 export * from "./simulated-error.middleware";
 export * from "./slower.middleware";
 export * from "./static-files.service";

package/src/logger-winston-production.adapter.ts

@@ -1,4 +1,3 @@
-import { WinstonTransport as AxiomTransport } from "@axiomhq/winston";
 import * as tools from "@bgord/tools";
 import * as winston from "winston";
 import type { LogAppType, LoggerPort, LogLevelEnum } from "./logger.port";
@@ -8,7 +7,6 @@ import type { RedactorPort } from "./redactor.port";
 
 type LoggerWinstonProductionAdapterConfigType = {
   app: LogAppType;
-  AXIOM_API_TOKEN?: string;
   redactor: RedactorPort;
 };
 
@@ -31,12 +29,7 @@ export class LoggerWinstonProductionAdapter {
       app: this.config.app,
       environment: NodeEnvironmentEnum.production,
       level,
-      transports: [
-        file,
-        this.config.AXIOM_API_TOKEN
-          ? new AxiomTransport({ token: this.config.AXIOM_API_TOKEN, dataset: this.config.app })
-          : undefined,
-      ].filter((adapter) => adapter !== undefined),
+      transports: [file],
       redactor: this.config.redactor,
       filePath,
     });

package/src/modules/system/events/MINUTE_HAS_PASSED_EVENT.ts

@@ -0,0 +1,13 @@
+import * as tools from "@bgord/tools";
+import { z } from "zod/v4";
+import { EventEnvelopeSchema } from "../../../event-envelope";
+
+export const MINUTE_HAS_PASSED_EVENT = "MINUTE_HAS_PASSED_EVENT";
+
+export const MinuteHasPassedEvent = z.object({
+  ...EventEnvelopeSchema,
+  name: z.literal(MINUTE_HAS_PASSED_EVENT),
+  payload: z.object({ timestamp: tools.TimestampValue }),
+});
+
+export type MinuteHasPassedEventType = z.infer<typeof MinuteHasPassedEvent>;

package/src/modules/system/events/index.ts

@@ -1 +1,2 @@
 export * from "./HOUR_HAS_PASSED_EVENT";
+export * from "./MINUTE_HAS_PASSED_EVENT";

package/src/modules/system/index.ts

@@ -1 +1,2 @@
 export * as Events from "./events";
+export * as Services from "./services";

package/src/modules/system/services/index.ts

@@ -0,0 +1,2 @@
+export * from "./passage-of-time-hourly.service";
+export * from "./passage-of-time-minute.service";

package/src/modules/system/services/passage-of-time-hourly.service.ts

@@ -0,0 +1,37 @@
+import type { ClockPort } from "../../../clock.port";
+import { createEventEnvelope } from "../../../event-envelope";
+import type { EventStoreLike } from "../../../event-store-like.types";
+import type { IdProviderPort } from "../../../id-provider.port";
+import type { UnitOfWork } from "../../../job-handler.port";
+import { Jobs } from "../../../jobs.service";
+import {
+  HOUR_HAS_PASSED_EVENT,
+  HourHasPassedEvent,
+  type HourHasPassedEventType,
+} from "../events/HOUR_HAS_PASSED_EVENT";
+
+type Dependencies = {
+  EventStore: EventStoreLike<HourHasPassedEventType>;
+  Clock: ClockPort;
+  IdProvider: IdProviderPort;
+};
+
+export class PassageOfTimeHourly implements UnitOfWork {
+  constructor(private readonly deps: Dependencies) {}
+
+  static cron = Jobs.SCHEDULES.EVERY_HOUR;
+
+  label = "PassageOfTime";
+
+  async process() {
+    const timestamp = this.deps.Clock.nowMs();
+
+    const event = HourHasPassedEvent.parse({
+      ...createEventEnvelope("passage_of_time", this.deps),
+      name: HOUR_HAS_PASSED_EVENT,
+      payload: { timestamp },
+    } satisfies HourHasPassedEventType);
+
+    await this.deps.EventStore.save([event]);
+  }
+}

package/src/modules/system/services/passage-of-time-minute.service.ts

@@ -0,0 +1,37 @@
+import type { ClockPort } from "../../../clock.port";
+import { createEventEnvelope } from "../../../event-envelope";
+import type { EventStoreLike } from "../../../event-store-like.types";
+import type { IdProviderPort } from "../../../id-provider.port";
+import type { UnitOfWork } from "../../../job-handler.port";
+import { Jobs } from "../../../jobs.service";
+import {
+  MINUTE_HAS_PASSED_EVENT,
+  MinuteHasPassedEvent,
+  type MinuteHasPassedEventType,
+} from "../events/MINUTE_HAS_PASSED_EVENT";
+
+type Dependencies = {
+  EventStore: EventStoreLike<MinuteHasPassedEventType>;
+  Clock: ClockPort;
+  IdProvider: IdProviderPort;
+};
+
+export class PassageOfTimeMinute implements UnitOfWork {
+  constructor(private readonly deps: Dependencies) {}
+
+  static cron = Jobs.SCHEDULES.EVERY_MINUTE;
+
+  label = "PassageOfTime";
+
+  async process() {
+    const timestamp = this.deps.Clock.nowMs();
+
+    const event = MinuteHasPassedEvent.parse({
+      ...createEventEnvelope("passage_of_time", this.deps),
+      name: MINUTE_HAS_PASSED_EVENT,
+      payload: { timestamp },
+    } satisfies MinuteHasPassedEventType);
+
+    await this.deps.EventStore.save([event]);
+  }
+}

package/src/setup.service.ts

@@ -1,5 +1,4 @@
 import * as tools from "@bgord/tools";
-import { uaBlocker } from "@hono/ua-blocker";
 import { bodyLimit } from "hono/body-limit";
 import { cors } from "hono/cors";
 import { languageDetector } from "hono/language";
@@ -7,7 +6,6 @@ import { requestId } from "hono/request-id";
 import { secureHeaders } from "hono/secure-headers";
 import { timing } from "hono/timing";
 import { ApiVersion } from "./api-version.middleware";
-import { BOTS_REGEX } from "./bots.vo";
 import type { ClockPort } from "./clock.port";
 import { Context } from "./context.middleware";
 import { CorrelationStorage } from "./correlation-storage.service";
@@ -17,6 +15,7 @@ import type { I18nConfigType } from "./i18n.service";
 import type { IdProviderPort } from "./id-provider.port";
 import type { JsonFileReaderPort } from "./json-file-reader.port";
 import type { LoggerPort } from "./logger.port";
+import { ShieldUserAgentBlockerAdapter } from "./shield-user-agent-blocker.adapter";
 import { TimeZoneOffset } from "./time-zone-offset.middleware";
 import { WeakETagExtractor } from "./weak-etag-extractor.middleware";
 
@@ -44,7 +43,7 @@ export class Setup {
     return [
       secureHeaders(secureHeadersOptions),
       bodyLimit({ maxSize: BODY_LIMIT_MAX_SIZE }),
-      uaBlocker({ blocklist: BOTS_REGEX }),
+      new ShieldUserAgentBlockerAdapter().verify,
       ApiVersion.build({ Clock: deps.Clock, JsonFileReader: deps.JsonFileReader }),
       cors(corsOptions),
       languageDetector({

package/src/shield-user-agent-blocker.adapter.ts

@@ -0,0 +1,18 @@
+import { createMiddleware } from "hono/factory";
+import { HTTPException } from "hono/http-exception";
+import { ALL_BOTS } from "./bots.vo";
+import { Client } from "./client.vo";
+import type { ShieldPort } from "./shield.port";
+
+export const UserAgentBlockedError = new HTTPException(403, { message: "app.user.agent.blocked.error" });
+
+export class ShieldUserAgentBlockerAdapter implements ShieldPort {
+  verify = createMiddleware(async (context, next) => {
+    const client = Client.fromHonoContext(context);
+
+    const detection = ALL_BOTS.some((bot) => client.matchesUa(bot));
+
+    if (!detection) return next();
+    throw UserAgentBlockedError;
+  });
+}