@effect-app/infra 1.32.0 → 1.32.2
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 +16 -0
- package/_cjs/services/QueueMaker/SQLQueue.cjs +3 -6
- package/_cjs/services/QueueMaker/SQLQueue.cjs.map +1 -1
- package/dist/RequestContext.d.ts.map +1 -1
- package/dist/logger.d.ts.map +1 -1
- package/dist/services/QueueMaker/SQLQueue.d.ts +1 -1
- package/dist/services/QueueMaker/SQLQueue.d.ts.map +1 -1
- package/dist/services/QueueMaker/SQLQueue.js +7 -7
- package/dist/services/Repository/ext.d.ts +3 -3
- package/package.json +5 -5
- package/src/services/QueueMaker/SQLQueue.ts +9 -5
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,21 @@
|
|
|
1
1
|
# @effect-app/infra
|
|
2
2
|
|
|
3
|
+
## 1.32.2
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- bf7d8df: improve: silence sql tracing for drain
|
|
8
|
+
|
|
9
|
+
## 1.32.1
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- Updated dependencies [61eb517]
|
|
14
|
+
- @effect-app/core@1.13.1
|
|
15
|
+
- @effect-app/infra-adapters@1.16.1
|
|
16
|
+
- effect-app@1.24.1
|
|
17
|
+
- @effect-app/schema@1.16.1
|
|
18
|
+
|
|
3
19
|
## 1.32.0
|
|
4
20
|
|
|
5
21
|
### Minor Changes
|
|
@@ -58,13 +58,10 @@ function makeSQLQueue(queueName, queueDrainName, schema, drainSchema) {
|
|
|
58
58
|
versionColumn: "etag"
|
|
59
59
|
});
|
|
60
60
|
const decodeDrain = _effectApp.S.decode(Drain);
|
|
61
|
-
const drain = () =>
|
|
62
|
-
const limit = (0, _dateFns.subMinutes)(new Date(), 15);
|
|
63
|
-
return sql`SELECT *
|
|
61
|
+
const drain = _effectApp.Effect.sync(() => (0, _dateFns.subMinutes)(new Date(), 15)).pipe(_effectApp.Effect.andThen(limit => sql`SELECT *
|
|
64
62
|
FROM queue
|
|
65
63
|
WHERE name = ${queueDrainName} AND finishedAt IS NULL AND (processingAt IS NULL OR processingAt < ${limit.getTime()})
|
|
66
|
-
LIMIT 1
|
|
67
|
-
};
|
|
64
|
+
LIMIT 1`));
|
|
68
65
|
const q = {
|
|
69
66
|
offer: (body, meta) => _effectApp.Effect.gen(function* () {
|
|
70
67
|
yield* queueRepo.insertVoid(Queue.insert.make({
|
|
@@ -78,7 +75,7 @@ function makeSQLQueue(queueName, queueDrainName, schema, drainSchema) {
|
|
|
78
75
|
}),
|
|
79
76
|
take: _effectApp.Effect.gen(function* () {
|
|
80
77
|
while (true) {
|
|
81
|
-
const [first] = yield* drain();
|
|
78
|
+
const [first] = yield* drain.pipe(_effectApp.Effect.withTracerEnabled(false)); // disable sql tracer otherwise we spam it..
|
|
82
79
|
if (first) {
|
|
83
80
|
const dec = yield* decodeDrain(first);
|
|
84
81
|
const {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SQLQueue.cjs","names":["_SQL","require","_setupRequest","_RequestContext","_errors","_service","_RequestContextContainer","_sql","_crypto","_dateFns","_effectApp","_ids","_schema","_utils","_logger","QueueId","exports","S","Number","pipe","brand","makeSQLQueue","queueName","queueDrainName","schema","drainSchema","Effect","gen","base","id","Model","Generated","meta","JsonFromString","QueueMeta","name","NonEmptyString255","createdAt","DateTimeInsert","updatedAt","DateTimeUpdate","processingAt","FieldOption","Date","finishedAt","etag","String","Queue","Class","body","Drain","sql","SqlClient","queueRepo","makeRepository","tableName","spanPrefix","idColumn","versionColumn","drainRepo","decodeDrain","decode","drain","
|
|
1
|
+
{"version":3,"file":"SQLQueue.cjs","names":["_SQL","require","_setupRequest","_RequestContext","_errors","_service","_RequestContextContainer","_sql","_crypto","_dateFns","_effectApp","_ids","_schema","_utils","_logger","QueueId","exports","S","Number","pipe","brand","makeSQLQueue","queueName","queueDrainName","schema","drainSchema","Effect","gen","base","id","Model","Generated","meta","JsonFromString","QueueMeta","name","NonEmptyString255","createdAt","DateTimeInsert","updatedAt","DateTimeUpdate","processingAt","FieldOption","Date","finishedAt","etag","String","Queue","Class","body","Drain","sql","SqlClient","queueRepo","makeRepository","tableName","spanPrefix","idColumn","versionColumn","drainRepo","decodeDrain","decode","drain","sync","subMinutes","andThen","limit","getTime","q","offer","insertVoid","insert","make","Option","none","randomUUID","take","first","withTracerEnabled","dec","rest","update","some","sleep","finish","updateVoid","rcc","RequestContextContainer","publish","messages","requestContext","span","serviceOption","Tracer","ParentSpan","forEach","m","RequestContext","getOrUndefined","discard","withSpan","captureStackTrace","kind","attributes","map","_","_tag","handleEvent","sessionId","silenceAndReportError","reportNonInterruptedFailure","processMessage","msg","succeed","flatMap","effect","InfraLogger","logInfo","annotateLogs","pretty","zipRight","setupRequestContext","inherit","RequestId","locale","withParentSpan","externalSpan","x","uninterruptible","fork","Fiber","join","tap","forever"],"sources":["../../../src/services/QueueMaker/SQLQueue.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RequestContext.d.ts","sourceRoot":"","sources":["../src/RequestContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAC3E,OAAO,EAAE,CAAC,EAAE,MAAM,YAAY,CAAA;AAG9B,eAAO,MAAM,MAAM,yBAAwB,CAAA;AAC3C,MAAM,MAAM,MAAM,GAAG,OAAO,MAAM,CAAC,IAAI,CAAA;;;;;;
|
|
1
|
+
{"version":3,"file":"RequestContext.d.ts","sourceRoot":"","sources":["../src/RequestContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAC3E,OAAO,EAAE,CAAC,EAAE,MAAM,YAAY,CAAA;AAG9B,eAAO,MAAM,MAAM,yBAAwB,CAAA;AAC3C,MAAM,MAAM,MAAM,GAAG,OAAO,MAAM,CAAC,IAAI,CAAA;;;;;;uBAW5B,iBAAiB,iBAIzB,sBAAqB;;;uBAKV,iBACL,iBACP,sBAAsB;;;;;;2BAaN,iBAAiB;;;2BAcG,iBAAiB;;;;;;;;;;;;;;AA9CvD,qBAAa,oBAAqB,SAAQ,yBASxC;CAAG;;;;;;;uBADM,iBAAiB,iBAIzB,sBAAqB;;;uBAKV,iBACL,iBACP,sBAAsB;;;;;;;;;;;2BAaN,iBAAiB;;;2BAcG,iBAAiB;;;;;;;;;;;;;;;;AAnCvD;;;GAGG;AACH,qBAAa,cAAe,SAAQ,mBAgBlC;IAEA,MAAM,CAAC,OAAO,CACZ,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,qBAAqB,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC,CAAC;IAUhE,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc;;;;;;CASrD;AAED,eAAO,MAAM,cAAc,QAAS,cAAc;;;;;;;;;CAkBhD,CAAA;AAKF,yBAAiB,oBAAoB,CAAC;IACpC,UAAiB,IAAK,SAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,oBAAoB,CAAC,QAAQ,CAAC,CAAC;KAAG;CACzF;AACD,yBAAiB,cAAc,CAAC;IAC9B,UAAiB,IAAK,SAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,cAAc,CAAC,QAAQ,CAAC,CAAC;KAAG;CACnF"}
|
package/dist/logger.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,WAAW;
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,WAAW;iBACoH,GAAG;eAAkF,GAAG;eAAkF,GAAG;cAAiF,GAAG;eAAkF,GAAG;CADna,CAAA"}
|
|
@@ -15,5 +15,5 @@ export declare function makeSQLQueue<Evt extends {
|
|
|
15
15
|
}, EvtE, DrainEvtE>(queueName: NonEmptyString255, queueDrainName: NonEmptyString255, schema: S.Schema<Evt, EvtE>, drainSchema: S.Schema<DrainEvt, DrainEvtE>): Effect.Effect<{
|
|
16
16
|
publish: (messages_0: Evt, ...messages: Evt[]) => Effect.Effect<void, never, never>;
|
|
17
17
|
drain: <DrainE, DrainR>(handleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR>, sessionId?: string) => Effect.Effect<never, never, RequestContextContainer | import("../Store/ContextMapContainer.js").ContextMapContainer | Exclude<Exclude<Exclude<Exclude<DrainR, Tracer.ParentSpan>, never>, Tracer.ParentSpan>, Tracer.ParentSpan>>;
|
|
18
|
-
}, never, SqlClient.SqlClient
|
|
18
|
+
}, never, RequestContextContainer | SqlClient.SqlClient>;
|
|
19
19
|
//# sourceMappingURL=SQLQueue.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SQLQueue.d.ts","sourceRoot":"","sources":["../../../src/services/QueueMaker/SQLQueue.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,uBAAuB,EAAE,MAAM,oDAAoD,CAAA;AAC5F,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAGvC,OAAO,EAAE,MAAM,EAAiB,CAAC,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAE7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAIrD,eAAO,MAAM,OAAO;;aAAoC,CAAA;AACxD,MAAM,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,IAAI,CAAA;AAGzC,wBAAgB,YAAY,CAC1B,GAAG,SAAS;IAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC5C,QAAQ,SAAS;IAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EACjD,IAAI,EACJ,SAAS,EAET,SAAS,EAAE,iBAAiB,EAC5B,cAAc,EAAE,iBAAiB,EACjC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,EAC3B,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC;;
|
|
1
|
+
{"version":3,"file":"SQLQueue.d.ts","sourceRoot":"","sources":["../../../src/services/QueueMaker/SQLQueue.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,uBAAuB,EAAE,MAAM,oDAAoD,CAAA;AAC5F,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAGvC,OAAO,EAAE,MAAM,EAAiB,CAAC,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAE7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAIrD,eAAO,MAAM,OAAO;;aAAoC,CAAA;AACxD,MAAM,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,IAAI,CAAA;AAGzC,wBAAgB,YAAY,CAC1B,GAAG,SAAS;IAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC5C,QAAQ,SAAS;IAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EACjD,IAAI,EACJ,SAAS,EAET,SAAS,EAAE,iBAAiB,EAC5B,cAAc,EAAE,iBAAiB,EACjC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,EAC3B,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC;;YAiH9B,MAAM,EAAE,MAAM,eACP,CAAC,EAAE,EAAE,QAAQ,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,cAC/C,MAAM;yDAiEzB"}
|
|
@@ -53,13 +53,13 @@ export function makeSQLQueue(queueName, queueDrainName, schema, drainSchema) {
|
|
|
53
53
|
versionColumn: "etag"
|
|
54
54
|
});
|
|
55
55
|
const decodeDrain = S.decode(Drain);
|
|
56
|
-
const drain =
|
|
57
|
-
|
|
58
|
-
|
|
56
|
+
const drain = Effect
|
|
57
|
+
.sync(() => subMinutes(new Date(), 15))
|
|
58
|
+
.pipe(Effect
|
|
59
|
+
.andThen((limit) => sql `SELECT *
|
|
59
60
|
FROM queue
|
|
60
61
|
WHERE name = ${queueDrainName} AND finishedAt IS NULL AND (processingAt IS NULL OR processingAt < ${limit.getTime()})
|
|
61
|
-
LIMIT 1
|
|
62
|
-
};
|
|
62
|
+
LIMIT 1`));
|
|
63
63
|
const q = {
|
|
64
64
|
offer: (body, meta) => Effect.gen(function* () {
|
|
65
65
|
yield* queueRepo.insertVoid(Queue.insert.make({
|
|
@@ -73,7 +73,7 @@ export function makeSQLQueue(queueName, queueDrainName, schema, drainSchema) {
|
|
|
73
73
|
}),
|
|
74
74
|
take: Effect.gen(function* () {
|
|
75
75
|
while (true) {
|
|
76
|
-
const [first] = yield* drain();
|
|
76
|
+
const [first] = yield* drain.pipe(Effect.withTracerEnabled(false)); // disable sql tracer otherwise we spam it..
|
|
77
77
|
if (first) {
|
|
78
78
|
const dec = yield* decodeDrain(first);
|
|
79
79
|
const { createdAt, updatedAt, ...rest } = dec;
|
|
@@ -146,4 +146,4 @@ export function makeSQLQueue(queueName, queueDrainName, schema, drainSchema) {
|
|
|
146
146
|
};
|
|
147
147
|
});
|
|
148
148
|
}
|
|
149
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
149
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SQLQueue.js","sourceRoot":"","sources":["../../../src/services/QueueMaker/SQLQueue.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,7 +39,7 @@ export declare function handleByIdAndSaveWithPure<T extends {
|
|
|
39
39
|
id: string;
|
|
40
40
|
}, Evt, ItemType extends string>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>): <Req extends {
|
|
41
41
|
id: T["id"];
|
|
42
|
-
}, Context, R, A, E, S2 extends T>(pure: (req: Req, ctx: Context) => Effect<A, E, FixEnv<R, Evt, T, S2>>) => (req: Req, ctx: Context) => Effect.Effect<A, import("effect-app/client/errors").OptimisticConcurrencyException |
|
|
42
|
+
}, Context, R, A, E, S2 extends T>(pure: (req: Req, ctx: Context) => Effect<A, E, FixEnv<R, Evt, T, S2>>) => (req: Req, ctx: Context) => Effect.Effect<A, import("effect-app/client/errors").OptimisticConcurrencyException | import("effect-app/client/errors").InvalidStateError | E | NotFoundError<ItemType>, Exclude<R, {
|
|
43
43
|
env: import("effect-app/Pure").PureEnv<Evt, T, S2>;
|
|
44
44
|
}>>;
|
|
45
45
|
/**
|
|
@@ -49,7 +49,7 @@ export declare function saveManyWithPure_<R, T extends {
|
|
|
49
49
|
id: unknown;
|
|
50
50
|
}, Encoded extends {
|
|
51
51
|
id: string;
|
|
52
|
-
}, A, E, Evt, S1 extends T, S2 extends T, ItemType extends string>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>, items: Iterable<S1>, pure: Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>): Effect.Effect<A, import("effect-app/client/errors").OptimisticConcurrencyException |
|
|
52
|
+
}, A, E, Evt, S1 extends T, S2 extends T, ItemType extends string>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>, items: Iterable<S1>, pure: Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>): Effect.Effect<A, import("effect-app/client/errors").OptimisticConcurrencyException | import("effect-app/client/errors").InvalidStateError | E, Exclude<R, {
|
|
53
53
|
env: import("effect-app/Pure").PureEnv<Evt, readonly S1[], readonly S2[]>;
|
|
54
54
|
}>>;
|
|
55
55
|
/**
|
|
@@ -66,7 +66,7 @@ export declare function saveAllWithEffectInt<T extends {
|
|
|
66
66
|
id: unknown;
|
|
67
67
|
}, Encoded extends {
|
|
68
68
|
id: string;
|
|
69
|
-
}, P extends T, Evt, ItemType extends string, R, E, A>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>, gen: Effect<readonly [Iterable<P>, Iterable<Evt>, A], E, R>): Effect.Effect<A, import("effect-app/client/errors").OptimisticConcurrencyException |
|
|
69
|
+
}, P extends T, Evt, ItemType extends string, R, E, A>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>, gen: Effect<readonly [Iterable<P>, Iterable<Evt>, A], E, R>): Effect.Effect<A, import("effect-app/client/errors").OptimisticConcurrencyException | import("effect-app/client/errors").InvalidStateError | E, R>;
|
|
70
70
|
/**
|
|
71
71
|
* @tsplus fluent Repository saveManyWithPureBatched
|
|
72
72
|
*/
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect-app/infra",
|
|
3
|
-
"version": "1.32.
|
|
3
|
+
"version": "1.32.2",
|
|
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.1.0",
|
|
22
22
|
"redlock": "^4.2.0",
|
|
23
|
-
"@effect-app/
|
|
24
|
-
"@effect-app/
|
|
25
|
-
"@effect-app/schema": "1.16.
|
|
26
|
-
"effect-app": "1.24.
|
|
23
|
+
"@effect-app/infra-adapters": "1.16.1",
|
|
24
|
+
"@effect-app/core": "1.13.1",
|
|
25
|
+
"@effect-app/schema": "1.16.1",
|
|
26
|
+
"effect-app": "1.24.1"
|
|
27
27
|
},
|
|
28
28
|
"devDependencies": {
|
|
29
29
|
"@babel/cli": "^7.25.7",
|
|
@@ -69,13 +69,17 @@ export function makeSQLQueue<
|
|
|
69
69
|
|
|
70
70
|
const decodeDrain = S.decode(Drain)
|
|
71
71
|
|
|
72
|
-
const drain =
|
|
73
|
-
|
|
74
|
-
|
|
72
|
+
const drain = Effect
|
|
73
|
+
.sync(() => subMinutes(new Date(), 15))
|
|
74
|
+
.pipe(
|
|
75
|
+
Effect
|
|
76
|
+
.andThen((limit) =>
|
|
77
|
+
sql<typeof Drain.Encoded>`SELECT *
|
|
75
78
|
FROM queue
|
|
76
79
|
WHERE name = ${queueDrainName} AND finishedAt IS NULL AND (processingAt IS NULL OR processingAt < ${limit.getTime()})
|
|
77
80
|
LIMIT 1`
|
|
78
|
-
|
|
81
|
+
)
|
|
82
|
+
)
|
|
79
83
|
|
|
80
84
|
const q = {
|
|
81
85
|
offer: (body: Evt, meta: typeof QueueMeta.Type) =>
|
|
@@ -93,7 +97,7 @@ export function makeSQLQueue<
|
|
|
93
97
|
}),
|
|
94
98
|
take: Effect.gen(function*() {
|
|
95
99
|
while (true) {
|
|
96
|
-
const [first] = yield* drain()
|
|
100
|
+
const [first] = yield* drain.pipe(Effect.withTracerEnabled(false)) // disable sql tracer otherwise we spam it..
|
|
97
101
|
if (first) {
|
|
98
102
|
const dec = yield* decodeDrain(first)
|
|
99
103
|
const { createdAt, updatedAt, ...rest } = dec
|