@hadoku/dev-vault 1.5.1 → 1.5.2

package/login.mjs

@@ -21,8 +21,23 @@ import { mainCheckoutOf } from './key-file.mjs';
 export const EDGE = 'https://hadoku.me';
 const FILE = '.devvault.local.json';
 const POLL_MS = 3000;
+// A request lives a day (edge DEVICE_TTL_S), so the approver can get to it
+// later. Poll briskly while someone is likely approving right now, then slowly:
+// a day at 3s would be ~29k requests for one abandoned login.
+const BRISK_MS = 10 * 60 * 1000;
+const SLOW_POLL_MS = 30_000;
 const DAY_MS = 24 * 60 * 60 * 1000;
 
+/** 86_400_000 -> "24 hours", 600_000 -> "10 minutes". */
+export function spell(ms) {
+	const min = Math.round(ms / 60_000);
+	if (min % 60 === 0) {
+		const h = min / 60;
+		return `${h} hour${h === 1 ? '' : 's'}`;
+	}
+	return `${min} minute${min === 1 ? '' : 's'}`;
+}
+
 function runGit(cwd, args) {
 	const r = spawnSync('git', args, { cwd, encoding: 'utf-8' });
 	return r.status === 0 ? r.stdout.trim() : '';
@@ -94,9 +109,12 @@ export async function login({
 	log(`[dev-vault]   code ${userCode}  ·  ${host}${repo ? `  ·  ${repo}` : ''}`);
 	log('[dev-vault] waiting for approval…');
 
-	const deadline = now() + (Number(expiresIn) || 600) * 1000;
+	const ttlMs = (Number(expiresIn) || 600) * 1000;
+	const startedAt = now();
+	const deadline = startedAt + ttlMs;
+	log(`[dev-vault] (the link stays valid for ${spell(ttlMs)}; leave this running)`);
 	while (now() < deadline) {
-		await sleep(POLL_MS);
+		await sleep(now() - startedAt < BRISK_MS ? POLL_MS : SLOW_POLL_MS);
 		let polled;
 		try {
 			polled = await postJson(fetchImpl, `${base}/auth/service-access/device/poll`, {
@@ -129,6 +147,6 @@ export async function login({
 		);
 		return 0;
 	}
-	log('[dev-vault] login: nobody approved within 10 minutes. Run `dev-vault login` again.');
+	log(`[dev-vault] login: nobody approved within ${spell(ttlMs)}. Run \`dev-vault login\` again.`);
 	return 1;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hadoku/dev-vault",
-  "version": "1.5.1",
-  "gitHead": "a1ecd41d02f32e8b58bfa42fec6a8e5df302333a",
+  "version": "1.5.2",
+  "gitHead": "9010a68c19d319334869bb549bc90acc1ee4d0ca",
   "description": "Local-dev vault-broker shim — fetches secrets from the hadoku mgmt-api broker and execs a child command with them in process.env. Works for any consuming repo (Node or non-Node).",
   "type": "module",
   "bin": {