@effect-app/infra 1.2.4 → 1.3.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +20 -0
- package/_cjs/services/QueueMaker/sbqueue.cjs +1 -2
- package/_cjs/services/QueueMaker/sbqueue.cjs.map +1 -1
- package/dist/services/QueueMaker/sbqueue.d.ts.map +1 -1
- package/dist/services/QueueMaker/sbqueue.js +4 -6
- package/package.json +9 -9
- package/src/services/QueueMaker/sbqueue.ts +3 -5
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,25 @@
|
|
|
1
1
|
# @effect-app/infra
|
|
2
2
|
|
|
3
|
+
## 1.3.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- 4f8177a: better fatalqueue error report
|
|
8
|
+
|
|
9
|
+
## 1.3.0
|
|
10
|
+
|
|
11
|
+
### Minor Changes
|
|
12
|
+
|
|
13
|
+
- 2e29520: update packages
|
|
14
|
+
|
|
15
|
+
### Patch Changes
|
|
16
|
+
|
|
17
|
+
- Updated dependencies [2e29520]
|
|
18
|
+
- @effect-app/infra-adapters@1.1.0
|
|
19
|
+
- effect-app@1.2.0
|
|
20
|
+
- @effect-app/schema@1.1.0
|
|
21
|
+
- @effect-app/core@1.1.0
|
|
22
|
+
|
|
3
23
|
## 1.2.4
|
|
4
24
|
|
|
5
25
|
### Patch Changes
|
|
@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.makeServiceBusLayers = makeServiceBusLayers;
|
|
7
7
|
exports.makeServiceBusQueue = makeServiceBusQueue;
|
|
8
8
|
var _ServiceBus = require("@effect-app/infra-adapters/ServiceBus");
|
|
9
|
-
var _errorReporter = require("@effect-app/infra/errorReporter");
|
|
10
9
|
var _RequestContext = require("@effect-app/infra/RequestContext");
|
|
11
10
|
var _effect = require("effect");
|
|
12
11
|
var _effectApp = require("effect-app");
|
|
@@ -81,7 +80,7 @@ function makeServiceBusQueue(queueName, queueDrainName, schema, drainSchema) {
|
|
|
81
80
|
}
|
|
82
81
|
return yield* $((0, _ServiceBus.subscribe)({
|
|
83
82
|
processMessage: x => processMessage(x.body).pipe(_effectApp.Effect.uninterruptible),
|
|
84
|
-
processError: err => _effectApp.Deferred.completeWith(deferred,
|
|
83
|
+
processError: err => _effectApp.Deferred.completeWith(deferred, (0, _errors.reportFatalQueueError)(_effectApp.Cause.fail(err.error)).pipe(_effectApp.Effect.andThen(_effectApp.Effect.fail(err.error))))
|
|
85
84
|
}, sessionId).pipe(_effectApp.Effect.provideService(_ServiceBus.ServiceBusReceiverFactory, receiver)));
|
|
86
85
|
}).pipe(_effectApp.Effect.andThen(_effectApp.Deferred.await(deferred).pipe(_effectApp.Effect.orDie))),
|
|
87
86
|
publish: (...messages) => _effectApp.Effect.gen(function* ($) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sbqueue.cjs","names":["_ServiceBus","require","
|
|
1
|
+
{"version":3,"file":"sbqueue.cjs","names":["_ServiceBus","require","_RequestContext","_effect","_effectApp","_ids","_schema","_utils","_setupRequest","_RequestContextContainer","_errors","_service","makeServiceBusQueue","queueName","queueDrainName","schema","drainSchema","wireSchema","S","Struct","body","meta","QueueMeta","drainW","parseDrain","flow","decodeUnknown","Effect","orDie","gen","$","s","Sender","receiver","ServiceBusReceiverFactory","silenceAndReportError","reportNonInterruptedFailure","name","reportError","reportNonInterruptedFailureCause","rcc","RequestContextContainer","deferred","Deferred","make","drain","handleEvent","sessionId","processMessage","messageBody","sync","JSON","parse","pipe","flatMap","x","effect","logDebug","annotateLogs","pretty","zipRight","_","setupRequestContext","RequestContext","inherit","requestContext","id","RequestId","locale","NonEmptyString255","_tag","withSpan","kind","attributes","Object","entries","reduce","prev","key","value","length","substring","Array","isArray","undefined","keys","span","withParentSpan","Tracer","externalSpan","tapErrorCause","subscribe","uninterruptible","processError","err","completeWith","reportFatalQueueError","Cause","fail","error","andThen","provideService","await","publish","messages","serviceOption","ParentSpan","promise","abortSignal","sendMessages","map","m","stringify","encodeSync","Option","getOrUndefined","messageId","contentType","makeServiceBusLayers","url","Layer","merge","Live","LiveSender","provide","LiveServiceBusClient"],"sources":["../../../src/services/QueueMaker/sbqueue.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sbqueue.d.ts","sourceRoot":"","sources":["../../../src/services/QueueMaker/sbqueue.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,yBAAyB,EAE1B,MAAM,uCAAuC,CAAA;
|
|
1
|
+
{"version":3,"file":"sbqueue.d.ts","sourceRoot":"","sources":["../../../src/services/QueueMaker/sbqueue.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,yBAAyB,EAE1B,MAAM,uCAAuC,CAAA;AAE9C,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/B,OAAO,EAAmB,MAAM,EAAQ,KAAK,EAAU,CAAC,EAAE,MAAM,YAAY,CAAA;AAE5E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAIjD,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAA;AAIvE;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,SAAS;IAAE,EAAE,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC1C,QAAQ,SAAS;IAAE,EAAE,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC/C,IAAI,EACJ,SAAS,EAET,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,EAC3B,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC;yCAsBvB,CAAC,EAAE,EAAE,QAAQ,KAAK,OAAO,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,cAC/C,MAAM;;+GA6HzB;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,wGAI1F"}
|
|
@@ -1,14 +1,13 @@
|
|
|
1
1
|
import { LiveSender, LiveServiceBusClient, Sender, ServiceBusReceiverFactory, subscribe } from "@effect-app/infra-adapters/ServiceBus";
|
|
2
|
-
import { captureException } from "@effect-app/infra/errorReporter";
|
|
3
2
|
import { RequestContext } from "@effect-app/infra/RequestContext";
|
|
4
3
|
import { Tracer } from "effect";
|
|
5
|
-
import { Deferred, Effect, flow, Layer, Option, S } from "effect-app";
|
|
4
|
+
import { Cause, Deferred, Effect, flow, Layer, Option, S } from "effect-app";
|
|
6
5
|
import { RequestId } from "effect-app/ids";
|
|
7
6
|
import { NonEmptyString255 } from "effect-app/schema";
|
|
8
7
|
import { pretty } from "effect-app/utils";
|
|
9
8
|
import { setupRequestContext } from "../../api/setupRequest.js";
|
|
10
9
|
import { RequestContextContainer } from "../RequestContextContainer.js";
|
|
11
|
-
import { reportNonInterruptedFailure, reportNonInterruptedFailureCause } from "./errors.js";
|
|
10
|
+
import { reportFatalQueueError, reportNonInterruptedFailure, reportNonInterruptedFailureCause } from "./errors.js";
|
|
12
11
|
import { QueueMeta } from "./service.js";
|
|
13
12
|
/**
|
|
14
13
|
* @tsplus static QueueMaker.Ops makeServiceBus
|
|
@@ -85,8 +84,7 @@ export function makeServiceBusQueue(queueName, queueDrainName, schema, drainSche
|
|
|
85
84
|
}
|
|
86
85
|
return yield* $(subscribe({
|
|
87
86
|
processMessage: (x) => processMessage(x.body).pipe(Effect.uninterruptible),
|
|
88
|
-
processError: (err) => Deferred.completeWith(deferred,
|
|
89
|
-
.sync(() => captureException(err.error))
|
|
87
|
+
processError: (err) => Deferred.completeWith(deferred, reportFatalQueueError(Cause.fail(err.error))
|
|
90
88
|
.pipe(Effect.andThen(Effect.fail(err.error))))
|
|
91
89
|
}, sessionId)
|
|
92
90
|
.pipe(Effect.provideService(ServiceBusReceiverFactory, receiver)));
|
|
@@ -120,4 +118,4 @@ export function makeServiceBusQueue(queueName, queueDrainName, schema, drainSche
|
|
|
120
118
|
export function makeServiceBusLayers(url, queueName, queueDrainName) {
|
|
121
119
|
return Layer.merge(ServiceBusReceiverFactory.Live(queueDrainName), LiveSender(queueName)).pipe(Layer.provide(LiveServiceBusClient(url)));
|
|
122
120
|
}
|
|
123
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
121
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2JxdWV1ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9RdWV1ZU1ha2VyL3NicXVldWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUNMLFVBQVUsRUFDVixvQkFBb0IsRUFDcEIsTUFBTSxFQUNOLHlCQUF5QixFQUN6QixTQUFTLEVBQ1YsTUFBTSx1Q0FBdUMsQ0FBQTtBQUM5QyxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0NBQWtDLENBQUE7QUFDakUsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLFFBQVEsQ0FBQTtBQUMvQixPQUFPLEVBQUUsS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsQ0FBQyxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBQzVFLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQTtBQUUxQyxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQTtBQUNyRCxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sa0JBQWtCLENBQUE7QUFDekMsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMkJBQTJCLENBQUE7QUFDL0QsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sK0JBQStCLENBQUE7QUFDdkUsT0FBTyxFQUFFLHFCQUFxQixFQUFFLDJCQUEyQixFQUFFLGdDQUFnQyxFQUFFLE1BQU0sYUFBYSxDQUFBO0FBQ2xILE9BQU8sRUFBa0IsU0FBUyxFQUFFLE1BQU0sY0FBYyxDQUFBO0FBRXhEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLG1CQUFtQixDQU1qQyxTQUFpQixFQUNqQixjQUFzQixFQUN0QixNQUEyQixFQUMzQixXQUEwQztJQUUxQyxNQUFNLFVBQVUsR0FBRyxDQUFDLENBQUMsTUFBTSxDQUFDO1FBQzFCLElBQUksRUFBRSxNQUFNO1FBQ1osSUFBSSxFQUFFLFNBQVM7S0FD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
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect-app/infra",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.3.1",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"dependencies": {
|
|
@@ -18,13 +18,13 @@
|
|
|
18
18
|
"proper-lockfile": "^4.1.2",
|
|
19
19
|
"pure-rand": "6.1.0",
|
|
20
20
|
"redlock": "^4.2.0",
|
|
21
|
-
"@effect-app/
|
|
22
|
-
"effect-app": "1.1.
|
|
23
|
-
"
|
|
24
|
-
"@effect-app/schema": "1.0
|
|
21
|
+
"@effect-app/infra-adapters": "1.1.0",
|
|
22
|
+
"@effect-app/core": "1.1.0",
|
|
23
|
+
"effect-app": "1.2.0",
|
|
24
|
+
"@effect-app/schema": "1.1.0"
|
|
25
25
|
},
|
|
26
26
|
"devDependencies": {
|
|
27
|
-
"@babel/cli": "^7.24.
|
|
27
|
+
"@babel/cli": "^7.24.5",
|
|
28
28
|
"@sentry/node": "^7.112.2",
|
|
29
29
|
"@types/express": "^4.17.21",
|
|
30
30
|
"@types/node": "~20.12.7",
|
|
@@ -42,9 +42,9 @@
|
|
|
42
42
|
},
|
|
43
43
|
"peerDependencies": {
|
|
44
44
|
"express": "^4.19.2",
|
|
45
|
-
"@effect/platform": "^0.
|
|
46
|
-
"@effect/schema": "^0.66.
|
|
47
|
-
"effect": "^3.0
|
|
45
|
+
"@effect/platform": "^0.51.0",
|
|
46
|
+
"@effect/schema": "^0.66.12",
|
|
47
|
+
"effect": "^3.1.0"
|
|
48
48
|
},
|
|
49
49
|
"typesVersions": {
|
|
50
50
|
"*": {
|
|
@@ -6,17 +6,16 @@ import {
|
|
|
6
6
|
ServiceBusReceiverFactory,
|
|
7
7
|
subscribe
|
|
8
8
|
} from "@effect-app/infra-adapters/ServiceBus"
|
|
9
|
-
import { captureException } from "@effect-app/infra/errorReporter"
|
|
10
9
|
import { RequestContext } from "@effect-app/infra/RequestContext"
|
|
11
10
|
import { Tracer } from "effect"
|
|
12
|
-
import { Deferred, Effect, flow, Layer, Option, S } from "effect-app"
|
|
11
|
+
import { Cause, Deferred, Effect, flow, Layer, Option, S } from "effect-app"
|
|
13
12
|
import { RequestId } from "effect-app/ids"
|
|
14
13
|
import type { StringId } from "effect-app/schema"
|
|
15
14
|
import { NonEmptyString255 } from "effect-app/schema"
|
|
16
15
|
import { pretty } from "effect-app/utils"
|
|
17
16
|
import { setupRequestContext } from "../../api/setupRequest.js"
|
|
18
17
|
import { RequestContextContainer } from "../RequestContextContainer.js"
|
|
19
|
-
import { reportNonInterruptedFailure, reportNonInterruptedFailureCause } from "./errors.js"
|
|
18
|
+
import { reportFatalQueueError, reportNonInterruptedFailure, reportNonInterruptedFailureCause } from "./errors.js"
|
|
20
19
|
import { type QueueBase, QueueMeta } from "./service.js"
|
|
21
20
|
|
|
22
21
|
/**
|
|
@@ -139,8 +138,7 @@ export function makeServiceBusQueue<
|
|
|
139
138
|
processError: (err) =>
|
|
140
139
|
Deferred.completeWith(
|
|
141
140
|
deferred,
|
|
142
|
-
|
|
143
|
-
.sync(() => captureException(err.error))
|
|
141
|
+
reportFatalQueueError(Cause.fail(err.error))
|
|
144
142
|
.pipe(Effect.andThen(Effect.fail(err.error)))
|
|
145
143
|
)
|
|
146
144
|
}, sessionId)
|