From 92ddbebea259a75ce13811bc69f839caf5aa43a0 Mon Sep 17 00:00:00 2001 From: Alicja Gruzdz Date: Tue, 13 Feb 2024 12:21:07 +0000 Subject: [PATCH] Move enums from @types to @symbols --- packages/host/src/lib/csi-controller.ts | 3 +-- .../host/src/lib/serviceDiscovery/topic.ts | 3 ++- packages/symbols/src/index.ts | 2 ++ packages/symbols/src/instance-status.ts | 10 ++++++++ .../symbols/src/sd-stream-handler-state.ts | 23 ++++++++++++++++++ packages/types/src/instance-store.ts | 3 ++- packages/types/src/instance.ts | 10 -------- packages/types/src/sd-stream-handler.ts | 24 +------------------ 8 files changed, 41 insertions(+), 37 deletions(-) create mode 100644 packages/symbols/src/instance-status.ts create mode 100644 packages/symbols/src/sd-stream-handler-state.ts diff --git a/packages/host/src/lib/csi-controller.ts b/packages/host/src/lib/csi-controller.ts index abb572933..cc4451882 100644 --- a/packages/host/src/lib/csi-controller.ts +++ b/packages/host/src/lib/csi-controller.ts @@ -17,7 +17,6 @@ import { STHRestAPI, STHConfiguration, InstanceLimits, - InstanceStatus, MonitoringMessageData, InstanceStats, OpResponse, @@ -33,7 +32,7 @@ import { MessageUtilities, InstanceAdapterError, } from "@scramjet/model"; -import { CommunicationChannel as CC, RunnerExitCode, RunnerMessageCode } from "@scramjet/symbols"; +import { CommunicationChannel as CC, InstanceStatus, RunnerExitCode, RunnerMessageCode } from "@scramjet/symbols"; import { Duplex, PassThrough, Readable } from "stream"; import { development } from "@scramjet/sth-config"; diff --git a/packages/host/src/lib/serviceDiscovery/topic.ts b/packages/host/src/lib/serviceDiscovery/topic.ts index ec95ad619..0bcbd69be 100644 --- a/packages/host/src/lib/serviceDiscovery/topic.ts +++ b/packages/host/src/lib/serviceDiscovery/topic.ts @@ -1,6 +1,7 @@ import { TransformOptions, Readable, Transform } from "stream"; -import { ContentType, WorkState, ReadableState, WritableState, StreamType, StreamOrigin, TopicHandler, TopicOptions, TopicState, ParsedMessage } from "@scramjet/types"; +import { ContentType, StreamOrigin, TopicHandler, TopicOptions, TopicState, ParsedMessage } from "@scramjet/types"; import TopicId from "./topicId"; +import { ReadableState, StreamType, WorkState, WritableState } from "@scramjet/symbols"; export enum TopicEvent { StateChanged = "stateChanged", diff --git a/packages/symbols/src/index.ts b/packages/symbols/src/index.ts index e6db6a71b..dc8bd279c 100644 --- a/packages/symbols/src/index.ts +++ b/packages/symbols/src/index.ts @@ -8,5 +8,7 @@ export { SequenceMessageCode } from "./sequence-status-code"; export { OpRecordCode } from "./op-record-code"; export { APIErrorCode } from "./api-error-codes"; export { DisconnectHubErrors } from "./disconnect-error-codes"; +export { InstanceStatus } from "./instance-status"; +export * from "./sd-stream-handler-state"; export * from "./headers"; diff --git a/packages/symbols/src/instance-status.ts b/packages/symbols/src/instance-status.ts new file mode 100644 index 000000000..1b74db37e --- /dev/null +++ b/packages/symbols/src/instance-status.ts @@ -0,0 +1,10 @@ + +export const enum InstanceStatus { + INITIALIZING = "initializing", + STARTING = "starting", + RUNNING = "running", + STOPPING = "stopping", + KILLING = "killing", + COMPLETED = "completed", + ERRORED = "errored", +} diff --git a/packages/symbols/src/sd-stream-handler-state.ts b/packages/symbols/src/sd-stream-handler-state.ts new file mode 100644 index 000000000..27b645094 --- /dev/null +++ b/packages/symbols/src/sd-stream-handler-state.ts @@ -0,0 +1,23 @@ +export enum WorkState { + Flowing = "flowing", + Close = "close", + Error = "error" +} + +export enum WritableState { + Finish = "finish", + Writable = "writable", + Drain = "drain" +} + +export enum ReadableState { + Readable = "readable", + Pause = "pause", + End = "end" +} + +export enum StreamType { + Instance = "instance", + Topic = "topic", + Api = "api" +} diff --git a/packages/types/src/instance-store.ts b/packages/types/src/instance-store.ts index cf7f39ec8..dbee1ccb7 100644 --- a/packages/types/src/instance-store.ts +++ b/packages/types/src/instance-store.ts @@ -1,5 +1,6 @@ +import { InstanceStatus } from "@scramjet/symbols"; import { AppConfig } from "./app-config"; -import { InstanceArgs, InstanceId, InstanceStatus } from "./instance"; +import { InstanceArgs, InstanceId } from "./instance"; import { SequenceInfoInstance } from "./sequence-adapter"; export type Instance = { diff --git a/packages/types/src/instance.ts b/packages/types/src/instance.ts index 7008e7be0..5ece3d3d4 100644 --- a/packages/types/src/instance.ts +++ b/packages/types/src/instance.ts @@ -1,13 +1,3 @@ export type InstanceId = string; export type InstanceArgs = any[]; - -export const enum InstanceStatus { - INITIALIZING = "initializing", - STARTING = "starting", - RUNNING = "running", - STOPPING = "stopping", - KILLING = "killing", - COMPLETED ="completed", - ERRORED = "errored", -} diff --git a/packages/types/src/sd-stream-handler.ts b/packages/types/src/sd-stream-handler.ts index 7bd93705d..c85c8ba0f 100644 --- a/packages/types/src/sd-stream-handler.ts +++ b/packages/types/src/sd-stream-handler.ts @@ -1,29 +1,7 @@ -export enum WorkState { - Flowing = "flowing", - Close = "close", - Error = "error" -} - -export enum WritableState { - Finish = "finish", - Writable = "writable", - Drain = "drain" -} - -export enum ReadableState { - Readable = "readable", - Pause = "pause", - End = "end" -} +import { WorkState, WritableState, ReadableState, StreamType } from "@scramjet/symbols"; export type StreamState = WorkState | WritableState | ReadableState; -export enum StreamType { - Instance = "instance", - Topic = "topic", - Api = "api" -} - export type StreamOptions = Record; export type OriginType = "space" | "hub"