@iam-brain/opencode-codex-auth 1.2.3 → 1.2.5
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 +15 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +41 -18
- package/dist/index.js.map +1 -1
- package/dist/lib/accounts-tools.d.ts.map +1 -1
- package/dist/lib/accounts-tools.js +114 -29
- package/dist/lib/accounts-tools.js.map +1 -1
- package/dist/lib/cache-io.d.ts.map +1 -1
- package/dist/lib/cache-io.js +8 -2
- package/dist/lib/cache-io.js.map +1 -1
- package/dist/lib/cache-lock.d.ts +1 -0
- package/dist/lib/cache-lock.d.ts.map +1 -1
- package/dist/lib/cache-lock.js +12 -2
- package/dist/lib/cache-lock.js.map +1 -1
- package/dist/lib/codex-native/accounts.d.ts.map +1 -1
- package/dist/lib/codex-native/accounts.js +18 -12
- package/dist/lib/codex-native/accounts.js.map +1 -1
- package/dist/lib/codex-native/acquire-auth.d.ts +1 -1
- package/dist/lib/codex-native/acquire-auth.d.ts.map +1 -1
- package/dist/lib/codex-native/acquire-auth.js +317 -204
- package/dist/lib/codex-native/acquire-auth.js.map +1 -1
- package/dist/lib/codex-native/auth-menu-flow.d.ts.map +1 -1
- package/dist/lib/codex-native/auth-menu-flow.js +27 -12
- package/dist/lib/codex-native/auth-menu-flow.js.map +1 -1
- package/dist/lib/codex-native/auth-menu-quotas.d.ts.map +1 -1
- package/dist/lib/codex-native/auth-menu-quotas.js +11 -4
- package/dist/lib/codex-native/auth-menu-quotas.js.map +1 -1
- package/dist/lib/codex-native/browser.d.ts +2 -0
- package/dist/lib/codex-native/browser.d.ts.map +1 -1
- package/dist/lib/codex-native/browser.js +3 -3
- package/dist/lib/codex-native/browser.js.map +1 -1
- package/dist/lib/codex-native/catalog-auth.d.ts.map +1 -1
- package/dist/lib/codex-native/catalog-auth.js +4 -2
- package/dist/lib/codex-native/catalog-auth.js.map +1 -1
- package/dist/lib/codex-native/chat-hooks.d.ts.map +1 -1
- package/dist/lib/codex-native/chat-hooks.js +0 -8
- package/dist/lib/codex-native/chat-hooks.js.map +1 -1
- package/dist/lib/codex-native/client-identity.d.ts.map +1 -1
- package/dist/lib/codex-native/client-identity.js +13 -5
- package/dist/lib/codex-native/client-identity.js.map +1 -1
- package/dist/lib/codex-native/collaboration.d.ts +1 -1
- package/dist/lib/codex-native/collaboration.d.ts.map +1 -1
- package/dist/lib/codex-native/collaboration.js +9 -116
- package/dist/lib/codex-native/collaboration.js.map +1 -1
- package/dist/lib/codex-native/oauth-auth-methods.d.ts +1 -0
- package/dist/lib/codex-native/oauth-auth-methods.d.ts.map +1 -1
- package/dist/lib/codex-native/oauth-auth-methods.js +36 -6
- package/dist/lib/codex-native/oauth-auth-methods.js.map +1 -1
- package/dist/lib/codex-native/oauth-persistence.d.ts.map +1 -1
- package/dist/lib/codex-native/oauth-persistence.js +6 -0
- package/dist/lib/codex-native/oauth-persistence.js.map +1 -1
- package/dist/lib/codex-native/oauth-server.d.ts +1 -0
- package/dist/lib/codex-native/oauth-server.d.ts.map +1 -1
- package/dist/lib/codex-native/oauth-server.js +114 -43
- package/dist/lib/codex-native/oauth-server.js.map +1 -1
- package/dist/lib/codex-native/openai-loader-fetch.d.ts.map +1 -1
- package/dist/lib/codex-native/openai-loader-fetch.js +122 -33
- package/dist/lib/codex-native/openai-loader-fetch.js.map +1 -1
- package/dist/lib/codex-native/originator.d.ts.map +1 -1
- package/dist/lib/codex-native/originator.js +18 -1
- package/dist/lib/codex-native/originator.js.map +1 -1
- package/dist/lib/codex-native/request-routing.d.ts.map +1 -1
- package/dist/lib/codex-native/request-routing.js +9 -0
- package/dist/lib/codex-native/request-routing.js.map +1 -1
- package/dist/lib/codex-native/request-transform.d.ts.map +1 -1
- package/dist/lib/codex-native/request-transform.js +39 -8
- package/dist/lib/codex-native/request-transform.js.map +1 -1
- package/dist/lib/codex-native/session-affinity-state.d.ts +1 -1
- package/dist/lib/codex-native/session-affinity-state.d.ts.map +1 -1
- package/dist/lib/codex-native/session-affinity-state.js +1 -0
- package/dist/lib/codex-native/session-affinity-state.js.map +1 -1
- package/dist/lib/codex-native.js.map +1 -1
- package/dist/lib/codex-prompts-cache.d.ts.map +1 -1
- package/dist/lib/codex-prompts-cache.js.map +1 -1
- package/dist/lib/codex-quota-fetch.d.ts.map +1 -1
- package/dist/lib/codex-quota-fetch.js +12 -9
- package/dist/lib/codex-quota-fetch.js.map +1 -1
- package/dist/lib/codex-status-storage.d.ts.map +1 -1
- package/dist/lib/codex-status-storage.js.map +1 -1
- package/dist/lib/codex-status.d.ts.map +1 -1
- package/dist/lib/codex-status.js +28 -3
- package/dist/lib/codex-status.js.map +1 -1
- package/dist/lib/config.d.ts +3 -0
- package/dist/lib/config.d.ts.map +1 -1
- package/dist/lib/config.js +41 -21
- package/dist/lib/config.js.map +1 -1
- package/dist/lib/fetch-orchestrator.d.ts +2 -1
- package/dist/lib/fetch-orchestrator.d.ts.map +1 -1
- package/dist/lib/fetch-orchestrator.js +81 -11
- package/dist/lib/fetch-orchestrator.js.map +1 -1
- package/dist/lib/identity.d.ts +6 -0
- package/dist/lib/identity.d.ts.map +1 -1
- package/dist/lib/identity.js +25 -4
- package/dist/lib/identity.js.map +1 -1
- package/dist/lib/opencode-install.d.ts.map +1 -1
- package/dist/lib/opencode-install.js +5 -6
- package/dist/lib/opencode-install.js.map +1 -1
- package/dist/lib/orchestrator-agent.d.ts.map +1 -1
- package/dist/lib/orchestrator-agent.js +2 -1
- package/dist/lib/orchestrator-agent.js.map +1 -1
- package/dist/lib/paths.d.ts.map +1 -1
- package/dist/lib/paths.js +24 -3
- package/dist/lib/paths.js.map +1 -1
- package/dist/lib/proactive-refresh.d.ts.map +1 -1
- package/dist/lib/proactive-refresh.js +50 -13
- package/dist/lib/proactive-refresh.js.map +1 -1
- package/dist/lib/refresh-queue.d.ts.map +1 -1
- package/dist/lib/refresh-queue.js +1 -0
- package/dist/lib/refresh-queue.js.map +1 -1
- package/dist/lib/remote-cache-fetch.d.ts.map +1 -1
- package/dist/lib/remote-cache-fetch.js +5 -1
- package/dist/lib/remote-cache-fetch.js.map +1 -1
- package/dist/lib/request-snapshots.d.ts.map +1 -1
- package/dist/lib/request-snapshots.js +46 -10
- package/dist/lib/request-snapshots.js.map +1 -1
- package/dist/lib/rotation.d.ts.map +1 -1
- package/dist/lib/rotation.js +3 -2
- package/dist/lib/rotation.js.map +1 -1
- package/dist/lib/session-affinity.d.ts.map +1 -1
- package/dist/lib/session-affinity.js +35 -20
- package/dist/lib/session-affinity.js.map +1 -1
- package/dist/lib/storage.d.ts.map +1 -1
- package/dist/lib/storage.js +110 -45
- package/dist/lib/storage.js.map +1 -1
- package/dist/lib/ui/auth-menu.d.ts +3 -2
- package/dist/lib/ui/auth-menu.d.ts.map +1 -1
- package/dist/lib/ui/auth-menu.js +1 -1
- package/dist/lib/ui/auth-menu.js.map +1 -1
- package/package.json +20 -8
package/README.md
CHANGED
|
@@ -7,6 +7,17 @@ OpenCode plugin for OpenAI ChatGPT OAuth with multi-account management, Codex-co
|
|
|
7
7
|
|
|
8
8
|
Quick links: [Getting Started](docs/getting-started.md) · [Configuration](docs/configuration.md) · [Multi-account](docs/multi-account.md) · [Troubleshooting](docs/troubleshooting.md) · [Persona Tool](docs/persona-tool.md)
|
|
9
9
|
|
|
10
|
+
## Requirements
|
|
11
|
+
|
|
12
|
+
- Node.js `20.x`
|
|
13
|
+
- npm `10.9.2` (managed via Corepack using `packageManager`)
|
|
14
|
+
- OpenCode CLI installed and available on your PATH
|
|
15
|
+
- Optional live quota probe test: set `CODEX_IN_VIVO=1` before running tests
|
|
16
|
+
- Release automation requires GitHub Actions permissions for `contents: write` and `id-token: write` (OIDC trusted publishing)
|
|
17
|
+
- Release automation also requires a configured GitHub Actions environment named `npm-release`
|
|
18
|
+
- Release publish job requires Node.js `>=22.14` and npm `>=11.5.1` for GitHub OIDC trusted publishing compatibility
|
|
19
|
+
- If npm publish fails with `ENEEDAUTH`, verify npm Trusted Publisher mapping for repo `iam-brain/opencode-codex-auth`, workflow `.github/workflows/release.yml`, and environment `npm-release`
|
|
20
|
+
|
|
10
21
|
## Why this plugin
|
|
11
22
|
|
|
12
23
|
- Uses ChatGPT OAuth instead of API keys for OpenAI provider flows.
|
|
@@ -123,6 +134,10 @@ Legacy sources can be imported explicitly from the auth menu:
|
|
|
123
134
|
```bash
|
|
124
135
|
npm install
|
|
125
136
|
npm run verify
|
|
137
|
+
npm run perf:profile
|
|
138
|
+
npm run perf:profile:compare -- /path/to/baseline-root /path/to/optimized-root
|
|
126
139
|
```
|
|
127
140
|
|
|
128
141
|
`npm run verify` includes ESM import specifier guards and a built CLI smoke check.
|
|
142
|
+
`npm run perf:profile` runs explicit `single-root` profiling for one checkout.
|
|
143
|
+
Use `npm run perf:profile:compare -- <baseline-root> <optimized-root>` for comparative gain output across two distinct roots.
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAkDjD,eAAO,MAAM,qBAAqB,EAAE,MA+OnC,CAAA;AAED,eAAe,qBAAqB,CAAA"}
|
package/dist/index.js
CHANGED
|
@@ -10,6 +10,7 @@ import { installCreatePersonalityCommand } from "./lib/personality-command.js";
|
|
|
10
10
|
import { installPersonalityBuilderSkill } from "./lib/personality-skill.js";
|
|
11
11
|
import { reconcileOrchestratorAgentVisibility } from "./lib/orchestrator-agent.js";
|
|
12
12
|
import { runOneProactiveRefreshTick } from "./lib/proactive-refresh.js";
|
|
13
|
+
import { createRefreshScheduler, ProactiveRefreshQueue } from "./lib/refresh-queue.js";
|
|
13
14
|
import { toolOutputForStatus } from "./lib/codex-status-tool.js";
|
|
14
15
|
import { requireOpenAIMultiOauthAuth, saveAuthStorage } from "./lib/storage.js";
|
|
15
16
|
import { refreshCachedCodexPrompts } from "./lib/codex-prompts-cache.js";
|
|
@@ -58,25 +59,47 @@ export const OpenAIMultiAuthPlugin = async (input) => {
|
|
|
58
59
|
});
|
|
59
60
|
if (getProactiveRefreshEnabled(cfg)) {
|
|
60
61
|
const bufferMs = getProactiveRefreshBufferMs(cfg);
|
|
61
|
-
const
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
62
|
+
const intervalMs = 60_000;
|
|
63
|
+
const taskKey = "proactive-refresh";
|
|
64
|
+
const queue = new ProactiveRefreshQueue({ bufferMs: 0 });
|
|
65
|
+
queue.enqueue({ key: taskKey, expiresAt: Date.now() + intervalMs });
|
|
66
|
+
const refreshScheduler = createRefreshScheduler({
|
|
67
|
+
intervalMs,
|
|
68
|
+
queue,
|
|
69
|
+
now: Date.now,
|
|
70
|
+
getTasks: () => [
|
|
71
|
+
{
|
|
72
|
+
key: taskKey,
|
|
73
|
+
expiresAt: 0,
|
|
74
|
+
refresh: async () => {
|
|
75
|
+
try {
|
|
76
|
+
await runOneProactiveRefreshTick({
|
|
77
|
+
now: Date.now,
|
|
78
|
+
bufferMs,
|
|
79
|
+
refresh: async (refreshToken) => {
|
|
80
|
+
const tokens = await refreshAccessToken(refreshToken);
|
|
81
|
+
return {
|
|
82
|
+
access: tokens.access_token,
|
|
83
|
+
refresh: tokens.refresh_token,
|
|
84
|
+
expires: Date.now() + (tokens.expires_in ?? 3600) * 1000
|
|
85
|
+
};
|
|
86
|
+
}
|
|
87
|
+
});
|
|
88
|
+
}
|
|
89
|
+
catch (error) {
|
|
90
|
+
if (error instanceof Error) {
|
|
91
|
+
// best-effort background scheduler
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
finally {
|
|
95
|
+
queue.enqueue({ key: taskKey, expiresAt: Date.now() + intervalMs });
|
|
96
|
+
}
|
|
97
|
+
}
|
|
72
98
|
}
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
});
|
|
78
|
-
}, 60_000);
|
|
79
|
-
scheduler = { stop: () => clearInterval(timer) };
|
|
99
|
+
]
|
|
100
|
+
});
|
|
101
|
+
refreshScheduler.start();
|
|
102
|
+
scheduler = { stop: refreshScheduler.stop };
|
|
80
103
|
}
|
|
81
104
|
log.debug("plugin init");
|
|
82
105
|
const hooks = await CodexAuthPlugin(input, {
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AAE/C,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,EACpB,2BAA2B,EAC5B,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AAC7G,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAC3E,OAAO,EACL,uBAAuB,EACvB,8BAA8B,EAC9B,iCAAiC,EACjC,mBAAmB,EACnB,8BAA8B,EAC9B,eAAe,EACf,8BAA8B,EAC9B,8BAA8B,EAC9B,yBAAyB,EACzB,+BAA+B,EAC/B,OAAO,EACP,sCAAsC,EACtC,mBAAmB,EACnB,yBAAyB,EACzB,mBAAmB,EACnB,cAAc,EACd,2BAA2B,EAC3B,0BAA0B,EAC1B,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,aAAa,EACd,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAA;AACnE,OAAO,EAAE,+BAA+B,EAAE,MAAM,8BAA8B,CAAA;AAC9E,OAAO,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAA;AAC3E,OAAO,EAAE,oCAAoC,EAAE,MAAM,6BAA6B,CAAA;AAClF,OAAO,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAA;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAA;AAChE,OAAO,EAAE,2BAA2B,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAC/E,OAAO,EAAE,yBAAyB,EAAE,MAAM,8BAA8B,CAAA;AACxE,OAAO,EAAE,4BAA4B,EAAE,MAAM,qCAAqC,CAAA;AAElF,IAAI,SAA2C,CAAA;AAE/C,MAAM,CAAC,MAAM,qBAAqB,GAAW,KAAK,EAAE,KAAK,EAAE,EAAE;IAC3D,IAAI,SAAS,EAAE,CAAC;QACd,SAAS,CAAC,IAAI,EAAE,CAAA;QAChB,SAAS,GAAG,SAAS,CAAA;IACvB,CAAC;IAED,MAAM,uBAAuB,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;QAClE,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;YAC3B,OAAO,CAAC,IAAI,CAAC,oEAAoE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;QACnG,CAAC;IACH,CAAC,CAAC,CAAA;IACF,MAAM,+BAA+B,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;QACrE,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;YAC3B,OAAO,CAAC,IAAI,CAAC,4EAA4E,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;QAC3G,CAAC;IACH,CAAC,CAAC,CAAA;IACF,MAAM,8BAA8B,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;QACpE,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;YAC3B,OAAO,CAAC,IAAI,CAAC,2EAA2E,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;QAC1G,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,MAAM,yBAAyB,EAAE;SAC9B,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;QAChB,4BAA4B,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;IAC5C,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;QACf,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;YAC3B,OAAO,CAAC,IAAI,CAAC,sEAAsE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;QACrG,CAAC;IACH,CAAC,CAAC,CAAA;IAEJ,MAAM,GAAG,GAAG,aAAa,CAAC;QACxB,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,IAAI,EAAE,cAAc,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC;KAC3C,CAAC,CAAA;IACF,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;IAChC,MAAM,2BAA2B,GAAG,8BAA8B,CAAC,GAAG,CAAC,CAAA;IACvE,MAAM,GAAG,GAAG,YAAY,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAEzD,MAAM,oCAAoC,CAAC,EAAE,OAAO,EAAE,2BAA2B,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;QACnG,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;YAC3B,OAAO,CAAC,IAAI,CAAC,iFAAiF,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;QAChH,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,IAAI,0BAA0B,CAAC,GAAG,CAAC,EAAE,CAAC;QACpC,MAAM,QAAQ,GAAG,2BAA2B,CAAC,GAAG,CAAC,CAAA;QACjD,MAAM,KAAK,GAAG,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accounts-tools.d.ts","sourceRoot":"","sources":["../../lib/accounts-tools.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAiB,oBAAoB,EAAE,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"accounts-tools.d.ts","sourceRoot":"","sources":["../../lib/accounts-tools.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAiB,oBAAoB,EAAE,MAAM,YAAY,CAAA;AASrE,MAAM,MAAM,cAAc,GAAG;IAC3B,YAAY,EAAE,MAAM,CAAA;IACpB,WAAW,EAAE,MAAM,CAAA;IACnB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,EAAE,OAAO,CAAA;CAClB,CAAA;AA6KD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,oBAAoB,GAAG,cAAc,EAAE,CAUnF;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,oBAAoB,EAAE,MAAM,EAAE,MAAM,GAAG,oBAAoB,CAwBvG;AAED,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,oBAAoB,EAAE,MAAM,EAAE,MAAM,GAAG,oBAAoB,CA0C9G;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,oBAAoB,EAAE,MAAM,EAAE,MAAM,GAAG,oBAAoB,CA6CvG"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { assignDeterministicFallbackIdentityKey, buildLegacyIdentityFingerprint, ensureIdentityKey, normalizeEmail, normalizePlan } from "./identity.js";
|
|
1
2
|
function cloneDomain(domain) {
|
|
2
3
|
if (!domain)
|
|
3
4
|
return undefined;
|
|
@@ -6,20 +7,100 @@ function cloneDomain(domain) {
|
|
|
6
7
|
accounts: [...domain.accounts]
|
|
7
8
|
};
|
|
8
9
|
}
|
|
10
|
+
function normalizeIdentityFields(account) {
|
|
11
|
+
if (account.accountId) {
|
|
12
|
+
const trimmed = account.accountId.trim();
|
|
13
|
+
account.accountId = trimmed || undefined;
|
|
14
|
+
}
|
|
15
|
+
account.email = normalizeEmail(account.email);
|
|
16
|
+
account.plan = normalizePlan(account.plan);
|
|
17
|
+
}
|
|
18
|
+
function hydrateAccounts(accounts) {
|
|
19
|
+
const fallbackIdentityCounts = new Map();
|
|
20
|
+
return accounts.map((account) => {
|
|
21
|
+
const next = { ...account };
|
|
22
|
+
normalizeIdentityFields(next);
|
|
23
|
+
ensureIdentityKey(next);
|
|
24
|
+
if (next.identityKey) {
|
|
25
|
+
return next;
|
|
26
|
+
}
|
|
27
|
+
const fingerprint = buildLegacyIdentityFingerprint(next);
|
|
28
|
+
const occurrence = fallbackIdentityCounts.get(fingerprint) ?? 0;
|
|
29
|
+
fallbackIdentityCounts.set(fingerprint, occurrence + 1);
|
|
30
|
+
assignDeterministicFallbackIdentityKey(next, occurrence);
|
|
31
|
+
return next;
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
function hydrateOpenAIForTooling(openai) {
|
|
35
|
+
const nextNative = openai.native
|
|
36
|
+
? {
|
|
37
|
+
...openai.native,
|
|
38
|
+
accounts: hydrateAccounts(openai.native.accounts)
|
|
39
|
+
}
|
|
40
|
+
: undefined;
|
|
41
|
+
const nextCodex = openai.codex
|
|
42
|
+
? {
|
|
43
|
+
...openai.codex,
|
|
44
|
+
accounts: hydrateAccounts(openai.codex.accounts)
|
|
45
|
+
}
|
|
46
|
+
: undefined;
|
|
47
|
+
const hydrated = {
|
|
48
|
+
...openai,
|
|
49
|
+
accounts: hydrateAccounts(openai.accounts),
|
|
50
|
+
...(nextNative ? { native: nextNative } : {}),
|
|
51
|
+
...(nextCodex ? { codex: nextCodex } : {})
|
|
52
|
+
};
|
|
53
|
+
reconcileActiveIdentityKeyForDomain(hydrated.native);
|
|
54
|
+
reconcileActiveIdentityKeyForDomain(hydrated.codex);
|
|
55
|
+
if (hydrated.activeIdentityKey &&
|
|
56
|
+
hydrated.accounts.some((account) => account.identityKey === hydrated.activeIdentityKey && account.enabled !== false)) {
|
|
57
|
+
return hydrated;
|
|
58
|
+
}
|
|
59
|
+
hydrated.activeIdentityKey = hydrated.accounts.find((account) => account.enabled !== false && account.identityKey)?.identityKey;
|
|
60
|
+
return hydrated;
|
|
61
|
+
}
|
|
9
62
|
function normalizeValue(value) {
|
|
10
63
|
return value?.trim().toLowerCase() ?? "";
|
|
11
64
|
}
|
|
12
65
|
function normalizeAccountId(value) {
|
|
13
66
|
return value?.trim() ?? "";
|
|
14
67
|
}
|
|
15
|
-
function
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
68
|
+
function hasStrictTuple(account) {
|
|
69
|
+
return Boolean(normalizeAccountId(account.accountId) &&
|
|
70
|
+
normalizeValue(account.email) &&
|
|
71
|
+
normalizeValue(account.plan));
|
|
72
|
+
}
|
|
73
|
+
function findUniqueDomainMatchIndex(domainAccounts, target) {
|
|
74
|
+
if (target.identityKey) {
|
|
75
|
+
const identityMatches = domainAccounts
|
|
76
|
+
.map((account, index) => ({ account, index }))
|
|
77
|
+
.filter(({ account }) => account.identityKey === target.identityKey);
|
|
78
|
+
if (identityMatches.length === 1)
|
|
79
|
+
return identityMatches[0].index;
|
|
80
|
+
if (identityMatches.length > 1)
|
|
81
|
+
return -1;
|
|
82
|
+
}
|
|
83
|
+
if (hasStrictTuple(target)) {
|
|
84
|
+
const tupleMatches = domainAccounts
|
|
85
|
+
.map((account, index) => ({ account, index }))
|
|
86
|
+
.filter(({ account }) => {
|
|
87
|
+
return (normalizeAccountId(account.accountId) === normalizeAccountId(target.accountId) &&
|
|
88
|
+
normalizeValue(account.email) === normalizeValue(target.email) &&
|
|
89
|
+
normalizeValue(account.plan) === normalizeValue(target.plan));
|
|
90
|
+
});
|
|
91
|
+
if (tupleMatches.length === 1)
|
|
92
|
+
return tupleMatches[0].index;
|
|
93
|
+
return -1;
|
|
94
|
+
}
|
|
95
|
+
const targetRefresh = target.refresh?.trim();
|
|
96
|
+
if (!targetRefresh)
|
|
97
|
+
return -1;
|
|
98
|
+
const refreshMatches = domainAccounts
|
|
99
|
+
.map((account, index) => ({ account, index }))
|
|
100
|
+
.filter(({ account }) => account.refresh?.trim() === targetRefresh);
|
|
101
|
+
if (refreshMatches.length === 1)
|
|
102
|
+
return refreshMatches[0].index;
|
|
103
|
+
return -1;
|
|
23
104
|
}
|
|
24
105
|
function reconcileActiveIdentityKeyForDomain(domain) {
|
|
25
106
|
if (!domain)
|
|
@@ -68,7 +149,8 @@ function resolveToolAccount(openai, index1) {
|
|
|
68
149
|
return account;
|
|
69
150
|
}
|
|
70
151
|
export function listAccountsForTools(openai) {
|
|
71
|
-
|
|
152
|
+
const hydrated = hydrateOpenAIForTooling(openai);
|
|
153
|
+
return buildToolRows(hydrated).map((row) => ({
|
|
72
154
|
displayIndex: row.displayIndex,
|
|
73
155
|
identityKey: row.identityKey,
|
|
74
156
|
email: row.email,
|
|
@@ -78,11 +160,12 @@ export function listAccountsForTools(openai) {
|
|
|
78
160
|
}));
|
|
79
161
|
}
|
|
80
162
|
export function switchAccountByIndex(openai, index1) {
|
|
81
|
-
const
|
|
163
|
+
const hydrated = hydrateOpenAIForTooling(openai);
|
|
164
|
+
const target = resolveToolAccount(hydrated, index1);
|
|
82
165
|
if (target.enabled === false)
|
|
83
166
|
throw new Error("Target account is disabled");
|
|
84
|
-
const nextNative = cloneDomain(
|
|
85
|
-
const nextCodex = cloneDomain(
|
|
167
|
+
const nextNative = cloneDomain(hydrated.native);
|
|
168
|
+
const nextCodex = cloneDomain(hydrated.codex);
|
|
86
169
|
const domains = [nextNative, nextCodex];
|
|
87
170
|
for (const domain of domains) {
|
|
88
171
|
if (!domain)
|
|
@@ -93,40 +176,41 @@ export function switchAccountByIndex(openai, index1) {
|
|
|
93
176
|
}
|
|
94
177
|
}
|
|
95
178
|
return {
|
|
96
|
-
...
|
|
179
|
+
...hydrated,
|
|
97
180
|
activeIdentityKey: target.identityKey,
|
|
98
181
|
...(nextNative ? { native: nextNative } : {}),
|
|
99
182
|
...(nextCodex ? { codex: nextCodex } : {})
|
|
100
183
|
};
|
|
101
184
|
}
|
|
102
185
|
export function toggleAccountEnabledByIndex(openai, index1) {
|
|
186
|
+
const hydrated = hydrateOpenAIForTooling(openai);
|
|
103
187
|
if (!Number.isInteger(index1))
|
|
104
188
|
throw new Error("Invalid account index");
|
|
105
189
|
if (index1 < 1)
|
|
106
190
|
throw new Error("Invalid account index");
|
|
107
|
-
const rows = buildToolRows(
|
|
191
|
+
const rows = buildToolRows(hydrated);
|
|
108
192
|
const row = rows[index1 - 1];
|
|
109
193
|
if (!row)
|
|
110
194
|
throw new Error("Invalid account index");
|
|
111
195
|
const idx = row.accountIndex;
|
|
112
196
|
if (idx < 0)
|
|
113
197
|
throw new Error("Target account missing identityKey");
|
|
114
|
-
const target =
|
|
198
|
+
const target = hydrated.accounts[idx];
|
|
115
199
|
if (!target?.identityKey)
|
|
116
200
|
throw new Error("Target account missing identityKey");
|
|
117
201
|
const toggledEnabled = target.enabled === false;
|
|
118
|
-
const nextAccounts = [...
|
|
202
|
+
const nextAccounts = [...hydrated.accounts];
|
|
119
203
|
nextAccounts[idx] = {
|
|
120
204
|
...target,
|
|
121
205
|
enabled: toggledEnabled
|
|
122
206
|
};
|
|
123
|
-
const nextNative = cloneDomain(
|
|
124
|
-
const nextCodex = cloneDomain(
|
|
207
|
+
const nextNative = cloneDomain(hydrated.native);
|
|
208
|
+
const nextCodex = cloneDomain(hydrated.codex);
|
|
125
209
|
const domains = [nextNative, nextCodex];
|
|
126
210
|
for (const domain of domains) {
|
|
127
211
|
if (!domain)
|
|
128
212
|
continue;
|
|
129
|
-
const domainIndex = domain.accounts
|
|
213
|
+
const domainIndex = findUniqueDomainMatchIndex(domain.accounts, target);
|
|
130
214
|
if (domainIndex >= 0) {
|
|
131
215
|
const domainTarget = domain.accounts[domainIndex];
|
|
132
216
|
if (domainTarget) {
|
|
@@ -136,28 +220,29 @@ export function toggleAccountEnabledByIndex(openai, index1) {
|
|
|
136
220
|
reconcileActiveIdentityKeyForDomain(domain);
|
|
137
221
|
}
|
|
138
222
|
return {
|
|
139
|
-
...
|
|
223
|
+
...hydrated,
|
|
140
224
|
accounts: nextAccounts,
|
|
141
225
|
...(nextNative ? { native: nextNative } : {}),
|
|
142
226
|
...(nextCodex ? { codex: nextCodex } : {})
|
|
143
227
|
};
|
|
144
228
|
}
|
|
145
229
|
export function removeAccountByIndex(openai, index1) {
|
|
230
|
+
const hydrated = hydrateOpenAIForTooling(openai);
|
|
146
231
|
if (!Number.isInteger(index1))
|
|
147
232
|
throw new Error("Invalid account index");
|
|
148
233
|
if (index1 < 1)
|
|
149
234
|
throw new Error("Invalid account index");
|
|
150
|
-
const rows = buildToolRows(
|
|
235
|
+
const rows = buildToolRows(hydrated);
|
|
151
236
|
const row = rows[index1 - 1];
|
|
152
237
|
if (!row)
|
|
153
238
|
throw new Error("Invalid account index");
|
|
154
239
|
const idx = row.accountIndex;
|
|
155
240
|
if (idx < 0)
|
|
156
241
|
throw new Error("Target account missing identityKey");
|
|
157
|
-
const removed =
|
|
158
|
-
const accounts =
|
|
159
|
-
let activeIdentityKey =
|
|
160
|
-
if (removed?.identityKey &&
|
|
242
|
+
const removed = hydrated.accounts[idx];
|
|
243
|
+
const accounts = hydrated.accounts.filter((_, i) => i !== idx);
|
|
244
|
+
let activeIdentityKey = hydrated.activeIdentityKey;
|
|
245
|
+
if (removed?.identityKey && hydrated.activeIdentityKey === removed.identityKey) {
|
|
161
246
|
const forward = accounts.slice(idx).find((a) => a.enabled !== false && a.identityKey);
|
|
162
247
|
const backward = accounts
|
|
163
248
|
.slice(0, idx)
|
|
@@ -166,20 +251,20 @@ export function removeAccountByIndex(openai, index1) {
|
|
|
166
251
|
const fallback = forward ?? backward;
|
|
167
252
|
activeIdentityKey = fallback?.identityKey;
|
|
168
253
|
}
|
|
169
|
-
const nextNative = cloneDomain(
|
|
170
|
-
const nextCodex = cloneDomain(
|
|
254
|
+
const nextNative = cloneDomain(hydrated.native);
|
|
255
|
+
const nextCodex = cloneDomain(hydrated.codex);
|
|
171
256
|
const domains = [nextNative, nextCodex];
|
|
172
257
|
for (const domain of domains) {
|
|
173
258
|
if (!domain || !removed?.identityKey)
|
|
174
259
|
continue;
|
|
175
|
-
const domainIndex = domain.accounts
|
|
260
|
+
const domainIndex = findUniqueDomainMatchIndex(domain.accounts, removed);
|
|
176
261
|
if (domainIndex >= 0) {
|
|
177
262
|
domain.accounts = domain.accounts.filter((_, i) => i !== domainIndex);
|
|
178
263
|
}
|
|
179
264
|
reconcileActiveIdentityKeyForDomain(domain);
|
|
180
265
|
}
|
|
181
266
|
return {
|
|
182
|
-
...
|
|
267
|
+
...hydrated,
|
|
183
268
|
accounts,
|
|
184
269
|
...(activeIdentityKey ? { activeIdentityKey } : { activeIdentityKey: undefined }),
|
|
185
270
|
...(nextNative ? { native: nextNative } : {}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accounts-tools.js","sourceRoot":"","sources":["../../lib/accounts-tools.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"accounts-tools.js","sourceRoot":"","sources":["../../lib/accounts-tools.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache-io.d.ts","sourceRoot":"","sources":["../../lib/cache-io.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cache-io.d.ts","sourceRoot":"","sources":["../../lib/cache-io.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEzC,KAAK,WAAW,GAAG,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,KAAK,IAAI,CAAA;AAI3F,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,WAAW,GAAG,SAAS,GAAG,IAAI,CAEjF;AAYD,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAEnE;AAKD,eAAO,MAAM,UAAU;mCACU,MAAM,MAAM,CAAC,QAAQ,GAAG,IAAI;CAG5D,CAAA;AA+CD,wBAAsB,2BAA2B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAejF;AAED,wBAAsB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAa3F;AAED,wBAAsB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAInF;AAED,wBAAsB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAsBzF;AAED,wBAAsB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAS7F;AAED,wBAAsB,6BAA6B,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CASnG;AAED,wBAAsB,6BAA6B,CACjD,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,OAAO,EACd,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GACzC,OAAO,CAAC,IAAI,CAAC,CAOf;AAED,wBAAsB,mCAAmC,CACvD,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,OAAO,EACd,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GACzC,OAAO,CAAC,IAAI,CAAC,CAOf"}
|
package/dist/lib/cache-io.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import fs from "node:fs/promises";
|
|
2
2
|
import path from "node:path";
|
|
3
|
+
import { randomUUID } from "node:crypto";
|
|
3
4
|
let cacheIoFailureObserver;
|
|
4
5
|
export function setCacheIoFailureObserver(observer) {
|
|
5
6
|
cacheIoFailureObserver = observer;
|
|
@@ -73,7 +74,12 @@ export async function enforceOwnerOnlyPermissions(filePath) {
|
|
|
73
74
|
await fs.chmod(filePath, 0o600);
|
|
74
75
|
}
|
|
75
76
|
catch (error) {
|
|
76
|
-
if (!isFsErrorCode(error, "EACCES") &&
|
|
77
|
+
if (!isFsErrorCode(error, "EACCES") &&
|
|
78
|
+
!isFsErrorCode(error, "EPERM") &&
|
|
79
|
+
!isFsErrorCode(error, "ENOTSUP") &&
|
|
80
|
+
!isFsErrorCode(error, "EOPNOTSUPP") &&
|
|
81
|
+
!isFsErrorCode(error, "ENOSYS") &&
|
|
82
|
+
!isFsErrorCode(error, "EINVAL")) {
|
|
77
83
|
throw error;
|
|
78
84
|
}
|
|
79
85
|
}
|
|
@@ -100,7 +106,7 @@ export async function writeJsonFile(filePath, value) {
|
|
|
100
106
|
}
|
|
101
107
|
export async function writeJsonFileAtomic(filePath, value) {
|
|
102
108
|
await fs.mkdir(path.dirname(filePath), { recursive: true });
|
|
103
|
-
const tempPath = `${filePath}.tmp.${Date.now().toString(36)}.${
|
|
109
|
+
const tempPath = `${filePath}.tmp.${Date.now().toString(36)}.${randomUUID()}`;
|
|
104
110
|
try {
|
|
105
111
|
await fs.writeFile(tempPath, `${JSON.stringify(value, null, 2)}\n`, { mode: 0o600 });
|
|
106
112
|
const tempHandle = await fs.open(tempPath, "r+");
|
package/dist/lib/cache-io.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache-io.js","sourceRoot":"","sources":["../../lib/cache-io.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAA;AACjC,OAAO,IAAI,MAAM,WAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"cache-io.js","sourceRoot":"","sources":["../../lib/cache-io.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/cache-lock.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
type LockTargetOptions = {
|
|
2
2
|
staleMs?: number;
|
|
3
3
|
};
|
|
4
|
+
export declare function lockTargetPathForFile(filePath: string): string;
|
|
4
5
|
export declare function withLockedDirectory<T>(directoryPath: string, fn: () => Promise<T>, options?: LockTargetOptions): Promise<T>;
|
|
5
6
|
export declare function withLockedFile<T>(filePath: string, fn: () => Promise<T>, options?: LockTargetOptions): Promise<T>;
|
|
6
7
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache-lock.d.ts","sourceRoot":"","sources":["../../lib/cache-lock.ts"],"names":[],"mappings":"AAUA,KAAK,iBAAiB,GAAG;IACvB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB,CAAA;
|
|
1
|
+
{"version":3,"file":"cache-lock.d.ts","sourceRoot":"","sources":["../../lib/cache-lock.ts"],"names":[],"mappings":"AAUA,KAAK,iBAAiB,GAAG;IACvB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB,CAAA;AAgBD,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,CAQZ;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,CAUZ"}
|
package/dist/lib/cache-lock.js
CHANGED
|
@@ -6,14 +6,22 @@ const LOCK_RETRIES = {
|
|
|
6
6
|
minTimeout: 10,
|
|
7
7
|
maxTimeout: 100
|
|
8
8
|
};
|
|
9
|
+
const FILE_LOCK_SUFFIX = ".lock";
|
|
9
10
|
function resolveLockOptions(options = {}) {
|
|
10
11
|
const staleMs = typeof options.staleMs === "number" && Number.isFinite(options.staleMs) ? options.staleMs : undefined;
|
|
11
12
|
return {
|
|
12
|
-
realpath:
|
|
13
|
+
realpath: true,
|
|
13
14
|
retries: LOCK_RETRIES,
|
|
14
15
|
...(staleMs !== undefined ? { stale: Math.max(1, Math.floor(staleMs)) } : {})
|
|
15
16
|
};
|
|
16
17
|
}
|
|
18
|
+
export function lockTargetPathForFile(filePath) {
|
|
19
|
+
return `${filePath}${FILE_LOCK_SUFFIX}`;
|
|
20
|
+
}
|
|
21
|
+
async function ensureLockTargetFile(lockTargetPath) {
|
|
22
|
+
const handle = await fs.open(lockTargetPath, "a", 0o600);
|
|
23
|
+
await handle.close();
|
|
24
|
+
}
|
|
17
25
|
export async function withLockedDirectory(directoryPath, fn, options = {}) {
|
|
18
26
|
await fs.mkdir(directoryPath, { recursive: true });
|
|
19
27
|
const release = await lockfile.lock(directoryPath, resolveLockOptions(options));
|
|
@@ -26,7 +34,9 @@ export async function withLockedDirectory(directoryPath, fn, options = {}) {
|
|
|
26
34
|
}
|
|
27
35
|
export async function withLockedFile(filePath, fn, options = {}) {
|
|
28
36
|
await fs.mkdir(path.dirname(filePath), { recursive: true });
|
|
29
|
-
const
|
|
37
|
+
const lockTargetPath = lockTargetPathForFile(filePath);
|
|
38
|
+
await ensureLockTargetFile(lockTargetPath);
|
|
39
|
+
const release = await lockfile.lock(lockTargetPath, resolveLockOptions(options));
|
|
30
40
|
try {
|
|
31
41
|
return await fn();
|
|
32
42
|
}
|
|
@@ -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;AAC5B,OAAO,QAAQ,MAAM,iBAAiB,CAAA;AAEtC,MAAM,YAAY,GAAG;IACnB,OAAO,EAAE,EAAE;IACX,UAAU,EAAE,EAAE;IACd,UAAU,EAAE,GAAG;CAChB,CAAA;
|
|
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;AAC5B,OAAO,QAAQ,MAAM,iBAAiB,CAAA;AAEtC,MAAM,YAAY,GAAG;IACnB,OAAO,EAAE,EAAE;IACX,UAAU,EAAE,EAAE;IACd,UAAU,EAAE,GAAG;CAChB,CAAA;AAKD,MAAM,gBAAgB,GAAG,OAAO,CAAA;AAEhC,SAAS,kBAAkB,CAAC,UAA6B,EAAE;IAKzD,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,OAAO,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAA;IACrH,OAAO;QACL,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,YAAY;QACrB,GAAG,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC9E,CAAA;AACH,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,QAAgB;IACpD,OAAO,GAAG,QAAQ,GAAG,gBAAgB,EAAE,CAAA;AACzC,CAAC;AAED,KAAK,UAAU,oBAAoB,CAAC,cAAsB;IACxD,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,cAAc,EAAE,GAAG,EAAE,KAAK,CAAC,CAAA;IACxD,MAAM,MAAM,CAAC,KAAK,EAAE,CAAA;AACtB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,aAAqB,EACrB,EAAoB,EACpB,UAA6B,EAAE;IAE/B,MAAM,EAAE,CAAC,KAAK,CAAC,aAAa,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IAClD,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,aAAa,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAA;IAC/E,IAAI,CAAC;QACH,OAAO,MAAM,EAAE,EAAE,CAAA;IACnB,CAAC;YAAS,CAAC;QACT,MAAM,OAAO,EAAE,CAAA;IACjB,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,QAAgB,EAChB,EAAoB,EACpB,UAA6B,EAAE;IAE/B,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IAC3D,MAAM,cAAc,GAAG,qBAAqB,CAAC,QAAQ,CAAC,CAAA;IACtD,MAAM,oBAAoB,CAAC,cAAc,CAAC,CAAA;IAC1C,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,cAAc,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAA;IAChF,IAAI,CAAC;QACH,OAAO,MAAM,EAAE,EAAE,CAAA;IACnB,CAAC;YAAS,CAAC;QACT,MAAM,OAAO,EAAE,CAAA;IACjB,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accounts.d.ts","sourceRoot":"","sources":["../../../lib/codex-native/accounts.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AACpG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAErD,wBAAgB,aAAa,CAAC,MAAM,EAAE,iBAAiB,EAAE,QAAQ,EAAE,aAAa,GAAG,aAAa,
|
|
1
|
+
{"version":3,"file":"accounts.d.ts","sourceRoot":"","sources":["../../../lib/codex-native/accounts.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AACpG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAErD,wBAAgB,aAAa,CAAC,MAAM,EAAE,iBAAiB,EAAE,QAAQ,EAAE,aAAa,GAAG,aAAa,CA4D/F;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,EAC1E,KAAK,EAAE,MAAM,GACZ,MAAM,CAUR;AAQD,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,aAAa,GAAG,eAAe,EAAE,CAIhF;AAED,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,iBAAiB,GAAG,IAAI,CAU1E;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,iBAAiB,EAAE,OAAO,EAAE,WAAW,GAAG,MAAM,CAW9F;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE;IAC3C,MAAM,CAAC,EAAE,iBAAiB,CAAA;IAC1B,KAAK,CAAC,EAAE,iBAAiB,CAAA;IACzB,UAAU,EAAE,cAAc,CAAA;CAC3B,GAAG,WAAW,EAAE,CAoEhB;AAED,wBAAgB,sCAAsC,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI,CAWnF"}
|
|
@@ -20,20 +20,26 @@ export function upsertAccount(openai, incoming) {
|
|
|
20
20
|
existingPlan === normalizedPlan);
|
|
21
21
|
})
|
|
22
22
|
: undefined;
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
23
|
+
let match;
|
|
24
|
+
let matchedByRefreshFallback = false;
|
|
25
|
+
if (strictMatch) {
|
|
26
|
+
match = strictMatch;
|
|
27
|
+
}
|
|
28
|
+
else if (!strictIdentityKey) {
|
|
29
|
+
const incomingRefresh = incoming.refresh?.trim();
|
|
30
|
+
if (incomingRefresh) {
|
|
31
|
+
const refreshMatches = openai.accounts.filter((existing) => existing.refresh?.trim() === incomingRefresh);
|
|
32
|
+
if (refreshMatches.length === 1) {
|
|
33
|
+
match = refreshMatches[0];
|
|
34
|
+
matchedByRefreshFallback = true;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
const target = match ?? {};
|
|
39
|
+
if (!match) {
|
|
34
40
|
openai.accounts.push(target);
|
|
35
41
|
}
|
|
36
|
-
if (!matchedByRefreshFallback
|
|
42
|
+
if (!matchedByRefreshFallback) {
|
|
37
43
|
if (normalizedAccountId)
|
|
38
44
|
target.accountId = normalizedAccountId;
|
|
39
45
|
if (normalizedEmail)
|