@rudderhq/server 0.5.2-canary.2 → 0.6.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/bootstrap/register-api-routes.d.ts.map +1 -1
- package/dist/bootstrap/register-api-routes.js +15 -0
- package/dist/bootstrap/register-api-routes.js.map +1 -1
- package/dist/bootstrap/types.d.ts +11 -0
- package/dist/bootstrap/types.d.ts.map +1 -1
- package/dist/bundled-plugins/plugin-linear/dist/worker.js +741 -7
- package/dist/bundled-plugins/plugin-linear/dist/worker.js.map +3 -3
- package/dist/config.d.ts +2 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +3 -0
- package/dist/config.js.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +28 -1
- package/dist/index.js.map +1 -1
- package/dist/local-runtime.d.ts +7 -0
- package/dist/local-runtime.d.ts.map +1 -1
- package/dist/local-runtime.js +15 -1
- package/dist/local-runtime.js.map +1 -1
- package/dist/middleware/auth.js +2 -2
- package/dist/middleware/auth.js.map +1 -1
- package/dist/middleware/error-handler.d.ts.map +1 -1
- package/dist/middleware/error-handler.js +3 -2
- package/dist/middleware/error-handler.js.map +1 -1
- package/dist/middleware/logger.d.ts +4 -0
- package/dist/middleware/logger.d.ts.map +1 -1
- package/dist/middleware/logger.js +82 -7
- package/dist/middleware/logger.js.map +1 -1
- package/dist/middleware/logger.test.js +94 -1
- package/dist/middleware/logger.test.js.map +1 -1
- package/dist/routes/chats.annotation-routes.d.ts +47 -0
- package/dist/routes/chats.annotation-routes.d.ts.map +1 -0
- package/dist/routes/chats.annotation-routes.js +164 -0
- package/dist/routes/chats.annotation-routes.js.map +1 -0
- package/dist/routes/chats.d.ts.map +1 -1
- package/dist/routes/chats.js +467 -165
- package/dist/routes/chats.js.map +1 -1
- package/dist/routes/chats.stream-routes.d.ts +1 -10
- package/dist/routes/chats.stream-routes.d.ts.map +1 -1
- package/dist/routes/chats.stream-routes.js +168 -110
- package/dist/routes/chats.stream-routes.js.map +1 -1
- package/dist/routes/chats.stream-support.d.ts +79 -0
- package/dist/routes/chats.stream-support.d.ts.map +1 -0
- package/dist/routes/chats.stream-support.js +121 -0
- package/dist/routes/chats.stream-support.js.map +1 -0
- package/dist/routes/issues.comments-attachments.d.ts.map +1 -1
- package/dist/routes/issues.comments-attachments.js +16 -2
- package/dist/routes/issues.comments-attachments.js.map +1 -1
- package/dist/routes/issues.d.ts.map +1 -1
- package/dist/routes/issues.js +21 -4
- package/dist/routes/issues.js.map +1 -1
- package/dist/routes/issues.mutations.d.ts.map +1 -1
- package/dist/routes/issues.mutations.js +20 -33
- package/dist/routes/issues.mutations.js.map +1 -1
- package/dist/routes/managed-mcp-agent-bindings.d.ts +15 -0
- package/dist/routes/managed-mcp-agent-bindings.d.ts.map +1 -0
- package/dist/routes/managed-mcp-agent-bindings.js +66 -0
- package/dist/routes/managed-mcp-agent-bindings.js.map +1 -0
- package/dist/routes/managed-mcp-connections.d.ts +8 -0
- package/dist/routes/managed-mcp-connections.d.ts.map +1 -0
- package/dist/routes/managed-mcp-connections.js +189 -0
- package/dist/routes/managed-mcp-connections.js.map +1 -0
- package/dist/routes/managed-mcp-runtime.d.ts +5 -0
- package/dist/routes/managed-mcp-runtime.d.ts.map +1 -0
- package/dist/routes/managed-mcp-runtime.js +148 -0
- package/dist/routes/managed-mcp-runtime.js.map +1 -0
- package/dist/routes/messenger.d.ts.map +1 -1
- package/dist/routes/messenger.js +1 -1
- package/dist/routes/messenger.js.map +1 -1
- package/dist/services/access.d.ts.map +1 -1
- package/dist/services/access.js +91 -12
- package/dist/services/access.js.map +1 -1
- package/dist/services/agent-run-context.d.ts +1 -0
- package/dist/services/agent-run-context.d.ts.map +1 -1
- package/dist/services/agent-run-context.js +5 -1
- package/dist/services/agent-run-context.js.map +1 -1
- package/dist/services/board-auth.d.ts +2 -2
- package/dist/services/chat-annotation-copy-lineage.d.ts +32 -0
- package/dist/services/chat-annotation-copy-lineage.d.ts.map +1 -0
- package/dist/services/chat-annotation-copy-lineage.js +110 -0
- package/dist/services/chat-annotation-copy-lineage.js.map +1 -0
- package/dist/services/chat-assistant.annotations.d.ts +16 -0
- package/dist/services/chat-assistant.annotations.d.ts.map +1 -0
- package/dist/services/chat-assistant.annotations.js +108 -0
- package/dist/services/chat-assistant.annotations.js.map +1 -0
- package/dist/services/chat-assistant.annotations.test.d.ts +2 -0
- package/dist/services/chat-assistant.annotations.test.d.ts.map +1 -0
- package/dist/services/chat-assistant.annotations.test.js +257 -0
- package/dist/services/chat-assistant.annotations.test.js.map +1 -0
- package/dist/services/chat-assistant.d.ts.map +1 -1
- package/dist/services/chat-assistant.helpers.d.ts +2 -3
- package/dist/services/chat-assistant.helpers.d.ts.map +1 -1
- package/dist/services/chat-assistant.helpers.js +37 -53
- package/dist/services/chat-assistant.helpers.js.map +1 -1
- package/dist/services/chat-assistant.js +61 -5
- package/dist/services/chat-assistant.js.map +1 -1
- package/dist/services/chat-generation-protocol.d.ts +8 -15
- package/dist/services/chat-generation-protocol.d.ts.map +1 -1
- package/dist/services/chat-generation-protocol.js +19 -59
- package/dist/services/chat-generation-protocol.js.map +1 -1
- package/dist/services/chat-generation-protocol.test.js +168 -6
- package/dist/services/chat-generation-protocol.test.js.map +1 -1
- package/dist/services/chat-generation-provenance.d.ts +14 -0
- package/dist/services/chat-generation-provenance.d.ts.map +1 -0
- package/dist/services/chat-generation-provenance.js +71 -0
- package/dist/services/chat-generation-provenance.js.map +1 -0
- package/dist/services/chat-inline-annotation-rendering.d.ts +2 -0
- package/dist/services/chat-inline-annotation-rendering.d.ts.map +1 -0
- package/dist/services/chat-inline-annotation-rendering.js +265 -0
- package/dist/services/chat-inline-annotation-rendering.js.map +1 -0
- package/dist/services/chat-inline-annotation-resolved-labels.d.ts +11 -0
- package/dist/services/chat-inline-annotation-resolved-labels.d.ts.map +1 -0
- package/dist/services/chat-inline-annotation-resolved-labels.js +490 -0
- package/dist/services/chat-inline-annotation-resolved-labels.js.map +1 -0
- package/dist/services/chat-inline-annotation-validation.d.ts +15 -0
- package/dist/services/chat-inline-annotation-validation.d.ts.map +1 -0
- package/dist/services/chat-inline-annotation-validation.js +430 -0
- package/dist/services/chat-inline-annotation-validation.js.map +1 -0
- package/dist/services/chat-inline-annotations.d.ts +18 -0
- package/dist/services/chat-inline-annotations.d.ts.map +1 -0
- package/dist/services/chat-inline-annotations.js +52 -0
- package/dist/services/chat-inline-annotations.js.map +1 -0
- package/dist/services/chat-inline-annotations.test.d.ts +2 -0
- package/dist/services/chat-inline-annotations.test.d.ts.map +1 -0
- package/dist/services/chat-inline-annotations.test.js +1306 -0
- package/dist/services/chat-inline-annotations.test.js.map +1 -0
- package/dist/services/chat-queued-message-materialization.d.ts +126 -0
- package/dist/services/chat-queued-message-materialization.d.ts.map +1 -0
- package/dist/services/chat-queued-message-materialization.js +327 -0
- package/dist/services/chat-queued-message-materialization.js.map +1 -0
- package/dist/services/chat-steer-messages.d.ts +3 -3
- package/dist/services/chat-steer-messages.d.ts.map +1 -1
- package/dist/services/chat-steer-messages.js +50 -80
- package/dist/services/chat-steer-messages.js.map +1 -1
- package/dist/services/chat-work-manifest.d.ts.map +1 -1
- package/dist/services/chat-work-manifest.js +5 -1
- package/dist/services/chat-work-manifest.js.map +1 -1
- package/dist/services/chats.annotation-persistence.d.ts +20 -0
- package/dist/services/chats.annotation-persistence.d.ts.map +1 -0
- package/dist/services/chats.annotation-persistence.js +206 -0
- package/dist/services/chats.annotation-persistence.js.map +1 -0
- package/dist/services/chats.d.ts +129 -96
- package/dist/services/chats.d.ts.map +1 -1
- package/dist/services/chats.helpers.d.ts +2 -2
- package/dist/services/chats.inline-visual-persistence.d.ts +3 -3
- package/dist/services/chats.inline-visual-persistence.d.ts.map +1 -1
- package/dist/services/chats.inline-visual-persistence.js +114 -54
- package/dist/services/chats.inline-visual-persistence.js.map +1 -1
- package/dist/services/chats.js +743 -252
- package/dist/services/chats.js.map +1 -1
- package/dist/services/finance.d.ts +1 -1
- package/dist/services/index.d.ts +8 -0
- package/dist/services/index.d.ts.map +1 -1
- package/dist/services/index.js +8 -0
- package/dist/services/index.js.map +1 -1
- package/dist/services/integrations/agent-integrations.d.ts +2 -2
- package/dist/services/integrations/custom-integrations.d.ts +3 -1
- package/dist/services/integrations/custom-integrations.d.ts.map +1 -1
- package/dist/services/integrations/custom-integrations.js +13 -2
- package/dist/services/integrations/custom-integrations.js.map +1 -1
- package/dist/services/issues.comments-attachments.d.ts +7 -1
- package/dist/services/issues.comments-attachments.d.ts.map +1 -1
- package/dist/services/issues.comments-attachments.js +13 -1
- package/dist/services/issues.comments-attachments.js.map +1 -1
- package/dist/services/issues.d.ts +6 -0
- package/dist/services/issues.d.ts.map +1 -1
- package/dist/services/issues.js +22 -3
- package/dist/services/issues.js.map +1 -1
- package/dist/services/knowledge-portability/organization-portability.core.d.ts +4 -1
- package/dist/services/knowledge-portability/organization-portability.core.d.ts.map +1 -1
- package/dist/services/knowledge-portability/organization-portability.core.js +17 -3
- package/dist/services/knowledge-portability/organization-portability.core.js.map +1 -1
- package/dist/services/knowledge-portability/organization-portability.export.d.ts.map +1 -1
- package/dist/services/knowledge-portability/organization-portability.export.js +2 -2
- package/dist/services/knowledge-portability/organization-portability.export.js.map +1 -1
- package/dist/services/knowledge-portability/organization-portability.import.d.ts.map +1 -1
- package/dist/services/knowledge-portability/organization-portability.import.js +13 -3
- package/dist/services/knowledge-portability/organization-portability.import.js.map +1 -1
- package/dist/services/knowledge-portability/organization-skills.catalog.d.ts +3 -0
- package/dist/services/knowledge-portability/organization-skills.catalog.d.ts.map +1 -1
- package/dist/services/knowledge-portability/organization-skills.catalog.js +54 -23
- package/dist/services/knowledge-portability/organization-skills.catalog.js.map +1 -1
- package/dist/services/knowledge-portability/organization-skills.d.ts.map +1 -1
- package/dist/services/knowledge-portability/organization-skills.js +627 -124
- package/dist/services/knowledge-portability/organization-skills.js.map +1 -1
- package/dist/services/knowledge-portability/organization-skills.sources.d.ts +1 -0
- package/dist/services/knowledge-portability/organization-skills.sources.d.ts.map +1 -1
- package/dist/services/knowledge-portability/organization-skills.sources.js +53 -10
- package/dist/services/knowledge-portability/organization-skills.sources.js.map +1 -1
- package/dist/services/mcp/authorizer-lock.d.ts +9 -0
- package/dist/services/mcp/authorizer-lock.d.ts.map +1 -0
- package/dist/services/mcp/authorizer-lock.js +15 -0
- package/dist/services/mcp/authorizer-lock.js.map +1 -0
- package/dist/services/mcp/managed-bindings.d.ts +17 -0
- package/dist/services/mcp/managed-bindings.d.ts.map +1 -0
- package/dist/services/mcp/managed-bindings.js +332 -0
- package/dist/services/mcp/managed-bindings.js.map +1 -0
- package/dist/services/mcp/managed-client.d.ts +64 -0
- package/dist/services/mcp/managed-client.d.ts.map +1 -0
- package/dist/services/mcp/managed-client.js +238 -0
- package/dist/services/mcp/managed-client.js.map +1 -0
- package/dist/services/mcp/managed-client.test.d.ts +2 -0
- package/dist/services/mcp/managed-client.test.d.ts.map +1 -0
- package/dist/services/mcp/managed-client.test.js +398 -0
- package/dist/services/mcp/managed-client.test.js.map +1 -0
- package/dist/services/mcp/managed-connections.d.ts +81 -0
- package/dist/services/mcp/managed-connections.d.ts.map +1 -0
- package/dist/services/mcp/managed-connections.js +920 -0
- package/dist/services/mcp/managed-connections.js.map +1 -0
- package/dist/services/mcp/managed-runtime.d.ts +134 -0
- package/dist/services/mcp/managed-runtime.d.ts.map +1 -0
- package/dist/services/mcp/managed-runtime.js +282 -0
- package/dist/services/mcp/managed-runtime.js.map +1 -0
- package/dist/services/mcp/oauth-provider.d.ts +48 -0
- package/dist/services/mcp/oauth-provider.d.ts.map +1 -0
- package/dist/services/mcp/oauth-provider.js +120 -0
- package/dist/services/mcp/oauth-provider.js.map +1 -0
- package/dist/services/mcp/oauth-scope.test.d.ts +2 -0
- package/dist/services/mcp/oauth-scope.test.d.ts.map +1 -0
- package/dist/services/mcp/oauth-scope.test.js +69 -0
- package/dist/services/mcp/oauth-scope.test.js.map +1 -0
- package/dist/services/mcp/oauth-session-gc.d.ts +14 -0
- package/dist/services/mcp/oauth-session-gc.d.ts.map +1 -0
- package/dist/services/mcp/oauth-session-gc.js +34 -0
- package/dist/services/mcp/oauth-session-gc.js.map +1 -0
- package/dist/services/mcp/oauth-session-gc.test.d.ts +2 -0
- package/dist/services/mcp/oauth-session-gc.test.d.ts.map +1 -0
- package/dist/services/mcp/oauth-session-gc.test.js +66 -0
- package/dist/services/mcp/oauth-session-gc.test.js.map +1 -0
- package/dist/services/mcp/oauth.d.ts +61 -0
- package/dist/services/mcp/oauth.d.ts.map +1 -0
- package/dist/services/mcp/oauth.js +1690 -0
- package/dist/services/mcp/oauth.js.map +1 -0
- package/dist/services/mcp/pinned-fetch.d.ts +15 -0
- package/dist/services/mcp/pinned-fetch.d.ts.map +1 -0
- package/dist/services/mcp/pinned-fetch.js +400 -0
- package/dist/services/mcp/pinned-fetch.js.map +1 -0
- package/dist/services/mcp/pinned-fetch.test.d.ts +2 -0
- package/dist/services/mcp/pinned-fetch.test.d.ts.map +1 -0
- package/dist/services/mcp/pinned-fetch.test.js +190 -0
- package/dist/services/mcp/pinned-fetch.test.js.map +1 -0
- package/dist/services/mcp/provider-registry.d.ts +77 -0
- package/dist/services/mcp/provider-registry.d.ts.map +1 -0
- package/dist/services/mcp/provider-registry.js +80 -0
- package/dist/services/mcp/provider-registry.js.map +1 -0
- package/dist/services/mcp/provider-registry.test.d.ts +2 -0
- package/dist/services/mcp/provider-registry.test.d.ts.map +1 -0
- package/dist/services/mcp/provider-registry.test.js +80 -0
- package/dist/services/mcp/provider-registry.test.js.map +1 -0
- package/dist/services/mcp/security-policy.d.ts +48 -0
- package/dist/services/mcp/security-policy.d.ts.map +1 -0
- package/dist/services/mcp/security-policy.js +344 -0
- package/dist/services/mcp/security-policy.js.map +1 -0
- package/dist/services/mcp/security-policy.test.d.ts +2 -0
- package/dist/services/mcp/security-policy.test.d.ts.map +1 -0
- package/dist/services/mcp/security-policy.test.js +226 -0
- package/dist/services/mcp/security-policy.test.js.map +1 -0
- package/dist/services/mcp/tool-discovery.d.ts +49 -0
- package/dist/services/mcp/tool-discovery.d.ts.map +1 -0
- package/dist/services/mcp/tool-discovery.js +198 -0
- package/dist/services/mcp/tool-discovery.js.map +1 -0
- package/dist/services/mcp/tool-discovery.test.d.ts +2 -0
- package/dist/services/mcp/tool-discovery.test.d.ts.map +1 -0
- package/dist/services/mcp/tool-discovery.test.js +168 -0
- package/dist/services/mcp/tool-discovery.test.js.map +1 -0
- package/dist/services/messenger.d.ts +1 -1
- package/dist/services/messenger.d.ts.map +1 -1
- package/dist/services/messenger.js +21 -3
- package/dist/services/messenger.js.map +1 -1
- package/dist/services/plugin-registry.d.ts +3 -3
- package/dist/services/runtime-kernel/heartbeat.core.d.ts +1 -1
- package/dist/services/runtime-kernel/heartbeat.core.d.ts.map +1 -1
- package/dist/services/runtime-kernel/heartbeat.core.js +30 -4
- package/dist/services/runtime-kernel/heartbeat.core.js.map +1 -1
- package/dist/services/runtime-kernel/heartbeat.wakeup.d.ts.map +1 -1
- package/dist/services/runtime-kernel/heartbeat.wakeup.js +38 -23
- package/dist/services/runtime-kernel/heartbeat.wakeup.js.map +1 -1
- package/dist/services/secrets.d.ts +64 -6
- package/dist/services/secrets.d.ts.map +1 -1
- package/dist/services/secrets.js +38 -15
- package/dist/services/secrets.js.map +1 -1
- package/dist/services/side-chats.d.ts +1 -1
- package/dist/services/side-chats.d.ts.map +1 -1
- package/dist/services/side-chats.js +56 -14
- package/dist/services/side-chats.js.map +1 -1
- package/dist/services/workspace-runtime.services.d.ts +2 -2
- package/dist/services/workspace-web-preview.js +1 -1
- package/package.json +16 -13
- package/resources/bundled-skills/rudder-docs/references/operating-practices.md +12 -5
- package/skills/rudder-docs/references/operating-practices.md +12 -5
- package/ui-dist/assets/LibraryLiveSurface-CKOthw54.js +1 -0
- package/ui-dist/assets/{abnfDiagram-VRR7QNED-KGtP7zoC.js → abnfDiagram-VRR7QNED-C6a_wMho.js} +1 -1
- package/ui-dist/assets/{arc-JjnKyiOb.js → arc-CP0En6KA.js} +1 -1
- package/ui-dist/assets/architectureDiagram-ZJ3FMSHR-AHfOdcaZ.js +36 -0
- package/ui-dist/assets/{blockDiagram-677ZJIJ3-D7YzMYrz.js → blockDiagram-677ZJIJ3-Bkl9lp63.js} +1 -1
- package/ui-dist/assets/{c4Diagram-LMCZKHZV-Dpf7UQxl.js → c4Diagram-LMCZKHZV-BpZareVt.js} +1 -1
- package/ui-dist/assets/channel-DqxL_Zcy.js +1 -0
- package/ui-dist/assets/{chunk-2Q5K7J3B-UJ3gsGlQ.js → chunk-2Q5K7J3B-BQAwVuXc.js} +1 -1
- package/ui-dist/assets/{chunk-32BRIVSS-BeHl2j2l.js → chunk-32BRIVSS-YkmfA08F.js} +1 -1
- package/ui-dist/assets/{chunk-5VM5RSS4-STE9fJd0.js → chunk-5VM5RSS4-DvvjwTnG.js} +1 -1
- package/ui-dist/assets/{chunk-EX3LRPZG-Bj8g8j4B.js → chunk-EX3LRPZG-TXD_Yhg5.js} +1 -1
- package/ui-dist/assets/{chunk-JWPE2WC7-0V4Pwta-.js → chunk-JWPE2WC7-CgMlj6XI.js} +1 -1
- package/ui-dist/assets/{chunk-MOJQB5TN-DNPn50gm.js → chunk-MOJQB5TN-BnJjU8Rc.js} +1 -1
- package/ui-dist/assets/{chunk-RYQCIY6F-Befmnv8r.js → chunk-RYQCIY6F-D9B64JKM.js} +1 -1
- package/ui-dist/assets/{chunk-V7JOEXUC-Boh8TjHj.js → chunk-V7JOEXUC-PS09QVpl.js} +1 -1
- package/ui-dist/assets/{chunk-VR4S4FIN-B_yEQSo3.js → chunk-VR4S4FIN-DQXb7pRS.js} +1 -1
- package/ui-dist/assets/{chunk-XXDRQBXY-Cf1GnUFx.js → chunk-XXDRQBXY-B1UdLiF2.js} +1 -1
- package/ui-dist/assets/classDiagram-OUVF2IWQ-DMwjzuJE.js +1 -0
- package/ui-dist/assets/classDiagram-v2-EOCWNBFH-DMwjzuJE.js +1 -0
- package/ui-dist/assets/cose-bilkent-JH36ORCC-lqqmMB3m.js +1 -0
- package/ui-dist/assets/{cynefin-VYW2F7L2-Dv1yELYC.js → cynefin-VYW2F7L2-C9hu0XqZ.js} +1 -1
- package/ui-dist/assets/{cynefinDiagram-TSTJHNR4-CeFwjFoZ.js → cynefinDiagram-TSTJHNR4-Uuhz4c-1.js} +1 -1
- package/ui-dist/assets/{dagre-VKFMJZFB-8idd_4sX.js → dagre-VKFMJZFB-ChDrQYse.js} +1 -1
- package/ui-dist/assets/{diagram-FQU43EPY-BBVua6hM.js → diagram-FQU43EPY-DLtjkVSN.js} +1 -1
- package/ui-dist/assets/{diagram-G47NLZAW-D1zLQZlp.js → diagram-G47NLZAW-DCvEm4D0.js} +1 -1
- package/ui-dist/assets/{diagram-NH7WQ7WH-DE_FTSNv.js → diagram-NH7WQ7WH-Dz5jlsPG.js} +1 -1
- package/ui-dist/assets/{diagram-OA4YK3LP-61VSKBEn.js → diagram-OA4YK3LP-BXmQLO-Q.js} +1 -1
- package/ui-dist/assets/{diagram-WEI45ONY-C-tED6BJ.js → diagram-WEI45ONY-JnMU3xrx.js} +1 -1
- package/ui-dist/assets/{ebnfDiagram-CCIWWBDH-BEB8WGt0.js → ebnfDiagram-CCIWWBDH-Kryuqj4r.js} +1 -1
- package/ui-dist/assets/{erDiagram-Q63AITRT-AN_jm1TZ.js → erDiagram-Q63AITRT-Bn7g2mSW.js} +1 -1
- package/ui-dist/assets/{flowDiagram-23GEKE2U-BwLC6tI7.js → flowDiagram-23GEKE2U-DcjqTK91.js} +4 -4
- package/ui-dist/assets/ganttDiagram-NO4QXBWP-BRkw9-GE.js +292 -0
- package/ui-dist/assets/{gitGraphDiagram-IHSO6WYX-D9HCL9rY.js → gitGraphDiagram-IHSO6WYX-Cexcp6kR.js} +1 -1
- package/ui-dist/assets/graph-Cu7OV4Oi.js +1 -0
- package/ui-dist/assets/{index-BQXnpwke.js → index-ASZMPBYm.js} +5 -5
- package/ui-dist/assets/{index-5OM32_rf.js → index-B17BqCTj.js} +1 -1
- package/ui-dist/assets/{index-Cf0gLy6a.js → index-B9MccU1g.js} +1 -1
- package/ui-dist/assets/{index-BoSJ4Rx1.js → index-BPqbtW_X.js} +1 -1
- package/ui-dist/assets/{index-CpIdZ4-7.js → index-C2HjDa98.js} +1 -1
- package/ui-dist/assets/index-CMPtpj0A.js +1 -0
- package/ui-dist/assets/{index-p0ZGU1_7.js → index-CZXgOYtk.js} +1 -1
- package/ui-dist/assets/{index-74cx3ESJ.js → index-CknAauOP.js} +1 -1
- package/ui-dist/assets/index-Cu1GuH0a.js +1 -0
- package/ui-dist/assets/index-D8PdEImm.css +1 -0
- package/ui-dist/assets/{index-DrVDiJhe.js → index-DB1YX9-p.js} +1 -1
- package/ui-dist/assets/{index-vHMnAQSb.js → index-DBxLZXK7.js} +624 -610
- package/ui-dist/assets/{index-CpEfk5zb.js → index-DOCVOD97.js} +1 -1
- package/ui-dist/assets/{index-DMuWG0YN.js → index-DUbakRAC.js} +1 -1
- package/ui-dist/assets/{index-AT8juaIi.js → index-Dbg1ZwO2.js} +1 -1
- package/ui-dist/assets/index-DwbLsoLt.js +1 -0
- package/ui-dist/assets/index-hCLSotmS.js +1 -0
- package/ui-dist/assets/index-jrhEFc-j.js +1 -0
- package/ui-dist/assets/index-kz8ueXgo.js +1 -0
- package/ui-dist/assets/{infoDiagram-FWYZ7A6U-CyO3CAA1.js → infoDiagram-FWYZ7A6U-DugVGI3K.js} +1 -1
- package/ui-dist/assets/{ishikawaDiagram-FXEZZL3T-BLLZuF1_.js → ishikawaDiagram-FXEZZL3T-CHy06Oev.js} +1 -1
- package/ui-dist/assets/{journeyDiagram-5HDEW3XC-CWzQocvE.js → journeyDiagram-5HDEW3XC-BI0w53rb.js} +1 -1
- package/ui-dist/assets/{kanban-definition-HUTT4EX6-Dz4SFU-I.js → kanban-definition-HUTT4EX6-v_bLwx7B.js} +1 -1
- package/ui-dist/assets/layout-Dwp1s_bo.js +1 -0
- package/ui-dist/assets/{linear-BlzDlAaL.js → linear-DAV4STLZ.js} +1 -1
- package/ui-dist/assets/map-Bs6QpaaQ.js +1 -0
- package/ui-dist/assets/{mermaid.core-BtCydd-w.js → mermaid.core-fVmaL47V.js} +4 -4
- package/ui-dist/assets/{mindmap-definition-LN4V7U3C-BeIkKRBx.js → mindmap-definition-LN4V7U3C-5dWD4dxm.js} +1 -1
- package/ui-dist/assets/{pegDiagram-2B236MQR-BZgpT4TN.js → pegDiagram-2B236MQR-DB2XsDPN.js} +1 -1
- package/ui-dist/assets/{pieDiagram-ENE6RG2P-BRFggcg2.js → pieDiagram-ENE6RG2P-Bc5teLCS.js} +1 -1
- package/ui-dist/assets/{quadrantDiagram-ABIIQ3AL-CibUo3gT.js → quadrantDiagram-ABIIQ3AL-BlfNdETt.js} +1 -1
- package/ui-dist/assets/{railroadDiagram-RFXS5EU6-DINJqhgn.js → railroadDiagram-RFXS5EU6-BbXywkq3.js} +1 -1
- package/ui-dist/assets/{requirementDiagram-TGXJPOKE-NegluQIe.js → requirementDiagram-TGXJPOKE-DU-CapdF.js} +1 -1
- package/ui-dist/assets/{sankeyDiagram-HTMAVEWB-Kq41yHAd.js → sankeyDiagram-HTMAVEWB-Ftvh3MqA.js} +1 -1
- package/ui-dist/assets/{sequenceDiagram-DBY2YBRQ-CngfEI4f.js → sequenceDiagram-DBY2YBRQ-CCtHt9V4.js} +1 -1
- package/ui-dist/assets/{sizeCapture-X5ZJPWSS-DUWRNlme.js → sizeCapture-X5ZJPWSS-x0jnIKHx.js} +1 -1
- package/ui-dist/assets/{stateDiagram-2N3HPSRC-BwHC_Fz4.js → stateDiagram-2N3HPSRC-2qCrydE7.js} +1 -1
- package/ui-dist/assets/stateDiagram-v2-6OUMAXLB-CvGRUgRf.js +1 -0
- package/ui-dist/assets/{swimlanes-5IMT3BWC-Cqp2rT1K.js → swimlanes-5IMT3BWC-6kqJq5Xf.js} +2 -2
- package/ui-dist/assets/swimlanesDiagram-G3AALYLV-EBa7-qSc.js +8 -0
- package/ui-dist/assets/{timeline-definition-FHXFAJF6-BG3GYPCu.js → timeline-definition-FHXFAJF6-BuRz8KHZ.js} +1 -1
- package/ui-dist/assets/{vennDiagram-L72KCM5P-D1IFU27N.js → vennDiagram-L72KCM5P-BKzMZ_Rv.js} +1 -1
- package/ui-dist/assets/{wardleyDiagram-EHGQE667-DboO2kYu.js → wardleyDiagram-EHGQE667-8uXlFtBV.js} +1 -1
- package/ui-dist/assets/{xychartDiagram-FW5EYKEG-vI2BGrXP.js → xychartDiagram-FW5EYKEG-CWKGlpF9.js} +1 -1
- package/ui-dist/index.html +2 -2
- package/ui-dist/assets/architectureDiagram-ZJ3FMSHR-DHyfFgK0.js +0 -36
- package/ui-dist/assets/channel-TMGI9Qt9.js +0 -1
- package/ui-dist/assets/classDiagram-OUVF2IWQ-r5zIpY6G.js +0 -1
- package/ui-dist/assets/classDiagram-v2-EOCWNBFH-r5zIpY6G.js +0 -1
- package/ui-dist/assets/cose-bilkent-JH36ORCC-fSNs9447.js +0 -1
- package/ui-dist/assets/ganttDiagram-NO4QXBWP-CJYhBF1C.js +0 -292
- package/ui-dist/assets/graph-DdBT9W3J.js +0 -1
- package/ui-dist/assets/index-6UIO-gg7.js +0 -1
- package/ui-dist/assets/index-BVkQVMFn.js +0 -1
- package/ui-dist/assets/index-BaAPxkqh.css +0 -1
- package/ui-dist/assets/index-CmCERTmS.js +0 -1
- package/ui-dist/assets/index-Cr4lUIaJ.js +0 -1
- package/ui-dist/assets/index-D0fAqlES.js +0 -1
- package/ui-dist/assets/index-DfNcAyZq.js +0 -1
- package/ui-dist/assets/layout-D3tY9q4Q.js +0 -1
- package/ui-dist/assets/map-Ctg1-a9N.js +0 -1
- package/ui-dist/assets/stateDiagram-v2-6OUMAXLB-C6P3NY96.js +0 -1
- package/ui-dist/assets/swimlanesDiagram-G3AALYLV-BNdDt62J.js +0 -8
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error-handler.js","sourceRoot":"","sources":["../../src/middleware/error-handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,KAAK,CAAC;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"error-handler.js","sourceRoot":"","sources":["../../src/middleware/error-handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,KAAK,CAAC;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAWrE,SAAS,kBAAkB,CACzB,GAAY,EACZ,GAAa,EACb,OAA8B,EAC9B,QAAgB;IAEf,GAAW,CAAC,cAAc,GAAG;QAC5B,KAAK,EAAE,OAAO;QACd,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,GAAG,EAAE,iBAAiB,CAAC,GAAG,CAAC;QAC3B,OAAO,EAAE,GAAG,CAAC,IAAI;QACjB,SAAS,EAAE,GAAG,CAAC,MAAM;QACrB,QAAQ,EAAE,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC;KACvB,CAAC;IACzB,IAAI,QAAQ,EAAE,CAAC;QACZ,GAAW,CAAC,GAAG,GAAG,QAAQ,CAAC;IAC9B,CAAC;AACH,CAAC;AAED,MAAM,UAAU,YAAY,CAC1B,GAAY,EACZ,GAAY,EACZ,GAAa,EACb,KAAmB;IAEnB,IAAI,GAAG,YAAY,SAAS,EAAE,CAAC;QAC7B,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;YACtB,kBAAkB,CAChB,GAAG,EACH,GAAG,EACH,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,EAChF,GAAG,CACJ,CAAC;QACJ,CAAC;QACD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC;YAC1B,KAAK,EAAE,GAAG,CAAC,OAAO;YAClB,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACjD,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IAED,IAAI,GAAG,YAAY,QAAQ,EAAE,CAAC;QAC5B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,kBAAkB,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;QACzE,OAAO;IACT,CAAC;IAED,MAAM,SAAS,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IACtE,kBAAkB,CAChB,GAAG,EACH,GAAG,EACH,GAAG,YAAY,KAAK;QAClB,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE;QAC5D,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,EACpF,SAAS,CACV,CAAC;IAEF,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,uBAAuB,EAAE,CAAC,CAAC;AAC3D,CAAC"}
|
|
@@ -1,4 +1,8 @@
|
|
|
1
1
|
import pino from "pino";
|
|
2
|
+
export declare function requestUrlForLogs(req: object): string;
|
|
3
|
+
export declare function requestQueryForLogs(req: object, query: unknown): unknown;
|
|
4
|
+
export declare function requestHeadersForLogs(req: object, headers: unknown): unknown;
|
|
5
|
+
export declare function serializeHttpRequestForLogs(serializedRequest: Record<string, unknown>): Record<string, unknown>;
|
|
2
6
|
export declare function markHttpRequestBodySensitive(req: object): void;
|
|
3
7
|
export declare function markBrowserHttpRequestBodySensitive(req: object, _res: object, next: () => void): void;
|
|
4
8
|
export declare function requestBodyForLogs(req: object, body: unknown): unknown;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/middleware/logger.ts"],"names":[],"mappings":"AAGA,OAAO,IAAI,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/middleware/logger.ts"],"names":[],"mappings":"AAGA,OAAO,IAAI,MAAM,MAAM,CAAC;AA0DxB,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAOrD;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAExE;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAa5E;AAED,wBAAgB,2BAA2B,CACzC,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAYzB;AAED,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAE9D;AAED,wBAAgB,mCAAmC,CACjD,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,IAAI,GACf,IAAI,CAGN;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO,CAMtE;AAqFD,eAAO,MAAM,MAAM,6BAKhB,CAAC;AAEJ,eAAO,MAAM,UAAU,sIAiDrB,CAAC"}
|
|
@@ -7,20 +7,89 @@ import pretty from "pino-pretty";
|
|
|
7
7
|
import { readConfigFile } from "../config-file.js";
|
|
8
8
|
import { resolveDefaultLogsDir, resolveHomeAwarePath } from "../home-paths.js";
|
|
9
9
|
const REDACTED_REQUEST_BODY = "[REDACTED]";
|
|
10
|
-
|
|
10
|
+
const REDACTED_REQUEST_QUERY = "[REDACTED]";
|
|
11
|
+
function requestRawUrl(req) {
|
|
11
12
|
const request = req;
|
|
12
|
-
|
|
13
|
+
return typeof request.originalUrl === "string"
|
|
13
14
|
? request.originalUrl
|
|
14
15
|
: typeof request.url === "string"
|
|
15
16
|
? request.url
|
|
16
17
|
: "";
|
|
17
|
-
|
|
18
|
+
}
|
|
19
|
+
function requestPathname(req) {
|
|
20
|
+
return (requestRawUrl(req).split(/[?#]/u, 1)[0] ?? "")
|
|
18
21
|
.toLowerCase()
|
|
19
22
|
.replace(/\/+$/u, "");
|
|
23
|
+
}
|
|
24
|
+
function isMcpOAuthCallbackRequest(req) {
|
|
25
|
+
return requestPathname(req) === "/api/mcp/oauth/callback";
|
|
26
|
+
}
|
|
27
|
+
function isBrowserRequest(req) {
|
|
28
|
+
const pathname = requestPathname(req);
|
|
20
29
|
return pathname === "/api/browser"
|
|
21
30
|
|| pathname.startsWith("/api/browser/")
|
|
22
31
|
|| pathname === "/api/instance/browser/broker";
|
|
23
32
|
}
|
|
33
|
+
function containsInlineAnnotations(body) {
|
|
34
|
+
if (!body || typeof body !== "object" || Array.isArray(body))
|
|
35
|
+
return false;
|
|
36
|
+
if (Object.hasOwn(body, "inlineAnnotations"))
|
|
37
|
+
return true;
|
|
38
|
+
const payload = body.payload;
|
|
39
|
+
if (payload && typeof payload === "object" && !Array.isArray(payload)) {
|
|
40
|
+
return Object.hasOwn(payload, "inlineAnnotations");
|
|
41
|
+
}
|
|
42
|
+
if (typeof payload !== "string")
|
|
43
|
+
return false;
|
|
44
|
+
try {
|
|
45
|
+
const parsed = JSON.parse(payload);
|
|
46
|
+
return Boolean(parsed
|
|
47
|
+
&& typeof parsed === "object"
|
|
48
|
+
&& !Array.isArray(parsed)
|
|
49
|
+
&& Object.hasOwn(parsed, "inlineAnnotations"));
|
|
50
|
+
}
|
|
51
|
+
catch {
|
|
52
|
+
// Malformed multipart JSON still reaches HTTP error logging. Prefer
|
|
53
|
+
// over-redaction when it declares the sensitive annotation field.
|
|
54
|
+
return /"inlineAnnotations"\s*:/u.test(payload);
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
export function requestUrlForLogs(req) {
|
|
58
|
+
const rawUrl = requestRawUrl(req);
|
|
59
|
+
if (!isMcpOAuthCallbackRequest(req))
|
|
60
|
+
return rawUrl;
|
|
61
|
+
const pathname = rawUrl.split(/[?#]/u, 1)[0] ?? "/api/mcp/oauth/callback";
|
|
62
|
+
return rawUrl.includes("?") || rawUrl.includes("#")
|
|
63
|
+
? `${pathname}?${REDACTED_REQUEST_QUERY}`
|
|
64
|
+
: pathname;
|
|
65
|
+
}
|
|
66
|
+
export function requestQueryForLogs(req, query) {
|
|
67
|
+
return isMcpOAuthCallbackRequest(req) ? REDACTED_REQUEST_QUERY : query;
|
|
68
|
+
}
|
|
69
|
+
export function requestHeadersForLogs(req, headers) {
|
|
70
|
+
if (!isMcpOAuthCallbackRequest(req) || !headers || typeof headers !== "object") {
|
|
71
|
+
return headers;
|
|
72
|
+
}
|
|
73
|
+
const output = { ...headers };
|
|
74
|
+
for (const name of ["referer", "referrer", "cookie", "authorization"]) {
|
|
75
|
+
if (Object.keys(output).some((key) => key.toLowerCase() === name)) {
|
|
76
|
+
for (const key of Object.keys(output)) {
|
|
77
|
+
if (key.toLowerCase() === name)
|
|
78
|
+
output[key] = REDACTED_REQUEST_QUERY;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
return output;
|
|
83
|
+
}
|
|
84
|
+
export function serializeHttpRequestForLogs(serializedRequest) {
|
|
85
|
+
const { originalUrl: _originalUrl, raw: _raw, ...safeRequest } = serializedRequest;
|
|
86
|
+
return {
|
|
87
|
+
...safeRequest,
|
|
88
|
+
url: requestUrlForLogs(serializedRequest),
|
|
89
|
+
query: requestQueryForLogs(serializedRequest, serializedRequest.query),
|
|
90
|
+
headers: requestHeadersForLogs(serializedRequest, serializedRequest.headers),
|
|
91
|
+
};
|
|
92
|
+
}
|
|
24
93
|
export function markHttpRequestBodySensitive(req) {
|
|
25
94
|
req.__rudderSensitiveRequestBody = true;
|
|
26
95
|
}
|
|
@@ -32,6 +101,7 @@ export function markBrowserHttpRequestBodySensitive(req, _res, next) {
|
|
|
32
101
|
export function requestBodyForLogs(req, body) {
|
|
33
102
|
return req.__rudderSensitiveRequestBody === true
|
|
34
103
|
|| isBrowserRequest(req)
|
|
104
|
+
|| containsInlineAnnotations(body)
|
|
35
105
|
? REDACTED_REQUEST_BODY
|
|
36
106
|
: body;
|
|
37
107
|
}
|
|
@@ -114,6 +184,11 @@ export const logger = pino({
|
|
|
114
184
|
]));
|
|
115
185
|
export const httpLogger = pinoHttp({
|
|
116
186
|
logger,
|
|
187
|
+
serializers: {
|
|
188
|
+
req(serializedRequest) {
|
|
189
|
+
return serializeHttpRequestForLogs(serializedRequest);
|
|
190
|
+
},
|
|
191
|
+
},
|
|
117
192
|
customLogLevel(_req, res, err) {
|
|
118
193
|
if (err || res.statusCode >= 500)
|
|
119
194
|
return "error";
|
|
@@ -122,12 +197,12 @@ export const httpLogger = pinoHttp({
|
|
|
122
197
|
return "info";
|
|
123
198
|
},
|
|
124
199
|
customSuccessMessage(req, res) {
|
|
125
|
-
return `${req.method} ${req
|
|
200
|
+
return `${req.method} ${requestUrlForLogs(req)} ${res.statusCode}`;
|
|
126
201
|
},
|
|
127
202
|
customErrorMessage(req, res, err) {
|
|
128
203
|
const ctx = res.__errorContext;
|
|
129
204
|
const errMsg = ctx?.error?.message || err?.message || res.err?.message || "unknown error";
|
|
130
|
-
return `${req.method} ${req
|
|
205
|
+
return `${req.method} ${requestUrlForLogs(req)} ${res.statusCode} — ${errMsg}`;
|
|
131
206
|
},
|
|
132
207
|
customProps(req, res) {
|
|
133
208
|
if (res.statusCode >= 400) {
|
|
@@ -137,7 +212,7 @@ export const httpLogger = pinoHttp({
|
|
|
137
212
|
errorContext: ctx.error,
|
|
138
213
|
reqBody: requestBodyForLogs(req, ctx.reqBody),
|
|
139
214
|
reqParams: ctx.reqParams,
|
|
140
|
-
reqQuery: ctx.reqQuery,
|
|
215
|
+
reqQuery: requestQueryForLogs(req, ctx.reqQuery),
|
|
141
216
|
};
|
|
142
217
|
}
|
|
143
218
|
const props = {};
|
|
@@ -149,7 +224,7 @@ export const httpLogger = pinoHttp({
|
|
|
149
224
|
props.reqParams = params;
|
|
150
225
|
}
|
|
151
226
|
if (query && typeof query === "object" && Object.keys(query).length > 0) {
|
|
152
|
-
props.reqQuery = query;
|
|
227
|
+
props.reqQuery = requestQueryForLogs(req, query);
|
|
153
228
|
}
|
|
154
229
|
if (req.route?.path) {
|
|
155
230
|
props.routePath = req.route.path;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/middleware/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAE/E,MAAM,qBAAqB,GAAG,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/middleware/logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import express from "express";
|
|
2
2
|
import request from "supertest";
|
|
3
3
|
import { describe, expect, it } from "vitest";
|
|
4
|
-
import { markBrowserHttpRequestBodySensitive, markHttpRequestBodySensitive, requestBodyForLogs, } from "./logger.js";
|
|
4
|
+
import { markBrowserHttpRequestBodySensitive, markHttpRequestBodySensitive, requestBodyForLogs, requestHeadersForLogs, requestQueryForLogs, requestUrlForLogs, serializeHttpRequestForLogs, } from "./logger.js";
|
|
5
5
|
describe("HTTP request-body logging", () => {
|
|
6
6
|
it("redacts a request body after the route marks it sensitive", () => {
|
|
7
7
|
const request = {};
|
|
@@ -26,6 +26,56 @@ describe("HTTP request-body logging", () => {
|
|
|
26
26
|
expect(requestBodyForLogs({ originalUrl: "/API/BROWSER/CLIPBOARD/" }, body)).toBe("[REDACTED]");
|
|
27
27
|
expect(requestBodyForLogs({ originalUrl: "/api/issues" }, body)).toBe(body);
|
|
28
28
|
});
|
|
29
|
+
it("redacts direct and queued inline annotation request bodies", () => {
|
|
30
|
+
const direct = {
|
|
31
|
+
body: "",
|
|
32
|
+
inlineAnnotations: [{
|
|
33
|
+
selectedText: "PRIVATE_SELECTED_TEXT",
|
|
34
|
+
comment: "PRIVATE_OPERATOR_COMMENT",
|
|
35
|
+
}],
|
|
36
|
+
};
|
|
37
|
+
const queued = {
|
|
38
|
+
payload: {
|
|
39
|
+
body: "",
|
|
40
|
+
inlineAnnotations: [{
|
|
41
|
+
selectedText: "PRIVATE_THINKING_TEXT",
|
|
42
|
+
comment: null,
|
|
43
|
+
}],
|
|
44
|
+
},
|
|
45
|
+
};
|
|
46
|
+
expect(requestBodyForLogs({ originalUrl: "/api/chats/chat-1/messages" }, direct)).toBe("[REDACTED]");
|
|
47
|
+
expect(requestBodyForLogs({ originalUrl: "/api/chats/chat-1/queue" }, queued)).toBe("[REDACTED]");
|
|
48
|
+
expect(JSON.stringify(requestBodyForLogs({ originalUrl: "/api/chats/chat-1/messages" }, direct))).not.toContain("PRIVATE_SELECTED_TEXT");
|
|
49
|
+
expect(JSON.stringify(requestBodyForLogs({ originalUrl: "/api/chats/chat-1/queue" }, queued))).not.toContain("PRIVATE_THINKING_TEXT");
|
|
50
|
+
});
|
|
51
|
+
it("redacts multipart Queue payloads whose annotation JSON is still stringified", () => {
|
|
52
|
+
const payload = JSON.stringify({
|
|
53
|
+
body: "",
|
|
54
|
+
inlineAnnotations: [{
|
|
55
|
+
selectedText: "PRIVATE_MULTIPART_THINKING_TEXT",
|
|
56
|
+
comment: "PRIVATE_MULTIPART_OPERATOR_COMMENT",
|
|
57
|
+
}],
|
|
58
|
+
});
|
|
59
|
+
const multipartCreate = {
|
|
60
|
+
payload,
|
|
61
|
+
clientMutationId: "mutation-1",
|
|
62
|
+
};
|
|
63
|
+
const multipartUpdate = {
|
|
64
|
+
payload,
|
|
65
|
+
expectedVersion: "2",
|
|
66
|
+
};
|
|
67
|
+
expect(requestBodyForLogs({ originalUrl: "/api/chats/chat-1/queue" }, multipartCreate)).toBe("[REDACTED]");
|
|
68
|
+
expect(requestBodyForLogs({ originalUrl: "/api/chats/chat-1/queue/queued-1" }, multipartUpdate)).toBe("[REDACTED]");
|
|
69
|
+
const logged = JSON.stringify([
|
|
70
|
+
requestBodyForLogs({}, multipartCreate),
|
|
71
|
+
requestBodyForLogs({}, multipartUpdate),
|
|
72
|
+
]);
|
|
73
|
+
expect(logged).not.toContain("PRIVATE_MULTIPART_THINKING_TEXT");
|
|
74
|
+
expect(logged).not.toContain("PRIVATE_MULTIPART_OPERATOR_COMMENT");
|
|
75
|
+
expect(requestBodyForLogs({}, {
|
|
76
|
+
payload: "{\"inlineAnnotations\":[{\"selectedText\":\"PRIVATE_TRUNCATED_TEXT\"}",
|
|
77
|
+
})).toBe("[REDACTED]");
|
|
78
|
+
});
|
|
29
79
|
it("keeps Browser bodies redacted when an HTTP request returns before its route", async () => {
|
|
30
80
|
const app = express();
|
|
31
81
|
let loggedBody;
|
|
@@ -46,5 +96,48 @@ describe("HTTP request-body logging", () => {
|
|
|
46
96
|
expect(mismatched.status).toBe(403);
|
|
47
97
|
expect(loggedBody).toBe("[REDACTED]");
|
|
48
98
|
});
|
|
99
|
+
it("redacts OAuth callback URL and query before auth or route middleware runs", () => {
|
|
100
|
+
const req = {
|
|
101
|
+
originalUrl: "/api/mcp/oauth/callback?state=raw-state&code=raw-code&error_description=private",
|
|
102
|
+
url: "/api/mcp/oauth/callback?state=raw-state&code=raw-code&error_description=private",
|
|
103
|
+
query: {
|
|
104
|
+
state: "raw-state",
|
|
105
|
+
code: "raw-code",
|
|
106
|
+
error_description: "private",
|
|
107
|
+
iss: "https://oauth.example.test",
|
|
108
|
+
},
|
|
109
|
+
headers: {
|
|
110
|
+
referer: "https://oauth.example.test/authorize?state=referer-state&code_challenge=pkce-secret",
|
|
111
|
+
cookie: "oauth-session=cookie-secret",
|
|
112
|
+
authorization: "Bearer callback-secret",
|
|
113
|
+
"user-agent": "test",
|
|
114
|
+
},
|
|
115
|
+
};
|
|
116
|
+
expect(requestUrlForLogs(req)).toBe("/api/mcp/oauth/callback?[REDACTED]");
|
|
117
|
+
expect(requestQueryForLogs(req, req.query)).toBe("[REDACTED]");
|
|
118
|
+
expect(requestHeadersForLogs(req, req.headers)).toEqual({
|
|
119
|
+
referer: "[REDACTED]",
|
|
120
|
+
cookie: "[REDACTED]",
|
|
121
|
+
authorization: "[REDACTED]",
|
|
122
|
+
"user-agent": "test",
|
|
123
|
+
});
|
|
124
|
+
const serialized = serializeHttpRequestForLogs(req);
|
|
125
|
+
expect(serialized).toMatchObject({
|
|
126
|
+
url: "/api/mcp/oauth/callback?[REDACTED]",
|
|
127
|
+
query: "[REDACTED]",
|
|
128
|
+
headers: {
|
|
129
|
+
referer: "[REDACTED]",
|
|
130
|
+
cookie: "[REDACTED]",
|
|
131
|
+
authorization: "[REDACTED]",
|
|
132
|
+
"user-agent": "test",
|
|
133
|
+
},
|
|
134
|
+
});
|
|
135
|
+
expect(JSON.stringify({
|
|
136
|
+
url: requestUrlForLogs(req),
|
|
137
|
+
query: requestQueryForLogs(req, req.query),
|
|
138
|
+
headers: requestHeadersForLogs(req, req.headers),
|
|
139
|
+
serialized,
|
|
140
|
+
})).not.toMatch(/raw-state|raw-code|private|oauth\.example|referer-state|pkce-secret|cookie-secret|callback-secret/u);
|
|
141
|
+
});
|
|
49
142
|
});
|
|
50
143
|
//# sourceMappingURL=logger.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.test.js","sourceRoot":"","sources":["../../src/middleware/logger.test.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,OAAO,MAAM,WAAW,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EACL,mCAAmC,EACnC,4BAA4B,EAC5B,kBAAkB,
|
|
1
|
+
{"version":3,"file":"logger.test.js","sourceRoot":"","sources":["../../src/middleware/logger.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
import type { Db } from "@rudderhq/db";
|
|
2
|
+
import { type ChatConversation, type ChatMessage } from "@rudderhq/shared";
|
|
3
|
+
import type { logActivity } from "../services/activity-log.js";
|
|
4
|
+
import type { PreparedChatInlineAnnotations } from "../services/chat-inline-annotations.js";
|
|
5
|
+
import type { chatService } from "../services/chats.js";
|
|
6
|
+
import type { StorageService } from "../storage/types.js";
|
|
7
|
+
import { getActorInfo } from "./authz.js";
|
|
8
|
+
type ChatService = ReturnType<typeof chatService>;
|
|
9
|
+
type ActorInfo = ReturnType<typeof getActorInfo>;
|
|
10
|
+
export type ChatAnnotationRouteInput = {
|
|
11
|
+
provided: boolean;
|
|
12
|
+
prepared: PreparedChatInlineAnnotations | null;
|
|
13
|
+
storedAttachments?: Array<{
|
|
14
|
+
provider: string;
|
|
15
|
+
objectKey: string;
|
|
16
|
+
contentType: string;
|
|
17
|
+
byteSize: number;
|
|
18
|
+
sha256: string;
|
|
19
|
+
originalFilename: string | null;
|
|
20
|
+
}>;
|
|
21
|
+
onPersisted?: (messageId: string) => void;
|
|
22
|
+
};
|
|
23
|
+
export type ChatTurnContext = {
|
|
24
|
+
chatTurnId: string;
|
|
25
|
+
turnVariant: number;
|
|
26
|
+
};
|
|
27
|
+
export declare function turnContextFromUserMessage(userMessage: ChatMessage): ChatTurnContext;
|
|
28
|
+
export declare function createChatAnnotationRouteHelpers(input: {
|
|
29
|
+
db: Db;
|
|
30
|
+
storage: StorageService;
|
|
31
|
+
chats: ChatService;
|
|
32
|
+
logActivity: typeof logActivity;
|
|
33
|
+
assertLocalMutationAllowed: (conversation: ChatConversation) => void;
|
|
34
|
+
}): {
|
|
35
|
+
addAgentAuthoredMessage: (conversation: ChatConversation, body: string, actor: ActorInfo) => Promise<ChatMessage>;
|
|
36
|
+
addUserMessage: (conversation: ChatConversation, body: string, actor: ActorInfo, editUserMessageId?: string | null, annotationInput?: ChatAnnotationRouteInput) => Promise<ChatMessage>;
|
|
37
|
+
cleanupStoredUserMessageFiles: (conversation: ChatConversation, storedFiles: Array<{
|
|
38
|
+
objectKey: string;
|
|
39
|
+
}>) => Promise<void>;
|
|
40
|
+
storeUserMessageFiles: (conversation: ChatConversation, files: Array<{
|
|
41
|
+
mimetype: string;
|
|
42
|
+
buffer: Buffer;
|
|
43
|
+
originalname: string;
|
|
44
|
+
}>) => Promise<import("../storage/types.js").PutFileResult[]>;
|
|
45
|
+
};
|
|
46
|
+
export {};
|
|
47
|
+
//# sourceMappingURL=chats.annotation-routes.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"chats.annotation-routes.d.ts","sourceRoot":"","sources":["../../src/routes/chats.annotation-routes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAEL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EACjB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,wCAAwC,CAAC;AAC5F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,KAAK,WAAW,GAAG,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC;AAClD,KAAK,SAAS,GAAG,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC;AAEjD,MAAM,MAAM,wBAAwB,GAAG;IACrC,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,6BAA6B,GAAG,IAAI,CAAC;IAC/C,iBAAiB,CAAC,EAAE,KAAK,CAAC;QACxB,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,MAAM,CAAC;QACf,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;KACjC,CAAC,CAAC;IACH,WAAW,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;CAC3C,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,wBAAgB,0BAA0B,CAAC,WAAW,EAAE,WAAW,GAAG,eAAe,CAQpF;AAED,wBAAgB,gCAAgC,CAAC,KAAK,EAAE;IACtD,EAAE,EAAE,EAAE,CAAC;IACP,OAAO,EAAE,cAAc,CAAC;IACxB,KAAK,EAAE,WAAW,CAAC;IACnB,WAAW,EAAE,OAAO,WAAW,CAAC;IAChC,0BAA0B,EAAE,CAAC,YAAY,EAAE,gBAAgB,KAAK,IAAI,CAAC;CACtE;4CA+JiB,gBAAgB,QACxB,MAAM,SACL,SAAS;mCA/JF,gBAAgB,QACxB,MAAM,SACL,SAAS,sBACI,MAAM,GAAG,IAAI,oBACf,wBAAwB;kDAyI5B,gBAAgB,eACjB,KAAK,CAAC;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;0CA3B3B,gBAAgB,SACvB,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAA;KAAE,CAAC;EAqF3E"}
|
|
@@ -0,0 +1,164 @@
|
|
|
1
|
+
import { chatInlineAnnotationsFromStructuredPayload, } from "@rudderhq/shared";
|
|
2
|
+
import { forbidden } from "../errors.js";
|
|
3
|
+
import { logger } from "../middleware/logger.js";
|
|
4
|
+
export function turnContextFromUserMessage(userMessage) {
|
|
5
|
+
if (!userMessage.chatTurnId) {
|
|
6
|
+
throw new Error("User message missing chat turn id");
|
|
7
|
+
}
|
|
8
|
+
return {
|
|
9
|
+
chatTurnId: userMessage.chatTurnId,
|
|
10
|
+
turnVariant: userMessage.turnVariant,
|
|
11
|
+
};
|
|
12
|
+
}
|
|
13
|
+
export function createChatAnnotationRouteHelpers(input) {
|
|
14
|
+
async function addUserMessage(conversation, body, actor, editUserMessageId, annotationInput) {
|
|
15
|
+
input.assertLocalMutationAllowed(conversation);
|
|
16
|
+
let transactionCommitReported = false;
|
|
17
|
+
const reportTransactionCommit = (messageId) => {
|
|
18
|
+
if (transactionCommitReported)
|
|
19
|
+
return;
|
|
20
|
+
transactionCommitReported = true;
|
|
21
|
+
annotationInput?.onPersisted?.(messageId);
|
|
22
|
+
};
|
|
23
|
+
const transactionCommitOptions = annotationInput?.onPersisted
|
|
24
|
+
? { onTransactionCommitted: reportTransactionCommit }
|
|
25
|
+
: {};
|
|
26
|
+
const messageOptions = annotationInput?.provided
|
|
27
|
+
? {
|
|
28
|
+
structuredPayload: {
|
|
29
|
+
inlineAnnotations: annotationInput.prepared?.annotations ?? [],
|
|
30
|
+
},
|
|
31
|
+
structuredPayloadProvided: true,
|
|
32
|
+
...(annotationInput.storedAttachments?.length
|
|
33
|
+
? {
|
|
34
|
+
attachments: annotationInput.storedAttachments.map((attachment) => ({
|
|
35
|
+
...attachment,
|
|
36
|
+
createdByAgentId: actor.agentId,
|
|
37
|
+
createdByUserId: actor.actorType === "user" ? actor.actorId : null,
|
|
38
|
+
})),
|
|
39
|
+
attachmentFileIndexesByAnnotationId: annotationInput.prepared?.attachmentFileIndexesByAnnotationId,
|
|
40
|
+
}
|
|
41
|
+
: {}),
|
|
42
|
+
...transactionCommitOptions,
|
|
43
|
+
}
|
|
44
|
+
: annotationInput?.storedAttachments?.length
|
|
45
|
+
? {
|
|
46
|
+
attachments: annotationInput.storedAttachments.map((attachment) => ({
|
|
47
|
+
...attachment,
|
|
48
|
+
createdByAgentId: actor.agentId,
|
|
49
|
+
createdByUserId: actor.actorType === "user" ? actor.actorId : null,
|
|
50
|
+
})),
|
|
51
|
+
...transactionCommitOptions,
|
|
52
|
+
}
|
|
53
|
+
: annotationInput?.onPersisted
|
|
54
|
+
? transactionCommitOptions
|
|
55
|
+
: undefined;
|
|
56
|
+
const userMessage = messageOptions
|
|
57
|
+
? await input.chats.addUserChatMessage(conversation.id, conversation.orgId, body, editUserMessageId ?? null, messageOptions)
|
|
58
|
+
: await input.chats.addUserChatMessage(conversation.id, conversation.orgId, body, editUserMessageId ?? null);
|
|
59
|
+
reportTransactionCommit(userMessage.id);
|
|
60
|
+
const persistedAnnotations = chatInlineAnnotationsFromStructuredPayload(userMessage.structuredPayload);
|
|
61
|
+
await input.logActivity(input.db, {
|
|
62
|
+
orgId: conversation.orgId,
|
|
63
|
+
actorType: actor.actorType,
|
|
64
|
+
actorId: actor.actorId,
|
|
65
|
+
agentId: actor.agentId,
|
|
66
|
+
runId: actor.runId,
|
|
67
|
+
action: "chat.message_added",
|
|
68
|
+
entityType: "chat",
|
|
69
|
+
entityId: conversation.id,
|
|
70
|
+
details: {
|
|
71
|
+
messageId: userMessage.id,
|
|
72
|
+
role: "user",
|
|
73
|
+
kind: "message",
|
|
74
|
+
editUserMessageId: editUserMessageId ?? null,
|
|
75
|
+
annotationCount: persistedAnnotations.length,
|
|
76
|
+
annotationSourceMessageIds: [
|
|
77
|
+
...new Set(persistedAnnotations.map((annotation) => annotation.sourceMessageId)),
|
|
78
|
+
],
|
|
79
|
+
},
|
|
80
|
+
});
|
|
81
|
+
const storedObjectKeys = new Set(annotationInput?.storedAttachments?.map((attachment) => attachment.objectKey) ?? []);
|
|
82
|
+
await Promise.all((userMessage.attachments ?? [])
|
|
83
|
+
.filter((attachment) => storedObjectKeys.has(attachment.objectKey ?? ""))
|
|
84
|
+
.map((attachment) => input.logActivity(input.db, {
|
|
85
|
+
orgId: conversation.orgId,
|
|
86
|
+
actorType: actor.actorType,
|
|
87
|
+
actorId: actor.actorId,
|
|
88
|
+
agentId: actor.agentId,
|
|
89
|
+
runId: actor.runId,
|
|
90
|
+
action: "chat.attachment_added",
|
|
91
|
+
entityType: "chat",
|
|
92
|
+
entityId: conversation.id,
|
|
93
|
+
details: {
|
|
94
|
+
attachmentId: attachment.id,
|
|
95
|
+
messageId: attachment.messageId,
|
|
96
|
+
originalFilename: attachment.originalFilename,
|
|
97
|
+
contentType: attachment.contentType,
|
|
98
|
+
},
|
|
99
|
+
})));
|
|
100
|
+
return userMessage;
|
|
101
|
+
}
|
|
102
|
+
async function storeUserMessageFiles(conversation, files) {
|
|
103
|
+
const storedFiles = [];
|
|
104
|
+
try {
|
|
105
|
+
for (const file of files) {
|
|
106
|
+
storedFiles.push(await input.storage.putFile({
|
|
107
|
+
orgId: conversation.orgId,
|
|
108
|
+
namespace: `chats/${conversation.id}`,
|
|
109
|
+
originalFilename: file.originalname || null,
|
|
110
|
+
contentType: (file.mimetype || "").toLowerCase(),
|
|
111
|
+
body: file.buffer,
|
|
112
|
+
}));
|
|
113
|
+
}
|
|
114
|
+
return storedFiles;
|
|
115
|
+
}
|
|
116
|
+
catch (error) {
|
|
117
|
+
await Promise.all(storedFiles.map((stored) => input.storage.deleteObject(conversation.orgId, stored.objectKey).catch(() => undefined)));
|
|
118
|
+
throw error;
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
async function cleanupStoredUserMessageFiles(conversation, storedFiles) {
|
|
122
|
+
await Promise.all(storedFiles.map((stored) => input.storage.deleteObject(conversation.orgId, stored.objectKey).catch((error) => {
|
|
123
|
+
logger.warn({ err: error, conversationId: conversation.id, objectKey: stored.objectKey }, "failed to clean up uncommitted chat attachment");
|
|
124
|
+
})));
|
|
125
|
+
}
|
|
126
|
+
async function addAgentAuthoredMessage(conversation, body, actor) {
|
|
127
|
+
input.assertLocalMutationAllowed(conversation);
|
|
128
|
+
if (!actor.agentId) {
|
|
129
|
+
throw forbidden("Agent authentication required");
|
|
130
|
+
}
|
|
131
|
+
const message = await input.chats.addMessage(conversation.id, {
|
|
132
|
+
orgId: conversation.orgId,
|
|
133
|
+
role: "assistant",
|
|
134
|
+
kind: "message",
|
|
135
|
+
body,
|
|
136
|
+
replyingAgentId: actor.agentId,
|
|
137
|
+
});
|
|
138
|
+
await input.logActivity(input.db, {
|
|
139
|
+
orgId: conversation.orgId,
|
|
140
|
+
actorType: "agent",
|
|
141
|
+
actorId: actor.agentId,
|
|
142
|
+
agentId: actor.agentId,
|
|
143
|
+
runId: actor.runId,
|
|
144
|
+
action: "chat.message_added",
|
|
145
|
+
entityType: "chat",
|
|
146
|
+
entityId: conversation.id,
|
|
147
|
+
details: {
|
|
148
|
+
messageId: message.id,
|
|
149
|
+
role: "assistant",
|
|
150
|
+
kind: "message",
|
|
151
|
+
replyingAgentId: actor.agentId,
|
|
152
|
+
source: "agent_direct_message",
|
|
153
|
+
},
|
|
154
|
+
});
|
|
155
|
+
return message;
|
|
156
|
+
}
|
|
157
|
+
return {
|
|
158
|
+
addAgentAuthoredMessage,
|
|
159
|
+
addUserMessage,
|
|
160
|
+
cleanupStoredUserMessageFiles,
|
|
161
|
+
storeUserMessageFiles,
|
|
162
|
+
};
|
|
163
|
+
}
|
|
164
|
+
//# sourceMappingURL=chats.annotation-routes.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"chats.annotation-routes.js","sourceRoot":"","sources":["../../src/routes/chats.annotation-routes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chats.d.ts","sourceRoot":"","sources":["../../src/routes/chats.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"chats.d.ts","sourceRoot":"","sources":["../../src/routes/chats.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AA8EvC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,OAAO,EAEL,KAAK,qBAAqB,EAE3B,MAAM,8BAA8B,CAAC;AAuBtC,wBAAgB,UAAU,CACxB,EAAE,EAAE,EAAE,EACN,OAAO,EAAE,cAAc,EACvB,iBAAiB,GAAE,qBAAqD,8CA8yFzE"}
|