@squadbase/vite-server 0.0.1-build-19 → 0.0.1-build-20

package/dist/cli/index.js

@@ -17062,14 +17062,35 @@ function createConnectorRegistry() {
   return { getQuery: getQuery2, loadConnections: loadConnections2, reloadEnvFile: reloadEnvFile2, watchConnectionsFile: watchConnectionsFile2 };
 }
 var APP_SESSION_COOKIE_NAME = "__Host-squadbase-session";
-var PREVIEW_SESSION_COOKIE_NAME = "squadbase-preview-session";
-function resolveProxyUrl(connectionId) {
-  const connectionPath = `/_sqcore/connections/${connectionId}/request`;
+function createSandboxProxyFetch(connectionId) {
+  const token = process.env.INTERNAL_SQUADBASE_OAUTH_MACHINE_CREDENTIAL;
   const sandboxId = process.env.INTERNAL_SQUADBASE_SANDBOX_ID;
-  if (sandboxId) {
-    const baseDomain2 = process.env["SQUADBASE_PREVIEW_BASE_DOMAIN"] ?? "preview.app.squadbase.dev";
-    return `https://${sandboxId}.${baseDomain2}${connectionPath}`;
+  if (!token || !sandboxId) {
+    throw new Error(
+      "Connection proxy is not configured. Please check your deployment settings."
+    );
   }
+  const envPrefix = process.env.SQUADBASE_ENV === "prod" ? "" : `${process.env.SQUADBASE_ENV ?? "dev1"}-`;
+  const proxyUrl = `https://${sandboxId}.preview.${envPrefix}app.squadbase.dev/_sqcore/connections/${connectionId}/request`;
+  return async (input, init) => {
+    const originalUrl = typeof input === "string" ? input : input instanceof URL ? input.href : input.url;
+    const originalMethod = init?.method ?? "GET";
+    const originalBody = init?.body ? JSON.parse(init.body) : void 0;
+    return fetch(proxyUrl, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${token}`
+      },
+      body: JSON.stringify({
+        url: originalUrl,
+        method: originalMethod,
+        body: originalBody
+      })
+    });
+  };
+}
+function createDeployedAppProxyFetch(connectionId) {
   const projectId = process.env["SQUADBASE_PROJECT_ID"];
   if (!projectId) {
     throw new Error(
@@ -17077,41 +17098,23 @@ function resolveProxyUrl(connectionId) {
     );
   }
   const baseDomain = process.env["SQUADBASE_APP_BASE_DOMAIN"] ?? "squadbase.app";
-  return `https://${projectId}.${baseDomain}${connectionPath}`;
-}
-function resolveAuthHeaders() {
-  const machineCredential = process.env.INTERNAL_SQUADBASE_OAUTH_MACHINE_CREDENTIAL;
-  if (machineCredential) {
-    return { Authorization: `Bearer ${machineCredential}` };
-  }
-  const c = getContext();
-  const cookies = getCookie(c);
-  const previewSession = cookies[PREVIEW_SESSION_COOKIE_NAME];
-  if (previewSession) {
-    return {
-      Cookie: `${PREVIEW_SESSION_COOKIE_NAME}=${previewSession}`
-    };
-  }
-  const appSession = cookies[APP_SESSION_COOKIE_NAME];
-  if (appSession) {
-    return { Authorization: `Bearer ${appSession}` };
-  }
-  throw new Error(
-    "No authentication method available for connection proxy."
-  );
-}
-function createProxyFetch(connectionId) {
+  const proxyUrl = `https://${projectId}.${baseDomain}/_sqcore/connections/${connectionId}/request`;
   return async (input, init) => {
     const originalUrl = typeof input === "string" ? input : input instanceof URL ? input.href : input.url;
     const originalMethod = init?.method ?? "GET";
     const originalBody = init?.body ? JSON.parse(init.body) : void 0;
-    const proxyUrl = resolveProxyUrl(connectionId);
-    const authHeaders = resolveAuthHeaders();
+    const c = getContext();
+    const appSession = getCookie(c, APP_SESSION_COOKIE_NAME);
+    if (!appSession) {
+      throw new Error(
+        "No authentication method available for connection proxy."
+      );
+    }
     return fetch(proxyUrl, {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
-        ...authHeaders
+        Authorization: `Bearer ${appSession}`
       },
       body: JSON.stringify({
         url: originalUrl,
@@ -17121,6 +17124,12 @@ function createProxyFetch(connectionId) {
     });
   };
 }
+function createProxyFetch(connectionId) {
+  if (process.env.INTERNAL_SQUADBASE_SANDBOX_ID) {
+    return createSandboxProxyFetch(connectionId);
+  }
+  return createDeployedAppProxyFetch(connectionId);
+}
 function resolveParams(entry, connectionId, plugin) {
   const params = {};
   for (const param of Object.values(plugin.parameters)) {

package/dist/index.js

@@ -16997,14 +16997,35 @@ function createConnectorRegistry() {
   return { getQuery: getQuery2, loadConnections: loadConnections2, reloadEnvFile: reloadEnvFile2, watchConnectionsFile: watchConnectionsFile2 };
 }
 var APP_SESSION_COOKIE_NAME = "__Host-squadbase-session";
-var PREVIEW_SESSION_COOKIE_NAME = "squadbase-preview-session";
-function resolveProxyUrl(connectionId) {
-  const connectionPath = `/_sqcore/connections/${connectionId}/request`;
+function createSandboxProxyFetch(connectionId) {
+  const token = process.env.INTERNAL_SQUADBASE_OAUTH_MACHINE_CREDENTIAL;
   const sandboxId = process.env.INTERNAL_SQUADBASE_SANDBOX_ID;
-  if (sandboxId) {
-    const baseDomain2 = process.env["SQUADBASE_PREVIEW_BASE_DOMAIN"] ?? "preview.app.squadbase.dev";
-    return `https://${sandboxId}.${baseDomain2}${connectionPath}`;
+  if (!token || !sandboxId) {
+    throw new Error(
+      "Connection proxy is not configured. Please check your deployment settings."
+    );
   }
+  const envPrefix = process.env.SQUADBASE_ENV === "prod" ? "" : `${process.env.SQUADBASE_ENV ?? "dev1"}-`;
+  const proxyUrl = `https://${sandboxId}.preview.${envPrefix}app.squadbase.dev/_sqcore/connections/${connectionId}/request`;
+  return async (input, init) => {
+    const originalUrl = typeof input === "string" ? input : input instanceof URL ? input.href : input.url;
+    const originalMethod = init?.method ?? "GET";
+    const originalBody = init?.body ? JSON.parse(init.body) : void 0;
+    return fetch(proxyUrl, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${token}`
+      },
+      body: JSON.stringify({
+        url: originalUrl,
+        method: originalMethod,
+        body: originalBody
+      })
+    });
+  };
+}
+function createDeployedAppProxyFetch(connectionId) {
   const projectId = process.env["SQUADBASE_PROJECT_ID"];
   if (!projectId) {
     throw new Error(
@@ -17012,41 +17033,23 @@ function resolveProxyUrl(connectionId) {
     );
   }
   const baseDomain = process.env["SQUADBASE_APP_BASE_DOMAIN"] ?? "squadbase.app";
-  return `https://${projectId}.${baseDomain}${connectionPath}`;
-}
-function resolveAuthHeaders() {
-  const machineCredential = process.env.INTERNAL_SQUADBASE_OAUTH_MACHINE_CREDENTIAL;
-  if (machineCredential) {
-    return { Authorization: `Bearer ${machineCredential}` };
-  }
-  const c = getContext();
-  const cookies = getCookie(c);
-  const previewSession = cookies[PREVIEW_SESSION_COOKIE_NAME];
-  if (previewSession) {
-    return {
-      Cookie: `${PREVIEW_SESSION_COOKIE_NAME}=${previewSession}`
-    };
-  }
-  const appSession = cookies[APP_SESSION_COOKIE_NAME];
-  if (appSession) {
-    return { Authorization: `Bearer ${appSession}` };
-  }
-  throw new Error(
-    "No authentication method available for connection proxy."
-  );
-}
-function createProxyFetch(connectionId) {
+  const proxyUrl = `https://${projectId}.${baseDomain}/_sqcore/connections/${connectionId}/request`;
   return async (input, init) => {
     const originalUrl = typeof input === "string" ? input : input instanceof URL ? input.href : input.url;
     const originalMethod = init?.method ?? "GET";
     const originalBody = init?.body ? JSON.parse(init.body) : void 0;
-    const proxyUrl = resolveProxyUrl(connectionId);
-    const authHeaders = resolveAuthHeaders();
+    const c = getContext();
+    const appSession = getCookie(c, APP_SESSION_COOKIE_NAME);
+    if (!appSession) {
+      throw new Error(
+        "No authentication method available for connection proxy."
+      );
+    }
     return fetch(proxyUrl, {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
-        ...authHeaders
+        Authorization: `Bearer ${appSession}`
       },
       body: JSON.stringify({
         url: originalUrl,
@@ -17056,6 +17059,12 @@ function createProxyFetch(connectionId) {
     });
   };
 }
+function createProxyFetch(connectionId) {
+  if (process.env.INTERNAL_SQUADBASE_SANDBOX_ID) {
+    return createSandboxProxyFetch(connectionId);
+  }
+  return createDeployedAppProxyFetch(connectionId);
+}
 function resolveParams(entry, connectionId, plugin) {
   const params = {};
   for (const param of Object.values(plugin.parameters)) {
@@ -17894,12 +17903,12 @@ var pages_default = app4;
 import { getContext as getContext2 } from "hono/context-storage";
 import { getCookie as getCookie2 } from "hono/cookie";
 var APP_SESSION_COOKIE_NAME2 = "__Host-squadbase-session";
-var PREVIEW_SESSION_COOKIE_NAME2 = "squadbase-preview-session";
+var PREVIEW_SESSION_COOKIE_NAME = "squadbase-preview-session";
 var APP_BASE_DOMAIN = "squadbase.app";
 var PREVIEW_BASE_DOMAIN = "preview.app.squadbase.dev";
 var SANDBOX_ID_ENV_NAME = "INTERNAL_SQUADBASE_SANDBOX_ID";
 var MACHINE_CREDENTIAL_ENV_NAME = "INTERNAL_SQUADBASE_OAUTH_MACHINE_CREDENTIAL";
-function resolveProxyUrl2(connectionId) {
+function resolveProxyUrl(connectionId) {
   const connectionPath = `/_sqcore/connections/${connectionId}/request`;
   const sandboxId = process.env[SANDBOX_ID_ENV_NAME];
   if (sandboxId) {
@@ -17915,17 +17924,17 @@ function resolveProxyUrl2(connectionId) {
   const baseDomain = process.env["SQUADBASE_APP_BASE_DOMAIN"] ?? APP_BASE_DOMAIN;
   return `https://${projectId}.${baseDomain}${connectionPath}`;
 }
-function resolveAuthHeaders2() {
+function resolveAuthHeaders() {
   const machineCredential = process.env[MACHINE_CREDENTIAL_ENV_NAME];
   if (machineCredential) {
     return { Authorization: `Bearer ${machineCredential}` };
   }
   const c = getContext2();
   const cookies = getCookie2(c);
-  const previewSession = cookies[PREVIEW_SESSION_COOKIE_NAME2];
+  const previewSession = cookies[PREVIEW_SESSION_COOKIE_NAME];
   if (previewSession) {
     return {
-      Cookie: `${PREVIEW_SESSION_COOKIE_NAME2}=${previewSession}`
+      Cookie: `${PREVIEW_SESSION_COOKIE_NAME}=${previewSession}`
     };
   }
   const appSession = cookies[APP_SESSION_COOKIE_NAME2];
@@ -17939,8 +17948,8 @@ function resolveAuthHeaders2() {
 function connection(connectionId) {
   return {
     async fetch(url, options) {
-      const proxyUrl = resolveProxyUrl2(connectionId);
-      const authHeaders = resolveAuthHeaders2();
+      const proxyUrl = resolveProxyUrl(connectionId);
+      const authHeaders = resolveAuthHeaders();
       return await fetch(proxyUrl, {
         method: "POST",
         headers: {

package/dist/main.js

@@ -16997,14 +16997,35 @@ function createConnectorRegistry() {
   return { getQuery: getQuery2, loadConnections: loadConnections2, reloadEnvFile: reloadEnvFile2, watchConnectionsFile: watchConnectionsFile2 };
 }
 var APP_SESSION_COOKIE_NAME = "__Host-squadbase-session";
-var PREVIEW_SESSION_COOKIE_NAME = "squadbase-preview-session";
-function resolveProxyUrl(connectionId) {
-  const connectionPath = `/_sqcore/connections/${connectionId}/request`;
+function createSandboxProxyFetch(connectionId) {
+  const token = process.env.INTERNAL_SQUADBASE_OAUTH_MACHINE_CREDENTIAL;
   const sandboxId = process.env.INTERNAL_SQUADBASE_SANDBOX_ID;
-  if (sandboxId) {
-    const baseDomain2 = process.env["SQUADBASE_PREVIEW_BASE_DOMAIN"] ?? "preview.app.squadbase.dev";
-    return `https://${sandboxId}.${baseDomain2}${connectionPath}`;
+  if (!token || !sandboxId) {
+    throw new Error(
+      "Connection proxy is not configured. Please check your deployment settings."
+    );
   }
+  const envPrefix = process.env.SQUADBASE_ENV === "prod" ? "" : `${process.env.SQUADBASE_ENV ?? "dev1"}-`;
+  const proxyUrl = `https://${sandboxId}.preview.${envPrefix}app.squadbase.dev/_sqcore/connections/${connectionId}/request`;
+  return async (input, init) => {
+    const originalUrl = typeof input === "string" ? input : input instanceof URL ? input.href : input.url;
+    const originalMethod = init?.method ?? "GET";
+    const originalBody = init?.body ? JSON.parse(init.body) : void 0;
+    return fetch(proxyUrl, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${token}`
+      },
+      body: JSON.stringify({
+        url: originalUrl,
+        method: originalMethod,
+        body: originalBody
+      })
+    });
+  };
+}
+function createDeployedAppProxyFetch(connectionId) {
   const projectId = process.env["SQUADBASE_PROJECT_ID"];
   if (!projectId) {
     throw new Error(
@@ -17012,41 +17033,23 @@ function resolveProxyUrl(connectionId) {
     );
   }
   const baseDomain = process.env["SQUADBASE_APP_BASE_DOMAIN"] ?? "squadbase.app";
-  return `https://${projectId}.${baseDomain}${connectionPath}`;
-}
-function resolveAuthHeaders() {
-  const machineCredential = process.env.INTERNAL_SQUADBASE_OAUTH_MACHINE_CREDENTIAL;
-  if (machineCredential) {
-    return { Authorization: `Bearer ${machineCredential}` };
-  }
-  const c = getContext();
-  const cookies = getCookie(c);
-  const previewSession = cookies[PREVIEW_SESSION_COOKIE_NAME];
-  if (previewSession) {
-    return {
-      Cookie: `${PREVIEW_SESSION_COOKIE_NAME}=${previewSession}`
-    };
-  }
-  const appSession = cookies[APP_SESSION_COOKIE_NAME];
-  if (appSession) {
-    return { Authorization: `Bearer ${appSession}` };
-  }
-  throw new Error(
-    "No authentication method available for connection proxy."
-  );
-}
-function createProxyFetch(connectionId) {
+  const proxyUrl = `https://${projectId}.${baseDomain}/_sqcore/connections/${connectionId}/request`;
   return async (input, init) => {
     const originalUrl = typeof input === "string" ? input : input instanceof URL ? input.href : input.url;
     const originalMethod = init?.method ?? "GET";
     const originalBody = init?.body ? JSON.parse(init.body) : void 0;
-    const proxyUrl = resolveProxyUrl(connectionId);
-    const authHeaders = resolveAuthHeaders();
+    const c = getContext();
+    const appSession = getCookie(c, APP_SESSION_COOKIE_NAME);
+    if (!appSession) {
+      throw new Error(
+        "No authentication method available for connection proxy."
+      );
+    }
     return fetch(proxyUrl, {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
-        ...authHeaders
+        Authorization: `Bearer ${appSession}`
       },
       body: JSON.stringify({
         url: originalUrl,
@@ -17056,6 +17059,12 @@ function createProxyFetch(connectionId) {
     });
   };
 }
+function createProxyFetch(connectionId) {
+  if (process.env.INTERNAL_SQUADBASE_SANDBOX_ID) {
+    return createSandboxProxyFetch(connectionId);
+  }
+  return createDeployedAppProxyFetch(connectionId);
+}
 function resolveParams(entry, connectionId, plugin) {
   const params = {};
   for (const param of Object.values(plugin.parameters)) {

package/dist/vite-plugin.js

@@ -16998,14 +16998,35 @@ function createConnectorRegistry() {
   return { getQuery: getQuery2, loadConnections: loadConnections2, reloadEnvFile: reloadEnvFile2, watchConnectionsFile: watchConnectionsFile2 };
 }
 var APP_SESSION_COOKIE_NAME = "__Host-squadbase-session";
-var PREVIEW_SESSION_COOKIE_NAME = "squadbase-preview-session";
-function resolveProxyUrl(connectionId) {
-  const connectionPath = `/_sqcore/connections/${connectionId}/request`;
+function createSandboxProxyFetch(connectionId) {
+  const token = process.env.INTERNAL_SQUADBASE_OAUTH_MACHINE_CREDENTIAL;
   const sandboxId = process.env.INTERNAL_SQUADBASE_SANDBOX_ID;
-  if (sandboxId) {
-    const baseDomain2 = process.env["SQUADBASE_PREVIEW_BASE_DOMAIN"] ?? "preview.app.squadbase.dev";
-    return `https://${sandboxId}.${baseDomain2}${connectionPath}`;
+  if (!token || !sandboxId) {
+    throw new Error(
+      "Connection proxy is not configured. Please check your deployment settings."
+    );
   }
+  const envPrefix = process.env.SQUADBASE_ENV === "prod" ? "" : `${process.env.SQUADBASE_ENV ?? "dev1"}-`;
+  const proxyUrl = `https://${sandboxId}.preview.${envPrefix}app.squadbase.dev/_sqcore/connections/${connectionId}/request`;
+  return async (input, init) => {
+    const originalUrl = typeof input === "string" ? input : input instanceof URL ? input.href : input.url;
+    const originalMethod = init?.method ?? "GET";
+    const originalBody = init?.body ? JSON.parse(init.body) : void 0;
+    return fetch(proxyUrl, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${token}`
+      },
+      body: JSON.stringify({
+        url: originalUrl,
+        method: originalMethod,
+        body: originalBody
+      })
+    });
+  };
+}
+function createDeployedAppProxyFetch(connectionId) {
   const projectId = process.env["SQUADBASE_PROJECT_ID"];
   if (!projectId) {
     throw new Error(
@@ -17013,41 +17034,23 @@ function resolveProxyUrl(connectionId) {
     );
   }
   const baseDomain = process.env["SQUADBASE_APP_BASE_DOMAIN"] ?? "squadbase.app";
-  return `https://${projectId}.${baseDomain}${connectionPath}`;
-}
-function resolveAuthHeaders() {
-  const machineCredential = process.env.INTERNAL_SQUADBASE_OAUTH_MACHINE_CREDENTIAL;
-  if (machineCredential) {
-    return { Authorization: `Bearer ${machineCredential}` };
-  }
-  const c = getContext();
-  const cookies = getCookie(c);
-  const previewSession = cookies[PREVIEW_SESSION_COOKIE_NAME];
-  if (previewSession) {
-    return {
-      Cookie: `${PREVIEW_SESSION_COOKIE_NAME}=${previewSession}`
-    };
-  }
-  const appSession = cookies[APP_SESSION_COOKIE_NAME];
-  if (appSession) {
-    return { Authorization: `Bearer ${appSession}` };
-  }
-  throw new Error(
-    "No authentication method available for connection proxy."
-  );
-}
-function createProxyFetch(connectionId) {
+  const proxyUrl = `https://${projectId}.${baseDomain}/_sqcore/connections/${connectionId}/request`;
   return async (input, init) => {
     const originalUrl = typeof input === "string" ? input : input instanceof URL ? input.href : input.url;
     const originalMethod = init?.method ?? "GET";
     const originalBody = init?.body ? JSON.parse(init.body) : void 0;
-    const proxyUrl = resolveProxyUrl(connectionId);
-    const authHeaders = resolveAuthHeaders();
+    const c = getContext();
+    const appSession = getCookie(c, APP_SESSION_COOKIE_NAME);
+    if (!appSession) {
+      throw new Error(
+        "No authentication method available for connection proxy."
+      );
+    }
     return fetch(proxyUrl, {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
-        ...authHeaders
+        Authorization: `Bearer ${appSession}`
       },
       body: JSON.stringify({
         url: originalUrl,
@@ -17057,6 +17060,12 @@ function createProxyFetch(connectionId) {
     });
   };
 }
+function createProxyFetch(connectionId) {
+  if (process.env.INTERNAL_SQUADBASE_SANDBOX_ID) {
+    return createSandboxProxyFetch(connectionId);
+  }
+  return createDeployedAppProxyFetch(connectionId);
+}
 function resolveParams(entry, connectionId, plugin) {
   const params = {};
   for (const param of Object.values(plugin.parameters)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squadbase/vite-server",
-  "version": "0.0.1-build-19",
+  "version": "0.0.1-build-20",
   "type": "module",
   "exports": {
     ".": {