@automagik/omni 2.260910.11 → 2.260910.12

package/dist/server/index.js

@@ -174442,6 +174442,7 @@ var init_schema2 = __esm(() => {
     id: uuid("id").primaryKey().defaultRandom(),
     name: varchar("name", { length: 100 }).notNull(),
     eventType: varchar("event_type", { length: 255 }).notNull(),
+    excludeTypes: jsonb("exclude_types").$type(),
     filters: jsonb("filters").$type(),
     cursor: bigint2("cursor", { mode: "number" }).notNull().default(0),
     createdAt: timestamp("created_at", { withTimezone: true }).notNull().defaultNow(),
@@ -251644,7 +251645,7 @@ var init_sentry_scrub = __esm(() => {
 var require_package7 = __commonJS((exports, module) => {
   module.exports = {
     name: "@omni/api",
-    version: "2.260910.11",
+    version: "2.260910.12",
     private: true,
     type: "module",
     exports: {
@@ -370514,6 +370515,20 @@ var init_dead_letters = __esm(() => {
 function escapeLikePattern(value) {
   return value.replace(/([\\%_])/g, "\\$1");
 }
+function eventTypeGlobClause(globs) {
+  const exact = globs.filter((t) => !t.endsWith("*"));
+  const prefixes = globs.filter((t) => t.endsWith("*")).map((t) => t.slice(0, -1));
+  const clauses = [
+    ...exact.length ? [inArray(omniEvents.eventType, exact)] : [],
+    ...prefixes.map((p2) => like(omniEvents.eventType, `${escapeLikePattern(p2)}%`))
+  ];
+  return clauses.length === 1 ? clauses[0] : or2(...clauses);
+}
+function eventTypeFilterClause(include, exclude) {
+  const inc = include?.length ? eventTypeGlobClause(include) : undefined;
+  const exc = exclude?.length ? eventTypeGlobClause(exclude) : undefined;
+  return and2(inc, exc ? not2(exc) : undefined);
+}
 function consumerTypeMatches(filter, eventType) {
   return filter.endsWith("*") ? eventType.startsWith(filter.slice(0, -1)) : filter === eventType;
 }
@@ -370533,6 +370548,7 @@ class EventService {
       personId,
       chatId,
       eventType,
+      excludeEventType,
       contentType,
       direction,
       since,
@@ -370556,17 +370572,9 @@ class EventService {
     if (chatId) {
       conditions3.push(eq(omniEvents.chatUuid, chatId));
     }
-    if (eventType?.length) {
-      const exact = eventType.filter((t) => !t.endsWith("*"));
-      const prefixes = eventType.filter((t) => t.endsWith("*")).map((t) => t.slice(0, -1));
-      const typeClauses = [
-        ...exact.length ? [inArray(omniEvents.eventType, exact)] : [],
-        ...prefixes.map((p2) => like(omniEvents.eventType, `${escapeLikePattern(p2)}%`))
-      ];
-      const combined = typeClauses.length === 1 ? typeClauses[0] : or2(...typeClauses);
-      if (combined)
-        conditions3.push(combined);
-    }
+    const typeClause = eventTypeFilterClause(eventType, excludeEventType);
+    if (typeClause)
+      conditions3.push(typeClause);
     if (contentType?.length) {
       conditions3.push(inArray(omniEvents.contentType, contentType));
     }
@@ -370830,7 +370838,13 @@ class EventConsumerService {
   async create(input) {
     const head = await this.head();
     const cursor = resolveInitialCursor(input.startFrom ?? "now", head);
-    const [created] = await this.db.insert(durableConsumers).values({ name: input.name, eventType: input.eventType, filters: input.filters ?? null, cursor }).onConflictDoNothing({ target: durableConsumers.name }).returning();
+    const [created] = await this.db.insert(durableConsumers).values({
+      name: input.name,
+      eventType: input.eventType,
+      excludeTypes: input.excludeTypes?.length ? input.excludeTypes : null,
+      filters: input.filters ?? null,
+      cursor
+    }).onConflictDoNothing({ target: durableConsumers.name }).returning();
     if (!created) {
       throw new ConflictError("DurableConsumer", `a consumer named '${input.name}' already exists`, {
         name: input.name
@@ -370890,7 +370904,7 @@ class EventConsumerService {
     return { ...updated, head, lag: computeLag(head, updated.cursor) };
   }
   async scanPage(consumer, limit2) {
-    const typeClause = consumer.eventType.endsWith("*") ? like(omniEvents.eventType, `${escapeLikePattern(consumer.eventType.slice(0, -1))}%`) : eq(omniEvents.eventType, consumer.eventType);
+    const typeClause = eventTypeFilterClause([consumer.eventType], consumer.excludeTypes ?? undefined);
     return this.db.select().from(omniEvents).where(and2(gt(omniEvents.journalSeq, consumer.cursor), typeClause)).orderBy(asc(omniEvents.journalSeq)).limit(limit2);
   }
 }
@@ -379973,6 +379987,7 @@ var init_event_consumers2 = __esm(() => {
     id: exports_external.string().uuid().openapi({ description: "Consumer UUID" }),
     name: exports_external.string().openapi({ description: "Unique consumer name (the follow/ack handle)" }),
     eventType: exports_external.string().openapi({ description: "Type filter: exact event type or trailing-* prefix glob" }),
+    excludeTypes: exports_external.array(exports_external.string()).nullable().openapi({ description: "Type globs dropped from the stream (exclusion wins over eventType), or null" }),
     filters: exports_external.array(ConsumerConditionSchema).nullable().openapi({ description: "Payload conditions (AND), or null" }),
     cursor: exports_external.number().int().openapi({ description: "Last acked journal_seq; delivery resumes strictly after it" }),
     head: exports_external.number().int().openapi({ description: "Highest journal_seq currently in the journal" }),
@@ -379983,6 +379998,7 @@ var init_event_consumers2 = __esm(() => {
   CreateConsumerSchema = exports_external.object({
     name: exports_external.string().min(1).max(100).regex(CONSUMER_NAME_PATTERN, "Consumer name must be lowercase tokens: a-z 0-9 . _ - (starting alphanumeric)").openapi({ description: "Unique consumer name (e.g. deploy-tracker)" }),
     eventType: exports_external.string().min(1).max(255).openapi({ description: "Type filter: exact event type, or trailing-* prefix glob (e.g. custom.github.*)" }),
+    excludeTypes: exports_external.array(exports_external.string().min(1).max(255)).max(20).optional().openapi({ description: "Type globs to drop (same syntax as eventType); exclusion wins over inclusion" }),
     filters: exports_external.array(ConsumerConditionSchema).max(20).optional().openapi({ description: "Payload conditions (AND) \u2014 same matcher as events wait --filter" }),
     startFrom: exports_external.enum(["now", "beginning"]).optional().openapi({ description: "Initial cursor: 'now' = journal head (default), 'beginning' = full replay" })
   });
@@ -380299,6 +380315,7 @@ function registerEventSchemas(registry4) {
         personId: exports_external.string().uuid().optional().openapi({ description: "Filter by person" }),
         chatId: exports_external.string().uuid().optional().openapi({ description: "Filter by chat UUID" }),
         eventType: exports_external.string().optional().openapi({ description: "Event types (comma-separated)" }),
+        excludeEventType: exports_external.string().optional().openapi({ description: "Event type globs to drop (comma-separated); exclusion wins over eventType" }),
         contentType: exports_external.string().optional().openapi({ description: "Content types (comma-separated)" }),
         direction: exports_external.enum(["inbound", "outbound"]).optional().openapi({ description: "Direction" }),
         since: exports_external.string().datetime().optional().openapi({ description: "Start date" }),
@@ -386871,6 +386888,7 @@ var init_events4 = __esm(() => {
     personId: exports_external.string().uuid().optional(),
     chatId: exports_external.string().uuid().optional(),
     eventType: exports_external.string().optional().transform((v2) => v2?.split(",")),
+    excludeEventType: exports_external.string().optional().transform((v2) => v2?.split(",")),
     contentType: exports_external.string().optional().transform((v2) => v2?.split(",")),
     direction: exports_external.enum(["inbound", "outbound"]).optional(),
     since: optionalDateParam("since"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automagik/omni",
-  "version": "2.260910.11",
+  "version": "2.260910.12",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/automagik-dev/omni.git",