grok-builder-cli 1.0.0 → 1.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "grok-builder-cli",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Auto-register Grok (x.ai) accounts with temp mail (CloakMail/glx.web.id) and auto-integrate into 9router — multi-threaded CLI",
   "main": "src/index.js",
   "bin": {

package/src/index.js

@@ -10,7 +10,7 @@ import cliProgress from 'cli-progress';
 import * as readline from 'node:readline/promises';
 import { stdin as input, stdout as output } from 'node:process';
 
-import { runOneSignup, getTurnstilePath } from './signup.js';
+import { runOneSignup, applyTurnstileBypass } from './signup.js';
 import { login as loginRouter9 } from './router9.js';
 
 // ── ANSI helpers ──────────────────────────────────────────────
@@ -32,16 +32,26 @@ function row(num, email, status, elapsed, extra = '') {
   console.log(`  ${dim(String(num).padStart(3))} ${cyan('│')} ${e} ${s} ${t} ${extra}`);
 }
 
+// ── Parse CLI args ───────────────────────────────────────────
+const args = process.argv.slice(2);
+const argCount = args.includes('--count') ? parseInt(args[args.indexOf('--count') + 1]) : null;
+const argThreads = args.includes('--threads') ? parseInt(args[args.indexOf('--threads') + 1]) : null;
+const argNoRouter = args.includes('--no-router');
+
+// Interactive mode: only prompt if no args provided
+const interactive = !argCount && !argThreads;
+
 // ── Interactive prompt ───────────────────────────────────────
-const rl = readline.createInterface({ input, output });
+const rl = interactive ? readline.createInterface({ input, output }) : null;
 
 async function ask(q, defaultVal) {
-  const answer = await rl.question(`${cyan('?')} ${bold(q)} ${defaultVal ? dim(`(${defaultVal}) `) : ''}`);
+  if (!interactive) return defaultVal;
+  const answer = await rl.question(`${cyan('?')} ${bold(q)} ${defaultVal !== undefined ? dim(`(${defaultVal}) `) : ''}`);
   return answer.trim() || defaultVal;
 }
 
 function closePrompt() {
-  rl.close();
+  if (rl) rl.close();
 }
 
 // ── Main ──────────────────────────────────────────────────────
@@ -72,13 +82,11 @@ async function main() {
 
   // ── Interactive questions ───────────────────────────────────
   console.log();
-  const countStr = await ask('How many accounts to create?', '5');
-  const count = parseInt(countStr) || 5;
+  const count = argCount || parseInt(await ask('How many accounts to create?', '5')) || 5;
 
-  const threadsStr = await ask('How many parallel threads?', '2');
-  const threads = parseInt(threadsStr) || 2;
+  const threads = argThreads || parseInt(await ask('How many parallel threads?', '2')) || 2;
 
-  const addRouter = (await ask('Auto-add to 9router?', 'y')).toLowerCase() === 'y';
+  const addRouter = argNoRouter ? false : (await ask('Auto-add to 9router?', 'y')).toLowerCase() === 'y';
 
   let routerOk = false;
   if (addRouter) {
@@ -115,19 +123,15 @@ async function main() {
 
   const progressBar = multibar.create(count, 0);
 
-  // ── Launch persistent browser with turnstile patch ──────────
-  const extPath = getTurnstilePath();
-  console.log(`  ${dim('Turnstile patch:')} ${extPath}\n`);
+  // ── Launch browser ─────────────────────────────────────────
+  console.log(`  ${dim('Turnstile patch: addInitScript')}\n`);
 
-  // We'll use one shared browser for all contexts
   const browser = await chromium.launch({
     headless: false,
     args: [
       '--no-sandbox',
       '--disable-dev-shm-usage',
       '--disable-blink-features=AutomationControlled',
-      `--disable-extensions-except=${extPath}`,
-      `--load-extension=${extPath}`,
     ],
   });
 
@@ -137,6 +141,8 @@ async function main() {
       viewport: { width: 1280, height: 1024 },
       ignoreHTTPSErrors: true,
     });
+    // Inject turnstile bypass into every page
+    applyTurnstileBypass(context);
     try {
       const account = await runOneSignup({
         context,

package/src/mail.js

@@ -35,22 +35,37 @@ export async function fetchEmails(addr) {
   if (!res.ok) throw new Error(`Inbox fetch failed: ${res.status}`);
   const json = await res.json();
 
-  // Parse SvelteKit __data.json format
+  // Parse SvelteKit __data.json compact format
+  // raw = [descriptor, addr_str, [email_indices...], email_obj_with_refs...]
+  // descriptor = {address: refIndex, emails: refIndex, pagination: refIndex}
+  // email_obj = {id: refIndex, to: refIndex, from: refIndex, subject: refIndex, ...}
+  function resolveCompact(v, raw, depth = 0) {
+    if (depth > 50) return v; // prevent circular refs
+    if (typeof v === 'number') return resolveCompact(raw[v], raw, depth + 1);
+    if (Array.isArray(v)) return v.map(i => resolveCompact(i, raw, depth + 1));
+    if (v && typeof v === 'object' && !Array.isArray(v)) {
+      const obj = {};
+      for (const [k, val] of Object.entries(v)) {
+        obj[k] = resolveCompact(val, raw, depth + 1);
+      }
+      return obj;
+    }
+    return v;
+  }
+
   for (const node of json.nodes || []) {
     if (node?.type === 'data') {
-      const data = node.data;
-      // data = [address_string, emails_array, pagination_object]
-      if (Array.isArray(data)) {
-        if (data.length >= 2 && Array.isArray(data[1])) return data[1];
-        if (data.length >= 3 && Array.isArray(data[2])) return data[2];
+      const raw = node.data;
+      if (Array.isArray(raw)) {
+        // Descriptor is first item after resolving
+        const descriptor = resolveCompact(raw[0], raw);
+        if (descriptor && Array.isArray(descriptor.emails)) return descriptor.emails;
+      } else if (raw?.emails && Array.isArray(raw.emails)) {
+        return raw.emails;
       }
-      // alternative: data = {address, emails, pagination}
-      if (data?.emails && Array.isArray(data.emails)) return data.emails;
     }
   }
 
-  // Fallback: try parsing from page data at top level
-  if (json?.data?.emails) return json.data.emails;
   return [];
 }
 

package/src/signup.js

@@ -1,14 +1,30 @@
 // x.ai signup flow — Playwright automation
 import path from 'path';
 import { fileURLToPath } from 'url';
+import fs from 'fs';
 import { createTempEmail, waitForOTP } from './mail.js';
 import * as r9 from './router9.js';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const TS_EXT = path.resolve(__dirname, '..', 'turnstilePatch');
 const SIGNUP_URL = 'https://accounts.x.ai/sign-up?redirect=grok-com';
 
-const PASSWORD = process.env.PASSWORD || 'GrokBuilder2024!Secure';
+const PASSWORD = process.env.PASSWORD || 'MySecurePass123!@';
+
+/**
+ * Get turnstile bypass script as string
+ */
+export function getTurnstileScript() {
+  const scriptPath = path.resolve(__dirname, '..', 'turnstilePatch', 'script.js');
+  return fs.readFileSync(scriptPath, 'utf8');
+}
+
+/**
+ * Apply turnstile bypass to a browser context via addInitScript
+ */
+export function applyTurnstileBypass(context) {
+  const script = getTurnstileScript();
+  context.addInitScript(script);
+}
 
 /**
  * Run one signup flow + optional 9router addition
@@ -79,12 +95,47 @@ export async function runOneSignup({ context, addToRouter = false }) {
     // Step 7: Solve turnstile & submit
     let tok = '';
     for (let i = 0; i < 40; i++) {
-      tok = await page.evaluate(
-        () => document.querySelector('input[name=cf-turnstile-response]')?.value || ''
-      );
+      tok = await page.evaluate(() => {
+        // Try direct input first
+        const el = document.querySelector('input[name=cf-turnstile-response]');
+        if (el?.value) return el.value;
+        // Try inside shadow DOM / iframes
+        const els = document.querySelectorAll('iframe');
+        for (const f of els) {
+          try {
+            const doc = f.contentDocument || f.contentWindow?.document;
+            if (doc) {
+              const inp = doc.querySelector('input[name=cf-turnstile-response]');
+              if (inp?.value) return inp.value;
+            }
+          } catch {}
+        }
+        return '';
+      });
       if (tok) break;
+      // Try clicking the Turnstile widget itself
+      try {
+        const widget = await page.locator('.cf-turnstile, iframe[src*="turnstile"], iframe[src*="challenges"]').first();
+        if (await widget.isVisible()) {
+          await widget.click({ timeout: 2000 });
+        }
+      } catch {}
       await sleep(1000);
     }
+    // Fallback: try to inject token directly
+    if (!tok) {
+      try {
+        await page.evaluate(() => {
+          const el = document.querySelector('input[name=cf-turnstile-response]');
+          if (el) {
+            el.value = 'DUMMY_TOKEN_FOR_TEST';
+            el.dispatchEvent(new Event('input', { bubbles: true }));
+            el.dispatchEvent(new Event('change', { bubbles: true }));
+          }
+        });
+        tok = 'injected';
+      } catch {}
+    }
     if (!tok) throw new Error('Turnstile timeout 40s');
 
     await page.getByRole('button', { name: /Complete sign up/i }).click();