@superblocksteam/sdk 1.8.0 → 1.9.0

package/dist/client.d.ts

@@ -1,6 +1,6 @@
 import { ComponentEvent, LocalGitRepoState, SuperblocksResourceType } from "@superblocksteam/util";
-import { ApiWithPb, Page, RemoteCommitDto, UserMeDto } from "./types";
-export type ViewMode = "export-deployed" | "export-latest" | "export-live";
+import { StdISocketRPCClient } from "./socket";
+import { ApiWithPb, Page, RemoteCommitDto, UserMeDto, ViewMode } from "./types";
 export interface UploadFile {
     name: string;
     filename: string;
@@ -16,15 +16,11 @@ export interface MultiPageApplicationWrapper {
     pages: Page[];
     apis: Record<string, any>[];
 }
-export type PushApplicationWithCommitConfig = ApplicationWrapper & {
-    commitId: string;
-    commitMessage: string;
-    gitState: LocalGitRepoState;
-};
 export type PushMultiPageApplicationWithCommitConfig = MultiPageApplicationWrapper & {
-    commitId: string;
-    commitMessage: string;
+    commitId?: string;
+    commitMessage?: string;
     gitState: LocalGitRepoState;
+    skipCommit: boolean;
 };
 export interface ApiWrapper {
     apiPb: Record<string, any>;
@@ -32,9 +28,10 @@ export interface ApiWrapper {
 }
 export type PushApiWithCommitConfig = {
     apiPb: Record<string, any>;
-    commitId: string;
-    commitMessage: string;
+    commitId?: string;
+    commitMessage?: string;
     gitState: LocalGitRepoState;
+    skipCommit: boolean;
 };
 export type Branches = {
     branches: Branch[];
@@ -43,16 +40,35 @@ export type Branch = {
     name: string;
     isDefault: boolean;
 };
-export declare function fetchApplication({ cliVersion, applicationId, branch, token, superblocksBaseUrl, viewMode, injectedHeaders, fetchSinglePageApplication, }: {
+export interface CommitDto {
+    commitMessage: string;
+    committer: {
+        name?: string;
+        email: string;
+    };
+    commitId: string;
+    commitDate: number;
+    branch?: string;
+    autosave?: boolean;
+    tag: string;
+    externalCommitId?: string | null;
+    externalCommitDate?: number | null;
+}
+export interface GetCommitsResponseBody {
+    autosaves: CommitDto[];
+    commits: CommitDto[];
+}
+export declare function fetchApplication({ cliVersion, applicationId, branch, token, superblocksBaseUrl, viewMode, commitId, skipSigningVerification, injectedHeaders, }: {
     cliVersion: string;
     applicationId: string;
     branch?: string;
     token: string;
     superblocksBaseUrl: string;
     viewMode: ViewMode;
+    commitId?: string;
+    skipSigningVerification?: boolean;
     injectedHeaders: Record<string, string>;
-    fetchSinglePageApplication: boolean;
-}): Promise<ApplicationWrapper | MultiPageApplicationWrapper | undefined>;
+}): Promise<MultiPageApplicationWrapper | undefined>;
 export declare function fetchApplicationBranches({ cliVersion, applicationId, token, superblocksBaseUrl, injectedHeaders, }: {
     cliVersion: string;
     applicationId: string;
@@ -60,20 +76,21 @@ export declare function fetchApplicationBranches({ cliVersion, applicationId, to
     superblocksBaseUrl: string;
     injectedHeaders: Record<string, string>;
 }): Promise<Branches | undefined>;
-export declare function fetchApplicationWithComponents({ cliVersion, applicationId, branch, token, superblocksBaseUrl, viewMode, injectedHeaders, fetchSinglePageApplication, }: {
+export declare function fetchApplicationWithComponents({ cliVersion, applicationId, branch, token, superblocksBaseUrl, viewMode, commitId, skipSigningVerification, injectedHeaders, }: {
     cliVersion: string;
     applicationId: string;
     branch: string;
     token: string;
     superblocksBaseUrl: string;
     viewMode: ViewMode;
+    commitId?: string;
+    skipSigningVerification?: boolean;
     injectedHeaders: Record<string, string>;
-    fetchSinglePageApplication?: boolean;
-}): Promise<((ApplicationWrapper | MultiPageApplicationWrapper) & {
+}): Promise<(MultiPageApplicationWrapper & {
     componentFiles: any;
 }) | undefined>;
 export declare function fetchApplications(cliVersion: string, token: string, superblocksBaseUrl: string, injectedHeaders?: Record<string, string>): Promise<any>;
-export declare function fetchApi(cliVersion: string, apiId: string, token: string, superblocksBaseUrl: string, viewMode: ViewMode, branch?: string): Promise<any>;
+export declare function fetchApi(cliVersion: string, apiId: string, token: string, superblocksBaseUrl: string, viewMode: ViewMode, branch?: string, commitId?: string, skipSigningVerification?: boolean): Promise<any>;
 export declare function fetchApis(cliVersion: string, token: string, superblocksBaseUrl: string): Promise<any>;
 export declare function validateGitSetup(cliVersion: string, resourceId: string, resourceType: SuperblocksResourceType, event: ComponentEvent, localGitRepoState: LocalGitRepoState, token: string, superblocksBaseUrl: string, injectedHeaders?: Record<string, string>): Promise<{
     branchName: string | null;
@@ -89,16 +106,18 @@ export declare function uploadComponents({ cliVersion, applicationId, componentC
     branch: string | null;
 }): Promise<void>;
 export declare function fetchCurrentUser(cliVersion: string, token: string, superblocksBaseUrl: string): Promise<UserMeDto>;
-export declare function pushApplication({ cliVersion, applicationId, token, superblocksBaseUrl, applicationConfig, branch, injectedHeaders, multiPage, }: {
+export declare const createSocketConnectionIfNeeded: (cliVersion: string, token: string, superblocksBaseUrl: string) => Promise<StdISocketRPCClient | undefined>;
+export declare function pushApplication({ cliVersion, applicationId, token, superblocksBaseUrl, applicationConfig, branch, injectedHeaders, }: {
     cliVersion: string;
     applicationId: string;
     token: string;
     superblocksBaseUrl: string;
     branch: string;
     injectedHeaders: Record<string, string>;
-    applicationConfig: PushApplicationWithCommitConfig | PushMultiPageApplicationWithCommitConfig;
-    multiPage?: boolean;
-}): Promise<RemoteCommitDto | undefined>;
+    applicationConfig: PushMultiPageApplicationWithCommitConfig;
+}): Promise<RemoteCommitDto | {
+    updated: Date;
+} | undefined>;
 export declare function pushApi({ cliVersion, apiId, token, superblocksBaseUrl, apiConfig, branch, injectedHeaders, }: {
     cliVersion: string;
     apiId: string;
@@ -109,4 +128,26 @@ export declare function pushApi({ cliVersion, apiId, token, superblocksBaseUrl,
     injectedHeaders: Record<string, string>;
 }): Promise<{
     commitId: string;
+} | {
+    updated: Date;
 } | undefined>;
+export declare function fetchApplicationCommits({ cliVersion, applicationId, branch, token, superblocksBaseUrl, injectedHeaders, limit, offset, }: {
+    cliVersion: string;
+    applicationId: string;
+    branch?: string;
+    token: string;
+    superblocksBaseUrl: string;
+    injectedHeaders: Record<string, string>;
+    limit?: number;
+    offset?: number;
+}): Promise<GetCommitsResponseBody>;
+export declare function fetchApiCommits({ cliVersion, applicationId, branch, token, superblocksBaseUrl, injectedHeaders, limit, offset, }: {
+    cliVersion: string;
+    applicationId: string;
+    branch?: string;
+    token: string;
+    superblocksBaseUrl: string;
+    injectedHeaders: Record<string, string>;
+    limit?: number;
+    offset?: number;
+}): Promise<GetCommitsResponseBody>;

package/dist/client.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.pushApi = exports.pushApplication = exports.fetchCurrentUser = exports.uploadComponents = exports.registerComponents = exports.validateGitSetup = exports.fetchApis = exports.fetchApi = exports.fetchApplications = exports.fetchApplicationWithComponents = exports.fetchApplicationBranches = exports.fetchApplication = void 0;
+exports.fetchApiCommits = exports.fetchApplicationCommits = exports.pushApi = exports.pushApplication = exports.createSocketConnectionIfNeeded = exports.fetchCurrentUser = exports.uploadComponents = exports.registerComponents = exports.validateGitSetup = exports.fetchApis = exports.fetchApi = exports.fetchApplications = exports.fetchApplicationWithComponents = exports.fetchApplicationBranches = exports.fetchApplication = void 0;
 const tslib_1 = require("tslib");
 const fs = tslib_1.__importStar(require("fs"));
 const util_1 = require("@superblocksteam/util");
@@ -15,17 +15,40 @@ const utils_1 = require("./utils");
 const BASE_BUCKETEER_URL = "api";
 const BASE_SERVER_PUBLIC_API_URL_V1 = "api/v1/public";
 const BASE_SERVER_PUBLIC_API_URL_v2 = "api/v2/public";
+const BASE_SERVER_API_URL_V2 = "api/v2";
+const BASE_SERVER_API_URL_V3 = "api/v3";
 const SUPERBLOCKS_MAX_FILE_SIZE_MB = 10;
 const CLI_VERSION_HEADER = "x-superblocks-cli-version";
 const SUPERBLOCKS_URL_HEADER = "x-superblocks-url";
-async function fetchApplication({ cliVersion, applicationId, branch, token, superblocksBaseUrl, viewMode, injectedHeaders = {}, fetchSinglePageApplication, }) {
+async function fetchApplication({ cliVersion, applicationId, branch, token, superblocksBaseUrl, viewMode, commitId, skipSigningVerification = false, injectedHeaders = {}, }) {
+    if (commitId && viewMode !== "export-commit") {
+        throw new Error(`If commitId ${commitId} is provided, viewMode cannot be ${viewMode}`);
+    }
     try {
-        const baseServerUrl = fetchSinglePageApplication
-            ? BASE_SERVER_PUBLIC_API_URL_V1
-            : BASE_SERVER_PUBLIC_API_URL_v2;
         const serverURL = branch
-            ? new URL(`${baseServerUrl}/applications/${applicationId}/branches/${encodeURIComponent(branch)}?viewMode=${viewMode}`, superblocksBaseUrl)
-            : new URL(`${baseServerUrl}/applications/${applicationId}?viewMode=${viewMode}`, superblocksBaseUrl);
+            ? new URL(`${BASE_SERVER_PUBLIC_API_URL_v2}/applications/${applicationId}/branches/${encodeURIComponent(branch)}`, superblocksBaseUrl)
+            : new URL(`${BASE_SERVER_PUBLIC_API_URL_v2}/applications/${applicationId}`, superblocksBaseUrl);
+        serverURL.search = new URLSearchParams({
+            viewMode,
+            ...(commitId ? { commitId } : {}),
+        }).toString();
+        const socket = !skipSigningVerification
+            ? await (0, exports.createSocketConnectionIfNeeded)(cliVersion, token, superblocksBaseUrl)
+            : undefined;
+        if (socket) {
+            try {
+                const resp = await socket.call.v2.public.application.get({
+                    applicationId,
+                    viewMode,
+                    branchName: branch,
+                    commitId,
+                });
+                return resp.data;
+            }
+            finally {
+                socket.close();
+            }
+        }
         const config = {
             method: "get",
             url: serverURL.toString(),
@@ -43,7 +66,7 @@ async function fetchApplication({ cliVersion, applicationId, branch, token, supe
         if (axios_1.default.isAxiosError(e) && e.response?.status === 404) {
             throw new util_1.NotFoundError(`Application ${applicationId} was not found`);
         }
-        throw new Error("Could not fetch application");
+        throw new Error(`Could not fetch application: ${typeof e === "object" && e && "message" in e ? e.message : e}`);
     }
 }
 exports.fetchApplication = fetchApplication;
@@ -71,7 +94,7 @@ async function fetchApplicationBranches({ cliVersion, applicationId, token, supe
     return serverResponse?.data?.data;
 }
 exports.fetchApplicationBranches = fetchApplicationBranches;
-async function fetchApplicationWithComponents({ cliVersion, applicationId, branch, token, superblocksBaseUrl, viewMode, injectedHeaders = {}, fetchSinglePageApplication = false, }) {
+async function fetchApplicationWithComponents({ cliVersion, applicationId, branch, token, superblocksBaseUrl, viewMode, commitId, skipSigningVerification = false, injectedHeaders = {}, }) {
     const applicationWrapper = await fetchApplication({
         cliVersion,
         applicationId,
@@ -79,8 +102,9 @@ async function fetchApplicationWithComponents({ cliVersion, applicationId, branc
         token,
         superblocksBaseUrl,
         viewMode,
+        commitId,
+        skipSigningVerification,
         injectedHeaders,
-        fetchSinglePageApplication,
     });
     if ((0, lodash_1.isEmpty)(applicationWrapper)) {
         return;
@@ -92,14 +116,11 @@ async function fetchApplicationWithComponents({ cliVersion, applicationId, branc
             componentFiles: null,
         };
     }
-    // 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);
-    const multiPage = fetchSinglePageApplication ? "false" : "true";
     // fetch files from bucketeer
     const branchPath = branch ? `/branches/${encodeURIComponent(branch)}` : "";
-    const componentFileURL = new URL(`${BASE_BUCKETEER_URL}/v1/components/${applicationId}${branchPath}?commit=${commitId}&viewMode=${viewMode}&multiPage=${multiPage}`, bucketeerBaseUrl).toString();
+    const componentFileURL = new URL(`${BASE_BUCKETEER_URL}/v1/components/${applicationId}${branchPath}?commit=${commitId}&viewMode=${viewMode}&multiPage=true`, bucketeerBaseUrl).toString();
     try {
         const config = {
             method: "get",
@@ -110,8 +131,12 @@ async function fetchApplicationWithComponents({ cliVersion, applicationId, branc
                 ...injectedHeaders,
             },
         };
-        const response = await (0, axios_1.default)(config);
-        return response.data;
+        const bucketeerApp = (await (0, axios_1.default)(config))
+            .data;
+        if (!(0, lodash_1.isEqual)(applicationWrapper.application.settings, bucketeerApp.application.settings)) {
+            throw new Error("Application settings fetched from bucketeer do not match the settings fetched from the server");
+        }
+        return bucketeerApp;
     }
     catch (e) {
         if (axios_1.default.isAxiosError(e) && e.response?.status === 404) {
@@ -152,27 +177,49 @@ async function fetchApplications(cliVersion, token, superblocksBaseUrl, injected
     }
 }
 exports.fetchApplications = fetchApplications;
-async function fetchApi(cliVersion, apiId, token, superblocksBaseUrl, viewMode, branch) {
+async function fetchApi(cliVersion, apiId, token, superblocksBaseUrl, viewMode, branch, commitId, skipSigningVerification = false) {
     try {
         const serverURL = branch
-            ? new URL(`${BASE_SERVER_PUBLIC_API_URL_V1}/apis/${apiId}/branches/${encodeURIComponent(branch)}?viewMode=${viewMode}`, superblocksBaseUrl)
-            : new URL(`${BASE_SERVER_PUBLIC_API_URL_V1}/apis/${apiId}?viewMode=${viewMode}`, superblocksBaseUrl);
-        const config = {
-            method: "get",
-            url: new URL(serverURL, superblocksBaseUrl).toString(),
-            headers: {
-                Authorization: "Bearer " + token,
-                [CLI_VERSION_HEADER]: cliVersion,
-            },
-        };
-        const response = await (0, axios_1.default)(config);
-        return response.data.data;
+            ? new URL(`${BASE_SERVER_PUBLIC_API_URL_V1}/apis/${apiId}/branches/${encodeURIComponent(branch)}`, superblocksBaseUrl)
+            : new URL(`${BASE_SERVER_PUBLIC_API_URL_V1}/apis/${apiId}`, superblocksBaseUrl);
+        serverURL.search = new URLSearchParams({
+            viewMode,
+            ...(commitId ? { commitId } : {}),
+        }).toString();
+        const socket = !skipSigningVerification
+            ? await (0, exports.createSocketConnectionIfNeeded)(cliVersion, token, superblocksBaseUrl)
+            : undefined;
+        if (socket) {
+            try {
+                const resp = await socket.call.v1.public.api.get({
+                    apiId,
+                    viewMode,
+                    branchName: branch,
+                });
+                return resp.data;
+            }
+            finally {
+                socket.close();
+            }
+        }
+        else {
+            const config = {
+                method: "get",
+                url: new URL(serverURL, superblocksBaseUrl).toString(),
+                headers: {
+                    Authorization: "Bearer " + token,
+                    [CLI_VERSION_HEADER]: cliVersion,
+                },
+            };
+            const response = await (0, axios_1.default)(config);
+            return response.data.data;
+        }
     }
     catch (e) {
         if (axios_1.default.isAxiosError(e) && e.response?.status === 404) {
             throw new util_1.NotFoundError(`Api ${apiId} was not found`);
         }
-        throw new Error("Could not fetch api");
+        throw new Error(`Could not fetch api: ${typeof e === "object" && e && "message" in e ? e.message : e}`);
     }
 }
 exports.fetchApi = fetchApi;
@@ -249,7 +296,7 @@ async function validateGitSetup(cliVersion, resourceId, resourceType, event, loc
         else {
             message = `${e?.message ? e.message : e}`;
         }
-        const errorMessage = `Could not validate your git setup against Superblocks for the ${resourceType.toLowerCase()} ${resourceName ?? resourceId}${message ? "\n" + message : ""}`;
+        const errorMessage = `Could not validate your git setup against Superblocks for ${resourceType.toLowerCase()} ${resourceName ?? resourceId}${message ? "\n" + message : ""}`;
         // TODO(@taha-au @gpoulios-sb) Replace this check with a more robust one that uses error codes once
         // the backend starts returning them as part of the response body
         if (message.includes("Please initialize git locally")) {
@@ -264,17 +311,8 @@ exports.validateGitSetup = validateGitSetup;
 async function registerComponents(cliVersion, applicationId, componentConfigs, token, superblocksBaseUrl, branch, injectedHeaders) {
     try {
         const branchPath = branch ? `/branches/${encodeURIComponent(branch)}` : "";
-        const userMe = await fetchCurrentUser(cliVersion, token, superblocksBaseUrl);
-        const organization = userMe.organizations[0];
-        if (organization.agentType == types_1.AgentType.ONPREMISE &&
-            (0, flag_1.signingEnabled)(userMe.flagBootstrap)) {
-            const profile = process.env.SUPERBLOCKS_PROFILE;
-            const agentUrl = await (0, utils_1.getAgentUrl)(userMe.agents, organization.agentType, profile);
-            const socket = await (0, socket_1.connectToISocketRPCServer)({
-                agentUrl,
-                superblocksBaseUrl,
-                token,
-            });
+        const socket = await (0, exports.createSocketConnectionIfNeeded)(cliVersion, token, superblocksBaseUrl);
+        if (socket) {
             const resp = await socket.call.v1.public.application.component.register({
                 applicationId,
                 branchName: branch || "",
@@ -365,19 +403,13 @@ You can reduce your component bundle size by uploading static assets to a separa
             },
         };
         const uploadResponse = await axios_1.default.post(postURL, formData, config);
-        const userMe = await fetchCurrentUser(cliVersion, token, superblocksBaseUrl);
-        const organization = userMe.organizations[0];
-        let agentUrl;
-        const signingRequired = organization.agentType == types_1.AgentType.ONPREMISE &&
-            (0, flag_1.signingEnabled)(userMe.flagBootstrap);
-        if (signingRequired) {
-            agentUrl = await (0, utils_1.getAgentUrl)(userMe.agents, organization.agentType);
-        }
-        const socket = await (0, socket_1.connectToISocketRPCServer)({
-            agentUrl,
-            superblocksBaseUrl,
-            token,
-        });
+        const initialSocket = await (0, exports.createSocketConnectionIfNeeded)(cliVersion, token, superblocksBaseUrl);
+        const socket = initialSocket ??
+            (await (0, socket_1.connectToISocketRPCServer)({
+                agentUrl: undefined,
+                superblocksBaseUrl,
+                token,
+            }));
         try {
             await socket.call.v1.public.application.component.update({
                 applicationId,
@@ -387,7 +419,7 @@ You can reduce your component bundle size by uploading static assets to a separa
                 registeredComponents: componentConfigs,
                 cliVersion,
                 componentBaseUrl: uploadResponse.data.componentBaseUrl,
-                signingRequired,
+                signingRequired: !(0, lodash_1.isEmpty)(initialSocket),
             });
         }
         finally {
@@ -447,7 +479,22 @@ async function fetchCurrentUser(cliVersion, token, superblocksBaseUrl) {
     }
 }
 exports.fetchCurrentUser = fetchCurrentUser;
-async function pushApplication({ cliVersion, applicationId, token, superblocksBaseUrl, applicationConfig, branch, injectedHeaders = {}, multiPage = false, }) {
+const createSocketConnectionIfNeeded = async (cliVersion, token, superblocksBaseUrl) => {
+    const userMe = await fetchCurrentUser(cliVersion, token, superblocksBaseUrl);
+    const organization = userMe.organizations[0];
+    if (organization.agentType == types_1.AgentType.ONPREMISE &&
+        (0, flag_1.signingEnabled)(userMe.flagBootstrap)) {
+        const profile = process.env.SUPERBLOCKS_PROFILE;
+        const agentUrl = await (0, utils_1.getAgentUrl)(userMe.agents, organization.agentType, profile);
+        return await (0, socket_1.connectToISocketRPCServer)({
+            agentUrl,
+            superblocksBaseUrl,
+            token,
+        });
+    }
+};
+exports.createSocketConnectionIfNeeded = createSocketConnectionIfNeeded;
+async function pushApplication({ cliVersion, applicationId, token, superblocksBaseUrl, applicationConfig, branch, injectedHeaders = {}, }) {
     const handleHttpError = (status) => {
         if (status === 405) {
             throw new errors_1.BranchNotCheckedOutError(`Branch ${branch} is not checked out`);
@@ -457,38 +504,19 @@ async function pushApplication({ cliVersion, applicationId, token, superblocksBa
         }
     };
     try {
-        const userMe = await fetchCurrentUser(cliVersion, token, superblocksBaseUrl);
-        const organization = userMe.organizations[0];
-        if (organization.agentType == types_1.AgentType.ONPREMISE &&
-            (0, flag_1.signingEnabled)(userMe.flagBootstrap)) {
-            const profile = process.env.SUPERBLOCKS_PROFILE;
-            const agentUrl = await (0, utils_1.getAgentUrl)(userMe.agents, organization.agentType, profile);
-            const socket = await (0, socket_1.connectToISocketRPCServer)({
-                agentUrl,
-                superblocksBaseUrl,
-                token,
+        const socket = await (0, exports.createSocketConnectionIfNeeded)(cliVersion, token, superblocksBaseUrl);
+        if (socket) {
+            const resp = await socket.call.v2.public.application.pushCommit({
+                applicationId,
+                apis: applicationConfig.apis,
+                application: applicationConfig.application,
+                branchName: branch,
+                commitId: applicationConfig.commitId,
+                commitMessage: applicationConfig.commitMessage,
+                pages: applicationConfig.pages,
+                gitState: applicationConfig.gitState,
+                skipCommit: applicationConfig.skipCommit,
             });
-            const resp = multiPage
-                ? await socket.call.v2.public.application.pushCommit({
-                    applicationId,
-                    apis: applicationConfig.apis,
-                    application: applicationConfig.application,
-                    branchName: branch,
-                    commitId: applicationConfig.commitId,
-                    commitMessage: applicationConfig.commitMessage,
-                    pages: applicationConfig.pages,
-                    gitState: applicationConfig.gitState,
-                })
-                : 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,
-                    gitState: applicationConfig.gitState,
-                });
             socket.close();
             handleHttpError(resp.responseMeta.status);
             if (resp.responseMeta.status !== 200) {
@@ -499,11 +527,7 @@ async function pushApplication({ cliVersion, applicationId, token, superblocksBa
             return resp.data;
         }
         else {
-            // v1 calls can be removed once all customers move to multi page
-            const baseServerPublicApiUrl = multiPage
-                ? BASE_SERVER_PUBLIC_API_URL_v2
-                : BASE_SERVER_PUBLIC_API_URL_V1;
-            const serverURL = new URL(`${baseServerPublicApiUrl}/applications/${applicationId}/branches/${encodeURIComponent(branch)}/push`, superblocksBaseUrl);
+            const serverURL = new URL(`${BASE_SERVER_PUBLIC_API_URL_v2}/applications/${applicationId}/branches/${encodeURIComponent(branch)}/push`, superblocksBaseUrl);
             const config = {
                 method: "post",
                 url: serverURL.toString(),
@@ -551,16 +575,8 @@ async function pushApi({ cliVersion, apiId, token, superblocksBaseUrl, apiConfig
     };
     const serverURL = new URL(`${BASE_SERVER_PUBLIC_API_URL_V1}/apis/${apiId}/branches/${encodeURIComponent(branch)}/push`, superblocksBaseUrl);
     try {
-        const userMe = await fetchCurrentUser(cliVersion, token, superblocksBaseUrl);
-        const organization = userMe.organizations[0];
-        if (organization.agentType == types_1.AgentType.ONPREMISE &&
-            (0, flag_1.signingEnabled)(userMe.flagBootstrap)) {
-            const agentUrl = await (0, utils_1.getAgentUrl)(userMe.agents, organization.agentType);
-            const socket = await (0, socket_1.connectToISocketRPCServer)({
-                agentUrl,
-                superblocksBaseUrl,
-                token,
-            });
+        const socket = await (0, exports.createSocketConnectionIfNeeded)(cliVersion, token, superblocksBaseUrl);
+        if (socket) {
             const resp = await socket.call.v1.public.api.pushCommit({
                 apiId,
                 apiPb: apiConfig.apiPb,
@@ -568,6 +584,7 @@ async function pushApi({ cliVersion, apiId, token, superblocksBaseUrl, apiConfig
                 commitId: apiConfig.commitId,
                 commitMessage: apiConfig.commitMessage,
                 gitState: apiConfig.gitState,
+                skipCommit: apiConfig.skipCommit,
             });
             socket.close();
             handleHttpError(resp.responseMeta.status);
@@ -615,3 +632,63 @@ async function pushApi({ cliVersion, apiId, token, superblocksBaseUrl, apiConfig
     }
 }
 exports.pushApi = pushApi;
+async function fetchApplicationCommits({ cliVersion, applicationId, branch, token, superblocksBaseUrl, injectedHeaders = {}, limit, offset, }) {
+    try {
+        const serverURL = branch
+            ? new URL(`${BASE_SERVER_API_URL_V2}/applications/${applicationId}/branches/${encodeURIComponent(branch)}/commits`, superblocksBaseUrl)
+            : new URL(`${BASE_SERVER_API_URL_V2}/applications/${applicationId}/commits`, superblocksBaseUrl);
+        serverURL.search = new URLSearchParams({
+            commitType: "commit",
+            ...(limit ? { limit: limit.toString() } : {}),
+            ...(offset ? { offset: offset.toString() } : {}),
+        }).toString();
+        const config = {
+            method: "get",
+            url: serverURL.toString(),
+            headers: {
+                Authorization: "Bearer " + token,
+                [CLI_VERSION_HEADER]: cliVersion,
+                ...injectedHeaders,
+            },
+        };
+        const serverResponse = await (0, axios_1.default)(config);
+        return serverResponse?.data?.data;
+    }
+    catch (e) {
+        if (axios_1.default.isAxiosError(e) && e.response?.status === 404) {
+            throw new util_1.NotFoundError(`Application ${applicationId} was not found`);
+        }
+        throw new Error("Could not fetch application");
+    }
+}
+exports.fetchApplicationCommits = fetchApplicationCommits;
+async function fetchApiCommits({ cliVersion, applicationId, branch, token, superblocksBaseUrl, injectedHeaders = {}, limit, offset, }) {
+    try {
+        const serverURL = branch
+            ? new URL(`${BASE_SERVER_API_URL_V3}/apis/${applicationId}/branches/${encodeURIComponent(branch)}/commits`, superblocksBaseUrl)
+            : new URL(`${BASE_SERVER_API_URL_V3}/apis/${applicationId}/commits`, superblocksBaseUrl);
+        serverURL.search = new URLSearchParams({
+            commitType: "commit",
+            ...(limit ? { limit: limit.toString() } : {}),
+            ...(offset ? { offset: offset.toString() } : {}),
+        }).toString();
+        const config = {
+            method: "get",
+            url: serverURL.toString(),
+            headers: {
+                Authorization: "Bearer " + token,
+                [CLI_VERSION_HEADER]: cliVersion,
+                ...injectedHeaders,
+            },
+        };
+        const serverResponse = await (0, axios_1.default)(config);
+        return serverResponse?.data?.data;
+    }
+    catch (e) {
+        if (axios_1.default.isAxiosError(e) && e.response?.status === 404) {
+            throw new util_1.NotFoundError(`Application ${applicationId} was not found`);
+        }
+        throw new Error("Could not fetch application");
+    }
+}
+exports.fetchApiCommits = fetchApiCommits;

package/dist/sdk.d.ts

@@ -1,30 +1,52 @@
 import { ComponentEvent, LocalGitRepoState, SuperblocksResourceType } from "@superblocksteam/util";
-import { PushApiWithCommitConfig, PushApplicationWithCommitConfig, PushMultiPageApplicationWithCommitConfig, ViewMode } from "./client";
+import { PushApiWithCommitConfig, PushMultiPageApplicationWithCommitConfig } from "./client";
+import { ViewMode } from "./types";
 export * from "./errors";
 export declare class SuperblocksSdk {
     token: string;
     superblocksBaseUrl: string;
     cliVersion: string;
     constructor(accessToken: string, superblocksBaseUrl: string, cliVersion: string);
-    fetchApplication({ applicationId, branch, headers, viewMode, fetchSinglePageApplication, }: {
+    fetchApplication({ applicationId, branch, headers, viewMode, skipSigningVerification, }: {
         applicationId: string;
         branch?: string;
         headers?: Record<string, string>;
         viewMode?: ViewMode;
-        fetchSinglePageApplication?: boolean;
-    }): Promise<import("./client").ApplicationWrapper | import("./client").MultiPageApplicationWrapper | undefined>;
+        skipSigningVerification?: boolean;
+    }): Promise<import("./client").MultiPageApplicationWrapper | undefined>;
     fetchApplicationBranches(applicationId: string, headers?: {}): Promise<import("./client").Branches | undefined>;
-    fetchApplicationWithComponents({ applicationId, branch, headers, viewMode, fetchSinglePageApplication, }: {
+    fetchApplicationWithComponents({ applicationId, branch, headers, viewMode, commitId, skipSigningVerification, }: {
         applicationId: string;
         branch: string;
         headers?: Record<string, string>;
         viewMode?: ViewMode;
-        fetchSinglePageApplication?: boolean;
-    }): Promise<((import("./client").ApplicationWrapper | import("./client").MultiPageApplicationWrapper) & {
+        commitId?: string;
+        skipSigningVerification?: boolean;
+    }): Promise<(import("./client").MultiPageApplicationWrapper & {
         componentFiles: any;
     }) | undefined>;
+    fetchApplicationCommits({ applicationId, branch, headers, limit, offset, }: {
+        applicationId: string;
+        branch: string;
+        headers?: Record<string, string>;
+        limit?: number;
+        offset?: number;
+    }): Promise<import("./client").GetCommitsResponseBody>;
+    fetchApiCommits({ apiId, branch, headers, limit, offset, }: {
+        apiId: string;
+        branch: string;
+        headers?: Record<string, string>;
+        limit?: number;
+        offset?: number;
+    }): Promise<import("./client").GetCommitsResponseBody>;
     fetchApplications(headers?: Record<string, string>): Promise<any>;
-    fetchApi(apiId: string, viewMode?: ViewMode, branch?: string): Promise<any>;
+    fetchApi({ apiId, branch, viewMode, commitId, skipSigningVerification, }: {
+        apiId: string;
+        viewMode?: ViewMode;
+        branch?: string;
+        commitId?: string;
+        skipSigningVerification?: boolean;
+    }): Promise<any>;
     fetchApis(): Promise<any>;
     validateGitSetup(resourceId: string, resourceType: SuperblocksResourceType, event: ComponentEvent, localGitRepoState: LocalGitRepoState, injectedHeaders?: Record<string, string>): Promise<{
         branchName: string | null;
@@ -32,13 +54,14 @@ export declare class SuperblocksSdk {
     registerComponents(applicationId: string, componentConfigs: Record<string, any>, branch: string | null, injectedHeaders: Record<string, string>): Promise<any>;
     uploadComponents(applicationId: string, componentConfigs: Record<string, any>, files: string[], branch: string | null): Promise<void>;
     fetchCurrentUser(): Promise<import("./types").UserMeDto>;
-    pushApplication({ applicationId, applicationConfig, branch, headers, multiPage, }: {
+    pushApplication({ applicationId, applicationConfig, branch, headers, }: {
         applicationId: string;
-        applicationConfig: PushApplicationWithCommitConfig | PushMultiPageApplicationWithCommitConfig;
+        applicationConfig: PushMultiPageApplicationWithCommitConfig;
         branch: string;
         headers?: Record<string, string>;
-        multiPage?: boolean;
-    }): Promise<import("./types").RemoteCommitDto | undefined>;
+    }): Promise<import("./types").RemoteCommitDto | {
+        updated: Date;
+    } | undefined>;
     pushApi({ apiId, apiConfig, branch, headers, }: {
         apiId: string;
         apiConfig: PushApiWithCommitConfig;
@@ -46,5 +69,7 @@ export declare class SuperblocksSdk {
         headers?: Record<string, string>;
     }): Promise<{
         commitId: string;
+    } | {
+        updated: Date;
     } | undefined>;
 }