@celljs/ta 4.15.2 → 4.16.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/dist/cli.mjs +5 -2
- package/dist/gateway.mjs +663 -46
- package/dist/pi/CHANGELOG.md +7 -0
- package/dist/pi/package.json +1 -1
- package/dist/pi/packages/ta-3d/package.json +1 -1
- package/dist/pi/packages/ta-agents/extension/index.mjs +8 -6
- package/dist/pi/packages/ta-agents/lib/acp-protocol.d.ts +2 -0
- package/dist/pi/packages/ta-agents/lib/acp-protocol.js +5 -0
- package/dist/pi/packages/ta-agents/lib/agent-session.d.ts +0 -2
- package/dist/pi/packages/ta-agents/lib/agent-session.js +1 -5
- package/dist/pi/packages/ta-agents/lib/agent-turn.d.ts +7 -2
- package/dist/pi/packages/ta-agents/lib/agent-turn.js +8 -4
- package/dist/pi/packages/ta-agents/package.json +1 -1
- package/dist/pi/packages/ta-bots/host/index.mjs +38 -3
- package/dist/pi/packages/ta-bots/package.json +1 -1
- package/dist/pi/packages/ta-changes/package.json +1 -1
- package/dist/pi/packages/ta-channels/host/index.mjs +38 -3
- package/dist/pi/packages/ta-channels/package.json +1 -1
- package/dist/pi/packages/ta-computer-use/package.json +1 -1
- package/dist/pi/packages/ta-cron/package.json +1 -1
- package/dist/pi/packages/ta-extensions/package.json +1 -1
- package/dist/pi/packages/ta-extensions/web/index.js +38 -3
- package/dist/pi/packages/ta-games/package.json +1 -1
- package/dist/pi/packages/ta-glance/README.en.md +2 -0
- package/dist/pi/packages/ta-glance/README.md +2 -0
- package/dist/pi/packages/ta-glance/extension/index.mjs +110 -21
- package/dist/pi/packages/ta-glance/lib/card.js +88 -8
- package/dist/pi/packages/ta-glance/lib/glance-prompt.d.ts +1 -1
- package/dist/pi/packages/ta-glance/lib/glance-prompt.js +7 -4
- package/dist/pi/packages/ta-glance/lib/glance-protocol.d.ts +34 -2
- package/dist/pi/packages/ta-glance/lib/glance-protocol.js +39 -1
- package/dist/pi/packages/ta-glance/lib/glance-spec.js +93 -19
- package/dist/pi/packages/ta-glance/lib/glance-util.d.ts +13 -0
- package/dist/pi/packages/ta-glance/lib/glance-util.js +28 -0
- package/dist/pi/packages/ta-glance/lib/style.d.ts +1 -1
- package/dist/pi/packages/ta-glance/lib/style.js +65 -2
- package/dist/pi/packages/ta-glance/package.json +1 -1
- package/dist/pi/packages/ta-glance/web/index.js +330 -34
- package/dist/pi/packages/ta-initiative/package.json +1 -1
- package/dist/pi/packages/ta-launcher/package.json +1 -1
- package/dist/pi/packages/ta-manual/package.json +1 -1
- package/dist/pi/packages/ta-moments/extension/index.mjs +38 -3
- package/dist/pi/packages/ta-moments/host/index.mjs +38 -3
- package/dist/pi/packages/ta-moments/package.json +1 -1
- package/dist/pi/packages/ta-moments/web/index.js +38 -3
- package/dist/pi/packages/ta-nearby/package.json +1 -1
- package/dist/pi/packages/ta-notify/package.json +1 -1
- package/dist/pi/packages/ta-plot/package.json +1 -1
- package/dist/pi/packages/ta-recall/package.json +1 -1
- package/dist/pi/packages/ta-rooms/package.json +1 -1
- package/dist/pi/packages/ta-share/package.json +1 -1
- package/dist/pi/packages/ta-sync/package.json +1 -1
- package/dist/pi/packages/ta-sync-cloud/package.json +1 -1
- package/dist/pi/packages/ta-team/package.json +1 -1
- package/dist/pi/packages/ta-workspace/package.json +1 -1
- package/dist/pi/packages/ta-workspace/web/index.js +38 -3
- package/dist/public/assets/{abnfDiagram-S7VZAUFO-Dd51Bqbx.js → abnfDiagram-S7VZAUFO-FSEuUCgT.js} +1 -1
- package/dist/public/assets/{architecture-WOLXFQ4H-BbG3_x7_.js → architecture-WOLXFQ4H-Do_DyWCg.js} +1 -1
- package/dist/public/assets/{architectureDiagram-YGSQEFNW-DbJO4t8I.js → architectureDiagram-YGSQEFNW-D-N2qDs4.js} +1 -1
- package/dist/public/assets/{blockDiagram-APKKGZFW-BwtrHF1f.js → blockDiagram-APKKGZFW-Ds6DzHNZ.js} +1 -1
- package/dist/public/assets/{browser-CTbeNBsA.js → browser-KlrZxPbE.js} +1 -1
- package/dist/public/assets/{c4Diagram-KJ2TOQU5-CfBe5A0H.js → c4Diagram-KJ2TOQU5-D5ZdqxrP.js} +1 -1
- package/dist/public/assets/{chunk-6MUBBAK2-C7R0mhrg.js → chunk-6MUBBAK2-CWOwhB3b.js} +1 -1
- package/dist/public/assets/{chunk-AXFCVDMN-VQgQruZT.js → chunk-AXFCVDMN-Dr6p2RGg.js} +1 -1
- package/dist/public/assets/{chunk-BG4553SI-CkUi_vD5.js → chunk-BG4553SI-DUCV_pmW.js} +1 -1
- package/dist/public/assets/{chunk-DQASFODM-BAQq7ktk.js → chunk-DQASFODM-Yxd3jIXM.js} +1 -1
- package/dist/public/assets/{chunk-HFQBQIA3-B1oF8lB7.js → chunk-HFQBQIA3-C24I15MF.js} +1 -1
- package/dist/public/assets/{chunk-KQLB2F66-DE5amcgT.js → chunk-KQLB2F66-Dxk-aejD.js} +1 -1
- package/dist/public/assets/{chunk-KS47KZWR-ev9S_csp.js → chunk-KS47KZWR-DPyr7gb8.js} +1 -1
- package/dist/public/assets/{chunk-LEVMRMFU-ziqnRvTG.js → chunk-LEVMRMFU-D_mEFJGR.js} +1 -1
- package/dist/public/assets/{chunk-M57EVK23-DaqPdEKA.js → chunk-M57EVK23-DfMFxQib.js} +1 -1
- package/dist/public/assets/{chunk-OY52VR5R-DFOG8j6z.js → chunk-OY52VR5R-O9W83Laa.js} +1 -1
- package/dist/public/assets/{chunk-QB3YPZ4I-eg35JLLN.js → chunk-QB3YPZ4I-IdikGcw1.js} +1 -1
- package/dist/public/assets/{chunk-R3KSYZAL-J73nie-R.js → chunk-R3KSYZAL-DLpaFCvz.js} +1 -1
- package/dist/public/assets/{chunk-STOXU5M4-B8EvDZvB.js → chunk-STOXU5M4-Lx-CZ4Ql.js} +1 -1
- package/dist/public/assets/{chunk-TU62E6Q5-DyCM007V.js → chunk-TU62E6Q5-DCnr5NsA.js} +1 -1
- package/dist/public/assets/{chunk-X4PVCEUW-BBGeCNmA.js → chunk-X4PVCEUW-Ct7aUJFY.js} +1 -1
- package/dist/public/assets/{chunk-XXDRQBXY-CAtJ2Wph.js → chunk-XXDRQBXY-CQhxfoYw.js} +1 -1
- package/dist/public/assets/{classDiagram-v2-L25IHNXF-DhQM6yHy.js → classDiagram-v2-L25IHNXF-DPSu5qYq.js} +1 -1
- package/dist/public/assets/{cose-bilkent-JH36ORCC-AqIcHabu.js → cose-bilkent-JH36ORCC-CFimsFsN.js} +1 -1
- package/dist/public/assets/cynefin-EF2NZ3EQ-Dcc0sCHf.js +1 -0
- package/dist/public/assets/{cynefinDiagram-L36ESFBY-7SyXzhRd.js → cynefinDiagram-L36ESFBY-CiAWhkVp.js} +1 -1
- package/dist/public/assets/{d3-selection-DsahLieG.js → d3-selection-C8RIDfkO.js} +1 -1
- package/dist/public/assets/{dagre-SPEB5RXH-DalaGtMS.js → dagre-SPEB5RXH-l1nRD1Fx.js} +1 -1
- package/dist/public/assets/{diagram-3B7GL73J-BcY-qB9G.js → diagram-3B7GL73J-ipqtnhoX.js} +1 -1
- package/dist/public/assets/{diagram-DNEMPZML-NV7fbe0h.js → diagram-DNEMPZML-VpIcHRUP.js} +1 -1
- package/dist/public/assets/{diagram-L3MUGCDN-BPx4GHoj.js → diagram-L3MUGCDN-8VdVmcS6.js} +1 -1
- package/dist/public/assets/{diagram-LA4NIPWU-BeUxqmw1.js → diagram-LA4NIPWU-Bej-aiF0.js} +1 -1
- package/dist/public/assets/{diagram-MHCOC4E2-Dlg1S5na.js → diagram-MHCOC4E2-D8gW4bVQ.js} +1 -1
- package/dist/public/assets/{diagram-XPFHEONP-DQhRoMkK.js → diagram-XPFHEONP-BMevAJ1M.js} +1 -1
- package/dist/public/assets/{dist-CQU8zJh_.js → dist-DBKJcjvW.js} +1 -1
- package/dist/public/assets/{ebnfDiagram-UZSYDL2S-gVEs3Um2.js → ebnfDiagram-UZSYDL2S-C3HDTOzn.js} +1 -1
- package/dist/public/assets/{editor.api-SQ1snuat.js → editor.api-BMWdjwhK.js} +1 -1
- package/dist/public/assets/{elk-XV6XMXQE-CHtlrPwu.js → elk-XV6XMXQE-XOOPrVin.js} +1 -1
- package/dist/public/assets/{erDiagram-EYBAPDEH-B0xok726.js → erDiagram-EYBAPDEH-Cr-vwx1l.js} +1 -1
- package/dist/public/assets/{eventmodeling-K75KTNOO-CFwphA0e.js → eventmodeling-K75KTNOO-DbPhpfxn.js} +1 -1
- package/dist/public/assets/flowDiagram-MALGAFMO-CDXqnHAQ.js +1 -0
- package/dist/public/assets/{freemarker2-DJKO-X2B.js → freemarker2-6h_1-8qB.js} +1 -1
- package/dist/public/assets/{ganttDiagram-23REXITY-B5wVGN1A.js → ganttDiagram-23REXITY-C7kNPXx3.js} +1 -1
- package/dist/public/assets/gitGraph-VSP46ZUC-KPsoB6Z1.js +1 -0
- package/dist/public/assets/{gitGraphDiagram-STJD7YCW-DEjNU1R_.js → gitGraphDiagram-STJD7YCW-CVnEJEZr.js} +1 -1
- package/dist/public/assets/{handlebars-ChVN7JPd.js → handlebars-F4lp3oLr.js} +1 -1
- package/dist/public/assets/{html-CQ0znKSa.js → html-Dj6f8B_g.js} +1 -1
- package/dist/public/assets/{index-CLlacdXR.js → index-DnNrrk68.js} +2 -2
- package/dist/public/assets/info-OHQRW6UA-CtM6s0SQ.js +1 -0
- package/dist/public/assets/{infoDiagram-KBXO4MBG-CJtrS72M.js → infoDiagram-KBXO4MBG-DcttQWdp.js} +1 -1
- package/dist/public/assets/{ishikawaDiagram-M35NCXHK-qYI1QBsK.js → ishikawaDiagram-M35NCXHK-BSUYTZf6.js} +1 -1
- package/dist/public/assets/{javascript-B-DHbkyI.js → javascript-b_BkOE5Y.js} +1 -1
- package/dist/public/assets/{journeyDiagram-OPLOXDXO-BOQ2y2ZZ.js → journeyDiagram-OPLOXDXO-BCfd5-6n.js} +1 -1
- package/dist/public/assets/{jsonMode-XuGC5N_z.js → jsonMode-Cq5QJbVZ.js} +1 -1
- package/dist/public/assets/{kanban-definition-BZKZHSQY-BJ64tKdP.js → kanban-definition-BZKZHSQY-B3nenaw_.js} +1 -1
- package/dist/public/assets/{liquid-B0Ujylzc.js → liquid-CGuZI_Aa.js} +1 -1
- package/dist/public/assets/{mdx-B19-V510.js → mdx-Dt9yTqnf.js} +1 -1
- package/dist/public/assets/{mermaid-parser.core-Scb01iBq.js → mermaid-parser.core-CquzROwT.js} +3 -3
- package/dist/public/assets/{mermaid.core-BMuvs7us.js → mermaid.core-Bx-e_Scq.js} +4 -4
- package/dist/public/assets/{mindmap-definition-I2QAS2VK-BYfOS3XN.js → mindmap-definition-I2QAS2VK-DyeewbnH.js} +1 -1
- package/dist/public/assets/module-C-ofp7U4.js +1 -0
- package/dist/public/assets/{module-DOrYVZ7B.js → module-dnDlIzeV.js} +79 -78
- package/dist/public/assets/{monaco-Bbe2os7m.js → monaco-nvIdDTWu.js} +3 -3
- package/dist/public/assets/packet-JDAUHWVQ-XKjiwdar.js +1 -0
- package/dist/public/assets/{pegDiagram-FD4XPPHP-D-Vlq9Gm.js → pegDiagram-FD4XPPHP-B884_KoR.js} +1 -1
- package/dist/public/assets/pie-XZMESJXO-MuCMavHL.js +1 -0
- package/dist/public/assets/{pieDiagram-J4AKIIQI-_-94-aMD.js → pieDiagram-J4AKIIQI-I40wRwyy.js} +1 -1
- package/dist/public/assets/{python-CWnMIOYq.js → python-Djw4wvG9.js} +1 -1
- package/dist/public/assets/{quadrantDiagram-XTYBLID2-BhFUbUYz.js → quadrantDiagram-XTYBLID2-DyNOImfk.js} +1 -1
- package/dist/public/assets/radar-ABXABTNO-Cq12GHJS.js +1 -0
- package/dist/public/assets/railroad-I3PHUGI6-CfeMswZU.js +1 -0
- package/dist/public/assets/{railroad-abnf-LNEFI6M7-yUa9GGCQ.js → railroad-abnf-LNEFI6M7-3G0zWzgf.js} +1 -1
- package/dist/public/assets/{railroad-ebnf-DWYD2UWJ-xY4YiL8M.js → railroad-ebnf-DWYD2UWJ-B5XRDRWS.js} +1 -1
- package/dist/public/assets/{railroad-peg-JR7BVNR7-BYFYCUAQ.js → railroad-peg-JR7BVNR7-rcIioIyH.js} +1 -1
- package/dist/public/assets/{railroadDiagram-MRQ6NCDL-C9FVhj0k.js → railroadDiagram-MRQ6NCDL-CDM2ahQM.js} +1 -1
- package/dist/public/assets/{razor-bDtpN6EJ.js → razor-CStezNUn.js} +1 -1
- package/dist/public/assets/{requirementDiagram-Y7LWUY3S-DLmAg-6C.js → requirementDiagram-Y7LWUY3S-hbb6WtfM.js} +1 -1
- package/dist/public/assets/{sankeyDiagram-WGJFYUXA-Bl5IpDk4.js → sankeyDiagram-WGJFYUXA-DLV3Aoae.js} +1 -1
- package/dist/public/assets/{sequenceDiagram-5NDRBG5M-Z-N0OiT_.js → sequenceDiagram-5NDRBG5M-BWxOV5U9.js} +1 -1
- package/dist/public/assets/{stateDiagram-v2-FJ4FJNEA-ctKQz8Mo.js → stateDiagram-v2-FJ4FJNEA-C-TaUPaQ.js} +1 -1
- package/dist/public/assets/{swimlanes-UMQ2AFYF-CWLKnALg.js → swimlanes-UMQ2AFYF-CJY0BFmc.js} +1 -1
- package/dist/public/assets/swimlanesDiagram-OMPLPG4O-DdFDl6aK.js +8 -0
- package/dist/public/assets/{timeline-definition-SEUHKTQE-DP8Ph_d6.js → timeline-definition-SEUHKTQE-CUfQb8Gv.js} +1 -1
- package/dist/public/assets/treeView-D4JQ5SDB-BQ4uUy4s.js +1 -0
- package/dist/public/assets/treemap-SAJKECNS-BFTTkjF9.js +1 -0
- package/dist/public/assets/{typescript-CGpNlLbn.js → typescript-B7kmi8MF.js} +1 -1
- package/dist/public/assets/{usecaseDiagram-AFA6YXN4-DvFjNj3J.js → usecaseDiagram-AFA6YXN4-BKTVAp-G.js} +1 -1
- package/dist/public/assets/{vennDiagram-NNMJR3RB-3m2F2H-I.js → vennDiagram-NNMJR3RB-CN1RxNTS.js} +1 -1
- package/dist/public/assets/wardley-7MLQ67FV-BbyzsA8S.js +1 -0
- package/dist/public/assets/{wardleyDiagram-S7YFUSEH-CsMntu16.js → wardleyDiagram-S7YFUSEH-JJ6qcpu1.js} +1 -1
- package/dist/public/assets/{xml-ByiLoakX.js → xml-DVamlHEU.js} +1 -1
- package/dist/public/assets/{xychartDiagram-GGNKY7IX-C80rxvM0.js → xychartDiagram-GGNKY7IX-BNakYgUZ.js} +1 -1
- package/dist/public/assets/{yaml-Cz2Af5Rj.js → yaml-BihGeFrM.js} +1 -1
- package/dist/public/index.html +1 -1
- package/dist/serve/index.mjs +5283 -4884
- package/package.json +39 -39
- package/dist/public/assets/cynefin-EF2NZ3EQ-yFytgtiy.js +0 -1
- package/dist/public/assets/flowDiagram-MALGAFMO-Cwye_DsX.js +0 -1
- package/dist/public/assets/gitGraph-VSP46ZUC-BYzb--zb.js +0 -1
- package/dist/public/assets/info-OHQRW6UA-na0qX3JP.js +0 -1
- package/dist/public/assets/module-B3SKdB70.js +0 -1
- package/dist/public/assets/packet-JDAUHWVQ-jhCd70vR.js +0 -1
- package/dist/public/assets/pie-XZMESJXO-DV0NJFsI.js +0 -1
- package/dist/public/assets/radar-ABXABTNO-Co-Hlf34.js +0 -1
- package/dist/public/assets/railroad-I3PHUGI6-DKMPEjDD.js +0 -1
- package/dist/public/assets/swimlanesDiagram-OMPLPG4O-CU76xJSu.js +0 -8
- package/dist/public/assets/treeView-D4JQ5SDB-JMMnu_MW.js +0 -1
- package/dist/public/assets/treemap-SAJKECNS-CPlAD3X1.js +0 -1
- package/dist/public/assets/wardley-7MLQ67FV-Dhc8wpLp.js +0 -1
package/dist/gateway.mjs
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
// ../../ta-packages/ta-gateway/esm/node/gateway-cli.js
|
|
2
2
|
import { homedir } from "node:os";
|
|
3
|
-
import { join as
|
|
3
|
+
import { join as join10 } from "node:path";
|
|
4
4
|
import { parseArgs } from "node:util";
|
|
5
5
|
|
|
6
6
|
// ../../ta-packages/ta-gateway/esm/node/gateway-server.js
|
|
7
|
-
import { createReadStream, existsSync as
|
|
7
|
+
import { createReadStream, existsSync as existsSync4, mkdirSync as mkdirSync5, statSync } from "node:fs";
|
|
8
8
|
import { createServer as createServer2, request as httpRequest } from "node:http";
|
|
9
9
|
import { request as httpsRequest } from "node:https";
|
|
10
|
-
import { extname, join as
|
|
10
|
+
import { extname, join as join9, normalize, sep } from "node:path";
|
|
11
11
|
import { pipeline } from "node:stream";
|
|
12
12
|
|
|
13
13
|
// ../../packages/rpc/esm/node/websocket/websocket-connection.js
|
|
@@ -810,15 +810,47 @@ var TaLanguageUtil;
|
|
|
810
810
|
var TaLocation;
|
|
811
811
|
(function(TaLocation2) {
|
|
812
812
|
TaLocation2.SSH = "ssh://";
|
|
813
|
+
TaLocation2.CLOUD = "ta://";
|
|
814
|
+
const CLOUD_NAME = /^[a-z0-9][a-z0-9-]{0,39}$/;
|
|
813
815
|
const HOST = /^(?!-)[\w.@:%+[\]-]+$/;
|
|
814
816
|
function isRemote(location) {
|
|
815
|
-
return location.startsWith(TaLocation2.SSH);
|
|
817
|
+
return location.startsWith(TaLocation2.SSH) || location.startsWith(TaLocation2.CLOUD);
|
|
816
818
|
}
|
|
817
819
|
TaLocation2.isRemote = isRemote;
|
|
820
|
+
function isCloud(host2) {
|
|
821
|
+
return !!host2 && host2.startsWith(TaLocation2.CLOUD);
|
|
822
|
+
}
|
|
823
|
+
TaLocation2.isCloud = isCloud;
|
|
824
|
+
function isCloudName(name) {
|
|
825
|
+
return CLOUD_NAME.test(name);
|
|
826
|
+
}
|
|
827
|
+
TaLocation2.isCloudName = isCloudName;
|
|
828
|
+
function cloud(name, path2 = "") {
|
|
829
|
+
return `${TaLocation2.CLOUD}${name}${path2 ? normalize(path2) : ""}`;
|
|
830
|
+
}
|
|
831
|
+
TaLocation2.cloud = cloud;
|
|
832
|
+
function cloudName(hostOrLocation) {
|
|
833
|
+
if (!hostOrLocation.startsWith(TaLocation2.CLOUD)) {
|
|
834
|
+
return;
|
|
835
|
+
}
|
|
836
|
+
const rest = hostOrLocation.slice(TaLocation2.CLOUD.length);
|
|
837
|
+
const slash = rest.indexOf("/");
|
|
838
|
+
return slash < 0 ? rest : rest.slice(0, slash);
|
|
839
|
+
}
|
|
840
|
+
TaLocation2.cloudName = cloudName;
|
|
818
841
|
function parse(location) {
|
|
842
|
+
var _a;
|
|
819
843
|
if (!isRemote(location)) {
|
|
820
844
|
return;
|
|
821
845
|
}
|
|
846
|
+
if (location.startsWith(TaLocation2.CLOUD)) {
|
|
847
|
+
const name = (_a = cloudName(location)) !== null && _a !== undefined ? _a : "";
|
|
848
|
+
if (!isCloudName(name)) {
|
|
849
|
+
throw new Error(`${JSON.stringify(location)} names no cloud workspace: write ta://<name>/<path>.`);
|
|
850
|
+
}
|
|
851
|
+
const path3 = location.slice(TaLocation2.CLOUD.length + name.length);
|
|
852
|
+
return { host: `${TaLocation2.CLOUD}${name}`, path: path3 ? normalize(path3) : "" };
|
|
853
|
+
}
|
|
822
854
|
const rest = location.slice(TaLocation2.SSH.length);
|
|
823
855
|
const slash = rest.indexOf("/");
|
|
824
856
|
const host2 = slash < 0 ? rest : rest.slice(0, slash);
|
|
@@ -830,7 +862,7 @@ var TaLocation;
|
|
|
830
862
|
}
|
|
831
863
|
TaLocation2.parse = parse;
|
|
832
864
|
function isHost(host2) {
|
|
833
|
-
return HOST.test(host2);
|
|
865
|
+
return isCloud(host2) ? isCloudName(host2.slice(TaLocation2.CLOUD.length)) : HOST.test(host2);
|
|
834
866
|
}
|
|
835
867
|
TaLocation2.isHost = isHost;
|
|
836
868
|
const FLAGS = /^-[46AaCfGgKkMNnqsTtVvXxYy]+$/;
|
|
@@ -894,10 +926,13 @@ var TaLocation;
|
|
|
894
926
|
}
|
|
895
927
|
TaLocation2.readHost = readHost;
|
|
896
928
|
function ssh(host2, path2 = "") {
|
|
897
|
-
return `${TaLocation2.SSH}${host2}${path2 ? normalize(path2) : ""}`;
|
|
929
|
+
return isCloud(host2) ? `${host2}${path2 ? normalize(path2) : ""}` : `${TaLocation2.SSH}${host2}${path2 ? normalize(path2) : ""}`;
|
|
898
930
|
}
|
|
899
931
|
TaLocation2.ssh = ssh;
|
|
900
932
|
function hostLabel(host2) {
|
|
933
|
+
if (isCloud(host2)) {
|
|
934
|
+
return host2.slice(TaLocation2.CLOUD.length);
|
|
935
|
+
}
|
|
901
936
|
const name = host2.replace(/^[^@]*@/, "").replace(/^\[(.*)\](?::\d+)?$/, "$1").replace(/^([^:]*):\d+$/, "$1");
|
|
902
937
|
return /^[\d.]+$/.test(name) || name.includes(":") ? name : name.split(".")[0] || name;
|
|
903
938
|
}
|
|
@@ -2172,6 +2207,7 @@ class CommandSandbox {
|
|
|
2172
2207
|
this.id = id;
|
|
2173
2208
|
this.type = "command";
|
|
2174
2209
|
this.name = SandboxProviders.string(config, "name", id);
|
|
2210
|
+
this.gatewayUrl = SandboxProviders.string(config, "gatewayUrl");
|
|
2175
2211
|
const start = SandboxProviders.string(config, "start");
|
|
2176
2212
|
if (!start) {
|
|
2177
2213
|
throw new Error(`The provider "${id}" of the type command needs "start", a command that prints the address of the Ta service.`);
|
|
@@ -2213,7 +2249,15 @@ class CommandSandbox {
|
|
|
2213
2249
|
run(command, tenant, extra = {}) {
|
|
2214
2250
|
return new Promise((resolve, reject) => {
|
|
2215
2251
|
const child = spawn("sh", ["-c", command], {
|
|
2216
|
-
env: {
|
|
2252
|
+
env: {
|
|
2253
|
+
...process.env,
|
|
2254
|
+
...this.env,
|
|
2255
|
+
...tenant.env,
|
|
2256
|
+
TA_TENANT_ID: tenant.id,
|
|
2257
|
+
TA_TENANT_ACCOUNT: tenant.account,
|
|
2258
|
+
TA_SERVE_TOKEN: tenant.token,
|
|
2259
|
+
...extra
|
|
2260
|
+
},
|
|
2217
2261
|
stdio: ["ignore", "pipe", "pipe"]
|
|
2218
2262
|
});
|
|
2219
2263
|
let stdout = "";
|
|
@@ -2348,6 +2392,15 @@ class DockerEngine {
|
|
|
2348
2392
|
throw error;
|
|
2349
2393
|
}
|
|
2350
2394
|
}
|
|
2395
|
+
async remove(name) {
|
|
2396
|
+
try {
|
|
2397
|
+
await this.call("DELETE", `/containers/${encodeURIComponent(name)}?force=true`);
|
|
2398
|
+
} catch (error) {
|
|
2399
|
+
if (!(error instanceof DockerError && error.status === 404)) {
|
|
2400
|
+
throw error;
|
|
2401
|
+
}
|
|
2402
|
+
}
|
|
2403
|
+
}
|
|
2351
2404
|
async ensureNetwork(name, isolated) {
|
|
2352
2405
|
try {
|
|
2353
2406
|
await this.call("GET", `/networks/${encodeURIComponent(name)}`);
|
|
@@ -2431,6 +2484,11 @@ var DockerEngineUtil;
|
|
|
2431
2484
|
// ../../ta-packages/ta-gateway/esm/node/docker-sandbox.js
|
|
2432
2485
|
var DockerSandboxUtil;
|
|
2433
2486
|
(function(DockerSandboxUtil2) {
|
|
2487
|
+
function hasEnv(have, want) {
|
|
2488
|
+
const set = new Set(have !== null && have !== undefined ? have : []);
|
|
2489
|
+
return Object.entries(want !== null && want !== undefined ? want : {}).every(([key, value]) => set.has(`${key}=${value}`));
|
|
2490
|
+
}
|
|
2491
|
+
DockerSandboxUtil2.hasEnv = hasEnv;
|
|
2434
2492
|
function hostname(account) {
|
|
2435
2493
|
const name = account.slice(account.indexOf(":") + 1).split("@")[0].toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 48).replace(/-+$/, "");
|
|
2436
2494
|
return name || "ta";
|
|
@@ -2468,12 +2526,17 @@ class DockerSandbox {
|
|
|
2468
2526
|
this.options = options;
|
|
2469
2527
|
this.type = "docker";
|
|
2470
2528
|
this.name = SandboxProviders.string(config, "name", "Docker");
|
|
2529
|
+
this.gatewayUrl = SandboxProviders.string(config, "gatewayUrl");
|
|
2471
2530
|
this.engine = engine !== null && engine !== undefined ? engine : new DockerEngine({ host: options.host });
|
|
2472
2531
|
}
|
|
2473
2532
|
async start(tenant) {
|
|
2474
|
-
var _a, _b, _c;
|
|
2533
|
+
var _a, _b, _c, _d;
|
|
2475
2534
|
const name = this.containerName(tenant);
|
|
2476
2535
|
let container = await this.engine.inspect(name);
|
|
2536
|
+
if (container && !DockerSandboxUtil.hasEnv((_a = container.Config) === null || _a === undefined ? undefined : _a.Env, tenant.env)) {
|
|
2537
|
+
await this.engine.remove(name);
|
|
2538
|
+
container = undefined;
|
|
2539
|
+
}
|
|
2477
2540
|
if (!container) {
|
|
2478
2541
|
await this.engine.ensureImage(this.options.image);
|
|
2479
2542
|
await this.engine.ensureNetwork(this.options.network, true);
|
|
@@ -2484,7 +2547,7 @@ class DockerSandbox {
|
|
|
2484
2547
|
await this.engine.start(name);
|
|
2485
2548
|
container = await this.engine.inspect(name);
|
|
2486
2549
|
}
|
|
2487
|
-
const port = (
|
|
2550
|
+
const port = (_d = (_c = (_b = container === null || container === undefined ? undefined : container.NetworkSettings.Ports) === null || _b === undefined ? undefined : _b[PORT]) === null || _c === undefined ? undefined : _c[0]) === null || _d === undefined ? undefined : _d.HostPort;
|
|
2488
2551
|
if (!port) {
|
|
2489
2552
|
throw new Error(`The container ${name} publishes no port for ${PORT}.`);
|
|
2490
2553
|
}
|
|
@@ -2508,11 +2571,12 @@ class DockerSandbox {
|
|
|
2508
2571
|
return {
|
|
2509
2572
|
Image: this.options.image,
|
|
2510
2573
|
Hostname: DockerSandboxUtil.hostname(tenant.account),
|
|
2511
|
-
Env: [`TA_SERVE_TOKEN=${tenant.token}`, ...Object.entries(this.options.env).map(([key, value]) => `${key}=${value}`)],
|
|
2574
|
+
Env: [`TA_SERVE_TOKEN=${tenant.token}`, ...Object.entries({ ...this.options.env, ...tenant.env }).map(([key, value]) => `${key}=${value}`)],
|
|
2512
2575
|
Labels: { "cell.ta.tenant": tenant.id, "cell.ta.account": tenant.account },
|
|
2513
2576
|
ExposedPorts: { [PORT]: {} },
|
|
2514
2577
|
HostConfig: {
|
|
2515
2578
|
PortBindings: { [PORT]: [{ HostIp: this.options.bind, HostPort: "" }] },
|
|
2579
|
+
ExtraHosts: ["host.docker.internal:host-gateway"],
|
|
2516
2580
|
Mounts: [{ Type: "volume", Source: name, Target: "/home/ta" }],
|
|
2517
2581
|
NetworkMode: this.options.network,
|
|
2518
2582
|
Memory: this.options.memory,
|
|
@@ -2867,9 +2931,11 @@ class Environments {
|
|
|
2867
2931
|
running.error = undefined;
|
|
2868
2932
|
const starting = (async () => {
|
|
2869
2933
|
var _a2;
|
|
2870
|
-
|
|
2871
|
-
const
|
|
2872
|
-
|
|
2934
|
+
var _b;
|
|
2935
|
+
const { provider, own } = this.provider(tenant);
|
|
2936
|
+
const env = own ? undefined : (_a2 = this.envOf) === null || _a2 === undefined ? undefined : _a2.call(this, tenant, provider);
|
|
2937
|
+
const endpoint = await provider.start({ ...EnvironmentsUtil.sandboxTenant(tenant), ...env ? { env } : {} });
|
|
2938
|
+
await EnvironmentsUtil.waitReady(endpoint.url, (_b = this.settings.readyTimeoutMs) !== null && _b !== undefined ? _b : provider.readyTimeoutMs);
|
|
2873
2939
|
return endpoint;
|
|
2874
2940
|
})();
|
|
2875
2941
|
running.starting = starting;
|
|
@@ -3011,6 +3077,68 @@ class GatewayAudit {
|
|
|
3011
3077
|
}
|
|
3012
3078
|
}
|
|
3013
3079
|
|
|
3080
|
+
// ../../ta-packages/ta-gateway/esm/node/gateway-exec.js
|
|
3081
|
+
var MAX_QUEUED_BYTES = 16 * 1024 * 1024;
|
|
3082
|
+
|
|
3083
|
+
class GatewayExecProxy {
|
|
3084
|
+
constructor(outer, endpoint, release) {
|
|
3085
|
+
this.outer = outer;
|
|
3086
|
+
this.release = release;
|
|
3087
|
+
this.queued = [];
|
|
3088
|
+
this.queuedBytes = 0;
|
|
3089
|
+
this.closed = false;
|
|
3090
|
+
outer.onMessage((text) => this.send(text));
|
|
3091
|
+
outer.onClose(() => this.dispose());
|
|
3092
|
+
endpoint.then((found) => this.open(found), (error) => this.close(1011, `Your environment did not start: ${error.message}`.slice(0, 120)));
|
|
3093
|
+
}
|
|
3094
|
+
open(endpoint) {
|
|
3095
|
+
if (this.closed) {
|
|
3096
|
+
return;
|
|
3097
|
+
}
|
|
3098
|
+
const url = new URL(`${endpoint.url.replace(/^http/, "ws")}/api/exec`);
|
|
3099
|
+
url.searchParams.set("token", endpoint.token);
|
|
3100
|
+
const inner = new WebSocket(url);
|
|
3101
|
+
this.inner = inner;
|
|
3102
|
+
inner.onopen = () => {
|
|
3103
|
+
for (const text of this.queued.splice(0)) {
|
|
3104
|
+
inner.send(text);
|
|
3105
|
+
}
|
|
3106
|
+
this.queuedBytes = 0;
|
|
3107
|
+
};
|
|
3108
|
+
inner.onmessage = (message) => this.outer.open && this.outer.send(String(message.data));
|
|
3109
|
+
inner.onclose = (event) => this.close(event.code === 1000 || event.code === 1001 ? 1001 : 1011, "The sandbox closed the connection.");
|
|
3110
|
+
inner.onerror = () => {
|
|
3111
|
+
return;
|
|
3112
|
+
};
|
|
3113
|
+
}
|
|
3114
|
+
send(text) {
|
|
3115
|
+
var _a;
|
|
3116
|
+
if (((_a = this.inner) === null || _a === undefined ? undefined : _a.readyState) === WebSocket.OPEN) {
|
|
3117
|
+
this.inner.send(text);
|
|
3118
|
+
} else if (this.queuedBytes + text.length <= MAX_QUEUED_BYTES) {
|
|
3119
|
+
this.queued.push(text);
|
|
3120
|
+
this.queuedBytes += text.length;
|
|
3121
|
+
} else {
|
|
3122
|
+
this.close(1013, "The environment is still starting.");
|
|
3123
|
+
}
|
|
3124
|
+
}
|
|
3125
|
+
close(code, reason) {
|
|
3126
|
+
if (this.outer.open) {
|
|
3127
|
+
this.outer.close(code, reason);
|
|
3128
|
+
}
|
|
3129
|
+
this.dispose();
|
|
3130
|
+
}
|
|
3131
|
+
dispose() {
|
|
3132
|
+
var _a;
|
|
3133
|
+
if (this.closed) {
|
|
3134
|
+
return;
|
|
3135
|
+
}
|
|
3136
|
+
this.closed = true;
|
|
3137
|
+
this.release();
|
|
3138
|
+
(_a = this.inner) === null || _a === undefined || _a.close();
|
|
3139
|
+
}
|
|
3140
|
+
}
|
|
3141
|
+
|
|
3014
3142
|
// ../../ta-packages/ta-gateway/esm/node/gateway-policy.js
|
|
3015
3143
|
import { readFileSync as readFileSync5 } from "node:fs";
|
|
3016
3144
|
import { join as join4 } from "node:path";
|
|
@@ -3069,6 +3197,7 @@ class TenantStore {
|
|
|
3069
3197
|
name: account.name,
|
|
3070
3198
|
avatar: account.avatar,
|
|
3071
3199
|
token: randomBytes3(32).toString("base64url"),
|
|
3200
|
+
modelKey: `tam-${randomBytes3(24).toString("base64url")}`,
|
|
3072
3201
|
createdAt: now
|
|
3073
3202
|
};
|
|
3074
3203
|
this.save(tenant);
|
|
@@ -3083,6 +3212,14 @@ class TenantStore {
|
|
|
3083
3212
|
this.save(next);
|
|
3084
3213
|
return next;
|
|
3085
3214
|
}
|
|
3215
|
+
modelKey(id) {
|
|
3216
|
+
var _a;
|
|
3217
|
+
const tenant = this.get(id);
|
|
3218
|
+
if (!tenant) {
|
|
3219
|
+
throw new Error(`No tenant ${id}`);
|
|
3220
|
+
}
|
|
3221
|
+
return (_a = tenant.modelKey) !== null && _a !== undefined ? _a : this.update(id, { modelKey: `tam-${randomBytes3(24).toString("base64url")}` }).modelKey;
|
|
3222
|
+
}
|
|
3086
3223
|
list() {
|
|
3087
3224
|
return readdirSync(this.dir).filter((name) => /^[0-9a-f]{16}\.json$/.test(name)).map((name) => this.get(name.slice(0, -5))).filter((tenant) => tenant !== undefined);
|
|
3088
3225
|
}
|
|
@@ -3097,7 +3234,7 @@ class PolicyError extends Error {
|
|
|
3097
3234
|
}
|
|
3098
3235
|
var GatewayPolicyUtil;
|
|
3099
3236
|
(function(GatewayPolicyUtil2) {
|
|
3100
|
-
const NUMBERS = ["freeMinutes", "promptsPerMinute", "connections"];
|
|
3237
|
+
const NUMBERS = ["freeMinutes", "monthlyTokens", "promptsPerMinute", "connections"];
|
|
3101
3238
|
const RANK = { member: 0, admin: 1, owner: 2 };
|
|
3102
3239
|
function rank(role) {
|
|
3103
3240
|
return RANK[role];
|
|
@@ -3165,6 +3302,7 @@ var GatewayPolicyUtil;
|
|
|
3165
3302
|
const own_ = pick("own");
|
|
3166
3303
|
return {
|
|
3167
3304
|
freeMinutes: number("freeMinutes"),
|
|
3305
|
+
monthlyTokens: number("monthlyTokens"),
|
|
3168
3306
|
promptsPerMinute: number("promptsPerMinute"),
|
|
3169
3307
|
connections: number("connections"),
|
|
3170
3308
|
providers: Array.isArray(providers) ? providers : undefined,
|
|
@@ -3357,11 +3495,12 @@ var MINUTE = 60000;
|
|
|
3357
3495
|
var MAX_TICK_MS = 2 * MINUTE;
|
|
3358
3496
|
|
|
3359
3497
|
class GatewayQuotas {
|
|
3360
|
-
constructor(policy, tenants, usage, ownAllowed) {
|
|
3498
|
+
constructor(policy, tenants, usage, ownAllowed, metered = () => false) {
|
|
3361
3499
|
this.policy = policy;
|
|
3362
3500
|
this.tenants = tenants;
|
|
3363
3501
|
this.usage = usage;
|
|
3364
3502
|
this.ownAllowed = ownAllowed;
|
|
3503
|
+
this.metered = metered;
|
|
3365
3504
|
this.lastTick = Date.now();
|
|
3366
3505
|
this.prompts = new Map;
|
|
3367
3506
|
}
|
|
@@ -3388,20 +3527,43 @@ class GatewayQuotas {
|
|
|
3388
3527
|
return freeMinutes !== undefined && meter.runMs >= (freeMinutes + meter.bonusMinutes) * MINUTE ? "minutes" : undefined;
|
|
3389
3528
|
}
|
|
3390
3529
|
state(tenant, now = Date.now()) {
|
|
3530
|
+
var _a, _b;
|
|
3391
3531
|
const { key, next } = GatewayUsageUtil.month(now);
|
|
3392
3532
|
const meter = this.meter(tenant, now);
|
|
3393
3533
|
const limits = this.limits(tenant);
|
|
3394
|
-
const
|
|
3534
|
+
const metered = this.metered();
|
|
3535
|
+
const month = metered ? { tokens: (_a = meter.tokens) !== null && _a !== undefined ? _a : 0, cost: (_b = meter.cost) !== null && _b !== undefined ? _b : 0 } : this.usage.month(tenant.id, now);
|
|
3395
3536
|
return {
|
|
3396
3537
|
month: key,
|
|
3397
3538
|
resetsAt: next,
|
|
3398
3539
|
minutes: { used: Math.floor(meter.runMs / MINUTE), limit: limits.freeMinutes, bonus: meter.bonusMinutes },
|
|
3399
|
-
tokens: { used: month.tokens, cost: month.cost },
|
|
3540
|
+
tokens: { used: month.tokens, cost: month.cost, limit: metered ? limits.monthlyTokens : undefined, metered },
|
|
3400
3541
|
promptsPerMinute: limits.promptsPerMinute,
|
|
3401
3542
|
connections: limits.connections,
|
|
3402
3543
|
blocked: this.blocked(tenant, now)
|
|
3403
3544
|
};
|
|
3404
3545
|
}
|
|
3546
|
+
refuseModels(tenant, now = Date.now()) {
|
|
3547
|
+
var _a;
|
|
3548
|
+
if (this.role(tenant) === "owner") {
|
|
3549
|
+
return;
|
|
3550
|
+
}
|
|
3551
|
+
if (tenant.suspended) {
|
|
3552
|
+
return "Your account is suspended by an administrator of the gateway.";
|
|
3553
|
+
}
|
|
3554
|
+
const limit = this.limits(tenant).monthlyTokens;
|
|
3555
|
+
const used = (_a = this.meter(tenant, now).tokens) !== null && _a !== undefined ? _a : 0;
|
|
3556
|
+
return limit !== undefined && used >= limit ? `Monthly usage limit reached: ${used} of ${limit} tokens this month; it starts again next month, or ask an administrator.` : undefined;
|
|
3557
|
+
}
|
|
3558
|
+
addTokens(tenantId, tokens, cost, now = Date.now()) {
|
|
3559
|
+
var _a, _b;
|
|
3560
|
+
const tenant = this.tenants.get(tenantId);
|
|
3561
|
+
if (!tenant) {
|
|
3562
|
+
return;
|
|
3563
|
+
}
|
|
3564
|
+
const meter = this.meter(tenant, now);
|
|
3565
|
+
this.tenants.update(tenantId, { meter: { ...meter, tokens: ((_a = meter.tokens) !== null && _a !== undefined ? _a : 0) + tokens, cost: ((_b = meter.cost) !== null && _b !== undefined ? _b : 0) + cost } });
|
|
3566
|
+
}
|
|
3405
3567
|
takePrompt(tenant, now = Date.now()) {
|
|
3406
3568
|
var _a;
|
|
3407
3569
|
const limit = this.limits(tenant).promptsPerMinute;
|
|
@@ -3502,6 +3664,401 @@ class Redactor {
|
|
|
3502
3664
|
}
|
|
3503
3665
|
}
|
|
3504
3666
|
|
|
3667
|
+
// ../../ta-packages/ta-gateway/esm/node/model-proxy.js
|
|
3668
|
+
import { createHash as createHash5, timingSafeEqual } from "node:crypto";
|
|
3669
|
+
import { existsSync as existsSync3, readFileSync as readFileSync7 } from "node:fs";
|
|
3670
|
+
import { join as join6 } from "node:path";
|
|
3671
|
+
|
|
3672
|
+
class ModelConfigError extends Error {
|
|
3673
|
+
}
|
|
3674
|
+
var MAX_BODY = 32 * 1024 * 1024;
|
|
3675
|
+
var MAX_READ = 8 * 1024 * 1024;
|
|
3676
|
+
var DROPPED_REQUEST = new Set([
|
|
3677
|
+
"host",
|
|
3678
|
+
"authorization",
|
|
3679
|
+
"x-api-key",
|
|
3680
|
+
"x-goog-api-key",
|
|
3681
|
+
"api-key",
|
|
3682
|
+
"cookie",
|
|
3683
|
+
"connection",
|
|
3684
|
+
"content-length",
|
|
3685
|
+
"accept-encoding",
|
|
3686
|
+
"transfer-encoding",
|
|
3687
|
+
"keep-alive",
|
|
3688
|
+
"upgrade",
|
|
3689
|
+
"proxy-authorization",
|
|
3690
|
+
"x-forwarded-for",
|
|
3691
|
+
"x-forwarded-proto",
|
|
3692
|
+
"x-forwarded-host"
|
|
3693
|
+
]);
|
|
3694
|
+
var DROPPED_RESPONSE = new Set(["content-encoding", "content-length", "transfer-encoding", "connection", "keep-alive", "set-cookie"]);
|
|
3695
|
+
var ModelProxyUtil;
|
|
3696
|
+
(function(ModelProxyUtil2) {
|
|
3697
|
+
ModelProxyUtil2.PATH = "/api/models";
|
|
3698
|
+
const ID = /^[a-z0-9][a-z0-9._-]{0,63}$/i;
|
|
3699
|
+
function read(dir) {
|
|
3700
|
+
var _a;
|
|
3701
|
+
const file = join6(dir, "models.json");
|
|
3702
|
+
if (!existsSync3(file)) {
|
|
3703
|
+
return {};
|
|
3704
|
+
}
|
|
3705
|
+
let config;
|
|
3706
|
+
try {
|
|
3707
|
+
config = JSON.parse(readFileSync7(file, "utf8"));
|
|
3708
|
+
} catch (error2) {
|
|
3709
|
+
throw new ModelConfigError(`${file} is not JSON: ${error2.message}`);
|
|
3710
|
+
}
|
|
3711
|
+
for (const [id, provider] of Object.entries((_a = config.providers) !== null && _a !== undefined ? _a : {})) {
|
|
3712
|
+
if (!ID.test(id)) {
|
|
3713
|
+
throw new ModelConfigError(`"${id}" cannot name a provider of models: letters, digits, . _ and -.`);
|
|
3714
|
+
}
|
|
3715
|
+
if (typeof (provider === null || provider === undefined ? undefined : provider.baseUrl) !== "string" || !/^https?:\/\//.test(provider.baseUrl) || typeof provider.api !== "string" || !Array.isArray(provider.models)) {
|
|
3716
|
+
throw new ModelConfigError(`The provider of models "${id}" needs baseUrl (http or https), api and models, as pi's models.json.`);
|
|
3717
|
+
}
|
|
3718
|
+
}
|
|
3719
|
+
return config;
|
|
3720
|
+
}
|
|
3721
|
+
ModelProxyUtil2.read = read;
|
|
3722
|
+
function key(value, env = process.env) {
|
|
3723
|
+
if (!value) {
|
|
3724
|
+
return;
|
|
3725
|
+
}
|
|
3726
|
+
const name = value.startsWith("$") ? value.slice(1) : value;
|
|
3727
|
+
if (/^[A-Z][A-Z0-9_]*$/.test(name) && env[name]) {
|
|
3728
|
+
return env[name];
|
|
3729
|
+
}
|
|
3730
|
+
return value.startsWith("$") ? undefined : value;
|
|
3731
|
+
}
|
|
3732
|
+
ModelProxyUtil2.key = key;
|
|
3733
|
+
function catalog(config) {
|
|
3734
|
+
var _a;
|
|
3735
|
+
return {
|
|
3736
|
+
providers: Object.entries((_a = config.providers) !== null && _a !== undefined ? _a : {}).map(([id, provider]) => ({
|
|
3737
|
+
id,
|
|
3738
|
+
name: provider.name,
|
|
3739
|
+
api: provider.api,
|
|
3740
|
+
models: provider.models.map((model) => ({ ...model }))
|
|
3741
|
+
}))
|
|
3742
|
+
};
|
|
3743
|
+
}
|
|
3744
|
+
ModelProxyUtil2.catalog = catalog;
|
|
3745
|
+
function presented(request2) {
|
|
3746
|
+
var _a, _b;
|
|
3747
|
+
const bearer = request2.headers.authorization;
|
|
3748
|
+
if (bearer === null || bearer === undefined ? undefined : bearer.startsWith("Bearer ")) {
|
|
3749
|
+
return bearer.slice("Bearer ".length).trim();
|
|
3750
|
+
}
|
|
3751
|
+
for (const name of ["x-api-key", "x-goog-api-key", "api-key"]) {
|
|
3752
|
+
const value = request2.headers[name];
|
|
3753
|
+
if (typeof value === "string" && value) {
|
|
3754
|
+
return value.trim();
|
|
3755
|
+
}
|
|
3756
|
+
}
|
|
3757
|
+
return (_b = new URL((_a = request2.url) !== null && _a !== undefined ? _a : "/", "http://gateway").searchParams.get("key")) !== null && _b !== undefined ? _b : undefined;
|
|
3758
|
+
}
|
|
3759
|
+
ModelProxyUtil2.presented = presented;
|
|
3760
|
+
function authHeaders(api, key2) {
|
|
3761
|
+
if (!key2) {
|
|
3762
|
+
return {};
|
|
3763
|
+
}
|
|
3764
|
+
if (api.startsWith("anthropic")) {
|
|
3765
|
+
return { "x-api-key": key2 };
|
|
3766
|
+
}
|
|
3767
|
+
if (api.startsWith("google")) {
|
|
3768
|
+
return { "x-goog-api-key": key2 };
|
|
3769
|
+
}
|
|
3770
|
+
if (api.includes("azure")) {
|
|
3771
|
+
return { "api-key": key2 };
|
|
3772
|
+
}
|
|
3773
|
+
return { authorization: `Bearer ${key2}` };
|
|
3774
|
+
}
|
|
3775
|
+
ModelProxyUtil2.authHeaders = authHeaders;
|
|
3776
|
+
function target(baseUrl, rest, query) {
|
|
3777
|
+
const params = new URLSearchParams(query);
|
|
3778
|
+
params.delete("key");
|
|
3779
|
+
const search = params.toString();
|
|
3780
|
+
return `${baseUrl.replace(/\/+$/, "")}${rest}${search ? `?${search}` : ""}`;
|
|
3781
|
+
}
|
|
3782
|
+
ModelProxyUtil2.target = target;
|
|
3783
|
+
function number(value) {
|
|
3784
|
+
return typeof value === "number" && Number.isFinite(value) && value > 0 ? value : 0;
|
|
3785
|
+
}
|
|
3786
|
+
function usageOf(value) {
|
|
3787
|
+
var _a, _b, _c, _d;
|
|
3788
|
+
var _e, _f, _g;
|
|
3789
|
+
if (!value || typeof value !== "object") {
|
|
3790
|
+
return;
|
|
3791
|
+
}
|
|
3792
|
+
const object = value;
|
|
3793
|
+
const usage = (_g = (_f = (_e = object.usage) !== null && _e !== undefined ? _e : (_a = object.message) === null || _a === undefined ? undefined : _a.usage) !== null && _f !== undefined ? _f : (_b = object.response) === null || _b === undefined ? undefined : _b.usage) !== null && _g !== undefined ? _g : object.usageMetadata;
|
|
3794
|
+
if (!usage || typeof usage !== "object") {
|
|
3795
|
+
return;
|
|
3796
|
+
}
|
|
3797
|
+
if ("promptTokenCount" in usage || "candidatesTokenCount" in usage) {
|
|
3798
|
+
const cached = number(usage.cachedContentTokenCount);
|
|
3799
|
+
return {
|
|
3800
|
+
input: Math.max(0, number(usage.promptTokenCount) - cached),
|
|
3801
|
+
output: number(usage.candidatesTokenCount) + number(usage.thoughtsTokenCount),
|
|
3802
|
+
cacheRead: cached,
|
|
3803
|
+
cacheWrite: 0
|
|
3804
|
+
};
|
|
3805
|
+
}
|
|
3806
|
+
if ("prompt_tokens" in usage || "completion_tokens" in usage) {
|
|
3807
|
+
const cached = number((_c = usage.prompt_tokens_details) === null || _c === undefined ? undefined : _c.cached_tokens);
|
|
3808
|
+
return { input: Math.max(0, number(usage.prompt_tokens) - cached), output: number(usage.completion_tokens), cacheRead: cached, cacheWrite: 0 };
|
|
3809
|
+
}
|
|
3810
|
+
if ("input_tokens" in usage || "output_tokens" in usage) {
|
|
3811
|
+
const cached = number((_d = usage.input_tokens_details) === null || _d === undefined ? undefined : _d.cached_tokens);
|
|
3812
|
+
return {
|
|
3813
|
+
input: Math.max(0, number(usage.input_tokens) - cached),
|
|
3814
|
+
output: number(usage.output_tokens),
|
|
3815
|
+
cacheRead: cached + number(usage.cache_read_input_tokens),
|
|
3816
|
+
cacheWrite: number(usage.cache_creation_input_tokens)
|
|
3817
|
+
};
|
|
3818
|
+
}
|
|
3819
|
+
return;
|
|
3820
|
+
}
|
|
3821
|
+
ModelProxyUtil2.usageOf = usageOf;
|
|
3822
|
+
function merge(into, next) {
|
|
3823
|
+
if (!next) {
|
|
3824
|
+
return into;
|
|
3825
|
+
}
|
|
3826
|
+
if (!into) {
|
|
3827
|
+
return { ...next };
|
|
3828
|
+
}
|
|
3829
|
+
return {
|
|
3830
|
+
input: Math.max(into.input, next.input),
|
|
3831
|
+
output: Math.max(into.output, next.output),
|
|
3832
|
+
cacheRead: Math.max(into.cacheRead, next.cacheRead),
|
|
3833
|
+
cacheWrite: Math.max(into.cacheWrite, next.cacheWrite)
|
|
3834
|
+
};
|
|
3835
|
+
}
|
|
3836
|
+
ModelProxyUtil2.merge = merge;
|
|
3837
|
+
function total(usage) {
|
|
3838
|
+
return usage.input + usage.output + usage.cacheRead + usage.cacheWrite;
|
|
3839
|
+
}
|
|
3840
|
+
ModelProxyUtil2.total = total;
|
|
3841
|
+
function cost(usage, price) {
|
|
3842
|
+
var _a, _b, _c, _d;
|
|
3843
|
+
if (!price) {
|
|
3844
|
+
return 0;
|
|
3845
|
+
}
|
|
3846
|
+
return (usage.input * ((_a = price.input) !== null && _a !== undefined ? _a : 0) + usage.output * ((_b = price.output) !== null && _b !== undefined ? _b : 0) + usage.cacheRead * ((_c = price.cacheRead) !== null && _c !== undefined ? _c : 0) + usage.cacheWrite * ((_d = price.cacheWrite) !== null && _d !== undefined ? _d : 0)) / 1e6;
|
|
3847
|
+
}
|
|
3848
|
+
ModelProxyUtil2.cost = cost;
|
|
3849
|
+
function metered(api, body) {
|
|
3850
|
+
if (api !== "openai-completions") {
|
|
3851
|
+
return body;
|
|
3852
|
+
}
|
|
3853
|
+
let parsed;
|
|
3854
|
+
try {
|
|
3855
|
+
parsed = JSON.parse(body.toString("utf8"));
|
|
3856
|
+
} catch (_a) {
|
|
3857
|
+
return body;
|
|
3858
|
+
}
|
|
3859
|
+
if (!parsed || typeof parsed !== "object" || parsed.stream !== true) {
|
|
3860
|
+
return body;
|
|
3861
|
+
}
|
|
3862
|
+
const options = parsed.stream_options && typeof parsed.stream_options === "object" ? parsed.stream_options : {};
|
|
3863
|
+
return Buffer.from(JSON.stringify({ ...parsed, stream_options: { ...options, include_usage: true } }));
|
|
3864
|
+
}
|
|
3865
|
+
ModelProxyUtil2.metered = metered;
|
|
3866
|
+
function modelOf(body, rest) {
|
|
3867
|
+
var _a;
|
|
3868
|
+
const named = (_a = /\/models\/([^/:]+)/.exec(rest)) === null || _a === undefined ? undefined : _a[1];
|
|
3869
|
+
if (named) {
|
|
3870
|
+
return decodeURIComponent(named);
|
|
3871
|
+
}
|
|
3872
|
+
try {
|
|
3873
|
+
const model = JSON.parse(body.toString("utf8")).model;
|
|
3874
|
+
return typeof model === "string" ? model : undefined;
|
|
3875
|
+
} catch (_b) {
|
|
3876
|
+
return;
|
|
3877
|
+
}
|
|
3878
|
+
}
|
|
3879
|
+
ModelProxyUtil2.modelOf = modelOf;
|
|
3880
|
+
function error(response, status, message, type = "insufficient_quota") {
|
|
3881
|
+
if (response.headersSent) {
|
|
3882
|
+
response.destroy();
|
|
3883
|
+
return;
|
|
3884
|
+
}
|
|
3885
|
+
response.writeHead(status, { "Content-Type": "application/json", "Cache-Control": "no-store" });
|
|
3886
|
+
response.end(JSON.stringify({ type: "error", error: { type, code: type, message } }));
|
|
3887
|
+
}
|
|
3888
|
+
ModelProxyUtil2.error = error;
|
|
3889
|
+
function sameKey(given, known) {
|
|
3890
|
+
return timingSafeEqual(createHash5("sha256").update(given).digest(), createHash5("sha256").update(known).digest());
|
|
3891
|
+
}
|
|
3892
|
+
ModelProxyUtil2.sameKey = sameKey;
|
|
3893
|
+
})(ModelProxyUtil || (ModelProxyUtil = {}));
|
|
3894
|
+
|
|
3895
|
+
class ModelProxy {
|
|
3896
|
+
constructor(config, hooks, env = process.env) {
|
|
3897
|
+
this.config = config;
|
|
3898
|
+
this.hooks = hooks;
|
|
3899
|
+
this.env = env;
|
|
3900
|
+
}
|
|
3901
|
+
get enabled() {
|
|
3902
|
+
var _a;
|
|
3903
|
+
return Object.keys((_a = this.config.providers) !== null && _a !== undefined ? _a : {}).length > 0;
|
|
3904
|
+
}
|
|
3905
|
+
provider(id) {
|
|
3906
|
+
var _a;
|
|
3907
|
+
return new Map(Object.entries((_a = this.config.providers) !== null && _a !== undefined ? _a : {})).get(id);
|
|
3908
|
+
}
|
|
3909
|
+
async handle(request2, response) {
|
|
3910
|
+
var _a, _b;
|
|
3911
|
+
var _c, _d, _e, _f;
|
|
3912
|
+
response.setHeader("Cache-Control", "no-store");
|
|
3913
|
+
const url = new URL((_c = request2.url) !== null && _c !== undefined ? _c : "/", "http://gateway");
|
|
3914
|
+
const given = ModelProxyUtil.presented(request2);
|
|
3915
|
+
const tenant = given ? this.hooks.tenantOfKey(given) : undefined;
|
|
3916
|
+
if (!tenant) {
|
|
3917
|
+
ModelProxyUtil.error(response, 401, "This model key is not one of the gateway.", "authentication_error");
|
|
3918
|
+
return;
|
|
3919
|
+
}
|
|
3920
|
+
const rest = url.pathname.slice(ModelProxyUtil.PATH.length);
|
|
3921
|
+
if (rest === "" || rest === "/") {
|
|
3922
|
+
if (request2.method !== "GET") {
|
|
3923
|
+
ModelProxyUtil.error(response, 405, "Read the catalog with GET.", "invalid_request_error");
|
|
3924
|
+
return;
|
|
3925
|
+
}
|
|
3926
|
+
response.writeHead(200, { "Content-Type": "application/json" });
|
|
3927
|
+
response.end(JSON.stringify(ModelProxyUtil.catalog(this.config)));
|
|
3928
|
+
return;
|
|
3929
|
+
}
|
|
3930
|
+
const id = rest.slice(1).split("/")[0];
|
|
3931
|
+
const provider = this.provider(id);
|
|
3932
|
+
if (!provider) {
|
|
3933
|
+
ModelProxyUtil.error(response, 404, `The gateway has no provider of models ${id}.`, "not_found_error");
|
|
3934
|
+
return;
|
|
3935
|
+
}
|
|
3936
|
+
const refused = this.hooks.refuse(tenant.id);
|
|
3937
|
+
if (refused) {
|
|
3938
|
+
ModelProxyUtil.error(response, 429, refused);
|
|
3939
|
+
return;
|
|
3940
|
+
}
|
|
3941
|
+
const received = await this.body(request2);
|
|
3942
|
+
if (!received) {
|
|
3943
|
+
ModelProxyUtil.error(response, 413, "The request is too large.", "invalid_request_error");
|
|
3944
|
+
return;
|
|
3945
|
+
}
|
|
3946
|
+
const body = ModelProxyUtil.metered(provider.api, received);
|
|
3947
|
+
const path = rest.slice(1 + id.length);
|
|
3948
|
+
const model = ModelProxyUtil.modelOf(body, path);
|
|
3949
|
+
const headers = {};
|
|
3950
|
+
for (const [name, value] of Object.entries(request2.headers)) {
|
|
3951
|
+
if (typeof value === "string" && !DROPPED_REQUEST.has(name)) {
|
|
3952
|
+
headers[name] = value;
|
|
3953
|
+
}
|
|
3954
|
+
}
|
|
3955
|
+
Object.assign(headers, (_d = provider.headers) !== null && _d !== undefined ? _d : {}, ModelProxyUtil.authHeaders(provider.api, ModelProxyUtil.key(provider.apiKey, this.env)));
|
|
3956
|
+
const abort = new AbortController;
|
|
3957
|
+
response.once("close", () => abort.abort());
|
|
3958
|
+
let upstream;
|
|
3959
|
+
try {
|
|
3960
|
+
upstream = await fetch(ModelProxyUtil.target(provider.baseUrl, path, url.searchParams), {
|
|
3961
|
+
method: request2.method,
|
|
3962
|
+
headers,
|
|
3963
|
+
body: request2.method === "GET" || request2.method === "HEAD" ? undefined : new Uint8Array(body),
|
|
3964
|
+
signal: abort.signal
|
|
3965
|
+
});
|
|
3966
|
+
} catch (error) {
|
|
3967
|
+
ModelProxyUtil.error(response, 502, `The provider of models ${id} is not reachable: ${error.message}`, "api_error");
|
|
3968
|
+
return;
|
|
3969
|
+
}
|
|
3970
|
+
const out = {};
|
|
3971
|
+
upstream.headers.forEach((value, name) => {
|
|
3972
|
+
if (!DROPPED_RESPONSE.has(name)) {
|
|
3973
|
+
out[name] = value;
|
|
3974
|
+
}
|
|
3975
|
+
});
|
|
3976
|
+
response.writeHead(upstream.status, out);
|
|
3977
|
+
const stream = ((_e = upstream.headers.get("content-type")) !== null && _e !== undefined ? _e : "").includes("event-stream");
|
|
3978
|
+
let usage;
|
|
3979
|
+
let text = "";
|
|
3980
|
+
const decoder = new TextDecoder;
|
|
3981
|
+
const reader = (_a = upstream.body) === null || _a === undefined ? undefined : _a.getReader();
|
|
3982
|
+
try {
|
|
3983
|
+
while (reader) {
|
|
3984
|
+
const { done, value } = await reader.read();
|
|
3985
|
+
if (done) {
|
|
3986
|
+
break;
|
|
3987
|
+
}
|
|
3988
|
+
if (!response.write(value) && !await this.drained(response)) {
|
|
3989
|
+
break;
|
|
3990
|
+
}
|
|
3991
|
+
const chunk = decoder.decode(value, { stream: true });
|
|
3992
|
+
if (stream) {
|
|
3993
|
+
text += chunk;
|
|
3994
|
+
const lines = text.split(`
|
|
3995
|
+
`);
|
|
3996
|
+
text = (_f = lines.pop()) !== null && _f !== undefined ? _f : "";
|
|
3997
|
+
for (const line of lines) {
|
|
3998
|
+
usage = ModelProxyUtil.merge(usage, this.event(line));
|
|
3999
|
+
}
|
|
4000
|
+
} else if (text.length < MAX_READ) {
|
|
4001
|
+
text += chunk;
|
|
4002
|
+
}
|
|
4003
|
+
}
|
|
4004
|
+
if (stream) {
|
|
4005
|
+
usage = ModelProxyUtil.merge(usage, this.event(text));
|
|
4006
|
+
} else if (upstream.ok) {
|
|
4007
|
+
try {
|
|
4008
|
+
usage = ModelProxyUtil.usageOf(JSON.parse(text));
|
|
4009
|
+
} catch (_g) {}
|
|
4010
|
+
}
|
|
4011
|
+
response.end();
|
|
4012
|
+
} catch (_h) {
|
|
4013
|
+
response.destroy();
|
|
4014
|
+
} finally {
|
|
4015
|
+
if (usage && ModelProxyUtil.total(usage) > 0) {
|
|
4016
|
+
const price = (_b = provider.models.find((each) => each.id === model)) === null || _b === undefined ? undefined : _b.cost;
|
|
4017
|
+
this.hooks.record(tenant.id, usage, ModelProxyUtil.cost(usage, price));
|
|
4018
|
+
}
|
|
4019
|
+
}
|
|
4020
|
+
}
|
|
4021
|
+
drained(response) {
|
|
4022
|
+
if (response.destroyed) {
|
|
4023
|
+
return Promise.resolve(false);
|
|
4024
|
+
}
|
|
4025
|
+
return new Promise((resolve) => {
|
|
4026
|
+
const done = (drained) => {
|
|
4027
|
+
response.off("drain", onDrain);
|
|
4028
|
+
response.off("close", onClose);
|
|
4029
|
+
resolve(drained);
|
|
4030
|
+
};
|
|
4031
|
+
const onDrain = () => done(true);
|
|
4032
|
+
const onClose = () => done(false);
|
|
4033
|
+
response.on("drain", onDrain);
|
|
4034
|
+
response.on("close", onClose);
|
|
4035
|
+
});
|
|
4036
|
+
}
|
|
4037
|
+
event(line) {
|
|
4038
|
+
const trimmed = line.trim();
|
|
4039
|
+
if (!trimmed.startsWith("data:")) {
|
|
4040
|
+
return;
|
|
4041
|
+
}
|
|
4042
|
+
try {
|
|
4043
|
+
return ModelProxyUtil.usageOf(JSON.parse(trimmed.slice(5)));
|
|
4044
|
+
} catch (_a) {
|
|
4045
|
+
return;
|
|
4046
|
+
}
|
|
4047
|
+
}
|
|
4048
|
+
async body(request2) {
|
|
4049
|
+
const chunks = [];
|
|
4050
|
+
let size = 0;
|
|
4051
|
+
for await (const chunk of request2) {
|
|
4052
|
+
size += chunk.length;
|
|
4053
|
+
if (size > MAX_BODY) {
|
|
4054
|
+
return;
|
|
4055
|
+
}
|
|
4056
|
+
chunks.push(chunk);
|
|
4057
|
+
}
|
|
4058
|
+
return Buffer.concat(chunks);
|
|
4059
|
+
}
|
|
4060
|
+
}
|
|
4061
|
+
|
|
3505
4062
|
// ../../ta-packages/ta-gateway/esm/node/gateway-service.js
|
|
3506
4063
|
class GatewayCallError extends Error {
|
|
3507
4064
|
constructor(message, code, hint) {
|
|
@@ -3536,7 +4093,8 @@ var GatewayServiceUtil;
|
|
|
3536
4093
|
grantMinutes: "admin",
|
|
3537
4094
|
setSuspended: "admin",
|
|
3538
4095
|
setDefaultLimits: "owner",
|
|
3539
|
-
setRole: "owner"
|
|
4096
|
+
setRole: "owner",
|
|
4097
|
+
createAccessToken: "anyone"
|
|
3540
4098
|
},
|
|
3541
4099
|
TaAccessServer: {
|
|
3542
4100
|
getAccess: "anyone",
|
|
@@ -3661,6 +4219,7 @@ var GatewayServiceUtil;
|
|
|
3661
4219
|
|
|
3662
4220
|
class GatewayService {
|
|
3663
4221
|
constructor(parts) {
|
|
4222
|
+
this.models = parts.models;
|
|
3664
4223
|
this.flow = parts.flow;
|
|
3665
4224
|
this.tenants = parts.tenants;
|
|
3666
4225
|
this.environments = parts.environments;
|
|
@@ -3708,7 +4267,8 @@ class GatewayService {
|
|
|
3708
4267
|
grantMinutes: () => this.grantMinutes(caller, first, second),
|
|
3709
4268
|
setSuspended: () => this.setSuspended(caller, first, second),
|
|
3710
4269
|
setDefaultLimits: () => this.setDefaultLimits(first),
|
|
3711
|
-
setRole: () => this.setRole(caller, first, second)
|
|
4270
|
+
setRole: () => this.setRole(caller, first, second),
|
|
4271
|
+
createAccessToken: () => this.accessToken(caller, first)
|
|
3712
4272
|
} : {
|
|
3713
4273
|
getAccess: () => this.access(caller),
|
|
3714
4274
|
bindUrl: () => this.flow.bindUrl(String(first)),
|
|
@@ -3782,8 +4342,8 @@ class GatewayService {
|
|
|
3782
4342
|
};
|
|
3783
4343
|
}
|
|
3784
4344
|
async console(caller) {
|
|
3785
|
-
var _a;
|
|
3786
|
-
var
|
|
4345
|
+
var _a, _b;
|
|
4346
|
+
var _c, _d, _e;
|
|
3787
4347
|
const tenants = this.tenants.list();
|
|
3788
4348
|
const [usages, agents] = await Promise.all([
|
|
3789
4349
|
Promise.all(tenants.map((tenant) => this.environments.usage(tenant).catch(() => {
|
|
@@ -3796,9 +4356,9 @@ class GatewayService {
|
|
|
3796
4356
|
const counts = new Map;
|
|
3797
4357
|
for (const tenant of tenants) {
|
|
3798
4358
|
const { provider } = this.environments.info(tenant);
|
|
3799
|
-
counts.set(provider, ((
|
|
4359
|
+
counts.set(provider, ((_c = counts.get(provider)) !== null && _c !== undefined ? _c : 0) + 1);
|
|
3800
4360
|
}
|
|
3801
|
-
const fallback = (
|
|
4361
|
+
const fallback = (_d = this.environments.settings.default) !== null && _d !== undefined ? _d : (_a = this.environments.providers[0]) === null || _a === undefined ? undefined : _a.id;
|
|
3802
4362
|
return {
|
|
3803
4363
|
version: this.meta.version,
|
|
3804
4364
|
startedAt: this.meta.startedAt,
|
|
@@ -3822,7 +4382,13 @@ class GatewayService {
|
|
|
3822
4382
|
}),
|
|
3823
4383
|
requests: this.flow.store.info(caller.token).requests.length,
|
|
3824
4384
|
role: caller.role,
|
|
3825
|
-
policy: this.policyView()
|
|
4385
|
+
policy: this.policyView(),
|
|
4386
|
+
models: ModelProxyUtil.catalog((_e = (_b = this.models) === null || _b === undefined ? undefined : _b.config) !== null && _e !== undefined ? _e : {}).providers.map((provider) => ({
|
|
4387
|
+
id: provider.id,
|
|
4388
|
+
name: provider.name,
|
|
4389
|
+
api: provider.api,
|
|
4390
|
+
models: provider.models.length
|
|
4391
|
+
}))
|
|
3826
4392
|
};
|
|
3827
4393
|
}
|
|
3828
4394
|
policyView() {
|
|
@@ -3932,6 +4498,14 @@ class GatewayService {
|
|
|
3932
4498
|
this.policy.setRole(id, role);
|
|
3933
4499
|
return this.policyView();
|
|
3934
4500
|
}
|
|
4501
|
+
accessToken(caller, label) {
|
|
4502
|
+
var _a;
|
|
4503
|
+
const tenant = (_a = this.tenants.get(caller.tenant.id)) !== null && _a !== undefined ? _a : caller.tenant;
|
|
4504
|
+
const device = typeof label === "string" && label.trim() ? label.trim().slice(0, 60) : "Another Ta";
|
|
4505
|
+
const token = this.flow.store.signIn({ id: caller.account, name: tenant.name, avatar: tenant.avatar }, device);
|
|
4506
|
+
console.log(`ta gateway: ${caller.account} made a token for ${device}`);
|
|
4507
|
+
return { token, url: this.meta.publicUrl };
|
|
4508
|
+
}
|
|
3935
4509
|
access(caller) {
|
|
3936
4510
|
const providers = this.flow.providers.map(({ id, name }) => ({ id, name }));
|
|
3937
4511
|
const info = this.flow.store.info(caller.token);
|
|
@@ -3987,7 +4561,7 @@ class GatewayService {
|
|
|
3987
4561
|
|
|
3988
4562
|
// ../../ta-packages/ta-gateway/esm/node/gateway-socket.js
|
|
3989
4563
|
var MAX_QUEUED = 256;
|
|
3990
|
-
var
|
|
4564
|
+
var MAX_QUEUED_BYTES2 = 16 * 1024 * 1024;
|
|
3991
4565
|
var FLOOD_MESSAGES = 2000;
|
|
3992
4566
|
var FLOOD_WINDOW_MS = 1e4;
|
|
3993
4567
|
|
|
@@ -4110,7 +4684,7 @@ class GatewaySocket {
|
|
|
4110
4684
|
var _a;
|
|
4111
4685
|
if (((_a = this.inner) === null || _a === undefined ? undefined : _a.readyState) === WebSocket.OPEN) {
|
|
4112
4686
|
this.inner.send(text);
|
|
4113
|
-
} else if (this.queued.length < MAX_QUEUED && this.queuedBytes + text.length <=
|
|
4687
|
+
} else if (this.queued.length < MAX_QUEUED && this.queuedBytes + text.length <= MAX_QUEUED_BYTES2) {
|
|
4114
4688
|
this.queued.push(text);
|
|
4115
4689
|
this.queuedBytes += text.length;
|
|
4116
4690
|
} else {
|
|
@@ -4156,7 +4730,7 @@ class GatewaySocket {
|
|
|
4156
4730
|
import { spawn as spawn2 } from "node:child_process";
|
|
4157
4731
|
import { mkdirSync as mkdirSync4 } from "node:fs";
|
|
4158
4732
|
import { createServer } from "node:net";
|
|
4159
|
-
import { join as
|
|
4733
|
+
import { join as join7 } from "node:path";
|
|
4160
4734
|
var STOP_TIMEOUT_MS = 1e4;
|
|
4161
4735
|
var KEPT_LINES = 2000;
|
|
4162
4736
|
|
|
@@ -4191,6 +4765,7 @@ class LocalSandbox {
|
|
|
4191
4765
|
this.running = new Map;
|
|
4192
4766
|
this.output = new Map;
|
|
4193
4767
|
this.name = SandboxProviders.string(config, "name", "Local");
|
|
4768
|
+
this.gatewayUrl = SandboxProviders.string(config, "gatewayUrl");
|
|
4194
4769
|
}
|
|
4195
4770
|
async start(tenant) {
|
|
4196
4771
|
var _a, _b;
|
|
@@ -4198,16 +4773,16 @@ class LocalSandbox {
|
|
|
4198
4773
|
if (running && running.child.exitCode === null) {
|
|
4199
4774
|
return { url: running.url, token: tenant.token };
|
|
4200
4775
|
}
|
|
4201
|
-
const root =
|
|
4202
|
-
const agentDir =
|
|
4203
|
-
const cwd =
|
|
4776
|
+
const root = join7(this.context.dir, "local", tenant.id);
|
|
4777
|
+
const agentDir = join7(root, "agent");
|
|
4778
|
+
const cwd = join7(root, "workspace");
|
|
4204
4779
|
mkdirSync4(agentDir, { recursive: true });
|
|
4205
4780
|
mkdirSync4(cwd, { recursive: true });
|
|
4206
4781
|
const port = await LocalSandbox.freePort();
|
|
4207
4782
|
const [command, ...args] = this.context.taCommand;
|
|
4208
4783
|
const child = spawn2(command, [...args, "serve", "--port", String(port)], {
|
|
4209
4784
|
cwd,
|
|
4210
|
-
env: { ...process.env, TA_CODING_AGENT_DIR: agentDir, TA_SERVE_TOKEN: tenant.token, CELL_SERVER__HOST: "127.0.0.1" },
|
|
4785
|
+
env: { ...process.env, ...tenant.env, TA_CODING_AGENT_DIR: agentDir, TA_SERVE_TOKEN: tenant.token, CELL_SERVER__HOST: "127.0.0.1" },
|
|
4211
4786
|
stdio: ["ignore", "pipe", "pipe"]
|
|
4212
4787
|
});
|
|
4213
4788
|
const tail = new LineTail;
|
|
@@ -4267,15 +4842,15 @@ class LocalSandbox {
|
|
|
4267
4842
|
}
|
|
4268
4843
|
|
|
4269
4844
|
// ../../ta-packages/ta-gateway/esm/node/sign-in-links.js
|
|
4270
|
-
import { createHash as
|
|
4271
|
-
import { readFileSync as
|
|
4272
|
-
import { join as
|
|
4845
|
+
import { createHash as createHash6, randomBytes as randomBytes4 } from "node:crypto";
|
|
4846
|
+
import { readFileSync as readFileSync8 } from "node:fs";
|
|
4847
|
+
import { join as join8 } from "node:path";
|
|
4273
4848
|
var SIGN_IN_LINK_PATH = "/sign-in/link/";
|
|
4274
|
-
var hash = (secret) =>
|
|
4849
|
+
var hash = (secret) => createHash6("sha256").update(secret).digest("base64url");
|
|
4275
4850
|
|
|
4276
4851
|
class SignInLinks {
|
|
4277
4852
|
constructor(dir) {
|
|
4278
|
-
this.file =
|
|
4853
|
+
this.file = join8(dir, "links.json");
|
|
4279
4854
|
}
|
|
4280
4855
|
create(account, name, ttlMs = 24 * 3600 * 1000, now = Date.now()) {
|
|
4281
4856
|
if (!/^[a-z][a-z0-9-]*:\S+$/.test(account)) {
|
|
@@ -4297,7 +4872,7 @@ class SignInLinks {
|
|
|
4297
4872
|
}
|
|
4298
4873
|
read(now) {
|
|
4299
4874
|
try {
|
|
4300
|
-
const links = JSON.parse(
|
|
4875
|
+
const links = JSON.parse(readFileSync8(this.file, "utf8"));
|
|
4301
4876
|
return Array.isArray(links) ? links.filter((link) => link.expiresAt > now) : [];
|
|
4302
4877
|
} catch (_a) {
|
|
4303
4878
|
return [];
|
|
@@ -4330,6 +4905,17 @@ var SANDBOX_TYPES = {
|
|
|
4330
4905
|
};
|
|
4331
4906
|
var GatewayServerUtil;
|
|
4332
4907
|
(function(GatewayServerUtil2) {
|
|
4908
|
+
function reach(type, port, publicUrl) {
|
|
4909
|
+
if (type === "docker") {
|
|
4910
|
+
return `http://host.docker.internal:${port}`;
|
|
4911
|
+
}
|
|
4912
|
+
if (type === "local" || !publicUrl) {
|
|
4913
|
+
return `http://127.0.0.1:${port}`;
|
|
4914
|
+
}
|
|
4915
|
+
return publicUrl;
|
|
4916
|
+
}
|
|
4917
|
+
GatewayServerUtil2.reach = reach;
|
|
4918
|
+
GatewayServerUtil2.EXEC_PATH = "/api/exec";
|
|
4333
4919
|
function blockedReason(block) {
|
|
4334
4920
|
switch (block) {
|
|
4335
4921
|
case "suspended":
|
|
@@ -4348,11 +4934,11 @@ var GatewayServerUtil;
|
|
|
4348
4934
|
} catch (_a) {
|
|
4349
4935
|
path = "/";
|
|
4350
4936
|
}
|
|
4351
|
-
const absolute = normalize(
|
|
4352
|
-
if ((absolute === root || absolute.startsWith(root.endsWith(sep) ? root : root + sep)) &&
|
|
4937
|
+
const absolute = normalize(join9(root, path));
|
|
4938
|
+
if ((absolute === root || absolute.startsWith(root.endsWith(sep) ? root : root + sep)) && existsSync4(absolute) && statSync(absolute).isFile()) {
|
|
4353
4939
|
return absolute;
|
|
4354
4940
|
}
|
|
4355
|
-
return
|
|
4941
|
+
return join9(root, "index.html");
|
|
4356
4942
|
}
|
|
4357
4943
|
GatewayServerUtil2.file = file;
|
|
4358
4944
|
function filesTarget(requestUrl, endpoint) {
|
|
@@ -4369,13 +4955,14 @@ var GatewayServerUtil;
|
|
|
4369
4955
|
|
|
4370
4956
|
class GatewayServer {
|
|
4371
4957
|
static async create(options) {
|
|
4958
|
+
const models = ModelProxyUtil.read(options.dir);
|
|
4372
4959
|
mkdirSync5(options.dir, { recursive: true, mode: 448 });
|
|
4373
4960
|
const config = SandboxProviders.read(options.dir);
|
|
4374
4961
|
const context = { dir: options.dir, taCommand: options.taCommand };
|
|
4375
4962
|
const providers = await SandboxProviders.create(config, context, SANDBOX_TYPES);
|
|
4376
|
-
return new GatewayServer(options, providers, config);
|
|
4963
|
+
return new GatewayServer(options, providers, config, models);
|
|
4377
4964
|
}
|
|
4378
|
-
constructor(options, providers, config) {
|
|
4965
|
+
constructor(options, providers, config, models = {}) {
|
|
4379
4966
|
var _a, _b;
|
|
4380
4967
|
this.options = options;
|
|
4381
4968
|
this.sockets = new Set;
|
|
@@ -4383,7 +4970,7 @@ class GatewayServer {
|
|
|
4383
4970
|
const owners = AccessUtil.parseList(env.TA_GATEWAY_ADMINS);
|
|
4384
4971
|
this.policy = new GatewayPolicy(options.dir, owners);
|
|
4385
4972
|
const allowed = [...AccessUtil.parseList(env.TA_ALLOWED_USERS), ...owners];
|
|
4386
|
-
this.flow = new SignInFlow(SignInProviders.fromEnv(env), new AccessStore(
|
|
4973
|
+
this.flow = new SignInFlow(SignInProviders.fromEnv(env), new AccessStore(join9(options.dir, "access.json"), allowed), SignInProviders.publicUrl(env));
|
|
4387
4974
|
this.tenants = new TenantStore(options.dir);
|
|
4388
4975
|
this.links = new SignInLinks(options.dir);
|
|
4389
4976
|
this.environments = new Environments(providers, this.tenants, {
|
|
@@ -4393,8 +4980,24 @@ class GatewayServer {
|
|
|
4393
4980
|
});
|
|
4394
4981
|
this.usage = new GatewayUsage(options.dir);
|
|
4395
4982
|
this.audit = new GatewayAudit(options.dir);
|
|
4396
|
-
this.quotas = new GatewayQuotas(this.policy, this.tenants, this.usage, () => this.environments.settings.own);
|
|
4983
|
+
this.quotas = new GatewayQuotas(this.policy, this.tenants, this.usage, () => this.environments.settings.own, () => this.models.enabled);
|
|
4397
4984
|
this.environments.guard = (tenant) => GatewayServerUtil.blockedReason(this.quotas.blocked(tenant));
|
|
4985
|
+
this.models = new ModelProxy(models, {
|
|
4986
|
+
tenantOfKey: (key) => this.tenants.list().find((tenant) => tenant.modelKey && ModelProxyUtil.sameKey(key, tenant.modelKey)),
|
|
4987
|
+
refuse: (id) => {
|
|
4988
|
+
const tenant = this.tenants.get(id);
|
|
4989
|
+
return tenant ? this.quotas.refuseModels(tenant) : "No such account.";
|
|
4990
|
+
},
|
|
4991
|
+
record: (id, usage, cost) => this.quotas.addTokens(id, ModelProxyUtil.total(usage), cost)
|
|
4992
|
+
}, env);
|
|
4993
|
+
this.environments.envOf = (tenant, provider) => {
|
|
4994
|
+
var _a2, _b2, _c;
|
|
4995
|
+
if (!this.models.enabled) {
|
|
4996
|
+
return;
|
|
4997
|
+
}
|
|
4998
|
+
const url = (_a2 = provider.gatewayUrl) !== null && _a2 !== undefined ? _a2 : GatewayServerUtil.reach(provider.type, (_c = (_b2 = this.port) !== null && _b2 !== undefined ? _b2 : options.port) !== null && _c !== undefined ? _c : 4100, SandboxProviders.publicBase(env));
|
|
4999
|
+
return { TA_MODEL_PROXY_URL: url.replace(/\/+$/, ""), TA_MODEL_PROXY_KEY: this.tenants.modelKey(tenant.id) };
|
|
5000
|
+
};
|
|
4398
5001
|
this.service = new GatewayService({
|
|
4399
5002
|
flow: this.flow,
|
|
4400
5003
|
tenants: this.tenants,
|
|
@@ -4404,6 +5007,7 @@ class GatewayServer {
|
|
|
4404
5007
|
usage: this.usage,
|
|
4405
5008
|
audit: this.audit,
|
|
4406
5009
|
hooks: { cutOff: () => this.cutOff(), reset: (id) => this.reset(id) },
|
|
5010
|
+
models: this.models,
|
|
4407
5011
|
meta: { links: this.links, startedAt: Date.now(), version: options.version, publicUrl: SandboxProviders.publicBase(env) }
|
|
4408
5012
|
});
|
|
4409
5013
|
}
|
|
@@ -4431,6 +5035,7 @@ class GatewayServer {
|
|
|
4431
5035
|
server.once("error", reject);
|
|
4432
5036
|
server.listen((_a2 = this.options.port) !== null && _a2 !== undefined ? _a2 : 4100, (_b2 = this.options.host) !== null && _b2 !== undefined ? _b2 : "127.0.0.1", () => {
|
|
4433
5037
|
const { address, port } = server.address();
|
|
5038
|
+
this.port = port;
|
|
4434
5039
|
resolve(`http://${address.includes(":") ? `[${address}]` : address}:${port}`);
|
|
4435
5040
|
});
|
|
4436
5041
|
});
|
|
@@ -4481,6 +5086,8 @@ class GatewayServer {
|
|
|
4481
5086
|
name: "ta gateway",
|
|
4482
5087
|
onSignedIn: (res, token, account, origin) => this.signedIn(res, token, account, origin)
|
|
4483
5088
|
});
|
|
5089
|
+
} else if (path === ModelProxyUtil.PATH || path.startsWith(`${ModelProxyUtil.PATH}/`)) {
|
|
5090
|
+
await this.models.handle(request2, response);
|
|
4484
5091
|
} else if (path.startsWith(`${TA_FILES_PATH}/`)) {
|
|
4485
5092
|
await this.files(request2, response);
|
|
4486
5093
|
} else if (path === "/api" || path.startsWith("/api/")) {
|
|
@@ -4585,7 +5192,7 @@ class GatewayServer {
|
|
|
4585
5192
|
upgrade(request2, socket, head) {
|
|
4586
5193
|
var _a, _b;
|
|
4587
5194
|
const url = new URL((_a = request2.url) !== null && _a !== undefined ? _a : "/", "http://gateway");
|
|
4588
|
-
if (url.pathname !== TA_WEBSOCKET_PATH) {
|
|
5195
|
+
if (url.pathname !== TA_WEBSOCKET_PATH && url.pathname !== GatewayServerUtil.EXEC_PATH) {
|
|
4589
5196
|
socket.destroy();
|
|
4590
5197
|
return;
|
|
4591
5198
|
}
|
|
@@ -4607,6 +5214,16 @@ class GatewayServer {
|
|
|
4607
5214
|
return;
|
|
4608
5215
|
}
|
|
4609
5216
|
this.tenants.update(caller.tenant.id, { lastActiveAt: Date.now() });
|
|
5217
|
+
if (url.pathname === GatewayServerUtil.EXEC_PATH) {
|
|
5218
|
+
const blocked = GatewayServerUtil.blockedReason(this.quotas.blocked(caller.tenant));
|
|
5219
|
+
if (blocked) {
|
|
5220
|
+
WebSocketConnection.refuse(socket, 403, blocked);
|
|
5221
|
+
return;
|
|
5222
|
+
}
|
|
5223
|
+
const exec = WebSocketConnection.open(socket, checked.key, head, { maxPayload: 64 * 1024 * 1024, heartbeat: 30000 });
|
|
5224
|
+
new GatewayExecProxy(exec, this.environments.ensure(caller.tenant), this.environments.connect(caller.tenant.id));
|
|
5225
|
+
return;
|
|
5226
|
+
}
|
|
4610
5227
|
const connection = WebSocketConnection.open(socket, checked.key, head, { maxPayload: 32 * 1024 * 1024, heartbeat: 30000, deflate: checked.deflate });
|
|
4611
5228
|
const gatewaySocket = new GatewaySocket(connection, caller, this.environments, this.service, this.quotas);
|
|
4612
5229
|
this.sockets.add(gatewaySocket);
|
|
@@ -4656,7 +5273,7 @@ var GatewayCli;
|
|
|
4656
5273
|
process.stdout.write(HELP);
|
|
4657
5274
|
return;
|
|
4658
5275
|
}
|
|
4659
|
-
const dir = (_b = (_a = values.dir) !== null && _a !== undefined ? _a : process.env.TA_GATEWAY_DIR) !== null && _b !== undefined ? _b :
|
|
5276
|
+
const dir = (_b = (_a = values.dir) !== null && _a !== undefined ? _a : process.env.TA_GATEWAY_DIR) !== null && _b !== undefined ? _b : join10(homedir(), ".ta", "gateway");
|
|
4660
5277
|
if (positionals[0] === "link") {
|
|
4661
5278
|
link(dir, positionals[1], values.name);
|
|
4662
5279
|
return;
|