prompsit-cli 26.428.1513 → 26.602.1316
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"device-flow.d.ts","sourceRoot":"","sources":["../../src/commands/device-flow.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"device-flow.d.ts","sourceRoot":"","sources":["../../src/commands/device-flow.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAa7D,2CAA2C;AAC3C,MAAM,WAAW,gBAAgB;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,4EAA4E;IAC5E,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,aAAa,CACjC,YAAY,EAAE,YAAY,EAC1B,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,gBAAgB,CAAC,CA2G3B"}
|
|
@@ -12,11 +12,6 @@ import { getLogger } from "../logging/index.js";
|
|
|
12
12
|
import { DEVICE_FLOW_DEFAULT_INTERVAL } from "../shared/constants.js";
|
|
13
13
|
const log = getLogger(import.meta.url);
|
|
14
14
|
const SLOW_DOWN_INCREMENT = 5; // RFC 8628 §3.5: increase interval by 5s on slow_down
|
|
15
|
-
// Adaptive polling: first 30 seconds (while user is actively in browser)
|
|
16
|
-
// poll every 2s for snappy UX. After that, fall back to API-provided interval.
|
|
17
|
-
// If API returns slow_down, we respect it immediately and disable adaptive mode.
|
|
18
|
-
const ADAPTIVE_WINDOW_MS = 30_000;
|
|
19
|
-
const ADAPTIVE_INTERVAL_SEC = 2;
|
|
20
15
|
/**
|
|
21
16
|
* Run the complete RFC 8628 Device Flow.
|
|
22
17
|
*
|
|
@@ -59,13 +54,11 @@ export async function runDeviceFlow(authResource, signal) {
|
|
|
59
54
|
terminal.warn(t("auth.device.browser_failed"));
|
|
60
55
|
}
|
|
61
56
|
// 4. Poll for authorization
|
|
62
|
-
//
|
|
63
|
-
//
|
|
64
|
-
|
|
65
|
-
let interval =
|
|
66
|
-
|
|
67
|
-
const pollStart = Date.now();
|
|
68
|
-
const deadline = pollStart + deviceAuth.expires_in * 1000;
|
|
57
|
+
// Honor the server-advertised interval as-is. The server enforces this value as a
|
|
58
|
+
// hard minimum (RFC 8628 §3.5) and returns slow_down to anyone polling faster, so
|
|
59
|
+
// polling below it is counterproductive — it only earns a slow_down penalty.
|
|
60
|
+
let interval = deviceAuth.interval || DEVICE_FLOW_DEFAULT_INTERVAL;
|
|
61
|
+
const deadline = Date.now() + deviceAuth.expires_in * 1000;
|
|
69
62
|
// Spinner: ora for CLI, terminal.dim for REPL (stdin is raw)
|
|
70
63
|
const isRepl = process.stdin.isRaw;
|
|
71
64
|
let spinner = null;
|
|
@@ -77,12 +70,6 @@ export async function runDeviceFlow(authResource, signal) {
|
|
|
77
70
|
}
|
|
78
71
|
try {
|
|
79
72
|
while (Date.now() < deadline) {
|
|
80
|
-
// Adaptive window expired → switch to API-provided interval
|
|
81
|
-
if (adaptiveMode && Date.now() - pollStart >= ADAPTIVE_WINDOW_MS) {
|
|
82
|
-
adaptiveMode = false;
|
|
83
|
-
interval = apiInterval;
|
|
84
|
-
log.debug("Adaptive polling window ended", { new_interval: String(interval) });
|
|
85
|
-
}
|
|
86
73
|
// Cancellable sleep (AbortSignal from REPL Ctrl+C or CLI SIGINT)
|
|
87
74
|
try {
|
|
88
75
|
await sleep(interval * 1000, signal);
|
|
@@ -110,10 +97,10 @@ export async function runDeviceFlow(authResource, signal) {
|
|
|
110
97
|
break;
|
|
111
98
|
}
|
|
112
99
|
case "slow_down": {
|
|
113
|
-
//
|
|
114
|
-
//
|
|
115
|
-
|
|
116
|
-
interval
|
|
100
|
+
// Defensive backstop. We already poll at the server-advertised interval, so
|
|
101
|
+
// this should not fire in normal operation; if it does, respect RFC 8628 §3.5:
|
|
102
|
+
// "the interval MUST be increased by 5 seconds for all subsequent requests".
|
|
103
|
+
interval += SLOW_DOWN_INCREMENT;
|
|
117
104
|
log.debug("Polling slowed down", { new_interval: String(interval) });
|
|
118
105
|
break;
|
|
119
106
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"device-flow.js","sourceRoot":"","sources":["../../src/commands/device-flow.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,mFAAmF;AACnF,qEAAqE;AAErE,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,GAAG,EAAE,EAAY,MAAM,KAAK,CAAC;AAEpC,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7E,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,CAAC,EAAE,MAAM,kBAAkB,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AAEtE,MAAM,GAAG,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAEvC,MAAM,mBAAmB,GAAG,CAAC,CAAC,CAAC,sDAAsD;
|
|
1
|
+
{"version":3,"file":"device-flow.js","sourceRoot":"","sources":["../../src/commands/device-flow.ts"],"names":[],"mappings":"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"}
|