opencode-account-manager 0.6.6 → 0.6.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/.github/workflows/ci.yml +27 -0
- package/README.md +43 -25
- package/README_VI.md +43 -25
- package/dist/cli.js +67 -5
- package/dist/cli.js.map +1 -1
- package/dist/core/accounts.d.ts.map +1 -1
- package/dist/core/accounts.js +11 -4
- package/dist/core/accounts.js.map +1 -1
- package/dist/core/config-store.d.ts +13 -0
- package/dist/core/config-store.d.ts.map +1 -1
- package/dist/core/config-store.js +31 -1
- package/dist/core/config-store.js.map +1 -1
- package/dist/core/fingerprint.d.ts +11 -0
- package/dist/core/fingerprint.d.ts.map +1 -0
- package/dist/core/fingerprint.js +47 -0
- package/dist/core/fingerprint.js.map +1 -0
- package/dist/core/health-log.d.ts +5 -0
- package/dist/core/health-log.d.ts.map +1 -1
- package/dist/core/health-log.js +32 -0
- package/dist/core/health-log.js.map +1 -1
- package/dist/core/health-oauth.d.ts.map +1 -1
- package/dist/core/health-oauth.js +6 -0
- package/dist/core/health-oauth.js.map +1 -1
- package/dist/core/health-orchestrator.d.ts.map +1 -1
- package/dist/core/health-orchestrator.js +26 -2
- package/dist/core/health-orchestrator.js.map +1 -1
- package/dist/core/importers/amExport.d.ts.map +1 -1
- package/dist/core/importers/amExport.js +2 -37
- package/dist/core/importers/amExport.js.map +1 -1
- package/dist/core/importers/amJson.d.ts.map +1 -1
- package/dist/core/importers/amJson.js +2 -34
- package/dist/core/importers/amJson.js.map +1 -1
- package/dist/core/opencode-config.d.ts +13 -0
- package/dist/core/opencode-config.d.ts.map +1 -1
- package/dist/core/opencode-config.js +25 -1
- package/dist/core/opencode-config.js.map +1 -1
- package/dist/tui/Dashboard.d.ts.map +1 -1
- package/dist/tui/Dashboard.js +24 -3
- package/dist/tui/Dashboard.js.map +1 -1
- package/dist/tui/components/DashboardView.d.ts.map +1 -1
- package/dist/tui/components/DashboardView.js +3 -19
- package/dist/tui/components/DashboardView.js.map +1 -1
- package/docs/ROADMAP.md +27 -5
- package/package.json +10 -9
- package/src/cli.ts +113 -43
- package/src/core/accounts.ts +33 -29
- package/src/core/config-store.ts +60 -21
- package/src/core/fingerprint.ts +49 -0
- package/src/core/health-log.ts +37 -0
- package/src/core/health-oauth.ts +7 -0
- package/src/core/health-orchestrator.ts +33 -6
- package/src/core/importers/amExport.ts +4 -43
- package/src/core/importers/amJson.ts +8 -44
- package/src/core/opencode-config.ts +58 -22
- package/src/tui/Dashboard.tsx +36 -9
- package/src/tui/components/DashboardView.tsx +1 -19
- package/tests/accounts.test.js +204 -0
- package/tests/health-log.test.js +87 -0
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Fingerprint generator for account imports
|
|
4
|
+
* Uses Node.js crypto module for UUID generation
|
|
5
|
+
*/
|
|
6
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
+
exports.generateFingerprint = generateFingerprint;
|
|
8
|
+
const crypto_1 = require("crypto");
|
|
9
|
+
/**
|
|
10
|
+
* Generate random hex string of specified length
|
|
11
|
+
*/
|
|
12
|
+
function randomHex(len) {
|
|
13
|
+
return (0, crypto_1.randomBytes)(Math.ceil(len / 2))
|
|
14
|
+
.toString("hex")
|
|
15
|
+
.slice(0, len);
|
|
16
|
+
}
|
|
17
|
+
/**
|
|
18
|
+
* Generate a new fingerprint for imported accounts
|
|
19
|
+
* Uses Node.js crypto for secure random generation
|
|
20
|
+
*/
|
|
21
|
+
function generateFingerprint() {
|
|
22
|
+
const platforms = ["win32/x64", "win32/arm64", "darwin/x64", "darwin/arm64"];
|
|
23
|
+
const ides = ["ANDROID_STUDIO", "INTELLIJ", "IDE_UNSPECIFIED"];
|
|
24
|
+
const clients = [
|
|
25
|
+
"google-cloud-sdk android-studio/2024.1",
|
|
26
|
+
"google-cloud-sdk intellij/2024.1",
|
|
27
|
+
"google-cloud-sdk vscode/1.87.0",
|
|
28
|
+
];
|
|
29
|
+
const platform = platforms[Math.floor(Math.random() * platforms.length)];
|
|
30
|
+
return {
|
|
31
|
+
deviceId: (0, crypto_1.randomUUID)(),
|
|
32
|
+
sessionToken: randomHex(32),
|
|
33
|
+
userAgent: `antigravity/1.15.8 ${platform}`,
|
|
34
|
+
apiClient: clients[Math.floor(Math.random() * clients.length)],
|
|
35
|
+
clientMetadata: {
|
|
36
|
+
ideType: ides[Math.floor(Math.random() * ides.length)],
|
|
37
|
+
platform: platform.startsWith("darwin") ? "MACOS" : "WINDOWS",
|
|
38
|
+
pluginType: "GEMINI",
|
|
39
|
+
osVersion: platform.startsWith("darwin") ? "14.2.1" : "10.0.19042",
|
|
40
|
+
arch: platform.split("/")[1],
|
|
41
|
+
sqmId: `{${(0, crypto_1.randomUUID)().toUpperCase()}}`,
|
|
42
|
+
},
|
|
43
|
+
quotaUser: `device-${randomHex(16)}`,
|
|
44
|
+
createdAt: Date.now(),
|
|
45
|
+
};
|
|
46
|
+
}
|
|
47
|
+
//# sourceMappingURL=fingerprint.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fingerprint.js","sourceRoot":"","sources":["../../src/core/fingerprint.ts"],"names":[],"mappings":";AAAA;;;GAGG;;AAkBH,kDA2BC;AA3CD,mCAAiD;AAGjD;;GAEG;AACH,SAAS,SAAS,CAAC,GAAW;IAC5B,OAAO,IAAA,oBAAW,EAAC,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;SACnC,QAAQ,CAAC,KAAK,CAAC;SACf,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;AACnB,CAAC;AAED;;;GAGG;AACH,SAAgB,mBAAmB;IACjC,MAAM,SAAS,GAAG,CAAC,WAAW,EAAE,aAAa,EAAE,YAAY,EAAE,cAAc,CAAC,CAAC;IAC7E,MAAM,IAAI,GAAG,CAAC,gBAAgB,EAAE,UAAU,EAAE,iBAAiB,CAAC,CAAC;IAC/D,MAAM,OAAO,GAAG;QACd,wCAAwC;QACxC,kCAAkC;QAClC,gCAAgC;KACjC,CAAC;IAEF,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;IAEzE,OAAO;QACL,QAAQ,EAAE,IAAA,mBAAU,GAAE;QACtB,YAAY,EAAE,SAAS,CAAC,EAAE,CAAC;QAC3B,SAAS,EAAE,sBAAsB,QAAQ,EAAE;QAC3C,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;QAC9D,cAAc,EAAE;YACd,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;YACtD,QAAQ,EAAE,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;YAC7D,UAAU,EAAE,QAAQ;YACpB,SAAS,EAAE,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,YAAY;YAClE,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAC5B,KAAK,EAAE,IAAI,IAAA,mBAAU,GAAE,CAAC,WAAW,EAAE,GAAG;SACzC;QACD,SAAS,EAAE,UAAU,SAAS,CAAC,EAAE,CAAC,EAAE;QACpC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;KACtB,CAAC;AACJ,CAAC"}
|
|
@@ -6,4 +6,9 @@ export interface LogHealthOptions {
|
|
|
6
6
|
}
|
|
7
7
|
export declare function collectLogHealthResults(options?: LogHealthOptions): Record<string, AccountHealthResult>;
|
|
8
8
|
export declare function mergeAccountHealth(primary: AccountHealthResult | undefined, secondary: AccountHealthResult | undefined): AccountHealthResult | undefined;
|
|
9
|
+
/**
|
|
10
|
+
* Redact sensitive information from a message before storing in cache.
|
|
11
|
+
* Hides tokens, refresh_tokens, and long email addresses.
|
|
12
|
+
*/
|
|
13
|
+
export declare function redactMessage(message: string | undefined): string | undefined;
|
|
9
14
|
//# sourceMappingURL=health-log.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"health-log.d.ts","sourceRoot":"","sources":["../../src/core/health-log.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAuB,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"health-log.d.ts","sourceRoot":"","sources":["../../src/core/health-log.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAuB,MAAM,SAAS,CAAC;AA0GnE,MAAM,WAAW,gBAAgB;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,wBAAgB,uBAAuB,CACrC,OAAO,GAAE,gBAAqB,GAC7B,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAsDrC;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,mBAAmB,GAAG,SAAS,EACxC,SAAS,EAAE,mBAAmB,GAAG,SAAS,GACzC,mBAAmB,GAAG,SAAS,CAEjC;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CA0B7E"}
|
package/dist/core/health-log.js
CHANGED
|
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.collectLogHealthResults = collectLogHealthResults;
|
|
7
7
|
exports.mergeAccountHealth = mergeAccountHealth;
|
|
8
|
+
exports.redactMessage = redactMessage;
|
|
8
9
|
const fs_1 = __importDefault(require("fs"));
|
|
9
10
|
const path_1 = __importDefault(require("path"));
|
|
10
11
|
const paths_1 = require("./paths");
|
|
@@ -12,6 +13,10 @@ const config_store_1 = require("./config-store");
|
|
|
12
13
|
const DEFAULT_MAX_FILES = 10;
|
|
13
14
|
const DEFAULT_MAX_BYTES = 2 * 1024 * 1024;
|
|
14
15
|
const EMAIL_REGEX = /[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}/gi;
|
|
16
|
+
// Patterns for redacting sensitive data
|
|
17
|
+
const TOKEN_REGEX = /token[=:]\s*["']?[a-zA-Z0-9_\-\.]+["']?/gi;
|
|
18
|
+
const REFRESH_TOKEN_REGEX = /refresh_token[=:]\s*["']?[a-zA-Z0-9_\-\.]+["']?/gi;
|
|
19
|
+
const LONG_EMAIL_REGEX = /[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}/gi;
|
|
15
20
|
const STATUS_PRIORITY = {
|
|
16
21
|
verification_required: 9,
|
|
17
22
|
disabled: 8,
|
|
@@ -151,4 +156,31 @@ function collectLogHealthResults(options = {}) {
|
|
|
151
156
|
function mergeAccountHealth(primary, secondary) {
|
|
152
157
|
return mergeHealthResults(primary, secondary);
|
|
153
158
|
}
|
|
159
|
+
/**
|
|
160
|
+
* Redact sensitive information from a message before storing in cache.
|
|
161
|
+
* Hides tokens, refresh_tokens, and long email addresses.
|
|
162
|
+
*/
|
|
163
|
+
function redactMessage(message) {
|
|
164
|
+
if (!message)
|
|
165
|
+
return message;
|
|
166
|
+
let redacted = message;
|
|
167
|
+
// Redact token=... or token: ... patterns
|
|
168
|
+
redacted = redacted.replace(TOKEN_REGEX, "token=***");
|
|
169
|
+
// Redact refresh_token=... or refresh_token: ... patterns
|
|
170
|
+
redacted = redacted.replace(REFRESH_TOKEN_REGEX, "refresh_token=***");
|
|
171
|
+
// Redact long email addresses (keep only first 3 chars and domain)
|
|
172
|
+
redacted = redacted.replace(LONG_EMAIL_REGEX, (email) => {
|
|
173
|
+
if (email.length > 20) {
|
|
174
|
+
const atIndex = email.indexOf("@");
|
|
175
|
+
if (atIndex > 0) {
|
|
176
|
+
const local = email.slice(0, Math.min(3, atIndex));
|
|
177
|
+
const domain = email.slice(atIndex);
|
|
178
|
+
return `${local}***${domain}`;
|
|
179
|
+
}
|
|
180
|
+
return email.slice(0, 3) + "***";
|
|
181
|
+
}
|
|
182
|
+
return email;
|
|
183
|
+
});
|
|
184
|
+
return redacted;
|
|
185
|
+
}
|
|
154
186
|
//# sourceMappingURL=health-log.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"health-log.js","sourceRoot":"","sources":["../../src/core/health-log.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"health-log.js","sourceRoot":"","sources":["../../src/core/health-log.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"health-oauth.d.ts","sourceRoot":"","sources":["../../src/core/health-oauth.ts"],"names":[],"mappings":"AACA,OAAO,EACL,mBAAmB,EAEnB,iBAAiB,EAClB,MAAM,SAAS,CAAC;AA+BjB,wBAAgB,4BAA4B,IAAI,OAAO,CAEtD;AA4DD,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,GAAG,MAAM,CAQ7F;AAED,wBAAsB,uBAAuB,CAC3C,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,mBAAmB,CAAC,
|
|
1
|
+
{"version":3,"file":"health-oauth.d.ts","sourceRoot":"","sources":["../../src/core/health-oauth.ts"],"names":[],"mappings":"AACA,OAAO,EACL,mBAAmB,EAEnB,iBAAiB,EAClB,MAAM,SAAS,CAAC;AA+BjB,wBAAgB,4BAA4B,IAAI,OAAO,CAEtD;AA4DD,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,GAAG,MAAM,CAQ7F;AAED,wBAAsB,uBAAuB,CAC3C,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,mBAAmB,CAAC,CAsF9B"}
|
|
@@ -95,6 +95,12 @@ async function checkAccountHealthOAuth(refreshToken) {
|
|
|
95
95
|
});
|
|
96
96
|
}
|
|
97
97
|
const tokenEndpoint = config.tokenEndpoint || DEFAULT_TOKEN_ENDPOINT;
|
|
98
|
+
// Enforce HTTPS-only token endpoints for security
|
|
99
|
+
if (!tokenEndpoint.startsWith("https://")) {
|
|
100
|
+
return buildResult("not_configured", "oauth", {
|
|
101
|
+
message: "Token endpoint must use HTTPS protocol",
|
|
102
|
+
});
|
|
103
|
+
}
|
|
98
104
|
const body = buildOAuthRequestBody(refreshToken, config);
|
|
99
105
|
return new Promise((resolve) => {
|
|
100
106
|
const request = https_1.default.request(tokenEndpoint, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"health-oauth.js","sourceRoot":"","sources":["../../src/core/health-oauth.ts"],"names":[],"mappings":";;;;;AAoCA,oEAEC;AA4DD,sDAQC;AAED,
|
|
1
|
+
{"version":3,"file":"health-oauth.js","sourceRoot":"","sources":["../../src/core/health-oauth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"health-orchestrator.d.ts","sourceRoot":"","sources":["../../src/core/health-orchestrator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAU5E,MAAM,MAAM,gBAAgB,GAAG,kBAAkB,GAAG,UAAU,GAAG,UAAU,CAAC;AAE5E,MAAM,WAAW,kBAAkB;IACjC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACxE;AAED,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,mBAAmB,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,eAAe,EAAE,CAAC;IACzB,MAAM,EAAE;QACN,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,MAAM,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC;KAC/C,CAAC;IACF,MAAM,EAAE;QACN,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;CACH;AAiDD,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,OAAO,EAAE,EACnB,OAAO,GAAE,kBAAuB,GAC/B,OAAO,CAAC,iBAAiB,CAAC,
|
|
1
|
+
{"version":3,"file":"health-orchestrator.d.ts","sourceRoot":"","sources":["../../src/core/health-orchestrator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAU5E,MAAM,MAAM,gBAAgB,GAAG,kBAAkB,GAAG,UAAU,GAAG,UAAU,CAAC;AAE5E,MAAM,WAAW,kBAAkB;IACjC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACxE;AAED,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,mBAAmB,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,eAAe,EAAE,CAAC;IACzB,MAAM,EAAE;QACN,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,MAAM,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC;KAC/C,CAAC;IACF,MAAM,EAAE;QACN,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;CACH;AAiDD,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,OAAO,EAAE,EACnB,OAAO,GAAE,kBAAuB,GAC/B,OAAO,CAAC,iBAAiB,CAAC,CA6J5B"}
|
|
@@ -100,10 +100,34 @@ async function checkAccountsHealth(accounts, options = {}) {
|
|
|
100
100
|
if (options.onProgress) {
|
|
101
101
|
options.onProgress(completed, total, `Checking ${item.email}...`);
|
|
102
102
|
}
|
|
103
|
-
|
|
103
|
+
let oauthResult;
|
|
104
|
+
try {
|
|
105
|
+
oauthResult = await (0, health_oauth_1.checkAccountHealthOAuth)(item.refreshToken);
|
|
106
|
+
}
|
|
107
|
+
catch (error) {
|
|
108
|
+
const isNetworkError = error instanceof Error &&
|
|
109
|
+
(error.message.includes("network") ||
|
|
110
|
+
error.message.includes("ECONNREFUSED") ||
|
|
111
|
+
error.message.includes("ETIMEDOUT") ||
|
|
112
|
+
error.message.includes("ENOTFOUND") ||
|
|
113
|
+
error.message.includes("socket") ||
|
|
114
|
+
error.message.includes("timeout"));
|
|
115
|
+
oauthResult = {
|
|
116
|
+
status: isNetworkError ? "network_error" : "unknown_error",
|
|
117
|
+
source: "oauth",
|
|
118
|
+
checkedAt: Date.now(),
|
|
119
|
+
message: error instanceof Error ? error.message : String(error),
|
|
120
|
+
};
|
|
121
|
+
}
|
|
104
122
|
const key = (0, config_store_1.normalizeHealthKey)(item.email);
|
|
105
123
|
const merged = (0, health_log_1.mergeAccountHealth)(oauthResult, logResults[key]) || oauthResult;
|
|
106
|
-
|
|
124
|
+
// Redact sensitive data before caching
|
|
125
|
+
const redactedResult = {
|
|
126
|
+
...merged,
|
|
127
|
+
message: (0, health_log_1.redactMessage)(merged.message),
|
|
128
|
+
errorDescription: (0, health_log_1.redactMessage)(merged.errorDescription),
|
|
129
|
+
};
|
|
130
|
+
(0, config_store_1.setHealthCacheEntry)(item.email, redactedResult);
|
|
107
131
|
completed++;
|
|
108
132
|
if (options.onProgress) {
|
|
109
133
|
options.onProgress(completed, total, `Finished ${item.email}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"health-orchestrator.js","sourceRoot":"","sources":["../../src/core/health-orchestrator.ts"],"names":[],"mappings":";;AA0FA,
|
|
1
|
+
{"version":3,"file":"health-orchestrator.js","sourceRoot":"","sources":["../../src/core/health-orchestrator.ts"],"names":[],"mappings":";;AA0FA,kDAgKC;AAzPD,iDAKwB;AACxB,iDAAyD;AACzD,6CAA0F;AAmC1F,SAAS,gBAAgB,CAAC,OAAe;IACvC,OAAO;QACL,MAAM,EAAE,aAAa;QACrB,MAAM,EAAE,QAAQ;QAChB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;QACrB,OAAO;KACR,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CACxB,MAA2C,EAC3C,MAA2B;IAE3B,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;AAC7C,CAAC;AAED,KAAK,UAAU,kBAAkB,CAC/B,KAAU,EACV,KAAa,EACb,IAA6B;IAE7B,MAAM,OAAO,GAAQ,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC7C,MAAM,SAAS,GAAG,IAAI,GAAG,EAAiB,CAAC;IAC3C,MAAM,KAAK,GAAoB,EAAE,CAAC;IAElC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,CAAC,CAAC;IAE1C,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QACrD,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;QAC1B,MAAM,OAAO,GAAG,CAAC,KAAK,IAAI,EAAE;YAC1B,OAAO,CAAC,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC,CAAC,EAAE,CAAC;QACL,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACpB,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAEvB,MAAM,KAAK,GAAG,GAAG,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC9C,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAEpC,IAAI,SAAS,CAAC,IAAI,IAAI,SAAS,EAAE,CAAC;YAChC,MAAM,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;IAED,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACzB,OAAO,OAAO,CAAC;AACjB,CAAC;AAEM,KAAK,UAAU,mBAAmB,CACvC,QAAmB,EACnB,UAA8B,EAAE;IAEhC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC7B,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,IAAI,CAAC;IAChD,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,KAAK,CAAC;IACrC,MAAM,QAAQ,GAAG,IAAA,gCAAiB,GAAE,CAAC;IACrC,MAAM,KAAK,GAAG,IAAA,6BAAc,GAAE,CAAC;IAC/B,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,IAAA,oCAAuB,GAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAEhE,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,iCAAkB,EAAC,KAAK,CAAC,CAAC,CAAC;IAC9E,MAAM,gBAAgB,GAAG,WAAW;QAClC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAA,iCAAkB,EAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;QAC/E,CAAC,CAAC,QAAQ,CAAC;IAEb,MAAM,KAAK,GAAsB,EAAE,CAAC;IACpC,MAAM,OAAO,GAAmD,EAAE,CAAC;IACnE,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAEvB,KAAK,MAAM,OAAO,IAAI,gBAAgB,EAAE,CAAC;QACvC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAC5B,MAAM,GAAG,GAAG,IAAA,iCAAkB,EAAC,KAAK,CAAC,CAAC;QACtC,MAAM,MAAM,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAE/C,IAAI,MAAM,IAAI,GAAG,GAAG,MAAM,CAAC,SAAS,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;YACvD,MAAM,MAAM,GAAG,IAAA,+BAAkB,EAAC,MAAM,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,MAAM,CAAC;YACrE,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;YACpD,SAAS;QACX,CAAC;QAED,IAAI,CAAC,KAAK,IAAI,MAAM,IAAI,GAAG,GAAG,MAAM,CAAC,SAAS,GAAG,QAAQ,CAAC,UAAU,EAAE,CAAC;YACrE,MAAM,IAAI,GAAG,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;YACjD,MAAM,MAAM,GAAG,IAAA,+BAAkB,EAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC;YACjE,KAAK,CAAC,IAAI,CAAC;gBACT,KAAK;gBACL,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,IAAI;gBACb,UAAU,EAAE,UAAU;aACvB,CAAC,CAAC;YACH,SAAS;QACX,CAAC;QAED,IAAI,OAAO,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;YAC9B,MAAM,IAAI,GAAG,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;YAClD,MAAM,MAAM,GAAG,IAAA,+BAAkB,EAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC;YACjE,KAAK,CAAC,IAAI,CAAC;gBACT,KAAK;gBACL,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,IAAI;gBACb,UAAU,EAAE,UAAU;aACvB,CAAC,CAAC;YACH,SAAS;QACX,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;YAC1B,MAAM,IAAI,GAAG,gBAAgB,CAAC,uBAAuB,CAAC,CAAC;YACvD,MAAM,MAAM,GAAG,IAAA,+BAAkB,EAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC;YACjE,KAAK,CAAC,IAAI,CAAC;gBACT,KAAK;gBACL,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,IAAI;gBACb,UAAU,EAAE,kBAAkB;aAC/B,CAAC,CAAC;YACH,SAAS;QACX,CAAC;QAED,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,IAAI,SAAS,GAAG,CAAC,CAAC;IAClB,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC;IAE7B,MAAM,cAAc,GAAG,MAAM,kBAAkB,CAC7C,OAAO,EACP,QAAQ,CAAC,cAAc,EACvB,KAAK,EAAE,IAAI,EAAE,EAAE;QACb,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;YACvB,OAAO,CAAC,UAAU,CAAC,SAAS,EAAE,KAAK,EAAE,YAAY,IAAI,CAAC,KAAK,KAAK,CAAC,CAAC;QACpE,CAAC;QAED,IAAI,WAAgC,CAAC;QAErC,IAAI,CAAC;YACH,WAAW,GAAG,MAAM,IAAA,sCAAuB,EAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACjE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,cAAc,GAClB,KAAK,YAAY,KAAK;gBACtB,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;oBAChC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;oBACtC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;oBACnC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;oBACnC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC;oBAChC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC;YAEvC,WAAW,GAAG;gBACZ,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,eAAe;gBAC1D,MAAM,EAAE,OAAO;gBACf,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;gBACrB,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;aAChE,CAAC;QACJ,CAAC;QAED,MAAM,GAAG,GAAG,IAAA,iCAAkB,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC3C,MAAM,MAAM,GAAG,IAAA,+BAAkB,EAAC,WAAW,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,WAAW,CAAC;QAC/E,uCAAuC;QACvC,MAAM,cAAc,GAAwB;YAC1C,GAAG,MAAM;YACT,OAAO,EAAE,IAAA,0BAAa,EAAC,MAAM,CAAC,OAAO,CAAC;YACtC,gBAAgB,EAAE,IAAA,0BAAa,EAAC,MAAM,CAAC,gBAAgB,CAAC;SACzD,CAAC;QACF,IAAA,kCAAmB,EAAC,IAAI,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;QAEhD,SAAS,EAAE,CAAC;QACZ,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;YACvB,OAAO,CAAC,UAAU,CAAC,SAAS,EAAE,KAAK,EAAE,YAAY,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;QACjE,CAAC;QAED,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAC/C,CAAC,CACF,CAAC;IAEF,KAAK,MAAM,KAAK,IAAI,cAAc,EAAE,CAAC;QACnC,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAC3D,CAAC;IAED,MAAM,MAAM,GAAgC;QAC1C,KAAK,EAAE,gBAAgB,CAAC,MAAM;QAC9B,OAAO,EAAE,cAAc,CAAC,MAAM;QAC9B,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM;QACpD,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM;QAClD,QAAQ,EAAE;YACR,EAAE,EAAE,CAAC;YACL,qBAAqB,EAAE,CAAC;YACxB,OAAO,EAAE,CAAC;YACV,QAAQ,EAAE,CAAC;YACX,OAAO,EAAE,CAAC;YACV,gBAAgB,EAAE,CAAC;YACnB,aAAa,EAAE,CAAC;YAChB,aAAa,EAAE,CAAC;YAChB,WAAW,EAAE,CAAC;YACd,cAAc,EAAE,CAAC;SAClB;KACF,CAAC;IAEF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,iBAAiB,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACzD,CAAC;IAED,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAE/B,OAAO;QACL,KAAK;QACL,MAAM;QACN,MAAM,EAAE;YACN,SAAS;YACT,WAAW;YACX,UAAU,EAAE,WAAW,GAAG,SAAS;SACpC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"amExport.d.ts","sourceRoot":"","sources":["../../../src/core/importers/amExport.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"amExport.d.ts","sourceRoot":"","sources":["../../../src/core/importers/amExport.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAGnC;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,IAAI,aAAa,EAAE,CAYrE;AAED,MAAM,WAAW,wBAAwB;IACvC,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,MAAM,EAAE,WAAW,CAAC;CACrB;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,wBAAwB,CAmC5F;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,wBAAwB,CA+BjF;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAU5D"}
|
|
@@ -19,6 +19,7 @@ exports.importFromAMExportContent = importFromAMExportContent;
|
|
|
19
19
|
exports.importFromAMExportFile = importFromAMExportFile;
|
|
20
20
|
exports.isAMExportFilePath = isAMExportFilePath;
|
|
21
21
|
const fs_1 = __importDefault(require("fs"));
|
|
22
|
+
const fingerprint_1 = require("../fingerprint");
|
|
22
23
|
/**
|
|
23
24
|
* Type guard to check if data is an AM export file (array of entries)
|
|
24
25
|
*/
|
|
@@ -34,42 +35,6 @@ function isAMExportFile(data) {
|
|
|
34
35
|
typeof item.email === "string" &&
|
|
35
36
|
typeof item.refresh_token === "string");
|
|
36
37
|
}
|
|
37
|
-
/**
|
|
38
|
-
* Generate a new fingerprint for imported accounts
|
|
39
|
-
*/
|
|
40
|
-
function generateFingerprint() {
|
|
41
|
-
const randomHex = (len) => {
|
|
42
|
-
let result = "";
|
|
43
|
-
for (let i = 0; i < len; i++) {
|
|
44
|
-
result += Math.floor(Math.random() * 16).toString(16);
|
|
45
|
-
}
|
|
46
|
-
return result;
|
|
47
|
-
};
|
|
48
|
-
const platforms = ["win32/x64", "win32/arm64", "darwin/x64", "darwin/arm64"];
|
|
49
|
-
const ides = ["ANDROID_STUDIO", "INTELLIJ", "IDE_UNSPECIFIED"];
|
|
50
|
-
const clients = [
|
|
51
|
-
"google-cloud-sdk android-studio/2024.1",
|
|
52
|
-
"google-cloud-sdk intellij/2024.1",
|
|
53
|
-
"google-cloud-sdk vscode/1.87.0",
|
|
54
|
-
];
|
|
55
|
-
const platform = platforms[Math.floor(Math.random() * platforms.length)];
|
|
56
|
-
return {
|
|
57
|
-
deviceId: crypto.randomUUID(),
|
|
58
|
-
sessionToken: randomHex(32),
|
|
59
|
-
userAgent: `antigravity/1.15.8 ${platform}`,
|
|
60
|
-
apiClient: clients[Math.floor(Math.random() * clients.length)],
|
|
61
|
-
clientMetadata: {
|
|
62
|
-
ideType: ides[Math.floor(Math.random() * ides.length)],
|
|
63
|
-
platform: platform.startsWith("darwin") ? "MACOS" : "WINDOWS",
|
|
64
|
-
pluginType: "GEMINI",
|
|
65
|
-
osVersion: platform.startsWith("darwin") ? "14.2.1" : "10.0.19042",
|
|
66
|
-
arch: platform.split("/")[1],
|
|
67
|
-
sqmId: `{${crypto.randomUUID().toUpperCase()}}`,
|
|
68
|
-
},
|
|
69
|
-
quotaUser: `device-${randomHex(16)}`,
|
|
70
|
-
createdAt: Date.now(),
|
|
71
|
-
};
|
|
72
|
-
}
|
|
73
38
|
/**
|
|
74
39
|
* Import accounts from AM export file content
|
|
75
40
|
*/
|
|
@@ -97,7 +62,7 @@ function importFromAMExportContent(entries) {
|
|
|
97
62
|
refreshToken: entry.refresh_token,
|
|
98
63
|
addedAt: Date.now(),
|
|
99
64
|
lastUsed: Date.now(),
|
|
100
|
-
fingerprint: generateFingerprint(),
|
|
65
|
+
fingerprint: (0, fingerprint_1.generateFingerprint)(),
|
|
101
66
|
enabled: true,
|
|
102
67
|
};
|
|
103
68
|
result.accounts.push(account);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"amExport.js","sourceRoot":"","sources":["../../../src/core/importers/amExport.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;;;
|
|
1
|
+
{"version":3,"file":"amExport.js","sourceRoot":"","sources":["../../../src/core/importers/amExport.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"amJson.d.ts","sourceRoot":"","sources":["../../../src/core/importers/amJson.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"amJson.d.ts","sourceRoot":"","sources":["../../../src/core/importers/amJson.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AA0CnC,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED,wBAAgB,kBAAkB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,kBAAkB,CAmFtE;AAED,wBAAgB,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAItD"}
|
|
@@ -16,39 +16,7 @@ exports.isAmFolder = isAmFolder;
|
|
|
16
16
|
const fs_1 = __importDefault(require("fs"));
|
|
17
17
|
const path_1 = __importDefault(require("path"));
|
|
18
18
|
const paths_1 = require("../paths");
|
|
19
|
-
|
|
20
|
-
const randomHex = (len) => {
|
|
21
|
-
let result = "";
|
|
22
|
-
for (let i = 0; i < len; i++) {
|
|
23
|
-
result += Math.floor(Math.random() * 16).toString(16);
|
|
24
|
-
}
|
|
25
|
-
return result;
|
|
26
|
-
};
|
|
27
|
-
const platforms = ["win32/x64", "win32/arm64", "darwin/x64", "darwin/arm64"];
|
|
28
|
-
const ides = ["ANDROID_STUDIO", "INTELLIJ", "IDE_UNSPECIFIED"];
|
|
29
|
-
const clients = [
|
|
30
|
-
"google-cloud-sdk android-studio/2024.1",
|
|
31
|
-
"google-cloud-sdk intellij/2024.1",
|
|
32
|
-
"google-cloud-sdk vscode/1.87.0",
|
|
33
|
-
];
|
|
34
|
-
const platform = platforms[Math.floor(Math.random() * platforms.length)];
|
|
35
|
-
return {
|
|
36
|
-
deviceId: crypto.randomUUID(),
|
|
37
|
-
sessionToken: randomHex(32),
|
|
38
|
-
userAgent: `antigravity/1.15.8 ${platform}`,
|
|
39
|
-
apiClient: clients[Math.floor(Math.random() * clients.length)],
|
|
40
|
-
clientMetadata: {
|
|
41
|
-
ideType: ides[Math.floor(Math.random() * ides.length)],
|
|
42
|
-
platform: platform.startsWith("darwin") ? "MACOS" : "WINDOWS",
|
|
43
|
-
pluginType: "GEMINI",
|
|
44
|
-
osVersion: platform.startsWith("darwin") ? "14.2.1" : "10.0.19042",
|
|
45
|
-
arch: platform.split("/")[1],
|
|
46
|
-
sqmId: `{${crypto.randomUUID().toUpperCase()}}`,
|
|
47
|
-
},
|
|
48
|
-
quotaUser: `device-${randomHex(16)}`,
|
|
49
|
-
createdAt: Date.now(),
|
|
50
|
-
};
|
|
51
|
-
}
|
|
19
|
+
const fingerprint_1 = require("../fingerprint");
|
|
52
20
|
function importFromAmFolder(amPath) {
|
|
53
21
|
const folderPath = amPath || (0, paths_1.getAmFolderPath)();
|
|
54
22
|
const result = {
|
|
@@ -117,7 +85,7 @@ function importFromAmFolder(amPath) {
|
|
|
117
85
|
managedProjectId: detail.token.project_id,
|
|
118
86
|
addedAt: Date.now(),
|
|
119
87
|
lastUsed: Date.now(),
|
|
120
|
-
fingerprint: generateFingerprint(),
|
|
88
|
+
fingerprint: (0, fingerprint_1.generateFingerprint)(),
|
|
121
89
|
};
|
|
122
90
|
result.accounts.push(account);
|
|
123
91
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"amJson.js","sourceRoot":"","sources":["../../../src/core/importers/amJson.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;;;
|
|
1
|
+
{"version":3,"file":"amJson.js","sourceRoot":"","sources":["../../../src/core/importers/amJson.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,6 +40,19 @@ export interface OpencodeConfig {
|
|
|
40
40
|
mcp?: Record<string, McpServerConfig>;
|
|
41
41
|
provider?: Record<string, ProviderConfig>;
|
|
42
42
|
}
|
|
43
|
+
export interface ConfigError {
|
|
44
|
+
file: string;
|
|
45
|
+
message: string;
|
|
46
|
+
timestamp: number;
|
|
47
|
+
}
|
|
48
|
+
/**
|
|
49
|
+
* Get the last opencode.json parse error, if any
|
|
50
|
+
*/
|
|
51
|
+
export declare function getLastOpencodeConfigError(): ConfigError | null;
|
|
52
|
+
/**
|
|
53
|
+
* Clear the last opencode.json error
|
|
54
|
+
*/
|
|
55
|
+
export declare function clearLastOpencodeConfigError(): void;
|
|
43
56
|
export interface ProviderInfo {
|
|
44
57
|
id: string;
|
|
45
58
|
name: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"opencode-config.d.ts","sourceRoot":"","sources":["../../src/core/opencode-config.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED,MAAM,WAAW,YAAY;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE;QACf,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,CAAC;CACH;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,UAAU,CAAC,EAAE,eAAe,CAAC;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;CACzC;AAED,MAAM,WAAW,cAAc;IAC7B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE;QACR,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;CACrC;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,OAAO,GAAG,QAAQ,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IACtC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;CAC3C;AAMD,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,IAAI,EAAE,SAAS,GAAG,QAAQ,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,YAAY,EAAE,CAAC;IAC1B,UAAU,EAAE,aAAa,EAAE,CAAC;IAC5B,OAAO,EAAE,UAAU,EAAE,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;CACrB;AAMD;;GAEG;AACH,wBAAgB,qBAAqB,IAAI,MAAM,CAU9C;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"opencode-config.d.ts","sourceRoot":"","sources":["../../src/core/opencode-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,6 +33,8 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
33
33
|
};
|
|
34
34
|
})();
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
exports.getLastOpencodeConfigError = getLastOpencodeConfigError;
|
|
37
|
+
exports.clearLastOpencodeConfigError = clearLastOpencodeConfigError;
|
|
36
38
|
exports.getOpencodeConfigPath = getOpencodeConfigPath;
|
|
37
39
|
exports.readOpencodeConfig = readOpencodeConfig;
|
|
38
40
|
exports.parseOpencodeInfo = parseOpencodeInfo;
|
|
@@ -40,6 +42,26 @@ exports.getConfigSummary = getConfigSummary;
|
|
|
40
42
|
const fs = __importStar(require("fs"));
|
|
41
43
|
const path = __importStar(require("path"));
|
|
42
44
|
const os = __importStar(require("os"));
|
|
45
|
+
let lastConfigError = null;
|
|
46
|
+
/**
|
|
47
|
+
* Get the last opencode.json parse error, if any
|
|
48
|
+
*/
|
|
49
|
+
function getLastOpencodeConfigError() {
|
|
50
|
+
return lastConfigError;
|
|
51
|
+
}
|
|
52
|
+
/**
|
|
53
|
+
* Clear the last opencode.json error
|
|
54
|
+
*/
|
|
55
|
+
function clearLastOpencodeConfigError() {
|
|
56
|
+
lastConfigError = null;
|
|
57
|
+
}
|
|
58
|
+
function setConfigError(file, message) {
|
|
59
|
+
lastConfigError = {
|
|
60
|
+
file,
|
|
61
|
+
message,
|
|
62
|
+
timestamp: Date.now(),
|
|
63
|
+
};
|
|
64
|
+
}
|
|
43
65
|
// ============================================================================
|
|
44
66
|
// Functions
|
|
45
67
|
// ============================================================================
|
|
@@ -69,7 +91,9 @@ function readOpencodeConfig(configPath) {
|
|
|
69
91
|
const content = fs.readFileSync(resolvedPath, "utf-8");
|
|
70
92
|
return JSON.parse(content);
|
|
71
93
|
}
|
|
72
|
-
catch {
|
|
94
|
+
catch (err) {
|
|
95
|
+
const message = err instanceof Error ? err.message : "Unknown parse error";
|
|
96
|
+
setConfigError(resolvedPath, message);
|
|
73
97
|
return null;
|
|
74
98
|
}
|
|
75
99
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"opencode-config.js","sourceRoot":"","sources":["../../src/core/opencode-config.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"opencode-config.js","sourceRoot":"","sources":["../../src/core/opencode-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Dashboard.d.ts","sourceRoot":"","sources":["../../src/tui/Dashboard.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"Dashboard.d.ts","sourceRoot":"","sources":["../../src/tui/Dashboard.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAoCnD,UAAU,cAAc;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAaD,wBAAgB,SAAS,CAAC,EAAE,UAAU,EAAE,EAAE,cAAc,qBA0nBvD"}
|
package/dist/tui/Dashboard.js
CHANGED
|
@@ -41,8 +41,9 @@ const accounts_1 = require("../core/accounts");
|
|
|
41
41
|
const paths_1 = require("../core/paths");
|
|
42
42
|
const amJson_1 = require("../core/importers/amJson");
|
|
43
43
|
const opencode_config_1 = require("../core/opencode-config");
|
|
44
|
-
const health_orchestrator_1 = require("../core/health-orchestrator");
|
|
45
44
|
const config_store_1 = require("../core/config-store");
|
|
45
|
+
const health_orchestrator_1 = require("../core/health-orchestrator");
|
|
46
|
+
const config_store_2 = require("../core/config-store");
|
|
46
47
|
function safeReadPluginFile(pluginPath) {
|
|
47
48
|
try {
|
|
48
49
|
return (0, accounts_1.readPluginAccountsFile)(pluginPath);
|
|
@@ -61,6 +62,7 @@ function Dashboard({ pluginPath }) {
|
|
|
61
62
|
const [summary, setSummary] = (0, react_1.useState)({ total: 0, available: 0, limited: 0 });
|
|
62
63
|
const [message, setMessage] = (0, react_1.useState)(null);
|
|
63
64
|
const [healthResults, setHealthResults] = (0, react_1.useState)({});
|
|
65
|
+
const [configError, setConfigError] = (0, react_1.useState)(null);
|
|
64
66
|
// Main tab state
|
|
65
67
|
const [activeTab, setActiveTab] = (0, react_1.useState)("dashboard");
|
|
66
68
|
// Dashboard tab state
|
|
@@ -79,8 +81,23 @@ function Dashboard({ pluginPath }) {
|
|
|
79
81
|
setTimeout(() => setMessage(null), duration);
|
|
80
82
|
};
|
|
81
83
|
const loadOpencodeConfig = () => {
|
|
84
|
+
// Clear previous errors
|
|
85
|
+
(0, opencode_config_1.clearLastOpencodeConfigError)();
|
|
86
|
+
(0, config_store_1.clearLastConfigError)();
|
|
82
87
|
const info = (0, opencode_config_1.parseOpencodeInfo)();
|
|
83
88
|
setOpencodeInfo(info);
|
|
89
|
+
// Check for config errors
|
|
90
|
+
const opencodeError = (0, opencode_config_1.getLastOpencodeConfigError)();
|
|
91
|
+
const appConfigError = (0, config_store_1.getLastConfigError)();
|
|
92
|
+
if (opencodeError) {
|
|
93
|
+
setConfigError(`opencode.json: ${opencodeError.message}`);
|
|
94
|
+
}
|
|
95
|
+
else if (appConfigError) {
|
|
96
|
+
setConfigError(`ocam-config.json: ${appConfigError.message}`);
|
|
97
|
+
}
|
|
98
|
+
else {
|
|
99
|
+
setConfigError(null);
|
|
100
|
+
}
|
|
84
101
|
};
|
|
85
102
|
const loadAccounts = () => {
|
|
86
103
|
const file = safeReadPluginFile(resolvedPath);
|
|
@@ -89,7 +106,7 @@ function Dashboard({ pluginPath }) {
|
|
|
89
106
|
setCheckedEmails(new Set());
|
|
90
107
|
};
|
|
91
108
|
const loadHealthCache = () => {
|
|
92
|
-
setHealthResults((0,
|
|
109
|
+
setHealthResults((0, config_store_2.getHealthCache)());
|
|
93
110
|
};
|
|
94
111
|
const refresh = async () => {
|
|
95
112
|
setIsLoading(true);
|
|
@@ -125,7 +142,7 @@ function Dashboard({ pluginPath }) {
|
|
|
125
142
|
setHealthResults((prev) => {
|
|
126
143
|
const next = { ...prev };
|
|
127
144
|
for (const item of result.items) {
|
|
128
|
-
next[(0,
|
|
145
|
+
next[(0, config_store_2.normalizeHealthKey)(item.email)] = item.result;
|
|
129
146
|
}
|
|
130
147
|
return next;
|
|
131
148
|
});
|
|
@@ -475,6 +492,10 @@ function Dashboard({ pluginPath }) {
|
|
|
475
492
|
{ label: "Providers", value: configSummary?.providers || 0, color: "white" },
|
|
476
493
|
{ label: "MCP", value: configSummary?.mcpEnabled || 0, color: "white" },
|
|
477
494
|
] }),
|
|
495
|
+
configError ? (react_1.default.createElement(ink_1.Box, { marginY: 1, paddingX: 1 },
|
|
496
|
+
react_1.default.createElement(ink_1.Text, { color: "red", bold: true },
|
|
497
|
+
"\u26A0 Config Error: ",
|
|
498
|
+
configError))) : null,
|
|
478
499
|
react_1.default.createElement(ink_1.Box, { marginY: 1 },
|
|
479
500
|
react_1.default.createElement(ink_1.Text, { dimColor: true }, "\u2191\u2193 navigate \u2022 Space select \u2022 "),
|
|
480
501
|
react_1.default.createElement(ink_1.Text, { bold: true }, "R"),
|