@kumori/aurora-backend-handler 1.0.52 → 1.0.54

package/api/service-api-service.ts

@@ -839,4 +839,51 @@ function getLatestRevision(revisions: Revision[]): number | null {
   }
   
   return Math.max(...revisions.map((revision) => Number(revision.id)));
+}
+export async function restartInstance(service: Service, roleId: string, instanceId: string, token: string) {
+  try {
+    await initializeGlobalWebSocketClient(token);
+    const status = getWebSocketStatus();
+    const revisionBody = {
+      tenant: service.tenant,
+      service: service.name,
+      role: roleId,
+      instance: instanceId === "all" ? undefined : instanceId,
+    };
+    const revisionResponse = await makeGlobalWebSocketRequest(
+      "service:restart",
+      revisionBody,
+      30000,
+      "RESTART_INSTANCE",
+      service.name
+    );
+    const notification: Notification = {
+      type: "success",
+      subtype: "instance-restarted",
+      date: Date.now().toString(),
+      status: "unread",
+      callToAction: false,
+      data: {
+        service: service,
+      },
+    };
+
+    eventHelper.notification.publish.creation(notification);
+  } catch (error) {
+    const notification: Notification = {
+      type: "error",
+      subtype: "error-instance-update",
+      date: Date.now().toString(),
+      info_content: {
+        code: (error as any).error.code,
+        message: (error as any).error.content,
+      },
+      status: "unread",
+      callToAction: false,
+      data: {
+        service: service,
+      },
+    };
+    eventHelper.notification.publish.creation(notification);
+  }
 }

package/backend-handler.ts

@@ -5,6 +5,7 @@ import {
   deployService,
   redeployService,
   requestRevisionData,
+  restartInstance,
   restartService,
   updateService,
   updateServiceLinks,
@@ -903,6 +904,13 @@ export class BackendHandler {
     this.unsubscribeFunctions.push(() => {
       eventHelper.service.unsubscribe.changeRevision(changeRevisionCb);
     })
+    const restartInstanceCb = (payload: { service: Service; roleId: string; instanceId: string; }) => {
+      restartInstance(payload.service, payload.roleId, payload.instanceId, token);
+    }
+    eventHelper.service.subscribe.restartInstance(restartInstanceCb);
+    this.unsubscribeFunctions.push(() =>
+      eventHelper.service.unsubscribe.restartInstance(restartInstanceCb)
+    );
   }
   /**
    * Function to subscribe to the marketplace events

package/event-helper.ts

@@ -336,7 +336,10 @@ export class EventHelper {
         updateServiceLinks : this.createEvent<Link>(EventNames.updateServiceLinks).publish,
         changeRevision: this.createEvent<Service>(EventNames.ChangeRevision).publish,
         revisionChanged: this.createEvent<Service>(EventNames.RevisionChanged).publish,
-        revisionChangeError: this.createEvent<Service>(EventNames.RevisionChangeError).publish
+        revisionChangeError: this.createEvent<Service>(EventNames.RevisionChangeError).publish,
+        restartInstance: this.createEvent<{ service: Service; roleId: string; instanceId: string }>(EventNames.RestartInstance).publish,
+        instanceRestarted: this.createEvent<{ service: Service; roleId: string; instanceId: string }>(EventNames.InstanceRestarted).publish,
+        instanceRestartError: this.createEvent<{ service: Service; roleId: string; instanceId: string }>(EventNames.InstanceRestartError).publish,
       },
       subscribe: {
         deploy: this.createEvent<Service>(EventNames.DeployService).subscribe,
@@ -356,7 +359,10 @@ export class EventHelper {
         updateServiceLinks : this.createEvent<Link>(EventNames.updateServiceLinks).subscribe,
         changeRevision: this.createEvent<Service>(EventNames.ChangeRevision).subscribe,
         revisionChanged: this.createEvent<Service>(EventNames.RevisionChanged).subscribe,
-        revisionChangeError: this.createEvent<Service>(EventNames.RevisionChangeError).subscribe
+        revisionChangeError: this.createEvent<Service>(EventNames.RevisionChangeError).subscribe,
+        restartInstance: this.createEvent<{ service: Service; roleId: string; instanceId: string }>(EventNames.RestartInstance).subscribe,
+        instanceRestarted: this.createEvent<{ service: Service; roleId: string; instanceId: string }>(EventNames.InstanceRestarted).subscribe,
+        instanceRestartError: this.createEvent<{ service: Service; roleId: string; instanceId: string }>(EventNames.InstanceRestartError).subscribe,
       },
       unsubscribe: {
         deploy: this.createEvent<Service>(EventNames.DeployService).unsubscribe,
@@ -376,7 +382,10 @@ export class EventHelper {
         updateServiceLinks : this.createEvent<Link>(EventNames.updateServiceLinks).unsubscribe,
         changeRevision: this.createEvent<Service>(EventNames.ChangeRevision).unsubscribe,
         revisionChanged: this.createEvent<Service>(EventNames.RevisionChanged).unsubscribe,
-        revisionChangeError: this.createEvent<Service>(EventNames.RevisionChangeError).unsubscribe
+        revisionChangeError: this.createEvent<Service>(EventNames.RevisionChangeError).unsubscribe,
+        restartInstance: this.createEvent<{ service: Service; roleId: string; instanceId: string }>(EventNames.RestartInstance).unsubscribe,
+        instanceRestarted: this.createEvent<{ service: Service; roleId: string; instanceId: string }>(EventNames.InstanceRestarted).unsubscribe,
+        instanceRestartError: this.createEvent<{ service: Service; roleId: string; instanceId: string }>(EventNames.InstanceRestartError).unsubscribe,
       },
     };
   }

package/event-names.ts

@@ -102,6 +102,9 @@ export enum EventNames {
 	ChangeRevision = "changeRevision",
 	RevisionChanged = "revisionChanged",
 	RevisionChangeError = "revisionChangeError",
+	RestartInstance = "restartInstance",
+	InstanceRestarted = "instanceRestarted",
+	InstanceRestartError = "instanceRestartError",
 	// * Marketplace
 	DeployMarketplaceItem = "deployMarketplaceItem",
 	MarketplaceItemDeployed = "marketplaceItemDeployed",

package/helpers/revision-helper.ts

@@ -110,7 +110,7 @@ const processRolesAndInstances = (
 
       const instance: Instance = {
         id: instanceId,
-        name: `${roleName}::${instanceId}`,
+        name: `${instanceId}`,
         status: instanceData.status.status,
         usage: {
           current: {
@@ -520,31 +520,9 @@ export const extractStructuredSchema = (
   | {} => {
   const configSchema = revisionData?.configSchema;
   if (!configSchema) return {};
-
-  const deploymentName = revisionData?.solution?.top;
-  const deployment = deploymentName
-    ? revisionData?.solution?.deployments?.[deploymentName]
-    : Object.values(revisionData?.solution?.deployments ?? {})[0];
-  const rolesDefinition: Record<string, any> =
-    (deployment as any)?.artifact?.description?.role ?? {};
-
-  const mergedParameterValues: Record<string, any> = {};
-  const mergedResourceValues: Record<string, any> = {};
-
-  Object.values(rolesDefinition).forEach((roleData: any) => {
-    const roleConfig = roleData?.artifact?.description?.config ?? {};
-    Object.assign(mergedParameterValues, roleConfig.parameter ?? {});
-    Object.assign(mergedResourceValues, roleConfig.resource ?? {});
-  });
-  const topLevelConfig = (deployment as any)?.config ?? {};
-  const parameterValues: Record<string, any> = {
-    ...topLevelConfig.parameter ?? {},
-    ...mergedParameterValues,
-  };
-  const configResourceValues: Record<string, any> = {
-    ...topLevelConfig.resource ?? {},
-    ...mergedResourceValues,
-  };
+  const deployedConfig = revisionData?.config?.config ?? {};
+  const parameterValues: Record<string, any> = deployedConfig.parameter ?? {};
+  const configResourceValues: Record<string, any> = deployedConfig.resource ?? {};
 
   const requiredParams: string[] =
     configSchema?.properties?.config?.required ?? [];

package/package.json

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