@effect/cluster 0.29.12 → 0.29.16

package/src/SqlMessageStorage.ts

@@ -750,7 +750,18 @@ export const make = Effect.fnUntraced(function*(options?: {
         AND shard_id = ${address.shardId}
         AND entity_type = ${address.entityType}
         AND entity_id = ${address.entityId}
-`.pipe(
+      `.pipe(
+        Effect.asVoid,
+        PersistenceError.refail
+      ),
+
+    resetShards: (shardIds) =>
+      sql`
+        UPDATE ${messagesTableSql}
+        SET last_read = NULL
+        WHERE processed = ${sqlFalse}
+        AND shard_id IN (${sql.literal(shardIds.join(","))})
+      `.pipe(
         Effect.asVoid,
         PersistenceError.refail
       )

package/src/SqlShardStorage.ts

@@ -141,10 +141,10 @@ export const make = Effect.fnUntraced(function*(options?: {
   const sqlNow = sql.literal(sqlNowString)
 
   const lockExpiresAt = sql.onDialectOrElse({
-    pg: () => sql`${sqlNow} - INTERVAL '120 seconds'`,
-    mysql: () => sql`DATE_SUB(${sqlNow}, INTERVAL 120 SECOND)`,
-    mssql: () => sql`DATEADD(SECOND, -120, ${sqlNow})`,
-    orElse: () => sql`datetime(${sqlNow}, '-120 seconds')`
+    pg: () => sql`${sqlNow} - INTERVAL '15 seconds'`,
+    mysql: () => sql`DATE_SUB(${sqlNow}, INTERVAL 15 SECOND)`,
+    mssql: () => sql`DATEADD(SECOND, -15, ${sqlNow})`,
+    orElse: () => sql`datetime(${sqlNow}, '-15 seconds')`
   })
 
   const acquireLock = sql.onDialectOrElse({
@@ -168,7 +168,7 @@ export const make = Effect.fnUntraced(function*(options?: {
         MERGE ${locksTableSql} WITH (HOLDLOCK) AS target
         USING (SELECT * FROM (VALUES ${sql.csv(values)})) AS source (shard_id, address, acquired_at)
         ON target.shard_id = source.shard_id
-        WHEN MATCHED AND (target.address = source.address OR DATEDIFF(SECOND, target.acquired_at, ${sqlNow}) > 120) THEN
+        WHEN MATCHED AND (target.address = source.address OR DATEDIFF(SECOND, target.acquired_at, ${sqlNow}) > 15) THEN
           UPDATE SET address = source.address, acquired_at = source.acquired_at
         WHEN NOT MATCHED THEN
           INSERT (shard_id, address, acquired_at)
@@ -185,7 +185,7 @@ export const make = Effect.fnUntraced(function*(options?: {
           SELECT 1 FROM ${locksTableSql}
           WHERE shard_id = source.shard_id
           AND address != ${address}
-          AND (strftime('%s', ${sqlNow}) - strftime('%s', acquired_at)) <= 120
+          AND (strftime('%s', ${sqlNow}) - strftime('%s', acquired_at)) <= 15
         )
         ON CONFLICT(shard_id) DO UPDATE
         SET address = ${address}, acquired_at = ${sqlNow}

package/src/internal/entityManager.ts

@@ -47,7 +47,9 @@ export interface EntityManager {
     message: Message.Incoming<any>
   ) => Effect.Effect<void, EntityNotManagedByRunner | MailboxFull | AlreadyProcessingMessage>
 
-  readonly isProcessingFor: (message: Message.Incoming<any>) => boolean
+  readonly isProcessingFor: (message: Message.Incoming<any>, options?: {
+    readonly excludeReplies?: boolean
+  }) => boolean
 
   readonly interruptShard: (shardId: ShardId) => Effect.Effect<void>
 
@@ -62,6 +64,7 @@ export type EntityState = {
   readonly activeRequests: Map<bigint, {
     readonly rpc: Rpc.AnyWithProps
     readonly message: Message.IncomingRequestLocal<any>
+    sentReply: boolean
     lastSentChunk: Option.Option<Reply.Chunk<Rpc.Any>>
     sequence: number
   }>
@@ -143,6 +146,8 @@ export const make = Effect.fnUntraced(function*<
                 const request = activeRequests.get(response.requestId)
                 if (!request) return Effect.void
 
+                request.sentReply = true
+
                 // For durable messages, ignore interrupts during shutdown.
                 // They will be retried when the entity is restarted.
                 if (
@@ -184,6 +189,9 @@ export const make = Effect.fnUntraced(function*<
                 if (!request) return Effect.void
                 const sequence = request.sequence
                 request.sequence++
+                if (!request.sentReply) {
+                  request.sentReply = true
+                }
                 return Effect.orDie(retryRespond(
                   4,
                   Effect.suspend(() => {
@@ -336,6 +344,7 @@ export const make = Effect.fnUntraced(function*<
               entry = {
                 rpc: entity.protocol.requests.get(message.envelope.tag)! as any as Rpc.AnyWithProps,
                 message,
+                sentReply: false,
                 lastSentChunk: message.lastSentReply as any,
                 sequence: Option.match(message.lastSentReply, {
                   onNone: () => 0,
@@ -402,10 +411,16 @@ export const make = Effect.fnUntraced(function*<
 
   return identity<EntityManager>({
     interruptShard,
-    isProcessingFor(message) {
+    isProcessingFor(message, options) {
       const state = activeServers.get(message.envelope.address.entityId)
       if (!state) return false
-      return state.activeRequests.has(message.envelope.requestId)
+      const request = state.activeRequests.get(message.envelope.requestId)
+      if (request === undefined) {
+        return false
+      } else if (options?.excludeReplies && request.sentReply) {
+        return false
+      }
+      return true
     },
     sendLocal,
     send: (message) =>