@superblocksteam/sdk 0.0.19 → 0.0.21

package/dist/client.d.ts

@@ -4,7 +4,12 @@ export interface UploadFile {
     filename: string;
     ContentType: string;
 }
-export declare function fetchApplication(applicationId: string, token: string, superblocksBaseUrl: string, viewMode: ViewMode): Promise<any>;
+export declare function fetchApplication({ applicationId, token, superblocksBaseUrl, viewMode, }: {
+    applicationId: string;
+    token: string;
+    superblocksBaseUrl: string;
+    viewMode: ViewMode;
+}): Promise<any>;
 export declare function fetchApplications(token: string, superblocksBaseUrl: string): Promise<any>;
 export declare function fetchApi(apiId: string, token: string, superblocksBaseUrl: string, viewMode: ViewMode): Promise<any>;
 export declare function fetchApis(token: string, superblocksBaseUrl: string): Promise<any>;

package/dist/client.js

@@ -8,20 +8,26 @@ const axios_1 = require("axios");
 const FormData = require("form-data");
 const BASE_SERVER_URL = "api/v1";
 const BASE_BUCKETEER_URL = "api/v1";
-const CLI_VERSION_HEADER = "X-Superblocks-CLI-Version";
-async function fetchApplication(applicationId, token, superblocksBaseUrl, viewMode) {
+const CLI_VERSION_HEADER = "x-superblocks-cli-version";
+async function fetchApplication({ applicationId, token, superblocksBaseUrl, viewMode, }) {
     var _a;
-    const url = `/api/v2/applications/${applicationId}?viewMode=${viewMode}`;
+    // TODO(jason) update this with commit ID once we enable fetching by commit
+    const commitId = "latest";
+    superblocksBaseUrl = superblocksBaseUrl.replace(/\/$/, "");
+    const bucketeerBaseUrl = (0, util_1.getBucketeerUrlFromSuperblocksUrl)(superblocksBaseUrl);
+    // fetch files from bucketeer
+    const componentFileURL = new URL(`${BASE_BUCKETEER_URL}/components/${applicationId}?commit=${commitId}&viewMode=${viewMode}`, bucketeerBaseUrl).toString();
     try {
         const config = {
             method: "get",
-            url: new URL(url, superblocksBaseUrl).toString(),
+            url: componentFileURL,
             headers: {
                 Authorization: "Bearer " + token,
+                "x-superblocks-url": superblocksBaseUrl,
             },
         };
         const response = await (0, axios_1.default)(config);
-        return response.data.data;
+        return response.data;
     }
     catch (e) {
         if (axios_1.default.isAxiosError(e) && ((_a = e.response) === null || _a === void 0 ? void 0 : _a.status) === 404) {
@@ -87,7 +93,7 @@ async function fetchApis(token, superblocksBaseUrl) {
 }
 exports.fetchApis = fetchApis;
 async function registerComponents(applicationId, componentConfigs, token, superblocksBaseUrl) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e, _f, _g;
     try {
         const [rootSettings] = await (0, util_2.getSuperblocksMonorepoConfigJson)(true);
         const config = {
@@ -104,17 +110,15 @@ async function registerComponents(applicationId, componentConfigs, token, superb
     }
     catch (e) {
         if (e instanceof axios_1.AxiosError) {
-            const message = (_c = (_b = (_a = e.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.responseMeta) === null || _c === void 0 ? void 0 : _c.message;
-            throw new Error(`Could not register application components
-${message !== null && message !== void 0 ? message : ""}`);
+            const message = (_f = (_d = (_c = (_b = (_a = e.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.responseMeta) === null || _c === void 0 ? void 0 : _c.message) !== null && _d !== void 0 ? _d : JSON.stringify((_e = e.response) === null || _e === void 0 ? void 0 : _e.data)) !== null && _f !== void 0 ? _f : (_g = e.response) === null || _g === void 0 ? void 0 : _g.statusText;
+            throw new Error(`Could not register application components ${message ? "\n" + message : ""}`);
         }
-        throw new Error(`Could not register application components
-${e.message}`);
+        throw new Error(`Could not register application components ${e.message ? "\n" + e.message : ""}`);
     }
 }
 exports.registerComponents = registerComponents;
 async function uploadComponents({ applicationId, componentConfigs, files, token, superblocksBaseUrl, }) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e, _f;
     superblocksBaseUrl = superblocksBaseUrl.replace(/\/$/, "");
     const bucketeerBaseUrl = (0, util_1.getBucketeerUrlFromSuperblocksUrl)(superblocksBaseUrl);
     // parse files to source and bundled files based on path
@@ -159,9 +163,9 @@ async function uploadComponents({ applicationId, componentConfigs, files, token,
     }
     catch (e) {
         if (e instanceof axios_1.AxiosError) {
-            const message = (_c = (_b = (_a = e.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.responseMeta) === null || _c === void 0 ? void 0 : _c.message;
+            const message = (_d = (_c = (_b = (_a = e.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.responseMeta) === null || _c === void 0 ? void 0 : _c.message) !== null && _d !== void 0 ? _d : (_e = e.response) === null || _e === void 0 ? void 0 : _e.data;
             throw new Error(`Could not upload application components
-${message}`);
+${message !== null && message !== void 0 ? message : (_f = e.response) === null || _f === void 0 ? void 0 : _f.statusText}`);
         }
         throw new Error(`Could not upload application components
 ${e.message}`);

package/dist/sdk.js

@@ -10,7 +10,12 @@ class SuperblocksSdk {
         this.superblocksBaseUrl = superblocksBaseUrl;
     }
     async fetchApplication(applicationId, viewMode = "export-live") {
-        return (0, client_1.fetchApplication)(applicationId, this.token, this.superblocksBaseUrl, viewMode);
+        return (0, client_1.fetchApplication)({
+            applicationId,
+            token: this.token,
+            superblocksBaseUrl: this.superblocksBaseUrl,
+            viewMode,
+        });
     }
     async fetchApplications() {
         return (0, client_1.fetchApplications)(this.token, this.superblocksBaseUrl);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superblocksteam/sdk",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "description": "Superblocks JS SDK",
   "main": "./dist/index.js",
   "exports": {

package/src/client.ts

@@ -10,7 +10,7 @@ import * as FormData from "form-data";
 const BASE_SERVER_URL = "api/v1";
 const BASE_BUCKETEER_URL = "api/v1";
 
-const CLI_VERSION_HEADER = "X-Superblocks-CLI-Version";
+const CLI_VERSION_HEADER = "x-superblocks-cli-version";
 
 export type ViewMode = "export-deployed" | "export-latest" | "export-live";
 
@@ -20,23 +20,40 @@ export interface UploadFile {
   ContentType: string;
 }
 
-export async function fetchApplication(
-  applicationId: string,
-  token: string,
-  superblocksBaseUrl: string,
-  viewMode: ViewMode
-) {
-  const url = `/api/v2/applications/${applicationId}?viewMode=${viewMode}`;
+export async function fetchApplication({
+  applicationId,
+  token,
+  superblocksBaseUrl,
+  viewMode,
+}: {
+  applicationId: string;
+  token: string;
+  superblocksBaseUrl: string;
+  viewMode: ViewMode;
+}) {
+  // TODO(jason) update this with commit ID once we enable fetching by commit
+  const commitId = "latest";
+  superblocksBaseUrl = superblocksBaseUrl.replace(/\/$/, "");
+  const bucketeerBaseUrl =
+    getBucketeerUrlFromSuperblocksUrl(superblocksBaseUrl);
+
+  // fetch files from bucketeer
+  const componentFileURL = new URL(
+    `${BASE_BUCKETEER_URL}/components/${applicationId}?commit=${commitId}&viewMode=${viewMode}`,
+    bucketeerBaseUrl
+  ).toString();
+
   try {
     const config = {
       method: "get",
-      url: new URL(url, superblocksBaseUrl).toString(),
+      url: componentFileURL,
       headers: {
         Authorization: "Bearer " + token,
+        "x-superblocks-url": superblocksBaseUrl,
       },
     };
     const response = await axios(config);
-    return response.data.data;
+    return response.data;
   } catch (e) {
     if (axios.isAxiosError(e) && e.response?.status === 404) {
       throw new Error(`Application ${applicationId} was not found`);
@@ -131,12 +148,21 @@ export async function registerComponents(
     return response.data;
   } catch (e: any) {
     if (e instanceof AxiosError) {
-      const message = e.response?.data?.responseMeta?.message as string;
-      throw new Error(`Could not register application components
-${message ?? ""}`);
+      const message: string =
+        (e.response?.data?.responseMeta?.message as string) ??
+        JSON.stringify(e.response?.data) ??
+        e.response?.statusText;
+      throw new Error(
+        `Could not register application components ${
+          message ? "\n" + message : ""
+        }`
+      );
     }
-    throw new Error(`Could not register application components
-${e.message as string}`);
+    throw new Error(
+      `Could not register application components ${
+        e.message ? "\n" + (e as Error).message : ""
+      }`
+    );
   }
 }
 
@@ -210,9 +236,10 @@ export async function uploadComponents({
     return response.data;
   } catch (e: any) {
     if (e instanceof AxiosError) {
-      const message = e.response?.data?.responseMeta?.message as string;
+      const message =
+        (e.response?.data?.responseMeta?.message as string) ?? e.response?.data;
       throw new Error(`Could not upload application components
-${message}`);
+${message ?? e.response?.statusText}`);
     }
     throw new Error(`Could not upload application components
 ${e.message as string}`);

package/src/sdk.ts

@@ -22,12 +22,12 @@ export class SuperblocksSdk {
     applicationId: string,
     viewMode: ViewMode = "export-live"
   ) {
-    return fetchApplication(
+    return fetchApplication({
       applicationId,
-      this.token,
-      this.superblocksBaseUrl,
-      viewMode
-    );
+      token: this.token,
+      superblocksBaseUrl: this.superblocksBaseUrl,
+      viewMode,
+    });
   }
 
   async fetchApplications() {