ima2-gen 1.1.20 → 1.1.22

package/lib/oauthLauncher.ts

@@ -1,78 +0,0 @@
-import { isWin } from "../bin/lib/platform.js";
-import { config } from "../config.js";
-import { parseLocalhostPortFromUrl, parseOAuthReadyUrl } from "./runtimePorts.js";
-import { type ChildProcess, spawn } from "node:child_process";
-
-export function startOAuthProxy(options: any = {}) {
-  const oauthPort = options.oauthPort ?? config.oauth.proxyPort;
-  const restartDelayMs = options.restartDelayMs ?? config.oauth.restartDelayMs;
-  let currentChild: ChildProcess | null = null;
-  let stopping = false;
-  let restartTimer: NodeJS.Timeout | null = null;
-  let hasBeenReady = false;
-
-  const spawnProxy = () => {
-    console.log(`Starting openai-oauth on port ${oauthPort}...`);
-    const spawnedAt = Date.now();
-    const child = spawn("npx", ["openai-oauth", "--port", String(oauthPort)], {
-      stdio: ["ignore", "pipe", "pipe"],
-      shell: isWin,
-      windowsHide: true,
-      env: { ...process.env },
-    });
-    currentChild = child;
-
-    child.stdout?.on("data", (d) => {
-      const msg = d.toString().trim();
-      if (!msg) return;
-      console.log(`[oauth] ${msg}`);
-      for (const line of msg.split(/\r?\n/)) {
-        const url = parseOAuthReadyUrl(line);
-        if (!url) continue;
-        const port = parseLocalhostPortFromUrl(url);
-        if (port && port !== oauthPort) {
-          console.log(`[oauth] requested port ${oauthPort}, actual port ${port}`);
-        }
-        options.onReady?.({ url, port: port || oauthPort, requestedPort: oauthPort });
-        hasBeenReady = true;
-      }
-    });
-
-    child.stderr?.on("data", (d) => {
-      const msg = d.toString().trim();
-      if (msg && !msg.includes("npm warn")) console.error(`[oauth] ${msg}`);
-    });
-
-    child.on("exit", (code) => {
-      if (currentChild === child) currentChild = null;
-      if (stopping) return;
-      const uptime = Date.now() - spawnedAt;
-      if (uptime < 5000 && !hasBeenReady) {
-        // Crashed immediately without ever becoming ready — likely missing openai-oauth or no token.
-        // Don't restart; just mark as failed silently.
-        console.log(`[oauth] proxy exited immediately (code ${code}). Skipping — Grok-only mode is fine.`);
-        options.onExit?.({ code });
-        return;
-      }
-      options.onExit?.({ code });
-      console.log(`[oauth] exited with code ${code}, restarting in ${Math.round(restartDelayMs / 1000)}s...`);
-      restartTimer = setTimeout(spawnProxy, restartDelayMs);
-    });
-  };
-
-  spawnProxy();
-
-  return {
-    get child() {
-      return currentChild;
-    },
-    kill(signal: NodeJS.Signals = "SIGTERM") {
-      this.stop(signal);
-    },
-    stop(signal: NodeJS.Signals = "SIGTERM") {
-      stopping = true;
-      if (restartTimer) clearTimeout(restartTimer);
-      try { currentChild?.kill(signal); } catch {}
-    },
-  };
-}

package/lib/oauthNormalize.ts

@@ -1,30 +0,0 @@
-// 0.09.12.2 — Keep supported image tool qualities intact for OAuth.
-// The exposed app contract accepts low/medium/high; normalize only malformed input so
-// the API response, UI metadata, and actual image_generation payload stay aligned.
-
-export const DEFAULT_IMAGE_QUALITY = "medium";
-export const VALID_IMAGE_QUALITIES = new Set(["low", "medium", "high"]);
-
-/**
- * @param {{ provider?: string, quality?: string }} input
- * @returns {{ quality: string, warnings: Array<{code:string,field:string,normalizedTo:string,reason:string}> }}
- */
-export function normalizeOAuthParams(input: { provider?: string; quality?: string } | null | undefined) {
-  const requested = typeof input?.quality === "string" ? input.quality : DEFAULT_IMAGE_QUALITY;
-
-  if (VALID_IMAGE_QUALITIES.has(requested)) {
-    return { quality: requested, warnings: [] };
-  }
-
-  return {
-    quality: DEFAULT_IMAGE_QUALITY,
-    warnings: [
-      {
-        code: "QUALITY_DEFAULTED",
-        field: "quality",
-        normalizedTo: DEFAULT_IMAGE_QUALITY,
-        reason: "invalid-quality",
-      },
-    ],
-  };
-}

package/lib/oauthProxy/errors.ts

@@ -1,128 +0,0 @@
-import { logEvent } from "../logger.js";
-import { classifyUpstreamError, classifyUpstreamErrorCode } from "../errorClassify.js";
-
-interface MakeOAuthErrorOptions {
-  status?: number;
-  code?: string;
-  upstreamBodyChars?: number;
-  upstreamCode?: string | null;
-  upstreamType?: string | null;
-  upstreamParam?: string | null;
-  eventType?: string;
-  eventCount?: number;
-  cause?: unknown;
-}
-
-interface OAuthError extends Error {
-  code: string;
-  status?: number;
-  upstreamBodyChars?: number;
-  upstreamCode?: string | null;
-  upstreamType?: string | null;
-  upstreamParam?: string | null;
-  eventType?: string;
-  eventCount?: number;
-  cause?: unknown;
-}
-
-export function makeOAuthError(
-  message: string,
-  {
-    status,
-    code = "OAUTH_UPSTREAM_ERROR",
-    upstreamBodyChars,
-    upstreamCode,
-    upstreamType,
-    upstreamParam,
-    eventType,
-    eventCount,
-    cause,
-  }: MakeOAuthErrorOptions = {},
-): OAuthError {
-  const err = new Error(message) as OAuthError;
-  err.code = code;
-  if (status) err.status = status;
-  if (typeof upstreamBodyChars === "number") err.upstreamBodyChars = upstreamBodyChars;
-  if (upstreamCode) err.upstreamCode = upstreamCode;
-  if (upstreamType) err.upstreamType = upstreamType;
-  if (upstreamParam) err.upstreamParam = upstreamParam;
-  if (eventType) err.eventType = eventType;
-  if (typeof eventCount === "number") err.eventCount = eventCount;
-  if (cause) err.cause = cause;
-  return err;
-}
-
-export function parseOpenAIErrorBody(text: string) {
-  try {
-    const parsed = JSON.parse(text);
-    const error = parsed?.error;
-    if (!error || typeof error !== "object") return null;
-    const message = typeof error.message === "string" ? error.message : "";
-    if (!message) return null;
-    return {
-      message,
-      code: typeof error.code === "string" ? error.code : null,
-      type: typeof error.type === "string" ? error.type : null,
-      param: typeof error.param === "string" ? error.param : null,
-    };
-  } catch {
-    return null;
-  }
-}
-
-export function normalizedOAuthCode(upstreamError: { code?: string | null; type?: string | null; message?: string | null } | null | undefined) {
-  const byCode = classifyUpstreamErrorCode(upstreamError?.code);
-  if (byCode !== "UNKNOWN") return byCode;
-  const byType = classifyUpstreamErrorCode(upstreamError?.type);
-  if (byType !== "UNKNOWN") return byType;
-  const byMessage = classifyUpstreamError(upstreamError?.message);
-  if (byMessage !== "UNKNOWN") return byMessage;
-  return "OAUTH_UPSTREAM_ERROR";
-}
-
-interface ThrowOAuthHttpErrorOptions {
-  requestId: string | null;
-  scope?: string;
-  fallbackMessage: string;
-}
-
-export function throwOAuthHttpError(res: { status: number }, text: string, { requestId, scope, fallbackMessage }: ThrowOAuthHttpErrorOptions) {
-  const upstream = parseOpenAIErrorBody(text);
-  const isClientError = res.status >= 400 && res.status < 500;
-  if (isClientError && upstream?.message) {
-    logEvent(scope || "oauth", "upstream_client_error", {
-      requestId,
-      status: res.status,
-      code: upstream.code,
-      type: upstream.type,
-      param: upstream.param,
-      errorChars: text.length,
-    });
-    throw makeOAuthError(upstream.message, {
-      status: res.status,
-      code: normalizedOAuthCode(upstream),
-      upstreamBodyChars: text.length,
-      upstreamCode: upstream.code,
-      upstreamType: upstream.type,
-      upstreamParam: upstream.param,
-    });
-  }
-  throw makeOAuthError(fallbackMessage, {
-    status: res.status,
-    upstreamBodyChars: text.length,
-  });
-}
-
-export function isAbortError(err: unknown) {
-  const e = err as { name?: string; code?: string } | null | undefined;
-  return e?.name === "AbortError" || e?.code === "ABORT_ERR";
-}
-
-export function throwOAuthTimeoutError(err: unknown, { timeoutMs: _timeoutMs, requestId: _requestId, scope }: { timeoutMs?: number; requestId?: string | null; scope?: string }) {
-  throw makeOAuthError("OAuth image generation timed out", {
-    code: "OAUTH_IMAGE_TIMEOUT",
-    status: 504,
-    cause: err,
-    eventType: `${scope || "oauth"}.timeout`,
-  });
-}