@effect-app/infra 1.39.0 → 1.40.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @effect-app/infra
 
+## 1.40.0
+
+### Minor Changes
+
+- 6cf87c8: move ops requiring Operations to the service
+
 ## 1.39.0
 
 ### Minor Changes

package/_cjs/services/Operations.cjs

@@ -3,11 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.forkOperation2 = exports.forkOperation = exports.Operations = void 0;
+exports.forkOperation = exports.Operations = void 0;
 exports.forkOperationFunction = forkOperationFunction;
-exports.forkOperationWithEffect = forkOperationWithEffect;
 var _Effect = require("@effect-app/core/Effect");
 var _Function = require("@effect-app/core/Function");
+var _RequestFiberSet = require("@effect-app/infra-adapters/RequestFiberSet");
 var _errorReporter = require("@effect-app/infra/errorReporter");
 var _schema = require("@effect-app/schema");
 var _dateFns = require("date-fns");
@@ -24,7 +24,9 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 const reportAppError = (0, _errorReporter.reportError)("Operations.Cleanup");
 const make = _effectApp.Effect.gen(function* () {
   const repo = yield* _OperationsRepo.OperationsRepo;
+  const reqFiberSet = yield* _RequestFiberSet.RequestFiberSet;
   const makeOp = _effectApp.Effect.sync(() => _Operations.OperationId.make());
+  const register = title => _effectApp.Effect.tap(makeOp, id => _effectApp.Effect.andThen((0, _Effect.annotateLogscoped)("operationId", id), _effectApp.Effect.acquireRelease(addOp(id, title), (_, exit) => finishOp(id, exit))));
   const cleanup = _effectApp.Effect.sync(() => (0, _dateFns.subHours)(new Date(), 1)).pipe(_effectApp.Effect.andThen(before => repo.query((0, _query.where)("updatedAt", "lt", before.toISOString()))), _effectApp.Effect.andThen(ops => (0, _Function.pipe)(ops, (0, _rateLimit.batch)(100, _effectApp.Effect.succeed, items => repo.removeAndPublish(items)))), _effectApp.Effect.withSpan("Operations.cleanup"));
   function addOp(id, title) {
     return repo.save(new _Operations.Operation({
@@ -49,9 +51,23 @@ const make = _effectApp.Effect.gen(function* () {
       progress
     })).pipe(_effectApp.Effect.orDie));
   }
+  function fork(self, fnc, title) {
+    return _effectApp.Effect.flatMap(Scope.make(), scope => register(title).pipe(Scope.extend(scope), _effectApp.Effect.flatMap(id => (0, _reportError.forkDaemonReportRequestUnexpected)(Scope.use(self(id).pipe(_effectApp.Effect.withSpan(title)), scope)).pipe(_effectApp.Effect.map(fiber => ({
+      fiber,
+      id
+    })))), _effectApp.Effect.tap(({
+      id
+    }) => _effectApp.Effect.interruptible(fnc(id)).pipe(_effectApp.Effect.forkScoped, Scope.extend(scope))))).pipe(_effectApp.Effect.provideService(_RequestFiberSet.RequestFiberSet, reqFiberSet));
+  }
+  const fork2 = (0, _Function.dual)(2, (self, title) => _effectApp.Effect.flatMap(Scope.make(), scope => register(title).pipe(Scope.extend(scope), _effectApp.Effect.flatMap(id => (0, _reportError.forkDaemonReportRequestUnexpected)(Scope.use(self(id).pipe(_effectApp.Effect.withSpan(title)), scope)).pipe(_effectApp.Effect.map(fiber => ({
+    fiber,
+    id
+  })))))));
   return {
     cleanup,
-    register: title => _effectApp.Effect.tap(makeOp, id => _effectApp.Effect.andThen((0, _Effect.annotateLogscoped)("operationId", id), _effectApp.Effect.acquireRelease(addOp(id, title), (_, exit) => finishOp(id, exit)))),
+    register,
+    fork,
+    fork2,
     all: repo.all,
     find: findOp,
     update
@@ -65,7 +81,7 @@ class Operations extends _effectApp.Context.TagMakeId("effect-app/Operations", m
       return reportAppError(_.cause);
     }
   }), _effectApp.Effect.schedule(_effectApp.Schedule.fixed(_effectApp.Duration.minutes(20))), _effectApp.Effect.map(_ => _), _MainFiberSet.MainFiberSet.run)).pipe(_effectApp.Layer.effectDiscard, _effectApp.Layer.provide(_MainFiberSet.MainFiberSet.Live));
-  static Live = this.CleanupLive.pipe(_effectApp.Layer.provideMerge(this.toLayer()));
+  static Live = this.CleanupLive.pipe(_effectApp.Layer.provideMerge(this.toLayer()), _effectApp.Layer.provide(_RequestFiberSet.RequestFiberSet.Live));
 }
 exports.Operations = Operations;
 const forkOperation = exports.forkOperation = (0, _Function.dual)(2, (self, title) => _effectApp.Effect.flatMap(Scope.make(), scope => Operations.register(title).pipe(Scope.extend(scope), _effectApp.Effect.flatMap(id => (0, _reportError.forkDaemonReportRequestUnexpected)(Scope.use(self.pipe(_effectApp.Effect.withSpan(title)), scope)).pipe(_effectApp.Effect.map(fiber => ({
@@ -75,16 +91,4 @@ const forkOperation = exports.forkOperation = (0, _Function.dual)(2, (self, titl
 function forkOperationFunction(fnc, title) {
   return inp => fnc(inp).pipe(_ => forkOperation(_, title));
 }
-const forkOperation2 = exports.forkOperation2 = (0, _Function.dual)(2, (self, title) => (0, _Effect.flatMap)(Operations, Operations => _effectApp.Effect.flatMap(Scope.make(), scope => Operations.register(title).pipe(Scope.extend(scope), _effectApp.Effect.flatMap(id => (0, _reportError.forkDaemonReportRequestUnexpected)(Scope.use(self(id).pipe(_effectApp.Effect.withSpan(title)), scope)).pipe(_effectApp.Effect.map(fiber => ({
-  fiber,
-  id
-}))))))));
-function forkOperationWithEffect(self, fnc, title) {
-  return _effectApp.Effect.flatMap(Operations, Operations => _effectApp.Effect.flatMap(Scope.make(), scope => Operations.register(title).pipe(Scope.extend(scope), _effectApp.Effect.flatMap(id => (0, _reportError.forkDaemonReportRequestUnexpected)(Scope.use(self(id).pipe(_effectApp.Effect.withSpan(title)), scope)).pipe(_effectApp.Effect.map(fiber => ({
-    fiber,
-    id
-  })))), _effectApp.Effect.tap(({
-    id
-  }) => _effectApp.Effect.interruptible(fnc(id)).pipe(_effectApp.Effect.forkScoped, Scope.extend(scope))))));
-}
 //# sourceMappingURL=Operations.cjs.map

package/_cjs/services/Operations.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"Operations.cjs","names":["_Effect","require","_Function","_errorReporter","_schema","_dateFns","_effectApp","_Operations","_MainFiberSet","Scope","_interopRequireWildcard","_reportError","_rateLimit","_OperationsRepo","_query","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","reportAppError","reportError","make","Effect","gen","repo","OperationsRepo","makeOp","sync","OperationId","cleanup","subHours","Date","pipe","andThen","before","query","where","toISOString","ops","batch","succeed","items","removeAndPublish","withSpan","addOp","id","title","save","Operation","orDie","findOp","find","finishOp","exit","flatMap","_","copy","updatedAt","result","Exit","isSuccess","Success","Failure","message","Cause","isInterrupted","cause","NonEmptyString2k","isDie","failureOption","Option","S","is","some","none","getOrNull","update","progress","register","tap","annotateLogscoped","acquireRelease","all","Operations","Context","TagMakeId","CleanupLive","use","void","schedule","Schedule","fixed","Duration","minutes","map","MainFiberSet","run","Layer","effectDiscard","provide","Live","provideMerge","toLayer","forkOperation","exports","dual","self","scope","extend","forkDaemonReportRequestUnexpected","fiber","forkOperationFunction","fnc","inp","forkOperation2","forkOperationWithEffect","interruptible","forkScoped"],"sources":["../../src/services/Operations.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"Operations.cjs","names":["_Effect","require","_Function","_RequestFiberSet","_errorReporter","_schema","_dateFns","_effectApp","_Operations","_MainFiberSet","Scope","_interopRequireWildcard","_reportError","_rateLimit","_OperationsRepo","_query","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","reportAppError","reportError","make","Effect","gen","repo","OperationsRepo","reqFiberSet","RequestFiberSet","makeOp","sync","OperationId","register","title","tap","id","andThen","annotateLogscoped","acquireRelease","addOp","_","exit","finishOp","cleanup","subHours","Date","pipe","before","query","where","toISOString","ops","batch","succeed","items","removeAndPublish","withSpan","save","Operation","orDie","findOp","find","flatMap","copy","updatedAt","result","Exit","isSuccess","Success","Failure","message","Cause","isInterrupted","cause","NonEmptyString2k","isDie","failureOption","Option","S","is","some","none","getOrNull","update","progress","fork","self","fnc","scope","extend","forkDaemonReportRequestUnexpected","use","map","fiber","interruptible","forkScoped","provideService","fork2","dual","all","Operations","Context","TagMakeId","CleanupLive","void","schedule","Schedule","fixed","Duration","minutes","MainFiberSet","run","Layer","effectDiscard","provide","Live","provideMerge","toLayer","forkOperation","exports","forkOperationFunction","inp"],"sources":["../../src/services/Operations.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/services/Operations.d.ts

@@ -1,4 +1,4 @@
-import type { RequestFiberSet } from "@effect-app/infra-adapters/RequestFiberSet";
+import { RequestFiberSet } from "@effect-app/infra-adapters/RequestFiberSet";
 import { NonEmptyString2k } from "@effect-app/schema";
 import type { Fiber } from "effect-app";
 import { Context, Effect, Layer, Option, S } from "effect-app";
@@ -9,35 +9,50 @@ import { OperationsRepo } from "./OperationsRepo.js";
 declare const Operations_base: (abstract new (service: {
     cleanup: Effect.Effect<void[], never, never>;
     register: (title: NonEmptyString2k) => Effect.Effect<S.StringId, never, Scope.Scope>;
+    fork: <R, R2, E, E2, A, A2>(self: (id: OperationId) => Effect<A, E, R>, fnc: (id: OperationId) => Effect<A2, E2, R2>, title: NonEmptyString2k) => Effect<RunningOperation<A, E>, never, Exclude<R, Scope.Scope> | Exclude<R2, Scope.Scope>>;
+    fork2: {
+        (title: NonEmptyString2k): <R, E, A>(self: (opId: OperationId) => Effect<A, E, R>) => Effect<RunningOperation<A, E>, never, Exclude<R, Scope.Scope>>;
+        <R, E, A>(self: (opId: OperationId) => Effect<A, E, R>, title: NonEmptyString2k): Effect<RunningOperation<A, E>, never, Exclude<R, Scope.Scope>>;
+    };
     all: Effect<Operation[]>;
     find: (id: OperationId) => Effect<Option<Operation>>;
     update: (id: OperationId, progress: OperationProgress) => Effect.Effect<void, never, never>;
 }) => Readonly<{
     cleanup: Effect.Effect<void[], never, never>;
     register: (title: NonEmptyString2k) => Effect.Effect<S.StringId, never, Scope.Scope>;
+    fork: <R, R2, E, E2, A, A2>(self: (id: OperationId) => Effect<A, E, R>, fnc: (id: OperationId) => Effect<A2, E2, R2>, title: NonEmptyString2k) => Effect<RunningOperation<A, E>, never, Exclude<R, Scope.Scope> | Exclude<R2, Scope.Scope>>;
+    fork2: {
+        (title: NonEmptyString2k): <R, E, A>(self: (opId: OperationId) => Effect<A, E, R>) => Effect<RunningOperation<A, E>, never, Exclude<R, Scope.Scope>>;
+        <R, E, A>(self: (opId: OperationId) => Effect<A, E, R>, title: NonEmptyString2k): Effect<RunningOperation<A, E>, never, Exclude<R, Scope.Scope>>;
+    };
     all: Effect<Operation[]>;
     find: (id: OperationId) => Effect<Option<Operation>>;
     update: (id: OperationId, progress: OperationProgress) => Effect.Effect<void, never, never>;
 }> & Context.TagClassShape<"effect-app/Operations", {
     cleanup: Effect.Effect<void[], never, never>;
     register: (title: NonEmptyString2k) => Effect.Effect<S.StringId, never, Scope.Scope>;
+    fork: <R, R2, E, E2, A, A2>(self: (id: OperationId) => Effect<A, E, R>, fnc: (id: OperationId) => Effect<A2, E2, R2>, title: NonEmptyString2k) => Effect<RunningOperation<A, E>, never, Exclude<R, Scope.Scope> | Exclude<R2, Scope.Scope>>;
+    fork2: {
+        (title: NonEmptyString2k): <R, E, A>(self: (opId: OperationId) => Effect<A, E, R>) => Effect<RunningOperation<A, E>, never, Exclude<R, Scope.Scope>>;
+        <R, E, A>(self: (opId: OperationId) => Effect<A, E, R>, title: NonEmptyString2k): Effect<RunningOperation<A, E>, never, Exclude<R, Scope.Scope>>;
+    };
     all: Effect<Operation[]>;
     find: (id: OperationId) => Effect<Option<Operation>>;
     update: (id: OperationId, progress: OperationProgress) => Effect.Effect<void, never, never>;
 }>) & {
     toLayer: {
-        (): Layer<Operations, never, OperationsRepo>;
+        (): Layer<Operations, never, OperationsRepo | RequestFiberSet>;
         <E_1, R_1>(eff: Effect<Omit<Operations, keyof Context.TagClassShape<any, any>>, E_1, R_1>): Layer<Operations, E_1, R_1>;
     };
     toLayerScoped: {
-        (): Layer<Operations, never, OperationsRepo>;
+        (): Layer<Operations, never, OperationsRepo | RequestFiberSet>;
         <E_1, R_2>(eff: Effect<Context.TagClassShape<any, any>, E_1, R_2>): Layer<Operations, E_1, Exclude<R_2, Scope.Scope>>;
     };
     of: (service: Context.TagClassShape<any, any>) => Operations;
-    make: Effect<Operations, never, OperationsRepo>;
+    make: Effect<Operations, never, OperationsRepo | RequestFiberSet>;
 } & Context.Tag<Operations, Operations> & {
     cleanup: Effect<void[], never, Operations>;
-    register: (title: NonEmptyString2k) => Effect<S.StringId, never, Scope.Scope | Operations>;
+    register: (title: NonEmptyString2k) => Effect<S.StringId, never, Operations | Scope.Scope>;
     all: Effect<Operation[], never, Operations>;
     find: (id: S.StringId) => Effect<Option<Operation>, never, Operations>;
     update: (id: S.StringId, progress: OperationProgress) => Effect<void, never, Operations>;
@@ -45,10 +60,15 @@ declare const Operations_base: (abstract new (service: {
     use: <X>(body: (_: {
         cleanup: Effect.Effect<void[], never, never>;
         register: (title: NonEmptyString2k) => Effect.Effect<S.StringId, never, Scope.Scope>;
+        fork: <R, R2, E, E2, A, A2>(self: (id: OperationId) => Effect<A, E, R>, fnc: (id: OperationId) => Effect<A2, E2, R2>, title: NonEmptyString2k) => Effect<RunningOperation<A, E>, never, Exclude<R, Scope.Scope> | Exclude<R2, Scope.Scope>>;
+        fork2: {
+            (title: NonEmptyString2k): <R, E_1, A_1>(self: (opId: OperationId) => Effect<A_1, E_1, R>) => Effect<RunningOperation<A_1, E_1>, never, Exclude<R, Scope.Scope>>;
+            <R, E_2, A_2>(self: (opId: OperationId) => Effect<A_2, E_2, R>, title: NonEmptyString2k): Effect<RunningOperation<A_2, E_2>, never, Exclude<R, Scope.Scope>>;
+        };
         all: Effect<Operation[]>;
         find: (id: OperationId) => Effect<Option<Operation>>;
         update: (id: OperationId, progress: OperationProgress) => Effect.Effect<void, never, never>;
-    }) => X) => X extends Effect<infer A_1, infer E_2, infer R_4> ? Effect<A_1, E_2, R_4 | Operations> : Effect<X, never, Operations>;
+    }) => X) => X extends Effect<infer A_1_1, infer E_2_1, infer R_4> ? Effect<A_1_1, E_2_1, Operations | R_4> : Effect<X, never, Operations>;
 };
 export declare class Operations extends Operations_base {
     private static readonly CleanupLive;
@@ -63,10 +83,5 @@ export declare const forkOperation: {
     <R, E, A>(self: Effect<A, E, R>, title: NonEmptyString2k): Effect<RunningOperation<A, E>, never, Operations | Exclude<R, Scope.Scope>>;
 };
 export declare function forkOperationFunction<R, E, A, Inp>(fnc: (inp: Inp) => Effect<A, E, R>, title: NonEmptyString2k): (inp: Inp) => Effect<RunningOperation<A, E>, never, Operations | Exclude<R, Scope.Scope>>;
-export declare const forkOperation2: {
-    (title: NonEmptyString2k): <R, E, A>(self: (opId: OperationId) => Effect<A, E, R>) => Effect<RunningOperation<A, E>, never, Operations | Exclude<R, Scope.Scope>>;
-    <R, E, A>(self: (opId: OperationId) => Effect<A, E, R>, title: NonEmptyString2k): Effect<RunningOperation<A, E>, never, Operations | Exclude<R, Scope.Scope>>;
-};
-export declare function forkOperationWithEffect<R, R2, E, E2, A, A2>(self: (id: OperationId) => Effect<A, E, R>, fnc: (id: OperationId) => Effect<A2, E2, R2>, title: NonEmptyString2k): Effect<RunningOperation<A, E>, never, Operations | RequestFiberSet | Exclude<R, Scope.Scope> | Exclude<R2, Scope.Scope>>;
 export {};
 //# sourceMappingURL=Operations.d.ts.map

package/dist/services/Operations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Operations.d.ts","sourceRoot":"","sources":["../../src/services/Operations.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Operations.d.ts","sourceRoot":"","sources":["../../src/services/Operations.ts"],"names":[],"mappings":"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"}

package/dist/services/Operations.js

@@ -1,5 +1,6 @@
-import { annotateLogscoped, flatMap } from "@effect-app/core/Effect";
+import { annotateLogscoped } from "@effect-app/core/Effect";
 import { dual, pipe } from "@effect-app/core/Function";
+import { RequestFiberSet } from "@effect-app/infra-adapters/RequestFiberSet";
 import { reportError } from "@effect-app/infra/errorReporter";
 import { NonEmptyString2k } from "@effect-app/schema";
 import { subHours } from "date-fns";
@@ -14,7 +15,9 @@ import { where } from "./query.js";
 const reportAppError = reportError("Operations.Cleanup");
 const make = Effect.gen(function* () {
     const repo = yield* OperationsRepo;
+    const reqFiberSet = yield* RequestFiberSet;
     const makeOp = Effect.sync(() => OperationId.make());
+    const register = (title) => Effect.tap(makeOp, (id) => Effect.andThen(annotateLogscoped("operationId", id), Effect.acquireRelease(addOp(id, title), (_, exit) => finishOp(id, exit))));
     const cleanup = Effect.sync(() => subHours(new Date(), 1)).pipe(Effect.andThen((before) => repo.query(where("updatedAt", "lt", before.toISOString()))), Effect.andThen((ops) => pipe(ops, batch(100, Effect.succeed, (items) => repo.removeAndPublish(items)))), Effect.withSpan("Operations.cleanup"));
     function addOp(id, title) {
         return repo.save(new Operation({ id, title })).pipe(Effect.orDie);
@@ -46,9 +49,22 @@ const make = Effect.gen(function* () {
     function update(id, progress) {
         return Effect.flatMap(repo.get(id).pipe(Effect.orDie), (_) => repo.save(copy(_, { updatedAt: new Date(), progress })).pipe(Effect.orDie));
     }
+    function fork(self, fnc, title) {
+        return Effect
+            .flatMap(Scope.make(), (scope) => register(title)
+            .pipe(Scope.extend(scope), Effect.flatMap((id) => forkDaemonReportRequestUnexpected(Scope.use(self(id).pipe(Effect.withSpan(title)), scope))
+            .pipe(Effect.map((fiber) => ({ fiber, id })))), Effect.tap(({ id }) => Effect.interruptible(fnc(id)).pipe(Effect.forkScoped, Scope.extend(scope)))))
+            .pipe(Effect.provideService(RequestFiberSet, reqFiberSet));
+    }
+    const fork2 = dual(2, (self, title) => Effect.flatMap(Scope.make(), (scope) => register(title)
+        .pipe(Scope.extend(scope), Effect
+        .flatMap((id) => forkDaemonReportRequestUnexpected(Scope.use(self(id).pipe(Effect.withSpan(title)), scope))
+        .pipe(Effect.map((fiber) => ({ fiber, id })))))));
     return {
         cleanup,
-        register: (title) => Effect.tap(makeOp, (id) => Effect.andThen(annotateLogscoped("operationId", id), Effect.acquireRelease(addOp(id, title), (_, exit) => finishOp(id, exit)))),
+        register,
+        fork,
+        fork2,
         all: repo.all,
         find: findOp,
         update
@@ -66,7 +82,7 @@ export class Operations extends Context.TagMakeId("effect-app/Operations", make)
         }
     }), Effect.schedule(Schedule.fixed(Duration.minutes(20))), Effect.map((_) => _), MainFiberSet.run))
         .pipe(Layer.effectDiscard, Layer.provide(MainFiberSet.Live));
-    static Live = this.CleanupLive.pipe(Layer.provideMerge(this.toLayer()));
+    static Live = this.CleanupLive.pipe(Layer.provideMerge(this.toLayer()), Layer.provide(RequestFiberSet.Live));
 }
 export const forkOperation = dual(2, (self, title) => Effect.flatMap(Scope.make(), (scope) => Operations
     .register(title)
@@ -76,15 +92,4 @@ export const forkOperation = dual(2, (self, title) => Effect.flatMap(Scope.make(
 export function forkOperationFunction(fnc, title) {
     return (inp) => fnc(inp).pipe((_) => forkOperation(_, title));
 }
-export const forkOperation2 = dual(2, (self, title) => flatMap(Operations, (Operations) => Effect.flatMap(Scope.make(), (scope) => Operations
-    .register(title)
-    .pipe(Scope.extend(scope), Effect
-    .flatMap((id) => forkDaemonReportRequestUnexpected(Scope.use(self(id).pipe(Effect.withSpan(title)), scope))
-    .pipe(Effect.map((fiber) => ({ fiber, id }))))))));
-export function forkOperationWithEffect(self, fnc, title) {
-    return Effect.flatMap(Operations, (Operations) => Effect.flatMap(Scope.make(), (scope) => Operations
-        .register(title)
-        .pipe(Scope.extend(scope), Effect.flatMap((id) => forkDaemonReportRequestUnexpected(Scope.use(self(id).pipe(Effect.withSpan(title)), scope))
-        .pipe(Effect.map((fiber) => ({ fiber, id })))), Effect.tap(({ id }) => Effect.interruptible(fnc(id)).pipe(Effect.forkScoped, Scope.extend(scope))))));
-}
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Operations.js","sourceRoot":"","sources":["../../src/services/Operations.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Operations.js","sourceRoot":"","sources":["../../src/services/Operations.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "1.39.0",
+  "version": "1.40.0",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -21,9 +21,9 @@
     "pure-rand": "6.1.0",
     "redlock": "^4.2.0",
     "@effect-app/core": "1.17.0",
+    "@effect-app/infra-adapters": "1.19.0",
     "effect-app": "1.28.0",
-    "@effect-app/schema": "1.19.0",
-    "@effect-app/infra-adapters": "1.19.0"
+    "@effect-app/schema": "1.19.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.25.7",

package/src/services/Operations.ts

@@ -1,6 +1,6 @@
-import { annotateLogscoped, flatMap } from "@effect-app/core/Effect"
+import { annotateLogscoped } from "@effect-app/core/Effect"
 import { dual, pipe } from "@effect-app/core/Function"
-import type { RequestFiberSet } from "@effect-app/infra-adapters/RequestFiberSet"
+import { RequestFiberSet } from "@effect-app/infra-adapters/RequestFiberSet"
 import { reportError } from "@effect-app/infra/errorReporter"
 import { NonEmptyString2k } from "@effect-app/schema"
 import { subHours } from "date-fns"
@@ -19,8 +19,19 @@ const reportAppError = reportError("Operations.Cleanup")
 
 const make = Effect.gen(function*() {
   const repo = yield* OperationsRepo
+  const reqFiberSet = yield* RequestFiberSet
   const makeOp = Effect.sync(() => OperationId.make())
 
+  const register = (title: NonEmptyString2k) =>
+    Effect.tap(
+      makeOp,
+      (id) =>
+        Effect.andThen(
+          annotateLogscoped("operationId", id),
+          Effect.acquireRelease(addOp(id, title), (_, exit) => finishOp(id, exit))
+        )
+    )
+
   const cleanup = Effect.sync(() => subHours(new Date(), 1)).pipe(
     Effect.andThen((before) => repo.query(where("updatedAt", "lt", before.toISOString()))),
     Effect.andThen((ops) => pipe(ops, batch(100, Effect.succeed, (items) => repo.removeAndPublish(items)))),
@@ -68,18 +79,75 @@ const make = Effect.gen(function*() {
       (_) => repo.save(copy(_, { updatedAt: new Date(), progress })).pipe(Effect.orDie)
     )
   }
+
+  function fork<R, R2, E, E2, A, A2>(
+    self: (id: OperationId) => Effect<A, E, R>,
+    fnc: (id: OperationId) => Effect<A2, E2, R2>,
+    title: NonEmptyString2k
+  ): Effect<
+    RunningOperation<A, E>,
+    never,
+    Exclude<R, Scope.Scope> | Exclude<R2, Scope.Scope>
+  > {
+    return Effect
+      .flatMap(
+        Scope.make(),
+        (scope) =>
+          register(title)
+            .pipe(
+              Scope.extend(scope),
+              Effect.flatMap((id) =>
+                forkDaemonReportRequestUnexpected(Scope.use(
+                  self(id).pipe(Effect.withSpan(title)),
+                  scope
+                ))
+                  .pipe(Effect.map((fiber): RunningOperation<A, E> => ({ fiber, id })))
+              ),
+              Effect.tap(({ id }) =>
+                Effect.interruptible(fnc(id)).pipe(
+                  Effect.forkScoped,
+                  Scope.extend(scope)
+                )
+              )
+            )
+      )
+      .pipe(Effect.provideService(RequestFiberSet, reqFiberSet))
+  }
+
+  const fork2: {
+    (title: NonEmptyString2k): <R, E, A>(
+      self: (opId: OperationId) => Effect<A, E, R>
+    ) => Effect<RunningOperation<A, E>, never, Exclude<R, Scope.Scope>>
+    <R, E, A>(
+      self: (opId: OperationId) => Effect<A, E, R>,
+      title: NonEmptyString2k
+    ): Effect<RunningOperation<A, E>, never, Exclude<R, Scope.Scope>>
+  } = dual(
+    2,
+    <R, E, A>(self: (opId: OperationId) => Effect<A, E, R>, title: NonEmptyString2k) =>
+      Effect.flatMap(
+        Scope.make(),
+        (scope) =>
+          register(title)
+            .pipe(
+              Scope.extend(scope),
+              Effect
+                .flatMap((id) =>
+                  forkDaemonReportRequestUnexpected(Scope.use(
+                    self(id).pipe(Effect.withSpan(title)),
+                    scope
+                  ))
+                    .pipe(Effect.map((fiber): RunningOperation<A, E> => ({ fiber, id })))
+                )
+            )
+      )
+  )
+
   return {
     cleanup,
-    register: (title: NonEmptyString2k) =>
-      Effect.tap(
-        makeOp,
-        (id) =>
-          Effect.andThen(
-            annotateLogscoped("operationId", id),
-            Effect.acquireRelease(addOp(id, title), (_, exit) => finishOp(id, exit))
-          )
-      ),
-
+    register,
+    fork,
+    fork2,
     all: repo.all,
     find: findOp,
     update
@@ -106,7 +174,7 @@ export class Operations extends Context.TagMakeId("effect-app/Operations", make)
     )
     .pipe(Layer.effectDiscard, Layer.provide(MainFiberSet.Live))
 
-  static readonly Live = this.CleanupLive.pipe(Layer.provideMerge(this.toLayer()))
+  static readonly Live = this.CleanupLive.pipe(Layer.provideMerge(this.toLayer()), Layer.provide(RequestFiberSet.Live))
 }
 
 export interface RunningOperation<A, E> {
@@ -147,68 +215,3 @@ export const forkOperation: {
 export function forkOperationFunction<R, E, A, Inp>(fnc: (inp: Inp) => Effect<A, E, R>, title: NonEmptyString2k) {
   return (inp: Inp) => fnc(inp).pipe((_) => forkOperation(_, title))
 }
-
-export const forkOperation2: {
-  (title: NonEmptyString2k): <R, E, A>(
-    self: (opId: OperationId) => Effect<A, E, R>
-  ) => Effect<RunningOperation<A, E>, never, Operations | Exclude<R, Scope.Scope>>
-  <R, E, A>(
-    self: (opId: OperationId) => Effect<A, E, R>,
-    title: NonEmptyString2k
-  ): Effect<RunningOperation<A, E>, never, Operations | Exclude<R, Scope.Scope>>
-} = dual(
-  2,
-  <R, E, A>(self: (opId: OperationId) => Effect<A, E, R>, title: NonEmptyString2k) =>
-    flatMap(Operations, (Operations) =>
-      Effect.flatMap(
-        Scope.make(),
-        (scope) =>
-          Operations
-            .register(title)
-            .pipe(
-              Scope.extend(scope),
-              Effect
-                .flatMap((id) =>
-                  forkDaemonReportRequestUnexpected(Scope.use(
-                    self(id).pipe(Effect.withSpan(title)),
-                    scope
-                  ))
-                    .pipe(Effect.map((fiber): RunningOperation<A, E> => ({ fiber, id })))
-                )
-            )
-      ))
-)
-
-export function forkOperationWithEffect<R, R2, E, E2, A, A2>(
-  self: (id: OperationId) => Effect<A, E, R>,
-  fnc: (id: OperationId) => Effect<A2, E2, R2>,
-  title: NonEmptyString2k
-): Effect<
-  RunningOperation<A, E>,
-  never,
-  Operations | RequestFiberSet | Exclude<R, Scope.Scope> | Exclude<R2, Scope.Scope>
-> {
-  return Effect.flatMap(Operations, (Operations) =>
-    Effect.flatMap(
-      Scope.make(),
-      (scope) =>
-        Operations
-          .register(title)
-          .pipe(
-            Scope.extend(scope),
-            Effect.flatMap((id) =>
-              forkDaemonReportRequestUnexpected(Scope.use(
-                self(id).pipe(Effect.withSpan(title)),
-                scope
-              ))
-                .pipe(Effect.map((fiber): RunningOperation<A, E> => ({ fiber, id })))
-            ),
-            Effect.tap(({ id }) =>
-              Effect.interruptible(fnc(id)).pipe(
-                Effect.forkScoped,
-                Scope.extend(scope)
-              )
-            )
-          )
-    ))
-}