Changes in types and messages

bdd/step-definitions/hub/config.ts

@@ -120,7 +120,7 @@ Then("I see a sequence called {string}", function(string: string) {
 Then("the output of an instance of {string} is as in {string} file", async function(this: CustomWorld, sequenceId, outputContentsFile) {
     const fileData = await readFile(outputContentsFile, "utf-8");
     const hostClient = getHostClient();
-    const instance = this.cliResources.instances?.find(inst => inst.sequence === sequenceId);
+    const instance = this.cliResources.instances?.find(inst => inst.sequence.id === sequenceId);
 
     if (!instance) throw new Error("Instance not found");
 

packages/cli/src/lib/helpers/instance.ts

@@ -29,7 +29,7 @@ export const instanceRestart = async (
     instanceId: string
 ) => {
     const instanceInfo = await getInstance(instanceId).getInfo();
-    const sequenceId = instanceInfo.sequence;
+    const sequenceId = instanceInfo.sequence.id;
     const sequenceClient = SequenceClient.from(sequenceId, getHostClient());
     const { provides, requires, args } = instanceInfo;
     const appConfig = instanceInfo.appConfig || {};

packages/host/src/lib/cpm-connector.ts

@@ -570,9 +570,8 @@ export class CPMConnector extends TypedEmitter<Events> {
      */
     async sendInstanceInfo(instance: Instance, instanceStatus: InstanceMessageCode): Promise<void> {
         this.logger.trace("Send instance status update", instanceStatus);
-
         await this.communicationStream?.whenWrote(
-            [CPMMessageCode.INSTANCE, { ...instance, status: instanceStatus }]
+            [CPMMessageCode.INSTANCE, { instance, status: instanceStatus }]
         );
 
         this.logger.trace("Instance status update sent", instanceStatus);

packages/host/src/lib/csi-controller.ts

@@ -785,11 +785,11 @@ export class CSIController extends TypedEmitter<Events> {
             args: this.args,
             provides: this.provides,
             requires: this.requires,
-            sequence: this.sequence.id,
-            sequenceInfo: {
+            sequence: {
                 id: this.sequence.id,
                 config: this.sequence.config,
-                name: this.sequence.name
+                name: this.sequence.name,
+                location : this.sequence.location
             },
             ports: this.info.ports,
             created: this.info.created,

packages/host/src/lib/host.ts

@@ -931,7 +931,12 @@ export class Host implements IComponent {
                 id: csic.id,
                 appConfig: csic.appConfig,
                 args: csic.args,
-                sequence: sequenceId,
+                sequence: (info => {
+                    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+                    const { instances, ...rest } = info;
+
+                    return rest;
+                })(sequence),
                 ports: csic.info.ports,
                 created: csic.info.created,
                 started: csic.info.started,
@@ -1040,7 +1045,7 @@ export class Host implements IComponent {
 
             await this.cpmConnector?.sendInstanceInfo({
                 id: csic.id,
-                sequence: sequence.id
+                sequence: sequence
             }, InstanceMessageCode.INSTANCE_ENDED);
 
             this.auditor.auditInstance(id, InstanceMessageCode.INSTANCE_ENDED);

packages/types/src/instance-store.ts

@@ -1,16 +1,15 @@
 import { AppConfig } from "./app-config";
-import { InstanceId, InstanceStatus } from "./instance";
-
-export type InstanceArgs = any[];
+import { InstanceArgs, InstanceId, InstanceStatus } from "./instance";
+import { SequenceInfoInstance } from "./sequence-adapter";
 
 export type Instance = {
     id: InstanceId,
     appConfig?: AppConfig,
     args?: InstanceArgs,
     provides?: string,
     requires?: string,
-    sequence: string,
-    ports?: Record<string, number>
+    sequence: SequenceInfoInstance,
+    ports?: Record<string, number>,
     created?: Date,
     started?: Date,
     ended?: Date,

packages/types/src/instance.ts

@@ -1,4 +1,7 @@
 export type InstanceId = string;
+
+export type InstanceArgs = any[];
+
 export const enum InstanceStatus {
     INITIALIZING = "initializing",
     STARTING = "starting",

packages/types/src/messages/instance.ts

@@ -1,9 +1,10 @@
 import { CPMMessageCode, InstanceMessageCode } from "@scramjet/symbols";
+import { Instance } from "../instance-store";
 
 export type InstanceMessageData = {
-    id: string;
-    sequence: string;
     status: InstanceMessageCode;
+    instance: Instance;
+    //id : string
 }
 
 export type InstanceMessage = { msgCode: CPMMessageCode.INSTANCE } & InstanceMessageData;

packages/types/src/rest-api-manager/common.ts

@@ -11,7 +11,7 @@ export type ConnectedSTHInfo = {
     selfHosted: boolean,
     isConnectionActive: boolean,
     description?: string,
-    tags?: Array<string>,
+    tags?: string[],
     disconnectReason?: string;
 };
 

packages/types/src/rest-api-manager/get-entities.ts

@@ -1,4 +1,6 @@
-import { GetEntitiesResponse as STHRestAPIGetEntitiesResponse } from "../rest-api-sth";
-
-export type GetEntitiesResponse =
-    (STHRestAPIGetEntitiesResponse & { hostId: string })[]
+export type GetEntitiesResponse = {
+    hubs: string[],
+    topics: string[],
+    sequences: string[],
+    instances: string[],
+}

packages/types/src/rest-api-manager/get-instance.ts

@@ -1 +1,3 @@
-export type GetInstanceResponse = string
+import { Instance } from "../instance-store";
+
+export type GetInstanceResponse = Instance

packages/types/src/rest-api-manager/get-instances.ts

@@ -1,3 +1,3 @@
-import { GetSequencesResponse } from "./get-sequences";
+import { GetInstanceResponse } from "../rest-api-sth";
 
-export type GetInstancesResponse = GetSequencesResponse[][];
+export type GetInstancesResponse = GetInstanceResponse[];

packages/types/src/rest-api-manager/get-list.ts

@@ -0,0 +1,15 @@
+import { ConnectedSTHInfoDetails } from "./common";
+
+export type GetListResponse = {
+      id: string,
+      info: ConnectedSTHInfoDetails,
+      healthy: boolean,
+      selfHosted: boolean,
+      isConnectionActive: boolean,
+      description?: string,
+      tags?: string[],
+      disconnectReason?: string,
+      topics : string[],
+      sequences: string[],
+      instances: string[],
+}[]

packages/types/src/rest-api-manager/get-sequence-ids.ts

@@ -0,0 +1 @@
+export type GetSequenceIDSResponse = string[];

packages/types/src/rest-api-manager/get-topics.ts

@@ -1,4 +1,11 @@
 export type GetTopicsResponse = {
     name: string;
     contentType: string;
+    actors: {
+        hostId?:string;
+        stream: boolean,
+        retired: boolean,
+        role: string,
+        type: string
+    }[]
 }[];

packages/types/src/rest-api-manager/index.ts

@@ -6,9 +6,11 @@ export * from "./get-health";
 export * from "./get-load";
 export * from "./get-sequences";
 export * from "./get-sequence";
+export * from "./get-sequence-ids";
 export * from "./get-instance";
 export * from "./get-instances";
 export * from "./get-topics";
+export * from "./get-list";
 export * from "./get-store-items";
 export * from "./put-store-item";
 export * from "./get-entities";

packages/types/src/rest-api-sth/get-instance.ts

@@ -3,5 +3,5 @@ import { DeepPartial } from "../utils";
 import { GetSequenceResponse } from "./get-sequence";
 
 export type GetInstanceResponse = Instance & {
-    sequenceInfo: DeepPartial<GetSequenceResponse>
+    sequence: DeepPartial<GetSequenceResponse>
 };

packages/types/src/runner-config.ts

@@ -1,7 +1,7 @@
 // TODO: Rename. it is not a runner config but response from Pre-runner. - valid!!!
 
 import { InstanceLimits } from "./instance-limits";
-import { InstanceArgs } from "./instance-store";
+import { InstanceArgs } from "./instance";
 import { PortConfig } from "./sequence-package-json";
 import { RunnerContainerConfiguration } from "./sth-configuration";
 

packages/types/src/sequence-adapter.ts

@@ -1,6 +1,6 @@
-import { SequenceConfig } from "./runner-config";
 import { Readable } from "stream";
 import { IObjectLogger } from "./object-logger";
+import { SequenceConfig } from "./runner-config";
 
 export type SequenceInfo = {
     config: SequenceConfig;
@@ -10,6 +10,8 @@ export type SequenceInfo = {
     name? : string;
 }
 
+export type SequenceInfoInstance = Omit<SequenceInfo, "instances">;
+
 export interface ISequenceAdapter {
     /**
      * Adapter name.

packages/types/src/sequence-package-json.ts

@@ -1,4 +1,4 @@
-import { InstanceArgs } from "./instance-store";
+import { InstanceArgs } from "./instance";
 
 export type PortConfig = `${number}/${"tcp" | "udp"}`