@squadbase/vite-server 0.1.3-dev.0 → 0.1.3-dev.10

package/dist/connectors/google-sheets-oauth.js

@@ -1,3 +1,42 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __esm = (fn, res) => function __init() {
+  return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
+};
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+
+// ../connectors/src/connectors/google-sheets/utils.ts
+function extractSpreadsheetId(urlOrId) {
+  const trimmed = urlOrId.trim();
+  const match = trimmed.match(SPREADSHEET_URL_PATTERN);
+  if (match) {
+    return match[1];
+  }
+  return trimmed;
+}
+var SPREADSHEET_URL_PATTERN;
+var init_utils = __esm({
+  "../connectors/src/connectors/google-sheets/utils.ts"() {
+    "use strict";
+    SPREADSHEET_URL_PATTERN = /docs\.google\.com\/spreadsheets\/d\/([a-zA-Z0-9_-]+)/;
+  }
+});
+
+// ../connectors/src/connectors/google-sheets-oauth/utils.ts
+var utils_exports = {};
+__export(utils_exports, {
+  extractSpreadsheetId: () => extractSpreadsheetId
+});
+var init_utils2 = __esm({
+  "../connectors/src/connectors/google-sheets-oauth/utils.ts"() {
+    "use strict";
+    init_utils();
+  }
+});
+
 // ../connectors/src/parameter-definition.ts
 var ParameterDefinition = class {
   slug;
@@ -44,21 +83,23 @@ var ParameterDefinition = class {
 
 // ../connectors/src/connectors/google-sheets-oauth/parameters.ts
 var parameters = {
-  spreadsheetId: new ParameterDefinition({
-    slug: "spreadsheet-id",
-    name: "Default Spreadsheet ID",
-    description: "The ID of the default Google Spreadsheet. Can be found in the spreadsheet URL: https://docs.google.com/spreadsheets/d/{spreadsheetId}/edit",
-    envVarBaseKey: "GOOGLE_SHEETS_OAUTH_SPREADSHEET_ID",
+  spreadsheetUrl: new ParameterDefinition({
+    slug: "spreadsheet-url",
+    name: "Google Spreadsheet URL",
+    description: "The URL of the Google Spreadsheet (e.g., https://docs.google.com/spreadsheets/d/xxxxx/edit). The spreadsheet ID is automatically extracted from the URL.",
+    envVarBaseKey: "GOOGLE_SHEETS_OAUTH_SPREADSHEET_URL",
     type: "text",
     secret: false,
-    required: false
+    required: true
   })
 };
 
 // ../connectors/src/connectors/google-sheets-oauth/sdk/index.ts
+init_utils2();
 var BASE_URL = "https://sheets.googleapis.com/v4/spreadsheets";
 function createClient(params, fetchFn = fetch) {
-  const defaultSpreadsheetId = params[parameters.spreadsheetId.slug];
+  const spreadsheetUrl = params[parameters.spreadsheetUrl.slug];
+  const defaultSpreadsheetId = spreadsheetUrl ? extractSpreadsheetId(spreadsheetUrl) : void 0;
   function resolveSpreadsheetId(override) {
     const id = override ?? defaultSpreadsheetId;
     if (!id) {
@@ -227,11 +268,13 @@ var AUTH_TYPES = {
   API_KEY: "api-key",
   JWT: "jwt",
   SERVICE_ACCOUNT: "service-account",
-  PAT: "pat"
+  PAT: "pat",
+  USER_PASSWORD: "user-password"
 };
 
 // ../connectors/src/connectors/google-sheets-oauth/tools/request.ts
 import { z } from "zod";
+init_utils2();
 var BASE_URL2 = "https://sheets.googleapis.com/v4/spreadsheets";
 var REQUEST_TIMEOUT_MS = 6e4;
 var cachedToken = null;
@@ -306,7 +349,8 @@ Authentication is handled automatically via OAuth proxy.
       `[connector-request] google-sheets-oauth/${connection2.name}: ${method} ${path2}`
     );
     try {
-      const spreadsheetId = parameters.spreadsheetId.tryGetValue(connection2);
+      const spreadsheetUrl = parameters.spreadsheetUrl.tryGetValue(connection2);
+      const spreadsheetId = spreadsheetUrl ? extractSpreadsheetId(spreadsheetUrl) : void 0;
       const resolvedPath = spreadsheetId ? path2.replace(/\{spreadsheetId\}/g, spreadsheetId) : path2;
       let url = `${BASE_URL2}${resolvedPath.startsWith("/") ? "" : "/"}${resolvedPath}`;
       if (queryParams) {
@@ -350,43 +394,35 @@ Authentication is handled automatically via OAuth proxy.
 var requestToolName = `google-sheets-oauth_${requestTool.name}`;
 var googleSheetsOnboarding = new ConnectorOnboarding({
   connectionSetupInstructions: {
-    ja: `\u4EE5\u4E0B\u306E\u624B\u9806\u3067Google Sheets\u30B3\u30CD\u30AF\u30B7\u30E7\u30F3\u306E\u30BB\u30C3\u30C8\u30A2\u30C3\u30D7\u3092\u884C\u3063\u3066\u304F\u3060\u3055\u3044\u3002
-
-1. \u30E6\u30FC\u30B6\u30FC\u306B\u300C\u4F7F\u7528\u3059\u308BGoogle Sheets\u306EURL\u3092\u8CBC\u308A\u4ED8\u3051\u3066\u304F\u3060\u3055\u3044\uFF08\u4F8B: https://docs.google.com/spreadsheets/d/xxxxx/edit\uFF09\u300D\u3068\u4F1D\u3048\u308B
-2. \u30E6\u30FC\u30B6\u30FC\u304CURL\u307E\u305F\u306F\u30B9\u30D7\u30EC\u30C3\u30C9\u30B7\u30FC\u30C8ID\u3092\u63D0\u4F9B\u3057\u305F\u3089\u3001URL\u304B\u3089ID\u3092\u62BD\u51FA\u3059\u308B\uFF08\`/d/\` \u3068 \`/edit\` \u306E\u9593\u306E\u6587\u5B57\u5217\uFF09
-3. \`updateConnectionParameters\` \u3092\u547C\u3073\u51FA\u3059:
-   - \`parameterSlug\`: \`"spreadsheet-id"\`
-   - \`value\`: \u62BD\u51FA\u3057\u305F\u30B9\u30D7\u30EC\u30C3\u30C9\u30B7\u30FC\u30C8ID
-4. \`${requestToolName}\` \u3092\u547C\u3073\u51FA\u3057\u3066\u3001\u30B9\u30D7\u30EC\u30C3\u30C9\u30B7\u30FC\u30C8\u306E\u30E1\u30BF\u30C7\u30FC\u30BF\u3092\u53D6\u5F97\u3059\u308B:
+    ja: `\u4EE5\u4E0B\u306E\u624B\u9806\u3067Google Sheets\u30B3\u30CD\u30AF\u30B7\u30E7\u30F3\u306E\u30BB\u30C3\u30C8\u30A2\u30C3\u30D7\u3092\u884C\u3063\u3066\u304F\u3060\u3055\u3044\u3002\u30B9\u30D7\u30EC\u30C3\u30C9\u30B7\u30FC\u30C8URL\u306F\u63A5\u7D9A\u30D1\u30E9\u30E1\u30FC\u30BF\u3068\u3057\u3066\u65E2\u306B\u767B\u9332\u6E08\u307F\u3067\u3059\u3002\u30E6\u30FC\u30B6\u30FC\u306B\u805E\u304D\u8FD4\u3055\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002
+
+1. \`${requestToolName}\` \u3092\u547C\u3073\u51FA\u3057\u3066\u3001\u30B9\u30D7\u30EC\u30C3\u30C9\u30B7\u30FC\u30C8\u306E\u30E1\u30BF\u30C7\u30FC\u30BF\u3092\u53D6\u5F97\u3059\u308B:
    - \`method\`: \`"GET"\`
    - \`path\`: \`"/{spreadsheetId}?fields=spreadsheetId,properties.title,sheets.properties.title"\`
-5. \u30A8\u30E9\u30FC\u304C\u8FD4\u3055\u308C\u305F\u5834\u5408\u3001\u30E6\u30FC\u30B6\u30FC\u306B\u30B9\u30D7\u30EC\u30C3\u30C9\u30B7\u30FC\u30C8\u306E\u5171\u6709\u8A2D\u5B9A\u3092\u78BA\u8A8D\u3059\u308B\u3088\u3046\u4F1D\u3048\u308B
-6. \`updateConnectionContext\` \u3092\u547C\u3073\u51FA\u3059:
+2. \u30A8\u30E9\u30FC\u304C\u8FD4\u3055\u308C\u305F\u5834\u5408\u3001\u30E6\u30FC\u30B6\u30FC\u306B\u30B9\u30D7\u30EC\u30C3\u30C9\u30B7\u30FC\u30C8\u306E\u5171\u6709\u8A2D\u5B9A\u3092\u78BA\u8A8D\u3059\u308B\u3088\u3046\u4F1D\u3048\u308B
+3. \`updateConnectionContext\` \u3092\u547C\u3073\u51FA\u3059:
    - \`spreadsheet\`: \u30B9\u30D7\u30EC\u30C3\u30C9\u30B7\u30FC\u30C8\u306E\u30BF\u30A4\u30C8\u30EB
    - \`sheets\`: \u30B7\u30FC\u30C8\u540D\u4E00\u89A7\uFF08\u30AB\u30F3\u30DE\u533A\u5207\u308A\uFF09
    - \`note\`: \u30BB\u30C3\u30C8\u30A2\u30C3\u30D7\u5185\u5BB9\u306E\u7C21\u5358\u306A\u8AAC\u660E
 
 #### \u5236\u7D04
 - **\u30BB\u30C3\u30C8\u30A2\u30C3\u30D7\u4E2D\u306B\u30B7\u30FC\u30C8\u306E\u30C7\u30FC\u30BF\u3092\u8AAD\u307F\u53D6\u3089\u306A\u3044\u3053\u3068**\u3002\u5B9F\u884C\u3057\u3066\u3088\u3044\u306E\u306F\u4E0A\u8A18\u624B\u9806\u3067\u6307\u5B9A\u3055\u308C\u305F\u30E1\u30BF\u30C7\u30FC\u30BF\u53D6\u5F97\u30EA\u30AF\u30A8\u30B9\u30C8\u306E\u307F
+- \u30B9\u30D7\u30EC\u30C3\u30C9\u30B7\u30FC\u30C8URL\u3092\u30E6\u30FC\u30B6\u30FC\u306B\u805E\u304D\u8FD4\u3055\u306A\u3044\u3053\u3068\uFF08\u767B\u9332\u6E08\u307F\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u305D\u306E\u307E\u307E\u4F7F\u7528\u3059\u308B\uFF09
 - \u30C4\u30FC\u30EB\u9593\u306F1\u6587\u3060\u3051\u66F8\u3044\u3066\u5373\u6B21\u306E\u30C4\u30FC\u30EB\u547C\u3073\u51FA\u3057\u3002\u4E0D\u8981\u306A\u8AAC\u660E\u306F\u7701\u7565\u3057\u3001\u52B9\u7387\u7684\u306B\u9032\u3081\u308B`,
-    en: `Follow these steps to set up the Google Sheets connection.
-
-1. Ask the user to paste the Google Sheets URL (e.g., https://docs.google.com/spreadsheets/d/xxxxx/edit)
-2. When the user provides a URL or spreadsheet ID, extract the ID from the URL (the string between \`/d/\` and \`/edit\`)
-3. Call \`updateConnectionParameters\`:
-   - \`parameterSlug\`: \`"spreadsheet-id"\`
-   - \`value\`: The extracted spreadsheet ID
-4. Call \`${requestToolName}\` to fetch spreadsheet metadata:
+    en: `Follow these steps to set up the Google Sheets connection. The spreadsheet URL is already registered as a connection parameter \u2014 do NOT ask the user for it again.
+
+1. Call \`${requestToolName}\` to fetch spreadsheet metadata:
    - \`method\`: \`"GET"\`
    - \`path\`: \`"/{spreadsheetId}?fields=spreadsheetId,properties.title,sheets.properties.title"\`
-5. If an error is returned, ask the user to check the spreadsheet sharing settings
-6. Call \`updateConnectionContext\`:
+2. If an error is returned, ask the user to check the spreadsheet sharing settings
+3. Call \`updateConnectionContext\`:
    - \`spreadsheet\`: The spreadsheet title
    - \`sheets\`: Sheet names (comma-separated)
    - \`note\`: Brief description of the setup
 
 #### Constraints
 - **Do NOT read sheet data during setup**. Only the metadata request specified in the steps above is allowed
+- Do NOT ask the user for the spreadsheet URL \u2014 it is already stored as a connection parameter
 - Write only 1 sentence between tool calls, then immediately call the next tool. Skip unnecessary explanations and proceed efficiently`
   },
   dataOverviewInstructions: {
@@ -402,7 +438,7 @@ var tools = { request: requestTool };
 var googleSheetsOauthConnector = new ConnectorPlugin({
   slug: "google-sheets",
   authType: AUTH_TYPES.OAUTH,
-  name: "Google Sheets (OAuth)",
+  name: "Google Sheets",
   description: "Connect to Google Sheets for spreadsheet data access using OAuth.",
   iconUrl: "https://images.ctfassets.net/9ncizv60xc5y/1UPQuggyiZmbb26CuaSr2h/032770e8739b183fa00b7625f024e536/google-sheets.svg",
   parameters,
@@ -517,10 +553,12 @@ batch.valueRanges.forEach(vr => console.log(vr.range, vr.values));
   tools,
   async checkConnection(params, config) {
     const { proxyFetch } = config;
-    const spreadsheetId = params[parameters.spreadsheetId.slug];
-    if (!spreadsheetId) {
+    const spreadsheetUrl = params[parameters.spreadsheetUrl.slug];
+    if (!spreadsheetUrl) {
       return { success: true };
     }
+    const { extractSpreadsheetId: extractSpreadsheetId2 } = await Promise.resolve().then(() => (init_utils2(), utils_exports));
+    const spreadsheetId = extractSpreadsheetId2(spreadsheetUrl);
     const url = `https://sheets.googleapis.com/v4/spreadsheets/${spreadsheetId}?fields=spreadsheetId,properties.title`;
     try {
       const res = await proxyFetch(url, { method: "GET" });
@@ -563,6 +601,79 @@ function resolveEnvVarOptional(entry, key) {
   return process.env[envVarName] || void 0;
 }
 
+// src/connector-client/proxy-fetch.ts
+import { getContext } from "hono/context-storage";
+import { getCookie } from "hono/cookie";
+var APP_SESSION_COOKIE_NAME = "__Host-squadbase-session";
+function createSandboxProxyFetch(connectionId) {
+  return async (input, init) => {
+    const token = process.env.INTERNAL_SQUADBASE_OAUTH_MACHINE_CREDENTIAL;
+    const sandboxId = process.env.INTERNAL_SQUADBASE_SANDBOX_ID;
+    if (!token || !sandboxId) {
+      throw new Error(
+        "Connection proxy is not configured. Please check your deployment settings."
+      );
+    }
+    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 baseDomain = process.env["SQUADBASE_PREVIEW_BASE_DOMAIN"] ?? "preview.app.squadbase.dev";
+    const proxyUrl = `https://${sandboxId}.${baseDomain}/_sqcore/connections/${connectionId}/request`;
+    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(
+      "Connection proxy is not configured. Please check your deployment settings."
+    );
+  }
+  const baseDomain = process.env["SQUADBASE_APP_BASE_DOMAIN"] ?? "squadbase.app";
+  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 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",
+        Authorization: `Bearer ${appSession}`
+      },
+      body: JSON.stringify({
+        url: originalUrl,
+        method: originalMethod,
+        body: originalBody
+      })
+    });
+  };
+}
+function createProxyFetch(connectionId) {
+  if (process.env.INTERNAL_SQUADBASE_SANDBOX_ID) {
+    return createSandboxProxyFetch(connectionId);
+  }
+  return createDeployedAppProxyFetch(connectionId);
+}
+
 // src/connectors/create-connector-sdk.ts
 function loadConnectionsSync() {
   const filePath = process.env.CONNECTIONS_PATH ?? path.join(process.cwd(), ".squadbase/connections.json");
@@ -596,7 +707,7 @@ function createConnectorSdk(plugin, createClient2) {
         if (val !== void 0) params[param.slug] = val;
       }
     }
-    return createClient2(params);
+    return createClient2(params, createProxyFetch(connectionId));
   };
 }
 

package/dist/connectors/google-sheets.d.ts

@@ -0,0 +1,5 @@
+import * as _squadbase_connectors_sdk from '@squadbase/connectors/sdk';
+
+declare const connection: (connectionId: string) => _squadbase_connectors_sdk.GoogleSheetsServiceAccountConnectorSdk;
+
+export { connection };