litmus-cli 1.5.2-beta.8 → 1.5.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (88) hide show
  1. package/dist/commands/connect.d.ts.map +1 -1
  2. package/dist/commands/connect.js +109 -229
  3. package/dist/commands/connect.js.map +1 -1
  4. package/dist/commands/doctor.d.ts.map +1 -1
  5. package/dist/commands/doctor.js +2 -7
  6. package/dist/commands/doctor.js.map +1 -1
  7. package/dist/commands/submit.d.ts.map +1 -1
  8. package/dist/commands/submit.js +1 -4
  9. package/dist/commands/submit.js.map +1 -1
  10. package/dist/cursor-session/package.json +1 -1
  11. package/dist/cursor-session/session.cjs +12 -12
  12. package/dist/lib/ai-tracking.d.ts +1 -2
  13. package/dist/lib/ai-tracking.d.ts.map +1 -1
  14. package/dist/lib/ai-tracking.js +8 -26
  15. package/dist/lib/ai-tracking.js.map +1 -1
  16. package/dist/lib/api.d.ts +1 -1
  17. package/dist/lib/api.d.ts.map +1 -1
  18. package/dist/lib/api.js +2 -2
  19. package/dist/lib/api.js.map +1 -1
  20. package/dist/lib/backfill-tools.d.ts.map +1 -1
  21. package/dist/lib/backfill-tools.js +0 -6
  22. package/dist/lib/backfill-tools.js.map +1 -1
  23. package/dist/lib/backfill.d.ts.map +1 -1
  24. package/dist/lib/backfill.js +0 -3
  25. package/dist/lib/backfill.js.map +1 -1
  26. package/dist/lib/backlog-flush.d.ts.map +1 -1
  27. package/dist/lib/backlog-flush.js +0 -3
  28. package/dist/lib/backlog-flush.js.map +1 -1
  29. package/dist/lib/capture-selftest.d.ts +0 -9
  30. package/dist/lib/capture-selftest.d.ts.map +1 -1
  31. package/dist/lib/capture-selftest.js +2 -4
  32. package/dist/lib/capture-selftest.js.map +1 -1
  33. package/dist/lib/connect-skills.d.ts.map +1 -1
  34. package/dist/lib/connect-skills.js +38 -48
  35. package/dist/lib/connect-skills.js.map +1 -1
  36. package/dist/lib/cursor-session.d.ts +0 -1
  37. package/dist/lib/cursor-session.d.ts.map +1 -1
  38. package/dist/lib/cursor-session.js +1 -1
  39. package/dist/lib/cursor-session.js.map +1 -1
  40. package/dist/lib/hook-logger.cjs +0 -16
  41. package/dist/lib/hosted-capture.d.ts.map +1 -1
  42. package/dist/lib/hosted-capture.js +1 -14
  43. package/dist/lib/hosted-capture.js.map +1 -1
  44. package/dist/lib/hosted-transcripts.d.ts.map +1 -1
  45. package/dist/lib/hosted-transcripts.js +0 -4
  46. package/dist/lib/hosted-transcripts.js.map +1 -1
  47. package/dist/lib/hosted-watcher.js +0 -5
  48. package/dist/lib/hosted-watcher.js.map +1 -1
  49. package/dist/lib/launcher-cleanup-journal.d.ts +0 -34
  50. package/dist/lib/launcher-cleanup-journal.d.ts.map +1 -1
  51. package/dist/lib/launcher-cleanup-journal.js +1 -75
  52. package/dist/lib/launcher-cleanup-journal.js.map +1 -1
  53. package/dist/lib/portal-launcher.d.ts +3 -44
  54. package/dist/lib/portal-launcher.d.ts.map +1 -1
  55. package/dist/lib/portal-launcher.js +42 -361
  56. package/dist/lib/portal-launcher.js.map +1 -1
  57. package/dist/lib/schemas.d.ts +0 -1
  58. package/dist/lib/schemas.d.ts.map +1 -1
  59. package/dist/lib/schemas.js +0 -1
  60. package/dist/lib/schemas.js.map +1 -1
  61. package/dist/lib/skill-import.d.ts +4 -4
  62. package/dist/lib/skill-import.js +4 -4
  63. package/dist/lib/snapshot-capture.d.ts +24 -0
  64. package/dist/lib/snapshot-capture.d.ts.map +1 -0
  65. package/dist/lib/snapshot-capture.js +90 -0
  66. package/dist/lib/snapshot-capture.js.map +1 -0
  67. package/dist/lib/snapshot-guardian.d.ts +2 -0
  68. package/dist/lib/snapshot-guardian.d.ts.map +1 -0
  69. package/dist/lib/snapshot-guardian.js +31 -0
  70. package/dist/lib/snapshot-guardian.js.map +1 -0
  71. package/dist/lib/snapshot-worker.d.ts +2 -0
  72. package/dist/lib/snapshot-worker.d.ts.map +1 -0
  73. package/dist/lib/snapshot-worker.js +98 -0
  74. package/dist/lib/snapshot-worker.js.map +1 -0
  75. package/dist/lib/ssh-config-file.d.ts +1 -1
  76. package/dist/lib/ssh-config-file.d.ts.map +1 -1
  77. package/dist/lib/ssh-config-file.js +3 -37
  78. package/dist/lib/ssh-config-file.js.map +1 -1
  79. package/dist/lib/watcher.js +78 -139
  80. package/dist/lib/watcher.js.map +1 -1
  81. package/dist/lib/zip.d.ts.map +1 -1
  82. package/dist/lib/zip.js +1 -2
  83. package/dist/lib/zip.js.map +1 -1
  84. package/package.json +1 -1
  85. package/dist/lib/isolated-host-policy.d.ts +0 -4
  86. package/dist/lib/isolated-host-policy.d.ts.map +0 -1
  87. package/dist/lib/isolated-host-policy.js +0 -17
  88. package/dist/lib/isolated-host-policy.js.map +0 -1
@@ -60,16 +60,6 @@ function configRegion(content, begin, end) {
60
60
  return null;
61
61
  return lines.slice(starts[0], ends[0] + 1).join("");
62
62
  }
63
- function configRegionState(content, begin, end) {
64
- const lines = content.match(/[^\n]*\n|[^\n]+$/g) ?? [];
65
- const starts = lines.flatMap((line, i) => line.trimEnd() === begin ? [i] : []);
66
- const ends = lines.flatMap((line, i) => line.trimEnd() === end ? [i] : []);
67
- if (starts.length === 0 && ends.length === 0)
68
- return "absent";
69
- if (starts.length !== 1 || ends.length !== 1 || ends[0] < starts[0])
70
- return "invalid";
71
- return { bytes: lines.slice(starts[0], ends[0] + 1).join("") };
72
- }
73
63
  /** Capture only this assessment's marker-delimited settings in a serializable plan. */
74
64
  export function createSshConfigCleanupPlan(file, alias) {
75
65
  if (!/^litmus-[a-zA-Z0-9-]+$/.test(alias))
@@ -94,43 +84,19 @@ export function createSshConfigCleanupPlan(file, alias) {
94
84
  /** Execute a captured plan only when every Litmus-owned region remains byte-identical. */
95
85
  export async function executeSshConfigCleanupPlan(file, plan) {
96
86
  if (!/^litmus-[a-zA-Z0-9-]+$/.test(plan.alias) || plan.regions.length !== 3)
97
- return "preserved";
98
- let matched = false;
87
+ return;
99
88
  await updateSshConfig(file, current => {
100
- // A temporary Litmus-owned region can disappear before durable cleanup
101
- // runs (for example the connect-time ControlPath override). Treat that as
102
- // already cleaned. Still preserve the file when a captured region changed
103
- // or a region that did not exist at capture time appeared later.
104
- if (plan.regions.some(({ begin, end, bytes }) => {
105
- const actual = configRegionState(current, begin, end);
106
- if (actual === "invalid")
107
- return true;
108
- if (bytes === null)
109
- return actual !== "absent";
110
- return actual !== "absent" && actual.bytes !== bytes;
111
- }))
89
+ if (plan.regions.some(({ begin, end, bytes }) => configRegion(current, begin, end) !== bytes))
112
90
  return current;
113
- matched = true;
114
91
  for (const { bytes } of plan.regions)
115
92
  if (bytes)
116
93
  current = current.replace(bytes, "");
117
94
  return current;
118
95
  });
119
- let current = "";
120
- try {
121
- current = readFileSync(file, "utf8");
122
- }
123
- catch {
124
- return "absent";
125
- }
126
- const remains = plan.regions.some(({ begin, end }) => configRegion(current, begin, end) !== null);
127
- if (remains)
128
- return "preserved";
129
- return matched ? "removed" : "absent";
130
96
  }
131
97
  /** Backwards-compatible in-memory wrapper used by non-durable callers. */
132
98
  export function prepareSshConfigCleanup(file, alias) {
133
99
  const plan = createSshConfigCleanupPlan(file, alias);
134
- return plan ? async () => { await executeSshConfigCleanupPlan(file, plan); } : async () => { };
100
+ return plan ? () => executeSshConfigCleanupPlan(file, plan) : async () => { };
135
101
  }
136
102
  //# sourceMappingURL=ssh-config-file.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"ssh-config-file.js","sourceRoot":"","sources":["../../src/lib/ssh-config-file.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ssh-config-file.js","sourceRoot":"","sources":["../../src/lib/ssh-config-file.ts"],"names":[],"mappings":"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"}
@@ -1,9 +1,8 @@
1
1
  #!/usr/bin/env node
2
- import { isolatedHostCaptureBlocked } from "./isolated-host-policy.js";
3
2
  import { markTrackerStartupReady, recordTrackerStartupFailure } from "./capture-startup-diagnostics.js";
4
3
  import { ActivityOutbox, activityReceiptMatches } from "./activity-outbox.js";
5
4
  import { relocateNoticeOwnership } from "./notice-ownership.js";
6
- import { collectProjectSnapshot } from "./project-snapshot.js";
5
+ import { captureSnapshot, SnapshotCaptureError } from "./snapshot-capture.js";
7
6
  import { watchProjectRoot, SNAPSHOT_REPAIR_GUIDANCE } from "./project-root.js";
8
7
  /**
9
8
  * Litmus file activity watcher.
@@ -32,13 +31,11 @@ import { getEffectiveDeadline, writeConfig, validateRebuiltTimes, computeTimeSyn
32
31
  import { CLI_VERSION } from "./version.js";
33
32
  import { armDeadlinePoll, createAutoSubmitController } from "./deadline.js";
34
33
  import { resumeChainFromLog } from "./chain.js";
35
- import { buildGitBundle, currentHead } from "./git-bundle.js";
36
34
  import { fetchInitMetadata, ServerError } from "./api.js";
37
35
  import { resolveBackendBase } from "./api-base.js";
38
36
  import { ServerTimesSchema } from "./schemas.js";
39
37
  import { detectInstalledHooks, notificationSetupAction, addActiveAssessment, removeActiveAssessment } from "./ai-tracking.js";
40
38
  import { retireAiCaptureForEndedSession, sessionOverMarked } from "./session-over.js";
41
- import { readActivityLogTail } from "./activity-tail.js";
42
39
  import { setupAiTracking } from "../commands/init.js";
43
40
  import { writeShadowChainCursor, readShadowChainCursor, writeShadowTrackerFile, writeShadowReviveInfo, readShadowConfigById, findShadowConfigForDir, deleteShadowForAssessment, writeRepairFile, removeRepairFile, REPAIR_FILE_NAME, } from "./shadow.js";
44
41
  import { createKeepAliveGuard } from "./keepalive.js";
@@ -55,10 +52,6 @@ import { codexStoreInventory, readCodexDelivery } from "./codex-capture-health.j
55
52
  // EPERM under Windows Defender, import error) and should die loudly, and a
56
53
  // hot error loop trips the storm guard rather than spinning forever. Anything
57
54
  // else is logged, reported as a chained watcher_error event, and survived.
58
- if (isolatedHostCaptureBlocked()) {
59
- process.stderr.write("privacy_scope_unavailable: native capture is unsupported in isolated-workspace mode\n");
60
- process.exit(0);
61
- }
62
55
  const keepAlive = createKeepAliveGuard(Date.now());
63
56
  process.on("uncaughtException", (err) => {
64
57
  const stack = String((err instanceof Error && err.stack) || err);
@@ -1473,71 +1466,6 @@ setInterval(detectNetworkAI, 5 * 60 * 1000); // Every 5 minutes
1473
1466
  // ── Codebase snapshot upload (for live interview agent) ──────────
1474
1467
  const SNAPSHOT_INTERVAL_MS = 5 * 60 * 1000; // Every 5 minutes
1475
1468
  // Text context and byte-preserving recovery capture live in project-snapshot.ts.
1476
- function getGitDiff() {
1477
- try {
1478
- return execSync("git diff HEAD~1 HEAD --stat --patch", {
1479
- cwd: projectDir,
1480
- maxBuffer: 500000,
1481
- timeout: 10000,
1482
- windowsHide: true,
1483
- }).toString().slice(0, 200000);
1484
- }
1485
- catch {
1486
- // No previous commit or git not available
1487
- try {
1488
- return execSync("git diff --cached --stat --patch", {
1489
- cwd: projectDir,
1490
- maxBuffer: 500000,
1491
- timeout: 10000,
1492
- windowsHide: true,
1493
- }).toString().slice(0, 200000);
1494
- }
1495
- catch {
1496
- return "";
1497
- }
1498
- }
1499
- }
1500
- function getRecentCommits() {
1501
- try {
1502
- const raw = execSync("git log --oneline --shortstat -10", {
1503
- cwd: projectDir,
1504
- maxBuffer: 100000,
1505
- timeout: 10000,
1506
- windowsHide: true,
1507
- }).toString();
1508
- const commits = [];
1509
- const lines = raw.split("\n");
1510
- let current = null;
1511
- for (const line of lines) {
1512
- const trimmed = line.trim();
1513
- if (!trimmed)
1514
- continue;
1515
- // Commit line: "abc1234 commit message"
1516
- const commitMatch = trimmed.match(/^([0-9a-f]{7,}) (.+)$/);
1517
- if (commitMatch) {
1518
- if (current)
1519
- commits.push(current);
1520
- current = { hash: commitMatch[1], message: commitMatch[2], linesAdded: 0, linesDeleted: 0 };
1521
- continue;
1522
- }
1523
- // Stats line: "3 files changed, 45 insertions(+), 12 deletions(-)"
1524
- if (current && trimmed.includes("file")) {
1525
- const addMatch = trimmed.match(/(\d+) insertion/);
1526
- const delMatch = trimmed.match(/(\d+) deletion/);
1527
- if (addMatch)
1528
- current.linesAdded = parseInt(addMatch[1]);
1529
- if (delMatch)
1530
- current.linesDeleted = parseInt(delMatch[1]);
1531
- }
1532
- }
1533
- if (current)
1534
- commits.push(current);
1535
- return commits;
1536
- }
1537
- catch {
1538
- return [];
1539
- }
1540
- }
1541
1469
  // ── Git history (ENG-2238) ──────────────────────────────────────
1542
1470
  // Capture lives in lib/git-bundle.ts; what belongs here is the one piece of
1543
1471
  // session state: HEAD at the last bundle the SERVER ACKED, so an unchanged
@@ -1602,86 +1530,96 @@ function reportProjectRootProblem() {
1602
1530
  reportSnapshotProblem(problem);
1603
1531
  return true;
1604
1532
  }
1605
- function uploadSnapshot() {
1533
+ let snapshotController = null;
1534
+ async function uploadSnapshot() {
1606
1535
  if (!uploadConfig)
1607
1536
  return;
1608
1537
  // Submit / time-limit / SIGTERM all set shuttingDown=true and flush the
1609
1538
  // queue. The 5-min interval would otherwise keep firing after the session
1610
1539
  // closed (server has already accepted the submission). Bail if we're
1611
1540
  // already on the way out.
1612
- if (shuttingDown)
1541
+ if (shuttingDown || snapshotController)
1613
1542
  return;
1543
+ // Persist the attempt before starting isolated capture. A timeout is reported
1544
+ // independently; the watcher remains able to send this marker and heartbeats.
1545
+ emit({ ts: new Date().toISOString(), type: "snapshot_tick" });
1614
1546
  if (reportProjectRootProblem())
1615
1547
  return;
1616
- const snapshot = collectProjectSnapshot(projectDir, rel => isCliNoticeArtifact(projectDir, rel, noticeOwnership));
1617
- const { files } = snapshot;
1618
- const fileCount = Object.keys(files).length;
1619
- if (fileCount === 0 && Object.keys(snapshot.recovery_files).length === 0) {
1620
- reportSnapshotProblem(snapshot.recovery_truncated ? "unreadable" : "empty");
1621
- return;
1622
- }
1623
- const gitDiff = getGitDiff();
1624
- const recentCommits = getRecentCommits();
1625
- // ENG-1952: the activity record rides its own field, not the files map — the
1626
- // dotfile ignore above is deliberate for code, and `files` feeds the
1627
- // interview agent's context. Without this, a reconstruction restores the
1628
- // candidate's code but none of their AI-usage evidence.
1629
- const activityLog = readActivityLogTail(projectDir);
1630
- const head = currentHead(projectDir);
1631
- const bundle = head && head !== lastBundledHead ? buildGitBundle(projectDir) : null;
1632
- const body = JSON.stringify({
1633
- ...snapshot,
1634
- git_diff: gitDiff,
1635
- recent_commits: recentCommits,
1636
- activity_log: activityLog,
1637
- // Omitted entirely when unchanged or unavailable; the server keeps the last
1638
- // good bundle rather than reading an absent field as "no history".
1639
- ...(bundle ? { git_bundle_gz: bundle.toString("base64") } : {}),
1640
- });
1641
- const omitted = Object.values(snapshot.recovery_files).filter(v => v === null).length;
1642
- if (omitted || snapshot.recovery_truncated)
1643
- process.stderr.write(`[watcher] recovery snapshot incomplete: ${omitted} file(s) omitted; file limit reached=${snapshot.recovery_truncated}\n`);
1644
- const url = new URL(`${uploadConfig.backendUrl}/cli/snapshot`);
1645
- const reqFn = url.protocol === "https:" ? https.request : http.request;
1646
- const req = reqFn(url, {
1647
- method: "POST",
1648
- headers: {
1649
- "Content-Type": "application/json",
1650
- "Content-Length": Buffer.byteLength(body),
1651
- "Authorization": `Bearer ${uploadConfig.token}`,
1652
- "X-Litmus-CLI-Version": CLI_VERSION, // ENG-1340
1653
- },
1654
- timeout: 30000, // 30s — snapshots can be larger
1655
- }, (res) => {
1656
- res.resume(); // Drain response
1657
- res.on("end", () => {
1658
- if (res.statusCode >= 400) {
1659
- process.stderr.write(`[watcher] snapshot upload failed: ${res.statusCode}\n`);
1660
- }
1661
- else {
1662
- // Only now is the history durably ours: an upload that never landed
1663
- // must be retried on the next tick, not suppressed as already sent.
1664
- if (snapshotProblem) {
1665
- emit({ ts: new Date().toISOString(), type: "snapshot_capture_restored" });
1666
- snapshotProblem = null;
1667
- removeRepairFile(projectDir);
1548
+ const captureRoot = projectDir;
1549
+ const controller = new AbortController();
1550
+ snapshotController = controller;
1551
+ try {
1552
+ const { snapshot, gitDiff, recentCommits, activityLog, head, bundle } = await captureSnapshot(captureRoot, lastBundledHead, noticeOwnership, { signal: controller.signal });
1553
+ if (shuttingDown || reportProjectRootProblem() || projectDir !== captureRoot)
1554
+ return;
1555
+ const { files } = snapshot;
1556
+ const fileCount = Object.keys(files).length;
1557
+ if (fileCount === 0 && Object.keys(snapshot.recovery_files).length === 0) {
1558
+ reportSnapshotProblem(snapshot.recovery_truncated ? "unreadable" : "empty");
1559
+ return;
1560
+ }
1561
+ const body = JSON.stringify({
1562
+ ...snapshot,
1563
+ git_diff: gitDiff,
1564
+ recent_commits: recentCommits,
1565
+ activity_log: activityLog,
1566
+ // Omitted entirely when unchanged or unavailable; the server keeps the last
1567
+ // good bundle rather than reading an absent field as "no history".
1568
+ ...(bundle ? { git_bundle_gz: bundle } : {}),
1569
+ });
1570
+ const omitted = Object.values(snapshot.recovery_files).filter(v => v === null).length;
1571
+ if (omitted || snapshot.recovery_truncated)
1572
+ process.stderr.write(`[watcher] recovery snapshot incomplete: ${omitted} file(s) omitted; file limit reached=${snapshot.recovery_truncated}\n`);
1573
+ const url = new URL(`${uploadConfig.backendUrl}/cli/snapshot`);
1574
+ const reqFn = url.protocol === "https:" ? https.request : http.request;
1575
+ const req = reqFn(url, {
1576
+ method: "POST",
1577
+ headers: {
1578
+ "Content-Type": "application/json",
1579
+ "Content-Length": Buffer.byteLength(body),
1580
+ "Authorization": `Bearer ${uploadConfig.token}`,
1581
+ "X-Litmus-CLI-Version": CLI_VERSION, // ENG-1340
1582
+ },
1583
+ timeout: 30000, // 30s — snapshots can be larger
1584
+ }, (res) => {
1585
+ res.resume(); // Drain response
1586
+ res.on("end", () => {
1587
+ if (res.statusCode >= 400) {
1588
+ process.stderr.write(`[watcher] snapshot upload failed: ${res.statusCode}\n`);
1668
1589
  }
1669
- if (bundle && head)
1670
- lastBundledHead = head;
1671
- process.stderr.write(`[watcher] snapshot uploaded: ${fileCount} files, ${(Buffer.byteLength(body) / 1024).toFixed(0)}KB${bundle ? ` (+git history ${(bundle.length / 1024).toFixed(0)}KB)` : ""}\n`);
1672
- }
1590
+ else {
1591
+ // Only now is the history durably ours: an upload that never landed
1592
+ // must be retried on the next tick, not suppressed as already sent.
1593
+ if (snapshotProblem) {
1594
+ emit({ ts: new Date().toISOString(), type: "snapshot_capture_restored" });
1595
+ snapshotProblem = null;
1596
+ removeRepairFile(projectDir);
1597
+ }
1598
+ if (bundle && head)
1599
+ lastBundledHead = head;
1600
+ process.stderr.write(`[watcher] snapshot uploaded: ${fileCount} files, ${(Buffer.byteLength(body) / 1024).toFixed(0)}KB${bundle ? ` (+git history ${(bundle.length / 1024).toFixed(0)}KB)` : ""}\n`);
1601
+ }
1602
+ });
1673
1603
  });
1674
- });
1675
- req.on("error", () => {
1676
- process.stderr.write("[watcher] snapshot upload error (network)\n");
1677
- });
1678
- req.on("timeout", () => { req.destroy(); });
1679
- req.end(body);
1604
+ req.on("error", () => {
1605
+ process.stderr.write("[watcher] snapshot upload error (network)\n");
1606
+ });
1607
+ req.on("timeout", () => { req.destroy(); });
1608
+ req.end(body);
1609
+ }
1610
+ catch (error) {
1611
+ if (!shuttingDown)
1612
+ reportSnapshotProblem(error instanceof SnapshotCaptureError ? error.reason : "worker_failed");
1613
+ }
1614
+ finally {
1615
+ if (snapshotController === controller)
1616
+ snapshotController = null;
1617
+ }
1680
1618
  }
1681
1619
  // First snapshot after 60s, then on interval
1682
1620
  setTimeout(() => {
1683
- uploadSnapshot();
1684
- setInterval(uploadSnapshot, SNAPSHOT_INTERVAL_MS);
1621
+ void uploadSnapshot();
1622
+ setInterval(() => { void uploadSnapshot(); }, SNAPSHOT_INTERVAL_MS);
1685
1623
  }, 60 * 1000);
1686
1624
  // ── Auto-submit at deadline ──────────────────────────────────────
1687
1625
  // Wall-clock POLL (see deadline.ts for the sleep/wake rationale). The poll
@@ -1807,6 +1745,7 @@ function shutdown(options = {}) {
1807
1745
  if (shuttingDown)
1808
1746
  return;
1809
1747
  shuttingDown = true;
1748
+ snapshotController?.abort();
1810
1749
  if (uploadRetryTimer) {
1811
1750
  clearTimeout(uploadRetryTimer);
1812
1751
  uploadRetryTimer = null;