@event-driven-io/emmett-postgresql 0.42.0-rc.2 → 0.42.0

package/dist/index.d.cts

@@ -74,7 +74,7 @@ type PostgreSQLProcessorLockOptions = {
     };
     lockKey?: string | bigint;
     lockTimeoutSeconds?: number;
-    lockPolicy?: LockAcquisitionPolicy;
+    lockAcquisitionPolicy?: LockAcquisitionPolicy;
 };
 type PostgreSQLProcessorLockContext = {
     execute: SQLExecutor;
@@ -370,6 +370,7 @@ declare const eventStoreSchemaMigrations: SQLMigration[];
 type CreateEventStoreSchemaOptions = {
     dryRun?: boolean | undefined;
     ignoreMigrationHashMismatch?: boolean | undefined;
+    migrationTimeoutMs?: number | undefined;
 };
 type EventStoreSchemaMigrationOptions = {
     migrationOptions?: CreateEventStoreSchemaOptions;
@@ -697,8 +698,10 @@ type PostgreSQLConnectionOptions = {
     connectionOptions?: PostgreSQLProcessorConnectionOptions;
 };
 type PostgreSQLProcessorOptionsBase = PostgreSQLConnectionOptions & {
-    lockPolicy?: LockAcquisitionPolicy;
-    lockTimeoutSeconds?: number;
+    lock?: {
+        acquisitionPolicy?: LockAcquisitionPolicy;
+        timeoutSeconds?: number;
+    };
     partition?: string;
 };
 type PostgreSQLReactorOptions<MessageType extends Message = Message> = ReactorOptions<MessageType, ReadEventMetadataWithGlobalPosition, PostgreSQLProcessorHandlerContext> & PostgreSQLProcessorOptionsBase;
@@ -737,7 +740,11 @@ type PostgreSQLEventStoreConsumer<ConsumerMessageType extends AnyMessage = any>
 declare const postgreSQLEventStoreConsumer: <ConsumerMessageType extends Message = AnyMessage>(options: PostgreSQLEventStoreConsumerOptions<ConsumerMessageType>) => PostgreSQLEventStoreConsumer<ConsumerMessageType>;
 
 declare const rebuildPostgreSQLProjections: <EventType extends AnyEvent = AnyEvent>(options: Omit<PostgreSQLEventStoreConsumerOptions<EventType>, "stopWhen" | "processors"> & {
-    lockPolicy?: LockAcquisitionPolicy;
+    lock?: {
+        lockAcquisitionPolicy?: LockAcquisitionPolicy;
+        acquisitionPolicy?: LockAcquisitionPolicy;
+        timeoutSeconds?: number;
+    };
 } & ({
     projections: (ProjectorOptions<EventType, ReadEventMetadataWithGlobalPosition, PostgreSQLProcessorHandlerContext> | PostgreSQLProjectionDefinition<EventType>)[];
 } | ProjectorOptions<EventType, ReadEventMetadataWithGlobalPosition, PostgreSQLProcessorHandlerContext>)) => PostgreSQLEventStoreConsumer<EventType>;

package/dist/index.d.ts

@@ -74,7 +74,7 @@ type PostgreSQLProcessorLockOptions = {
     };
     lockKey?: string | bigint;
     lockTimeoutSeconds?: number;
-    lockPolicy?: LockAcquisitionPolicy;
+    lockAcquisitionPolicy?: LockAcquisitionPolicy;
 };
 type PostgreSQLProcessorLockContext = {
     execute: SQLExecutor;
@@ -370,6 +370,7 @@ declare const eventStoreSchemaMigrations: SQLMigration[];
 type CreateEventStoreSchemaOptions = {
     dryRun?: boolean | undefined;
     ignoreMigrationHashMismatch?: boolean | undefined;
+    migrationTimeoutMs?: number | undefined;
 };
 type EventStoreSchemaMigrationOptions = {
     migrationOptions?: CreateEventStoreSchemaOptions;
@@ -697,8 +698,10 @@ type PostgreSQLConnectionOptions = {
     connectionOptions?: PostgreSQLProcessorConnectionOptions;
 };
 type PostgreSQLProcessorOptionsBase = PostgreSQLConnectionOptions & {
-    lockPolicy?: LockAcquisitionPolicy;
-    lockTimeoutSeconds?: number;
+    lock?: {
+        acquisitionPolicy?: LockAcquisitionPolicy;
+        timeoutSeconds?: number;
+    };
     partition?: string;
 };
 type PostgreSQLReactorOptions<MessageType extends Message = Message> = ReactorOptions<MessageType, ReadEventMetadataWithGlobalPosition, PostgreSQLProcessorHandlerContext> & PostgreSQLProcessorOptionsBase;
@@ -737,7 +740,11 @@ type PostgreSQLEventStoreConsumer<ConsumerMessageType extends AnyMessage = any>
 declare const postgreSQLEventStoreConsumer: <ConsumerMessageType extends Message = AnyMessage>(options: PostgreSQLEventStoreConsumerOptions<ConsumerMessageType>) => PostgreSQLEventStoreConsumer<ConsumerMessageType>;
 
 declare const rebuildPostgreSQLProjections: <EventType extends AnyEvent = AnyEvent>(options: Omit<PostgreSQLEventStoreConsumerOptions<EventType>, "stopWhen" | "processors"> & {
-    lockPolicy?: LockAcquisitionPolicy;
+    lock?: {
+        lockAcquisitionPolicy?: LockAcquisitionPolicy;
+        acquisitionPolicy?: LockAcquisitionPolicy;
+        timeoutSeconds?: number;
+    };
 } & ({
     projections: (ProjectorOptions<EventType, ReadEventMetadataWithGlobalPosition, PostgreSQLProcessorHandlerContext> | PostgreSQLProjectionDefinition<EventType>)[];
 } | ProjectorOptions<EventType, ReadEventMetadataWithGlobalPosition, PostgreSQLProcessorHandlerContext>)) => PostgreSQLEventStoreConsumer<EventType>;

package/dist/index.js

@@ -892,10 +892,10 @@ import {
 } from "@event-driven-io/dumbo";
 import "pg";
 
-// src/eventStore/projections/locks/tryAcquireProcessorLock.ts
+// src/eventStore/projections/locks/tryAcquireProjectionLock.ts
 import { single } from "@event-driven-io/dumbo";
 
-// src/eventStore/schema/processors/processorsLocks.ts
+// src/eventStore/schema/projections/projectionsLocks.ts
 import { sql as sql3 } from "@event-driven-io/dumbo";
 
 // src/eventStore/schema/createFunctionIfDoesNotExist.ts
@@ -911,7 +911,97 @@ END $$;
 `
 );
 
+// src/eventStore/schema/projections/projectionsLocks.ts
+var tryAcquireProjectionLockSQL = createFunctionIfDoesNotExistSQL(
+  "emt_try_acquire_projection_lock",
+  `
+CREATE OR REPLACE FUNCTION emt_try_acquire_projection_lock(
+    p_lock_key   BIGINT,
+    p_partition  TEXT,
+    p_name       TEXT,
+    p_version    INT
+)
+RETURNS TABLE (acquired BOOLEAN, is_active BOOLEAN)
+LANGUAGE plpgsql
+AS $emt_try_acquire_projection_lock$
+BEGIN
+    RETURN QUERY
+    WITH lock_check AS (
+        SELECT pg_try_advisory_xact_lock_shared(p_lock_key) AS acquired
+    ),
+    status_check AS (
+        SELECT status = 'active' AS is_active
+        FROM ${projectionsTable.name}
+        WHERE partition = p_partition AND name = p_name AND version = p_version
+    )
+    SELECT
+        COALESCE((SELECT lc.acquired FROM lock_check lc), false),
+        COALESCE((SELECT sc.is_active FROM status_check sc), true);
+END;
+$emt_try_acquire_projection_lock$;
+`
+);
+var callTryAcquireProjectionLock = (params) => sql3(
+  `SELECT * FROM emt_try_acquire_projection_lock(%s::BIGINT, %L, %L, %s);`,
+  params.lockKey,
+  params.partition,
+  params.name,
+  params.version
+);
+
+// src/eventStore/projections/locks/tryAcquireProjectionLock.ts
+var tryAcquireProjectionLock = async (execute, {
+  lockKey,
+  projectionName,
+  partition,
+  version
+}) => {
+  const lockKeyBigInt = isBigint(lockKey) ? lockKey : await hashText(lockKey);
+  const { acquired, is_active } = await single(
+    execute.query(
+      callTryAcquireProjectionLock({
+        lockKey: lockKeyBigInt.toString(),
+        partition,
+        name: projectionName,
+        version
+      })
+    )
+  );
+  return acquired === true && is_active === true;
+};
+
+// src/eventStore/projections/locks/postgreSQLProjectionLock.ts
+var postgreSQLProjectionLock = (options) => {
+  let acquired = false;
+  const lockKey = options.lockKey ?? toProjectionLockKey(options);
+  return {
+    tryAcquire: async (context) => {
+      if (acquired) {
+        return true;
+      }
+      acquired = await tryAcquireProjectionLock(context.execute, {
+        ...options,
+        lockKey
+      });
+      return acquired;
+    },
+    release: (_context) => {
+      if (!acquired) return;
+      acquired = false;
+    }
+  };
+};
+var toProjectionLockKey = ({
+  projectionName,
+  partition,
+  version
+}) => `${partition}:${projectionName}:${version}`;
+
+// src/eventStore/projections/locks/tryAcquireProcessorLock.ts
+import { single as single2 } from "@event-driven-io/dumbo";
+
 // src/eventStore/schema/processors/processorsLocks.ts
+import { sql as sql4 } from "@event-driven-io/dumbo";
 var tryAcquireProcessorLockSQL = createFunctionIfDoesNotExistSQL(
   "emt_try_acquire_processor_lock",
   `
@@ -1026,7 +1116,7 @@ END;
 $emt_release_processor_lock$;
 `
 );
-var callTryAcquireProcessorLock = (params) => sql3(
+var callTryAcquireProcessorLock = (params) => sql4(
   `SELECT * FROM emt_try_acquire_processor_lock(%s::BIGINT, %L, %s, %L, %L, %L, %L, %L, %s);`,
   params.lockKey,
   params.processorId,
@@ -1038,7 +1128,7 @@ var callTryAcquireProcessorLock = (params) => sql3(
   params.projectionKind,
   params.lockTimeoutSeconds
 );
-var callReleaseProcessorLock = (params) => sql3(
+var callReleaseProcessorLock = (params) => sql4(
   `SELECT emt_release_processor_lock(%s::BIGINT, %L, %L, %s, %L, %L) as result;`,
   params.lockKey,
   params.processorId,
@@ -1052,7 +1142,7 @@ var callReleaseProcessorLock = (params) => sql3(
 var PROCESSOR_LOCK_DEFAULT_TIMEOUT_SECONDS = 300;
 var tryAcquireProcessorLock = async (execute, options) => {
   const lockKeyBigInt = isBigint(options.lockKey) ? options.lockKey : await hashText(options.lockKey);
-  const { acquired, checkpoint } = await single(
+  const { acquired, checkpoint } = await single2(
     execute.command(
       callTryAcquireProcessorLock({
         lockKey: lockKeyBigInt.toString(),
@@ -1070,7 +1160,7 @@ var tryAcquireProcessorLock = async (execute, options) => {
   return acquired ? { acquired: true, checkpoint } : { acquired: false };
 };
 var tryAcquireProcessorLockWithRetry = async (execute, options) => {
-  const policy = options.lockPolicy ?? DefaultPostgreSQLProcessorLockPolicy;
+  const policy = options.lockAcquisitionPolicy ?? DefaultPostgreSQLProcessorLockPolicy;
   if (policy.type === "retry") {
     return asyncRetry(() => tryAcquireProcessorLock(execute, options), {
       retries: policy.retries - 1,
@@ -1083,7 +1173,7 @@ var tryAcquireProcessorLockWithRetry = async (execute, options) => {
 };
 var releaseProcessorLock = async (execute, options) => {
   const lockKeyBigInt = isBigint(options.lockKey) ? options.lockKey : await hashText(options.lockKey);
-  const { result } = await single(
+  const { result } = await single2(
     execute.command(
       callReleaseProcessorLock({
         lockKey: lockKeyBigInt.toString(),
@@ -1098,96 +1188,6 @@ var releaseProcessorLock = async (execute, options) => {
   return result;
 };
 
-// src/eventStore/projections/locks/tryAcquireProjectionLock.ts
-import { single as single2 } from "@event-driven-io/dumbo";
-
-// src/eventStore/schema/projections/projectionsLocks.ts
-import { sql as sql4 } from "@event-driven-io/dumbo";
-var tryAcquireProjectionLockSQL = createFunctionIfDoesNotExistSQL(
-  "emt_try_acquire_projection_lock",
-  `
-CREATE OR REPLACE FUNCTION emt_try_acquire_projection_lock(
-    p_lock_key   BIGINT,
-    p_partition  TEXT,
-    p_name       TEXT,
-    p_version    INT
-)
-RETURNS TABLE (acquired BOOLEAN, is_active BOOLEAN)
-LANGUAGE plpgsql
-AS $emt_try_acquire_projection_lock$
-BEGIN
-    RETURN QUERY
-    WITH lock_check AS (
-        SELECT pg_try_advisory_xact_lock_shared(p_lock_key) AS acquired
-    ),
-    status_check AS (
-        SELECT status = 'active' AS is_active
-        FROM ${projectionsTable.name}
-        WHERE partition = p_partition AND name = p_name AND version = p_version
-    )
-    SELECT
-        COALESCE((SELECT lc.acquired FROM lock_check lc), false),
-        COALESCE((SELECT sc.is_active FROM status_check sc), true);
-END;
-$emt_try_acquire_projection_lock$;
-`
-);
-var callTryAcquireProjectionLock = (params) => sql4(
-  `SELECT * FROM emt_try_acquire_projection_lock(%s::BIGINT, %L, %L, %s);`,
-  params.lockKey,
-  params.partition,
-  params.name,
-  params.version
-);
-
-// src/eventStore/projections/locks/tryAcquireProjectionLock.ts
-var tryAcquireProjectionLock = async (execute, {
-  lockKey,
-  projectionName,
-  partition,
-  version
-}) => {
-  const lockKeyBigInt = isBigint(lockKey) ? lockKey : await hashText(lockKey);
-  const { acquired, is_active } = await single2(
-    execute.query(
-      callTryAcquireProjectionLock({
-        lockKey: lockKeyBigInt.toString(),
-        partition,
-        name: projectionName,
-        version
-      })
-    )
-  );
-  return acquired === true && is_active === true;
-};
-
-// src/eventStore/projections/locks/postgreSQLProjectionLock.ts
-var postgreSQLProjectionLock = (options) => {
-  let acquired = false;
-  const lockKey = options.lockKey ?? toProjectionLockKey(options);
-  return {
-    tryAcquire: async (context) => {
-      if (acquired) {
-        return true;
-      }
-      acquired = await tryAcquireProjectionLock(context.execute, {
-        ...options,
-        lockKey
-      });
-      return acquired;
-    },
-    release: (_context) => {
-      if (!acquired) return;
-      acquired = false;
-    }
-  };
-};
-var toProjectionLockKey = ({
-  projectionName,
-  partition,
-  version
-}) => `${partition}:${projectionName}:${version}`;
-
 // src/eventStore/projections/locks/postgreSQLProcessorLock.ts
 var DefaultPostgreSQLProcessorLockPolicy = {
   type: "fail"
@@ -1204,7 +1204,7 @@ var postgreSQLProcessorLock = (options) => {
         ...options,
         lockKey
       });
-      if (!result.acquired && options.lockPolicy?.type !== "skip") {
+      if (!result.acquired && options.lockAcquisitionPolicy?.type !== "skip") {
         throw new EmmettError(
           `Failed to acquire lock for processor '${options.processorId}'`
         );
@@ -4723,8 +4723,7 @@ var postgreSQLProjector = (options) => {
     processorInstanceId = getProcessorInstanceId(processorId),
     version = defaultProcessorVersion,
     partition = defaultProcessorPartition,
-    lockPolicy = DefaultPostgreSQLProcessorLockPolicy,
-    lockTimeoutSeconds
+    lock
   } = options;
   const { pool, connectionString, close } = getProcessorPool(options);
   const processorLock = postgreSQLProcessorLock({
@@ -4738,8 +4737,8 @@ var postgreSQLProjector = (options) => {
       version: options.projection.version ?? version,
       handlingType: "async"
     } : void 0,
-    lockPolicy,
-    lockTimeoutSeconds
+    lockAcquisitionPolicy: lock?.acquisitionPolicy ?? DefaultPostgreSQLProcessorLockPolicy,
+    lockTimeoutSeconds: lock?.timeoutSeconds
   });
   const hooks = wrapHooksWithProcessorLocks(
     {
@@ -4791,7 +4790,7 @@ var postgreSQLReactor = (options) => {
     processorInstanceId = getProcessorInstanceId(processorId),
     version = defaultProcessorVersion,
     partition = defaultProcessorPartition,
-    lockPolicy = DefaultPostgreSQLProcessorLockPolicy
+    lock
   } = options;
   const { pool, connectionString, close } = getProcessorPool(options);
   const processorLock = postgreSQLProcessorLock({
@@ -4800,7 +4799,8 @@ var postgreSQLReactor = (options) => {
     partition,
     processorInstanceId,
     projection: void 0,
-    lockPolicy
+    lockAcquisitionPolicy: lock?.acquisitionPolicy ?? DefaultPostgreSQLProcessorLockPolicy,
+    lockTimeoutSeconds: lock?.timeoutSeconds
   });
   const hooks = wrapHooksWithProcessorLocks(
     {
@@ -4986,9 +4986,9 @@ var rebuildPostgreSQLProjections = (options) => {
     ...options,
     stopWhen: { noMessagesLeft: true }
   });
+  const lock = { acquisitionPolicy: defaultRebuildLockPolicy, ...options.lock };
   const projections = "projections" in options ? options.projections.map(
     (p) => "projection" in p ? {
-      lockPolicy: defaultRebuildLockPolicy,
       truncateOnStart: true,
       processorId: getProjectorId({
         projectionName: p.projection.name ?? unknownTag2
@@ -4999,14 +4999,14 @@ var rebuildPostgreSQLProjections = (options) => {
       processorId: getProjectorId({
         projectionName: p.name ?? unknownTag2
       }),
-      truncateOnStart: true,
-      lockPolicy: defaultRebuildLockPolicy
+      truncateOnStart: true
     }
   ) : [options];
   for (const projectionDefinition of projections) {
     consumer.projector({
       ...projectionDefinition,
-      truncateOnStart: projectionDefinition.truncateOnStart ?? true
+      truncateOnStart: projectionDefinition.truncateOnStart ?? true,
+      lock
     });
   }
   return consumer;