@effect-app/infra 1.43.3 → 1.43.5
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 +18 -0
- package/_cjs/errorReporter.cjs +4 -20
- package/_cjs/errorReporter.cjs.map +1 -1
- package/_cjs/logger/jsonLogger.cjs +3 -1
- package/_cjs/logger/jsonLogger.cjs.map +1 -1
- package/_cjs/services/Operations.cjs +1 -1
- package/_cjs/services/Operations.cjs.map +1 -1
- package/dist/errorReporter.d.ts.map +1 -1
- package/dist/errorReporter.js +5 -24
- package/dist/logger/jsonLogger.js +2 -2
- package/dist/services/Operations.d.ts.map +1 -1
- package/dist/services/Operations.js +4 -4
- package/package.json +4 -4
- package/src/errorReporter.ts +4 -21
- package/src/logger/jsonLogger.ts +1 -1
- package/src/services/Operations.ts +3 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,23 @@
|
|
|
1
1
|
# @effect-app/infra
|
|
2
2
|
|
|
3
|
+
## 1.43.5
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- 0eac9da: improve: Operation error handling
|
|
8
|
+
- Updated dependencies [0eac9da]
|
|
9
|
+
- effect-app@1.30.4
|
|
10
|
+
- @effect-app/infra-adapters@1.20.5
|
|
11
|
+
|
|
12
|
+
## 1.43.4
|
|
13
|
+
|
|
14
|
+
### Patch Changes
|
|
15
|
+
|
|
16
|
+
- 4a814f5: improve error report
|
|
17
|
+
- Updated dependencies [4a814f5]
|
|
18
|
+
- @effect-app/infra-adapters@1.20.4
|
|
19
|
+
- effect-app@1.30.3
|
|
20
|
+
|
|
3
21
|
## 1.43.3
|
|
4
22
|
|
|
5
23
|
### Patch Changes
|
package/_cjs/errorReporter.cjs
CHANGED
|
@@ -15,24 +15,8 @@ var _logger = require("./logger.cjs");
|
|
|
15
15
|
var _RequestContextContainer = require("./services/RequestContextContainer.cjs");
|
|
16
16
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
17
17
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
18
|
-
const tryToJson = error => {
|
|
19
|
-
try {
|
|
20
|
-
return error.toJSON();
|
|
21
|
-
} catch {
|
|
22
|
-
try {
|
|
23
|
-
return error.toString();
|
|
24
|
-
} catch (err) {
|
|
25
|
-
try {
|
|
26
|
-
return `Failed to convert error: ${err}`;
|
|
27
|
-
} catch {
|
|
28
|
-
return `Failed to convert error: unknown failure`;
|
|
29
|
-
}
|
|
30
|
-
}
|
|
31
|
-
}
|
|
32
|
-
};
|
|
33
18
|
function reportError(name) {
|
|
34
19
|
return (cause, extras) => _effectApp.Effect.gen(function* () {
|
|
35
|
-
yield* (0, _errors.annotateSpanWithError)(cause, name);
|
|
36
20
|
if (_effectApp.Cause.isInterrupted(cause)) {
|
|
37
21
|
yield* _logger.InfraLogger.logDebug("Interrupted").pipe(_effectApp.Effect.annotateLogs("extras", JSON.stringify(extras ?? {})));
|
|
38
22
|
return;
|
|
@@ -41,7 +25,7 @@ function reportError(name) {
|
|
|
41
25
|
yield* reportSentry(error, extras);
|
|
42
26
|
yield* _logger.InfraLogger.logError("Reporting error", cause).pipe(_effectApp.Effect.annotateLogs((0, _utils.dropUndefined)({
|
|
43
27
|
extras,
|
|
44
|
-
|
|
28
|
+
cause: (0, _errors.tryToJson)(error),
|
|
45
29
|
__error_name__: name
|
|
46
30
|
})), _effectApp.Effect.catchAllCause(cause => _logger.InfraLogger.logError("Failed to log error", cause)), _effectApp.Effect.catchAllCause(() => _logger.InfraLogger.logError("Failed to log error cause")));
|
|
47
31
|
error[_errors.ErrorReported] = true;
|
|
@@ -54,7 +38,8 @@ function reportSentry(error, extras) {
|
|
|
54
38
|
const scope = new Sentry.Scope();
|
|
55
39
|
if (context) scope.setContext("context", context);
|
|
56
40
|
if (extras) scope.setContext("extras", extras);
|
|
57
|
-
scope.setContext("error", tryToJson(error));
|
|
41
|
+
scope.setContext("error", (0, _errors.tryToJson)(error));
|
|
42
|
+
scope.setContext("cause", (0, _errors.tryToJson)(error.originalCause));
|
|
58
43
|
Sentry.captureException(error, scope);
|
|
59
44
|
}));
|
|
60
45
|
}
|
|
@@ -66,10 +51,9 @@ function logError(name) {
|
|
|
66
51
|
})));
|
|
67
52
|
return;
|
|
68
53
|
}
|
|
69
|
-
const error = new _errors.CauseException(cause, name);
|
|
70
54
|
yield* _logger.InfraLogger.logWarning("Logging error", cause).pipe(_effectApp.Effect.annotateLogs((0, _utils.dropUndefined)({
|
|
71
55
|
extras,
|
|
72
|
-
|
|
56
|
+
cause: (0, _errors.tryToJson)(cause),
|
|
73
57
|
__error_name__: name
|
|
74
58
|
})), _effectApp.Effect.catchAllCause(cause => _logger.InfraLogger.logError("Failed to log error", cause)), _effectApp.Effect.catchAllCause(() => _logger.InfraLogger.logError("Failed to log error cause")));
|
|
75
59
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errorReporter.cjs","names":["_utils","require","Sentry","_interopRequireWildcard","_effectApp","_errors","_logger","_RequestContextContainer","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","
|
|
1
|
+
{"version":3,"file":"errorReporter.cjs","names":["_utils","require","Sentry","_interopRequireWildcard","_effectApp","_errors","_logger","_RequestContextContainer","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","reportError","name","cause","extras","Effect","gen","Cause","isInterrupted","InfraLogger","logDebug","pipe","annotateLogs","JSON","stringify","error","CauseException","reportSentry","logError","dropUndefined","tryToJson","__error_name__","catchAllCause","ErrorReported","RequestContextContainer","getOption","map","ctx","context","Option","getOrUndefined","scope","Scope","setContext","originalCause","captureException","logWarning","console","reportMessage","message","captureMessage","warn"],"sources":["../src/errorReporter.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -24,7 +24,9 @@ const jsonLogger = exports.jsonLogger = _effectApp.Logger.make(({
|
|
|
24
24
|
fiber: _effectApp.FiberId.threadName(fiberId),
|
|
25
25
|
message,
|
|
26
26
|
request: _effectApp.Option.getOrUndefined(c),
|
|
27
|
-
cause: cause
|
|
27
|
+
cause: cause !== null && cause !== _effectApp.Cause.empty ? _effectApp.Cause.pretty(cause, {
|
|
28
|
+
renderErrorCause: true
|
|
29
|
+
}) : undefined,
|
|
28
30
|
spans: _effectApp.List.map(spans, _ => ({
|
|
29
31
|
label: _.label,
|
|
30
32
|
timing: nowMillis - _.startTime
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jsonLogger.cjs","names":["_effectApp","require","_shared","jsonLogger","exports","Logger","make","annotations","cause","context","fiberId","logLevel","message","spans","now","Date","nowMillis","getTime","c","getRequestContext","data","timestamp","level","label","fiber","FiberId","threadName","request","Option","getOrUndefined","Cause","empty","pretty","undefined","List","map","_","timing","startTime","pipe","toArray","HashMap","size","reduce","prev","k","v","globalThis","console","log","JSON","stringify","logJson","replace","defaultLogger","withSpanAnnotations"],"sources":["../../src/logger/jsonLogger.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AAEO,MAAME,UAAU,GAAAC,OAAA,CAAAD,UAAA,GAAGE,iBAAM,CAACC,IAAI,CACnC,CAAC;EAAEC,WAAW;EAAEC,KAAK;EAAEC,OAAO;EAAEC,OAAO;EAAEC,QAAQ;EAAEC,OAAO;EAAEC;AAAK,CAAE,KAAI;EACrE,MAAMC,GAAG,GAAG,IAAIC,IAAI,EAAE;EACtB,MAAMC,SAAS,GAAGF,GAAG,CAACG,OAAO,EAAE;EAE/B,MAAMC,CAAC,GAAG,IAAAC,yBAAiB,EAACV,OAAO,CAAC;EAEpC,MAAMW,IAAI,GAAG;IACXC,SAAS,EAAEP,GAAG;IACdQ,KAAK,EAAEX,QAAQ,CAACY,KAAK;IACrBC,KAAK,EAAEC,kBAAO,CAACC,UAAU,CAAChB,OAAO,CAAC;IAClCE,OAAO;IACPe,OAAO,EAAEC,iBAAM,CAACC,cAAc,CAACX,CAAC,CAAC;IACjCV,KAAK,EAAEA,KAAK,
|
|
1
|
+
{"version":3,"file":"jsonLogger.cjs","names":["_effectApp","require","_shared","jsonLogger","exports","Logger","make","annotations","cause","context","fiberId","logLevel","message","spans","now","Date","nowMillis","getTime","c","getRequestContext","data","timestamp","level","label","fiber","FiberId","threadName","request","Option","getOrUndefined","Cause","empty","pretty","renderErrorCause","undefined","List","map","_","timing","startTime","pipe","toArray","HashMap","size","reduce","prev","k","v","globalThis","console","log","JSON","stringify","logJson","replace","defaultLogger","withSpanAnnotations"],"sources":["../../src/logger/jsonLogger.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AAEO,MAAME,UAAU,GAAAC,OAAA,CAAAD,UAAA,GAAGE,iBAAM,CAACC,IAAI,CACnC,CAAC;EAAEC,WAAW;EAAEC,KAAK;EAAEC,OAAO;EAAEC,OAAO;EAAEC,QAAQ;EAAEC,OAAO;EAAEC;AAAK,CAAE,KAAI;EACrE,MAAMC,GAAG,GAAG,IAAIC,IAAI,EAAE;EACtB,MAAMC,SAAS,GAAGF,GAAG,CAACG,OAAO,EAAE;EAE/B,MAAMC,CAAC,GAAG,IAAAC,yBAAiB,EAACV,OAAO,CAAC;EAEpC,MAAMW,IAAI,GAAG;IACXC,SAAS,EAAEP,GAAG;IACdQ,KAAK,EAAEX,QAAQ,CAACY,KAAK;IACrBC,KAAK,EAAEC,kBAAO,CAACC,UAAU,CAAChB,OAAO,CAAC;IAClCE,OAAO;IACPe,OAAO,EAAEC,iBAAM,CAACC,cAAc,CAACX,CAAC,CAAC;IACjCV,KAAK,EAAEA,KAAK,KAAK,IAAI,IAAIA,KAAK,KAAKsB,gBAAK,CAACC,KAAK,GAAGD,gBAAK,CAACE,MAAM,CAACxB,KAAK,EAAE;MAAEyB,gBAAgB,EAAE;IAAI,CAAE,CAAC,GAAGC,SAAS;IAC5GrB,KAAK,EAAEsB,eAAI,CAACC,GAAG,CAACvB,KAAK,EAAGwB,CAAC,KAAM;MAAEd,KAAK,EAAEc,CAAC,CAACd,KAAK;MAAEe,MAAM,EAAEtB,SAAS,GAAGqB,CAAC,CAACE;IAAS,CAAE,CAAC,CAAC,CAACC,IAAI,CAACL,eAAI,CAACM,OAAO,CAAC;IACvGlC,WAAW,EAAEmC,kBAAO,CAACC,IAAI,CAACpC,WAAW,CAAC,GAAG,CAAC,GACtC,CAAC,GAAGA,WAAW,CAAC,CAACqC,MAAM,CAAC,CAACC,IAAI,EAAE,CAACC,CAAC,EAAEC,CAAC,CAAC,KAAI;MACzCF,IAAI,CAACC,CAAC,CAAC,GAAGC,CAAC;MACX,OAAOF,IAAI;IACb,CAAC,EAAE,EAA6B,CAAC,GAC/BX;GACL;EAEDc,UAAU,CAACC,OAAO,CAACC,GAAG,CAACC,IAAI,CAACC,SAAS,CAAChC,IAAI,CAAC,CAAC;AAC9C,CAAC,CACF;AAEM,MAAMiC,OAAO,GAAAjD,OAAA,CAAAiD,OAAA,GAAGhD,iBAAM,CAACiD,OAAO,CAACjD,iBAAM,CAACkD,aAAa,EAAElD,iBAAM,CAACmD,mBAAmB,CAACrD,UAAU,CAAC,CAAC","ignoreList":[]}
|
|
@@ -38,7 +38,7 @@ const make = _effectApp.Effect.gen(function* () {
|
|
|
38
38
|
function finishOp(id, exit) {
|
|
39
39
|
return _effectApp.Effect.flatMap(repo.get(id).pipe(_effectApp.Effect.orDie), _ => repo.save((0, _effectApp.copy)(_, {
|
|
40
40
|
updatedAt: new Date(),
|
|
41
|
-
result: _effectApp.Exit.isSuccess(exit) ? new _Operations.
|
|
41
|
+
result: _effectApp.Exit.isSuccess(exit) ? new _Operations.OperationSuccess() : new _Operations.OperationFailure({
|
|
42
42
|
message: _effectApp.Cause.isInterrupted(exit.cause) ? (0, _schema.NonEmptyString2k)("Interrupted") : _effectApp.Cause.isDie(exit.cause) ? (0, _schema.NonEmptyString2k)("Unknown error") : _effectApp.Cause.failureOption(exit.cause).pipe(_effectApp.Option.flatMap(_ => typeof _ === "object" && _ !== null && "message" in _ && _effectApp.S.is(_schema.NonEmptyString2k)(_.message) ? _effectApp.Option.some(_.message) : _effectApp.Option.none()), _effectApp.Option.getOrNull)
|
|
43
43
|
})
|
|
44
44
|
})).pipe(_effectApp.Effect.orDie));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Operations.cjs","names":["_Effect","require","_Function","_errorReporter","_schema","_dateFns","_effectApp","_Operations","Scope","_interopRequireWildcard","_rateLimit","_MainFiberSet","_OperationsRepo","_query","_RequestFiberSet","_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","
|
|
1
|
+
{"version":3,"file":"Operations.cjs","names":["_Effect","require","_Function","_errorReporter","_schema","_dateFns","_effectApp","_Operations","Scope","_interopRequireWildcard","_rateLimit","_MainFiberSet","_OperationsRepo","_query","_RequestFiberSet","_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","OperationSuccess","OperationFailure","message","Cause","isInterrupted","cause","NonEmptyString2k","isDie","failureOption","Option","S","is","some","none","getOrNull","update","progress","fork","self","fnc","scope","extend","forkDaemonReportUnexpected","use","map","fiber","interruptible","forkScoped","provideService","fork2","dual","forkOperation","forkOperationFunction","inp","all","Operations","Context","TagMakeId","CleanupLive","void","schedule","Schedule","fixed","Duration","minutes","MainFiberSet","run","Layer","effectDiscard","provide","Live","provideMerge","toLayer"],"sources":["../../src/services/Operations.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,SAAA,GAAAD,OAAA;AACA,IAAAE,cAAA,GAAAF,OAAA;AACA,IAAAG,OAAA,GAAAH,OAAA;AACA,IAAAI,QAAA,GAAAJ,OAAA;AAEA,IAAAK,UAAA,GAAAL,OAAA;AAEA,IAAAM,WAAA,GAAAN,OAAA;AACA,IAAAO,KAAA,GAAAC,uBAAA,CAAAR,OAAA;AACA,IAAAS,UAAA,GAAAT,OAAA;AACA,IAAAU,aAAA,GAAAV,OAAA;AACA,IAAAW,eAAA,GAAAX,OAAA;AACA,IAAAY,MAAA,GAAAZ,OAAA;AACA,IAAAa,gBAAA,GAAAb,OAAA;AAAsD,SAAAc,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,SAAAP,wBAAAO,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;AAEtD,MAAMW,cAAc,GAAG,IAAAC,0BAAW,EAAC,oBAAoB,CAAC;AAExD,MAAMC,IAAI,GAAGC,iBAAM,CAACC,GAAG,CAAC,aAAS;EAC/B,MAAMC,IAAI,GAAG,OAAOC,8BAAc;EAClC,MAAMC,WAAW,GAAG,OAAOC,gCAAe;EAC1C,MAAMC,MAAM,GAAGN,iBAAM,CAACO,IAAI,CAAC,MAAMC,uBAAW,CAACT,IAAI,EAAE,CAAC;EAEpD,MAAMU,QAAQ,GAAIC,KAAuB,IACvCV,iBAAM,CAACW,GAAG,CACRL,MAAM,EACLM,EAAE,IACDZ,iBAAM,CAACa,OAAO,CACZ,IAAAC,yBAAiB,EAAC,aAAa,EAAEF,EAAE,CAAC,EACpCZ,iBAAM,CAACe,cAAc,CAACC,KAAK,CAACJ,EAAE,EAAEF,KAAK,CAAC,EAAE,CAACO,CAAC,EAAEC,IAAI,KAAKC,QAAQ,CAACP,EAAE,EAAEM,IAAI,CAAC,CAAC,CACzE,CACJ;EAEH,MAAME,OAAO,GAAGpB,iBAAM,CAACO,IAAI,CAAC,MAAM,IAAAc,iBAAQ,EAAC,IAAIC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAACC,IAAI,CAC7DvB,iBAAM,CAACa,OAAO,CAAEW,MAAM,IAAKtB,IAAI,CAACuB,KAAK,CAAC,IAAAC,YAAK,EAAC,WAAW,EAAE,IAAI,EAAEF,MAAM,CAACG,WAAW,EAAE,CAAC,CAAC,CAAC,EACtF3B,iBAAM,CAACa,OAAO,CAAEe,GAAG,IAAK,IAAAL,cAAI,EAACK,GAAG,EAAE,IAAAC,gBAAK,EAAC,GAAG,EAAE7B,iBAAM,CAAC8B,OAAO,EAAGC,KAAK,IAAK7B,IAAI,CAAC8B,gBAAgB,CAACD,KAAK,CAAC,CAAC,CAAC,CAAC,EACvG/B,iBAAM,CAACiC,QAAQ,CAAC,oBAAoB,CAAC,CACtC;EAED,SAASjB,KAAKA,CAACJ,EAAe,EAAEF,KAAuB;IACrD,OAAOR,IAAI,CAACgC,IAAI,CAAC,IAAIC,qBAAS,CAAC;MAAEvB,EAAE;MAAEF;IAAK,CAAE,CAAC,CAAC,CAACa,IAAI,CAACvB,iBAAM,CAACoC,KAAK,CAAC;EACnE;EACA,SAASC,MAAMA,CAACzB,EAAe;IAC7B,OAAOV,IAAI,CAACoC,IAAI,CAAC1B,EAAE,CAAC;EACtB;EACA,SAASO,QAAQA,CAACP,EAAe,EAAEM,IAA4B;IAC7D,OAAOlB,iBAAM,CACVuC,OAAO,CAACrC,IAAI,CAACjB,GAAG,CAAC2B,EAAE,CAAC,CAACW,IAAI,CAACvB,iBAAM,CAACoC,KAAK,CAAC,EAAGnB,CAAC,IAC1Cf,IAAI,CACDgC,IAAI,CACH,IAAAM,eAAI,EAACvB,CAAC,EAAE;MACNwB,SAAS,EAAE,IAAInB,IAAI,EAAE;MACrBoB,MAAM,EAAEC,eAAI,CAACC,SAAS,CAAC1B,IAAI,CAAC,GACxB,IAAI2B,4BAAgB,EAAE,GACtB,IAAIC,4BAAgB,CAAC;QACrBC,OAAO,EAAEC,gBAAK,CAACC,aAAa,CAAC/B,IAAI,CAACgC,KAAK,CAAC,GACpC,IAAAC,wBAAgB,EAAC,aAAa,CAAC,GAC/BH,gBAAK,CAACI,KAAK,CAAClC,IAAI,CAACgC,KAAK,CAAC,GACvB,IAAAC,wBAAgB,EAAC,eAAe,CAAC,GACjCH,gBAAK,CACJK,aAAa,CAACnC,IAAI,CAACgC,KAAK,CAAC,CACzB3B,IAAI,CACH+B,iBAAM,CAACf,OAAO,CAAEtB,CAAC,IACf,OAAOA,CAAC,KAAK,QAAQ,IAAIA,CAAC,KAAK,IAAI,IAAI,SAAS,IAAIA,CAAC,IAAIsC,YAAC,CAACC,EAAE,CAACL,wBAAgB,CAAC,CAAClC,CAAC,CAAC8B,OAAO,CAAC,GACtFO,iBAAM,CAACG,IAAI,CAACxC,CAAC,CAAC8B,OAAO,CAAC,GACtBO,iBAAM,CAACI,IAAI,EAAE,CAClB,EACDJ,iBAAM,CAACK,SAAS;OAEvB;KACJ,CAAC,CACH,CACApC,IAAI,CAACvB,iBAAM,CAACoC,KAAK,CAAC,CAAC;EAC5B;EACA,SAASwB,MAAMA,CAAChD,EAAe,EAAEiD,QAA2B;IAC1D,OAAO7D,iBAAM,CAACuC,OAAO,CACnBrC,IAAI,CAACjB,GAAG,CAAC2B,EAAE,CAAC,CAACW,IAAI,CAACvB,iBAAM,CAACoC,KAAK,CAAC,EAC9BnB,CAAC,IAAKf,IAAI,CAACgC,IAAI,CAAC,IAAAM,eAAI,EAACvB,CAAC,EAAE;MAAEwB,SAAS,EAAE,IAAInB,IAAI,EAAE;MAAEuC;IAAQ,CAAE,CAAC,CAAC,CAACtC,IAAI,CAACvB,iBAAM,CAACoC,KAAK,CAAC,CAClF;EACH;EAEA,SAAS0B,IAAIA,CACXC,IAA0C,EAC1CC,GAA4C,EAC5CtD,KAAuB;IAMvB,OAAOV,iBAAM,CACVuC,OAAO,CACNrE,KAAK,CAAC6B,IAAI,EAAE,EACXkE,KAAK,IACJxD,QAAQ,CAACC,KAAK,CAAC,CACZa,IAAI,CACHrD,KAAK,CAACgG,MAAM,CAACD,KAAK,CAAC,EACnBjE,iBAAM,CAACuC,OAAO,CAAE3B,EAAE,IAChBR,WAAW,CACR+D,0BAA0B,CAACjG,KAAK,CAACkG,GAAG,CACnCL,IAAI,CAACnD,EAAE,CAAC,CAACW,IAAI,CAACvB,iBAAM,CAACiC,QAAQ,CAACvB,KAAK,CAAC,CAAC,EACrCuD,KAAK,CACN,CAAC,CACD1C,IAAI,CAACvB,iBAAM,CAACqE,GAAG,CAAEC,KAAK,KAA8B;MAAEA,KAAK;MAAE1D;IAAE,CAAE,CAAC,CAAC,CAAC,CACxE,EACDZ,iBAAM,CAACW,GAAG,CAAC,CAAC;MAAEC;IAAE,CAAE,KAChBZ,iBAAM,CAACuE,aAAa,CAACP,GAAG,CAACpD,EAAE,CAAC,CAAC,CAACW,IAAI,CAChCvB,iBAAM,CAACwE,UAAU,EACjBtG,KAAK,CAACgG,MAAM,CAACD,KAAK,CAAC,CACpB,CACF,CACF,CACN,CACA1C,IAAI,CAACvB,iBAAM,CAACyE,cAAc,CAACpE,gCAAe,EAAED,WAAW,CAAC,CAAC;EAC9D;EAEA,MAAMsE,KAAK,GAQP,IAAAC,cAAI,EACN,CAAC,EACD,CAAUZ,IAA4C,EAAErD,KAAuB,KAC7EV,iBAAM,CAACuC,OAAO,CACZrE,KAAK,CAAC6B,IAAI,EAAE,EACXkE,KAAK,IACJxD,QAAQ,CAACC,KAAK,CAAC,CACZa,IAAI,CACHrD,KAAK,CAACgG,MAAM,CAACD,KAAK,CAAC,EACnBjE,iBAAM,CACHuC,OAAO,CAAE3B,EAAE,IACVR,WAAW,CACR+D,0BAA0B,CAACjG,KAAK,CAACkG,GAAG,CACnCL,IAAI,CAACnD,EAAE,CAAC,CAACW,IAAI,CAACvB,iBAAM,CAACiC,QAAQ,CAACvB,KAAK,CAAC,CAAC,EACrCuD,KAAK,CACN,CAAC,CACD1C,IAAI,CAACvB,iBAAM,CAACqE,GAAG,CAAEC,KAAK,KAA8B;IAAEA,KAAK;IAAE1D;EAAE,CAAE,CAAC,CAAC,CAAC,CACxE,CACJ,CACN,CACJ;EAED,MAAMgE,aAAa,GAQf,IAAAD,cAAI,EACN,CAAC,EACD,CAAUZ,IAAqB,EAAErD,KAAuB,KACtDV,iBAAM,CAACuC,OAAO,CACZrE,KAAK,CAAC6B,IAAI,EAAE,EACXkE,KAAK,IACJxD,QAAQ,CAACC,KAAK,CAAC,CACZa,IAAI,CACHrD,KAAK,CAACgG,MAAM,CAACD,KAAK,CAAC,EACnBjE,iBAAM,CACHuC,OAAO,CAAE3B,EAAE,IACVR,WAAW,CACR+D,0BAA0B,CAACjG,KAAK,CAACkG,GAAG,CACnCL,IAAI,CAACxC,IAAI,CAACvB,iBAAM,CAACiC,QAAQ,CAACvB,KAAK,CAAC,CAAC,EACjCuD,KAAK,CACN,CAAC,CACD1C,IAAI,CAACvB,iBAAM,CAACqE,GAAG,CAAEC,KAAK,KAA8B;IAAEA,KAAK;IAAE1D;EAAE,CAAE,CAAC,CAAC,CAAC,CACxE,CACJ,CACN,CACJ;EAED,SAASiE,qBAAqBA,CAAeb,GAAkC,EAAEtD,KAAuB;IACtG,OAAQoE,GAAQ,IAAKd,GAAG,CAACc,GAAG,CAAC,CAACvD,IAAI,CAAEN,CAAC,IAAK2D,aAAa,CAAC3D,CAAC,EAAEP,KAAK,CAAC,CAAC;EACpE;EAEA,OAAO;IACLU,OAAO;IACPX,QAAQ;IACRqD,IAAI;IACJY,KAAK;IACLE,aAAa;IACbC,qBAAqB;IACrBE,GAAG,EAAE7E,IAAI,CAAC6E,GAAG;IACbzC,IAAI,EAAED,MAAM;IACZuB;GACD;AACH,CAAC,CAAC;AAEI,MAAOoB,UAAW,SAAQC,kBAAO,CAACC,SAAS,CAAC,uBAAuB,EAAEnF,IAAI,CAAC,EAAc;EACpF,OAAgBoF,WAAW,GAAG,IAAI,CACvCf,GAAG,CAAEnD,CAAC,IACLA,CAAC,CAACG,OAAO,CAACG,IAAI,CACZvB,iBAAM,CAACkB,IAAI,EACXlB,iBAAM,CACHuC,OAAO,CAAEtB,CAAC,IAAI;IACb,IAAI0B,eAAI,CAACC,SAAS,CAAC3B,CAAC,CAAC,EAAE;MACrB,OAAOjB,iBAAM,CAACoF,IAAI;IACpB,CAAC,MAAM;MACL,OAAOvF,cAAc,CAACoB,CAAC,CAACiC,KAAK,CAAC;IAChC;EACF,CAAC,CAAC,EACJlD,iBAAM,CAACqF,QAAQ,CAACC,mBAAQ,CAACC,KAAK,CAACC,mBAAQ,CAACC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EACrDzF,iBAAM,CAACqE,GAAG,CAAEpD,CAAC,IAAKA,CAAU,CAAC,EAC7ByE,0BAAY,CAACC,GAAG,CACjB,CACF,CACApE,IAAI,CAACqE,gBAAK,CAACC,aAAa,EAAED,gBAAK,CAACE,OAAO,CAACJ,0BAAY,CAACK,IAAI,CAAC,CAAC;EAE9D,OAAgBA,IAAI,GAAG,IAAI,CAACZ,WAAW,CAAC5D,IAAI,CAACqE,gBAAK,CAACI,YAAY,CAAC,IAAI,CAACC,OAAO,EAAE,CAAC,EAAEL,gBAAK,CAACE,OAAO,CAACzF,gCAAe,CAAC0F,IAAI,CAAC,CAAC;EAErH,OAAgBnB,aAAa,GAAIlE,KAAuB,IAAeqD,IAAqB,IAC1F,IAAI,CAACK,GAAG,CAAEnD,CAAC,IAAKA,CAAC,CAAC2D,aAAa,CAACb,IAAI,EAAErD,KAAK,CAAC,CAAC;EAC/C,OAAgBmE,qBAAqB,GACnCA,CAAeb,GAAkC,EAAEtD,KAAuB,KAAMoE,GAAQ,IACtF,IAAI,CAACV,GAAG,CAAEnD,CAAC,IAAKA,CAAC,CAAC4D,qBAAqB,CAACb,GAAG,EAAEtD,KAAK,CAAC,CAACoE,GAAG,CAAC,CAAC;EAC7D,OAAgBhB,IAAI,GAAGA,CACrBC,IAA0C,EAC1CC,GAA4C,EAC5CtD,KAAuB,KACpB,IAAI,CAAC0D,GAAG,CAAEnD,CAAC,IAAKA,CAAC,CAAC6C,IAAI,CAACC,IAAI,EAAEC,GAAG,EAAEtD,KAAK,CAAC,CAAC;EAE9C,OAAgBgE,KAAK,GAAIhE,KAAuB,IAAeqD,IAA4C,IACzG,IAAI,CAACK,GAAG,CAAEnD,CAAC,IAAKA,CAAC,CAACyD,KAAK,CAACX,IAAI,EAAErD,KAAK,CAAC,CAAC","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errorReporter.d.ts","sourceRoot":"","sources":["../src/errorReporter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAU,MAAM,YAAY,CAAA;AAClD,OAAO,
|
|
1
|
+
{"version":3,"file":"errorReporter.d.ts","sourceRoot":"","sources":["../src/errorReporter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAU,MAAM,YAAY,CAAA;AAClD,OAAO,EAAE,cAAc,EAA4B,MAAM,aAAa,CAAA;AAItE,wBAAgB,WAAW,CACzB,IAAI,EAAE,MAAM,WAEG,KAAK,CAAC,OAAO,CAAC,WAAW,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,sEAwBhE;AAiBD,wBAAgB,QAAQ,CAAC,CAAC,EACxB,IAAI,EAAE,MAAM,WAEG,KAAK,CAAC,CAAC,CAAC,WAAW,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,uCAkB1D;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,QAG9C;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,qCAU9E"}
|
package/dist/errorReporter.js
CHANGED
|
@@ -1,30 +1,11 @@
|
|
|
1
1
|
import { dropUndefined } from "@effect-app/core/utils";
|
|
2
2
|
import * as Sentry from "@sentry/node";
|
|
3
3
|
import { Cause, Effect, Option } from "effect-app";
|
|
4
|
-
import {
|
|
4
|
+
import { CauseException, ErrorReported, tryToJson } from "./errors.js";
|
|
5
5
|
import { InfraLogger } from "./logger.js";
|
|
6
6
|
import { RequestContextContainer } from "./services/RequestContextContainer.js";
|
|
7
|
-
const tryToJson = (error) => {
|
|
8
|
-
try {
|
|
9
|
-
return error.toJSON();
|
|
10
|
-
}
|
|
11
|
-
catch {
|
|
12
|
-
try {
|
|
13
|
-
return error.toString();
|
|
14
|
-
}
|
|
15
|
-
catch (err) {
|
|
16
|
-
try {
|
|
17
|
-
return `Failed to convert error: ${err}`;
|
|
18
|
-
}
|
|
19
|
-
catch {
|
|
20
|
-
return `Failed to convert error: unknown failure`;
|
|
21
|
-
}
|
|
22
|
-
}
|
|
23
|
-
}
|
|
24
|
-
};
|
|
25
7
|
export function reportError(name) {
|
|
26
8
|
return (cause, extras) => Effect.gen(function* () {
|
|
27
|
-
yield* annotateSpanWithError(cause, name);
|
|
28
9
|
if (Cause.isInterrupted(cause)) {
|
|
29
10
|
yield* InfraLogger.logDebug("Interrupted").pipe(Effect.annotateLogs("extras", JSON.stringify(extras ?? {})));
|
|
30
11
|
return;
|
|
@@ -35,7 +16,7 @@ export function reportError(name) {
|
|
|
35
16
|
.logError("Reporting error", cause)
|
|
36
17
|
.pipe(Effect.annotateLogs(dropUndefined({
|
|
37
18
|
extras,
|
|
38
|
-
|
|
19
|
+
cause: tryToJson(error),
|
|
39
20
|
__error_name__: name
|
|
40
21
|
})), Effect.catchAllCause((cause) => InfraLogger.logError("Failed to log error", cause)), Effect.catchAllCause(() => InfraLogger.logError("Failed to log error cause")));
|
|
41
22
|
error[ErrorReported] = true;
|
|
@@ -51,6 +32,7 @@ function reportSentry(error, extras) {
|
|
|
51
32
|
if (extras)
|
|
52
33
|
scope.setContext("extras", extras);
|
|
53
34
|
scope.setContext("error", tryToJson(error));
|
|
35
|
+
scope.setContext("cause", tryToJson(error.originalCause));
|
|
54
36
|
Sentry.captureException(error, scope);
|
|
55
37
|
}));
|
|
56
38
|
}
|
|
@@ -60,12 +42,11 @@ export function logError(name) {
|
|
|
60
42
|
yield* InfraLogger.logDebug("Interrupted").pipe(Effect.annotateLogs(dropUndefined({ extras })));
|
|
61
43
|
return;
|
|
62
44
|
}
|
|
63
|
-
const error = new CauseException(cause, name);
|
|
64
45
|
yield* InfraLogger
|
|
65
46
|
.logWarning("Logging error", cause)
|
|
66
47
|
.pipe(Effect.annotateLogs(dropUndefined({
|
|
67
48
|
extras,
|
|
68
|
-
|
|
49
|
+
cause: tryToJson(cause),
|
|
69
50
|
__error_name__: name
|
|
70
51
|
})), Effect.catchAllCause((cause) => InfraLogger.logError("Failed to log error", cause)), Effect.catchAllCause(() => InfraLogger.logError("Failed to log error cause")));
|
|
71
52
|
});
|
|
@@ -86,4 +67,4 @@ export function reportMessage(message, extras) {
|
|
|
86
67
|
console.warn(message);
|
|
87
68
|
}));
|
|
88
69
|
}
|
|
89
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
70
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JSZXBvcnRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9lcnJvclJlcG9ydGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQTtBQUN0RCxPQUFPLEtBQUssTUFBTSxNQUFNLGNBQWMsQ0FBQTtBQUN0QyxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDbEQsT0FBTyxFQUFFLGNBQWMsRUFBRSxhQUFhLEVBQUUsU0FBUyxFQUFFLE1BQU0sYUFBYSxDQUFBO0FBQ3RFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxhQUFhLENBQUE7QUFDekMsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sdUNBQXVDLENBQUE7QUFFL0UsTUFBTSxVQUFVLFdBQVcsQ0FDekIsSUFBWTtJQUVaLE9BQU8sQ0FBQyxLQUFxQixFQUFFLE1BQWdDLEVBQUUsRUFBRSxDQUNqRSxNQUFNLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQztRQUNsQixJQUFJLEtBQUssQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQztZQUMvQixLQUFLLENBQUMsQ0FBQyxXQUFXLENBQUMsUUFBUSxDQUFDLGFBQWEsQ0FBQyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsWUFBWSxDQUFDLFFBQVEsRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLE1BQU0sSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUE7WUFDNUcsT0FBTTtRQUNSLENBQUM7UUFDRCxNQUFNLEtBQUssR0FBRyxJQUFJLGNBQWMsQ0FBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLENBQUE7UUFFN0MsS0FBSyxDQUFDLENBQUMsWUFBWSxDQUFDLEtBQUssRUFBRSxNQUFNLENBQUMsQ0FBQTtRQUNsQyxLQUFLLENBQUMsQ0FBQyxXQUFXO2FBQ2YsUUFBUSxDQUFDLGlCQUFpQixF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
|
|
@@ -10,7 +10,7 @@ export const jsonLogger = Logger.make(({ annotations, cause, context, fiberId, l
|
|
|
10
10
|
fiber: FiberId.threadName(fiberId),
|
|
11
11
|
message,
|
|
12
12
|
request: Option.getOrUndefined(c),
|
|
13
|
-
cause: cause
|
|
13
|
+
cause: cause !== null && cause !== Cause.empty ? Cause.pretty(cause, { renderErrorCause: true }) : undefined,
|
|
14
14
|
spans: List.map(spans, (_) => ({ label: _.label, timing: nowMillis - _.startTime })).pipe(List.toArray),
|
|
15
15
|
annotations: HashMap.size(annotations) > 0
|
|
16
16
|
? [...annotations].reduce((prev, [k, v]) => {
|
|
@@ -22,4 +22,4 @@ export const jsonLogger = Logger.make(({ annotations, cause, context, fiberId, l
|
|
|
22
22
|
globalThis.console.log(JSON.stringify(data));
|
|
23
23
|
});
|
|
24
24
|
export const logJson = Logger.replace(Logger.defaultLogger, Logger.withSpanAnnotations(jsonLogger));
|
|
25
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
25
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoianNvbkxvZ2dlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9sb2dnZXIvanNvbkxvZ2dlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxFQUFFLE9BQU8sRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDMUUsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sYUFBYSxDQUFBO0FBRS9DLE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBRyxNQUFNLENBQUMsSUFBSSxDQUNuQyxDQUFDLEVBQUUsV0FBVyxFQUFFLEtBQUssRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBRTtJQUNyRSxNQUFNLEdBQUcsR0FBRyxJQUFJLElBQUksRUFBRSxDQUFBO0lBQ3RCLE1BQU0sU0FBUyxHQUFHLEdBQUcsQ0FBQyxPQUFPLEVBQUUsQ0FBQTtJQUUvQixNQUFNLENBQUMsR0FBRyxpQkFBaUIsQ0FBQyxPQUFPLENBQUMsQ0FBQTtJQUVwQyxNQUFNLElBQUksR0FBRztRQUNYLFNBQVMsRUFBRSxHQUFHO1FBQ2QsS0FBSyxFQUFFLFFBQVEsQ0FBQyxLQUFLO1FBQ3JCLEtBQUssRUFBRSxPQUFPLENBQUMsVUFBVSxDQUFDLE9BQU8sQ0FBQztRQUNsQyxPQUFPO1FBQ1AsT0FBTyxFQUFFLE1BQU0sQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFDO1FBQ2pDLEtBQUssRUFBRSxLQUFLLEtBQUssSUFBSSxJQUFJLEtBQUssS0FBSyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLEtBQUssRUFBRSxFQUFFLGdCQUFnQixFQUFFLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVM7UUFDNUcsS0FBSyxFQUFFLElBQUksQ0FBQyxHQUFHLENBQUMsS0FBSyxFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQyxLQUFLLEVBQUUsTUFBTSxFQUFFLFNBQVMsR0FBRyxDQUFDLENBQUMsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO1FBQ3ZHLFdBQVcsRUFBRSxPQUFPLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUM7WUFDeEMsQ0FBQyxDQUFDLENBQUMsR0FBRyxXQUFXLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRTtnQkFDekMsSUFBSSxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQTtnQkFDWCxPQUFPLElBQUksQ0FBQTtZQUNiLENBQUMsRUFBRSxFQUE2QixDQUFDO1lBQ2pDLENBQUMsQ0FBQyxTQUFTO0tBQ2QsQ0FBQTtJQUVELFVBQVUsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQTtBQUM5QyxDQUFDLENBQ0YsQ0FBQTtBQUVELE1BQU0sQ0FBQyxNQUFNLE9BQU8sR0FBRyxNQUFNLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxhQUFhLEVBQUUsTUFBTSxDQUFDLG1CQUFtQixDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUEifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Operations.d.ts","sourceRoot":"","sources":["../../src/services/Operations.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAErD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AACvC,OAAO,EAAS,OAAO,EAAkB,MAAM,EAAQ,KAAK,EAAE,MAAM,EAAE,CAAC,EAAY,MAAM,YAAY,CAAA;AACrG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AAC9D,OAAO,
|
|
1
|
+
{"version":3,"file":"Operations.d.ts","sourceRoot":"","sources":["../../src/services/Operations.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import { reportError } from "@effect-app/infra/errorReporter";
|
|
|
4
4
|
import { NonEmptyString2k } from "@effect-app/schema";
|
|
5
5
|
import { subHours } from "date-fns";
|
|
6
6
|
import { Cause, Context, copy, Duration, Effect, Exit, Layer, Option, S, Schedule } from "effect-app";
|
|
7
|
-
import {
|
|
7
|
+
import { Operation, OperationFailure, OperationId, OperationSuccess } from "effect-app/Operations";
|
|
8
8
|
import * as Scope from "effect/Scope";
|
|
9
9
|
import { batch } from "../rateLimit.js";
|
|
10
10
|
import { MainFiberSet } from "./MainFiberSet.js";
|
|
@@ -30,8 +30,8 @@ const make = Effect.gen(function* () {
|
|
|
30
30
|
.save(copy(_, {
|
|
31
31
|
updatedAt: new Date(),
|
|
32
32
|
result: Exit.isSuccess(exit)
|
|
33
|
-
? new
|
|
34
|
-
: new
|
|
33
|
+
? new OperationSuccess()
|
|
34
|
+
: new OperationFailure({
|
|
35
35
|
message: Cause.isInterrupted(exit.cause)
|
|
36
36
|
? NonEmptyString2k("Interrupted")
|
|
37
37
|
: Cause.isDie(exit.cause)
|
|
@@ -99,4 +99,4 @@ export class Operations extends Context.TagMakeId("effect-app/Operations", make)
|
|
|
99
99
|
static fork = (self, fnc, title) => this.use((_) => _.fork(self, fnc, title));
|
|
100
100
|
static fork2 = (title) => (self) => this.use((_) => _.fork2(self, title));
|
|
101
101
|
}
|
|
102
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
102
|
+
//# 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.43.
|
|
3
|
+
"version": "1.43.5",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"dependencies": {
|
|
@@ -20,10 +20,10 @@
|
|
|
20
20
|
"proper-lockfile": "^4.1.2",
|
|
21
21
|
"pure-rand": "6.1.0",
|
|
22
22
|
"redlock": "^4.2.0",
|
|
23
|
+
"@effect-app/infra-adapters": "1.20.5",
|
|
23
24
|
"@effect-app/schema": "1.19.1",
|
|
24
|
-
"@effect-app/
|
|
25
|
-
"effect-app": "1.30.
|
|
26
|
-
"@effect-app/core": "1.17.1"
|
|
25
|
+
"@effect-app/core": "1.17.1",
|
|
26
|
+
"effect-app": "1.30.4"
|
|
27
27
|
},
|
|
28
28
|
"devDependencies": {
|
|
29
29
|
"@babel/cli": "^7.25.7",
|
package/src/errorReporter.ts
CHANGED
|
@@ -1,32 +1,15 @@
|
|
|
1
1
|
import { dropUndefined } from "@effect-app/core/utils"
|
|
2
2
|
import * as Sentry from "@sentry/node"
|
|
3
3
|
import { Cause, Effect, Option } from "effect-app"
|
|
4
|
-
import {
|
|
4
|
+
import { CauseException, ErrorReported, tryToJson } from "./errors.js"
|
|
5
5
|
import { InfraLogger } from "./logger.js"
|
|
6
6
|
import { RequestContextContainer } from "./services/RequestContextContainer.js"
|
|
7
7
|
|
|
8
|
-
const tryToJson = <T>(error: CauseException<T>) => {
|
|
9
|
-
try {
|
|
10
|
-
return error.toJSON()
|
|
11
|
-
} catch {
|
|
12
|
-
try {
|
|
13
|
-
return error.toString()
|
|
14
|
-
} catch (err) {
|
|
15
|
-
try {
|
|
16
|
-
return `Failed to convert error: ${err}`
|
|
17
|
-
} catch {
|
|
18
|
-
return `Failed to convert error: unknown failure`
|
|
19
|
-
}
|
|
20
|
-
}
|
|
21
|
-
}
|
|
22
|
-
}
|
|
23
|
-
|
|
24
8
|
export function reportError(
|
|
25
9
|
name: string
|
|
26
10
|
) {
|
|
27
11
|
return (cause: Cause<unknown>, extras?: Record<string, unknown>) =>
|
|
28
12
|
Effect.gen(function*() {
|
|
29
|
-
yield* annotateSpanWithError(cause, name)
|
|
30
13
|
if (Cause.isInterrupted(cause)) {
|
|
31
14
|
yield* InfraLogger.logDebug("Interrupted").pipe(Effect.annotateLogs("extras", JSON.stringify(extras ?? {})))
|
|
32
15
|
return
|
|
@@ -39,7 +22,7 @@ export function reportError(
|
|
|
39
22
|
.pipe(
|
|
40
23
|
Effect.annotateLogs(dropUndefined({
|
|
41
24
|
extras,
|
|
42
|
-
|
|
25
|
+
cause: tryToJson(error),
|
|
43
26
|
__error_name__: name
|
|
44
27
|
})),
|
|
45
28
|
Effect.catchAllCause((cause) => InfraLogger.logError("Failed to log error", cause)),
|
|
@@ -61,6 +44,7 @@ function reportSentry(
|
|
|
61
44
|
if (context) scope.setContext("context", context as unknown as Record<string, unknown>)
|
|
62
45
|
if (extras) scope.setContext("extras", extras)
|
|
63
46
|
scope.setContext("error", tryToJson(error) as any)
|
|
47
|
+
scope.setContext("cause", tryToJson(error.originalCause) as any)
|
|
64
48
|
Sentry.captureException(error, scope)
|
|
65
49
|
}))
|
|
66
50
|
}
|
|
@@ -74,13 +58,12 @@ export function logError<E>(
|
|
|
74
58
|
yield* InfraLogger.logDebug("Interrupted").pipe(Effect.annotateLogs(dropUndefined({ extras })))
|
|
75
59
|
return
|
|
76
60
|
}
|
|
77
|
-
const error = new CauseException(cause, name)
|
|
78
61
|
yield* InfraLogger
|
|
79
62
|
.logWarning("Logging error", cause)
|
|
80
63
|
.pipe(
|
|
81
64
|
Effect.annotateLogs(dropUndefined({
|
|
82
65
|
extras,
|
|
83
|
-
|
|
66
|
+
cause: tryToJson(cause),
|
|
84
67
|
__error_name__: name
|
|
85
68
|
})),
|
|
86
69
|
Effect.catchAllCause((cause) => InfraLogger.logError("Failed to log error", cause)),
|
package/src/logger/jsonLogger.ts
CHANGED
|
@@ -14,7 +14,7 @@ export const jsonLogger = Logger.make<unknown, void>(
|
|
|
14
14
|
fiber: FiberId.threadName(fiberId),
|
|
15
15
|
message,
|
|
16
16
|
request: Option.getOrUndefined(c),
|
|
17
|
-
cause: cause
|
|
17
|
+
cause: cause !== null && cause !== Cause.empty ? Cause.pretty(cause, { renderErrorCause: true }) : undefined,
|
|
18
18
|
spans: List.map(spans, (_) => ({ label: _.label, timing: nowMillis - _.startTime })).pipe(List.toArray),
|
|
19
19
|
annotations: HashMap.size(annotations) > 0
|
|
20
20
|
? [...annotations].reduce((prev, [k, v]) => {
|
|
@@ -6,7 +6,7 @@ import { subHours } from "date-fns"
|
|
|
6
6
|
import type { Fiber } from "effect-app"
|
|
7
7
|
import { Cause, Context, copy, Duration, Effect, Exit, Layer, Option, S, Schedule } from "effect-app"
|
|
8
8
|
import type { OperationProgress } from "effect-app/Operations"
|
|
9
|
-
import {
|
|
9
|
+
import { Operation, OperationFailure, OperationId, OperationSuccess } from "effect-app/Operations"
|
|
10
10
|
import * as Scope from "effect/Scope"
|
|
11
11
|
import { batch } from "../rateLimit.js"
|
|
12
12
|
import { MainFiberSet } from "./MainFiberSet.js"
|
|
@@ -51,8 +51,8 @@ const make = Effect.gen(function*() {
|
|
|
51
51
|
copy(_, {
|
|
52
52
|
updatedAt: new Date(),
|
|
53
53
|
result: Exit.isSuccess(exit)
|
|
54
|
-
? new
|
|
55
|
-
: new
|
|
54
|
+
? new OperationSuccess()
|
|
55
|
+
: new OperationFailure({
|
|
56
56
|
message: Cause.isInterrupted(exit.cause)
|
|
57
57
|
? NonEmptyString2k("Interrupted")
|
|
58
58
|
: Cause.isDie(exit.cause)
|