@effect-app/infra 1.22.0 → 1.23.1

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @effect-app/infra
 
+## 1.23.1
+
+### Patch Changes
+
+- Updated dependencies [13b7aa1]
+  - effect-app@1.17.2
+  - @effect-app/infra-adapters@1.11.4
+
+## 1.23.0
+
+### Minor Changes
+
+- feat: add SQLQueue
+
 ## 1.22.0
 
 ### Minor Changes

package/_cjs/services/QueueMaker/SQLQueue.cjs

@@ -0,0 +1,161 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.QueueId = void 0;
+exports.makeSQLQueue = makeSQLQueue;
+var _setupRequest = require("@effect-app/infra/api/setupRequest");
+var _RequestContext = require("@effect-app/infra/RequestContext");
+var _errors = require("@effect-app/infra/services/QueueMaker/errors");
+var _service = require("@effect-app/infra/services/QueueMaker/service");
+var _RequestContextContainer = require("@effect-app/infra/services/RequestContextContainer");
+var _sql = require("@effect/sql");
+var _dateFns = require("date-fns");
+var _effectApp = require("effect-app");
+var _ids = require("effect-app/ids");
+var _schema = require("effect-app/schema");
+var _utils = require("effect-app/utils");
+const QueueId = exports.QueueId = _effectApp.S.Number.pipe(_effectApp.S.brand("QueueId"));
+/**
+ * Currently limited to one process draining at a time, due to in-process Semaphore instead of row-level locking.
+ */
+function makeSQLQueue(queueName, queueDrainName, schema, drainSchema) {
+  return _effectApp.Effect.gen(function* () {
+    const base = {
+      id: _sql.Model.Generated(QueueId),
+      meta: _sql.Model.JsonFromString(_service.QueueMeta),
+      name: _effectApp.S.NonEmptyString255,
+      createdAt: _sql.Model.DateTimeInsert,
+      updatedAt: _sql.Model.DateTimeUpdate,
+      // TODO: at+owner
+      processingAt: _sql.Model.FieldOption(_effectApp.S.Date),
+      finishedAt: _sql.Model.FieldOption(_effectApp.S.Date)
+      // TODO: record locking.. / optimistic locking
+      // rowVersion: Model.DateTimeFromNumberWithNow
+    };
+    class Queue extends _sql.Model.Class("Queue")({
+      body: _sql.Model.JsonFromString(schema),
+      ...base
+    }) {}
+    class Drain extends _sql.Model.Class("Drain")({
+      body: _sql.Model.JsonFromString(drainSchema),
+      ...base
+    }) {}
+    const sql = yield* _sql.SqlClient.SqlClient;
+    const queueRepo = yield* _sql.Model.makeRepository(Queue, {
+      tableName: "queue",
+      spanPrefix: "QueueRepo",
+      idColumn: "id"
+    });
+    const drainRepo = yield* _sql.Model.makeRepository(Drain, {
+      tableName: "queue",
+      spanPrefix: "DrainRepo",
+      idColumn: "id"
+    });
+    const decodeDrain = _effectApp.S.decode(Drain);
+    const drain = () => {
+      const limit = (0, _dateFns.subMinutes)(new Date(), 15);
+      return sql`SELECT *
+    FROM queue
+    WHERE name = ${queueDrainName} AND finishedAt IS NULL AND (processingAt IS NULL OR processingAt < ${limit.getTime()})
+    LIMIT 1`;
+    };
+    // temporary workaround until we have a SQLite rowversion..
+    const lock = yield* _effectApp.Effect.makeSemaphore(1);
+    const q = {
+      offer: (body, meta) => _effectApp.Effect.gen(function* () {
+        yield* queueRepo.insert(Queue.insert.make({
+          body,
+          meta,
+          name: queueName,
+          processingAt: _effectApp.Option.none(),
+          finishedAt: _effectApp.Option.none()
+        }));
+      }),
+      take: _effectApp.Effect.gen(function* () {
+        while (true) {
+          const first = yield* lock.withPermits(1)(_effectApp.Effect.gen(function* () {
+            const [first] = yield* drain();
+            if (first) {
+              const dec = yield* decodeDrain(first);
+              const {
+                createdAt,
+                updatedAt,
+                ...rest
+              } = dec;
+              yield* drainRepo.update(Drain.update.make({
+                ...rest,
+                processingAt: _effectApp.Option.some(new Date())
+              }));
+              return dec;
+            }
+            return null;
+          }));
+          if (first) return first;
+          yield* _effectApp.Effect.sleep(250);
+        }
+      }),
+      finish: ({
+        createdAt,
+        updatedAt,
+        ...q
+      }) => drainRepo.update(Drain.update.make({
+        ...q,
+        finishedAt: _effectApp.Option.some(new Date())
+      }))
+    };
+    const rcc = yield* _RequestContextContainer.RequestContextContainer;
+    return {
+      publish: (...messages) => _effectApp.Effect.gen(function* ($) {
+        const requestContext = yield* $(rcc.requestContext);
+        const span = yield* $(_effectApp.Effect.serviceOption(_effectApp.Tracer.ParentSpan));
+        return yield* $(_effectApp.Effect.forEach(messages, m => q.offer(m, {
+          requestContext: new _RequestContext.RequestContext(requestContext),
+          // workaround Schema expecting exact class
+          span: _effectApp.Option.getOrUndefined(span)
+        }), {
+          discard: true
+        }));
+      }).pipe(_effectApp.Effect.withSpan("queue.publish: " + queueName, {
+        captureStackTrace: false,
+        kind: "producer",
+        attributes: {
+          "message_tags": messages.map(_ => _._tag)
+        }
+      })),
+      drain: (handleEvent, sessionId) => _effectApp.Effect.gen(function* () {
+        const silenceAndReportError = (0, _errors.reportNonInterruptedFailure)({
+          name: "MemQueue.drain." + queueDrainName
+        });
+        const processMessage = msg => _effectApp.Effect.succeed(msg).pipe(_effectApp.Effect.flatMap(({
+          body,
+          meta
+        }) => {
+          let effect = _effectApp.Effect.logDebug(`[${queueDrainName}] Processing incoming message`).pipe(_effectApp.Effect.annotateLogs({
+            body: (0, _utils.pretty)(body),
+            meta: (0, _utils.pretty)(meta)
+          }), _effectApp.Effect.zipRight(handleEvent(body)), silenceAndReportError, _ => (0, _setupRequest.setupRequestContext)(_, _RequestContext.RequestContext.inherit(meta.requestContext, {
+            id: (0, _ids.RequestId)(body.id),
+            locale: "en",
+            name: (0, _schema.NonEmptyString255)(`${queueDrainName}.${body._tag}`)
+          })), _effectApp.Effect.withSpan(`queue.drain: ${queueDrainName}.${body._tag}`, {
+            captureStackTrace: false,
+            kind: "consumer",
+            attributes: {
+              "queue.name": queueDrainName,
+              "queue.sessionId": sessionId,
+              "queue.input": body
+            }
+          }));
+          if (meta.span) {
+            effect = _effectApp.Effect.withParentSpan(effect, _effectApp.Tracer.externalSpan(meta.span));
+          }
+          return effect;
+        }));
+        return yield* q.take.pipe(_effectApp.Effect.flatMap(x => processMessage(x).pipe(_effectApp.Effect.uninterruptible, _effectApp.Effect.fork, _effectApp.Effect.flatMap(_effectApp.Fiber.join), _effectApp.Effect.tap(q.finish(x)))), silenceAndReportError, _effectApp.Effect.forever);
+      })
+    };
+  });
+}
+//# sourceMappingURL=SQLQueue.cjs.map

package/_cjs/services/QueueMaker/SQLQueue.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"SQLQueue.cjs","names":["_setupRequest","require","_RequestContext","_errors","_service","_RequestContextContainer","_sql","_dateFns","_effectApp","_ids","_schema","_utils","QueueId","exports","S","Number","pipe","brand","makeSQLQueue","queueName","queueDrainName","schema","drainSchema","Effect","gen","base","id","Model","Generated","meta","JsonFromString","QueueMeta","name","NonEmptyString255","createdAt","DateTimeInsert","updatedAt","DateTimeUpdate","processingAt","FieldOption","Date","finishedAt","Queue","Class","body","Drain","sql","SqlClient","queueRepo","makeRepository","tableName","spanPrefix","idColumn","drainRepo","decodeDrain","decode","drain","limit","subMinutes","getTime","lock","makeSemaphore","q","offer","insert","make","Option","none","take","first","withPermits","dec","rest","update","some","sleep","finish","rcc","RequestContextContainer","publish","messages","$","requestContext","span","serviceOption","Tracer","ParentSpan","forEach","m","RequestContext","getOrUndefined","discard","withSpan","captureStackTrace","kind","attributes","map","_","_tag","handleEvent","sessionId","silenceAndReportError","reportNonInterruptedFailure","processMessage","msg","succeed","flatMap","effect","logDebug","annotateLogs","pretty","zipRight","setupRequestContext","inherit","RequestId","locale","withParentSpan","externalSpan","x","uninterruptible","fork","Fiber","join","tap","forever"],"sources":["../../../src/services/QueueMaker/SQLQueue.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/services/QueueMaker/SQLQueue.d.ts

@@ -0,0 +1,22 @@
+import { RequestContextContainer } from "@effect-app/infra/services/RequestContextContainer";
+import { SqlClient } from "@effect/sql";
+import { Effect, S, Tracer } from "effect-app";
+import { NonEmptyString255 } from "effect-app/schema";
+export declare const QueueId: S.brand<typeof import("@effect/schema/Schema").Number & {
+    withDefault: S.PropertySignature<":", number, never, ":", number, true, never>;
+}, "QueueId">;
+export type QueueId = typeof QueueId.Type;
+/**
+ * Currently limited to one process draining at a time, due to in-process Semaphore instead of row-level locking.
+ */
+export declare function makeSQLQueue<Evt extends {
+    id: S.StringId;
+    _tag: string;
+}, DrainEvt extends {
+    id: S.StringId;
+    _tag: string;
+}, EvtE, DrainEvtE>(queueName: NonEmptyString255, queueDrainName: NonEmptyString255, schema: S.Schema<Evt, EvtE>, drainSchema: S.Schema<DrainEvt, DrainEvtE>): Effect.Effect<{
+    publish: (messages_0: Evt, ...messages: Evt[]) => Effect.Effect<void, never, never>;
+    drain: <DrainE, DrainR>(handleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR>, sessionId?: string) => Effect.Effect<never, never, RequestContextContainer | import("../Store/ContextMapContainer.js").ContextMapContainer | Exclude<Exclude<Exclude<DrainR, Tracer.ParentSpan>, never>, Tracer.ParentSpan>>;
+}, never, RequestContextContainer | SqlClient.SqlClient>;
+//# sourceMappingURL=SQLQueue.d.ts.map

package/dist/services/QueueMaker/SQLQueue.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SQLQueue.d.ts","sourceRoot":"","sources":["../../../src/services/QueueMaker/SQLQueue.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,uBAAuB,EAAE,MAAM,oDAAoD,CAAA;AAC5F,OAAO,EAAS,SAAS,EAAE,MAAM,aAAa,CAAA;AAE9C,OAAO,EAAE,MAAM,EAAiB,CAAC,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAE7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAGrD,eAAO,MAAM,OAAO;;aAAoC,CAAA;AACxD,MAAM,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,IAAI,CAAA;AAEzC;;GAEG;AACH,wBAAgB,YAAY,CAC1B,GAAG,SAAS;IAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC5C,QAAQ,SAAS;IAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EACjD,IAAI,EACJ,SAAS,EAET,SAAS,EAAE,iBAAiB,EAC5B,cAAc,EAAE,iBAAiB,EACjC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,EAC3B,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC;;YAgH9B,MAAM,EAAE,MAAM,eACP,CAAC,EAAE,EAAE,QAAQ,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,cAC/C,MAAM;yDA0DzB"}

package/dist/services/QueueMaker/SQLQueue.js

@@ -0,0 +1,143 @@
+import { setupRequestContext } from "@effect-app/infra/api/setupRequest";
+import { RequestContext } from "@effect-app/infra/RequestContext";
+import { reportNonInterruptedFailure } from "@effect-app/infra/services/QueueMaker/errors";
+import { QueueMeta } from "@effect-app/infra/services/QueueMaker/service";
+import { RequestContextContainer } from "@effect-app/infra/services/RequestContextContainer";
+import { Model, SqlClient } from "@effect/sql";
+import { subMinutes } from "date-fns";
+import { Effect, Fiber, Option, S, Tracer } from "effect-app";
+import { RequestId } from "effect-app/ids";
+import { NonEmptyString255 } from "effect-app/schema";
+import { pretty } from "effect-app/utils";
+export const QueueId = S.Number.pipe(S.brand("QueueId"));
+/**
+ * Currently limited to one process draining at a time, due to in-process Semaphore instead of row-level locking.
+ */
+export function makeSQLQueue(queueName, queueDrainName, schema, drainSchema) {
+    return Effect.gen(function* () {
+        const base = {
+            id: Model.Generated(QueueId),
+            meta: Model.JsonFromString(QueueMeta),
+            name: S.NonEmptyString255,
+            createdAt: Model.DateTimeInsert,
+            updatedAt: Model.DateTimeUpdate,
+            // TODO: at+owner
+            processingAt: Model.FieldOption(S.Date),
+            finishedAt: Model.FieldOption(S.Date)
+            // TODO: record locking.. / optimistic locking
+            // rowVersion: Model.DateTimeFromNumberWithNow
+        };
+        class Queue extends Model.Class("Queue")({
+            body: Model.JsonFromString(schema),
+            ...base
+        }) {
+        }
+        class Drain extends Model.Class("Drain")({
+            body: Model.JsonFromString(drainSchema),
+            ...base
+        }) {
+        }
+        const sql = yield* SqlClient.SqlClient;
+        const queueRepo = yield* Model.makeRepository(Queue, {
+            tableName: "queue",
+            spanPrefix: "QueueRepo",
+            idColumn: "id"
+        });
+        const drainRepo = yield* Model.makeRepository(Drain, {
+            tableName: "queue",
+            spanPrefix: "DrainRepo",
+            idColumn: "id"
+        });
+        const decodeDrain = S.decode(Drain);
+        const drain = () => {
+            const limit = subMinutes(new Date(), 15);
+            return sql `SELECT *
+    FROM queue
+    WHERE name = ${queueDrainName} AND finishedAt IS NULL AND (processingAt IS NULL OR processingAt < ${limit.getTime()})
+    LIMIT 1`;
+        };
+        // temporary workaround until we have a SQLite rowversion..
+        const lock = yield* Effect.makeSemaphore(1);
+        const q = {
+            offer: (body, meta) => Effect.gen(function* () {
+                yield* queueRepo.insert(Queue.insert.make({
+                    body,
+                    meta,
+                    name: queueName,
+                    processingAt: Option.none(),
+                    finishedAt: Option.none()
+                }));
+            }),
+            take: Effect.gen(function* () {
+                while (true) {
+                    const first = yield* lock.withPermits(1)(Effect.gen(function* () {
+                        const [first] = yield* drain();
+                        if (first) {
+                            const dec = yield* decodeDrain(first);
+                            const { createdAt, updatedAt, ...rest } = dec;
+                            yield* drainRepo.update(Drain.update.make({ ...rest, processingAt: Option.some(new Date()) }));
+                            return dec;
+                        }
+                        return null;
+                    }));
+                    if (first)
+                        return first;
+                    yield* Effect.sleep(250);
+                }
+            }),
+            finish: ({ createdAt, updatedAt, ...q }) => drainRepo.update(Drain.update.make({ ...q, finishedAt: Option.some(new Date()) }))
+        };
+        const rcc = yield* RequestContextContainer;
+        return {
+            publish: (...messages) => Effect
+                .gen(function* ($) {
+                const requestContext = yield* $(rcc.requestContext);
+                const span = yield* $(Effect.serviceOption(Tracer.ParentSpan));
+                return yield* $(Effect
+                    .forEach(messages, (m) => q.offer(m, {
+                    requestContext: new RequestContext(requestContext), // workaround Schema expecting exact class
+                    span: Option.getOrUndefined(span)
+                }), {
+                    discard: true
+                }));
+            })
+                .pipe(Effect.withSpan("queue.publish: " + queueName, {
+                captureStackTrace: false,
+                kind: "producer",
+                attributes: { "message_tags": messages.map((_) => _._tag) }
+            })),
+            drain: (handleEvent, sessionId) => Effect.gen(function* () {
+                const silenceAndReportError = reportNonInterruptedFailure({ name: "MemQueue.drain." + queueDrainName });
+                const processMessage = (msg) => Effect
+                    .succeed(msg)
+                    .pipe(Effect
+                    .flatMap(({ body, meta }) => {
+                    let effect = Effect
+                        .logDebug(`[${queueDrainName}] Processing incoming message`)
+                        .pipe(Effect.annotateLogs({ body: pretty(body), meta: pretty(meta) }), Effect.zipRight(handleEvent(body)), silenceAndReportError, (_) => setupRequestContext(_, RequestContext.inherit(meta.requestContext, {
+                        id: RequestId(body.id),
+                        locale: "en",
+                        name: NonEmptyString255(`${queueDrainName}.${body._tag}`)
+                    })), Effect
+                        .withSpan(`queue.drain: ${queueDrainName}.${body._tag}`, {
+                        captureStackTrace: false,
+                        kind: "consumer",
+                        attributes: {
+                            "queue.name": queueDrainName,
+                            "queue.sessionId": sessionId,
+                            "queue.input": body
+                        }
+                    }));
+                    if (meta.span) {
+                        effect = Effect.withParentSpan(effect, Tracer.externalSpan(meta.span));
+                    }
+                    return effect;
+                }));
+                return yield* q
+                    .take
+                    .pipe(Effect.flatMap((x) => processMessage(x).pipe(Effect.uninterruptible, Effect.fork, Effect.flatMap(Fiber.join), Effect.tap(q.finish(x)))), silenceAndReportError, Effect.forever);
+            })
+        };
+    });
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU1FMUXVldWUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvUXVldWVNYWtlci9TUUxRdWV1ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQTtBQUN4RSxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0NBQWtDLENBQUE7QUFDakUsT0FBTyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sOENBQThDLENBQUE7QUFFMUYsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLCtDQUErQyxDQUFBO0FBQ3pFLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLG9EQUFvRCxDQUFBO0FBQzVGLE9BQU8sRUFBRSxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sYUFBYSxDQUFBO0FBQzlDLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxVQUFVLENBQUE7QUFDckMsT0FBTyxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLENBQUMsRUFBRSxNQUFNLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDN0QsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGdCQUFnQixDQUFBO0FBQzFDLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLG1CQUFtQixDQUFBO0FBQ3JELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQTtBQUV6QyxNQUFNLENBQUMsTUFBTSxPQUFPLEdBQUcsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFBO0FBR3hEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLFlBQVksQ0FNMUIsU0FBNEIsRUFDNUIsY0FBaUMsRUFDakMsTUFBMkIsRUFDM0IsV0FBMEM7SUFFMUMsT0FBTyxNQUFNLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQztRQUN6QixNQUFNLElBQUksR0FBRztZ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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "1.22.0",
+  "version": "1.23.1",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -18,10 +18,10 @@
     "proper-lockfile": "^4.1.2",
     "pure-rand": "6.1.0",
     "redlock": "^4.2.0",
+    "@effect-app/infra-adapters": "1.11.4",
+    "effect-app": "1.17.2",
     "@effect-app/core": "1.10.1",
-    "@effect-app/schema": "1.12.1",
-    "effect-app": "1.17.1",
-    "@effect-app/infra-adapters": "1.11.3"
+    "@effect-app/schema": "1.12.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.25.6",
@@ -44,6 +44,7 @@
     "express": "^4.21.0",
     "@effect/platform": "^0.66.2",
     "@effect/schema": "^0.74.1",
+    "@effect/sql": "^0.14.0",
     "@effect/vitest": "^0.10.5",
     "effect": "^3.8.4"
   },
@@ -415,6 +416,16 @@
         "default": "./_cjs/services/OperationsRepo.cjs"
       }
     },
+    "./services/QueueMaker/SQLQueue": {
+      "import": {
+        "types": "./dist/services/QueueMaker/SQLQueue.d.ts",
+        "default": "./dist/services/QueueMaker/SQLQueue.js"
+      },
+      "require": {
+        "types": "./dist/services/QueueMaker/SQLQueue.d.ts",
+        "default": "./_cjs/services/QueueMaker/SQLQueue.cjs"
+      }
+    },
     "./services/QueueMaker/errors": {
       "import": {
         "types": "./dist/services/QueueMaker/errors.d.ts",

package/src/services/QueueMaker/SQLQueue.ts

@@ -0,0 +1,201 @@
+import { setupRequestContext } from "@effect-app/infra/api/setupRequest"
+import { RequestContext } from "@effect-app/infra/RequestContext"
+import { reportNonInterruptedFailure } from "@effect-app/infra/services/QueueMaker/errors"
+import type { QueueBase } from "@effect-app/infra/services/QueueMaker/service"
+import { QueueMeta } from "@effect-app/infra/services/QueueMaker/service"
+import { RequestContextContainer } from "@effect-app/infra/services/RequestContextContainer"
+import { Model, SqlClient } from "@effect/sql"
+import { subMinutes } from "date-fns"
+import { Effect, Fiber, Option, S, Tracer } from "effect-app"
+import { RequestId } from "effect-app/ids"
+import { NonEmptyString255 } from "effect-app/schema"
+import { pretty } from "effect-app/utils"
+
+export const QueueId = S.Number.pipe(S.brand("QueueId"))
+export type QueueId = typeof QueueId.Type
+
+/**
+ * Currently limited to one process draining at a time, due to in-process Semaphore instead of row-level locking.
+ */
+export function makeSQLQueue<
+  Evt extends { id: S.StringId; _tag: string },
+  DrainEvt extends { id: S.StringId; _tag: string },
+  EvtE,
+  DrainEvtE
+>(
+  queueName: NonEmptyString255,
+  queueDrainName: NonEmptyString255,
+  schema: S.Schema<Evt, EvtE>,
+  drainSchema: S.Schema<DrainEvt, DrainEvtE>
+) {
+  return Effect.gen(function*() {
+    const base = {
+      id: Model.Generated(QueueId),
+      meta: Model.JsonFromString(QueueMeta),
+      name: S.NonEmptyString255,
+      createdAt: Model.DateTimeInsert,
+      updatedAt: Model.DateTimeUpdate,
+      // TODO: at+owner
+      processingAt: Model.FieldOption(S.Date),
+      finishedAt: Model.FieldOption(S.Date)
+      // TODO: record locking.. / optimistic locking
+      // rowVersion: Model.DateTimeFromNumberWithNow
+    }
+    class Queue extends Model.Class<Queue>("Queue")({
+      body: Model.JsonFromString(schema),
+      ...base
+    }) {}
+    class Drain extends Model.Class<Drain>("Drain")({
+      body: Model.JsonFromString(drainSchema),
+      ...base
+    }) {}
+    const sql = yield* SqlClient.SqlClient
+
+    const queueRepo = yield* Model.makeRepository(Queue, {
+      tableName: "queue",
+      spanPrefix: "QueueRepo",
+      idColumn: "id"
+    })
+
+    const drainRepo = yield* Model.makeRepository(Drain, {
+      tableName: "queue",
+      spanPrefix: "DrainRepo",
+      idColumn: "id"
+    })
+
+    const decodeDrain = S.decode(Drain)
+
+    const drain = () => {
+      const limit = subMinutes(new Date(), 15)
+      return sql<typeof Drain.Encoded>`SELECT *
+    FROM queue
+    WHERE name = ${queueDrainName} AND finishedAt IS NULL AND (processingAt IS NULL OR processingAt < ${limit.getTime()})
+    LIMIT 1`
+    }
+
+    // temporary workaround until we have a SQLite rowversion..
+    const lock = yield* Effect.makeSemaphore(1)
+
+    const q = {
+      offer: (body: Evt, meta: typeof QueueMeta.Type) =>
+        Effect.gen(function*() {
+          yield* queueRepo.insert(
+            Queue.insert.make({
+              body,
+              meta,
+              name: queueName,
+              processingAt: Option.none(),
+              finishedAt: Option.none()
+            })
+          )
+        }),
+      take: Effect.gen(function*() {
+        while (true) {
+          const first = yield* lock.withPermits(1)(Effect.gen(function*() {
+            const [first] = yield* drain()
+            if (first) {
+              const dec = yield* decodeDrain(first)
+              const { createdAt, updatedAt, ...rest } = dec
+              yield* drainRepo.update(Drain.update.make({ ...rest, processingAt: Option.some(new Date()) }))
+              return dec
+            }
+            return null
+          }))
+          if (first) return first
+          yield* Effect.sleep(250)
+        }
+      }),
+      finish: ({ createdAt, updatedAt, ...q }: Drain) =>
+        drainRepo.update(Drain.update.make({ ...q, finishedAt: Option.some(new Date()) }))
+    }
+    const rcc = yield* RequestContextContainer
+
+    return {
+      publish: (...messages) =>
+        Effect
+          .gen(function*($) {
+            const requestContext = yield* $(rcc.requestContext)
+            const span = yield* $(Effect.serviceOption(Tracer.ParentSpan))
+            return yield* $(
+              Effect
+                .forEach(
+                  messages,
+                  (m) =>
+                    q.offer(m, {
+                      requestContext: new RequestContext(requestContext), // workaround Schema expecting exact class
+                      span: Option.getOrUndefined(span)
+                    }),
+                  {
+                    discard: true
+                  }
+                )
+            )
+          })
+          .pipe(
+            Effect.withSpan("queue.publish: " + queueName, {
+              captureStackTrace: false,
+              kind: "producer",
+              attributes: { "message_tags": messages.map((_) => _._tag) }
+            })
+          ),
+      drain: <DrainE, DrainR>(
+        handleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR>,
+        sessionId?: string
+      ) =>
+        Effect.gen(function*() {
+          const silenceAndReportError = reportNonInterruptedFailure({ name: "MemQueue.drain." + queueDrainName })
+          const processMessage = (msg: Drain) =>
+            Effect
+              .succeed(msg)
+              .pipe(Effect
+                .flatMap(({ body, meta }) => {
+                  let effect = Effect
+                    .logDebug(`[${queueDrainName}] Processing incoming message`)
+                    .pipe(
+                      Effect.annotateLogs({ body: pretty(body), meta: pretty(meta) }),
+                      Effect.zipRight(handleEvent(body)),
+                      silenceAndReportError,
+                      (_) =>
+                        setupRequestContext(
+                          _,
+                          RequestContext.inherit(meta.requestContext, {
+                            id: RequestId(body.id),
+                            locale: "en" as const,
+                            name: NonEmptyString255(`${queueDrainName}.${body._tag}`)
+                          })
+                        ),
+                      Effect
+                        .withSpan(`queue.drain: ${queueDrainName}.${body._tag}`, {
+                          captureStackTrace: false,
+                          kind: "consumer",
+                          attributes: {
+                            "queue.name": queueDrainName,
+                            "queue.sessionId": sessionId,
+                            "queue.input": body
+                          }
+                        })
+                    )
+                  if (meta.span) {
+                    effect = Effect.withParentSpan(effect, Tracer.externalSpan(meta.span))
+                  }
+                  return effect
+                }))
+
+          return yield* q
+            .take
+            .pipe(
+              Effect.flatMap((x) =>
+                processMessage(x).pipe(
+                  Effect.uninterruptible,
+                  Effect.fork,
+                  Effect.flatMap(Fiber.join),
+                  Effect.tap(q.finish(x))
+                )
+              ),
+              silenceAndReportError,
+              Effect.forever
+            )
+        })
+    } satisfies QueueBase<Evt, DrainEvt>
+  })
+}

package/vitest.config.ts.timestamp-1711744615239-dcf257a844e01.mjs

@@ -1,37 +0,0 @@
-// packages/infra/vitest.config.ts
-import { defineConfig } from "file:///Users/patrickroza/pj/effect-app/libs/node_modules/.pnpm/vite@5.2.6_@types+node@20.11.30/node_modules/vite/dist/node/index.js";
-
-// vite.config.base.ts
-import path from "path";
-import fs from "fs";
-var __vite_injected_original_dirname = "/Users/patrickroza/pj/effect-app/libs";
-function makeConfig(dirName) {
-  const prefix = path.resolve(__vite_injected_original_dirname, "packages");
-  const packages = fs.readdirSync(prefix).map((f) => prefix + "/" + f).filter((f) => fs.lstatSync(f).isDirectory());
-  const cfg = {
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    //plugins: [autoImport],
-    test: {
-      include: ["./test/**/*.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}"],
-      reporters: "verbose",
-      globals: true
-    },
-    resolve: {
-      alias: packages.reduce((acc, cur) => {
-        acc[JSON.parse(fs.readFileSync(cur + "/package.json", "utf-8")).name] = path.resolve(cur, cur.endsWith("core") ? "dist" : "src");
-        return acc;
-      }, {})
-      // "@effect-app/core/Prelude": path.join(__dirname, "packages/core/src/Prelude.code.ts")
-    }
-  };
-  console.log(cfg);
-  return cfg;
-}
-
-// packages/infra/vitest.config.ts
-var __vite_injected_original_dirname2 = "/Users/patrickroza/pj/effect-app/libs/packages/infra";
-var vitest_config_default = defineConfig(makeConfig(__vite_injected_original_dirname2));
-export {
-  vitest_config_default as default
-};
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsicGFja2FnZXMvaW5mcmEvdml0ZXN0LmNvbmZpZy50cyIsICJ2aXRlLmNvbmZpZy5iYXNlLnRzIl0sCiAgInNvdXJjZXNDb250ZW50IjogWyJjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfZGlybmFtZSA9IFwiL1VzZXJzL3BhdHJpY2tyb3phL3BqL2VmZmVjdC1hcHAvbGlicy9wYWNrYWdlcy9pbmZyYVwiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9maWxlbmFtZSA9IFwiL1VzZXJzL3BhdHJpY2tyb3phL3BqL2VmZmVjdC1hcHAvbGlicy9wYWNrYWdlcy9pbmZyYS92aXRlc3QuY29uZmlnLnRzXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ltcG9ydF9tZXRhX3VybCA9IFwiZmlsZTovLy9Vc2Vycy9wYXRyaWNrcm96YS9wai9lZmZlY3QtYXBwL2xpYnMvcGFja2FnZXMvaW5mcmEvdml0ZXN0LmNvbmZpZy50c1wiOy8vLyA8cmVmZXJlbmNlIHR5cGVzPVwidml0ZXN0XCIgLz5cbmltcG9ydCB7IGRlZmluZUNvbmZpZyB9IGZyb20gXCJ2aXRlXCJcbmltcG9ydCBtYWtlQ29uZmlnIGZyb20gXCIuLi8uLi92aXRlLmNvbmZpZy5iYXNlXCJcblxuZXhwb3J0IGRlZmF1bHQgZGVmaW5lQ29uZmlnKG1ha2VDb25maWcoX19kaXJuYW1lKSlcbiIsICJjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfZGlybmFtZSA9IFwiL1VzZXJzL3BhdHJpY2tyb3phL3BqL2VmZmVjdC1hcHAvbGlic1wiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9maWxlbmFtZSA9IFwiL1VzZXJzL3BhdHJpY2tyb3phL3BqL2VmZmVjdC1hcHAvbGlicy92aXRlLmNvbmZpZy5iYXNlLnRzXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ltcG9ydF9tZXRhX3VybCA9IFwiZmlsZTovLy9Vc2Vycy9wYXRyaWNrcm96YS9wai9lZmZlY3QtYXBwL2xpYnMvdml0ZS5jb25maWcuYmFzZS50c1wiOy8vLyA8cmVmZXJlbmNlIHR5cGVzPVwidml0ZXN0XCIgLz5cbmltcG9ydCBwYXRoIGZyb20gXCJwYXRoXCJcbmltcG9ydCBmcyBmcm9tIFwiZnNcIlxuaW1wb3J0IEF1dG9JbXBvcnQgZnJvbSBcInVucGx1Z2luLWF1dG8taW1wb3J0L3ZpdGVcIlxuaW1wb3J0IHsgZGVmaW5lQ29uZmlnIH0gZnJvbSBcInZpdGVzdC9jb25maWdcIlxuXG4vLyBjb25zdCBhdXRvSW1wb3J0ID0gQXV0b0ltcG9ydCh7XG4vLyAgIGR0czogXCIuL3Rlc3QvYXV0by1pbXBvcnRzLmQudHNcIixcbi8vICAgLy8gaW5jbHVkZTogW1xuLy8gICAvLyAgIC9cXC50ZXN0XFwuW3RqXXN4PyQvIC8vIC50cywgLnRzeCwgLmpzLCAuanN4XG4vLyAgIC8vIF0sXG4vLyAgIGltcG9ydHM6IFtcbi8vICAgICBcInZpdGVzdFwiXG4vLyAgIF1cbi8vIH0pXG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIG1ha2VDb25maWcoZGlyTmFtZT86IHN0cmluZykge1xuICBjb25zdCBwcmVmaXggPSBwYXRoLnJlc29sdmUoX19kaXJuYW1lLCBcInBhY2thZ2VzXCIpXG4gIGNvbnN0IHBhY2thZ2VzID0gZnMucmVhZGRpclN5bmMocHJlZml4KS5tYXAoZiA9PiBwcmVmaXggKyBcIi9cIiArIGYpLmZpbHRlcihmID0+IGZzLmxzdGF0U3luYyhmKS5pc0RpcmVjdG9yeSgpIClcbiAgY29uc3QgY2ZnID0ge1xuICAgIC8vIGVzbGludC1kaXNhYmxlLW5leHQtbGluZSBAdHlwZXNjcmlwdC1lc2xpbnQvbm8tdmFyLXJlcXVpcmVzXG4gICAgLy9wbHVnaW5zOiBbYXV0b0ltcG9ydF0sXG4gICAgdGVzdDoge1xuICAgICAgaW5jbHVkZTogIFtcIi4vdGVzdC8qKi8qLnRlc3Que2pzLG1qcyxjanMsdHMsbXRzLGN0cyxqc3gsdHN4fVwiXSxcbiAgICAgIHJlcG9ydGVyczogXCJ2ZXJib3NlXCIsXG4gICAgICBnbG9iYWxzOiB0cnVlXG4gICAgfSxcbiAgICByZXNvbHZlOiB7XG4gICAgICBhbGlhczogcGFja2FnZXMucmVkdWNlKChhY2MsIGN1cikgPT4geyAvLyB3b3JrYXJvdW5kIGZvciAvUHJlbHVkZSBpc3N1ZVxuICAgICAgYWNjW0pTT04ucGFyc2UoZnMucmVhZEZpbGVTeW5jKGN1ciArIFwiL3BhY2thZ2UuanNvblwiLCBcInV0Zi04XCIpKS5uYW1lXSA9IHBhdGgucmVzb2x2ZShjdXIsIGN1ci5lbmRzV2l0aChcImNvcmVcIikgPyBcImRpc3RcIiA6IFwic3JjXCIpXG4gICAgICByZXR1cm4gYWNjXG4gICAgfSwgeyB9KSAvLyBcIkBlZmZlY3QtYXBwL2NvcmUvUHJlbHVkZVwiOiBwYXRoLmpvaW4oX19kaXJuYW1lLCBcInBhY2thZ2VzL2NvcmUvc3JjL1ByZWx1ZGUuY29kZS50c1wiKVxuICB9XG4gIH1cbiAgY29uc29sZS5sb2coY2ZnKVxuICByZXR1cm4gY2ZnXG59XG4iXSwKICAibWFwcGluZ3MiOiAiO0FBQ0EsU0FBUyxvQkFBb0I7OztBQ0E3QixPQUFPLFVBQVU7QUFDakIsT0FBTyxRQUFRO0FBRmYsSUFBTSxtQ0FBbUM7QUFnQjFCLFNBQVIsV0FBNEIsU0FBa0I7QUFDbkQsUUFBTSxTQUFTLEtBQUssUUFBUSxrQ0FBVyxVQUFVO0FBQ2pELFFBQU0sV0FBVyxHQUFHLFlBQVksTUFBTSxFQUFFLElBQUksT0FBSyxTQUFTLE1BQU0sQ0FBQyxFQUFFLE9BQU8sT0FBSyxHQUFHLFVBQVUsQ0FBQyxFQUFFLFlBQVksQ0FBRTtBQUM3RyxRQUFNLE1BQU07QUFBQTtBQUFBO0FBQUEsSUFHVixNQUFNO0FBQUEsTUFDSixTQUFVLENBQUMsa0RBQWtEO0FBQUEsTUFDN0QsV0FBVztBQUFBLE1BQ1gsU0FBUztBQUFBLElBQ1g7QUFBQSxJQUNBLFNBQVM7QUFBQSxNQUNQLE9BQU8sU0FBUyxPQUFPLENBQUMsS0FBSyxRQUFRO0FBQ3JDLFlBQUksS0FBSyxNQUFNLEdBQUcsYUFBYSxNQUFNLGlCQUFpQixPQUFPLENBQUMsRUFBRSxJQUFJLElBQUksS0FBSyxRQUFRLEtBQUssSUFBSSxTQUFTLE1BQU0sSUFBSSxTQUFTLEtBQUs7QUFDL0gsZUFBTztBQUFBLE1BQ1QsR0FBRyxDQUFFLENBQUM7QUFBQTtBQUFBLElBQ1I7QUFBQSxFQUNBO0FBQ0EsVUFBUSxJQUFJLEdBQUc7QUFDZixTQUFPO0FBQ1Q7OztBRHBDQSxJQUFNQSxvQ0FBbUM7QUFJekMsSUFBTyx3QkFBUSxhQUFhLFdBQVdDLGlDQUFTLENBQUM7IiwKICAibmFtZXMiOiBbIl9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lIiwgIl9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lIl0KfQo=