@superblocksteam/sdk 1.5.1 → 1.5.2

package/dist/client.js

@@ -434,8 +434,14 @@ async function fetchCurrentUser(cliVersion, token, superblocksBaseUrl) {
 }
 exports.fetchCurrentUser = fetchCurrentUser;
 async function pushApplication({ cliVersion, applicationId, token, superblocksBaseUrl, applicationConfig, branch, injectedHeaders = {}, }) {
-    const serverURL = new URL(`${BASE_SERVER_PUBLIC_API_URL}/applications/${applicationId}/branches/${encodeURIComponent(branch)}/push`, superblocksBaseUrl);
-    let serverResponse;
+    const handleHttpError = (status) => {
+        if (status === 405) {
+            throw new errors_1.BranchNotCheckedOutError(`Branch ${branch} is not checked out`);
+        }
+        else if (status === 409) {
+            throw new errors_1.CommitAlreadyExistsError(`Commit ${applicationConfig.commitId} already exists`);
+        }
+    };
     try {
         const userMe = await fetchCurrentUser(cliVersion, token, superblocksBaseUrl);
         const organization = userMe.organizations[0];
@@ -458,9 +464,16 @@ async function pushApplication({ cliVersion, applicationId, token, superblocksBa
                 page: applicationConfig.page,
             });
             socket.close();
+            handleHttpError(resp.responseMeta.status);
+            if (resp.responseMeta.status !== 200) {
+                // Get the raw error message from the server and throw it. The outer try-catch block will wrap it in a nicer error message
+                const message = resp?.responseMeta?.message ?? JSON.stringify(resp?.data);
+                throw new Error(message);
+            }
             return resp.data;
         }
         else {
+            const serverURL = new URL(`${BASE_SERVER_PUBLIC_API_URL}/applications/${applicationId}/branches/${encodeURIComponent(branch)}/push`, superblocksBaseUrl);
             const config = {
                 method: "post",
                 url: serverURL.toString(),
@@ -471,31 +484,41 @@ async function pushApplication({ cliVersion, applicationId, token, superblocksBa
                 },
                 data: applicationConfig,
             };
-            serverResponse = await (0, axios_1.default)(config);
+            try {
+                const serverResponse = await (0, axios_1.default)(config);
+                return serverResponse?.data?.data;
+            }
+            catch (e) {
+                if (!axios_1.default.isAxiosError(e)) {
+                    throw e;
+                }
+                handleHttpError(e.response?.data?.responseMeta?.status ?? e.response?.status);
+                const message = e.response?.data?.responseMeta?.message ??
+                    JSON.stringify(e.response?.data) ??
+                    e.response?.statusText;
+                throw new Error(message);
+            }
         }
     }
     catch (e) {
-        if (axios_1.default.isAxiosError(e)) {
-            const respCode = e.response?.data?.responseMeta?.status ?? e.response?.status;
-            if (respCode === 405) {
-                throw new errors_1.BranchNotCheckedOutError(`Branch ${branch} is not checked out`);
-            }
-            else if (respCode === 409) {
-                throw new errors_1.CommitAlreadyExistsError(`Commit ${applicationConfig.commitId} already exists`);
-            }
-            const message = e.response?.data?.responseMeta?.message ??
-                JSON.stringify(e.response?.data) ??
-                e.response?.statusText;
-            throw new Error(`Could not push application ${message ? "\n" + message : ""}`);
+        if (e instanceof errors_1.BranchNotCheckedOutError ||
+            e instanceof errors_1.CommitAlreadyExistsError) {
+            throw e;
         }
         throw new Error(`Could not push application ${e.message ? "\n" + e.message : ""}`);
     }
-    return serverResponse?.data?.data;
 }
 exports.pushApplication = pushApplication;
 async function pushApi({ cliVersion, apiId, token, superblocksBaseUrl, apiConfig, branch, injectedHeaders = {}, }) {
+    const handleHttpError = (status) => {
+        if (status === 405) {
+            throw new errors_1.BranchNotCheckedOutError(`Branch ${branch} is not checked out`);
+        }
+        else if (status === 409) {
+            throw new errors_1.CommitAlreadyExistsError(`Commit ${apiConfig.commitId} already exists`);
+        }
+    };
     const serverURL = new URL(`${BASE_SERVER_PUBLIC_API_URL}/apis/${apiId}/branches/${encodeURIComponent(branch)}/push`, superblocksBaseUrl);
-    let serverResponse;
     try {
         const userMe = await fetchCurrentUser(cliVersion, token, superblocksBaseUrl);
         const organization = userMe.organizations[0];
@@ -515,6 +538,12 @@ async function pushApi({ cliVersion, apiId, token, superblocksBaseUrl, apiConfig
                 commitMessage: apiConfig.commitMessage,
             });
             socket.close();
+            handleHttpError(resp.responseMeta.status);
+            if (resp.responseMeta.status !== 200) {
+                // Get the raw error message from the server and throw it. The outer try-catch block will wrap it in a nicer error message
+                const message = resp?.responseMeta?.message ?? JSON.stringify(resp?.data);
+                throw new Error(message);
+            }
             return resp.data;
         }
         else {
@@ -528,24 +557,28 @@ async function pushApi({ cliVersion, apiId, token, superblocksBaseUrl, apiConfig
                 },
                 data: apiConfig,
             };
-            serverResponse = await (0, axios_1.default)(config);
+            try {
+                const serverResponse = await (0, axios_1.default)(config);
+                return serverResponse?.data?.data;
+            }
+            catch (e) {
+                if (!axios_1.default.isAxiosError(e)) {
+                    throw e;
+                }
+                handleHttpError(e.response?.data?.responseMeta?.status);
+                const message = e.response?.data?.responseMeta?.message ??
+                    JSON.stringify(e.response?.data) ??
+                    e.response?.statusText;
+                throw new Error(message);
+            }
         }
     }
     catch (e) {
-        if (axios_1.default.isAxiosError(e)) {
-            if (e.response?.data?.responseMeta?.status === 405) {
-                throw new errors_1.BranchNotCheckedOutError(`Branch ${branch} is not checked out`);
-            }
-            else if (e.response?.data?.responseMeta?.status === 409) {
-                throw new errors_1.CommitAlreadyExistsError(`Commit ${apiConfig.commitId} already exists`);
-            }
-            const message = e.response?.data?.responseMeta?.message ??
-                JSON.stringify(e.response?.data) ??
-                e.response?.statusText;
-            throw new Error(`Could not push api ${message ? "\n" + message : ""}`);
+        if (e instanceof errors_1.BranchNotCheckedOutError ||
+            e instanceof errors_1.CommitAlreadyExistsError) {
+            throw e;
         }
         throw new Error(`Could not push api ${e.message ? "\n" + e.message : ""}`);
     }
-    return serverResponse?.data?.data;
 }
 exports.pushApi = pushApi;

package/dist/socket/handlers.d.ts

@@ -38,6 +38,7 @@ type ResponseDto<T> = {
 export type ResponseMeta = {
     status: number;
     success: boolean;
+    message?: string;
     error?: APIResponseError;
 };
 type APIResponseError = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superblocksteam/sdk",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "Superblocks JS SDK",
   "main": "./dist/index.js",
   "exports": {
@@ -31,7 +31,7 @@
     "typescript": "^5.1.3"
   },
   "dependencies": {
-    "@superblocksteam/util": "1.5.1",
+    "@superblocksteam/util": "1.5.2",
     "axios": "^1.3.5",
     "isomorphic-ws": "^5.0.0"
   },

package/src/client.ts

@@ -675,14 +675,15 @@ export async function pushApplication({
   injectedHeaders: Record<string, string>;
   applicationConfig: PushApplicationWithCommitConfig;
 }): Promise<RemoteCommitDto | undefined> {
-  const serverURL = new URL(
-    `${BASE_SERVER_PUBLIC_API_URL}/applications/${applicationId}/branches/${encodeURIComponent(
-      branch
-    )}/push`,
-    superblocksBaseUrl
-  );
-  let serverResponse;
-
+  const handleHttpError = (status: number) => {
+    if (status === 405) {
+      throw new BranchNotCheckedOutError(`Branch ${branch} is not checked out`);
+    } else if (status === 409) {
+      throw new CommitAlreadyExistsError(
+        `Commit ${applicationConfig.commitId} already exists`
+      );
+    }
+  };
   try {
     const userMe = await fetchCurrentUser(
       cliVersion,
@@ -715,8 +716,21 @@ export async function pushApplication({
         page: applicationConfig.page,
       });
       socket.close();
+      handleHttpError(resp.responseMeta.status);
+      if (resp.responseMeta.status !== 200) {
+        // Get the raw error message from the server and throw it. The outer try-catch block will wrap it in a nicer error message
+        const message: string =
+          (resp?.responseMeta?.message as string) ?? JSON.stringify(resp?.data);
+        throw new Error(message);
+      }
       return resp.data;
     } else {
+      const serverURL = new URL(
+        `${BASE_SERVER_PUBLIC_API_URL}/applications/${applicationId}/branches/${encodeURIComponent(
+          branch
+        )}/push`,
+        superblocksBaseUrl
+      );
       const config: AxiosRequestConfig = {
         method: "post",
         url: serverURL.toString(),
@@ -727,29 +741,31 @@ export async function pushApplication({
         },
         data: applicationConfig,
       };
-      serverResponse = await axios<ResponseWithMeta<RemoteCommitDto>>(config);
-    }
-  } catch (e) {
-    if (axios.isAxiosError(e)) {
-      const respCode =
-        e.response?.data?.responseMeta?.status ?? e.response?.status;
-      if (respCode === 405) {
-        throw new BranchNotCheckedOutError(
-          `Branch ${branch} is not checked out`
+      try {
+        const serverResponse = await axios<ResponseWithMeta<RemoteCommitDto>>(
+          config
         );
-      } else if (respCode === 409) {
-        throw new CommitAlreadyExistsError(
-          `Commit ${applicationConfig.commitId} already exists`
+        return serverResponse?.data?.data;
+      } catch (e) {
+        if (!axios.isAxiosError(e)) {
+          throw e;
+        }
+        handleHttpError(
+          e.response?.data?.responseMeta?.status ?? e.response?.status
         );
+        const message =
+          (e.response?.data?.responseMeta?.message as string) ??
+          JSON.stringify(e.response?.data) ??
+          e.response?.statusText;
+        throw new Error(message);
       }
-      const message: string =
-        (e.response?.data?.responseMeta?.message as string) ??
-        JSON.stringify(e.response?.data) ??
-        e.response?.statusText;
-
-      throw new Error(
-        `Could not push application ${message ? "\n" + message : ""}`
-      );
+    }
+  } catch (e) {
+    if (
+      e instanceof BranchNotCheckedOutError ||
+      e instanceof CommitAlreadyExistsError
+    ) {
+      throw e;
     }
     throw new Error(
       `Could not push application ${
@@ -757,8 +773,6 @@ export async function pushApplication({
       }`
     );
   }
-
-  return serverResponse?.data?.data;
 }
 
 export async function pushApi({
@@ -778,14 +792,21 @@ export async function pushApi({
   branch: string;
   injectedHeaders: Record<string, string>;
 }): Promise<{ commitId: string } | undefined> {
+  const handleHttpError = (status: number) => {
+    if (status === 405) {
+      throw new BranchNotCheckedOutError(`Branch ${branch} is not checked out`);
+    } else if (status === 409) {
+      throw new CommitAlreadyExistsError(
+        `Commit ${apiConfig.commitId} already exists`
+      );
+    }
+  };
   const serverURL = new URL(
     `${BASE_SERVER_PUBLIC_API_URL}/apis/${apiId}/branches/${encodeURIComponent(
       branch
     )}/push`,
     superblocksBaseUrl
   );
-  let serverResponse;
-
   try {
     const userMe = await fetchCurrentUser(
       cliVersion,
@@ -811,6 +832,13 @@ export async function pushApi({
         commitMessage: apiConfig.commitMessage,
       });
       socket.close();
+      handleHttpError(resp.responseMeta.status);
+      if (resp.responseMeta.status !== 200) {
+        // Get the raw error message from the server and throw it. The outer try-catch block will wrap it in a nicer error message
+        const message: string =
+          (resp?.responseMeta?.message as string) ?? JSON.stringify(resp?.data);
+        throw new Error(message);
+      }
       return resp.data;
     } else {
       const config: AxiosRequestConfig = {
@@ -823,27 +851,29 @@ export async function pushApi({
         },
         data: apiConfig,
       };
-      serverResponse = await axios<ResponseWithMeta<{ commitId: string }>>(
-        config
-      );
+      try {
+        const serverResponse = await axios<
+          ResponseWithMeta<{ commitId: string }>
+        >(config);
+        return serverResponse?.data?.data;
+      } catch (e) {
+        if (!axios.isAxiosError(e)) {
+          throw e;
+        }
+        handleHttpError(e.response?.data?.responseMeta?.status);
+        const message =
+          (e.response?.data?.responseMeta?.message as string) ??
+          JSON.stringify(e.response?.data) ??
+          e.response?.statusText;
+        throw new Error(message);
+      }
     }
   } catch (e) {
-    if (axios.isAxiosError(e)) {
-      if (e.response?.data?.responseMeta?.status === 405) {
-        throw new BranchNotCheckedOutError(
-          `Branch ${branch} is not checked out`
-        );
-      } else if (e.response?.data?.responseMeta?.status === 409) {
-        throw new CommitAlreadyExistsError(
-          `Commit ${apiConfig.commitId} already exists`
-        );
-      }
-      const message: string =
-        (e.response?.data?.responseMeta?.message as string) ??
-        JSON.stringify(e.response?.data) ??
-        e.response?.statusText;
-
-      throw new Error(`Could not push api ${message ? "\n" + message : ""}`);
+    if (
+      e instanceof BranchNotCheckedOutError ||
+      e instanceof CommitAlreadyExistsError
+    ) {
+      throw e;
     }
     throw new Error(
       `Could not push api ${
@@ -851,6 +881,4 @@ export async function pushApi({
       }`
     );
   }
-
-  return serverResponse?.data?.data;
 }

package/src/socket/handlers.ts

@@ -49,6 +49,7 @@ type ResponseDto<T> = {
 export type ResponseMeta = {
   status: number;
   success: boolean;
+  message?: string;
   error?: APIResponseError;
 };