@effect-app/infra 1.0.10 → 1.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +16 -0
- package/_cjs/services/Operations.cjs +4 -3
- package/_cjs/services/Operations.cjs.map +1 -1
- package/dist/services/Operations.d.ts +2 -1
- package/dist/services/Operations.d.ts.map +1 -1
- package/dist/services/Operations.js +10 -6
- package/package.json +10 -10
- package/src/services/Operations.ts +37 -7
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,21 @@
|
|
|
1
1
|
# @effect-app/infra
|
|
2
2
|
|
|
3
|
+
## 1.1.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- dd1f45f: feat: build RequestFiberSet usage into forkOperation
|
|
8
|
+
|
|
9
|
+
## 1.0.11
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- Updated dependencies [9c69b5b]
|
|
14
|
+
- @effect-app/core@1.0.3
|
|
15
|
+
- @effect-app/infra-adapters@1.0.7
|
|
16
|
+
- effect-app@1.0.5
|
|
17
|
+
- @effect-app/schema@1.0.5
|
|
18
|
+
|
|
3
19
|
## 1.0.10
|
|
4
20
|
|
|
5
21
|
### Patch Changes
|
|
@@ -8,6 +8,7 @@ exports.forkOperationFunction = forkOperationFunction;
|
|
|
8
8
|
exports.forkOperationWithEffect = forkOperationWithEffect;
|
|
9
9
|
var _Effect = require("@effect-app/core/Effect");
|
|
10
10
|
var _Function = require("@effect-app/core/Function");
|
|
11
|
+
var _RequestFiberSet = require("@effect-app/infra-adapters/RequestFiberSet");
|
|
11
12
|
var _errorReporter = require("@effect-app/infra/errorReporter");
|
|
12
13
|
var _schema = require("@effect-app/schema");
|
|
13
14
|
var _dateFns = require("date-fns");
|
|
@@ -85,12 +86,12 @@ class Operations extends _effectApp.Context.TagMakeId("effect-app/Operations", m
|
|
|
85
86
|
static Live = this.CleanupLive.pipe(_effectApp.Layer.provideMerge(this.toLayer()));
|
|
86
87
|
}
|
|
87
88
|
exports.Operations = Operations;
|
|
88
|
-
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.tap(() => (0, _reportError.forkDaemonReportRequestUnexpected)(Scope.use(self, scope))))));
|
|
89
|
+
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.tap(() => (0, _reportError.forkDaemonReportRequestUnexpected)(Scope.use(self.pipe(_effectApp.Effect.withSpan(title), _RequestFiberSet.RequestFiberSet.setRootParentSpan), scope)).pipe(_effectApp.Effect.andThen(_RequestFiberSet.RequestFiberSet.add))))));
|
|
89
90
|
function forkOperationFunction(fnc, title) {
|
|
90
91
|
return inp => fnc(inp).pipe(_ => forkOperation(_, title));
|
|
91
92
|
}
|
|
92
|
-
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.tap(id => (0, _reportError.forkDaemonReportRequestUnexpected)(Scope.use(self(id), scope)))))));
|
|
93
|
+
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.tap(id => (0, _reportError.forkDaemonReportRequestUnexpected)(Scope.use(self(id).pipe(_effectApp.Effect.withSpan(title), _RequestFiberSet.RequestFiberSet.setRootParentSpan), scope)).pipe(_effectApp.Effect.andThen(_RequestFiberSet.RequestFiberSet.add)))))));
|
|
93
94
|
function forkOperationWithEffect(self, fnc, title) {
|
|
94
|
-
return _effectApp.Effect.flatMap(Operations, Operations => _effectApp.Effect.flatMap(Scope.make(), scope => Operations.register(title).pipe(Scope.extend(scope), _effectApp.Effect.tap(opId => (0, _reportError.forkDaemonReportRequestUnexpected)(Scope.use(self(opId), scope))), _effectApp.Effect.tap(opId => _effectApp.Effect.interruptible(fnc(opId)).pipe(_effectApp.Effect.forkScoped, Scope.extend(scope))))));
|
|
95
|
+
return _effectApp.Effect.flatMap(Operations, Operations => _effectApp.Effect.flatMap(Scope.make(), scope => Operations.register(title).pipe(Scope.extend(scope), _effectApp.Effect.tap(opId => (0, _reportError.forkDaemonReportRequestUnexpected)(Scope.use(self(opId).pipe(_effectApp.Effect.withSpan(title), _RequestFiberSet.RequestFiberSet.setRootParentSpan), scope)).pipe(_effectApp.Effect.andThen(_RequestFiberSet.RequestFiberSet.add))), _effectApp.Effect.tap(opId => _effectApp.Effect.interruptible(fnc(opId)).pipe(_effectApp.Effect.forkScoped, Scope.extend(scope))))));
|
|
95
96
|
}
|
|
96
97
|
//# sourceMappingURL=Operations.cjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Operations.cjs","names":["_Effect","require","_Function","_errorReporter","_schema","_dateFns","_effectApp","_Operations","_MainFiberSet","Scope","_interopRequireWildcard","_reportError","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","reportAppError","reportError","make","Effect","sync","ops","Map","makeOp","OperationId","cleanup","before","subHours","Date","entries","forEach","id","op","lastChanged","Option","fromNullable","updatedAt","pipe","getOrElse","createdAt","delete","withSpan","addOp","title","Operation","findOp","finishOp","exit","flatMap","_","isNone","Error","copy","value","result","Exit","isSuccess","Success","Failure","message","Cause","isInterrupted","cause","NonEmptyString2k","isDie","failureOption","S","is","some","none","getOrNull","update","progress","register","tap","andThen","annotateLogscoped","acquireRelease","all","values","find","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","forkOperationFunction","fnc","inp","forkOperation2","forkOperationWithEffect","opId","interruptible","forkScoped"],"sources":["../../src/services/Operations.ts"],"sourcesContent":[null],"mappings":";;;;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,SAAA,GAAAD,OAAA;AACA,IAAAE,
|
|
1
|
+
{"version":3,"file":"Operations.cjs","names":["_Effect","require","_Function","_RequestFiberSet","_errorReporter","_schema","_dateFns","_effectApp","_Operations","_MainFiberSet","Scope","_interopRequireWildcard","_reportError","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","reportAppError","reportError","make","Effect","sync","ops","Map","makeOp","OperationId","cleanup","before","subHours","Date","entries","forEach","id","op","lastChanged","Option","fromNullable","updatedAt","pipe","getOrElse","createdAt","delete","withSpan","addOp","title","Operation","findOp","finishOp","exit","flatMap","_","isNone","Error","copy","value","result","Exit","isSuccess","Success","Failure","message","Cause","isInterrupted","cause","NonEmptyString2k","isDie","failureOption","S","is","some","none","getOrNull","update","progress","register","tap","andThen","annotateLogscoped","acquireRelease","all","values","find","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","RequestFiberSet","setRootParentSpan","add","forkOperationFunction","fnc","inp","forkOperation2","forkOperationWithEffect","opId","interruptible","forkScoped"],"sources":["../../src/services/Operations.ts"],"sourcesContent":[null],"mappings":";;;;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,SAAA,GAAAD,OAAA;AACA,IAAAE,gBAAA,GAAAF,OAAA;AACA,IAAAG,cAAA,GAAAH,OAAA;AAEA,IAAAI,OAAA,GAAAJ,OAAA;AACA,IAAAK,QAAA,GAAAL,OAAA;AACA,IAAAM,UAAA,GAAAN,OAAA;AAEA,IAAAO,WAAA,GAAAP,OAAA;AACA,IAAAQ,aAAA,GAAAR,OAAA;AACA,IAAAS,KAAA,GAAAC,uBAAA,CAAAV,OAAA;AACA,IAAAW,YAAA,GAAAX,OAAA;AAAyE,SAAAY,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAH,wBAAAG,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,OAAAC,cAAA,CAAAC,IAAA,CAAAhB,CAAA,EAAAc,CAAA,SAAAG,CAAA,GAAAP,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAG,CAAA,KAAAA,CAAA,CAAAV,GAAA,IAAAU,CAAA,CAAAC,GAAA,IAAAP,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAG,CAAA,IAAAT,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAe,GAAA,CAAAlB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAEzE,MAAMW,cAAc,GAAG,IAAAC,0BAAW,EAAC,oBAAoB,CAAC;AAExD,MAAMC,IAAI,GAAGC,iBAAM,CAACC,IAAI,CAAC,MAAK;EAC5B,MAAMC,GAAG,GAAG,IAAIC,GAAG,EAA0B;EAC7C,MAAMC,MAAM,GAAGJ,iBAAM,CAACC,IAAI,CAAC,MAAMI,uBAAW,CAACN,IAAI,EAAE,CAAC;EAEpD,MAAMO,OAAO,GAAGN,iBAAM,CACnBC,IAAI,CAAC,MAAK;IACT,MAAMM,MAAM,GAAG,IAAAC,iBAAQ,EAAC,IAAIC,IAAI,EAAE,EAAE,CAAC,CAAC;IACrC,CAAC,GAAGP,GAAG,CACLQ,OAAO,EAAE,CAAC,CACVC,OAAO,CAAC,CAAC,CAACC,EAAE,EAAEC,EAAE,CAAC,KAAI;MACpB,MAAMC,WAAW,GAAGC,iBAAM,CAACC,YAAY,CAACH,EAAE,CAACI,SAAS,CAAC,CAACC,IAAI,CAACH,iBAAM,CAACI,SAAS,CAAC,MAAMN,EAAE,CAACO,SAAS,CAAC,CAAC;MAChG,IAAIN,WAAW,GAAGP,MAAM,EAAE;QACxBL,GAAG,CAACmB,MAAM,CAACT,EAAE,CAAC;MAChB;IACF,CAAC,CAAC;EACN,CAAC,CAAC,CACDM,IAAI,CAAClB,iBAAM,CAACsB,QAAQ,CAAC,oBAAoB,CAAC,CAAC;EAE9C,SAASC,KAAKA,CAACX,EAAe,EAAEY,KAAuB;IACrD,OAAOxB,iBAAM,CAACC,IAAI,CAAC,MAAK;MACtBC,GAAG,CAACN,GAAG,CAACgB,EAAE,EAAE,IAAIa,qBAAS,CAAC;QAAEb,EAAE;QAAEY;MAAK,CAAE,CAAC,CAAC;IAC3C,CAAC,CAAC;EACJ;EACA,SAASE,MAAMA,CAACd,EAAe;IAC7B,OAAOZ,iBAAM,CAACC,IAAI,CAAC,MAAMc,iBAAM,CAACC,YAAY,CAACd,GAAG,CAACjB,GAAG,CAAC2B,EAAE,CAAC,CAAC,CAAC;EAC5D;EACA,SAASe,QAAQA,CAACf,EAAe,EAAEgB,IAA4B;IAC7D,OAAO5B,iBAAM,CAAC6B,OAAO,CAACH,MAAM,CAACd,EAAE,CAAC,EAAGkB,CAAC,IAClC9B,iBAAM,CAACC,IAAI,CAAC,MAAK;MACf,IAAIc,iBAAM,CAACgB,MAAM,CAACD,CAAC,CAAC,EAAE;QACpB,MAAM,IAAIE,KAAK,CAAC,WAAW,CAAC;MAC9B;MACA9B,GAAG,CAACN,GAAG,CACLgB,EAAE,EACF,IAAAqB,eAAI,EAACH,CAAC,CAACI,KAAK,EAAE;QACZjB,SAAS,EAAE,IAAIR,IAAI,EAAE;QACrB0B,MAAM,EAAEC,eAAI,CAACC,SAAS,CAACT,IAAI,CAAC,GACxB,IAAIU,mBAAO,EAAE,GACb,IAAIC,mBAAO,CAAC;UACZC,OAAO,EAAEC,gBAAK,CAACC,aAAa,CAACd,IAAI,CAACe,KAAK,CAAC,GACpC,IAAAC,wBAAgB,EAAC,aAAa,CAAC,GAC/BH,gBAAK,CAACI,KAAK,CAACjB,IAAI,CAACe,KAAK,CAAC,GACvB,IAAAC,wBAAgB,EAAC,eAAe,CAAC,GACjCH,gBAAK,CACJK,aAAa,CAAClB,IAAI,CAACe,KAAK,CAAC,CACzBzB,IAAI,CACHH,iBAAM,CAACc,OAAO,CAAEC,CAAC,IACf,OAAOA,CAAC,KAAK,QAAQ,IAAIA,CAAC,KAAK,IAAI,IAAI,SAAS,IAAIA,CAAC,IAAIiB,YAAC,CAACC,EAAE,CAACJ,wBAAgB,CAAC,CAACd,CAAC,CAACU,OAAO,CAAC,GACtFzB,iBAAM,CAACkC,IAAI,CAACnB,CAAC,CAACU,OAAO,CAAC,GACtBzB,iBAAM,CAACmC,IAAI,EAAE,CAClB,EACDnC,iBAAM,CAACoC,SAAS;SAEvB;OACJ,CAAC,CACH;IACH,CAAC,CAAC,CAAC;EACP;EACA,SAASC,MAAMA,CAACxC,EAAe,EAAEyC,QAA2B;IAC1D,OAAOrD,iBAAM,CAAC6B,OAAO,CAACH,MAAM,CAACd,EAAE,CAAC,EAAGkB,CAAC,IAClC9B,iBAAM,CAACC,IAAI,CAAC,MAAK;MACf,IAAIc,iBAAM,CAACgB,MAAM,CAACD,CAAC,CAAC,EAAE;QACpB,MAAM,IAAIE,KAAK,CAAC,WAAW,CAAC;MAC9B;MACA9B,GAAG,CAACN,GAAG,CAACgB,EAAE,EAAE,IAAAqB,eAAI,EAACH,CAAC,CAACI,KAAK,EAAE;QAAEjB,SAAS,EAAE,IAAIR,IAAI,EAAE;QAAE4C;MAAQ,CAAE,CAAC,CAAC;IACjE,CAAC,CAAC,CAAC;EACP;EACA,OAAO;IACL/C,OAAO;IACPgD,QAAQ,EAAG9B,KAAuB,IAChCxB,iBAAM,CAACuD,GAAG,CACRnD,MAAM,EACLQ,EAAE,IACDZ,iBAAM,CAACwD,OAAO,CACZ,IAAAC,yBAAiB,EAAC,aAAa,EAAE7C,EAAE,CAAC,EACpCZ,iBAAM,CAAC0D,cAAc,CAACnC,KAAK,CAACX,EAAE,EAAEY,KAAK,CAAC,EAAE,CAACM,CAAC,EAAEF,IAAI,KAAKD,QAAQ,CAACf,EAAE,EAAEgB,IAAI,CAAC,CAAC,CACzE,CACJ;IAEH+B,GAAG,EAAE3D,iBAAM,CAACC,IAAI,CAAC,MAAM,CAAC,GAAGC,GAAG,CAAC0D,MAAM,EAAE,CAAC,CAAC;IACzCC,IAAI,EAAEnC,MAAM;IACZ0B;GACD;AACH,CAAC,CAAC;AAEI,MAAOU,UAAW,SAAQC,kBAAO,CAACC,SAAS,CAAC,uBAAuB,EAAEjE,IAAI,CAAC,EAAc;EACpF,OAAgBkE,WAAW,GAAG,IAAI,CACvCC,GAAG,CAAEpC,CAAC,IACLA,CAAC,CAACxB,OAAO,CAACY,IAAI,CACZlB,iBAAM,CAAC4B,IAAI,EACX5B,iBAAM,CACH6B,OAAO,CAAEC,CAAC,IAAI;IACb,IAAIM,eAAI,CAACC,SAAS,CAACP,CAAC,CAAC,EAAE;MACrB,OAAO9B,iBAAM,CAACmE,IAAI;IACpB,CAAC,MAAM;MACL,OAAOtE,cAAc,CAACiC,CAAC,CAACa,KAAK,CAAC;IAChC;EACF,CAAC,CAAC,EACJ3C,iBAAM,CAACoE,QAAQ,CAACC,mBAAQ,CAACC,KAAK,CAACC,mBAAQ,CAACC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EACrDxE,iBAAM,CAACyE,GAAG,CAAE3C,CAAC,IAAKA,CAAU,CAAC,EAC7B4C,0BAAY,CAACC,GAAG,CACjB,CACF,CACAzD,IAAI,CAAC0D,gBAAK,CAACC,aAAa,EAAED,gBAAK,CAACE,OAAO,CAACJ,0BAAY,CAACK,IAAI,CAAC,CAAC;EAE9D,OAAgBA,IAAI,GAAG,IAAI,CAACd,WAAW,CAAC/C,IAAI,CAAC0D,gBAAK,CAACI,YAAY,CAAC,IAAI,CAACC,OAAO,EAAE,CAAC,CAAC;;;AAG3E,MAAMC,aAAa,GAAAC,OAAA,CAAAD,aAAA,GAQtB,IAAAE,cAAI,EACN,CAAC,EACD,CAAUC,IAAqB,EAAE7D,KAAuB,KACtDxB,iBAAM,CAAC6B,OAAO,CACZvD,KAAK,CAACyB,IAAI,EAAE,EACXuF,KAAK,IACJxB,UAAU,CACPR,QAAQ,CAAC9B,KAAK,CAAC,CACfN,IAAI,CACH5C,KAAK,CAACiH,MAAM,CAACD,KAAK,CAAC,EACnBtF,iBAAM,CACHuD,GAAG,CAAC,MACH,IAAAiC,8CAAiC,EAAClH,KAAK,CAAC4F,GAAG,CACzCmB,IAAI,CAACnE,IAAI,CACPlB,iBAAM,CAACsB,QAAQ,CAACE,KAAK,CAAC,EACtBiE,gCAAe,CAACC,iBAAiB,CAClC,EACDJ,KAAK,CACN,CAAC,CACCpE,IAAI,CAAClB,iBAAM,CAACwD,OAAO,CAACiC,gCAAe,CAACE,GAAG,CAAC,CAAC,CAC7C,CACJ,CACN,CACJ;AAEK,SAAUC,qBAAqBA,CAAeC,GAAkC,EAAErE,KAAuB;EAC7G,OAAQsE,GAAQ,IAAKD,GAAG,CAACC,GAAG,CAAC,CAAC5E,IAAI,CAAEY,CAAC,IAAKoD,aAAa,CAACpD,CAAC,EAAEN,KAAK,CAAC,CAAC;AACpE;AAEO,MAAMuE,cAAc,GAAAZ,OAAA,CAAAY,cAAA,GAQvB,IAAAX,cAAI,EACN,CAAC,EACD,CAAUC,IAA4C,EAAE7D,KAAuB,KAC7E,IAAAK,eAAO,EAACiC,UAAU,EAAGA,UAAU,IAC7B9D,iBAAM,CAAC6B,OAAO,CACZvD,KAAK,CAACyB,IAAI,EAAE,EACXuF,KAAK,IACJxB,UAAU,CACPR,QAAQ,CAAC9B,KAAK,CAAC,CACfN,IAAI,CACH5C,KAAK,CAACiH,MAAM,CAACD,KAAK,CAAC,EACnBtF,iBAAM,CACHuD,GAAG,CAAE3C,EAAE,IACN,IAAA4E,8CAAiC,EAAClH,KAAK,CAAC4F,GAAG,CACzCmB,IAAI,CAACzE,EAAE,CAAC,CACLM,IAAI,CACHlB,iBAAM,CAACsB,QAAQ,CAACE,KAAK,CAAC,EACtBiE,gCAAe,CAACC,iBAAiB,CAClC,EACHJ,KAAK,CACN,CAAC,CACCpE,IAAI,CAAClB,iBAAM,CAACwD,OAAO,CAACiC,gCAAe,CAACE,GAAG,CAAC,CAAC,CAC7C,CACJ,CACN,CAAC,CACP;AAEK,SAAUK,uBAAuBA,CACrCX,IAA0C,EAC1CQ,GAA4C,EAC5CrE,KAAuB;EAEvB,OAAOxB,iBAAM,CAAC6B,OAAO,CAACiC,UAAU,EAAGA,UAAU,IAC3C9D,iBAAM,CAAC6B,OAAO,CACZvD,KAAK,CAACyB,IAAI,EAAE,EACXuF,KAAK,IACJxB,UAAU,CACPR,QAAQ,CAAC9B,KAAK,CAAC,CACfN,IAAI,CACH5C,KAAK,CAACiH,MAAM,CAACD,KAAK,CAAC,EACnBtF,iBAAM,CAACuD,GAAG,CAAE0C,IAAI,IACd,IAAAT,8CAAiC,EAAClH,KAAK,CAAC4F,GAAG,CACzCmB,IAAI,CAACY,IAAI,CAAC,CAAC/E,IAAI,CAAClB,iBAAM,CAACsB,QAAQ,CAACE,KAAK,CAAC,EAAEiE,gCAAe,CAACC,iBAAiB,CAAC,EAC1EJ,KAAK,CACN,CAAC,CACCpE,IAAI,CAAClB,iBAAM,CAACwD,OAAO,CAACiC,gCAAe,CAACE,GAAG,CAAC,CAAC,CAC7C,EACD3F,iBAAM,CAACuD,GAAG,CAAE0C,IAAI,IACdjG,iBAAM,CAACkG,aAAa,CAACL,GAAG,CAACI,IAAI,CAAC,CAAC,CAAC/E,IAAI,CAClClB,iBAAM,CAACmG,UAAU,EACjB7H,KAAK,CAACiH,MAAM,CAACD,KAAK,CAAC,CACpB,CACF,CACF,CACN,CAAC;AACN","ignoreList":[]}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { RequestFiberSet } from "@effect-app/infra-adapters/RequestFiberSet";
|
|
1
2
|
import type { StringId } from "@effect-app/schema";
|
|
2
3
|
import { NonEmptyString2k } from "@effect-app/schema";
|
|
3
4
|
import { Context, Effect, Layer, Option } from "effect-app";
|
|
@@ -61,6 +62,6 @@ export declare const forkOperation2: {
|
|
|
61
62
|
(title: NonEmptyString2k): <R, E, A>(self: (opId: OperationId) => Effect<A, E, R>) => Effect<StringId, never, Operations | Exclude<R, Scope.Scope>>;
|
|
62
63
|
<R, E, A>(self: (opId: OperationId) => Effect<A, E, R>, title: NonEmptyString2k): Effect<StringId, never, Operations | Exclude<R, Scope.Scope>>;
|
|
63
64
|
};
|
|
64
|
-
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<StringId, never, Operations | Exclude<R, Scope.Scope> | Exclude<R2, Scope.Scope>>;
|
|
65
|
+
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<StringId, never, Operations | RequestFiberSet | Exclude<R, Scope.Scope> | Exclude<R2, Scope.Scope>>;
|
|
65
66
|
export {};
|
|
66
67
|
//# sourceMappingURL=Operations.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Operations.d.ts","sourceRoot":"","sources":["../../src/services/Operations.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Operations.d.ts","sourceRoot":"","sources":["../../src/services/Operations.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { annotateLogscoped, flatMap } from "@effect-app/core/Effect";
|
|
2
2
|
import { dual } from "@effect-app/core/Function";
|
|
3
|
+
import { RequestFiberSet } from "@effect-app/infra-adapters/RequestFiberSet";
|
|
3
4
|
import { reportError } from "@effect-app/infra/errorReporter";
|
|
4
5
|
import { NonEmptyString2k } from "@effect-app/schema";
|
|
5
6
|
import { subHours } from "date-fns";
|
|
@@ -89,18 +90,21 @@ export class Operations extends Context.TagMakeId("effect-app/Operations", make)
|
|
|
89
90
|
export const forkOperation = dual(2, (self, title) => Effect.flatMap(Scope.make(), (scope) => Operations
|
|
90
91
|
.register(title)
|
|
91
92
|
.pipe(Scope.extend(scope), Effect
|
|
92
|
-
.tap(() => forkDaemonReportRequestUnexpected(Scope.use(self, scope))
|
|
93
|
+
.tap(() => forkDaemonReportRequestUnexpected(Scope.use(self.pipe(Effect.withSpan(title), RequestFiberSet.setRootParentSpan), scope))
|
|
94
|
+
.pipe(Effect.andThen(RequestFiberSet.add))))));
|
|
93
95
|
export function forkOperationFunction(fnc, title) {
|
|
94
96
|
return (inp) => fnc(inp).pipe((_) => forkOperation(_, title));
|
|
95
97
|
}
|
|
96
98
|
export const forkOperation2 = dual(2, (self, title) => flatMap(Operations, (Operations) => Effect.flatMap(Scope.make(), (scope) => Operations
|
|
97
99
|
.register(title)
|
|
98
100
|
.pipe(Scope.extend(scope), Effect
|
|
99
|
-
.tap((id) => forkDaemonReportRequestUnexpected(Scope.use(self(id)
|
|
101
|
+
.tap((id) => forkDaemonReportRequestUnexpected(Scope.use(self(id)
|
|
102
|
+
.pipe(Effect.withSpan(title), RequestFiberSet.setRootParentSpan), scope))
|
|
103
|
+
.pipe(Effect.andThen(RequestFiberSet.add)))))));
|
|
100
104
|
export function forkOperationWithEffect(self, fnc, title) {
|
|
101
|
-
return Effect.flatMap(Operations, (Operations) => Effect.flatMap(Scope
|
|
102
|
-
.make(), (scope) => Operations
|
|
105
|
+
return Effect.flatMap(Operations, (Operations) => Effect.flatMap(Scope.make(), (scope) => Operations
|
|
103
106
|
.register(title)
|
|
104
|
-
.pipe(Scope.extend(scope), Effect.tap((opId) => forkDaemonReportRequestUnexpected(Scope.use(self(opId)
|
|
107
|
+
.pipe(Scope.extend(scope), Effect.tap((opId) => forkDaemonReportRequestUnexpected(Scope.use(self(opId).pipe(Effect.withSpan(title), RequestFiberSet.setRootParentSpan), scope))
|
|
108
|
+
.pipe(Effect.andThen(RequestFiberSet.add))), Effect.tap((opId) => Effect.interruptible(fnc(opId)).pipe(Effect.forkScoped, Scope.extend(scope))))));
|
|
105
109
|
}
|
|
106
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
110
|
+
//# 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
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect-app/infra",
|
|
3
|
-
"version": "1.0
|
|
3
|
+
"version": "1.1.0",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"dependencies": {
|
|
@@ -12,20 +12,20 @@
|
|
|
12
12
|
"@sendgrid/mail": "^8.1.3",
|
|
13
13
|
"change-case": "^5.4.4",
|
|
14
14
|
"cross-fetch": "^4.0.0",
|
|
15
|
-
"fast-check": "~3.17.
|
|
15
|
+
"fast-check": "~3.17.2",
|
|
16
16
|
"object-hash": "^3.0.0",
|
|
17
17
|
"path-parser": "^6.1.0",
|
|
18
18
|
"proper-lockfile": "^4.1.2",
|
|
19
19
|
"pure-rand": "6.1.0",
|
|
20
20
|
"redlock": "^4.2.0",
|
|
21
|
-
"@effect-app/
|
|
22
|
-
"@effect-app/
|
|
23
|
-
"@effect-app/
|
|
24
|
-
"effect-app": "1.0.
|
|
21
|
+
"@effect-app/core": "1.0.3",
|
|
22
|
+
"@effect-app/schema": "1.0.5",
|
|
23
|
+
"@effect-app/infra-adapters": "1.0.7",
|
|
24
|
+
"effect-app": "1.0.5"
|
|
25
25
|
},
|
|
26
26
|
"devDependencies": {
|
|
27
27
|
"@babel/cli": "^7.24.1",
|
|
28
|
-
"@sentry/node": "^7.
|
|
28
|
+
"@sentry/node": "^7.111.0",
|
|
29
29
|
"@types/express": "^4.17.21",
|
|
30
30
|
"@types/node": "~20.12.7",
|
|
31
31
|
"@types/proper-lockfile": "^4.1.4",
|
|
@@ -42,9 +42,9 @@
|
|
|
42
42
|
},
|
|
43
43
|
"peerDependencies": {
|
|
44
44
|
"express": "^4.19.2",
|
|
45
|
-
"@effect/platform": "^0.
|
|
46
|
-
"@effect/schema": "^0.66.
|
|
47
|
-
"effect": "^3.0.
|
|
45
|
+
"@effect/platform": "^0.50.2",
|
|
46
|
+
"@effect/schema": "^0.66.5",
|
|
47
|
+
"effect": "^3.0.3"
|
|
48
48
|
},
|
|
49
49
|
"typesVersions": {
|
|
50
50
|
"*": {
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { annotateLogscoped, flatMap } from "@effect-app/core/Effect"
|
|
2
2
|
import { dual } from "@effect-app/core/Function"
|
|
3
|
+
import { RequestFiberSet } from "@effect-app/infra-adapters/RequestFiberSet"
|
|
3
4
|
import { reportError } from "@effect-app/infra/errorReporter"
|
|
4
5
|
import type { StringId } from "@effect-app/schema"
|
|
5
6
|
import { NonEmptyString2k } from "@effect-app/schema"
|
|
@@ -140,7 +141,16 @@ export const forkOperation: {
|
|
|
140
141
|
.pipe(
|
|
141
142
|
Scope.extend(scope),
|
|
142
143
|
Effect
|
|
143
|
-
.tap(() =>
|
|
144
|
+
.tap(() =>
|
|
145
|
+
forkDaemonReportRequestUnexpected(Scope.use(
|
|
146
|
+
self.pipe(
|
|
147
|
+
Effect.withSpan(title),
|
|
148
|
+
RequestFiberSet.setRootParentSpan
|
|
149
|
+
),
|
|
150
|
+
scope
|
|
151
|
+
))
|
|
152
|
+
.pipe(Effect.andThen(RequestFiberSet.add))
|
|
153
|
+
)
|
|
144
154
|
)
|
|
145
155
|
)
|
|
146
156
|
)
|
|
@@ -169,7 +179,17 @@ export const forkOperation2: {
|
|
|
169
179
|
.pipe(
|
|
170
180
|
Scope.extend(scope),
|
|
171
181
|
Effect
|
|
172
|
-
.tap((id) =>
|
|
182
|
+
.tap((id) =>
|
|
183
|
+
forkDaemonReportRequestUnexpected(Scope.use(
|
|
184
|
+
self(id)
|
|
185
|
+
.pipe(
|
|
186
|
+
Effect.withSpan(title),
|
|
187
|
+
RequestFiberSet.setRootParentSpan
|
|
188
|
+
),
|
|
189
|
+
scope
|
|
190
|
+
))
|
|
191
|
+
.pipe(Effect.andThen(RequestFiberSet.add))
|
|
192
|
+
)
|
|
173
193
|
)
|
|
174
194
|
))
|
|
175
195
|
)
|
|
@@ -178,18 +198,28 @@ export function forkOperationWithEffect<R, R2, E, E2, A, A2>(
|
|
|
178
198
|
self: (id: OperationId) => Effect<A, E, R>,
|
|
179
199
|
fnc: (id: OperationId) => Effect<A2, E2, R2>,
|
|
180
200
|
title: NonEmptyString2k
|
|
181
|
-
): Effect<StringId, never, Operations | Exclude<R, Scope.Scope> | Exclude<R2, Scope.Scope>> {
|
|
201
|
+
): Effect<StringId, never, Operations | RequestFiberSet | Exclude<R, Scope.Scope> | Exclude<R2, Scope.Scope>> {
|
|
182
202
|
return Effect.flatMap(Operations, (Operations) =>
|
|
183
203
|
Effect.flatMap(
|
|
184
|
-
Scope
|
|
185
|
-
.make(),
|
|
204
|
+
Scope.make(),
|
|
186
205
|
(scope) =>
|
|
187
206
|
Operations
|
|
188
207
|
.register(title)
|
|
189
208
|
.pipe(
|
|
190
209
|
Scope.extend(scope),
|
|
191
|
-
Effect.tap((opId) =>
|
|
192
|
-
|
|
210
|
+
Effect.tap((opId) =>
|
|
211
|
+
forkDaemonReportRequestUnexpected(Scope.use(
|
|
212
|
+
self(opId).pipe(Effect.withSpan(title), RequestFiberSet.setRootParentSpan),
|
|
213
|
+
scope
|
|
214
|
+
))
|
|
215
|
+
.pipe(Effect.andThen(RequestFiberSet.add))
|
|
216
|
+
),
|
|
217
|
+
Effect.tap((opId) =>
|
|
218
|
+
Effect.interruptible(fnc(opId)).pipe(
|
|
219
|
+
Effect.forkScoped,
|
|
220
|
+
Scope.extend(scope)
|
|
221
|
+
)
|
|
222
|
+
)
|
|
193
223
|
)
|
|
194
224
|
))
|
|
195
225
|
}
|