@kumori/aurora-backend-handler 1.0.0 → 1.0.2

package/api/account-api-service.ts

@@ -1,5 +1,5 @@
 
-import { Account, Notification } from "@hestekumori/aurora-interfaces";
+import { Account, Notification } from "@kumori/aurora-interfaces";
 import {
   initializeGlobalWebSocketClient,
   getWebSocketStatus,

package/api/deploy-service-helper.ts

@@ -10,7 +10,7 @@ import {
   ComponentSpec as ComponentSpecDSL,
   ServiceSpec as ServiceSpecDSL,
 } from "@kumori/kumori-dsl-generator";
-import { MarketplaceService, Resource, Service } from "@hestekumori/aurora-interfaces";
+import { MarketplaceService, Resource, Service } from "@kumori/aurora-interfaces";
 
 export type ResourceBundle =
   | { secret: { name: string; configResource: string } }

package/api/environment-api-service.ts

@@ -1,5 +1,5 @@
 
-import { Environment, Notification } from "@hestekumori/aurora-interfaces";
+import { Environment, Notification } from "@kumori/aurora-interfaces";
 import { eventHelper } from "../backend-handler";
 import {
   initializeGlobalWebSocketClient,

package/api/marketplace-api-service.ts

@@ -1,4 +1,4 @@
-import { Link, MarketplaceItem, MarketplaceService, Notification, Service } from "@hestekumori/aurora-interfaces";
+import { Link, MarketplaceItem, MarketplaceService, Notification, Service } from "@kumori/aurora-interfaces";
 import { eventHelper } from "../backend-handler";
 import { environment } from "../environment";
 

package/api/reporting-api-service.ts

@@ -1,4 +1,4 @@
-import { Environment } from "@hestekumori/aurora-interfaces";
+import { Environment } from "@kumori/aurora-interfaces";
 import { makeGlobalWebSocketRequest } from "../websocket-manager";
 
 export const getReporting = async (env: Environment) => {

package/api/resources-api-service.ts

@@ -1,4 +1,4 @@
-import { Notification, Resource } from "@hestekumori/aurora-interfaces";
+import { Notification, Resource } from "@kumori/aurora-interfaces";
 import { eventHelper } from "../backend-handler";
 
 import {

package/api/service-api-service.ts

@@ -6,7 +6,7 @@ import {
   getWebSocketStatus,
   makeGlobalWebSocketRequest,
 } from "../websocket-manager";
-import { Link, Notification, Service } from "@hestekumori/aurora-interfaces";
+import { Link, Notification, Service } from "@kumori/aurora-interfaces";
 let pendingLinks = new Map<string, Link[]>();
 /**
  * Function to deploy a service

package/api/tenant-api-service.ts

@@ -1,4 +1,4 @@
-import { Notification, Registry, Tenant, tenantRole } from "@hestekumori/aurora-interfaces";
+import { Notification, Registry, Tenant, tenantRole } from "@kumori/aurora-interfaces";
 import { eventHelper } from "../backend-handler";
 import { environment } from "../environment";
 import {

package/api/user-api-service.ts

@@ -4,7 +4,7 @@ import {
   makeGlobalWebSocketRequest,
 } from "../websocket-manager.ts";
 import { environment } from "../environment.ts";
-import { Account, Container, Environment, Instance, MarketplaceItem, Notification, Organization, Platform, Registry, Resource, Service, Tenant, User, UserData } from "@hestekumori/aurora-interfaces";
+import { Account, Container, Environment, Instance, MarketplaceItem, Notification, Organization, Platform, Registry, Resource, Service, Tenant, User, UserData } from "@kumori/aurora-interfaces";
 
 type Security = string;
 

package/backend-handler.ts

@@ -52,7 +52,7 @@ import {
   updateResource,
 } from "./api/resources-api-service";
 import { getPlanProviders } from './api/planProvider-api-service';
-import { Account, Environment, Link, MarketplaceService, Notification, Organization, Resource, Service, Tenant, tenantRole, UserData } from "@hestekumori/aurora-interfaces";
+import { Account, Environment, Link, MarketplaceService, Notification, Organization, Resource, Service, Tenant, tenantRole, UserData } from "@kumori/aurora-interfaces";
 
 export let eventHelper: EventHelper;
 const token =

package/event-helper.ts

@@ -1,4 +1,4 @@
-import { Account, Environment, Link, MarketplaceItem, MarketplaceService, Organization, PlanProvider, Registry, Tenant, tenantRole, User, Service, Notification, Resource } from "@hestekumori/aurora-interfaces";
+import { Account, Environment, Link, MarketplaceItem, MarketplaceService, Organization, PlanProvider, Registry, Tenant, tenantRole, User, Service, Notification, Resource } from "@kumori/aurora-interfaces";
 import { EventNames } from "./event-names";
 export interface RegistryUpdatePayload {
   tenant: Tenant;

package/helpers/account-helper.ts

@@ -1,4 +1,4 @@
-import { Account, Notification } from "@hestekumori/aurora-interfaces";
+import { Account, Notification } from "@kumori/aurora-interfaces";
 
 
 interface HandleAccountEventParams {

package/helpers/environment-helper.ts

@@ -1,4 +1,4 @@
-import { Account, Environment, Notification } from "@hestekumori/aurora-interfaces";
+import { Account, Environment, Notification } from "@kumori/aurora-interfaces";
 
 
 

package/helpers/link-helper.ts

@@ -1,4 +1,4 @@
-import { Link, Service } from "@hestekumori/aurora-interfaces";
+import { Link, Service } from "@kumori/aurora-interfaces";
 
 
 interface HandleLinkEventParams {

package/helpers/plan-helper.ts

@@ -1,4 +1,4 @@
-import { Plan, UserData } from "@hestekumori/aurora-interfaces";
+import { Plan, UserData } from "@kumori/aurora-interfaces";
 
 
 interface HandlePlanInstanceEventParams {

package/helpers/registry-helper.ts

@@ -1,5 +1,5 @@
 
-import { Registry, Tenant } from "@hestekumori/aurora-interfaces";
+import { Registry, Tenant } from "@kumori/aurora-interfaces";
 import { decodeRegistryAuth } from "../utils/utils";
 
 

package/helpers/resource-helper.ts

@@ -1,5 +1,5 @@
 
-import { Resource, Tenant } from "@hestekumori/aurora-interfaces";
+import { Resource, Tenant } from "@kumori/aurora-interfaces";
 import { decodeRegistryAuth } from "../utils/utils";
 
 

package/helpers/revision-helper.ts

@@ -1,5 +1,12 @@
-
-import { Account, Container, Environment, Instance, Resource, Service, Usage } from "@hestekumori/aurora-interfaces";
+import {
+  Account,
+  Container,
+  Environment,
+  Instance,
+  Resource,
+  Service,
+  Usage,
+} from "@kumori/aurora-interfaces";
 import { convertToGigabytes, getTimestamp } from "../utils/utils";
 
 interface Role {
@@ -73,8 +80,13 @@ const MAX_HISTORY = 100;
 const processRolesAndInstances = (
   eventData: any,
   serviceId: string,
-  roleMap: Map<string, Role[]>
-): { roles: Role[]; instances: Instance[]; usedCpu: number; usedMemory: number } => {
+  roleMap: Map<string, Role[]>,
+): {
+  roles: Role[];
+  instances: Instance[];
+  usedCpu: number;
+  usedMemory: number;
+} => {
   const roles: Role[] = [];
   const instances: Instance[] = [];
   let usedCpu = 0;
@@ -86,7 +98,7 @@ const processRolesAndInstances = (
 
   for (const [roleName, roleData] of roleEntries) {
     const instanceEntries = Object.entries(
-      (roleData as { instances: Record<string, any> }).instances
+      (roleData as { instances: Record<string, any> }).instances,
     );
     const roleInstances: Instance[] = [];
     const existingRoles = roleMap.get(serviceId) || [];
@@ -172,7 +184,7 @@ const createRevision = (
   parentParts: { [entity: string]: string },
   eventData: any,
   usedCpu: number,
-  usedMemory: number
+  usedMemory: number,
 ): Revision => {
   return {
     service: parentParts.service,
@@ -236,10 +248,10 @@ const updateServiceWithRevision = (
   entityId: string,
   eventData: any,
   newRevision: Revision,
-  roles: Role[]
+  roles: Role[],
 ): { updatedService: Service; deploymentErrorEvent: Service | null } => {
   const existingRevisionIndex = existingService.revisions.findIndex(
-    (rev) => rev === entityId
+    (rev) => rev === entityId,
   );
   const shouldIncludeInList =
     newRevision.errorCode !== "COMPUTE_ERROR" &&
@@ -253,7 +265,7 @@ const updateServiceWithRevision = (
         : existingService.revisions;
   } else {
     updatedRevisions = existingService.revisions.filter(
-      (rev) => rev !== entityId
+      (rev) => rev !== entityId,
     );
   }
 
@@ -308,7 +320,7 @@ const updateEnvironmentConsumption = (
   environment: Environment,
   servicesMap: Map<string, Service>,
   revisionsMap: Map<string, Revision>,
-  serviceEnvironmentId: string
+  serviceEnvironmentId: string,
 ): Environment => {
   let totalEnvCpu = 0;
   let totalEnvMemory = 0;
@@ -353,7 +365,7 @@ const updateAccountConsumption = (
   account: Account,
   servicesMap: Map<string, Service>,
   revisionsMap: Map<string, Revision>,
-  serviceAccountId: string
+  serviceAccountId: string,
 ): Account => {
   let totalAccountCpu = 0;
   let totalAccountMemory = 0;
@@ -416,7 +428,7 @@ export const handleRevisionEvent = ({
   const { roles, instances, usedCpu, usedMemory } = processRolesAndInstances(
     eventData,
     serviceId,
-    roleMap
+    roleMap,
   );
 
   // Create new revision
@@ -425,14 +437,15 @@ export const handleRevisionEvent = ({
     parentParts,
     eventData,
     usedCpu,
-    usedMemory
+    usedMemory,
   );
 
   // Initialize result
   let updatedService: Service | null = null;
   let updatedEnvironment: Environment | null = null;
   let updatedAccount: Account | null = null;
-  let pendingRevisionError: { service: string; revision: Revision } | null = null;
+  let pendingRevisionError: { service: string; revision: Revision } | null =
+    null;
   let serviceDeployedEvent: Service | null = null;
   let serviceDeploymentErrorEvent: Service | null = null;
   let shouldFetchChannels = false;
@@ -446,7 +459,7 @@ export const handleRevisionEvent = ({
       entityId,
       eventData,
       newRevision,
-      roles
+      roles,
     );
 
     updatedService = serviceUpdateResult.updatedService;
@@ -464,7 +477,7 @@ export const handleRevisionEvent = ({
           { ...environment },
           tempServicesMap,
           tempRevisionsMap,
-          serviceEnvironmentId
+          serviceEnvironmentId,
         );
       }
     }
@@ -474,7 +487,7 @@ export const handleRevisionEvent = ({
       if (account) {
         const tempServicesMap = new Map(servicesMap);
         tempServicesMap.set(serviceId, updatedService);
-        
+
         const tempRevisionsMap = new Map(revisionsMap);
         tempRevisionsMap.set(revisionKey, newRevision);
 
@@ -482,7 +495,7 @@ export const handleRevisionEvent = ({
           { ...account },
           tempServicesMap,
           tempRevisionsMap,
-          serviceAccountId
+          serviceAccountId,
         );
       }
     }
@@ -494,7 +507,11 @@ export const handleRevisionEvent = ({
       revision: newRevision,
     };
   }
-  if (!eventData.meta.deleted && eventData.status && eventData.status.deployed) {
+  if (
+    !eventData.meta.deleted &&
+    eventData.status &&
+    eventData.status.deployed
+  ) {
     shouldFetchChannels = true;
     channelsFetchInfo = {
       serviceId: parentParts.service,
@@ -517,7 +534,10 @@ export const handleRevisionEvent = ({
     serviceDeploymentErrorEvent,
   };
 };
-export const processRevisionData = (service: Service, revisionData: any): Service => {
+export const processRevisionData = (
+  service: Service,
+  revisionData: any,
+): Service => {
   const { solution } = revisionData;
   const deploymentName = solution.top || service.name;
   const deployment = solution.deployments[deploymentName];
@@ -560,6 +580,11 @@ export const processDeployment = (
   if (hasRoles) {
     Object.entries(rolesDefinition).forEach(
       ([roleName, roleData]: [string, any]) => {
+        const fileSystemParameters = extractParametersFromFilesystem(
+          roleData.artifact.description?.mapping.filesystem || [],
+          allServiceParameters,
+        );
+        allServiceParameters.push(...fileSystemParameters);
         const roleResources = extractResources(roleData.config?.resource || {});
         const existingRole = service.role.find((r) => r.name === roleName);
         let hsize = 1;
@@ -647,7 +672,7 @@ export const extractParametersFromConfig = (
 
       if (typeof paramValue === "object" && paramValue !== null) {
         if (paramValue.value !== undefined) {
-          value = String(paramValue.value);
+          value = paramValue.value;
         } else if (paramValue.default !== undefined) {
           value = String(paramValue.default);
         } else {
@@ -678,6 +703,32 @@ export const extractParametersFromConfig = (
 
   return parameters;
 };
+export const extractParametersFromFilesystem = (
+  filesystem: any,
+  currentParameters: { [key: string]: string }[],
+): { [key: string]: string }[] => {
+  const parameters: { [key: string]: string }[] = [];
+  filesystem.forEach((file: any) => {
+    Object.entries(file).forEach(([key, value]: [string, any]) => {
+      if (value.data) {
+        const existingParam = currentParameters.find(
+          (param) => param.value === value.data.value,
+        );
+        parameters.push({
+          name: existingParam?.name || key,
+          path: value.path,
+          value: value.data.value,
+          type: "file",
+        });
+        if (existingParam) {
+          currentParameters.splice(currentParameters.indexOf(existingParam), 1);
+        }
+      }
+    });
+  });
+
+  return parameters;
+};
 export const extractResources = (resourceConfig: any): Resource[] => {
   const resources: Resource[] = [];
 
@@ -896,4 +947,4 @@ const extractParameters = (
   }
 
   return parameters;
-};
+};

package/helpers/service-helper.ts

@@ -1,5 +1,5 @@
 
-import { Channel, Service, Tenant, Usage } from "@hestekumori/aurora-interfaces";
+import { Channel, Service, Tenant, Usage } from "@kumori/aurora-interfaces";
 import { getTimestamp } from "../utils/utils";
 
 interface Role {

package/helpers/tenant-helper.ts

@@ -1,5 +1,5 @@
 
-import { Tenant, tenantRole, User, UserData } from "@hestekumori/aurora-interfaces";
+import { Tenant, tenantRole, User, UserData } from "@kumori/aurora-interfaces";
 import { parseKeyPath } from "../utils/utils";
 
 export const handleTenantEvent: (

package/helpers/token-helper.ts

@@ -1,4 +1,4 @@
-import { ClusterToken, Token, UserData } from "@hestekumori/aurora-interfaces";
+import { ClusterToken, Token, UserData } from "@kumori/aurora-interfaces";
 
 
 interface HandleTokenEventParams {

package/helpers/user-helper.ts

@@ -1,4 +1,4 @@
-import { Notification, Plan, Tenant, UserData } from "@hestekumori/aurora-interfaces";
+import { Notification, Plan, Tenant, UserData } from "@kumori/aurora-interfaces";
 
 
 

package/package.json

@@ -3,8 +3,8 @@
     "test": "jest --config jest.config.ts"
   },
   "dependencies": {
-    "@hestekumori/aurora-interfaces": "^1.0.17",
     "@jest/globals": "^29.7.0",
+    "@kumori/aurora-interfaces": "^1.0.0",
     "@kumori/kumori-dsl-generator": "^1.0.3",
     "@kumori/kumori-module-generator": "^1.1.6",
     "jest": "^29.7.0",
@@ -23,7 +23,7 @@
     "ws": "^8.18.2"
   },
   "name": "@kumori/aurora-backend-handler",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "backend handler",
   "main": "backend-handler.ts",
   "repository": {

package/test/backend-handler.test.ts

@@ -12,7 +12,7 @@ import {
   getMarketplaceItems,
 } from "../api/marketplace-api-service";
 import { BackendHandler } from "../backend-handler";
-import { Account, Tenant, UserData, Environment, Service, MarketplaceService } from "@hestekumori/aurora-interfaces";
+import { Account, Tenant, UserData, Environment, Service, MarketplaceService } from "@kumori/aurora-interfaces";
 
 jest.mock("../event-helper", () => {
   return jest.fn().mockImplementation((globalEventHandler) => {

package/test/deploy-service-helper.test.ts

@@ -1,4 +1,4 @@
-import { Service } from "@hestekumori/aurora-interfaces";
+import { Service } from "@kumori/aurora-interfaces";
 import {
   withDefaultValue,
   handleParametersToGenerateData,

package/websocket-manager.ts

@@ -1,6 +1,6 @@
 import { v7 as uuidv7 } from "uuid";
 import { environment } from "./environment";
-import { Account, Channel, ClusterToken, Environment, Instance, Link, MarketplaceService, Notification, Organization, Plan, PlanProvider, Platform, Registry, Resource, Service, Tenant, tenantRole, Token, Usage, User, UserData } from "@hestekumori/aurora-interfaces";
+import { Account, Channel, ClusterToken, Environment, Instance, Link, MarketplaceService, Notification, Organization, Plan, PlanProvider, Platform, Registry, Resource, Service, Tenant, tenantRole, Token, Usage, User, UserData } from "@kumori/aurora-interfaces";
 import { loadMarketplaceItemsForTenant } from "./api/marketplace-api-service";
 import { getReporting } from "./api/reporting-api-service";
 import { parseKeyPath } from "./utils/utils";