paseo-agy-acp 2.3.0 → 2.3.1
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,2 @@
|
|
|
1
|
-
|
|
1
|
+
import type { Readable } from "node:stream";
|
|
2
|
+
export declare function runOfficialLogin(environment?: NodeJS.ProcessEnv, version?: string, input?: Readable): Promise<number>;
|
|
@@ -1,12 +1,19 @@
|
|
|
1
|
+
import { get } from "node:http";
|
|
2
|
+
import { createInterface } from "node:readline/promises";
|
|
1
3
|
import { isJsonRpcFailure, isJsonRpcSuccess } from "./json-rpc.js";
|
|
2
4
|
import { createNdjsonParser, encodeNdjson } from "./ndjson.js";
|
|
3
5
|
import { spawnOfficialKernel } from "./spawn.js";
|
|
4
6
|
const AUTHENTICATE_TIMEOUT_MS = 10 * 60_000;
|
|
5
|
-
export async function runOfficialLogin(environment = process.env, version = "0.0.0") {
|
|
7
|
+
export async function runOfficialLogin(environment = process.env, version = "0.0.0", input = process.stdin) {
|
|
6
8
|
process.stderr.write("Starting official Antigravity ACP login (authenticate methodId=oauth-personal).\n");
|
|
7
|
-
|
|
9
|
+
// The official kernel prints the OAuth URL as ordinary stdout text. Its
|
|
10
|
+
// stdout is a pipe here, so force Python to flush that prompt immediately.
|
|
11
|
+
const child = spawnOfficialKernel({ ...environment, PYTHONUNBUFFERED: "1" });
|
|
8
12
|
const pending = new Map();
|
|
9
13
|
let nextId = 1;
|
|
14
|
+
let authenticationStarted = false;
|
|
15
|
+
let promptCallback;
|
|
16
|
+
let rejectLogin;
|
|
10
17
|
const parse = createNdjsonParser((message) => {
|
|
11
18
|
if ("method" in message && !("id" in message)) {
|
|
12
19
|
const params = "params" in message ? message.params : undefined;
|
|
@@ -18,6 +25,13 @@ export async function runOfficialLogin(environment = process.env, version = "0.0
|
|
|
18
25
|
pending.delete(message.id);
|
|
19
26
|
settle?.(message);
|
|
20
27
|
}
|
|
28
|
+
}, (line) => {
|
|
29
|
+
process.stderr.write(`${formatLoginOutput(line)}\n`);
|
|
30
|
+
if (authenticationStarted && !promptCallback && extractUrl(line)) {
|
|
31
|
+
promptCallback = promptForCallbackUrl(input)
|
|
32
|
+
.then(deliverOAuthCallback)
|
|
33
|
+
.catch((error) => rejectLogin?.(error));
|
|
34
|
+
}
|
|
21
35
|
});
|
|
22
36
|
child.stdout.on("data", parse);
|
|
23
37
|
const request = (method, params) => {
|
|
@@ -43,7 +57,13 @@ export async function runOfficialLogin(environment = process.env, version = "0.0
|
|
|
43
57
|
if (isJsonRpcFailure(initialized)) {
|
|
44
58
|
throw new Error(initialized.error.message);
|
|
45
59
|
}
|
|
46
|
-
|
|
60
|
+
authenticationStarted = true;
|
|
61
|
+
const authenticated = await Promise.race([
|
|
62
|
+
request("authenticate", { methodId: "oauth-personal" }),
|
|
63
|
+
new Promise((_, reject) => {
|
|
64
|
+
rejectLogin = reject;
|
|
65
|
+
})
|
|
66
|
+
]);
|
|
47
67
|
if (isJsonRpcFailure(authenticated)) {
|
|
48
68
|
throw new Error(authenticated.error.message);
|
|
49
69
|
}
|
|
@@ -64,6 +84,56 @@ export async function runOfficialLogin(environment = process.env, version = "0.0
|
|
|
64
84
|
}
|
|
65
85
|
}
|
|
66
86
|
}
|
|
87
|
+
function extractUrl(line) {
|
|
88
|
+
return line.match(/https?:\/\/\S+/)?.[0];
|
|
89
|
+
}
|
|
90
|
+
function formatLoginOutput(line) {
|
|
91
|
+
const url = extractUrl(line);
|
|
92
|
+
if (!url || !line.startsWith("Open the following link to authenticate the ACP server:")) {
|
|
93
|
+
return line;
|
|
94
|
+
}
|
|
95
|
+
return `${line.slice(0, line.indexOf(url)).trimEnd()}\n\n${url}\n`;
|
|
96
|
+
}
|
|
97
|
+
async function promptForCallbackUrl(input) {
|
|
98
|
+
const readline = createInterface({ input, output: process.stderr });
|
|
99
|
+
try {
|
|
100
|
+
const callbackUrl = (await readline.question("\nPaste the OAuth callback URL to finish login: ")).trim();
|
|
101
|
+
if (callbackUrl.length === 0)
|
|
102
|
+
throw new Error("OAuth callback URL is required");
|
|
103
|
+
return callbackUrl;
|
|
104
|
+
}
|
|
105
|
+
finally {
|
|
106
|
+
readline.close();
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
function deliverOAuthCallback(callbackUrl) {
|
|
110
|
+
let url;
|
|
111
|
+
try {
|
|
112
|
+
url = new URL(callbackUrl);
|
|
113
|
+
}
|
|
114
|
+
catch {
|
|
115
|
+
return Promise.reject(new Error("OAuth callback URL is invalid"));
|
|
116
|
+
}
|
|
117
|
+
if (url.protocol !== "http:" || !isLoopbackHost(url.hostname)) {
|
|
118
|
+
return Promise.reject(new Error("OAuth callback URL must use a local HTTP address"));
|
|
119
|
+
}
|
|
120
|
+
return new Promise((resolve, reject) => {
|
|
121
|
+
const request = get(url, (response) => {
|
|
122
|
+
response.resume();
|
|
123
|
+
if ((response.statusCode ?? 500) >= 400) {
|
|
124
|
+
reject(new Error(`OAuth callback returned HTTP ${response.statusCode}`));
|
|
125
|
+
}
|
|
126
|
+
else {
|
|
127
|
+
resolve();
|
|
128
|
+
}
|
|
129
|
+
});
|
|
130
|
+
request.setTimeout(10_000, () => request.destroy(new Error("OAuth callback timed out")));
|
|
131
|
+
request.once("error", reject);
|
|
132
|
+
});
|
|
133
|
+
}
|
|
134
|
+
function isLoopbackHost(hostname) {
|
|
135
|
+
return hostname === "127.0.0.1" || hostname === "localhost" || hostname === "[::1]";
|
|
136
|
+
}
|
|
67
137
|
function summarizeAuthUpdate(method, params) {
|
|
68
138
|
if (typeof params === "object" && params !== null) {
|
|
69
139
|
return `official kernel: ${method} ${JSON.stringify(params).slice(0, 400)}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../ACP Connector/official-kernel/login.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAGjB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEjD,MAAM,uBAAuB,GAAG,EAAE,GAAG,MAAM,CAAC;AAE5C,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,WAAW,GAAsB,OAAO,CAAC,GAAG,EAC5C,OAAO,GAAG,OAAO;
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../ACP Connector/official-kernel/login.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED