@superblocksteam/sdk 1.4.1 → 1.5.0

package/src/client.ts

@@ -1,23 +1,26 @@
 import * as fs from "fs";
 import {
+  COMPONENT_EVENT_HEADER,
   ComponentEvent,
   getBucketeerUrlFromSuperblocksUrl,
-  getSuperblocksMonorepoConfigJson,
   getContentType,
-  COMPONENT_EVENT_HEADER,
-  NotFoundError,
   LocalGitRepoState,
-  ValidateGitSetupRequestBody,
+  NotFoundError,
   SuperblocksResourceType,
   unreachable,
+  ValidateGitSetupRequestBody,
 } from "@superblocksteam/util";
 import axios, { AxiosError, AxiosRequestConfig } from "axios";
-import * as FormData from "form-data";
+import FormData from "form-data";
 import { isEmpty } from "lodash";
 import { BranchNotCheckedOutError, CommitAlreadyExistsError } from "./errors";
+import { signingEnabled } from "./flag";
+import { connectToISocketRPCServer } from "./socket";
+import { AgentType, RemoteCommitDto, UserMeDto } from "./types";
+import { getAgentUrls } from "./utils";
 
-const BASE_SERVER_URL = "api/v1";
-const BASE_BUCKETEER_URL = "api/v1";
+const BASE_BUCKETEER_URL = "api";
+const BASE_SERVER_PUBLIC_API_URL = "api/v1/public";
 
 const SUPERBLOCKS_MAX_FILE_SIZE_MB = 10;
 
@@ -66,6 +69,7 @@ export type Branch = {
 type ResponseWithMeta<T> = { responseMeta: unknown; data: T };
 
 export async function fetchApplication({
+  cliVersion,
   applicationId,
   branch,
   token,
@@ -73,6 +77,7 @@ export async function fetchApplication({
   viewMode,
   injectedHeaders = {},
 }: {
+  cliVersion: string;
   applicationId: string;
   branch?: string;
   token: string;
@@ -82,11 +87,13 @@ export async function fetchApplication({
 }): Promise<ApplicationWrapper | undefined> {
   const serverURL = branch
     ? new URL(
-        `api/v2/applications/${applicationId}/branches/${branch}?viewMode=${viewMode}`,
+        `${BASE_SERVER_PUBLIC_API_URL}/applications/${applicationId}/branches/${encodeURIComponent(
+          branch
+        )}?viewMode=${viewMode}`,
         superblocksBaseUrl
       )
     : new URL(
-        `api/v2/applications/${applicationId}?viewMode=${viewMode}`,
+        `${BASE_SERVER_PUBLIC_API_URL}/applications/${applicationId}?viewMode=${viewMode}`,
         superblocksBaseUrl
       );
 
@@ -98,6 +105,7 @@ export async function fetchApplication({
       url: serverURL.toString(),
       headers: {
         Authorization: "Bearer " + token,
+        [CLI_VERSION_HEADER]: cliVersion,
         ...injectedHeaders,
       },
     };
@@ -113,18 +121,20 @@ export async function fetchApplication({
 }
 
 export async function fetchApplicationBranches({
+  cliVersion,
   applicationId,
   token,
   superblocksBaseUrl,
   injectedHeaders = {},
 }: {
+  cliVersion: string;
   applicationId: string;
   token: string;
   superblocksBaseUrl: string;
   injectedHeaders: Record<string, string>;
 }): Promise<Branches | undefined> {
   const serverURL = new URL(
-    `api/v2/applications/${applicationId}/branches`,
+    `public/applications/${applicationId}/branches`,
     superblocksBaseUrl
   );
   let serverResponse;
@@ -135,6 +145,7 @@ export async function fetchApplicationBranches({
       url: serverURL.toString(),
       headers: {
         Authorization: "Bearer " + token,
+        [CLI_VERSION_HEADER]: cliVersion,
         ...injectedHeaders,
       },
     };
@@ -150,6 +161,7 @@ export async function fetchApplicationBranches({
 }
 
 export async function fetchApplicationWithComponents({
+  cliVersion,
   applicationId,
   branch,
   token,
@@ -157,6 +169,7 @@ export async function fetchApplicationWithComponents({
   viewMode,
   injectedHeaders = {},
 }: {
+  cliVersion: string;
   applicationId: string;
   branch: string;
   token: string;
@@ -165,6 +178,7 @@ export async function fetchApplicationWithComponents({
   injectedHeaders: Record<string, string>;
 }): Promise<(ApplicationWrapper & { componentFiles: any }) | undefined> {
   const applicationWrapper = await fetchApplication({
+    cliVersion,
     applicationId,
     branch,
     token,
@@ -194,7 +208,7 @@ export async function fetchApplicationWithComponents({
   // fetch files from bucketeer
   const branchPath = branch ? `/branches/${encodeURIComponent(branch)}` : "";
   const componentFileURL = new URL(
-    `${BASE_BUCKETEER_URL}/components/${applicationId}${branchPath}?commit=${commitId}&viewMode=${viewMode}`,
+    `${BASE_BUCKETEER_URL}/v1/components/${applicationId}${branchPath}?commit=${commitId}&viewMode=${viewMode}`,
     bucketeerBaseUrl
   ).toString();
 
@@ -219,6 +233,7 @@ export async function fetchApplicationWithComponents({
 }
 
 export async function fetchApplications(
+  cliVersion: string,
   token: string,
   superblocksBaseUrl: string,
   injectedHeaders: Record<string, string> = {}
@@ -226,34 +241,61 @@ export async function fetchApplications(
   try {
     const config: AxiosRequestConfig = {
       method: "get",
-      url: new URL(`/api/v2/applications`, superblocksBaseUrl).toString(),
+      url: new URL(
+        `${BASE_SERVER_PUBLIC_API_URL}/applications`,
+        superblocksBaseUrl
+      ).toString(),
       headers: {
         Authorization: "Bearer " + token,
+        [CLI_VERSION_HEADER]: cliVersion,
         ...injectedHeaders,
       },
     };
     const response = await axios(config);
     return response.data.data.applications;
-  } catch (e) {
-    throw new Error("Could not fetch applications");
+  } catch (e: any) {
+    let message: string;
+    if (e instanceof AxiosError) {
+      message =
+        (e.response?.data?.responseMeta?.message as string) ??
+        JSON.stringify(e.response?.data) ??
+        e.response?.statusText ??
+        e?.message ??
+        `${e}`;
+    } else {
+      message = `${e?.message ? e?.message : e}`;
+    }
+    throw new Error(`Could not fetch applications: ${message}`);
   }
 }
 
 export async function fetchApi(
+  cliVersion: string,
   apiId: string,
   token: string,
   superblocksBaseUrl: string,
-  viewMode: ViewMode
+  viewMode: ViewMode,
+  branch?: string
 ) {
   try {
+    const serverURL = branch
+      ? new URL(
+          `${BASE_SERVER_PUBLIC_API_URL}/apis/${apiId}/branches/${encodeURIComponent(
+            branch
+          )}?viewMode=${viewMode}`,
+          superblocksBaseUrl
+        )
+      : new URL(
+          `${BASE_SERVER_PUBLIC_API_URL}/apis/${apiId}?viewMode=${viewMode}`,
+          superblocksBaseUrl
+        );
+
     const config: AxiosRequestConfig = {
       method: "get",
-      url: new URL(
-        `/api/v3/apis/${apiId}?viewMode=${viewMode}`,
-        superblocksBaseUrl
-      ).toString(),
+      url: new URL(serverURL, superblocksBaseUrl).toString(),
       headers: {
         Authorization: "Bearer " + token,
+        [CLI_VERSION_HEADER]: cliVersion,
       },
     };
     const response = await axios(config);
@@ -266,23 +308,32 @@ export async function fetchApi(
   }
 }
 
-export async function fetchApis(token: string, superblocksBaseUrl: string) {
+export async function fetchApis(
+  cliVersion: string,
+  token: string,
+  superblocksBaseUrl: string
+) {
   try {
     const config: AxiosRequestConfig = {
       method: "get",
-      url: new URL(`/api/v3/apis`, superblocksBaseUrl).toString(),
+      url: new URL(
+        `${BASE_SERVER_PUBLIC_API_URL}/apis`,
+        superblocksBaseUrl
+      ).toString(),
       headers: {
         Authorization: "Bearer " + token,
+        [CLI_VERSION_HEADER]: cliVersion,
       },
     };
     const response = await axios(config);
-    return response.data.data;
+    return response.data.data.apis;
   } catch (e) {
     throw new Error("Could not fetch apis");
   }
 }
 
 export async function validateGitSetup(
+  cliVersion: string,
   resourceId: string,
   resourceType: SuperblocksResourceType,
   event: ComponentEvent,
@@ -293,7 +344,6 @@ export async function validateGitSetup(
 ) {
   let resourceName: string | undefined;
   try {
-    const [rootSettings] = await getSuperblocksMonorepoConfigJson(true);
     const requestBody: ValidateGitSetupRequestBody = {
       event,
       gitState: localGitRepoState,
@@ -301,11 +351,11 @@ export async function validateGitSetup(
     let path: string;
     switch (resourceType) {
       case "APPLICATION": {
-        path = `/public/application/${resourceId}/validate-git-setup`;
+        path = `/application/${resourceId}/validate-git-setup`;
         break;
       }
       case "BACKEND": {
-        path = `/public/api/${resourceId}/validate-git-setup`;
+        path = `/api/${resourceId}/validate-git-setup`;
         break;
       }
       default:
@@ -313,10 +363,13 @@ export async function validateGitSetup(
     }
     const config: AxiosRequestConfig = {
       method: "post",
-      url: new URL(`${BASE_SERVER_URL}/${path}`, superblocksBaseUrl).toString(),
+      url: new URL(
+        `${BASE_SERVER_PUBLIC_API_URL}/${path}`,
+        superblocksBaseUrl
+      ).toString(),
       headers: {
         Authorization: "Bearer " + token,
-        [CLI_VERSION_HEADER]: rootSettings.metadata.cliVersion,
+        [CLI_VERSION_HEADER]: cliVersion,
         ...injectedHeaders,
       },
       data: requestBody,
@@ -353,31 +406,55 @@ export async function validateGitSetup(
 }
 
 export async function registerComponents(
+  cliVersion: string,
   applicationId: string,
   componentConfigs: Record<string, any>,
   token: string,
   superblocksBaseUrl: string,
   branch: string | null,
-  injectedHeaders?: Record<string, string>
+  injectedHeaders: Record<string, string>
 ) {
   try {
-    const [rootSettings] = await getSuperblocksMonorepoConfigJson(true);
     const branchPath = branch ? `/branches/${encodeURIComponent(branch)}` : "";
-    const config: AxiosRequestConfig = {
-      method: "put",
-      url: new URL(
-        `${BASE_SERVER_URL}/public/application/${applicationId}${branchPath}/components`,
-        superblocksBaseUrl
-      ).toString(),
-      headers: {
-        Authorization: "Bearer " + token,
-        [CLI_VERSION_HEADER]: rootSettings.metadata.cliVersion,
-        ...injectedHeaders,
-      },
-      data: { components: componentConfigs },
-    };
-    const response = await axios(config);
-    return response.data;
+    const userMe = await fetchCurrentUser(
+      cliVersion,
+      token,
+      superblocksBaseUrl
+    );
+    const organization = userMe.organizations[0];
+    if (organization.agentType == AgentType.ONPREMISE && signingEnabled(userMe.flagBootstrap)) {
+      const agentUrls = getAgentUrls(userMe.agents, organization.agentType);
+      const socket = await connectToISocketRPCServer({
+        agentUrls,
+        superblocksBaseUrl,
+        token,
+      });
+      const resp = await socket.call.v1.public.application.component.register({
+        applicationId,
+        branchName: branch || "",
+        cliVersion: cliVersion,
+        componentEvent: injectedHeaders[COMPONENT_EVENT_HEADER],
+        components: componentConfigs,
+      });
+      socket.close();
+      return resp.data;
+    } else {
+      const config: AxiosRequestConfig = {
+        method: "put",
+        url: new URL(
+          `${BASE_SERVER_PUBLIC_API_URL}/application/${applicationId}${branchPath}/components`,
+          superblocksBaseUrl
+        ).toString(),
+        headers: {
+          Authorization: "Bearer " + token,
+          [CLI_VERSION_HEADER]: cliVersion,
+          ...injectedHeaders,
+        },
+        data: { components: componentConfigs },
+      };
+      const response = await axios(config);
+      return response.data;
+    }
   } catch (e: any) {
     if (e instanceof AxiosError) {
       const message: string =
@@ -399,6 +476,7 @@ export async function registerComponents(
 }
 
 export async function uploadComponents({
+  cliVersion,
   applicationId,
   componentConfigs,
   files,
@@ -406,6 +484,7 @@ export async function uploadComponents({
   superblocksBaseUrl,
   branch,
 }: {
+  cliVersion: string;
   applicationId: string;
   componentConfigs: Record<string, any>;
   files: string[];
@@ -445,7 +524,7 @@ export async function uploadComponents({
     buildFiles,
   });
   const postURL = new URL(
-    `${BASE_BUCKETEER_URL}/components/upload`,
+    `${BASE_BUCKETEER_URL}/v2/components/upload`,
     bucketeerBaseUrl
   ).toString();
 
@@ -469,20 +548,48 @@ You can reduce your component bundle size by uploading static assets to a separa
   const formHeaders = formData.getHeaders();
 
   try {
-    const [rootSettings] = await getSuperblocksMonorepoConfigJson(true);
     const config: AxiosRequestConfig = {
       headers: {
         Authorization: "Bearer " + token,
-        [CLI_VERSION_HEADER]: rootSettings.metadata.cliVersion,
+        [CLI_VERSION_HEADER]: cliVersion,
         [COMPONENT_EVENT_HEADER]: ComponentEvent.UPLOAD,
         [SUPERBLOCKS_URL_HEADER]: superblocksBaseUrl,
-        ...formHeaders,
+          ...formHeaders,
       },
     };
 
-    const response = await axios.post(postURL, formData, config);
+    const uploadResponse = await axios.post(postURL, formData, config);
 
-    return response.data;
+    const userMe = await fetchCurrentUser(
+      cliVersion,
+      token,
+      superblocksBaseUrl
+    );
+    const organization = userMe.organizations[0];
+    const signingRequired = organization.agentType == AgentType.ONPREMISE && signingEnabled(userMe.flagBootstrap);
+    let agentUrls: string[] = [];
+    if (signingRequired) {
+      agentUrls = getAgentUrls(userMe.agents, organization.agentType);
+    }
+    const socket = await connectToISocketRPCServer({
+      agentUrls,
+      superblocksBaseUrl,
+      token,
+    });
+    try {
+      await socket.call.v1.public.application.component.update({
+        applicationId,
+        branchName: branch ?? undefined,
+        srcFiles: srcFiles.map((file) => file.filename),
+        buildFiles: buildFiles.map((file) => file.filename),
+        registeredComponents: componentConfigs,
+        cliVersion,
+        componentBaseUrl: uploadResponse.data.componentBaseUrl,
+        signingRequired,
+      });
+    } finally {
+      socket.close();
+    }
   } catch (e: any) {
     if (e instanceof AxiosError && e.response?.status === 413) {
       throw new Error(
@@ -506,26 +613,43 @@ You can reduce your component bundle size by uploading static assets to a separa
 }
 
 export async function fetchCurrentUser(
+  cliVersion: string,
   token: string,
   superblocksBaseUrl: string
-) {
+): Promise<UserMeDto> {
   try {
     const config: AxiosRequestConfig = {
       method: "get",
-      url: new URL(`/api/v1/users/me`, superblocksBaseUrl).toString(),
+      url: new URL(
+        `${BASE_SERVER_PUBLIC_API_URL}/users/me`,
+        superblocksBaseUrl
+      ).toString(),
       headers: {
         Authorization: "Bearer " + token,
+        [CLI_VERSION_HEADER]: cliVersion,
         [COMPONENT_EVENT_HEADER]: ComponentEvent.LOGIN,
       },
     };
     const response = await axios(config);
-    return response.data.data.user;
-  } catch (e) {
-    throw new Error("Could not fetch current user");
+    return response.data.data as UserMeDto;
+  } catch (e: any) {
+    let message: string;
+    if (e instanceof AxiosError) {
+      message =
+        (e.response?.data?.responseMeta?.message as string) ??
+        JSON.stringify(e.response?.data) ??
+        e.response?.statusText ??
+        e?.message ??
+        `${e}`;
+    } else {
+      message = `${e?.message ? e?.message : e}`;
+    }
+    throw new Error(`Could not fetch current user: ${message}`);
   }
 }
 
 export async function pushApplication({
+  cliVersion,
   applicationId,
   token,
   superblocksBaseUrl,
@@ -533,16 +657,16 @@ export async function pushApplication({
   branch,
   injectedHeaders = {},
 }: {
+  cliVersion: string;
   applicationId: string;
   token: string;
   superblocksBaseUrl: string;
   branch: string;
   injectedHeaders: Record<string, string>;
   applicationConfig: PushApplicationWithCommitConfig;
-}): Promise<ApplicationWrapper | undefined> {
-  const [rootSettings] = await getSuperblocksMonorepoConfigJson(true);
+}): Promise<RemoteCommitDto | undefined> {
   const serverURL = new URL(
-    `${BASE_SERVER_URL}/public/applications/${applicationId}/branches/${encodeURIComponent(
+    `${BASE_SERVER_PUBLIC_API_URL}/applications/${applicationId}/branches/${encodeURIComponent(
       branch
     )}/push`,
     superblocksBaseUrl
@@ -550,17 +674,43 @@ export async function pushApplication({
   let serverResponse;
 
   try {
-    const config: AxiosRequestConfig = {
-      method: "post",
-      url: serverURL.toString(),
-      headers: {
-        Authorization: "Bearer " + token,
-        [CLI_VERSION_HEADER]: rootSettings.metadata.cliVersion,
-        ...injectedHeaders,
-      },
-      data: applicationConfig,
-    };
-    serverResponse = await axios<ResponseWithMeta<ApplicationWrapper>>(config);
+    const userMe = await fetchCurrentUser(
+      cliVersion,
+      token,
+      superblocksBaseUrl
+    );
+    const organization = userMe.organizations[0];
+    if (organization.agentType == AgentType.ONPREMISE && signingEnabled(userMe.flagBootstrap)) {
+      const agentUrls = getAgentUrls(userMe.agents, organization.agentType);
+      const socket = await connectToISocketRPCServer({
+        agentUrls,
+        superblocksBaseUrl,
+        token,
+      });
+      const resp = await socket.call.v1.public.application.pushCommit({
+        applicationId,
+        apis: applicationConfig.apis,
+        application: applicationConfig.application,
+        branchName: branch,
+        commitId: applicationConfig.commitId,
+        commitMessage: applicationConfig.commitMessage,
+        page: applicationConfig.page,
+      });
+      socket.close();
+      return resp.data;
+    } else {
+      const config: AxiosRequestConfig = {
+        method: "post",
+        url: serverURL.toString(),
+        headers: {
+          Authorization: "Bearer " + token,
+          [CLI_VERSION_HEADER]: cliVersion,
+          ...injectedHeaders,
+        },
+        data: applicationConfig,
+      };
+      serverResponse = await axios<ResponseWithMeta<RemoteCommitDto>>(config);
+    }
   } catch (e) {
     if (axios.isAxiosError(e)) {
       const respCode =
@@ -594,6 +744,7 @@ export async function pushApplication({
 }
 
 export async function pushApi({
+  cliVersion,
   apiId,
   token,
   superblocksBaseUrl,
@@ -601,6 +752,7 @@ export async function pushApi({
   branch,
   injectedHeaders = {},
 }: {
+  cliVersion: string;
   apiId: string;
   token: string;
   superblocksBaseUrl: string;
@@ -608,9 +760,8 @@ export async function pushApi({
   branch: string;
   injectedHeaders: Record<string, string>;
 }): Promise<{ commitId: string } | undefined> {
-  const [rootSettings] = await getSuperblocksMonorepoConfigJson(true);
   const serverURL = new URL(
-    `${BASE_SERVER_URL}/public/apis/${apiId}/branches/${encodeURIComponent(
+    `${BASE_SERVER_PUBLIC_API_URL}/apis/${apiId}/branches/${encodeURIComponent(
       branch
     )}/push`,
     superblocksBaseUrl
@@ -618,19 +769,43 @@ export async function pushApi({
   let serverResponse;
 
   try {
-    const config: AxiosRequestConfig = {
-      method: "post",
-      url: serverURL.toString(),
-      headers: {
-        Authorization: "Bearer " + token,
-        [CLI_VERSION_HEADER]: rootSettings.metadata.cliVersion,
-        ...injectedHeaders,
-      },
-      data: apiConfig,
-    };
-    serverResponse = await axios<ResponseWithMeta<{ commitId: string }>>(
-      config
+    const userMe = await fetchCurrentUser(
+      cliVersion,
+      token,
+      superblocksBaseUrl
     );
+    const organization = userMe.organizations[0];
+    if (organization.agentType == AgentType.ONPREMISE && signingEnabled(userMe.flagBootstrap)) {
+      const agentUrls = getAgentUrls(userMe.agents, organization.agentType);
+      const socket = await connectToISocketRPCServer({
+        agentUrls,
+        superblocksBaseUrl,
+        token,
+      });
+      const resp = await socket.call.v1.public.api.pushCommit({
+        apiId,
+        apiPb: apiConfig.apiPb,
+        branchName: branch,
+        commitId: apiConfig.commitId,
+        commitMessage: apiConfig.commitMessage,
+      });
+      socket.close();
+      return resp.data;
+    } else {
+      const config: AxiosRequestConfig = {
+        method: "post",
+        url: serverURL.toString(),
+        headers: {
+          Authorization: "Bearer " + token,
+          [CLI_VERSION_HEADER]: cliVersion,
+          ...injectedHeaders,
+        },
+        data: apiConfig,
+      };
+      serverResponse = await axios<ResponseWithMeta<{ commitId: string }>>(
+        config
+      );
+    }
   } catch (e) {
     if (axios.isAxiosError(e)) {
       if (e.response?.data?.responseMeta?.status === 405) {

package/src/flag.ts

@@ -0,0 +1,5 @@
+import { FlagBootstrap } from "./types";
+
+export const signingEnabled = (flags: FlagBootstrap): boolean => {
+  return flags["ui.enable-resource-signing"] ?? false;
+};