@vidiemme/copilot-proxy 0.1.1 → 0.3.0
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 +18 -2
- package/dist/autostart.d.ts +4 -0
- package/dist/autostart.js +46 -3
- package/dist/autostart.js.map +1 -1
- package/dist/cli.js +240 -76
- package/dist/cli.js.map +1 -1
- package/dist/collector/forwarder.d.ts +16 -0
- package/dist/collector/forwarder.js +61 -5
- package/dist/collector/forwarder.js.map +1 -1
- package/dist/config.d.ts +3 -0
- package/dist/config.js +2 -0
- package/dist/config.js.map +1 -1
- package/dist/editors.d.ts +18 -0
- package/dist/editors.js +75 -0
- package/dist/editors.js.map +1 -0
- package/dist/paths.d.ts +0 -2
- package/dist/paths.js +0 -11
- package/dist/paths.js.map +1 -1
- package/dist/projectDetector.js +55 -11
- package/dist/projectDetector.js.map +1 -1
- package/dist/proxy/inspectRequest.js +3 -2
- package/dist/proxy/inspectRequest.js.map +1 -1
- package/dist/server.js +10 -3
- package/dist/server.js.map +1 -1
- package/dist/setupHelpers.d.ts +9 -0
- package/dist/setupHelpers.js +40 -0
- package/dist/setupHelpers.js.map +1 -0
- package/dist/usage/collector.js.map +1 -1
- package/dist/usage/parseOpenAI.d.ts +7 -5
- package/dist/usage/parseOpenAI.js +21 -10
- package/dist/usage/parseOpenAI.js.map +1 -1
- package/dist/usage/sse.js.map +1 -1
- package/dist/version.d.ts +2 -0
- package/dist/version.js +6 -0
- package/dist/version.js.map +1 -0
- package/package.json +4 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspectRequest.js","sourceRoot":"","sources":["../../src/proxy/inspectRequest.ts"],"names":[],"mappings":"AAQA,MAAM,eAAe,GAAG,0BAA0B,CAAC;AAEnD,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,CAAC,CAAC,CAAE,KAAiC,CAAC,CAAC,CAAC,SAAS,CAAC;AACtG,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,cAAc,CAAC,IAAY,EAAE,IAAY;IACvD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IAEtD,IAAI,MAAe,CAAC;IACpB,IAAI,CAAC;QACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;IAC9C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IACjC,CAAC;IAED,MAAM,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC9B,IAAI,CAAC,IAAI;QAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IAE1C,MAAM,KAAK,GAAG,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IACtE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC;IAEpC,IAAI,SAA6B,CAAC;IAClC,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACzC,IAAI,OAAO,QAAQ,EAAE,OAAO,KAAK,QAAQ,EAAE,CAAC;QAC1C,SAAS,GAAG,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC1D,CAAC;IAED,
|
|
1
|
+
{"version":3,"file":"inspectRequest.js","sourceRoot":"","sources":["../../src/proxy/inspectRequest.ts"],"names":[],"mappings":"AAQA,MAAM,eAAe,GAAG,0BAA0B,CAAC;AAEnD,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,CAAC,CAAC,CAAE,KAAiC,CAAC,CAAC,CAAC,SAAS,CAAC;AACtG,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,cAAc,CAAC,IAAY,EAAE,IAAY;IACvD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IAEtD,IAAI,MAAe,CAAC;IACpB,IAAI,CAAC;QACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;IAC9C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IACjC,CAAC;IAED,MAAM,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC9B,IAAI,CAAC,IAAI;QAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IAE1C,MAAM,KAAK,GAAG,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IACtE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC;IAEpC,IAAI,SAA6B,CAAC;IAClC,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACzC,IAAI,OAAO,QAAQ,EAAE,OAAO,KAAK,QAAQ,EAAE,CAAC;QAC1C,SAAS,GAAG,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC1D,CAAC;IAED,wEAAwE;IACxE,2DAA2D;IAC3D,IAAI,MAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,IAAI,IAAI,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;QACtF,IAAI,CAAC,cAAc,GAAG,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;QAC9C,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,EAAE,CAAC;IACxF,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;AAC5C,CAAC"}
|
package/dist/server.js
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import { readFileSync } from 'node:fs';
|
|
2
|
-
import
|
|
2
|
+
import { stat } from 'node:fs/promises';
|
|
3
|
+
import Fastify, { LogController } from 'fastify';
|
|
3
4
|
import { UsageForwarder } from './collector/forwarder.js';
|
|
4
5
|
import { createProxyHandler } from './proxy/handler.js';
|
|
5
6
|
import { ProjectDetector } from './projectDetector.js';
|
|
7
|
+
import { CLIENT_VERSION } from './version.js';
|
|
6
8
|
function createServer(config) {
|
|
7
9
|
const options = {
|
|
8
10
|
logger: { level: config.logLevel },
|
|
@@ -11,8 +13,8 @@ function createServer(config) {
|
|
|
11
13
|
keepAliveTimeout: 120_000,
|
|
12
14
|
bodyLimit: 64 * 1024 * 1024,
|
|
13
15
|
// Il log per-richiesta duplicherebbe il record di usage senza aggiungere
|
|
14
|
-
// nulla.
|
|
15
|
-
disableRequestLogging: true,
|
|
16
|
+
// nulla.
|
|
17
|
+
logController: new LogController({ disableRequestLogging: true }),
|
|
16
18
|
};
|
|
17
19
|
if (!config.tlsKeyPath || !config.tlsCertPath)
|
|
18
20
|
return Fastify(options);
|
|
@@ -44,11 +46,16 @@ export async function buildApp(config) {
|
|
|
44
46
|
if (!detector.enabled) {
|
|
45
47
|
server.log.warn('WORKSPACE_ROOTS non impostato: il progetto va dichiarato esplicitamente, altrimenti il traffico finisce in `unassigned`');
|
|
46
48
|
}
|
|
49
|
+
const startedAt = new Date().toISOString();
|
|
47
50
|
server.get('/_health', async () => ({
|
|
48
51
|
ok: true,
|
|
52
|
+
version: CLIENT_VERSION,
|
|
53
|
+
startedAt,
|
|
49
54
|
upstream: config.upstreamBaseUrl,
|
|
50
55
|
collector: config.collectorUrl,
|
|
51
56
|
projectDetection: detector.enabled,
|
|
57
|
+
usage: forwarder.stats(),
|
|
58
|
+
spoolBytes: await stat(config.spoolPath).then((info) => info.size, () => 0),
|
|
52
59
|
}));
|
|
53
60
|
server.route({
|
|
54
61
|
method: ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS', 'HEAD'],
|
package/dist/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
export interface DeveloperIdentity {
|
|
2
|
+
name?: string;
|
|
3
|
+
email?: string;
|
|
4
|
+
}
|
|
5
|
+
/** Nome ed email con cui il developer firma i commit: il default piu' ragionevole per la dashboard. */
|
|
6
|
+
export declare function gitIdentity(): DeveloperIdentity;
|
|
7
|
+
export type PortStatus = 'free' | 'proxy' | 'busy';
|
|
8
|
+
/** Distingue una porta libera da una gia' occupata dal proxy stesso o da altro. */
|
|
9
|
+
export declare function portStatus(port: number, host: string): Promise<PortStatus>;
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
import { execFileSync } from 'node:child_process';
|
|
2
|
+
import { createServer } from 'node:net';
|
|
3
|
+
function gitConfig(key) {
|
|
4
|
+
try {
|
|
5
|
+
const value = execFileSync('git', ['config', '--global', key], {
|
|
6
|
+
encoding: 'utf-8',
|
|
7
|
+
stdio: ['ignore', 'pipe', 'ignore'],
|
|
8
|
+
timeout: 2000,
|
|
9
|
+
}).trim();
|
|
10
|
+
return value.length > 0 ? value : undefined;
|
|
11
|
+
}
|
|
12
|
+
catch {
|
|
13
|
+
return undefined;
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
/** Nome ed email con cui il developer firma i commit: il default piu' ragionevole per la dashboard. */
|
|
17
|
+
export function gitIdentity() {
|
|
18
|
+
return { name: gitConfig('user.name'), email: gitConfig('user.email') };
|
|
19
|
+
}
|
|
20
|
+
/** Distingue una porta libera da una gia' occupata dal proxy stesso o da altro. */
|
|
21
|
+
export async function portStatus(port, host) {
|
|
22
|
+
const free = await new Promise((resolve) => {
|
|
23
|
+
const server = createServer();
|
|
24
|
+
server.once('error', () => resolve(false));
|
|
25
|
+
server.listen(port, host, () => server.close(() => resolve(true)));
|
|
26
|
+
});
|
|
27
|
+
if (free)
|
|
28
|
+
return 'free';
|
|
29
|
+
try {
|
|
30
|
+
const response = await fetch(`http://127.0.0.1:${port}/_health`, {
|
|
31
|
+
signal: AbortSignal.timeout(2000),
|
|
32
|
+
});
|
|
33
|
+
const body = (await response.json());
|
|
34
|
+
return body.upstream !== undefined && body.collector !== undefined ? 'proxy' : 'busy';
|
|
35
|
+
}
|
|
36
|
+
catch {
|
|
37
|
+
return 'busy';
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
//# sourceMappingURL=setupHelpers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"setupHelpers.js","sourceRoot":"","sources":["../src/setupHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAOxC,SAAS,SAAS,CAAC,GAAW;IAC5B,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,GAAG,CAAC,EAAE;YAC7D,QAAQ,EAAE,OAAO;YACjB,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC;YACnC,OAAO,EAAE,IAAI;SACd,CAAC,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IAC9C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED,uGAAuG;AACvG,MAAM,UAAU,WAAW;IACzB,OAAO,EAAE,IAAI,EAAE,SAAS,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,SAAS,CAAC,YAAY,CAAC,EAAE,CAAC;AAC1E,CAAC;AAID,mFAAmF;AACnF,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,IAAY,EAAE,IAAY;IACzD,MAAM,IAAI,GAAG,MAAM,IAAI,OAAO,CAAU,CAAC,OAAO,EAAE,EAAE;QAClD,MAAM,MAAM,GAAG,YAAY,EAAE,CAAC;QAC9B,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QAC3C,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACrE,CAAC,CAAC,CAAC;IACH,IAAI,IAAI;QAAE,OAAO,MAAM,CAAC;IAExB,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,oBAAoB,IAAI,UAAU,EAAE;YAC/D,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC;SAClC,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAgD,CAAC;QACpF,OAAO,IAAI,CAAC,QAAQ,KAAK,SAAS,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;IACxF,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,MAAM,CAAC;IAChB,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collector.js","sourceRoot":"","sources":["../../src/usage/collector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AACxF,OAAO,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAC/E,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAGrC;;;;;;;;GAQG;AACH,MAAM,OAAO,cAAc;IAUI;
|
|
1
|
+
{"version":3,"file":"collector.js","sourceRoot":"","sources":["../../src/usage/collector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AACxF,OAAO,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAC/E,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAGrC;;;;;;;;GAQG;AACH,MAAM,OAAO,cAAc;IAUI,SAAS;IATrB,SAAS,GAAG,IAAI,yBAAyB,EAAE,CAAC;IAC5C,MAAM,GAAG,IAAI,sBAAsB,EAAE,CAAC;IACtC,GAAG,CAAY;IACxB,eAAe,GAAiB,EAAE,CAAC;IACnC,cAAc,GAAG,CAAC,CAAC;IAE3B,6EAA6E;IACrE,MAAM,CAAU,kBAAkB,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;IAE7D,YAA6B,SAAkB;yBAAlB,SAAS;QACpC,IAAI,CAAC,GAAG,GAAG,IAAI,SAAS,CAAC,CAAC,OAAO,EAAE,EAAE;YACnC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YACpC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,KAAiB;QACpB,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACrB,OAAO;QACT,CAAC;QACD,IAAI,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC,UAAU,GAAG,cAAc,CAAC,kBAAkB;YAAE,OAAO;QACvF,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACjC,IAAI,CAAC,cAAc,IAAI,KAAK,CAAC,UAAU,CAAC;IAC1C,CAAC;IAED,MAAM;QACJ,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;YACf,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACzD,CAAC;QAED,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,SAAS,CAAC;QACxD,IAAI,IAAa,CAAC;QAClB,IAAI,CAAC;YACH,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;QAC3E,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,SAAS,CAAC;QACnB,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,eAAe,GAAG,EAAE,CAAC;QAC5B,CAAC;QACD,OAAO,sBAAsB,CAAC,IAAI,CAAC,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;IACnE,CAAC;CACF;AAED,gDAAgD;AAChD,MAAM,UAAU,mBAAmB,CAAC,WAA+B;IACjE,OAAO,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;AACzE,CAAC"}
|
|
@@ -2,17 +2,19 @@ import { type ParsedUsage } from './types.js';
|
|
|
2
2
|
/**
|
|
3
3
|
* Estrae i token da un blocco `usage` in formato OpenAI / Copilot chat completions.
|
|
4
4
|
*
|
|
5
|
-
* Attenzione: `prompt_tokens` INCLUDE i `cached_tokens
|
|
6
|
-
*
|
|
7
|
-
* e a tariffa cache).
|
|
5
|
+
* Attenzione: `prompt_tokens` INCLUDE i `cached_tokens` (e, sui modelli che
|
|
6
|
+
* lo fatturano, il cache write). Vanno sottratti, altrimenti quei token
|
|
7
|
+
* verrebbero fatturati due volte (a tariffa piena e a tariffa cache).
|
|
8
8
|
*/
|
|
9
9
|
export declare function readOpenAIUsageBlock(usage: unknown): ParsedUsage | undefined;
|
|
10
10
|
/**
|
|
11
11
|
* Accumulatore per uno stream OpenAI/Copilot.
|
|
12
12
|
*
|
|
13
|
-
*
|
|
14
|
-
* `stream_options: { include_usage: true }`)
|
|
13
|
+
* Chat completions: l'usage arriva in un chunk finale (richiede
|
|
14
|
+
* `stream_options: { include_usage: true }`), e alcuni gateway lo ripetono su
|
|
15
15
|
* piu' chunk: si tiene sempre l'ultimo blocco non vuoto.
|
|
16
|
+
* Responses API: gli eventi `response.*` annidano tutto in `response`, e
|
|
17
|
+
* l'usage compare in `response.completed` (o `incomplete` / `failed`).
|
|
16
18
|
*/
|
|
17
19
|
export declare class OpenAIUsageAccumulator {
|
|
18
20
|
private usage;
|
|
@@ -5,9 +5,9 @@ function asObject(value) {
|
|
|
5
5
|
/**
|
|
6
6
|
* Estrae i token da un blocco `usage` in formato OpenAI / Copilot chat completions.
|
|
7
7
|
*
|
|
8
|
-
* Attenzione: `prompt_tokens` INCLUDE i `cached_tokens
|
|
9
|
-
*
|
|
10
|
-
* e a tariffa cache).
|
|
8
|
+
* Attenzione: `prompt_tokens` INCLUDE i `cached_tokens` (e, sui modelli che
|
|
9
|
+
* lo fatturano, il cache write). Vanno sottratti, altrimenti quei token
|
|
10
|
+
* verrebbero fatturati due volte (a tariffa piena e a tariffa cache).
|
|
11
11
|
*/
|
|
12
12
|
export function readOpenAIUsageBlock(usage) {
|
|
13
13
|
const u = asObject(usage);
|
|
@@ -16,27 +16,36 @@ export function readOpenAIUsageBlock(usage) {
|
|
|
16
16
|
const promptTokens = coerceTokenCount(u.prompt_tokens ?? u.input_tokens);
|
|
17
17
|
const promptDetails = asObject(u.prompt_tokens_details ?? u.input_tokens_details);
|
|
18
18
|
const cachedTokens = coerceTokenCount(promptDetails?.cached_tokens);
|
|
19
|
+
// Nome del campo non ancora stabile fra gateway: si accettano le varianti note.
|
|
20
|
+
const cacheWriteTokens = coerceTokenCount(promptDetails?.cache_write_tokens ??
|
|
21
|
+
promptDetails?.cache_creation_tokens ??
|
|
22
|
+
u.cache_creation_input_tokens);
|
|
19
23
|
const outputTokens = coerceTokenCount(u.completion_tokens ?? u.output_tokens);
|
|
20
24
|
return {
|
|
21
|
-
inputTokens: Math.max(0, promptTokens - cachedTokens),
|
|
25
|
+
inputTokens: Math.max(0, promptTokens - cachedTokens - cacheWriteTokens),
|
|
22
26
|
cachedInputTokens: cachedTokens,
|
|
23
|
-
|
|
24
|
-
cacheWriteTokens: 0,
|
|
27
|
+
cacheWriteTokens,
|
|
25
28
|
outputTokens,
|
|
26
29
|
};
|
|
27
30
|
}
|
|
28
31
|
/**
|
|
29
32
|
* Accumulatore per uno stream OpenAI/Copilot.
|
|
30
33
|
*
|
|
31
|
-
*
|
|
32
|
-
* `stream_options: { include_usage: true }`)
|
|
34
|
+
* Chat completions: l'usage arriva in un chunk finale (richiede
|
|
35
|
+
* `stream_options: { include_usage: true }`), e alcuni gateway lo ripetono su
|
|
33
36
|
* piu' chunk: si tiene sempre l'ultimo blocco non vuoto.
|
|
37
|
+
* Responses API: gli eventi `response.*` annidano tutto in `response`, e
|
|
38
|
+
* l'usage compare in `response.completed` (o `incomplete` / `failed`).
|
|
34
39
|
*/
|
|
35
40
|
export class OpenAIUsageAccumulator {
|
|
36
41
|
usage;
|
|
37
42
|
model;
|
|
38
43
|
handleEvent(payload) {
|
|
39
|
-
const
|
|
44
|
+
const event = asObject(payload);
|
|
45
|
+
if (!event)
|
|
46
|
+
return;
|
|
47
|
+
const isResponsesEvent = typeof event.type === 'string' && event.type.startsWith('response.');
|
|
48
|
+
const chunk = isResponsesEvent ? asObject(event.response) : event;
|
|
40
49
|
if (!chunk)
|
|
41
50
|
return;
|
|
42
51
|
if (typeof chunk.model === 'string' && chunk.model.length > 0) {
|
|
@@ -47,8 +56,10 @@ export class OpenAIUsageAccumulator {
|
|
|
47
56
|
const parsed = readOpenAIUsageBlock(chunk.usage);
|
|
48
57
|
if (!parsed)
|
|
49
58
|
return;
|
|
50
|
-
if (parsed.inputTokens + parsed.cachedInputTokens + parsed.outputTokens ===
|
|
59
|
+
if (parsed.inputTokens + parsed.cachedInputTokens + parsed.cacheWriteTokens + parsed.outputTokens ===
|
|
60
|
+
0) {
|
|
51
61
|
return;
|
|
62
|
+
}
|
|
52
63
|
this.usage = parsed;
|
|
53
64
|
}
|
|
54
65
|
result() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseOpenAI.js","sourceRoot":"","sources":["../../src/usage/parseOpenAI.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAoB,MAAM,YAAY,CAAC;AAIhE,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,CAAC,CAAC,CAAE,KAAc,CAAC,CAAC,CAAC,SAAS,CAAC;AACnF,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,oBAAoB,CAAC,KAAc;IACjD,MAAM,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC1B,IAAI,CAAC,CAAC;QAAE,OAAO,SAAS,CAAC;IAEzB,MAAM,YAAY,GAAG,gBAAgB,CAAC,CAAC,CAAC,aAAa,IAAI,CAAC,CAAC,YAAY,CAAC,CAAC;IACzE,MAAM,aAAa,GAAG,QAAQ,CAAC,CAAC,CAAC,qBAAqB,IAAI,CAAC,CAAC,oBAAoB,CAAC,CAAC;IAClF,MAAM,YAAY,GAAG,gBAAgB,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;IACpE,MAAM,YAAY,GAAG,gBAAgB,CAAC,CAAC,CAAC,iBAAiB,IAAI,CAAC,CAAC,aAAa,CAAC,CAAC;IAE9E,OAAO;QACL,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,YAAY,GAAG,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"parseOpenAI.js","sourceRoot":"","sources":["../../src/usage/parseOpenAI.ts"],"names":[],"mappings":"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"}
|
package/dist/usage/sse.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sse.js","sourceRoot":"","sources":["../../src/usage/sse.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,OAAO,SAAS;IAIS;
|
|
1
|
+
{"version":3,"file":"sse.js","sourceRoot":"","sources":["../../src/usage/sse.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,OAAO,SAAS;IAIS,SAAS;IAH9B,MAAM,GAAG,EAAE,CAAC;IACH,OAAO,GAAG,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC;IAEpD,YAA6B,SAAqC;yBAArC,SAAS;IAA+B,CAAC;IAEtE,IAAI,CAAC,KAAiB;QACpB,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QAC5D,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACpB,CAAC;IAED,GAAG;QACD,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;QACrC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;IACnB,CAAC;IAEO,KAAK,CAAC,KAAc;QAC1B,wEAAwE;QACxE,gBAAgB;QAChB,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACtD,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACvC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9C,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QAEnB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC;gBAAE,SAAS;YACvC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClB,CAAC;QAED,IAAI,KAAK,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC;YAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACvD,CAAC;IAEO,IAAI,CAAC,QAAgB;QAC3B,MAAM,SAAS,GAAa,EAAE,CAAC;QAC/B,KAAK,MAAM,IAAI,IAAI,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;YACxC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;gBAAE,SAAS;YACxC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC;QAC5C,CAAC;QACD,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAEnC,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClC,IAAI,IAAI,KAAK,QAAQ;YAAE,OAAO;QAE9B,IAAI,CAAC;YACH,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;QACnC,CAAC;QAAC,MAAM,CAAC;YACP,0DAA0D;QAC5D,CAAC;IACH,CAAC;CACF"}
|
package/dist/version.js
ADDED
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { readFileSync } from 'node:fs';
|
|
2
|
+
// Da `src/` (tsx) e da `dist/` (build) il manifest del pacchetto sta un livello sopra.
|
|
3
|
+
const manifest = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf-8'));
|
|
4
|
+
export const CLIENT_VERSION = manifest.version;
|
|
5
|
+
export const CLIENT_USER_AGENT = `${manifest.name}/${manifest.version}`;
|
|
6
|
+
//# sourceMappingURL=version.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,uFAAuF;AACvF,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CACzB,YAAY,CAAC,IAAI,GAAG,CAAC,iBAAiB,EAAE,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAC9B,CAAC;AAEvC,MAAM,CAAC,MAAM,cAAc,GAAG,QAAQ,CAAC,OAAO,CAAC;AAC/C,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vidiemme/copilot-proxy",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.3.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "Proxy locale: misura il consumo di token di GitHub Copilot e lo attribuisce al progetto",
|
|
6
6
|
"license": "MIT",
|
|
@@ -39,12 +39,12 @@
|
|
|
39
39
|
},
|
|
40
40
|
"dependencies": {
|
|
41
41
|
"@vidiemme/copilot-usage-contract": "^0.1.0",
|
|
42
|
-
"fastify": "^5.
|
|
43
|
-
"undici": "^7.
|
|
42
|
+
"fastify": "^5.12.5",
|
|
43
|
+
"undici": "^7.30.0"
|
|
44
44
|
},
|
|
45
45
|
"devDependencies": {
|
|
46
46
|
"@types/node": "^22.10.7",
|
|
47
47
|
"tsx": "^4.19.2",
|
|
48
|
-
"typescript": "^
|
|
48
|
+
"typescript": "^7.0.2"
|
|
49
49
|
}
|
|
50
50
|
}
|