@effect-app/infra 2.0.1 → 2.1.0

package/dist/services/adapters/ServiceBus.js

@@ -0,0 +1,73 @@
+import { ServiceBusClient } from "@azure/service-bus";
+import { Cause, Context, Effect, Exit, FiberSet, Layer } from "effect-app";
+import { InfraLogger } from "./logger.js";
+function makeClient(url) {
+    return Effect.acquireRelease(Effect.sync(() => new ServiceBusClient(url)), (client) => Effect.promise(() => client.close()));
+}
+const Client = Context.GenericTag("@services/Client");
+export const LiveServiceBusClient = (url) => Layer.scoped(Client)(makeClient(url));
+function makeSender(queueName) {
+    return Effect.gen(function* () {
+        const serviceBusClient = yield* Client;
+        return yield* Effect.acquireRelease(Effect.sync(() => serviceBusClient.createSender(queueName)), (subscription) => Effect.promise(() => subscription.close()));
+    });
+}
+export const Sender = Context.GenericTag("@services/Sender");
+export function LiveSender(queueName) {
+    return Layer
+        .scoped(Sender, makeSender(queueName));
+}
+function makeReceiver(queueName, waitTillEmpty, sessionId) {
+    return Effect.gen(function* () {
+        const serviceBusClient = yield* Client;
+        return yield* Effect.acquireRelease(sessionId
+            ? Effect.promise(() => serviceBusClient.acceptSession(queueName, sessionId))
+            : Effect.sync(() => serviceBusClient.createReceiver(queueName)), (r) => waitTillEmpty.pipe(Effect.andThen(Effect.promise(() => r.close()))));
+    });
+}
+export class ServiceBusReceiverFactory extends Context.TagId("ServiceBusReceiverFactory")() {
+    static Live = (queueName) => this.toLayer(Client.pipe(Effect.andThen((cl) => ({
+        make: (waitTillEmpty) => makeReceiver(queueName, waitTillEmpty).pipe(Effect.provideService(Client, cl)),
+        makeSession: (sessionId, waitTillEmpty) => makeReceiver(queueName, waitTillEmpty, sessionId).pipe(Effect.provideService(Client, cl))
+    }))));
+}
+export function sendMessages(messages, options) {
+    return Effect.gen(function* () {
+        const s = yield* Sender;
+        return yield* Effect.promise(() => s.sendMessages(messages, options));
+    });
+}
+export function subscribe(hndlr, sessionId) {
+    return Effect.gen(function* () {
+        const rf = yield* ServiceBusReceiverFactory;
+        const fs = yield* FiberSet.make();
+        const fr = yield* FiberSet.runtime(fs)();
+        const wait = Effect.gen(function* () {
+            if ((yield* FiberSet.size(fs)) > 0) {
+                yield* InfraLogger.logDebug("Waiting ServiceBusFiberSet to be empty: " + (yield* FiberSet.size(fs)));
+            }
+            while ((yield* FiberSet.size(fs)) > 0)
+                yield* Effect.sleep("250 millis");
+        });
+        const r = yield* sessionId
+            ? rf.makeSession(sessionId, wait)
+            : rf.make(wait);
+        const runEffect = (effect) => new Promise((resolve, reject) => fr(effect)
+            .addObserver((exit) => {
+            if (Exit.isSuccess(exit)) {
+                resolve(exit.value);
+            }
+            else {
+                reject(Cause.pretty(exit.cause, { renderErrorCause: true }));
+            }
+        }));
+        yield* Effect.acquireRelease(Effect.sync(() => r.subscribe({
+            processError: (err) => runEffect(hndlr
+                .processError(err)
+                .pipe(Effect.catchAllCause((cause) => Effect.logError("ServiceBus Error", cause)))),
+            processMessage: (msg) => runEffect(hndlr.processMessage(msg))
+            // DO NOT CATCH ERRORS here as they should return to the queue!
+        })), (subscription) => Effect.promise(() => subscription.close()));
+    });
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2VydmljZUJ1cy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9hZGFwdGVycy9TZXJ2aWNlQnVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQVNBLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG9CQUFvQixDQUFBO0FBRXJELE9BQU8sRUFBRSxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsUUFBUSxFQUFFLEtBQUssRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUMxRSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sYUFBYSxDQUFBO0FBRXpDLFNBQVMsVUFBVSxDQUFDLEdBQVc7SUFDN0IsT0FBTyxNQUFNLENBQUMsY0FBYyxDQUMxQixNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLElBQUksZ0JBQWdCLENBQUMsR0FBRyxDQUFDLENBQUMsRUFDNUMsQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUMsTUFBTSxDQUFDLEtBQUssRUFBRSxDQUFDLENBQ2pELENBQUE7QUFDSCxDQUFDO0FBRUQsTUFBTSxNQUFNLEdBQUcsT0FBTyxDQUFDLFVBQVUsQ0FBbUIsa0JBQWtCLENBQUMsQ0FBQTtBQUN2RSxNQUFNLENBQUMsTUFBTSxvQkFBb0IsR0FBRyxDQUFDLEdBQVcsRUFBRSxFQUFFLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQTtBQUUxRixTQUFTLFVBQVUsQ0FBQyxTQUFpQjtJQUNuQyxPQUFPLE1BQU0sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDO1FBQ3pCLE1BQU0sZ0JBQWdCLEdBQUcsS0FBSyxDQUFDLENBQUMsTUFBTSxDQUFBO1FBRXRDLE9BQU8sS0FBSyxDQUFDLENBQUMsTUFBTSxDQUFDLGNBQWMsQ0FDakMsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQyxnQkFBZ0IsQ0FBQyxZQUFZLENBQUMsU0FBUyxDQUFDLENBQUMsRUFDM0QsQ0FBQyxZQUFZLEVBQUUsRUFBRSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUMsWUFBWSxDQUFDLEtBQUssRUFBRSxDQUFDLENBQzdELENBQUE7SUFDSCxDQUFDLENBQUMsQ0FBQTtBQUNKLENBQUM7QUFDRCxNQUFNLENBQUMsTUFBTSxNQUFNLEdBQUcsT0FBTyxDQUFDLFVBQVUsQ0FBbUIsa0JBQWtCLENBQUMsQ0FBQTtBQUU5RSxNQUFNLFVBQVUsVUFBVSxDQUFDLFNBQWlCO0lBQzFDLE9BQU8sS0FBSztTQUNULE1BQU0sQ0FBQyxNQUFNLEVBQUUsVUFBVSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUE7QUFDMUMsQ0FBQztBQUVELFNBQVMsWUFBWSxDQUFDLFNBQWlCLEVBQUUsYUFBMkIsRUFBRSxTQUFrQjtJQUN0RixPQUFPLE1BQU0sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDO1FBQ3pCLE1BQU0sZ0JBQWdCLEdBQUcsS0FBSyxDQUFDLENBQUMsTUFBTSxDQUFBO1FBRXRDLE9BQU8sS0FBSyxDQUFDLENBQUMsTUFBTSxDQUFDLGNBQWMsQ0FDakMsU0FBUztZQUNQLENBQUMsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDLGdCQUFnQixDQUFDLGFBQWEsQ0FBQyxTQUFTLEVBQUUsU0FBUyxDQUFDLENBQUM7WUFDNUUsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsZ0JBQWdCLENBQUMsY0FBYyxDQUFDLFNBQVMsQ0FBQyxDQUFDLEVBQ2pFLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQzNFLENBQUE7SUFDSCxDQUFDLENBQUMsQ0FBQTtBQUNKLENBQUM7QUFFRCxNQUFNLE9BQU8seUJBQTBCLFNBQVEsT0FBTyxDQUFDLEtBQUssQ0FDMUQsMkJBQTJCLENBQzVCLEVBR0c7SUFDRixNQUFNLENBQVUsSUFBSSxHQUFHLENBQUMsU0FBaUIsRUFBRSxFQUFFLENBQzNDLElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQy9DLElBQUksRUFBRSxDQUFDLGFBQTJCLEVBQUUsRUFBRSxDQUNwQyxZQUFZLENBQUMsU0FBUyxFQUFFLGFBQWEsQ0FBQyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsY0FBYyxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUMsQ0FBQztRQUNoRixXQUFXLEVBQUUsQ0FBQyxTQUFpQixFQUFFLGFBQTJCLEVBQUUsRUFBRSxDQUM5RCxZQUFZLENBQUMsU0FBUyxFQUFFLGFBQWEsRUFBRSxTQUFTLENBQUMsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLGNBQWMsQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDLENBQUM7S0FDNUYsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBOztBQUdULE1BQU0sVUFBVSxZQUFZLENBQzFCLFFBQTBFLEVBQzFFLE9BQThCO0lBRTlCLE9BQU8sTUFBTSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUM7UUFDekIsTUFBTSxDQUFDLEdBQUcsS0FBSyxDQUFDLENBQUMsTUFBTSxDQUFBO1FBQ3ZCLE9BQU8sS0FBSyxDQUFDLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDLENBQUMsWUFBWSxDQUFDLFFBQVEsRUFBRSxPQUFPLENBQUMsQ0FBQyxDQUFBO0lBQ3ZFLENBQUMsQ0FBQyxDQUFBO0FBQ0osQ0FBQztBQUVELE1BQU0sVUFBVSxTQUFTLENBQWEsS0FBa0MsRUFBRSxTQUFrQjtJQUMxRixPQUFPLE1BQU0sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDO1FBQ3pCLE1BQU0sRUFBRSxHQUFHLEtBQUssQ0FBQyxDQUFDLHlCQUF5QixDQUFBO1FBQzNDLE1BQU0sRUFBRSxHQUFHLEtBQUssQ0FBQyxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUUsQ0FBQTtRQUNqQyxNQUFNLEVBQUUsR0FBRyxLQUFLLENBQUMsQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQyxFQUFlLENBQUE7UUFDckQsTUFBTSxJQUFJLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUM7WUFDL0IsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQztnQkFDbkMsS0FBSyxDQUFDLENBQUMsV0FBVyxDQUFDLFFBQVEsQ0FBQywwQ0FBMEMsR0FBRyxDQUFDLEtBQUssQ0FBQyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFBO1lBQ3RHLENBQUM7WUFDRCxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQyxHQUFHLENBQUM7Z0JBQUUsS0FBSyxDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxZQUFZLENBQUMsQ0FBQTtRQUMxRSxDQUFDLENBQUMsQ0FBQTtRQUNGLE1BQU0sQ0FBQyxHQUFHLEtBQUssQ0FBQyxDQUFDLFNBQVM7WUFDeEIsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxXQUFXLENBQ2QsU0FBUyxFQUNULElBQUksQ0FDTDtZQUNELENBQUMsQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFBO1FBRWpCLE1BQU0sU0FBUyxHQUFHLENBQUksTUFBb0MsRUFBRSxFQUFFLENBQzVELElBQUksT0FBTyxDQUFPLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxFQUFFLENBQ3BDLEVBQUUsQ0FBQyxNQUFNLENBQUM7YUFDUCxXQUFXLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRTtZQUNwQixJQUFJLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQztnQkFDekIsT0FBTyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQTtZQUNyQixDQUFDO2lCQUFNLENBQUM7Z0JBQ04sTUFBTSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEtBQUssRUFBRSxFQUFFLGdCQUFnQixFQUFFLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQTtZQUM5RCxDQUFDO1FBQ0gsQ0FBQyxDQUFDLENBQ0wsQ0FBQTtRQUNILEtBQUssQ0FBQyxDQUFDLE1BQU0sQ0FBQyxjQUFjLENBQzFCLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQ2YsQ0FBQyxDQUFDLFNBQVMsQ0FBQztZQUNWLFlBQVksRUFBRSxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQ3BCLFNBQVMsQ0FDUCxLQUFLO2lCQUNGLFlBQVksQ0FBQyxHQUFHLENBQUM7aUJBQ2pCLElBQUksQ0FBQyxNQUFNLENBQUMsYUFBYSxDQUFDLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLGtCQUFrQixFQUFFLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FDckY7WUFDSCxjQUFjLEVBQUUsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsY0FBYyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQzdELCtEQUErRDtTQUNoRSxDQUFDLENBQ0gsRUFDRCxDQUFDLFlBQVksRUFBRSxFQUFFLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQyxZQUFZLENBQUMsS0FBSyxFQUFFLENBQUMsQ0FDN0QsQ0FBQTtJQUNILENBQUMsQ0FBQyxDQUFBO0FBQ0osQ0FBQyJ9

package/dist/services/adapters/cosmos-client.d.ts

@@ -0,0 +1,10 @@
+import { Context, Effect, Layer } from "effect-app";
+export declare const makeCosmosClient: (url: string, dbName: string) => Effect.Effect<{
+    db: import("@azure/cosmos").Database;
+}, never, never>;
+export interface CosmosClient extends Effect.Success<ReturnType<typeof makeCosmosClient>> {
+}
+export declare const CosmosClient: Context.Tag<CosmosClient, CosmosClient>;
+export declare const db: Effect.Effect<import("@azure/cosmos").Database, never, CosmosClient>;
+export declare const CosmosClientLayer: (cosmosUrl: string, dbName: string) => Layer.Layer<CosmosClient, never, never>;
+//# sourceMappingURL=cosmos-client.d.ts.map

package/dist/services/adapters/cosmos-client.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cosmos-client.d.ts","sourceRoot":"","sources":["../../../src/services/adapters/cosmos-client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAInD,eAAO,MAAM,gBAAgB,QAAS,MAAM,UAAU,MAAM;;gBACM,CAAA;AAElE,MAAM,WAAW,YAAa,SAAQ,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,gBAAgB,CAAC,CAAC;CAAG;AAE5F,eAAO,MAAM,YAAY,yCAA6D,CAAA;AAEtF,eAAO,MAAM,EAAE,sEAAwC,CAAA;AAEvD,eAAO,MAAM,iBAAiB,cAAe,MAAM,UAAU,MAAM,4CACF,CAAA"}

package/dist/services/adapters/cosmos-client.js

@@ -0,0 +1,8 @@
+import { CosmosClient as ComosClient_ } from "@azure/cosmos";
+import { Context, Effect, Layer } from "effect-app";
+const withClient = (url) => Effect.sync(() => new ComosClient_(url));
+export const makeCosmosClient = (url, dbName) => Effect.map(withClient(url), (x) => ({ db: x.database(dbName) }));
+export const CosmosClient = Context.GenericTag("@services/CosmosClient");
+export const db = Effect.map(CosmosClient, (_) => _.db);
+export const CosmosClientLayer = (cosmosUrl, dbName) => Layer.effect(CosmosClient, makeCosmosClient(cosmosUrl, dbName));
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29zbW9zLWNsaWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9hZGFwdGVycy9jb3Ntb3MtY2xpZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLElBQUksWUFBWSxFQUFFLE1BQU0sZUFBZSxDQUFBO0FBQzVELE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUVuRCxNQUFNLFVBQVUsR0FBRyxDQUFDLEdBQVcsRUFBRSxFQUFFLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQyxJQUFJLFlBQVksQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFBO0FBRTVFLE1BQU0sQ0FBQyxNQUFNLGdCQUFnQixHQUFHLENBQUMsR0FBVyxFQUFFLE1BQWMsRUFBRSxFQUFFLENBQzlELE1BQU0sQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUE7QUFJbEUsTUFBTSxDQUFDLE1BQU0sWUFBWSxHQUFHLE9BQU8sQ0FBQyxVQUFVLENBQWUsd0JBQXdCLENBQUMsQ0FBQTtBQUV0RixNQUFNLENBQUMsTUFBTSxFQUFFLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxZQUFZLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQTtBQUV2RCxNQUFNLENBQUMsTUFBTSxpQkFBaUIsR0FBRyxDQUFDLFNBQWlCLEVBQUUsTUFBYyxFQUFFLEVBQUUsQ0FDckUsS0FBSyxDQUFDLE1BQU0sQ0FBQyxZQUFZLEVBQUUsZ0JBQWdCLENBQUMsU0FBUyxFQUFFLE1BQU0sQ0FBQyxDQUFDLENBQUEifQ==

package/dist/services/adapters/index.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=index.d.ts.map

package/dist/services/adapters/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/adapters/index.ts"],"names":[],"mappings":""}

package/dist/services/adapters/index.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvYWRhcHRlcnMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9

package/dist/services/adapters/logger.d.ts

@@ -0,0 +1,8 @@
+export declare const InfraLogger: {
+    logWarning: (...message: ReadonlyArray<any>) => import("effect/Effect").Effect<void, never, never>;
+    logError: (...message: ReadonlyArray<any>) => import("effect/Effect").Effect<void, never, never>;
+    logFatal: (...message: ReadonlyArray<any>) => import("effect/Effect").Effect<void, never, never>;
+    logInfo: (...message: ReadonlyArray<any>) => import("effect/Effect").Effect<void, never, never>;
+    logDebug: (...message: ReadonlyArray<any>) => import("effect/Effect").Effect<void, never, never>;
+};
+//# sourceMappingURL=logger.d.ts.map

package/dist/services/adapters/logger.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../src/services/adapters/logger.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,WAAW;iBAC0H,GAAG;eAAkF,GAAG;eAAkF,GAAG;cAAiF,GAAG;eAAkF,GAAG;CADza,CAAA"}

package/dist/services/adapters/logger.js

@@ -0,0 +1,3 @@
+import { makeLog } from "effect-app/utils/logger";
+export const InfraLogger = makeLog("@effect-app/infra", "info");
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NlcnZpY2VzL2FkYXB0ZXJzL2xvZ2dlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0seUJBQXlCLENBQUE7QUFFakQsTUFBTSxDQUFDLE1BQU0sV0FBVyxHQUFHLE9BQU8sQ0FBQyxtQkFBbUIsRUFBRSxNQUFNLENBQUMsQ0FBQSJ9

package/dist/services/adapters/memQueue.d.ts

@@ -0,0 +1,34 @@
+import { Context, Effect, type Queue } from "effect-app";
+declare const MemQueue_base: (abstract new (service: {
+    getOrCreateQueue: (k: string) => Effect.Effect<Queue.Queue<string>, never, never>;
+}) => Readonly<{
+    getOrCreateQueue: (k: string) => Effect.Effect<Queue.Queue<string>, never, never>;
+}> & Context.TagClassShape<"effect-app/MemQueue", {
+    getOrCreateQueue: (k: string) => Effect.Effect<Queue.Queue<string>, never, never>;
+}>) & {
+    toLayer: {
+        (): import("effect/Layer").Layer<MemQueue, never, never>;
+        <E_1, R_1>(eff: Effect.Effect<Omit<MemQueue, keyof Context.TagClassShape<any, any>>, E_1, R_1>): import("effect/Layer").Layer<MemQueue, E_1, R_1>;
+    };
+    toLayerScoped: {
+        (): import("effect/Layer").Layer<MemQueue, never, never>;
+        <E_1, R_2>(eff: Effect.Effect<Context.TagClassShape<any, any>, E_1, R_2>): import("effect/Layer").Layer<MemQueue, E_1, Exclude<R_2, import("effect/Scope").Scope>>;
+    };
+    of: (service: Context.TagClassShape<any, any>) => MemQueue;
+    make: Effect.Effect<MemQueue, never, never>;
+} & Context.Tag<MemQueue, MemQueue> & {
+    getOrCreateQueue: (k: string) => Effect.Effect<Queue.Queue<string>, never, MemQueue>;
+} & {
+    use: <X>(body: (_: {
+        getOrCreateQueue: (k: string) => Effect.Effect<Queue.Queue<string>, never, never>;
+    }) => X) => X extends Effect.Effect<infer A_1, infer E_2, infer R_4> ? Effect.Effect<A_1, E_2, R_4 | MemQueue> : Effect.Effect<X, never, MemQueue>;
+};
+/**
+ * @tsplus type MemQueue
+ * @tsplus companion MemQueue.Ops
+ */
+export declare class MemQueue extends MemQueue_base {
+    static readonly Live: import("effect/Layer").Layer<MemQueue, never, never>;
+}
+export {};
+//# sourceMappingURL=memQueue.d.ts.map

package/dist/services/adapters/memQueue.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"memQueue.d.ts","sourceRoot":"","sources":["../../../src/services/adapters/memQueue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,KAAK,EAAE,MAAM,YAAY,CAAA;;0BAQ5B,MAAM;;0BAAN,MAAM;;0BAAN,MAAM;;;;;;;;;;;;;;;;8BAAN,MAAM;;;AAWlC;;;GAGG;AACH,qBAAa,QAAS,SAAQ,aAA0D;IACtF,MAAM,CAAC,QAAQ,CAAC,IAAI,uDAAiB;CACtC"}

package/dist/services/adapters/memQueue.js

@@ -0,0 +1,24 @@
+import { Context, Effect } from "effect-app";
+import * as Q from "effect/Queue";
+const make = Effect
+    .gen(function* () {
+    const store = yield* Effect.sync(() => new Map());
+    return {
+        getOrCreateQueue: (k) => Effect.gen(function* () {
+            const q = store.get(k);
+            if (q)
+                return q;
+            const newQ = yield* Q.unbounded();
+            store.set(k, newQ);
+            return newQ;
+        })
+    };
+});
+/**
+ * @tsplus type MemQueue
+ * @tsplus companion MemQueue.Ops
+ */
+export class MemQueue extends Context.TagMakeId("effect-app/MemQueue", make)() {
+    static Live = this.toLayer();
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVtUXVldWUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvYWRhcHRlcnMvbWVtUXVldWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQWMsTUFBTSxZQUFZLENBQUE7QUFDeEQsT0FBTyxLQUFLLENBQUMsTUFBTSxjQUFjLENBQUE7QUFFakMsTUFBTSxJQUFJLEdBQUcsTUFBTTtLQUNoQixHQUFHLENBQUMsUUFBUSxDQUFDO0lBQ1osTUFBTSxLQUFLLEdBQUcsS0FBSyxDQUFDLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQyxJQUFJLEdBQUcsRUFBK0IsQ0FBQyxDQUFBO0lBRTlFLE9BQU87UUFDTCxnQkFBZ0IsRUFBRSxDQUFDLENBQVMsRUFBRSxFQUFFLENBQzlCLE1BQU0sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDO1lBQ2xCLE1BQU0sQ0FBQyxHQUFHLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUE7WUFDdEIsSUFBSSxDQUFDO2dCQUFFLE9BQU8sQ0FBQyxDQUFBO1lBQ2YsTUFBTSxJQUFJLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVMsRUFBVSxDQUFBO1lBQ3pDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFLElBQUksQ0FBQyxDQUFBO1lBQ2xCLE9BQU8sSUFBSSxDQUFBO1FBQ2IsQ0FBQyxDQUFDO0tBQ0wsQ0FBQTtBQUNILENBQUMsQ0FBQyxDQUFBO0FBRUo7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLFFBQVMsU0FBUSxPQUFPLENBQUMsU0FBUyxDQUFDLHFCQUFxQixFQUFFLElBQUksQ0FBQyxFQUFZO0lBQ3RGLE1BQU0sQ0FBVSxJQUFJLEdBQUcsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFBIn0=

package/dist/services/adapters/mongo-client.d.ts

@@ -0,0 +1,10 @@
+import { Context, Effect, Layer } from "effect-app";
+declare const makeMongoClient: (url: string, dbName?: string) => Effect.Effect<{
+    db: import("mongodb").Db;
+}, never, import("effect/Scope").Scope>;
+export interface MongoClient extends Effect.Success<ReturnType<typeof makeMongoClient>> {
+}
+export declare const MongoClient: Context.Tag<MongoClient, MongoClient>;
+export declare const MongoClientLive: (mongoUrl: string, dbName?: string) => Layer.Layer<MongoClient, never, never>;
+export {};
+//# sourceMappingURL=mongo-client.d.ts.map

package/dist/services/adapters/mongo-client.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mongo-client.d.ts","sourceRoot":"","sources":["../../../src/services/adapters/mongo-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAenD,QAAA,MAAM,eAAe,QAAS,MAAM,WAAW,MAAM;;uCAA+D,CAAA;AAEpH,MAAM,WAAW,WAAY,SAAQ,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC;CAAG;AAE1F,eAAO,MAAM,WAAW,uCAA2D,CAAA;AAEnF,eAAO,MAAM,eAAe,aAAc,MAAM,WAAW,MAAM,2CACH,CAAA"}

package/dist/services/adapters/mongo-client.js

@@ -0,0 +1,12 @@
+import { Context, Effect, Layer } from "effect-app";
+import { MongoClient as MongoClient_ } from "mongodb";
+// TODO: we should probably share a single client...
+const withClient = (url) => Effect.acquireRelease(Effect
+    .promise(() => {
+    const client = new MongoClient_(url);
+    return client.connect();
+}), (cl) => Effect.promise(() => cl.close()).pipe(Effect.uninterruptible, Effect.orDie));
+const makeMongoClient = (url, dbName) => Effect.map(withClient(url), (x) => ({ db: x.db(dbName) }));
+export const MongoClient = Context.GenericTag("@services/MongoClient");
+export const MongoClientLive = (mongoUrl, dbName) => Layer.scoped(MongoClient, makeMongoClient(mongoUrl, dbName));
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9uZ28tY2xpZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NlcnZpY2VzL2FkYXB0ZXJzL21vbmdvLWNsaWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDbkQsT0FBTyxFQUFFLFdBQVcsSUFBSSxZQUFZLEVBQUUsTUFBTSxTQUFTLENBQUE7QUFFckQsb0RBQW9EO0FBRXBELE1BQU0sVUFBVSxHQUFHLENBQUMsR0FBVyxFQUFFLEVBQUUsQ0FDakMsTUFBTSxDQUFDLGNBQWMsQ0FDbkIsTUFBTTtLQUNILE9BQU8sQ0FBQyxHQUFHLEVBQUU7SUFDWixNQUFNLE1BQU0sR0FBRyxJQUFJLFlBQVksQ0FBQyxHQUFHLENBQUMsQ0FBQTtJQUNwQyxPQUFPLE1BQU0sQ0FBQyxPQUFPLEVBQUUsQ0FBQTtBQUN6QixDQUFDLENBQUMsRUFDSixDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQyxFQUFFLENBQUMsS0FBSyxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLGVBQWUsRUFBRSxNQUFNLENBQUMsS0FBSyxDQUFDLENBQ3BGLENBQUE7QUFFSCxNQUFNLGVBQWUsR0FBRyxDQUFDLEdBQVcsRUFBRSxNQUFlLEVBQUUsRUFBRSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUE7QUFJcEgsTUFBTSxDQUFDLE1BQU0sV0FBVyxHQUFHLE9BQU8sQ0FBQyxVQUFVLENBQWMsdUJBQXVCLENBQUMsQ0FBQTtBQUVuRixNQUFNLENBQUMsTUFBTSxlQUFlLEdBQUcsQ0FBQyxRQUFnQixFQUFFLE1BQWUsRUFBRSxFQUFFLENBQ25FLEtBQUssQ0FBQyxNQUFNLENBQUMsV0FBVyxFQUFFLGVBQWUsQ0FBQyxRQUFRLEVBQUUsTUFBTSxDQUFDLENBQUMsQ0FBQSJ9

package/dist/services/adapters/redis-client.d.ts

@@ -0,0 +1,29 @@
+import { Context, Effect, Layer, Option } from "effect-app";
+import type { RedisClient as Client } from "redis";
+import Redlock from "redlock";
+declare const ConnectionException_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").Equals<A, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }) => import("effect/Cause").YieldableError & {
+    readonly _tag: "ConnectionException";
+} & Readonly<A>;
+export declare class ConnectionException extends ConnectionException_base<{
+    cause: Error;
+    message: string;
+}> {
+    constructor(cause: Error);
+}
+export declare const makeRedisClient: (makeClient: () => Client) => Effect.Effect<{
+    client: Client;
+    lock: Redlock;
+    get: (key: string) => Effect.Effect<Option<string>, ConnectionException, never>;
+    hget: (key: string, field: string) => Effect.Effect<Option<string>, ConnectionException, never>;
+    hset: (key: string, field: string, value: string) => Effect.Effect<void, ConnectionException, never>;
+    hmgetAll: (key: string) => Effect.Effect<Option<{
+        [key: string]: string;
+    }>, ConnectionException, never>;
+    set: (key: string, val: string) => Effect.Effect<void, ConnectionException, never>;
+}, never, import("effect/Scope").Scope>;
+export interface RedisClient extends Effect.Success<ReturnType<typeof makeRedisClient>> {
+}
+export declare const RedisClient: Context.Tag<RedisClient, RedisClient>;
+export declare const RedisClientLayer: (storageUrl: string) => Layer.Layer<RedisClient, never, never>;
+export {};
+//# sourceMappingURL=redis-client.d.ts.map

package/dist/services/adapters/redis-client.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"redis-client.d.ts","sourceRoot":"","sources":["../../../src/services/adapters/redis-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAQ,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACjE,OAAO,KAAK,EAAE,WAAW,IAAI,MAAM,EAAE,MAAM,OAAO,CAAA;AAClD,OAAO,OAAO,MAAM,SAAS,CAAA;;;;AAE7B,qBAAa,mBAAoB,SAAQ,yBAAwC;IAAE,KAAK,EAAE,KAAK,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;gBACrG,KAAK,EAAE,KAAK;CAGzB;AAED,eAAO,MAAM,eAAe,eAAgB,MAAM,MAAM;;;eAO9B,MAAM;gBAiCL,MAAM,SAAS,MAAM;gBAXrB,MAAM,SAAS,MAAM,SAAS,MAAM;oBAqBhC,MAAM;;;eAhCX,MAAM,OAAO,MAAM;uCA8D1C,CAAA;AAEH,MAAM,WAAW,WAAY,SAAQ,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC;CAAG;AAE1F,eAAO,MAAM,WAAW,uCAA2D,CAAA;AAEnF,eAAO,MAAM,gBAAgB,eAAgB,MAAM,2CACgB,CAAA"}

package/dist/services/adapters/redis-client.js

@@ -0,0 +1,93 @@
+import { Context, Data, Effect, Layer, Option } from "effect-app";
+import Redlock from "redlock";
+export class ConnectionException extends Data.TaggedError("ConnectionException") {
+    constructor(cause) {
+        super({ message: "A connection error ocurred", cause });
+    }
+}
+export const makeRedisClient = (makeClient) => Effect.acquireRelease(Effect
+    .sync(() => {
+    const client = createClient(makeClient);
+    const lock = new Redlock([client]);
+    function get(key) {
+        return Effect
+            .async((res) => {
+            client.get(key, (err, v) => err
+                ? res(new ConnectionException(err))
+                : res(Effect.sync(() => Option.fromNullable(v))));
+        })
+            .pipe(Effect.uninterruptible);
+    }
+    function set(key, val) {
+        return Effect
+            .async((res) => {
+            client.set(key, val, (err) => err
+                ? res(new ConnectionException(err))
+                : res(Effect.sync(() => void 0)));
+        })
+            .pipe(Effect.uninterruptible);
+    }
+    function hset(key, field, value) {
+        return Effect
+            .async((res) => {
+            client.hset(key, field, value, (err) => err
+                ? res(new ConnectionException(err))
+                : res(Effect.sync(() => void 0)));
+        })
+            .pipe(Effect.uninterruptible);
+    }
+    function hget(key, field) {
+        return Effect
+            .async((res) => {
+            client.hget(key, field, (err, v) => err
+                ? res(new ConnectionException(err))
+                : res(Effect.sync(() => Option.fromNullable(v))));
+        })
+            .pipe(Effect.uninterruptible);
+    }
+    function hmgetAll(key) {
+        return Effect
+            .async((res) => {
+            client.hgetall(key, (err, v) => err
+                ? res(new ConnectionException(err))
+                : res(Effect.sync(() => Option.fromNullable(v))));
+        })
+            .pipe(Effect.uninterruptible);
+    }
+    return {
+        client,
+        lock,
+        get,
+        hget,
+        hset,
+        hmgetAll,
+        set
+    };
+}), (cl) => Effect
+    .async((res) => {
+    cl.client.quit((err) => res(err ? Effect.fail(err) : Effect.void));
+})
+    .pipe(Effect.uninterruptible, Effect.orDie));
+export const RedisClient = Context.GenericTag("@services/RedisClient");
+export const RedisClientLayer = (storageUrl) => Layer.scoped(RedisClient, makeRedisClient(makeRedis(storageUrl)));
+function createClient(makeClient) {
+    const client = makeClient();
+    client.on("error", (error) => {
+        console.error(error);
+    });
+    return client;
+}
+function makeRedis(storageUrl) {
+    const url = new URL(storageUrl);
+    const hostname = url.hostname;
+    const password = url.password;
+    return () => createClient(storageUrl === "redis://"
+        ? {
+            host: hostname,
+            port: 6380,
+            auth_pass: password,
+            tls: { servername: hostname }
+        }
+        : storageUrl);
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVkaXMtY2xpZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NlcnZpY2VzL2FkYXB0ZXJzL3JlZGlzLWNsaWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUVqRSxPQUFPLE9BQU8sTUFBTSxTQUFTLENBQUE7QUFFN0IsTUFBTSxPQUFPLG1CQUFvQixTQUFRLElBQUksQ0FBQyxXQUFXLENBQUMscUJBQXFCLENBQW9DO0lBQ2pILFlBQVksS0FBWTtRQUN0QixLQUFLLENBQUMsRUFBRSxPQUFPLEVBQUUsNEJBQTRCLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQTtJQUN6RCxDQUFDO0NBQ0Y7QUFFRCxNQUFNLENBQUMsTUFBTSxlQUFlLEdBQUcsQ0FBQyxVQUF3QixFQUFFLEVBQUUsQ0FDMUQsTUFBTSxDQUFDLGNBQWMsQ0FDbkIsTUFBTTtLQUNILElBQUksQ0FBQyxHQUFHLEVBQUU7SUFDVCxNQUFNLE1BQU0sR0FBRyxZQUFZLENBQUMsVUFBVSxDQUFDLENBQUE7SUFDdkMsTUFBTSxJQUFJLEdBQUcsSUFBSSxPQUFPLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFBO0lBRWxDLFNBQVMsR0FBRyxDQUFDLEdBQVc7UUFDdEIsT0FBTyxNQUFNO2FBQ1YsS0FBSyxDQUFzQyxDQUFDLEdBQUcsRUFBRSxFQUFFO1lBQ2xELE1BQU0sQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLENBQUMsR0FBRyxFQUFFLENBQUMsRUFBRSxFQUFFLENBQ3pCLEdBQUc7Z0JBQ0QsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxJQUFJLG1CQUFtQixDQUFDLEdBQUcsQ0FBQyxDQUFDO2dCQUNuQyxDQUFDLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsTUFBTSxD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

package/package.json

@@ -1,29 +1,24 @@
 {
   "name": "@effect-app/infra",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "license": "MIT",
   "type": "module",
   "dependencies": {
-    "@azure/cosmos": "^4.1.1",
-    "@azure/service-bus": "^7.9.5",
-    "@effect/rpc": "^0.44.2",
-    "@effect/rpc-http": "^0.42.2",
-    "express-oauth2-jwt-bearer": "^1.6.0",
     "@faker-js/faker": "^8.4.1",
-    "@sendgrid/helpers": "^8.0.0",
-    "@sendgrid/mail": "^8.1.4",
     "change-case": "^5.4.4",
     "cross-fetch": "^4.0.0",
+    "express-oauth2-jwt-bearer": "^1.6.0",
     "fast-check": "~3.22.0",
     "object-hash": "^3.0.0",
     "path-parser": "^6.1.0",
     "proper-lockfile": "^4.1.2",
     "pure-rand": "6.1.0",
-    "redlock": "^4.2.0",
-    "@effect-app/infra-adapters": "2.0.1",
+    "query-string": "^9.1.1",
     "effect-app": "2.0.1"
   },
   "devDependencies": {
+    "@azure/cosmos": "^4.1.1",
+    "@azure/service-bus": "^7.9.5",
     "@babel/cli": "^7.25.7",
     "@sentry/node": "^8.35.0",
     "@types/express": "^5.0.0",
@@ -36,15 +31,26 @@
     "jwt-decode": "^4.0.0",
     "mongodb": "6.10.0",
     "redis": "^3.1.2",
+    "redlock": "^4.2.0",
+    "strip-ansi": "^7.1.0",
     "typescript": "^5.6.3",
     "vitest": "^2.1.3"
   },
   "peerDependencies": {
-    "express": "^4.21.1",
+    "@azure/cosmos": "^4.1.1",
+    "@azure/service-bus": "^7.9.5",
+    "@effect/experimental": "^0.30.3",
     "@effect/platform": "^0.69.2",
+    "@effect/rpc-http": "^0.42.2",
+    "@effect/rpc": "^0.44.2",
     "@effect/sql": "^0.18.3",
     "@effect/vitest": "^0.13.0",
-    "effect": "^3.10.0"
+    "@sendgrid/helpers": "^8.0.0",
+    "@sendgrid/mail": "^8.1.4",
+    "redis": "^3.1.2",
+    "redlock": "^4.2.0",
+    "effect": "^3.10.0",
+    "express": "^4.21.1"
   },
   "typesVersions": {
     "*": {
@@ -204,6 +210,16 @@
         "default": "./_cjs/errors.cjs"
       }
     },
+    "./fileUtil": {
+      "import": {
+        "types": "./dist/fileUtil.d.ts",
+        "default": "./dist/fileUtil.js"
+      },
+      "require": {
+        "types": "./dist/fileUtil.d.ts",
+        "default": "./_cjs/fileUtil.cjs"
+      }
+    },
     "./filter/types": {
       "import": {
         "types": "./dist/filter/types.d.ts",
@@ -334,6 +350,16 @@
         "default": "./_cjs/rateLimit.cjs"
       }
     },
+    "./services/CUPS": {
+      "import": {
+        "types": "./dist/services/CUPS.d.ts",
+        "default": "./dist/services/CUPS.js"
+      },
+      "require": {
+        "types": "./dist/services/CUPS.d.ts",
+        "default": "./_cjs/services/CUPS.cjs"
+      }
+    },
     "./services/Emailer": {
       "import": {
         "types": "./dist/services/Emailer.d.ts",
@@ -624,6 +650,96 @@
         "default": "./_cjs/services/Store/utils.cjs"
       }
     },
+    "./services/adapters/SQL": {
+      "import": {
+        "types": "./dist/services/adapters/SQL.d.ts",
+        "default": "./dist/services/adapters/SQL.js"
+      },
+      "require": {
+        "types": "./dist/services/adapters/SQL.d.ts",
+        "default": "./_cjs/services/adapters/SQL.cjs"
+      }
+    },
+    "./services/adapters/SQL/Model": {
+      "import": {
+        "types": "./dist/services/adapters/SQL/Model.d.ts",
+        "default": "./dist/services/adapters/SQL/Model.js"
+      },
+      "require": {
+        "types": "./dist/services/adapters/SQL/Model.d.ts",
+        "default": "./_cjs/services/adapters/SQL/Model.cjs"
+      }
+    },
+    "./services/adapters/ServiceBus": {
+      "import": {
+        "types": "./dist/services/adapters/ServiceBus.d.ts",
+        "default": "./dist/services/adapters/ServiceBus.js"
+      },
+      "require": {
+        "types": "./dist/services/adapters/ServiceBus.d.ts",
+        "default": "./_cjs/services/adapters/ServiceBus.cjs"
+      }
+    },
+    "./services/adapters/cosmos-client": {
+      "import": {
+        "types": "./dist/services/adapters/cosmos-client.d.ts",
+        "default": "./dist/services/adapters/cosmos-client.js"
+      },
+      "require": {
+        "types": "./dist/services/adapters/cosmos-client.d.ts",
+        "default": "./_cjs/services/adapters/cosmos-client.cjs"
+      }
+    },
+    "./services/adapters/index": {
+      "import": {
+        "types": "./dist/services/adapters/index.d.ts",
+        "default": "./dist/services/adapters/index.js"
+      },
+      "require": {
+        "types": "./dist/services/adapters/index.d.ts",
+        "default": "./_cjs/services/adapters/index.cjs"
+      }
+    },
+    "./services/adapters/logger": {
+      "import": {
+        "types": "./dist/services/adapters/logger.d.ts",
+        "default": "./dist/services/adapters/logger.js"
+      },
+      "require": {
+        "types": "./dist/services/adapters/logger.d.ts",
+        "default": "./_cjs/services/adapters/logger.cjs"
+      }
+    },
+    "./services/adapters/memQueue": {
+      "import": {
+        "types": "./dist/services/adapters/memQueue.d.ts",
+        "default": "./dist/services/adapters/memQueue.js"
+      },
+      "require": {
+        "types": "./dist/services/adapters/memQueue.d.ts",
+        "default": "./_cjs/services/adapters/memQueue.cjs"
+      }
+    },
+    "./services/adapters/mongo-client": {
+      "import": {
+        "types": "./dist/services/adapters/mongo-client.d.ts",
+        "default": "./dist/services/adapters/mongo-client.js"
+      },
+      "require": {
+        "types": "./dist/services/adapters/mongo-client.d.ts",
+        "default": "./_cjs/services/adapters/mongo-client.cjs"
+      }
+    },
+    "./services/adapters/redis-client": {
+      "import": {
+        "types": "./dist/services/adapters/redis-client.d.ts",
+        "default": "./dist/services/adapters/redis-client.js"
+      },
+      "require": {
+        "types": "./dist/services/adapters/redis-client.d.ts",
+        "default": "./_cjs/services/adapters/redis-client.cjs"
+      }
+    },
     "./services/query": {
       "import": {
         "types": "./dist/services/query.d.ts",

package/src/api/internal/RequestContextMiddleware.ts

@@ -1,6 +1,5 @@
 import { Effect } from "effect-app"
 import { HttpMiddleware, HttpServerRequest, HttpServerResponse } from "effect-app/http"
-import { RequestId } from "effect-app/ids"
 import { NonEmptyString255 } from "effect-app/Schema"
 import { Locale, RequestContext } from "../../RequestContext.js"
 import { setupRequestContext } from "../setupRequest.js"
@@ -24,8 +23,8 @@ export const RequestContextMiddleware = (defaultLocale: Locale = "en") =>
 
       const requestContext = new RequestContext({
         span: {
-          traceId: RequestId(currentSpan.traceId),
-          spanId: RequestId(currentSpan.spanId),
+          traceId: currentSpan.traceId,
+          spanId: currentSpan.spanId,
           sampled: currentSpan.sampled
         },
         name: NonEmptyString255(req.originalUrl), // set more detailed elsewhere

package/src/api/internal/events.ts

@@ -1,8 +1,8 @@
-import { setupRequestContextFromCurrent } from "@effect-app/infra/api/setupRequest"
-import { reportError } from "@effect-app/infra/errorReporter"
 import { Duration, Effect, pipe, S, Schedule, Stream } from "effect-app"
 import { HttpHeaders, HttpServerResponse } from "effect-app/http"
+import { reportError } from "../../errorReporter.js"
 import { InfraLogger } from "../../logger.js"
+import { setupRequestContextFromCurrent } from "../setupRequest.js"
 
 // Tell the client to retry every 10 seconds if connectivity is lost
 const setRetry = Stream.succeed("retry: 10000")

package/src/api/setupRequest.ts

@@ -1,5 +1,4 @@
-import type { Tracer } from "effect-app"
-import { Effect, FiberRef, Layer } from "effect-app"
+import { Effect, FiberRef, Layer, Tracer } from "effect-app"
 import { NonEmptyString255 } from "effect-app/Schema"
 import { LocaleRef, RequestContext, spanAttributes } from "../RequestContext.js"
 import { startContextMap } from "../services/Store/ContextMapContainer.js"
@@ -14,7 +13,7 @@ export const getRequestContext = Effect
   .pipe(
     Effect.map(({ locale, namespace, span }) =>
       new RequestContext({
-        span,
+        span: Tracer.externalSpan(span),
         locale,
         namespace,
         // TODO: get through span context, or don't care at all.