@effect-app/infra 0.17.2 → 0.17.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 +6 -0
- package/_cjs/api/routing.cjs +8 -11
- package/_cjs/api/routing.cjs.map +1 -1
- package/_src/api/routing.ts +8 -9
- package/dist/api/routing.d.ts.map +1 -1
- package/dist/api/routing.js +9 -12
- package/package.json +4 -4
package/CHANGELOG.md
CHANGED
package/_cjs/api/routing.cjs
CHANGED
|
@@ -149,7 +149,7 @@ function makeRequestHandler(handler, errorHandler, makeMiddlewareContext) {
|
|
|
149
149
|
reqCookies: (0, tsplus_module_7.pretty)(pars.cookies),
|
|
150
150
|
reqHeaders: tsplus_module_7.RecordPretty(tsplus_module_7.object$(pars.headers))
|
|
151
151
|
} : undefined)
|
|
152
|
-
})(tsplus_module_3.logInfo("
|
|
152
|
+
})(tsplus_module_3.logInfo("Incoming request"))), tsplus_module_3.suspendSucceed(() => {
|
|
153
153
|
const handleRequest = tsplus_module_3.flatMap(tsplus_module_3.map(parseRequest(req), ({
|
|
154
154
|
body,
|
|
155
155
|
path,
|
|
@@ -169,13 +169,10 @@ function makeRequestHandler(handler, errorHandler, makeMiddlewareContext) {
|
|
|
169
169
|
// PR is not relevant here
|
|
170
170
|
: r;
|
|
171
171
|
return errorHandler(req, res, requestContext, r2);
|
|
172
|
-
})), cause => tsplus_module_3.tapErrorCause(tsplus_module_3.
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
path: req.originalUrl,
|
|
177
|
-
method: req.method
|
|
178
|
-
});
|
|
172
|
+
})), cause => tsplus_module_3.tapErrorCause(tsplus_module_3.tuplePar(tsplus_module_3.sync(() => res.status(500).send()), (0, _reportError.reportRequestError)(cause, {
|
|
173
|
+
requestContext,
|
|
174
|
+
path: req.originalUrl,
|
|
175
|
+
method: req.method
|
|
179
176
|
}), tsplus_module_3.suspendSucceed(() => {
|
|
180
177
|
const headers = res.getHeaders();
|
|
181
178
|
return tsplus_module_8.logAnnotates({
|
|
@@ -191,8 +188,8 @@ function makeRequestHandler(handler, errorHandler, makeMiddlewareContext) {
|
|
|
191
188
|
prev[key] = value && typeof value === "string" ? (0, _util.snipString)(value) : value;
|
|
192
189
|
return prev;
|
|
193
190
|
}, {})))
|
|
194
|
-
})(tsplus_module_3.logErrorCauseMessage("
|
|
195
|
-
})), cause => tsplus_module_3.sync(() => console.error("Error occurred while reporting error", cause)))), () => tsplus_module_3.
|
|
191
|
+
})(tsplus_module_3.logErrorCauseMessage("Finished request", cause));
|
|
192
|
+
})), cause => tsplus_module_3.sync(() => console.error("Error occurred while reporting error", cause)))), () => tsplus_module_3.flatMap(tsplus_module_1.get(RequestSettings), s => {
|
|
196
193
|
const headers = res.getHeaders();
|
|
197
194
|
return tsplus_module_8.logAnnotates({
|
|
198
195
|
method: req.method,
|
|
@@ -201,7 +198,7 @@ function makeRequestHandler(handler, errorHandler, makeMiddlewareContext) {
|
|
|
201
198
|
...(s.verbose ? {
|
|
202
199
|
resHeaders: tsplus_module_7.RecordPretty(tsplus_module_7.object$(headers))
|
|
203
200
|
} : undefined)
|
|
204
|
-
})(tsplus_module_3.logInfo("
|
|
201
|
+
})(tsplus_module_3.logInfo("Finished request"));
|
|
205
202
|
})), tsplus_module_6.tag, requestContext) // otherwise external error reporter breaks.
|
|
206
203
|
, requestContext));
|
|
207
204
|
};
|
package/_cjs/api/routing.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routing.cjs","mappings":"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
|
|
1
|
+
{"version":3,"file":"routing.cjs","mappings":";;;;;;;;;;;;;;;;;;;;;;;;AACA;AAGA;AAKA;AAEA;AAEA;AAEA;AACA;AACA;AAAsC;AAAA;AAjBtC;;AAmBO,MAAMA,eAAe,GAAGC,2BAAoB;EACjDC,OAAO,EAAE;CACV,CAAC;AAAA;AAEI,SAAUC,kBAAkB,CAWhCC,OAUY;EAEZ,MAAMC,EAAE,GAAGC,2BACTC,oBAGOC,EAAE,CAACC,WAAW,EAHrBF,oBAEOC,EA5CG,CA4CHE,MAAM,CAACC,GAAG,EAFjBJ,oBACOK,CAAC,IAAIA,CAAC,EADbL,6BAAoBH,OAAO,CAACS,OAAO,CAAC,CACtB,CACI,CACI,CACvB;EACD,MAAMC,YAAY,GAAIC,CAAU,IAAKC,gCAAE,EAAYC,CAAC,IAAIA,CAAC,CAACF,CAAC,CAAC,CAAC;EAE7D,MAAMG,EAAE,GAAGZ,2BACTC,oBAGOC,EAAE,CAACC,WAAW,EAHrBF,oBAEOC,EApDG,CAoDHE,MAAM,CAACC,GAAG,EAFjBJ,oBACOK,CAAC,IAAIA,CAAC,EADbL,6BAAoBH,OAAO,CAACe,KAAK,CAAC,CACpB,CACI,CACI,CACvB;EACD,MAAMC,UAAU,GAAIL,CAAU,IAAKC,gCAAE,EAAYC,CAAC,IAAIA,CAAC,CAACF,CAAC,CAAC,CAAC;EAE3D,MAAMM,EAAE,GAAGf,2BACTC,oBAGOC,EAAE,CAACC,WAAW,EAHrBF,oBAEOC,EA5DG,CA4DHE,MAAM,CAACC,GAAG,EAFjBJ,oBACOK,CAAC,IAAIA,CAAC,EADbL,6BAAoBH,OAAO,CAACkB,IAAI,CAAC,CACnB,CACI,CACI,CACvB;EACD,MAAMC,SAAS,GAAIR,CAAU,IAAKC,gCAAE,EAAYC,CAAC,IAAIA,CAAC,CAACF,CAAC,CAAC,CAAC;EAE1D,MAAMS,EAAE,GAAGlB,2BACTC,oBAGOC,EAAE,CAACC,WAAW,EAHrBF,oBAEOC,EApEG,CAoEHE,MAAM,CAACC,GAAG,EAFjBJ,oBACOK,CAAC,IAAIA,CAAC,EADbL,6BAAoBH,OAAO,CAACqB,IAAI,CAAC,CACnB,CACI,CACI,CACvB;EACD,MAAMC,SAAS,GAAIX,CAAU,IAAKC,gCAAE,EAAYC,CAAC,IAAIA,CAAC,CAACF,CAAC,CAAC,CAAC;EAE1D,MAAMY,EAAE,GAAGrB,2BACTC,oBAGOC,EAAE,CAACC,WAAW,EAHrBF,oBAEOC,EA5EG,CA4EHE,MAAM,CAACC,GAAG,EAFjBJ,oBACOK,CAAC,IAAIA,CAAC,EADbL,6BAAoBH,OAAO,CAACwB,MAAM,CAAC,CACrB,CACI,CACI,CACvB;EACD,MAAMC,WAAW,GAAId,CAAU,IAAKC,gCAAE,EAAYC,CAAC,IAAIA,CAAC,CAACF,CAAC,CAAC,CAAC;EAE5D,OAAO;IACLQ,SAAS;IACTM,WAAW;IACXf,YAAY;IACZY,SAAS;IACTN;GACD;AACH;AA2BM,SAAUU,KAAK,CAcnBC,cAUC,EACDC,YAK8B,EAC9BC,UAYC;EAED,IAAIC,qBAAqB,GAAGC,SAAS;EACrC,IAAIF,UAAU,EAAE;IACd,MAAM;MAAEG,OAAO;MAAEC;IAAW,CAAE,GAAGJ,UAAU,CAACF,cAAc,CAAC;IAC3DA,cAAc,GAAGK,OAAO;IACxBF,qBAAqB,GAAGG,WAAW;;EAErC,OAAO/B,2BAAE,CAACwB,KAAK,CAACC,cAAc,CAAC3B,OAAO,CAACkC,MAAM,CAACC,WAAW,EAAS,CAAC,CACjER,cAAc,CAAC3B,OAAO,CAACoC,IAAI,CAACC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EACzCC,kBAAkB,CAChBX,cAAc,EACdC,YAAY,EACZE,qBAAqB,CACtB,CACF,EACC5B,qBAAO,MACL,gCAAmB,EACjByB,cAAc,CAAC3B,OAAO,CAACoC,IAAI,EAC3BT,cAAc,CAAC3B,OAAO,CAACkC,MAAM,EAC7BP,cAAc,CACf,CACF,CACF;AACH;AAEM,SAAUY,cAAc,CAC5BC,cAA2C;EAE3C,OAAO,CAACC,GAAS,EAAEC,GAAqB,EAAEC,CAAI,KAC5CzC,6CAAO,MAAMsC,cAAc,CAACC,GAAG,CAAC,CAACE,CAAC,CAAC,CAAC,EACzBC,CAAC,IACR1C,qBAAO,MAAK;IACV0C,CAAC,KAAKb,SAAS,GACXW,GAAG,CAACG,MAAM,CAAC,GAAG,CAAC,CAACC,IAAI,EAAE,GACtBJ,GAAG,CAACG,MAAM,CAAC,GAAG,CAAC,CACdC,IAAI,CAACC,IAAI,CAACC,SAAS,CAACJ,CAAC,CAAC,CAAC;EAC9B,CAAC,CAAC,CACH;AACP;AAEM,SAAUN,kBAAkB,CAchCN,OAUC,EACDJ,YAKkC,EAClCE,qBAAwD;EAExD,MAAM;IAAE9B,OAAO;IAAEiD,QAAQ;IAAEC,aAAa;IAAEC,CAAC,EAAEC;EAAM,CAAE,GAAGpB,OAAO;EAC/D,MAAMqB,QAAQ,GAAGJ,QAAQ,GAAG,oBAAa,EAACA,QAAe,CAAC,GAzOhD7C,EAAE,CAyOiDkD,IAAI;EACjE,MAAMC,OAAO,GAAGnD,EA1OJ,CA0OIoD,OAAO,CAACjD,GAAG,CAAC8C,QAAQ,CAAC;EACrC,MAAMb,cAAc,GAAGU,aAAa,GAC/BT,GAAS,IAAKrC,EA5OP,CA4OOoD,OAAO,CAACjD,GAAG,CAAC2C,aAAa,CAACT,GAAG,CAAC,CAAC,GAC9C,MAAMc,OAAO;EAEjB,MAAME,cAAc,GAAG1D,kBAAkB,CAACC,OAAO,CAAC;EAClD,MAAM0D,YAAY,GAAG,sCAAkB,EAACD,cAAc,CAAC;EACvD,MAAME,OAAO,GAAGpB,cAAc,CAACC,cAAc,CAAC;EAE9C,SAASoB,SAAS,CAACnB,GAAoB;IACrC,OAAOvC,qBAAO,OAAO;MACnBkC,IAAI,EAAEK,GAAG,CAACoB,MAAM;MAChBC,KAAK,EAAErB,GAAG,CAACqB,KAAK;MAChBC,IAAI,EAAEtB,GAAG,CAACsB,IAAI;MACdC,OAAO,EAAEvB,GAAG,CAACuB,OAAO;MACpBC,OAAO,EAAExB,GAAG,CAACwB;KACd,CAAC,CAAC;EACL;EAEA,SAAShC,WAAW,CAACQ,GAAoB;IACvC,MAAMyB,KAAK,GAAG,IAAIC,IAAI,EAAE;IACxB,MAAMC,SAAS,GAAG,CAAC,IAAI,EAAE,IAAI,CAAU;IACvC,MAAMC,aAAa,GAAG5B,GAAG,CAACuB,OAAO,CAAC,UAAU,CAAC;IAC7C,MAAMM,MAAM,GAAGD,aAAa,IAAID,SAAS,CAACG,QAAQ,CAACF,aAAoB,CAAC,GACnEA,aAA0C,GAC1C,IAAc;IAEnB;IACA;IACA;IACA;IAEA,MAAMG,SAAS,GAAG/B,GAAG,CAACuB,OAAO,CAAC,YAAY,CAAC;IAC3C,MAAMS,MAAM,GAAGD,SAAS,GAAGE,sDAAS,EAAaF,SAAS,CAAC,GAAGG,0BAAS,CAACC,IAAI,EAAE;IAE9E,MAAMC,cAAc,GAAG,IAAIC,+BAAc,CAAC;MACxCL,MAAM;MACNM,IAAI,EAAE3E,EA/QE,CA+QF4E,gBAAgB,CACpBhF,OAAO,CAACiF,KAAK,YAAYC,cAAW,GAAGlF,OAAO,CAACiF,KAAK,CAACF,IAAI,GAAG/E,OAAO,CAAC+E,IAAI,CACzE;MACDT,MAAM;MACNa,SAAS,EAAEjB;MACX;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;KACD,CAAC;IACF;IACA,OAAOW,cAAc;EACvB;EAEA,OAAO,CAACpC,GAAoB,EAAEC,GAAqB,KAAI;IACrD,OAAOxC,+CAAc;MACnB2E,cAAc,EAAE3E,qBAAO,MAAK;QAC1B,MAAM2E,cAAc,GAAG5C,WAAW,CAACQ,GAAG,CAAC;QACvC,IAAIA,GAAG,CAACP,MAAM,KAAK,KAAK,EAAE;UACxBQ,GAAG,CAAC0C,SAAS,CAAC,eAAe,EAAE,UAAU,CAAC;;QAE5C1C,GAAG,CAAC0C,SAAS,CAAC,kBAAkB,EAAEP,cAAc,CAACP,MAAM,CAAC;QACxD,OAAOO,cAAc;MACvB,CAAC,CAAC;MACFQ,IAAI,EAAEzB,SAAS,CAACnB,GAAG;KACpB,CAAC,EACS,CAAC;MAAE4C,IAAI;MAAER;IAAc,CAAE,KAChCS,mMAAe,GAAa9E,CAAC,IAEzB+E,6BAAoB;MAClBrD,MAAM,EAAEO,GAAG,CAACP,MAAM;MAClBE,IAAI,EAAEK,GAAG,CAAC+C,WAAW;MACrB,IAAGhF,CAAC,CAACV,OAAO,GACR;QACA2F,OAAO,uDAAEJ,IAAI,CAACjD,IAAI,EAAU;QAC5BsD,QAAQ,uDAAEL,IAAI,CAACvB,KAAK,EAAU;QAC9B6B,OAAO,EAAE,0BAAM,EAACN,IAAI,CAACtB,IAAI,CAAC;QAC1B6B,UAAU,EAAE,0BAAM,EAACP,IAAI,CAACpB,OAAO,CAAC;QAChC4B,UAAU,uDAAER,IAAI,CAACrB,OAAO;OACzB,GACDjC,SAAS;KACZ,CAAC,CAbJ7B,wBAAe,kBAAkB,CAAC,CAcjC,CACF,EACCA,+BAAsB,MAAK;MACzB,MAAM4F,aAAa,GAAG5F,wDAAY,CAACuC,GAAG,CAAC,EAChC,CAAC;QAAEsB,IAAI;QAAE3B,IAAI;QAAE0B;MAAK,CAAE,KAAI;QAC7B,MAAMiC,EAAE,GAAG;UACT,kCAAGhC,IAAI,CAAM;UACb,kCAAGD,KAAK,CAAM;UACd,kCAAG1B,IAAI;SACW;QACpB,OAAO2D,EAAE;MACX,CAAC,CAAC,EACOC,SAAS,IAChB9F,8BAAM,CAAC8F,SAAgB,CAAC,EACbpD,CAAC,IAAIe,OAAO,CAACqC,SAAS,EAAEtD,GAAG,EAAEE,CAAC,CAAC,CAAC,CAC5C;MACH;MACA,MAAMA,CAAC,GAAGH,GAAG,CAACP,MAAM,KAAK,KAAK,GAAEhC,gCAAC4F,aAAa,IAAmBA,aAAa,EAAC;MAC/E;MACA,MAAMG,EAAE,GAAGnE,qBAAqB,GAC5BlB,yCAA2BkB,qBAAqB,CAACW,GAAG,EAAEC,GAAG,EAAEmC,cAAc,CAAC,EAA1EjC,CAAC;MACH;MAAA,EACEA,CAAyC;MAC7C,OAAOhB,YAAY,CACjBa,GAAG,EACHC,GAAG,EACHmC,cAAc,EACdoB,EAAE,CACH;IACH,CAAC,CAAC,CACH,EACgBC,KAAK,IAClBhG,uDACEA,qBAAO,MAAMwC,GAAG,CAACG,MAAM,CAAC,GAAG,CAAC,CAACC,IAAI,EAAE,CAAC,EACpC,mCAAkB,EAACoD,KAAK,EAAE;MACxBrB,cAAc;MACdzC,IAAI,EAAEK,GAAG,CAAC+C,WAAW;MACrBtD,MAAM,EAAEO,GAAG,CAACP;KACb,CAAC,EACFhC,+BAAsB,MAAK;MACzB,MAAM8D,OAAO,GAAGtB,GAAG,CAACyD,UAAU,EAAE;MAChC,OAGQZ,6BAAoB;QAC1BrD,MAAM,EAAEO,GAAG,CAACP,MAAM;QAClBE,IAAI,EAAEK,GAAG,CAAC+C,WAAW;QACrBY,UAAU,EAAE1D,GAAG,CAAC0D,UAAU,CAACC,QAAQ,EAAE;QAErCZ,OAAO,uDAAEJ,IAAI,CAACjD,IAAI,EAAU;QAC5BsD,QAAQ,uDAAEL,IAAI,CAACvB,KAAK,EAAU;QAC9B6B,OAAO,EAAE,0BAAM,EAACN,IAAI,CAACtB,IAAI,CAAC;QAC1B6B,UAAU,EAAE,0BAAM,EAACP,IAAI,CAACpB,OAAO,CAAC;QAChC4B,UAAU,uDAAER,IAAI,CAACrB,OAAO,EAAU;QAElCsC,UAAU,uDAAEC,MAAM,CAACC,OAAO,CAACxC,OAAO,CAAC,CAACyC,MAAM,CAAC,CAACC,IAAI,EAAE,CAACC,GAAG,EAAEC,KAAK,CAAC,KAAI;UAChEF,IAAI,CAACC,GAAG,CAAC,GAAGC,KAAK,IAAI,OAAOA,KAAK,KAAK,QAAQ,GAAG,oBAAU,EAACA,KAAK,CAAC,GAAGA,KAAK;UAC1E,OAAOF,IAAI;QACb,CAAC,EAAE,EAAyB,CAAC;OAE9B,CAAC,CAnBKxG,qCACL,kBAAkB,EAClBgG,KAAK,CACN;IAiBH,CAAC,CAAC,CACH,EACgBA,KAAK,IAAIhG,qBAAO,MAAM2G,OAAO,CAACC,KAAK,CAAC,sCAAsC,EAAEZ,KAAK,CAAC,CAAC,CAAC,CACtG,EACI,MACHhG,2DAAe,GAAaM,CAAC,IAAG;MAC9B,MAAMwD,OAAO,GAAGtB,GAAG,CAACyD,UAAU,EAAE;MAChC,OAAgDZ,6BAAoB;QAClErD,MAAM,EAAEO,GAAG,CAACP,MAAM;QAClBE,IAAI,EAAEK,GAAG,CAAC+C,WAAW;QACrBY,UAAU,EAAE1D,GAAG,CAAC0D,UAAU,CAACC,QAAQ,EAAE;QACrC,IAAG7F,CAAC,CAACV,OAAO,GACR;UACAwG,UAAU,uDAAEtC,OAAO;SACpB,GACDjC,SAAS;OACZ,CAAC,CATK7B,wBAAe,kBAAkB,CAAC;IAU3C,CAAC,CAAC,CACH,uBACmC2E,cAAc,CAAC,CAAC;IAAA,EACtCA,cAAc,CAAC,CAChC;EACL,CAAC;AACH;AA2CA;;;;AAIM,SAAUkC,QAAQ,CAA4BC,QAAW;EAC7D,MAAMC,MAAM,GAAGC,2DAAQ,GAAST,MAAM,CAAC,CAACC,IAAI,EAAES,GAAG,KAAI;IACnDT,IAAI,CAACS,GAAG,CAAC,GAAGzF,KAAK,CAACsF,QAAQ,CAACG,GAAG,CAAsB,EAAEC,6CAAwB,CAAC;IAC/E,OAAOV,IAAI;EACb,CAAC,EAAE,EAAS,CAA8B;EAE1C,OAAOO,MAAM;AACf;AAEA;;;;AAIM,SAAUI,WAAW,CAAgCL,QAAW;EACpE,MAAMC,MAAM,GAAGC,2DAAQ,GAAST,MAAM,CAAC,CAACC,IAAI,EAAES,GAAG,KAAI;IACnD,MAAMG,OAAO,GAAGP,QAAQ,CAACC,QAAQ,CAACG,GAAG,CAAC,CAAC;IACvCD,0DAAO,GAASK,OAAO,CAACZ,GAAG,IAAID,IAAI,CAAC,GAAGS,GAAa,IAAIR,GAAa,EAAE,CAAC,GAAGW,OAAO,CAACX,GAAG,CAAC,CAAC;IACxF,OAAOD,IAAI;EACb,CAAC,EAAE,EAAS,CAA2C;EAEvD,OAAOO,MAAM;AACf;AAwCM,SAAU7D,MAAM,CAMpBoE,CAAsC,EACtCtE,aAAmB;EAEnB;EACA,MAAMlD,OAAO,GAAGI,EAAE,CAACqH,cAAc,CAACD,CAAC,CAAC;EACpC,MAAMvE,QAAQ,GAAG7C,EAAE,CAACsH,eAAe,CAACF,CAAC,CAAC;EAUtC,OACErE,CAAgC,KAC5B;IACJD,aAAa;IACbC,CAAC;IACDnD,OAAO;IACPiD,QAAQ;IACR0E,eAAe,EAAEH,CAAC,CAACG,eAAe,IAAI1E;GAQtC;AACJ;AAqBA;;;;;;;;;;;;;;;AAeM,SAAU2E,aAAa,CAAuDC,GAAa;EAE/F,OAOEb,QAAmB,IACjB;IACF,MAAMhF,OAAO,GAAGkF,sDAAG,GAAST,MAAM,CAAC,CAACC,IAAI,EAAES,GAAG,KAAI;MAC/CT,IAAI,CAACS,GAAG,CAAC,GAAG/D,MAAM,CAACyE,GAAG,CAACV,GAAG,CAAC,CAAC,CAACH,QAAQ,CAACG,GAAG,CAAQ,CAAC;MAClD,OAAOT,IAAI;IACb,CAAC,EAAE,EAAS,CAAC;IAEb,OAAO1E,OASN;EACH,CAAC;AACH","names":["RequestSettings","tsplus_module_1","verbose","makeRequestParsers","Request","ph","tsplus_module_3","tsplus_module_2","MO","condemnFail","Parser","for","s","Headers","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","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]}
|
package/_src/api/routing.ts
CHANGED
|
@@ -307,7 +307,7 @@ export function makeRequestHandler<
|
|
|
307
307
|
})
|
|
308
308
|
.flatMap(({ pars, requestContext }) =>
|
|
309
309
|
RequestSettings.get.flatMap(s =>
|
|
310
|
-
Effect.logInfo("
|
|
310
|
+
Effect.logInfo("Incoming request").apply(
|
|
311
311
|
Effect.logAnnotates({
|
|
312
312
|
method: req.method,
|
|
313
313
|
path: req.originalUrl,
|
|
@@ -353,18 +353,17 @@ export function makeRequestHandler<
|
|
|
353
353
|
})
|
|
354
354
|
)
|
|
355
355
|
.tapErrorCause(cause =>
|
|
356
|
-
Effect.
|
|
357
|
-
res.status(500).send()
|
|
358
|
-
|
|
356
|
+
Effect.tuplePar(
|
|
357
|
+
Effect(() => res.status(500).send()),
|
|
358
|
+
reportRequestError(cause, {
|
|
359
359
|
requestContext,
|
|
360
360
|
path: req.originalUrl,
|
|
361
361
|
method: req.method
|
|
362
|
-
})
|
|
363
|
-
}).zipRight(
|
|
362
|
+
}),
|
|
364
363
|
Effect.suspendSucceed(() => {
|
|
365
364
|
const headers = res.getHeaders()
|
|
366
365
|
return Effect.logErrorCauseMessage(
|
|
367
|
-
"
|
|
366
|
+
"Finished request",
|
|
368
367
|
cause
|
|
369
368
|
).apply(Effect.logAnnotates({
|
|
370
369
|
method: req.method,
|
|
@@ -388,9 +387,9 @@ export function makeRequestHandler<
|
|
|
388
387
|
.tapErrorCause(cause => Effect(() => console.error("Error occurred while reporting error", cause)))
|
|
389
388
|
)
|
|
390
389
|
.tap(() =>
|
|
391
|
-
RequestSettings.get.
|
|
390
|
+
RequestSettings.get.flatMap(s => {
|
|
392
391
|
const headers = res.getHeaders()
|
|
393
|
-
return Effect.logInfo("
|
|
392
|
+
return Effect.logInfo("Finished request").apply(Effect.logAnnotates({
|
|
394
393
|
method: req.method,
|
|
395
394
|
path: req.originalUrl,
|
|
396
395
|
statusCode: res.statusCode.toString(),
|
|
@@ -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;AAChE,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,
|
|
1
|
+
{"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../_src/api/routing.ts"],"names":[],"mappings":"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"}
|
package/dist/api/routing.js
CHANGED
|
@@ -131,7 +131,7 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
|
|
|
131
131
|
reqHeaders: tsplus_module_7.RecordPretty(tsplus_module_7.object$(pars.headers))
|
|
132
132
|
} :
|
|
133
133
|
undefined
|
|
134
|
-
})(tsplus_module_3.logInfo("
|
|
134
|
+
})(tsplus_module_3.logInfo("Incoming request"))), tsplus_module_3.suspendSucceed(() => {
|
|
135
135
|
const handleRequest = tsplus_module_3.flatMap(tsplus_module_3.map(parseRequest(req), ({ body, path, query }) => {
|
|
136
136
|
const hn = {
|
|
137
137
|
...tsplus_module_9.getOrUndefined(body),
|
|
@@ -148,13 +148,10 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
|
|
|
148
148
|
// PR is not relevant here
|
|
149
149
|
: r;
|
|
150
150
|
return errorHandler(req, res, requestContext, r2);
|
|
151
|
-
})), cause => tsplus_module_3.tapErrorCause(tsplus_module_3.
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
path: req.originalUrl,
|
|
156
|
-
method: req.method
|
|
157
|
-
});
|
|
151
|
+
})), cause => tsplus_module_3.tapErrorCause(tsplus_module_3.tuplePar(tsplus_module_3.sync(() => res.status(500).send()), reportRequestError(cause, {
|
|
152
|
+
requestContext,
|
|
153
|
+
path: req.originalUrl,
|
|
154
|
+
method: req.method
|
|
158
155
|
}), tsplus_module_3.suspendSucceed(() => {
|
|
159
156
|
const headers = res.getHeaders();
|
|
160
157
|
return tsplus_module_8.logAnnotates({
|
|
@@ -170,8 +167,8 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
|
|
|
170
167
|
prev[key] = value && typeof value === "string" ? snipString(value) : value;
|
|
171
168
|
return prev;
|
|
172
169
|
}, {})))
|
|
173
|
-
})(tsplus_module_3.logErrorCauseMessage("
|
|
174
|
-
})), cause => tsplus_module_3.sync(() => console.error("Error occurred while reporting error", cause)))), () => tsplus_module_3.
|
|
170
|
+
})(tsplus_module_3.logErrorCauseMessage("Finished request", cause));
|
|
171
|
+
})), cause => tsplus_module_3.sync(() => console.error("Error occurred while reporting error", cause)))), () => tsplus_module_3.flatMap(tsplus_module_1.get(RequestSettings), s => {
|
|
175
172
|
const headers = res.getHeaders();
|
|
176
173
|
return tsplus_module_8.logAnnotates({
|
|
177
174
|
method: req.method,
|
|
@@ -182,7 +179,7 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
|
|
|
182
179
|
resHeaders: tsplus_module_7.RecordPretty(tsplus_module_7.object$(headers))
|
|
183
180
|
} :
|
|
184
181
|
undefined
|
|
185
|
-
})(tsplus_module_3.logInfo("
|
|
182
|
+
})(tsplus_module_3.logInfo("Finished request"));
|
|
186
183
|
})), tsplus_module_6.tag, requestContext) // otherwise external error reporter breaks.
|
|
187
184
|
, requestContext));
|
|
188
185
|
};
|
|
@@ -246,4 +243,4 @@ export function matchResource(mod) {
|
|
|
246
243
|
return handler;
|
|
247
244
|
};
|
|
248
245
|
}
|
|
249
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routing.js","sourceRoot":"","sources":["../../_src/api/routing.ts"],"names":[],"mappings":"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"}
|
|
246
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routing.js","sourceRoot":"","sources":["../../_src/api/routing.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect-app/infra",
|
|
3
|
-
"version": "0.17.
|
|
3
|
+
"version": "0.17.3",
|
|
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.16.0",
|
|
24
23
|
"@effect-app/infra-adapters": "0.14.0",
|
|
25
|
-
"@effect-app/
|
|
26
|
-
"@effect-app/schema": "0.14.0"
|
|
24
|
+
"@effect-app/prelude": "0.16.0",
|
|
25
|
+
"@effect-app/schema": "0.14.0",
|
|
26
|
+
"@effect-app/core": "0.16.0"
|
|
27
27
|
},
|
|
28
28
|
"devDependencies": {
|
|
29
29
|
"@babel/cli": "^7.20.7",
|