@effect-app/infra 0.25.8 → 0.26.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 +26 -0
- package/_cjs/RequestContext.cjs +4 -3
- package/_cjs/RequestContext.cjs.map +1 -1
- package/_cjs/api/defaultErrorHandler.cjs +11 -16
- package/_cjs/api/defaultErrorHandler.cjs.map +1 -1
- package/_cjs/api/express/schema/requestHandler.cjs +1 -1
- package/_cjs/api/express/schema/requestHandler.cjs.map +1 -1
- package/_cjs/api/routing.cjs +7 -3
- package/_cjs/api/routing.cjs.map +1 -1
- package/_cjs/services/QueueMaker/sbqueue.cjs.map +1 -1
- package/_cjs/services/Store/Memory.cjs +1 -1
- package/_cjs/services/Store/Memory.cjs.map +1 -1
- package/_src/RequestContext.ts +4 -5
- package/_src/api/defaultErrorHandler.ts +12 -29
- package/_src/api/express/schema/requestHandler.ts +1 -1
- package/_src/api/routing.ts +12 -3
- package/_src/services/QueueMaker/sbqueue.ts +21 -21
- package/_src/services/Store/Memory.ts +1 -1
- package/dist/RequestContext.d.ts +1 -4
- package/dist/RequestContext.d.ts.map +1 -1
- package/dist/RequestContext.js +5 -4
- package/dist/api/defaultErrorHandler.d.ts +2 -2
- package/dist/api/defaultErrorHandler.d.ts.map +1 -1
- package/dist/api/defaultErrorHandler.js +12 -17
- package/dist/api/express/makeOpenApiSpecs.d.ts +1 -1
- package/dist/api/express/schema/requestHandler.js +2 -2
- package/dist/api/routing.d.ts +1 -1
- package/dist/api/routing.d.ts.map +1 -1
- package/dist/api/routing.js +8 -4
- package/dist/services/QueueMaker/sbqueue.js +1 -1
- package/dist/services/Store/Memory.js +2 -2
- package/package.json +5 -5
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,31 @@
|
|
|
1
1
|
# @effect-app/infra
|
|
2
2
|
|
|
3
|
+
## 0.26.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- Improve store-id
|
|
8
|
+
|
|
9
|
+
### Patch Changes
|
|
10
|
+
|
|
11
|
+
- d69d6ead: fix typo
|
|
12
|
+
- Updated dependencies
|
|
13
|
+
- @effect-app/core@0.24.0
|
|
14
|
+
- @effect-app/infra-adapters@0.20.6
|
|
15
|
+
- @effect-app/prelude@0.21.6
|
|
16
|
+
- @effect-app/schema@0.18.5
|
|
17
|
+
|
|
18
|
+
## 0.25.9
|
|
19
|
+
|
|
20
|
+
### Patch Changes
|
|
21
|
+
|
|
22
|
+
- 8da4c8fc: Add match and improve error handling
|
|
23
|
+
- Updated dependencies [8da4c8fc]
|
|
24
|
+
- @effect-app/core@0.23.1
|
|
25
|
+
- @effect-app/infra-adapters@0.20.5
|
|
26
|
+
- @effect-app/prelude@0.21.5
|
|
27
|
+
- @effect-app/schema@0.18.4
|
|
28
|
+
|
|
3
29
|
## 0.25.8
|
|
4
30
|
|
|
5
31
|
### Patch Changes
|
package/_cjs/RequestContext.cjs
CHANGED
|
@@ -17,8 +17,7 @@ class RequestContextParent extends tsplus_module_1.MNModel()({
|
|
|
17
17
|
id: tsplus_module_1.prop(RequestId),
|
|
18
18
|
name: tsplus_module_1.prop(tsplus_module_1.ReasonableString),
|
|
19
19
|
locale: tsplus_module_1.prop(tsplus_module_1.literal("en", "de")),
|
|
20
|
-
createdAt: tsplus_module_1.defaultProp(tsplus_module_1.date)
|
|
21
|
-
namespace: tsplus_module_1.optProp(tsplus_module_1.ReasonableString)
|
|
20
|
+
createdAt: tsplus_module_1.defaultProp(tsplus_module_1.date)
|
|
22
21
|
}) {}
|
|
23
22
|
exports.RequestContextParent = RequestContextParent;
|
|
24
23
|
function makeRequestId() {
|
|
@@ -32,10 +31,12 @@ class RequestContext extends tsplus_module_1.MNModel()({
|
|
|
32
31
|
...RequestContextParent.omit("id"),
|
|
33
32
|
id: tsplus_module_1.defaultProp(RequestId, makeRequestId),
|
|
34
33
|
rootId: tsplus_module_1.prop(RequestId),
|
|
35
|
-
parent: tsplus_module_1.optProp(RequestContextParent)
|
|
34
|
+
parent: tsplus_module_1.optProp(RequestContextParent),
|
|
35
|
+
namespace: tsplus_module_1.optProp(tsplus_module_1.ReasonableString)
|
|
36
36
|
}) {
|
|
37
37
|
static inherit(parent, newSelf) {
|
|
38
38
|
return new RequestContext({
|
|
39
|
+
namespace: parent?.namespace,
|
|
39
40
|
...newSelf,
|
|
40
41
|
rootId: parent.rootId,
|
|
41
42
|
parent
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RequestContext.cjs","mappings":";;;;;;;;;;;;AAAO,MAAMA,SAAS,mBAAGC,QAAQ;AAAA;AAG3B,MAAOC,oBAAqB,SAAQC,uBAAO,EAK9C,CAAC;EACFC,IAAI,EAAED,oBAAI,CAACA,uBAAO,CAAC,gBAAgB,CAAC,CAAC;EACrCE,EAAE,EAAEF,oBAAI,CAACH,SAAS,CAAC;EACnBM,IAAI,EAAEH,oBAAI,iBAACI,gBAAgB,CAAC;EAC5BC,MAAM,EAAEL,oBAAI,CAACA,uBAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;EACjCM,SAAS,EAAEN,2BAAW,iBAACO,IAAI
|
|
1
|
+
{"version":3,"file":"RequestContext.cjs","mappings":";;;;;;;;;;;;AAAO,MAAMA,SAAS,mBAAGC,QAAQ;AAAA;AAG3B,MAAOC,oBAAqB,SAAQC,uBAAO,EAK9C,CAAC;EACFC,IAAI,EAAED,oBAAI,CAACA,uBAAO,CAAC,gBAAgB,CAAC,CAAC;EACrCE,EAAE,EAAEF,oBAAI,CAACH,SAAS,CAAC;EACnBM,IAAI,EAAEH,oBAAI,iBAACI,gBAAgB,CAAC;EAC5BC,MAAM,EAAEL,oBAAI,CAACA,uBAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;EACjCM,SAAS,EAAEN,2BAAW,iBAACO,IAAI;CAC5B,CAAC;AAAG;AAIC,SAAUC,aAAa;EAC3B,OAAOX,SAAS,CAACY,IAAI,EAAE;AACzB;AAEA;;;;AAIM,MAAOC,cAAe,SAAQV,uBAAO,EAKxC,CAAC;EACF,GAAGD,oBAAoB,CAACY,IAAI,CAAC,IAAI,CAAC;EAClCT,EAAE,EAAEF,2BAAW,CAACH,SAAS,EAAEW,aAAa,CAAC;EACzCI,MAAM,EAAEZ,oBAAI,CAACH,SAAS,CAAC;EACvBgB,MAAM,EAAEb,uBAAO,CAACD,oBAAoB,CAAC;EACrCe,SAAS,EAAEd,uBAAO,iBAACI,gBAAgB;CACpC,CAAC;EACA,OAAOW,OAAO,CAEZF,MAAsB,EACtBG,OAA8C;IAE9C,OAAO,IAAIN,cAAc,CAAC;MACxBI,SAAS,EAAED,MAAM,EAAEC,SAAS;MAC5B,GAAGE,OAAO;MACVJ,MAAM,EAAEC,MAAM,CAACD,MAAM;MACrBC;KACD,CAAC;EACJ;EAEA,OAAOI,YAAY,CAAaC,IAAoB;IAClD,OAAO;MACLC,aAAa,EAAED,IAAI,CAACf,IAAI;MACxBE,MAAM,EAAEa,IAAI,CAACb,MAAM;MACnB,IAAIa,IAAI,CAACL,MAAM,GACX;QAAEO,mBAAmB,EAAEF,IAAI,CAACL,MAAM,CAACV,IAAI;QAAEkB,YAAY,EAAEH,IAAI,CAACL,MAAM,CAACR;MAAM,CAAE,GAC3E,EAAE;KACP;EACH;;AAMF;;;AAAA;AAGO,MAAMiB,GAAG,GAAGC,mBAAG,EAAkB;AAAA;AASxC,WAAiBxB,oBAAoB;EAUtBA,4BAAO,GAAe;IAAEyB,CAAC,EAAE;EAAE,CAAE;AAY9C,CAAC,EAtBgBzB,oBAAoB,oCAApBA,oBAAoB;AAgCrC,WAAiBW,cAAc;EAahBA,sBAAO,GAAe;IAAEc,CAAC,EAAE;EAAE,CAAE;AAY9C,CAAC,EAzBgBd,cAAc,8BAAdA,cAAc","names":["RequestId","StringId","RequestContextParent","tsplus_module_1","_tag","id","name","ReasonableString","locale","createdAt","date","makeRequestId","make","RequestContext","omit","rootId","parent","namespace","inherit","newSelf","toMonitoring","self","operationName","parentOperationName","parentLocale","tag","tsplus_module_2","$"],"sourceRoot":"","sources":["../_src/RequestContext.ts"],"sourcesContent":[null]}
|
|
@@ -14,29 +14,24 @@ var _reportError = require("./reportError.cjs");
|
|
|
14
14
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
15
15
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
16
16
|
function defaultBasicErrorHandler(_req, res, _requestContext, r2) {
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
}))
|
|
17
|
+
const sendError = code => body => tsplus_module_1.sync(() => res.status(code).send(body));
|
|
18
|
+
return tsplus_module_4.untraced(() => tsplus_module_1.catchAll(tsplus_module_1.catchTag(tsplus_module_1.tapErrorCause(r2, cause => tsplus_module_2.isFailure(cause) ? (0, _reportError.logRequestError)(cause) : tsplus_module_3.unit), "ValidationError", err => sendError(400)(err.errors))
|
|
20
19
|
// final catch all; expecting never so that unhandled known errors will show up
|
|
21
20
|
, err => tsplus_module_1.flatMap(tsplus_module_1.map(tsplus_module_1.logError("Program error, compiler probably silenced, got an unsupported Error in Error Channel of Effect" + err), () => err), tsplus_module_1.die)));
|
|
22
21
|
}
|
|
23
22
|
const optimisticConcurrencySchedule = tsplus_module_5.intersect(tsplus_module_5.recurWhile(a => a._tag === "OptimisticConcurrencyException"))(tsplus_module_5.once());
|
|
24
23
|
function defaultErrorHandler(req, res, _, r2) {
|
|
25
24
|
const r3 = req.method === "PATCH" ? tsplus_module_1.retry(r2, optimisticConcurrencySchedule) : r2;
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
res.status(403).send(err);
|
|
34
|
-
})), "InvalidStateError", err => tsplus_module_1.sync(() => {
|
|
35
|
-
res.status(422).send(err);
|
|
36
|
-
})), "OptimisticConcurrencyException", err => tsplus_module_1.sync(() => {
|
|
25
|
+
const sendError = code => body => tsplus_module_1.sync(() => res.status(code).send(body));
|
|
26
|
+
return tsplus_module_4.untraced(() => tsplus_module_1.catchAll(tsplus_module_1.catchTags(tsplus_module_1.tapErrorCause(r3, cause => tsplus_module_2.isFailure(cause) ? (0, _reportError.logRequestError)(cause) : tsplus_module_3.unit), {
|
|
27
|
+
"ValidationError": err => sendError(400)(err.errors),
|
|
28
|
+
"NotFoundError": sendError(404),
|
|
29
|
+
"NotLoggedInError": sendError(401),
|
|
30
|
+
"UnauthorizedError": sendError(403),
|
|
31
|
+
"InvalidStateError": sendError(422),
|
|
37
32
|
// 412 or 409.. https://stackoverflow.com/questions/19122088/which-http-status-code-to-use-to-reject-a-put-due-to-optimistic-locking-failure
|
|
38
|
-
|
|
39
|
-
})
|
|
33
|
+
"OptimisticConcurrencyException": sendError(412)
|
|
34
|
+
})
|
|
40
35
|
// final catch all; expecting never so that unhandled known errors will show up
|
|
41
36
|
, err => tsplus_module_1.flatMap(tsplus_module_1.map(tsplus_module_1.logError("Program error, compiler probably silenced, got an unsupported Error in Error Channel of Effect" + err), () => err), tsplus_module_1.die)));
|
|
42
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defaultErrorHandler.cjs","mappings":";;;;;;;;;;;;AAUA;AAAkD;AAAA;AAE5C,SAAUA,wBAAwB,CACtCC,IAAqB,EACrBC,GAAqB,EACrBC,eAA+B,EAC/BC,EAAoC;EAEpC,
|
|
1
|
+
{"version":3,"file":"defaultErrorHandler.cjs","mappings":";;;;;;;;;;;;AAUA;AAAkD;AAAA;AAE5C,SAAUA,wBAAwB,CACtCC,IAAqB,EACrBC,GAAqB,EACrBC,eAA+B,EAC/BC,EAAoC;EAEpC,MAAMC,SAAS,GAAIC,IAAY,IAAMC,IAAa,IAAKC,2BAAON,GAAG,CAACO,MAAM,CAACH,IAAI,CAAC,CAACI,IAAI,CAACH,IAAI,CAAC,CAAC;EAC1F,OAAOI,yBAAe,MACpBH,kFAAE,EACeI,KAAK,IAAIC,+BAAK,CAAY,GAAG,gCAAe,EAACD,KAAK,CAAC,GAAEE,oBAAY,CAAC,EACvE,iBAAiB,EAAEC,GAAG,IAAIV,SAAS,CAAC,GAAG,CAAC,CAACU,GAAG,CAACC,MAAM,CAAC;EAC9D;EAAA,EACWD,GAAU,IACnBP,qEACE,gGAAgG,GAAGO,GAAG,CACvG,EACM,MAAMA,GAAc,CAAC,sBACN,CACvB,CACJ;AACH;AAEA,MAAME,6BAA6B,6BACjCC,2BAAqCC,CAAC,IAAIA,CAAC,CAACC,IAAI,KAAK,gCAAgC,CAAC,EADlDF,sBAAe,CACmC;AAElF,SAAUG,mBAAmB,CACjCC,GAAoB,EACpBpB,GAAqB,EACrBqB,CAAiB,EACjBnB,EAAoC;EAEpC,MAAMoB,EAAE,GAAGF,GAAG,CAACG,MAAM,KAAK,OAAO,GAC7BjB,wBAAE,EAAOS,6BAA6B,CAAC,GACvCb,EAAE;EACN,MAAMC,SAAS,GAAIC,IAAY,IAAMC,IAAa,IAAKC,2BAAON,GAAG,CAACO,MAAM,CAACH,IAAI,CAAC,CAACI,IAAI,CAACH,IAAI,CAAC,CAAC;EAC1F,OAAOI,yBAAe,MACpBH,mFAAE,EACeI,KAAK,IAAIC,+BAAK,CAAY,GAAG,gCAAe,EAACD,KAAK,CAAC,GAAEE,oBAAY,CAAC,EACtE;IACT,iBAAiB,EAAEC,GAAG,IAAIV,SAAS,CAAC,GAAG,CAAC,CAACU,GAAG,CAACC,MAAM,CAAC;IACpD,eAAe,EAAEX,SAAS,CAAC,GAAG,CAAC;IAC/B,kBAAkB,EAAEA,SAAS,CAAC,GAAG,CAAC;IAClC,mBAAmB,EAAEA,SAAS,CAAC,GAAG,CAAC;IACnC,mBAAmB,EAAEA,SAAS,CAAC,GAAG,CAAC;IACnC;IACA,gCAAgC,EAAEA,SAAS,CAAC,GAAG;GAChD;EACD;EAAA,EACWU,GAAU,IACnBP,qEACE,gGAAgG,GAAGO,GAAG,CACvG,EACM,MAAMA,GAAc,CAAC,sBACN,CACvB,CACJ;AACH","names":["defaultBasicErrorHandler","_req","res","_requestContext","r2","sendError","code","body","tsplus_module_1","status","send","tsplus_module_4","cause","tsplus_module_2","tsplus_module_3","err","errors","optimisticConcurrencySchedule","tsplus_module_5","a","_tag","defaultErrorHandler","req","_","r3","method"],"sourceRoot":"","sources":["../../_src/api/defaultErrorHandler.ts"],"sourcesContent":[null]}
|
|
@@ -103,7 +103,7 @@ function parseRequestParams(parsers) {
|
|
|
103
103
|
errors.push(makeError("path")(path.errors));
|
|
104
104
|
}
|
|
105
105
|
if (query._tag === "Failure") {
|
|
106
|
-
errors.push(makeError("
|
|
106
|
+
errors.push(makeError("query")(query.errors));
|
|
107
107
|
}
|
|
108
108
|
if (errors.length) {
|
|
109
109
|
return tsplus_module_1.fail(new _errors.ValidationError(errors));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"requestHandler.cjs","mappings":"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
|
|
1
|
+
{"version":3,"file":"requestHandler.cjs","mappings":"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","names":["decodeErrors","x","parseRequestParams","parsers","body","cookies","headers","params","query","tsplus_module_1","parseBody","_","tsplus_module_2","tsplus_module_3","cause","_tag","value","errors","cookie","parseCookie","parseHeaders","parseQuery","path","parsePath","push","makeError","length","ValidationError","type","e","respondSuccess","encodeResponse","req","res","tsplus_module_4","r","undefined","status","send","JSON","stringify","makeRequestParsers","Request","ph","tsplus_module_5","Headers","s","Parser","for","MO","condemn","u","tsplus_module_6","d","pq","Query","pb","Body","pp","Path","pc","Cookie"],"sourceRoot":"","sources":["../../../../_src/api/express/schema/requestHandler.ts"],"sourcesContent":[null]}
|
package/_cjs/api/routing.cjs
CHANGED
|
@@ -26,6 +26,7 @@ var tsplus_module_11 = _interopRequireWildcard(require("@effect/io/Debug"));
|
|
|
26
26
|
var Ex = _interopRequireWildcard(require("@effect-app/infra-adapters/express"));
|
|
27
27
|
var MO = _interopRequireWildcard(require("@effect-app/prelude/schema"));
|
|
28
28
|
var _RequestContext2 = require("../RequestContext.cjs");
|
|
29
|
+
var _Memory = require("../services/Store/Memory.cjs");
|
|
29
30
|
var _defaultErrorHandler = require("./defaultErrorHandler.cjs");
|
|
30
31
|
var _requestHandler = require("./express/schema/requestHandler.cjs");
|
|
31
32
|
var _routing = require("./express/schema/routing.cjs");
|
|
@@ -108,11 +109,14 @@ function makeRequestHandler(handler, errorHandler, makeMiddlewareContext) {
|
|
|
108
109
|
// }
|
|
109
110
|
const requestId = req.headers["request-id"];
|
|
110
111
|
const rootId = requestId ? tsplus_module_5.parseUnsafe(_RequestContext2.RequestId)(requestId) : _RequestContext2.RequestId.make();
|
|
112
|
+
const storeId = req.headers["x-store-id"];
|
|
113
|
+
const namespace = MO.ReasonableString(storeId && (Array.isArray(storeId) ? storeId[0] : storeId) || "primary");
|
|
111
114
|
const requestContext = new _RequestContext2.RequestContext({
|
|
112
115
|
rootId,
|
|
113
116
|
name: MO.ReasonableString(Request.Model instanceof MO.SchemaNamed ? Request.Model.name : Request.name),
|
|
114
117
|
locale,
|
|
115
|
-
createdAt: start
|
|
118
|
+
createdAt: start,
|
|
119
|
+
namespace
|
|
116
120
|
// ...(context.operation.parentId
|
|
117
121
|
// ? {
|
|
118
122
|
// parent: new RequestContextParent({
|
|
@@ -166,9 +170,9 @@ function makeRequestHandler(handler, errorHandler, makeMiddlewareContext) {
|
|
|
166
170
|
// Commands should not be interruptable.
|
|
167
171
|
const r = req.method !== "GET" ? tsplus_module_3.uninterruptible(handleRequest) : handleRequest; // .instrument("Performance.RequestResponse")
|
|
168
172
|
// the first log entry should be of the request start.
|
|
169
|
-
const r2 = makeMiddlewareContext ? tsplus_module_4.provideSomeContextEffect(makeMiddlewareContext(req, res, requestContext))(r)
|
|
173
|
+
const r2 = makeMiddlewareContext ? tsplus_module_4.provideSomeContextEffect(makeMiddlewareContext(req, res, requestContext))(tsplus_module_3.zipRight(_Memory.restoreFromRequestContext, r))
|
|
170
174
|
// PR is not relevant here
|
|
171
|
-
: r;
|
|
175
|
+
: tsplus_module_3.zipRight(tsplus_module_3.provideService(_Memory.restoreFromRequestContext, tsplus_module_6.tag, requestContext), r);
|
|
172
176
|
return errorHandler(req, res, requestContext, r2);
|
|
173
177
|
})), cause => tsplus_module_3.tapErrorCause(tsplus_module_3.tuplePar(tsplus_module_3.sync(() => res.status(500).send()), (0, _reportError.reportRequestError)(cause, {
|
|
174
178
|
requestContext,
|
package/_cjs/api/routing.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routing.cjs","mappings":"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","names":["RequestSettings","tsplus_module_1","verbose","makeRequestParsers","Request","ph","tsplus_module_3","tsplus_module_2","Headers","s","MO","Parser","for","condemnFail","parseHeaders","u","tsplus_module_4","d","pq","Query","parseQuery","pb","Body","parseBody","pp","Path","parsePath","pc","Cookie","parseCookie","match","requestHandler","errorHandler","middleware","makeMiddlewareContext","undefined","handler","makeContext","method","toLowerCase","path","split","makeRequestHandler","respondSuccess","encodeResponse","req","res","a","r","status","send","JSON","stringify","Response","adaptResponse","h","handle","response","Void","encoder","Encoder","requestParsers","parseRequest","respond","getParams","params","query","body","headers","cookies","start","Date","supported","desiredLocale","locale","includes","requestId","rootId","tsplus_module_5","RequestId","make","requestContext","RequestContext","name","ReasonableString","Model","SchemaNamed","createdAt","tsplus_module_11","restore","setHeader","pars","tsplus_module_10","tsplus_module_8","originalUrl","reqPath","reqQuery","reqBody","reqCookies","reqHeaders","handleRequest","hn","parsedReq","r2","cause","getHeaders","statusCode","toString","resHeaders","Object","entries","reduce","prev","key","value","console","error","matchAll","handlers","mapped","tsplus_module_7","cur","defaultBasicErrorHandler","matchAllAlt","matches","forEach","_","extractRequest","extractResponse","ResponseOpenApi","matchResource","mod"],"sourceRoot":"","sources":["../../_src/api/routing.ts"],"sourcesContent":[null]}
|
|
1
|
+
{"version":3,"file":"routing.cjs","mappings":"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","names":["RequestSettings","tsplus_module_1","verbose","makeRequestParsers","Request","ph","tsplus_module_3","tsplus_module_2","Headers","s","MO","Parser","for","condemnFail","parseHeaders","u","tsplus_module_4","d","pq","Query","parseQuery","pb","Body","parseBody","pp","Path","parsePath","pc","Cookie","parseCookie","match","requestHandler","errorHandler","middleware","makeMiddlewareContext","undefined","handler","makeContext","method","toLowerCase","path","split","makeRequestHandler","respondSuccess","encodeResponse","req","res","a","r","status","send","JSON","stringify","Response","adaptResponse","h","handle","response","Void","encoder","Encoder","requestParsers","parseRequest","respond","getParams","params","query","body","headers","cookies","start","Date","supported","desiredLocale","locale","includes","requestId","rootId","tsplus_module_5","RequestId","make","storeId","namespace","ReasonableString","Array","isArray","requestContext","RequestContext","name","Model","SchemaNamed","createdAt","tsplus_module_11","restore","setHeader","pars","tsplus_module_10","tsplus_module_8","originalUrl","reqPath","reqQuery","reqBody","reqCookies","reqHeaders","handleRequest","hn","parsedReq","r2","cause","getHeaders","statusCode","toString","resHeaders","Object","entries","reduce","prev","key","value","console","error","matchAll","handlers","mapped","tsplus_module_7","cur","defaultBasicErrorHandler","matchAllAlt","matches","forEach","_","extractRequest","extractResponse","ResponseOpenApi","matchResource","mod"],"sourceRoot":"","sources":["../../_src/api/routing.ts"],"sourcesContent":[null]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sbqueue.cjs","mappings":";;;;;;;;;;;;;;;AAAA;AASA;AAGA;AACA;AAA2F;AAAA;AAG3F;;;AAGM,SAAUA,mBAAmB,CAQjCC,UAAkB,EAClBC,cAAsB,EACtBC,OAAyD,EACzDC,eAAwF,EACxFC,cAEwD,EACxDC,UAGmF;EAEnF,OAAOC,oBAAW,WAAUC,CAAC;IAC3B,MAAMC,CAAC,GAAG,OAAOD,CAAC,yBAACE,kBAAM,EAAQ;IACjC,MAAMC,QAAQ,GAAG,OAAOH,CAAC,yBAACI,oBAAQ,EAAQ;IAC1C,MAAMC,aAAa,GAAGC,8CAAQ,EAAWH,QAAQ,CAAC;IAClD,MAAMI,qBAAqB,GAAG,wCAA2B,EAAC;MAAEC,IAAI,EAAE,wBAAwB,GAAGd;IAAc,CAAE,CAAC;IAC9G,MAAMe,WAAW,GAAG,6CAAgC,EAAC;MAAED,IAAI,EAAE,wBAAwB,GAAGd;IAAc,CAAE,CAAC;IAEzG,OAAO;MACLgB,KAAK,EAAEX,oBAAW,WAAUC,CAAC;QAC3B,MAAMW,WAAW,GAAG,OAAOX,CAAC,CAACJ,eAAe,CAAC;QAC7C;QACA,SAASgB,cAAc,CAACC,WAAgB;UACtC,OAAOd,yHAAY,MAAMe,IAAI,CAACC,KAAK,CAACF,WAAW,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"sbqueue.cjs","mappings":"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","names":["makeServiceBusQueue","_queueName","queueDrainName","encoder","makeHandleEvent","provideContext","parseDrain","tsplus_module_1","$","s","Sender","receiver","Receiver","receiverLayer","tsplus_module_2","silenceAndReportError","name","reportError","drain","handleEvent","processMessage","messageBody","JSON","parse","x","body","meta","RequestContext","inherit","id","locale","tsplus_module_5","_tag","tsplus_module_4","restoreFromRequestContext","_","processError","err","error","publish","messages","requestContext","sendMessages","map","stringify","messageId","contentType","makeServiceBusLayers","url","queueName","tsplus_module_8"],"sourceRoot":"","sources":["../../../_src/services/QueueMaker/sbqueue.ts"],"sourcesContent":[null]}
|
|
@@ -43,7 +43,7 @@ function memFilter(filter, cursor) {
|
|
|
43
43
|
}
|
|
44
44
|
const storeId = tsplus_module_5.unsafeMake("primary");
|
|
45
45
|
exports.storeId = storeId;
|
|
46
|
-
const restoreFromRequestContext = tsplus_module_7.serviceWithEffect(tsplus_module_6.tag, ctx => tsplus_module_5.set(storeId, ctx.
|
|
46
|
+
const restoreFromRequestContext = tsplus_module_7.serviceWithEffect(tsplus_module_6.tag, ctx => tsplus_module_5.set(storeId, ctx.namespace ?? "primary"));
|
|
47
47
|
exports.restoreFromRequestContext = restoreFromRequestContext;
|
|
48
48
|
function makeMemoryStoreInt(name, seed) {
|
|
49
49
|
return tsplus_module_7.gen(function* ($) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Memory.cjs","mappings":";;;;;;;;;;;;;;;;;;;AAEA;AAEA;AACA;AAAuF;AAAA;AALvF;;AAOM,SAAUA,SAAS,CAA2BC,MAAiB,EAAEC,MAA0C;EAC/G,OAASC,CAAW,IAAc;IAChC,MAAMC,IAAI,GAAGF,MAAM,EAAEE,IAAI;IACzB,MAAMC,KAAK,GAAGH,MAAM,EAAEG,KAAK;IAC3B,IAAI,CAACD,IAAI,IAAIC,KAAK,KAAK,CAAC,EAAE;MACxB,OAAOC,2EAAe,qBAAU,EAACL,MAAM,CAAC,EAAjCE,CAAC,CAAiC,uBAAgB,EAAW,MAAMI,uBAAa,CAAC;;IAE1F,IAAIC,CAAC,GAAGD,0BAAY,qBAAU,EAACN,MAAM,CAAC,EAA9BE,CAAC,CAA8B;IACvC,IAAIC,IAAI,EAAE;MACRI,CAAC,GAAGD,sBAAC,EAAMH,IAAI,CAAC;;IAElB,IAAIC,KAAK,KAAKI,SAAS,EAAE;MACvBD,CAAC,GAAGD,sBAAC,EAAMF,KAAK,CAAC;;IAEnB,qCAAOG,CAAC;EACV,CAAC;AACH;AAEO,MAAME,OAAO,GAAGC,2BAAoB,SAAS,CAAC;AAAA;AAC9C,MAAMC,yBAAyB,GAAGC,uDAAoCC,GAAG,IAC9EH,2BAAO,EAAKG,GAAG,CAACC,
|
|
1
|
+
{"version":3,"file":"Memory.cjs","mappings":"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","names":["memFilter","filter","cursor","c","skip","limit","tsplus_module_3","tsplus_module_1","r","undefined","storeId","tsplus_module_5","restoreFromRequestContext","tsplus_module_7","ctx","namespace","makeMemoryStoreInt","name","seed","$","updateETag","items","Map","makeStore","entries","map","id","e","store","tsplus_module_8","sem","withPermit","withPermits","values","s","all","batchSet","i","find","current","m","mut","forEach","set","_","toReadonlyArray","get","filterJoinSelect","flatMap","bulkSet","remove","makeMemoryStore","make","config","storesSem","primary","stores","getStore","allowNamespace","Error","args","MemoryStoreLive","tsplus_module_10"],"sourceRoot":"","sources":["../../../_src/services/Store/Memory.ts"],"sourcesContent":[null]}
|
package/_src/RequestContext.ts
CHANGED
|
@@ -11,8 +11,7 @@ export class RequestContextParent extends MNModel<
|
|
|
11
11
|
id: prop(RequestId),
|
|
12
12
|
name: prop(ReasonableString),
|
|
13
13
|
locale: prop(literal("en", "de")),
|
|
14
|
-
createdAt: defaultProp(date)
|
|
15
|
-
namespace: optProp(ReasonableString)
|
|
14
|
+
createdAt: defaultProp(date)
|
|
16
15
|
}) {}
|
|
17
16
|
/** @ignore @internal @deprecated */
|
|
18
17
|
export type RequestContextParentConstructor = typeof RequestContextParent
|
|
@@ -34,7 +33,8 @@ export class RequestContext extends MNModel<
|
|
|
34
33
|
...RequestContextParent.omit("id"),
|
|
35
34
|
id: defaultProp(RequestId, makeRequestId),
|
|
36
35
|
rootId: prop(RequestId),
|
|
37
|
-
parent: optProp(RequestContextParent)
|
|
36
|
+
parent: optProp(RequestContextParent),
|
|
37
|
+
namespace: optProp(ReasonableString)
|
|
38
38
|
}) {
|
|
39
39
|
static inherit(
|
|
40
40
|
this: void,
|
|
@@ -42,6 +42,7 @@ export class RequestContext extends MNModel<
|
|
|
42
42
|
newSelf: RequestContextParent.ConstructorInput
|
|
43
43
|
) {
|
|
44
44
|
return new RequestContext({
|
|
45
|
+
namespace: parent?.namespace,
|
|
45
46
|
...newSelf,
|
|
46
47
|
rootId: parent.rootId,
|
|
47
48
|
parent
|
|
@@ -73,7 +74,6 @@ export interface RequestContextParent {
|
|
|
73
74
|
readonly id: RequestId
|
|
74
75
|
readonly locale: "de" | "en"
|
|
75
76
|
readonly name: ReasonableString
|
|
76
|
-
readonly namespace?: ReasonableString | undefined
|
|
77
77
|
}
|
|
78
78
|
export namespace RequestContextParent {
|
|
79
79
|
/**
|
|
@@ -84,7 +84,6 @@ export namespace RequestContextParent {
|
|
|
84
84
|
readonly id: string
|
|
85
85
|
readonly locale: "de" | "en"
|
|
86
86
|
readonly name: string
|
|
87
|
-
readonly namespace?: string | undefined
|
|
88
87
|
}
|
|
89
88
|
export const Encoded: EncodedOps = { $: {} }
|
|
90
89
|
/**
|
|
@@ -16,13 +16,11 @@ export function defaultBasicErrorHandler<R>(
|
|
|
16
16
|
_requestContext: RequestContext,
|
|
17
17
|
r2: Effect<R, ValidationError, void>
|
|
18
18
|
) {
|
|
19
|
+
const sendError = (code: number) => (body: unknown) => Effect(res.status(code).send(body))
|
|
19
20
|
return Debug.untraced(() =>
|
|
20
21
|
r2
|
|
21
22
|
.tapErrorCause(cause => cause.isFailure() ? logRequestError(cause) : Effect.unit)
|
|
22
|
-
.catchTag("ValidationError", err =>
|
|
23
|
-
Effect.sync(() => {
|
|
24
|
-
res.status(400).send(err.errors)
|
|
25
|
-
}))
|
|
23
|
+
.catchTag("ValidationError", err => sendError(400)(err.errors))
|
|
26
24
|
// final catch all; expecting never so that unhandled known errors will show up
|
|
27
25
|
.catchAll((err: never) =>
|
|
28
26
|
Effect.logError(
|
|
@@ -46,34 +44,19 @@ export function defaultErrorHandler<R>(
|
|
|
46
44
|
const r3 = req.method === "PATCH"
|
|
47
45
|
? r2.retry(optimisticConcurrencySchedule)
|
|
48
46
|
: r2
|
|
47
|
+
const sendError = (code: number) => (body: unknown) => Effect(res.status(code).send(body))
|
|
49
48
|
return Debug.untraced(() =>
|
|
50
49
|
r3
|
|
51
50
|
.tapErrorCause(cause => cause.isFailure() ? logRequestError(cause) : Effect.unit)
|
|
52
|
-
.
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
Effect.sync(() => {
|
|
62
|
-
res.status(401).send(err)
|
|
63
|
-
}))
|
|
64
|
-
.catchTag("UnauthorizedError", err =>
|
|
65
|
-
Effect.sync(() => {
|
|
66
|
-
res.status(403).send(err)
|
|
67
|
-
}))
|
|
68
|
-
.catchTag("InvalidStateError", err =>
|
|
69
|
-
Effect.sync(() => {
|
|
70
|
-
res.status(422).send(err)
|
|
71
|
-
}))
|
|
72
|
-
.catchTag("OptimisticConcurrencyException", err =>
|
|
73
|
-
Effect.sync(() => {
|
|
74
|
-
// 412 or 409.. https://stackoverflow.com/questions/19122088/which-http-status-code-to-use-to-reject-a-put-due-to-optimistic-locking-failure
|
|
75
|
-
res.status(412).send(err)
|
|
76
|
-
}))
|
|
51
|
+
.catchTags({
|
|
52
|
+
"ValidationError": err => sendError(400)(err.errors),
|
|
53
|
+
"NotFoundError": sendError(404),
|
|
54
|
+
"NotLoggedInError": sendError(401),
|
|
55
|
+
"UnauthorizedError": sendError(403),
|
|
56
|
+
"InvalidStateError": sendError(422),
|
|
57
|
+
// 412 or 409.. https://stackoverflow.com/questions/19122088/which-http-status-code-to-use-to-reject-a-put-due-to-optimistic-locking-failure
|
|
58
|
+
"OptimisticConcurrencyException": sendError(412)
|
|
59
|
+
})
|
|
77
60
|
// final catch all; expecting never so that unhandled known errors will show up
|
|
78
61
|
.catchAll((err: never) =>
|
|
79
62
|
Effect.logError(
|
|
@@ -140,7 +140,7 @@ export function parseRequestParams<PathA, CookieA, QueryA, BodyA, HeaderA>(
|
|
|
140
140
|
errors.push(makeError("path")(path.errors))
|
|
141
141
|
}
|
|
142
142
|
if (query._tag === "Failure") {
|
|
143
|
-
errors.push(makeError("
|
|
143
|
+
errors.push(makeError("query")(query.errors))
|
|
144
144
|
}
|
|
145
145
|
if (errors.length) {
|
|
146
146
|
return Effect.fail(new ValidationError(errors))
|
package/_src/api/routing.ts
CHANGED
|
@@ -8,6 +8,7 @@ import { pretty } from "@effect-app/prelude/utils"
|
|
|
8
8
|
import type express from "express"
|
|
9
9
|
import type { ValidationError } from "../errors.js"
|
|
10
10
|
import { RequestContext, RequestId } from "../RequestContext.js"
|
|
11
|
+
import { restoreFromRequestContext } from "../services/Store/Memory.js"
|
|
11
12
|
import type { SupportedErrors } from "./defaultErrorHandler.js"
|
|
12
13
|
import { defaultBasicErrorHandler } from "./defaultErrorHandler.js"
|
|
13
14
|
import type { Encode, RequestHandler, RequestHandlerOptRes, RequestParsers } from "./express/schema/requestHandler.js"
|
|
@@ -272,13 +273,17 @@ export function makeRequestHandler<
|
|
|
272
273
|
const requestId = req.headers["request-id"]
|
|
273
274
|
const rootId = requestId ? RequestId.parseUnsafe(requestId) : RequestId.make()
|
|
274
275
|
|
|
276
|
+
const storeId = req.headers["x-store-id"]
|
|
277
|
+
const namespace = ReasonableString((storeId && (Array.isArray(storeId) ? storeId[0] : storeId)) || "primary")
|
|
278
|
+
|
|
275
279
|
const requestContext = new RequestContext({
|
|
276
280
|
rootId,
|
|
277
281
|
name: ReasonableString(
|
|
278
282
|
Request.Model instanceof SchemaNamed ? Request.Model.name : Request.name
|
|
279
283
|
),
|
|
280
284
|
locale,
|
|
281
|
-
createdAt: start
|
|
285
|
+
createdAt: start,
|
|
286
|
+
namespace
|
|
282
287
|
// ...(context.operation.parentId
|
|
283
288
|
// ? {
|
|
284
289
|
// parent: new RequestContextParent({
|
|
@@ -342,9 +347,13 @@ export function makeRequestHandler<
|
|
|
342
347
|
const r = req.method !== "GET" ? handleRequest.uninterruptible : handleRequest // .instrument("Performance.RequestResponse")
|
|
343
348
|
// the first log entry should be of the request start.
|
|
344
349
|
const r2 = makeMiddlewareContext
|
|
345
|
-
?
|
|
350
|
+
? restoreFromRequestContext
|
|
351
|
+
.zipRight(r)
|
|
352
|
+
.provideSomeContextEffect(makeMiddlewareContext(req, res, requestContext))
|
|
346
353
|
// PR is not relevant here
|
|
347
|
-
:
|
|
354
|
+
: restoreFromRequestContext
|
|
355
|
+
.provideService(RequestContext.Tag, requestContext)
|
|
356
|
+
.zipRight(r) as Effect<R, E | ValidationError, void>
|
|
348
357
|
return errorHandler(
|
|
349
358
|
req,
|
|
350
359
|
res,
|
|
@@ -50,29 +50,29 @@ export function makeServiceBusQueue<
|
|
|
50
50
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
51
51
|
function processMessage(messageBody: any) {
|
|
52
52
|
return Effect.sync(() => JSON.parse(messageBody))
|
|
53
|
-
|
|
53
|
+
.flatMap(x => parseDrain(x))
|
|
54
|
+
.orDie
|
|
55
|
+
.flatMap(({ body, meta }) =>
|
|
56
|
+
Effect
|
|
57
|
+
.logDebug(`$$ [${queueDrainName}] Processing incoming message`)
|
|
58
|
+
.apply(Effect.logAnnotates({ body: body.$$.pretty, meta: meta.$$.pretty }))
|
|
59
|
+
.tap(() => restoreFromRequestContext)
|
|
60
|
+
.zipRight(handleEvent(body))
|
|
54
61
|
.orDie
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
.
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
provideContext(
|
|
66
|
-
RequestContext.inherit(meta, {
|
|
67
|
-
id: body.id,
|
|
68
|
-
locale: "en" as const,
|
|
69
|
-
name: ReasonableString(body._tag)
|
|
70
|
-
})
|
|
71
|
-
)
|
|
72
|
-
)
|
|
62
|
+
// we silenceAndReportError here, so that the error is reported, and moves into the Exit.
|
|
63
|
+
.apply(silenceAndReportError)
|
|
64
|
+
.apply(
|
|
65
|
+
provideContext(
|
|
66
|
+
RequestContext.inherit(meta, {
|
|
67
|
+
id: body.id,
|
|
68
|
+
locale: "en" as const,
|
|
69
|
+
name: ReasonableString(body._tag)
|
|
70
|
+
})
|
|
71
|
+
)
|
|
73
72
|
)
|
|
74
|
-
|
|
75
|
-
|
|
73
|
+
)
|
|
74
|
+
// we reportError here, so that we report the error only, and keep flowing
|
|
75
|
+
.tapErrorCause(reportError)
|
|
76
76
|
}
|
|
77
77
|
|
|
78
78
|
return yield* $(
|
|
@@ -25,7 +25,7 @@ export function memFilter<T extends { id: string }>(filter: Filter<T>, cursor?:
|
|
|
25
25
|
|
|
26
26
|
export const storeId = FiberRef.unsafeMake("primary")
|
|
27
27
|
export const restoreFromRequestContext = RequestContext.Tag.accessWithEffect(ctx =>
|
|
28
|
-
storeId.set(ctx.
|
|
28
|
+
storeId.set(ctx.namespace ?? "primary")
|
|
29
29
|
)
|
|
30
30
|
|
|
31
31
|
export function makeMemoryStoreInt<Id extends string, Id2 extends Id, PM extends PersistenceModelType<Id>>(
|
package/dist/RequestContext.d.ts
CHANGED
|
@@ -11,7 +11,6 @@ declare const RequestContextParent_base: import("@effect-app/schema").MNModel<im
|
|
|
11
11
|
name: import("@effect-app/schema").Property<import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>> & import("@effect-app/schema").Utils<import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>>>, "required", import("@fp-ts/core/Option").None, import("@fp-ts/core/Option").None>;
|
|
12
12
|
locale: import("@effect-app/schema").Property<import("@effect-app/schema").DefaultSchema<unknown, "en" | "de", "en" | "de", "en" | "de", import("@effect-app/schema").LiteralApi<["en", "de"]>>, "required", import("@fp-ts/core/Option").None, import("@fp-ts/core/Option").None>;
|
|
13
13
|
createdAt: import("@effect-app/schema").FromProperty<import("@effect-app/schema").SchemaDefaultSchema<unknown, Date, Date, string, {}>, "required", import("@fp-ts/core/Option").None, import("@fp-ts/core/Option").Some<["constructor", () => Date]>>;
|
|
14
|
-
namespace: import("@effect-app/schema").Property<import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>> & import("@effect-app/schema").Utils<import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>>>, "optional", import("@fp-ts/core/Option").None, import("@fp-ts/core/Option").None>;
|
|
15
14
|
}>, RequestContextParent, RequestContextParent.ConstructorInput, RequestContextParent.Encoded, RequestContextParent.Props> & import("@effect-app/schema").PropsExtensions<RequestContextParent.Props>;
|
|
16
15
|
export declare class RequestContextParent extends RequestContextParent_base {
|
|
17
16
|
}
|
|
@@ -24,11 +23,11 @@ declare const RequestContext_base: import("@effect-app/schema").MNModel<import("
|
|
|
24
23
|
make(this: void): import("@effect-app/prelude/schema").StringId;
|
|
25
24
|
}, "required", import("@fp-ts/core/Option").None, import("@fp-ts/core/Option").None>;
|
|
26
25
|
parent: import("@effect-app/schema").Property<typeof RequestContextParent, "optional", import("@fp-ts/core/Option").None, import("@fp-ts/core/Option").None>;
|
|
26
|
+
namespace: import("@effect-app/schema").Property<import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>> & import("@effect-app/schema").Utils<import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>>>, "optional", import("@fp-ts/core/Option").None, import("@fp-ts/core/Option").None>;
|
|
27
27
|
_tag: import("@effect-app/schema").Property<import("@effect-app/schema").DefaultSchema<unknown, "RequestContext", "RequestContext", "RequestContext", import("@effect-app/schema").LiteralApi<["RequestContext"]>>, "required", import("@fp-ts/core/Option").None, import("@fp-ts/core/Option").None>;
|
|
28
28
|
name: import("@effect-app/schema").Property<import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>> & import("@effect-app/schema").Utils<import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>>>, "required", import("@fp-ts/core/Option").None, import("@fp-ts/core/Option").None>;
|
|
29
29
|
locale: import("@effect-app/schema").Property<import("@effect-app/schema").DefaultSchema<unknown, "en" | "de", "en" | "de", "en" | "de", import("@effect-app/schema").LiteralApi<["en", "de"]>>, "required", import("@fp-ts/core/Option").None, import("@fp-ts/core/Option").None>;
|
|
30
30
|
createdAt: import("@effect-app/schema").FromProperty<import("@effect-app/schema").SchemaDefaultSchema<unknown, Date, Date, string, {}>, "required", import("@fp-ts/core/Option").None, import("@fp-ts/core/Option").Some<["constructor", () => Date]>>;
|
|
31
|
-
namespace: import("@effect-app/schema").Property<import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>> & import("@effect-app/schema").Utils<import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>>>, "optional", import("@fp-ts/core/Option").None, import("@fp-ts/core/Option").None>;
|
|
32
31
|
}>, RequestContext, RequestContext.ConstructorInput, RequestContext.Encoded, RequestContext.Props> & import("@effect-app/schema").PropsExtensions<RequestContext.Props>;
|
|
33
32
|
/**
|
|
34
33
|
* @tsplus type RequestContext
|
|
@@ -55,7 +54,6 @@ export interface RequestContextParent {
|
|
|
55
54
|
readonly id: RequestId;
|
|
56
55
|
readonly locale: "de" | "en";
|
|
57
56
|
readonly name: ReasonableString;
|
|
58
|
-
readonly namespace?: ReasonableString | undefined;
|
|
59
57
|
}
|
|
60
58
|
export declare namespace RequestContextParent {
|
|
61
59
|
/**
|
|
@@ -66,7 +64,6 @@ export declare namespace RequestContextParent {
|
|
|
66
64
|
readonly id: string;
|
|
67
65
|
readonly locale: "de" | "en";
|
|
68
66
|
readonly name: string;
|
|
69
|
-
readonly namespace?: string | undefined;
|
|
70
67
|
}
|
|
71
68
|
const Encoded: EncodedOps;
|
|
72
69
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RequestContext.d.ts","sourceRoot":"","sources":["../_src/RequestContext.ts"],"names":[],"mappings":";AAAA,eAAO,MAAM,SAAS;;CAAW,CAAA;AACjC,MAAM,MAAM,SAAS,GAAG,mBAAmB,CAAC,OAAO,SAAS,CAAC,CAAA
|
|
1
|
+
{"version":3,"file":"RequestContext.d.ts","sourceRoot":"","sources":["../_src/RequestContext.ts"],"names":[],"mappings":"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"}
|
package/dist/RequestContext.js
CHANGED
|
@@ -6,8 +6,7 @@ export class RequestContextParent extends tsplus_module_1.MNModel()({
|
|
|
6
6
|
id: tsplus_module_1.prop(RequestId),
|
|
7
7
|
name: tsplus_module_1.prop(tsplus_module_1.ReasonableString),
|
|
8
8
|
locale: tsplus_module_1.prop(tsplus_module_1.literal("en", "de")),
|
|
9
|
-
createdAt: tsplus_module_1.defaultProp(tsplus_module_1.date)
|
|
10
|
-
namespace: tsplus_module_1.optProp(tsplus_module_1.ReasonableString)
|
|
9
|
+
createdAt: tsplus_module_1.defaultProp(tsplus_module_1.date)
|
|
11
10
|
}) {
|
|
12
11
|
}
|
|
13
12
|
export function makeRequestId() {
|
|
@@ -21,10 +20,12 @@ export class RequestContext extends tsplus_module_1.MNModel()({
|
|
|
21
20
|
...RequestContextParent.omit("id"),
|
|
22
21
|
id: tsplus_module_1.defaultProp(RequestId, makeRequestId),
|
|
23
22
|
rootId: tsplus_module_1.prop(RequestId),
|
|
24
|
-
parent: tsplus_module_1.optProp(RequestContextParent)
|
|
23
|
+
parent: tsplus_module_1.optProp(RequestContextParent),
|
|
24
|
+
namespace: tsplus_module_1.optProp(tsplus_module_1.ReasonableString)
|
|
25
25
|
}) {
|
|
26
26
|
static inherit(parent, newSelf) {
|
|
27
27
|
return new RequestContext({
|
|
28
|
+
namespace: parent?.namespace,
|
|
28
29
|
...newSelf,
|
|
29
30
|
rootId: parent.rootId,
|
|
30
31
|
parent
|
|
@@ -50,4 +51,4 @@ export const tag = tsplus_module_2.Tag();
|
|
|
50
51
|
(function (RequestContext) {
|
|
51
52
|
RequestContext.Encoded = { $: {} };
|
|
52
53
|
})(RequestContext || (RequestContext = {}));
|
|
53
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
54
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVxdWVzdENvbnRleHQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9fc3JjL1JlcXVlc3RDb250ZXh0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsTUFBTSxDQUFDLE1BQU0sU0FBUyxtQkFBRyxRQUFRLENBQUE7QUFHakMsTUFBTSxPQUFPLG9CQUFxQixTQUFRLGdCQUFBLE9BQU8sRUFLOUMsQ0FBQztJQUNGLElBQUksRUFBRSxnQkFBQSxJQUFJLENBQUMsZ0JBQUEsT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBQUM7SUFDckMsRUFBRSxFQUFFLGdCQUFBLElBQUksQ0FBQyxTQUFTLENBQUM7SUFDbkIsSUFBSSxFQUFFLGdCQUFBLElBQUksaUJBQUMsZ0JBQWdCLENBQUM7SUFDNUIsTUFBTSxFQUFFLGdCQUFBLElBQUksQ0FBQyxnQkFBQSxPQUFPLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDO0lBQ2pDLFNBQVMsRUFBRSxnQkFBQSxXQUFXLGlCQUFDLElBQUksQ0FBQztDQUM3QixDQUFDO0NBQUc7QUFJTCxNQUFNLFVBQVUsYUFBYTtJQUMzQixPQUFPLFNBQVMsQ0FBQyxJQUFJLEVBQUUsQ0FBQTtBQUN6QixDQUFDO0FBRUQ7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLGNBQWUsU0FBUSxnQkFBQSxPQUFPLEVBS3hDLENBQUM7SUFDRixHQUFHLG9CQUFvQixDQUFDLElBQUksQ0FBQyxJQUFJLENBQUM7SUFDbEMsRUFBRSxFQUFFLGdCQUFBLFdBQVcsQ0FBQyxTQUFTLEVBQUUsYUFBYSxDQUFDO0lBQ3pDLE1BQU0sRUFBRSxnQkFBQSxJQUFJLENBQUMsU0FBUyxDQUFDO0lBQ3ZCLE1BQU0sRUFBRSxnQkFBQSxPQUFPLENBQUMsb0JBQW9CLENBQUM7SUFDckMsU0FBUyxFQUFFLGdCQUFBLE9BQU8saUJBQUMsZ0JBQWdCLENBQUM7Q0FDckMsQ0FBQztJQUNBLE1BQU0sQ0FBQyxPQUFPLENBRVosTUFBc0IsRUFDdEIsT0FBOEM7UUFFOUMsT0FBTyxJQUFJLGNBQWMsQ0FBQztZQUN4QixTQUFTLEVBQUUsTUFBTSxFQUFFLFNBQVM7WUFDNUIsR0FBRyxPQUFPO1lBQ1YsTUFBTSxFQUFFLE1BQU0sQ0FBQyxNQUFNO1lBQ3JCLE1BQU07U0FDUCxDQUFDLENBQUE7SUFDSixDQUFDO0lBRUQsTUFBTSxDQUFDLFlBQVksQ0FBYSxJQUFvQjtRQUNsRCxPQUFPO1lBQ0wsYUFBYSxFQUFFLElBQUksQ0FBQyxJQUFJO1lBQ3hCLE1BQU0sRUFBRSxJQUFJLENBQUMsTUFBTTtZQUNuQixHQUFHLENBQUMsSUFBSSxDQUFDLE1BQU07Z0JBQ2IsQ0FBQyxDQUFDLEVBQUUsbUJBQW1CLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsWUFBWSxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxFQUFFO2dCQUM3RSxDQUFDLENBQUMsRUFBRSxDQUFDO1NBQ1IsQ0FBQTtJQUNILENBQUM7Q0FDRjtBQUtEOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sR0FBRyxHQUFHLGdCQUFBLEdBQUcsRUFBa0IsQ0FBQTtBQVN4QyxXQUFpQixvQkFBb0I7SUFVdEIsNEJBQU8sR0FBZSxFQUFFLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FBQTtBQVk5QyxDQUFDLEVBdEJnQixvQkFBb0IsS0FBcEIsb0JBQW9CLFFBc0JwQztBQVVELFdBQWlCLGNBQWM7SUFhaEIsc0JBQU8sR0FBZSxFQUFFLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FBQTtBQVk5QyxDQUFDLEVBekJnQixjQUFjLEtBQWQsY0FBYyxRQXlCOUIifQ==
|
|
@@ -2,7 +2,7 @@ import { Effect } from "@effect/io/Effect";
|
|
|
2
2
|
import type express from "express";
|
|
3
3
|
import type { InvalidStateError, NotFoundError, NotLoggedInError, OptimisticConcurrencyException, UnauthorizedError, ValidationError } from "../errors.js";
|
|
4
4
|
import type { RequestContext } from "../RequestContext.js";
|
|
5
|
-
export declare function defaultBasicErrorHandler<R>(_req: express.Request, res: express.Response, _requestContext: RequestContext, r2: Effect<R, ValidationError, void>): import("@effect/io/Effect").Effect<RequestContext | R, never, void
|
|
6
|
-
export declare function defaultErrorHandler<R>(req: express.Request, res: express.Response, _: RequestContext, r2: Effect<R, SupportedErrors, void>): import("@effect/io/Effect").Effect<RequestContext | R, never, void
|
|
5
|
+
export declare function defaultBasicErrorHandler<R>(_req: express.Request, res: express.Response, _requestContext: RequestContext, r2: Effect<R, ValidationError, void>): import("@effect/io/Effect").Effect<RequestContext | R, never, void | express.Response<any, Record<string, any>>>;
|
|
6
|
+
export declare function defaultErrorHandler<R>(req: express.Request, res: express.Response, _: RequestContext, r2: Effect<R, SupportedErrors, void>): import("@effect/io/Effect").Effect<RequestContext | R, never, void | express.Response<any, Record<string, any>>>;
|
|
7
7
|
export type SupportedErrors = ValidationError | NotFoundError | NotLoggedInError | UnauthorizedError | InvalidStateError | OptimisticConcurrencyException;
|
|
8
8
|
//# sourceMappingURL=defaultErrorHandler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defaultErrorHandler.d.ts","sourceRoot":"","sources":["../../_src/api/defaultErrorHandler.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAA;AAClC,OAAO,KAAK,EACV,iBAAiB,EACjB,aAAa,EACb,gBAAgB,EAChB,8BAA8B,EAC9B,iBAAiB,EACjB,eAAe,EAChB,MAAM,cAAc,CAAA;AACrB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAG1D,wBAAgB,wBAAwB,CAAC,CAAC,EACxC,IAAI,EAAE,OAAO,CAAC,OAAO,EACrB,GAAG,EAAE,OAAO,CAAC,QAAQ,EACrB,eAAe,EAAE,cAAc,EAC/B,EAAE,EAAE,MAAM,CAAC,CAAC,EAAE,eAAe,EAAE,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"defaultErrorHandler.d.ts","sourceRoot":"","sources":["../../_src/api/defaultErrorHandler.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAA;AAClC,OAAO,KAAK,EACV,iBAAiB,EACjB,aAAa,EACb,gBAAgB,EAChB,8BAA8B,EAC9B,iBAAiB,EACjB,eAAe,EAChB,MAAM,cAAc,CAAA;AACrB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAG1D,wBAAgB,wBAAwB,CAAC,CAAC,EACxC,IAAI,EAAE,OAAO,CAAC,OAAO,EACrB,GAAG,EAAE,OAAO,CAAC,QAAQ,EACrB,eAAe,EAAE,cAAc,EAC/B,EAAE,EAAE,MAAM,CAAC,CAAC,EAAE,eAAe,EAAE,IAAI,CAAC,oHAgBrC;AAKD,wBAAgB,mBAAmB,CAAC,CAAC,EACnC,GAAG,EAAE,OAAO,CAAC,OAAO,EACpB,GAAG,EAAE,OAAO,CAAC,QAAQ,EACrB,CAAC,EAAE,cAAc,EACjB,EAAE,EAAE,MAAM,CAAC,CAAC,EAAE,eAAe,EAAE,IAAI,CAAC,oHA2BrC;AAED,MAAM,MAAM,eAAe,GACvB,eAAe,GACf,aAAa,GACb,gBAAgB,GAChB,iBAAiB,GACjB,iBAAiB,GACjB,8BAA8B,CAAA"}
|
|
@@ -5,9 +5,8 @@ import * as tsplus_module_4 from "@effect/io/Debug";
|
|
|
5
5
|
import * as tsplus_module_5 from "@effect/io/Schedule";
|
|
6
6
|
import { logRequestError } from "./reportError.js";
|
|
7
7
|
export function defaultBasicErrorHandler(_req, res, _requestContext, r2) {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
}))
|
|
8
|
+
const sendError = (code) => (body) => tsplus_module_1.sync(() => res.status(code).send(body));
|
|
9
|
+
return tsplus_module_4.untraced(() => tsplus_module_1.catchAll(tsplus_module_1.catchTag(tsplus_module_1.tapErrorCause(r2, cause => tsplus_module_2.isFailure(cause) ? logRequestError(cause) : tsplus_module_3.unit), "ValidationError", err => sendError(400)(err.errors))
|
|
11
10
|
// final catch all; expecting never so that unhandled known errors will show up
|
|
12
11
|
, (err) => tsplus_module_1.flatMap(tsplus_module_1.map(tsplus_module_1.logError("Program error, compiler probably silenced, got an unsupported Error in Error Channel of Effect" + err), () => err), tsplus_module_1.die)));
|
|
13
12
|
}
|
|
@@ -16,21 +15,17 @@ export function defaultErrorHandler(req, res, _, r2) {
|
|
|
16
15
|
const r3 = req.method === "PATCH"
|
|
17
16
|
? tsplus_module_1.retry(r2, optimisticConcurrencySchedule)
|
|
18
17
|
: r2;
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
res.status(403).send(err);
|
|
27
|
-
})), "InvalidStateError", err => tsplus_module_1.sync(() => {
|
|
28
|
-
res.status(422).send(err);
|
|
29
|
-
})), "OptimisticConcurrencyException", err => tsplus_module_1.sync(() => {
|
|
18
|
+
const sendError = (code) => (body) => tsplus_module_1.sync(() => res.status(code).send(body));
|
|
19
|
+
return tsplus_module_4.untraced(() => tsplus_module_1.catchAll(tsplus_module_1.catchTags(tsplus_module_1.tapErrorCause(r3, cause => tsplus_module_2.isFailure(cause) ? logRequestError(cause) : tsplus_module_3.unit), {
|
|
20
|
+
"ValidationError": err => sendError(400)(err.errors),
|
|
21
|
+
"NotFoundError": sendError(404),
|
|
22
|
+
"NotLoggedInError": sendError(401),
|
|
23
|
+
"UnauthorizedError": sendError(403),
|
|
24
|
+
"InvalidStateError": sendError(422),
|
|
30
25
|
// 412 or 409.. https://stackoverflow.com/questions/19122088/which-http-status-code-to-use-to-reject-a-put-due-to-optimistic-locking-failure
|
|
31
|
-
|
|
32
|
-
})
|
|
26
|
+
"OptimisticConcurrencyException": sendError(412)
|
|
27
|
+
})
|
|
33
28
|
// final catch all; expecting never so that unhandled known errors will show up
|
|
34
29
|
, (err) => tsplus_module_1.flatMap(tsplus_module_1.map(tsplus_module_1.logError("Program error, compiler probably silenced, got an unsupported Error in Error Channel of Effect" + err), () => err), tsplus_module_1.die)));
|
|
35
30
|
}
|
|
36
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
31
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVmYXVsdEVycm9ySGFuZGxlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL19zcmMvYXBpL2RlZmF1bHRFcnJvckhhbmRsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFVQSxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sa0JBQWtCLENBQUE7QUFFbEQsTUFBTSxVQUFVLHdCQUF3QixDQUN0QyxJQUFxQixFQUNyQixHQUFxQixFQUNyQixlQUErQixFQUMvQixFQUFvQztJQUVwQyxNQUFNLFNBQVMsR0FBRyxDQUFDLElBQVksRUFBRSxFQUFFLENBQUMsQ0FBQyxJQUFhLEVBQUUsRUFBRSxDQUFDLDJCQUFPLEdBQUcsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUE7SUFDMUYsT0FBTyx5QkFBZSxHQUFHLEVBQUUsQ0FDekIseUJBQUEseUJBQUEsOEJBQUEsRUFBRSxFQUNlLEtBQUssQ0FBQyxFQUFFLENBQUMsMEJBQUEsS0FBSyxDQUFZLENBQUMsQ0FBQyxDQUFDLGVBQWUsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLHFCQUFZLENBQUMsRUFDdkUsaUJBQWlCLEVBQUUsR0FBRyxDQUFDLEVBQUUsQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQy9ELCtFQUErRTtNQUNyRSxDQUFDLEdBQVUsRUFBRSxFQUFFLENBQ3ZCLHdCQUFBLG9CQUFBLHlCQUNFLGdHQUFnRyxHQUFHLEdBQUcsQ0FDdkcsRUFDTSxHQUFHLEVBQUUsQ0FBQyxHQUFjLENBQUMsc0JBQ04sQ0FDdkIsQ0FDSixDQUFBO0FBQ0gsQ0FBQztBQUVELE1BQU0sNkJBQTZCLDZCQUNqQywyQkFBcUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxLQUFLLGdDQUFnQyxDQUFDLEVBRGxELHNCQUFlLENBQ21DLENBQUE7QUFFeEYsTUFBTSxVQUFVLG1CQUFtQixDQUNqQyxHQUFvQixFQUNwQixHQUFxQixFQUNyQixDQUFpQixFQUNqQixFQUFvQztJQUVwQyxNQUFNLEVBQUUsR0FBRyxHQUFHLENBQUMsTUFBTSxLQUFLLE9BQU87UUFDL0IsQ0FBQyxDQUFDLHNCQUFBLEVBQUUsRUFBTyw2QkFBNkIsQ0FBQztRQUN6QyxDQUFDLENBQUMsRUFBRSxDQUFBO0lBQ04sTUFBTSxTQUFTLEdBQUcsQ0FBQyxJQUFZLEVBQUUsRUFBRSxDQUFDLENBQUMsSUFBYSxFQUFFLEVBQUUsQ0FBQywyQkFBTyxHQUFHLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFBO0lBQzFGLE9BQU8seUJBQWUsR0FBRyxFQUFFLENBQ3pCLHlCQUFBLDBCQUFBLDhCQUFBLEVBQUUsRUFDZSxLQUFLLENBQUMsRUFBRSxDQUFDLDBCQUFBLEtBQUssQ0FBWSxDQUFDLENBQUMsQ0FBQyxlQUFlLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxxQkFBWSxDQUFDLEVBQ3RFO1FBQ1QsaUJBQWlCLEVBQUUsR0FBRyxDQUFDLEVBQUUsQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQztRQUNwRCxlQUFlLEVBQUUsU0FBUyxDQUFDLEdBQUcsQ0FBQztRQUMvQixrQkFBa0IsRUFBRSxTQUFTLENBQUMsR0FBRyxDQUFDO1FBQ2xDLG1CQUFtQixFQUFFLFNBQVMsQ0FBQyxHQUFHLENBQUM7UUFDbkMsbUJBQW1CLEVBQUUsU0FBUyxDQUFDLEdBQUcsQ0FBQztRQUNuQyw0SUFBNEk7UUFDNUksZ0NBQWdDLEVBQUUsU0FBUyxDQUFDLEdBQUcsQ0FBQztLQUNqRCxDQUFDO0lBQ0YsK0VBQStFO01BQ3JFLENBQUMsR0FBVSxFQUFFLEVBQUUsQ0FDdkIsd0JBQUEsb0JBQUEseUJBQ0UsZ0dBQWdHLEdBQUcsR0FBRyxDQUN2RyxFQUNNLEdBQUcsRUFBRSxDQUFDLEdBQWMsQ0FBQyxzQkFDTixDQUN2QixDQUNKLENBQUE7QUFDSCxDQUFDIn0=
|
|
@@ -18,7 +18,7 @@ export declare function makeOpenApiSpecs(rdescs: Iterable<RouteDescriptorAny>, i
|
|
|
18
18
|
version: string;
|
|
19
19
|
};
|
|
20
20
|
tags: never[];
|
|
21
|
-
paths: Record<string, Record<"
|
|
21
|
+
paths: Record<string, Record<"GET" | "POST" | "PUT" | "PATCH" | "DELETE", {
|
|
22
22
|
[x: string]: {
|
|
23
23
|
responses: any;
|
|
24
24
|
tags: readonly string[] | undefined;
|
|
@@ -75,7 +75,7 @@ export function parseRequestParams(parsers) {
|
|
|
75
75
|
errors.push(makeError("path")(path.errors));
|
|
76
76
|
}
|
|
77
77
|
if (query._tag === "Failure") {
|
|
78
|
-
errors.push(makeError("
|
|
78
|
+
errors.push(makeError("query")(query.errors));
|
|
79
79
|
}
|
|
80
80
|
if (errors.length) {
|
|
81
81
|
return tsplus_module_1.fail(new ValidationError(errors));
|
|
@@ -135,4 +135,4 @@ export function makeRequestParsers(Request) {
|
|
|
135
135
|
parseQuery
|
|
136
136
|
};
|
|
137
137
|
}
|
|
138
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
138
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"requestHandler.js","sourceRoot":"","sources":["../../../../_src/api/express/schema/requestHandler.ts"],"names":[],"mappings":"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"}
|
package/dist/api/routing.d.ts
CHANGED
|
@@ -94,7 +94,7 @@ export interface ReqHandler<Req, R, E, Res, ReqSchema extends MO.SchemaAny, ResS
|
|
|
94
94
|
* })
|
|
95
95
|
* ```
|
|
96
96
|
*/
|
|
97
|
-
export declare function matchResource<TModules extends Record<string, Record<string, any>>>(mod: TModules): <THandlers extends { [K in keyof TModules]: (req: InstanceType<GetRequest<TModules[K]> extends infer T ? T extends GetRequest<TModules[K]> ? T extends new (...args: any[]) => any ? T : never : never : never>) => import("@effect/io/Effect").Effect<any, SupportedErrors, MO.ParsedShapeOf<Extr<GetResponse<TModules[K]>>>>; }>(handlers: THandlers) => { [K_1 in keyof TModules]: ReqHandler<InstanceType<GetRequest<TModules[K_1]> extends infer
|
|
97
|
+
export declare function matchResource<TModules extends Record<string, Record<string, any>>>(mod: TModules): <THandlers extends { [K in keyof TModules]: (req: InstanceType<GetRequest<TModules[K]> extends infer T ? T extends GetRequest<TModules[K]> ? T extends new (...args: any[]) => any ? T : never : never : never>) => import("@effect/io/Effect").Effect<any, SupportedErrors, MO.ParsedShapeOf<Extr<GetResponse<TModules[K]>>>>; }>(handlers: THandlers) => { [K_1 in keyof TModules]: ReqHandler<InstanceType<GetRequest<TModules[K_1]> extends infer T ? T extends GetRequest<TModules[K_1]> ? T extends new (...args: any[]) => any ? T : never : never : never>, _R<ReturnType<THandlers[K_1]>>, _E<ReturnType<THandlers[K_1]>>, MO.ParsedShapeOf<Extr<GetResponse<TModules[K_1]>>>, GetRequest<TModules[K_1]>, GetResponse<TModules[K_1]>, any>; };
|
|
98
98
|
export type ReqFromSchema<ReqSchema> = InstanceType<ReqSchema extends {
|
|
99
99
|
new (...args: any[]): any;
|
|
100
100
|
} ? ReqSchema : never>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../_src/api/routing.ts"],"names":[],"mappings":";;;AACA,OAAO,KAAK,EAAE,MAAM,oCAAoC,CAAA;AACxD,OAAO,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,+BAA+B,CAAA;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAEzE,OAAO,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAEhD,OAAO,KAAK,OAAO,MAAM,SAAS,CAAA;AAClC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AACnD,OAAO,EAAE,cAAc,EAAa,MAAM,sBAAsB,CAAA;
|
|
1
|
+
{"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../_src/api/routing.ts"],"names":[],"mappings":";;;AACA,OAAO,KAAK,EAAE,MAAM,oCAAoC,CAAA;AACxD,OAAO,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,+BAA+B,CAAA;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAEzE,OAAO,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAEhD,OAAO,KAAK,OAAO,MAAM,SAAS,CAAA;AAClC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AACnD,OAAO,EAAE,cAAc,EAAa,MAAM,sBAAsB,CAAA;AAEhE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAE/D,OAAO,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAA;AAEtH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAKrE,eAAO,MAAM,eAAe;;EAE1B,CAAA;AAEF,wBAAgB,kBAAkB,CAChC,CAAC,EACD,KAAK,EACL,OAAO,EACP,MAAM,EACN,KAAK,EACL,OAAO,EACP,IAAI,SAAS,KAAK,GAAG,MAAM,GAAG,KAAK,EACnC,IAAI,EACJ,MAAM,EAEN,OAAO,EAAE,cAAc,CACrB,CAAC,EACD,KAAK,EACL,OAAO,EACP,MAAM,EACN,KAAK,EACL,OAAO,EACP,IAAI,EACJ,IAAI,EACJ,MAAM,CACP,CAAC,SAAS,CAAC,GACX,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAgDxD;AAED,MAAM,MAAM,qBAAqB,CAAC,IAAI,EAAE,EAAE,GAAG,KAAK,EAAE,EAAE,GAAG,KAAK,IAAI,CAChE,GAAG,EAAE,OAAO,CAAC,OAAO,EACpB,GAAG,EAAE,OAAO,CAAC,QAAQ,EACrB,OAAO,EAAE,cAAc,KACpB,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC,CAAA;AAElC,MAAM,MAAM,UAAU,CACpB,CAAC,EACD,KAAK,EACL,OAAO,EACP,MAAM,EACN,KAAK,EACL,OAAO,EACP,IAAI,SAAS,KAAK,GAAG,MAAM,GAAG,KAAK,EACnC,IAAI,EACJ,IAAI,EACJ,EAAE,GAAG,KAAK,EACV,EAAE,GAAG,KAAK,IACR,CACF,OAAO,EAAE,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,KACjF;IACH,OAAO,EAAE,OAAO,OAAO,CAAA;IACvB,WAAW,EAAE,qBAAqB,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,CAAC,CAAA;CACjD,CAAA;AAED,wBAAgB,KAAK,CACnB,CAAC,EACD,CAAC,EACD,KAAK,EACL,OAAO,EACP,MAAM,EACN,KAAK,EACL,OAAO,EACP,IAAI,SAAS,KAAK,GAAG,MAAM,GAAG,KAAK,EACnC,IAAI,EACJ,EAAE,GAAG,KAAK,EACV,EAAE,GAAG,KAAK,EACV,IAAI,GAAG,KAAK,EAEZ,cAAc,EAAE,cAAc,CAC5B,CAAC,EACD,KAAK,EACL,OAAO,EACP,MAAM,EACN,KAAK,EACL,OAAO,EACP,IAAI,EACJ,IAAI,EACJ,CAAC,CACF,EACD,YAAY,EAAE,CAAC,CAAC,EACd,GAAG,EAAE,OAAO,CAAC,OAAO,EACpB,GAAG,EAAE,OAAO,CAAC,QAAQ,EACrB,cAAc,EAAE,cAAc,EAC9B,EAAE,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,eAAe,EAAE,IAAI,CAAC,KACrC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,EAC9B,UAAU,CAAC,EAAE,UAAU,CACrB,CAAC,EACD,KAAK,EACL,OAAO,EACP,MAAM,EACN,KAAK,EACL,OAAO,EACP,IAAI,EACJ,IAAI,EACJ,CAAC,EACD,EAAE,EACF,EAAE,CACH,yMAwBF;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,EACvC,cAAc,EAAE,CAAC,GAAG,EAAE,IAAI,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,SAE9B,IAAI,OAAO,gBAAgB,KAAK,CAAC,4DAU/C;AAED,wBAAgB,kBAAkB,CAChC,CAAC,EACD,CAAC,EACD,KAAK,EACL,OAAO,EACP,MAAM,EACN,KAAK,EACL,OAAO,EACP,IAAI,SAAS,KAAK,GAAG,MAAM,GAAG,KAAK,EACnC,IAAI,GAAG,IAAI,EACX,EAAE,GAAG,KAAK,EACV,EAAE,GAAG,KAAK,EACV,IAAI,GAAG,KAAK,EAEZ,OAAO,EAAE,oBAAoB,CAC3B,CAAC,GAAG,EAAE,EACN,KAAK,EACL,OAAO,EACP,MAAM,EACN,KAAK,EACL,OAAO,EACP,IAAI,EACJ,IAAI,EACJ,CAAC,CACF,EACD,YAAY,EAAE,CAAC,CAAC,EACd,GAAG,EAAE,OAAO,CAAC,OAAO,EACpB,GAAG,EAAE,OAAO,CAAC,QAAQ,EACrB,cAAc,EAAE,cAAc,EAC9B,EAAE,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,eAAe,EAAE,IAAI,CAAC,KACrC,MAAM,CAAC,IAAI,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,EAClC,qBAAqB,CAAC,EAAE,qBAAqB,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,GACvD,CAAC,GAAG,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,QAAQ,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,CAqLrF;AAED,MAAM,MAAM,eAAe,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAAA;CAAE,CAAA;AACpE,MAAM,MAAM,mBAAmB,GAAG,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,eAAe,CAAC,CAAA;AAEzG,MAAM,MAAM,iBAAiB,GAAG,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;AAE3F,KAAK,QAAQ,CAAC,CAAC,SAAS,eAAe,IAAI;KACxC,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,cAAc,CACzC,MAAM,CAAC,EACP,GAAG,EAAE,eAAe;IACpB,GAAG,EAAE,iBAAiB;IACtB,GAAG,EAAE,gBAAgB;IACrB,GAAG,EAAE,eAAe;IACpB,GAAG,EAAE,iBAAiB;IACtB,GAAG,EAAE,cAAc;IACnB,GAAG,EAAE,cAAc;IACnB,eAAe,CAChB,GAAG,UAAU,CAAC,CAAC,EAAE,KAAK,CAAC,GACpB,KAAK;CACV,CAAA;AAED,MAAM,MAAM,UAAU,CACpB,CAAC,EAQD,EAAE,GAAG,KAAK,IACR,MAAM,CACN,EAAE,CAAC,gBAAgB,GACnB,EAAE,CAAC,UAAU,GACb,OAAO,CACP,CAAC,EACD,EAAE,CACH,EACD,KAAK,EACL,kBAAkB,CACnB,CAAA;AAED;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,CAAC,SAAS,eAAe,EAAE,QAAQ,EAAE,CAAC,eAO9D;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,mBAAmB,EAAE,QAAQ,EAAE,CAAC,4BAQrE;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAA;CACnD,CAAA;AAED,MAAM,MAAM,YAAY,CAAC,CAAC,SAAS,mBAAmB,IAAI;KACvD,CAAC,IAAI,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAC/B,CAAA;AAID,MAAM,MAAM,OAAO,CAAC,CAAC,SAAS,MAAM,IAAI,MAAM,SAAS,CAAC,GAAG,MAAM,GAAG;KACjE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,CAChB,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,MAAM,CAAC,GAAG,CAAC,SAAS,MAAM,GAAG,CAAC,SAAS,SAAS,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GACzF,WAAW,CAAC,CAAC,CAAC,SAAS,MAAM,EAAE,GAAG,CAAC;SAChC,CAAC,IAAI,MAAM,EAAE,IAAI,GAAG,OAAO,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,IAAI,OAAO,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;KAC1F,CAAC,GACF,KAAK,GACP,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GACV,KAAK,KACN,IAAI;CACV,SAAS,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,IAAI,CAAC,GAAG,CAAC,SAAS,OAAO,GAAiB;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAE,GAAG,KAAK,GAClH,KAAK,CAAA;AAEP,KAAK,WAAW,CAAC,CAAC,SAAS,MAAM,IAAI,MAAM,SAAS,CAAC,GAAG,MAAM,GAAG;KAC9D,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,CAChB,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,MAAM,CAAC,GAAG,CAAC,SAAS,MAAM,GAAG,CAAC,SAAS,SAAS,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAMzF,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GACZ,KAAK,GACL,KAAK,KACN,IAAI;CACV,SAAS,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,IAAI,CAAC,GAAG,CAAC,SAAS,OAAO,GAAiB;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAE,GAAG,KAAK,GAClH,KAAK,CAAA;AAEP,wBAAgB,MAAM,CACpB,OAAO,SAAS,MAAM,CACpB,MAAM,EACN,GAAG,CACJ,EAED,CAAC,EAAE,OAAO,GAAG;IAAE,eAAe,CAAC,EAAE,GAAG,CAAA;CAAE,EACtC,aAAa,CAAC,EAAE,GAAG,wEASgB,GAAG,EAAE,KAAG,GAAG,iMAAX,GAAG,EAAE,KAAG,GAAG,qIAqB/C;AAED,MAAM,MAAM,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS;IAAE,KAAK,EAAE,EAAE,CAAC,SAAS,CAAA;CAAE,GAAG,CAAC,CAAC,OAAO,CAAC,GAChE,CAAC,SAAS,EAAE,CAAC,SAAS,GAAG,CAAC,GAC1B,KAAK,CAAA;AAET,MAAM,WAAW,UAAU,CACzB,GAAG,EACH,CAAC,EACD,CAAC,EACD,GAAG,EACH,SAAS,SAAS,EAAE,CAAC,SAAS,EAC9B,SAAS,SAAS,EAAE,CAAC,SAAS,EAC9B,GAAG,GAAG,GAAG;IAET,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAA;IAC1C,OAAO,EAAE,SAAS,CAAA;IAClB,QAAQ,EAAE,SAAS,CAAA;IACnB,eAAe,EAAE,GAAG,CAAA;CACrB;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,aAAa,CAAC,QAAQ,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,0tBA2BhG;AAED,MAAM,MAAM,aAAa,CAAC,SAAS,IAAI,YAAY,CACjD,SAAS,SAAS;IAAE,KAAI,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,GAAG,CAAA;CAAE,GAAG,SAAS,GACtD,KAAK,CACV,CAAA;AAED,MAAM,MAAM,aAAa,CAAC,SAAS,IAAI,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAA"}
|
package/dist/api/routing.js
CHANGED
|
@@ -15,6 +15,7 @@ import { extractSchema, SchemaNamed } from "@effect-app/prelude/schema";
|
|
|
15
15
|
import * as MO from "@effect-app/prelude/schema";
|
|
16
16
|
import { pretty } from "@effect-app/prelude/utils";
|
|
17
17
|
import { RequestContext, RequestId } from "../RequestContext.js";
|
|
18
|
+
import { restoreFromRequestContext } from "../services/Store/Memory.js";
|
|
18
19
|
import { defaultBasicErrorHandler } from "./defaultErrorHandler.js";
|
|
19
20
|
import { parseRequestParams } from "./express/schema/requestHandler.js";
|
|
20
21
|
import { makeRouteDescriptor } from "./express/schema/routing.js";
|
|
@@ -91,11 +92,14 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
|
|
|
91
92
|
// }
|
|
92
93
|
const requestId = req.headers["request-id"];
|
|
93
94
|
const rootId = requestId ? tsplus_module_5.parseUnsafe(RequestId)(requestId) : RequestId.make();
|
|
95
|
+
const storeId = req.headers["x-store-id"];
|
|
96
|
+
const namespace = MO.ReasonableString((storeId && (Array.isArray(storeId) ? storeId[0] : storeId)) || "primary");
|
|
94
97
|
const requestContext = new RequestContext({
|
|
95
98
|
rootId,
|
|
96
99
|
name: MO.ReasonableString(Request.Model instanceof SchemaNamed ? Request.Model.name : Request.name),
|
|
97
100
|
locale,
|
|
98
|
-
createdAt: start
|
|
101
|
+
createdAt: start,
|
|
102
|
+
namespace
|
|
99
103
|
// ...(context.operation.parentId
|
|
100
104
|
// ? {
|
|
101
105
|
// parent: new RequestContextParent({
|
|
@@ -145,9 +149,9 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
|
|
|
145
149
|
const r = req.method !== "GET" ? tsplus_module_3.uninterruptible(handleRequest) : handleRequest; // .instrument("Performance.RequestResponse")
|
|
146
150
|
// the first log entry should be of the request start.
|
|
147
151
|
const r2 = makeMiddlewareContext
|
|
148
|
-
? tsplus_module_4.provideSomeContextEffect(makeMiddlewareContext(req, res, requestContext))(r)
|
|
152
|
+
? tsplus_module_4.provideSomeContextEffect(makeMiddlewareContext(req, res, requestContext))(tsplus_module_3.zipRight(restoreFromRequestContext, r))
|
|
149
153
|
// PR is not relevant here
|
|
150
|
-
: r;
|
|
154
|
+
: tsplus_module_3.zipRight(tsplus_module_3.provideService(restoreFromRequestContext, tsplus_module_6.tag, requestContext), r);
|
|
151
155
|
return errorHandler(req, res, requestContext, r2);
|
|
152
156
|
})), cause => tsplus_module_3.tapErrorCause(tsplus_module_3.tuplePar(tsplus_module_3.sync(() => res.status(500).send()), reportRequestError(cause, {
|
|
153
157
|
requestContext,
|
|
@@ -244,4 +248,4 @@ export function matchResource(mod) {
|
|
|
244
248
|
return handler;
|
|
245
249
|
};
|
|
246
250
|
}
|
|
247
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routing.js","sourceRoot":"","sources":["../../_src/api/routing.ts"],"names":[],"mappings":"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"}
|
|
251
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routing.js","sourceRoot":"","sources":["../../_src/api/routing.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,4 +56,4 @@ export function makeServiceBusQueue(_queueName, queueDrainName, encoder, makeHan
|
|
|
56
56
|
export function makeServiceBusLayers(url, queueName, queueDrainName) {
|
|
57
57
|
return tsplus_module_8.provide((tsplus_module_8.merge(LiveSender(queueName))(LiveReceiver(queueDrainName))))(LiveServiceBusClient(url));
|
|
58
58
|
}
|
|
59
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
59
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2JxdWV1ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvc2VydmljZXMvUXVldWVNYWtlci9zYnF1ZXVlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7O0FBQUEsT0FBTyxFQUNMLFlBQVksRUFDWixVQUFVLEVBQ1Ysb0JBQW9CLEVBQ3BCLFFBQVEsRUFDUixNQUFNLEVBQ04sU0FBUyxFQUNWLE1BQU0sdUNBQXVDLENBQUE7QUFFOUMsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0saUNBQWlDLENBQUE7QUFDbEUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGtDQUFrQyxDQUFBO0FBRWpFLE9BQU8sRUFBRSx5QkFBeUIsRUFBRSxNQUFNLG9CQUFvQixDQUFBO0FBQzlELE9BQU8sRUFBRSwyQkFBMkIsRUFBRSxnQ0FBZ0MsRUFBRSxNQUFNLGFBQWEsQ0FBQTtBQUczRjs7R0FFRztBQUNILE1BQU0sVUFBVSxtQkFBbUIsQ0FRakMsVUFBa0IsRUFDbEIsY0FBc0IsRUFDdEIsT0FBeUQsRUFDekQsZUFBd0YsRUFDeEYsY0FFd0QsRUFDeEQsVUFHbUY7SUFFbkYsT0FBTyxvQkFBVyxRQUFRLENBQUMsRUFBQyxDQUFDO1FBQzNCLE1BQU0sQ0FBQyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMseUJBQUMsTUFBTSxFQUFRLENBQUE7UUFDakMsTUFBTSxRQUFRLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyx5QkFBQyxRQUFRLEVBQVEsQ0FBQTtRQUMxQyxNQUFNLGFBQWEsR0FBRywwQkFBQSxRQUFRLEVBQVcsUUFBUSxDQUFDLENBQUE7UUFDbEQsTUFBTSxxQkFBcUIsR0FBRywyQkFBMkIsQ0FBQyxFQUFFLElBQUksRUFBRSx3QkFBd0IsR0FBRyxjQUFjLEVBQUUsQ0FBQyxDQUFBO1FBQzlHLE1BQU0sV0FBVyxHQUFHLGdDQUFnQyxDQUFDLEVBQUUsSUFBSSxFQUFFLHdCQUF3QixHQUFHLGNBQWMsRUFBRSxDQUFDLENB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
|
|
@@ -30,7 +30,7 @@ export function memFilter(filter, cursor) {
|
|
|
30
30
|
});
|
|
31
31
|
}
|
|
32
32
|
export const storeId = tsplus_module_5.unsafeMake("primary");
|
|
33
|
-
export const restoreFromRequestContext = tsplus_module_7.serviceWithEffect(tsplus_module_6.tag, ctx => tsplus_module_5.set(storeId, ctx.
|
|
33
|
+
export const restoreFromRequestContext = tsplus_module_7.serviceWithEffect(tsplus_module_6.tag, ctx => tsplus_module_5.set(storeId, ctx.namespace ?? "primary"));
|
|
34
34
|
export function makeMemoryStoreInt(name, seed) {
|
|
35
35
|
return tsplus_module_7.gen(function* ($) {
|
|
36
36
|
const updateETag = makeUpdateETag(name);
|
|
@@ -94,4 +94,4 @@ export const makeMemoryStore = () => ({
|
|
|
94
94
|
})
|
|
95
95
|
});
|
|
96
96
|
export const MemoryStoreLive = tsplus_module_10.makeLayer(StoreMaker, makeMemoryStore());
|
|
97
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
97
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTWVtb3J5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vX3NyYy9zZXJ2aWNlcy9TdG9yZS9NZW1vcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLHVEQUF1RDtBQUV2RCxPQUErQix5QkFBeUIsQ0FBQTtBQUV4RCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sY0FBYyxDQUFBO0FBQ3pDLE9BQU8sRUFBRSxVQUFVLEVBQUUsb0JBQW9CLEVBQUUsUUFBUSxFQUFFLGNBQWMsRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUV2RixNQUFNLFVBQVUsU0FBUyxDQUEyQixNQUFpQixFQUFFLE1BQTBDO0lBQy9HLE9BQU8sQ0FBQyxDQUFDLENBQVcsRUFBWSxFQUFFO1FBQ2hDLE1BQU0sSUFBSSxHQUFHLE1BQU0sRUFBRSxJQUFJLENBQUE7UUFDekIsTUFBTSxLQUFLLEdBQUcsTUFBTSxFQUFFLEtBQUssQ0FBQTtRQUMzQixJQUFJLENBQUMsSUFBSSxJQUFJLEtBQUssS0FBSyxDQUFDLEVBQUU7WUFDeEIsT0FBTywwQkFBQSxvQkFBQSw2QkFBZSxVQUFVLENBQUMsTUFBTSxDQUFDLEVBQWpDLENBQUMsQ0FBaUMsdUJBQWdCLEVBQVcsR0FBRyxFQUFFLENBQUMsdUJBQWEsQ0FBQyxDQUFBO1NBQ3pGO1FBQ0QsSUFBSSxDQUFDLEdBQUcsMEJBQVksVUFBVSxDQUFDLE1BQU0sQ0FBQyxFQUE5QixDQUFDLENBQThCLENBQUE7UUFDdkMsSUFBSSxJQUFJLEVBQUU7WUFDUixDQUFDLEdBQUcscUJBQUEsQ0FBQyxFQUFNLElBQUksQ0FBQyxDQUFBO1NBQ2pCO1FBQ0QsSUFBSSxLQUFLLEtBQUssU0FBUyxFQUFFO1lBQ3ZCLENBQUMsR0FBRyxxQkFBQSxDQUFDLEVBQU0sS0FBSyxDQUFDLENBQUE7U0FDbEI7UUFDRCxxQ0FBTyxDQUFDLEVBQVE7SUFDbEIsQ0FBQyxDQUFDLENBQUE7QUFDSixDQUFDO0FBRUQsTUFBTSxDQUFDLE1B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
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect-app/infra",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.26.0",
|
|
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.0.0",
|
|
22
22
|
"redlock": "^4.2.0",
|
|
23
|
-
"@effect-app/prelude": "0.21.
|
|
24
|
-
"@effect-app/
|
|
25
|
-
"@effect-app/
|
|
26
|
-
"@effect-app/
|
|
23
|
+
"@effect-app/prelude": "0.21.6",
|
|
24
|
+
"@effect-app/infra-adapters": "0.20.6",
|
|
25
|
+
"@effect-app/schema": "0.18.5",
|
|
26
|
+
"@effect-app/core": "0.24.0"
|
|
27
27
|
},
|
|
28
28
|
"devDependencies": {
|
|
29
29
|
"@babel/cli": "^7.20.7",
|