@iam-brain/opencode-codex-auth 1.6.0 → 1.7.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.
- package/README.md +1 -1
- package/dist/lib/cache-lock.d.ts +36 -0
- package/dist/lib/cache-lock.d.ts.map +1 -1
- package/dist/lib/cache-lock.js +149 -3
- package/dist/lib/cache-lock.js.map +1 -1
- package/dist/lib/codex-native/acquire-auth.d.ts.map +1 -1
- package/dist/lib/codex-native/acquire-auth.js +11 -5
- package/dist/lib/codex-native/acquire-auth.js.map +1 -1
- package/dist/lib/codex-native/client-identity.js +1 -1
- package/dist/lib/codex-native/oauth-auth-methods.d.ts.map +1 -1
- package/dist/lib/codex-native/oauth-auth-methods.js +30 -4
- package/dist/lib/codex-native/oauth-auth-methods.js.map +1 -1
- package/dist/lib/codex-native/oauth-utils.d.ts +1 -0
- package/dist/lib/codex-native/oauth-utils.d.ts.map +1 -1
- package/dist/lib/codex-native/oauth-utils.js +35 -15
- package/dist/lib/codex-native/oauth-utils.js.map +1 -1
- package/dist/lib/codex-native/openai-loader-fetch.js +1 -1
- package/dist/lib/codex-native/openai-loader-fetch.js.map +1 -1
- package/dist/lib/codex-native/reasoning-summary.d.ts +1 -1
- package/dist/lib/codex-native/reasoning-summary.d.ts.map +1 -1
- package/dist/lib/codex-native/reasoning-summary.js +1 -1
- package/dist/lib/codex-native/reasoning-summary.js.map +1 -1
- package/dist/lib/codex-native/request-transform-model.d.ts +1 -0
- package/dist/lib/codex-native/request-transform-model.d.ts.map +1 -1
- package/dist/lib/codex-native/request-transform-model.js +3 -2
- package/dist/lib/codex-native/request-transform-model.js.map +1 -1
- package/dist/lib/codex-native/request-transform-payload.d.ts.map +1 -1
- package/dist/lib/codex-native/request-transform-payload.js +7 -5
- package/dist/lib/codex-native/request-transform-payload.js.map +1 -1
- package/dist/lib/model-catalog/provider.d.ts.map +1 -1
- package/dist/lib/model-catalog/provider.js +5 -0
- package/dist/lib/model-catalog/provider.js.map +1 -1
- package/dist/lib/model-catalog/shared.d.ts +3 -1
- package/dist/lib/model-catalog/shared.d.ts.map +1 -1
- package/dist/lib/model-catalog/shared.js +3 -2
- package/dist/lib/model-catalog/shared.js.map +1 -1
- package/dist/lib/proactive-refresh.d.ts.map +1 -1
- package/dist/lib/proactive-refresh.js +11 -2
- package/dist/lib/proactive-refresh.js.map +1 -1
- package/package.json +6 -6
package/README.md
CHANGED
|
@@ -72,7 +72,7 @@ npm run check:docs
|
|
|
72
72
|
|
|
73
73
|
Local git hooks now enforce `npm run verify` before both `git commit` and `git push`. The commit hook accepts staged-only commit-ready changes, and the push hook requires a clean tree so it verifies the exact commits being pushed. `npm run verify:local` runs the same enforcement manually, with a cache so unchanged trees do not rerun the full suite twice in a row.
|
|
74
74
|
|
|
75
|
-
Pull request CI stays intentionally lean: GitHub still runs clean-room verify, tarball smoke, Windows smoke,
|
|
75
|
+
Pull request CI stays intentionally lean: GitHub still runs clean-room verify, tarball smoke, Windows smoke, and secret scanning. Dependency vulnerability auditing via `npm audit` runs on default-branch pushes instead of every PR.
|
|
76
76
|
|
|
77
77
|
## Usage Note
|
|
78
78
|
|
package/dist/lib/cache-lock.d.ts
CHANGED
|
@@ -1,8 +1,44 @@
|
|
|
1
|
+
type LockFunction = (file: string, options?: Record<string, unknown>) => Promise<() => Promise<void>>;
|
|
2
|
+
type RetryOptions = {
|
|
3
|
+
retries: number;
|
|
4
|
+
minTimeout: number;
|
|
5
|
+
maxTimeout: number;
|
|
6
|
+
};
|
|
7
|
+
declare function resolveLockFunction(value: unknown, visited?: Set<unknown>): LockFunction | undefined;
|
|
8
|
+
declare function toRetryOptions(value: unknown): RetryOptions;
|
|
9
|
+
declare function ownerFilePathForLockDirectory(lockDir: string): string;
|
|
10
|
+
declare function writeDirectoryLockOwner(lockDir: string, ownerToken: string): Promise<void>;
|
|
11
|
+
declare function hasDirectoryLockOwner(lockDir: string, ownerToken: string): Promise<boolean>;
|
|
12
|
+
declare function lockWithDirectoryFallback(targetPath: string, options?: Record<string, unknown>): Promise<() => Promise<void>>;
|
|
13
|
+
declare function resolveImportedLockFunction(specifier: string): Promise<LockFunction | undefined>;
|
|
14
|
+
declare function getLockFunction(): Promise<LockFunction>;
|
|
15
|
+
declare const LOCK_RETRIES: {
|
|
16
|
+
retries: number;
|
|
17
|
+
minTimeout: number;
|
|
18
|
+
maxTimeout: number;
|
|
19
|
+
};
|
|
1
20
|
type LockTargetOptions = {
|
|
2
21
|
staleMs?: number;
|
|
3
22
|
};
|
|
23
|
+
declare function resolveLockOptions(options?: LockTargetOptions): {
|
|
24
|
+
realpath: true;
|
|
25
|
+
retries: typeof LOCK_RETRIES;
|
|
26
|
+
stale?: number;
|
|
27
|
+
};
|
|
4
28
|
export declare function lockTargetPathForFile(filePath: string): string;
|
|
5
29
|
export declare function withLockedDirectory<T>(directoryPath: string, fn: () => Promise<T>, options?: LockTargetOptions): Promise<T>;
|
|
6
30
|
export declare function withLockedFile<T>(filePath: string, fn: () => Promise<T>, options?: LockTargetOptions): Promise<T>;
|
|
31
|
+
export declare const __cacheLockTest: {
|
|
32
|
+
DIRECTORY_LOCK_OWNER_FILE: string;
|
|
33
|
+
getLockFunction: typeof getLockFunction;
|
|
34
|
+
hasDirectoryLockOwner: typeof hasDirectoryLockOwner;
|
|
35
|
+
lockWithDirectoryFallback: typeof lockWithDirectoryFallback;
|
|
36
|
+
ownerFilePathForLockDirectory: typeof ownerFilePathForLockDirectory;
|
|
37
|
+
resolveImportedLockFunction: typeof resolveImportedLockFunction;
|
|
38
|
+
resolveLockFunction: typeof resolveLockFunction;
|
|
39
|
+
resolveLockOptions: typeof resolveLockOptions;
|
|
40
|
+
toRetryOptions: typeof toRetryOptions;
|
|
41
|
+
writeDirectoryLockOwner: typeof writeDirectoryLockOwner;
|
|
42
|
+
};
|
|
7
43
|
export {};
|
|
8
44
|
//# sourceMappingURL=cache-lock.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache-lock.d.ts","sourceRoot":"","sources":["../../lib/cache-lock.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cache-lock.d.ts","sourceRoot":"","sources":["../../lib/cache-lock.ts"],"names":[],"mappings":"AAIA,KAAK,YAAY,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,CAAA;AAErG,KAAK,YAAY,GAAG;IAClB,OAAO,EAAE,MAAM,CAAA;IACf,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;CACnB,CAAA;AAKD,iBAAS,mBAAmB,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,eAAqB,GAAG,YAAY,GAAG,SAAS,CA0BnG;AAMD,iBAAS,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,YAAY,CA6BpD;AAMD,iBAAS,6BAA6B,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE9D;AAED,iBAAe,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEzF;AAED,iBAAe,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAU1F;AAED,iBAAe,yBAAyB,CACtC,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAChC,OAAO,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,CAuC9B;AAED,iBAAe,2BAA2B,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAM/F;AAED,iBAAe,eAAe,IAAI,OAAO,CAAC,YAAY,CAAC,CAMtD;AAED,QAAA,MAAM,YAAY;;;;CAIjB,CAAA;AAED,KAAK,iBAAiB,GAAG;IACvB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB,CAAA;AAGD,iBAAS,kBAAkB,CAAC,OAAO,GAAE,iBAAsB,GAAG;IAC5D,QAAQ,EAAE,IAAI,CAAA;IACd,OAAO,EAAE,OAAO,YAAY,CAAA;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,CAOA;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAE9D;AAOD,wBAAsB,mBAAmB,CAAC,CAAC,EACzC,aAAa,EAAE,MAAM,EACrB,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACpB,OAAO,GAAE,iBAAsB,GAC9B,OAAO,CAAC,CAAC,CAAC,CASZ;AAED,wBAAsB,cAAc,CAAC,CAAC,EACpC,QAAQ,EAAE,MAAM,EAChB,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACpB,OAAO,GAAE,iBAAsB,GAC9B,OAAO,CAAC,CAAC,CAAC,CAWZ;AAGD,eAAO,MAAM,eAAe;;;;;;;;;;;CAW3B,CAAA"}
|
package/dist/lib/cache-lock.js
CHANGED
|
@@ -1,6 +1,137 @@
|
|
|
1
|
+
import { randomUUID } from "node:crypto";
|
|
1
2
|
import fs from "node:fs/promises";
|
|
2
3
|
import path from "node:path";
|
|
3
|
-
|
|
4
|
+
let cachedLockFunction;
|
|
5
|
+
const DIRECTORY_LOCK_OWNER_FILE = ".owner";
|
|
6
|
+
function resolveLockFunction(value, visited = new Set()) {
|
|
7
|
+
if (typeof value === "function") {
|
|
8
|
+
return value;
|
|
9
|
+
}
|
|
10
|
+
if (!value || typeof value !== "object") {
|
|
11
|
+
return undefined;
|
|
12
|
+
}
|
|
13
|
+
if (visited.has(value)) {
|
|
14
|
+
return undefined;
|
|
15
|
+
}
|
|
16
|
+
visited.add(value);
|
|
17
|
+
const record = value;
|
|
18
|
+
const direct = resolveLockFunction(record.lock, visited);
|
|
19
|
+
if (direct)
|
|
20
|
+
return direct;
|
|
21
|
+
const viaDefault = resolveLockFunction(record.default, visited);
|
|
22
|
+
if (viaDefault)
|
|
23
|
+
return viaDefault;
|
|
24
|
+
const viaModule = resolveLockFunction(record.module, visited);
|
|
25
|
+
if (viaModule)
|
|
26
|
+
return viaModule;
|
|
27
|
+
const viaExports = resolveLockFunction(record.exports, visited);
|
|
28
|
+
if (viaExports)
|
|
29
|
+
return viaExports;
|
|
30
|
+
return undefined;
|
|
31
|
+
}
|
|
32
|
+
function isFsErrorCode(error, code) {
|
|
33
|
+
return typeof error === "object" && error !== null && "code" in error && error.code === code;
|
|
34
|
+
}
|
|
35
|
+
function toRetryOptions(value) {
|
|
36
|
+
const defaultOptions = {
|
|
37
|
+
retries: 0,
|
|
38
|
+
minTimeout: 50,
|
|
39
|
+
maxTimeout: 200
|
|
40
|
+
};
|
|
41
|
+
if (!value || typeof value !== "object") {
|
|
42
|
+
return defaultOptions;
|
|
43
|
+
}
|
|
44
|
+
const record = value;
|
|
45
|
+
const retries = typeof record.retries === "number" && Number.isFinite(record.retries)
|
|
46
|
+
? Math.max(0, Math.floor(record.retries))
|
|
47
|
+
: defaultOptions.retries;
|
|
48
|
+
const minTimeout = typeof record.minTimeout === "number" && Number.isFinite(record.minTimeout)
|
|
49
|
+
? Math.max(1, Math.floor(record.minTimeout))
|
|
50
|
+
: defaultOptions.minTimeout;
|
|
51
|
+
const maxTimeout = typeof record.maxTimeout === "number" && Number.isFinite(record.maxTimeout)
|
|
52
|
+
? Math.max(minTimeout, Math.floor(record.maxTimeout))
|
|
53
|
+
: defaultOptions.maxTimeout;
|
|
54
|
+
return {
|
|
55
|
+
retries,
|
|
56
|
+
minTimeout,
|
|
57
|
+
maxTimeout
|
|
58
|
+
};
|
|
59
|
+
}
|
|
60
|
+
async function sleep(ms) {
|
|
61
|
+
await new Promise((resolve) => setTimeout(resolve, ms));
|
|
62
|
+
}
|
|
63
|
+
function ownerFilePathForLockDirectory(lockDir) {
|
|
64
|
+
return path.join(lockDir, DIRECTORY_LOCK_OWNER_FILE);
|
|
65
|
+
}
|
|
66
|
+
async function writeDirectoryLockOwner(lockDir, ownerToken) {
|
|
67
|
+
await fs.writeFile(ownerFilePathForLockDirectory(lockDir), ownerToken, { mode: 0o600 });
|
|
68
|
+
}
|
|
69
|
+
async function hasDirectoryLockOwner(lockDir, ownerToken) {
|
|
70
|
+
try {
|
|
71
|
+
const value = await fs.readFile(ownerFilePathForLockDirectory(lockDir), "utf8");
|
|
72
|
+
return value === ownerToken;
|
|
73
|
+
}
|
|
74
|
+
catch (error) {
|
|
75
|
+
if (isFsErrorCode(error, "ENOENT")) {
|
|
76
|
+
return false;
|
|
77
|
+
}
|
|
78
|
+
throw error;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
async function lockWithDirectoryFallback(targetPath, options) {
|
|
82
|
+
const lockDir = `${targetPath}.lock`;
|
|
83
|
+
const retry = toRetryOptions(options?.retries);
|
|
84
|
+
for (let attempt = 0;; attempt += 1) {
|
|
85
|
+
try {
|
|
86
|
+
await fs.mkdir(lockDir);
|
|
87
|
+
const ownerToken = randomUUID();
|
|
88
|
+
try {
|
|
89
|
+
await writeDirectoryLockOwner(lockDir, ownerToken);
|
|
90
|
+
}
|
|
91
|
+
catch (error) {
|
|
92
|
+
await fs.rm(lockDir, { recursive: true, force: true });
|
|
93
|
+
throw error;
|
|
94
|
+
}
|
|
95
|
+
return async () => {
|
|
96
|
+
if (!(await hasDirectoryLockOwner(lockDir, ownerToken))) {
|
|
97
|
+
return;
|
|
98
|
+
}
|
|
99
|
+
try {
|
|
100
|
+
await fs.rm(lockDir, { recursive: true, force: true });
|
|
101
|
+
}
|
|
102
|
+
catch (error) {
|
|
103
|
+
if (!isFsErrorCode(error, "ENOENT")) {
|
|
104
|
+
throw error;
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
};
|
|
108
|
+
}
|
|
109
|
+
catch (error) {
|
|
110
|
+
if (!isFsErrorCode(error, "EEXIST")) {
|
|
111
|
+
throw error;
|
|
112
|
+
}
|
|
113
|
+
if (attempt >= retry.retries) {
|
|
114
|
+
throw error;
|
|
115
|
+
}
|
|
116
|
+
const timeout = Math.min(retry.maxTimeout, retry.minTimeout * 2 ** attempt);
|
|
117
|
+
await sleep(timeout);
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
async function resolveImportedLockFunction(specifier) {
|
|
122
|
+
try {
|
|
123
|
+
return resolveLockFunction(await import(specifier));
|
|
124
|
+
}
|
|
125
|
+
catch {
|
|
126
|
+
return undefined;
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
async function getLockFunction() {
|
|
130
|
+
if (cachedLockFunction)
|
|
131
|
+
return cachedLockFunction;
|
|
132
|
+
cachedLockFunction = (await resolveImportedLockFunction("proper-lockfile")) ?? lockWithDirectoryFallback;
|
|
133
|
+
return cachedLockFunction;
|
|
134
|
+
}
|
|
4
135
|
const LOCK_RETRIES = {
|
|
5
136
|
retries: 20,
|
|
6
137
|
minTimeout: 10,
|
|
@@ -24,7 +155,8 @@ async function ensureLockTargetFile(lockTargetPath) {
|
|
|
24
155
|
}
|
|
25
156
|
export async function withLockedDirectory(directoryPath, fn, options = {}) {
|
|
26
157
|
await fs.mkdir(directoryPath, { recursive: true });
|
|
27
|
-
const
|
|
158
|
+
const lock = await getLockFunction();
|
|
159
|
+
const release = await lock(directoryPath, resolveLockOptions(options));
|
|
28
160
|
try {
|
|
29
161
|
return await fn();
|
|
30
162
|
}
|
|
@@ -36,7 +168,8 @@ export async function withLockedFile(filePath, fn, options = {}) {
|
|
|
36
168
|
await fs.mkdir(path.dirname(filePath), { recursive: true });
|
|
37
169
|
const lockTargetPath = lockTargetPathForFile(filePath);
|
|
38
170
|
await ensureLockTargetFile(lockTargetPath);
|
|
39
|
-
const
|
|
171
|
+
const lock = await getLockFunction();
|
|
172
|
+
const release = await lock(lockTargetPath, resolveLockOptions(options));
|
|
40
173
|
try {
|
|
41
174
|
return await fn();
|
|
42
175
|
}
|
|
@@ -44,4 +177,17 @@ export async function withLockedFile(filePath, fn, options = {}) {
|
|
|
44
177
|
await release();
|
|
45
178
|
}
|
|
46
179
|
}
|
|
180
|
+
// Test-only hooks for focused fallback coverage without widening the runtime behavior surface.
|
|
181
|
+
export const __cacheLockTest = {
|
|
182
|
+
DIRECTORY_LOCK_OWNER_FILE,
|
|
183
|
+
getLockFunction,
|
|
184
|
+
hasDirectoryLockOwner,
|
|
185
|
+
lockWithDirectoryFallback,
|
|
186
|
+
ownerFilePathForLockDirectory,
|
|
187
|
+
resolveImportedLockFunction,
|
|
188
|
+
resolveLockFunction,
|
|
189
|
+
resolveLockOptions,
|
|
190
|
+
toRetryOptions,
|
|
191
|
+
writeDirectoryLockOwner
|
|
192
|
+
};
|
|
47
193
|
//# sourceMappingURL=cache-lock.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache-lock.js","sourceRoot":"","sources":["../../lib/cache-lock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAA;AACjC,OAAO,IAAI,MAAM,WAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"cache-lock.js","sourceRoot":"","sources":["../../lib/cache-lock.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"acquire-auth.d.ts","sourceRoot":"","sources":["../../../lib/codex-native/acquire-auth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAyB,QAAQ,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAA;AAG7G,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAC1C,OAAO,EAA2C,KAAK,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAEjG,OAAO,KAAK,EAAiB,cAAc,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"acquire-auth.d.ts","sourceRoot":"","sources":["../../../lib/codex-native/acquire-auth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAyB,QAAQ,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAA;AAG7G,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAC1C,OAAO,EAA2C,KAAK,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAEjG,OAAO,KAAK,EAAiB,cAAc,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AA0DlF,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,EAAE,cAAc,CAAA;IACxB,OAAO,CAAC,EAAE,4BAA4B,CAAA;IACtC,iBAAiB,EAAE,OAAO,CAAA;IAC1B,kBAAkB,EAAE,kBAAkB,CAAA;IACtC,kBAAkB,EAAE,kBAAkB,CAAA;IACtC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACpC,2BAA2B,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACvD,gBAAgB,EAAE,OAAO,CAAA;IACzB,0BAA0B,CAAC,EAAE,gBAAgB,CAAA;IAC7C,GAAG,CAAC,EAAE,MAAM,CAAA;CACb,CAAA;AAED,wBAAgB,oCAAoC,IAAI;IACtD,kBAAkB,EAAE,kBAAkB,CAAA;IACtC,kBAAkB,EAAE,kBAAkB,CAAA;CACvC,CAKA;AAgBD,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAwexF"}
|
|
@@ -14,6 +14,9 @@ function isOAuthTokenRefreshError(value) {
|
|
|
14
14
|
const TERMINAL_REFRESH_ERROR_CODES = new Set([
|
|
15
15
|
"invalid_grant",
|
|
16
16
|
"invalid_refresh_token",
|
|
17
|
+
"refresh_token_expired",
|
|
18
|
+
"refresh_token_reused",
|
|
19
|
+
"refresh_token_invalidated",
|
|
17
20
|
"refresh_token_revoked",
|
|
18
21
|
"token_revoked"
|
|
19
22
|
]);
|
|
@@ -25,13 +28,16 @@ function isTerminalRefreshCredentialError(error) {
|
|
|
25
28
|
}
|
|
26
29
|
}
|
|
27
30
|
if (error instanceof Error) {
|
|
28
|
-
const
|
|
31
|
+
const oauthMessage = "oauthMessage" in error && typeof error.oauthMessage === "string" ? error.oauthMessage.trim().toLowerCase() : "";
|
|
32
|
+
const message = `${error.message.trim().toLowerCase()} ${oauthMessage}`.trim();
|
|
29
33
|
if (message.includes("invalid_grant"))
|
|
30
34
|
return true;
|
|
31
|
-
if (message.includes("refresh token") &&
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
+
if (message.includes("refresh token") &&
|
|
36
|
+
(message.includes("invalid") ||
|
|
37
|
+
message.includes("expired") ||
|
|
38
|
+
message.includes("reused") ||
|
|
39
|
+
message.includes("revoked") ||
|
|
40
|
+
message.includes("invalidated"))) {
|
|
35
41
|
return true;
|
|
36
42
|
}
|
|
37
43
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"acquire-auth.js","sourceRoot":"","sources":["../../../lib/codex-native/acquire-auth.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AACzF,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAEjF,OAAO,EAAE,wBAAwB,EAAE,aAAa,EAA2B,MAAM,gBAAgB,CAAA;AACjG,OAAO,EAAE,uBAAuB,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAEzF,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAA;AAClD,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAA+B,MAAM,kBAAkB,CAAA;AAEpG,MAAM,gCAAgC,GAAG,MAAM,CAAA;AAC/C,MAAM,qBAAqB,GAAG,MAAM,CAAA;AACpC,MAAM,2BAA2B,GAAG,MAAM,CAAA;AAE1C,SAAS,wBAAwB,CAAC,KAAc;IAC9C,OAAO,KAAK,YAAY,KAAK,IAAI,CAAC,QAAQ,IAAI,KAAK,IAAI,WAAW,IAAI,KAAK,CAAC,CAAA;AAC9E,CAAC;AAED,MAAM,4BAA4B,GAAG,IAAI,GAAG,CAAC;IAC3C,eAAe;IACf,uBAAuB;IACvB,uBAAuB;IACvB,eAAe;CAChB,CAAC,CAAA;AAEF,SAAS,gCAAgC,CAAC,KAAc;IACtD,IAAI,wBAAwB,CAAC,KAAK,CAAC,EAAE,CAAC;QACpC,MAAM,SAAS,GAAG,OAAO,KAAK,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;QACxG,IAAI,SAAS,IAAI,4BAA4B,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7D,OAAO,IAAI,CAAA;QACb,CAAC;IACH,CAAC;IAED,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;QAC3B,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAA;QAClD,IAAI,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC;YAAE,OAAO,IAAI,CAAA;QAClD,IAAI,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;YACtG,OAAO,IAAI,CAAA;QACb,CAAC;QACD,IAAI,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YACrE,OAAO,IAAI,CAAA;QACb,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAA;AACd,CAAC;AAsBD,MAAM,UAAU,oCAAoC;IAIlD,OAAO;QACL,kBAAkB,EAAE,wBAAwB,EAAE;QAC9C,kBAAkB,EAAE,wBAAwB,EAAE;KAC/C,CAAA;AACH,CAAC;AAED,SAAS,2BAA2B,CAAC,OAAsB,EAAE,KAAa;IACxE,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,EAAE,IAAI,EAAE,CAAA;IAC/C,IAAI,WAAW;QAAE,OAAO,WAAW,CAAA;IAEnC,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,CAAA;IAC3C,MAAM,KAAK,GAAG,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC3C,MAAM,IAAI,GAAG,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;IACxC,IAAI,SAAS,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;QAC/B,OAAO,GAAG,SAAS,IAAI,KAAK,IAAI,IAAI,EAAE,CAAA;IACxC,CAAC;IAED,OAAO,OAAO,KAAK,EAAE,CAAA;AACvB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,KAA6B;IACnE,IAAI,MAA0B,CAAA;IAC9B,IAAI,SAA6B,CAAA;IACjC,IAAI,WAA+B,CAAA;IACnC,IAAI,YAAgC,CAAA;IACpC,IAAI,KAAyB,CAAA;IAC7B,IAAI,IAAwB,CAAA;IAC5B,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAA;IACnC,IAAI,eAAe,GAAG,KAAK,CAAA;IAC3B,IAAI,iBAAiB,GAAG,KAAK,CAAA;IAC7B,IAAI,iBAAiB,GAAG,KAAK,CAAA;IAC7B,IAAI,kBAAkB,GAAG,KAAK,CAAA;IAC9B,IAAI,aAAa,GAAG,CAAC,CAAA;IACrB,IAAI,cAAc,GAAG,KAAK,CAAA;IAC1B,IAAI,kBAAqD,CAAA;IAEzD,IAAI,CAAC;QACH,OAAO,IAAI,EAAE,CAAC;YACZ,IAAI,YAAsC,CAAA;YAC1C,IAAI,UAAU,GAAG,KAAK,CAAA;YACtB,IAAI,iCAAiC,GAAG,KAAK,CAAA;YAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;YACtB,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAA;YAC3E,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,CAAA;YAClC,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBACvC,MAAM,IAAI,gBAAgB,CAAC;oBACzB,OAAO,EAAE,2DAA2D;oBACpE,MAAM,EAAE,GAAG;oBACX,IAAI,EAAE,sBAAsB;oBAC5B,KAAK,EAAE,MAAM;iBACd,CAAC,CAAA;YACJ,CAAC;YAED,MAAM,MAAM,GAAG,uBAAuB,CAAC,YAAY,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAA;YACpE,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAA;YACtC,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACjC,MAAM,IAAI,gBAAgB,CAAC;oBACzB,OAAO,EAAE,aAAa,KAAK,CAAC,QAAQ,oDAAoD;oBACxF,MAAM,EAAE,GAAG;oBACX,IAAI,EAAE,wBAAwB;oBAC9B,KAAK,EAAE,UAAU;iBAClB,CAAC,CAAA;YACJ,CAAC;YAED,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,KAAK,KAAK,CAAC,CAAA;YAC9E,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACzB,MAAM,IAAI,gBAAgB,CAAC;oBACzB,OAAO,EAAE,qBAAqB,KAAK,CAAC,QAAQ,wEAAwE;oBACpH,MAAM,EAAE,GAAG;oBACX,IAAI,EAAE,qBAAqB;oBAC3B,KAAK,EAAE,UAAU;iBAClB,CAAC,CAAA;YACJ,CAAC;YAED,MAAM,gBAAgB,GAAqB,KAAK,CAAC,0BAA0B,IAAI,MAAM,CAAC,QAAQ,IAAI,QAAQ,CAAA;YAC1G,IAAI,CAAC,cAAc,EAAE,CAAC;gBACpB,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,gBAAgB,EAAE;oBACjC,QAAQ,EAAE,gBAAgB;oBAC1B,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;oBAC3C,aAAa,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM;oBACrC,eAAe,EAAE,OAAO,CAAC,MAAM;oBAC/B,IAAI,EAAE,KAAK,CAAC,QAAQ;oBACpB,UAAU,EAAE,KAAK,CAAC,OAAO,EAAE,UAAU,IAAI,IAAI;iBAC9C,CAAC,CAAA;gBACF,cAAc,GAAG,IAAI,CAAA;YACvB,CAAC;YAED,MAAM,iBAAiB,GAAG,MAAM,CAAC,QAAQ;iBACtC,GAAG,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;gBACxB,OAAO;gBACP,KAAK;gBACL,UAAU,EAAE,2BAA2B,CAAC,OAAO,EAAE,KAAK,CAAC;aACxD,CAAC,CAAC;iBACF,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAA;YAEtD,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACnC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,wCAAwC,EAAE;oBACzD,SAAS,EAAE,SAAS,CAAC,IAAI;oBACzB,aAAa,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM;iBACtC,CAAC,CAAA;gBACF,UAAU,GAAG,IAAI,CAAA;YACnB,CAAC;iBAAM,CAAC;gBACN,MAAM,YAAY,GAChB,gBAAgB,KAAK,QAAQ;oBAC3B,CAAC,CAAC,KAAK,CAAC,kBAAkB;oBAC1B,CAAC,CAAC,gBAAgB,KAAK,QAAQ;wBAC7B,CAAC,CAAC,KAAK,CAAC,kBAAkB;wBAC1B,CAAC,CAAC,SAAS,CAAA;gBAEjB,MAAM,QAAQ,GAAG,aAAa,CAAC;oBAC7B,QAAQ,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC;oBACzD,QAAQ,EAAE,gBAAgB;oBAC1B,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;oBAC3C,GAAG;oBACH,eAAe,EAAE,KAAK,CAAC,gBAAgB;oBACvC,gBAAgB,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,UAAU;oBACjF,kBAAkB,EAAE,YAAY;oBAChC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;wBACjB,kBAAkB,GAAG;4BACnB,QAAQ,EAAE,KAAK,CAAC,QAAQ;4BACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ;4BACxB,UAAU,EAAE,KAAK,CAAC,UAAU;4BAC5B,aAAa,EAAE,KAAK,CAAC,aAAa;4BAClC,aAAa,EAAE,KAAK,CAAC,aAAa;4BAClC,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;4BAC1C,aAAa,EAAE,KAAK,CAAC,aAAa;4BAClC,cAAc,EAAE,SAAS,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;4BACpE,GAAG,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE,KAAK,CAAC,mBAAmB,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;4BAC1F,GAAG,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,KAAK,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;4BACpF,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;yBAChE,CAAA;wBACD,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAA;oBAC9C,CAAC;iBACF,CAAC,CAAA;gBAEF,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACd,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,sCAAsC,EAAE;wBACvD,SAAS,EAAE,SAAS,CAAC,IAAI;wBACzB,aAAa,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM;qBACtC,CAAC,CAAA;oBACF,UAAU,GAAG,IAAI,CAAA;gBACnB,CAAC;qBAAM,CAAC;oBACN,MAAM,aAAa,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAA;oBACnF,IAAI,CAAC,aAAa,EAAE,CAAC;wBACnB,UAAU,GAAG,IAAI,CAAA;oBACnB,CAAC;yBAAM,CAAC;wBACN,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,UAAU,EAAE,GAAG,aAAa,CAAA;wBAE1D,IAAI,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;4BAC9B,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,sCAAsC,EAAE;gCACvD,UAAU;gCACV,mBAAmB,EAAE,QAAQ,CAAC,WAAW;gCACzC,aAAa;6BACd,CAAC,CAAA;wBACJ,CAAC;6BAAM,CAAC;4BACN,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;4BACzB,IAAI,CAAC,KAAK,CAAC,iBAAiB,IAAI,KAAK,CAAC,OAAO,EAAE,UAAU,IAAI,YAAY,EAAE,CAAC;gCAC1E,iCAAiC,GAAG,IAAI,CAAA;4BAC1C,CAAC;4BAED,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,6BAA6B,EAAE;gCAC9C,UAAU;gCACV,mBAAmB,EAAE,QAAQ,CAAC,WAAW;gCACzC,aAAa;gCACb,eAAe,EAAE,QAAQ,CAAC,OAAO,KAAK,KAAK;gCAC3C,qBAAqB,EAAE,QAAQ,CAAC,aAAa,IAAI,IAAI;gCACrD,eAAe,EAAE,QAAQ,CAAC,OAAO,IAAI,IAAI;6BAC1C,CAAC,CAAA;4BACF,IAAI,kBAAkB,EAAE,CAAC;gCACvB,kBAAkB,GAAG;oCACnB,GAAG,kBAAkB;oCACrB,cAAc,EAAE,SAAS,CAAC,IAAI;oCAC9B,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;oCAChF,GAAG,CAAC,aAAa,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;oCAClD,UAAU;iCACX,CAAA;4BACH,CAAC;4BAED,YAAY,GAAG,kBAAkB,CAAC,QAAQ,EAAE,aAAa,IAAI,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;4BACnF,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAA;4BACtB,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAA;4BACpB,MAAM,mBAAmB,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC,WAAW,CAAA;4BAEnE,IAAI,CAAC,mBAAmB,EAAE,CAAC;gCACzB,kBAAkB,GAAG,IAAI,CAAA;4BAC3B,CAAC;iCAAM,IAAI,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,OAAO,IAAI,QAAQ,CAAC,OAAO,GAAG,GAAG,EAAE,CAAC;gCACzE,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAA;gCACxB,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAA;gCAC9B,WAAW,GAAG,mBAAmB,CAAA;gCACjC,MAAM,iBAAiB,GACrB,kBAAkB,EAAE,QAAQ,IAAI,KAAK,CAAC,0BAA0B,IAAI,MAAM,CAAC,QAAQ,CAAA;gCACrF,IAAI,iBAAiB,KAAK,QAAQ,IAAI,iBAAiB,KAAK,aAAa,EAAE,CAAC;oCAC1E,MAAM,eAAe,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,EAAE;wCAC5C,MAAM,aAAa,GAAG,uBAAuB,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAA;wCACvE,MAAM,iBAAiB,GAAG,mBAAmB;4CAC3C,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,KAAK,mBAAmB,CAAC;4CACvF,CAAC,CAAC,SAAS,CAAA;wCACb,MAAM,OAAO,GAAG,iBAAiB,IAAI,aAAa,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAA;wCAC1E,IAAI,CAAC,OAAO;4CAAE,OAAM;wCACpB,MAAM,YAAY,GAAG,aAAa,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,KAAK,OAAO,CAAC,CAAA;wCACvF,MAAM,iBAAiB,GAAG,2BAA2B,CACnD,OAAO,EACP,YAAY,IAAI,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,aAAa,CACjD,CAAA;wCACD,IAAI,iBAAiB,KAAK,UAAU,IAAI,OAAO,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;4CAClE,OAAM;wCACR,CAAC;wCACD,IAAI,CAAC,OAAO,CAAC,WAAW,IAAI,mBAAmB,EAAE,CAAC;4CAChD,OAAO,CAAC,WAAW,GAAG,mBAAmB,CAAA;wCAC3C,CAAC;wCACD,IAAI,iBAAiB,KAAK,aAAa,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;4CAC/D,IAAI,aAAa,CAAC,iBAAiB,KAAK,OAAO,CAAC,WAAW,EAAE,CAAC;gDAC5D,aAAa,CAAC,iBAAiB,GAAG,OAAO,CAAC,WAAW,CAAA;4CACvD,CAAC;4CACD,OAAM;wCACR,CAAC;wCAED,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;wCAC7B,MAAM,gBAAgB,GAAG,OAAO,OAAO,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAA;wCAC5F,IACE,gBAAgB,KAAK,SAAS;4CAC9B,UAAU,GAAG,gBAAgB,IAAI,2BAA2B,EAC5D,CAAC;4CACD,OAAO,CAAC,QAAQ,GAAG,UAAU,CAAA;wCAC/B,CAAC;oCACH,CAAC,CAAC,CAAA;gCACJ,CAAC;4BACH,CAAC;iCAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;gCAC7B,iBAAiB,GAAG,IAAI,CAAA;gCACxB,MAAM,eAAe,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,EAAE;oCAC5C,MAAM,aAAa,GAAG,uBAAuB,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAA;oCACvE,MAAM,iBAAiB,GAAG,mBAAmB;wCAC3C,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,KAAK,mBAAmB,CAAC;wCACvF,CAAC,CAAC,SAAS,CAAA;oCACb,MAAM,OAAO,GAAG,iBAAiB,IAAI,aAAa,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAA;oCAC1E,IAAI,CAAC,OAAO;wCAAE,OAAM;oCACpB,MAAM,YAAY,GAAG,aAAa,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,KAAK,OAAO,CAAC,CAAA;oCACvF,MAAM,iBAAiB,GAAG,2BAA2B,CACnD,OAAO,EACP,YAAY,IAAI,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,aAAa,CACjD,CAAA;oCACD,IAAI,iBAAiB,KAAK,UAAU,IAAI,OAAO,CAAC,OAAO,KAAK,KAAK,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;wCACrF,OAAM;oCACR,CAAC;oCACD,OAAO,CAAC,aAAa,GAAG,GAAG,GAAG,gCAAgC,CAAA;gCAChE,CAAC,CAAC,CAAA;4BACJ,CAAC;iCAAM,CAAC;gCACN,MAAM,UAAU,GAAG,GAAG,GAAG,qBAAqB,CAAA;gCAC9C,MAAM,eAAe,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,EAAE;oCAC5C,MAAM,aAAa,GAAG,uBAAuB,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAA;oCACvE,MAAM,iBAAiB,GAAG,aAAa,CAAC,QAAQ,CAAC,IAAI,CACnD,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,KAAK,mBAAmB,CACzD,CAAA;oCACD,MAAM,OAAO,GAAG,iBAAiB,IAAI,aAAa,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAA;oCAC1E,IAAI,CAAC,OAAO;wCAAE,OAAM;oCACpB,MAAM,YAAY,GAAG,aAAa,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,KAAK,OAAO,CAAC,CAAA;oCACvF,MAAM,iBAAiB,GAAG,2BAA2B,CACnD,OAAO,EACP,YAAY,IAAI,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,aAAa,CACjD,CAAA;oCACD,IAAI,iBAAiB,KAAK,UAAU;wCAAE,OAAM;oCAC5C,IACE,OAAO,CAAC,OAAO,KAAK,KAAK;wCACzB,CAAC,OAAO,CAAC,OAAO;wCAChB,OAAO,CAAC,OAAO,KAAK,QAAQ,CAAC,OAAO;wCACpC,CAAC,OAAO,OAAO,CAAC,iBAAiB,KAAK,QAAQ,IAAI,OAAO,CAAC,iBAAiB,GAAG,GAAG,CAAC,EAClF,CAAC;wCACD,OAAM;oCACR,CAAC;oCAED,OAAO,CAAC,iBAAiB,GAAG,UAAU,CAAA;oCACtC,YAAY,GAAG;wCACb,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,mBAAmB;wCACvD,YAAY,EAAE,OAAO,CAAC,OAAO;wCAC7B,UAAU;wCACV,aAAa,EAAE,YAAY,IAAI,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,aAAa;qCAChE,CAAA;gCACH,CAAC,CAAC,CAAA;4BACJ,CAAC;wBACH,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;YAED,IAAI,MAAM;gBAAE,MAAK;YACjB,IAAI,iCAAiC,EAAE,CAAC;gBACtC,MAAM,KAAK,CAAC,2BAA2B,EAAE,CAAA;YAC3C,CAAC;YACD,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,IAAI,UAAU,IAAI,CAAC,aAAa,GAAG,CAAC,IAAI,SAAS,CAAC,IAAI,IAAI,aAAa,CAAC,EAAE,CAAC;oBACzE,MAAK;gBACP,CAAC;gBACD,SAAQ;YACV,CAAC;YAED,IAAI,CAAC;gBACH,MAAM,kBAAkB,GAAG,YAAY,CAAA;gBACvC,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAA;gBACxE,MAAM,gBAAgB,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,UAAU,IAAI,IAAI,CAAC,GAAG,IAAI,CAAA;gBACxE,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAA;gBACnD,MAAM,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,YAAY,CAAC,CAAA;gBAErE,MAAM,eAAe,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,EAAE;oBAC5C,MAAM,MAAM,GAAG,uBAAuB,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAA;oBAChE,MAAM,QAAQ,GAAG,kBAAkB,CAAC,WAAW;wBAC7C,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,KAAK,kBAAkB,CAAC,WAAW,CAAC;wBAC3F,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAA;oBACrD,IAAI,CAAC,QAAQ;wBAAE,OAAM;oBAErB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;oBACtB,IACE,OAAO,QAAQ,CAAC,iBAAiB,KAAK,QAAQ;wBAC9C,QAAQ,CAAC,iBAAiB,KAAK,kBAAkB,CAAC,UAAU;wBAC5D,QAAQ,CAAC,iBAAiB,IAAI,GAAG;wBACjC,QAAQ,CAAC,OAAO,KAAK,kBAAkB,CAAC,YAAY,EACpD,CAAC;wBACD,IAAI,QAAQ,CAAC,iBAAiB,KAAK,kBAAkB,CAAC,UAAU,EAAE,CAAC;4BACjE,OAAO,QAAQ,CAAC,iBAAiB,CAAA;wBACnC,CAAC;wBACD,OAAM;oBACR,CAAC;oBAED,IAAI,QAAQ,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;wBAC/B,OAAO,QAAQ,CAAC,iBAAiB,CAAA;wBACjC,OAAM;oBACR,CAAC;oBAED,QAAQ,CAAC,OAAO,GAAG,MAAM,CAAC,aAAa,CAAA;oBACvC,QAAQ,CAAC,MAAM,GAAG,MAAM,CAAC,YAAY,CAAA;oBACrC,QAAQ,CAAC,OAAO,GAAG,gBAAgB,CAAA;oBACnC,QAAQ,CAAC,SAAS,GAAG,kBAAkB,IAAI,QAAQ,CAAC,SAAS,CAAA;oBAC7D,IAAI,MAAM,EAAE,KAAK;wBAAE,QAAQ,CAAC,KAAK,GAAG,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;oBAChE,IAAI,MAAM,EAAE,IAAI;wBAAE,QAAQ,CAAC,IAAI,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;oBAC5D,iBAAiB,CAAC,QAAQ,CAAC,CAAA;oBAC3B,MAAM,gBAAgB,GAAG,OAAO,QAAQ,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAA;oBAC9F,IAAI,gBAAgB,KAAK,SAAS,IAAI,GAAG,GAAG,gBAAgB,IAAI,2BAA2B,EAAE,CAAC;wBAC5F,QAAQ,CAAC,QAAQ,GAAG,GAAG,CAAA;oBACzB,CAAC;oBACD,OAAO,QAAQ,CAAC,iBAAiB,CAAA;oBACjC,OAAO,QAAQ,CAAC,aAAa,CAAA;oBAC7B,IAAI,QAAQ,CAAC,WAAW;wBAAE,MAAM,CAAC,iBAAiB,GAAG,QAAQ,CAAC,WAAW,CAAA;oBAEzE,YAAY,GAAG,kBAAkB,CAAC,QAAQ,EAAE,kBAAkB,CAAC,aAAa,CAAC,CAAA;oBAC7E,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAA;oBACtB,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAA;oBACpB,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAA;oBACxB,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAA;oBAC9B,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAA;gBACpC,CAAC,CAAC,CAAA;YACJ,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,YAAY,GAAG,gCAAgC,CAAC,KAAK,CAAC,CAAA;gBAC5D,IAAI,YAAY,EAAE,CAAC;oBACjB,eAAe,GAAG,IAAI,CAAA;gBACxB,CAAC;qBAAM,CAAC;oBACN,iBAAiB,GAAG,IAAI,CAAA;gBAC1B,CAAC;gBAED,MAAM,kBAAkB,GAAG,YAAY,CAAA;gBACvC,MAAM,eAAe,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,EAAE;oBAC5C,MAAM,MAAM,GAAG,uBAAuB,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAA;oBAChE,MAAM,QAAQ,GAAG,kBAAkB,CAAC,WAAW;wBAC7C,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,KAAK,kBAAkB,CAAC,WAAW,CAAC;wBAC3F,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAA;oBACrD,IAAI,CAAC,QAAQ;wBAAE,OAAM;oBAErB,IACE,QAAQ,CAAC,iBAAiB,KAAK,kBAAkB,CAAC,UAAU;wBAC5D,QAAQ,CAAC,OAAO,KAAK,kBAAkB,CAAC,YAAY,EACpD,CAAC;wBACD,OAAM;oBACR,CAAC;oBAED,OAAO,QAAQ,CAAC,iBAAiB,CAAA;oBACjC,IAAI,YAAY,EAAE,CAAC;wBACjB,QAAQ,CAAC,OAAO,GAAG,KAAK,CAAA;wBACxB,OAAO,QAAQ,CAAC,aAAa,CAAA;wBAC7B,OAAM;oBACR,CAAC;oBAED,IAAI,QAAQ,CAAC,OAAO,KAAK,KAAK;wBAAE,OAAM;oBACtC,QAAQ,CAAC,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,gCAAgC,CAAA;gBACxE,CAAC,CAAC,CAAA;YACJ,CAAC;YAED,IAAI,MAAM;gBAAE,MAAK;YACjB,IAAI,aAAa,GAAG,CAAC,IAAI,SAAS,CAAC,IAAI,IAAI,aAAa,EAAE,CAAC;gBACzD,MAAK;YACP,CAAC;QACH,CAAC;QAED,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;YACtB,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAA;YAC3E,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,CAAA;YAClC,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBACvC,MAAM,IAAI,gBAAgB,CAAC;oBACzB,OAAO,EAAE,2DAA2D;oBACpE,MAAM,EAAE,GAAG;oBACX,IAAI,EAAE,sBAAsB;oBAC5B,KAAK,EAAE,MAAM;iBACd,CAAC,CAAA;YACJ,CAAC;YAED,MAAM,MAAM,GAAG,uBAAuB,CAAC,YAAY,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAA;YACpE,MAAM,oBAAoB,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,KAAK,KAAK,CAAC,CAAA;YAC3F,IAAI,oBAAoB,CAAC,MAAM,KAAK,CAAC,IAAI,eAAe,EAAE,CAAC;gBACzD,MAAM,IAAI,gBAAgB,CAAC;oBACzB,OAAO,EACL,+GAA+G;oBACjH,MAAM,EAAE,GAAG;oBACX,IAAI,EAAE,uBAAuB;oBAC7B,KAAK,EAAE,MAAM;iBACd,CAAC,CAAA;YACJ,CAAC;YAED,MAAM,eAAe,GAAG,oBAAoB,CAAC,MAAM,CAAqB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;gBAC3F,MAAM,aAAa,GACjB,OAAO,OAAO,CAAC,iBAAiB,KAAK,QAAQ,IAAI,OAAO,CAAC,iBAAiB,GAAG,GAAG;oBAC9E,CAAC,CAAC,OAAO,CAAC,iBAAiB;oBAC3B,CAAC,CAAC,OAAO,CAAC,aAAa,CAAA;gBAC3B,IAAI,OAAO,aAAa,KAAK,QAAQ,IAAI,aAAa,IAAI,GAAG;oBAAE,OAAO,OAAO,CAAA;gBAC7E,IAAI,OAAO,KAAK,SAAS,IAAI,aAAa,GAAG,OAAO;oBAAE,OAAO,aAAa,CAAA;gBAC1E,OAAO,OAAO,CAAA;YAChB,CAAC,EAAE,SAAS,CAAC,CAAA;YAEb,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;gBAClC,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,eAAe,GAAG,GAAG,CAAC,CAAA;gBACjD,MAAM,IAAI,gBAAgB,CAAC;oBACzB,OAAO,EAAE,8DAA8D,cAAc,CAAC,MAAM,CAAC,kCAAkC;oBAC/H,MAAM,EAAE,GAAG;oBACX,IAAI,EAAE,2BAA2B;oBACjC,KAAK,EAAE,UAAU;iBAClB,CAAC,CAAA;YACJ,CAAC;YAED,IAAI,eAAe,EAAE,CAAC;gBACpB,MAAM,IAAI,gBAAgB,CAAC;oBACzB,OAAO,EACL,8GAA8G;oBAChH,MAAM,EAAE,GAAG;oBACX,IAAI,EAAE,uBAAuB;oBAC7B,KAAK,EAAE,MAAM;iBACd,CAAC,CAAA;YACJ,CAAC;YAED,IAAI,iBAAiB,EAAE,CAAC;gBACtB,MAAM,IAAI,gBAAgB,CAAC;oBACzB,OAAO,EAAE,kGAAkG;oBAC3G,MAAM,EAAE,GAAG;oBACX,IAAI,EAAE,uBAAuB;oBAC7B,KAAK,EAAE,UAAU;iBAClB,CAAC,CAAA;YACJ,CAAC;YAED,IAAI,kBAAkB,EAAE,CAAC;gBACvB,MAAM,IAAI,gBAAgB,CAAC;oBACzB,OAAO,EAAE,oGAAoG;oBAC7G,MAAM,EAAE,GAAG;oBACX,IAAI,EAAE,0BAA0B;oBAChC,KAAK,EAAE,UAAU;iBAClB,CAAC,CAAA;YACJ,CAAC;YAED,IAAI,iBAAiB,EAAE,CAAC;gBACtB,MAAM,IAAI,gBAAgB,CAAC;oBACzB,OAAO,EAAE,iFAAiF;oBAC1F,MAAM,EAAE,GAAG;oBACX,IAAI,EAAE,gBAAgB;oBACtB,KAAK,EAAE,MAAM;iBACd,CAAC,CAAA;YACJ,CAAC;YAED,MAAM,IAAI,gBAAgB,CAAC;gBACzB,OAAO,EAAE,qBAAqB,KAAK,CAAC,QAAQ,wEAAwE;gBACpH,MAAM,EAAE,GAAG;gBACX,IAAI,EAAE,qBAAqB;gBAC3B,KAAK,EAAE,UAAU;aAClB,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,kBAAkB,CAAC,KAAK,CAAC;YAAE,MAAM,KAAK,CAAA;QAC1C,MAAM,IAAI,gBAAgB,CAAC;YACzB,OAAO,EACL,2GAA2G;YAC7G,MAAM,EAAE,GAAG;YACX,IAAI,EAAE,oBAAoB;YAC1B,KAAK,EAAE,MAAM;SACd,CAAC,CAAA;IACJ,CAAC;IAED,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,gBAAgB,CAAC;YACzB,OAAO,EAAE,oEAAoE;YAC7E,MAAM,EAAE,GAAG;YACX,IAAI,EAAE,uBAAuB;YAC7B,KAAK,EAAE,MAAM;SACd,CAAC,CAAA;IACJ,CAAC;IAED,OAAO;QACL,MAAM;QACN,SAAS;QACT,WAAW;QACX,YAAY;QACZ,KAAK;QACL,IAAI;QACJ,GAAG,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;KACxE,CAAA;AACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"acquire-auth.js","sourceRoot":"","sources":["../../../lib/codex-native/acquire-auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ import { fetchRemoteText } from "../remote-cache-fetch.js";
|
|
|
8
8
|
import { isFsErrorCode } from "../cache-io.js";
|
|
9
9
|
import { URL } from "node:url";
|
|
10
10
|
const DEFAULT_PLUGIN_VERSION = "0.1.0";
|
|
11
|
-
const DEFAULT_CODEX_CLIENT_VERSION = "0.
|
|
11
|
+
const DEFAULT_CODEX_CLIENT_VERSION = "0.116.0";
|
|
12
12
|
const CODEX_CLIENT_VERSION_CACHE_FILE = path.join(defaultOpencodeCachePath(), "codex-client-version.json");
|
|
13
13
|
const CODEX_CLIENT_VERSION_TTL_MS = 60 * 60 * 1000;
|
|
14
14
|
const CODEX_GITHUB_RELEASES_API = "https://api.github.com/repos/openai/codex/releases/latest";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-auth-methods.d.ts","sourceRoot":"","sources":["../../../lib/codex-native/oauth-auth-methods.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"oauth-auth-methods.d.ts","sourceRoot":"","sources":["../../../lib/codex-native/oauth-auth-methods.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAEjD,OAAO,EAWL,KAAK,SAAS,EAEd,KAAK,aAAa,EACnB,MAAM,kBAAkB,CAAA;AAGzB,KAAK,YAAY,GAAG;IAClB,IAAI,EAAE,SAAS,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,KAAK,YAAY,GAAG;IAClB,IAAI,EAAE,QAAQ,CAAA;CACf,CAAA;AAED,KAAK,mBAAmB,GAAG,YAAY,GAAG,YAAY,CAAA;AAEtD,KAAK,qBAAqB,GAAG;IAC3B,GAAG,EAAE,MAAM,CAAA;IACX,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,MAAM,CAAA;IACpB,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,OAAO,CAAC,mBAAmB,CAAC,CAAA;CAC7C,CAAA;AAuBD,KAAK,cAAc,GAAG,KAAK,GAAG,MAAM,CAAA;AAEpC,KAAK,oBAAoB,GAAG;IAC1B,QAAQ,EAAE,cAAc,CAAA;IACxB,SAAS,EAAE,cAAc,CAAA;IACzB,sBAAsB,EAAE,CAAC,OAAO,EAAE;QAAE,SAAS,EAAE,OAAO,CAAA;KAAE,KAAK,OAAO,CAAC,cAAc,CAAC,CAAA;IACpF,gBAAgB,EAAE,MAAM,OAAO,CAAC;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IACxD,oBAAoB,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,KAAK,OAAO,CAAC,aAAa,CAAC,CAAA;IAC1G,uBAAuB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,GAAG,OAAO,KAAK,IAAI,CAAA;IACzF,kBAAkB,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IAC5D,WAAW,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;IAClC,eAAe,EAAE,MAAM,CAAA;IACvB,oBAAoB,EAAE,MAAM,CAAA;CAC7B,CAAA;AAED,KAAK,qBAAqB,GAAG;IAC3B,SAAS,EAAE,cAAc,CAAA;IACzB,kBAAkB,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CAC7D,CAAA;AAoBD,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,oBAAoB,IACtD,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAG,OAAO,CAAC,qBAAqB,CAAC,CAqI/E;AAED,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,qBAAqB,SACrD,OAAO,CAAC,qBAAqB,CAAC,CAkHhD"}
|
|
@@ -1,6 +1,14 @@
|
|
|
1
1
|
import { resolveRequestUserAgent } from "./client-identity.js";
|
|
2
|
-
import { resolveCodexOriginator } from "./originator.js";
|
|
3
2
|
import { buildAuthorizeUrl, CLIENT_ID, extractAccountId, fetchWithTimeout, generatePKCE, generateState, ISSUER, OAUTH_DEVICE_AUTH_TIMEOUT_MS, OAUTH_HTTP_TIMEOUT_MS, OAUTH_POLLING_SAFETY_MARGIN_MS, sleep } from "./oauth-utils.js";
|
|
3
|
+
import { resolveCodexOriginator } from "./originator.js";
|
|
4
|
+
function oauthStartupFailurePayload(reason) {
|
|
5
|
+
return {
|
|
6
|
+
url: "",
|
|
7
|
+
method: "auto",
|
|
8
|
+
instructions: `Failed to start authorization: ${reason}`,
|
|
9
|
+
callback: async () => ({ type: "failed" })
|
|
10
|
+
};
|
|
11
|
+
}
|
|
4
12
|
function redactOAuthDisplayUrl(url) {
|
|
5
13
|
try {
|
|
6
14
|
const parsed = new URL(url);
|
|
@@ -32,8 +40,18 @@ function toOAuthSuccess(tokens) {
|
|
|
32
40
|
}
|
|
33
41
|
export function createBrowserOAuthAuthorize(deps) {
|
|
34
42
|
return async (inputs) => {
|
|
43
|
+
const shouldUseInteractiveMenu = process.env.OPENCODE_NO_BROWSER !== "1" && process.stdin.isTTY && process.stdout.isTTY;
|
|
35
44
|
const runSingleBrowserOAuthInline = async () => {
|
|
36
|
-
|
|
45
|
+
let redirectUri;
|
|
46
|
+
try {
|
|
47
|
+
;
|
|
48
|
+
({ redirectUri } = await deps.startOAuthServer());
|
|
49
|
+
}
|
|
50
|
+
catch (error) {
|
|
51
|
+
const reason = error instanceof Error ? error.message : "Failed to start OAuth callback server";
|
|
52
|
+
process.stdout.write(`\nAuthorization failed: ${reason}\n\n`);
|
|
53
|
+
return null;
|
|
54
|
+
}
|
|
37
55
|
const pkce = await generatePKCE();
|
|
38
56
|
const state = generateState();
|
|
39
57
|
const authUrl = buildAuthorizeUrl(redirectUri, pkce, state, deps.spoofMode === "codex" ? "codex_cli_rs" : "opencode");
|
|
@@ -96,10 +114,18 @@ export function createBrowserOAuthAuthorize(deps) {
|
|
|
96
114
|
};
|
|
97
115
|
}
|
|
98
116
|
};
|
|
99
|
-
if (
|
|
117
|
+
if (shouldUseInteractiveMenu) {
|
|
100
118
|
return runInteractiveBrowserAuthLoop();
|
|
101
119
|
}
|
|
102
|
-
|
|
120
|
+
let redirectUri;
|
|
121
|
+
try {
|
|
122
|
+
;
|
|
123
|
+
({ redirectUri } = await deps.startOAuthServer());
|
|
124
|
+
}
|
|
125
|
+
catch (error) {
|
|
126
|
+
const reason = error instanceof Error ? error.message : "Failed to start OAuth callback server";
|
|
127
|
+
return oauthStartupFailurePayload(reason);
|
|
128
|
+
}
|
|
103
129
|
const pkce = await generatePKCE();
|
|
104
130
|
const state = generateState();
|
|
105
131
|
const authUrl = buildAuthorizeUrl(redirectUri, pkce, state, deps.spoofMode === "codex" ? "codex_cli_rs" : "opencode");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-auth-methods.js","sourceRoot":"","sources":["../../../lib/codex-native/oauth-auth-methods.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AAC9D,OAAO,
|
|
1
|
+
{"version":3,"file":"oauth-auth-methods.js","sourceRoot":"","sources":["../../../lib/codex-native/oauth-auth-methods.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,6 +35,7 @@ export type TokenResponse = {
|
|
|
35
35
|
export type OAuthTokenRefreshError = Error & {
|
|
36
36
|
status?: number;
|
|
37
37
|
oauthCode?: string;
|
|
38
|
+
oauthMessage?: string;
|
|
38
39
|
};
|
|
39
40
|
export declare function fetchWithTimeout(input: string | URL | Request, init: RequestInit, timeoutMs: number): Promise<Response>;
|
|
40
41
|
export declare function sleep(ms: number): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-utils.d.ts","sourceRoot":"","sources":["../../../lib/codex-native/oauth-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,aAAa,EACnB,MAAM,cAAc,CAAA;AACrB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAGlD,eAAO,MAAM,SAAS,iCAAiC,CAAA;AACvD,eAAO,MAAM,MAAM,4BAA4B,CAAA;AAC/C,eAAO,MAAM,UAAU,OAAO,CAAA;AAC9B,eAAO,MAAM,mBAAmB,cAAc,CAAA;AAC9C,eAAO,MAAM,qBAAqB,0BAAgD,CAAA;AAClF,eAAO,MAAM,mBAAmB,mBAAmB,CAAA;AACnD,eAAO,MAAM,kBAAkB,wCAAmD,CAAA;AAClF,eAAO,MAAM,eAAe,oBAAoB,CAAA;AAChD,eAAO,MAAM,8BAA8B,OAAO,CAAA;AAQlD,eAAO,MAAM,qBAAqB,QAAgF,CAAA;AAClH,eAAO,MAAM,4BAA4B,QAIxC,CAAA;AACD,eAAO,MAAM,yBAAyB,QAIrC,CAAA;AACD,eAAO,MAAM,8BAA8B,QAI1C,CAAA;AACD,eAAO,MAAM,oCAAoC,QAIhD,CAAA;AAWD,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAMD,wBAAsB,YAAY,IAAI,OAAO,CAAC,SAAS,CAAC,CAKvD;AAED,wBAAgB,aAAa,IAAI,MAAM,CAEtC;AAED,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,aAAa,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAEhG;AAED,KAAK,gBAAgB,GAAG;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB,CAAA;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAazF;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,YAAY,EAAE,MAAM,CAAA;IACpB,aAAa,EAAE,MAAM,CAAA;IACrB,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG,KAAK,GAAG;IAC3C,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"oauth-utils.d.ts","sourceRoot":"","sources":["../../../lib/codex-native/oauth-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,6 +56,37 @@ export function extractAccountId(tokens) {
|
|
|
56
56
|
}
|
|
57
57
|
return undefined;
|
|
58
58
|
}
|
|
59
|
+
function parseOAuthErrorPayload(raw) {
|
|
60
|
+
if (!raw)
|
|
61
|
+
return {};
|
|
62
|
+
try {
|
|
63
|
+
const payload = JSON.parse(raw);
|
|
64
|
+
const topLevelError = payload.error;
|
|
65
|
+
if (typeof topLevelError === "string") {
|
|
66
|
+
return {
|
|
67
|
+
code: topLevelError,
|
|
68
|
+
message: typeof payload.error_description === "string" ? payload.error_description : undefined
|
|
69
|
+
};
|
|
70
|
+
}
|
|
71
|
+
if (topLevelError && typeof topLevelError === "object" && !Array.isArray(topLevelError)) {
|
|
72
|
+
const nested = topLevelError;
|
|
73
|
+
return {
|
|
74
|
+
code: typeof nested.code === "string" ? nested.code : undefined,
|
|
75
|
+
message: typeof nested.message === "string"
|
|
76
|
+
? nested.message
|
|
77
|
+
: typeof payload.error_description === "string"
|
|
78
|
+
? payload.error_description
|
|
79
|
+
: undefined
|
|
80
|
+
};
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
catch (error) {
|
|
84
|
+
if (!(error instanceof SyntaxError)) {
|
|
85
|
+
// Best effort parse only.
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
return {};
|
|
89
|
+
}
|
|
59
90
|
export async function fetchWithTimeout(input, init, timeoutMs) {
|
|
60
91
|
const controller = new AbortController();
|
|
61
92
|
const timeout = setTimeout(() => controller.abort(), Math.max(1, Math.floor(timeoutMs)));
|
|
@@ -120,25 +151,14 @@ export async function refreshAccessToken(refreshToken) {
|
|
|
120
151
|
}).toString()
|
|
121
152
|
}, OAUTH_HTTP_TIMEOUT_MS);
|
|
122
153
|
if (!response.ok) {
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
if (raw) {
|
|
127
|
-
const payload = JSON.parse(raw);
|
|
128
|
-
if (typeof payload.error === "string")
|
|
129
|
-
oauthCode = payload.error;
|
|
130
|
-
}
|
|
131
|
-
}
|
|
132
|
-
catch (error) {
|
|
133
|
-
if (!(error instanceof SyntaxError)) {
|
|
134
|
-
// Best effort parse only.
|
|
135
|
-
}
|
|
136
|
-
// Best effort parse only.
|
|
137
|
-
}
|
|
154
|
+
const raw = await response.text();
|
|
155
|
+
const parsedError = parseOAuthErrorPayload(raw);
|
|
156
|
+
const oauthCode = parsedError.code;
|
|
138
157
|
const detail = oauthCode ? `${oauthCode}` : `status ${response.status}`;
|
|
139
158
|
const error = new Error(`Token refresh failed (${detail})`);
|
|
140
159
|
error.status = response.status;
|
|
141
160
|
error.oauthCode = oauthCode;
|
|
161
|
+
error.oauthMessage = parsedError.message;
|
|
142
162
|
throw error;
|
|
143
163
|
}
|
|
144
164
|
return (await response.json());
|