prompsit-cli 26.410.1743 → 26.411.1539
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;AAqB7D,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,cAAc,EAAE,MAAM,CAAC;CACxB;AAyDD;;;;;;;;;;GAUG;AACH,wBAAsB,aAAa,CACjC,YAAY,EAAE,YAAY,EAC1B,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,gBAAgB,CAAC,CAoH3B"}
|
|
@@ -14,6 +14,11 @@ import { DEVICE_FLOW_DEFAULT_INTERVAL } from "../shared/constants.js";
|
|
|
14
14
|
const log = getLogger(import.meta.url);
|
|
15
15
|
const BROWSER_TIMEOUT_MS = 3000;
|
|
16
16
|
const SLOW_DOWN_INCREMENT = 5; // RFC 8628 §3.5: increase interval by 5s on slow_down
|
|
17
|
+
// Adaptive polling: first 30 seconds (while user is actively in browser)
|
|
18
|
+
// poll every 2s for snappy UX. After that, fall back to API-provided interval.
|
|
19
|
+
// If API returns slow_down, we respect it immediately and disable adaptive mode.
|
|
20
|
+
const ADAPTIVE_WINDOW_MS = 30_000;
|
|
21
|
+
const ADAPTIVE_INTERVAL_SEC = 2;
|
|
17
22
|
/**
|
|
18
23
|
* Open a URL in the default browser.
|
|
19
24
|
* Cross-platform: start (win32), open (darwin), xdg-open (linux).
|
|
@@ -111,8 +116,13 @@ export async function runDeviceFlow(authResource, signal) {
|
|
|
111
116
|
terminal.warn(t("auth.device.browser_failed"));
|
|
112
117
|
}
|
|
113
118
|
// 4. Poll for authorization
|
|
114
|
-
|
|
115
|
-
|
|
119
|
+
// Adaptive interval: fast polling first 30s, fall back to API interval after.
|
|
120
|
+
// API-provided interval is the floor once adaptive window ends OR on slow_down.
|
|
121
|
+
const apiInterval = deviceAuth.interval || DEVICE_FLOW_DEFAULT_INTERVAL;
|
|
122
|
+
let interval = Math.min(apiInterval, ADAPTIVE_INTERVAL_SEC);
|
|
123
|
+
let adaptiveMode = true;
|
|
124
|
+
const pollStart = Date.now();
|
|
125
|
+
const deadline = pollStart + deviceAuth.expires_in * 1000;
|
|
116
126
|
// Spinner: ora for CLI, terminal.dim for REPL (stdin is raw)
|
|
117
127
|
const isRepl = process.stdin.isRaw;
|
|
118
128
|
let spinner = null;
|
|
@@ -124,6 +134,12 @@ export async function runDeviceFlow(authResource, signal) {
|
|
|
124
134
|
}
|
|
125
135
|
try {
|
|
126
136
|
while (Date.now() < deadline) {
|
|
137
|
+
// Adaptive window expired → switch to API-provided interval
|
|
138
|
+
if (adaptiveMode && Date.now() - pollStart >= ADAPTIVE_WINDOW_MS) {
|
|
139
|
+
adaptiveMode = false;
|
|
140
|
+
interval = apiInterval;
|
|
141
|
+
log.debug("Adaptive polling window ended", { new_interval: String(interval) });
|
|
142
|
+
}
|
|
127
143
|
// Cancellable sleep (AbortSignal from REPL Ctrl+C or CLI SIGINT)
|
|
128
144
|
try {
|
|
129
145
|
await sleep(interval * 1000, signal);
|
|
@@ -151,7 +167,10 @@ export async function runDeviceFlow(authResource, signal) {
|
|
|
151
167
|
break;
|
|
152
168
|
}
|
|
153
169
|
case "slow_down": {
|
|
154
|
-
|
|
170
|
+
// Server throttling — disable adaptive mode and respect RFC 8628 §3.5:
|
|
171
|
+
// "the interval MUST be increased by 5 seconds for all subsequent requests"
|
|
172
|
+
adaptiveMode = false;
|
|
173
|
+
interval = Math.max(interval, apiInterval) + SLOW_DOWN_INCREMENT;
|
|
155
174
|
log.debug("Polling slowed down", { new_interval: String(interval) });
|
|
156
175
|
break;
|
|
157
176
|
}
|
|
@@ -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,YAAY,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACzD,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,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,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,kBAAkB,GAAG,IAAI,CAAC;AAChC,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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"}
|