dirtydishes/islandflow
1
0
Fork 0
Code Issues 2 Pull requests 4 Projects Releases Packages Wiki Activity Actions 1

merge main into nextjs upgrade

Browse source
This commit is contained in:
dirtydishes 2026-05-19 14:47:43 -04:00
commit 171cf52518
40 changed files with 2355 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

14
packages/bus/src/jetstream.ts
View file

@ -9,7 +9,9 @@ import {
type StreamUpdateConfig,
JSONCodec,
type JsMsg,
createInbox
createInbox,
nanos,
millis
} from "nats";
import { getKnownStreamDefinitions, getStreamDefinition, type StreamRetentionClass } from "./streams";
@ -164,13 +166,13 @@ export const resolveStreamRetention = (
): Pick<StreamConfig, "max_bytes" | "max_age"> => {
if (streamClass === "raw") {
return {
max_age: parseBoundedNumber(env.STREAM_RAW_MAX_AGE_MS, 3_600_000),
max_age: nanos(parseBoundedNumber(env.STREAM_RAW_MAX_AGE_MS, 3_600_000)),
max_bytes: parseBoundedNumber(env.STREAM_RAW_MAX_BYTES, 536_870_912)
};
}
return {
max_age: parseBoundedNumber(env.STREAM_DERIVED_MAX_AGE_MS, 43_200_000),
max_age: nanos(parseBoundedNumber(env.STREAM_DERIVED_MAX_AGE_MS, 43_200_000)),
max_bytes: parseBoundedNumber(env.STREAM_DERIVED_MAX_BYTES, 268_435_456)
};
};
@ -417,7 +419,7 @@ const formatBytes = (value: number): string => {
};
const formatRetentionSummary = (config: StreamConfig): string => {
return `age=${formatDurationMs(Number(config.max_age))} bytes=${formatBytes(config.max_bytes)} replicas=${config.num_replicas} retention=${config.retention} discard=${config.discard}`;
return `age=${formatDurationMs(millis(Number(config.max_age)))} bytes=${formatBytes(config.max_bytes)} replicas=${config.num_replicas} retention=${config.retention} discard=${config.discard}`;
};
const formatReportLine = (
@ -442,12 +444,12 @@ const formatReportLine = (
const details = report.retentionDrift
.map((delta) => {
const desiredValue = delta.field === "max_age"
? formatDurationMs(Number(delta.desired))
? formatDurationMs(millis(Number(delta.desired)))
: delta.field === "max_bytes"
? formatBytes(Number(delta.desired))
: formatStructuredValue(delta.desired);
const currentValue = delta.field === "max_age"
? formatDurationMs(Number(delta.current))
? formatDurationMs(millis(Number(delta.current)))
: delta.field === "max_bytes"
? formatBytes(Number(delta.current))
: formatStructuredValue(delta.current);

8
packages/bus/tests/jetstream.test.ts
View file

@ -1,5 +1,5 @@
import { describe, expect, it } from "bun:test";
import type { JetStreamManager, StreamConfig } from "nats";
import { nanos, type JetStreamManager, type StreamConfig } from "nats";
import {
auditStreamConfig,
buildKnownStreamConfig,
@ -52,14 +52,14 @@ const buildAllKnownConfigs = (env: Record<string, string | undefined> = {}) => {
describe("jetstream retention defaults", () => {
it("resolves raw defaults to 60m and 512 MiB", () => {
expect(resolveStreamRetention("raw")).toEqual({
max_age: 3_600_000,
max_age: nanos(3_600_000),
max_bytes: 536_870_912
});
});
it("resolves derived defaults to 12h and 256 MiB", () => {
expect(resolveStreamRetention("derived")).toEqual({
max_age: 43_200_000,
max_age: nanos(43_200_000),
max_bytes: 268_435_456
});
});
@ -71,7 +71,7 @@ describe("jetstream retention defaults", () => {
STREAM_RAW_MAX_BYTES: "5678"
})
).toEqual({
max_age: 1234,
max_age: nanos(1234),
max_bytes: 5678
});
});