@omnicross/subscriptions 0.1.5 → 0.1.7

package/NOTICE

@@ -1,41 +1,12 @@
 @omnicross/subscriptions — THIRD-PARTY NOTICES
 ==============================================
 
-This package contains the subscription-as-provider block (auth strategies,
-account service, provider registry, dispatcher, OpenCodeGo routing). Some routing
-shapes and configuration-data values were adapted,
-clean-room, from the following third-party works. Those repositories are NOT
-vendored into this tree; only original TypeScript that mirrors their routing
-shape / config-data values lives here (see the in-code provenance comments).
+This package contains the subscription-as-provider block (auth strategies,
+account service, provider registry, dispatcher, and OpenCodeGo routing) and uses
+the following third-party dependency. Its license applies to that dependency.
 
 --------------------------------------------------------------------------------
-1. claude-relay-service  (MIT License) — routing shape only
---------------------------------------------------------------------------------
-
-The Codex (ChatGPT OAuth) upstream routing shape — the
-`https://chatgpt.com/backend-api/codex/responses` endpoint dispatch in
-`src/SubscriptionProviderRegistry.ts` — mirrors the route shape of
-`claude-relay-service` (`src/routes/openaiRoutes.js`). Routing shape only; the
-TypeScript is original, and the upstream repository is not vendored.
-
-    https://github.com/Wei-Shaw/claude-relay-service
-    Licensed under the MIT License.
-
---------------------------------------------------------------------------------
-2. oc-go-cc  (OpenCodeGo CC) — model-map + routing-shape / config-data
---------------------------------------------------------------------------------
-
-The OpenCodeGo routing-shape, scenario router, model-map defaults, endpoint
-shapes, and Anthropic-shape `x-api-key` fallback in
-`src/opencodego/{defaults,endpoints,model-shape,ScenarioRouter}.ts` and
-`src/auth/StaticBearerAuthStrategy.ts` are clean-room ports of the model-map and
-routing shape from `oc-go-cc` (`internal/router/model_router.go`,
-`internal/client/opencode.go`, `configs/config.example.json`). Configuration
-data + routing shape only; the TypeScript is original, and the upstream
-repository is not vendored.
-
---------------------------------------------------------------------------------
-3. js-tiktoken  (MIT License)
+1. js-tiktoken  (MIT License)
 --------------------------------------------------------------------------------
 
 `src/opencodego/token-count.ts` lazily imports `js-tiktoken` (cl100k_base

package/dist/{chunk-TPW5Q25Y.cjs → chunk-PWV5NBO5.cjs}

@@ -29,39 +29,70 @@ function errorMessage(error, errorDescription) {
   }
   return String(error);
 }
-async function postForm(fetchImpl, url, params, parseErrorMessage) {
-  const response = await fetchImpl(url, {
-    method: "POST",
-    headers: { "Content-Type": "application/x-www-form-urlencoded" },
-    body: params.toString()
-  });
+function withStatus(message, response) {
+  return response.ok ? message : `${message} (HTTP ${response.status})`;
+}
+var DEFAULT_TOKEN_TIMEOUT_MS = 3e4;
+async function fetchWithTimeout(fetchImpl, url, init, timeoutMs) {
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
+  try {
+    return await fetchImpl(url, { ...init, signal: controller.signal });
+  } catch (e) {
+    if (controller.signal.aborted) {
+      throw new Error(`token endpoint timed out after ${Math.round(timeoutMs / 1e3)}s`);
+    }
+    throw e;
+  } finally {
+    clearTimeout(timer);
+  }
+}
+async function postForm(fetchImpl, url, params, parseErrorMessage, timeoutMs = DEFAULT_TOKEN_TIMEOUT_MS) {
+  const response = await fetchWithTimeout(
+    fetchImpl,
+    url,
+    {
+      method: "POST",
+      headers: { "Content-Type": "application/x-www-form-urlencoded" },
+      body: params.toString()
+    },
+    timeoutMs
+  );
   const responseData = await response.text();
   let data;
   try {
     data = JSON.parse(responseData);
   } catch (e2) {
-    throw new Error(parseErrorMessage);
+    throw new Error(withStatus(parseErrorMessage, response));
   }
   if (data.error) {
-    throw new Error(errorMessage(data.error, data.error_description));
+    throw new Error(withStatus(errorMessage(data.error, data.error_description), response));
   }
   return data;
 }
-async function postJson(fetchImpl, url, body, parseErrorMessage, extraHeaders = {}) {
-  const response = await fetchImpl(url, {
-    method: "POST",
-    headers: { "Content-Type": "application/json", ...extraHeaders },
-    body: JSON.stringify(body)
-  });
+async function postJson(fetchImpl, url, body, parseErrorMessage, extraHeaders = {}, timeoutMs = DEFAULT_TOKEN_TIMEOUT_MS) {
+  const response = await fetchWithTimeout(
+    fetchImpl,
+    url,
+    {
+      method: "POST",
+      headers: { "Content-Type": "application/json", ...extraHeaders },
+      body: JSON.stringify(body)
+    },
+    timeoutMs
+  );
   const responseData = await response.text();
   let data;
   try {
     data = JSON.parse(responseData);
   } catch (e3) {
-    throw new Error(parseErrorMessage);
+    throw new Error(withStatus(parseErrorMessage, response));
   }
   if (data.error) {
-    throw new Error(errorMessage(data.error, data.error_description));
+    throw new Error(withStatus(errorMessage(data.error, data.error_description), response));
+  }
+  if (!response.ok) {
+    throw new Error(withStatus("token endpoint rejected the request", response));
   }
   return data;
 }

package/dist/{chunk-IXGHVMZB.js → chunk-UETFQ5LB.js}

@@ -29,39 +29,70 @@ function errorMessage(error, errorDescription) {
   }
   return String(error);
 }
-async function postForm(fetchImpl, url, params, parseErrorMessage) {
-  const response = await fetchImpl(url, {
-    method: "POST",
-    headers: { "Content-Type": "application/x-www-form-urlencoded" },
-    body: params.toString()
-  });
+function withStatus(message, response) {
+  return response.ok ? message : `${message} (HTTP ${response.status})`;
+}
+var DEFAULT_TOKEN_TIMEOUT_MS = 3e4;
+async function fetchWithTimeout(fetchImpl, url, init, timeoutMs) {
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
+  try {
+    return await fetchImpl(url, { ...init, signal: controller.signal });
+  } catch (e) {
+    if (controller.signal.aborted) {
+      throw new Error(`token endpoint timed out after ${Math.round(timeoutMs / 1e3)}s`);
+    }
+    throw e;
+  } finally {
+    clearTimeout(timer);
+  }
+}
+async function postForm(fetchImpl, url, params, parseErrorMessage, timeoutMs = DEFAULT_TOKEN_TIMEOUT_MS) {
+  const response = await fetchWithTimeout(
+    fetchImpl,
+    url,
+    {
+      method: "POST",
+      headers: { "Content-Type": "application/x-www-form-urlencoded" },
+      body: params.toString()
+    },
+    timeoutMs
+  );
   const responseData = await response.text();
   let data;
   try {
     data = JSON.parse(responseData);
   } catch {
-    throw new Error(parseErrorMessage);
+    throw new Error(withStatus(parseErrorMessage, response));
   }
   if (data.error) {
-    throw new Error(errorMessage(data.error, data.error_description));
+    throw new Error(withStatus(errorMessage(data.error, data.error_description), response));
   }
   return data;
 }
-async function postJson(fetchImpl, url, body, parseErrorMessage, extraHeaders = {}) {
-  const response = await fetchImpl(url, {
-    method: "POST",
-    headers: { "Content-Type": "application/json", ...extraHeaders },
-    body: JSON.stringify(body)
-  });
+async function postJson(fetchImpl, url, body, parseErrorMessage, extraHeaders = {}, timeoutMs = DEFAULT_TOKEN_TIMEOUT_MS) {
+  const response = await fetchWithTimeout(
+    fetchImpl,
+    url,
+    {
+      method: "POST",
+      headers: { "Content-Type": "application/json", ...extraHeaders },
+      body: JSON.stringify(body)
+    },
+    timeoutMs
+  );
   const responseData = await response.text();
   let data;
   try {
     data = JSON.parse(responseData);
   } catch {
-    throw new Error(parseErrorMessage);
+    throw new Error(withStatus(parseErrorMessage, response));
   }
   if (data.error) {
-    throw new Error(errorMessage(data.error, data.error_description));
+    throw new Error(withStatus(errorMessage(data.error, data.error_description), response));
+  }
+  if (!response.ok) {
+    throw new Error(withStatus("token endpoint rejected the request", response));
   }
   return data;
 }