@kumori/aurora-backend-handler 1.0.36 → 1.0.38

package/helpers/revision-helper.ts

@@ -370,7 +370,14 @@ export const handleRevisionEvent = ({
     serviceId,
     roleMap,
   );
+  const existingRevision = revisionsMap.get(revisionKey);
   const newRevision = createRevision(entityId, eventData, usedCpu, usedMemory);
+  if (
+    existingRevision?.schema &&
+    Object.keys(existingRevision.schema).length > 0
+  ) {
+    newRevision.schema = existingRevision.schema;
+  }
 
   let updatedService: Service | null = null;
   let updatedEnvironment: Environment | null = null;
@@ -462,9 +469,122 @@ export const handleRevisionEvent = ({
   };
 };
 
+const collectNamedTypes = (schema: any): string[] => {
+  if (!schema || typeof schema !== "object") return [];
+  const names: string[] = [];
+  if (schema.$kdsl?.const?.NamedType?.Name)
+    names.push(schema.$kdsl.const.NamedType.Name as string);
+  if (Array.isArray(schema.oneOf)) {
+    for (const branch of schema.oneOf) names.push(...collectNamedTypes(branch));
+  }
+  return names;
+};
+
+const namedTypeToResourceKind = (
+  namedTypes: string[],
+): { type: string; kind?: string } => {
+  for (const name of namedTypes) {
+    switch (name) {
+      case "Secret":
+        return { type: "secret" };
+      case "Domain":
+        return { type: "domain" };
+      case "Port":
+        return { type: "port" };
+      case "Certificate":
+        return { type: "certificate" };
+      case "CA":
+        return { type: "ca" };
+      case "Volatile":
+      case "Ephemeral":
+        return { type: "volume", kind: "volatile" };
+      case "NonReplicated":
+        return { type: "volume", kind: "nonReplicated" };
+      case "Persisted":
+      case "Persistent":
+        return { type: "volume", kind: "persistent" };
+      case "Registered":
+        return { type: "volume" };
+    }
+  }
+  return { type: "secret" };
+};
+
+export const extractStructuredSchema = (
+  revisionData: any,
+): {
+  parameters: {
+    name: string;
+    type: string;
+    required: boolean;
+    defaultValue?: any;
+  }[];
+  resources: { name: string; type: string; kind?: string; required: boolean }[];
+} => {
+  const configSchema = revisionData?.configSchema;
+  const deploymentName = revisionData?.solution?.top;
+  const deployment = deploymentName
+    ? revisionData?.solution?.deployments?.[deploymentName]
+    : Object.values(revisionData?.solution?.deployments ?? {})[0];
+
+  const parameterValues: Record<string, any> =
+    (deployment as any)?.config?.parameter ?? {};
+  const requiredParams: string[] =
+    configSchema?.properties?.config?.required ?? [];
+  const requiredResources: string[] =
+    configSchema?.properties?.resource?.required ?? [];
+  const schemaConfigProps: Record<string, any> =
+    configSchema?.properties?.config?.properties ?? {};
+  const schemaResourceProps: Record<string, any> =
+    configSchema?.properties?.resource?.properties ?? {};
+
+  const parameters = Object.entries(schemaConfigProps).map(
+    ([name, propSchema]) => {
+      const entry: {
+        name: string;
+        type: string;
+        required: boolean;
+        defaultValue?: any;
+      } = {
+        name,
+        type: propSchema?.type ?? "string",
+        required: requiredParams.includes(name),
+      };
+      const currentValue = parameterValues[name];
+      if (currentValue !== undefined) entry.defaultValue = currentValue;
+      else if (propSchema?.default !== undefined)
+        entry.defaultValue = propSchema.default;
+      return entry;
+    },
+  );
+
+  const resources = Object.entries(schemaResourceProps).map(
+    ([name, propSchema]) => {
+      const namedTypes = collectNamedTypes(propSchema);
+      const resolved = namedTypeToResourceKind(namedTypes);
+      const entry: {
+        name: string;
+        type: string;
+        kind?: string;
+        required: boolean;
+      } = {
+        name,
+        type: resolved.type,
+        required: requiredResources.includes(name),
+      };
+      if (resolved.kind) entry.kind = resolved.kind;
+      return entry;
+    },
+  );
+
+  return { parameters, resources };
+};
+
 export const processRevisionData = (
   service: Service,
   revisionData: any,
+  revisionsMap?: Map<string, Revision>,
+  serviceId?: string,
 ): Service => {
   const { solution } = revisionData;
 
@@ -472,6 +592,56 @@ export const processRevisionData = (
   const parameters = extractParametersFromConfig(config.parameter || {});
   const resources = extractResources(config.resource || {});
 
+  if (revisionsMap && serviceId && revisionData.revision) {
+    const revisionId: string = revisionData.revision;
+    const revisionKey = `${serviceId}-${revisionId}`;
+    const schema = extractStructuredSchema(revisionData);
+    const existing = revisionsMap.get(revisionKey);
+    if (existing) {
+      revisionsMap.set(revisionKey, { ...existing, schema });
+    } else {
+      revisionsMap.set(revisionKey, {
+        id: revisionId,
+        schema,
+        usage: {
+          current: {
+            cpu: 0,
+            memory: 0,
+            storage: 0,
+            volatileStorage: 0,
+            nonReplicatedStorage: 0,
+            persistentStorage: 0,
+          },
+          limit: {
+            cpu: { max: revisionData.intensives?.vcpu / 1000 || 0, min: 0 },
+            memory: { max: revisionData.intensives?.ram / 1000 || 0, min: 0 },
+            storage: {
+              max: revisionData.intensives?.shared_disk / 1000 || 0,
+              min: 0,
+            },
+            volatileStorage: {
+              max: revisionData.intensives?.volatile_disk / 1000 || 0,
+              min: 0,
+            },
+            nonReplicatedStorage: {
+              max: revisionData.intensives?.nrpersistent_disk / 1000 || 0,
+              min: 0,
+            },
+            persistentStorage: {
+              max: revisionData.intensives?.persistent_disk / 1000 || 0,
+              min: 0,
+            },
+          },
+          cost: 0,
+        },
+        status: { code: "", message: "", timestamp: "", args: [] },
+        errorCode: "",
+        errorMsg: "",
+        createdAt: "",
+      });
+    }
+  }
+
   const deploymentName = solution.top || service.name;
   const deployment = solution.deployments[deploymentName];
 
@@ -783,114 +953,3 @@ const extractResourceName = (resourcePath: string): string => {
   }
   return resourcePath;
 };
-
-const collectNamedTypes = (schema: any): string[] => {
-  if (!schema || typeof schema !== "object") return [];
-  const names: string[] = [];
-  if (schema.$kdsl?.const?.NamedType?.Name)
-    names.push(schema.$kdsl.const.NamedType.Name as string);
-  if (Array.isArray(schema.oneOf)) {
-    for (const branch of schema.oneOf) names.push(...collectNamedTypes(branch));
-  }
-  return names;
-};
-
-const namedTypeToResourceKind = (
-  namedTypes: string[],
-): { type: string; kind?: string } => {
-  for (const name of namedTypes) {
-    switch (name) {
-      case "Secret":
-        return { type: "secret" };
-      case "Domain":
-        return { type: "domain" };
-      case "Port":
-        return { type: "port" };
-      case "Certificate":
-        return { type: "certificate" };
-      case "CA":
-        return { type: "ca" };
-      case "Volatile":
-      case "Ephemeral":
-        return { type: "volume", kind: "volatile" };
-      case "NonReplicated":
-        return { type: "volume", kind: "nonReplicated" };
-      case "Persisted":
-      case "Persistent":
-        return { type: "volume", kind: "persistent" };
-      case "Registered":
-        return { type: "volume" };
-    }
-  }
-  return { type: "secret" };
-};
-
-export const extractStructuredSchema = (
-  revisionData: any,
-): {
-  parameters: {
-    name: string;
-    type: string;
-    required: boolean;
-    defaultValue?: any;
-  }[];
-  resources: { name: string; type: string; kind?: string; required: boolean }[];
-} => {
-  const configSchema = revisionData?.configSchema;
-  const deploymentName = revisionData?.solution?.top;
-  const deployment = deploymentName
-    ? revisionData?.solution?.deployments?.[deploymentName]
-    : Object.values(revisionData?.solution?.deployments ?? {})[0];
-
-  const parameterValues: Record<string, any> =
-    (deployment as any)?.config?.parameter ?? {};
-  const requiredParams: string[] =
-    configSchema?.properties?.config?.required ?? [];
-  const requiredResources: string[] =
-    configSchema?.properties?.resource?.required ?? [];
-  const schemaConfigProps: Record<string, any> =
-    configSchema?.properties?.config?.properties ?? {};
-  const schemaResourceProps: Record<string, any> =
-    configSchema?.properties?.resource?.properties ?? {};
-
-  const parameters = Object.entries(schemaConfigProps).map(
-    ([name, propSchema]) => {
-      const entry: {
-        name: string;
-        type: string;
-        required: boolean;
-        defaultValue?: any;
-      } = {
-        name,
-        type: propSchema?.type ?? "string",
-        required: requiredParams.includes(name),
-      };
-      const currentValue = parameterValues[name];
-      if (currentValue !== undefined) entry.defaultValue = currentValue;
-      else if (propSchema?.default !== undefined)
-        entry.defaultValue = propSchema.default;
-      return entry;
-    },
-  );
-
-  const resources = Object.entries(schemaResourceProps).map(
-    ([name, propSchema]) => {
-      const namedTypes = collectNamedTypes(propSchema);
-      const resolved = namedTypeToResourceKind(namedTypes);
-      const entry: {
-        name: string;
-        type: string;
-        kind?: string;
-        required: boolean;
-      } = {
-        name,
-        type: resolved.type,
-        required: requiredResources.includes(name),
-      };
-      if (resolved.kind) entry.kind = resolved.kind;
-      return entry;
-    },
-  );
-
-  return { parameters, resources };
-};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kumori/aurora-backend-handler",
-  "version": "1.0.36",
+  "version": "1.0.38",
   "description": "backend handler",
   "main": "backend-handler.ts",
   "scripts": {

package/websocket-manager.ts

@@ -1218,6 +1218,8 @@ const handleOperationSuccess = (operation: PendingOperation, response: any) => {
             const updatedService = processRevisionData(
               svcSuccessResult.updatedService!,
               svcSuccessResult.revisionData,
+              revisionsMap,
+              svcSuccessResult.serviceId,
             );
 
             if (svcSuccessResult.revisionData.revision_error) {