@kumori/aurora-backend-handler 1.0.99 → 1.0.111

package/.gitlab-ci.yml

@@ -18,27 +18,27 @@ install:
     paths:
       - node_modules/
 
-# test:
-#   stage: test
-#   image: node:16-alpine
-#   tags:
-#     - docker
-#   dependencies:
-#     - install
-#   script:
-#     - npm install --no-save jest-junit
-#     - npm run test
-#   coverage: '/All files.*?\|\s*[\d\.]+\s*\|\s*[\d\.]+\s*\|\s*[\d\.]+\s*\|\s*([\d\.]+)/'
-#   artifacts:
-#     when: always
-#     paths:
-#       - report.xml
-#     reports:
-#       junit: report.xml
-#   only:
-#     - merge_requests
-#     - master
-#     - tags
+test:
+  stage: test
+  image: node:16-alpine
+  tags:
+    - docker
+  dependencies:
+    - install
+  script:
+    - npm install --no-save jest-junit
+    - npm run test
+  coverage: '/All files.*?\|\s*[\d\.]+\s*\|\s*[\d\.]+\s*\|\s*[\d\.]+\s*\|\s*([\d\.]+)/'
+  artifacts:
+    when: always
+    paths:
+      - report.xml
+    reports:
+      junit: report.xml
+  only:
+    - merge_requests
+    - master
+    - tags
 
 release:
   stage: release

package/CHANGELOG.md

@@ -0,0 +1,10 @@
+# CHANGELOG 1.0.0 (2026-04-28)
+
+## Added (2 change)
+
+* More tests to improve coverage.
+* CHANGELOG.md file to follow the new reposiotry structure.
+
+## Changes (1 change)
+
+* Updated the DSL library to ["@kumori/kumori-dsl-generator": "1.0.6"]

package/api/account-api-service.ts

@@ -1,4 +1,4 @@
-import { Account, Notification } from "@kumori/aurora-interfaces";
+import { Account, errors, Notification } from "@kumori/aurora-interfaces";
 import {
   initializeGlobalWebSocketClient,
   getWebSocketStatus,
@@ -8,6 +8,13 @@ import { eventHelper } from "../backend-handler";
 
 type Security = string;
 function extractErrorInfo(error: unknown): { code: string; message: string } {
+  if ((error as any)?.isTimeout) {
+    return {
+      code: "timeout",
+      message:
+        "The request is taking too long, but it does not mean it failed. If you need more help, please contact support.",
+    };
+  }
   const err = (error as any)?.error;
   return {
     code: err?.code ?? "unknown_error",
@@ -630,7 +637,7 @@ export const createAccount = async (account: Account, security: Security) => {
 
     const accountErrorNotification: Notification = {
       type: "error",
-      subtype: "account-creation-error",
+      subtype: errors.account.creationError.subtype,
       info_content: {
         code,
         message,
@@ -729,7 +736,7 @@ export const deleteAccount = async (account: Account, security: Security) => {
 
     const accountNotification: Notification = {
       type: "success",
-      subtype: "account-deleteing",
+      subtype: errors.account.deleting.subtype,
       date: Date.now().toString(),
       status: "unread",
       callToAction: false,
@@ -747,7 +754,7 @@ export const deleteAccount = async (account: Account, security: Security) => {
 
     const accountErrorNotification: Notification = {
       type: "error",
-      subtype: "account-deletion-error",
+      subtype: errors.account.deletionError.subtype,
       date: Date.now().toString(),
       info_content: {
         code,
@@ -790,7 +797,7 @@ export const clearAccount = async (account: Account, security: Security) => {
     eventHelper.account.publish.cleaned(updatedAccount);
     const accountNotification: Notification = {
       type: "success",
-      subtype: "account-cleaned",
+      subtype: errors.account.cleaned.subtype,
       date: Date.now().toString(),
       status: "unread",
       callToAction: false,
@@ -808,7 +815,7 @@ export const clearAccount = async (account: Account, security: Security) => {
 
     const accountErrorNotification: Notification = {
       type: "error",
-      subtype: "account-clean-error",
+      subtype: errors.account.cleanError.subtype,
       date: Date.now().toString(),
       info_content: {
         code,
@@ -1422,24 +1429,25 @@ export const updateAccount = async (account: Account, security: Security) => {
       provider: account.cloudProvider?.name,
     });
     eventHelper.account.publish.updateError(account);
-    // const { code, message } = extractErrorInfo(error);
+    const { code, message } = extractErrorInfo(error);
 
-    // const accountErrorNotification: Notification = {
-    //   type: "error",
-    //   subtype: "account-update-error",
-    //   date: Date.now().toString(),
-    //   info_content: {
-    //     code,
-    //     message,
-    //   },
-    //   status: "unread",
-    //   callToAction: false,
-    //   data: {
-    //     account: account.name,
-    //     tenant: account.tenant,
-    //   },
-    // };
-    // eventHelper.notification.publish.creation(accountErrorNotification);
+    const accountErrorNotification: Notification = {
+      type: "error",
+      subtype: errors.account.updateError.subtype,
+      date: Date.now().toString(),
+      info_content: {
+        code,
+        message,
+      },
+      status: "unread",
+      callToAction: false,
+      data: {
+        account: account.name,
+        tenant: account.tenant,
+      },
+      userError: true,
+    };
+    eventHelper.notification.publish.creation(accountErrorNotification);
     throw error;
   }
 };

package/api/deploy-service-helper.ts

@@ -84,6 +84,8 @@ export interface ServiceSpecForm {
   cpuRequirements: number;
   memoryRequirements: number;
   registryUrl: string;
+  registryCredentialsSecret?: string;
+  registryCredentialSecret?: string;
   imageTag: string;
   clientChannels: Array<{ name: string }>;
   channels: Array<{
@@ -98,6 +100,7 @@ export interface ServiceSpecForm {
     certificateResource?: string;
     withMtls?: boolean;
     caResource?: string;
+    gatewayName?: string;
   }>;
   clientChannelsExtra?: Array<{ name: string }>;
   defaultExecutable: { cmd?: string; entryPoint?: string };
@@ -136,6 +139,7 @@ export interface ServiceSpecForm {
     };
     histeresys: string;
   };
+  hsize?: number;
 }
 
 export interface ServiceWithLocalComponentSpec {
@@ -180,7 +184,8 @@ interface ArtifactConfigParameterDto {
 type ParameterTypeDto = "string" | "number" | "bool";
 type ComponentEnvironmentDto =
   | ComponentEnvironmentParamDto
-  | ComponentEnvironmentSecretDto;
+  | ComponentEnvironmentSecretDto
+  | ComponentEnvironmentValueDto;
 interface ComponentEnvironmentParamDto {
   varName: string;
   param: string;
@@ -189,6 +194,10 @@ interface ComponentEnvironmentSecretDto {
   varName: string;
   secret: string;
 }
+interface ComponentEnvironmentValueDto {
+  varName: string;
+  value: string;
+}
 type ArtifactConfigResource =
   | CA<ArtifactConfigResourceSpec>
   | Secret<ArtifactConfigResourceSpec>
@@ -218,13 +227,21 @@ interface Port<VARIANT> {
 interface Certificate<VARIANT> {
   certificate: VARIANT;
 }
-type ComponentFilesystemDto = FilesystemVolumeDto | FilesystemFileDto;
+type ComponentFilesystemDto =
+  | FilesystemVolumeDto
+  | FilesystemSecretDto
+  | FilesystemFileDto;
 
 interface FilesystemVolumeDto {
   path: string;
   resourceVolume: string;
 }
 
+interface FilesystemSecretDto {
+  path: string;
+  resourceSecret: string;
+}
+
 interface FilesystemFileDto {
   path: string;
   param?: string;
@@ -378,6 +395,13 @@ export function handleParametersToGenerateData(
         });
         break;
 
+      case "clientChannel":
+        environmentResult.push({
+          varName: parameter.name,
+          value: `0.${parameter.value}`,
+        });
+        break;
+
       default:
         console.warn(`Unknown parameter type: ${parameter.type}`);
         parametersResult.push({
@@ -396,10 +420,17 @@ export function handleParametersToGenerateData(
     switch (resource.type) {
       case "secret":
         resourcesResult.push({ secret: { name: resource.name } });
-        environmentResult.push({
-          varName: resource.name,
-          secret: resource.name as string,
-        });
+        if (resource.key) {
+          fileSystemResult.push({
+            path: resource.key,
+            resourceSecret: resource.name,
+          });
+        } else {
+          environmentResult.push({
+            varName: resource.name,
+            secret: resource.name as string,
+          });
+        }
         break;
       case "volume":
         resourcesResult.push({ volume: { name: resource.name } });
@@ -436,7 +467,6 @@ export function handleParametersToGenerateData(
  * @returns A ServiceSpecForm object with the data of the service.
  */
 export function transformServiceToForm(service: Service): ServiceSpecForm {
-  console.log('--- TRANSFORM SERVICE TO FORM ---', service.name);
   return {
     tenantId: service.tenant,
     accountId: service.account,
@@ -445,6 +475,7 @@ export function transformServiceToForm(service: Service): ServiceSpecForm {
     cpuRequirements: service.usage.limit.cpu.max,
     memoryRequirements: service.usage.limit.memory.max,
     registryUrl: service.registry,
+    registryCredentialsSecret: service.registryCredentialSecret,
     imageTag: service.imageName,
     clientChannels: service.clientChannels.map((ch) => ({ name: ch.name })),
     channels: service.serverChannels.map((ch) => ({
@@ -462,6 +493,7 @@ export function transformServiceToForm(service: Service): ServiceSpecForm {
       certificateResource: ch.certificateResource,
       withMtls: ch.withMtls,
       caResource: ch.caResource,
+      gatewayName: ch.gatewayName,
     })),
     clientChannelsExtra: service.duplexChannels.map((ch) => ({
       name: ch.name,
@@ -486,13 +518,22 @@ export function transformServiceToForm(service: Service): ServiceSpecForm {
       })),
     },
     environment: [service.environment],
-    fileSystem: service.resources
-      .filter((resource) => resource.type === "volume")
-      .map((resource) => ({
-        path: resource.key,
-        resourceVolume: resource.name,
-      })),
+    fileSystem: [
+      ...service.resources
+        .filter((resource) => resource.type === "volume")
+        .map((resource) => ({
+          path: resource.key,
+          resourceVolume: resource.name,
+        })),
+      ...service.resources
+        .filter((resource) => resource.type === "secret" && resource.key)
+        .map((resource) => ({
+          path: resource.key,
+          resourceSecret: resource.name,
+        })),
+    ],
     scaling: service.role[0].scalling,
+    hsize: service.role[0].hsize
   };
 }
 /**
@@ -513,15 +554,12 @@ export async function generateServiceSpec(
     resources: componentResources,
   } = handleParametersToGenerateData(formParams, formResources);
 
-  console.log('--- GENERATE SERVICE SPEC ---', form.serviceId);
-  console.log('Channels from Form:', JSON.stringify(form.channels));
-
   const serverConfigDomainResources: ArtifactConfigResource[] = form.channels
     .filter((channel) => channel.protocol === "HTTPS" && channel.isPublic)
     .map((channel) => ({ domain: { name: `${channel.channelName}_domain` } }));
 
   const hasDefaultCertChannel = form.channels.some(
-    (ch) => ch.protocol === "HTTPS" && ch.isPublic && !ch.certificateResource
+    (ch) => ch.protocol === "HTTPS" && ch.isPublic && !ch.certificateResource,
   );
   if (hasDefaultCertChannel) {
     serverConfigDomainResources.push({
@@ -531,23 +569,17 @@ export async function generateServiceSpec(
 
   const customCertResources: ArtifactConfigResource[] = form.channels
     .filter(
-      (ch) => ch.protocol === "HTTPS" && ch.isPublic && ch.certificateResource
+      (ch) => ch.protocol === "HTTPS" && ch.isPublic && ch.certificateResource,
     )
     .map((ch) => ({ certificate: { name: `${ch.channelName}_cert` } }));
 
   const customCaResources: ArtifactConfigResource[] = form.channels
     .filter(
       (ch) =>
-        ch.protocol === "HTTPS" && ch.isPublic && ch.withMtls && ch.caResource
+        ch.protocol === "HTTPS" && ch.isPublic && ch.withMtls && ch.caResource,
     )
     .map((ch) => ({ ca: { name: `${ch.channelName}_ca` } }));
 
-  console.log('Generated Resources Spec:', {
-    serverConfigDomainResources,
-    customCertResources,
-    customCaResources
-  });
-
   const serviceConfigPortResources: ArtifactConfigResource[] = form.channels
     .filter((channel) => channel.protocol === "TCP" && channel.isPublic)
     .map((channel) => ({ port: { name: `${channel.channelName}_port` } }));
@@ -636,7 +668,7 @@ export async function generateServiceSpec(
     .map((channel) => {
       if (channel.protocol === "HTTPS") {
         return {
-          name: `${channel.channelName}_inbound`,
+          name: channel.gatewayName || `${channel.channelName}_inbound`,
           artifact: {
             artifactKind: "service",
             moduleDomain: "kumori.systems",
@@ -679,7 +711,7 @@ export async function generateServiceSpec(
         };
       }
       return {
-        name: `${channel.channelName}_inbound`,
+        name: channel.gatewayName || `${channel.channelName}_inbound`,
         artifact: {
           artifactKind: "service",
           moduleDomain: " ",
@@ -713,7 +745,7 @@ export async function generateServiceSpec(
       ];
       if (channel.isPublic) {
         result.push({
-          clientRole: `${channel.channelName}_inbound`,
+          clientRole: channel.gatewayName || `${channel.channelName}_inbound`,
           clientChannel: "inbound",
           serverRole: withDefaultValue(form.serviceId, ""),
           serverChannel: channel.channelName,
@@ -891,7 +923,7 @@ export async function generateServiceSpec(
     }));
 
   const hasDefaultCertChannelDeployment = form.channels.some(
-    (ch) => ch.protocol === "HTTPS" && ch.isPublic && !ch.certificateResource
+    (ch) => ch.protocol === "HTTPS" && ch.isPublic && !ch.certificateResource,
   );
   if (hasDefaultCertChannelDeployment) {
     deploymentConfigDomain.push({
@@ -904,7 +936,7 @@ export async function generateServiceSpec(
 
   const customCertDeploymentResources: DeploymentResource[] = form.channels
     .filter(
-      (ch) => ch.protocol === "HTTPS" && ch.isPublic && ch.certificateResource
+      (ch) => ch.protocol === "HTTPS" && ch.isPublic && ch.certificateResource,
     )
     .map((ch) => ({
       certificate: {
@@ -916,7 +948,7 @@ export async function generateServiceSpec(
   const customCaDeploymentResources: DeploymentResource[] = form.channels
     .filter(
       (ch) =>
-        ch.protocol === "HTTPS" && ch.isPublic && ch.withMtls && ch.caResource
+        ch.protocol === "HTTPS" && ch.isPublic && ch.withMtls && ch.caResource,
     )
     .map((ch) => ({
       ca: {
@@ -1065,7 +1097,7 @@ export async function generateServiceSpec(
                     detail: (marketplaceItem.roles ?? []).reduce(
                       (acc, role) => ({
                         ...acc,
-                        [withDefaultValue(role, "")]: 1,
+                        [withDefaultValue(role, "")]: (marketplaceItem.deploymentData.role ?? []).find((r) => r.name === withDefaultValue(role, ""))?.hsize || 1,
                       }),
                       {},
                     ),
@@ -1108,7 +1140,7 @@ export async function generateServiceSpec(
       ],
       scale: {
         detail: {
-          [withDefaultValue(form.serviceId, "")]: 1,
+          [withDefaultValue(form.serviceId, "")]: form.hsize || 1,
         },
       },
       meta: autoscalingDefined
@@ -1139,13 +1171,12 @@ async function generateServiceSpecDSL(
     fileSystem,
     resources: componentResources,
   } = handleParametersToGenerateData(formParams, formResources);
-
   const serverConfigDomainResources: ArtifactConfigResource[] = form.channels
     .filter((channel) => channel.protocol === "HTTPS" && channel.isPublic)
     .map((channel) => ({ domain: { name: `${channel.channelName}_domain` } }));
 
   const hasDefaultCertChannel = form.channels.some(
-    (ch) => ch.protocol === "HTTPS" && ch.isPublic && !ch.certificateResource
+    (ch) => ch.protocol === "HTTPS" && ch.isPublic && !ch.certificateResource,
   );
   if (hasDefaultCertChannel) {
     serverConfigDomainResources.push({
@@ -1155,23 +1186,17 @@ async function generateServiceSpecDSL(
 
   const customCertResources: ArtifactConfigResource[] = form.channels
     .filter(
-      (ch) => ch.protocol === "HTTPS" && ch.isPublic && ch.certificateResource
+      (ch) => ch.protocol === "HTTPS" && ch.isPublic && ch.certificateResource,
     )
     .map((ch) => ({ certificate: { name: `${ch.channelName}_cert` } }));
 
   const customCaResources: ArtifactConfigResource[] = form.channels
     .filter(
       (ch) =>
-        ch.protocol === "HTTPS" && ch.isPublic && ch.withMtls && ch.caResource
+        ch.protocol === "HTTPS" && ch.isPublic && ch.withMtls && ch.caResource,
     )
     .map((ch) => ({ ca: { name: `${ch.channelName}_ca` } }));
 
-  console.log('Generated Resources Config:', {
-    serverConfigDomainResources,
-    customCertResources,
-    customCaResources
-  });
-
   const serviceConfigPortResources: ArtifactConfigResource[] = form.channels
     .filter((channel) => channel.protocol === "TCP" && channel.isPublic)
     .map((channel) => ({ port: { name: `${channel.channelName}_port` } }));
@@ -1256,7 +1281,7 @@ async function generateServiceSpecDSL(
     .map((channel) => {
       if (channel.protocol === "HTTPS") {
         return {
-          name: `${channel.channelName}_inbound`,
+          name: channel.gatewayName || `${channel.channelName}_inbound`,
           artifact: {
             artifactKind: "service" as const,
             moduleDomain: "kumori",
@@ -1299,7 +1324,7 @@ async function generateServiceSpecDSL(
         };
       }
       return {
-        name: `${channel.channelName}_inbound`,
+        name: channel.gatewayName || `${channel.channelName}_inbound`,
         artifact: {
           artifactKind: "service" as const,
           moduleDomain: "kumori",
@@ -1334,7 +1359,7 @@ async function generateServiceSpecDSL(
     ];
     if (channel.isPublic) {
       result.push({
-        clientRole: `${channel.channelName}_inbound`,
+        clientRole: channel.gatewayName || `${channel.channelName}_inbound`,
         clientChannel: "inbound",
         serverRole: withDefaultValue(form.serviceId, ""),
         serverChannel: channel.channelName,
@@ -1458,7 +1483,7 @@ async function generateServiceSpecDSL(
     }));
 
   const hasDefaultCertChannelDeployment = form.channels.some(
-    (ch) => ch.protocol === "HTTPS" && ch.isPublic && !ch.certificateResource
+    (ch) => ch.protocol === "HTTPS" && ch.isPublic && !ch.certificateResource,
   );
   if (hasDefaultCertChannelDeployment) {
     deploymentConfigDomain.push({
@@ -1471,7 +1496,7 @@ async function generateServiceSpecDSL(
 
   const customCertDeploymentResources: DeploymentResource[] = form.channels
     .filter(
-      (ch) => ch.protocol === "HTTPS" && ch.isPublic && ch.certificateResource
+      (ch) => ch.protocol === "HTTPS" && ch.isPublic && ch.certificateResource,
     )
     .map((ch) => ({
       certificate: {
@@ -1483,7 +1508,7 @@ async function generateServiceSpecDSL(
   const customCaDeploymentResources: DeploymentResource[] = form.channels
     .filter(
       (ch) =>
-        ch.protocol === "HTTPS" && ch.isPublic && ch.withMtls && ch.caResource
+        ch.protocol === "HTTPS" && ch.isPublic && ch.withMtls && ch.caResource,
     )
     .map((ch) => ({
       ca: {
@@ -1492,12 +1517,6 @@ async function generateServiceSpecDSL(
       },
     }));
 
-  console.log('Generated Deployment Resources:', {
-    deploymentConfigDomain,
-    customCertDeploymentResources,
-    customCaDeploymentResources
-  });
-
   const deploymentConfigPort: DeploymentResource[] = form.channels
     .filter((channel) => channel.protocol === "TCP" && channel.isPublic)
     .map((channel) => ({
@@ -1520,7 +1539,6 @@ async function generateServiceSpecDSL(
   } = {
     simple: {},
   };
-
   scaling.simple[form.serviceId] = {
     scale_up: {
       cpu: parseInt(form.scaling?.cpu.up || "") || 0,
@@ -1534,7 +1552,7 @@ async function generateServiceSpecDSL(
     min_replicas: form.scaling?.instances.min || 0,
     max_replicas: form.scaling?.instances.max || 0,
   };
-
+  const autoscalingDefined = form.scaling;
   const hasMarketplacePackage = marketplaceItem?.package;
 
   const serviceSpec: ServiceSpecDSLWithLocalComponent = {
@@ -1630,14 +1648,13 @@ async function generateServiceSpecDSL(
       ],
       scale: {
         detail: {
-          [withDefaultValue(form.serviceId, "")]: 1,
+          [withDefaultValue(form.serviceId, "")]: form.hsize || 1,
         },
       },
       meta: {
-        deploymentMeta: {
           environment: form.environment || [],
           team: "development",
-        },
+            scaling: autoscalingDefined ? scaling  : {}
       },
     },
   };
@@ -1673,13 +1690,13 @@ async function generateServiceSpecDSL(
       memoryRequirements: withDefaultValue(form.memoryRequirements, 0) * 1000,
       registryUrl: withDefaultValue(form.registryUrl, "docker.io").trim(),
       imageTag: withDefaultValue(form.imageTag, "").trim(),
-      registryCredentialsSecret: form.config.resources
-        .map((r) => {
-          if (r.type === "secret" && r.key === "registryCredentials") {
-            return r.name;
-          }
-        })
-        .find((name) => name !== undefined),
+      registryCredentialsSecret: form.registryCredentialsSecret
+        ? form.config.resources.find(
+            (r) => r.type === "secret" && r.name === form.registryCredentialsSecret,
+          )?.name
+        : form.config.resources.find(
+            (r) => r.type === "secret" && r.key === "registryCredentials",
+          )?.name,
       config: {
         parameters,
         resources: componentResources,
@@ -1718,7 +1735,6 @@ export async function deployServiceHelper(
     serviceForm,
     marketplaceItem,
   );
-  console.log('Final generated ServiceSpecDSL:', JSON.stringify(serviceSpecDSL, null, 2));
   CUEBundle = buildServiceDeploymentModule(serviceSpecDSL);
 
   // if (marketplaceItem?.package) {