@webstudio-is/http-client 0.174.0 → 0.179.0

package/lib/index.js

@@ -1,15 +1,12 @@
 // src/index.ts
-var loadProjectDataById = 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,12 +14,17 @@ var loadProjectDataById = 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 = new Headers();
+  if ("seviceToken" in params) {
+    headers.set("Authorization", params.seviceToken);
+  } else {
+    headers.set("x-auth-token", params.authToken);
+  }
   const response = await fetch(url.href, {
-    headers: {
-      Authorization: params.authToken
-    }
+    headers
   });
   if (response.ok) {
     return await response.json();
@@ -30,22 +32,49 @@ 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);
+var loadProjectDataByProjectId = async (params) => {
+  const result = await getLatestBuildUsingProjectId(params);
+  if (result.buildId === null) {
+    throw new Error(`The project is not published yet`);
   }
-  const response = await fetch(url.href);
-  if (response.ok) {
-    return await response.json();
+  return await loadProjectDataByBuildId({
+    buildId: result.buildId,
+    origin: params.origin,
+    authToken: params.authToken
+  });
+};
+var buildProjectDomainPrefix = "p-";
+var parseBuilderUrl = (urlStr) => {
+  const url = new URL(urlStr);
+  const fragments = url.host.split(".");
+  const re = /^(?<prefix>[a-z-]+)(?<uuid>[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12})(-dot-(?<branch>.*))?/;
+  const match = fragments[0].match(re);
+  const prefix = match?.groups?.prefix;
+  const projectId = match?.groups?.uuid;
+  const branch = match?.groups?.branch;
+  if (prefix !== buildProjectDomainPrefix) {
+    return {
+      projectId: void 0,
+      sourceOrigin: url.origin
+    };
   }
-  const message = await response.text();
-  throw new Error(message.slice(0, 1e3));
+  if (projectId === void 0) {
+    return {
+      projectId: void 0,
+      sourceOrigin: url.origin
+    };
+  }
+  fragments[0] = fragments[0].replace(re, branch ?? "");
+  const sourceUrl = new URL(url.origin);
+  sourceUrl.protocol = "https";
+  sourceUrl.host = fragments.filter(Boolean).join(".");
+  return {
+    projectId,
+    sourceOrigin: sourceUrl.origin
+  };
 };
 export {
-  getLatestBuildUsingProjectId,
   loadProjectDataByBuildId,
-  loadProjectDataById
+  loadProjectDataByProjectId,
+  parseBuilderUrl
 };

package/lib/types/index.d.ts

@@ -21,20 +21,23 @@ export type Data = {
     };
     assets: Array<Asset>;
 };
-export declare const loadProjectDataById: (params: {
-    projectId: string;
-    origin: string;
-    authToken?: string;
-}) => Promise<Data>;
 export declare const loadProjectDataByBuildId: (params: {
     buildId: string;
     origin: string;
+} & ({
+    seviceToken: string;
+} | {
     authToken: string;
-}) => Promise<Data>;
-export declare const getLatestBuildUsingProjectId: (params: {
+})) => Promise<Data>;
+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;
+} | {
+    projectId: string;
+    sourceOrigin: string;
+};

package/lib/types/index.test.d.ts

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,16 +1,18 @@
 {
   "name": "@webstudio-is/http-client",
-  "version": "0.174.0",
+  "version": "0.179.0",
   "description": "Webstudio HTTP Client",
   "author": "Webstudio <github@webstudio.is>",
   "homepage": "https://webstudio.is",
   "type": "module",
   "dependencies": {
-    "@webstudio-is/sdk": "0.174.0"
+    "@webstudio-is/sdk": "0.179.0"
   },
   "devDependencies": {
+    "@jest/globals": "^29.7.0",
     "typescript": "5.5.2",
-    "@webstudio-is/tsconfig": "1.0.7"
+    "@webstudio-is/tsconfig": "1.0.7",
+    "@webstudio-is/jest-config": "1.0.7"
   },
   "exports": {
     "webstudio": "./src/index.ts",
@@ -18,7 +20,8 @@
     "import": "./lib/index.js"
   },
   "files": [
-    "lib/*"
+    "lib/*",
+    "!*.{test,stories}.*"
   ],
   "license": "AGPL-3.0-or-later",
   "private": false,
@@ -26,6 +29,7 @@
   "scripts": {
     "build": "rm -rf lib && esbuild src/index.ts --outdir=lib --bundle --format=esm --packages=external",
     "dts": "tsc --project tsconfig.dts.json",
-    "typecheck": "tsc"
+    "typecheck": "tsc",
+    "test": "NODE_OPTIONS=--experimental-vm-modules jest"
   }
 }