@effect-app/infra 1.6.8 → 1.7.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 +20 -0
- package/_cjs/errorReporter.cjs +20 -5
- package/_cjs/errorReporter.cjs.map +1 -1
- package/_cjs/services/Emailer/Sendgrid.cjs +1 -1
- package/_cjs/services/Emailer/Sendgrid.cjs.map +1 -1
- package/_cjs/services/Store/Disk.cjs +1 -1
- package/_cjs/services/Store/Disk.cjs.map +1 -1
- package/_cjs/services/Store/utils.cjs +1 -1
- package/_cjs/services/Store/utils.cjs.map +1 -1
- package/dist/errorReporter.d.ts.map +1 -1
- package/dist/errorReporter.js +24 -6
- package/package.json +13 -13
- package/src/errorReporter.ts +33 -11
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,25 @@
|
|
|
1
1
|
# @effect-app/infra
|
|
2
2
|
|
|
3
|
+
## 1.7.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- 9cc6f86: update packages
|
|
8
|
+
|
|
9
|
+
### Patch Changes
|
|
10
|
+
|
|
11
|
+
- Updated dependencies [9cc6f86]
|
|
12
|
+
- @effect-app/infra-adapters@1.3.0
|
|
13
|
+
- effect-app@1.5.0
|
|
14
|
+
- @effect-app/schema@1.3.0
|
|
15
|
+
- @effect-app/core@1.3.0
|
|
16
|
+
|
|
17
|
+
## 1.6.9
|
|
18
|
+
|
|
19
|
+
### Patch Changes
|
|
20
|
+
|
|
21
|
+
- ed065df: improve: failec error reporting handling
|
|
22
|
+
|
|
3
23
|
## 1.6.8
|
|
4
24
|
|
|
5
25
|
### Patch Changes
|
package/_cjs/errorReporter.cjs
CHANGED
|
@@ -14,6 +14,21 @@ var _errors = require("./errors.cjs");
|
|
|
14
14
|
var _RequestContextContainer = require("./services/RequestContextContainer.cjs");
|
|
15
15
|
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); }
|
|
16
16
|
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; }
|
|
17
|
+
const tryToJson = error => {
|
|
18
|
+
try {
|
|
19
|
+
return error.toJSON();
|
|
20
|
+
} catch {
|
|
21
|
+
try {
|
|
22
|
+
return error.toString();
|
|
23
|
+
} catch (err) {
|
|
24
|
+
try {
|
|
25
|
+
return `Failed to convert error: ${err}`;
|
|
26
|
+
} catch {
|
|
27
|
+
return `Failed to convert error: unknown failure`;
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
};
|
|
17
32
|
function reportError(name) {
|
|
18
33
|
return (cause, extras) => _effectApp.Effect.gen(function* ($) {
|
|
19
34
|
yield* $((0, _errors.annotateSpanWithError)(cause, name));
|
|
@@ -25,9 +40,9 @@ function reportError(name) {
|
|
|
25
40
|
yield* $(reportSentry(error, extras));
|
|
26
41
|
yield* $(_effectApp.Effect.logError("Reporting error", cause).pipe(_effectApp.Effect.annotateLogs((0, _utils.dropUndefined)({
|
|
27
42
|
extras,
|
|
28
|
-
__cause__: error
|
|
43
|
+
__cause__: tryToJson(error),
|
|
29
44
|
__error_name__: name
|
|
30
|
-
}))));
|
|
45
|
+
})), _effectApp.Effect.catchAll(() => _effectApp.Effect.logError("Failed to log error"))));
|
|
31
46
|
error[_errors.ErrorReported] = true;
|
|
32
47
|
return error;
|
|
33
48
|
});
|
|
@@ -38,7 +53,7 @@ function reportSentry(error, extras) {
|
|
|
38
53
|
const scope = new Sentry.Scope();
|
|
39
54
|
if (context) scope.setContext("context", context);
|
|
40
55
|
if (extras) scope.setContext("extras", extras);
|
|
41
|
-
scope.setContext("error", error
|
|
56
|
+
scope.setContext("error", tryToJson(error));
|
|
42
57
|
Sentry.captureException(error, scope);
|
|
43
58
|
}));
|
|
44
59
|
}
|
|
@@ -53,9 +68,9 @@ function logError(name) {
|
|
|
53
68
|
const error = new _errors.CauseException(cause, name);
|
|
54
69
|
yield* $(_effectApp.Effect.logWarning("Logging error", cause).pipe(_effectApp.Effect.annotateLogs((0, _utils.dropUndefined)({
|
|
55
70
|
extras,
|
|
56
|
-
__cause__: error
|
|
71
|
+
__cause__: tryToJson(error),
|
|
57
72
|
__error_name__: name
|
|
58
|
-
}))));
|
|
73
|
+
})), _effectApp.Effect.catchAll(() => _effectApp.Effect.logError("Failed to log error"))));
|
|
59
74
|
});
|
|
60
75
|
}
|
|
61
76
|
function captureException(error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errorReporter.cjs","names":["_utils","require","Sentry","_interopRequireWildcard","_effectApp","_errors","_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","$","annotateSpanWithError","Cause","isInterrupted","logDebug","pipe","annotateLogs","JSON","stringify","
|
|
1
|
+
{"version":3,"file":"errorReporter.cjs","names":["_utils","require","Sentry","_interopRequireWildcard","_effectApp","_errors","_RequestContextContainer","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","tryToJson","error","toJSON","toString","err","reportError","name","cause","extras","Effect","gen","$","annotateSpanWithError","Cause","isInterrupted","logDebug","pipe","annotateLogs","JSON","stringify","CauseException","reportSentry","logError","dropUndefined","__cause__","__error_name__","catchAll","ErrorReported","RequestContextContainer","getOption","map","ctx","context","Option","getOrUndefined","scope","Scope","setContext","captureException","logWarning","console","reportMessage","message","captureMessage","warn"],"sources":["../src/errorReporter.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -11,7 +11,7 @@ var _mail = _interopRequireDefault(require("@sendgrid/mail"));
|
|
|
11
11
|
var _effectApp = require("effect-app");
|
|
12
12
|
var _util = require("util");
|
|
13
13
|
var _service = require("./service.cjs");
|
|
14
|
-
function _interopRequireDefault(
|
|
14
|
+
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
15
15
|
const makeSendgrid = ({
|
|
16
16
|
apiKey,
|
|
17
17
|
defaultFrom,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Sendgrid.cjs","names":["_utils","require","_mail","_interopRequireDefault","_effectApp","_util","_service","
|
|
1
|
+
{"version":3,"file":"Sendgrid.cjs","names":["_utils","require","_mail","_interopRequireDefault","_effectApp","_util","_service","e","__esModule","default","makeSendgrid","apiKey","defaultFrom","defaultReplyTo","realMail","subjectPrefix","Effect","sync","sgMail","setApiKey","Secret","value","Emailer","of","sendMail","msg_","gen","$","msg","dropUndefinedT","from","replyTo","undefined","render","renderMessage","renderedMsg_","renderedMsg","subject","logDebug","pipe","annotateLogs","inspect","ret","async","cb","send","err","result","fail","Sendgrid","config","toLayer","forceFake","i","makeId","to","renderFake","cc","bcc","renderFakeIfTest","isTestAddress","toLowerCase","endsWith","email","addr","name","renderMailData","eq","Equivalence","mapInput","string","Array","isArray","dedupeWith","map","x","md","join"],"sources":["../../../src/services/Emailer/Sendgrid.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -10,7 +10,7 @@ var _fs = _interopRequireDefault(require("fs"));
|
|
|
10
10
|
var _effectApp = require("effect-app");
|
|
11
11
|
var _Memory = require("./Memory.cjs");
|
|
12
12
|
var _service = require("./service.cjs");
|
|
13
|
-
function _interopRequireDefault(
|
|
13
|
+
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
14
14
|
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); }
|
|
15
15
|
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; }
|
|
16
16
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Disk.cjs","names":["fu","_interopRequireWildcard","require","_fs","_interopRequireDefault","_effectApp","_Memory","_service","
|
|
1
|
+
{"version":3,"file":"Disk.cjs","names":["fu","_interopRequireWildcard","require","_fs","_interopRequireDefault","_effectApp","_Memory","_service","e","__esModule","default","_getRequireWildcardCache","WeakMap","r","t","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","makeDiskStoreInt","prefix","namespace","dir","name","seed","defaultValues","Effect","gen","$","fs","existsSync","mkdirSync","file","fsStore","readTextFile","pipe","withSpan","flatMap","x","sync","JSON","parse","orDie","attributes","setRaw","v","stringify","undefined","json","writeTextFile","length","store","makeMemoryStoreInt","all","sem","unsafeMakeSemaphore","withPermit","withPermits","flushToDisk","flushToDiskInBackground","tapErrorCause","Console","error","uninterruptible","forkDaemon","batchSet","flow","tap","bulkSet","remove","makeDiskStore","make","config","storesSem","primary","stores","Map","ctx","context","getStore","allowNamespace","succeed","FiberRef","storeId","Error","suspend","existing","provide","s","_","find","args","filter","DiskStoreLayer","StoreMaker","toLayer"],"sources":["../../../src/services/Store/Disk.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -15,7 +15,7 @@ var _effectApp = require("effect-app");
|
|
|
15
15
|
var _objectHash = _interopRequireDefault(require("object-hash"));
|
|
16
16
|
var _errors = require("../../errors.cjs");
|
|
17
17
|
var _codeFilter = require("./codeFilter.cjs");
|
|
18
|
-
function _interopRequireDefault(
|
|
18
|
+
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
19
19
|
const makeETag = ({
|
|
20
20
|
_etag,
|
|
21
21
|
...e
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.cjs","names":["_effectApp","require","_objectHash","_interopRequireDefault","_errors","_codeFilter","
|
|
1
|
+
{"version":3,"file":"utils.cjs","names":["_effectApp","require","_objectHash","_interopRequireDefault","_errors","_codeFilter","e","__esModule","default","makeETag","_etag","objectHash","exports","makeUpdateETag","type","current","Effect","gen","$","mapError","OptimisticConcurrencyException","id","found","Option","isSome","value","newE","codeFilter","filter","x","codeFilter3_","some","none","lowercaseIfString","val","toLowerCase","compare","valA","valB","lowerThan","lowerThanExclusive","greaterThan","greaterThanExclusive"],"sources":["../../../src/services/Store/utils.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AACA,IAAAC,WAAA,GAAAC,sBAAA,CAAAF,OAAA;AACA,IAAAG,OAAA,GAAAH,OAAA;AACA,IAAAI,WAAA,GAAAJ,OAAA;AAA8C,SAAAE,uBAAAG,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAGvC,MAAMG,QAAQ,GAAGA,CACtB;EAAEC,KAAK;EAAE,GAAGJ;AAAC,CAAK,MACV;EACR,GAAGA,CAAC;EACJI,KAAK,EAAE,IAAAC,mBAAU,EAACL,CAAC;CACpB,CAAS;AAAAM,OAAA,CAAAH,QAAA,GAAAA,QAAA;AACH,MAAMI,cAAc,GACxBC,IAAY,IAAK,CAAiDR,CAAI,EAAES,OAAkB,KACzFC,iBAAM,CAACC,GAAG,CAAC,WAAUC,CAAC;EACpB,IAAIZ,CAAC,CAACI,KAAK,EAAE;IACX,OAAOQ,CAAC,CACNF,iBAAM,CAACG,QAAQ,CACbJ,OAAO,EACP,MAAM,IAAIK,sCAA8B,CAAC;MAAEN,IAAI;MAAEO,EAAE,EAAEf,CAAC,CAACe,EAAE;MAAEN,OAAO,EAAE,EAAE;MAAEO,KAAK,EAAEhB,CAAC,CAACI;IAAK,CAAE,CAAC,CAC1F,CACF;EACH;EACA,IAAIa,iBAAM,CAACC,MAAM,CAACT,OAAO,CAAC,IAAIA,OAAO,CAACU,KAAK,CAACf,KAAK,KAAKJ,CAAC,CAACI,KAAK,EAAE;IAC7D,OAAO,OAAOQ,CAAC,CACb,IAAIE,sCAA8B,CAAC;MACjCN,IAAI;MACJO,EAAE,EAAEN,OAAO,CAACU,KAAK,CAACJ,EAAE;MACpBN,OAAO,EAAEA,OAAO,CAACU,KAAK,CAACf,KAAK;MAC5BY,KAAK,EAAEhB,CAAC,CAACI;KACV,CAAC,CACH;EACH;EACA,MAAMgB,IAAI,GAAGjB,QAAQ,CAACH,CAAC,CAAC;EACxB,OAAOoB,IAAI;AACb,CAAC,CAAC;AAAAd,OAAA,CAAAC,cAAA,GAAAA,cAAA;AAEA,SAAUc,UAAUA,CAAyCC,MAAc;EAC/E,OAAQC,CAAI,IAAK,IAAAC,wBAAY,EAACF,MAAM,EAAEC,CAAC,CAAC,GAAGN,iBAAM,CAACQ,IAAI,CAACF,CAAkB,CAAC,GAAGN,iBAAM,CAACS,IAAI,EAAE;AAC5F;AAEM,SAAUC,iBAAiBA,CAAIC,GAAM;EACzC,IAAI,OAAOA,GAAG,KAAK,QAAQ,EAAE;IAC3B,OAAOA,GAAG,CAACC,WAAW,EAAE;EAC1B;EACA,OAAOD,GAAG;AACZ;AAEM,SAAUE,OAAOA,CAACC,IAAa,EAAEC,IAAa;EAClD,OAAOD,IAAI,KAAKC,IAAI;AACtB;AAEM,SAAUC,SAASA,CAACF,IAAsB,EAAEC,IAAsB;EACtE,OAAOD,IAAI,GAAGC,IAAI;AACpB;AAEM,SAAUE,kBAAkBA,CAACH,IAAsB,EAAEC,IAAsB;EAC/E,OAAOD,IAAI,IAAIC,IAAI;AACrB;AAEM,SAAUG,WAAWA,CAACJ,IAAsB,EAAEC,IAAsB;EACxE,OAAOD,IAAI,GAAGC,IAAI;AACpB;AAEM,SAAUI,oBAAoBA,CAACL,IAAsB,EAAEC,IAAsB;EACjF,OAAOD,IAAI,IAAIC,IAAI;AACrB","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,EAAyB,cAAc,EAAiB,MAAM,aAAa,CAAA;
|
|
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,EAAyB,cAAc,EAAiB,MAAM,aAAa,CAAA;AAmBlF,wBAAgB,WAAW,CACzB,IAAI,EAAE,MAAM,WAEG,MAAM,OAAO,CAAC,WAAW,OAAO,MAAM,EAAE,OAAO,CAAC,sEAyBhE;AAgBD,wBAAgB,QAAQ,CAAC,CAAC,EACxB,IAAI,EAAE,MAAM,WAEG,MAAM,CAAC,CAAC,WAAW,OAAO,MAAM,EAAE,OAAO,CAAC,uCAoB1D;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,GAAG,SAAS,qCAU1F"}
|
package/dist/errorReporter.js
CHANGED
|
@@ -3,6 +3,24 @@ import * as Sentry from "@sentry/node";
|
|
|
3
3
|
import { Cause, Effect, Option } from "effect-app";
|
|
4
4
|
import { annotateSpanWithError, CauseException, ErrorReported } from "./errors.js";
|
|
5
5
|
import { RequestContextContainer } from "./services/RequestContextContainer.js";
|
|
6
|
+
const tryToJson = (error) => {
|
|
7
|
+
try {
|
|
8
|
+
return error.toJSON();
|
|
9
|
+
}
|
|
10
|
+
catch {
|
|
11
|
+
try {
|
|
12
|
+
return error.toString();
|
|
13
|
+
}
|
|
14
|
+
catch (err) {
|
|
15
|
+
try {
|
|
16
|
+
return `Failed to convert error: ${err}`;
|
|
17
|
+
}
|
|
18
|
+
catch {
|
|
19
|
+
return `Failed to convert error: unknown failure`;
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
};
|
|
6
24
|
export function reportError(name) {
|
|
7
25
|
return (cause, extras) => Effect.gen(function* ($) {
|
|
8
26
|
yield* $(annotateSpanWithError(cause, name));
|
|
@@ -16,9 +34,9 @@ export function reportError(name) {
|
|
|
16
34
|
.logError("Reporting error", cause)
|
|
17
35
|
.pipe(Effect.annotateLogs(dropUndefined({
|
|
18
36
|
extras,
|
|
19
|
-
__cause__: error
|
|
37
|
+
__cause__: tryToJson(error),
|
|
20
38
|
__error_name__: name
|
|
21
|
-
}))));
|
|
39
|
+
})), Effect.catchAll(() => Effect.logError("Failed to log error"))));
|
|
22
40
|
error[ErrorReported] = true;
|
|
23
41
|
return error;
|
|
24
42
|
});
|
|
@@ -31,7 +49,7 @@ function reportSentry(error, extras) {
|
|
|
31
49
|
scope.setContext("context", context);
|
|
32
50
|
if (extras)
|
|
33
51
|
scope.setContext("extras", extras);
|
|
34
|
-
scope.setContext("error", error
|
|
52
|
+
scope.setContext("error", tryToJson(error));
|
|
35
53
|
Sentry.captureException(error, scope);
|
|
36
54
|
}));
|
|
37
55
|
}
|
|
@@ -46,9 +64,9 @@ export function logError(name) {
|
|
|
46
64
|
.logWarning("Logging error", cause)
|
|
47
65
|
.pipe(Effect.annotateLogs(dropUndefined({
|
|
48
66
|
extras,
|
|
49
|
-
__cause__: error
|
|
67
|
+
__cause__: tryToJson(error),
|
|
50
68
|
__error_name__: name
|
|
51
|
-
}))));
|
|
69
|
+
})), Effect.catchAll(() => Effect.logError("Failed to log error"))));
|
|
52
70
|
});
|
|
53
71
|
}
|
|
54
72
|
export function captureException(error) {
|
|
@@ -67,4 +85,4 @@ export function reportMessage(message, extras) {
|
|
|
67
85
|
console.warn(message);
|
|
68
86
|
}));
|
|
69
87
|
}
|
|
70
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
88
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JSZXBvcnRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9lcnJvclJlcG9ydGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQTtBQUN0RCxPQUFPLEtBQUssTUFBTSxNQUFNLGNBQWMsQ0FBQTtBQUN0QyxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDbEQsT0FBTyxFQUFFLHFCQUFxQixFQUFFLGNBQWMsRUFBRSxhQUFhLEVBQUUsTUFBTSxhQUFhLENBQUE7QUFDbEYsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sdUNBQXVDLENBQUE7QUFFL0UsTUFBTSxTQUFTLEdBQUcsQ0FBSSxLQUF3QixFQUFFLEVBQUU7SUFDaEQsSUFBSSxDQUFDO1FBQ0gsT0FBTyxLQUFLLENBQUMsTUFBTSxFQUFFLENBQUE7SUFDdkIsQ0FBQztJQUFDLE1BQU0sQ0FBQztRQUNQLElBQUksQ0FBQztZQUNILE9BQU8sS0FBSyxDQUFDLFFBQVEsRUFBRSxDQUFBO1FBQ3pCLENBQUM7UUFBQyxPQUFPLEdBQUcsRUFBRSxDQUFDO1lBQ2IsSUFBSSxDQUFDO2dCQUNILE9BQU8sNEJBQTRCLEdBQUcsRUFBRSxDQUFBO1lBQzFDLENBQUM7WUFBQyxNQUFNLENBQUM7Z0JBQ1AsT0FBTywwQ0FBMEMsQ0FBQTtZQUNuRCxDQUFDO1FBQ0gsQ0FBQztJQUNILENBQUM7QUFDSCxDQUFDLENBQUE7QUFFRCxNQUFNLFVBQVUsV0FBVyxDQUN6QixJQUFZO0lBRVosT0FBTyxDQUFDLEtBQXFCLEVBQUUsTUFBZ0MsRUFBRSxFQUFFLENBQ2pFLE1BQU0sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLEVBQUMsQ0FBQztRQUNwQixLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMscUJBQXFCLENBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxDQUFDLENB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
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect-app/infra",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.7.0",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"dependencies": {
|
|
@@ -12,29 +12,29 @@
|
|
|
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.
|
|
15
|
+
"fast-check": "~3.19.0",
|
|
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": "1.
|
|
22
|
-
"@effect-app/infra-adapters": "1.
|
|
23
|
-
"@effect-app/
|
|
24
|
-
"
|
|
21
|
+
"@effect-app/core": "1.3.0",
|
|
22
|
+
"@effect-app/infra-adapters": "1.3.0",
|
|
23
|
+
"@effect-app/schema": "1.3.0",
|
|
24
|
+
"effect-app": "1.5.0"
|
|
25
25
|
},
|
|
26
26
|
"devDependencies": {
|
|
27
|
-
"@babel/cli": "^7.24.
|
|
28
|
-
"@sentry/node": "^8.
|
|
27
|
+
"@babel/cli": "^7.24.7",
|
|
28
|
+
"@sentry/node": "^8.8.0",
|
|
29
29
|
"@types/express": "^4.17.21",
|
|
30
|
-
"@types/node": "~20.
|
|
30
|
+
"@types/node": "~20.14.2",
|
|
31
31
|
"@types/proper-lockfile": "^4.1.4",
|
|
32
32
|
"@types/redis": "^2.8.32",
|
|
33
33
|
"@types/redlock": "^4.0.7",
|
|
34
34
|
"express": "^4.19.2",
|
|
35
35
|
"jwks-rsa": "2.1.4",
|
|
36
36
|
"jwt-decode": "^4.0.0",
|
|
37
|
-
"mongodb": "6.
|
|
37
|
+
"mongodb": "6.7.0",
|
|
38
38
|
"redis": "^3.1.2",
|
|
39
39
|
"ts-node": "^10.9.2",
|
|
40
40
|
"typescript": "^5.4.5",
|
|
@@ -42,9 +42,9 @@
|
|
|
42
42
|
},
|
|
43
43
|
"peerDependencies": {
|
|
44
44
|
"express": "^4.19.2",
|
|
45
|
-
"@effect/platform": "^0.
|
|
46
|
-
"@effect/schema": "^0.67.
|
|
47
|
-
"effect": "^3.
|
|
45
|
+
"@effect/platform": "^0.56.0",
|
|
46
|
+
"@effect/schema": "^0.67.21",
|
|
47
|
+
"effect": "^3.3.0"
|
|
48
48
|
},
|
|
49
49
|
"typesVersions": {
|
|
50
50
|
"*": {
|
package/src/errorReporter.ts
CHANGED
|
@@ -4,6 +4,22 @@ import { Cause, Effect, Option } from "effect-app"
|
|
|
4
4
|
import { annotateSpanWithError, CauseException, ErrorReported } from "./errors.js"
|
|
5
5
|
import { RequestContextContainer } from "./services/RequestContextContainer.js"
|
|
6
6
|
|
|
7
|
+
const tryToJson = <T>(error: CauseException<T>) => {
|
|
8
|
+
try {
|
|
9
|
+
return error.toJSON()
|
|
10
|
+
} catch {
|
|
11
|
+
try {
|
|
12
|
+
return error.toString()
|
|
13
|
+
} catch (err) {
|
|
14
|
+
try {
|
|
15
|
+
return `Failed to convert error: ${err}`
|
|
16
|
+
} catch {
|
|
17
|
+
return `Failed to convert error: unknown failure`
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
|
|
7
23
|
export function reportError(
|
|
8
24
|
name: string
|
|
9
25
|
) {
|
|
@@ -20,11 +36,14 @@ export function reportError(
|
|
|
20
36
|
yield* $(
|
|
21
37
|
Effect
|
|
22
38
|
.logError("Reporting error", cause)
|
|
23
|
-
.pipe(
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
39
|
+
.pipe(
|
|
40
|
+
Effect.annotateLogs(dropUndefined({
|
|
41
|
+
extras,
|
|
42
|
+
__cause__: tryToJson(error),
|
|
43
|
+
__error_name__: name
|
|
44
|
+
})),
|
|
45
|
+
Effect.catchAll(() => Effect.logError("Failed to log error"))
|
|
46
|
+
)
|
|
28
47
|
)
|
|
29
48
|
error[ErrorReported] = true
|
|
30
49
|
return error
|
|
@@ -40,7 +59,7 @@ function reportSentry(
|
|
|
40
59
|
const scope = new Sentry.Scope()
|
|
41
60
|
if (context) scope.setContext("context", context as unknown as Record<string, unknown>)
|
|
42
61
|
if (extras) scope.setContext("extras", extras)
|
|
43
|
-
scope.setContext("error", error
|
|
62
|
+
scope.setContext("error", tryToJson(error) as any)
|
|
44
63
|
Sentry.captureException(error, scope)
|
|
45
64
|
}))
|
|
46
65
|
}
|
|
@@ -58,11 +77,14 @@ export function logError<E>(
|
|
|
58
77
|
yield* $(
|
|
59
78
|
Effect
|
|
60
79
|
.logWarning("Logging error", cause)
|
|
61
|
-
.pipe(
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
80
|
+
.pipe(
|
|
81
|
+
Effect.annotateLogs(dropUndefined({
|
|
82
|
+
extras,
|
|
83
|
+
__cause__: tryToJson(error),
|
|
84
|
+
__error_name__: name
|
|
85
|
+
})),
|
|
86
|
+
Effect.catchAll(() => Effect.logError("Failed to log error"))
|
|
87
|
+
)
|
|
66
88
|
)
|
|
67
89
|
})
|
|
68
90
|
}
|