happy2 0.0.5 → 0.0.11

package/packages/happy2-server/dist/modules/webhook/webhookDeliveryEnqueuePendingSyncEvents.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"webhookDeliveryEnqueuePendingSyncEvents.d.ts","sourceRoot":"","sources":["../../../sources/modules/webhook/webhookDeliveryEnqueuePendingSyncEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAQtE;;;GAGG;AACH,wBAAsB,uCAAuC,CACzD,QAAQ,EAAE,eAAe,EACzB,WAAW,EAAE,MAAM,IAAI,EACvB,KAAK,SAAM,GACZ,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAwDlC"}

package/packages/happy2-server/dist/modules/webhook/webhookDeliveryEnqueuePendingSyncEvents.js

@@ -0,0 +1,42 @@
+import {} from "../drizzle.js";
+import {} from "../integrations/types.js";
+import { and, eq, isNull, or, sql } from "drizzle-orm";
+import { integrations, syncEvents, webhookDeliveries, webhookSubscriptions } from "../schema.js";
+import { positiveLimit } from "./impl/positiveLimit.js";
+import { webhookDeliveryEnqueueSyncSequence } from "./webhookDeliveryEnqueueSyncSequence.js";
+/**
+ * Backfills delivery rows for the oldest sync sequences that still match an outgoing subscription but have not been queued.
+ * Each sequence delegates conflict-safe insertion to the event enqueue path, allowing a worker to retry this scan without duplicating deliveries.
+ */
+export async function webhookDeliveryEnqueuePendingSyncEvents(executor, nowProvider, limit = 100) {
+    positiveLimit(limit, 1_000);
+    const alreadyQueued = executor
+        .select({
+        id: webhookDeliveries.id,
+    })
+        .from(webhookDeliveries)
+        .where(and(eq(webhookDeliveries.subscriptionId, webhookSubscriptions.id), eq(webhookDeliveries.eventId, sql `'sync:' || ${syncEvents.id}`)));
+    const eligibleSubscription = executor
+        .select({
+        id: webhookSubscriptions.id,
+    })
+        .from(webhookSubscriptions)
+        .innerJoin(integrations, eq(integrations.id, webhookSubscriptions.integrationId))
+        .where(and(eq(webhookSubscriptions.direction, "outgoing"), eq(webhookSubscriptions.active, 1), eq(integrations.active, 1), isNull(integrations.deletedAt), sql `julianday(${syncEvents.createdAt}) >= julianday(${webhookSubscriptions.createdAt})`, or(isNull(webhookSubscriptions.chatId), eq(webhookSubscriptions.chatId, syncEvents.chatId)), sql `exists (select 1 from json_each(${webhookSubscriptions.eventTypesJson}) where value = ${syncEvents.kind})`, sql `exists (select 1 from json_each(${integrations.scopesJson}) where value = 'events:read')`, sql `not exists ${alreadyQueued}`));
+    const firstEventId = sql `min(${syncEvents.id})`;
+    const sequences = await executor
+        .select({
+        sequence: syncEvents.sequence,
+        firstEventId,
+    })
+        .from(syncEvents)
+        .where(sql `exists ${eligibleSubscription}`)
+        .groupBy(syncEvents.sequence)
+        .orderBy(firstEventId)
+        .limit(limit);
+    const deliveries = [];
+    for (const row of sequences)
+        deliveries.push(...(await webhookDeliveryEnqueueSyncSequence(executor, nowProvider, String(row.sequence))));
+    return deliveries;
+}
+//# sourceMappingURL=webhookDeliveryEnqueuePendingSyncEvents.js.map

package/packages/happy2-server/dist/modules/webhook/webhookDeliveryEnqueuePendingSyncEvents.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"webhookDeliveryEnqueuePendingSyncEvents.js","sourceRoot":"","sources":["../../../sources/modules/webhook/webhookDeliveryEnqueuePendingSyncEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,MAAM,eAAe,CAAC;AACrD,OAAO,EAA8B,MAAM,0BAA0B,CAAC;AACtE,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAEvD,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAEjG,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,kCAAkC,EAAE,MAAM,yCAAyC,CAAC;AAC7F;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,uCAAuC,CACzD,QAAyB,EACzB,WAAuB,EACvB,KAAK,GAAG,GAAG;IAEX,aAAa,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC5B,MAAM,aAAa,GAAG,QAAQ;SACzB,MAAM,CAAC;QACJ,EAAE,EAAE,iBAAiB,CAAC,EAAE;KAC3B,CAAC;SACD,IAAI,CAAC,iBAAiB,CAAC;SACvB,KAAK,CACF,GAAG,CACC,EAAE,CAAC,iBAAiB,CAAC,cAAc,EAAE,oBAAoB,CAAC,EAAE,CAAC,EAC7D,EAAE,CAAC,iBAAiB,CAAC,OAAO,EAAE,GAAG,CAAA,cAAc,UAAU,CAAC,EAAE,EAAE,CAAC,CAClE,CACJ,CAAC;IACN,MAAM,oBAAoB,GAAG,QAAQ;SAChC,MAAM,CAAC;QACJ,EAAE,EAAE,oBAAoB,CAAC,EAAE;KAC9B,CAAC;SACD,IAAI,CAAC,oBAAoB,CAAC;SAC1B,SAAS,CAAC,YAAY,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,EAAE,oBAAoB,CAAC,aAAa,CAAC,CAAC;SAChF,KAAK,CACF,GAAG,CACC,EAAE,CAAC,oBAAoB,CAAC,SAAS,EAAE,UAAU,CAAC,EAC9C,EAAE,CAAC,oBAAoB,CAAC,MAAM,EAAE,CAAC,CAAC,EAClC,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,EAC1B,MAAM,CAAC,YAAY,CAAC,SAAS,CAAC,EAC9B,GAAG,CAAA,aAAa,UAAU,CAAC,SAAS,kBAAkB,oBAAoB,CAAC,SAAS,GAAG,EACvF,EAAE,CACE,MAAM,CAAC,oBAAoB,CAAC,MAAM,CAAC,EACnC,EAAE,CAAC,oBAAoB,CAAC,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,CACrD,EACD,GAAG,CAAA,mCAAmC,oBAAoB,CAAC,cAAc,mBAAmB,UAAU,CAAC,IAAI,GAAG,EAC9G,GAAG,CAAA,mCAAmC,YAAY,CAAC,UAAU,gCAAgC,EAC7F,GAAG,CAAA,cAAc,aAAa,EAAE,CACnC,CACJ,CAAC;IACN,MAAM,YAAY,GAAG,GAAG,CAAQ,OAAO,UAAU,CAAC,EAAE,GAAG,CAAC;IACxD,MAAM,SAAS,GAAG,MAAM,QAAQ;SAC3B,MAAM,CAAC;QACJ,QAAQ,EAAE,UAAU,CAAC,QAAQ;QAC7B,YAAY;KACf,CAAC;SACD,IAAI,CAAC,UAAU,CAAC;SAChB,KAAK,CAAC,GAAG,CAAA,UAAU,oBAAoB,EAAE,CAAC;SAC1C,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC;SAC5B,OAAO,CAAC,YAAY,CAAC;SACrB,KAAK,CAAC,KAAK,CAAC,CAAC;IAClB,MAAM,UAAU,GAA4B,EAAE,CAAC;IAC/C,KAAK,MAAM,GAAG,IAAI,SAAS;QACvB,UAAU,CAAC,IAAI,CACX,GAAG,CAAC,MAAM,kCAAkC,CACxC,QAAQ,EACR,WAAW,EACX,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CACvB,CAAC,CACL,CAAC;IACN,OAAO,UAAU,CAAC;AACtB,CAAC"}

package/packages/happy2-server/dist/modules/webhook/webhookDeliveryEnqueueSyncSequence.d.ts

@@ -0,0 +1,8 @@
+import { type DrizzleExecutor } from "../drizzle.js";
+import { type QueuedWebhookDelivery } from "../integrations/types.js";
+/**
+ * Converts every durable event in one sync sequence into eligible outgoing webhook delivery rows.
+ * Sequence expansion stays at this boundary while delegated per-event transactions and uniqueness constraints make repeated calls safe.
+ */
+export declare function webhookDeliveryEnqueueSyncSequence(executor: DrizzleExecutor, nowProvider: () => Date, sequence: string): Promise<QueuedWebhookDelivery[]>;
+//# sourceMappingURL=webhookDeliveryEnqueueSyncSequence.d.ts.map

package/packages/happy2-server/dist/modules/webhook/webhookDeliveryEnqueueSyncSequence.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"webhookDeliveryEnqueueSyncSequence.d.ts","sourceRoot":"","sources":["../../../sources/modules/webhook/webhookDeliveryEnqueueSyncSequence.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAoB,KAAK,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAMxF;;;GAGG;AACH,wBAAsB,kCAAkC,CACpD,QAAQ,EAAE,eAAe,EACzB,WAAW,EAAE,MAAM,IAAI,EACvB,QAAQ,EAAE,MAAM,GACjB,OAAO,CAAC,qBAAqB,EAAE,CAAC,CA4BlC"}

package/packages/happy2-server/dist/modules/webhook/webhookDeliveryEnqueueSyncSequence.js

@@ -0,0 +1,38 @@
+import {} from "../drizzle.js";
+import { IntegrationError } from "../integrations/types.js";
+import { asc, eq } from "drizzle-orm";
+import { syncEvents } from "../schema.js";
+import { webhookDeliveryEnqueueOutgoingEvent } from "./webhookDeliveryEnqueueOutgoingEvent.js";
+/**
+ * Converts every durable event in one sync sequence into eligible outgoing webhook delivery rows.
+ * Sequence expansion stays at this boundary while delegated per-event transactions and uniqueness constraints make repeated calls safe.
+ */
+export async function webhookDeliveryEnqueueSyncSequence(executor, nowProvider, sequence) {
+    if (!/^\d+$/.test(sequence))
+        throw new IntegrationError("invalid", "Sync sequence is invalid");
+    const events = await executor
+        .select()
+        .from(syncEvents)
+        .where(eq(syncEvents.sequence, Number(sequence)))
+        .orderBy(asc(syncEvents.id));
+    const deliveries = [];
+    for (const event of events) {
+        deliveries.push(...(await webhookDeliveryEnqueueOutgoingEvent(executor, nowProvider, {
+            eventId: `sync:${event.id}`,
+            eventType: event.kind,
+            chatId: event.chatId ?? undefined,
+            payload: {
+                syncEventId: String(event.id),
+                sequence: String(event.sequence),
+                chatId: event.chatId ?? undefined,
+                chatPts: event.chatPts === null ? undefined : String(event.chatPts),
+                entityId: event.entityId ?? undefined,
+                actorUserId: event.actorUserId ?? undefined,
+                targetUserId: event.targetUserId ?? undefined,
+                createdAt: event.createdAt,
+            },
+        })));
+    }
+    return deliveries;
+}
+//# sourceMappingURL=webhookDeliveryEnqueueSyncSequence.js.map

package/packages/happy2-server/dist/modules/webhook/webhookDeliveryEnqueueSyncSequence.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"webhookDeliveryEnqueueSyncSequence.js","sourceRoot":"","sources":["../../../sources/modules/webhook/webhookDeliveryEnqueueSyncSequence.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAA8B,MAAM,0BAA0B,CAAC;AAExF,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,mCAAmC,EAAE,MAAM,0CAA0C,CAAC;AAC/F;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,kCAAkC,CACpD,QAAyB,EACzB,WAAuB,EACvB,QAAgB;IAEhB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC;QAAE,MAAM,IAAI,gBAAgB,CAAC,SAAS,EAAE,0BAA0B,CAAC,CAAC;IAC/F,MAAM,MAAM,GAAG,MAAM,QAAQ;SACxB,MAAM,EAAE;SACR,IAAI,CAAC,UAAU,CAAC;SAChB,KAAK,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;SAChD,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;IACjC,MAAM,UAAU,GAA4B,EAAE,CAAC;IAC/C,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QACzB,UAAU,CAAC,IAAI,CACX,GAAG,CAAC,MAAM,mCAAmC,CAAC,QAAQ,EAAE,WAAW,EAAE;YACjE,OAAO,EAAE,QAAQ,KAAK,CAAC,EAAE,EAAE;YAC3B,SAAS,EAAE,KAAK,CAAC,IAAI;YACrB,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,SAAS;YACjC,OAAO,EAAE;gBACL,WAAW,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC7B,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC;gBAChC,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,SAAS;gBACjC,OAAO,EAAE,KAAK,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;gBACnE,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI,SAAS;gBACrC,WAAW,EAAE,KAAK,CAAC,WAAW,IAAI,SAAS;gBAC3C,YAAY,EAAE,KAAK,CAAC,YAAY,IAAI,SAAS;gBAC7C,SAAS,EAAE,KAAK,CAAC,SAAS;aAC7B;SACJ,CAAC,CAAC,CACN,CAAC;IACN,CAAC;IACD,OAAO,UAAU,CAAC;AACtB,CAAC"}

package/packages/happy2-server/dist/modules/webhook/webhookDeliveryList.d.ts

@@ -0,0 +1,8 @@
+import { type DrizzleExecutor } from "../drizzle.js";
+import { type QueuedWebhookDelivery } from "../integrations/types.js";
+/**
+ * Lists the newest queued deliveries for an existing integration after server-level integration-admin authorization.
+ * The bounded projection exposes delivery state without allowing ordinary integration users to inspect payload history.
+ */
+export declare function webhookDeliveryList(executor: DrizzleExecutor, actorUserId: string, integrationId: string, limit?: number): Promise<QueuedWebhookDelivery[]>;
+//# sourceMappingURL=webhookDeliveryList.d.ts.map

package/packages/happy2-server/dist/modules/webhook/webhookDeliveryList.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"webhookDeliveryList.d.ts","sourceRoot":"","sources":["../../../sources/modules/webhook/webhookDeliveryList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAUtE;;;GAGG;AACH,wBAAsB,mBAAmB,CACrC,QAAQ,EAAE,eAAe,EACzB,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,EACrB,KAAK,SAAM,GACZ,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAelC"}

package/packages/happy2-server/dist/modules/webhook/webhookDeliveryList.js

@@ -0,0 +1,27 @@
+import {} from "../drizzle.js";
+import {} from "../integrations/types.js";
+import { asDelivery } from "../integration/asDelivery.js";
+import { deliverySelection } from "../integration/deliverySelection.js";
+import { desc, eq } from "drizzle-orm";
+import { positiveLimit } from "./impl/positiveLimit.js";
+import { webhookDeliveries, webhookSubscriptions } from "../schema.js";
+import { userRequireIntegrationAdmin } from "../integration/userRequireIntegrationAdmin.js";
+import { integrationRequire } from "../integration/integrationRequire.js";
+/**
+ * Lists the newest queued deliveries for an existing integration after server-level integration-admin authorization.
+ * The bounded projection exposes delivery state without allowing ordinary integration users to inspect payload history.
+ */
+export async function webhookDeliveryList(executor, actorUserId, integrationId, limit = 100) {
+    await userRequireIntegrationAdmin(executor, actorUserId);
+    positiveLimit(limit, 200);
+    await integrationRequire(executor, integrationId, false);
+    const rows = await executor
+        .select(deliverySelection)
+        .from(webhookDeliveries)
+        .innerJoin(webhookSubscriptions, eq(webhookSubscriptions.id, webhookDeliveries.subscriptionId))
+        .where(eq(webhookSubscriptions.integrationId, integrationId))
+        .orderBy(desc(webhookDeliveries.createdAt), desc(webhookDeliveries.id))
+        .limit(limit);
+    return rows.map(asDelivery);
+}
+//# sourceMappingURL=webhookDeliveryList.js.map

package/packages/happy2-server/dist/modules/webhook/webhookDeliveryList.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"webhookDeliveryList.js","sourceRoot":"","sources":["../../../sources/modules/webhook/webhookDeliveryList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,MAAM,eAAe,CAAC;AACrD,OAAO,EAA8B,MAAM,0BAA0B,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAEvC,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAEvE,OAAO,EAAE,2BAA2B,EAAE,MAAM,+CAA+C,CAAC;AAC5F,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAC1E;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACrC,QAAyB,EACzB,WAAmB,EACnB,aAAqB,EACrB,KAAK,GAAG,GAAG;IAEX,MAAM,2BAA2B,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IACzD,aAAa,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAC1B,MAAM,kBAAkB,CAAC,QAAQ,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC;IACzD,MAAM,IAAI,GAAG,MAAM,QAAQ;SACtB,MAAM,CAAC,iBAAiB,CAAC;SACzB,IAAI,CAAC,iBAAiB,CAAC;SACvB,SAAS,CACN,oBAAoB,EACpB,EAAE,CAAC,oBAAoB,CAAC,EAAE,EAAE,iBAAiB,CAAC,cAAc,CAAC,CAChE;SACA,KAAK,CAAC,EAAE,CAAC,oBAAoB,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;SAC5D,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC;SACtE,KAAK,CAAC,KAAK,CAAC,CAAC;IAClB,OAAO,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;AAChC,CAAC"}

package/packages/happy2-server/dist/modules/webhook/webhookSubscriptionList.d.ts

@@ -0,0 +1,8 @@
+import { type DrizzleExecutor } from "../drizzle.js";
+import { type WebhookSubscriptionSummary } from "../integrations/types.js";
+/**
+ * Lists an existing integration's webhook subscriptions for a server integration administrator.
+ * Authorization and integration existence checks are kept at this boundary because subscription configuration is not exposed to ordinary members.
+ */
+export declare function webhookSubscriptionList(executor: DrizzleExecutor, actorUserId: string, integrationId: string): Promise<WebhookSubscriptionSummary[]>;
+//# sourceMappingURL=webhookSubscriptionList.d.ts.map

package/packages/happy2-server/dist/modules/webhook/webhookSubscriptionList.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"webhookSubscriptionList.d.ts","sourceRoot":"","sources":["../../../sources/modules/webhook/webhookSubscriptionList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,KAAK,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAQ3E;;;GAGG;AACH,wBAAsB,uBAAuB,CACzC,QAAQ,EAAE,eAAe,EACzB,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,GACtB,OAAO,CAAC,0BAA0B,EAAE,CAAC,CASvC"}

package/packages/happy2-server/dist/modules/webhook/webhookSubscriptionList.js

@@ -0,0 +1,23 @@
+import {} from "../drizzle.js";
+import {} from "../integrations/types.js";
+import { asSubscription } from "./impl/asSubscription.js";
+import { desc, eq } from "drizzle-orm";
+import { subscriptionSelection } from "./impl/subscriptionSelection.js";
+import { webhookSubscriptions } from "../schema.js";
+import { userRequireIntegrationAdmin } from "../integration/userRequireIntegrationAdmin.js";
+import { integrationRequire } from "../integration/integrationRequire.js";
+/**
+ * Lists an existing integration's webhook subscriptions for a server integration administrator.
+ * Authorization and integration existence checks are kept at this boundary because subscription configuration is not exposed to ordinary members.
+ */
+export async function webhookSubscriptionList(executor, actorUserId, integrationId) {
+    await userRequireIntegrationAdmin(executor, actorUserId);
+    await integrationRequire(executor, integrationId, false);
+    const rows = await executor
+        .select(subscriptionSelection)
+        .from(webhookSubscriptions)
+        .where(eq(webhookSubscriptions.integrationId, integrationId))
+        .orderBy(desc(webhookSubscriptions.createdAt), desc(webhookSubscriptions.id));
+    return rows.map(asSubscription);
+}
+//# sourceMappingURL=webhookSubscriptionList.js.map

package/packages/happy2-server/dist/modules/webhook/webhookSubscriptionList.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"webhookSubscriptionList.js","sourceRoot":"","sources":["../../../sources/modules/webhook/webhookSubscriptionList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,MAAM,eAAe,CAAC;AACrD,OAAO,EAAmC,MAAM,0BAA0B,CAAC;AAC3E,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAEvC,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,2BAA2B,EAAE,MAAM,+CAA+C,CAAC;AAC5F,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAC1E;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CACzC,QAAyB,EACzB,WAAmB,EACnB,aAAqB;IAErB,MAAM,2BAA2B,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IACzD,MAAM,kBAAkB,CAAC,QAAQ,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC;IACzD,MAAM,IAAI,GAAG,MAAM,QAAQ;SACtB,MAAM,CAAC,qBAAqB,CAAC;SAC7B,IAAI,CAAC,oBAAoB,CAAC;SAC1B,KAAK,CAAC,EAAE,CAAC,oBAAoB,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;SAC5D,OAAO,CAAC,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC,CAAC;IAClF,OAAO,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;AACpC,CAAC"}

package/packages/happy2-server/dist/modules/workspace/service.d.ts

@@ -1,4 +1,4 @@
-import type { CollaborationRepository } from "../collaboration/repository.js";
+import { type DrizzleExecutor } from "../drizzle.js";
 import { type PubSub } from "../realtime/index.js";
 import { type WorkspaceDirectoryPage, type WorkspaceFileDeleteResult, type WorkspaceFileWriteResult, type WorkspaceSnapshot, type WorkspaceTextFile, type WorkspaceTextPatch } from "./types.js";
 export declare const MAX_WORKSPACE_TEXT_FILE_BYTES: number;
@@ -8,15 +8,16 @@ export declare const MAX_WORKSPACE_TEXT_FILE_BYTES: number;
  */
 export declare const DEFAULT_DEFERRED_WORKSPACE_DIRECTORIES: readonly string[];
 export declare class WorkspaceService {
-    private readonly repository;
+    private readonly executor;
     private readonly pubsub;
+    private readonly workspacesRoot;
     private readonly onError;
     private readonly indexes;
     private readonly indexCreations;
     private readonly warmIndexes;
     private readonly indexesByChat;
     private closed;
-    constructor(repository: CollaborationRepository, pubsub: PubSub, onError?: (error: unknown) => void);
+    constructor(executor: DrizzleExecutor, pubsub: PubSub, workspacesRoot: string, onError?: (error: unknown) => void);
     getSnapshot(userId: string, chatId: string): Promise<WorkspaceSnapshot>;
     getDirectory(input: {
         userId: string;

package/packages/happy2-server/dist/modules/workspace/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../sources/modules/workspace/service.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,EAAkB,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACnE,OAAO,EAEH,KAAK,sBAAsB,EAC3B,KAAK,yBAAyB,EAC9B,KAAK,wBAAwB,EAG7B,KAAK,iBAAiB,EACtB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EAC1B,MAAM,YAAY,CAAC;AAepB,eAAO,MAAM,6BAA6B,QAAkB,CAAC;AAE7D;;;GAGG;AACH,eAAO,MAAM,sCAAsC,EAAE,SAAS,MAAM,EAalE,CAAC;AA2BH,qBAAa,gBAAgB;IAQrB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAT5B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAqC;IAC7D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA8C;IAC7E,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqC;IACjE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAqC;IACnE,OAAO,CAAC,MAAM,CAAS;IAEvB,YACqB,UAAU,EAAE,uBAAuB,EACnC,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAsB,EACpE;IAEE,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAG5E;IAEK,YAAY,CAAC,KAAK,EAAE;QACtB,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;QACf,SAAS,EAAE,MAAM,CAAC;QAClB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,MAAM,CAAC;KAClB,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAOlC;IAEK,OAAO,CAAC,KAAK,EAAE;QACjB,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,MAAM,CAAC;KAChB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAG7B;IAEK,SAAS,CAAC,KAAK,EAAE;QACnB,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,MAAM,CAAC;QACb,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;QAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE,kBAAkB,CAAC;KAC9B,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAQpC;IAEK,UAAU,CAAC,KAAK,EAAE;QACpB,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,MAAM,CAAC;QACb,eAAe,EAAE,MAAM,CAAC;KAC3B,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAMrC;IAEK,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAiB3B;YAEa,eAAe;IA8C7B,OAAO,CAAC,UAAU;IAOlB,OAAO,CAAC,cAAc;IAKtB,OAAO,CAAC,cAAc;CAUzB;AA84BD,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAK7E"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../sources/modules/workspace/service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,eAAe,CAAC;AAgBrD,OAAO,EAAkB,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACnE,OAAO,EAGH,KAAK,sBAAsB,EAC3B,KAAK,yBAAyB,EAC9B,KAAK,wBAAwB,EAG7B,KAAK,iBAAiB,EACtB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EAC1B,MAAM,YAAY,CAAC;AAcpB,eAAO,MAAM,6BAA6B,QAAkB,CAAC;AAE7D;;;GAGG;AACH,eAAO,MAAM,sCAAsC,EAAE,SAAS,MAAM,EAalE,CAAC;AAqBH,qBAAa,gBAAgB;IAOrB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAT5B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAqC;IAC7D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA8C;IAC7E,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqC;IACjE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAqC;IACnE,OAAO,CAAC,MAAM,CAAS;IACvB,YACqB,QAAQ,EAAE,eAAe,EACzB,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,MAAM,EACtB,OAAO,GAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAsB,EACpE;IACE,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAG5E;IACK,YAAY,CAAC,KAAK,EAAE;QACtB,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;QACf,SAAS,EAAE,MAAM,CAAC;QAClB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,MAAM,CAAC;KAClB,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAOlC;IACK,OAAO,CAAC,KAAK,EAAE;QACjB,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,MAAM,CAAC;KAChB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAG7B;IACK,SAAS,CAAC,KAAK,EAAE;QACnB,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,MAAM,CAAC;QACb,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;QAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE,kBAAkB,CAAC;KAC9B,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAQpC;IACK,UAAU,CAAC,KAAK,EAAE;QACpB,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,MAAM,CAAC;QACb,eAAe,EAAE,MAAM,CAAC;KAC3B,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAMrC;IACK,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAiB3B;YACa,eAAe;IA6C7B,OAAO,CAAC,UAAU;IAMlB,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,cAAc;CAUzB;AAq5BD,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAK7E"}

package/packages/happy2-server/dist/modules/workspace/service.js

@@ -1,7 +1,9 @@
+import { chatWorkspaceGetTarget } from "../chat/chatWorkspaceGetTarget.js";
+import {} from "../drizzle.js";
 import { execFile } from "node:child_process";
 import { createHash, randomUUID } from "node:crypto";
 import { constants, watch } from "node:fs";
-import { link, lstat, open, readdir, realpath, rename, unlink, } from "node:fs/promises";
+import { link, lstat, mkdir, open, readdir, realpath, rename, unlink, } from "node:fs/promises";
 import { dirname, join, sep } from "node:path";
 import { realtimeTopics } from "../realtime/index.js";
 import { WorkspaceError, } from "./types.js";
@@ -39,17 +41,19 @@ export const DEFAULT_DEFERRED_WORKSPACE_DIRECTORIES = Object.freeze([
 ]);
 const defaultDeferredDirectories = new Set(DEFAULT_DEFERRED_WORKSPACE_DIRECTORIES);
 export class WorkspaceService {
-    repository;
+    executor;
     pubsub;
+    workspacesRoot;
     onError;
     indexes = new Map();
     indexCreations = new Map();
     warmIndexes = new Map();
     indexesByChat = new Map();
     closed = false;
-    constructor(repository, pubsub, onError = () => undefined) {
-        this.repository = repository;
+    constructor(executor, pubsub, workspacesRoot, onError = () => undefined) {
+        this.executor = executor;
         this.pubsub = pubsub;
+        this.workspacesRoot = workspacesRoot;
         this.onError = onError;
     }
     async getSnapshot(userId, chatId) {
@@ -100,11 +104,11 @@ export class WorkspaceService {
     async authorizedIndex(userId, chatId) {
         if (this.closed)
             throw new Error("Workspace service is closed");
-        const binding = await this.repository.getChatWorkspaceBinding(userId, chatId);
-        const root = await workspaceRoot(binding.cwd);
+        const target = await chatWorkspaceGetTarget(this.executor, userId, chatId);
+        const root = await workspaceRoot(target, this.workspacesRoot);
         const existing = this.indexes.get(root);
         if (existing) {
-            this.attachChat(binding.chatId, existing);
+            this.attachChat(target.chatId, existing);
             this.touchWarmIndex(root, existing);
             existing.ensureWatcher();
             existing.warmUp();
@@ -114,7 +118,7 @@ export class WorkspaceService {
         const pending = this.indexCreations.get(root);
         if (pending) {
             const index = await pending;
-            this.attachChat(binding.chatId, index);
+            this.attachChat(target.chatId, index);
             this.touchWarmIndex(root, index);
             index.ensureWatcher();
             index.warmUp();
@@ -123,7 +127,7 @@ export class WorkspaceService {
         }
         const creation = (async () => {
             const index = new WorkspaceIndex(root, this.pubsub, this.onError);
-            index.attachChat(binding.chatId);
+            index.attachChat(target.chatId);
             await index.start();
             if (this.closed) {
                 await index.close();
@@ -135,7 +139,7 @@ export class WorkspaceService {
         this.indexCreations.set(root, creation);
         try {
             const index = await creation;
-            this.attachChat(binding.chatId, index);
+            this.attachChat(target.chatId, index);
             this.touchWarmIndex(root, index);
             this.coolOldIndexes();
             return index;
@@ -207,7 +211,9 @@ class WorkspaceIndex {
     ensureWatcher() {
         if (this.closed || this.watcher)
             return;
-        const watcher = watch(this.root, { recursive: true }, (_eventType, filename) => {
+        const watcher = watch(this.root, {
+            recursive: true,
+        }, (_eventType, filename) => {
             this.queueChange(filename === null ? undefined : String(filename));
         });
         watcher.unref();
@@ -243,7 +249,12 @@ class WorkspaceIndex {
         this.ensureWatcher();
         const paths = [];
         const unloaded = new Set();
-        const queue = [{ depth: 0, directory: "" }];
+        const queue = [
+            {
+                depth: 0,
+                directory: "",
+            },
+        ];
         let pathBytes = 0;
         let directoriesRead = 0;
         let stopped = false;
@@ -289,7 +300,10 @@ class WorkspaceIndex {
                 if (!entry.isDirectory)
                     continue;
                 if (current.depth + 1 < MAX_PRELOAD_DEPTH)
-                    queue.push({ directory: entry.path, depth: current.depth + 1 });
+                    queue.push({
+                        directory: entry.path,
+                        depth: current.depth + 1,
+                    });
                 else
                     unloaded.add(entry.path);
             }
@@ -384,7 +398,10 @@ class WorkspaceIndex {
                     throw workspaceConflict(null);
                 throw error;
             }
-            return { path: input.path, deletedVersion: input.expectedVersion };
+            return {
+                path: input.path,
+                deletedVersion: input.expectedVersion,
+            };
         });
     }
     async close() {
@@ -419,7 +436,9 @@ class WorkspaceIndex {
             throw error;
         }
         try {
-            const metadata = await handle.stat({ bigint: true });
+            const metadata = await handle.stat({
+                bigint: true,
+            });
             if (!metadata.isFile())
                 throw new WorkspaceError("not_found", "Workspace file was not found");
             if (metadata.size > BigInt(MAX_WORKSPACE_TEXT_FILE_BYTES))
@@ -429,7 +448,9 @@ class WorkspaceIndex {
                 throw new WorkspaceError("too_large", `Workspace text files are limited to ${MAX_WORKSPACE_TEXT_FILE_BYTES} bytes`);
             let content;
             try {
-                content = new TextDecoder("utf-8", { fatal: true }).decode(buffer);
+                content = new TextDecoder("utf-8", {
+                    fatal: true,
+                }).decode(buffer);
             }
             catch {
                 throw new WorkspaceError("not_text", "Workspace file is not valid UTF-8 text");
@@ -511,7 +532,12 @@ class WorkspaceIndex {
             const entry = this.gitStatusByPath.get(path) ??
                 (path.endsWith("/") ? this.gitStatusByPath.get(path.slice(0, -1)) : undefined);
             if (entry)
-                gitStatus.push(entry.path === path ? entry : { ...entry, path });
+                gitStatus.push(entry.path === path
+                    ? entry
+                    : {
+                        ...entry,
+                        path,
+                    });
         }
         gitStatus.sort((left, right) => comparePaths(left.path, right.path));
         return {
@@ -547,7 +573,9 @@ class WorkspaceIndex {
         const fullPath = await this.validatedDirectoryPath(directory);
         let dirents;
         try {
-            dirents = await readdir(fullPath, { withFileTypes: true });
+            dirents = await readdir(fullPath, {
+                withFileTypes: true,
+            });
         }
         catch (error) {
             if (isMissingPathError(error))
@@ -557,7 +585,11 @@ class WorkspaceIndex {
         const entries = dirents
             .map((entry) => {
             const path = `${directory}${entry.name}${entry.isDirectory() ? "/" : ""}`;
-            return { isDirectory: entry.isDirectory(), name: entry.name, path };
+            return {
+                isDirectory: entry.isDirectory(),
+                name: entry.name,
+                path,
+            };
         })
             .sort((left, right) => comparePaths(left.name, right.name));
         this.cacheDirectory(directory, entries);
@@ -780,7 +812,10 @@ function parseGitStatus(output) {
         }
     }
     return [...byPath]
-        .map(([path, status]) => ({ path, status }))
+        .map(([path, status]) => ({
+        path,
+        status,
+    }))
         .sort((left, right) => comparePaths(left.path, right.path));
 }
 function canonicalDirectory(value) {
@@ -941,7 +976,10 @@ function gitOutput(root, arguments_) {
     return new Promise((resolve, reject) => {
         execFile("git", ["-C", root, ...arguments_], {
             encoding: "utf8",
-            env: { ...process.env, GIT_OPTIONAL_LOCKS: "0" },
+            env: {
+                ...process.env,
+                GIT_OPTIONAL_LOCKS: "0",
+            },
             maxBuffer: GIT_MAX_BUFFER_BYTES,
             timeout: GIT_TIMEOUT_MS,
             windowsHide: true,
@@ -962,7 +1000,9 @@ function isExpectedNoRepositoryError(error) {
         candidate.stderr?.includes("not a git repository") === true);
 }
 function isMissingPathError(error) {
-    return Boolean(error && typeof error === "object" && error.code === "ENOENT");
+    return Boolean(error &&
+        typeof error === "object" &&
+        error.code === "ENOENT");
 }
 function isUnavailableFileError(error) {
     if (!error || typeof error !== "object")
@@ -970,9 +1010,17 @@ function isUnavailableFileError(error) {
     return ["EISDIR", "ELOOP", "ENOENT", "ENOTDIR"].includes(String(error.code));
 }
 function isAlreadyExistsError(error) {
-    return Boolean(error && typeof error === "object" && error.code === "EEXIST");
+    return Boolean(error &&
+        typeof error === "object" &&
+        error.code === "EEXIST");
 }
-async function workspaceRoot(cwd) {
+async function workspaceRoot(target, workspacesRoot) {
+    const cwd = target.source === "rig" ? target.cwd : join(workspacesRoot, "channels", target.chatId);
+    if (target.source === "channel")
+        await mkdir(cwd, {
+            recursive: true,
+            mode: 0o700,
+        });
     try {
         const root = await realpath(cwd);
         if (!(await lstat(root)).isDirectory())