@balena/open-balena-api 28.0.12-build-renovate-major-5-chai-d6dc0e320ea2053faebff644859f1d3ba40d54e7-1 → 29.0.0-build-reduce-service-install-usage-state-get-v3-427fd396ec055f8061204b216e28a5f9216da822-1
Sign up to get free protection for your applications and to get access to all the features.
- package/dist/features/device-state/routes/fleet-state-get-v3.d.ts +60 -0
- package/dist/features/device-state/routes/fleet-state-get-v3.js.map +1 -1
- package/dist/features/device-state/routes/state-get-v3.d.ts +879 -2
- package/dist/features/device-state/routes/state-get-v3.js +27 -19
- package/dist/features/device-state/routes/state-get-v3.js.map +1 -1
- package/dist/features/device-state/state-get-utils.d.ts +15 -27
- package/dist/features/device-state/state-get-utils.js +2 -9
- package/dist/features/device-state/state-get-utils.js.map +1 -1
- package/package.json +3 -3
|
@@ -24,12 +24,12 @@ export function buildAppFromRelease(device, application, release, config, defaul
|
|
|
24
24
|
// extract the per-image information
|
|
25
25
|
const image = ipr.image[0];
|
|
26
26
|
const si = serviceInstallFromImage(device ?? application, image);
|
|
27
|
+
const svc = image.is_a_build_of__service[0];
|
|
27
28
|
if (si == null) {
|
|
28
|
-
throw new Error(`Could not find service install for device or application: '${application.uuid}', image: '${image?.id}', service: '${JSON.stringify(
|
|
29
|
+
throw new Error(`Could not find service install for device or application: '${application.uuid}', image: '${image?.id}', service: '${JSON.stringify(svc)}', service: '${device != null
|
|
29
30
|
? JSON.stringify(device.service_install)
|
|
30
31
|
: JSON.stringify(application.service)}'`);
|
|
31
32
|
}
|
|
32
|
-
const svc = si.service?.[0] ?? si;
|
|
33
33
|
const environment = {};
|
|
34
34
|
varListInsert(ipr.image_environment_variable, environment);
|
|
35
35
|
varListInsert(application.application_environment_variable, environment);
|
|
@@ -37,7 +37,7 @@ export function buildAppFromRelease(device, application, release, config, defaul
|
|
|
37
37
|
if (device?.device_environment_variable) {
|
|
38
38
|
varListInsert(device.device_environment_variable, environment);
|
|
39
39
|
}
|
|
40
|
-
if (si
|
|
40
|
+
if ('device_service_environment_variable' in si) {
|
|
41
41
|
varListInsert(si.device_service_environment_variable, environment);
|
|
42
42
|
}
|
|
43
43
|
const labels = {
|
|
@@ -97,9 +97,21 @@ export const releaseExpand = {
|
|
|
97
97
|
'id',
|
|
98
98
|
'is_stored_at__image_location',
|
|
99
99
|
'content_hash',
|
|
100
|
-
'is_a_build_of__service',
|
|
101
100
|
'contract',
|
|
102
101
|
],
|
|
102
|
+
$expand: {
|
|
103
|
+
is_a_build_of__service: {
|
|
104
|
+
$select: ['id', 'service_name'],
|
|
105
|
+
$expand: {
|
|
106
|
+
service_environment_variable: {
|
|
107
|
+
$select: ['name', 'value'],
|
|
108
|
+
},
|
|
109
|
+
service_label: {
|
|
110
|
+
$select: ['label_name', 'value'],
|
|
111
|
+
},
|
|
112
|
+
},
|
|
113
|
+
},
|
|
114
|
+
},
|
|
103
115
|
},
|
|
104
116
|
image_label: {
|
|
105
117
|
$select: ['label_name', 'value'],
|
|
@@ -111,6 +123,13 @@ export const releaseExpand = {
|
|
|
111
123
|
},
|
|
112
124
|
},
|
|
113
125
|
};
|
|
126
|
+
const appSelect = [
|
|
127
|
+
'id',
|
|
128
|
+
'uuid',
|
|
129
|
+
'app_name',
|
|
130
|
+
'is_host',
|
|
131
|
+
'is_of__class',
|
|
132
|
+
];
|
|
114
133
|
const appExpand = {
|
|
115
134
|
application_environment_variable: {
|
|
116
135
|
$select: ['name', 'value'],
|
|
@@ -126,26 +145,15 @@ const deviceExpand = {
|
|
|
126
145
|
// `should_be_running__release` will automatically defer to the app release as necessary
|
|
127
146
|
should_be_running__release: releaseExpand,
|
|
128
147
|
service_install: {
|
|
129
|
-
$select: ['id'],
|
|
148
|
+
$select: ['id', 'service'],
|
|
130
149
|
$expand: {
|
|
131
|
-
service: {
|
|
132
|
-
$select: ['id', 'service_name'],
|
|
133
|
-
$expand: {
|
|
134
|
-
service_environment_variable: {
|
|
135
|
-
$select: ['name', 'value'],
|
|
136
|
-
},
|
|
137
|
-
service_label: {
|
|
138
|
-
$select: ['label_name', 'value'],
|
|
139
|
-
},
|
|
140
|
-
},
|
|
141
|
-
},
|
|
142
150
|
device_service_environment_variable: {
|
|
143
151
|
$select: ['name', 'value'],
|
|
144
152
|
},
|
|
145
153
|
},
|
|
146
154
|
},
|
|
147
155
|
belongs_to__application: {
|
|
148
|
-
$select:
|
|
156
|
+
$select: appSelect,
|
|
149
157
|
$expand: {
|
|
150
158
|
...appExpand,
|
|
151
159
|
application_config_variable: {
|
|
@@ -158,7 +166,7 @@ const deviceExpand = {
|
|
|
158
166
|
$expand: {
|
|
159
167
|
...releaseExpand.$expand,
|
|
160
168
|
belongs_to__application: {
|
|
161
|
-
$select:
|
|
169
|
+
$select: appSelect,
|
|
162
170
|
$expand: appExpand,
|
|
163
171
|
},
|
|
164
172
|
},
|
|
@@ -168,7 +176,7 @@ const deviceExpand = {
|
|
|
168
176
|
$expand: {
|
|
169
177
|
...releaseExpand.$expand,
|
|
170
178
|
belongs_to__application: {
|
|
171
|
-
$select:
|
|
179
|
+
$select: appSelect,
|
|
172
180
|
$expand: appExpand,
|
|
173
181
|
},
|
|
174
182
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state-get-v3.js","sourceRoot":"","sources":["../../../../src/features/device-state/routes/state-get-v3.ts"],"names":[],"mappings":"AAEA,OAAO,CAAC,MAAM,QAAQ,CAAC;AACvB,OAAO,EACN,gBAAgB,EAChB,gBAAgB,GAChB,MAAM,wCAAwC,CAAC;AAChD,OAAO,EACN,yBAAyB,EACzB,mBAAmB,EACnB,SAAS,EACT,qBAAqB,EACrB,6BAA6B,EAC7B,eAAe,EACf,uBAAuB,EACvB,aAAa,GACb,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"state-get-v3.js","sourceRoot":"","sources":["../../../../src/features/device-state/routes/state-get-v3.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import type { ExpandableStringKeyOf } from 'pinejs-client-core';
|
|
2
2
|
import type { dbModule, permissions } from '@balena/pinejs';
|
|
3
|
-
import type { Device
|
|
3
|
+
import type { Device } from '../../balena-model.js';
|
|
4
|
+
import type { ExpandedDevice as ExpandedDeviceV3, ExpandedRelease as ExpandedReleaseV3 } from './routes/state-get-v3.js';
|
|
5
|
+
import type { ExpandedApplicationWithService } from './routes/fleet-state-get-v3.js';
|
|
4
6
|
export declare const getStateEventAdditionalFields: Array<Exclude<keyof Device['Read'], ExpandableStringKeyOf<Device['Read']>>>;
|
|
5
7
|
declare const defaultConfigVariableFns: Array<(config: Dictionary<string>) => void>;
|
|
6
8
|
export declare const addDefaultConfigVariableFn: (fn: (typeof defaultConfigVariableFns)[number]) => void;
|
|
@@ -13,34 +15,20 @@ export declare const getConfig: (device: {
|
|
|
13
15
|
} | undefined, application?: {
|
|
14
16
|
application_config_variable: EnvVarList;
|
|
15
17
|
} | undefined) => Dictionary<string>;
|
|
16
|
-
type
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
};
|
|
23
|
-
type ExpandedServiceInstall = {
|
|
24
|
-
id: ServiceInstall['Read']['id'];
|
|
25
|
-
service: ExpandedService[];
|
|
26
|
-
device_service_environment_variable: EnvVarList;
|
|
27
|
-
};
|
|
18
|
+
type Image = ExpandedReleaseV3['contains__image'][number]['image'][number];
|
|
19
|
+
type ServiceInstall = ExpandedDeviceV3['service_install'][number];
|
|
20
|
+
type Service = ExpandedApplicationWithService['service'][number];
|
|
21
|
+
export declare function serviceInstallFromImage(deviceOrFleet: {
|
|
22
|
+
service_install: ServiceInstall[];
|
|
23
|
+
}, image?: Image): ServiceInstall | undefined;
|
|
28
24
|
export declare function serviceInstallFromImage(deviceOrFleet: {
|
|
29
|
-
|
|
30
|
-
}, image?:
|
|
31
|
-
is_a_build_of__service: number | {
|
|
32
|
-
__id: number;
|
|
33
|
-
};
|
|
34
|
-
}): ExpandedServiceInstall | undefined;
|
|
25
|
+
service: Service[];
|
|
26
|
+
}, image?: Image): Service | undefined;
|
|
35
27
|
export declare function serviceInstallFromImage(deviceOrFleet: {
|
|
36
|
-
|
|
37
|
-
}
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
};
|
|
41
|
-
}): ExpandedService | undefined;
|
|
42
|
-
/** @deprecated Use the strongly-typed overloads with `{ service_install }` or `{ service }` instead */
|
|
43
|
-
export declare function serviceInstallFromImage(deviceOrFleet: AnyObject, image?: AnyObject): undefined | AnyObject;
|
|
28
|
+
service_install: ServiceInstall[];
|
|
29
|
+
} | {
|
|
30
|
+
service: Service[];
|
|
31
|
+
}, image?: Image): Service | ServiceInstall | undefined;
|
|
44
32
|
export declare const formatImageLocation: (imageLocation: string) => string;
|
|
45
33
|
export declare const filterDeviceConfig: (configVars: Dictionary<string>) => void;
|
|
46
34
|
export declare const setReadTransaction: (newReadTransaction: dbModule.Database["readTransaction"]) => void;
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import _ from 'lodash';
|
|
2
1
|
import { sbvrUtils, errors } from '@balena/pinejs';
|
|
3
2
|
import { DEFAULT_SUPERVISOR_POLL_INTERVAL, EMPTY_DEVICE_STATE_GET_DELAY_SECONDS, } from '../../lib/config.js';
|
|
4
3
|
import { createMultiLevelStore, reqPermissionNormalizer, } from '../../infra/cache/index.js';
|
|
@@ -39,15 +38,9 @@ export function serviceInstallFromImage(deviceOrFleet, image) {
|
|
|
39
38
|
if (image == null) {
|
|
40
39
|
return;
|
|
41
40
|
}
|
|
42
|
-
|
|
43
|
-
if (typeof image.is_a_build_of__service === 'object') {
|
|
44
|
-
id = image.is_a_build_of__service.__id;
|
|
45
|
-
}
|
|
46
|
-
else {
|
|
47
|
-
id = image.is_a_build_of__service;
|
|
48
|
-
}
|
|
41
|
+
const id = image.is_a_build_of__service[0].id;
|
|
49
42
|
if ('service_install' in deviceOrFleet) {
|
|
50
|
-
return
|
|
43
|
+
return deviceOrFleet.service_install.find(({ service }) => service.__id === id);
|
|
51
44
|
}
|
|
52
45
|
else if ('service' in deviceOrFleet) {
|
|
53
46
|
return deviceOrFleet.service.find((fleetService) => fleetService.id === id);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state-get-utils.js","sourceRoot":"","sources":["../../../src/features/device-state/state-get-utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"state-get-utils.js","sourceRoot":"","sources":["../../../src/features/device-state/state-get-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": "
|
|
4
|
+
"version": "29.0.0-build-reduce-service-install-usage-state-get-v3-427fd396ec055f8061204b216e28a5f9216da822-1",
|
|
5
5
|
"license": "AGPL-3.0",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
@@ -136,7 +136,7 @@
|
|
|
136
136
|
},
|
|
137
137
|
"devDependencies": {
|
|
138
138
|
"@balena/lint": "^9.0.1",
|
|
139
|
-
"@types/chai": "^
|
|
139
|
+
"@types/chai": "^4.3.19",
|
|
140
140
|
"@types/mocha": "^10.0.8",
|
|
141
141
|
"@types/mockery": "^1.4.33",
|
|
142
142
|
"@types/sinon": "^17.0.3",
|
|
@@ -168,6 +168,6 @@
|
|
|
168
168
|
"loader": "ts-node/esm/transpile-only"
|
|
169
169
|
},
|
|
170
170
|
"versionist": {
|
|
171
|
-
"publishedAt": "2024-09-
|
|
171
|
+
"publishedAt": "2024-09-28T12:14:28.875Z"
|
|
172
172
|
}
|
|
173
173
|
}
|