scripter-x 1.0.13 → 1.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scripter-x",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "description": "ScripterX — local Flipkart session extractor (runs on your residential IP, syncs to marthunt)",
   "type": "module",
   "bin": {

package/src/commands.js

@@ -208,7 +208,12 @@ export async function run(io, api, args = {}) {
       if (a > 0) await new Promise((r) => setTimeout(r, 1000));
       try { saved = await saveSessions(api, cid, { campaignName: name }); } catch (e) { lastErr = e; }
     }
-    if (saved) { io.print(`  ✓ saved ${saved.count} session(s) to:`); io.print(`     ${saved.path}`, 'accent'); }
+    if (saved) {
+      io.print('  ✓ saved session(s) to:');
+      for (const res of saved) {
+        io.print(`     ${res.path} (${res.count} sessions)`, 'accent');
+      }
+    }
     else io.print(`  ! couldn't auto-save${lastErr ? ` (${lastErr.message})` : ''} — run \`export ${name}\` to retry`);
   } else io.print('  ◉ no sessions extracted — nothing to save.');
   if (worker.logPath) io.print(`  ◉ log saved to: ${worker.logPath}`);
@@ -329,7 +334,12 @@ export async function exportCmd(io, api, args = {}) {
     if (a > 0) await new Promise((r) => setTimeout(r, 800));
     try { saved = await saveSessions(api, c.id, { campaignName: c.name, out: args.out }); } catch (e) { lastErr = e; }
   }
-  if (saved) { io.print(`  ✓ exported ${saved.count} session(s) to:`); io.print(`     ${saved.path}`, 'accent'); }
+  if (saved) {
+    io.print('  ✓ exported session(s) to:');
+    for (const res of saved) {
+      io.print(`     ${res.path} (${res.count} sessions)`, 'accent');
+    }
+  }
   else if (lastErr) io.print(`  ✗ ${lastErr.message}`);
   else io.print('  ! no extracted sessions in this campaign yet.');
 }

package/src/util.js

@@ -37,21 +37,81 @@ export const log = {
 export async function saveSessions(api, cid, { campaignName, out } = {}) {
   let name = (campaignName || cid.slice(0, 8)).replace(/[^A-Za-z0-9._-]+/g, '-').replace(/^-+|-+$/g, '') || cid.slice(0, 8);
   const accounts = await api.exportCampaign(cid);
-  const sessions = (accounts || []).map((a) => a.session).filter(Boolean);
-  if (!sessions.length) return null;
+  if (!accounts || !accounts.length) return null;
 
+  let checkMinutes = false;
+  try {
+    const { campaign } = await api.getCampaign(cid);
+    checkMinutes = !!campaign.check_minutes;
+  } catch (e) {
+    // ignore
+  }
+
+  // Resolve base directory and optional forced filename.
+  let baseDir, forcedName = null;
   const defaultName = `${name}-${cid.slice(0, 8)}.json`;
-  let dest;
   if (out) {
     const expanded = out.startsWith('~') ? join(homedir(), out.slice(1)) : out;
     const isDir = (existsSync(expanded) && statSync(expanded).isDirectory()) || /[/\\]$/.test(out);
-    dest = isDir ? join(expanded, defaultName) : expanded;
+    if (isDir) {
+      baseDir = expanded;
+    } else {
+      baseDir = dirname(expanded);
+      forcedName = expanded.split(/[/\\]/).pop();
+    }
   } else {
     const downloads = join(homedir(), 'Downloads');
     const base = existsSync(downloads) ? downloads : homedir();
-    dest = join(base, 'scripterx', defaultName);
+    baseDir = join(base, 'scripterx');
+  }
+
+  function write(suffix, sessionsToWrite) {
+    if (!sessionsToWrite || !sessionsToWrite.length) return null;
+    let fname;
+    if (forcedName) {
+      fname = suffix === '' ? forcedName : forcedName.replace(/\.json$/i, `${suffix}.json`);
+    } else {
+      fname = `${name}-${cid.slice(0, 8)}${suffix}.json`;
+    }
+    const dest = join(baseDir, fname);
+    mkdirSync(baseDir, { recursive: true });
+    writeFileSync(dest, JSON.stringify(sessionsToWrite, null, 2));
+    return dest;
+  }
+
+  // Partition by coupon_eligible when minutes check was requested.
+  const minutesFree = [];   // coupon_eligible=true  → no Minutes order, ₹100 coupon available
+  const minutesUsed = [];   // coupon_eligible=false → already placed a Minutes order
+  const unchecked = [];      // coupon_eligible absent → check wasn't done for this account
+
+  for (const a of accounts) {
+    const sess = a.session;
+    if (!sess) continue;
+    const eligible = a.coupon_eligible;
+    if (checkMinutes && eligible !== undefined && eligible !== null) {
+      (eligible ? minutesFree : minutesUsed).push(sess);
+    } else {
+      unchecked.push(sess);
+    }
   }
-  mkdirSync(dirname(dest), { recursive: true });
-  writeFileSync(dest, JSON.stringify(sessions, null, 2));
-  return { path: dest, count: sessions.length };
+
+  const results = [];
+  if (checkMinutes && (minutesFree.length || minutesUsed.length)) {
+    const destFree = write('-minutes-free', minutesFree);
+    if (destFree) results.push({ label: '🟢 minutes-free (₹100 coupon)', path: destFree, count: minutesFree.length });
+
+    const destUsed = write('-minutes-used', minutesUsed);
+    if (destUsed) results.push({ label: '🔴 minutes-used (coupon gone)', path: destUsed, count: minutesUsed.length });
+
+    if (unchecked.length) {
+      const destUnk = write('-unchecked', unchecked);
+      if (destUnk) results.push({ label: '⚪ unchecked', path: destUnk, count: unchecked.length });
+    }
+  } else {
+    const allSessions = [...minutesFree, ...minutesUsed, ...unchecked];
+    const dest = write('', allSessions);
+    if (dest) results.push({ label: 'combined', path: dest, count: allSessions.length });
+  }
+
+  return results.length ? results : null;
 }

package/src/worker.js

@@ -48,6 +48,8 @@ export class Worker {
   _claim() {
     if (this.stopped) return 0;
     if (this.stats.succeeded >= this.requested) return 0;
+    const active = this.stats.attempts - (this.stats.succeeded + this.stats.failed + this.stats.cancelled);
+    if (this.stats.succeeded + active >= this.requested) return 0;
     if (this.stats.attempts >= this.requested * ATTEMPT_CAP_MULT) return 0;
     return ++this.stats.attempts;
   }
@@ -119,9 +121,24 @@ export class Worker {
     const idNo = this._nextSeq();
     const res = { id_no: idNo, status: 'failed', cost: 0, detail: '' };
 
+    if (this.stats.succeeded >= this.requested) {
+      this._emit(slot, { phase: 'done', detail: 'goal reached' });
+      res.status = 'cancelled';
+      res.detail = 'goal reached';
+      return res;
+    }
+
     this._emit(slot, { mobile: '', phase: 'renting', detail: 'requesting a number', wait: 0 });
     const number = await this._rent(slot);
     if (!number) { res.status = 'cancelled'; res.detail = 'stopped while renting'; return res; }
+    if (this.stats.succeeded >= this.requested) {
+      this.log(`goal reached by another slot; releasing ${number.mobile} immediately`);
+      this._release(number, Date.now());
+      this._emit(slot, { phase: 'done', detail: 'goal reached' });
+      res.status = 'cancelled';
+      res.detail = 'goal reached';
+      return res;
+    }
     const rentedAt = Date.now();
     res.mobile = number.mobile;
     this._emit(slot, { mobile: number.mobile, phase: 'rented', detail: 'got a number' });
@@ -135,9 +152,13 @@ export class Worker {
     // releaseOnce — the single chokepoint that schedules the provider cancel. Called from
     // every terminal path (fail, success, error). Without this a blocked/errored number
     // could stay rented → we'd be charged.
-    const releaseOnce = () => {
+    const releaseOnce = (charged = false, doneDetail = 'done') => {
       if (released) return;
       released = true;
+      if (charged) {
+        this._emit(slot, { phase: 'done', detail: doneDetail });
+        return;
+      }
       this._emit(slot, { phase: 'cancelling', detail: 'releasing number' });
       this._release(number, rentedAt);
     };
@@ -148,7 +169,7 @@ export class Worker {
       res.cost = charged ? number.cost : 0;
       res.detail = detail;
       this.log(`FAILED ${number.mobile}: ${detail} (charged: ${charged})`);
-      releaseOnce();
+      releaseOnce(charged, 'failed');
       return res;
     };
 
@@ -219,10 +240,10 @@ export class Worker {
       }
 
       this._emit(slot, { phase: 'saving', detail: 'saving session' });
-      res.status = 'success'; res.cost = number.cost; res.session = session;
       this.log(`SUCCESS ${number.mobile} — session extracted (₹${number.cost})${res.email_linked ? ` + email ${res.linked_email}` : ''}`);
-      this._emit(slot, { phase: 'done', detail: res.email_linked ? `extracted + ${res.linked_email}` : 'extracted' });
-      releaseOnce(); // success still releases the number (OTP already consumed)
+      const doneDetail = res.email_linked ? `extracted + ${res.linked_email}` : 'extracted';
+      this._emit(slot, { phase: 'done', detail: doneDetail });
+      releaseOnce(true, doneDetail); // success still releases the number (OTP already consumed)
       return res;
     } catch (e) {
       // ANY unexpected error → still release the number so we're never charged for a leak