@supersdk/supercli 0.1.2-staging.7 → 0.1.2-staging.8
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.
package/dist/auth/browserAuth.js
CHANGED
|
@@ -45,10 +45,13 @@ async function login(deps) {
|
|
|
45
45
|
}
|
|
46
46
|
const { request_id } = createOutcome.data;
|
|
47
47
|
const authorizeUrl = `${env.webOrigin}/cli/authorize?request=${encodeURIComponent(request_id)}`;
|
|
48
|
+
// URL **无条件**打印:"浏览器是否真的弹出来了"没有可靠的跨平台信号(见
|
|
49
|
+
// defaultOpenBrowser 的注释),一旦误判成功而不打印,用户就卡在粘码提示前、
|
|
50
|
+
// 手上没有任何可打开的地址。多打一行 URL 的代价远小于此。
|
|
48
51
|
const opened = await deps.openBrowser(authorizeUrl);
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
+
log_1.log.info(opened
|
|
53
|
+
? `opened your browser to authorize; if nothing appeared, open this URL manually: ${authorizeUrl}`
|
|
54
|
+
: `could not open a browser automatically — open this URL to continue: ${authorizeUrl}`);
|
|
52
55
|
const code = deps.promptCode().trim();
|
|
53
56
|
if (!code) {
|
|
54
57
|
return { ok: false, message: 'no authorization code entered' };
|
|
@@ -154,9 +157,22 @@ const defaultOpenBrowser = async (url) => {
|
|
|
154
157
|
resolve(false);
|
|
155
158
|
return;
|
|
156
159
|
}
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
setImmediate
|
|
160
|
+
// 🔴 必须等 'spawn'/'error' 二选一,不能 setImmediate(resolve(true))。
|
|
161
|
+
// 命令不存在(headless Linux / 精简容器里没有 xdg-open)时 spawn 不会同步抛,
|
|
162
|
+
// ENOENT 以**异步** error 事件到达,一定晚于 setImmediate —— 于是永远判成
|
|
163
|
+
// 「浏览器已打开」,授权 URL 那行不打印,用户卡在粘码提示前无 URL 可开。
|
|
164
|
+
let settled = false;
|
|
165
|
+
const settle = (opened) => {
|
|
166
|
+
if (settled)
|
|
167
|
+
return;
|
|
168
|
+
settled = true;
|
|
169
|
+
resolve(opened);
|
|
170
|
+
};
|
|
171
|
+
child.once('error', () => settle(false));
|
|
172
|
+
child.once('spawn', () => {
|
|
173
|
+
child.unref();
|
|
174
|
+
settle(true);
|
|
175
|
+
});
|
|
160
176
|
});
|
|
161
177
|
};
|
|
162
178
|
exports.defaultOpenBrowser = defaultOpenBrowser;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browserAuth.js","sourceRoot":"","sources":["../../src/auth/browserAuth.ts"],"names":[],"mappings":";;;AA0DA,
|
|
1
|
+
{"version":3,"file":"browserAuth.js","sourceRoot":"","sources":["../../src/auth/browserAuth.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED