@effect-app/infra 1.23.1 → 1.23.3
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 +19 -0
- package/_cjs/api/internal/events.cjs +2 -1
- package/_cjs/api/internal/events.cjs.map +1 -1
- package/_cjs/api/internal/middlewares.cjs +3 -2
- package/_cjs/api/internal/middlewares.cjs.map +1 -1
- package/_cjs/api/routing/defaultErrorHandler.cjs +3 -2
- package/_cjs/api/routing/defaultErrorHandler.cjs.map +1 -1
- package/_cjs/api/routing/makeRequestHandler.cjs +9 -8
- package/_cjs/api/routing/makeRequestHandler.cjs.map +1 -1
- package/_cjs/errorReporter.cjs +12 -11
- package/_cjs/errorReporter.cjs.map +1 -1
- package/_cjs/logger.cjs +9 -0
- package/_cjs/logger.cjs.map +1 -0
- package/_cjs/services/Emailer/Sendgrid.cjs +6 -5
- package/_cjs/services/Emailer/Sendgrid.cjs.map +1 -1
- package/_cjs/services/Emailer/fake.cjs +3 -2
- package/_cjs/services/Emailer/fake.cjs.map +1 -1
- package/_cjs/services/QueueMaker/SQLQueue.cjs +7 -6
- package/_cjs/services/QueueMaker/SQLQueue.cjs.map +1 -1
- package/_cjs/services/QueueMaker/memQueue.cjs +15 -14
- package/_cjs/services/QueueMaker/memQueue.cjs.map +1 -1
- package/_cjs/services/QueueMaker/sbqueue.cjs +15 -14
- package/_cjs/services/QueueMaker/sbqueue.cjs.map +1 -1
- package/_cjs/services/RepositoryBase.cjs +22 -22
- package/_cjs/services/RepositoryBase.cjs.map +1 -1
- package/_cjs/services/Store/Cosmos/query.cjs +2 -3
- package/_cjs/services/Store/Cosmos/query.cjs.map +1 -1
- package/_cjs/services/Store/Cosmos.cjs +24 -23
- package/_cjs/services/Store/Cosmos.cjs.map +1 -1
- package/_cjs/services/Store/Disk.cjs +6 -6
- package/_cjs/services/Store/Disk.cjs.map +1 -1
- package/_cjs/services/Store/Memory.cjs +7 -6
- package/_cjs/services/Store/Memory.cjs.map +1 -1
- package/_cjs/services/Store/utils.cjs +5 -5
- package/_cjs/services/Store/utils.cjs.map +1 -1
- package/dist/api/internal/events.d.ts.map +1 -1
- package/dist/api/internal/events.js +3 -2
- package/dist/api/internal/middlewares.d.ts.map +1 -1
- package/dist/api/internal/middlewares.js +4 -3
- package/dist/api/routing/defaultErrorHandler.d.ts.map +1 -1
- package/dist/api/routing/defaultErrorHandler.js +4 -3
- package/dist/api/routing/makeRequestHandler.d.ts.map +1 -1
- package/dist/api/routing/makeRequestHandler.js +10 -9
- package/dist/errorReporter.d.ts +1 -1
- package/dist/errorReporter.d.ts.map +1 -1
- package/dist/errorReporter.js +12 -11
- package/dist/logger.d.ts +8 -0
- package/dist/logger.d.ts.map +1 -0
- package/dist/logger.js +3 -0
- package/dist/services/Emailer/Sendgrid.d.ts.map +1 -1
- package/dist/services/Emailer/Sendgrid.js +8 -7
- package/dist/services/Emailer/fake.d.ts.map +1 -1
- package/dist/services/Emailer/fake.js +5 -4
- package/dist/services/QueueMaker/SQLQueue.d.ts.map +1 -1
- package/dist/services/QueueMaker/SQLQueue.js +9 -8
- package/dist/services/QueueMaker/memQueue.d.ts.map +1 -1
- package/dist/services/QueueMaker/memQueue.js +17 -16
- package/dist/services/QueueMaker/sbqueue.d.ts.map +1 -1
- package/dist/services/QueueMaker/sbqueue.js +17 -16
- package/dist/services/RepositoryBase.d.ts.map +1 -1
- package/dist/services/RepositoryBase.js +23 -23
- package/dist/services/Store/Cosmos/query.d.ts.map +1 -1
- package/dist/services/Store/Cosmos/query.js +3 -4
- package/dist/services/Store/Cosmos.d.ts.map +1 -1
- package/dist/services/Store/Cosmos.js +24 -23
- package/dist/services/Store/Disk.d.ts.map +1 -1
- package/dist/services/Store/Disk.js +8 -8
- package/dist/services/Store/Memory.d.ts.map +1 -1
- package/dist/services/Store/Memory.js +8 -7
- package/dist/services/Store/utils.d.ts.map +1 -1
- package/dist/services/Store/utils.js +5 -5
- package/examples/query.ts +3 -3
- package/package.json +15 -5
- package/src/api/internal/events.ts +2 -1
- package/src/api/internal/middlewares.ts +3 -2
- package/src/api/routing/defaultErrorHandler.ts +3 -2
- package/src/api/routing/makeRequestHandler.ts +9 -8
- package/src/api/writeDocs.ts.bak +1 -1
- package/src/errorReporter.ts +31 -33
- package/src/logger.ts +3 -0
- package/src/services/Emailer/Sendgrid.ts +14 -12
- package/src/services/Emailer/fake.ts +4 -3
- package/src/services/QueueMaker/SQLQueue.ts +18 -19
- package/src/services/QueueMaker/memQueue.ts +33 -36
- package/src/services/QueueMaker/sbqueue.ts +38 -41
- package/src/services/RepositoryBase.ts +40 -43
- package/src/services/Store/Cosmos/query.ts +6 -5
- package/src/services/Store/Cosmos.ts +75 -90
- package/src/services/Store/Disk.ts +12 -14
- package/src/services/Store/Memory.ts +7 -6
- package/src/services/Store/utils.ts +10 -14
- package/test/query.test.ts +56 -61
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,24 @@
|
|
|
1
1
|
# @effect-app/infra
|
|
2
2
|
|
|
3
|
+
## 1.23.3
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- 550ba43: control log levels
|
|
8
|
+
- Updated dependencies [550ba43]
|
|
9
|
+
- @effect-app/infra-adapters@1.11.6
|
|
10
|
+
- effect-app@1.17.4
|
|
11
|
+
- @effect-app/core@1.10.2
|
|
12
|
+
- @effect-app/schema@1.12.2
|
|
13
|
+
|
|
14
|
+
## 1.23.2
|
|
15
|
+
|
|
16
|
+
### Patch Changes
|
|
17
|
+
|
|
18
|
+
- Updated dependencies [6a3e66a]
|
|
19
|
+
- effect-app@1.17.3
|
|
20
|
+
- @effect-app/infra-adapters@1.11.5
|
|
21
|
+
|
|
3
22
|
## 1.23.1
|
|
4
23
|
|
|
5
24
|
### Patch Changes
|
|
@@ -8,11 +8,12 @@ var _setupRequest = require("@effect-app/infra/api/setupRequest");
|
|
|
8
8
|
var _errorReporter = require("@effect-app/infra/errorReporter");
|
|
9
9
|
var _effectApp = require("effect-app");
|
|
10
10
|
var _http = require("effect-app/http");
|
|
11
|
+
var _logger = require("src/logger.js");
|
|
11
12
|
// Tell the client to retry every 10 seconds if connectivity is lost
|
|
12
13
|
const setRetry = _effectApp.Stream.succeed("retry: 10000");
|
|
13
14
|
const keepAlive = _effectApp.Stream.schedule(_effectApp.Effect.succeed(":keep-alive"), _effectApp.Schedule.fixed(_effectApp.Duration.seconds(15)));
|
|
14
15
|
const makeSSE = (events, schema) => _effectApp.Effect.gen(function* () {
|
|
15
|
-
yield*
|
|
16
|
+
yield* _logger.InfraLogger.logInfo("$ start listening to events");
|
|
16
17
|
const enc = new TextEncoder();
|
|
17
18
|
const encode = _effectApp.S.encode(schema);
|
|
18
19
|
const eventStream = _effectApp.Stream.flatMap(events, _ => encode(_.evt).pipe(_effectApp.Effect.andThen(evt => `id: ${_.evt.id}\ndata: ${JSON.stringify(evt)}`)));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"events.cjs","names":["_setupRequest","require","_errorReporter","_effectApp","_http","setRetry","Stream","succeed","keepAlive","schedule","Effect","Schedule","fixed","Duration","seconds","makeSSE","events","schema","gen","logInfo","enc","TextEncoder","encode","S","eventStream","flatMap","_","evt","pipe","andThen","id","JSON","stringify","stream","merge","map","ctx","context","res","HttpServerResponse","tapErrorCause","reportError","provideContext","contentType","headers","HttpHeaders","fromInput","setupRequestContext","exports"],"sources":["../../../src/api/internal/events.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,aAAA,GAAAC,OAAA;AACA,IAAAC,cAAA,GAAAD,OAAA;AACA,IAAAE,UAAA,GAAAF,OAAA;AACA,IAAAG,KAAA,GAAAH,OAAA;AAEA;AACA,
|
|
1
|
+
{"version":3,"file":"events.cjs","names":["_setupRequest","require","_errorReporter","_effectApp","_http","_logger","setRetry","Stream","succeed","keepAlive","schedule","Effect","Schedule","fixed","Duration","seconds","makeSSE","events","schema","gen","InfraLogger","logInfo","enc","TextEncoder","encode","S","eventStream","flatMap","_","evt","pipe","andThen","id","JSON","stringify","stream","merge","map","ctx","context","res","HttpServerResponse","tapErrorCause","reportError","provideContext","contentType","headers","HttpHeaders","fromInput","setupRequestContext","exports"],"sources":["../../../src/api/internal/events.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,aAAA,GAAAC,OAAA;AACA,IAAAC,cAAA,GAAAD,OAAA;AACA,IAAAE,UAAA,GAAAF,OAAA;AACA,IAAAG,KAAA,GAAAH,OAAA;AACA,IAAAI,OAAA,GAAAJ,OAAA;AAEA;AACA,MAAMK,QAAQ,GAAGC,iBAAM,CAACC,OAAO,CAAC,cAAc,CAAC;AAC/C,MAAMC,SAAS,GAAGF,iBAAM,CAACG,QAAQ,CAACC,iBAAM,CAACH,OAAO,CAAC,aAAa,CAAC,EAAEI,mBAAQ,CAACC,KAAK,CAACC,mBAAQ,CAACC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAE/F,MAAMC,OAAO,GAAGA,CACrBC,MAA0D,EAC1DC,MAA2B,KAE3BP,iBAAM,CACHQ,GAAG,CAAC,aAAS;EACZ,OAAOC,mBAAW,CAACC,OAAO,CAAC,6BAA6B,CAAC;EAEzD,MAAMC,GAAG,GAAG,IAAIC,WAAW,EAAE;EAE7B,MAAMC,MAAM,GAAGC,YAAC,CAACD,MAAM,CAACN,MAAM,CAAC;EAE/B,MAAMQ,WAAW,GAAGnB,iBAAM,CAACoB,OAAO,CAChCV,MAAM,EACLW,CAAC,IACAJ,MAAM,CAACI,CAAC,CAACC,GAAG,CAAC,CACVC,IAAI,CAACnB,iBAAM,CAACoB,OAAO,CAAEF,GAAG,IAAK,OAAOD,CAAC,CAACC,GAAG,CAACG,EAAE,WAAWC,IAAI,CAACC,SAAS,CAACL,GAAG,CAAC,EAAE,CAAC,CAAC,CACpF;EAED,MAAMM,MAAM,GAAG,IAAAL,eAAI,EACjBxB,QAAQ,EACRC,iBAAM,CAAC6B,KAAK,CAAC3B,SAAS,CAAC,EACvBF,iBAAM,CAAC6B,KAAK,CAACV,WAAW,CAAC,EACzBnB,iBAAM,CAAC8B,GAAG,CAAET,CAAC,IAAKN,GAAG,CAACE,MAAM,CAACI,CAAC,GAAG,MAAM,CAAC,CAAC,CAC1C;EAED,MAAMU,GAAG,GAAG,OAAO3B,iBAAM,CAAC4B,OAAO,EAAU;EAC3C,MAAMC,GAAG,GAAGC,wBAAkB,CAACN,MAAM,CACnCA,MAAM,CACHL,IAAI,CACHvB,iBAAM,CAACmC,aAAa,CAAC,IAAAC,0BAAW,EAAC,SAAS,CAAC,CAAC,EAC5CpC,iBAAM,CAACqC,cAAc,CAACN,GAAG,CAAC,CAC3B,EACH;IACEO,WAAW,EAAE,mBAAmB;IAChCC,OAAO,EAAEC,iBAAW,CAACC,SAAS,CAAC;MAC7B,cAAc,EAAE,mBAAmB;MACnC,eAAe,EAAE,UAAU;MAC3B,mBAAmB,EAAE,IAAI;MACzB,YAAY,EAAE,YAAY,CAAC;KAC5B;GACF,CACF;EACD,OAAOR,GAAG;AACZ,CAAC,CAAC,CACDV,IAAI,CAACnB,iBAAM,CAAC+B,aAAa,CAAC,IAAAC,0BAAW,EAAC,SAAS,CAAC,CAAC,EAAGf,CAAC,IAAK,IAAAqB,iCAAmB,EAACrB,CAAC,EAAE,QAAQ,CAAC,CAAC;AAAAsB,OAAA,CAAAlC,OAAA,GAAAA,OAAA","ignoreList":[]}
|
|
@@ -17,6 +17,7 @@ var FiberRef = _interopRequireWildcard(require("effect/FiberRef"));
|
|
|
17
17
|
var _Function = require("effect/Function");
|
|
18
18
|
var HashMap = _interopRequireWildcard(require("effect/HashMap"));
|
|
19
19
|
var Metric = _interopRequireWildcard(require("effect/Metric"));
|
|
20
|
+
var _logger = require("src/logger.js");
|
|
20
21
|
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); }
|
|
21
22
|
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; }
|
|
22
23
|
/**
|
|
@@ -42,9 +43,9 @@ const errorLog = exports.errorLog = Middleware.make(app => _effectApp.Effect.gen
|
|
|
42
43
|
const request = yield* _(HttpServerRequest.HttpServerRequest);
|
|
43
44
|
const response = yield* _(app);
|
|
44
45
|
if (response.status >= 400 && response.status < 500) {
|
|
45
|
-
yield* _(
|
|
46
|
+
yield* _(_logger.InfraLogger.logWarning(`${request.method.toUpperCase()} ${request.url} client error ${response.status}`));
|
|
46
47
|
} else if (response.status >= 500) {
|
|
47
|
-
yield* _(
|
|
48
|
+
yield* _(_logger.InfraLogger.logError(`${request.method.toUpperCase()} ${request.url} server error ${response.status}`));
|
|
48
49
|
}
|
|
49
50
|
return response;
|
|
50
51
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middlewares.cjs","names":["crypto","_interopRequireWildcard","require","_utils","_errors","Middleware","HttpServerRequest","ServerResponse","_effectApp","_http","Either","FiberRef","_Function","HashMap","Metric","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","accessLog","level","make","app","pipe","Effect","flatMap","request","method","url","exports","uuidLogAnnotation","logAnnotationKey","sync","randomUUID","uuid","update","currentLogAnnotations","endpointCallsMetric","endpointCalledCounter","counter","gen","_","increment","tagMetrics","errorLog","response","status","logWarning","toUpperCase","logError","toServerResponse","err","HttpServerResponse","empty","setStatus","setBody","HttpBody","unsafeJson","message","basicAuth","checkCredentials","options","headerName","skippedPaths","skipPaths","includes","authHeader","headers","toLowerCase","undefined","NotLoggedInError","authorizationParts","split","length","credentialsBuffer","Buffer","from","credentialsText","toString","credentialsParts","check","user","password","either","isLeft","left","cors","_options","DEFAULTS","allowedOrigins","allowedMethods","allowedHeaders","exposedHeaders","credentials","isAllowedOrigin","origin","allowOrigin","originHeader","Vary","allowMethods","join","allowCredentials","allowHeaders","accessControlRequestHeaders","exposeHeaders","maxAge","corsHeaders","HttpHeaders","fromInput","dropUndefined","setHeaders"],"sources":["../../../src/api/internal/middlewares.ts"],"sourcesContent":[null],"mappings":";;;;;;AAKA,IAAAA,MAAA,GAAAC,uBAAA,CAAAC,OAAA;AAEA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AACA,IAAAG,UAAA,GAAAJ,uBAAA,CAAAC,OAAA;AACA,IAAAI,iBAAA,GAAAL,uBAAA,CAAAC,OAAA;AACA,IAAAK,cAAA,GAAAN,uBAAA,CAAAC,OAAA;AACA,IAAAM,UAAA,GAAAN,OAAA;AACA,IAAAO,KAAA,GAAAP,OAAA;AACA,IAAAQ,MAAA,GAAAT,uBAAA,CAAAC,OAAA;AACA,IAAAS,QAAA,GAAAV,uBAAA,CAAAC,OAAA;AACA,IAAAU,SAAA,GAAAV,OAAA;AACA,IAAAW,OAAA,GAAAZ,uBAAA,CAAAC,OAAA;AACA,IAAAY,MAAA,GAAAb,uBAAA,CAAAC,OAAA;
|
|
1
|
+
{"version":3,"file":"middlewares.cjs","names":["crypto","_interopRequireWildcard","require","_utils","_errors","Middleware","HttpServerRequest","ServerResponse","_effectApp","_http","Either","FiberRef","_Function","HashMap","Metric","_logger","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","accessLog","level","make","app","pipe","Effect","flatMap","request","method","url","exports","uuidLogAnnotation","logAnnotationKey","sync","randomUUID","uuid","update","currentLogAnnotations","endpointCallsMetric","endpointCalledCounter","counter","gen","_","increment","tagMetrics","errorLog","response","status","InfraLogger","logWarning","toUpperCase","logError","toServerResponse","err","HttpServerResponse","empty","setStatus","setBody","HttpBody","unsafeJson","message","basicAuth","checkCredentials","options","headerName","skippedPaths","skipPaths","includes","authHeader","headers","toLowerCase","undefined","NotLoggedInError","authorizationParts","split","length","credentialsBuffer","Buffer","from","credentialsText","toString","credentialsParts","check","user","password","either","isLeft","left","cors","_options","DEFAULTS","allowedOrigins","allowedMethods","allowedHeaders","exposedHeaders","credentials","isAllowedOrigin","origin","allowOrigin","originHeader","Vary","allowMethods","join","allowCredentials","allowHeaders","accessControlRequestHeaders","exposeHeaders","maxAge","corsHeaders","HttpHeaders","fromInput","dropUndefined","setHeaders"],"sources":["../../../src/api/internal/middlewares.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -11,6 +11,7 @@ var _HttpServerResponse = require("@effect/platform/HttpServerResponse");
|
|
|
11
11
|
var _effectApp = require("effect-app");
|
|
12
12
|
var _errors = require("effect-app/client/errors");
|
|
13
13
|
var _http = require("effect-app/http");
|
|
14
|
+
var _logger = require("src/logger.js");
|
|
14
15
|
class JWTError extends _effectApp.Data.TaggedClass("JWTError") {}
|
|
15
16
|
exports.JWTError = JWTError;
|
|
16
17
|
const logRequestError = (0, _errorReporter.logError)("Request");
|
|
@@ -18,7 +19,7 @@ function defaultBasicErrorHandler(_req, res, r2) {
|
|
|
18
19
|
const sendError = code => body => _effectApp.Effect.sync(() => (0, _HttpServerResponse.setBody)(res, _http.HttpBody.unsafeJson(body)).pipe((0, _HttpServerResponse.setStatus)(code)));
|
|
19
20
|
return r2.pipe(_effectApp.Effect.tapErrorCause(cause => _effectApp.Cause.isFailure(cause) ? logRequestError(cause) : _effectApp.Effect.void), _effectApp.Effect.catchTag("ValidationError", err => sendError(400)(err.errors)), _effectApp.Effect
|
|
20
21
|
// final catch all; expecting never so that unhandled known errors will show up
|
|
21
|
-
.catchAll(err =>
|
|
22
|
+
.catchAll(err => _logger.InfraLogger.logError("Program error, compiler probably silenced, got an unsupported Error in Error Channel of Effect" + err).pipe(_effectApp.Effect.map(() => err), _effectApp.Effect.flatMap(_effectApp.Effect.die))));
|
|
22
23
|
}
|
|
23
24
|
const optimisticConcurrencySchedule = _effectApp.Schedule.once && _effectApp.Schedule.recurWhile(a => a._tag === "OptimisticConcurrencyException");
|
|
24
25
|
function defaultErrorHandler(req, res, r2, customErrorSchema) {
|
|
@@ -56,6 +57,6 @@ function defaultErrorHandler(req, res, r2, customErrorSchema) {
|
|
|
56
57
|
// TODO: customize error code
|
|
57
58
|
? sendError(422, customErrorSchema)(x) : _effectApp.Effect.fail(x)) : x => x, _effectApp.Effect
|
|
58
59
|
// final catch all; expecting never so that unhandled known errors will show up
|
|
59
|
-
.catchAll(err =>
|
|
60
|
+
.catchAll(err => _logger.InfraLogger.logError("Program error, compiler probably silenced, got an unsupported Error in Error Channel of Effect" + err).pipe(_effectApp.Effect.map(() => err), _effectApp.Effect.flatMap(_effectApp.Effect.die))));
|
|
60
61
|
}
|
|
61
62
|
//# sourceMappingURL=defaultErrorHandler.cjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defaultErrorHandler.cjs","names":["_errorReporter","require","_HttpServerResponse","_effectApp","_errors","_http","JWTError","Data","TaggedClass","exports","logRequestError","logError","defaultBasicErrorHandler","_req","res","r2","sendError","code","body","Effect","sync","setBody","HttpBody","unsafeJson","pipe","setStatus","tapErrorCause","cause","Cause","isFailure","void","catchTag","err","errors","catchAll","map","flatMap","die","optimisticConcurrencySchedule","Schedule","once","recurWhile","a","_tag","defaultErrorHandler","req","customErrorSchema","r3","method","retry","schema","S","encode","orDie","andThen","annotateCurrentSpan","pretty","squashWith","_","catchTags","succeed","HttpServerResponse","message","error","status","headers","HttpHeaders","fromInput","ValidationError","NotFoundError","NotLoggedInError","UnauthorizedError","InvalidStateError","ServiceUnavailableError","OptimisticConcurrencyException","x","is","fail"],"sources":["../../../src/api/routing/defaultErrorHandler.ts"],"sourcesContent":[null],"mappings":";;;;;;;;AAAA,IAAAA,cAAA,GAAAC,OAAA;AAEA,IAAAC,mBAAA,GAAAD,OAAA;AACA,IAAAE,UAAA,GAAAF,OAAA;AAEA,IAAAG,OAAA,GAAAH,OAAA;AASA,IAAAI,KAAA,GAAAJ,OAAA;
|
|
1
|
+
{"version":3,"file":"defaultErrorHandler.cjs","names":["_errorReporter","require","_HttpServerResponse","_effectApp","_errors","_http","_logger","JWTError","Data","TaggedClass","exports","logRequestError","logError","defaultBasicErrorHandler","_req","res","r2","sendError","code","body","Effect","sync","setBody","HttpBody","unsafeJson","pipe","setStatus","tapErrorCause","cause","Cause","isFailure","void","catchTag","err","errors","catchAll","InfraLogger","map","flatMap","die","optimisticConcurrencySchedule","Schedule","once","recurWhile","a","_tag","defaultErrorHandler","req","customErrorSchema","r3","method","retry","schema","S","encode","orDie","andThen","annotateCurrentSpan","pretty","squashWith","_","catchTags","succeed","HttpServerResponse","message","error","status","headers","HttpHeaders","fromInput","ValidationError","NotFoundError","NotLoggedInError","UnauthorizedError","InvalidStateError","ServiceUnavailableError","OptimisticConcurrencyException","x","is","fail"],"sources":["../../../src/api/routing/defaultErrorHandler.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -12,6 +12,7 @@ var _errorReporter = require("@effect-app/infra/errorReporter");
|
|
|
12
12
|
var _effectApp = require("effect-app");
|
|
13
13
|
var _http = require("effect-app/http");
|
|
14
14
|
var _schema = require("effect-app/schema");
|
|
15
|
+
var _logger = require("src/logger.js");
|
|
15
16
|
var _setupRequest = require("../setupRequest.cjs");
|
|
16
17
|
var _base = require("./base.cjs");
|
|
17
18
|
const RequestSettings = exports.RequestSettings = _effectApp.FiberRef.unsafeMake({
|
|
@@ -55,14 +56,14 @@ function makeRequestHandler(handler, errorHandler, middlewareLayer) {
|
|
|
55
56
|
headers: req.headers,
|
|
56
57
|
cookies: {} // req.cookies
|
|
57
58
|
}));
|
|
58
|
-
return _effectApp.Effect.gen(function* (
|
|
59
|
-
const req = yield*
|
|
59
|
+
return _effectApp.Effect.gen(function* () {
|
|
60
|
+
const req = yield* _http.HttpServerRequest.HttpServerRequest;
|
|
60
61
|
const res = _http.HttpServerResponse.empty().pipe(_ => req.method === "GET" ? _http.HttpServerResponse.setHeader(_, "Cache-Control", "no-store") : _);
|
|
61
|
-
const pars = yield*
|
|
62
|
-
const settings = yield*
|
|
62
|
+
const pars = yield* getParams;
|
|
63
|
+
const settings = yield* _effectApp.FiberRef.get(RequestSettings);
|
|
63
64
|
const eff =
|
|
64
65
|
// TODO: we don;t have access to user id here cause context is not yet created
|
|
65
|
-
|
|
66
|
+
_logger.InfraLogger.logInfo("Incoming request").pipe(_effectApp.Effect.annotateLogs({
|
|
66
67
|
method: req.method,
|
|
67
68
|
path: req.originalUrl,
|
|
68
69
|
...(settings.verbose ? {
|
|
@@ -97,7 +98,7 @@ function makeRequestHandler(handler, errorHandler, middlewareLayer) {
|
|
|
97
98
|
method: req.method
|
|
98
99
|
}), _effectApp.Effect.suspend(() => {
|
|
99
100
|
const headers = res.headers;
|
|
100
|
-
return
|
|
101
|
+
return _logger.InfraLogger.logError("Finished request", cause).pipe(_effectApp.Effect.annotateLogs({
|
|
101
102
|
method: req.method,
|
|
102
103
|
path: req.originalUrl,
|
|
103
104
|
statusCode: res.status.toString(),
|
|
@@ -113,7 +114,7 @@ function makeRequestHandler(handler, errorHandler, middlewareLayer) {
|
|
|
113
114
|
}));
|
|
114
115
|
})], {
|
|
115
116
|
concurrency: "inherit"
|
|
116
|
-
}))).pipe(_effectApp.Effect.tapErrorCause(cause => _effectApp.Console.error("Error occurred while reporting error", cause)))), _effectApp.Effect.tap(res =>
|
|
117
|
+
}))).pipe(_effectApp.Effect.tapErrorCause(cause => _effectApp.Console.error("Error occurred while reporting error", cause)))), _effectApp.Effect.tap(res => _logger.InfraLogger.logInfo("Finished request").pipe(_effectApp.Effect.annotateLogs({
|
|
117
118
|
method: req.method,
|
|
118
119
|
path: req.originalUrl,
|
|
119
120
|
statusCode: res.status.toString(),
|
|
@@ -121,7 +122,7 @@ function makeRequestHandler(handler, errorHandler, middlewareLayer) {
|
|
|
121
122
|
resHeaders: (0, _utils.pretty)(res.headers)
|
|
122
123
|
} : undefined)
|
|
123
124
|
}))));
|
|
124
|
-
return yield*
|
|
125
|
+
return yield* eff;
|
|
125
126
|
}).pipe(_ => (0, _setupRequest.updateRequestContext)(_, (0, _utils.copy)(_ => ({
|
|
126
127
|
name: (0, _schema.NonEmptyString255)(handler.name)
|
|
127
128
|
}))));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"makeRequestHandler.cjs","names":["_utils","require","_RequestFiberSet","_util","_errorReporter","_effectApp","_http","_schema","_setupRequest","_base","RequestSettings","exports","FiberRef","unsafeMake","verbose","makeRequestHandler","handler","errorHandler","middlewareLayer","Request","Response","h","handle","response","S","Void","resp","encoder","fields","encode","rt","encodedSchema","Struct","requestParsers","makeRequestParsers","parseRequest","parseRequestParams","getParams","Effect","map","all","rcx","HttpRouter","RouteContext","searchParms","HttpServerRequest","ParsedSearchParams","req","flatMap","json","pipe","body","headers","params","query","cookies","gen","
|
|
1
|
+
{"version":3,"file":"makeRequestHandler.cjs","names":["_utils","require","_RequestFiberSet","_util","_errorReporter","_effectApp","_http","_schema","_logger","_setupRequest","_base","RequestSettings","exports","FiberRef","unsafeMake","verbose","makeRequestHandler","handler","errorHandler","middlewareLayer","Request","Response","h","handle","response","S","Void","resp","encoder","fields","encode","rt","encodedSchema","Struct","requestParsers","makeRequestParsers","parseRequest","parseRequestParams","getParams","Effect","map","all","rcx","HttpRouter","RouteContext","searchParms","HttpServerRequest","ParsedSearchParams","req","flatMap","json","pipe","body","headers","params","query","cookies","gen","res","HttpServerResponse","empty","_","method","setHeader","pars","settings","get","eff","InfraLogger","logInfo","annotateLogs","path","originalUrl","reqPath","pretty","reqQuery","reqBody","reqCookies","reqHeaders","undefined","andThen","suspend","handleRequest","hn","Option","getOrUndefined","tap","parsedReq","annotateCurrentSpan","Object","entries","reduce","prev","key","value","length","substring","Array","isArray","keys","provideService","Tag","r","setBody","HttpBody","unsafeJson","setStatus","provide","RequestFiberSet","register","catchAllCause","cause","sync","reportError","logError","statusCode","status","toString","resHeaders","snipString","concurrency","tapErrorCause","Console","error","updateRequestContext","copy","name","NonEmptyString255"],"sources":["../../../src/api/routing/makeRequestHandler.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/_cjs/errorReporter.cjs
CHANGED
|
@@ -11,6 +11,7 @@ var _utils = require("@effect-app/core/utils");
|
|
|
11
11
|
var Sentry = _interopRequireWildcard(require("@sentry/node"));
|
|
12
12
|
var _effectApp = require("effect-app");
|
|
13
13
|
var _errors = require("./errors.cjs");
|
|
14
|
+
var _logger = require("./logger.cjs");
|
|
14
15
|
var _RequestContextContainer = require("./services/RequestContextContainer.cjs");
|
|
15
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); }
|
|
16
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; }
|
|
@@ -30,19 +31,19 @@ const tryToJson = error => {
|
|
|
30
31
|
}
|
|
31
32
|
};
|
|
32
33
|
function reportError(name) {
|
|
33
|
-
return (cause, extras) => _effectApp.Effect.gen(function* (
|
|
34
|
-
yield*
|
|
34
|
+
return (cause, extras) => _effectApp.Effect.gen(function* () {
|
|
35
|
+
yield* (0, _errors.annotateSpanWithError)(cause, name);
|
|
35
36
|
if (_effectApp.Cause.isInterrupted(cause)) {
|
|
36
|
-
yield*
|
|
37
|
+
yield* _logger.InfraLogger.logDebug("Interrupted").pipe(_effectApp.Effect.annotateLogs("extras", JSON.stringify(extras ?? {})));
|
|
37
38
|
return;
|
|
38
39
|
}
|
|
39
40
|
const error = new _errors.CauseException(cause, name);
|
|
40
|
-
yield*
|
|
41
|
-
yield*
|
|
41
|
+
yield* reportSentry(error, extras);
|
|
42
|
+
yield* _logger.InfraLogger.logError("Reporting error", cause).pipe(_effectApp.Effect.annotateLogs((0, _utils.dropUndefined)({
|
|
42
43
|
extras,
|
|
43
44
|
__cause__: tryToJson(error),
|
|
44
45
|
__error_name__: name
|
|
45
|
-
})), _effectApp.Effect.catchAllCause(cause =>
|
|
46
|
+
})), _effectApp.Effect.catchAllCause(cause => _logger.InfraLogger.logError("Failed to log error", cause)), _effectApp.Effect.catchAllCause(() => _logger.InfraLogger.logError("Failed to log error cause")));
|
|
46
47
|
error[_errors.ErrorReported] = true;
|
|
47
48
|
return error;
|
|
48
49
|
});
|
|
@@ -58,19 +59,19 @@ function reportSentry(error, extras) {
|
|
|
58
59
|
}));
|
|
59
60
|
}
|
|
60
61
|
function logError(name) {
|
|
61
|
-
return (cause, extras) => _effectApp.Effect.gen(function* (
|
|
62
|
+
return (cause, extras) => _effectApp.Effect.gen(function* () {
|
|
62
63
|
if (_effectApp.Cause.isInterrupted(cause)) {
|
|
63
|
-
yield*
|
|
64
|
+
yield* _logger.InfraLogger.logDebug("Interrupted").pipe(_effectApp.Effect.annotateLogs((0, _utils.dropUndefined)({
|
|
64
65
|
extras
|
|
65
|
-
})))
|
|
66
|
+
})));
|
|
66
67
|
return;
|
|
67
68
|
}
|
|
68
69
|
const error = new _errors.CauseException(cause, name);
|
|
69
|
-
yield*
|
|
70
|
+
yield* _logger.InfraLogger.logWarning("Logging error", cause).pipe(_effectApp.Effect.annotateLogs((0, _utils.dropUndefined)({
|
|
70
71
|
extras,
|
|
71
72
|
__cause__: tryToJson(error),
|
|
72
73
|
__error_name__: name
|
|
73
|
-
})), _effectApp.Effect.catchAllCause(cause =>
|
|
74
|
+
})), _effectApp.Effect.catchAllCause(cause => _logger.InfraLogger.logError("Failed to log error", cause)), _effectApp.Effect.catchAllCause(() => _logger.InfraLogger.logError("Failed to log error cause")));
|
|
74
75
|
});
|
|
75
76
|
}
|
|
76
77
|
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","tryToJson","error","toJSON","toString","err","reportError","name","cause","extras","Effect","gen","
|
|
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","tryToJson","error","toJSON","toString","err","reportError","name","cause","extras","Effect","gen","annotateSpanWithError","Cause","isInterrupted","InfraLogger","logDebug","pipe","annotateLogs","JSON","stringify","CauseException","reportSentry","logError","dropUndefined","__cause__","__error_name__","catchAllCause","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":[]}
|
package/_cjs/logger.cjs
ADDED
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.InfraLogger = void 0;
|
|
7
|
+
var _logger = require("@effect-app/core/utils/logger");
|
|
8
|
+
const InfraLogger = exports.InfraLogger = (0, _logger.makeLog)("@effect-app/infra", "info");
|
|
9
|
+
//# sourceMappingURL=logger.cjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logger.cjs","names":["_logger","require","InfraLogger","exports","makeLog"],"sources":["../src/logger.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AAEO,MAAMC,WAAW,GAAAC,OAAA,CAAAD,WAAA,GAAG,IAAAE,eAAO,EAAC,mBAAmB,EAAE,MAAM,CAAC","ignoreList":[]}
|
|
@@ -9,6 +9,7 @@ exports.renderMessage = renderMessage;
|
|
|
9
9
|
var _utils = require("@effect-app/core/utils");
|
|
10
10
|
var _mail = _interopRequireDefault(require("@sendgrid/mail"));
|
|
11
11
|
var _effectApp = require("effect-app");
|
|
12
|
+
var _logger = require("src/logger.js");
|
|
12
13
|
var _util = require("util");
|
|
13
14
|
var _service = require("./service.cjs");
|
|
14
15
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
@@ -22,7 +23,7 @@ const makeSendgrid = ({
|
|
|
22
23
|
_mail.default.setApiKey(_effectApp.Secret.value(apiKey));
|
|
23
24
|
return _service.Emailer.of({
|
|
24
25
|
sendMail(msg_) {
|
|
25
|
-
return _effectApp.Effect.gen(function* (
|
|
26
|
+
return _effectApp.Effect.gen(function* () {
|
|
26
27
|
const msg = (0, _utils.dropUndefinedT)({
|
|
27
28
|
...msg_,
|
|
28
29
|
from: msg_.from ?? defaultFrom,
|
|
@@ -34,16 +35,16 @@ const makeSendgrid = ({
|
|
|
34
35
|
...renderedMsg_,
|
|
35
36
|
subject: `${subjectPrefix}${renderedMsg_.subject}`
|
|
36
37
|
};
|
|
37
|
-
yield*
|
|
38
|
-
const ret = yield*
|
|
38
|
+
yield* _logger.InfraLogger.logDebug("Sending email").pipe(_effectApp.Effect.annotateLogs("msg", (0, _util.inspect)(renderedMsg, false, 5)));
|
|
39
|
+
const ret = yield* _effectApp.Effect.async(cb => void _mail.default.send(renderedMsg, false, (err, result) => err ? cb(_effectApp.Effect.fail(err)) : cb(_effectApp.Effect.sync(() => result))));
|
|
39
40
|
// const event = {
|
|
40
41
|
// name: "EmailSent",
|
|
41
42
|
// properties: {
|
|
42
43
|
// templateId: msg.templateId
|
|
43
44
|
// }
|
|
44
45
|
// }
|
|
45
|
-
// yield*
|
|
46
|
-
// const { trackEvent } = yield*
|
|
46
|
+
// yield* InfraLogger.logDebug("Tracking email event").annotateLogs("event", event.$$.pretty)
|
|
47
|
+
// const { trackEvent } = yield* AiContextService
|
|
47
48
|
// trackEvent(event)
|
|
48
49
|
return ret;
|
|
49
50
|
});
|
|
@@ -1 +1 @@
|
|
|
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","
|
|
1
|
+
{"version":3,"file":"Sendgrid.cjs","names":["_utils","require","_mail","_interopRequireDefault","_effectApp","_logger","_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","InfraLogger","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":[]}
|
|
@@ -6,10 +6,11 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.FakeSendgrid = void 0;
|
|
7
7
|
var _effectApp = require("effect-app");
|
|
8
8
|
var _utils = require("effect-app/utils");
|
|
9
|
+
var _logger = require("src/logger.js");
|
|
9
10
|
var _service = require("./service.cjs");
|
|
10
|
-
const makeFake =
|
|
11
|
+
const makeFake = _logger.InfraLogger.logInfo("FAKE Emailer Service enabled").pipe(_effectApp.Effect.map(() => _service.Emailer.of({
|
|
11
12
|
sendMail(msg) {
|
|
12
|
-
return
|
|
13
|
+
return _logger.InfraLogger.logDebug(`Fake send mail`).pipe(_effectApp.Effect.annotateLogs("msg", (0, _utils.pretty)(msg)));
|
|
13
14
|
}
|
|
14
15
|
})));
|
|
15
16
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fake.cjs","names":["_effectApp","require","_utils","_service","makeFake","
|
|
1
|
+
{"version":3,"file":"fake.cjs","names":["_effectApp","require","_utils","_logger","_service","makeFake","InfraLogger","logInfo","pipe","Effect","map","Emailer","of","sendMail","msg","logDebug","annotateLogs","pretty","FakeSendgrid","exports","toLayer"],"sources":["../../../src/services/Emailer/fake.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AACA,IAAAG,QAAA,GAAAH,OAAA;AAEA,MAAMI,QAAQ,GAAGC,mBAAW,CACzBC,OAAO,CAAC,8BAA8B,CAAC,CACvCC,IAAI,CAACC,iBAAM,CAACC,GAAG,CAAC,MACfC,gBAAO,CAACC,EAAE,CAAC;EACTC,QAAQA,CAACC,GAAG;IACV,OAAOR,mBAAW,CACfS,QAAQ,CAAC,gBAAgB,CAAC,CAC1BP,IAAI,CAACC,iBAAM,CAACO,YAAY,CAAC,KAAK,EAAE,IAAAC,aAAM,EAACH,GAAG,CAAC,CAAC,CAAC;EAClD;CACD,CAAC,CACH,CAAC;AAEJ;;;AAGO,MAAMI,YAAY,GAAAC,OAAA,CAAAD,YAAA,GAAGP,gBAAO,CAACS,OAAO,CAACf,QAAQ,CAAC","ignoreList":[]}
|
|
@@ -16,6 +16,7 @@ var _effectApp = require("effect-app");
|
|
|
16
16
|
var _ids = require("effect-app/ids");
|
|
17
17
|
var _schema = require("effect-app/schema");
|
|
18
18
|
var _utils = require("effect-app/utils");
|
|
19
|
+
var _logger = require("src/logger.js");
|
|
19
20
|
const QueueId = exports.QueueId = _effectApp.S.Number.pipe(_effectApp.S.brand("QueueId"));
|
|
20
21
|
/**
|
|
21
22
|
* Currently limited to one process draining at a time, due to in-process Semaphore instead of row-level locking.
|
|
@@ -107,16 +108,16 @@ function makeSQLQueue(queueName, queueDrainName, schema, drainSchema) {
|
|
|
107
108
|
};
|
|
108
109
|
const rcc = yield* _RequestContextContainer.RequestContextContainer;
|
|
109
110
|
return {
|
|
110
|
-
publish: (...messages) => _effectApp.Effect.gen(function* (
|
|
111
|
-
const requestContext = yield*
|
|
112
|
-
const span = yield*
|
|
113
|
-
return yield*
|
|
111
|
+
publish: (...messages) => _effectApp.Effect.gen(function* () {
|
|
112
|
+
const requestContext = yield* rcc.requestContext;
|
|
113
|
+
const span = yield* _effectApp.Effect.serviceOption(_effectApp.Tracer.ParentSpan);
|
|
114
|
+
return yield* _effectApp.Effect.forEach(messages, m => q.offer(m, {
|
|
114
115
|
requestContext: new _RequestContext.RequestContext(requestContext),
|
|
115
116
|
// workaround Schema expecting exact class
|
|
116
117
|
span: _effectApp.Option.getOrUndefined(span)
|
|
117
118
|
}), {
|
|
118
119
|
discard: true
|
|
119
|
-
})
|
|
120
|
+
});
|
|
120
121
|
}).pipe(_effectApp.Effect.withSpan("queue.publish: " + queueName, {
|
|
121
122
|
captureStackTrace: false,
|
|
122
123
|
kind: "producer",
|
|
@@ -132,7 +133,7 @@ function makeSQLQueue(queueName, queueDrainName, schema, drainSchema) {
|
|
|
132
133
|
body,
|
|
133
134
|
meta
|
|
134
135
|
}) => {
|
|
135
|
-
let effect =
|
|
136
|
+
let effect = _logger.InfraLogger.logInfo(`[${queueDrainName}] Processing incoming message`).pipe(_effectApp.Effect.annotateLogs({
|
|
136
137
|
body: (0, _utils.pretty)(body),
|
|
137
138
|
meta: (0, _utils.pretty)(meta)
|
|
138
139
|
}), _effectApp.Effect.zipRight(handleEvent(body)), silenceAndReportError, _ => (0, _setupRequest.setupRequestContext)(_, _RequestContext.RequestContext.inherit(meta.requestContext, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SQLQueue.cjs","names":["_setupRequest","require","_RequestContext","_errors","_service","_RequestContextContainer","_sql","_dateFns","_effectApp","_ids","_schema","_utils","QueueId","exports","S","Number","pipe","brand","makeSQLQueue","queueName","queueDrainName","schema","drainSchema","Effect","gen","base","id","Model","Generated","meta","JsonFromString","QueueMeta","name","NonEmptyString255","createdAt","DateTimeInsert","updatedAt","DateTimeUpdate","processingAt","FieldOption","Date","finishedAt","Queue","Class","body","Drain","sql","SqlClient","queueRepo","makeRepository","tableName","spanPrefix","idColumn","drainRepo","decodeDrain","decode","drain","limit","subMinutes","getTime","lock","makeSemaphore","q","offer","insert","make","Option","none","take","first","withPermits","dec","rest","update","some","sleep","finish","rcc","RequestContextContainer","publish","messages","
|
|
1
|
+
{"version":3,"file":"SQLQueue.cjs","names":["_setupRequest","require","_RequestContext","_errors","_service","_RequestContextContainer","_sql","_dateFns","_effectApp","_ids","_schema","_utils","_logger","QueueId","exports","S","Number","pipe","brand","makeSQLQueue","queueName","queueDrainName","schema","drainSchema","Effect","gen","base","id","Model","Generated","meta","JsonFromString","QueueMeta","name","NonEmptyString255","createdAt","DateTimeInsert","updatedAt","DateTimeUpdate","processingAt","FieldOption","Date","finishedAt","Queue","Class","body","Drain","sql","SqlClient","queueRepo","makeRepository","tableName","spanPrefix","idColumn","drainRepo","decodeDrain","decode","drain","limit","subMinutes","getTime","lock","makeSemaphore","q","offer","insert","make","Option","none","take","first","withPermits","dec","rest","update","some","sleep","finish","rcc","RequestContextContainer","publish","messages","requestContext","span","serviceOption","Tracer","ParentSpan","forEach","m","RequestContext","getOrUndefined","discard","withSpan","captureStackTrace","kind","attributes","map","_","_tag","handleEvent","sessionId","silenceAndReportError","reportNonInterruptedFailure","processMessage","msg","succeed","flatMap","effect","InfraLogger","logInfo","annotateLogs","pretty","zipRight","setupRequestContext","inherit","RequestId","locale","withParentSpan","externalSpan","x","uninterruptible","fork","Fiber","join","tap","forever"],"sources":["../../../src/services/QueueMaker/SQLQueue.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|