@balena/open-balena-api 46.0.1 → 46.0.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/dist/features/device-logs/lib/read.d.ts +5 -2
- package/dist/features/device-logs/lib/read.js +9 -2
- package/dist/features/device-logs/lib/read.js.map +1 -1
- package/dist/features/device-logs/lib/store.d.ts +9 -3
- package/dist/features/device-logs/lib/store.js +15 -4
- package/dist/features/device-logs/lib/store.js.map +1 -1
- package/package.json +2 -2
|
@@ -1,3 +1,6 @@
|
|
|
1
|
-
import type { RequestHandler } from 'express';
|
|
2
1
|
import type { SetupOptions } from '../../../index.js';
|
|
3
|
-
export declare const read: (onLogReadStreamInitialized: SetupOptions["onLogReadStreamInitialized"]) => RequestHandler
|
|
2
|
+
export declare const read: (onLogReadStreamInitialized: SetupOptions["onLogReadStreamInitialized"]) => import("express").RequestHandler<import("express-serve-static-core").ParamsDictionary, any, undefined, {
|
|
3
|
+
stream?: string | undefined;
|
|
4
|
+
count?: string | undefined;
|
|
5
|
+
start?: string | undefined;
|
|
6
|
+
}, Record<string, any>>;
|
|
@@ -7,12 +7,19 @@ import { addRetentionLimit, getPrimaryBackend, getSecondaryBackend, shouldReadFr
|
|
|
7
7
|
import { LOGS_DEFAULT_HISTORY_COUNT, LOGS_DEFAULT_HISTORY_LOOKBACK, LOGS_DEFAULT_HISTORY_STREAMING_LOOKBACK, LOGS_DEFAULT_RETENTION_LIMIT, LOGS_DEFAULT_SUBSCRIPTION_COUNT, LOGS_HEARTBEAT_INTERVAL, LOGS_READ_STREAM_FLUSH_INTERVAL, NDJSON_CTYPE, } from '../../../lib/config.js';
|
|
8
8
|
import { DAYS } from '@balena/env-parsing';
|
|
9
9
|
import { checkInt } from '../../../lib/utils.js';
|
|
10
|
+
import { createValidatedRequestHandler, z, } from '../../../infra/validation/index.js';
|
|
10
11
|
const { NotFoundError } = errors;
|
|
11
12
|
const { api } = sbvrUtils;
|
|
12
13
|
const getReadBackend = async () => shouldReadFromSecondary()
|
|
13
14
|
? await getSecondaryBackend()
|
|
14
15
|
: await getPrimaryBackend();
|
|
15
|
-
export const read = (onLogReadStreamInitialized) =>
|
|
16
|
+
export const read = (onLogReadStreamInitialized) => createValidatedRequestHandler({
|
|
17
|
+
query: z.object({
|
|
18
|
+
stream: z.string().optional(),
|
|
19
|
+
count: z.string().optional(),
|
|
20
|
+
start: z.string().optional(),
|
|
21
|
+
}),
|
|
22
|
+
}, async (req, res) => {
|
|
16
23
|
try {
|
|
17
24
|
const ctx = await getReadContext(req);
|
|
18
25
|
const isStreamingRead = req.query.stream === '1';
|
|
@@ -41,7 +48,7 @@ export const read = (onLogReadStreamInitialized) => async (req, res) => {
|
|
|
41
48
|
captureException(err, 'Failed to read device logs');
|
|
42
49
|
res.status(500).end();
|
|
43
50
|
}
|
|
44
|
-
};
|
|
51
|
+
});
|
|
45
52
|
async function handleStreamingRead(ctx, req, res, { count, start }) {
|
|
46
53
|
const backend = await getReadBackend();
|
|
47
54
|
let state = StreamState.Buffering;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read.js","sourceRoot":"","sources":["../../../../src/features/device-logs/lib/read.ts"],"names":[],"mappings":"AACA,OAAO,UAAU,MAAM,aAAa,CAAC;AACrC,OAAO,CAAC,MAAM,QAAQ,CAAC;AACvB,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAEnD,OAAO,EACN,gBAAgB,EAChB,gBAAgB,GAChB,MAAM,wCAAwC,CAAC;AAQhD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EACN,iBAAiB,EACjB,iBAAiB,EACjB,mBAAmB,EACnB,uBAAuB,GACvB,MAAM,aAAa,CAAC;AAErB,OAAO,EACN,0BAA0B,EAC1B,6BAA6B,EAC7B,uCAAuC,EACvC,4BAA4B,EAC5B,+BAA+B,EAC/B,uBAAuB,EACvB,+BAA+B,EAC/B,YAAY,GACZ,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"read.js","sourceRoot":"","sources":["../../../../src/features/device-logs/lib/read.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,10 @@
|
|
|
1
|
-
import type { RequestHandler } from 'express';
|
|
2
1
|
import type { SetupOptions } from '../../../index.js';
|
|
3
|
-
export declare const store: RequestHandler
|
|
4
|
-
|
|
2
|
+
export declare const store: import("express").RequestHandler<import("express-serve-static-core").ParamsDictionary, any, {
|
|
3
|
+
timestamp: number;
|
|
4
|
+
message: string;
|
|
5
|
+
isStdErr?: boolean | undefined;
|
|
6
|
+
isSystem?: boolean | undefined;
|
|
7
|
+
serviceId?: number | undefined;
|
|
8
|
+
uuid?: string | undefined;
|
|
9
|
+
}[], Record<string, never>, Record<string, any>>;
|
|
10
|
+
export declare const storeStream: (onLogWriteStreamInitialized: SetupOptions["onLogWriteStreamInitialized"]) => import("express").RequestHandler<import("express-serve-static-core").ParamsDictionary, any, undefined, Record<string, never>, Record<string, any>>;
|
|
@@ -7,6 +7,7 @@ import { captureException, handleHttpErrors, translateError, } from '../../../in
|
|
|
7
7
|
import { addRetentionLimit, getPrimaryBackend, getSecondaryBackend, LOGS_SECONDARY_BACKEND_ENABLED, shouldPublishToSecondary, } from './config.js';
|
|
8
8
|
import { DEVICE_LOGS_WRITE_AUTH_CACHE_TIMEOUT, LOGS_BACKEND_UNAVAILABLE_FLUSH_INTERVAL, LOGS_PRIMARY_BACKEND, LOGS_STREAM_FLUSH_INTERVAL, LOGS_WRITE_BUFFER_LIMIT, NDJSON_CTYPE, } from '../../../lib/config.js';
|
|
9
9
|
import { multiCacheMemoizee, reqPermissionNormalizer, } from '../../../infra/cache/index.js';
|
|
10
|
+
import { createValidatedRequestHandler, z, } from '../../../infra/validation/index.js';
|
|
10
11
|
const { UnauthorizedError, ServiceUnavailableError, UnsupportedMediaTypeError, } = errors;
|
|
11
12
|
const { api } = sbvrUtils;
|
|
12
13
|
const supervisor = new Supervisor();
|
|
@@ -52,7 +53,17 @@ const getWriteContext = (() => {
|
|
|
52
53
|
return maybeLogContext;
|
|
53
54
|
};
|
|
54
55
|
})();
|
|
55
|
-
export const store =
|
|
56
|
+
export const store = createValidatedRequestHandler({
|
|
57
|
+
body: z.array(z.object({
|
|
58
|
+
timestamp: z.number(),
|
|
59
|
+
message: z.string(),
|
|
60
|
+
isStdErr: z.boolean().optional(),
|
|
61
|
+
isSystem: z.boolean().optional(),
|
|
62
|
+
serviceId: z.number().optional(),
|
|
63
|
+
// This should never actually be sent, but if it is we just ignore the log line instead of throwing an error
|
|
64
|
+
uuid: z.string().optional(),
|
|
65
|
+
})),
|
|
66
|
+
}, async (req, res) => {
|
|
56
67
|
try {
|
|
57
68
|
const body = req.body;
|
|
58
69
|
const logs = supervisor.convertLogs(body);
|
|
@@ -66,8 +77,8 @@ export const store = async (req, res) => {
|
|
|
66
77
|
catch (err) {
|
|
67
78
|
handleStoreErrors(req, res, err);
|
|
68
79
|
}
|
|
69
|
-
};
|
|
70
|
-
export const storeStream = (onLogWriteStreamInitialized) => async (req, res) => {
|
|
80
|
+
});
|
|
81
|
+
export const storeStream = (onLogWriteStreamInitialized) => createValidatedRequestHandler(async (req, res) => {
|
|
71
82
|
try {
|
|
72
83
|
const ctx = await getWriteContext(req);
|
|
73
84
|
handleStreamingWrite(ctx, req, res);
|
|
@@ -76,7 +87,7 @@ export const storeStream = (onLogWriteStreamInitialized) => async (req, res) =>
|
|
|
76
87
|
catch (err) {
|
|
77
88
|
handleStoreErrors(req, res, err);
|
|
78
89
|
}
|
|
79
|
-
};
|
|
90
|
+
});
|
|
80
91
|
function handleStoreErrors(req, res, err) {
|
|
81
92
|
if (!(err instanceof errors.HttpError)) {
|
|
82
93
|
// Log non `HttpError`s regardless of headers state
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"store.js","sourceRoot":"","sources":["../../../../src/features/device-logs/lib/store.ts"],"names":[],"mappings":"AAGA,OAAO,UAAU,MAAM,aAAa,CAAC;AAErC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EACN,gBAAgB,EAChB,gBAAgB,EAChB,cAAc,GACd,MAAM,wCAAwC,CAAC;AAChD,OAAO,EACN,iBAAiB,EACjB,iBAAiB,EACjB,mBAAmB,EACnB,8BAA8B,EAC9B,wBAAwB,GACxB,MAAM,aAAa,CAAC;AAErB,OAAO,EACN,oCAAoC,EACpC,uCAAuC,EACvC,oBAAoB,EACpB,0BAA0B,EAC1B,uBAAuB,EACvB,YAAY,GACZ,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACN,kBAAkB,EAClB,uBAAuB,GACvB,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"store.js","sourceRoot":"","sources":["../../../../src/features/device-logs/lib/store.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@balena/open-balena-api",
|
|
3
3
|
"description": "Internet of things, Made Simple",
|
|
4
|
-
"version": "46.0.
|
|
4
|
+
"version": "46.0.2",
|
|
5
5
|
"license": "AGPL-3.0",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
@@ -185,6 +185,6 @@
|
|
|
185
185
|
"import": "@swc-node/register/esm-register"
|
|
186
186
|
},
|
|
187
187
|
"versionist": {
|
|
188
|
-
"publishedAt": "2026-05-
|
|
188
|
+
"publishedAt": "2026-05-14T20:03:17.831Z"
|
|
189
189
|
}
|
|
190
190
|
}
|