@balena/open-balena-api 35.0.0-build-otaviojacobi-test-bf19180a60fed62446ca07403bf754033e642f2c-1 → 35.0.0
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/api-keys/lib.d.ts +8 -1
- package/dist/features/api-keys/routes.js +5 -5
- package/dist/features/api-keys/routes.js.map +1 -1
- package/dist/features/auth/login.js +1 -1
- package/dist/features/auth/login.js.map +1 -1
- package/dist/features/auth/public-keys.js +1 -1
- package/dist/features/auth/public-keys.js.map +1 -1
- package/dist/features/auth/refresh-token.js +1 -1
- package/dist/features/auth/refresh-token.js.map +1 -1
- package/dist/features/auth/whoami.js +2 -2
- package/dist/features/auth/whoami.js.map +1 -1
- package/dist/features/cascade-delete/hooks.js +4 -6
- package/dist/features/cascade-delete/hooks.js.map +1 -1
- package/dist/features/ci-cd/hooks/release-versioning.js +2 -2
- package/dist/features/ci-cd/hooks/release-versioning.js.map +1 -1
- package/dist/features/contracts/index.js +2 -2
- package/dist/features/contracts/index.js.map +1 -1
- package/dist/features/device-config/device-config.js +4 -0
- package/dist/features/device-config/device-config.js.map +1 -1
- package/dist/features/device-config/download.js +1 -1
- package/dist/features/device-config/download.js.map +1 -1
- package/dist/features/device-logs/lib/backends/loki.d.ts +2 -2
- package/dist/features/device-logs/lib/backends/loki.js +45 -21
- package/dist/features/device-logs/lib/backends/loki.js.map +1 -1
- package/dist/features/device-logs/lib/backends/redis.d.ts +2 -2
- package/dist/features/device-logs/lib/backends/redis.js +12 -7
- package/dist/features/device-logs/lib/backends/redis.js.map +1 -1
- package/dist/features/device-logs/lib/read.js +38 -11
- package/dist/features/device-logs/lib/read.js.map +1 -1
- package/dist/features/device-logs/lib/store.js +1 -1
- package/dist/features/device-logs/lib/store.js.map +1 -1
- package/dist/features/device-logs/lib/struct.d.ts +5 -1
- package/dist/features/device-logs/lib/struct.js.map +1 -1
- package/dist/features/device-provisioning/register.js +1 -1
- package/dist/features/device-provisioning/register.js.map +1 -1
- package/dist/features/device-proxy/device-proxy.js +1 -1
- package/dist/features/device-proxy/device-proxy.js.map +1 -1
- package/dist/features/device-state/routes/fleet-state-get-v3.js +1 -1
- package/dist/features/device-state/routes/fleet-state-get-v3.js.map +1 -1
- package/dist/features/device-state/routes/state-get-v2.js +1 -1
- package/dist/features/device-state/routes/state-get-v2.js.map +1 -1
- package/dist/features/device-state/routes/state-get-v3.js +1 -1
- package/dist/features/device-state/routes/state-get-v3.js.map +1 -1
- package/dist/features/device-state/routes/state-patch-v2.js +1 -1
- package/dist/features/device-state/routes/state-patch-v2.js.map +1 -1
- package/dist/features/device-state/routes/state-patch-v3.js +1 -1
- package/dist/features/device-state/routes/state-patch-v3.js.map +1 -1
- package/dist/features/device-types/routes.js +4 -6
- package/dist/features/device-types/routes.js.map +1 -1
- package/dist/features/host-os-access/access.js +1 -1
- package/dist/features/host-os-access/access.js.map +1 -1
- package/dist/features/registry/registry.js +7 -12
- package/dist/features/registry/registry.js.map +1 -1
- package/dist/features/request-logging/index.js +3 -2
- package/dist/features/request-logging/index.js.map +1 -1
- package/dist/features/vars-schema/hooks/vars-update-trigger.js +1 -3
- package/dist/features/vars-schema/hooks/vars-update-trigger.js.map +1 -1
- package/dist/features/vpn/services.js +3 -3
- package/dist/features/vpn/services.js.map +1 -1
- package/dist/index.js +1 -3
- package/dist/index.js.map +1 -1
- package/dist/infra/auth/jwt-passport.js +42 -35
- package/dist/infra/auth/jwt-passport.js.map +1 -1
- package/dist/infra/auth/permissions.d.ts +5 -3
- package/dist/infra/auth/permissions.js +6 -4
- package/dist/infra/auth/permissions.js.map +1 -1
- package/dist/infra/cascade-delete/index.js +2 -4
- package/dist/infra/cascade-delete/index.js.map +1 -1
- package/dist/infra/error-handling/index.d.ts +0 -3
- package/dist/infra/error-handling/index.js +7 -8
- package/dist/infra/error-handling/index.js.map +1 -1
- package/dist/infra/rate-limiting/index.js +2 -4
- package/dist/infra/rate-limiting/index.js.map +1 -1
- package/dist/infra/redis/index.d.ts +2 -9
- package/dist/infra/request-promise/index.d.ts +3 -13
- package/dist/infra/request-promise/index.js +13 -9
- package/dist/infra/request-promise/index.js.map +1 -1
- package/dist/infra/scheduler/index.js +4 -1
- package/dist/infra/scheduler/index.js.map +1 -1
- package/dist/lib/config.d.ts +7 -2
- package/dist/lib/config.js +8 -6
- package/dist/lib/config.js.map +1 -1
- package/package.json +13 -8
- package/dist/migrations/00102-make-asset-not-null-on-release-asset.sql +0 -2
@@ -1,4 +1,4 @@
|
|
1
|
-
import
|
1
|
+
import pProps from 'p-props';
|
2
2
|
import _ from 'lodash';
|
3
3
|
import randomstring from 'randomstring';
|
4
4
|
import memoize from 'memoizee';
|
@@ -142,7 +142,7 @@ export async function createAllPermissions(tx, permissionNames, roleMap, apiKeyM
|
|
142
142
|
.then(({ id }) => id);
|
143
143
|
}
|
144
144
|
}
|
145
|
-
return await
|
145
|
+
return await pProps(result);
|
146
146
|
});
|
147
147
|
const createRolePermissions = async (rolePermissionNames, roleName) => {
|
148
148
|
try {
|
@@ -189,7 +189,8 @@ export async function createAllPermissions(tx, permissionNames, roleMap, apiKeyM
|
|
189
189
|
throw err;
|
190
190
|
}
|
191
191
|
};
|
192
|
-
const rolesPromise =
|
192
|
+
const rolesPromise = (async () => {
|
193
|
+
const resolvedRoleMap = await pProps(_.mapValues(roleMap, createRolePermissions));
|
193
194
|
// Assign user roles
|
194
195
|
await Promise.all(_.map(userMap, async (userEmails, roleName) => {
|
195
196
|
for (const email of userEmails) {
|
@@ -249,7 +250,8 @@ export async function createAllPermissions(tx, permissionNames, roleMap, apiKeyM
|
|
249
250
|
captureException(err, 'Error on clearing stale permissions');
|
250
251
|
throw err;
|
251
252
|
}
|
252
|
-
|
253
|
+
return resolvedRoleMap;
|
254
|
+
})();
|
253
255
|
const apiKeysPromise = Promise.all(_.toPairs(apiKeyMap).map(async ([roleName, { permissions: apiKeyPermissions, key }]) => {
|
254
256
|
try {
|
255
257
|
const role = await createRolePermissions(apiKeyPermissions, roleName);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"permissions.js","sourceRoot":"","sources":["../../../src/infra/auth/permissions.ts"],"names":[],"mappings":"AAAA,OAAO,
|
1
|
+
{"version":3,"file":"permissions.js","sourceRoot":"","sources":["../../../src/infra/auth/permissions.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,SAAS,CAAC;AAC7B,OAAO,CAAC,MAAM,QAAQ,CAAC;AACvB,OAAO,YAAY,MAAM,cAAc,CAAC;AACxC,OAAO,OAAO,MAAM,UAAU,CAAC;AAE/B,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAExD,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAElE,MAAM,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;AAE1B,MAAM,CAAC,MAAM,eAAe,GAAG,OAAO,CACrC,KAAK,IAAqB,EAAE;IAC3B,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,EAAE,CAAC,eAAe,CAC/C,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC,MAAM,QAAQ,CAAC,OAAO,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CACpD,CAAC;IACF,IAAI,KAAK,EAAE,KAAK,IAAI,IAAI,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC3C,CAAC;IACD,OAAO,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC;AACzB,CAAC,EACD;IACC,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,IAAI;CACf,CACD,CAAC;AAEF,8BAA8B;AAE9B,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,IAAY,EAAE,EAAM,EAAE,EAAE,CACzD,aAAa,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;AAErC,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,IAAY,EAAE,EAAM,EAAE,EAAE,CAC/D,aAAa,CAAC,YAAY,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;AAE3C,MAAM,CAAC,MAAM,oBAAoB,GAAG,CACnC,IAAY,EACZ,UAAkB,EAClB,EAAM,EACL,EAAE,CAAC,aAAa,CAAC,uBAAuB,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC;AAEtE,MAAM,qBAAqB,GAAG,CAC7B,MAAc,EACd,eAAyB,EACzB,EAAM,EACL,EAAE,CACH,OAAO,CAAC,GAAG,CACV,eAAe,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;IAClC,MAAM,UAAU,GAAG,MAAM,uBAAuB,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC3D,MAAM,oBAAoB,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACvD,CAAC,CAAC,CACF,CAAC;AAEH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,IAAY,EAAE,IAAY,EAAE,EAAM,EAAE,EAAE,CACpE,aAAa,CAAC,iBAAiB,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;AAEtD,MAAM,CAAC,MAAM,oBAAoB,GAAG,CACnC,IAAY,EACZ,UAAkB,EAClB,EAAM,EACL,EAAE,CAAC,aAAa,CAAC,uBAAuB,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC;AAEtE,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EAAE,IAAY,EAAE,IAAY,EAAE,EAAM,EAAE,EAAE;IAC1E,MAAM,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC;QACrB,QAAQ,EAAE,iBAAiB;QAC3B,EAAE,EAAE;YACH,IAAI;YACJ,IAAI;SACJ;QACD,WAAW,EAAE;YACZ,EAAE;YACF,GAAG,EAAE,WAAW,CAAC,IAAI;SACrB;KACD,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAkB;AAElB,MAAM,iBAAiB,GAAG,KAAK,EAC9B,OAAe,EACf,IAAoB,EACpB,EAAM,EACL,EAAE;IACH,MAAM,SAAS,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC;QAChC,WAAW,EAAE;YACZ,EAAE;YACF,GAAG,EAAE,WAAW,CAAC,IAAI;SACrB;KACD,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC;QACnC,QAAQ,EAAE,SAAS;QACnB,OAAO,EAAE;YACR,OAAO,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC;YACtB,OAAO,EAAE;gBACR,YAAY,EAAE,OAAO;gBACrB,SAAS,EAAE;oBACV,IAAI,EAAE;wBACL,MAAM,EAAE,KAAK;wBACb,KAAK,EAAE;4BACN,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE;yBACtB;qBACD;iBACD;aACD;SACD;KACD,CAAC,CAAC;IACH,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IAE3B,IAAI,GAAG,KAAK,CAAC,EAAE,CAAC;QACf,MAAM,GAAG,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC;QACpC,MAAM,IAAI,GAAG;YACZ,YAAY,EAAE,OAAO;YACrB,GAAG;SACH,CAAC;QAEF,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC;YAClC,QAAQ,EAAE,SAAS;YACnB,IAAI;SACJ,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,EAAE,GAAG,KAAK,EAAE,GAAG,IAAI,EAAE,CAAC;QACrC,MAAM,SAAS,CAAC,IAAI,CAAC;YACpB,QAAQ,EAAE,oBAAoB;YAC9B,IAAI,EAAE;gBACL,OAAO,EAAE,MAAM,CAAC,EAAE;gBAClB,IAAI,EAAE,IAAI,CAAC,EAAE;aACb;YACD,OAAO,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE;SAClC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IACf,CAAC;SAAM,CAAC;QACP,IAAI,GAAG,GAAG,CAAC,EAAE,CAAC;YACb,OAAO,CAAC,IAAI,CACX,YAAY,OAAO,QAAQ,GAAG,sBAAsB,IAAI,CAAC,EAAE,EAAE,CAC7D,CAAC;QACH,CAAC;QACD,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC;IACnB,CAAC;AACF,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,EAC7B,QAAgB,EAChB,iBAA2B,EAC3B,GAAW,EACX,EAAM,EACL,EAAE;IACH,MAAM,IAAI,GAAG,MAAM,iBAAiB,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IACnD,MAAM,qBAAqB,CAAC,IAAI,CAAC,EAAE,EAAE,iBAAiB,EAAE,EAAE,CAAC,CAAC;IAC5D,MAAM,YAAY,GAAG,MAAM,eAAe,EAAE,CAAC;IAC7C,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,YAAY,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;IAE/D,IAAI,GAAG,EAAE,CAAC;QACT,MAAM,CAAC,GAAG,GAAG,GAAG,CAAC;QACjB,MAAM,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC;YACpB,QAAQ,EAAE,SAAS;YACnB,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,WAAW,EAAE;gBACZ,GAAG,EAAE,WAAW,CAAC,IAAI;gBACrB,EAAE;aACF;YACD,IAAI,EAAE;gBACL,GAAG;aACH;SACD,CAAC,CAAC;IACJ,CAAC;IACD,OAAO,MAAM,CAAC;AACf,CAAC,CAAC;AAqBF,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACzC,EAAM,EACN,eAA8B,EAC9B,OAA2B,EAC3B,SAA+B,EAC/B,OAAoB;IAEpB,MAAM,KAAK,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,EAAE,GAAG,EAAE,WAAW,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IAE7E,MAAM,gBAAgB,GAAG,KAAK;SAC5B,GAAG,CAAC;QACJ,QAAQ,EAAE,YAAY;QACtB,OAAO,EAAE;YACR,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC;YACvB,OAAO,EAAE,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,eAAe,EAAE,EAAE;SAC3C;KACD,CAAC;SACD,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;QACrB,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;QACtE,MAAM,MAAM,GAAyC,EAAE,CAAC;QACxD,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE,CAAC;YAC9C,IAAI,cAAc,CAAC,cAAc,CAAC,IAAI,IAAI,EAAE,CAAC;gBAC5C,MAAM,CAAC,cAAc,CAAC,GAAG,cAAc,CAAC,cAAc,CAAC,CAAC;YACzD,CAAC;iBAAM,CAAC;gBACP,MAAM,CAAC,cAAc,CAAC,GAAG,KAAK;qBAC5B,IAAI,CAAC;oBACL,QAAQ,EAAE,YAAY;oBACtB,IAAI,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE;oBAC9B,OAAO,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE;iBAClC,CAAC;qBACD,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;YACxB,CAAC;QACF,CAAC;QACD,OAAO,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEJ,MAAM,qBAAqB,GAAG,KAAK,EAClC,mBAA6B,EAC7B,QAAgB,EACU,EAAE;QAC5B,IAAI,CAAC;YACJ,MAAM,IAAI,GAAG,MAAM,iBAAiB,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YACnD,IAAI,mBAAmB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACtC,OAAO,IAAI,CAAC;YACb,CAAC;YACD,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAC1B,CAAC,CAAC,IAAI,CAAC,MAAM,gBAAgB,EAAE,mBAAmB,CAAC,CACnD,CAAC;YACF,MAAM,qBAAqB,GAAG,CAAC,KAAK,IAAI,EAAE;gBACzC,MAAM,eAAe,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC;oBACvC,QAAQ,EAAE,uBAAuB;oBACjC,OAAO,EAAE;wBACR,OAAO,EAAE,YAAY;wBACrB,OAAO,EAAE;4BACR,IAAI,EAAE,IAAI,CAAC,EAAE;4BACb,UAAU,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE;yBAC1B;qBACD;iBACD,CAAC,CAAC;gBACH,MAAM,iBAAiB,GAAa,eAAe,CAAC,GAAG,CACtD,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CACnC,CAAC;gBACF,MAAM,OAAO,CAAC,GAAG,CAChB,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CACzD,KAAK,CAAC,IAAI,CAAC;oBACV,QAAQ,EAAE,uBAAuB;oBACjC,IAAI,EAAE;wBACL,IAAI,EAAE,IAAI,CAAC,EAAE;wBACb,UAAU;qBACV;oBACD,OAAO,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE;iBAClC,CAAC,CACF,CACD,CAAC;YACH,CAAC,CAAC,EAAE,CAAC;YACL,MAAM,wBAAwB,GAAG,KAAK,CAAC,MAAM,CAAC;gBAC7C,QAAQ,EAAE,uBAAuB;gBACjC,OAAO,EAAE;oBACR,OAAO,EAAE;wBACR,IAAI,EAAE,IAAI,CAAC,EAAE;wBACb,IAAI,EAAE,EAAE,UAAU,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;qBACpC;iBACD;aACD,CAAC,CAAC;YACH,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,qBAAqB,EAAE,wBAAwB,CAAC,CAAC,CAAC;YACrE,OAAO,IAAI,CAAC;QACb,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACd,gBAAgB,CAAC,GAAG,EAAE,wBAAwB,QAAQ,EAAE,CAAC,CAAC;YAC1D,MAAM,GAAG,CAAC;QACX,CAAC;IACF,CAAC,CAAC;IAEF,MAAM,YAAY,GAAG,CAAC,KAAK,IAAI,EAAE;QAChC,MAAM,eAAe,GAAG,MAAM,MAAM,CACnC,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAC3C,CAAC;QACF,oBAAoB;QACpB,MAAM,OAAO,CAAC,GAAG,CAChB,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE;YAC7C,KAAK,MAAM,KAAK,IAAI,UAAU,EAAE,CAAC;gBAChC,IAAI,CAAC;oBACJ,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,KAAK,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;oBAC/C,IAAI,IAAI,EAAE,EAAE,IAAI,IAAI,EAAE,CAAC;wBACtB,MAAM,IAAI,KAAK,CAAC,QAAQ,KAAK,aAAa,CAAC,CAAC;oBAC7C,CAAC;oBACD,MAAM,cAAc,CAAC,IAAI,CAAC,EAAE,EAAE,eAAe,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;gBACjE,CAAC;gBAAC,MAAM,CAAC;oBACR,gBAAgB;gBACjB,CAAC;YACF,CAAC;QACF,CAAC,CAAC,CACF,CAAC;QACF,wDAAwD;QACxD,MAAM,KAAK,GAAG,MAAM,gBAAgB,CAAC;QACrC,IAAI,CAAC;YACJ,MAAM,KAAK,CAAC,MAAM,CAAC;gBAClB,QAAQ,EAAE,YAAY;gBACtB,OAAO,EAAE;oBACR,OAAO,EAAE;wBACR,IAAI,EAAE;4BACL,GAAG,EAAE;gCACJ;oCACC,WAAW,EAAE;wCACZ,IAAI,EAAE;4CACL,MAAM,EAAE,KAAK;4CACb,KAAK,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE;yCACrC;qCACD;iCACD;gCACD;oCACC,WAAW,EAAE;wCACZ,IAAI,EAAE;4CACL,MAAM,EAAE,KAAK;4CACb,KAAK,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE;yCACrC;qCACD;iCACD;gCACD;oCACC,cAAc,EAAE;wCACf,IAAI,EAAE;4CACL,MAAM,EAAE,KAAK;4CACb,KAAK,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE;yCACrC;qCACD;iCACD;gCACD,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE;6BACrC;yBACD;qBACD;iBACD;aACD,CAAC,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACd,gBAAgB,CAAC,GAAG,EAAE,qCAAqC,CAAC,CAAC;YAC7D,MAAM,GAAG,CAAC;QACX,CAAC;QACD,OAAO,eAAe,CAAC;IACxB,CAAC,CAAC,EAAE,CAAC;IAEL,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CACjC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,GAAG,CACvB,KAAK,EAAE,CAAC,QAAQ,EAAE,EAAE,WAAW,EAAE,iBAAiB,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE;QAC7D,IAAI,CAAC;YACJ,MAAM,IAAI,GAAG,MAAM,qBAAqB,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC;YACtE,MAAM,YAAY,GAAG,MAAM,eAAe,EAAE,CAAC;YAC7C,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,YAAY,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;YAE/D,IAAI,CAAC,GAAG,EAAE,CAAC;gBACV,OAAO,MAAM,CAAC,GAAG,CAAC;YACnB,CAAC;YACD,MAAM,KAAK,CAAC,KAAK,CAAC;gBACjB,QAAQ,EAAE,SAAS;gBACnB,EAAE,EAAE,MAAM,CAAC,EAAE;gBACb,IAAI,EAAE;oBACL,GAAG;iBACH;aACD,CAAC,CAAC;YACH,+CAA+C;YAC/C,+BAA+B;YAC/B,OAAO,GAAG,CAAC;QACZ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACd,gBAAgB,CAAC,GAAG,EAAE,kBAAkB,QAAQ,WAAW,CAAC,CAAC;QAC9D,CAAC;IACF,CAAC,CACD,CACD,CAAC;IAEF,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC,CAAC;IAC3E,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;AAC3B,CAAC"}
|
@@ -4,7 +4,7 @@ export function addDeleteHookForDependents(model, resource, dependents) {
|
|
4
4
|
const dependentResources = Object.keys(dependents);
|
5
5
|
hooks.addPureHook('DELETE', model, resource, {
|
6
6
|
PRERUN: async (args) => {
|
7
|
-
const { api
|
7
|
+
const { api } = args;
|
8
8
|
const resourceIds = await sbvrUtils.getAffectedIds(args);
|
9
9
|
if (resourceIds.length === 0) {
|
10
10
|
return;
|
@@ -23,9 +23,7 @@ export function addDeleteHookForDependents(model, resource, dependents) {
|
|
23
23
|
});
|
24
24
|
}
|
25
25
|
catch (err) {
|
26
|
-
captureException(err, `Error deleting resource '${dependentResource}' before deleting '${resource}'
|
27
|
-
req,
|
28
|
-
});
|
26
|
+
captureException(err, `Error deleting resource '${dependentResource}' before deleting '${resource}'`);
|
29
27
|
throw err;
|
30
28
|
}
|
31
29
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/infra/cascade-delete/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAE9D,MAAM,UAAU,0BAA0B,CACzC,KAAa,EACb,QAAgB,EAChB,UAEC;IAED,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAEnD,KAAK,CAAC,WAAW,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE;QAC5C,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YACtB,MAAM,EAAE,GAAG,EAAE,GAAG,
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/infra/cascade-delete/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAE9D,MAAM,UAAU,0BAA0B,CACzC,KAAa,EACb,QAAgB,EAChB,UAEC;IAED,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAEnD,KAAK,CAAC,WAAW,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE;QAC5C,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YACtB,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;YAErB,MAAM,WAAW,GAAG,MAAM,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;YACzD,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC9B,OAAO;YACR,CAAC;YAED,KAAK,MAAM,iBAAiB,IAAI,kBAAkB,EAAE,CAAC;gBACpD,MAAM,eAAe,GAAG,UAAU,CAAC,iBAAiB,CAAC,CAAC;gBACtD,IAAI,CAAC;oBACJ,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC;wBAC5C,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;wBAC7D,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,EAAE,CAAC;oBAC/C,MAAM,GAAG,CAAC,MAAM,CAAC;wBAChB,QAAQ,EAAE,iBAAiB;wBAC3B,OAAO,EAAE;4BACR,OAAO,EAAE,MAAM;yBACf;qBACD,CAAC,CAAC;gBACJ,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACd,gBAAgB,CACf,GAAG,EACH,4BAA4B,iBAAiB,sBAAsB,QAAQ,GAAG,CAC9E,CAAC;oBACF,MAAM,GAAG,CAAC;gBACX,CAAC;YACF,CAAC;QACF,CAAC;KACD,CAAC,CAAC;AACJ,CAAC"}
|
@@ -1,12 +1,9 @@
|
|
1
|
-
import * as Sentry from '@sentry/node';
|
2
|
-
import type { hooks } from '@balena/pinejs';
|
3
1
|
import { errors } from '@balena/pinejs';
|
4
2
|
export declare const translateError: (err: Error | number | string) => string;
|
5
3
|
export declare function captureException(err: Error, message?: string, options?: {
|
6
4
|
tags?: {
|
7
5
|
[key: string]: string;
|
8
6
|
};
|
9
|
-
req?: Sentry.PolymorphicRequest | hooks.HookReq;
|
10
7
|
extra?: AnyObject;
|
11
8
|
}): void;
|
12
9
|
/** Captures and returns an InternalRequestError */
|
@@ -2,6 +2,7 @@ import _ from 'lodash';
|
|
2
2
|
import * as Sentry from '@sentry/node';
|
3
3
|
import escapeHtml from 'escape-html';
|
4
4
|
import { errors, sbvrUtils } from '@balena/pinejs';
|
5
|
+
import { trace } from '@opentelemetry/api';
|
5
6
|
const { InternalRequestError, HttpError } = errors;
|
6
7
|
export const translateError = (err) => {
|
7
8
|
if (err instanceof InternalRequestError) {
|
@@ -21,22 +22,20 @@ export const translateError = (err) => {
|
|
21
22
|
return escapeHtml(message);
|
22
23
|
};
|
23
24
|
export function captureException(err, message, options) {
|
25
|
+
const traceId = trace.getActiveSpan()?.spanContext().traceId ?? '';
|
24
26
|
// if err does not have a message or a stack, we have no information about that error
|
25
27
|
if (_.isObject(err) && err.message == null) {
|
26
|
-
console.error(message, err);
|
28
|
+
console.error(traceId, message, err);
|
27
29
|
}
|
28
30
|
else {
|
29
|
-
console.error(message, err.message, err.stack);
|
31
|
+
console.error(traceId, message, err.message, err.stack);
|
30
32
|
}
|
31
33
|
Sentry.withScope((scope) => {
|
32
34
|
if (options != null) {
|
33
|
-
const { tags,
|
35
|
+
const { tags, extra } = options;
|
34
36
|
if (tags != null) {
|
35
37
|
scope.setTags(tags);
|
36
38
|
}
|
37
|
-
if (req != null) {
|
38
|
-
scope.addEventProcessor((evt) => Sentry.addRequestDataToEvent(evt, req));
|
39
|
-
}
|
40
39
|
if (extra != null) {
|
41
40
|
scope.setExtras(extra);
|
42
41
|
}
|
@@ -60,9 +59,9 @@ export const ThisShouldNeverHappenError = (errorMessage, options) => {
|
|
60
59
|
captureException(error, errorMessage, options);
|
61
60
|
return error;
|
62
61
|
};
|
63
|
-
sbvrUtils.onHandleHttpError((
|
62
|
+
sbvrUtils.onHandleHttpError((_req, err) => {
|
64
63
|
if (err instanceof InternalRequestError) {
|
65
|
-
captureException(err, 'Internal server error'
|
64
|
+
captureException(err, 'Internal server error');
|
66
65
|
err.body ??= 'Server error';
|
67
66
|
}
|
68
67
|
});
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/infra/error-handling/index.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,QAAQ,CAAC;AACvB,OAAO,KAAK,MAAM,MAAM,cAAc,CAAC;AACvC,OAAO,UAAU,MAAM,aAAa,CAAC;
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/infra/error-handling/index.ts"],"names":[],"mappings":"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"}
|
@@ -107,9 +107,7 @@ const $createRateLimitMiddleware = (rateLimiter, { ignoreIP = false, allowReset
|
|
107
107
|
await Promise.all([rateLimiter.delete(key), resetRatelimit?.()]);
|
108
108
|
}
|
109
109
|
catch (err) {
|
110
|
-
captureException(err, 'Error failed to reset rate limit counter'
|
111
|
-
req,
|
112
|
-
});
|
110
|
+
captureException(err, 'Error failed to reset rate limit counter');
|
113
111
|
}
|
114
112
|
};
|
115
113
|
};
|
@@ -125,7 +123,7 @@ const $createRateLimitMiddleware = (rateLimiter, { ignoreIP = false, allowReset
|
|
125
123
|
if (handleHttpErrors(req, res, err)) {
|
126
124
|
return;
|
127
125
|
}
|
128
|
-
captureException(err, 'Error during rate limiting'
|
126
|
+
captureException(err, 'Error during rate limiting');
|
129
127
|
res.status(500).end();
|
130
128
|
}
|
131
129
|
};
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/infra/rate-limiting/index.ts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/infra/rate-limiting/index.ts"],"names":[],"mappings":"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"}
|
@@ -2,10 +2,7 @@ import { Redis } from 'ioredis';
|
|
2
2
|
import * as NodeRedis from 'redis';
|
3
3
|
import type { REDIS } from '../../lib/config.js';
|
4
4
|
import { getNodeRedisOptions, getRedisOptions } from './config.js';
|
5
|
-
export declare const createIsolatedNodeRedis: (
|
6
|
-
readOnly?: boolean;
|
7
|
-
instance?: keyof typeof REDIS;
|
8
|
-
} | undefined) => Promise<NodeRedis.RedisClusterType<{
|
5
|
+
export declare const createIsolatedNodeRedis: (...args: Parameters<typeof getNodeRedisOptions>) => Promise<NodeRedis.RedisClusterType<{
|
9
6
|
graph: {
|
10
7
|
CONFIG_GET: typeof import("@redis/graph/dist/commands/CONFIG_GET.js");
|
11
8
|
configGet: typeof import("@redis/graph/dist/commands/CONFIG_GET.js");
|
@@ -584,11 +581,7 @@ export declare const createIsolatedNodeRedis: (args_0?: {
|
|
584
581
|
reserve: typeof import("@redis/bloom/dist/commands/top-k/RESERVE.js");
|
585
582
|
};
|
586
583
|
} & NodeRedis.RedisModules, NodeRedis.RedisFunctions, NodeRedis.RedisScripts>>;
|
587
|
-
export declare const createIsolatedRedis: (
|
588
|
-
readOnly?: boolean;
|
589
|
-
instance?: keyof typeof REDIS;
|
590
|
-
enableAutoPipelining?: boolean;
|
591
|
-
} | undefined) => Redis | import("ioredis").Cluster;
|
584
|
+
export declare const createIsolatedRedis: (...args: Parameters<typeof getRedisOptions>) => Redis | import("ioredis").Cluster;
|
592
585
|
export declare const redis: Redis | import("ioredis").Cluster;
|
593
586
|
export declare const redisRO: Redis | import("ioredis").Cluster;
|
594
587
|
export declare const nodeRedis: NodeRedis.RedisClusterType<{
|
@@ -1,15 +1,5 @@
|
|
1
|
-
import Bluebird from 'bluebird';
|
2
1
|
import request from 'request';
|
3
|
-
type Request = typeof request;
|
4
2
|
export type RequestResponse = [request.Response, any];
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
postAsync: (arg1: (request.UriOptions & request.CoreOptions) | (request.UrlOptions & request.CoreOptions)) => Bluebird<RequestResponse>;
|
9
|
-
putAsync: (arg1: (request.UriOptions & request.CoreOptions) | (request.UrlOptions & request.CoreOptions)) => Bluebird<RequestResponse>;
|
10
|
-
delAsync: (arg1: (request.UriOptions & request.CoreOptions) | (request.UrlOptions & request.CoreOptions)) => Bluebird<RequestResponse>;
|
11
|
-
}
|
12
|
-
export declare const defaultRequest: request.RequestAPI<request.Request, request.CoreOptions, request.RequiredUriUrl>;
|
13
|
-
declare const promisifiedRequest: PromisifiedRequest;
|
14
|
-
export declare const requestAsync: (arg1: (request.UriOptions & request.CoreOptions) | (request.UrlOptions & request.CoreOptions)) => Bluebird<RequestResponse>;
|
15
|
-
export default promisifiedRequest;
|
3
|
+
declare const defaultRequest: request.RequestAPI<request.Request, request.CoreOptions, request.RequiredUriUrl>;
|
4
|
+
export declare const requestAsync: (arg1: (request.UriOptions & request.CoreOptions) | (request.UrlOptions & request.CoreOptions)) => Promise<RequestResponse>;
|
5
|
+
export default defaultRequest;
|
@@ -1,14 +1,18 @@
|
|
1
|
-
import Bluebird from 'bluebird';
|
2
1
|
import request from 'request';
|
3
2
|
import { EXTERNAL_HTTP_TIMEOUT_MS } from '../../lib/config.js';
|
4
|
-
|
3
|
+
const defaultRequest = request.defaults({
|
5
4
|
timeout: EXTERNAL_HTTP_TIMEOUT_MS,
|
6
5
|
});
|
7
|
-
const
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
6
|
+
export const requestAsync = (arg1) => {
|
7
|
+
return new Promise((resolve, reject) => {
|
8
|
+
defaultRequest(arg1, (err, res, body) => {
|
9
|
+
if (err) {
|
10
|
+
reject(err);
|
11
|
+
return;
|
12
|
+
}
|
13
|
+
resolve([res, body]);
|
14
|
+
});
|
15
|
+
});
|
16
|
+
};
|
17
|
+
export default defaultRequest;
|
14
18
|
//# sourceMappingURL=index.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/infra/request-promise/index.ts"],"names":[],"mappings":"AAAA,OAAO,
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/infra/request-promise/index.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAI/D,MAAM,cAAc,GAAG,OAAO,CAAC,QAAQ,CAAC;IACvC,OAAO,EAAE,wBAAwB;CACjC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,YAAY,GAAG,CAC3B,IAE6C,EAC5C,EAAE;IACH,OAAO,IAAI,OAAO,CAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACvD,cAAc,CAAC,IAAI,EAAE,CAAC,GAAU,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YAC9C,IAAI,GAAG,EAAE,CAAC;gBACT,MAAM,CAAC,GAAG,CAAC,CAAC;gBACZ,OAAO;YACR,CAAC;YACD,OAAO,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,cAAc,CAAC"}
|
@@ -52,7 +52,10 @@ const updateJobInfoExecute = async (jobInfoKey, job) => {
|
|
52
52
|
export const jobIds = [];
|
53
53
|
export const scheduleJob = (jobId, rule, jobFunction, lockOptions) => {
|
54
54
|
jobIds.push(jobId);
|
55
|
-
|
55
|
+
// TODO: Change this to `lockOptions?.ttl ?? JOB_DEFAULT_TTL` in the next major.
|
56
|
+
const ttl = lockOptions?.ttl != null && lockOptions.ttl !== 0
|
57
|
+
? lockOptions.ttl
|
58
|
+
: JOB_DEFAULT_TTL;
|
56
59
|
const jobLockKey = JOB_LOCK_PREFIX + jobId;
|
57
60
|
const jobInfoKey = JOB_INFO_PREFIX + jobId;
|
58
61
|
const job = schedule.scheduleJob(jobId, rule, async (fireDate) => {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/infra/scheduler/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;EAiBE;AAEF,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,QAAQ,MAAM,eAAe,CAAC;AACrC,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAI9D,MAAM,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;AAe1B,MAAM,eAAe,GAAG,mBAAmB,CAAC;AAC5C,MAAM,eAAe,GAAG,gBAAgB,CAAC;AACzC,MAAM,eAAe,GAAG,IAAI,CAAC;AAY7B,MAAM,MAAM,GAAG,IAAI,OAAO,CAAC,CAAC,KAAK,CAAC,EAAE;IACnC,UAAU,EAAE,CAAC;IACb,UAAU,EAAE,EAAE;IACd,WAAW,EAAE,EAAE;CACf,CAAC,CAAC;AAEH,MAAM,qBAAqB,GAAG,KAAK,EAClC,UAAkB,EAClB,GAAiB,EACjB,QAAc,EACK,EAAE;IACrB,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAE5C,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;QACnB,MAAM,oBAAoB,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;QAC5C,OAAO,IAAI,CAAC;IACb,CAAC;IACD,MAAM,OAAO,GAAY,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC3C,OAAO,CACN,OAAO,CAAC,cAAc,IAAI,IAAI;QAC9B,OAAO,CAAC,cAAc,IAAI,QAAQ,CAAC,OAAO,EAAE;QAC5C,OAAO,CAAC,cAAc,GAAG,GAAG,CAAC,cAAc,EAAE,CAAC,OAAO,EAAE,CACvD,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,KAAK,EAAE,UAAkB,EAAE,GAAiB,EAAE,EAAE;IAC5E,MAAM,OAAO,GAAY;QACxB,cAAc,EAAE,GAAG,CAAC,cAAc,EAAE,CAAC,OAAO,EAAE;KAC9C,CAAC;IACF,MAAM,iBAAiB,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IAClD,MAAM,KAAK,CAAC,GAAG,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;AAChD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,MAAM,GAAa,EAAE,CAAC;AACnC,MAAM,CAAC,MAAM,WAAW,GAAG,CAC1B,KAAa,EACb,IAKS,EACT,WAAwB,EACxB,WAA0B,EACX,EAAE;IACjB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACnB,MAAM,GAAG,
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/infra/scheduler/index.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/config.d.ts
CHANGED
@@ -97,6 +97,7 @@ export declare const LOKI_QUERY_HOST: string | undefined;
|
|
97
97
|
export declare const LOKI_INGESTER_GRPC_PORT: number;
|
98
98
|
export declare const LOKI_QUERY_HTTP_PORT: number;
|
99
99
|
export declare const LOKI_HISTORY_GZIP: boolean;
|
100
|
+
export declare const LOKI_HISTORY_TIMEOUT: number;
|
100
101
|
export declare const LOKI_GRPC_SEND_GZIP: boolean;
|
101
102
|
export declare const LOKI_GRPC_RECEIVE_COMPRESSION_LEVEL: number;
|
102
103
|
export declare const LOKI_WRITE_PCT: number;
|
@@ -122,6 +123,9 @@ export declare const LOGS_DEFAULT_SUBSCRIPTION_COUNT = 0;
|
|
122
123
|
export declare const LOGS_SUBSCRIPTION_EXPIRY_SECONDS: number;
|
123
124
|
export declare const LOGS_SUBSCRIPTION_EXPIRY_HEARTBEAT_SECONDS: number;
|
124
125
|
export declare const LOGS_DEFAULT_RETENTION_LIMIT = 1000;
|
126
|
+
export declare const LOGS_DEFAULT_RETENTION_DURATION: number;
|
127
|
+
export declare const LOGS_DEFAULT_HISTORY_STREAMING_LOOKBACK: number;
|
128
|
+
export declare const LOGS_DEFAULT_HISTORY_LOOKBACK: number;
|
125
129
|
export declare const LOGS_PRIMARY_BACKEND: string;
|
126
130
|
export declare const LOGS_READ_STREAM_FLUSH_INTERVAL: number;
|
127
131
|
export declare const LOGS_STREAM_FLUSH_INTERVAL: number;
|
@@ -129,7 +133,6 @@ export declare const LOGS_BACKEND_UNAVAILABLE_FLUSH_INTERVAL: number;
|
|
129
133
|
export declare const LOGS_WRITE_BUFFER_LIMIT: number;
|
130
134
|
export declare const PINEJS_QUEUE_CONCURRENCY: number;
|
131
135
|
export declare let PINEJS_QUEUE_INTERVAL_MS: number;
|
132
|
-
export declare let PINEJS_WEBRESOURCE_MULTIPART_ENABLED: boolean;
|
133
136
|
export declare const ASYNC_TASK_ATTEMPT_LIMIT: number;
|
134
137
|
export declare let ASYNC_TASK_CREATE_SERVICE_INSTALLS_ENABLED: boolean;
|
135
138
|
export declare const ASYNC_TASK_CREATE_SERVICE_INSTALLS_BATCH_SIZE: number;
|
@@ -146,6 +149,8 @@ export declare const TOKEN_AUTH_CERT_PUB: string;
|
|
146
149
|
export declare const TOKEN_AUTH_JWT_ALGO: string;
|
147
150
|
export declare const VPN_SERVICE_API_KEY: string;
|
148
151
|
export declare const VPN_GUEST_API_KEY: string | undefined;
|
152
|
+
/** Set a large expiry so that huge pulls/pushes go through without needing to re-authenticate mid-process. */
|
153
|
+
export declare const REGISTRY_TOKEN_EXPIRY_SECONDS: number;
|
149
154
|
export declare let DEFAULT_SUPERVISOR_POLL_INTERVAL: number;
|
150
155
|
export declare const HIDE_UNVERSIONED_ENDPOINT: boolean;
|
151
156
|
export declare const METRICS_MAX_REPORT_INTERVAL_SECONDS: number;
|
@@ -168,6 +173,7 @@ export declare const RESOLVE_IMAGE_LOCATION_CACHE_TIMEOUT: number;
|
|
168
173
|
export declare const RESOLVE_IMAGE_READ_ACCESS_CACHE_TIMEOUT: number;
|
169
174
|
export declare const VPN_AUTH_CACHE_TIMEOUT: number;
|
170
175
|
export declare const DEVICE_LOGS_WRITE_AUTH_CACHE_TIMEOUT: number;
|
176
|
+
export declare const DEVICE_LOGS_LOKI_CONTEXT_CACHE_TIMEOUT: number;
|
171
177
|
export declare const API_KEY_ROLE_CACHE_TIMEOUT: number;
|
172
178
|
export declare const GZIP_COMPRESSION_QUALITY: number;
|
173
179
|
export declare const BROTLI_COMPRESSION_QUALITY: number;
|
@@ -194,6 +200,5 @@ export declare const TEST_MOCK_ONLY: {
|
|
194
200
|
ASYNC_TASKS_ENABLED: typeof ASYNC_TASKS_ENABLED;
|
195
201
|
ASYNC_TASK_CREATE_SERVICE_INSTALLS_ENABLED: typeof ASYNC_TASK_CREATE_SERVICE_INSTALLS_ENABLED;
|
196
202
|
PINEJS_QUEUE_INTERVAL_MS: typeof PINEJS_QUEUE_INTERVAL_MS;
|
197
|
-
PINEJS_WEBRESOURCE_MULTIPART_ENABLED: typeof PINEJS_WEBRESOURCE_MULTIPART_ENABLED;
|
198
203
|
};
|
199
204
|
export {};
|
package/dist/lib/config.js
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
import { boolVar, HOURS, intVar, MINUTES, optionalVar, requiredVar, SECONDS, hostPortsVar, trustProxyVar, arrayVar, } from '@balena/env-parsing';
|
1
|
+
import { boolVar, HOURS, intVar, MINUTES, optionalVar, requiredVar, SECONDS, hostPortsVar, trustProxyVar, arrayVar, DAYS, SECONDS_PER_HOUR, } from '@balena/env-parsing';
|
2
2
|
// Even though we only use these when TRUST_PROXY we do not conditionally
|
3
3
|
// import them, since that makes the execution order harder to predict.
|
4
4
|
import proxyAddr from 'proxy-addr';
|
@@ -182,6 +182,7 @@ export const LOKI_QUERY_HOST = optionalVar('LOKI_QUERY_HOST', LOKI_HOST);
|
|
182
182
|
export const LOKI_INGESTER_GRPC_PORT = intVar('LOKI_INGESTER_GRPC_PORT', 9095);
|
183
183
|
export const LOKI_QUERY_HTTP_PORT = intVar('LOKI_QUERY_HTTP_PORT', 3100);
|
184
184
|
export const LOKI_HISTORY_GZIP = boolVar('LOKI_HISTORY_GZIP', true);
|
185
|
+
export const LOKI_HISTORY_TIMEOUT = intVar('LOKI_HISTORY_TIMEOUT', 55000);
|
185
186
|
export const LOKI_GRPC_SEND_GZIP = boolVar('LOKI_GRPC_SEND_GZIP', true);
|
186
187
|
export const LOKI_GRPC_RECEIVE_COMPRESSION_LEVEL = intVar('LOKI_GRPC_RECEIVE_COMPRESSION_LEVEL', 2);
|
187
188
|
// control the percent of logs written to Loki while scaling up
|
@@ -221,6 +222,9 @@ export const LOGS_DEFAULT_SUBSCRIPTION_COUNT = 0;
|
|
221
222
|
export const LOGS_SUBSCRIPTION_EXPIRY_SECONDS = 60 * 60;
|
222
223
|
export const LOGS_SUBSCRIPTION_EXPIRY_HEARTBEAT_SECONDS = LOGS_SUBSCRIPTION_EXPIRY_SECONDS / 2;
|
223
224
|
export const LOGS_DEFAULT_RETENTION_LIMIT = 1000;
|
225
|
+
export const LOGS_DEFAULT_RETENTION_DURATION = 30 * DAYS;
|
226
|
+
export const LOGS_DEFAULT_HISTORY_STREAMING_LOOKBACK = intVar('LOGS_DEFAULT_HISTORY_STREAMING_LOOKBACK', 1 * DAYS);
|
227
|
+
export const LOGS_DEFAULT_HISTORY_LOOKBACK = intVar('LOGS_DEFAULT_HISTORY_LOOKBACK', LOGS_DEFAULT_RETENTION_DURATION);
|
224
228
|
export const LOGS_PRIMARY_BACKEND = optionalVar('LOGS_PRIMARY_BACKEND', 'redis');
|
225
229
|
if (LOGS_PRIMARY_BACKEND !== 'redis' && LOGS_PRIMARY_BACKEND !== 'loki') {
|
226
230
|
throw new Error('LOGS_PRIMARY_BACKEND must be either "redis" or "loki"');
|
@@ -247,7 +251,6 @@ export const LOGS_BACKEND_UNAVAILABLE_FLUSH_INTERVAL = intVar('LOGS_BACKEND_UNAV
|
|
247
251
|
export const LOGS_WRITE_BUFFER_LIMIT = intVar('LOGS_WRITE_BUFFER_LIMIT', 50);
|
248
252
|
export const PINEJS_QUEUE_CONCURRENCY = intVar('PINEJS_QUEUE_CONCURRENCY', 1);
|
249
253
|
export let PINEJS_QUEUE_INTERVAL_MS = intVar('PINEJS_QUEUE_INTERVAL_MS', 1000);
|
250
|
-
export let PINEJS_WEBRESOURCE_MULTIPART_ENABLED = boolVar('PINEJS_WEBRESOURCE_MULTIPART_ENABLED', true);
|
251
254
|
export const ASYNC_TASK_ATTEMPT_LIMIT = intVar('ASYNC_TASK_ATTEMPT_LIMIT', 2 ** 31 - 1);
|
252
255
|
export let ASYNC_TASK_CREATE_SERVICE_INSTALLS_ENABLED = boolVar('ASYNC_TASK_CREATE_SERVICE_INSTALLS_ENABLED', false);
|
253
256
|
export const ASYNC_TASK_CREATE_SERVICE_INSTALLS_BATCH_SIZE = intVar('ASYNC_TASK_CREATE_SERVICE_INSTALLS_BATCH_SIZE', 2000);
|
@@ -264,6 +267,8 @@ export const TOKEN_AUTH_CERT_PUB = requiredVar('TOKEN_AUTH_CERT_PUB');
|
|
264
267
|
export const TOKEN_AUTH_JWT_ALGO = requiredVar('TOKEN_AUTH_JWT_ALGO');
|
265
268
|
export const VPN_SERVICE_API_KEY = requiredVar('VPN_SERVICE_API_KEY');
|
266
269
|
export const VPN_GUEST_API_KEY = optionalVar('VPN_GUEST_API_KEY');
|
270
|
+
/** Set a large expiry so that huge pulls/pushes go through without needing to re-authenticate mid-process. */
|
271
|
+
export const REGISTRY_TOKEN_EXPIRY_SECONDS = intVar('REGISTRY_TOKEN_EXPIRY_SECONDS', 4 * SECONDS_PER_HOUR);
|
267
272
|
export let DEFAULT_SUPERVISOR_POLL_INTERVAL = intVar('DEFAULT_SUPERVISOR_POLL_INTERVAL', 10 * MINUTES);
|
268
273
|
export const HIDE_UNVERSIONED_ENDPOINT = boolVar('HIDE_UNVERSIONED_ENDPOINT', true);
|
269
274
|
export const METRICS_MAX_REPORT_INTERVAL_SECONDS = intVar('METRICS_MAX_REPORT_INTERVAL_SECONDS', 60);
|
@@ -292,6 +297,7 @@ export const RESOLVE_IMAGE_LOCATION_CACHE_TIMEOUT = intVar('RESOLVE_IMAGE_LOCATI
|
|
292
297
|
export const RESOLVE_IMAGE_READ_ACCESS_CACHE_TIMEOUT = intVar('RESOLVE_IMAGE_READ_ACCESS_CACHE_TIMEOUT', 5 * MINUTES);
|
293
298
|
export const VPN_AUTH_CACHE_TIMEOUT = intVar('VPN_AUTH_CACHE_TIMEOUT', 5 * MINUTES);
|
294
299
|
export const DEVICE_LOGS_WRITE_AUTH_CACHE_TIMEOUT = intVar('DEVICE_LOGS_WRITE_AUTH_CACHE_TIMEOUT', 5 * MINUTES);
|
300
|
+
export const DEVICE_LOGS_LOKI_CONTEXT_CACHE_TIMEOUT = intVar('DEVICE_LOGS_LOKI_CONTEXT_CACHE_TIMEOUT', 5 * MINUTES);
|
295
301
|
export const API_KEY_ROLE_CACHE_TIMEOUT = intVar('API_KEY_ROLE_CACHE_TIMEOUT', 5 * MINUTES);
|
296
302
|
export const GZIP_COMPRESSION_QUALITY = intVar('GZIP_COMPRESSION_QUALITY', -1);
|
297
303
|
export const BROTLI_COMPRESSION_QUALITY = intVar('BROTLI_COMPRESSION_QUALITY', 4);
|
@@ -389,9 +395,5 @@ export const TEST_MOCK_ONLY = {
|
|
389
395
|
guardTestMockOnly();
|
390
396
|
PINEJS_QUEUE_INTERVAL_MS = v;
|
391
397
|
},
|
392
|
-
set PINEJS_WEBRESOURCE_MULTIPART_ENABLED(v) {
|
393
|
-
guardTestMockOnly();
|
394
|
-
PINEJS_WEBRESOURCE_MULTIPART_ENABLED = v;
|
395
|
-
},
|
396
398
|
};
|
397
399
|
//# sourceMappingURL=config.js.map
|
package/dist/lib/config.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"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"}
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"AACA,OAAO,EACN,OAAO,EACP,KAAK,EACL,MAAM,EACN,OAAO,EACP,WAAW,EACX,WAAW,EACX,OAAO,EACP,YAAY,EACZ,aAAa,EACb,QAAQ,EACR,IAAI,EACJ,gBAAgB,GAChB,MAAM,qBAAqB,CAAC;AAE7B,yEAAyE;AACzE,uEAAuE;AACvE,OAAO,SAAS,MAAM,YAAY,CAAC;AACnC,OAAO,QAAQ,MAAM,UAAU,CAAC;AAEhC,MAAM,CAAC,IAAI,OAAe,CAAC;AAC3B,MAAM,UAAU,UAAU,CAAC,CAAiB;IAC3C,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CACd,iDAAiD,OAAO,WAAW,CAAC,GAAG,CACvE,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC,CAAC;AACb,CAAC;AAED,MAAM,aAAa,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8BrB,CAAC;AAEF,MAAM,CAAN,IAAY,wBAEX;AAFD,WAAY,wBAAwB;IACnC,mJAA8C,CAAA;AAC/C,CAAC,EAFW,wBAAwB,KAAxB,wBAAwB,QAEnC;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;AAChD,MAAM,CAAC,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AACzC,MAAM,CAAC,MAAM,2BAA2B,GAAG,MAAM,CAChD,6BAA6B,EAC7B,CAAC,CACD,CAAC;AACF,MAAM,CAAC,IAAI,mCAAmC,GAAG,MAAM,CACtD,qCAAqC,EACrC,EAAE,CACF,CAAC;AACF;;;;;GAKG;AACH,MAAM,CAAC,IAAI,+CAA+C,GAAG,MAAM,CAClE,iDAAiD,EACjD,IAAI,CACJ,CAAC;AACF,MAAM,CAAC,MAAM,uBAAuB,GAAG,WAAW,CAAC,yBAAyB,CAAC,CAAC;AAC9E,MAAM,CAAC,MAAM,sBAAsB,GAAG,MAAM,CAAC,wBAAwB,EAAE,IAAI,CAAC,CAAC;AAE7E,MAAM,CAAC,IAAI,mBAAmB,GAAG,OAAO,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAC;AAEvE,MAAM,CAAC,MAAM,0BAA0B,GAAG,WAAW,CACpD,4BAA4B,CAC5B,CAAC;AACF,MAAM,CAAC,MAAM,qBAAqB,GAAG,WAAW,CAAC,uBAAuB,CAAC,CAAC;AAE1E;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,GAAG,CACxC,WAAW,CAAC,oBAAoB,EAAE,EAAE,CAAC;KACnC,KAAK,CAAC,GAAG,CAAC;KACV,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;KAC1B,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CACnC,CAAC;AAEF,MAAM,CAAC,MAAM,2BAA2B,GAAG,WAAW,CACrD,6BAA6B,EAC7B,WAAW,CACX,CAAC;AACF,MAAM,CAAC,MAAM,0BAA0B,GAAG,WAAW,CACpD,4BAA4B,EAC5B,WAAW,CACX,CAAC;AACF,MAAM,CAAC,MAAM,4BAA4B,GAAG,WAAW,CACtD,8BAA8B,CAC9B,CAAC;AACF,MAAM,CAAC,MAAM,4BAA4B,GAAG,WAAW,CACtD,8BAA8B,CAC9B,CAAC;AACF,MAAM,CAAC,MAAM,2BAA2B,GAAG,WAAW,CACrD,6BAA6B,CAC7B,CAAC;AACF,MAAM,CAAC,MAAM,6BAA6B,GAAG,WAAW,CACvD,+BAA+B,CAC/B,CAAC;AACF,MAAM,CAAC,MAAM,4BAA4B,GAAG,WAAW,CACtD,8BAA8B,CAC9B,CAAC;AACF,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;AAC9D,MAAM,CAAC,MAAM,oBAAoB,GAAG,MAAM,CAAC,sBAAsB,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC;AAChF,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CACrC,kBAAkB,EAClB,oBAAoB,GAAG,CAAC,GAAG,OAAO,CAClC,CAAC;AACF,MAAM,CAAC,MAAM,UAAU,GAAG,WAAW,CAAC,YAAY,CAAC,CAAC;AACpD,MAAM,CAAC,MAAM,UAAU,GAAG,WAAW,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;AACxD,MAAM,CAAC,MAAM,wBAAwB,GAAG,WAAW,CAAC,0BAA0B,CAAC,CAAC;AAChF,MAAM,CAAC,MAAM,YAAY,GAAG,WAAW,CAAC,cAAc,CAAC,CAAC;AACxD,MAAM,CAAC,MAAM,QAAQ,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;AAChD,MAAM,CAAC,MAAM,QAAQ,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;AAEhD,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,GAAG,EAAE;IACjD,IAAI,YAAY,EAAE,CAAC;QAClB,MAAM,OAAO,GAAG;YACf,UAAU,YAAY,IAAI,QAAQ,MAAM;YACxC,UAAU,QAAQ,IAAI,QAAQ,MAAM;SACpC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACb,OAAO,aAAa;aAClB,OAAO,CAAC,iBAAiB,EAAE,OAAO,CAAC;aACnC,OAAO,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;IAClC,CAAC;SAAM,CAAC;QACP,OAAO,aAAa,CAAC,OAAO,CAC3B,iBAAiB,EACjB,UAAU,QAAQ,IAAI,QAAQ,EAAE,CAChC,CAAC;IACH,CAAC;AACF,CAAC,CAAC,EAAE,CAAC;AAEL,MAAM,CAAC,MAAM,iCAAiC,GAAG,WAAW,CAC3D,mCAAmC,EACnC,EAAE,CACF,CAAC;AACF,MAAM,CAAC,MAAM,wBAAwB,GAAG,MAAM,CAC7C,0BAA0B,EAC1B,EAAE,GAAG,OAAO,CACZ,CAAC;AACF,MAAM,CAAC,MAAM,oBAAoB,GAAG,WAAW,CAAC,sBAAsB,CAAC,CAAC;AACxE,MAAM,CAAC,MAAM,sBAAsB,GAAG,WAAW,CAAC,wBAAwB,CAAC,CAAC;AAC5E,MAAM,CAAC,MAAM,oBAAoB,GAAG,WAAW,CAC9C,sBAAsB,EACtB,QAAQ,CACR,CAAC;AACF,MAAM,CAAC,MAAM,wBAAwB,GAAG,WAAW,CAAC,0BAA0B,CAAC,CAAC;AAChF,MAAM,CAAC,MAAM,wBAAwB,GAAG,WAAW,CAAC,0BAA0B,CAAC,CAAC;AAChF,MAAM,CAAC,MAAM,8BAA8B,GAAG,OAAO,CACpD,gCAAgC,EAChC,KAAK,CACL,CAAC;AACF,MAAM,CAAC,MAAM,kCAAkC,GAAG,OAAO,CACxD,oCAAoC;AACpC,iEAAiE;AACjE,sEAAsE;AACtE,wBAAwB,IAAI,IAAI,IAAI,wBAAwB,IAAI,IAAI,CACpE,CAAC;AACF,MAAM,CAAC,MAAM,6BAA6B,GAAG,MAAM,CAClD,+BAA+B,CAC/B,CAAC;AACF,MAAM,CAAC,MAAM,qBAAqB,GAAG,WAAW,CAAC,uBAAuB,CAAC,CAAC;AAC1E,MAAM,CAAC,MAAM,mCAAmC,GAAG,OAAO,CACzD,qCAAqC,EACrC,KAAK,CACL,CAAC;AACF,MAAM,CAAC,MAAM,SAAS,GAAG,WAAW,CAAC,WAAW,CAAC,CAAC;AAClD,MAAM,CAAC,MAAM,cAAc,GAAG,WAAW,CAAC,gBAAgB,CAAC,CAAC;AAC5D,MAAM,CAAC,MAAM,QAAQ,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;AAChD,MAAM,CAAC,MAAM,mBAAmB,GAAG,WAAW,CAAC,qBAAqB,CAAC,CAAC;AACtE,MAAM,CAAC,MAAM,iBAAiB,GAAG,MAAM,CAAC,mBAAmB,EAAE,CAAC,CAAC,CAAC;AAChE,MAAM,CAAC,MAAM,yBAAyB,GAAG,WAAW,CACnD,2BAA2B,CAC3B,CAAC;AA2BF,SAAS,SAAS,CACjB,MAAc,EACd,YAAyB,EACzB,WAAuB,EACvB,gBAA0B;IAE1B,MAAM,WAAW,GAAG,GAAG,MAAM,OAAO,CAAC;IACrC,MAAM,WAAW,GAAG,GAAG,MAAM,OAAO,CAAC;IACrC,MAAM,aAAa,GAAG,GAAG,MAAM,UAAU,CAAC;IAC1C,MAAM,aAAa,GAAG,GAAG,MAAM,UAAU,CAAC;IAC1C,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,MAAM,aAAa,EAAE,gBAAgB,CAAC,CAAC;IACpE,MAAM,KAAK,GAAG,YAAY,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IACtD,MAAM,IAAI,GAAG,YAAY,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;IACpD,IAAI,SAAS,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,iBAAiB,MAAM,cAAc,CAAC,CAAC;IACxD,CAAC;IACD,IAAI,SAAS,EAAE,CAAC;QACf,MAAM,+BAA+B,GAAG,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;QACvE,KAAK,MAAM,OAAO,IAAI,+BAA+B,EAAE,CAAC;YACvD,IAAI,WAAW,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC;gBAClC,MAAM,IAAI,KAAK,CAAC,IAAI,OAAO,uCAAuC,CAAC,CAAC;YACrE,CAAC;QACF,CAAC;QACD,OAAO;YACN,SAAS;YACT,KAAK;YACL,IAAI;SACJ,CAAC;IACH,CAAC;IACD,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CACd,IAAI,WAAW,wDAAwD,CACvE,CAAC;IACH,CAAC;IACD,MAAM,OAAO,GAAG,YAAY,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;IACnD,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,IAAI,aAAa,kCAAkC,CAAC,CAAC;IACtE,CAAC;IACD,MAAM,MAAM,GAAG,YAAY,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;IACjD,OAAO;QACN,SAAS;QACT,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;QACd,IAAI;QACJ,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;QAClB,MAAM;KACN,CAAC;AACH,CAAC;AACD,MAAM,YAAY,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;AAExC,IAAI,YAAY,CAAC,SAAS,EAAE,CAAC;IAC5B,4BAA4B;IAC5B,MAAM,IAAI,KAAK,CACd,8DAA8D,CAC9D,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,KAAK,GAAG;IACpB,OAAO,EAAE,YAAY;IACrB,IAAI,EAAE,SAAS,CACd,YAAY,EACZ,CAAC,YAAY,CAAC,IAAI,CAAC,EACnB,YAAY,CAAC,IAAI,EACjB,YAAY,CAAC,SAAS,CACtB;CACD,CAAC;AACF,MAAM,CAAC,MAAM,yBAAyB,GAAG,OAAO,CAC/C,2BAA2B,EAC3B,KAAK,CACL,CAAC;AACF,MAAM,CAAC,MAAM,8BAA8B,GAAG,OAAO,CACpD,gCAAgC,EAChC,IAAI,CACJ,CAAC;AACF,MAAM,SAAS,GAAG,WAAW,CAAC,WAAW,CAAC,CAAC;AAC3C,MAAM,CAAC,MAAM,kBAAkB,GAAG,WAAW,CAAC,oBAAoB,EAAE,SAAS,CAAC,CAAC;AAC/E,MAAM,CAAC,MAAM,eAAe,GAAG,WAAW,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAC;AACzE,MAAM,CAAC,MAAM,uBAAuB,GAAG,MAAM,CAAC,yBAAyB,EAAE,IAAI,CAAC,CAAC;AAC/E,MAAM,CAAC,MAAM,oBAAoB,GAAG,MAAM,CAAC,sBAAsB,EAAE,IAAI,CAAC,CAAC;AACzE,MAAM,CAAC,MAAM,iBAAiB,GAAG,OAAO,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAC;AACpE,MAAM,CAAC,MAAM,oBAAoB,GAAG,MAAM,CAAC,sBAAsB,EAAE,KAAK,CAAC,CAAC;AAC1E,MAAM,CAAC,MAAM,mBAAmB,GAAG,OAAO,CAAC,qBAAqB,EAAE,IAAI,CAAC,CAAC;AACxE,MAAM,CAAC,MAAM,mCAAmC,GAAG,MAAM,CACxD,qCAAqC,EACrC,CAAC,CACD,CAAC;AACF,+DAA+D;AAC/D,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC;AAC1D;;;GAGG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;AACxD,IAAI,cAAc,GAAG,GAAG,IAAI,aAAa,GAAG,CAAC,EAAE,CAAC;IAC/C,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;AAC3E,CAAC;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG,OAAO,CACvC,mBAAmB,EACnB,kBAAkB,IAAI,IAAI,IAAI,eAAe,IAAI,IAAI,CACrD,CAAC;AACF,IAAI,iBAAiB,IAAI,CAAC,CAAC,kBAAkB,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC;IACpE,MAAM,IAAI,KAAK,CACd,sFAAsF,CACtF,CAAC;AACH,CAAC;AAED,yEAAyE;AACzE,MAAM,CAAC,MAAM,oBAAoB,GAAG,OAAO,CAAC,sBAAsB,EAAE,KAAK,CAAC,CAAC;AAC3E,4EAA4E;AAC5E,MAAM,CAAC,MAAM,iBAAiB,GAAG,MAAM,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAC;AAEnE,mFAAmF;AACnF,MAAM,CAAC,MAAM,oBAAoB,GAAG,MAAM,CAAC,sBAAsB,EAAE,GAAG,CAAC,CAAC;AACxE;;;GAGG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,MAAM,CAAC,qBAAqB,EAAE,GAAG,CAAC,CAAC;AACtE,IAAI,oBAAoB,GAAG,GAAG,IAAI,mBAAmB,GAAG,CAAC,EAAE,CAAC;IAC3D,MAAM,IAAI,KAAK,CACd,oEAAoE,CACpE,CAAC;AACH,CAAC;AACD,MAAM,CAAC,MAAM,kBAAkB,GAAG,OAAO,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC;AAEtE,MAAM,CAAC,MAAM,YAAY,GAAG,sBAAsB,CAAC;AAEnD,mBAAmB;AACnB,MAAM,CAAC,MAAM,uBAAuB,GAAG,KAAK,CAAC;AAC7C,MAAM,CAAC,MAAM,0BAA0B,GAAG,IAAI,CAAC;AAC/C,MAAM,CAAC,MAAM,+BAA+B,GAAG,CAAC,CAAC;AACjD,MAAM,CAAC,MAAM,gCAAgC,GAAG,EAAE,GAAG,EAAE,CAAC;AACxD,MAAM,CAAC,MAAM,0CAA0C,GACtD,gCAAgC,GAAG,CAAC,CAAC;AAEtC,MAAM,CAAC,MAAM,4BAA4B,GAAG,IAAI,CAAC;AACjD,MAAM,CAAC,MAAM,+BAA+B,GAAG,EAAE,GAAG,IAAI,CAAC;AAEzD,MAAM,CAAC,MAAM,uCAAuC,GAAG,MAAM,CAC5D,yCAAyC,EACzC,CAAC,GAAG,IAAI,CACR,CAAC;AACF,MAAM,CAAC,MAAM,6BAA6B,GAAG,MAAM,CAClD,+BAA+B,EAC/B,+BAA+B,CAC/B,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,WAAW,CAC9C,sBAAsB,EACtB,OAAO,CACP,CAAC;AACF,IAAI,oBAAoB,KAAK,OAAO,IAAI,oBAAoB,KAAK,MAAM,EAAE,CAAC;IACzE,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;AAC1E,CAAC;AACD,IAAI,oBAAoB,KAAK,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC3D,MAAM,IAAI,KAAK,CACd,qEAAqE,CACrE,CAAC;AACH,CAAC;KAAM,IAAI,oBAAoB,KAAK,OAAO,IAAI,CAAC,kBAAkB,EAAE,CAAC;IACpE,MAAM,IAAI,KAAK,CACd,uEAAuE,CACvE,CAAC;AACH,CAAC;AACD,IACC,oBAAoB,KAAK,OAAO;IAChC,CAAC,mBAAmB,GAAG,GAAG,IAAI,oBAAoB,GAAG,GAAG,CAAC,EACxD,CAAC;IACF,MAAM,IAAI,KAAK,CACd,qGAAqG,CACrG,CAAC;AACH,CAAC;KAAM,IACN,oBAAoB,KAAK,MAAM;IAC/B,CAAC,aAAa,GAAG,GAAG,IAAI,cAAc,GAAG,GAAG,CAAC,EAC5C,CAAC;IACF,MAAM,IAAI,KAAK,CACd,wFAAwF,CACxF,CAAC;AACH,CAAC;AAED,mBAAmB;AACnB,MAAM,CAAC,MAAM,+BAA+B,GAAG,MAAM,CACpD,iCAAiC,EACjC,GAAG,CACH,CAAC;AAEF,oBAAoB;AACpB,MAAM,CAAC,MAAM,0BAA0B,GAAG,MAAM,CAC/C,4BAA4B,EAC5B,GAAG,CACH,CAAC;AACF,MAAM,CAAC,MAAM,uCAAuC,GAAG,MAAM,CAC5D,yCAAyC,EACzC,IAAI,CACJ,CAAC;AACF,MAAM,CAAC,MAAM,uBAAuB,GAAG,MAAM,CAAC,yBAAyB,EAAE,EAAE,CAAC,CAAC;AAE7E,MAAM,CAAC,MAAM,wBAAwB,GAAG,MAAM,CAAC,0BAA0B,EAAE,CAAC,CAAC,CAAC;AAC9E,MAAM,CAAC,IAAI,wBAAwB,GAAG,MAAM,CAAC,0BAA0B,EAAE,IAAI,CAAC,CAAC;AAE/E,MAAM,CAAC,MAAM,wBAAwB,GAAG,MAAM,CAC7C,0BAA0B,EAC1B,CAAC,IAAI,EAAE,GAAG,CAAC,CACX,CAAC;AACF,MAAM,CAAC,IAAI,0CAA0C,GAAG,OAAO,CAC9D,4CAA4C,EAC5C,KAAK,CACL,CAAC;AACF,MAAM,CAAC,MAAM,6CAA6C,GAAG,MAAM,CAClE,+CAA+C,EAC/C,IAAI,CACJ,CAAC;AACF,MAAM,CAAC,MAAM,8CAA8C,GAAG,MAAM,CACnE,gDAAgD,EAChD,EAAE,GAAG,IAAI,CACT,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,WAAW,CAAC,gBAAgB,CAAC,CAAC;AAC5D,MAAM,CAAC,MAAM,UAAU,GAAG,WAAW,CAAC,YAAY,CAAC,CAAC;AACpD,MAAM,CAAC,MAAM,eAAe,GAAG,WAAW,CAAC,iBAAiB,EAAE,EAAE,CAAC,CAAC;AAClE,MAAM,CAAC,MAAM,kBAAkB,GAAG,WAAW,CAAC,oBAAoB,EAAE,EAAE,CAAC,CAAC;AACxE,MAAM,CAAC,MAAM,wBAAwB,GAAG,WAAW,CAAC,0BAA0B,CAAC,CAAC;AAChF,MAAM,CAAC,MAAM,sBAAsB,GAAG,WAAW,CAAC,wBAAwB,CAAC,CAAC;AAC5E,MAAM,CAAC,MAAM,mBAAmB,GAAG,WAAW,CAAC,qBAAqB,CAAC,CAAC;AACtE,MAAM,CAAC,MAAM,mBAAmB,GAAG,WAAW,CAAC,qBAAqB,CAAC,CAAC;AACtE,MAAM,CAAC,MAAM,mBAAmB,GAAG,WAAW,CAAC,qBAAqB,CAAC,CAAC;AACtE,MAAM,CAAC,MAAM,mBAAmB,GAAG,WAAW,CAAC,qBAAqB,CAAC,CAAC;AACtE,MAAM,CAAC,MAAM,mBAAmB,GAAG,WAAW,CAAC,qBAAqB,CAAC,CAAC;AACtE,MAAM,CAAC,MAAM,iBAAiB,GAAG,WAAW,CAAC,mBAAmB,CAAC,CAAC;AAElE,8GAA8G;AAC9G,MAAM,CAAC,MAAM,6BAA6B,GAAG,MAAM,CAClD,+BAA+B,EAC/B,CAAC,GAAG,gBAAgB,CACpB,CAAC;AAEF,MAAM,CAAC,IAAI,gCAAgC,GAAG,MAAM,CACnD,kCAAkC,EAClC,EAAE,GAAG,OAAO,CACZ,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAG,OAAO,CAC/C,2BAA2B,EAC3B,IAAI,CACJ,CAAC;AAEF,MAAM,CAAC,MAAM,mCAAmC,GAAG,MAAM,CACxD,qCAAqC,EACrC,EAAE,CACF,CAAC;AACF,uEAAuE;AACvE,MAAM,CAAC,MAAM,yBAAyB,GAAG,MAAM,CAC9C,2BAA2B,EAC3B,CAAC,IAAI,EAAE,GAAG,CAAC,CACX,CAAC;AACF,MAAM,CAAC,MAAM,6CAA6C,GAAG,MAAM,CAClE,+CAA+C,EAC/C,EAAE,CACF,CAAC;AACF;;GAEG;AACH,MAAM,CAAC,MAAM,oCAAoC,GAAG,MAAM,CACzD,sCAAsC;AACtC,mFAAmF;AACnF,uCAAuC;AACvC,0EAA0E;AAC1E,gCAAgC,GAAG,OAAO,CAC1C,CAAC;AAEF,iBAAiB;AACjB,MAAM,CAAC,MAAM,mCAAmC,GAAG,MAAM,CACxD,qCAAqC,EACrC,IAAI,CAAC,GAAG,CAAC,6CAA6C,EAAE,CAAC,GAAG,EAAE,CAAC,CAC/D,CAAC;AACF,MAAM,CAAC,MAAM,gCAAgC,GAAG,MAAM,CACrD,kCAAkC,EAClC,CAAC,GAAG,OAAO,CACX,CAAC;AACF,MAAM,CAAC,MAAM,0BAA0B,GAAG,MAAM,CAC/C,4BAA4B,EAC5B,CAAC,GAAG,KAAK,CACT,CAAC;AACF,MAAM,CAAC,MAAM,4BAA4B,GAAG,MAAM,CACjD,8BAA8B,EAC9B,EAAE,GAAG,OAAO,CACZ,CAAC;AACF,MAAM,CAAC,MAAM,mCAAmC,GAAG,MAAM,CACxD,qCAAqC,EACrC,EAAE,GAAG,OAAO,CACZ,CAAC;AACF,MAAM,CAAC,MAAM,4BAA4B,GAAG,MAAM,CACjD,8BAA8B,EAC9B,CAAC,GAAG,OAAO,CACX,CAAC;AACF,MAAM,CAAC,MAAM,2BAA2B,GAAG,MAAM,CAChD,6BAA6B,EAC7B,CAAC,GAAG,OAAO,CACX,CAAC;AACF,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,GAAG,OAAO,CAAC;AACrD,MAAM,CAAC,MAAM,8BAA8B,GAAG,MAAM,CACnD,gCAAgC,EAChC,CAAC,GAAG,OAAO,CACX,CAAC;AACF,MAAM,CAAC,MAAM,oCAAoC,GAAG,MAAM,CACzD,sCAAsC,EACtC,CAAC,GAAG,OAAO,CACX,CAAC;AACF,MAAM,CAAC,MAAM,uCAAuC,GAAG,MAAM,CAC5D,yCAAyC,EACzC,CAAC,GAAG,OAAO,CACX,CAAC;AACF,MAAM,CAAC,MAAM,sBAAsB,GAAG,MAAM,CAC3C,wBAAwB,EACxB,CAAC,GAAG,OAAO,CACX,CAAC;AACF,MAAM,CAAC,MAAM,oCAAoC,GAAG,MAAM,CACzD,sCAAsC,EACtC,CAAC,GAAG,OAAO,CACX,CAAC;AACF,MAAM,CAAC,MAAM,sCAAsC,GAAG,MAAM,CAC3D,wCAAwC,EACxC,CAAC,GAAG,OAAO,CACX,CAAC;AACF,MAAM,CAAC,MAAM,0BAA0B,GAAG,MAAM,CAC/C,4BAA4B,EAC5B,CAAC,GAAG,OAAO,CACX,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAG,MAAM,CAAC,0BAA0B,EAAE,CAAC,CAAC,CAAC,CAAC;AAC/E,MAAM,CAAC,MAAM,0BAA0B,GAAG,MAAM,CAC/C,4BAA4B,EAC5B,CAAC,CACD,CAAC;AACF,MAAM,CAAC,MAAM,8BAA8B,GAAG,MAAM,CACnD,gCAAgC,EAChC,SAAS,CACT,CAAC;AAEF,MAAM,UAAU,GAAG,aAAa,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;AAEvD,IAAI,eAE8C,CAAC;AACnD,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;IACpC,sGAAsG;IACtG,iGAAiG;IACjG,kGAAkG;IAClG,4FAA4F;IAE5F,8BAA8B;IAC9B,MAAM,aAAa,GAAG,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAChD,eAAe,GAAG,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE;QAC5D,SAAS,EAAE,IAAI;QACf,GAAG,EAAE,IAAI;KACT,CAAC,CAAC;AACJ,CAAC;KAAM,CAAC;IACP,eAAe,GAAG,UAAU,CAAC;AAC9B,CAAC;AACD,MAAM,CAAC,MAAM,WAAW,GAAG,eAAe,CAAC;AAE3C,MAAM,CAAC,MAAM,gCAAgC,GAAG,OAAO,CACtD,kCAAkC,EAClC,KAAK,CACL,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,WAAW,CAAC,sBAAsB,CAAC,CAAC;AACxE,MAAM,CAAC,MAAM,sBAAsB,GAAG,WAAW,CAAC,wBAAwB,CAAC,CAAC;AAC5E,MAAM,CAAC,MAAM,0BAA0B,GAAG,WAAW,CACpD,4BAA4B,CAC5B,CAAC;AACF,MAAM,CAAC,MAAM,0BAA0B,GAAG,WAAW,CACpD,4BAA4B,CAC5B,CAAC;AACF,MAAM,CAAC,MAAM,sBAAsB,GAAG,WAAW,CAAC,wBAAwB,CAAC,CAAC;AAC5E,MAAM,CAAC,MAAM,4BAA4B,GAAG,MAAM,CACjD,8BAA8B,EAC9B,SAAS,CACT,CAAC;AACF,MAAM,CAAC,MAAM,uCAAuC,GAAG,WAAW,CACjE,yCAAyC,CACzC,CAAC;AACF,MAAM,CAAC,MAAM,iCAAiC,GAAG,WAAW,CAC3D,mCAAmC,CACnC,CAAC;AACF,MAAM,CAAC,MAAM,4BAA4B,GAAG,WAAW,CACtD,8BAA8B,CAC9B,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,GAAG,IAAI,GAAG,CAC7C,QAAQ,CAAC,yBAAyB,CAAC,IAAI,EAAE,CACzC,CAAC;AACF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,OAAe,EAAE,EAAE;IACtD,uBAAuB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACtC,CAAC,CAAC;AACF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,OAAe,EAAE,EAAE;IACrD,uBAAuB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AACzC,CAAC,CAAC;AAEF;;;;GAIG;AACH,SAAS,YAAY,CACpB,OAA0B,EAC1B,WAAuB;IAEvB,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IACtC,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;QACtB,IAAI,WAAW,IAAI,IAAI,EAAE,CAAC;YACzB,OAAO,EAAE,CAAC;QACX,CAAC;QACD,OAAO,WAAW,CAAC;IACpB,CAAC;IAED,wGAAwG;IACxG,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACzC,QAAQ,KAAK,CAAC,MAAM,EAAE,CAAC;QACtB,KAAK,CAAC;YACL,OAAO;gBACN,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC;aAClB,CAAC;QACH,KAAK,CAAC;YACL,OAAO;gBACN,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC;gBAClB,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC;aAClB,CAAC;IACJ,CAAC;IAED,MAAM,IAAI,KAAK,CACd,IAAI,OAAO,sGAAsG,CACjH,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,EAAE;IACrC,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,KAAK,MAAM,EAAE,CAAC;QACvC,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;IACtE,CAAC;AACF,CAAC,CAAC;AACF,MAAM,CAAC,MAAM,cAAc,GAAG;IAC7B,IAAI,gCAAgC,CACnC,CAA0C;QAE1C,iBAAiB,EAAE,CAAC;QACpB,gCAAgC,GAAG,CAAC,CAAC;IACtC,CAAC;IACD,IAAI,mCAAmC,CACtC,CAA6C;QAE7C,iBAAiB,EAAE,CAAC;QACpB,mCAAmC,GAAG,CAAC,CAAC;IACzC,CAAC;IACD,IAAI,+CAA+C,CAClD,CAAyD;QAEzD,iBAAiB,EAAE,CAAC;QACpB,+CAA+C,GAAG,CAAC,CAAC;IACrD,CAAC;IACD,IAAI,mBAAmB,CAAC,CAA6B;QACpD,iBAAiB,EAAE,CAAC;QACpB,mBAAmB,GAAG,CAAC,CAAC;IACzB,CAAC;IACD,IAAI,0CAA0C,CAC7C,CAAoD;QAEpD,iBAAiB,EAAE,CAAC;QACpB,0CAA0C,GAAG,CAAC,CAAC;IAChD,CAAC;IACD,IAAI,wBAAwB,CAAC,CAAkC;QAC9D,iBAAiB,EAAE,CAAC;QACpB,wBAAwB,GAAG,CAAC,CAAC;IAC9B,CAAC;CACD,CAAC"}
|
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
|
4
|
+
"version": "35.0.0",
|
5
5
|
"license": "AGPL-3.0",
|
6
6
|
"repository": {
|
7
7
|
"type": "git",
|
@@ -50,13 +50,16 @@
|
|
50
50
|
"@balena/env-parsing": "^1.2.0",
|
51
51
|
"@balena/es-version": "^1.0.3",
|
52
52
|
"@balena/node-metrics-gatherer": "^6.0.3",
|
53
|
-
"@balena/pinejs": "20.
|
53
|
+
"@balena/pinejs": "^20.0.3",
|
54
54
|
"@balena/pinejs-webresource-cloudfront": "^1.0.2",
|
55
|
-
"@balena/pinejs-webresource-s3": "
|
56
|
-
"@
|
55
|
+
"@balena/pinejs-webresource-s3": "^1.0.2",
|
56
|
+
"@opentelemetry/api": "^1.9.0",
|
57
|
+
"@opentelemetry/instrumentation-express": "^0.47.1",
|
58
|
+
"@opentelemetry/instrumentation-http": "^0.57.2",
|
59
|
+
"@opentelemetry/sdk-node": "^0.57.2",
|
60
|
+
"@sentry/node": "^9.6.1",
|
57
61
|
"@swc-node/register": "^1.10.9",
|
58
62
|
"@types/basic-auth": "^1.1.8",
|
59
|
-
"@types/bluebird": "^3.5.42",
|
60
63
|
"@types/cache-manager": "^4.0.6",
|
61
64
|
"@types/cache-manager-ioredis": "^2.0.6",
|
62
65
|
"@types/common-tags": "^1.8.4",
|
@@ -89,7 +92,6 @@
|
|
89
92
|
"balena-device-config": "^6.3.0",
|
90
93
|
"balena-semver": "^3.0.0",
|
91
94
|
"basic-auth": "^2.0.1",
|
92
|
-
"bluebird": "^3.7.2",
|
93
95
|
"body-parser": "^1.20.3",
|
94
96
|
"bufferutil": "^4.0.9",
|
95
97
|
"cache-manager": "^4.1.0",
|
@@ -114,6 +116,8 @@
|
|
114
116
|
"ndjson": "^2.0.0",
|
115
117
|
"node-schedule": "^2.1.1",
|
116
118
|
"on-finished": "^2.4.1",
|
119
|
+
"p-map": "^7.0.3",
|
120
|
+
"p-props": "^6.0.0",
|
117
121
|
"passport": "^0.7.0",
|
118
122
|
"passport-jwt": "^4.0.1",
|
119
123
|
"pinejs-client-core": "^8.1.2",
|
@@ -132,7 +136,7 @@
|
|
132
136
|
"tar": "^7.4.3",
|
133
137
|
"thirty-two": "^1.0.2",
|
134
138
|
"typed-error": "^3.2.2",
|
135
|
-
"typescript": "^5.
|
139
|
+
"typescript": "^5.8.2",
|
136
140
|
"uuid": "^11.0.5",
|
137
141
|
"validator": "^13.12.0",
|
138
142
|
"ws": "^8.18.0"
|
@@ -151,6 +155,7 @@
|
|
151
155
|
"lint-staged": "^15.3.0",
|
152
156
|
"mocha": "^11.1.0",
|
153
157
|
"nock": "^13.5.6",
|
158
|
+
"p-timeout": "^6.1.4",
|
154
159
|
"pinejs-client-supertest": "^3.0.1",
|
155
160
|
"rimraf": "^6.0.1",
|
156
161
|
"sinon": "^19.0.2",
|
@@ -170,6 +175,6 @@
|
|
170
175
|
"import": "@swc-node/register/esm-register"
|
171
176
|
},
|
172
177
|
"versionist": {
|
173
|
-
"publishedAt": "2025-
|
178
|
+
"publishedAt": "2025-03-19T15:05:53.207Z"
|
174
179
|
}
|
175
180
|
}
|