slotlock 0.5.2 → 0.6.0

package/types.d.ts

@@ -30,8 +30,14 @@ export interface SlotlockResource {
     visibility?: 'shared' | 'private';
     /** When the tenant archived it: no longer listed or booked, its history kept. Absent in use. */
     archivedAt?: Date;
-    /** What a booking on it must satisfy (`SlotlockBookingRules`). Absent when it has none. */
+    /** Its own booking rules (`SlotlockBookingRules`). Absent when it has none. */
     bookingRules?: SlotlockBookingRules;
+    /**
+     * What a booking on it must satisfy: the tenant's default rules, overlaid by its pool's, overlaid
+     * by its own (`setBookingRuleDefaults`), a field set at a narrower level winning. Absent when no
+     * rule applies.
+     */
+    effectiveBookingRules?: SlotlockBookingRules;
     /**
      * The pool it belongs to: interchangeable resources sharing a name, such as a vehicle class or a
      * room type, booked by the class (`slotlock_book_pool`). Absent when it is in none.
@@ -630,6 +636,13 @@ export interface CalendarEventRetentionResult {
     hasMore: boolean;
 }
 /** What erasing a tenant deleted. */
+/** A tenant's default booking rules (`SlotlockStore.getBookingRuleDefaults`). */
+export interface SlotlockBookingRuleDefaults {
+    /** The tenant's own defaults, under every pool's; null when it has none. */
+    tenant: SlotlockBookingRules | null;
+    /** Each pool's defaults, by pool name, for the pools that have them. */
+    pools: Record<string, SlotlockBookingRules>;
+}
 export interface SlotlockTenantErasure {
     /** Rows deleted, by table (every table the tenant owns rows in is named, with 0 for none). */
     rows: Record<string, number>;

package/webhooks.d.ts

@@ -1,5 +1,5 @@
 import { lookup as dnsLookup } from 'node:dns';
-import type { SlotlockChange, SlotlockEventFeed } from './event-feed.js';
+import { type SlotlockChange, type SlotlockChangeOrigin, type SlotlockEventFeed } from './event-feed.js';
 /** The CloudEvents envelope a change is delivered and listed as. */
 export interface SlotlockCloudEvent {
     specversion: '1.0';
@@ -9,9 +9,17 @@ export interface SlotlockCloudEvent {
     subject: string;
     time: string;
     datacontenttype: 'application/json';
+    /** Extension attribute: where the change came from (`mcp`, `rest`, `dashboard`, ...), when recorded. */
+    slotlockorigin?: SlotlockChangeOrigin;
+    /** Extension attribute: the id of the API key that made the change, when one did. */
+    slotlockkeyid?: string;
     data: Record<string, unknown>;
 }
-/** A change as CloudEvents 1.0 (structured mode): `type` is `io.pylota.slotlock.<change type>`. */
+/**
+ * A change as CloudEvents 1.0 (structured mode): `type` is `io.pylota.slotlock.<change type>`, with
+ * the extension attributes `slotlockorigin` and `slotlockkeyid` when the change records them. A
+ * `coverage.*` change is redacted as the feed serves it (slotlockServedChange), whoever built it.
+ */
 export declare function slotlockCloudEvent(change: SlotlockChange): SlotlockCloudEvent;
 /**
  * The Standard Webhooks signature of one attempt: `v1,` and the base64 HMAC-SHA256, keyed by the

package/webhooks.js

@@ -9,18 +9,26 @@ import { Agent as HttpAgent, request as httpRequest } from 'node:http';
 import { Agent as HttpsAgent, request as httpsRequest } from 'node:https';
 import { BlockList, isIP } from 'node:net';
 import { Readable } from 'node:stream';
+import { slotlockServedChange, } from './event-feed.js';
 import { ignoreRejection } from './hooks.js';
-/** A change as CloudEvents 1.0 (structured mode): `type` is `io.pylota.slotlock.<change type>`. */
+/**
+ * A change as CloudEvents 1.0 (structured mode): `type` is `io.pylota.slotlock.<change type>`, with
+ * the extension attributes `slotlockorigin` and `slotlockkeyid` when the change records them. A
+ * `coverage.*` change is redacted as the feed serves it (slotlockServedChange), whoever built it.
+ */
 export function slotlockCloudEvent(change) {
+    const served = slotlockServedChange(change.type, change.subject, change.data);
     return {
         specversion: '1.0',
         id: change.id,
         source: change.resourceId ? `/slotlock/resources/${change.resourceId}` : '/slotlock',
         type: `io.pylota.slotlock.${change.type}`,
-        subject: change.subject,
+        subject: served.subject,
         time: change.occurredAt.toISOString(),
         datacontenttype: 'application/json',
-        data: change.data,
+        ...(change.origin ? { slotlockorigin: change.origin } : {}),
+        ...(change.keyId ? { slotlockkeyid: change.keyId } : {}),
+        data: served.data,
     };
 }
 /**