chore: Lint extensions folder.

This commit is contained in:
cpojer
2026-01-31 22:13:48 +09:00
parent 4f2166c503
commit 230ca789e2
221 changed files with 4006 additions and 1583 deletions

View File

@@ -83,8 +83,12 @@ describe("extractGeminiCliCredentials", () => {
mockExistsSync.mockImplementation((p: string) => {
const normalized = normalizePath(p);
if (normalized === normalizePath(fakeGeminiPath)) return true;
if (normalized === normalizePath(fakeOauth2Path)) return true;
if (normalized === normalizePath(fakeGeminiPath)) {
return true;
}
if (normalized === normalizePath(fakeOauth2Path)) {
return true;
}
return false;
});
mockRealpathSync.mockReturnValue(fakeResolvedPath);
@@ -160,8 +164,12 @@ describe("extractGeminiCliCredentials", () => {
mockExistsSync.mockImplementation((p: string) => {
const normalized = normalizePath(p);
if (normalized === normalizePath(fakeGeminiPath)) return true;
if (normalized === normalizePath(fakeOauth2Path)) return true;
if (normalized === normalizePath(fakeGeminiPath)) {
return true;
}
if (normalized === normalizePath(fakeOauth2Path)) {
return true;
}
return false;
});
mockRealpathSync.mockReturnValue(fakeResolvedPath);
@@ -205,8 +213,12 @@ describe("extractGeminiCliCredentials", () => {
mockExistsSync.mockImplementation((p: string) => {
const normalized = normalizePath(p);
if (normalized === normalizePath(fakeGeminiPath)) return true;
if (normalized === normalizePath(fakeOauth2Path)) return true;
if (normalized === normalizePath(fakeGeminiPath)) {
return true;
}
if (normalized === normalizePath(fakeOauth2Path)) {
return true;
}
return false;
});
mockRealpathSync.mockReturnValue(fakeResolvedPath);

View File

@@ -43,7 +43,9 @@ export type GeminiCliOAuthContext = {
function resolveEnv(keys: string[]): string | undefined {
for (const key of keys) {
const value = process.env[key]?.trim();
if (value) return value;
if (value) {
return value;
}
}
return undefined;
}
@@ -57,11 +59,15 @@ export function clearCredentialsCache(): void {
/** Extracts OAuth credentials from the installed Gemini CLI's bundled oauth2.js. */
export function extractGeminiCliCredentials(): { clientId: string; clientSecret: string } | null {
if (cachedGeminiCliCredentials) return cachedGeminiCliCredentials;
if (cachedGeminiCliCredentials) {
return cachedGeminiCliCredentials;
}
try {
const geminiPath = findInPath("gemini");
if (!geminiPath) return null;
if (!geminiPath) {
return null;
}
const resolvedPath = realpathSync(geminiPath);
const geminiCliDir = dirname(dirname(resolvedPath));
@@ -97,9 +103,13 @@ export function extractGeminiCliCredentials(): { clientId: string; clientSecret:
}
if (!content) {
const found = findFile(geminiCliDir, "oauth2.js", 10);
if (found) content = readFileSync(found, "utf8");
if (found) {
content = readFileSync(found, "utf8");
}
}
if (!content) {
return null;
}
if (!content) return null;
const idMatch = content.match(/(\d+-[a-z0-9]+\.apps\.googleusercontent\.com)/);
const secretMatch = content.match(/(GOCSPX-[A-Za-z0-9_-]+)/);
@@ -118,21 +128,29 @@ function findInPath(name: string): string | null {
for (const dir of (process.env.PATH ?? "").split(delimiter)) {
for (const ext of exts) {
const p = join(dir, name + ext);
if (existsSync(p)) return p;
if (existsSync(p)) {
return p;
}
}
}
return null;
}
function findFile(dir: string, name: string, depth: number): string | null {
if (depth <= 0) return null;
if (depth <= 0) {
return null;
}
try {
for (const e of readdirSync(dir, { withFileTypes: true })) {
const p = join(dir, e.name);
if (e.isFile() && e.name === name) return p;
if (e.isFile() && e.name === name) {
return p;
}
if (e.isDirectory() && !e.name.startsWith(".")) {
const found = findFile(p, name, depth - 1);
if (found) return found;
if (found) {
return found;
}
}
}
} catch {}
@@ -160,7 +178,9 @@ function resolveOAuthClientConfig(): { clientId: string; clientSecret?: string }
}
function isWSL(): boolean {
if (process.platform !== "linux") return false;
if (process.platform !== "linux") {
return false;
}
try {
const release = readFileSync("/proc/version", "utf8").toLowerCase();
return release.includes("microsoft") || release.includes("wsl");
@@ -170,7 +190,9 @@ function isWSL(): boolean {
}
function isWSL2(): boolean {
if (!isWSL()) return false;
if (!isWSL()) {
return false;
}
try {
const version = readFileSync("/proc/version", "utf8").toLowerCase();
return version.includes("wsl2") || version.includes("microsoft-standard");
@@ -210,17 +232,25 @@ function parseCallbackInput(
expectedState: string,
): { code: string; state: string } | { error: string } {
const trimmed = input.trim();
if (!trimmed) return { error: "No input provided" };
if (!trimmed) {
return { error: "No input provided" };
}
try {
const url = new URL(trimmed);
const code = url.searchParams.get("code");
const state = url.searchParams.get("state") ?? expectedState;
if (!code) return { error: "Missing 'code' parameter in URL" };
if (!state) return { error: "Missing 'state' parameter. Paste the full URL." };
if (!code) {
return { error: "Missing 'code' parameter in URL" };
}
if (!state) {
return { error: "Missing 'state' parameter. Paste the full URL." };
}
return { code, state };
} catch {
if (!expectedState) return { error: "Paste the full redirect URL, not just the code." };
if (!expectedState) {
return { error: "Paste the full redirect URL, not just the code." };
}
return { code: trimmed, state: expectedState };
}
}
@@ -289,7 +319,9 @@ async function waitForLocalCallback(params: {
});
const finish = (err?: Error, result?: { code: string; state: string }) => {
if (timeout) clearTimeout(timeout);
if (timeout) {
clearTimeout(timeout);
}
try {
server.close();
} catch {
@@ -427,14 +459,20 @@ async function discoverProject(accessToken: string): Promise<string> {
if (err instanceof Error) {
throw err;
}
throw new Error("loadCodeAssist failed");
throw new Error("loadCodeAssist failed", { cause: err });
}
if (data.currentTier) {
const project = data.cloudaicompanionProject;
if (typeof project === "string" && project) return project;
if (typeof project === "object" && project?.id) return project.id;
if (envProject) return envProject;
if (typeof project === "string" && project) {
return project;
}
if (typeof project === "object" && project?.id) {
return project.id;
}
if (envProject) {
return envProject;
}
throw new Error(
"This account requires GOOGLE_CLOUD_PROJECT or GOOGLE_CLOUD_PROJECT_ID to be set.",
);
@@ -482,8 +520,12 @@ async function discoverProject(accessToken: string): Promise<string> {
}
const projectId = lro.response?.cloudaicompanionProject?.id;
if (projectId) return projectId;
if (envProject) return envProject;
if (projectId) {
return projectId;
}
if (envProject) {
return envProject;
}
throw new Error(
"Could not discover or provision a Google Cloud project. Set GOOGLE_CLOUD_PROJECT or GOOGLE_CLOUD_PROJECT_ID.",
@@ -491,11 +533,17 @@ async function discoverProject(accessToken: string): Promise<string> {
}
function isVpcScAffected(payload: unknown): boolean {
if (!payload || typeof payload !== "object") return false;
if (!payload || typeof payload !== "object") {
return false;
}
const error = (payload as { error?: unknown }).error;
if (!error || typeof error !== "object") return false;
if (!error || typeof error !== "object") {
return false;
}
const details = (error as { details?: unknown[] }).details;
if (!Array.isArray(details)) return false;
if (!Array.isArray(details)) {
return false;
}
return details.some(
(item) =>
typeof item === "object" &&
@@ -507,7 +555,9 @@ function isVpcScAffected(payload: unknown): boolean {
function getDefaultTier(
allowedTiers?: Array<{ id?: string; isDefault?: boolean }>,
): { id?: string } | undefined {
if (!allowedTiers?.length) return { id: TIER_LEGACY };
if (!allowedTiers?.length) {
return { id: TIER_LEGACY };
}
return allowedTiers.find((tier) => tier.isDefault) ?? { id: TIER_LEGACY };
}
@@ -520,12 +570,16 @@ async function pollOperation(
const response = await fetch(`${CODE_ASSIST_ENDPOINT}/v1internal/${operationName}`, {
headers,
});
if (!response.ok) continue;
if (!response.ok) {
continue;
}
const data = (await response.json()) as {
done?: boolean;
response?: { cloudaicompanionProject?: { id?: string } };
};
if (data.done) return data;
if (data.done) {
return data;
}
}
throw new Error("Operation polling timeout");
}
@@ -558,7 +612,9 @@ export async function loginGeminiCliOAuth(
ctx.progress.update("Waiting for you to paste the callback URL...");
const callbackInput = await ctx.prompt("Paste the redirect URL here: ");
const parsed = parseCallbackInput(callbackInput, verifier);
if ("error" in parsed) throw new Error(parsed.error);
if ("error" in parsed) {
throw new Error(parsed.error);
}
if (parsed.state !== verifier) {
throw new Error("OAuth state mismatch - please try again");
}
@@ -592,9 +648,11 @@ export async function loginGeminiCliOAuth(
ctx.log(`\nOpen this URL in your LOCAL browser:\n\n${authUrl}\n`);
const callbackInput = await ctx.prompt("Paste the redirect URL here: ");
const parsed = parseCallbackInput(callbackInput, verifier);
if ("error" in parsed) throw new Error(parsed.error);
if ("error" in parsed) {
throw new Error(parsed.error, { cause: err });
}
if (parsed.state !== verifier) {
throw new Error("OAuth state mismatch - please try again");
throw new Error("OAuth state mismatch - please try again", { cause: err });
}
ctx.progress.update("Exchanging authorization code for tokens...");
return exchangeCodeForTokens(parsed.code, verifier);