@balena/open-balena-api 34.3.7-build-reduce-unnecessary-96b5c5c4dcaaf81f697e7aefb2d96126f521a12c-1 → 34.3.8-build-internal-output-logs-bea6440ab639151effdca093d810799e082ea436-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 +3 -3
- package/dist/features/device-logs/lib/backends/loki.js +13 -15
- package/dist/features/device-logs/lib/backends/loki.js.map +1 -1
- package/dist/features/device-logs/lib/backends/redis.d.ts +3 -3
- package/dist/features/device-logs/lib/backends/redis.js +4 -1
- package/dist/features/device-logs/lib/backends/redis.js.map +1 -1
- package/dist/features/device-logs/lib/read.js +3 -7
- package/dist/features/device-logs/lib/read.js.map +1 -1
- package/dist/features/device-logs/lib/store.js +0 -1
- package/dist/features/device-logs/lib/store.js.map +1 -1
- package/dist/features/device-logs/lib/struct.d.ts +11 -6
- package/dist/features/device-logs/lib/struct.js.map +1 -1
- package/dist/features/device-logs/lib/supervisor.d.ts +3 -3
- package/dist/features/device-logs/lib/supervisor.js +0 -1
- package/dist/features/device-logs/lib/supervisor.js.map +1 -1
- package/package.json +2 -2
@@ -1,4 +1,4 @@
|
|
1
|
-
import type {
|
1
|
+
import type { DeviceLogsBackend, InternalDeviceLog, LogContext, OutputDeviceLog, Subscription } from '../struct.js';
|
2
2
|
export declare class LokiBackend implements DeviceLogsBackend {
|
3
3
|
private subscriptions;
|
4
4
|
private querier;
|
@@ -15,8 +15,8 @@ export declare class LokiBackend implements DeviceLogsBackend {
|
|
15
15
|
* @param ctx
|
16
16
|
* @param count
|
17
17
|
*/
|
18
|
-
history($ctx: LogContext, count: number): Promise<
|
19
|
-
publish(ctx: LogContext, logs: Array<
|
18
|
+
history($ctx: LogContext, count: number): Promise<OutputDeviceLog[]>;
|
19
|
+
publish(ctx: LogContext, logs: Array<InternalDeviceLog & {
|
20
20
|
version?: number;
|
21
21
|
}>): Promise<any>;
|
22
22
|
private push;
|
@@ -19,7 +19,6 @@ const lokiIngesterAddress = `${LOKI_INGESTER_HOST}:${LOKI_INGESTER_GRPC_PORT}`;
|
|
19
19
|
const MIN_BACKOFF = 100;
|
20
20
|
const MAX_BACKOFF = 10 * 1000;
|
21
21
|
const VERSION = 2;
|
22
|
-
const VERBOSE_ERROR_MESSAGE = false;
|
23
22
|
function createTimestampFromDate(date = new Date()) {
|
24
23
|
const timestamp = new loki.Timestamp();
|
25
24
|
timestamp.fromDate(date);
|
@@ -133,18 +132,21 @@ export class LokiBackend {
|
|
133
132
|
json: true,
|
134
133
|
gzip: LOKI_HISTORY_GZIP,
|
135
134
|
});
|
136
|
-
|
135
|
+
return _(body.data.result)
|
137
136
|
.flatMap(({ values }) => values)
|
138
137
|
.map(([timestamp, logLine]) => {
|
139
138
|
const log = JSON.parse(logLine);
|
140
|
-
log.nanoTimestamp = BigInt(timestamp);
|
141
139
|
if (log.version !== VERSION) {
|
142
140
|
throw new Error(`Invalid Loki serialization version: ${JSON.stringify(log)}`);
|
143
141
|
}
|
144
142
|
delete log.version;
|
145
|
-
|
146
|
-
|
147
|
-
|
143
|
+
const nanoTimestamp = BigInt(timestamp);
|
144
|
+
log.createdAt = Math.floor(Number(nanoTimestamp / 1000000n));
|
145
|
+
return [nanoTimestamp, log];
|
146
|
+
})
|
147
|
+
.sortBy(([timestamp]) => timestamp)
|
148
|
+
.map(([, log]) => log)
|
149
|
+
.value();
|
148
150
|
}
|
149
151
|
async publish(ctx, logs) {
|
150
152
|
const logEntries = this.fromDeviceLogsToEntries(ctx, logs);
|
@@ -160,11 +162,7 @@ export class LokiBackend {
|
|
160
162
|
catch (err) {
|
161
163
|
incrementPublishCallFailedTotal();
|
162
164
|
incrementPublishLogMessagesDropped(countLogs);
|
163
|
-
|
164
|
-
if (VERBOSE_ERROR_MESSAGE) {
|
165
|
-
message += JSON.stringify(logs, omitNanoTimestamp, '\t').substring(0, 1000);
|
166
|
-
}
|
167
|
-
captureException(err, message);
|
165
|
+
captureException(err, `Failed to publish logs for device ${lokiCtx.uuid}`);
|
168
166
|
throw new BadRequestError(`Failed to publish logs for device ${lokiCtx.uuid}`);
|
169
167
|
}
|
170
168
|
}
|
@@ -251,14 +249,14 @@ export class LokiBackend {
|
|
251
249
|
try {
|
252
250
|
return stream.getEntriesList().map((entry) => {
|
253
251
|
const log = JSON.parse(entry.getLine());
|
254
|
-
const timestamp = entry.getTimestamp();
|
255
|
-
log.nanoTimestamp =
|
256
|
-
BigInt(timestamp.getSeconds()) * 1000000000n +
|
257
|
-
BigInt(timestamp.getNanos());
|
258
252
|
if (log.version !== VERSION) {
|
259
253
|
throw new Error(`Invalid Loki serialization version: ${JSON.stringify(log)}`);
|
260
254
|
}
|
261
255
|
delete log.version;
|
256
|
+
const timestampEntry = entry.getTimestamp();
|
257
|
+
const nanoTimestamp = BigInt(timestampEntry.getSeconds()) * 1000000000n +
|
258
|
+
BigInt(timestampEntry.getNanos());
|
259
|
+
log.createdAt = Math.floor(Number(nanoTimestamp / 1000000n));
|
262
260
|
return log;
|
263
261
|
});
|
264
262
|
}
|
@@ -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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"}
|
@@ -1,4 +1,4 @@
|
|
1
|
-
import type {
|
1
|
+
import type { DeviceLogsBackend, InternalDeviceLog, LogContext, OutputDeviceLog, Subscription } from '../struct.js';
|
2
2
|
import type { Result } from 'ioredis';
|
3
3
|
declare module 'ioredis' {
|
4
4
|
interface RedisCommander<Context> {
|
@@ -11,9 +11,9 @@ export declare class RedisBackend implements DeviceLogsBackend {
|
|
11
11
|
private subscriptions;
|
12
12
|
private subscriptionHeartbeats;
|
13
13
|
constructor();
|
14
|
-
history(ctx: LogContext, count: number): Promise<
|
14
|
+
history(ctx: LogContext, count: number): Promise<OutputDeviceLog[]>;
|
15
15
|
get available(): boolean;
|
16
|
-
publish(ctx: LogContext, logs:
|
16
|
+
publish(ctx: LogContext, logs: InternalDeviceLog[]): Promise<void>;
|
17
17
|
subscribe(ctx: LogContext, subscription: Subscription): void;
|
18
18
|
unsubscribe(ctx: LogContext, subscription: Subscription): void;
|
19
19
|
private get connected();
|
@@ -205,7 +205,10 @@ export class RedisBackend {
|
|
205
205
|
}
|
206
206
|
async toRedisLog(log) {
|
207
207
|
try {
|
208
|
-
let compressedLog = schema.toBuffer(
|
208
|
+
let compressedLog = schema.toBuffer({
|
209
|
+
...log,
|
210
|
+
createdAt: Math.floor(Number(log.nanoTimestamp / 1000000n)),
|
211
|
+
});
|
209
212
|
const compression = await getCompressionLib();
|
210
213
|
if (compression != null) {
|
211
214
|
compressedLog = await compression.compress(compressedLog);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"redis.js","sourceRoot":"","sources":["../../../../../src/features/device-logs/lib/backends/redis.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,CAAC,MAAM,QAAQ,CAAC;AACvB,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAC7E,OAAO,EACN,0CAA0C,EAC1C,gCAAgC,EAChC,8BAA8B,EAC9B,yBAAyB,GACzB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;
|
1
|
+
{"version":3,"file":"redis.js","sourceRoot":"","sources":["../../../../../src/features/device-logs/lib/backends/redis.ts"],"names":[],"mappings":"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"}
|
@@ -3,8 +3,7 @@ import _ from 'lodash';
|
|
3
3
|
import { sbvrUtils, errors } from '@balena/pinejs';
|
4
4
|
import { captureException, handleHttpErrors, } from '../../../infra/error-handling/index.js';
|
5
5
|
import { StreamState } from './struct.js';
|
6
|
-
import { addRetentionLimit, getPrimaryBackend, getSecondaryBackend,
|
7
|
-
import { getNanoTimestamp } from '../../../lib/utils.js';
|
6
|
+
import { addRetentionLimit, getPrimaryBackend, getSecondaryBackend, shouldReadFromSecondary, } from './config.js';
|
8
7
|
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
8
|
const { NotFoundError } = errors;
|
10
9
|
const { api } = sbvrUtils;
|
@@ -20,9 +19,7 @@ export const read = (onLogReadStreamInitialized) => async (req, res) => {
|
|
20
19
|
}
|
21
20
|
else {
|
22
21
|
const logs = await getHistory(await getReadBackend(), ctx, req, LOGS_DEFAULT_HISTORY_COUNT);
|
23
|
-
res
|
24
|
-
.set('Content-Type', 'application/json')
|
25
|
-
.send(JSON.stringify(logs, omitNanoTimestamp));
|
22
|
+
res.json(logs);
|
26
23
|
}
|
27
24
|
}
|
28
25
|
catch (err) {
|
@@ -56,7 +53,7 @@ async function handleStreamingRead(ctx, req, res) {
|
|
56
53
|
dropped++;
|
57
54
|
}
|
58
55
|
else if (state !== StreamState.Closed) {
|
59
|
-
if (!write(JSON.stringify(log
|
56
|
+
if (!write(JSON.stringify(log) + '\n') &&
|
60
57
|
state === StreamState.Writable) {
|
61
58
|
state = StreamState.Saturated;
|
62
59
|
}
|
@@ -75,7 +72,6 @@ async function handleStreamingRead(ctx, req, res) {
|
|
75
72
|
if (dropped) {
|
76
73
|
const now = Date.now();
|
77
74
|
onLog({
|
78
|
-
nanoTimestamp: getNanoTimestamp(),
|
79
75
|
createdAt: now,
|
80
76
|
timestamp: now,
|
81
77
|
isStdErr: true,
|
@@ -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;
|
1
|
+
{"version":3,"file":"read.js","sourceRoot":"","sources":["../../../../src/features/device-logs/lib/read.ts"],"names":[],"mappings":"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"}
|
@@ -161,7 +161,6 @@ function handleStreamingWrite(ctx, req, res) {
|
|
161
161
|
const deleteCount = buffer.length - bufferLimit;
|
162
162
|
buffer.splice(0, deleteCount, {
|
163
163
|
nanoTimestamp: buffer[0].nanoTimestamp,
|
164
|
-
createdAt: buffer[0].createdAt,
|
165
164
|
timestamp: buffer[0].timestamp,
|
166
165
|
isStdErr: true,
|
167
166
|
isSystem: true,
|
@@ -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;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,
|
1
|
+
{"version":3,"file":"store.js","sourceRoot":"","sources":["../../../../src/features/device-logs/lib/store.ts"],"names":[],"mappings":"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"}
|
@@ -7,15 +7,19 @@ export interface LokiLogContext extends LogContext {
|
|
7
7
|
readonly orgId: string;
|
8
8
|
readonly appId: string;
|
9
9
|
}
|
10
|
-
|
10
|
+
interface DeviceLog {
|
11
11
|
message: string;
|
12
|
-
nanoTimestamp: bigint;
|
13
|
-
createdAt: number;
|
14
12
|
timestamp: number;
|
15
13
|
isSystem: boolean;
|
16
14
|
isStdErr: boolean;
|
17
15
|
serviceId?: number;
|
18
16
|
}
|
17
|
+
export interface InternalDeviceLog extends DeviceLog {
|
18
|
+
nanoTimestamp: bigint;
|
19
|
+
}
|
20
|
+
export interface OutputDeviceLog extends DeviceLog {
|
21
|
+
createdAt: number;
|
22
|
+
}
|
19
23
|
export interface SupervisorLog {
|
20
24
|
message: string;
|
21
25
|
timestamp: number;
|
@@ -31,14 +35,14 @@ export interface OldSupervisorLog {
|
|
31
35
|
is_stderr?: boolean;
|
32
36
|
image_id?: number;
|
33
37
|
}
|
34
|
-
export type Subscription = (log:
|
38
|
+
export type Subscription = (log: OutputDeviceLog) => void;
|
35
39
|
export interface DeviceLogsBackend {
|
36
|
-
history(ctx: LogContext, count: number): Promise<
|
40
|
+
history(ctx: LogContext, count: number): Promise<OutputDeviceLog[]>;
|
37
41
|
available: boolean;
|
38
42
|
/**
|
39
43
|
* `logs` will be mutated to empty and so must be handled synchronously
|
40
44
|
*/
|
41
|
-
publish(ctx: LogContext, logs:
|
45
|
+
publish(ctx: LogContext, logs: InternalDeviceLog[]): Promise<any>;
|
42
46
|
subscribe(ctx: LogContext, subscription: Subscription): void;
|
43
47
|
unsubscribe(ctx: LogContext, subscription: Subscription): void;
|
44
48
|
}
|
@@ -49,3 +53,4 @@ export declare enum StreamState {
|
|
49
53
|
Saturated = 3,
|
50
54
|
Closed = 4
|
51
55
|
}
|
56
|
+
export {};
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"struct.js","sourceRoot":"","sources":["../../../../src/features/device-logs/lib/struct.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"struct.js","sourceRoot":"","sources":["../../../../src/features/device-logs/lib/struct.ts"],"names":[],"mappings":"AA+DA,MAAM,CAAN,IAAY,WAMX;AAND,WAAY,WAAW;IACtB,uDAAS,CAAA;IACT,qDAAQ,CAAA;IACR,qDAAQ,CAAA;IACR,uDAAS,CAAA;IACT,iDAAM,CAAA;AACP,CAAC,EANW,WAAW,KAAX,WAAW,QAMtB"}
|
@@ -1,9 +1,9 @@
|
|
1
|
-
import type {
|
1
|
+
import type { InternalDeviceLog, SupervisorLog } from './struct.js';
|
2
2
|
export declare class Supervisor {
|
3
|
-
convertLogs(logs: SupervisorLog[]):
|
3
|
+
convertLogs(logs: SupervisorLog[]): InternalDeviceLog[];
|
4
4
|
private convertAnyLog;
|
5
5
|
convertLog(log: {
|
6
6
|
[key in keyof SupervisorLog]: unknown;
|
7
|
-
}):
|
7
|
+
}): InternalDeviceLog | undefined;
|
8
8
|
private isOldLog;
|
9
9
|
}
|
@@ -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;
|
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;AAOxC,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,GAEjB;QACA,wCAAwC;QACxC,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC;YACd,OAAO;QACR,CAAC;QACD,IAAI,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;YACrC,MAAM,IAAI,MAAM,CAAC,eAAe,CAAC,kCAAkC,CAAC,CAAC;QACtE,CAAC;QACD,IAAI,OAAO,GAAG,CAAC,SAAS,KAAK,QAAQ,EAAE,CAAC;YACvC,MAAM,IAAI,MAAM,CAAC,eAAe,CAAC,oCAAoC,CAAC,CAAC;QACxE,CAAC;QACD,MAAM,YAAY,GAAsB;YACvC,aAAa,EAAE,gBAAgB,EAAE;YACjC,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;SACpB,CAAC;QACF,IAAI,WAAW,IAAI,GAAG,EAAE,CAAC;YACxB,IAAI,OAAO,GAAG,CAAC,SAAS,KAAK,QAAQ,EAAE,CAAC;gBACvC,MAAM,IAAI,MAAM,CAAC,eAAe,CAC/B,iDAAiD,CACjD,CAAC;YACH,CAAC;YACD,YAAY,CAAC,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC;QACxC,CAAC;QACD,OAAO,YAAY,CAAC;IACrB,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.8-build-internal-output-logs-bea6440ab639151effdca093d810799e082ea436-1",
|
5
5
|
"license": "AGPL-3.0",
|
6
6
|
"repository": {
|
7
7
|
"type": "git",
|
@@ -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-24T13:28:22.944Z"
|
170
170
|
}
|
171
171
|
}
|