@appsemble/node-utils 0.30.14-test.3 → 0.30.14-test.4

package/README.md

@@ -1,9 +1,9 @@
-# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.30.14-test.3/config/assets/logo.svg) Appsemble Node Utilities
+# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.30.14-test.4/config/assets/logo.svg) Appsemble Node Utilities
 
 > NodeJS utilities used by Appsemble internally.
 
 [![npm](https://img.shields.io/npm/v/@appsemble/node-utils)](https://www.npmjs.com/package/@appsemble/node-utils)
-[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.30.14-test.3/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.30.14-test.3)
+[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.30.14-test.4/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.30.14-test.4)
 [![Prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://prettier.io)
 
 ## Table of Contents
@@ -26,5 +26,5 @@ compatibility is not guaranteed.
 
 ## License
 
-[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.30.14-test.3/LICENSE.md) ©
+[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.30.14-test.4/LICENSE.md) ©
 [Appsemble](https://appsemble.com)

package/app.js

@@ -25,7 +25,6 @@ const getPluralRules = memoize((locale, opts) => new Intl.PluralRules(locale, op
  * @returns A localized remapper context for the app.
  */
 export async function getRemapperContext(app, language, options, context) {
-    var _a, _b;
     const { getAppMessages, getAppUrl, getAppVariables, getCurrentAppMember } = options;
     const appUrl = String(await getAppUrl({ context, app }));
     const appMessages = await getAppMessages({
@@ -39,7 +38,7 @@ export async function getRemapperContext(app, language, options, context) {
         formatters: {
             getNumberFormat,
             getPluralRules,
-            getDateTimeFormat: memoize((locale, opts) => new Intl.DateTimeFormat(locale, { ...opts, timeZone: appMemberInfo === null || appMemberInfo === void 0 ? void 0 : appMemberInfo.zoneinfo })),
+            getDateTimeFormat: memoize((locale, opts) => new Intl.DateTimeFormat(locale, { ...opts, timeZone: appMemberInfo?.zoneinfo })),
         },
     }));
     return {
@@ -52,12 +51,11 @@ export async function getRemapperContext(app, language, options, context) {
             return cache(message || `'{${id}}'`);
         },
         getVariable(variableName) {
-            var _a;
-            return (_a = appVariables.find((appVariable) => appVariable.name === variableName)) === null || _a === void 0 ? void 0 : _a.value;
+            return appVariables.find((appVariable) => appVariable.name === variableName)?.value;
         },
         appMemberInfo,
         context: {},
-        locale: (_b = (_a = appMemberInfo === null || appMemberInfo === void 0 ? void 0 : appMemberInfo.locale) !== null && _a !== void 0 ? _a : app.definition.defaultLanguage) !== null && _b !== void 0 ? _b : defaultLocale,
+        locale: appMemberInfo?.locale ?? app.definition.defaultLanguage ?? defaultLocale,
     };
 }
 function replaceStyle(stylesheet, selector, property, value) {

package/container/helpers.js

@@ -1,9 +1,8 @@
-var _a, _b;
 import { logger } from '@appsemble/node-utils';
 import { AppsV1Api, CoreV1Api, HttpError, KubeConfig, } from '@kubernetes/client-node';
-export const maxCPU = (_a = process.env.MAX_CONTAINER_CPU) !== null && _a !== void 0 ? _a : 3;
+export const maxCPU = process.env.MAX_CONTAINER_CPU ?? 3;
 // In gigabytes
-export const maxMemoryGi = (_b = process.env.MAX_CONTAINER_MEMORY) !== null && _b !== void 0 ? _b : 3;
+export const maxMemoryGi = process.env.MAX_CONTAINER_MEMORY ?? 3;
 export const appIdLabel = 'appId';
 export const resourceDefaults = { memory: '128Mi', cpu: '0.1' };
 export function getKubeConfig() {
@@ -14,8 +13,7 @@ export function getKubeConfig() {
     return { appsApi, coreApi, kubeconfig };
 }
 export function getContainerNamespace() {
-    var _a;
-    return `companion-containers-${(_a = process.env.SERVICE_NAME) !== null && _a !== void 0 ? _a : 'appsemble'}`;
+    return `companion-containers-${process.env.SERVICE_NAME ?? 'appsemble'}`;
 }
 export function formatServiceName(containerName, appName, appId) {
     const serviceName = `${containerName}-${appName}-${appId}`.replaceAll(' ', '-').toLowerCase();

package/container/logs.js

@@ -35,12 +35,11 @@ function filterLogEntries(entries, deploymentName, fromAppsemble) {
     return res;
 }
 export async function getLogs(deploymentName, fromAppsemble) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     const { coreApi } = getKubeConfig();
     let pods;
     const containerNamespace = getContainerNamespace();
     let appsembleNamespace = 'appsemble';
-    const appsembleServiceName = (_a = process.env.SERVICE_NAME) !== null && _a !== void 0 ? _a : 'appsemble';
+    const appsembleServiceName = process.env.SERVICE_NAME ?? 'appsemble';
     logger.silly(`Using service name ${appsembleServiceName}`);
     try {
         const NAMESPACE_FILE_PATH = '/var/run/secrets/kubernetes.io/serviceaccount/namespace';
@@ -65,19 +64,19 @@ export async function getLogs(deploymentName, fromAppsemble) {
     }
     const podLogs = [];
     for (const pod of pods.items) {
-        if (((_c = (_b = pod.metadata) === null || _b === void 0 ? void 0 : _b.ownerReferences) === null || _c === void 0 ? void 0 : _c.find((r) => r.kind === 'ReplicaSet')) &&
-            ((_d = pod.status) === null || _d === void 0 ? void 0 : _d.phase) === 'Running') {
-            if (fromAppsemble && !((_e = pod.metadata) === null || _e === void 0 ? void 0 : _e.name.includes(appsembleServiceName))) {
+        if (pod.metadata?.ownerReferences?.find((r) => r.kind === 'ReplicaSet') &&
+            pod.status?.phase === 'Running') {
+            if (fromAppsemble && !pod.metadata?.name.includes(appsembleServiceName)) {
                 continue;
             }
-            if (!fromAppsemble && !((_f = pod.metadata) === null || _f === void 0 ? void 0 : _f.name.includes(deploymentName))) {
+            if (!fromAppsemble && !pod.metadata?.name.includes(deploymentName)) {
                 continue;
             }
-            logger.silly(`Pod: ${(_g = pod.metadata) === null || _g === void 0 ? void 0 : _g.name}, status: ${pod.status}, deployment: ${deploymentName}`);
+            logger.silly(`Pod: ${pod.metadata?.name}, status: ${pod.status}, deployment: ${deploymentName}`);
             try {
-                const res = await fetchLogs(fromAppsemble ? appsembleNamespace : containerNamespace, (_h = pod.metadata) === null || _h === void 0 ? void 0 : _h.name, fromAppsemble ? 'appsemble' : deploymentName);
+                const res = await fetchLogs(fromAppsemble ? appsembleNamespace : containerNamespace, pod.metadata?.name, fromAppsemble ? 'appsemble' : deploymentName);
                 let entries = res.split('\n');
-                logger.silly(`Number of entries found for pod ${(_j = pod.metadata) === null || _j === void 0 ? void 0 : _j.name}: ${entries.length}`);
+                logger.silly(`Number of entries found for pod ${pod.metadata?.name}: ${entries.length}`);
                 entries = filterLogEntries([...entries], deploymentName, fromAppsemble);
                 podLogs.push({ fromAppsemble, entries });
             }

package/container/operations.js

@@ -12,7 +12,6 @@ import { generateDeploymentAndServiceSpecs } from './specs.js';
  * @param appId Id of the app.
  */
 export async function updateNamespacedSecret(secretName, value, appName, appId) {
-    var _a, _b;
     // If testing, don't create Kubernetes resources
     if (process.env.TEST) {
         return;
@@ -50,16 +49,15 @@ export async function updateNamespacedSecret(secretName, value, appName, appId)
         return;
     }
     try {
-        logger.verbose(`Creating secret ${(_a = secretSpec.metadata) === null || _a === void 0 ? void 0 : _a.name} ...`);
+        logger.verbose(`Creating secret ${secretSpec.metadata?.name} ...`);
         const { body: secret } = await coreApi.createNamespacedSecret(namespace, secretSpec);
-        logger.info(`Secret ${(_b = secret.metadata) === null || _b === void 0 ? void 0 : _b.name} created successfully`);
+        logger.info(`Secret ${secret.metadata?.name} created successfully`);
     }
     catch (error) {
         handleKubernetesError(error);
     }
 }
 export async function deleteSecret(appName, appId, key) {
-    var _a;
     if (process.env.TEST) {
         return;
     }
@@ -71,7 +69,7 @@ export async function deleteSecret(appName, appId, key) {
             const { body: secret } = await coreApi.readNamespacedSecret(secretName, namespace);
             logger.verbose(`Deleteing key ${key} of secret ${secretName} from namespace ${namespace} ...`);
             if (!(key in secret.data)) {
-                logger.warn(`Key ${key} does not exist on secret ${(_a = secret.metadata) === null || _a === void 0 ? void 0 : _a.name}`);
+                logger.warn(`Key ${key} does not exist on secret ${secret.metadata?.name}`);
                 return;
             }
             delete secret.data[key];
@@ -96,7 +94,6 @@ export async function deleteCompanionContainers(serviceName) {
     await deleteResource('deployment', namespace, serviceName);
 }
 export async function updateCompanionContainers(definitions, appName, appId, registry) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
     // If testing, don't create Kubernetes resources
     if (process.env.TEST) {
         return;
@@ -116,12 +113,12 @@ export async function updateCompanionContainers(definitions, appName, appId, reg
     // Update or create deployment and service
     for (const def of definitions) {
         const serviceName = formatServiceName(def.name, appName, appId);
-        const existing = (_a = services === null || services === void 0 ? void 0 : services.items) === null || _a === void 0 ? void 0 : _a.find((s) => s.metadata.name === serviceName);
+        const existing = services?.items?.find((s) => s.metadata.name === serviceName);
         // Update
         if (existing) {
             logger.verbose(`Updating resources for ${existing.metadata.name} in namespace ${namespace}`);
             const patchOptions = [
-                (_b = existing.metadata) === null || _b === void 0 ? void 0 : _b.name,
+                existing.metadata?.name,
                 namespace,
                 [
                     {
@@ -132,7 +129,7 @@ export async function updateCompanionContainers(definitions, appName, appId, reg
                     {
                         op: 'replace',
                         path: '/spec/ports/0/targetPort',
-                        value: (_c = def.port) !== null && _c !== void 0 ? _c : 8080,
+                        value: def.port ?? 8080,
                     },
                     {
                         op: 'add',
@@ -150,7 +147,7 @@ export async function updateCompanionContainers(definitions, appName, appId, reg
             // Update service
             try {
                 const updatedService = await coreApi.patchNamespacedService(...patchOptions);
-                logger.info(`Service ${(_e = (_d = updatedService === null || updatedService === void 0 ? void 0 : updatedService.body) === null || _d === void 0 ? void 0 : _d.metadata) === null || _e === void 0 ? void 0 : _e.name} updated`);
+                logger.info(`Service ${updatedService?.body?.metadata?.name} updated`);
             }
             catch (error) {
                 logger.error('Error updating service:');
@@ -167,7 +164,7 @@ export async function updateCompanionContainers(definitions, appName, appId, reg
                 {
                     op: 'replace',
                     path: '/spec/template/spec/containers/0/ports/0/containerPort',
-                    value: (_f = def.port) !== null && _f !== void 0 ? _f : 8080,
+                    value: def.port ?? 8080,
                 },
                 {
                     op: 'replace',
@@ -187,7 +184,7 @@ export async function updateCompanionContainers(definitions, appName, appId, reg
             ];
             try {
                 const updatedDeployment = await appsApi.patchNamespacedDeployment(...patchOptions);
-                logger.info(`Deployment ${(_h = (_g = updatedDeployment === null || updatedDeployment === void 0 ? void 0 : updatedDeployment.body) === null || _g === void 0 ? void 0 : _g.metadata) === null || _h === void 0 ? void 0 : _h.name} updated`);
+                logger.info(`Deployment ${updatedDeployment?.body?.metadata?.name} updated`);
             }
             catch (error) {
                 logger.error('Error updating deployment:');
@@ -196,11 +193,11 @@ export async function updateCompanionContainers(definitions, appName, appId, reg
             // Update pod
             try {
                 const { body } = await coreApi.listNamespacedPod(namespace, undefined, undefined, undefined, undefined, `appId=${appId}`);
-                if (((_j = body === null || body === void 0 ? void 0 : body.items) === null || _j === void 0 ? void 0 : _j.length) === 0) {
+                if (body?.items?.length === 0) {
                     logger.silly(`Deployment ${serviceName} has 0 pods, skipping ...`);
                     continue;
                 }
-                const pod = (_k = body === null || body === void 0 ? void 0 : body.items) === null || _k === void 0 ? void 0 : _k.find((i) => i.metadata.labels.app === existing.metadata.name);
+                const pod = body?.items?.find((i) => i.metadata.labels.app === existing.metadata.name);
                 // Set base labels, such as selector, pod name, pod hash
                 const props = {
                     ...def.metadata,
@@ -212,7 +209,7 @@ export async function updateCompanionContainers(definitions, appName, appId, reg
                     },
                     name: pod.metadata.name,
                 };
-                patchOptions[0] = (_l = pod === null || pod === void 0 ? void 0 : pod.metadata) === null || _l === void 0 ? void 0 : _l.name;
+                patchOptions[0] = pod?.metadata?.name;
                 patchOptions[2] = [
                     {
                         op: 'replace',
@@ -221,7 +218,7 @@ export async function updateCompanionContainers(definitions, appName, appId, reg
                     },
                 ];
                 const updatedPod = await coreApi.patchNamespacedPod(...patchOptions);
-                logger.verbose(`Pod updated: ${(_o = (_m = updatedPod === null || updatedPod === void 0 ? void 0 : updatedPod.body) === null || _m === void 0 ? void 0 : _m.metadata) === null || _o === void 0 ? void 0 : _o.name}`);
+                logger.verbose(`Pod updated: ${updatedPod?.body?.metadata?.name}`);
             }
             catch (error) {
                 handleKubernetesError(error);
@@ -234,7 +231,7 @@ export async function updateCompanionContainers(definitions, appName, appId, reg
                 logger.verbose(`Creating resources in namespace ${namespace} ...`);
                 try {
                     const deploymentObj = await appsApi.createNamespacedDeployment(namespace, deployment);
-                    logger.info(`Deployment created: ${(_q = (_p = deploymentObj.body) === null || _p === void 0 ? void 0 : _p.metadata) === null || _q === void 0 ? void 0 : _q.name}`);
+                    logger.info(`Deployment created: ${deploymentObj.body?.metadata?.name}`);
                 }
                 catch (error) {
                     handleKubernetesError(error);
@@ -242,7 +239,7 @@ export async function updateCompanionContainers(definitions, appName, appId, reg
                 }
                 try {
                     const serviceObj = await coreApi.createNamespacedService(namespace, service);
-                    logger.info(`Service created: ${(_r = serviceObj.body.metadata) === null || _r === void 0 ? void 0 : _r.name}`);
+                    logger.info(`Service created: ${serviceObj.body.metadata?.name}`);
                 }
                 catch (error) {
                     handleKubernetesError(error);
@@ -258,12 +255,12 @@ export async function updateCompanionContainers(definitions, appName, appId, reg
         if (service.spec.type === 'ExternalName') {
             continue;
         }
-        if (((_s = service.metadata) === null || _s === void 0 ? void 0 : _s.labels) &&
+        if (service.metadata?.labels &&
             appIdLabel in service.metadata.labels &&
             service.metadata.labels[appIdLabel] === appId) {
             const existing = definitions.find((d) => formatServiceName(d.name, appName, appId) === service.metadata.name);
             if (!existing) {
-                await deleteCompanionContainers((_t = service.metadata) === null || _t === void 0 ? void 0 : _t.name);
+                await deleteCompanionContainers(service.metadata?.name);
             }
         }
     }

package/container/scale.js

@@ -19,7 +19,6 @@ export async function scaleDeployment(namespace, deploymentName, replicas = 0) {
     }
 }
 export async function stopIdleContainers(interval = 10) {
-    var _a;
     const { appsApi } = getKubeConfig();
     let deployments;
     logger.verbose('Scaling containers');
@@ -32,7 +31,7 @@ export async function stopIdleContainers(interval = 10) {
     }
     for (const deployment of deployments.items) {
         const { annotations, name, namespace } = deployment.metadata;
-        if (((_a = deployment.metadata) === null || _a === void 0 ? void 0 : _a.namespace) !== getContainerNamespace() ||
+        if (deployment.metadata?.namespace !== getContainerNamespace() ||
             deployment.spec.replicas === 0) {
             continue;
         }
@@ -68,7 +67,6 @@ export async function stopIdleContainers(interval = 10) {
     }
 }
 export async function waitForPodReadiness(namespace, appSelector, maxWait = 10000) {
-    var _a;
     let isReady;
     const interval = 500;
     let elapsed = 0;
@@ -76,10 +74,7 @@ export async function waitForPodReadiness(namespace, appSelector, maxWait = 1000
     while (!isReady) {
         const pods = await coreApi.listNamespacedPod(namespace, undefined, undefined, undefined, undefined, `app=${appSelector}`);
         if (pods.body.items.length > 0) {
-            isReady = (_a = pods.body) === null || _a === void 0 ? void 0 : _a.items.every((pod) => {
-                var _a, _b;
-                return (_b = (_a = pod.status) === null || _a === void 0 ? void 0 : _a.conditions) === null || _b === void 0 ? void 0 : _b.some((condition) => condition.type === 'Ready' && condition.status === 'True');
-            });
+            isReady = pods.body?.items.every((pod) => pod.status?.conditions?.some((condition) => condition.type === 'Ready' && condition.status === 'True'));
         }
         if (!isReady) {
             logger.silly(`Waiting for ${appSelector} to be ready ...`);

package/container/specs.js

@@ -11,7 +11,6 @@ import { formatEnv, logger, resourceDefaults, validateContainerResources, } from
  * @returns `V1Service` and `V1Deployment` spec objects.
  */
 export function generateDeploymentAndServiceSpecs(definition, name, appName, appId, registry) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
     let { image, resources } = definition;
     logger.silly(`Using image ${image} ${registry ? `from registry ${registry}` : ''}`);
     if (registry && !image.includes('/')) {
@@ -24,14 +23,14 @@ export function generateDeploymentAndServiceSpecs(definition, name, appName, app
     const podTemplateSpec = {
         metadata: {
             ...definition.metadata,
-            labels: { app: name, ...(_a = definition.metadata) === null || _a === void 0 ? void 0 : _a.labels, appId },
+            labels: { app: name, ...definition.metadata?.labels, appId },
         },
         spec: {
             containers: [
                 {
                     name,
                     image,
-                    ports: [{ containerPort: (_b = definition.port) !== null && _b !== void 0 ? _b : 8080 }],
+                    ports: [{ containerPort: definition.port ?? 8080 }],
                     env,
                     resources: {
                         limits: { ...validatedResources.limits },
@@ -46,7 +45,7 @@ export function generateDeploymentAndServiceSpecs(definition, name, appName, app
         replicas: 1,
         selector: {
             matchLabels: { app: name, appId },
-            ...(_c = definition.metadata) === null || _c === void 0 ? void 0 : _c.selector,
+            ...definition.metadata?.selector,
         },
         template: podTemplateSpec,
     };
@@ -55,20 +54,20 @@ export function generateDeploymentAndServiceSpecs(definition, name, appName, app
         metadata: {
             name,
             ...definition.metadata,
-            labels: { ...(_d = definition.metadata) === null || _d === void 0 ? void 0 : _d.labels, appId },
+            labels: { ...definition.metadata?.labels, appId },
         },
         spec: deploymentSpec,
     };
     // Default service type is ClusterIP
     const serviceSpec = {
-        selector: { app: name, ...(_f = (_e = definition.metadata) === null || _e === void 0 ? void 0 : _e.selector) === null || _f === void 0 ? void 0 : _f.matchLabels, appId },
-        ports: [{ port: 80, targetPort: (_g = definition.port) !== null && _g !== void 0 ? _g : 8080 }],
+        selector: { app: name, ...definition.metadata?.selector?.matchLabels, appId },
+        ports: [{ port: 80, targetPort: definition.port ?? 8080 }],
     };
     const service = {
         metadata: {
             name,
             ...definition.metadata,
-            labels: { ...(_h = definition.metadata) === null || _h === void 0 ? void 0 : _h.labels, appId },
+            labels: { ...definition.metadata?.labels, appId },
         },
         spec: serviceSpec,
     };

package/getAppsembleMessages.js

@@ -14,7 +14,7 @@ export async function getSupportedLanguages() {
  */
 export async function getAppsembleMessages(language, baseLanguage) {
     const lang = language.toLowerCase();
-    const baseLang = baseLanguage === null || baseLanguage === void 0 ? void 0 : baseLanguage.toLowerCase();
+    const baseLang = baseLanguage?.toLowerCase();
     const languages = await getSupportedLanguages();
     const messages = {};
     if (baseLang && languages.has(baseLanguage)) {

package/getMessagesUtil.js

@@ -3,7 +3,6 @@ import { defaultLocale, extractAppMessages, normalizeBlockName, } from '@appsemb
 import tags from 'language-tags';
 import { assertKoaError, throwKoaError } from './koa.js';
 export async function getMessagesUtil(ctx, language, appId, merge, { getApp, getAppMessages, getBlockMessages }, override = 'true') {
-    var _a, _b, _c, _d, _e;
     if (!tags.check(language)) {
         throwKoaError(ctx, 400, '`Language “${language}” is invalid`');
     }
@@ -37,13 +36,13 @@ export async function getMessagesUtil(ctx, language, appId, merge, { getApp, get
     const languageMessages = override === 'true' && appMessages.find((m) => m.language === lang);
     for (const block of blockMessages) {
         const { name } = block;
-        const defaultMessages = (_a = block.messages) === null || _a === void 0 ? void 0 : _a[defaultLocale];
-        const blockBaseLanguageMessages = baseLang && ((_b = block.messages) === null || _b === void 0 ? void 0 : _b[baseLang]);
-        const blockLanguageMessages = (_c = block.messages) === null || _c === void 0 ? void 0 : _c[language];
+        const defaultMessages = block.messages?.[defaultLocale];
+        const blockBaseLanguageMessages = baseLang && block.messages?.[baseLang];
+        const blockLanguageMessages = block.messages?.[language];
         const blockVersionMessages = {
             ...defaultMessages,
-            ...Object.fromEntries(Object.entries(blockBaseLanguageMessages !== null && blockBaseLanguageMessages !== void 0 ? blockBaseLanguageMessages : {}).filter(([, value]) => value)),
-            ...Object.fromEntries(Object.entries(blockLanguageMessages !== null && blockLanguageMessages !== void 0 ? blockLanguageMessages : {}).filter(([, value]) => value)),
+            ...Object.fromEntries(Object.entries(blockBaseLanguageMessages ?? {}).filter(([, value]) => value)),
+            ...Object.fromEntries(Object.entries(blockLanguageMessages ?? {}).filter(([, value]) => value)),
         };
         if (messages.blocks[name]) {
             messages.blocks[name][block.version] = blockVersionMessages;
@@ -64,7 +63,7 @@ export async function getMessagesUtil(ctx, language, appId, merge, { getApp, get
     }
     return {
         language: lang,
-        messages: mergeMessages(messages, (_d = baseLanguageMessages === null || baseLanguageMessages === void 0 ? void 0 : baseLanguageMessages.messages) !== null && _d !== void 0 ? _d : {}, (_e = languageMessages === null || languageMessages === void 0 ? void 0 : languageMessages.messages) !== null && _e !== void 0 ? _e : {}),
+        messages: mergeMessages(messages, baseLanguageMessages?.messages ?? {}, languageMessages?.messages ?? {}),
     };
 }
 //# sourceMappingURL=getMessagesUtil.js.map

package/logger.js

@@ -11,12 +11,11 @@ function headerCase(header) {
     return header.replaceAll(/(^|-)\w/g, (a) => a.toUpperCase());
 }
 function httpErrorToString(error) {
-    var _a, _b, _c;
     const { config, request, response } = error;
     return [
         chalk.blue.bold('Request:'),
         highlight([
-            `${config.method.toUpperCase()} ${axios.getUri(config)} HTTP/${(_b = (_a = request === null || request === void 0 ? void 0 : request.res) === null || _a === void 0 ? void 0 : _a.httpVersion) !== null && _b !== void 0 ? _b : '1.1'}`,
+            `${config.method.toUpperCase()} ${axios.getUri(config)} HTTP/${request?.res?.httpVersion ?? '1.1'}`,
             ...Object.entries(config.headers)
                 .map(([key, value]) => [headerCase(key), value])
                 .map(([key, value]) => `${key}: ${key === 'Authorization' ? 'xxxxxxxxxx' : value}`)
@@ -26,7 +25,7 @@ function httpErrorToString(error) {
         chalk.blue.bold('Response:'),
         response
             ? highlight([
-                `HTTP/${(_c = request.res) === null || _c === void 0 ? void 0 : _c.httpVersion} ${response.status} ${response.statusText}`,
+                `HTTP/${request.res?.httpVersion} ${response.status} ${response.statusText}`,
                 ...Object.entries(response.headers)
                     .map(([key, value]) => `${headerCase(key)}: ${value}`)
                     .sort(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/node-utils",
-  "version": "0.30.14-test.3",
+  "version": "0.30.14-test.4",
   "description": "NodeJS utilities used by Appsemble internally.",
   "keywords": [
     "app",
@@ -38,8 +38,8 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@appsemble/types": "0.30.14-test.3",
-    "@appsemble/utils": "0.30.14-test.3",
+    "@appsemble/types": "0.30.14-test.4",
+    "@appsemble/utils": "0.30.14-test.4",
     "@formatjs/fast-memoize": "^2.0.0",
     "@fortawesome/fontawesome-free": "^6.0.0",
     "@kubernetes/client-node": "0.21.0",
@@ -114,6 +114,6 @@
     }
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=20"
   }
 }

package/render.js

@@ -38,7 +38,7 @@ export async function render(ctx, filename, data) {
 export function makeCSP(csp) {
     return Object.entries(csp)
         .map(([key, values]) => [key, values.filter(Boolean)])
-        .filter(([, values]) => values === null || values === void 0 ? void 0 : values.length)
+        .filter(([, values]) => values?.length)
         .sort(([a], [b]) => a.localeCompare(b))
         .map(([key, values]) => `${key} ${[...new Set(values)].sort(compareStrings).join(' ')}`)
         .join('; ');

package/resource.js

@@ -20,7 +20,6 @@ export function stripResource({ $author, $created, $editor, $ephemeral, $group,
  * @returns The matching resource definition.
  */
 export function getResourceDefinition(appDefinition, resourceType, ctx, view) {
-    var _a;
     if (!appDefinition) {
         if (ctx === undefined) {
             throw new Error('App not found');
@@ -29,7 +28,7 @@ export function getResourceDefinition(appDefinition, resourceType, ctx, view) {
             throwKoaError(ctx, 404, 'App not found');
         }
     }
-    const definition = (_a = appDefinition.resources) === null || _a === void 0 ? void 0 : _a[resourceType];
+    const definition = appDefinition.resources?.[resourceType];
     if (!definition) {
         if (ctx === undefined || ctx.response === undefined) {
             throw new Error(`App does not have resources called ${resourceType}`);
@@ -59,17 +58,16 @@ export function getResourceDefinition(appDefinition, resourceType, ctx, view) {
  *   3. preValidateProperty function used for reconstructing resources from a CSV file.
  */
 export function extractResourceBody(ctx) {
-    var _a, _b;
     let body;
     let assets;
     let preValidateProperty;
-    if (((_a = ctx === null || ctx === void 0 ? void 0 : ctx.request) === null || _a === void 0 ? void 0 : _a.body) && ctx.is('multipart/form-data')) {
+    if (ctx?.request?.body && ctx.is('multipart/form-data')) {
         ({ assets = [], resource: body } = ctx.request.body);
         if (Array.isArray(body) && body.length === 1) {
             [body] = body;
         }
     }
-    else if ((_b = ctx === null || ctx === void 0 ? void 0 : ctx.request) === null || _b === void 0 ? void 0 : _b.body) {
+    else if (ctx?.request?.body) {
         if (ctx.is('text/csv')) {
             preValidateProperty = preProcessCSV;
         }
@@ -104,7 +102,6 @@ export function extractResourceBody(ctx) {
  *   3. Asset IDs from the `knownAssetIds` array which are no longer used.
  */
 export function processResourceBody(ctx, definition, knownAssetIds = [], knownExpires, knownAssetNameIds = [], isPatch = false) {
-    var _a, _b, _c;
     const [resource, assets, preValidateProperty] = extractResourceBody(ctx);
     const validator = new Validator();
     const assetIdMap = new Map();
@@ -114,7 +111,7 @@ export function processResourceBody(ctx, definition, knownAssetIds = [], knownEx
     const regularAssets = [];
     const thumbnailAssetSuffix = '-thumbnail.png';
     for (const asset of assets) {
-        if ((_a = asset.filename) === null || _a === void 0 ? void 0 : _a.endsWith(thumbnailAssetSuffix)) {
+        if (asset.filename?.endsWith(thumbnailAssetSuffix)) {
             thumbnailAssets.push(asset);
         }
         else {
@@ -132,7 +129,7 @@ export function processResourceBody(ctx, definition, knownAssetIds = [], knownEx
         const regularAsset = preparedRegularAssets.find((ra) => !usedPreparedRegularAssets.includes(ra.id) &&
             ra.filename.startsWith(filename.replace(thumbnailAssetSuffix, '')));
         const id = regularAsset ? `${regularAsset.id}-thumbnail` : randomUUID();
-        usedPreparedRegularAssets.push(regularAsset === null || regularAsset === void 0 ? void 0 : regularAsset.id);
+        usedPreparedRegularAssets.push(regularAsset?.id);
         assetIdMap.set(index + preparedRegularAssets.length, id);
         assetUsedMap.set(index, false);
         return { data: contents, filename, id, mime };
@@ -159,7 +156,7 @@ export function processResourceBody(ctx, definition, knownAssetIds = [], knownEx
     };
     const patchedSchema = {
         ...definition.schema,
-        required: ((_b = ctx.request) === null || _b === void 0 ? void 0 : _b.method) === 'PATCH' || isPatch ? [] : definition.schema.required,
+        required: ctx.request?.method === 'PATCH' || isPatch ? [] : definition.schema.required,
         properties: {
             ...definition.schema.properties,
             id: { type: 'integer' },
@@ -178,7 +175,7 @@ export function processResourceBody(ctx, definition, knownAssetIds = [], knownEx
                 type: 'array',
                 items: { type: 'string', format: 'binary' },
             },
-            ...Object.fromEntries(Object.values((_c = definition.references) !== null && _c !== void 0 ? _c : {}).map((reference) => [
+            ...Object.fromEntries(Object.values(definition.references ?? {}).map((reference) => [
                 `$${reference.resource}`,
                 { type: 'integer' },
             ])),

package/server/controllers/common/apps/resources/createCountAppResourcesController.js

@@ -21,10 +21,10 @@ export function createCountAppResourcesController(options) {
                     {
                         type: resourceType,
                         AppId: appId,
-                        GroupId: selectedGroupId !== null && selectedGroupId !== void 0 ? selectedGroupId : null,
+                        GroupId: selectedGroupId ?? null,
                         expires: { or: [{ gt: new Date() }, null] },
                         ...(app.demoMode ? { seed: false, ephemeral: true } : {}),
-                        ...($own ? { AuthorId: authSubject === null || authSubject === void 0 ? void 0 : authSubject.id } : {}),
+                        ...($own ? { AuthorId: authSubject?.id } : {}),
                     },
                 ],
             },

package/server/controllers/common/apps/resources/createCreateAppResourceController.js

@@ -32,13 +32,12 @@ export function createCreateAppResourceController(options) {
             return;
         }
         const resources = Array.isArray(processedBody) ? processedBody : [processedBody];
-        if (!(ctx.client && 'app' in ctx.client) && (query === null || query === void 0 ? void 0 : query.seed) === 'true') {
+        if (!(ctx.client && 'app' in ctx.client) && query?.seed === 'true') {
             const preparedSeedAssets = structuredClone(preparedAssets);
             const preparedSeedResources = resources.map((resource) => {
-                var _a;
                 const cleanResource = { ...resource };
                 if (app.demoMode) {
-                    for (const referencedProperty of Object.keys((_a = resourceDefinition.references) !== null && _a !== void 0 ? _a : {})) {
+                    for (const referencedProperty of Object.keys(resourceDefinition.references ?? {})) {
                         delete cleanResource[referencedProperty];
                     }
                 }

package/server/controllers/common/apps/resources/createDeleteAppResourceController.js

@@ -1,7 +1,6 @@
 import { assertKoaError } from '@appsemble/node-utils';
 export function createDeleteAppResourceController(options) {
     return async (ctx) => {
-        var _a;
         const { pathParams: { appId, resourceId, resourceType }, queryParams: { selectedGroupId }, user: authSubject, } = ctx;
         const { checkAppPermissions, deleteAppResource, getApp, getAppResource } = options;
         const app = await getApp({ context: ctx, query: { where: { id: appId } } });
@@ -10,7 +9,7 @@ export function createDeleteAppResourceController(options) {
                 id: resourceId,
                 type: resourceType,
                 AppId: appId,
-                GroupId: selectedGroupId !== null && selectedGroupId !== void 0 ? selectedGroupId : null,
+                GroupId: selectedGroupId ?? null,
                 expires: { or: [{ gt: new Date() }, { eq: null }] },
                 ...(app.demoMode ? { seed: false, ephemeral: true } : {}),
             },
@@ -26,7 +25,7 @@ export function createDeleteAppResourceController(options) {
         await checkAppPermissions({
             context: ctx,
             permissions: [
-                ((_a = resource.$author) === null || _a === void 0 ? void 0 : _a.id) === authSubject.id
+                resource.$author?.id === authSubject.id
                     ? `$resource:${resourceType}:own:delete`
                     : `$resource:${resourceType}:delete`,
             ],

package/server/controllers/common/apps/resources/createGetAppResourceByIdController.js

@@ -2,7 +2,6 @@ import { assertKoaError, getRemapperContext, getResourceDefinition, } from '@app
 import { defaultLocale, remap } from '@appsemble/utils';
 export function createGetAppResourceByIdController(options) {
     return async (ctx) => {
-        var _a;
         const { pathParams: { appId, resourceId, resourceType }, queryParams: { selectedGroupId, view }, user: authSubject, } = ctx;
         const { checkAppPermissions, getApp, getAppResource } = options;
         const app = await getApp({ context: ctx, query: { where: { id: appId } } });
@@ -11,7 +10,7 @@ export function createGetAppResourceByIdController(options) {
                 id: resourceId,
                 type: resourceType,
                 AppId: appId,
-                GroupId: selectedGroupId !== null && selectedGroupId !== void 0 ? selectedGroupId : null,
+                GroupId: selectedGroupId ?? null,
                 expires: { or: [{ gt: new Date() }, null] },
                 ...(app.demoMode ? { seed: false, ephemeral: true } : {}),
             },
@@ -27,7 +26,7 @@ export function createGetAppResourceByIdController(options) {
         await checkAppPermissions({
             context: ctx,
             permissions: [
-                ((_a = resource.$author) === null || _a === void 0 ? void 0 : _a.id) === (authSubject === null || authSubject === void 0 ? void 0 : authSubject.id)
+                resource.$author?.id === authSubject?.id
                     ? `$resource:${resourceType}:own:get`
                     : view
                         ? `$resource:${resourceType}:get:${view}`

package/server/controllers/common/apps/resources/createQueryAppResourcesController.js

@@ -3,7 +3,6 @@ import { defaultLocale, remap } from '@appsemble/utils';
 import { generateResourceQuery } from '../../../../utils/resources.js';
 export function createQueryAppResourcesController(options) {
     return async (ctx) => {
-        var _a, _b;
         const { pathParams: { appId, resourceType }, queryParams: { $own, $select, $skip, $top, selectedGroupId, view }, user: authSubject, } = ctx;
         const { checkAppPermissions, getApp, getAppResources } = options;
         const app = await getApp({ context: ctx, query: { where: { id: appId } } });
@@ -21,21 +20,21 @@ export function createQueryAppResourcesController(options) {
             app,
             groupId: selectedGroupId,
         });
-        const isSameOrigin = ((_a = ctx === null || ctx === void 0 ? void 0 : ctx.headers) === null || _a === void 0 ? void 0 : _a.origin) === ((_b = ctx === null || ctx === void 0 ? void 0 : ctx.headers) === null || _b === void 0 ? void 0 : _b.host);
+        const isSameOrigin = ctx?.headers?.origin === ctx?.headers?.host;
         const findOptions = {
             limit: $top,
             offset: $skip,
-            attributes: $select === null || $select === void 0 ? void 0 : $select.split(',').map((s) => s.trim()),
+            attributes: $select?.split(',').map((s) => s.trim()),
             where: {
                 and: [
                     where,
                     {
                         type: resourceType,
                         AppId: appId,
-                        GroupId: selectedGroupId !== null && selectedGroupId !== void 0 ? selectedGroupId : null,
+                        GroupId: selectedGroupId ?? null,
                         expires: { or: [{ gt: new Date() }, null] },
                         ...(app.demoMode && !isSameOrigin ? { seed: false, ephemeral: true } : {}),
-                        ...($own ? { AuthorId: authSubject === null || authSubject === void 0 ? void 0 : authSubject.id } : {}),
+                        ...($own ? { AuthorId: authSubject?.id } : {}),
                     },
                 ],
             },

package/server/controllers/common/apps/resources/createUpdateAppResourceController.js

@@ -1,7 +1,6 @@
 import { assertKoaError, getResourceDefinition, processResourceBody, } from '@appsemble/node-utils';
 export function createUpdateAppResourceController(options) {
     return async (ctx) => {
-        var _a;
         const { pathParams: { appId, resourceId, resourceType }, queryParams: { selectedGroupId }, user: authSubject, } = ctx;
         const { checkAppPermissions, getApp, getAppAssets, getAppResource, updateAppResource } = options;
         const app = await getApp({ context: ctx, query: { where: { id: appId } } });
@@ -10,7 +9,7 @@ export function createUpdateAppResourceController(options) {
                 id: resourceId,
                 type: resourceType,
                 AppId: appId,
-                GroupId: selectedGroupId !== null && selectedGroupId !== void 0 ? selectedGroupId : null,
+                GroupId: selectedGroupId ?? null,
                 expires: { or: [{ gt: new Date() }, null] },
                 ...(app.demoMode ? { seed: false, ephemeral: true } : {}),
             },
@@ -26,7 +25,7 @@ export function createUpdateAppResourceController(options) {
         await checkAppPermissions({
             context: ctx,
             permissions: [
-                ((_a = oldResource.$author) === null || _a === void 0 ? void 0 : _a.id) === (authSubject === null || authSubject === void 0 ? void 0 : authSubject.id)
+                oldResource.$author?.id === authSubject?.id
                     ? `$resource:${resourceType}:own:update`
                     : `$resource:${resourceType}:update`,
             ],

package/server/controllers/main/apps/resources/createDeleteAppSeedResourcesController.js

@@ -2,12 +2,11 @@ import { assertKoaError } from '../../../../../koa.js';
 import { deleteResourcesRecursively } from '../../../../utils/resources.js';
 export function createDeleteAppSeedResourcesController(options) {
     return async (ctx) => {
-        var _a;
         const { pathParams: { appId }, } = ctx;
         const { getApp } = options;
         const app = await getApp({ context: ctx, query: { where: { id: appId } } });
         assertKoaError(!app, ctx, 404, 'App not found');
-        for (const resourceType of Object.keys((_a = app.definition.resources) !== null && _a !== void 0 ? _a : {})) {
+        for (const resourceType of Object.keys(app.definition.resources ?? {})) {
             await deleteResourcesRecursively(resourceType, app, options, ctx);
         }
     };

package/server/routes/appRouter/bulmaHandler.js

@@ -88,7 +88,7 @@ export function createBulmaHandler({ createTheme, getTheme }) {
             fontSource: getQueryParameter(query.fontSource) || baseTheme.font.source,
         };
         const result = await getTheme({ theme });
-        let css = result === null || result === void 0 ? void 0 : result.css;
+        let css = result?.css;
         if (!css) {
             css = stripBom(String(renderSync({
                 data: processStyle(theme),

package/server/routes/appRouter/iconHandler.js

@@ -10,7 +10,7 @@ export function createIconHandler({ getApp, getAppIcon, getDbUpdated }) {
         const dbUpdated = app ? await getDbUpdated({ app, maskable, context: ctx }) : false;
         const appIcon = app ? await getAppIcon({ app, context: ctx }) : null;
         await serveIcon(ctx, {
-            background: maskable ? (app === null || app === void 0 ? void 0 : app.iconBackground) || '#ffffff' : undefined,
+            background: maskable ? app?.iconBackground || '#ffffff' : undefined,
             cache: dbUpdated ? isEqual(parseISO(updated), dbUpdated) : false,
             fallback: 'mobile-alt-solid.png',
             height: size && Number.parseInt(size),

package/server/routes/appRouter/indexHandler.js

@@ -7,7 +7,6 @@ export const bulmaURL = `/bulma/${bulmaVersion}/bulma.min.css`;
 export const faURL = `/fa/${faVersion}/css/all.min.css`;
 export function createIndexHandler({ createSettings, getApp, getAppDetails, getAppMessages, getAppUrl, getCsp, getHost, }) {
     return async (ctx) => {
-        var _a;
         const { hostname, path } = ctx;
         const host = getHost({ context: ctx });
         const app = await getApp({ context: ctx });
@@ -61,7 +60,7 @@ export function createIndexHandler({ createSettings, getApp, getAppDetails, getA
             faURL,
             nonce,
             settings,
-            themeColor: ((_a = app.definition.theme) === null || _a === void 0 ? void 0 : _a.themeColor) || '#ffffff',
+            themeColor: app.definition.theme?.themeColor || '#ffffff',
             appUpdated: updated.toISOString(),
         });
     };

package/server/utils/actions.js

@@ -60,7 +60,6 @@ function deserializeResource(data) {
     return replaceAssets(resource);
 }
 async function handleRequestProxy(ctx, app, action, useBody, options) {
-    var _a, _b;
     const { method, query, request: { body, headers }, } = ctx;
     let data;
     if (useBody) {
@@ -97,7 +96,7 @@ async function handleRequestProxy(ctx, app, action, useBody, options) {
         throwKoaError(ctx, 400, 'params should be a JSON object.');
     }
     let axiosConfig = {
-        method: (_a = action.method) !== null && _a !== void 0 ? _a : 'GET',
+        method: action.method ?? 'GET',
         url: String(proxyUrl),
         params,
         responseType: 'arraybuffer',
@@ -114,6 +113,7 @@ async function handleRequestProxy(ctx, app, action, useBody, options) {
         }
     }
     axiosConfig.headers['user-agent'] = `AppsembleServer/${version}`;
+    axiosConfig.headers.connection = 'close';
     axiosConfig.responseType = 'stream';
     axiosConfig.validateStatus = () => true;
     axiosConfig.decompress = false;
@@ -139,7 +139,7 @@ async function handleRequestProxy(ctx, app, action, useBody, options) {
             const { deploymentName, namespace } = parseServiceUrl(String(proxyUrl));
             try {
                 await scaleDeployment(namespace, deploymentName, 1);
-                await waitForPodReadiness(namespace, deploymentName, (_b = process.env.POD_READINESS_TIMEOUT) !== null && _b !== void 0 ? _b : undefined);
+                await waitForPodReadiness(namespace, deploymentName, process.env.POD_READINESS_TIMEOUT ?? undefined);
                 response = await axios(axiosConfig);
             }
             catch {
@@ -165,7 +165,7 @@ export function createProxyHandler(useBody, options) {
         const app = await options.getApp({ context: ctx, query: { where: { id: appId } } });
         assertKoaError(!app, ctx, 404, 'App not found');
         const appAction = get(app.definition, path);
-        const action = supportedActions.find((act) => act === (appAction === null || appAction === void 0 ? void 0 : appAction.type));
+        const action = supportedActions.find((act) => act === appAction?.type);
         switch (action) {
             case 'email':
                 return handleEmail(ctx, app, appAction, options);

package/server/utils/resources.js

@@ -18,10 +18,7 @@ export function generateResourceQuery(ctx, { parseQuery }, resourceDefinition) {
 }
 export async function deleteResourcesRecursively(type, app, options, context) {
     const { deleteAppResource, getAppResources } = options;
-    const referencingResources = Object.entries(app.definition.resources).filter(([, resourceDefinition]) => {
-        var _a;
-        return Object.values((_a = resourceDefinition.references) !== null && _a !== void 0 ? _a : {}).find((resourceReference) => resourceReference.resource === type);
-    });
+    const referencingResources = Object.entries(app.definition.resources).filter(([, resourceDefinition]) => Object.values(resourceDefinition.references ?? {}).find((resourceReference) => resourceReference.resource === type));
     for (const [referencingResourceType] of referencingResources) {
         await deleteResourcesRecursively(referencingResourceType, app, options, context);
     }

package/tinyRouter.js

@@ -27,7 +27,7 @@ export function tinyRouter(routes) {
             }
             m = 'any';
         }
-        ctx.params = (match === null || match === void 0 ? void 0 : match.groups) ? { ...match.groups } : null;
+        ctx.params = match?.groups ? { ...match.groups } : null;
         return result[m](ctx, next);
     };
 }