zevairouter 1.0.82 → 1.0.84

package/src/lib/oauth/services/grokCliBulkImportManager.js

@@ -16,6 +16,7 @@ import {
 import {
   runXaiEmailSignup,
   runXaiEmailDeviceAuthorize,
+  runXaiGoogleDeviceAuthorize,
 } from "./grokXaiEmailAutomation.js";
 
 const GROK_CLI_PROVIDER_ID = "grok-cli";
@@ -46,53 +47,32 @@ export function resolveVerificationUrl(deviceData) {
 
 /**
  * Expand bulk lines for Grok:
- * - auto / tempmail / auto:N / tempmail:N  → generate N tempmail mailboxes + random passwords
- * - email:password / email|password → existing login
- * - bare number N → N auto accounts
+ * - email:password / email|password → **Google OAuth** device auth (default, like Kiro)
+ * - google:email:pass / gmail:email|pass → force Google
+ * - email-login:email:pass → legacy xAI email+password (Turnstile)
+ * - auto / tempmail / auto:N → tempmail register (legacy)
+ * - bare number N → N tempmail accounts
  */
 export async function expandGrokBulkAccountLines(accounts = [], { createMailbox = createTempmailMailbox } = {}) {
   const lines = Array.isArray(accounts) ? accounts : [];
   const expanded = [];
   const invalidLines = [];
 
-  for (let index = 0; index < lines.length; index++) {
-    const raw = String(lines[index] || "").trim();
-    if (!raw || raw.startsWith("#")) continue;
-
-    // bare count: "5"
-    if (/^\d{1,3}$/.test(raw)) {
-      const n = Math.min(50, Math.max(1, Number(raw)));
-      for (let i = 0; i < n; i++) {
-        const box = await createMailbox({ prefix: "zevai-cb", label: "grok-cli-bulk" });
-        const password = generateTempmailPassword();
-        expanded.push({
-          line: index + 1,
-          email: box.address,
-          password,
-          mode: "tempmail-register",
-        });
-      }
-      continue;
-    }
-
-    // auto / tempmail / auto:3
-    const autoMatch = raw.match(/^(auto|tempmail)(?::(\d{1,3}))?$/i);
-    if (autoMatch) {
-      const n = Math.min(50, Math.max(1, Number(autoMatch[2] || 1)));
-      for (let i = 0; i < n; i++) {
-        const box = await createMailbox({ prefix: "zevai-cb", label: "grok-cli-bulk" });
-        const password = generateTempmailPassword();
-        expanded.push({
-          line: index + 1,
-          email: box.address,
-          password,
-          mode: "tempmail-register",
-        });
-      }
-      continue;
+  const pushTempmail = async (count, line) => {
+    const n = Math.min(50, Math.max(1, count));
+    for (let i = 0; i < n; i++) {
+      const box = await createMailbox({ prefix: "zevai-cb", label: "grok-cli-bulk" });
+      const password = generateTempmailPassword();
+      expanded.push({
+        line,
+        email: box.address,
+        password,
+        mode: "tempmail-register",
+      });
     }
+  };
 
-    // standard email:password or email|password
+  const parseEmailPassword = (raw) => {
     let email = "";
     let password = "";
     if (raw.includes("|")) {
@@ -107,18 +87,47 @@ export async function expandGrokBulkAccountLines(accounts = [], { createMailbox
         password = raw.slice(idx + 1).trim();
       }
     }
+    return { email, password };
+  };
+
+  for (let index = 0; index < lines.length; index++) {
+    const raw = String(lines[index] || "").trim();
+    if (!raw || raw.startsWith("#")) continue;
+
+    if (/^\d{1,3}$/.test(raw)) {
+      await pushTempmail(Number(raw), index + 1);
+      continue;
+    }
+
+    const autoMatch = raw.match(/^(auto|tempmail)(?::(\d{1,3}))?$/i);
+    if (autoMatch) {
+      await pushTempmail(Number(autoMatch[2] || 1), index + 1);
+      continue;
+    }
 
+    let body = raw;
+    let mode = "google-login";
+    const googlePref = raw.match(/^(google|gmail)[:|]/i);
+    const emailPref = raw.match(/^email-login[:|]/i);
+    if (googlePref) {
+      body = raw.slice(googlePref[0].length).trim();
+      mode = "google-login";
+    } else if (emailPref) {
+      body = raw.slice(emailPref[0].length).trim();
+      mode = "email-login";
+    }
+
+    const { email, password } = parseEmailPassword(body);
     if (!email || !password) {
       invalidLines.push(index + 1);
       continue;
     }
 
-    // Existing credentials → login only (no signup). Tempmail domain still works for login.
     expanded.push({
       line: index + 1,
       email,
       password,
-      mode: "email-login",
+      mode,
     });
   }
 
@@ -212,8 +221,8 @@ class GrokCliBulkImportManager extends KiroBulkImportManager {
 
     if (!parsed.length) {
       const error = invalidLines.length > 0
-        ? "Invalid format. Use: auto / auto:5 / email:password (or email|password)"
-        : "At least one account entry is required (e.g. auto or auto:3)";
+        ? "Invalid format. Use: email|password (Google OAuth) / auto / auto:5 / email-login:email:pass"
+        : "At least one account entry is required (e.g. email|password or auto:3)";
       throw Object.assign(new Error(error), {
         error,
         ...(invalidLines.length ? { invalidLines } : {}),
@@ -245,7 +254,7 @@ class GrokCliBulkImportManager extends KiroBulkImportManager {
     if (live) {
       const modeByEmail = new Map(parsed.map((a) => [a.email.toLowerCase(), a.mode]));
       for (const account of live.accounts) {
-        account.mode = modeByEmail.get(String(account.email || "").toLowerCase()) || "email-login";
+        account.mode = modeByEmail.get(String(account.email || "").toLowerCase()) || "google-login";
       }
       // Keep passwords in account for signup path (parent may strip later)
       for (const account of live.accounts) {
@@ -321,7 +330,7 @@ class GrokCliBulkImportManager extends KiroBulkImportManager {
         void this.persistJobSnapshot(job, { forcePreview: false });
       };
 
-      const mode = account.mode || "email-login";
+      const mode = account.mode || "google-login";
 
       // 1) Register via tempmail if needed
       if (mode === "tempmail-register") {
@@ -376,7 +385,7 @@ class GrokCliBulkImportManager extends KiroBulkImportManager {
         }
       }
 
-      // 2) Device code + authorize with email session
+      // 2) Device code + authorize (Google OAuth preferred; email path for legacy)
       this.setAccountStep(account, "requesting_device_code", "Requesting Grok CLI device code");
       await this.persistJobSnapshot(job, { forcePreview: true });
       const deviceData = await this.requestDeviceCode();
@@ -386,16 +395,36 @@ class GrokCliBulkImportManager extends KiroBulkImportManager {
         throw new Error("Grok CLI did not return a device code / verification URL");
       }
 
-      const auth = await runXaiEmailDeviceAuthorize(page, {
-        email: account.email,
-        password: account.password,
-        verificationUrl: authUrl,
-        deviceCode,
-        pollToken: (code) => this.pollToken(code),
-        pollOtp: (addr, opts) => this.pollOtp(addr, opts),
-        onStep,
-        cancelCheck: () => job.cancelRequested,
-      });
+      const useGoogle = mode === "google-login" || mode === "google";
+      let auth;
+      if (useGoogle) {
+        this.setAccountStep(
+          account,
+          "google_device_auth",
+          `Authorizing Grok via Google OAuth (${account.email})`
+        );
+        await this.persistJobSnapshot(job, { forcePreview: true });
+        auth = await runXaiGoogleDeviceAuthorize(page, {
+          email: account.email,
+          password: account.password,
+          verificationUrl: authUrl,
+          deviceCode,
+          pollToken: (code) => this.pollToken(code),
+          onStep,
+          cancelCheck: () => job.cancelRequested,
+        });
+      } else {
+        auth = await runXaiEmailDeviceAuthorize(page, {
+          email: account.email,
+          password: account.password,
+          verificationUrl: authUrl,
+          deviceCode,
+          pollToken: (code) => this.pollToken(code),
+          pollOtp: (addr, opts) => this.pollOtp(addr, opts),
+          onStep,
+          cancelCheck: () => job.cancelRequested,
+        });
+      }
 
       if (auth.status === "success" && auth.tokens) {
         await this.finalizeSuccess(job, account, auth.tokens, mode);
@@ -406,7 +435,25 @@ class GrokCliBulkImportManager extends KiroBulkImportManager {
         return;
       }
 
-      this.finalizeAccount(account, "failed", {
+      if (auth.status === "needs_manual") {
+        account.manualSession = {
+          context,
+          page,
+          opened: false,
+          openedAt: null,
+          ownedBrowser,
+        };
+        this.finalizeAccount(account, "needs_manual", {
+          error: auth.error,
+          step: "awaiting_manual",
+          message: auth.error,
+        });
+        await this.persistJobSnapshot(job, { forcePreview: true });
+        ownedBrowser = null;
+        return;
+      }
+
+      this.finalizeAccount(account, auth.status?.startsWith?.("failed") ? auth.status : "failed", {
         error: auth.error || "Device authorization failed",
         step: "device_failed",
         message: auth.error || "Device authorization failed",
@@ -464,11 +511,15 @@ class GrokCliBulkImportManager extends KiroBulkImportManager {
     })();
   }
 
-  async finalizeSuccess(job, account, tokens, mode = "email-login") {
+  async finalizeSuccess(job, account, tokens, mode = "google-login") {
     this.setAccountStep(account, "saving_connection", "Saving Grok CLI connection");
     await this.persistJobSnapshot(job, { forcePreview: true });
 
-    const automation = mode === "tempmail-register" ? "tempmail-cloakbrowser" : "email-login-cloakbrowser";
+    const automation = mode === "tempmail-register"
+      ? "tempmail-cloakbrowser"
+      : mode === "google-login" || mode === "google"
+        ? "google-oauth-device"
+        : "email-login-cloakbrowser";
     const { connection } = await this.saveConnection({
       tokens,
       email: tokens.email || account.email,