@webstudio-is/http-client 0.175.0 → 0.181.0

package/lib/index.js

@@ -1,15 +1,12 @@
 // src/index.ts
-var loadProjectDataByProjectId = async (params) => {
-  const result = await getLatestBuildUsingProjectId(params);
-  if (result.buildId === null) {
-    throw new Error(`The project is not published yet`);
-  }
-  const url = new URL(params.origin);
-  url.pathname = `/rest/build/${result.buildId}`;
-  if (params.authToken) {
-    url.searchParams.append("authToken", params.authToken);
-  }
-  const response = await fetch(url.href);
+var getLatestBuildUsingProjectId = async (params) => {
+  const { origin, projectId, authToken } = params;
+  const { sourceOrigin } = parseBuilderUrl(origin);
+  const url = new URL(sourceOrigin);
+  url.pathname = `/rest/buildId/${projectId}`;
+  const headers = new Headers();
+  headers.set("x-auth-token", authToken);
+  const response = await fetch(url.href, { headers });
   if (response.ok) {
     return await response.json();
   }
@@ -17,13 +14,14 @@ var loadProjectDataByProjectId = async (params) => {
   throw new Error(message.slice(0, 1e3));
 };
 var loadProjectDataByBuildId = async (params) => {
-  const url = new URL(params.origin);
+  const { sourceOrigin } = parseBuilderUrl(params.origin);
+  const url = new URL(sourceOrigin);
   url.pathname = `/rest/build/${params.buildId}`;
-  const headers = {};
+  const headers = new Headers();
   if ("seviceToken" in params) {
-    headers.Authorization = params.seviceToken;
+    headers.set("Authorization", params.seviceToken);
   } else {
-    headers["x-auth-token"] = params.authToken;
+    headers.set("x-auth-token", params.authToken);
   }
   const response = await fetch(url.href, {
     headers
@@ -34,19 +32,16 @@ var loadProjectDataByBuildId = async (params) => {
   const message = await response.text();
   throw new Error(message.slice(0, 1e3));
 };
-var getLatestBuildUsingProjectId = async (params) => {
-  const { origin, projectId, authToken } = params;
-  const url = new URL(origin);
-  url.pathname = `/rest/buildId/${projectId}`;
-  if (authToken) {
-    url.searchParams.append("authToken", authToken);
-  }
-  const response = await fetch(url.href);
-  if (response.ok) {
-    return await response.json();
+var loadProjectDataByProjectId = async (params) => {
+  const result = await getLatestBuildUsingProjectId(params);
+  if (result.buildId === null) {
+    throw new Error(`The project is not published yet`);
   }
-  const message = await response.text();
-  throw new Error(message.slice(0, 1e3));
+  return await loadProjectDataByBuildId({
+    buildId: result.buildId,
+    origin: params.origin,
+    authToken: params.authToken
+  });
 };
 var buildProjectDomainPrefix = "p-";
 var parseBuilderUrl = (urlStr) => {
@@ -79,7 +74,6 @@ var parseBuilderUrl = (urlStr) => {
   };
 };
 export {
-  getLatestBuildUsingProjectId,
   loadProjectDataByBuildId,
   loadProjectDataByProjectId,
   parseBuilderUrl

package/lib/types/index.d.ts

@@ -21,11 +21,6 @@ export type Data = {
     };
     assets: Array<Asset>;
 };
-export declare const loadProjectDataByProjectId: (params: {
-    projectId: string;
-    origin: string;
-    authToken?: string;
-}) => Promise<Data>;
 export declare const loadProjectDataByBuildId: (params: {
     buildId: string;
     origin: string;
@@ -34,13 +29,11 @@ export declare const loadProjectDataByBuildId: (params: {
 } | {
     authToken: string;
 })) => Promise<Data>;
-export declare const getLatestBuildUsingProjectId: (params: {
+export declare const loadProjectDataByProjectId: (params: {
     projectId: string;
     origin: string;
-    authToken?: string;
-}) => Promise<{
-    buildId: string | null;
-}>;
+    authToken: string;
+}) => Promise<Data>;
 export declare const parseBuilderUrl: (urlStr: string) => {
     projectId: undefined;
     sourceOrigin: string;

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@webstudio-is/http-client",
-  "version": "0.175.0",
+  "version": "0.181.0",
   "description": "Webstudio HTTP Client",
   "author": "Webstudio <github@webstudio.is>",
   "homepage": "https://webstudio.is",
   "type": "module",
   "dependencies": {
-    "@webstudio-is/sdk": "0.175.0"
+    "@webstudio-is/sdk": "0.181.0"
   },
   "devDependencies": {
     "@jest/globals": "^29.7.0",
     "typescript": "5.5.2",
-    "@webstudio-is/tsconfig": "1.0.7",
-    "@webstudio-is/jest-config": "1.0.7"
+    "@webstudio-is/jest-config": "1.0.7",
+    "@webstudio-is/tsconfig": "1.0.7"
   },
   "exports": {
     "webstudio": "./src/index.ts",