feat(api-client): Add advanced cluster creation method and refactor login actions to use API client

2025-09-10 20:23:12 +00:00
parent 124c4ca46f
commit dc0d128892
2 changed files with 105 additions and 126 deletions
--- a/ts_apiclient/classes.cloudlyapiclient.ts
+++ b/ts_apiclient/classes.cloudlyapiclient.ts
@@ -271,6 +271,14 @@ export class CloudlyApiClient {
    },
    createCluster: async (optionsArg: Parameters<typeof Cluster.createCluster>[1]) => {
      return Cluster.createCluster(this, optionsArg);
+    },
+    createClusterAdvanced: async (clusterName: string, setupMode?: 'manual' | 'hetzner' | 'aws' | 'digitalocean') => {
+      const op = 'createCluster';
+      const payload: any = { identity: this.identity, clusterName };
+      if (setupMode) payload.setupMode = setupMode;
+      const wsReq = this.createWsRequest<plugins.servezoneInterfaces.requests.cluster.IRequest_CreateCluster>(op);
+      if (wsReq) return wsReq.fire(payload);
+      return this.createHttpRequest<plugins.servezoneInterfaces.requests.cluster.IRequest_CreateCluster>(op).fire(payload);
    }
  }

--- a/ts_web/appstate.ts
+++ b/ts_web/appstate.ts
@@ -14,27 +14,19 @@ export const loginStatePart: plugins.smartstate.StatePart<unknown, ILoginState>
 export const loginAction = loginStatePart.createAction<{ username: string; password: string }>(
  async (statePartArg, payloadArg) => {
    const currentState = statePartArg.getState();
-    const trLogin =
-      new domtools.plugins.typedrequest.TypedRequest<plugins.interfaces.requests.admin.IReq_Admin_LoginWithUsernameAndPassword>(
-        '/typedrequest',
-        'adminLoginWithUsernameAndPassword'
-      );
-    const response = await trLogin.fire({
-      username: payloadArg.username,
-      password: payloadArg.password,
-    }).catch(err => {
+    let identity: plugins.interfaces.data.IIdentity = null;
+    try {
+      identity = await apiClient.loginWithUsernameAndPassword(payloadArg.username, payloadArg.password) as any;
+    } catch (err) {
      console.log(err);
-      return {
-        ...statePartArg.getState(),
    }
-    });
    const newState = {
      ...currentState,
-      ...(response.identity ? { identity: response.identity } : {}),
+      ...(identity ? { identity } : {}),
    };
    try {
      // Keep shared API client in sync and establish WS for modules using sockets
-      apiClient.identity = (response as any)?.identity || null;
+      apiClient.identity = identity || null;
      if (apiClient.identity) {
        if (!apiClient['typedsocketClient']) {
          await apiClient.start();
@@ -105,60 +97,67 @@ export const apiClient = new plugins.servezoneApi.CloudlyApiClient({
 export const getAllDataAction = dataState.createAction(async (statePartArg) => {
  let currentState = statePartArg.getState();
  // SecretsGroups
-  const trGetSecretGroups =
-    new domtools.plugins.typedrequest.TypedRequest<plugins.interfaces.requests.secretgroup.IReq_GetSecretGroups>(
-      '/typedrequest',
-      'getSecretGroups'
-    );
-  const response = await trGetSecretGroups.fire({
-    identity: loginStatePart.getState().identity,
-  });
+  try {
+    apiClient.identity = loginStatePart.getState().identity;
+    const secretGroups = await apiClient.secretgroup.getSecretGroups();
    currentState = {
      ...currentState,
-    secretGroups: response.secretGroups,
+      secretGroups: secretGroups as any,
    };
+  } catch (err) {
+    console.error('Failed to fetch secret groups:', err);
+    currentState = {
+      ...currentState,
+      secretGroups: [],
+    };
+  }

  // SecretBundles
-  const trGetSecretBundles =
-    new domtools.plugins.typedrequest.TypedRequest<plugins.interfaces.requests.secretbundle.IReq_GetSecretBundles>(
-      '/typedrequest',
-      'getSecretBundles'
-    );
-  const responseSecretBundles = await trGetSecretBundles.fire({
-    identity: loginStatePart.getState().identity,
-  });
+  try {
+    apiClient.identity = loginStatePart.getState().identity;
+    const responseSecretBundles = await apiClient.secretbundle.getSecretBundles();
    currentState = {
      ...currentState,
-    secretBundles: responseSecretBundles.secretBundles,
+      secretBundles: responseSecretBundles as any,
    };
+  } catch (err) {
+    console.error('Failed to fetch secret bundles:', err);
+    currentState = {
+      ...currentState,
+      secretBundles: [],
+    };
+  }

  // images
-  const trGetImages =
-    new domtools.plugins.typedrequest.TypedRequest<plugins.interfaces.requests.image.IRequest_GetAllImages>(
-      '/typedrequest',
-      'getAllImages'
-    );
-  const responseImages = await trGetImages.fire({
-    identity: loginStatePart.getState().identity,
-  });
+  try {
+    apiClient.identity = loginStatePart.getState().identity;
+    const images = await apiClient.image.getImages();
    currentState = {
      ...currentState,
-    images: responseImages.images,
+      images: images as any,
    };
+  } catch (err) {
+    console.error('Failed to fetch images:', err);
+    currentState = {
+      ...currentState,
+      images: [],
+    };
+  }

  // Clusters
-  const trGetClusters =
-    new domtools.plugins.typedrequest.TypedRequest<plugins.interfaces.requests.cluster.IReq_Any_Cloudly_GetClusters>(
-      '/typedrequest',
-      'getClusters'
-    );
-  const responseClusters = await trGetClusters.fire({
-    identity: loginStatePart.getState().identity,
-  });
-
+  try {
+    apiClient.identity = loginStatePart.getState().identity;
+    const clusters = await apiClient.cluster.getClusters();
    currentState = {
      ...currentState,
-    clusters: responseClusters.clusters,
+      clusters: clusters as any,
+    }
+  } catch (err) {
+    console.error('Failed to fetch clusters:', err);
+    currentState = {
+      ...currentState,
+      clusters: [],
+    }
  }

  // External Registries via shared API client
@@ -178,18 +177,12 @@ export const getAllDataAction = dataState.createAction(async (statePartArg) => {
  }

  // Services
-  const trGetServices =
-    new domtools.plugins.typedrequest.TypedRequest<plugins.interfaces.requests.service.IRequest_Any_Cloudly_GetServices>(
-      '/typedrequest',
-      'getServices'
-    );
  try {
-    const responseServices = await trGetServices.fire({
-      identity: loginStatePart.getState().identity,
-    });
+    apiClient.identity = loginStatePart.getState().identity;
+    const services = await apiClient.services.getServices();
    currentState = {
      ...currentState,
-      services: responseServices?.services || [],
+      services: services as any,
    };
  } catch (error) {
    console.error('Failed to fetch services:', error);
@@ -200,15 +193,9 @@ export const getAllDataAction = dataState.createAction(async (statePartArg) => {
  }

  // Deployments
-  const trGetDeployments =
-    new domtools.plugins.typedrequest.TypedRequest<plugins.interfaces.requests.deployment.IReq_Any_Cloudly_GetDeployments>(
-      '/typedrequest',
-      'getDeployments'
-    );
  try {
-    const responseDeployments = await trGetDeployments.fire({
-      identity: loginStatePart.getState().identity,
-    });
+    apiClient.identity = loginStatePart.getState().identity;
+    const responseDeployments = await apiClient.deployments.getDeployments();
    currentState = {
      ...currentState,
      deployments: responseDeployments?.deployments || [],
@@ -291,16 +278,13 @@ export const deleteServiceAction = dataState.createAction(
 export const createSecretGroupAction = dataState.createAction(
  async (statePartArg, payloadArg: plugins.interfaces.data.ISecretGroup) => {
    let currentState = statePartArg.getState();
-    const trCreateSecretGroup =
-      new domtools.plugins.typedrequest.TypedRequest<plugins.interfaces.requests.secretgroup.IReq_CreateSecretGroup>(
-        '/typedrequest',
-        'createSecretGroup'
-      );
-    const response = await trCreateSecretGroup.fire({
-      identity: loginStatePart.getState().identity,
-      secretGroup: payloadArg,
-    });
+    try {
+      apiClient.identity = loginStatePart.getState().identity;
+      await apiClient.secretgroup.createSecretGroup(payloadArg.data);
      currentState = await dataState.dispatchAction(getAllDataAction, null);
+    } catch (err) {
+      console.error('Failed to create secret group:', err);
+    }
    return currentState;
    return currentState;
  }
@@ -309,16 +293,16 @@ export const createSecretGroupAction = dataState.createAction(
 export const deleteSecretGroupAction = dataState.createAction(
  async (statePartArg, payloadArg: { secretGroupId: string }) => {
    let currentState = statePartArg.getState();
-    const trDeleteSecretGroup =
-      new domtools.plugins.typedrequest.TypedRequest<plugins.interfaces.requests.secretgroup.IReq_DeleteSecretGroupById>(
-        '/typedrequest',
-        'deleteSecretGroupById'
-      );
-    const response = await trDeleteSecretGroup.fire({
-      identity: loginStatePart.getState().identity,
-      secretGroupId: payloadArg.secretGroupId,
-    });
+    try {
+      apiClient.identity = loginStatePart.getState().identity;
+      const sg = (currentState.secretGroups as any[])?.find(s => s.id === payloadArg.secretGroupId);
+      if (sg) {
+        await sg.delete(apiClient as any, sg.id);
+      }
      currentState = await dataState.dispatchAction(getAllDataAction, null);
+    } catch (err) {
+      console.error('Failed to delete secret group:', err);
+    }
    return currentState;
  }
 );
@@ -327,16 +311,16 @@ export const deleteSecretGroupAction = dataState.createAction(
 export const deleteSecretBundleAction = dataState.createAction(
  async (statePartArg, payloadArg: { configBundleId: string }) => {
    let currentState = statePartArg.getState();
-    const trDeleteConfigBundle =
-      new domtools.plugins.typedrequest.TypedRequest<plugins.interfaces.requests.secretbundle.IReq_DeleteSecretBundleById>( 
-        '/typedrequest',
-        'deleteSecretBundleById'
-      );
-    const response = await trDeleteConfigBundle.fire({
-      identity: loginStatePart.getState().identity,
-      secretBundleId: payloadArg.configBundleId,
-    });
+    try {
+      apiClient.identity = loginStatePart.getState().identity;
+      const sb = (currentState.secretBundles as any[])?.find(b => b.id === payloadArg.configBundleId);
+      if (sb) {
+        await sb.delete(apiClient as any, sb.id);
+      }
      currentState = await dataState.dispatchAction(getAllDataAction, null);
+    } catch (err) {
+      console.error('Failed to delete secret bundle:', err);
+    }
    return currentState;
  }
 );
@@ -603,21 +587,8 @@ export const addClusterAction = dataState.createAction(
    }
  ) => {
    let currentState = statePartArg.getState();
-    const trAddCluster =
-      new domtools.plugins.typedrequest.TypedRequest<plugins.interfaces.requests.cluster.IRequest_CreateCluster>(
-        '/typedrequest',
-        'createCluster'
-      );
-    const response = await trAddCluster.fire({
-      identity: loginStatePart.getState().identity,
-      ...payloadArg,
-    });
-    currentState = {
-      ...currentState,
-      ...{
-        clusters: [...currentState.clusters, response.cluster],
-      },
-    }
-    return currentState;
+    apiClient.identity = loginStatePart.getState().identity;
+    await apiClient.cluster.createClusterAdvanced(payloadArg.clusterName, payloadArg.setupMode);
+    return await dataState.dispatchAction(getAllDataAction, null);
  }
 );