@effect-app/infra 0.234.2 → 0.234.4

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 CHANGED
@@ -1,5 +1,18 @@
1
1
  # @effect-app/infra
2
2
 
3
+ ## 0.234.4
4
+
5
+ ### Patch Changes
6
+
7
+ - Updated dependencies [8f59a5f]
8
+ - @effect-app/infra-adapters@0.154.8
9
+
10
+ ## 0.234.3
11
+
12
+ ### Patch Changes
13
+
14
+ - 6fd8d12: improve: http handler should be uninterruptible except for the user's handler.
15
+
3
16
  ## 0.234.2
4
17
 
5
18
  ### Patch Changes
@@ -52,7 +52,7 @@ function makeRequestHandler(handler, errorHandler, middlewareLayer) {
52
52
  headers: req.headers,
53
53
  cookies: {} // req.cookies
54
54
  }));
55
- return _effectApp.Effect.gen(function* ($) {
55
+ return _effectApp.Effect.uninterruptibleMask(restore => _effectApp.Effect.gen(function* ($) {
56
56
  const req = yield* $(_http.HttpServerRequest.ServerRequest);
57
57
  const res = _http.HttpServerResponse.empty().pipe(_ => req.method === "GET" ? _http.HttpServerResponse.setHeader(_, "Cache-Control", "no-store") : _);
58
58
  const pars = yield* $(getParams);
@@ -86,7 +86,7 @@ function makeRequestHandler(handler, errorHandler, middlewareLayer) {
86
86
  return prev;
87
87
  }, {}))), _effectApp.Effect.flatMap(parsedReq => handle(parsedReq).pipe(_effectApp.Effect.provideService(handler.Request.Tag, parsedReq), _effectApp.Effect.flatMap(encoder), _effectApp.Effect.map(r => res.pipe(_http.HttpServerResponse.setBody(_http.HttpBody.unsafeJson(r)), _http.HttpServerResponse.setStatus(r === undefined ? 204 : 200))))));
88
88
  // Commands should not be interruptable.
89
- const r = req.method !== "GET" ? _effectApp.Effect.uninterruptible(handleRequest) : handleRequest; // .instrument("Performance.RequestResponse")
89
+ const r = req.method !== "GET" ? _effectApp.Effect.uninterruptible(handleRequest) : restore(handleRequest); // .instrument("Performance.RequestResponse")
90
90
  const r2 = middlewareLayer ? _effectApp.Effect.provide(r, middlewareLayer)
91
91
  // PR is not relevant here
92
92
  : r;
@@ -123,6 +123,6 @@ function makeRequestHandler(handler, errorHandler, middlewareLayer) {
123
123
  return yield* $(eff);
124
124
  }).pipe(_ => (0, _setupRequest.updateRequestContext)(_, (0, _utils.copy)(_ => ({
125
125
  name: (0, _schema.NonEmptyString255)(handler.name)
126
- }))));
126
+ })))));
127
127
  }
128
128
  //# sourceMappingURL=makeRequestHandler.cjs.map
@@ -1 +1 @@
1
- {"version":3,"file":"makeRequestHandler.cjs","names":["_utils","require","_util","_errorReporter","_effectApp","_http","_schema","_setupRequest","_base","RequestSettings","exports","FiberRef","unsafeMake","verbose","makeRequestHandler","handler","errorHandler","middlewareLayer","Request","Response","h","handle","response","S","void","resp","encoder","fields","encode","rt","encodedSchema","struct","requestParsers","makeRequestParsers","parseRequest","parseRequestParams","getParams","Effect","map","all","rcx","HttpRouter","RouteContext","req","flatMap","HttpServerRequest","ServerRequest","json","pipe","body","headers","params","query","searchParams","cookies","gen","$","res","HttpServerResponse","empty","_","method","setHeader","pars","settings","get","eff","logInfo","annotateLogs","path","originalUrl","reqPath","pretty","reqQuery","reqBody","reqCookies","reqHeaders","undefined","andThen","suspend","handleRequest","hn","Option","getOrUndefined","tap","parsedReq","annotateCurrentSpan","Object","entries","reduce","prev","key","value","length","substring","Array","isArray","keys","provideService","Tag","r","setBody","HttpBody","unsafeJson","setStatus","uninterruptible","r2","provide","catchAllCause","cause","sync","reportError","logError","statusCode","status","toString","resHeaders","snipString","concurrency","tapErrorCause","Console","error","updateRequestContext","copy","name","NonEmptyString255"],"sources":["../../../src/api/routing/makeRequestHandler.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"file":"makeRequestHandler.cjs","names":["_utils","require","_util","_errorReporter","_effectApp","_http","_schema","_setupRequest","_base","RequestSettings","exports","FiberRef","unsafeMake","verbose","makeRequestHandler","handler","errorHandler","middlewareLayer","Request","Response","h","handle","response","S","void","resp","encoder","fields","encode","rt","encodedSchema","struct","requestParsers","makeRequestParsers","parseRequest","parseRequestParams","getParams","Effect","map","all","rcx","HttpRouter","RouteContext","req","flatMap","HttpServerRequest","ServerRequest","json","pipe","body","headers","params","query","searchParams","cookies","uninterruptibleMask","restore","gen","$","res","HttpServerResponse","empty","_","method","setHeader","pars","settings","get","eff","logInfo","annotateLogs","path","originalUrl","reqPath","pretty","reqQuery","reqBody","reqCookies","reqHeaders","undefined","andThen","suspend","handleRequest","hn","Option","getOrUndefined","tap","parsedReq","annotateCurrentSpan","Object","entries","reduce","prev","key","value","length","substring","Array","isArray","keys","provideService","Tag","r","setBody","HttpBody","unsafeJson","setStatus","uninterruptible","r2","provide","catchAllCause","cause","sync","reportError","logError","statusCode","status","toString","resHeaders","snipString","concurrency","tapErrorCause","Console","error","updateRequestContext","copy","name","NonEmptyString255"],"sources":["../../../src/api/routing/makeRequestHandler.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
@@ -1 +1 @@
1
- {"version":3,"file":"makeRequestHandler.d.ts","sourceRoot":"","sources":["../../../src/api/routing/makeRequestHandler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"makeRequestHandler.d.ts","sourceRoot":"","sources":["../../../src/api/routing/makeRequestHandler.ts"],"names":[],"mappings":"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"}
@@ -37,7 +37,7 @@ export function makeRequestHandler(handler, errorHandler, middlewareLayer) {
37
37
  headers: req.headers,
38
38
  cookies: {} // req.cookies
39
39
  }));
40
- return Effect
40
+ return Effect.uninterruptibleMask((restore) => Effect
41
41
  .gen(function* ($) {
42
42
  const req = yield* $(HttpServerRequest.ServerRequest);
43
43
  const res = HttpServerResponse
@@ -90,7 +90,7 @@ export function makeRequestHandler(handler, errorHandler, middlewareLayer) {
90
90
  .pipe(Effect.provideService(handler.Request.Tag, parsedReq), Effect.flatMap(encoder), Effect
91
91
  .map((r) => res.pipe(HttpServerResponse.setBody(HttpBody.unsafeJson(r)), HttpServerResponse.setStatus(r === undefined ? 204 : 200))))));
92
92
  // Commands should not be interruptable.
93
- const r = req.method !== "GET" ? Effect.uninterruptible(handleRequest) : handleRequest; // .instrument("Performance.RequestResponse")
93
+ const r = req.method !== "GET" ? Effect.uninterruptible(handleRequest) : restore(handleRequest); // .instrument("Performance.RequestResponse")
94
94
  const r2 = middlewareLayer
95
95
  ? Effect.provide(r, middlewareLayer)
96
96
  // PR is not relevant here
@@ -145,6 +145,6 @@ export function makeRequestHandler(handler, errorHandler, middlewareLayer) {
145
145
  })
146
146
  .pipe((_) => updateRequestContext(_, copy((_) => ({
147
147
  name: NonEmptyString255(handler.name)
148
- }))));
148
+ })))));
149
149
  }
150
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"makeRequestHandler.js","sourceRoot":"","sources":["../../../src/api/routing/makeRequestHandler.ts"],"names":[],"mappings":"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"}
150
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"makeRequestHandler.js","sourceRoot":"","sources":["../../../src/api/routing/makeRequestHandler.ts"],"names":[],"mappings":"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"}
@@ -46,7 +46,7 @@ declare const Operations_base: (abstract new (service: {
46
46
  all: Effect.Effect<Operation[], never, never>;
47
47
  find: (id: StringId) => Effect.Effect<Option.Option<Operation>, never, never>;
48
48
  update: (id: StringId, progress: OperationProgress) => Effect.Effect<void, never, never>;
49
- }) => X) => X extends Effect<infer A_3, infer E_5, infer R_5> ? Effect<A_3, E_5, Operations | R_5> : Effect<X, never, Operations>;
49
+ }) => X) => X extends Effect<infer A_3, infer E_5, infer R_5> ? Effect<A_3, E_5, R_5 | Operations> : Effect<X, never, Operations>;
50
50
  };
51
51
  export declare class Operations extends Operations_base {
52
52
  private static readonly CleanupLive;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@effect-app/infra",
3
- "version": "0.234.2",
3
+ "version": "0.234.4",
4
4
  "license": "MIT",
5
5
  "type": "module",
6
6
  "dependencies": {
@@ -19,9 +19,9 @@
19
19
  "pure-rand": "6.1.0",
20
20
  "redlock": "^4.2.0",
21
21
  "@effect-app/core": "0.169.1",
22
- "effect-app": "0.202.1",
23
- "@effect-app/infra-adapters": "0.154.7",
24
- "@effect-app/schema": "0.220.4"
22
+ "@effect-app/infra-adapters": "0.154.8",
23
+ "@effect-app/schema": "0.220.4",
24
+ "effect-app": "0.202.1"
25
25
  },
26
26
  "devDependencies": {
27
27
  "@babel/cli": "^7.24.1",
@@ -164,176 +164,178 @@ export function makeRequestHandler<
164
164
  })
165
165
  )
166
166
 
167
- return Effect
168
- .gen(function*($) {
169
- const req = yield* $(HttpServerRequest.ServerRequest)
170
- const res = HttpServerResponse
171
- .empty()
172
- .pipe((_) => req.method === "GET" ? HttpServerResponse.setHeader(_, "Cache-Control", "no-store") : _)
167
+ return Effect.uninterruptibleMask((restore) =>
168
+ Effect
169
+ .gen(function*($) {
170
+ const req = yield* $(HttpServerRequest.ServerRequest)
171
+ const res = HttpServerResponse
172
+ .empty()
173
+ .pipe((_) => req.method === "GET" ? HttpServerResponse.setHeader(_, "Cache-Control", "no-store") : _)
173
174
 
174
- const pars = yield* $(getParams)
175
+ const pars = yield* $(getParams)
175
176
 
176
- const settings = yield* $(FiberRef.get(RequestSettings))
177
+ const settings = yield* $(FiberRef.get(RequestSettings))
177
178
 
178
- const eff =
179
- // TODO: we don;t have access to user id here cause context is not yet created
180
- Effect
181
- .logInfo("Incoming request")
182
- .pipe(
183
- Effect.annotateLogs({
184
- method: req.method,
185
- path: req.originalUrl,
186
- ...(settings.verbose
187
- ? {
188
- reqPath: pretty(pars.params),
189
- reqQuery: pretty(pars.query),
190
- reqBody: pretty(pars.body),
191
- reqCookies: pretty(pars.cookies),
192
- reqHeaders: pretty(pars.headers)
193
- }
194
- : undefined)
195
- }),
196
- Effect
197
- .andThen(
198
- Effect.suspend(() => {
199
- const handleRequest = parseRequest(pars)
200
- .pipe(
201
- Effect.map(({ body, path, query }) => {
202
- const hn = {
203
- ...body.pipe(Option.getOrUndefined) ?? {},
204
- ...query.pipe(Option.getOrUndefined) ?? {},
205
- ...path.pipe(Option.getOrUndefined) ?? {}
206
- } as unknown as ReqA
207
- return hn
208
- }),
209
- Effect.tap((parsedReq) =>
210
- Effect.annotateCurrentSpan(
211
- "requestInput",
212
- Object.entries(parsedReq).reduce((prev, [key, value]: [string, unknown]) => {
213
- prev[key] = key === "password"
214
- ? "<redacted>"
215
- : typeof value === "string" || typeof value === "number" || typeof value === "boolean"
216
- ? typeof value === "string" && value.length > 256
217
- ? (value.substring(0, 253) + "...")
218
- : value
219
- : Array.isArray(value)
220
- ? `Array[${value.length}]`
221
- : value === null || value === undefined
222
- ? `${value}`
223
- : typeof value === "object" && value
224
- ? `Object[${Object.keys(value).length}]`
225
- : typeof value
226
- return prev
227
- }, {} as Record<string, string | number | boolean>)
228
- )
229
- ),
230
- Effect.flatMap((parsedReq) =>
231
- handle(parsedReq)
232
- .pipe(
233
- Effect.provideService(handler.Request.Tag, parsedReq as any),
234
- Effect.flatMap(encoder),
235
- Effect
236
- .map((r) =>
237
- res.pipe(
238
- HttpServerResponse.setBody(HttpBody.unsafeJson(r)),
239
- HttpServerResponse.setStatus(r === undefined ? 204 : 200)
240
- )
241
- )
179
+ const eff =
180
+ // TODO: we don;t have access to user id here cause context is not yet created
181
+ Effect
182
+ .logInfo("Incoming request")
183
+ .pipe(
184
+ Effect.annotateLogs({
185
+ method: req.method,
186
+ path: req.originalUrl,
187
+ ...(settings.verbose
188
+ ? {
189
+ reqPath: pretty(pars.params),
190
+ reqQuery: pretty(pars.query),
191
+ reqBody: pretty(pars.body),
192
+ reqCookies: pretty(pars.cookies),
193
+ reqHeaders: pretty(pars.headers)
194
+ }
195
+ : undefined)
196
+ }),
197
+ Effect
198
+ .andThen(
199
+ Effect.suspend(() => {
200
+ const handleRequest = parseRequest(pars)
201
+ .pipe(
202
+ Effect.map(({ body, path, query }) => {
203
+ const hn = {
204
+ ...body.pipe(Option.getOrUndefined) ?? {},
205
+ ...query.pipe(Option.getOrUndefined) ?? {},
206
+ ...path.pipe(Option.getOrUndefined) ?? {}
207
+ } as unknown as ReqA
208
+ return hn
209
+ }),
210
+ Effect.tap((parsedReq) =>
211
+ Effect.annotateCurrentSpan(
212
+ "requestInput",
213
+ Object.entries(parsedReq).reduce((prev, [key, value]: [string, unknown]) => {
214
+ prev[key] = key === "password"
215
+ ? "<redacted>"
216
+ : typeof value === "string" || typeof value === "number" || typeof value === "boolean"
217
+ ? typeof value === "string" && value.length > 256
218
+ ? (value.substring(0, 253) + "...")
219
+ : value
220
+ : Array.isArray(value)
221
+ ? `Array[${value.length}]`
222
+ : value === null || value === undefined
223
+ ? `${value}`
224
+ : typeof value === "object" && value
225
+ ? `Object[${Object.keys(value).length}]`
226
+ : typeof value
227
+ return prev
228
+ }, {} as Record<string, string | number | boolean>)
242
229
  )
243
- )
244
- ) as Effect<
245
- HttpServerResponse.ServerResponse,
246
- ValidationError | ResE,
247
- Exclude<R, EnforceNonEmptyRecord<M>>
248
- >
230
+ ),
231
+ Effect.flatMap((parsedReq) =>
232
+ handle(parsedReq)
233
+ .pipe(
234
+ Effect.provideService(handler.Request.Tag, parsedReq as any),
235
+ Effect.flatMap(encoder),
236
+ Effect
237
+ .map((r) =>
238
+ res.pipe(
239
+ HttpServerResponse.setBody(HttpBody.unsafeJson(r)),
240
+ HttpServerResponse.setStatus(r === undefined ? 204 : 200)
241
+ )
242
+ )
243
+ )
244
+ )
245
+ ) as Effect<
246
+ HttpServerResponse.ServerResponse,
247
+ ValidationError | ResE,
248
+ Exclude<R, EnforceNonEmptyRecord<M>>
249
+ >
249
250
 
250
- // Commands should not be interruptable.
251
- const r = req.method !== "GET" ? Effect.uninterruptible(handleRequest) : handleRequest // .instrument("Performance.RequestResponse")
252
- const r2 = middlewareLayer
253
- ? Effect.provide(r, middlewareLayer)
254
- // PR is not relevant here
255
- : (r as Effect<
256
- HttpServerResponse.ServerResponse,
257
- ResE | MiddlewareE | ValidationError,
258
- Exclude<Exclude<R, EnforceNonEmptyRecord<M>>, PR>
259
- >)
260
- return errorHandler(
261
- req,
262
- res,
263
- r2
264
- )
265
- })
266
- ),
267
- Effect
268
- .catchAllCause((cause) =>
269
- Effect
270
- .sync(() => HttpServerResponse.setStatus(res, 500))
271
- .pipe(Effect
272
- .tap((res) =>
273
- Effect
274
- .all([
275
- reportError("request")(cause, {
276
- path: req.originalUrl,
277
- method: req.method
278
- }),
279
- Effect.suspend(() => {
280
- const headers = res.headers
281
- return Effect
282
- .logError("Finished request", cause)
283
- .pipe(Effect.annotateLogs({
284
- method: req.method,
285
- path: req.originalUrl,
286
- statusCode: res.status.toString(),
251
+ // Commands should not be interruptable.
252
+ const r = req.method !== "GET" ? Effect.uninterruptible(handleRequest) : restore(handleRequest) // .instrument("Performance.RequestResponse")
253
+ const r2 = middlewareLayer
254
+ ? Effect.provide(r, middlewareLayer)
255
+ // PR is not relevant here
256
+ : (r as Effect<
257
+ HttpServerResponse.ServerResponse,
258
+ ResE | MiddlewareE | ValidationError,
259
+ Exclude<Exclude<R, EnforceNonEmptyRecord<M>>, PR>
260
+ >)
261
+ return errorHandler(
262
+ req,
263
+ res,
264
+ r2
265
+ )
266
+ })
267
+ ),
268
+ Effect
269
+ .catchAllCause((cause) =>
270
+ Effect
271
+ .sync(() => HttpServerResponse.setStatus(res, 500))
272
+ .pipe(Effect
273
+ .tap((res) =>
274
+ Effect
275
+ .all([
276
+ reportError("request")(cause, {
277
+ path: req.originalUrl,
278
+ method: req.method
279
+ }),
280
+ Effect.suspend(() => {
281
+ const headers = res.headers
282
+ return Effect
283
+ .logError("Finished request", cause)
284
+ .pipe(Effect.annotateLogs({
285
+ method: req.method,
286
+ path: req.originalUrl,
287
+ statusCode: res.status.toString(),
287
288
 
288
- reqPath: pretty(pars.params),
289
- reqQuery: pretty(pars.query),
290
- reqBody: pretty(pars.body),
291
- reqCookies: pretty(pars.cookies),
292
- reqHeaders: pretty(pars.headers),
289
+ reqPath: pretty(pars.params),
290
+ reqQuery: pretty(pars.query),
291
+ reqBody: pretty(pars.body),
292
+ reqCookies: pretty(pars.cookies),
293
+ reqHeaders: pretty(pars.headers),
293
294
 
294
- resHeaders: pretty(
295
- Object
296
- .entries(headers)
297
- .reduce((prev, [key, value]) => {
298
- prev[key] = value && typeof value === "string" ? snipString(value) : value
299
- return prev
300
- }, {} as Record<string, any>)
301
- )
302
- }))
303
- })
304
- ], { concurrency: "inherit" })
305
- ))
306
- .pipe(
307
- Effect.tapErrorCause((cause) => Console.error("Error occurred while reporting error", cause))
308
- )
309
- ),
310
- Effect
311
- .tap((res) =>
312
- Effect
313
- .logInfo("Finished request")
314
- .pipe(Effect.annotateLogs({
315
- method: req.method,
316
- path: req.originalUrl,
317
- statusCode: res.status.toString(),
318
- ...(settings.verbose
319
- ? {
320
- resHeaders: pretty(res.headers)
321
- }
322
- : undefined)
323
- }))
324
- )
325
- )
295
+ resHeaders: pretty(
296
+ Object
297
+ .entries(headers)
298
+ .reduce((prev, [key, value]) => {
299
+ prev[key] = value && typeof value === "string" ? snipString(value) : value
300
+ return prev
301
+ }, {} as Record<string, any>)
302
+ )
303
+ }))
304
+ })
305
+ ], { concurrency: "inherit" })
306
+ ))
307
+ .pipe(
308
+ Effect.tapErrorCause((cause) => Console.error("Error occurred while reporting error", cause))
309
+ )
310
+ ),
311
+ Effect
312
+ .tap((res) =>
313
+ Effect
314
+ .logInfo("Finished request")
315
+ .pipe(Effect.annotateLogs({
316
+ method: req.method,
317
+ path: req.originalUrl,
318
+ statusCode: res.status.toString(),
319
+ ...(settings.verbose
320
+ ? {
321
+ resHeaders: pretty(res.headers)
322
+ }
323
+ : undefined)
324
+ }))
325
+ )
326
+ )
326
327
 
327
- return yield* $(eff)
328
- })
329
- .pipe((_) =>
330
- updateRequestContext(
331
- _,
332
- copy((_) => ({
333
- name: NonEmptyString255(
334
- handler.name
335
- )
336
- }))
328
+ return yield* $(eff)
329
+ })
330
+ .pipe((_) =>
331
+ updateRequestContext(
332
+ _,
333
+ copy((_) => ({
334
+ name: NonEmptyString255(
335
+ handler.name
336
+ )
337
+ }))
338
+ )
337
339
  )
338
- )
340
+ )
339
341
  }