@kaitranntt/ccs 8.2.0-dev.9 → 8.3.0-dev.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/dist/cliproxy/binary/platform-detector.d.ts.map +1 -1
- package/dist/cliproxy/binary/platform-detector.js +34 -1
- package/dist/cliproxy/binary/platform-detector.js.map +1 -1
- package/dist/cliproxy/binary/types.d.ts +3 -0
- package/dist/cliproxy/binary/types.d.ts.map +1 -1
- package/dist/cliproxy/binary/types.js +7 -2
- package/dist/cliproxy/binary/types.js.map +1 -1
- package/dist/cliproxy/binary/version-cache.d.ts.map +1 -1
- package/dist/cliproxy/binary/version-cache.js +4 -0
- package/dist/cliproxy/binary/version-cache.js.map +1 -1
- package/dist/cliproxy/executor/account-resolution.d.ts.map +1 -1
- package/dist/cliproxy/executor/account-resolution.js +5 -0
- package/dist/cliproxy/executor/account-resolution.js.map +1 -1
- package/dist/glmt/delta-accumulator.d.ts.map +1 -1
- package/dist/glmt/delta-accumulator.js +1 -0
- package/dist/glmt/delta-accumulator.js.map +1 -1
- package/dist/proxy/profile-router.d.ts +14 -0
- package/dist/proxy/profile-router.d.ts.map +1 -1
- package/dist/proxy/profile-router.js +1 -0
- package/dist/proxy/profile-router.js.map +1 -1
- package/dist/proxy/server/http-helpers.d.ts +5 -0
- package/dist/proxy/server/http-helpers.d.ts.map +1 -1
- package/dist/proxy/server/http-helpers.js +40 -1
- package/dist/proxy/server/http-helpers.js.map +1 -1
- package/dist/proxy/server/messages-route.d.ts.map +1 -1
- package/dist/proxy/server/messages-route.js +173 -10
- package/dist/proxy/server/messages-route.js.map +1 -1
- package/dist/proxy/upstream-url.d.ts +42 -2
- package/dist/proxy/upstream-url.d.ts.map +1 -1
- package/dist/proxy/upstream-url.js +83 -4
- package/dist/proxy/upstream-url.js.map +1 -1
- package/package.json +1 -1
- package/scripts/run-test-bucket.js +183 -17
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platform-detector.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/binary/platform-detector.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EACL,YAAY,EAEZ,aAAa,EAEb,eAAe,EAChB,MAAM,UAAU,CAAC;AAElB,4BAA4B;AAC5B,eAAO,MAAM,cAAc;;;;;;;;;;;;;CAajB,CAAC;AAEX;;;;;;GAMG;AACH,eAAO,MAAM,eAAe,EAAE,eAA4B,CAAC;AAE3D;;;;;GAKG;AACH,eAAO,MAAM,yBAAyB,UAAkD,CAAC;AAEzF;;;;;GAKG;AACH,eAAO,MAAM,2BAA2B,cAAc,CAAC;AAEvD;;;;GAIG;AACH,eAAO,MAAM,qBAAqB;;;CAAuC,CAAC;AAE1E,wDAAwD;AACxD,eAAO,MAAM,gBAAgB,UAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"platform-detector.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/binary/platform-detector.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EACL,YAAY,EAEZ,aAAa,EAEb,eAAe,EAChB,MAAM,UAAU,CAAC;AAElB,4BAA4B;AAC5B,eAAO,MAAM,cAAc;;;;;;;;;;;;;CAajB,CAAC;AAEX;;;;;;GAMG;AACH,eAAO,MAAM,eAAe,EAAE,eAA4B,CAAC;AAE3D;;;;;GAKG;AACH,eAAO,MAAM,yBAAyB,UAAkD,CAAC;AAEzF;;;;;GAKG;AACH,eAAO,MAAM,2BAA2B,cAAc,CAAC;AAEvD;;;;GAIG;AACH,eAAO,MAAM,qBAAqB;;;CAAuC,CAAC;AAE1E,wDAAwD;AACxD,eAAO,MAAM,gBAAgB,UAA4B,CAAC;AAwB1D,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS,CAGpF;AA2CD;;;;;GAKG;AACH,wBAAgB,cAAc,CAC5B,OAAO,CAAC,EAAE,MAAM,EAChB,OAAO,GAAE,eAAiC,GACzC,YAAY,CAkCd;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,GAAE,eAAiC,GAAG,MAAM,CAIpF;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,GAAE,eAAiC,GAAG,MAAM,CAEvF;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAC5B,OAAO,CAAC,EAAE,MAAM,EAChB,OAAO,GAAE,eAAiC,GACzC,MAAM,CAKR;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,OAAO,CAAC,EAAE,MAAM,EAChB,OAAO,GAAE,eAAiC,GACzC,MAAM,CAIR;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,GAAE,eAAiC,GAAG,MAAM,CAErF;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,IAAI,OAAO,CAO7C;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,IAAI,MAAM,CAW/C"}
|
|
@@ -68,11 +68,42 @@ const RELEASE_ARCH_MAP = {
|
|
|
68
68
|
arm64: 'aarch64',
|
|
69
69
|
aarch64: 'aarch64',
|
|
70
70
|
};
|
|
71
|
+
const PLUS_NO_PLUGIN_ASSET_MIN_VERSION = '7.1.68-0';
|
|
72
|
+
const PLUS_AARCH64_ASSET_MIN_VERSION = '7.1.45-1';
|
|
71
73
|
function mapNodeArchToReleaseArch(nodeArch) {
|
|
72
74
|
const arch = ARCH_MAP[nodeArch];
|
|
73
75
|
return arch ? RELEASE_ARCH_MAP[arch] : undefined;
|
|
74
76
|
}
|
|
75
77
|
exports.mapNodeArchToReleaseArch = mapNodeArchToReleaseArch;
|
|
78
|
+
function parseVersionParts(version) {
|
|
79
|
+
const [coreVersion, forkRelease = '0'] = version.replace(/^v/, '').split('-', 2);
|
|
80
|
+
const [major = 0, minor = 0, patch = 0] = coreVersion
|
|
81
|
+
.split('.')
|
|
82
|
+
.map((part) => parseInt(part, 10) || 0);
|
|
83
|
+
return [major, minor, patch, parseInt(forkRelease, 10) || 0];
|
|
84
|
+
}
|
|
85
|
+
function isAtLeastVersion(version, minimum) {
|
|
86
|
+
const left = parseVersionParts(version);
|
|
87
|
+
const right = parseVersionParts(minimum);
|
|
88
|
+
for (let index = 0; index < left.length; index += 1) {
|
|
89
|
+
if (left[index] > right[index])
|
|
90
|
+
return true;
|
|
91
|
+
if (left[index] < right[index])
|
|
92
|
+
return false;
|
|
93
|
+
}
|
|
94
|
+
return true;
|
|
95
|
+
}
|
|
96
|
+
function usesPlusNoPluginAsset(version, os) {
|
|
97
|
+
return os !== 'windows' && isAtLeastVersion(version, PLUS_NO_PLUGIN_ASSET_MIN_VERSION);
|
|
98
|
+
}
|
|
99
|
+
function getReleaseArchForBackend(backend, version, publicArch, releaseArch) {
|
|
100
|
+
if (backend === 'plus' &&
|
|
101
|
+
publicArch === 'arm64' &&
|
|
102
|
+
!isAtLeastVersion(version, PLUS_AARCH64_ASSET_MIN_VERSION)) {
|
|
103
|
+
return 'arm64';
|
|
104
|
+
}
|
|
105
|
+
return releaseArch;
|
|
106
|
+
}
|
|
76
107
|
/**
|
|
77
108
|
* Detect current platform and return binary info
|
|
78
109
|
* @param version Optional version for binaryName (defaults to backend fallback)
|
|
@@ -95,7 +126,9 @@ function detectPlatform(version, backend = exports.DEFAULT_BACKEND) {
|
|
|
95
126
|
const config = exports.BACKEND_CONFIG[backend];
|
|
96
127
|
const ver = version || config.fallbackVersion;
|
|
97
128
|
const extension = os === 'windows' ? 'zip' : 'tar.gz';
|
|
98
|
-
const
|
|
129
|
+
const assetArch = getReleaseArchForBackend(backend, ver, arch, releaseArch);
|
|
130
|
+
const assetVariant = backend === 'plus' && usesPlusNoPluginAsset(ver, os) ? '_no-plugin' : '';
|
|
131
|
+
const binaryName = `${config.binaryPrefix}_${ver}_${os}_${assetArch}${assetVariant}.${extension}`;
|
|
99
132
|
return {
|
|
100
133
|
os,
|
|
101
134
|
arch,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platform-detector.js","sourceRoot":"","sources":["../../../src/cliproxy/binary/platform-detector.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAUH,4BAA4B;AACf,QAAA,cAAc,GAAG;IAC5B,QAAQ,EAAE;QACR,IAAI,EAAE,2BAA2B;QACjC,YAAY,EAAE,aAAa;QAC3B,UAAU,EAAE,eAAe;QAC3B,eAAe,EAAE,QAAQ;KAC1B;IACD,IAAI,EAAE;QACJ,IAAI,EAAE,4BAA4B;QAClC,YAAY,EAAE,iBAAiB;QAC/B,UAAU,EAAE,oBAAoB;QAChC,eAAe,EAAE,UAAU;KAC5B;CACO,CAAC;AAEX;;;;;;GAMG;AACU,QAAA,eAAe,GAAoB,UAAU,CAAC;AAE3D;;;;;GAKG;AACU,QAAA,yBAAyB,GAAG,sBAAc,CAAC,uBAAe,CAAC,CAAC,eAAe,CAAC;AAEzF;;;;;GAKG;AACU,QAAA,2BAA2B,GAAG,WAAW,CAAC;AAEvD;;;;GAIG;AACU,QAAA,qBAAqB,GAAG,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC;AAE1E,wDAAwD;AAC3C,QAAA,gBAAgB,GAAG,iCAAyB,CAAC;AAE1D,8EAA8E;AAC9E,MAAM,MAAM,GAA4C;IACtD,MAAM,EAAE,QAAQ;IAChB,KAAK,EAAE,OAAO;IACd,KAAK,EAAE,SAAS;CACjB,CAAC;AAEF,MAAM,QAAQ,GAA8C;IAC1D,GAAG,EAAE,OAAO;IACZ,KAAK,EAAE,OAAO;CACf,CAAC;AAEF,uEAAuE;AACvE,MAAM,gBAAgB,GAAyC;IAC7D,KAAK,EAAE,OAAO;IACd,KAAK,EAAE,SAAS;IAChB,OAAO,EAAE,SAAS;CACnB,CAAC;AAEF,SAAgB,wBAAwB,CAAC,QAAgB;IACvD,MAAM,IAAI,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAChC,OAAO,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACnD,CAAC;AAHD,4DAGC;AAED;;;;;GAKG;AACH,SAAgB,cAAc,CAC5B,OAAgB,EAChB,UAA2B,uBAAe;IAE1C,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC;IACtC,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAE9B,MAAM,EAAE,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;IAChC,MAAM,IAAI,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAChC,MAAM,WAAW,GAAG,wBAAwB,CAAC,QAAQ,CAAC,CAAC;IAEvD,IAAI,CAAC,EAAE,EAAE,CAAC;QACR,MAAM,IAAI,KAAK,CACb,iCAAiC,YAAY,IAAI;YAC/C,2CAA2C,CAC9C,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CACb,iCAAiC,QAAQ,IAAI,GAAG,yCAAyC,CAC1F,CAAC;IACJ,CAAC;IAED,MAAM,MAAM,GAAG,sBAAc,CAAC,OAAO,CAAC,CAAC;IACvC,MAAM,GAAG,GAAG,OAAO,IAAI,MAAM,CAAC,eAAe,CAAC;IAC9C,MAAM,SAAS,GAAqB,EAAE,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC;IACxE,MAAM,UAAU,GAAG,GAAG,MAAM,CAAC,YAAY,IAAI,GAAG,IAAI,EAAE,IAAI,
|
|
1
|
+
{"version":3,"file":"platform-detector.js","sourceRoot":"","sources":["../../../src/cliproxy/binary/platform-detector.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
export interface VersionCache {
|
|
7
7
|
latestVersion: string;
|
|
8
8
|
checkedAt: number;
|
|
9
|
+
repo: string;
|
|
9
10
|
}
|
|
10
11
|
/** Update check result */
|
|
11
12
|
export interface UpdateCheckResult {
|
|
@@ -30,6 +31,8 @@ export declare const GITHUB_REPOS: {
|
|
|
30
31
|
readonly original: "router-for-me/CLIProxyAPI";
|
|
31
32
|
readonly plus: "kaitranntt/CLIProxyAPIPlus";
|
|
32
33
|
};
|
|
34
|
+
/** Get GitHub repository for specific backend */
|
|
35
|
+
export declare function getGitHubRepo(backend: 'original' | 'plus'): string;
|
|
33
36
|
/** Get GitHub API URLs for specific backend */
|
|
34
37
|
export declare function getGitHubApiUrls(backend: 'original' | 'plus'): {
|
|
35
38
|
latestRelease: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/binary/types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,mCAAmC;AACnC,MAAM,WAAW,YAAY;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/binary/types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,mCAAmC;AACnC,MAAM,WAAW,YAAY;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,0BAA0B;AAC1B,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,OAAO,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,gEAAgE;AAChE,eAAO,MAAM,yBAAyB,QAAiB,CAAC;AAExD,oEAAoE;AACpE,eAAO,MAAM,gBAAgB,iBAAiB,CAAC;AAE/C;;;GAGG;AACH,eAAO,MAAM,yBAAyB,4EACqC,CAAC;AAC5E,eAAO,MAAM,uBAAuB,qEACgC,CAAC;AAErE,+BAA+B;AAC/B,eAAO,MAAM,YAAY;;;CAGf,CAAC;AAEX,iDAAiD;AACjD,wBAAgB,aAAa,CAAC,OAAO,EAAE,UAAU,GAAG,MAAM,GAAG,MAAM,CAElE;AAED,+CAA+C;AAC/C,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,UAAU,GAAG,MAAM;;;EAM5D;AAED,mCAAmC;AACnC,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,mCAAmC;AACnC,MAAM,WAAW,iBAAkB,SAAQ,gBAAgB;IACzD,SAAS,EAAE,OAAO,CAAC;CACpB"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* Types specific to binary management operations.
|
|
5
5
|
*/
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
-
exports.getGitHubApiUrls = exports.GITHUB_REPOS = exports.GITHUB_API_ALL_RELEASES = exports.GITHUB_API_LATEST_RELEASE = exports.VERSION_PIN_FILE = exports.VERSION_CACHE_DURATION_MS = void 0;
|
|
7
|
+
exports.getGitHubApiUrls = exports.getGitHubRepo = exports.GITHUB_REPOS = exports.GITHUB_API_ALL_RELEASES = exports.GITHUB_API_LATEST_RELEASE = exports.VERSION_PIN_FILE = exports.VERSION_CACHE_DURATION_MS = void 0;
|
|
8
8
|
/** Cache duration for version check (1 hour in milliseconds) */
|
|
9
9
|
exports.VERSION_CACHE_DURATION_MS = 60 * 60 * 1000;
|
|
10
10
|
/** Version pin file name - stores user's explicit version choice */
|
|
@@ -20,9 +20,14 @@ exports.GITHUB_REPOS = {
|
|
|
20
20
|
original: 'router-for-me/CLIProxyAPI',
|
|
21
21
|
plus: 'kaitranntt/CLIProxyAPIPlus',
|
|
22
22
|
};
|
|
23
|
+
/** Get GitHub repository for specific backend */
|
|
24
|
+
function getGitHubRepo(backend) {
|
|
25
|
+
return exports.GITHUB_REPOS[backend];
|
|
26
|
+
}
|
|
27
|
+
exports.getGitHubRepo = getGitHubRepo;
|
|
23
28
|
/** Get GitHub API URLs for specific backend */
|
|
24
29
|
function getGitHubApiUrls(backend) {
|
|
25
|
-
const repo =
|
|
30
|
+
const repo = getGitHubRepo(backend);
|
|
26
31
|
return {
|
|
27
32
|
latestRelease: `https://api.github.com/repos/${repo}/releases/latest`,
|
|
28
33
|
allReleases: `https://api.github.com/repos/${repo}/releases`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/cliproxy/binary/types.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/cliproxy/binary/types.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAkBH,gEAAgE;AACnD,QAAA,yBAAyB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAExD,oEAAoE;AACvD,QAAA,gBAAgB,GAAG,cAAc,CAAC;AAE/C;;;GAGG;AACU,QAAA,yBAAyB,GACpC,yEAAyE,CAAC;AAC/D,QAAA,uBAAuB,GAClC,kEAAkE,CAAC;AAErE,+BAA+B;AAClB,QAAA,YAAY,GAAG;IAC1B,QAAQ,EAAE,2BAA2B;IACrC,IAAI,EAAE,4BAA4B;CAC1B,CAAC;AAEX,iDAAiD;AACjD,SAAgB,aAAa,CAAC,OAA4B;IACxD,OAAO,oBAAY,CAAC,OAAO,CAAC,CAAC;AAC/B,CAAC;AAFD,sCAEC;AAED,+CAA+C;AAC/C,SAAgB,gBAAgB,CAAC,OAA4B;IAC3D,MAAM,IAAI,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IACpC,OAAO;QACL,aAAa,EAAE,gCAAgC,IAAI,kBAAkB;QACrE,WAAW,EAAE,gCAAgC,IAAI,WAAW;KAC7D,CAAC;AACJ,CAAC;AAND,4CAMC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version-cache.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/binary/version-cache.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,EACL,YAAY,EAGZ,gBAAgB,
|
|
1
|
+
{"version":3,"file":"version-cache.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/binary/version-cache.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,EACL,YAAY,EAGZ,gBAAgB,EAEjB,MAAM,SAAS,CAAC;AAEjB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAEhD;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,GAAE,eAAiC,GAAG,MAAM,CAEtF;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,GAAE,eAAiC,GAAG,MAAM,CAEpF;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,GAAE,eAAiC,GAAG,YAAY,GAAG,IAAI,CAEhG;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,GAAE,eAAiC,GACzC,YAAY,GAAG,IAAI,CAErB;AA+BD;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,eAAiC,GACzC,IAAI,CAcN;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,MAAM,CAUrF;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAO5E;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,GAAE,eAAiC,GAAG,MAAM,GAAG,IAAI,CAU1F;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,eAAiC,GACzC,IAAI,CAQN;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,GAAE,eAAiC,GAAG,IAAI,CASnF;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,OAAO,GAAE,eAAiC,GAAG,OAAO,CAEnF;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI,CAgBhE;AAMD;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,GAAE,eAAiC,GAAG,MAAM,CAE1F;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,GAAE,eAAiC,GACzC,gBAAgB,GAAG,IAAI,CAEzB;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CACvC,OAAO,GAAE,eAAiC,GACzC,gBAAgB,GAAG,IAAI,CAEzB;AA0BD;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,gBAAgB,EACvB,OAAO,GAAE,eAAiC,GACzC,IAAI,CASN"}
|
|
@@ -70,6 +70,9 @@ function readVersionCacheInternal(backend, allowExpired) {
|
|
|
70
70
|
try {
|
|
71
71
|
const content = fs.readFileSync(cachePath, 'utf8');
|
|
72
72
|
const cache = JSON.parse(content);
|
|
73
|
+
if (cache.repo !== (0, types_1.getGitHubRepo)(backend)) {
|
|
74
|
+
return null;
|
|
75
|
+
}
|
|
73
76
|
// Check if cache is still valid, unless caller explicitly allows stale fallback.
|
|
74
77
|
if (allowExpired || Date.now() - cache.checkedAt < types_1.VERSION_CACHE_DURATION_MS) {
|
|
75
78
|
return cache;
|
|
@@ -89,6 +92,7 @@ function writeVersionCache(version, backend = platform_detector_1.DEFAULT_BACKEN
|
|
|
89
92
|
const cache = {
|
|
90
93
|
latestVersion: version,
|
|
91
94
|
checkedAt: Date.now(),
|
|
95
|
+
repo: (0, types_1.getGitHubRepo)(backend),
|
|
92
96
|
};
|
|
93
97
|
try {
|
|
94
98
|
fs.mkdirSync(path.dirname(cachePath), { recursive: true });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version-cache.js","sourceRoot":"","sources":["../../../src/cliproxy/binary/version-cache.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,uCAAyB;AACzB,2CAA6B;AAC7B,iEAAuD;AACvD,
|
|
1
|
+
{"version":3,"file":"version-cache.js","sourceRoot":"","sources":["../../../src/cliproxy/binary/version-cache.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account-resolution.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/executor/account-resolution.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAaH,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAA2B,KAAK,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAW5F;;;;GAIG;AACH,wBAAgB,mCAAmC,CACjD,QAAQ,EAAE,gBAAgB,EAC1B,kBAAkB,EAAE,gBAAgB,EAAE,GACrC,oBAAoB,EAAE,CAcxB;AAID;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,gBAAgB,EAC1B,mBAAmB,EAAE,gBAAgB,EAAE,GACtC,IAAI,CAYN;AAID,MAAM,WAAW,wBAAwB;IACvC,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,kDAAkD;IAClD,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,uBAAuB;IACtC,wEAAwE;IACxE,SAAS,EAAE,OAAO,CAAC;CACpB;AAID;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,GAAG,EAAE,wBAAwB,GAC5B,OAAO,CAAC,uBAAuB,CAAC,
|
|
1
|
+
{"version":3,"file":"account-resolution.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/executor/account-resolution.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAaH,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAA2B,KAAK,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAW5F;;;;GAIG;AACH,wBAAgB,mCAAmC,CACjD,QAAQ,EAAE,gBAAgB,EAC1B,kBAAkB,EAAE,gBAAgB,EAAE,GACrC,oBAAoB,EAAE,CAcxB;AAID;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,gBAAgB,EAC1B,mBAAmB,EAAE,gBAAgB,EAAE,GACtC,IAAI,CAYN;AAID,MAAM,WAAW,wBAAwB;IACvC,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,kDAAkD;IAClD,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,uBAAuB;IACtC,wEAAwE;IACxE,SAAS,EAAE,OAAO,CAAC;CACpB;AAID;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,GAAG,EAAE,wBAAwB,GAC5B,OAAO,CAAC,uBAAuB,CAAC,CA+ElC;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,IAAI,CAKpE"}
|
|
@@ -105,6 +105,7 @@ async function resolveAccounts(ctx) {
|
|
|
105
105
|
}
|
|
106
106
|
}
|
|
107
107
|
process.exit(1);
|
|
108
|
+
return { earlyExit: true };
|
|
108
109
|
}
|
|
109
110
|
(0, account_manager_1.setDefaultAccount)(provider, account.id);
|
|
110
111
|
(0, account_manager_1.touchAccount)(provider, account.id);
|
|
@@ -120,6 +121,7 @@ async function resolveAccounts(ctx) {
|
|
|
120
121
|
console.error((0, ui_1.fail)(`No account found for ${providerConfig.displayName}`));
|
|
121
122
|
console.error(` Run "ccs ${provider} --auth" to add an account first`);
|
|
122
123
|
process.exit(1);
|
|
124
|
+
return { earlyExit: true };
|
|
123
125
|
}
|
|
124
126
|
try {
|
|
125
127
|
const success = (0, account_manager_1.renameAccount)(provider, defaultAccount.id, setNickname);
|
|
@@ -129,13 +131,16 @@ async function resolveAccounts(ctx) {
|
|
|
129
131
|
else {
|
|
130
132
|
console.error((0, ui_1.fail)('Failed to rename account'));
|
|
131
133
|
process.exit(1);
|
|
134
|
+
return { earlyExit: true };
|
|
132
135
|
}
|
|
133
136
|
}
|
|
134
137
|
catch (err) {
|
|
135
138
|
console.error((0, ui_1.fail)(err instanceof Error ? err.message : 'Failed to rename account'));
|
|
136
139
|
process.exit(1);
|
|
140
|
+
return { earlyExit: true };
|
|
137
141
|
}
|
|
138
142
|
process.exit(0);
|
|
143
|
+
return { earlyExit: true };
|
|
139
144
|
}
|
|
140
145
|
return { earlyExit: false };
|
|
141
146
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account-resolution.js","sourceRoot":"","sources":["../../../src/cliproxy/executor/account-resolution.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"account-resolution.js","sourceRoot":"","sources":["../../../src/cliproxy/executor/account-resolution.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delta-accumulator.d.ts","sourceRoot":"","sources":["../../src/glmt/delta-accumulator.ts"],"names":[],"mappings":";AAEA;;;;;;;;;;;;GAYG;AAEH,UAAU,cAAc;IACtB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,UAAU,uBAAuB;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACjC;AAED,UAAU,YAAY;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,UAAU,QAAQ;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE;QACR,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,UAAU,aAAa;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE;QACT,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;CACH;AAED,UAAU,UAAU;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,UAAU,kBAAkB;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,OAAO,CAAC;IACxB,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;IACtB,KAAK,EAAE;QACL,YAAY,EAAE,MAAM,CAAC;QACrB,aAAa,EAAE,MAAM,CAAC;KACvB,CAAC;CACH;AAED,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,KAAK,CAAgB;IAC7B,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO,CAAC,aAAa,CAAiB;IACtC,OAAO,CAAC,iBAAiB,CAAS;IAClC,OAAO,CAAC,SAAS,CAAa;IAC9B,OAAO,CAAC,cAAc,CAA2B;IACjD,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,sBAAsB,CAAS;IACvC,OAAO,CAAC,YAAY,CAAU;IAC9B,OAAO,CAAC,cAAc,CAAU;IAChC,OAAO,CAAC,SAAS,CAAU;IAC3B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,YAAY,CAAS;gBAEjB,eAAe,GAAE,cAAmB,EAAE,OAAO,GAAE,uBAA4B;IAkCvF;;;OAGG;IACH,eAAe,IAAI,YAAY,GAAG,IAAI;IAOtC;;;;OAIG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY;IA0BtC;;;OAGG;IACH,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IA+B7B;;OAEG;IACH,gBAAgB,IAAI,IAAI;IAcxB;;;OAGG;IACH,WAAW,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"delta-accumulator.d.ts","sourceRoot":"","sources":["../../src/glmt/delta-accumulator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delta-accumulator.js","sourceRoot":"","sources":["../../src/glmt/delta-accumulator.ts"],"names":[],"mappings":";;AAEA;;;;;;;;;;;;GAYG;;;AAgEH,MAAa,gBAAgB;IAmB3B,YAAY,kBAAkC,EAAE,EAAE,UAAmC,EAAE;
|
|
1
|
+
{"version":3,"file":"delta-accumulator.js","sourceRoot":"","sources":["../../src/glmt/delta-accumulator.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,13 @@ export interface OpenAICompatProfileConfig {
|
|
|
7
7
|
provider: DroidProvider;
|
|
8
8
|
insecure?: boolean;
|
|
9
9
|
forceOpenAIReasoningModel?: boolean;
|
|
10
|
+
/**
|
|
11
|
+
* When true, forward Anthropic-format requests to the upstream
|
|
12
|
+
* `/v1/messages` endpoint instead of translating to OpenAI chat
|
|
13
|
+
* completions. Required for providers that reject OpenAI-format
|
|
14
|
+
* requests (e.g. Kimi, Anthropic-API mirrors).
|
|
15
|
+
*/
|
|
16
|
+
passthrough?: boolean;
|
|
10
17
|
model?: string;
|
|
11
18
|
opusModel?: string;
|
|
12
19
|
sonnetModel?: string;
|
|
@@ -24,6 +31,13 @@ export interface OpenAICompatProfileEnv {
|
|
|
24
31
|
CCS_DROID_PROVIDER?: string;
|
|
25
32
|
CCS_OPENAI_PROXY_INSECURE?: string;
|
|
26
33
|
CCS_OPENAI_REASONING_MODEL?: string;
|
|
34
|
+
/**
|
|
35
|
+
* Force Anthropic passthrough for this profile. When set, the
|
|
36
|
+
* proxy forwards incoming `/v1/messages` requests to the
|
|
37
|
+
* upstream `/v1/messages` endpoint without translating to
|
|
38
|
+
* OpenAI format.
|
|
39
|
+
*/
|
|
40
|
+
CCS_OPENAI_PROXY_PASSTHROUGH?: string;
|
|
27
41
|
}
|
|
28
42
|
export declare function isOpenAICompatProvider(provider: DroidProvider | null): provider is DroidProvider;
|
|
29
43
|
export declare function resolveOpenAICompatProfileConfig(profileName: string, settingsPath: string, env: OpenAICompatProfileEnv): OpenAICompatProfileConfig | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profile-router.d.ts","sourceRoot":"","sources":["../../src/proxy/profile-router.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,aAAa,EACnB,MAAM,2BAA2B,CAAC;AAEnC,MAAM,WAAW,yBAAyB;IACxC,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,aAAa,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,sBAAsB;IACrC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,4BAA4B,CAAC,EAAE,MAAM,CAAC;IACtC,8BAA8B,CAAC,EAAE,MAAM,CAAC;IACxC,6BAA6B,CAAC,EAAE,MAAM,CAAC;IACvC,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,0BAA0B,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"profile-router.d.ts","sourceRoot":"","sources":["../../src/proxy/profile-router.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,aAAa,EACnB,MAAM,2BAA2B,CAAC;AAEnC,MAAM,WAAW,yBAAyB;IACxC,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,aAAa,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC;;;;;OAKG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,sBAAsB;IACrC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,4BAA4B,CAAC,EAAE,MAAM,CAAC;IACtC,8BAA8B,CAAC,EAAE,MAAM,CAAC;IACxC,6BAA6B,CAAC,EAAE,MAAM,CAAC;IACvC,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC;;;;;OAKG;IACH,4BAA4B,CAAC,EAAE,MAAM,CAAC;CACvC;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,aAAa,GAAG,IAAI,GAAG,QAAQ,IAAI,aAAa,CAEhG;AAOD,wBAAgB,gCAAgC,CAC9C,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,sBAAsB,GAC1B,yBAAyB,GAAG,IAAI,CAoClC"}
|
|
@@ -35,6 +35,7 @@ function resolveOpenAICompatProfileConfig(profileName, settingsPath, env) {
|
|
|
35
35
|
provider,
|
|
36
36
|
insecure: isTruthyEnv(env.CCS_OPENAI_PROXY_INSECURE),
|
|
37
37
|
forceOpenAIReasoningModel: isTruthyEnv(env.CCS_OPENAI_REASONING_MODEL),
|
|
38
|
+
passthrough: isTruthyEnv(env.CCS_OPENAI_PROXY_PASSTHROUGH),
|
|
38
39
|
model: env.ANTHROPIC_MODEL?.trim() || undefined,
|
|
39
40
|
opusModel: env.ANTHROPIC_DEFAULT_OPUS_MODEL?.trim() || undefined,
|
|
40
41
|
sonnetModel: env.ANTHROPIC_DEFAULT_SONNET_MODEL?.trim() || undefined,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profile-router.js","sourceRoot":"","sources":["../../src/proxy/profile-router.ts"],"names":[],"mappings":";;;AAAA,8DAImC;
|
|
1
|
+
{"version":3,"file":"profile-router.js","sourceRoot":"","sources":["../../src/proxy/profile-router.ts"],"names":[],"mappings":";;;AAAA,8DAImC;AA4CnC,SAAgB,sBAAsB,CAAC,QAA8B;IACnE,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,KAAK,6BAA6B,CAAC;AAC7E,CAAC;AAFD,wDAEC;AAED,SAAS,WAAW,CAAC,KAAyB;IAC5C,MAAM,UAAU,GAAG,KAAK,EAAE,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC/C,OAAO,UAAU,KAAK,GAAG,IAAI,UAAU,KAAK,MAAM,IAAI,UAAU,KAAK,KAAK,IAAI,UAAU,KAAK,IAAI,CAAC;AACpG,CAAC;AAED,SAAgB,gCAAgC,CAC9C,WAAmB,EACnB,YAAoB,EACpB,GAA2B;IAE3B,MAAM,OAAO,GAAG,GAAG,CAAC,kBAAkB,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACrD,MAAM,MAAM,GAAG,GAAG,CAAC,oBAAoB,EAAE,IAAI,EAAE,IAAI,GAAG,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACvF,IAAI,CAAC,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;QACxB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,eAAe,GAAG,IAAA,8CAA6B,EAAC,OAAO,CAAC,CAAC;IAC/D,MAAM,QAAQ,GAAG,sBAAsB,CAAC,eAAe,CAAC;QACtD,CAAC,CAAC,eAAe;QACjB,CAAC,CAAC,IAAA,qCAAoB,EAAC;YACnB,QAAQ,EAAE,GAAG,CAAC,kBAAkB;YAChC,OAAO;YACP,KAAK,EAAE,GAAG,CAAC,eAAe;SAC3B,CAAC,CAAC;IACP,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,EAAE,CAAC;QACtC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO;QACL,WAAW;QACX,YAAY;QACZ,OAAO;QACP,MAAM;QACN,QAAQ;QACR,QAAQ,EAAE,WAAW,CAAC,GAAG,CAAC,yBAAyB,CAAC;QACpD,yBAAyB,EAAE,WAAW,CAAC,GAAG,CAAC,0BAA0B,CAAC;QACtE,WAAW,EAAE,WAAW,CAAC,GAAG,CAAC,4BAA4B,CAAC;QAC1D,KAAK,EAAE,GAAG,CAAC,eAAe,EAAE,IAAI,EAAE,IAAI,SAAS;QAC/C,SAAS,EAAE,GAAG,CAAC,4BAA4B,EAAE,IAAI,EAAE,IAAI,SAAS;QAChE,WAAW,EAAE,GAAG,CAAC,8BAA8B,EAAE,IAAI,EAAE,IAAI,SAAS;QACpE,UAAU,EACR,GAAG,CAAC,6BAA6B,EAAE,IAAI,EAAE;YACzC,GAAG,CAAC,0BAA0B,EAAE,IAAI,EAAE;YACtC,SAAS;KACZ,CAAC;AACJ,CAAC;AAxCD,4EAwCC"}
|
|
@@ -4,5 +4,10 @@
|
|
|
4
4
|
import * as http from 'http';
|
|
5
5
|
export declare function writeJson(res: http.ServerResponse, statusCode: number, payload: unknown): void;
|
|
6
6
|
export declare function readJsonBody(req: http.IncomingMessage): Promise<unknown>;
|
|
7
|
+
/**
|
|
8
|
+
* Read the raw request body as a UTF-8 string, suitable for forwarding
|
|
9
|
+
* verbatim in passthrough mode. Rejects bodies larger than 10MB.
|
|
10
|
+
*/
|
|
11
|
+
export declare function readRawBody(req: http.IncomingMessage): Promise<string>;
|
|
7
12
|
export declare function pipeWebResponseToNode(response: Response, res: http.ServerResponse): Promise<void>;
|
|
8
13
|
//# sourceMappingURL=http-helpers.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-helpers.d.ts","sourceRoot":"","sources":["../../../src/proxy/server/http-helpers.ts"],"names":[],"mappings":";;;AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAK7B,wBAAgB,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAG9F;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,CAgDxE;AAED,wBAAsB,qBAAqB,CACzC,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,IAAI,CAAC,cAAc,GACvB,OAAO,CAAC,IAAI,CAAC,CAiBf"}
|
|
1
|
+
{"version":3,"file":"http-helpers.d.ts","sourceRoot":"","sources":["../../../src/proxy/server/http-helpers.ts"],"names":[],"mappings":";;;AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAK7B,wBAAgB,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAG9F;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,CAgDxE;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAsCtE;AAED,wBAAsB,qBAAqB,CACzC,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,IAAI,CAAC,cAAc,GACvB,OAAO,CAAC,IAAI,CAAC,CAiBf"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.pipeWebResponseToNode = exports.readJsonBody = exports.writeJson = void 0;
|
|
3
|
+
exports.pipeWebResponseToNode = exports.readRawBody = exports.readJsonBody = exports.writeJson = void 0;
|
|
4
4
|
const stream_1 = require("stream");
|
|
5
5
|
const MAX_BODY_SIZE = 10 * 1024 * 1024;
|
|
6
6
|
function writeJson(res, statusCode, payload) {
|
|
@@ -53,6 +53,45 @@ function readJsonBody(req) {
|
|
|
53
53
|
});
|
|
54
54
|
}
|
|
55
55
|
exports.readJsonBody = readJsonBody;
|
|
56
|
+
/**
|
|
57
|
+
* Read the raw request body as a UTF-8 string, suitable for forwarding
|
|
58
|
+
* verbatim in passthrough mode. Rejects bodies larger than 10MB.
|
|
59
|
+
*/
|
|
60
|
+
function readRawBody(req) {
|
|
61
|
+
return new Promise((resolve, reject) => {
|
|
62
|
+
const chunks = [];
|
|
63
|
+
let total = 0;
|
|
64
|
+
let settled = false;
|
|
65
|
+
const resolveOnce = (payload) => {
|
|
66
|
+
if (!settled) {
|
|
67
|
+
settled = true;
|
|
68
|
+
resolve(payload);
|
|
69
|
+
}
|
|
70
|
+
};
|
|
71
|
+
const rejectOnce = (error) => {
|
|
72
|
+
if (!settled) {
|
|
73
|
+
settled = true;
|
|
74
|
+
reject(error);
|
|
75
|
+
}
|
|
76
|
+
};
|
|
77
|
+
req.on('data', (chunk) => {
|
|
78
|
+
total += chunk.length;
|
|
79
|
+
if (total > MAX_BODY_SIZE) {
|
|
80
|
+
req.pause();
|
|
81
|
+
rejectOnce(new Error('Request body too large (max 10MB)'));
|
|
82
|
+
return;
|
|
83
|
+
}
|
|
84
|
+
chunks.push(chunk);
|
|
85
|
+
});
|
|
86
|
+
req.on('end', () => {
|
|
87
|
+
resolveOnce(Buffer.concat(chunks).toString('utf8'));
|
|
88
|
+
});
|
|
89
|
+
req.on('error', (error) => {
|
|
90
|
+
rejectOnce(error instanceof Error ? error : new Error(String(error)));
|
|
91
|
+
});
|
|
92
|
+
});
|
|
93
|
+
}
|
|
94
|
+
exports.readRawBody = readRawBody;
|
|
56
95
|
async function pipeWebResponseToNode(response, res) {
|
|
57
96
|
res.statusCode = response.status;
|
|
58
97
|
response.headers.forEach((value, key) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-helpers.js","sourceRoot":"","sources":["../../../src/proxy/server/http-helpers.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"http-helpers.js","sourceRoot":"","sources":["../../../src/proxy/server/http-helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messages-route.d.ts","sourceRoot":"","sources":["../../../src/proxy/server/messages-route.ts"],"names":[],"mappings":";;;AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACzC,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"messages-route.d.ts","sourceRoot":"","sources":["../../../src/proxy/server/messages-route.ts"],"names":[],"mappings":";;;AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACzC,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAoVnE,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,IAAI,CAAC,mBAAmB,GAAG,MAAM,GAAG,IAAI,CAmB1F;AAED,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,IAAI,CAAC,mBAAmB,EACjC,aAAa,EAAE,MAAM,GACpB,OAAO,CAET;AAqDD,wBAAgB,6BAA6B,CAC3C,GAAG,EAAE,IAAI,CAAC,eAAe,EACzB,GAAG,EAAE,IAAI,CAAC,cAAc,EACxB,UAAU,EAAE,eAAe,EAC3B,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,GACrC,MAAM,IAAI,CA0BZ;AAED,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,IAAI,CAAC,eAAe,EACzB,GAAG,EAAE,IAAI,CAAC,cAAc,EACxB,OAAO,EAAE,yBAAyB,EAClC,iBAAiB,EAAE,MAAM,EACzB,kBAAkB,CAAC,EAAE,UAAU,GAC9B,OAAO,CAAC,IAAI,CAAC,CA2Lf;AAED,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,IAAI,CAAC,cAAc,EACxB,OAAO,EAAE,yBAAyB,GACjC,IAAI,CAWN"}
|
|
@@ -17,12 +17,39 @@ class ProxyInputError extends Error {
|
|
|
17
17
|
this.name = 'ProxyInputError';
|
|
18
18
|
}
|
|
19
19
|
}
|
|
20
|
-
|
|
21
|
-
|
|
20
|
+
/**
|
|
21
|
+
* Build the upstream request headers. Preserves the original User-Agent from
|
|
22
|
+
* the incoming request when available, since some providers (e.g. Kimi)
|
|
23
|
+
* reject requests from unknown User-Agents. Falls back to a stable
|
|
24
|
+
* `CCS-OpenAI-Compat-Proxy/<version>` User-Agent when the client did not
|
|
25
|
+
* provide one.
|
|
26
|
+
*/
|
|
27
|
+
function buildUpstreamHeaders(profile, incomingHeaders, options = {}) {
|
|
28
|
+
const headers = {
|
|
22
29
|
'Content-Type': 'application/json',
|
|
23
30
|
Authorization: `Bearer ${profile.apiKey}`,
|
|
24
31
|
'User-Agent': 'CCS-OpenAI-Compat-Proxy/1.0',
|
|
25
32
|
};
|
|
33
|
+
if (options.preserveUserAgent) {
|
|
34
|
+
// Preserve the original User-Agent (or x-stainless-user-agent fallback) so
|
|
35
|
+
// providers that require a recognized coding-agent identifier accept the
|
|
36
|
+
// passthrough request.
|
|
37
|
+
const rawUserAgent = pickHeaderValue(incomingHeaders, ['user-agent', 'x-stainless-user-agent']);
|
|
38
|
+
headers['User-Agent'] = rawUserAgent?.trim() || headers['User-Agent'];
|
|
39
|
+
}
|
|
40
|
+
return headers;
|
|
41
|
+
}
|
|
42
|
+
function pickHeaderValue(headers, names) {
|
|
43
|
+
for (const name of names) {
|
|
44
|
+
const value = headers[name];
|
|
45
|
+
if (typeof value === 'string' && value.length > 0) {
|
|
46
|
+
return value;
|
|
47
|
+
}
|
|
48
|
+
if (Array.isArray(value) && value.length > 0 && typeof value[0] === 'string') {
|
|
49
|
+
return value[0];
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
return undefined;
|
|
26
53
|
}
|
|
27
54
|
function isKnownOpenAIReasoningChatModel(model) {
|
|
28
55
|
if (typeof model !== 'string') {
|
|
@@ -116,7 +143,22 @@ function shapeUpstreamChatPayload(payload, profile) {
|
|
|
116
143
|
}
|
|
117
144
|
return shaped;
|
|
118
145
|
}
|
|
119
|
-
function buildUpstreamRequest(profile, rawBody) {
|
|
146
|
+
function buildUpstreamRequest(profile, rawBody, options = {}) {
|
|
147
|
+
// In passthrough mode we forward the incoming Anthropic body verbatim to
|
|
148
|
+
// the upstream provider, skipping both the Anthropic→OpenAI translation
|
|
149
|
+
// and the per-provider payload shaping. The body is still serialized as
|
|
150
|
+
// a string so we can stream it on the wire.
|
|
151
|
+
if (options.passthrough) {
|
|
152
|
+
if (rawBody === undefined || rawBody === null) {
|
|
153
|
+
throw new ProxyInputError('Missing request body');
|
|
154
|
+
}
|
|
155
|
+
const body = options.rawBodyText ?? JSON.stringify(rawBody);
|
|
156
|
+
if (!body.trim()) {
|
|
157
|
+
throw new ProxyInputError('Missing request body');
|
|
158
|
+
}
|
|
159
|
+
const route = options.route ?? (0, request_router_1.resolveProxyRequestRoute)(profile, buildRoutingRequest(rawBody));
|
|
160
|
+
return { body, route };
|
|
161
|
+
}
|
|
120
162
|
let transformed;
|
|
121
163
|
try {
|
|
122
164
|
const transformer = new request_transformer_1.ProxyRequestTransformer();
|
|
@@ -134,6 +176,106 @@ function buildUpstreamRequest(profile, rawBody) {
|
|
|
134
176
|
}, route.profile);
|
|
135
177
|
return { body: JSON.stringify(body), route };
|
|
136
178
|
}
|
|
179
|
+
function parseJsonBodyText(rawBodyText) {
|
|
180
|
+
const raw = rawBodyText.trim();
|
|
181
|
+
if (!raw) {
|
|
182
|
+
return {};
|
|
183
|
+
}
|
|
184
|
+
try {
|
|
185
|
+
return JSON.parse(raw);
|
|
186
|
+
}
|
|
187
|
+
catch {
|
|
188
|
+
throw new ProxyInputError('Invalid JSON in request body');
|
|
189
|
+
}
|
|
190
|
+
}
|
|
191
|
+
function asRecord(value) {
|
|
192
|
+
return typeof value === 'object' && value !== null && !Array.isArray(value)
|
|
193
|
+
? value
|
|
194
|
+
: null;
|
|
195
|
+
}
|
|
196
|
+
function routingTextContent(content) {
|
|
197
|
+
if (typeof content === 'string') {
|
|
198
|
+
return content;
|
|
199
|
+
}
|
|
200
|
+
if (!Array.isArray(content)) {
|
|
201
|
+
return '';
|
|
202
|
+
}
|
|
203
|
+
return content
|
|
204
|
+
.map((part) => {
|
|
205
|
+
const parsed = asRecord(part);
|
|
206
|
+
if (!parsed) {
|
|
207
|
+
return '';
|
|
208
|
+
}
|
|
209
|
+
if (parsed.type === 'text' && typeof parsed.text === 'string') {
|
|
210
|
+
return parsed.text;
|
|
211
|
+
}
|
|
212
|
+
if (parsed.type === 'image') {
|
|
213
|
+
return '[image]';
|
|
214
|
+
}
|
|
215
|
+
return '';
|
|
216
|
+
})
|
|
217
|
+
.filter(Boolean)
|
|
218
|
+
.join('\n');
|
|
219
|
+
}
|
|
220
|
+
function routingMessages(messages) {
|
|
221
|
+
if (!Array.isArray(messages)) {
|
|
222
|
+
return [];
|
|
223
|
+
}
|
|
224
|
+
return messages.flatMap((message) => {
|
|
225
|
+
const parsed = asRecord(message);
|
|
226
|
+
const role = parsed?.role;
|
|
227
|
+
if (role !== 'system' && role !== 'user' && role !== 'assistant' && role !== 'tool') {
|
|
228
|
+
return [];
|
|
229
|
+
}
|
|
230
|
+
return [
|
|
231
|
+
{
|
|
232
|
+
role,
|
|
233
|
+
content: routingTextContent(parsed?.content),
|
|
234
|
+
},
|
|
235
|
+
];
|
|
236
|
+
});
|
|
237
|
+
}
|
|
238
|
+
function routingTools(tools) {
|
|
239
|
+
if (!Array.isArray(tools)) {
|
|
240
|
+
return undefined;
|
|
241
|
+
}
|
|
242
|
+
const normalized = tools.flatMap((tool) => {
|
|
243
|
+
const parsed = asRecord(tool);
|
|
244
|
+
const fn = asRecord(parsed?.function);
|
|
245
|
+
if (parsed?.type !== 'function' || typeof fn?.name !== 'string') {
|
|
246
|
+
return [];
|
|
247
|
+
}
|
|
248
|
+
return [
|
|
249
|
+
{
|
|
250
|
+
type: 'function',
|
|
251
|
+
function: {
|
|
252
|
+
name: fn.name,
|
|
253
|
+
description: typeof fn.description === 'string' ? fn.description : undefined,
|
|
254
|
+
parameters: asRecord(fn.parameters) ?? {},
|
|
255
|
+
},
|
|
256
|
+
},
|
|
257
|
+
];
|
|
258
|
+
});
|
|
259
|
+
return normalized.length > 0 ? normalized : undefined;
|
|
260
|
+
}
|
|
261
|
+
function buildRoutingRequest(rawBody) {
|
|
262
|
+
const parsed = asRecord(rawBody);
|
|
263
|
+
const model = typeof parsed?.model === 'string' ? parsed.model : undefined;
|
|
264
|
+
const thinking = asRecord(parsed?.thinking);
|
|
265
|
+
const thinkingEnabled = thinking?.type === 'enabled' || thinking?.type === 'adaptive';
|
|
266
|
+
return {
|
|
267
|
+
model,
|
|
268
|
+
stream: parsed?.stream === true,
|
|
269
|
+
messages: routingMessages(parsed?.messages),
|
|
270
|
+
tools: routingTools(parsed?.tools),
|
|
271
|
+
reasoning: thinkingEnabled
|
|
272
|
+
? {
|
|
273
|
+
enabled: true,
|
|
274
|
+
effort: 'high',
|
|
275
|
+
}
|
|
276
|
+
: undefined,
|
|
277
|
+
};
|
|
278
|
+
}
|
|
137
279
|
function extractIncomingProxyToken(headers) {
|
|
138
280
|
const xApiKey = headers['x-api-key'];
|
|
139
281
|
if (typeof xApiKey === 'string' && xApiKey.trim().length > 0) {
|
|
@@ -156,10 +298,10 @@ function validateIncomingProxyAuth(headers, expectedToken) {
|
|
|
156
298
|
return extractIncomingProxyToken(headers) === expectedToken;
|
|
157
299
|
}
|
|
158
300
|
exports.validateIncomingProxyAuth = validateIncomingProxyAuth;
|
|
159
|
-
function buildFetchInit(profile, body, signal, insecureDispatcher) {
|
|
301
|
+
function buildFetchInit(profile, body, signal, incomingHeaders, preserveUserAgent, insecureDispatcher) {
|
|
160
302
|
const init = {
|
|
161
303
|
method: 'POST',
|
|
162
|
-
headers: buildUpstreamHeaders(profile),
|
|
304
|
+
headers: buildUpstreamHeaders(profile, incomingHeaders, { preserveUserAgent }),
|
|
163
305
|
body,
|
|
164
306
|
signal,
|
|
165
307
|
};
|
|
@@ -230,9 +372,20 @@ async function handleProxyMessagesRequest(req, res, profile, expectedAuthToken,
|
|
|
230
372
|
logger.stage('auth', 'auth.ok', 'Proxy auth validated');
|
|
231
373
|
let timeoutMs = REQUEST_TIMEOUT_MS;
|
|
232
374
|
try {
|
|
233
|
-
const
|
|
234
|
-
|
|
235
|
-
const
|
|
375
|
+
const rawBodyText = await (0, http_helpers_1.readRawBody)(req);
|
|
376
|
+
const rawBody = parseJsonBodyText(rawBodyText);
|
|
377
|
+
const initialRoute = (0, request_router_1.resolveProxyRequestRoute)(profile, buildRoutingRequest(rawBody));
|
|
378
|
+
const passthrough = (0, upstream_url_1.isAnthropicPassthroughProfile)(initialRoute.profile.baseUrl, {
|
|
379
|
+
forcePassthrough: initialRoute.profile.passthrough === true,
|
|
380
|
+
});
|
|
381
|
+
logger.stage('transform', 'request.transform.start', 'Transforming inbound proxy body', {
|
|
382
|
+
passthrough,
|
|
383
|
+
});
|
|
384
|
+
const upstream = buildUpstreamRequest(profile, rawBody, {
|
|
385
|
+
passthrough,
|
|
386
|
+
rawBodyText,
|
|
387
|
+
route: passthrough ? initialRoute : undefined,
|
|
388
|
+
});
|
|
236
389
|
logger.stage('route', 'request.routed', 'Resolved proxy upstream route', {
|
|
237
390
|
profileName: upstream.route.profile.profileName,
|
|
238
391
|
provider: upstream.route.profile.provider,
|
|
@@ -267,14 +420,24 @@ async function handleProxyMessagesRequest(req, res, profile, expectedAuthToken,
|
|
|
267
420
|
profileName: profile.profileName,
|
|
268
421
|
routedProfileName: upstream.route.profile.profileName,
|
|
269
422
|
insecureTls: dispatcher !== undefined,
|
|
423
|
+
passthrough,
|
|
424
|
+
});
|
|
425
|
+
const upstreamUrl = (0, upstream_url_1.resolveOpenAIChatCompletionsUrl)(upstream.route.profile.baseUrl, {
|
|
426
|
+
passthrough,
|
|
270
427
|
});
|
|
271
|
-
const upstreamResponse = await fetch(
|
|
428
|
+
const upstreamResponse = await fetch(upstreamUrl, buildFetchInit(upstream.route.profile, upstream.body, controller.signal, req.headers, passthrough, dispatcher));
|
|
272
429
|
logger.stage('upstream', 'upstream.response', 'Received upstream response', {
|
|
273
430
|
profileName: profile.profileName,
|
|
274
431
|
routedProfileName: upstream.route.profile.profileName,
|
|
275
432
|
status: upstreamResponse.status,
|
|
276
433
|
});
|
|
277
|
-
|
|
434
|
+
// In passthrough mode the upstream already returns Anthropic-format
|
|
435
|
+
// bytes, so we just pipe the response through unchanged. The SSE
|
|
436
|
+
// transformer is only used for OpenAI-mode responses that need to
|
|
437
|
+
// be re-encoded as Anthropic SSE.
|
|
438
|
+
const response = passthrough
|
|
439
|
+
? upstreamResponse
|
|
440
|
+
: await transformer.transform(upstreamResponse);
|
|
278
441
|
await (0, http_helpers_1.pipeWebResponseToNode)(response, res);
|
|
279
442
|
logger.stage('respond', 'request.respond', 'Proxy response written', undefined, {
|
|
280
443
|
latencyMs: Date.now() - startedAt,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messages-route.js","sourceRoot":"","sources":["../../../src/proxy/server/messages-route.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"messages-route.js","sourceRoot":"","sources":["../../../src/proxy/server/messages-route.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,43 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
/**
|
|
2
|
+
* Resolve upstream URLs for OpenAI-compat proxy requests.
|
|
3
|
+
*
|
|
4
|
+
* Two modes are supported:
|
|
5
|
+
*
|
|
6
|
+
* 1. Default (OpenAI mode) - appends `/chat/completions` or `/models` to the
|
|
7
|
+
* base URL so requests are routed to the OpenAI-compatible endpoint of the
|
|
8
|
+
* upstream provider.
|
|
9
|
+
*
|
|
10
|
+
* 2. Anthropic passthrough - some providers (e.g. Kimi coding endpoints)
|
|
11
|
+
* expose an Anthropic-compatible `/v1/messages` endpoint and reject
|
|
12
|
+
* OpenAI-format requests. For these profiles we preserve the incoming
|
|
13
|
+
* Anthropic body and forward it directly to the provider's
|
|
14
|
+
* `/v1/messages` endpoint.
|
|
15
|
+
*
|
|
16
|
+
* Passthrough is enabled when:
|
|
17
|
+
* - `CCS_OPENAI_PROXY_PASSTHROUGH=1` is set in the profile env, OR
|
|
18
|
+
* - The base URL is a known Anthropic-style provider host.
|
|
19
|
+
*/
|
|
20
|
+
/**
|
|
21
|
+
* Returns true if the profile should pass Anthropic-format requests through
|
|
22
|
+
* directly to the upstream provider, skipping the OpenAI translation.
|
|
23
|
+
*/
|
|
24
|
+
export declare function isAnthropicPassthroughProfile(baseUrl: string, options?: {
|
|
25
|
+
forcePassthrough?: boolean;
|
|
26
|
+
}): boolean;
|
|
27
|
+
/**
|
|
28
|
+
* Resolve the upstream URL for a chat completions request.
|
|
29
|
+
*
|
|
30
|
+
* For OpenAI-compatible providers this resolves to
|
|
31
|
+
* `<base>/v1/chat/completions`. For Anthropic passthrough providers this
|
|
32
|
+
* resolves to `<base>/v1/messages`.
|
|
33
|
+
*/
|
|
34
|
+
export declare function resolveOpenAIChatCompletionsUrl(baseUrl: string, options?: {
|
|
35
|
+
passthrough?: boolean;
|
|
36
|
+
}): string;
|
|
37
|
+
/**
|
|
38
|
+
* Resolve the upstream URL for the models endpoint.
|
|
39
|
+
*/
|
|
40
|
+
export declare function resolveOpenAIModelsUrl(baseUrl: string, options?: {
|
|
41
|
+
passthrough?: boolean;
|
|
42
|
+
}): string;
|
|
3
43
|
//# sourceMappingURL=upstream-url.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upstream-url.d.ts","sourceRoot":"","sources":["../../src/proxy/upstream-url.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"upstream-url.d.ts","sourceRoot":"","sources":["../../src/proxy/upstream-url.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AA4BH;;;GAGG;AACH,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,MAAM,EACf,OAAO,GAAE;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAAO,GAC3C,OAAO,CAYT;AAiDD;;;;;;GAMG;AACH,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,MAAM,EACf,OAAO,GAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAA;CAAO,GACtC,MAAM,CAKR;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,MAAM,EACf,OAAO,GAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAA;CAAO,GACtC,MAAM,CAKR"}
|
|
@@ -1,6 +1,25 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Resolve upstream URLs for OpenAI-compat proxy requests.
|
|
4
|
+
*
|
|
5
|
+
* Two modes are supported:
|
|
6
|
+
*
|
|
7
|
+
* 1. Default (OpenAI mode) - appends `/chat/completions` or `/models` to the
|
|
8
|
+
* base URL so requests are routed to the OpenAI-compatible endpoint of the
|
|
9
|
+
* upstream provider.
|
|
10
|
+
*
|
|
11
|
+
* 2. Anthropic passthrough - some providers (e.g. Kimi coding endpoints)
|
|
12
|
+
* expose an Anthropic-compatible `/v1/messages` endpoint and reject
|
|
13
|
+
* OpenAI-format requests. For these profiles we preserve the incoming
|
|
14
|
+
* Anthropic body and forward it directly to the provider's
|
|
15
|
+
* `/v1/messages` endpoint.
|
|
16
|
+
*
|
|
17
|
+
* Passthrough is enabled when:
|
|
18
|
+
* - `CCS_OPENAI_PROXY_PASSTHROUGH=1` is set in the profile env, OR
|
|
19
|
+
* - The base URL is a known Anthropic-style provider host.
|
|
20
|
+
*/
|
|
2
21
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.resolveOpenAIModelsUrl = exports.resolveOpenAIChatCompletionsUrl = void 0;
|
|
22
|
+
exports.resolveOpenAIModelsUrl = exports.resolveOpenAIChatCompletionsUrl = exports.isAnthropicPassthroughProfile = void 0;
|
|
4
23
|
function normalizePathname(pathname) {
|
|
5
24
|
const trimmed = pathname.replace(/\/+$/, '');
|
|
6
25
|
return trimmed || '';
|
|
@@ -10,14 +29,58 @@ function ensureSupportedProtocol(parsed) {
|
|
|
10
29
|
throw new Error(`Unsupported upstream protocol: ${parsed.protocol}`);
|
|
11
30
|
}
|
|
12
31
|
}
|
|
32
|
+
function isAnthropicPassthroughHost(hostname) {
|
|
33
|
+
const normalized = hostname.toLowerCase();
|
|
34
|
+
return (normalized === 'api.anthropic.com' ||
|
|
35
|
+
normalized.endsWith('.anthropic.com') ||
|
|
36
|
+
normalized === 'api.kimi.com' ||
|
|
37
|
+
normalized.endsWith('.kimi.com'));
|
|
38
|
+
}
|
|
13
39
|
function isOpenRouterHost(hostname) {
|
|
14
40
|
const normalized = hostname.toLowerCase();
|
|
15
41
|
return normalized === 'openrouter.ai' || normalized.endsWith('.openrouter.ai');
|
|
16
42
|
}
|
|
17
|
-
|
|
43
|
+
/**
|
|
44
|
+
* Returns true if the profile should pass Anthropic-format requests through
|
|
45
|
+
* directly to the upstream provider, skipping the OpenAI translation.
|
|
46
|
+
*/
|
|
47
|
+
function isAnthropicPassthroughProfile(baseUrl, options = {}) {
|
|
48
|
+
if (options.forcePassthrough) {
|
|
49
|
+
return true;
|
|
50
|
+
}
|
|
51
|
+
let parsed;
|
|
52
|
+
try {
|
|
53
|
+
parsed = new URL(baseUrl);
|
|
54
|
+
}
|
|
55
|
+
catch {
|
|
56
|
+
return false;
|
|
57
|
+
}
|
|
58
|
+
ensureSupportedProtocol(parsed);
|
|
59
|
+
return isAnthropicPassthroughHost(parsed.hostname);
|
|
60
|
+
}
|
|
61
|
+
exports.isAnthropicPassthroughProfile = isAnthropicPassthroughProfile;
|
|
62
|
+
/**
|
|
63
|
+
* Build the upstream URL for either the messages path or the models path.
|
|
64
|
+
* When passthrough is enabled, the messages path is appended verbatim
|
|
65
|
+
* (i.e. `/v1/messages`); otherwise the OpenAI suffix is appended.
|
|
66
|
+
*/
|
|
67
|
+
function buildResolvedUrl(baseUrl, suffix, options = {}) {
|
|
18
68
|
const parsed = new URL(baseUrl);
|
|
19
69
|
ensureSupportedProtocol(parsed);
|
|
20
70
|
const pathname = normalizePathname(parsed.pathname);
|
|
71
|
+
if (options.passthrough) {
|
|
72
|
+
// For Anthropic passthrough, the suffix is always `/v1/messages` or
|
|
73
|
+
// `/v1/models`. If the base URL already ends in `/v1` we drop the
|
|
74
|
+
// duplicated prefix; otherwise we append the suffix verbatim.
|
|
75
|
+
if (pathname.endsWith('/v1') && suffix.startsWith('/v1/')) {
|
|
76
|
+
parsed.pathname = `${pathname}${suffix.slice(3)}`;
|
|
77
|
+
parsed.search = '';
|
|
78
|
+
return parsed.toString();
|
|
79
|
+
}
|
|
80
|
+
parsed.pathname = pathname ? `${pathname}${suffix}` : suffix;
|
|
81
|
+
parsed.search = '';
|
|
82
|
+
return parsed.toString();
|
|
83
|
+
}
|
|
21
84
|
if (pathname.endsWith(suffix)) {
|
|
22
85
|
return parsed.toString();
|
|
23
86
|
}
|
|
@@ -32,11 +95,27 @@ function buildResolvedUrl(baseUrl, suffix) {
|
|
|
32
95
|
parsed.pathname = pathname ? `${pathname}/v1${suffix}` : `/v1${suffix}`;
|
|
33
96
|
return parsed.toString();
|
|
34
97
|
}
|
|
35
|
-
|
|
98
|
+
/**
|
|
99
|
+
* Resolve the upstream URL for a chat completions request.
|
|
100
|
+
*
|
|
101
|
+
* For OpenAI-compatible providers this resolves to
|
|
102
|
+
* `<base>/v1/chat/completions`. For Anthropic passthrough providers this
|
|
103
|
+
* resolves to `<base>/v1/messages`.
|
|
104
|
+
*/
|
|
105
|
+
function resolveOpenAIChatCompletionsUrl(baseUrl, options = {}) {
|
|
106
|
+
if (options.passthrough) {
|
|
107
|
+
return buildResolvedUrl(baseUrl, '/v1/messages', { passthrough: true });
|
|
108
|
+
}
|
|
36
109
|
return buildResolvedUrl(baseUrl, '/chat/completions');
|
|
37
110
|
}
|
|
38
111
|
exports.resolveOpenAIChatCompletionsUrl = resolveOpenAIChatCompletionsUrl;
|
|
39
|
-
|
|
112
|
+
/**
|
|
113
|
+
* Resolve the upstream URL for the models endpoint.
|
|
114
|
+
*/
|
|
115
|
+
function resolveOpenAIModelsUrl(baseUrl, options = {}) {
|
|
116
|
+
if (options.passthrough) {
|
|
117
|
+
return buildResolvedUrl(baseUrl, '/v1/models', { passthrough: true });
|
|
118
|
+
}
|
|
40
119
|
return buildResolvedUrl(baseUrl, '/models');
|
|
41
120
|
}
|
|
42
121
|
exports.resolveOpenAIModelsUrl = resolveOpenAIModelsUrl;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upstream-url.js","sourceRoot":"","sources":["../../src/proxy/upstream-url.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"upstream-url.js","sourceRoot":"","sources":["../../src/proxy/upstream-url.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -44,8 +44,15 @@ const slowTests = [
|
|
|
44
44
|
// CommonJS-heavy JS suites stay slow by default because many of them mutate
|
|
45
45
|
// module cache or process state. Opt them into `test:fast` only after they are
|
|
46
46
|
// proven stable in the mixed fast bucket.
|
|
47
|
-
const fastJsTests = new Set([
|
|
48
|
-
|
|
47
|
+
const fastJsTests = new Set(['tests/unit/flag-parsing-simple.test.js']);
|
|
48
|
+
|
|
49
|
+
const isolatedTests = new Set([
|
|
50
|
+
'tests/unit/targets/codex-adapter-exec.test.ts',
|
|
51
|
+
'tests/unit/targets/codex-adapter.test.ts',
|
|
52
|
+
'tests/unit/targets/droid-adapter.test.ts',
|
|
53
|
+
'tests/unit/targets/target-registry.test.ts',
|
|
54
|
+
'tests/unit/utils/fetch-proxy-setup.test.ts',
|
|
55
|
+
'tests/unit/web-server/usage/account-attribution.test.ts',
|
|
49
56
|
]);
|
|
50
57
|
|
|
51
58
|
const filePattern = /(\.test\.(c|m)?[jt]s|\.spec\.(c|m)?[jt]s|-test\.(c|m)?[jt]s)$/;
|
|
@@ -89,6 +96,11 @@ function shouldForceSlow(file) {
|
|
|
89
96
|
return readsBuiltDist(file);
|
|
90
97
|
}
|
|
91
98
|
|
|
99
|
+
function usesBunTestRunner(relativePath) {
|
|
100
|
+
const source = fs.readFileSync(path.join(rootDir, relativePath), 'utf8');
|
|
101
|
+
return source.includes('bun:test') || /(^|[^\w.])(?:describe|it)\s*\(/m.test(source);
|
|
102
|
+
}
|
|
103
|
+
|
|
92
104
|
function getSlowSet() {
|
|
93
105
|
const discovered = getDiscoveredTests();
|
|
94
106
|
const forceSlow = discovered.filter((file) => shouldForceSlow(file));
|
|
@@ -99,9 +111,101 @@ function selectBucket(name) {
|
|
|
99
111
|
const discovered = getDiscoveredTests();
|
|
100
112
|
const slowSet = getSlowSet();
|
|
101
113
|
|
|
102
|
-
return name === 'slow'
|
|
103
|
-
|
|
104
|
-
|
|
114
|
+
return name === 'slow' ? [...slowSet].sort() : discovered.filter((file) => !slowSet.has(file));
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
function toBunTestPath(relativePath) {
|
|
118
|
+
if (
|
|
119
|
+
relativePath.startsWith('./') ||
|
|
120
|
+
relativePath.startsWith('../') ||
|
|
121
|
+
path.isAbsolute(relativePath)
|
|
122
|
+
) {
|
|
123
|
+
return relativePath;
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
return `./${relativePath}`;
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
function getBunArgs(name, selected = selectBucket(name)) {
|
|
130
|
+
const testPaths = selected.map(toBunTestPath);
|
|
131
|
+
|
|
132
|
+
// Slow bucket forces sequential execution because it spawns subprocesses,
|
|
133
|
+
// binds ports, and touches shared state — parallelism causes flakes.
|
|
134
|
+
// Fast bucket keeps bun's default parallelism for speed.
|
|
135
|
+
return name === 'slow' ? ['test', '--max-concurrency=1', ...testPaths] : ['test', ...testPaths];
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
function shouldRunIsolated(file) {
|
|
139
|
+
return file.startsWith('src/') || isolatedTests.has(file) || !usesBunTestRunner(file);
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
function getBunRuns(name, selected = selectBucket(name)) {
|
|
143
|
+
const shared = selected.filter((file) => !shouldRunIsolated(file));
|
|
144
|
+
const isolated = selected.filter(shouldRunIsolated);
|
|
145
|
+
const runs = [];
|
|
146
|
+
|
|
147
|
+
if (shared.length > 0) {
|
|
148
|
+
runs.push({
|
|
149
|
+
label: 'shared',
|
|
150
|
+
selected: shared,
|
|
151
|
+
bunArgs: getBunArgs(name, shared),
|
|
152
|
+
quietOnPass: false,
|
|
153
|
+
});
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
for (const file of isolated) {
|
|
157
|
+
runs.push({
|
|
158
|
+
label: file,
|
|
159
|
+
selected: [file],
|
|
160
|
+
bunArgs: getBunArgs(name, [file]),
|
|
161
|
+
quietOnPass: true,
|
|
162
|
+
});
|
|
163
|
+
}
|
|
164
|
+
|
|
165
|
+
return runs;
|
|
166
|
+
}
|
|
167
|
+
|
|
168
|
+
function stripAnsi(value) {
|
|
169
|
+
return value.replace(/\x1b\[[0-9;]*m/g, '');
|
|
170
|
+
}
|
|
171
|
+
|
|
172
|
+
function parseBunFileCount(output) {
|
|
173
|
+
const match = stripAnsi(output).match(/Ran\s+\d+\s+tests?\s+across\s+(\d+)\s+files?/i);
|
|
174
|
+
return match ? Number(match[1]) : null;
|
|
175
|
+
}
|
|
176
|
+
|
|
177
|
+
function verifyReportedFileCount(selectedCount, output) {
|
|
178
|
+
const reportedCount = parseBunFileCount(output);
|
|
179
|
+
|
|
180
|
+
if (reportedCount === null) {
|
|
181
|
+
return {
|
|
182
|
+
ok: false,
|
|
183
|
+
message: '[X] Could not find Bun test file count in output.',
|
|
184
|
+
reportedCount,
|
|
185
|
+
selectedCount,
|
|
186
|
+
};
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
if (reportedCount !== selectedCount) {
|
|
190
|
+
return {
|
|
191
|
+
ok: false,
|
|
192
|
+
message:
|
|
193
|
+
`[X] Bun ran ${reportedCount} files, but the bucket selected ${selectedCount} files. ` +
|
|
194
|
+
'Check test path arguments for filter/path ambiguity.',
|
|
195
|
+
reportedCount,
|
|
196
|
+
selectedCount,
|
|
197
|
+
};
|
|
198
|
+
}
|
|
199
|
+
|
|
200
|
+
return {
|
|
201
|
+
ok: true,
|
|
202
|
+
reportedCount,
|
|
203
|
+
selectedCount,
|
|
204
|
+
};
|
|
205
|
+
}
|
|
206
|
+
|
|
207
|
+
function shouldVerifyRunFileCount(run) {
|
|
208
|
+
return run.selected.every((file) => usesBunTestRunner(file));
|
|
105
209
|
}
|
|
106
210
|
|
|
107
211
|
function ensureBuildForSlowBucket() {
|
|
@@ -118,6 +222,54 @@ function ensureBuildForSlowBucket() {
|
|
|
118
222
|
return build.status ?? 1;
|
|
119
223
|
}
|
|
120
224
|
|
|
225
|
+
function runBunTest(run) {
|
|
226
|
+
const result = spawnSync('bun', run.bunArgs, {
|
|
227
|
+
cwd: rootDir,
|
|
228
|
+
encoding: 'utf8',
|
|
229
|
+
maxBuffer: 64 * 1024 * 1024,
|
|
230
|
+
shell: process.platform === 'win32',
|
|
231
|
+
});
|
|
232
|
+
|
|
233
|
+
const output = `${result.stdout ?? ''}\n${result.stderr ?? ''}`;
|
|
234
|
+
const writeOutput = () => {
|
|
235
|
+
if (result.stdout) {
|
|
236
|
+
process.stdout.write(result.stdout);
|
|
237
|
+
}
|
|
238
|
+
if (result.stderr) {
|
|
239
|
+
process.stderr.write(result.stderr);
|
|
240
|
+
}
|
|
241
|
+
};
|
|
242
|
+
|
|
243
|
+
if (result.error) {
|
|
244
|
+
writeOutput();
|
|
245
|
+
console.error(`[X] Failed to run bun test: ${result.error.message}`);
|
|
246
|
+
return 1;
|
|
247
|
+
}
|
|
248
|
+
|
|
249
|
+
const exitCode = result.status ?? 1;
|
|
250
|
+
if (exitCode !== 0) {
|
|
251
|
+
writeOutput();
|
|
252
|
+
return exitCode;
|
|
253
|
+
}
|
|
254
|
+
|
|
255
|
+
if (shouldVerifyRunFileCount(run)) {
|
|
256
|
+
const countCheck = verifyReportedFileCount(run.selected.length, output);
|
|
257
|
+
if (!countCheck.ok) {
|
|
258
|
+
writeOutput();
|
|
259
|
+
console.error(countCheck.message);
|
|
260
|
+
return 1;
|
|
261
|
+
}
|
|
262
|
+
}
|
|
263
|
+
|
|
264
|
+
if (run.quietOnPass) {
|
|
265
|
+
console.log(`[OK] ${run.label}`);
|
|
266
|
+
} else {
|
|
267
|
+
writeOutput();
|
|
268
|
+
}
|
|
269
|
+
|
|
270
|
+
return 0;
|
|
271
|
+
}
|
|
272
|
+
|
|
121
273
|
function runBucket(name) {
|
|
122
274
|
const selected = selectBucket(name);
|
|
123
275
|
|
|
@@ -133,20 +285,25 @@ function runBucket(name) {
|
|
|
133
285
|
}
|
|
134
286
|
}
|
|
135
287
|
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
: ['test', ...selected];
|
|
288
|
+
const runs = getBunRuns(name, selected);
|
|
289
|
+
const isolatedCount = runs.filter((run) => run.quietOnPass).length;
|
|
290
|
+
if (isolatedCount > 0) {
|
|
291
|
+
console.log(`[i] Running ${isolatedCount} test file(s) in isolated Bun processes.`);
|
|
292
|
+
}
|
|
142
293
|
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
294
|
+
let exitCode = 0;
|
|
295
|
+
for (const run of runs) {
|
|
296
|
+
const status = runBunTest(run);
|
|
297
|
+
if (status !== 0) {
|
|
298
|
+
exitCode = status;
|
|
299
|
+
}
|
|
300
|
+
}
|
|
301
|
+
|
|
302
|
+
if (exitCode === 0) {
|
|
303
|
+
console.log(`[OK] Bucket '${name}' ran ${selected.length} selected test files.`);
|
|
304
|
+
}
|
|
148
305
|
|
|
149
|
-
return
|
|
306
|
+
return exitCode;
|
|
150
307
|
}
|
|
151
308
|
|
|
152
309
|
function main(args = process.argv.slice(2)) {
|
|
@@ -180,10 +337,19 @@ if (require.main === module) {
|
|
|
180
337
|
module.exports = {
|
|
181
338
|
slowTests,
|
|
182
339
|
fastJsTests,
|
|
340
|
+
isolatedTests,
|
|
183
341
|
readsBuiltDist,
|
|
184
342
|
shouldForceSlow,
|
|
185
343
|
getDiscoveredTests,
|
|
186
344
|
getSlowSet,
|
|
187
345
|
selectBucket,
|
|
346
|
+
toBunTestPath,
|
|
347
|
+
getBunArgs,
|
|
348
|
+
usesBunTestRunner,
|
|
349
|
+
shouldRunIsolated,
|
|
350
|
+
getBunRuns,
|
|
351
|
+
parseBunFileCount,
|
|
352
|
+
verifyReportedFileCount,
|
|
353
|
+
shouldVerifyRunFileCount,
|
|
188
354
|
main,
|
|
189
355
|
};
|