@balena/open-balena-api 34.3.3-build-logs-validate-ingest-1cf5166ab9e4d2fb520f6854327d2f8c4c62575d-1 → 34.3.4-build-logs-limit-history-count-d8f05daee5681be8194bc3f4f2c446b27733ea49-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/dist/features/device-logs/lib/backends/loki.d.ts +1 -0
- package/dist/features/device-logs/lib/backends/loki.js +19 -0
- package/dist/features/device-logs/lib/backends/loki.js.map +1 -1
- package/dist/features/device-logs/lib/read.js +13 -9
- package/dist/features/device-logs/lib/read.js.map +1 -1
- package/dist/features/device-logs/lib/store.js +1 -7
- package/dist/features/device-logs/lib/store.js.map +1 -1
- package/dist/features/device-logs/lib/supervisor.d.ts +1 -3
- package/dist/features/device-logs/lib/supervisor.js +2 -14
- package/dist/features/device-logs/lib/supervisor.js.map +1 -1
- package/package.json +3 -3
|
@@ -26,6 +26,7 @@ export declare class LokiBackend implements DeviceLogsBackend {
|
|
|
26
26
|
private getKey;
|
|
27
27
|
private getStructuredMetadata;
|
|
28
28
|
private getLabels;
|
|
29
|
+
private validateLog;
|
|
29
30
|
private fromStreamToDeviceLogs;
|
|
30
31
|
private fromDeviceLogsToEntries;
|
|
31
32
|
private fromLogEntriesToStream;
|
|
@@ -247,6 +247,24 @@ export class LokiBackend {
|
|
|
247
247
|
getLabels(ctx) {
|
|
248
248
|
return `{fleet_id="${ctx.appId}"}`;
|
|
249
249
|
}
|
|
250
|
+
validateLog(log) {
|
|
251
|
+
if (typeof log.message !== 'string') {
|
|
252
|
+
throw new BadRequestError('DeviceLog message must be string');
|
|
253
|
+
}
|
|
254
|
+
else if (typeof log.timestamp !== 'number') {
|
|
255
|
+
throw new BadRequestError('DeviceLog timestamp must be number');
|
|
256
|
+
}
|
|
257
|
+
else if (typeof log.isSystem !== 'boolean') {
|
|
258
|
+
throw new BadRequestError('DeviceLog isSystem must be boolean');
|
|
259
|
+
}
|
|
260
|
+
else if (typeof log.isStdErr !== 'boolean') {
|
|
261
|
+
throw new BadRequestError('DeviceLog isStdErr must be boolean');
|
|
262
|
+
}
|
|
263
|
+
else if (typeof log.serviceId !== 'number' &&
|
|
264
|
+
log.serviceId !== undefined) {
|
|
265
|
+
throw new BadRequestError('DeviceLog serviceId must be number or undefined');
|
|
266
|
+
}
|
|
267
|
+
}
|
|
250
268
|
fromStreamToDeviceLogs(stream) {
|
|
251
269
|
try {
|
|
252
270
|
return stream.getEntriesList().map((entry) => {
|
|
@@ -269,6 +287,7 @@ export class LokiBackend {
|
|
|
269
287
|
}
|
|
270
288
|
fromDeviceLogsToEntries(ctx, logs) {
|
|
271
289
|
return logs.map((log) => {
|
|
290
|
+
this.validateLog(log);
|
|
272
291
|
const timestamp = new loki.Timestamp();
|
|
273
292
|
timestamp.setSeconds(Math.floor(Number(log.nanoTimestamp / 1000000000n)));
|
|
274
293
|
timestamp.setNanos(Number(log.nanoTimestamp % 1000000000n));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loki.js","sourceRoot":"","sources":["../../../../../src/features/device-logs/lib/backends/loki.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"loki.js","sourceRoot":"","sources":["../../../../../src/features/device-logs/lib/backends/loki.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ import { captureException, handleHttpErrors, } from '../../../infra/error-handli
|
|
|
5
5
|
import { StreamState } from './struct.js';
|
|
6
6
|
import { addRetentionLimit, getPrimaryBackend, getSecondaryBackend, omitNanoTimestamp, shouldReadFromSecondary, } from './config.js';
|
|
7
7
|
import { getNanoTimestamp } from '../../../lib/utils.js';
|
|
8
|
-
import { LOGS_DEFAULT_HISTORY_COUNT, LOGS_DEFAULT_SUBSCRIPTION_COUNT, LOGS_HEARTBEAT_INTERVAL, LOGS_READ_STREAM_FLUSH_INTERVAL, NDJSON_CTYPE, } from '../../../lib/config.js';
|
|
8
|
+
import { LOGS_DEFAULT_HISTORY_COUNT, LOGS_DEFAULT_RETENTION_LIMIT, LOGS_DEFAULT_SUBSCRIPTION_COUNT, LOGS_HEARTBEAT_INTERVAL, LOGS_READ_STREAM_FLUSH_INTERVAL, NDJSON_CTYPE, } from '../../../lib/config.js';
|
|
9
9
|
const { NotFoundError } = errors;
|
|
10
10
|
const { api } = sbvrUtils;
|
|
11
11
|
const getReadBackend = async () => shouldReadFromSecondary()
|
|
@@ -139,19 +139,23 @@ async function handleStreamingRead(ctx, req, res) {
|
|
|
139
139
|
}
|
|
140
140
|
}
|
|
141
141
|
function getCount(countParam, defaultCount) {
|
|
142
|
+
let count;
|
|
142
143
|
if (countParam == null) {
|
|
143
|
-
|
|
144
|
+
count = defaultCount;
|
|
144
145
|
}
|
|
145
|
-
if (countParam === 'all') {
|
|
146
|
-
|
|
147
|
-
}
|
|
148
|
-
const parsedCount = parseInt(countParam, 10);
|
|
149
|
-
if (!Number.isNaN(parsedCount)) {
|
|
150
|
-
return parsedCount;
|
|
146
|
+
else if (countParam === 'all') {
|
|
147
|
+
count = Infinity;
|
|
151
148
|
}
|
|
152
149
|
else {
|
|
153
|
-
|
|
150
|
+
const parsedCount = parseInt(countParam, 10);
|
|
151
|
+
if (!Number.isNaN(parsedCount)) {
|
|
152
|
+
count = parsedCount;
|
|
153
|
+
}
|
|
154
|
+
else {
|
|
155
|
+
count = defaultCount;
|
|
156
|
+
}
|
|
154
157
|
}
|
|
158
|
+
return Math.min(count, LOGS_DEFAULT_RETENTION_LIMIT);
|
|
155
159
|
}
|
|
156
160
|
function getHistory(backend, ctx, { query }, defaultCount) {
|
|
157
161
|
const count = getCount(query.count, defaultCount);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read.js","sourceRoot":"","sources":["../../../../src/features/device-logs/lib/read.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"read.js","sourceRoot":"","sources":["../../../../src/features/device-logs/lib/read.ts"],"names":[],"mappings":"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"}
|
|
@@ -123,13 +123,7 @@ function handleStreamingWrite(ctx, req, res) {
|
|
|
123
123
|
}
|
|
124
124
|
}
|
|
125
125
|
parser.on('error', close).on('data', (sLog) => {
|
|
126
|
-
|
|
127
|
-
try {
|
|
128
|
-
log = supervisor.convertLog(sLog);
|
|
129
|
-
}
|
|
130
|
-
catch {
|
|
131
|
-
return;
|
|
132
|
-
}
|
|
126
|
+
const log = supervisor.convertLog(sLog);
|
|
133
127
|
if (!log) {
|
|
134
128
|
return;
|
|
135
129
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"store.js","sourceRoot":"","sources":["../../../../src/features/device-logs/lib/store.ts"],"names":[],"mappings":"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
|
|
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;AAEvC,MAAM,EACL,iBAAiB,EACjB,uBAAuB,EACvB,yBAAyB,GACzB,GAAG,MAAM,CAAC;AACX,MAAM,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;AAE1B,MAAM,UAAU,GAAG,IAAI,UAAU,EAAE,CAAC;AAEpC,MAAM,eAAe,GAAG,CAAC,GAAG,EAAE;IAC7B,MAAM,gBAAgB,GAAG,kBAAkB,CAC1C,KAAK,EACJ,IAAY,EACZ,GAA8B,EACA,EAAE;QAChC,IAAI,CAAC;YACJ,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;gBAC9D,OAAO,MAAM,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC;oBAC9B,MAAM,EAAE,MAAM;oBACd,sFAAsF;oBACtF,GAAG,EAAE,uCAAuC,IAAI,GAAG;oBACnD,WAAW,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE;oBACxB,IAAI,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE;iBAC7B,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC;YACH,MAAM,QAAQ,GAAuB,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;YACxD,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;gBACtB,OAAO,KAAK,CAAC;YACd,CAAC;YACD,OAAO,iBAAiB,CAAC;gBACxB,EAAE,EAAE,QAAQ;gBACZ,IAAI;aACJ,CAAC,CAAC;QACJ,CAAC;QAAC,MAAM,CAAC;YACR,OAAO,KAAK,CAAC;QACd,CAAC;IACF,CAAC,EACD;QACC,QAAQ,EAAE,2BAA2B;QACrC,OAAO,EAAE,IAAI;QACb,SAAS,EAAE,IAAI;QACf,MAAM,EAAE,oCAAoC;QAC5C,UAAU,EAAE,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE;YAC3B,OAAO,GAAG,IAAI,IAAI,uBAAuB,CAAC,GAAG,CAAC,EAAE,CAAC;QAClD,CAAC;KACD,EACD,EAAE,UAAU,EAAE,KAAK,EAAE,CACrB,CAAC;IACF,OAAO,KAAK,EAAE,GAAY,EAAuB,EAAE;QAClD,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAC5B,MAAM,eAAe,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAC1D,IAAI,eAAe,KAAK,KAAK,EAAE,CAAC;YAC/B,MAAM,IAAI,iBAAiB,EAAE,CAAC;QAC/B,CAAC;QACD,OAAO,eAAe,CAAC;IACxB,CAAC,CAAC;AACH,CAAC,CAAC,EAAE,CAAC;AAEL,MAAM,CAAC,MAAM,KAAK,GAAmB,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;IAC1E,IAAI,CAAC;QACJ,MAAM,IAAI,GAAoB,GAAG,CAAC,IAAI,CAAC;QACvC,MAAM,IAAI,GAAgB,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACvD,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,MAAM,GAAG,GAAG,MAAM,eAAe,CAAC,GAAG,CAAC,CAAC;YACvC,oCAAoC;YACpC,MAAM,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACjC,CAAC;QACD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;IACvB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACd,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAClC,CAAC;AACF,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GACvB,CACC,2BAAwE,EACvD,EAAE,CACpB,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;IACrC,IAAI,CAAC;QACJ,MAAM,GAAG,GAAG,MAAM,eAAe,CAAC,GAAG,CAAC,CAAC;QACvC,oBAAoB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QACpC,2BAA2B,EAAE,CAAC,GAAG,CAAC,CAAC;IACpC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACd,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAClC,CAAC;AACF,CAAC,CAAC;AAEH,SAAS,iBAAiB,CAAC,GAAY,EAAE,GAAa,EAAE,GAAU;IACjE,IAAI,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC;QACrC,OAAO;IACR,CAAC;IACD,gBAAgB,CAAC,GAAG,EAAE,6BAA6B,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;IAC9D,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;AACvB,CAAC;AAED,MAAM,cAAc,GAAG,MAAM,iBAAiB,EAAE,CAAC;AACjD,MAAM,gBAAgB,GAAG,8BAA8B;IACtD,CAAC,CAAC,MAAM,mBAAmB,EAAE;IAC7B,CAAC,CAAC,SAAS,CAAC;AAEb,MAAM,cAAc,GAAG,KAAK,EAAE,GAAe,EAAE,MAAmB,EAAE,EAAE;IACrE,MAAM,qBAAqB,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAClE,MAAM,uBAAuB,GAAG,wBAAwB,EAAE;QACzD,CAAC,CAAC,gBAAgB,EAAE,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACrD,gBAAgB,CACf,GAAG,EACH,6BAA6B,oBAAoB,KAAK,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,EAAE,CACjF,CAAC;QACH,CAAC,CAAC;QACH,CAAC,CAAC,SAAS,CAAC;IACb,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,qBAAqB,EAAE,uBAAuB,CAAC,CAAC,CAAC;AACrE,CAAC,CAAC;AAEF,SAAS,oBAAoB,CAC5B,GAAe,EACf,GAAY,EACZ,GAAa;IAEb,2EAA2E;IAC3E,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,CAAC;QAC/B,MAAM,IAAI,uBAAuB,CAAC,iCAAiC,CAAC,CAAC;IACtE,CAAC;IACD,IAAI,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,KAAK,YAAY,EAAE,CAAC;QAC9C,MAAM,IAAI,yBAAyB,CAClC,2CAA2C,YAAY,EAAE,CACzD,CAAC;IACH,CAAC;IAED,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,uBAAuB,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC;IAC3E,MAAM,MAAM,GAAgB,EAAE,CAAC;IAC/B,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC;IAE9B,SAAS,KAAK,CAAC,GAAkB;QAChC,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;YACtB,2CAA2C;YAC3C,IAAI,GAAG,EAAE,CAAC;gBACT,IAAI,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC;oBACrC,OAAO;gBACR,CAAC;gBACD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;YAC3C,CAAC;iBAAM,CAAC;gBACP,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;YACvB,CAAC;QACF,CAAC;IACF,CAAC;IAED,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAmB,EAAE,EAAE;QAC5D,MAAM,GAAG,GAAG,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACxC,IAAI,CAAC,GAAG,EAAE,CAAC;YACV,OAAO;QACR,CAAC;QACD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,QAAQ,EAAE,CAAC;QACZ,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjB,6EAA6E;QAC7E,IAAI,MAAM,CAAC,MAAM,IAAI,WAAW,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,CAAC;YAC/D,GAAG,CAAC,KAAK,EAAE,CAAC;QACb,CAAC;IACF,CAAC,CAAC,CAAC;IAEH,UAAU,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACvB,UAAU,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAEvB,iCAAiC;IACjC,IAAI,GAAG,CAAC,GAAG,CAAC,kBAAkB,CAAC,KAAK,MAAM,EAAE,CAAC;QAC5C,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1D,CAAC;SAAM,CAAC;QACP,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAClB,CAAC;IAED,IAAI,gBAAgB,GAAG,KAAK,CAAC;IAE7B,KAAK,UAAU,UAAU;QACxB,IAAI,CAAC;YACJ,yDAAyD;YACzD,IAAI,MAAM,CAAC,MAAM,IAAI,cAAc,CAAC,SAAS,EAAE,CAAC;gBAC/C,IAAI,MAAM,CAAC,MAAM,GAAG,WAAW,EAAE,CAAC;oBACjC,4GAA4G;oBAC5G,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,GAAG,WAAW,CAAC;oBAChD,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,WAAW,EAAE;wBAC7B,aAAa,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,aAAa;wBACtC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS;wBAC9B,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS;wBAC9B,QAAQ,EAAE,IAAI;wBACd,QAAQ,EAAE,IAAI;wBACd,OAAO,EAAE,uBAAuB,WAAW,kCAAkC;qBAC7E,CAAC,CAAC;gBACJ,CAAC;gBACD,4DAA4D;gBAC5D,MAAM,cAAc,GAAG,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;gBACnD,mBAAmB;gBACnB,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;gBAClB,gDAAgD;gBAChD,IAAI,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC;oBACpB,GAAG,CAAC,MAAM,EAAE,CAAC;gBACd,CAAC;gBACD,kCAAkC;gBAClC,MAAM,cAAc,CAAC;YACtB,CAAC;YACD,gBAAgB,GAAG,KAAK,CAAC;YAEzB,wEAAwE;YACxE,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACvB,QAAQ,EAAE,CAAC;YACZ,CAAC;QACF,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACd,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAClC,CAAC;IACF,CAAC;IACD,SAAS,QAAQ;QAChB,IAAI,gBAAgB,KAAK,KAAK,EAAE,CAAC;YAChC,OAAO;QACR,CAAC;QACD,8DAA8D;QAC9D,MAAM,KAAK,GAAG,cAAc,CAAC,SAAS;YACrC,CAAC,CAAC,0BAA0B;YAC5B,CAAC,CAAC,uCAAuC,CAAC;QAC3C,UAAU,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAC9B,gBAAgB,GAAG,IAAI,CAAC;IACzB,CAAC;AACF,CAAC"}
|
|
@@ -2,8 +2,6 @@ import type { DeviceLog, SupervisorLog } from './struct.js';
|
|
|
2
2
|
export declare class Supervisor {
|
|
3
3
|
convertLogs(logs: SupervisorLog[]): DeviceLog[];
|
|
4
4
|
private convertAnyLog;
|
|
5
|
-
convertLog(log:
|
|
6
|
-
[key in keyof SupervisorLog]: unknown;
|
|
7
|
-
}): DeviceLog | undefined;
|
|
5
|
+
convertLog(log: SupervisorLog): DeviceLog | undefined;
|
|
8
6
|
private isOldLog;
|
|
9
7
|
}
|
|
@@ -26,27 +26,15 @@ export class Supervisor {
|
|
|
26
26
|
if (log.uuid) {
|
|
27
27
|
return;
|
|
28
28
|
}
|
|
29
|
-
|
|
30
|
-
throw new errors.BadRequestError('DeviceLog message must be string');
|
|
31
|
-
}
|
|
32
|
-
if (typeof log.timestamp !== 'number') {
|
|
33
|
-
throw new errors.BadRequestError('DeviceLog timestamp must be number');
|
|
34
|
-
}
|
|
35
|
-
const validatedLog = {
|
|
29
|
+
return {
|
|
36
30
|
nanoTimestamp: getNanoTimestamp(),
|
|
37
31
|
createdAt: Date.now(),
|
|
38
32
|
timestamp: log.timestamp,
|
|
39
33
|
isSystem: log.isSystem === true,
|
|
40
34
|
isStdErr: log.isStdErr === true,
|
|
41
35
|
message: log.message,
|
|
36
|
+
serviceId: log.serviceId,
|
|
42
37
|
};
|
|
43
|
-
if ('serviceId' in log) {
|
|
44
|
-
if (typeof log.serviceId !== 'number') {
|
|
45
|
-
throw new errors.BadRequestError('DeviceLog serviceId must be number or undefined');
|
|
46
|
-
}
|
|
47
|
-
validatedLog.serviceId = log.serviceId;
|
|
48
|
-
}
|
|
49
|
-
return validatedLog;
|
|
50
38
|
}
|
|
51
39
|
isOldLog(log) {
|
|
52
40
|
const old = log;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"supervisor.js","sourceRoot":"","sources":["../../../../src/features/device-logs/lib/supervisor.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,QAAQ,CAAC;AAEvB,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAGxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,MAAM,kBAAkB,GAAG,EAAE,CAAC;AAE9B,MAAM,OAAO,UAAU;IACf,WAAW,CAAC,IAAqB;QACvC,IAAI,IAAI,CAAC,MAAM,GAAG,kBAAkB,EAAE,CAAC;YACtC,MAAM,IAAI,MAAM,CAAC,eAAe,CAC/B,oCAAoC,kBAAkB,OAAO,CAC7D,CAAC;QACH,CAAC;QACD,OAAO,CAAC,CAAC,IAAI,CAAC;aACZ,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACZ,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QAChC,CAAC,CAAC;aACD,OAAO,EAAE;aACT,KAAK,EAAE,CAAC;IACX,CAAC;IAEO,aAAa,CAAC,GAAkB;QACvC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACxB,qDAAqD;YACrD,MAAM,IAAI,MAAM,CAAC,eAAe,EAAE,CAAC;QACpC,CAAC;QACD,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IAEM,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"supervisor.js","sourceRoot":"","sources":["../../../../src/features/device-logs/lib/supervisor.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,QAAQ,CAAC;AAEvB,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAGxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,MAAM,kBAAkB,GAAG,EAAE,CAAC;AAE9B,MAAM,OAAO,UAAU;IACf,WAAW,CAAC,IAAqB;QACvC,IAAI,IAAI,CAAC,MAAM,GAAG,kBAAkB,EAAE,CAAC;YACtC,MAAM,IAAI,MAAM,CAAC,eAAe,CAC/B,oCAAoC,kBAAkB,OAAO,CAC7D,CAAC;QACH,CAAC;QACD,OAAO,CAAC,CAAC,IAAI,CAAC;aACZ,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACZ,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QAChC,CAAC,CAAC;aACD,OAAO,EAAE;aACT,KAAK,EAAE,CAAC;IACX,CAAC;IAEO,aAAa,CAAC,GAAkB;QACvC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACxB,qDAAqD;YACrD,MAAM,IAAI,MAAM,CAAC,eAAe,EAAE,CAAC;QACpC,CAAC;QACD,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IAEM,UAAU,CAAC,GAAkB;QACnC,wCAAwC;QACxC,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC;YACd,OAAO;QACR,CAAC;QACD,OAAO;YACN,aAAa,EAAE,gBAAgB,EAAE;YACjC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,QAAQ,EAAE,GAAG,CAAC,QAAQ,KAAK,IAAI;YAC/B,QAAQ,EAAE,GAAG,CAAC,QAAQ,KAAK,IAAI;YAC/B,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,SAAS,EAAE,GAAG,CAAC,SAAS;SACxB,CAAC;IACH,CAAC;IAEO,QAAQ,CAAC,GAAQ;QACxB,MAAM,GAAG,GAAqB,GAAG,CAAC;QAClC,OAAO,CACN,GAAG,CAAC,SAAS,IAAI,IAAI,IAAI,GAAG,CAAC,SAAS,IAAI,IAAI,IAAI,GAAG,CAAC,QAAQ,IAAI,IAAI,CACtE,CAAC;IACH,CAAC;CACD"}
|
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": "34.3.
|
|
4
|
+
"version": "34.3.4-build-logs-limit-history-count-d8f05daee5681be8194bc3f4f2c446b27733ea49-1",
|
|
5
5
|
"license": "AGPL-3.0",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
@@ -154,7 +154,7 @@
|
|
|
154
154
|
},
|
|
155
155
|
"engines": {
|
|
156
156
|
"node": "^22.2.0",
|
|
157
|
-
"npm": "^
|
|
157
|
+
"npm": "^11.0.0"
|
|
158
158
|
},
|
|
159
159
|
"mocha": {
|
|
160
160
|
"reporter": "spec",
|
|
@@ -166,6 +166,6 @@
|
|
|
166
166
|
"loader": "ts-node/esm/transpile-only"
|
|
167
167
|
},
|
|
168
168
|
"versionist": {
|
|
169
|
-
"publishedAt": "2024-12-
|
|
169
|
+
"publishedAt": "2024-12-23T20:15:49.210Z"
|
|
170
170
|
}
|
|
171
171
|
}
|