si space <spc> disconnect

scramjetorg · Mar 20, 2023 · 1fdea2a · 1fdea2a
1 parent 7b627fa
commit 1fdea2a
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 5 deletions.
diff --git a/packages/cli/src/lib/commands/space.ts b/packages/cli/src/lib/commands/space.ts
@@ -1,4 +1,5 @@
 /* eslint-disable no-console */
+import { PostDisconnectPayload } from "@scramjet/types/src/rest-api-manager";
 import { CommandDefinition, isProductionEnv } from "../../types";
 import { profileManager, sessionConfig } from "../config";
 import { displayObject, displayStream } from "../output";
@@ -79,6 +80,32 @@ export const space: CommandDefinition = (program) => {
             await displayStream(await managerClient.getLogStream());
         });
 
+    spaceCmd
+        .command("disconnect")
+        .description("Disconnect self hosted Hubs from space")
+        .argument("<space_name>", "The name of the Space")
+        .option("--id <id>", "Hub Id")
+        .option("--all", "Disconnects all self-hosted Hubs connected to Space", false)
+        .action(async (spaceName: string, id: string, all: string) => {
+            const mwClient = getMiddlewareClient();
+            const managerClient = mwClient.getManagerClient(spaceName);
+            let opts = { } as PostDisconnectPayload;
+
+            if (typeof id === "string") {
+                opts = { id };
+            }
+
+            if (all) {
+                opts = { limit: 0 };
+            }
+
+            if (!Object.keys(opts).length) {
+                throw new Error("Missing --id or --all");
+            }
+
+            displayObject(await managerClient.disconnectHubs(opts), profileManager.getProfileConfig().format);
+        });
+
     const accessKeyCmd = spaceCmd
             .command("access")
             .description("Manages Access Keys for active Space");
@@ -94,7 +121,7 @@ export const space: CommandDefinition = (program) => {
                 throw new Error("No Space set");
             }
 
-            displayObject(await mwClient.createAccessKey(spaceName, { description }), "json");
+            displayObject(await mwClient.createAccessKey(spaceName, { description }), profileManager.getProfileConfig().format);
         });
 
     accessKeyCmd.command("list")
@@ -108,7 +135,7 @@ export const space: CommandDefinition = (program) => {
                 throw new Error("No Space set");
             }
 
-            displayObject(await mwClient.listAccessKeys(spaceName), "json");
+            displayObject(await mwClient.listAccessKeys(spaceName), profileManager.getProfileConfig().format);
         });
 
     accessKeyCmd.command("revoke")
@@ -122,6 +149,6 @@ export const space: CommandDefinition = (program) => {
                 throw new Error("No Space set");
             }
 
-            displayObject(await mwClient.revokeAccessKey(spaceName, accessKey), "json");
+            displayObject(await mwClient.revokeAccessKey(spaceName, accessKey), profileManager.getProfileConfig().format);
         });
 };
diff --git a/packages/model/src/stream-handler.ts b/packages/model/src/stream-handler.ts
@@ -56,6 +56,7 @@ type ControlMessageHandlerList = {
     [CPMMessageCode.STH_ID]: ConfiguredMessageHandler<CPMMessageCode.STH_ID>[];
     [CPMMessageCode.KEY_REVOKED]: ConfiguredMessageHandler<CPMMessageCode.KEY_REVOKED>[];
     [CPMMessageCode.LIMIT_EXCEEDED]: ConfiguredMessageHandler<CPMMessageCode.LIMIT_EXCEEDED>[];
+    [CPMMessageCode.ID_DROP]: ConfiguredMessageHandler<CPMMessageCode.ID_DROP>[];
 };
 
 export class CommunicationHandler implements ICommunicationHandler {
@@ -92,6 +93,7 @@ export class CommunicationHandler implements ICommunicationHandler {
             [CPMMessageCode.STH_ID]: [],
             [CPMMessageCode.KEY_REVOKED]: [],
             [CPMMessageCode.LIMIT_EXCEEDED]: [],
+            [CPMMessageCode.ID_DROP]: [],
         };
         this.monitoringHandlerHash = {
             [RunnerMessageCode.ACKNOWLEDGE]: [],

diff --git a/packages/symbols/src/cpm-message-code.ts b/packages/symbols/src/cpm-message-code.ts
@@ -14,5 +14,6 @@ export enum CPMMessageCode {
     CONFIRM_MSG = 8000,
 
     KEY_REVOKED = 9001,
-    LIMIT_EXCEEDED = 9002
+    LIMIT_EXCEEDED = 9002,
+    ID_DROP = 9003
 }
diff --git a/packages/types/src/message-streams.ts b/packages/types/src/message-streams.ts
@@ -95,7 +95,7 @@ export type EncodedMessage<
 export type ControlMessageCode =
     RunnerMessageCode.KILL | RunnerMessageCode.MONITORING_RATE | RunnerMessageCode.STOP | RunnerMessageCode.EVENT |
     RunnerMessageCode.PONG |
-    CPMMessageCode.STH_ID | CPMMessageCode.KEY_REVOKED | CPMMessageCode.LIMIT_EXCEEDED |
+    CPMMessageCode.STH_ID | CPMMessageCode.KEY_REVOKED | CPMMessageCode.LIMIT_EXCEEDED | CPMMessageCode.ID_DROP |
     RunnerMessageCode.INPUT_CONTENT_TYPE;
 
 export type EncodedControlMessage = EncodedMessage<ControlMessageCode>;

diff --git a/packages/types/src/rest-api-manager/post-disconnect.ts b/packages/types/src/rest-api-manager/post-disconnect.ts
@@ -1,6 +1,7 @@
 import { OpResponse } from "../rest-api-multi-manager";
 
 export type PostDisconnectPayload = {
+    id?: string;
     limit?: number;
     accessKey?: string;
 }