@schuttdev/gigai 0.1.0-beta.15 → 0.1.0-beta.17

package/dist/index.js

@@ -51,8 +51,8 @@ function getOrgUUID() {
   if (process.env.GIGAI_ORG_UUID) {
     return process.env.GIGAI_ORG_UUID;
   }
-  const proxyUrl = process.env.ANTHROPIC_PROXY_URL ?? "";
-  const jwtMatch = proxyUrl.match(/\/([A-Za-z0-9_-]+\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+)/);
+  const proxyUrl = process.env.HTTPS_PROXY || process.env.HTTP_PROXY || "";
+  const jwtMatch = proxyUrl.match(/jwt_([^@]+)/);
   if (jwtMatch) {
     try {
       const payload = decodeJWTPayload(jwtMatch[1]);
@@ -62,18 +62,25 @@ function getOrgUUID() {
     } catch {
     }
   }
+  const anthropicProxy = process.env.ANTHROPIC_PROXY_URL ?? "";
+  const anthropicJwtMatch = anthropicProxy.match(/([A-Za-z0-9_-]+\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+)/);
+  if (anthropicJwtMatch) {
+    try {
+      const payload = decodeJWTPayload(anthropicJwtMatch[1]);
+      if (payload.organization_uuid) {
+        return payload.organization_uuid;
+      }
+    } catch {
+    }
+  }
   const apiKey = process.env.ANTHROPIC_API_KEY ?? "";
-  if (apiKey.includes("/")) {
-    const parts = apiKey.split("/");
-    const jwtPart = parts.find((p) => p.includes(".") && p.split(".").length === 3);
-    if (jwtPart) {
-      try {
-        const payload = decodeJWTPayload(jwtPart);
-        if (payload.organization_uuid) {
-          return payload.organization_uuid;
-        }
-      } catch {
+  if (apiKey.includes(".")) {
+    try {
+      const payload = decodeJWTPayload(apiKey);
+      if (payload.organization_uuid) {
+        return payload.organization_uuid;
       }
+    } catch {
     }
   }
   throw new Error(
@@ -82,6 +89,23 @@ function getOrgUUID() {
 }
 
 // src/http.ts
+async function getProxyDispatcher() {
+  const proxyUrl = process.env.HTTPS_PROXY || process.env.HTTP_PROXY;
+  if (!proxyUrl) return void 0;
+  try {
+    const undici = await import("undici");
+    return new undici.ProxyAgent(proxyUrl);
+  } catch {
+    return void 0;
+  }
+}
+var _dispatcher = null;
+async function ensureDispatcher() {
+  if (_dispatcher === null) {
+    _dispatcher = await getProxyDispatcher();
+  }
+  return _dispatcher;
+}
 function createHttpClient(serverUrl, sessionToken) {
   const baseUrl = serverUrl.replace(/\/$/, "");
   async function request(path, init = {}) {
@@ -94,10 +118,15 @@ function createHttpClient(serverUrl, sessionToken) {
     if (!headers["Content-Type"] && init.body && typeof init.body === "string") {
       headers["Content-Type"] = "application/json";
     }
-    const res = await fetch(`${baseUrl}${path}`, {
+    const dispatcher = await ensureDispatcher();
+    const fetchOpts = {
       ...init,
       headers
-    });
+    };
+    if (dispatcher) {
+      fetchOpts.dispatcher = dispatcher;
+    }
+    const res = await fetch(`${baseUrl}${path}`, fetchOpts);
     if (!res.ok) {
       let errorBody;
       try {
@@ -124,11 +153,16 @@ function createHttpClient(serverUrl, sessionToken) {
       if (sessionToken) {
         headers["Authorization"] = `Bearer ${sessionToken}`;
       }
-      const res = await fetch(`${baseUrl}${path}`, {
+      const dispatcher = await ensureDispatcher();
+      const fetchOpts = {
         method: "POST",
         headers,
         body: formData
-      });
+      };
+      if (dispatcher) {
+        fetchOpts.dispatcher = dispatcher;
+      }
+      const res = await fetch(`${baseUrl}${path}`, fetchOpts);
       if (!res.ok) {
         let errorBody;
         try {
@@ -144,7 +178,12 @@ function createHttpClient(serverUrl, sessionToken) {
       if (sessionToken) {
         headers["Authorization"] = `Bearer ${sessionToken}`;
       }
-      const res = await fetch(`${baseUrl}${path}`, { headers });
+      const dispatcher = await ensureDispatcher();
+      const fetchOpts = { headers };
+      if (dispatcher) {
+        fetchOpts.dispatcher = dispatcher;
+      }
+      const res = await fetch(`${baseUrl}${path}`, fetchOpts);
       if (!res.ok) {
         throw new Error(`HTTP ${res.status}: ${res.statusText}`);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schuttdev/gigai",
-  "version": "0.1.0-beta.15",
+  "version": "0.1.0-beta.17",
   "type": "module",
   "bin": {
     "gigai": "dist/index.js"
@@ -30,7 +30,8 @@
     "@modelcontextprotocol/sdk": "^1.0.0",
     "@inquirer/prompts": "^7.0.0",
     "nanoid": "^5.0.0",
-    "zod": "^3.22.0"
+    "zod": "^3.22.0",
+    "undici": "^6.0.0"
   },
   "devDependencies": {
     "@gigai/shared": "*",