@balena/open-balena-api 35.0.0-build-loki-structured-metadata-d86e792a6832d5595bf4bf73e81ebeb283dc26bf-1 → 35.0.0-build-otaviojacobi-test-7df65410e828dd380bca047fbd78fd23496d021c-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/balena-model.d.ts +2 -2
- package/dist/balena.sbvr +1 -1
- package/dist/features/device-logs/lib/backends/loki.d.ts +4 -3
- package/dist/features/device-logs/lib/backends/loki.js +58 -126
- package/dist/features/device-logs/lib/backends/loki.js.map +1 -1
- package/dist/features/device-types/storage/aws-sdk-wrapper.d.ts +5 -0
- package/dist/features/device-types/storage/aws-sdk-wrapper.js +11 -0
- package/dist/features/device-types/storage/aws-sdk-wrapper.js.map +1 -0
- package/dist/features/device-types/storage/s3.d.ts +2 -2
- package/dist/features/device-types/storage/s3.js +1 -2
- package/dist/features/device-types/storage/s3.js.map +1 -1
- package/dist/fileupload-handler.d.ts +1 -1
- package/dist/fileupload-handler.js +2 -2
- package/dist/fileupload-handler.js.map +1 -1
- package/dist/lib/utils.js +4 -0
- package/dist/lib/utils.js.map +1 -1
- package/dist/migrations/00102-make-asset-not-null-on-release-asset.sql +2 -0
- package/package.json +34 -30
- package/dist/features/device-types/storage/aws-sdk-wrapper.cjs +0 -10
- package/dist/features/device-types/storage/aws-sdk-wrapper.cjs.map +0 -1
- package/dist/features/device-types/storage/aws-sdk-wrapper.d.cts +0 -2
package/dist/balena-model.d.ts
CHANGED
@@ -1237,7 +1237,7 @@ export interface ReleaseAsset {
|
|
1237
1237
|
} | [Release['Read']];
|
1238
1238
|
asset_key: Types['Short Text']['Read'];
|
1239
1239
|
id: Types['Serial']['Read'];
|
1240
|
-
asset: Types['WebResource']['Read'];
|
1240
|
+
asset: Types['WebResource']['Read'] | null;
|
1241
1241
|
};
|
1242
1242
|
Write: {
|
1243
1243
|
created_at: Types['Date Time']['Write'];
|
@@ -1245,7 +1245,7 @@ export interface ReleaseAsset {
|
|
1245
1245
|
release: Release['Write']['id'];
|
1246
1246
|
asset_key: Types['Short Text']['Write'];
|
1247
1247
|
id: Types['Serial']['Write'];
|
1248
|
-
asset: Types['WebResource']['Write'];
|
1248
|
+
asset: Types['WebResource']['Write'] | null;
|
1249
1249
|
};
|
1250
1250
|
}
|
1251
1251
|
export interface UserHasDirectAccessToApplication {
|
package/dist/balena.sbvr
CHANGED
@@ -736,7 +736,7 @@ Fact type: release has asset key
|
|
736
736
|
|
737
737
|
-- release asset
|
738
738
|
Fact type: release asset has asset
|
739
|
-
Necessity: each release asset has
|
739
|
+
Necessity: each release asset has at most one asset.
|
740
740
|
|
741
741
|
|
742
742
|
-- service environment variable
|
@@ -1,7 +1,6 @@
|
|
1
1
|
import type { DeviceLogsBackend, InternalDeviceLog, LogContext, OutputDeviceLog, Subscription } from '../struct.js';
|
2
2
|
export declare class LokiBackend implements DeviceLogsBackend {
|
3
3
|
private subscriptions;
|
4
|
-
private querier;
|
5
4
|
private pusher;
|
6
5
|
private tailCalls;
|
7
6
|
constructor();
|
@@ -16,14 +15,16 @@ export declare class LokiBackend implements DeviceLogsBackend {
|
|
16
15
|
* @param count
|
17
16
|
*/
|
18
17
|
history($ctx: LogContext, count: number): Promise<OutputDeviceLog[]>;
|
19
|
-
publish(ctx: LogContext, logs: InternalDeviceLog
|
18
|
+
publish(ctx: LogContext, logs: Array<InternalDeviceLog & {
|
19
|
+
version?: number;
|
20
|
+
}>): Promise<any>;
|
20
21
|
private push;
|
21
22
|
subscribe($ctx: LogContext, subscription: Subscription): Promise<void>;
|
22
23
|
unsubscribe($ctx: LogContext): Promise<void>;
|
23
24
|
private getDeviceQuery;
|
24
25
|
private getKey;
|
26
|
+
private getStructuredMetadata;
|
25
27
|
private getLabels;
|
26
|
-
private fromStreamToDeviceLogs;
|
27
28
|
private fromDeviceLogsToEntries;
|
28
29
|
private fromLogEntriesToStream;
|
29
30
|
}
|
@@ -7,7 +7,10 @@ import { LOKI_QUERY_HOST, LOKI_QUERY_HTTP_PORT, LOKI_INGESTER_HOST, LOKI_INGESTE
|
|
7
7
|
import { captureException } from '../../../../infra/error-handling/index.js';
|
8
8
|
import { setCurrentSubscriptions, incrementSubscriptionTotal, incrementPublishCallSuccessTotal, incrementPublishCallFailedTotal, incrementLokiPushErrorTotal, incrementPublishLogMessagesTotal, incrementPublishLogMessagesDropped, incrementLokiPushTotal, updateLokiPushDurationHistogram, incrementPublishCallTotal, } from './metrics.js';
|
9
9
|
import { setTimeout } from 'timers/promises';
|
10
|
+
import { omitNanoTimestamp } from '../config.js';
|
10
11
|
import { requestAsync } from '../../../../infra/request-promise/index.js';
|
12
|
+
import WebSocket from 'ws';
|
13
|
+
import querystring from 'node:querystring';
|
11
14
|
const { BadRequestError } = errors;
|
12
15
|
// invert status object for quick lookup of status identifier using status code
|
13
16
|
const statusKeys = _.transform(loki.status, function (result, value, key) {
|
@@ -17,11 +20,7 @@ const lokiQueryAddress = `${LOKI_QUERY_HOST}:${LOKI_QUERY_HTTP_PORT}`;
|
|
17
20
|
const lokiIngesterAddress = `${LOKI_INGESTER_HOST}:${LOKI_INGESTER_GRPC_PORT}`;
|
18
21
|
const MIN_BACKOFF = 100;
|
19
22
|
const MAX_BACKOFF = 10 * 1000;
|
20
|
-
|
21
|
-
const timestamp = new loki.Timestamp();
|
22
|
-
timestamp.fromDate(date);
|
23
|
-
return timestamp;
|
24
|
-
}
|
23
|
+
const VERSION = 2;
|
25
24
|
function backoff(fn, retryIf) {
|
26
25
|
return async (...args) => {
|
27
26
|
let nextBackoff = MIN_BACKOFF;
|
@@ -60,11 +59,7 @@ async function assertLokiLogContext(ctx) {
|
|
60
59
|
passthrough: { req: permissions.root },
|
61
60
|
options: {
|
62
61
|
$select: ['belongs_to__application'],
|
63
|
-
$expand: {
|
64
|
-
belongs_to__application: {
|
65
|
-
$select: ['id', 'organization'],
|
66
|
-
},
|
67
|
-
},
|
62
|
+
$expand: { belongs_to__application: { $select: ['id', 'organization'] } },
|
68
63
|
},
|
69
64
|
});
|
70
65
|
if (device == null) {
|
@@ -82,7 +77,6 @@ async function assertLokiLogContext(ctx) {
|
|
82
77
|
}
|
83
78
|
export class LokiBackend {
|
84
79
|
subscriptions;
|
85
|
-
querier;
|
86
80
|
pusher;
|
87
81
|
tailCalls;
|
88
82
|
constructor() {
|
@@ -90,10 +84,6 @@ export class LokiBackend {
|
|
90
84
|
const compressionAlgorithm = LOKI_GRPC_SEND_GZIP
|
91
85
|
? compressionAlgorithms.gzip
|
92
86
|
: compressionAlgorithms.identity;
|
93
|
-
this.querier = new loki.QuerierClient(lokiIngesterAddress, loki.createInsecureCredentials(), {
|
94
|
-
'grpc.default_compression_algorithm': compressionAlgorithm,
|
95
|
-
'grpc.default_compression_level': LOKI_GRPC_RECEIVE_COMPRESSION_LEVEL,
|
96
|
-
});
|
97
87
|
this.pusher = new loki.PusherClient(lokiIngesterAddress, loki.createInsecureCredentials(), {
|
98
88
|
'grpc.default_compression_algorithm': compressionAlgorithm,
|
99
89
|
'grpc.default_compression_level': LOKI_GRPC_RECEIVE_COMPRESSION_LEVEL,
|
@@ -119,9 +109,7 @@ export class LokiBackend {
|
|
119
109
|
const ctx = await assertLokiLogContext($ctx);
|
120
110
|
const [, body] = await requestAsync({
|
121
111
|
url: `http://${lokiQueryAddress}/loki/api/v1/query_range`,
|
122
|
-
headers: {
|
123
|
-
'X-Scope-OrgID': ctx.orgId,
|
124
|
-
},
|
112
|
+
headers: { 'X-Scope-OrgID': ctx.orgId },
|
125
113
|
qs: {
|
126
114
|
query: this.getDeviceQuery(ctx),
|
127
115
|
limit: Number.isFinite(count) ? count : 1000,
|
@@ -131,35 +119,16 @@ export class LokiBackend {
|
|
131
119
|
gzip: LOKI_HISTORY_GZIP,
|
132
120
|
});
|
133
121
|
return _(body.data.result)
|
134
|
-
.flatMap(({
|
135
|
-
|
136
|
-
|
137
|
-
|
138
|
-
|
139
|
-
baseLog.timestamp = Number(value);
|
140
|
-
break;
|
141
|
-
case 'is_system':
|
142
|
-
baseLog.isSystem = value === 'true';
|
143
|
-
break;
|
144
|
-
case 'is_stderr':
|
145
|
-
baseLog.isStdErr = value === 'true';
|
146
|
-
break;
|
147
|
-
case 'service_id':
|
148
|
-
baseLog.serviceId = Number(value);
|
149
|
-
break;
|
150
|
-
}
|
122
|
+
.flatMap(({ values }) => values)
|
123
|
+
.map(([timestamp, logLine]) => {
|
124
|
+
const log = JSON.parse(logLine);
|
125
|
+
if (log.version !== VERSION) {
|
126
|
+
throw new Error(`Invalid Loki serialization version: ${JSON.stringify(log)}`);
|
151
127
|
}
|
152
|
-
|
153
|
-
|
154
|
-
|
155
|
-
|
156
|
-
{
|
157
|
-
...baseLog,
|
158
|
-
createdAt: Math.floor(Number(nanoTimestamp / 1000000n)),
|
159
|
-
message,
|
160
|
-
},
|
161
|
-
];
|
162
|
-
});
|
128
|
+
delete log.version;
|
129
|
+
const nanoTimestamp = BigInt(timestamp);
|
130
|
+
log.createdAt = Math.floor(Number(nanoTimestamp / 1000000n));
|
131
|
+
return [nanoTimestamp, log];
|
163
132
|
})
|
164
133
|
.sortBy(([timestamp]) => timestamp)
|
165
134
|
.map(([, log]) => log)
|
@@ -190,9 +159,7 @@ export class LokiBackend {
|
|
190
159
|
const startAt = Date.now();
|
191
160
|
try {
|
192
161
|
await new Promise((resolve, reject) => {
|
193
|
-
this.pusher.push(pushRequest, loki.createOrgIdMetadata(ctx.orgId), {
|
194
|
-
deadline: startAt + LOKI_PUSH_TIMEOUT,
|
195
|
-
}, (err, response) => {
|
162
|
+
this.pusher.push(pushRequest, loki.createOrgIdMetadata(ctx.orgId), { deadline: startAt + LOKI_PUSH_TIMEOUT }, (err, response) => {
|
196
163
|
if (err) {
|
197
164
|
reject(err);
|
198
165
|
}
|
@@ -210,33 +177,46 @@ export class LokiBackend {
|
|
210
177
|
const ctx = await assertLokiLogContext($ctx);
|
211
178
|
const key = this.getKey(ctx);
|
212
179
|
if (!this.tailCalls.has(key)) {
|
213
|
-
const
|
214
|
-
|
215
|
-
|
216
|
-
|
217
|
-
|
218
|
-
|
219
|
-
if (stream) {
|
220
|
-
const logs = this.fromStreamToDeviceLogs(stream);
|
221
|
-
for (const log of logs) {
|
222
|
-
this.subscriptions.emit(key, log);
|
223
|
-
}
|
224
|
-
}
|
225
|
-
});
|
226
|
-
call.on('error', (err) => {
|
227
|
-
if (err.code !== loki.status.CANCELLED) {
|
228
|
-
captureException(err, `Loki tail call error for device ${ctx.uuid}`);
|
229
|
-
}
|
180
|
+
const ws = new WebSocket(`ws://${lokiQueryAddress}/loki/api/v1/tail?${querystring.stringify({
|
181
|
+
query: this.getDeviceQuery(ctx),
|
182
|
+
start: `${BigInt(Date.now()) * 1000000n}`,
|
183
|
+
})}`, { headers: { 'X-Scope-OrgID': ctx.orgId } });
|
184
|
+
ws.on('error', (err) => {
|
185
|
+
captureException(err, `Loki tail call message error for device ${ctx.uuid}`);
|
230
186
|
this.subscriptions.removeListener(key, subscription);
|
231
187
|
this.tailCalls.delete(key);
|
232
188
|
setCurrentSubscriptions(this.tailCalls.size);
|
233
189
|
});
|
234
|
-
|
190
|
+
ws.on('close', () => {
|
235
191
|
this.subscriptions.removeListener(key, subscription);
|
236
192
|
this.tailCalls.delete(key);
|
237
193
|
setCurrentSubscriptions(this.tailCalls.size);
|
238
194
|
});
|
239
|
-
|
195
|
+
ws.on('open', function open() {
|
196
|
+
console.log('connected');
|
197
|
+
});
|
198
|
+
ws.on('message', (data) => {
|
199
|
+
try {
|
200
|
+
const result = JSON.parse(data.toString());
|
201
|
+
for (const stream of result.streams) {
|
202
|
+
// TODO: if there are multiple streams we may have to buffer the logs and sort them by timestamp
|
203
|
+
for (const [timestamp, logLine] of stream.values) {
|
204
|
+
const log = JSON.parse(logLine);
|
205
|
+
if (log.version !== VERSION) {
|
206
|
+
throw new Error(`Invalid Loki serialization version: ${JSON.stringify(log)}`);
|
207
|
+
}
|
208
|
+
delete log.version;
|
209
|
+
const nanoTimestamp = BigInt(timestamp);
|
210
|
+
log.createdAt = Math.floor(Number(nanoTimestamp / 1000000n));
|
211
|
+
this.subscriptions.emit(key, log);
|
212
|
+
}
|
213
|
+
}
|
214
|
+
}
|
215
|
+
catch (err) {
|
216
|
+
captureException(err, `Loki tail call message error for device ${ctx.uuid}`);
|
217
|
+
}
|
218
|
+
});
|
219
|
+
this.tailCalls.set(key, ws);
|
240
220
|
incrementSubscriptionTotal();
|
241
221
|
setCurrentSubscriptions(this.tailCalls.size);
|
242
222
|
}
|
@@ -246,7 +226,7 @@ export class LokiBackend {
|
|
246
226
|
const ctx = await assertLokiLogContext($ctx);
|
247
227
|
const key = this.getKey(ctx);
|
248
228
|
const call = this.tailCalls.get(key);
|
249
|
-
call?.
|
229
|
+
call?.close();
|
250
230
|
}
|
251
231
|
getDeviceQuery(ctx) {
|
252
232
|
return `{fleet_id="${ctx.appId}"} | device_id="${ctx.id}"`;
|
@@ -254,73 +234,25 @@ export class LokiBackend {
|
|
254
234
|
getKey(ctx) {
|
255
235
|
return `o${ctx.orgId}:a${ctx.appId}:d${ctx.id}`;
|
256
236
|
}
|
237
|
+
getStructuredMetadata(ctx) {
|
238
|
+
return [
|
239
|
+
new loki.LabelPairAdapter().setName('device_id').setValue(`${ctx.id}`),
|
240
|
+
];
|
241
|
+
}
|
257
242
|
getLabels(ctx) {
|
258
243
|
return `{fleet_id="${ctx.appId}"}`;
|
259
244
|
}
|
260
|
-
fromStreamToDeviceLogs(stream) {
|
261
|
-
try {
|
262
|
-
return stream.getEntriesList().map((entry) => {
|
263
|
-
const message = entry.getLine();
|
264
|
-
const structuredMetadataList = entry.getStructuredmetadataList();
|
265
|
-
const timestamp = entry.getTimestamp();
|
266
|
-
const nanoTimestamp = BigInt(timestamp.getSeconds()) * 1000000000n +
|
267
|
-
BigInt(timestamp.getNanos());
|
268
|
-
const log = {
|
269
|
-
createdAt: Math.floor(Number(nanoTimestamp / 1000000n)),
|
270
|
-
message,
|
271
|
-
};
|
272
|
-
for (const structuredMetadata of structuredMetadataList) {
|
273
|
-
switch (structuredMetadata.getName()) {
|
274
|
-
case 'timestamp':
|
275
|
-
log.timestamp = Number(structuredMetadata.getValue());
|
276
|
-
break;
|
277
|
-
case 'is_system':
|
278
|
-
log.isSystem = structuredMetadata.getValue() === 'true';
|
279
|
-
break;
|
280
|
-
case 'is_stderr':
|
281
|
-
log.isStdErr = structuredMetadata.getValue() === 'true';
|
282
|
-
break;
|
283
|
-
case 'service_id':
|
284
|
-
log.serviceId = Number(structuredMetadata.getValue());
|
285
|
-
break;
|
286
|
-
}
|
287
|
-
}
|
288
|
-
return log;
|
289
|
-
});
|
290
|
-
}
|
291
|
-
catch (err) {
|
292
|
-
captureException(err, `Failed to convert stream to device log`);
|
293
|
-
return [];
|
294
|
-
}
|
295
|
-
}
|
296
245
|
fromDeviceLogsToEntries(ctx, logs) {
|
297
|
-
const
|
298
|
-
.setName('device_id')
|
299
|
-
.setValue(`${ctx.id}`);
|
246
|
+
const structuredMetadata = this.getStructuredMetadata(ctx);
|
300
247
|
return logs.map((log) => {
|
301
248
|
const timestamp = new loki.Timestamp();
|
302
249
|
timestamp.setSeconds(Math.floor(Number(log.nanoTimestamp / 1000000000n)));
|
303
250
|
timestamp.setNanos(Number(log.nanoTimestamp % 1000000000n));
|
304
|
-
|
305
|
-
|
306
|
-
new loki.LabelPairAdapter()
|
307
|
-
.setName('timestamp')
|
308
|
-
.setValue(`${log.timestamp}`),
|
309
|
-
new loki.LabelPairAdapter()
|
310
|
-
.setName('is_system')
|
311
|
-
.setValue(`${log.isSystem}`),
|
312
|
-
new loki.LabelPairAdapter()
|
313
|
-
.setName('is_stderr')
|
314
|
-
.setValue(`${log.isStdErr}`),
|
315
|
-
];
|
316
|
-
if (log.serviceId) {
|
317
|
-
structuredMetadata.push(new loki.LabelPairAdapter()
|
318
|
-
.setName('service_id')
|
319
|
-
.setValue(`${log.serviceId}`));
|
320
|
-
}
|
251
|
+
// store log line as JSON
|
252
|
+
const logJson = JSON.stringify({ ...log, version: VERSION }, omitNanoTimestamp);
|
321
253
|
// create entry with labels, line and timestamp
|
322
254
|
return new loki.EntryAdapter()
|
323
|
-
.setLine(
|
255
|
+
.setLine(logJson)
|
324
256
|
.setTimestamp(timestamp)
|
325
257
|
.setStructuredmetadataList(structuredMetadata);
|
326
258
|
});
|
@@ -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":"AAAA,OAAO,CAAC,MAAM,QAAQ,CAAC;AACvB,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAEtD,OAAO,IAAI,MAAM,kBAAkB,CAAC;AAEpC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EACN,eAAe,EACf,oBAAoB,EACpB,kBAAkB,EAClB,uBAAuB,EACvB,iBAAiB,EACjB,mBAAmB,EACnB,mCAAmC,EACnC,oBAAoB,EACpB,iBAAiB,GACjB,MAAM,2BAA2B,CAAC;AASnC,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAC7E,OAAO,EACN,uBAAuB,EACvB,0BAA0B,EAC1B,gCAAgC,EAChC,+BAA+B,EAC/B,2BAA2B,EAC3B,gCAAgC,EAChC,kCAAkC,EAClC,sBAAsB,EACtB,+BAA+B,EAC/B,yBAAyB,GACzB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,4CAA4C,CAAC;AAC1E,OAAO,SAAS,MAAM,IAAI,CAAC;AAC3B,OAAO,WAAW,MAAM,kBAAkB,CAAC;AAE3C,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,CAAC;AAOnC,+EAA+E;AAC/E,MAAM,UAAU,GAAG,CAAC,CAAC,SAAS,CAC7B,IAAI,CAAC,MAAM,EACX,UAAU,MAA0B,EAAE,KAAK,EAAE,GAAG;IAC/C,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC;AACrB,CAAC,EACD,EAAE,CACF,CAAC;AAEF,MAAM,gBAAgB,GAAG,GAAG,eAAe,IAAI,oBAAoB,EAAE,CAAC;AACtE,MAAM,mBAAmB,GAAG,GAAG,kBAAkB,IAAI,uBAAuB,EAAE,CAAC;AAE/E,MAAM,WAAW,GAAG,GAAG,CAAC;AACxB,MAAM,WAAW,GAAG,EAAE,GAAG,IAAI,CAAC;AAC9B,MAAM,OAAO,GAAG,CAAC,CAAC;AAElB,SAAS,OAAO,CACf,EAAK,EACL,OAAgC;IAEhC,OAAO,KAAK,EAAE,GAAG,IAAmB,EAAmC,EAAE;QACxE,IAAI,WAAW,GAAG,WAAW,CAAC;QAC9B,IAAI,WAAW,GAAG,WAAW,CAAC;QAC9B,OAAO,WAAW,IAAI,WAAW,EAAE,CAAC;YACnC,IAAI,CAAC;gBACJ,OAAO,MAAM,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;YAC1B,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACd,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;oBAClB,MAAM,UAAU,CAAC,WAAW,CAAC,CAAC;oBAC9B,YAAY;oBACZ,WAAW,GAAG,WAAW,GAAG,WAAW,CAAC;oBACxC,WAAW,GAAG,WAAW,GAAG,WAAW,CAAC;gBACzC,CAAC;qBAAM,CAAC;oBACP,MAAM,GAAG,CAAC;gBACX,CAAC;YACF,CAAC;QACF,CAAC;QACD,MAAM,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACjC,CAAC,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,oBAAoB,CAClC,GAAyC;IAEzC,IAAI,OAAO,IAAI,GAAG,IAAI,OAAO,IAAI,GAAG,EAAE,CAAC;QACtC,OAAO,GAAyD,CAAC;IAClE,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC;QAC5C,QAAQ,EAAE,QAAQ;QAClB,EAAE,EAAE,GAAG,CAAC,EAAE;QACV,WAAW,EAAE,EAAE,GAAG,EAAE,WAAW,CAAC,IAAI,EAAE;QACtC,OAAO,EAAE;YACR,OAAO,EAAE,CAAC,yBAAyB,CAAC;YACpC,OAAO,EAAE,EAAE,uBAAuB,EAAE,EAAE,OAAO,EAAE,CAAC,IAAI,EAAE,cAAc,CAAC,EAAE,EAAE;SACzE;KACD,CAAC,CAAC;IAEH,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;QACpB,MAAM,IAAI,KAAK,CAAC,WAAW,GAAG,CAAC,EAAE,aAAa,CAAC,CAAC;IACjD,CAAC;IAED,IAAI,MAAM,CAAC,uBAAuB,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;QAC/C,MAAM,IAAI,KAAK,CAAC,WAAW,GAAG,CAAC,EAAE,iBAAiB,CAAC,CAAC;IACrD,CAAC;IAED,yFAAyF;IACxF,GAA4B,CAAC,KAAK;QAClC,GAAG,MAAM,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;IAC1C,GAA4B,CAAC,KAAK;QAClC,GAAG,MAAM,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;IAE1D,OAAO,GAAyD,CAAC;AAClE,CAAC;AAED,MAAM,OAAO,WAAW;IACf,aAAa,CAAe;IAC5B,MAAM,CAAoB;IAC1B,SAAS,CAAyB;IAE1C;QACC,IAAI,CAAC,aAAa,GAAG,IAAI,YAAY,EAAE,CAAC;QACxC,MAAM,oBAAoB,GAAG,mBAAmB;YAC/C,CAAC,CAAC,qBAAqB,CAAC,IAAI;YAC5B,CAAC,CAAC,qBAAqB,CAAC,QAAQ,CAAC;QAClC,IAAI,CAAC,MAAM,GAAG,IAAI,IAAI,CAAC,YAAY,CAClC,mBAAmB,EACnB,IAAI,CAAC,yBAAyB,EAAE,EAChC;YACC,oCAAoC,EAAE,oBAAoB;YAC1D,gCAAgC,EAAE,mCAAmC;SACrE,CACD,CAAC;QACF,IAAI,CAAC,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;QAC3B,IAAI,CAAC,IAAI,GAAG,OAAO,CAClB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EACpB,CAAC,GAAsB,EAAW,EAAE;YACnC,2BAA2B,CAC1B,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,CAC7C,CAAC;YACF,OAAO,CACN,oBAAoB;gBACpB,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,QAAQ,CACjE,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC,CACd,CACD,CAAC;QACH,CAAC,CACD,CAAC;IACH,CAAC;IAEe,SAAS,GAAG,IAAI,CAAC;IAEjC;;;;;;;;OAQG;IACI,KAAK,CAAC,OAAO,CACnB,IAAgB,EAChB,KAAa;QAEb,MAAM,GAAG,GAAG,MAAM,oBAAoB,CAAC,IAAI,CAAC,CAAC;QAE7C,MAAM,CAAC,EAAE,IAAI,CAAC,GAAG,MAAM,YAAY,CAAC;YACnC,GAAG,EAAE,UAAU,gBAAgB,0BAA0B;YACzD,OAAO,EAAE,EAAE,eAAe,EAAE,GAAG,CAAC,KAAK,EAAE;YACvC,EAAE,EAAE;gBACH,KAAK,EAAE,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC;gBAC/B,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;gBAC5C,KAAK,EAAE,KAAK;aACZ;YACD,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,iBAAiB;SACvB,CAAC,CAAC;QAEH,OAAO,CAAC,CACP,IAAI,CAAC,IAAI,CAAC,MAER,CACF;aACC,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC;aAC/B,GAAG,CAAC,CAAC,CAAC,SAAS,EAAE,OAAO,CAAC,EAA6B,EAAE;YACxD,MAAM,GAAG,GAAkB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC/C,IAAI,GAAG,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;gBAC7B,MAAM,IAAI,KAAK,CACd,uCAAuC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAC5D,CAAC;YACH,CAAC;YACD,OAAO,GAAG,CAAC,OAAO,CAAC;YACnB,MAAM,aAAa,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;YACxC,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,aAAa,GAAG,QAAQ,CAAC,CAAC,CAAC;YAC7D,OAAO,CAAC,aAAa,EAAE,GAAsB,CAAC,CAAC;QAChD,CAAC,CAAC;aACD,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC;aAClC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC;aACrB,KAAK,EAAE,CAAC;IACX,CAAC;IAEM,KAAK,CAAC,OAAO,CACnB,GAAe,EACf,IAAqD;QAErD,MAAM,UAAU,GAAG,IAAI,CAAC,uBAAuB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAE3D,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC;QAC9B,yBAAyB,EAAE,CAAC;QAC5B,gCAAgC,CAAC,SAAS,CAAC,CAAC;QAC5C,MAAM,OAAO,GAAG,MAAM,oBAAoB,CAAC,GAAG,CAAC,CAAC;QAChD,MAAM,MAAM,GAAG,IAAI,CAAC,sBAAsB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAChE,IAAI,CAAC;YACJ,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YACjC,gCAAgC,EAAE,CAAC;QACpC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACd,+BAA+B,EAAE,CAAC;YAClC,kCAAkC,CAAC,SAAS,CAAC,CAAC;YAC9C,gBAAgB,CACf,GAAG,EACH,qCAAqC,OAAO,CAAC,IAAI,EAAE,CACnD,CAAC;YACF,MAAM,IAAI,eAAe,CACxB,qCAAqC,OAAO,CAAC,IAAI,EAAE,CACnD,CAAC;QACH,CAAC;IACF,CAAC;IAEO,KAAK,CAAC,IAAI,CACjB,GAAmB,EACnB,MAA0B;QAE1B,sBAAsB,EAAE,CAAC;QACzB,MAAM,WAAW,GAAG,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;QAC3C,WAAW,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAC/B,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC3B,IAAI,CAAC;YACJ,MAAM,IAAI,OAAO,CAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACxD,IAAI,CAAC,MAAM,CAAC,IAAI,CACf,WAAW,EACX,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,KAAK,CAAC,EACnC,EAAE,QAAQ,EAAE,OAAO,GAAG,iBAAiB,EAAE,EACzC,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE;oBACjB,IAAI,GAAG,EAAE,CAAC;wBACT,MAAM,CAAC,GAAG,CAAC,CAAC;oBACb,CAAC;yBAAM,CAAC;wBACP,OAAO,CAAC,QAAQ,CAAC,CAAC;oBACnB,CAAC;gBACF,CAAC,CACD,CAAC;YACH,CAAC,CAAC,CAAC;QACJ,CAAC;gBAAS,CAAC;YACV,+BAA+B,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,CAAC;QACvD,CAAC;IACF,CAAC;IAEM,KAAK,CAAC,SAAS,CAAC,IAAgB,EAAE,YAA0B;QAClE,MAAM,GAAG,GAAG,MAAM,oBAAoB,CAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YAC9B,MAAM,EAAE,GAAG,IAAI,SAAS,CACvB,QAAQ,gBAAgB,qBAAqB,WAAW,CAAC,SAAS,CAAC;gBAClE,KAAK,EAAE,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC;gBAC/B,KAAK,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,QAAQ,EAAE;aACzC,CAAC,EAAE,EACJ,EAAE,OAAO,EAAE,EAAE,eAAe,EAAE,GAAG,CAAC,KAAK,EAAE,EAAE,CAC3C,CAAC;YAEF,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;gBACtB,gBAAgB,CACf,GAAG,EACH,2CAA2C,GAAG,CAAC,IAAI,EAAE,CACrD,CAAC;gBACF,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;gBACrD,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAC3B,uBAAuB,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YAC9C,CAAC,CAAC,CAAC;YACH,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;gBACnB,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;gBACrD,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAC3B,uBAAuB,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YAC9C,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,IAAI;gBAC1B,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YAC1B,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE;gBACzB,IAAI,CAAC;oBACJ,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAKxC,CAAC;oBAEF,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;wBACrC,gGAAgG;wBAChG,KAAK,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;4BAClD,MAAM,GAAG,GAAkB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;4BAC/C,IAAI,GAAG,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;gCAC7B,MAAM,IAAI,KAAK,CACd,uCAAuC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAC5D,CAAC;4BACH,CAAC;4BACD,OAAO,GAAG,CAAC,OAAO,CAAC;4BACnB,MAAM,aAAa,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;4BACxC,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,aAAa,GAAG,QAAQ,CAAC,CAAC,CAAC;4BAC7D,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,GAAsB,CAAC,CAAC;wBACtD,CAAC;oBACF,CAAC;gBACF,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACd,gBAAgB,CACf,GAAG,EACH,2CAA2C,GAAG,CAAC,IAAI,EAAE,CACrD,CAAC;gBACH,CAAC;YACF,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YAC5B,0BAA0B,EAAE,CAAC;YAC7B,uBAAuB,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC9C,CAAC;QACD,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAC1C,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,IAAgB;QACxC,MAAM,GAAG,GAAG,MAAM,oBAAoB,CAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC7B,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACrC,IAAI,EAAE,KAAK,EAAE,CAAC;IACf,CAAC;IAEO,cAAc,CAAC,GAAmB;QACzC,OAAO,cAAc,GAAG,CAAC,KAAK,mBAAmB,GAAG,CAAC,EAAE,GAAG,CAAC;IAC5D,CAAC;IAEO,MAAM,CAAC,GAAmB;QACjC,OAAO,IAAI,GAAG,CAAC,KAAK,KAAK,GAAG,CAAC,KAAK,KAAK,GAAG,CAAC,EAAE,EAAE,CAAC;IACjD,CAAC;IAEO,qBAAqB,CAAC,GAAe;QAC5C,OAAO;YACN,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC,EAAE,EAAE,CAAC;SACtE,CAAC;IACH,CAAC;IAEO,SAAS,CAAC,GAAmB;QACpC,OAAO,cAAc,GAAG,CAAC,KAAK,IAAI,CAAC;IACpC,CAAC;IAEO,uBAAuB,CAC9B,GAAe,EACf,IAAqD;QAErD,MAAM,kBAAkB,GAAG,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC;QAC3D,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACvB,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACvC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;YAC1E,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,GAAG,WAAW,CAAC,CAAC,CAAC;YAC5D,yBAAyB;YACzB,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAC7B,EAAE,GAAG,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,EAC5B,iBAAiB,CACjB,CAAC;YACF,+CAA+C;YAC/C,OAAO,IAAI,IAAI,CAAC,YAAY,EAAE;iBAC5B,OAAO,CAAC,OAAO,CAAC;iBAChB,YAAY,CAAC,SAAS,CAAC;iBACvB,yBAAyB,CAAC,kBAAkB,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;IACJ,CAAC;IACO,sBAAsB,CAC7B,GAAmB,EACnB,UAA+B;QAE/B,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QACnC,MAAM,MAAM,GAAG,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;QACxC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACzB,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;QAClC,OAAO,MAAM,CAAC;IACf,CAAC;CACD"}
|
@@ -0,0 +1,11 @@
|
|
1
|
+
// We import/re-export the aws-sdk so that we can mock it in tests.
|
2
|
+
import AWS from 'aws-sdk';
|
3
|
+
import { guardTestMockOnly } from '../../../lib/config.js';
|
4
|
+
export default AWS;
|
5
|
+
export const TEST_MOCK_ONLY = {
|
6
|
+
set S3(v) {
|
7
|
+
guardTestMockOnly();
|
8
|
+
AWS.S3 = v;
|
9
|
+
},
|
10
|
+
};
|
11
|
+
//# sourceMappingURL=aws-sdk-wrapper.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"aws-sdk-wrapper.js","sourceRoot":"","sources":["../../../../src/features/device-types/storage/aws-sdk-wrapper.ts"],"names":[],"mappings":"AAAA,mEAAmE;AACnE,OAAO,GAAG,MAAM,SAAS,CAAC;AAC1B,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,eAAe,GAAG,CAAC;AAEnB,MAAM,CAAC,MAAM,cAAc,GAAG;IAC7B,IAAI,EAAE,CAAC,CAAgB;QACtB,iBAAiB,EAAE,CAAC;QACpB,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IACZ,CAAC;CACD,CAAC"}
|
@@ -1,6 +1,6 @@
|
|
1
|
-
import
|
1
|
+
import AWS from './aws-sdk-wrapper.js';
|
2
2
|
export declare const getKey: (...parts: string[]) => string;
|
3
|
-
export declare function getFile(s3Path: string): Promise<import("aws-sdk/lib/request.js").PromiseResult<
|
3
|
+
export declare function getFile(s3Path: string): Promise<import("aws-sdk/lib/request.js").PromiseResult<AWS.S3.GetObjectOutput, AWS.AWSError> | undefined>;
|
4
4
|
export declare function getFolderSize(folder: string, marker?: string): Promise<number>;
|
5
5
|
export declare function listFolders(folder: string, marker?: string): Promise<string[]>;
|
6
6
|
export declare function fileExists(s3Path: string): Promise<boolean>;
|
@@ -1,7 +1,6 @@
|
|
1
|
-
import
|
1
|
+
import AWS from './aws-sdk-wrapper.js';
|
2
2
|
import _ from 'lodash';
|
3
3
|
import path from 'path';
|
4
|
-
const { AWS } = AWSWrapper;
|
5
4
|
import { IMAGE_STORAGE_ACCESS_KEY, IMAGE_STORAGE_BUCKET as S3_BUCKET, IMAGE_STORAGE_ENDPOINT, IMAGE_STORAGE_FORCE_PATH_STYLE, IMAGE_STORAGE_SECRET_KEY, IMAGE_STORAGE_DEBUG_REQUEST_ERRORS, } from '../../../lib/config.js';
|
6
5
|
export const getKey = (...parts) => parts.join('/');
|
7
6
|
class UnauthenticatedS3Facade {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"s3.js","sourceRoot":"","sources":["../../../../src/features/device-types/storage/s3.ts"],"names":[],"mappings":"AAAA,OAAO,
|
1
|
+
{"version":3,"file":"s3.js","sourceRoot":"","sources":["../../../../src/features/device-types/storage/s3.ts"],"names":[],"mappings":"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"}
|
@@ -1,2 +1,2 @@
|
|
1
|
-
import { webResourceHandler } from '@balena/pinejs';
|
1
|
+
import type { webResourceHandler } from '@balena/pinejs';
|
2
2
|
export declare const getFileUploadHandler: () => webResourceHandler.WebResourceHandler | undefined;
|
@@ -1,5 +1,5 @@
|
|
1
|
-
import { webResourceHandler } from '@balena/pinejs';
|
2
1
|
import { CloudFrontHandler } from '@balena/pinejs-webresource-cloudfront';
|
2
|
+
import { S3Handler } from '@balena/pinejs-webresource-s3';
|
3
3
|
import * as fs from 'fs';
|
4
4
|
import { WEBRESOURCES_S3_ACCESS_KEY, WEBRESOURCES_S3_SECRET_KEY, WEBRESOURCES_S3_REGION, WEBRESOURCES_S3_HOST, WEBRESOURCES_S3_BUCKET, WEBRESOURCES_S3_MAX_FILESIZE, WEBRESOURCES_CLOUDFRONT_PRIVATEKEY_PATH, WEBRESOURCES_CLOUDFRONT_PUBLICKEY, WEBRESOURCES_CLOUDFRONT_HOST, } from './lib/config.js';
|
5
5
|
const getEndpointFromHost = (host) => {
|
@@ -60,7 +60,7 @@ export const getFileUploadHandler = () => {
|
|
60
60
|
}
|
61
61
|
const s3Config = getS3Config();
|
62
62
|
if (s3Config != null) {
|
63
|
-
handler = new
|
63
|
+
handler = new S3Handler(s3Config);
|
64
64
|
console.log('Successfully initialised webresource S3 handler.');
|
65
65
|
console.log({
|
66
66
|
region: s3Config.region,
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"fileupload-handler.js","sourceRoot":"","sources":["../src/fileupload-handler.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"fileupload-handler.js","sourceRoot":"","sources":["../src/fileupload-handler.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/utils.js
CHANGED
@@ -18,6 +18,10 @@ export const checkInt = (num) => {
|
|
18
18
|
if (num == null) {
|
19
19
|
return false;
|
20
20
|
}
|
21
|
+
// If the string contains non-integer characters then it's not a valid integer, even if `parseInt` might turn it into one
|
22
|
+
if (!/^-?[0-9]+$/.test(num)) {
|
23
|
+
return false;
|
24
|
+
}
|
21
25
|
const n = parseInt(num, 10);
|
22
26
|
if (Number.isNaN(n)) {
|
23
27
|
return false;
|
package/dist/lib/utils.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/lib/utils.ts"],"names":[],"mappings":"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"}
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/lib/utils.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": "35.0.0-build-
|
4
|
+
"version": "35.0.0-build-otaviojacobi-test-7df65410e828dd380bca047fbd78fd23496d021c-1",
|
5
5
|
"license": "AGPL-3.0",
|
6
6
|
"repository": {
|
7
7
|
"type": "git",
|
@@ -17,7 +17,8 @@
|
|
17
17
|
"./models/balena-model.d.ts": "./dist/balena-model.d.ts",
|
18
18
|
"./models/balena-init.sql": "./dist/balena-init.sql",
|
19
19
|
"./models/v6.sbvr": "./dist/translations/v6/v6.sbvr",
|
20
|
-
"./models/v7.sbvr": "./dist/translations/v7/v7.sbvr"
|
20
|
+
"./models/v7.sbvr": "./dist/translations/v7/v7.sbvr",
|
21
|
+
"./mocks/aws-sdk-wrapper": "./dist/features/device-types/storage/aws-sdk-wrapper.js"
|
21
22
|
},
|
22
23
|
"files": [
|
23
24
|
"dist/"
|
@@ -44,14 +45,16 @@
|
|
44
45
|
"prepare": "node -e \"try { (await import('husky')).default() } catch (e) { if (e.code !== 'ERR_MODULE_NOT_FOUND') throw e }\" --input-type module"
|
45
46
|
},
|
46
47
|
"dependencies": {
|
47
|
-
"@balena/abstract-sql-compiler": "^10.0
|
48
|
+
"@balena/abstract-sql-compiler": "^10.2.0",
|
48
49
|
"@balena/abstract-sql-to-typescript": "^5.1.0",
|
49
50
|
"@balena/env-parsing": "^1.2.0",
|
50
51
|
"@balena/es-version": "^1.0.3",
|
51
52
|
"@balena/node-metrics-gatherer": "^6.0.3",
|
52
|
-
"@balena/pinejs": "^
|
53
|
-
"@balena/pinejs-webresource-cloudfront": "^0.2
|
54
|
-
"@
|
53
|
+
"@balena/pinejs": "^20.0.3",
|
54
|
+
"@balena/pinejs-webresource-cloudfront": "^1.0.2",
|
55
|
+
"@balena/pinejs-webresource-s3": "^1.0.2",
|
56
|
+
"@sentry/node": "^8.48.0",
|
57
|
+
"@swc-node/register": "^1.10.9",
|
55
58
|
"@types/basic-auth": "^1.1.8",
|
56
59
|
"@types/bluebird": "^3.5.42",
|
57
60
|
"@types/cache-manager": "^4.0.6",
|
@@ -65,11 +68,11 @@
|
|
65
68
|
"@types/express-serve-static-core": "^4.19.6",
|
66
69
|
"@types/json-schema": "^7.0.15",
|
67
70
|
"@types/jsonwebtoken": "^9.0.7",
|
68
|
-
"@types/lodash": "^4.17.
|
71
|
+
"@types/lodash": "^4.17.14",
|
69
72
|
"@types/memoizee": "^0.4.11",
|
70
73
|
"@types/morgan": "^1.9.9",
|
71
74
|
"@types/ndjson": "^2.0.4",
|
72
|
-
"@types/node": "^22.
|
75
|
+
"@types/node": "^22.10.5",
|
73
76
|
"@types/node-schedule": "^2.1.7",
|
74
77
|
"@types/on-finished": "^2.3.4",
|
75
78
|
"@types/passport-jwt": "^4.0.1",
|
@@ -80,26 +83,28 @@
|
|
80
83
|
"@types/semver": "^7.5.8",
|
81
84
|
"@types/statuses": "^2.0.5",
|
82
85
|
"@types/validator": "^13.12.2",
|
86
|
+
"@types/ws": "^8.5.14",
|
83
87
|
"avsc": "^5.7.7",
|
84
|
-
"aws-sdk": "^2.
|
88
|
+
"aws-sdk": "^2.1692.0",
|
85
89
|
"balena-device-config": "^6.3.0",
|
86
|
-
"balena-semver": "^
|
90
|
+
"balena-semver": "^3.0.0",
|
87
91
|
"basic-auth": "^2.0.1",
|
88
92
|
"bluebird": "^3.7.2",
|
89
93
|
"body-parser": "^1.20.3",
|
94
|
+
"bufferutil": "^4.0.9",
|
90
95
|
"cache-manager": "^4.1.0",
|
91
96
|
"cache-manager-ioredis": "^2.1.0",
|
92
97
|
"common-tags": "^1.8.2",
|
93
98
|
"compressible": "^2.0.18",
|
94
|
-
"compression": "^1.7.
|
99
|
+
"compression": "^1.7.5",
|
95
100
|
"compression-next": "^1.0.3",
|
96
101
|
"cookie-parser": "^1.4.7",
|
97
102
|
"cookie-session": "^2.1.0",
|
98
103
|
"escape-html": "^1.0.3",
|
99
104
|
"eventemitter3": "^5.0.1",
|
100
|
-
"express": "^4.21.
|
101
|
-
"fast-glob": "^3.3.
|
102
|
-
"ioredis": "^5.4.
|
105
|
+
"express": "^4.21.2",
|
106
|
+
"fast-glob": "^3.3.3",
|
107
|
+
"ioredis": "^5.4.2",
|
103
108
|
"ipaddr.js": "^2.2.0",
|
104
109
|
"jsonwebtoken": "^9.0.2",
|
105
110
|
"lodash": "^4.17.21",
|
@@ -111,9 +116,9 @@
|
|
111
116
|
"on-finished": "^2.4.1",
|
112
117
|
"passport": "^0.7.0",
|
113
118
|
"passport-jwt": "^4.0.1",
|
114
|
-
"pinejs-client-core": "^8.1.
|
119
|
+
"pinejs-client-core": "^8.1.2",
|
115
120
|
"proxy-addr": "^2.0.7",
|
116
|
-
"randomstring": "^1.3.
|
121
|
+
"randomstring": "^1.3.1",
|
117
122
|
"rate-limiter-flexible": "^5.0.4",
|
118
123
|
"redis": "^4.7.0",
|
119
124
|
"redlock": "^4.2.0",
|
@@ -126,27 +131,26 @@
|
|
126
131
|
"supervisor": "^0.12.0",
|
127
132
|
"tar": "^7.4.3",
|
128
133
|
"thirty-two": "^1.0.2",
|
129
|
-
"ts-node": "^10.9.2",
|
130
134
|
"typed-error": "^3.2.2",
|
131
|
-
"typescript": "^5.7.
|
132
|
-
"uuid": "^11.0.
|
133
|
-
"validator": "^13.12.0"
|
135
|
+
"typescript": "^5.7.3",
|
136
|
+
"uuid": "^11.0.5",
|
137
|
+
"validator": "^13.12.0",
|
138
|
+
"ws": "^8.18.0"
|
134
139
|
},
|
135
140
|
"devDependencies": {
|
136
|
-
"@balena/lint": "^9.
|
137
|
-
"@types/chai": "^5.0.
|
138
|
-
"@types/mocha": "^10.0.
|
141
|
+
"@balena/lint": "^9.1.3",
|
142
|
+
"@types/chai": "^5.0.1",
|
143
|
+
"@types/mocha": "^10.0.10",
|
139
144
|
"@types/mockery": "^1.4.33",
|
140
145
|
"@types/sinon": "^17.0.3",
|
141
146
|
"@types/supertest": "^6.0.2",
|
142
147
|
"@types/temp": "^0.9.4",
|
143
148
|
"chai": "^5.1.2",
|
144
149
|
"copyfiles": "^2.4.1",
|
145
|
-
"husky": "^9.1.
|
146
|
-
"lint-staged": "^15.
|
147
|
-
"mocha": "^11.
|
148
|
-
"
|
149
|
-
"nock": "^13.5.5",
|
150
|
+
"husky": "^9.1.7",
|
151
|
+
"lint-staged": "^15.3.0",
|
152
|
+
"mocha": "^11.1.0",
|
153
|
+
"nock": "^13.5.6",
|
150
154
|
"pinejs-client-supertest": "^3.0.1",
|
151
155
|
"rimraf": "^6.0.1",
|
152
156
|
"sinon": "^19.0.2",
|
@@ -163,9 +167,9 @@
|
|
163
167
|
"delay": true,
|
164
168
|
"exit": true,
|
165
169
|
"_": "index.js",
|
166
|
-
"
|
170
|
+
"import": "@swc-node/register/esm-register"
|
167
171
|
},
|
168
172
|
"versionist": {
|
169
|
-
"publishedAt": "
|
173
|
+
"publishedAt": "2025-02-17T22:33:41.643Z"
|
170
174
|
}
|
171
175
|
}
|
@@ -1,10 +0,0 @@
|
|
1
|
-
"use strict";
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
|
-
};
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
6
|
-
exports.AWS = void 0;
|
7
|
-
// We import/re-export the aws-sdk from a cts file so that mockery can work with it
|
8
|
-
const aws_sdk_1 = __importDefault(require("aws-sdk"));
|
9
|
-
exports.AWS = aws_sdk_1.default;
|
10
|
-
//# sourceMappingURL=aws-sdk-wrapper.cjs.map
|
@@ -1 +0,0 @@
|
|
1
|
-
{"version":3,"file":"aws-sdk-wrapper.cjs","sourceRoot":"","sources":["../../../../src/features/device-types/storage/aws-sdk-wrapper.cts"],"names":[],"mappings":";;;;;;AAAA,mFAAmF;AACnF,sDAA0B;AACjB,cADF,iBAAG,CACE"}
|