factory-factory 0.3.18 → 0.3.20
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -0
- package/dist/client/assets/{arc-Bxdinun-.js → arc-BO0sk6BM.js} +1 -1
- package/dist/client/assets/{architectureDiagram-3BPJPVTR-D75ngTH0.js → architectureDiagram-3BPJPVTR-BiwrJn01.js} +1 -1
- package/dist/client/assets/{blockDiagram-GPEHLZMM-b0hRXjTo.js → blockDiagram-GPEHLZMM-nfqVYcG7.js} +1 -1
- package/dist/client/assets/{c4Diagram-AAUBKEIU-BP3yHaZ4.js → c4Diagram-AAUBKEIU-gH-CgRkj.js} +1 -1
- package/dist/client/assets/channel-qE_eugFJ.js +1 -0
- package/dist/client/assets/{chunk-2J33WTMH-BSnzH03J.js → chunk-2J33WTMH-BSA0QyBP.js} +1 -1
- package/dist/client/assets/{chunk-4BX2VUAB-D1getS3X.js → chunk-4BX2VUAB-jiIlm-jU.js} +1 -1
- package/dist/client/assets/{chunk-55IACEB6-Dr2CwskK.js → chunk-55IACEB6-Cv9U9Ak-.js} +1 -1
- package/dist/client/assets/{chunk-727SXJPM-C7_YUe-M.js → chunk-727SXJPM-CpxJ_7Wx.js} +1 -1
- package/dist/client/assets/{chunk-AQP2D5EJ-Cs7q0NsF.js → chunk-AQP2D5EJ-BL_hJu_8.js} +1 -1
- package/dist/client/assets/{chunk-FMBD7UC4-KFtquRvq.js → chunk-FMBD7UC4-U_iAA2we.js} +1 -1
- package/dist/client/assets/{chunk-ND2GUHAM-BuZ0_q1n.js → chunk-ND2GUHAM-CR9rGWpo.js} +1 -1
- package/dist/client/assets/{chunk-QZHKN3VN-CXq3kkUn.js → chunk-QZHKN3VN-BoLv45f5.js} +1 -1
- package/dist/client/assets/classDiagram-4FO5ZUOK-Br7aWOMi.js +1 -0
- package/dist/client/assets/classDiagram-v2-Q7XG4LA2-Br7aWOMi.js +1 -0
- package/dist/client/assets/{cose-bilkent-S5V4N54A-B2PPRokq.js → cose-bilkent-S5V4N54A-2Q7GC4ZY.js} +1 -1
- package/dist/client/assets/{dagre-BM42HDAG-Bdgt43P0.js → dagre-BM42HDAG-DaxrK5DK.js} +1 -1
- package/dist/client/assets/{diagram-2AECGRRQ-l7renH-H.js → diagram-2AECGRRQ-0MAYacdt.js} +1 -1
- package/dist/client/assets/{diagram-5GNKFQAL-I7lNTczj.js → diagram-5GNKFQAL-DW5UxCeI.js} +1 -1
- package/dist/client/assets/{diagram-KO2AKTUF-C8kPNrsA.js → diagram-KO2AKTUF-CU3iBH-g.js} +1 -1
- package/dist/client/assets/{diagram-LMA3HP47-pvteu9cM.js → diagram-LMA3HP47-CjGOHwD0.js} +1 -1
- package/dist/client/assets/{diagram-OG6HWLK6-DpN6QlJ3.js → diagram-OG6HWLK6-B-wHM_mJ.js} +1 -1
- package/dist/client/assets/{erDiagram-TEJ5UH35-Dcelk-6E.js → erDiagram-TEJ5UH35-BkBcMgb_.js} +1 -1
- package/dist/client/assets/{flowDiagram-I6XJVG4X-PluLGOsL.js → flowDiagram-I6XJVG4X-BErHv0-i.js} +1 -1
- package/dist/client/assets/{ganttDiagram-6RSMTGT7-B052JdQf.js → ganttDiagram-6RSMTGT7-DxSH6Hll.js} +1 -1
- package/dist/client/assets/{gitGraphDiagram-PVQCEYII-CCFDSwzA.js → gitGraphDiagram-PVQCEYII-BKjk_NzB.js} +1 -1
- package/dist/client/assets/{index-DHNmCWEQ.js → index-DHRQmt0z.js} +165 -165
- package/dist/client/assets/{infoDiagram-5YYISTIA-D8U6SFWo.js → infoDiagram-5YYISTIA-CPrRPFU2.js} +1 -1
- package/dist/client/assets/{ishikawaDiagram-YF4QCWOH-CgB-TF4r.js → ishikawaDiagram-YF4QCWOH-CI-80hW5.js} +1 -1
- package/dist/client/assets/{journeyDiagram-JHISSGLW-CAGmqjlT.js → journeyDiagram-JHISSGLW-ByKj8dRf.js} +1 -1
- package/dist/client/assets/{kanban-definition-UN3LZRKU-BDuo7F2D.js → kanban-definition-UN3LZRKU-DLcf7a9N.js} +1 -1
- package/dist/client/assets/{linear-Dz4kMSHb.js → linear-DIZ8op5J.js} +1 -1
- package/dist/client/assets/{mindmap-definition-RKZ34NQL-Db2Ukjm6.js → mindmap-definition-RKZ34NQL-BsDpFWdh.js} +1 -1
- package/dist/client/assets/{mobile-baseline-BuwX04Ww.js → mobile-baseline-jv_SPi-c.js} +1 -1
- package/dist/client/assets/{pieDiagram-4H26LBE5-D2-5sOl5.js → pieDiagram-4H26LBE5-C3dEKgHx.js} +1 -1
- package/dist/client/assets/{quadrantDiagram-W4KKPZXB-CJlGrwhK.js → quadrantDiagram-W4KKPZXB-H5PdDgog.js} +1 -1
- package/dist/client/assets/{requirementDiagram-4Y6WPE33-D4h5kgWL.js → requirementDiagram-4Y6WPE33-D3PRRJVb.js} +1 -1
- package/dist/client/assets/{sankeyDiagram-5OEKKPKP-dWom-dYP.js → sankeyDiagram-5OEKKPKP-CIxvoToE.js} +1 -1
- package/dist/client/assets/{sequenceDiagram-3UESZ5HK-C5_GmsPA.js → sequenceDiagram-3UESZ5HK-JOZ0B71g.js} +1 -1
- package/dist/client/assets/{stateDiagram-AJRCARHV-CUjApIoO.js → stateDiagram-AJRCARHV-dwx_Dyu7.js} +1 -1
- package/dist/client/assets/stateDiagram-v2-BHNVJYJU-g56rq9Om.js +1 -0
- package/dist/client/assets/{terminal-instance-BBnsG1mL.js → terminal-instance-TRj_DMCe.js} +1 -1
- package/dist/client/assets/{timeline-definition-PNZ67QCA-BF3tbgdG.js → timeline-definition-PNZ67QCA-DnI7kBWN.js} +1 -1
- package/dist/client/assets/{vennDiagram-CIIHVFJN-Q4ZHYJTv.js → vennDiagram-CIIHVFJN-Tk8IfETS.js} +1 -1
- package/dist/client/assets/{wardley-L42UT6IY-X4BiwCUd.js → wardley-L42UT6IY-F_38sdTm.js} +1 -1
- package/dist/client/assets/{wardleyDiagram-YWT4CUSO-CjJKT6Dj.js → wardleyDiagram-YWT4CUSO-DCqXhcQP.js} +1 -1
- package/dist/client/assets/{xychartDiagram-2RQKCTM6-Dl6wiodH.js → xychartDiagram-2RQKCTM6-BGnQjikn.js} +1 -1
- package/dist/client/index.html +1 -1
- package/dist/prisma/generated/internal/class.js +4 -4
- package/dist/prisma/generated/internal/class.js.map +1 -1
- package/dist/prisma/generated/internal/prismaNamespace.d.ts +4 -0
- package/dist/prisma/generated/internal/prismaNamespace.d.ts.map +1 -1
- package/dist/prisma/generated/internal/prismaNamespace.js +4 -0
- package/dist/prisma/generated/internal/prismaNamespace.js.map +1 -1
- package/dist/prisma/generated/internal/prismaNamespaceBrowser.d.ts +4 -0
- package/dist/prisma/generated/internal/prismaNamespaceBrowser.d.ts.map +1 -1
- package/dist/prisma/generated/internal/prismaNamespaceBrowser.js +4 -0
- package/dist/prisma/generated/internal/prismaNamespaceBrowser.js.map +1 -1
- package/dist/prisma/generated/models/PeriodicTask.d.ts +72 -1
- package/dist/prisma/generated/models/PeriodicTask.d.ts.map +1 -1
- package/dist/prisma/generated/models/UserSettings.d.ts +57 -1
- package/dist/prisma/generated/models/UserSettings.d.ts.map +1 -1
- package/dist/prisma/generated/models/Workspace.d.ts +64 -1
- package/dist/prisma/generated/models/Workspace.d.ts.map +1 -1
- package/dist/src/backend/interceptors/pr-detection.interceptor.d.ts.map +1 -1
- package/dist/src/backend/interceptors/pr-detection.interceptor.js +10 -7
- package/dist/src/backend/interceptors/pr-detection.interceptor.js.map +1 -1
- package/dist/src/backend/interceptors/pr-detection.interceptor.test.js +88 -0
- package/dist/src/backend/interceptors/pr-detection.interceptor.test.js.map +1 -1
- package/dist/src/backend/lib/file-lock-mutex.d.ts +5 -1
- package/dist/src/backend/lib/file-lock-mutex.d.ts.map +1 -1
- package/dist/src/backend/lib/file-lock-mutex.js +125 -10
- package/dist/src/backend/lib/file-lock-mutex.js.map +1 -1
- package/dist/src/backend/lib/file-lock-mutex.test.js +43 -0
- package/dist/src/backend/lib/file-lock-mutex.test.js.map +1 -1
- package/dist/src/backend/orchestration/data-backup.service.d.ts.map +1 -1
- package/dist/src/backend/orchestration/data-backup.service.js +4 -0
- package/dist/src/backend/orchestration/data-backup.service.js.map +1 -1
- package/dist/src/backend/orchestration/data-backup.service.test.js +3 -0
- package/dist/src/backend/orchestration/data-backup.service.test.js.map +1 -1
- package/dist/src/backend/orchestration/domain-bridges.orchestrator.d.ts.map +1 -1
- package/dist/src/backend/orchestration/domain-bridges.orchestrator.js +13 -1
- package/dist/src/backend/orchestration/domain-bridges.orchestrator.js.map +1 -1
- package/dist/src/backend/orchestration/domain-bridges.orchestrator.test.js +133 -5
- package/dist/src/backend/orchestration/domain-bridges.orchestrator.test.js.map +1 -1
- package/dist/src/backend/orchestration/workspace-archive.orchestrator.d.ts +1 -0
- package/dist/src/backend/orchestration/workspace-archive.orchestrator.d.ts.map +1 -1
- package/dist/src/backend/orchestration/workspace-init-issue-prompts.d.ts +6 -0
- package/dist/src/backend/orchestration/workspace-init-issue-prompts.d.ts.map +1 -0
- package/dist/src/backend/orchestration/workspace-init-issue-prompts.js +262 -0
- package/dist/src/backend/orchestration/workspace-init-issue-prompts.js.map +1 -0
- package/dist/src/backend/orchestration/workspace-init.orchestrator.d.ts +1 -0
- package/dist/src/backend/orchestration/workspace-init.orchestrator.d.ts.map +1 -1
- package/dist/src/backend/orchestration/workspace-init.orchestrator.js +6 -409
- package/dist/src/backend/orchestration/workspace-init.orchestrator.js.map +1 -1
- package/dist/src/backend/routers/websocket/chat.handler.d.ts.map +1 -1
- package/dist/src/backend/routers/websocket/chat.handler.js +10 -1
- package/dist/src/backend/routers/websocket/chat.handler.js.map +1 -1
- package/dist/src/backend/routers/websocket/chat.handler.test.js +25 -7
- package/dist/src/backend/routers/websocket/chat.handler.test.js.map +1 -1
- package/dist/src/backend/routers/websocket/dev-logs.handler.d.ts.map +1 -1
- package/dist/src/backend/routers/websocket/dev-logs.handler.js +11 -1
- package/dist/src/backend/routers/websocket/dev-logs.handler.js.map +1 -1
- package/dist/src/backend/routers/websocket/dev-logs.handler.test.js +34 -1
- package/dist/src/backend/routers/websocket/dev-logs.handler.test.js.map +1 -1
- package/dist/src/backend/routers/websocket/post-run-logs.handler.d.ts.map +1 -1
- package/dist/src/backend/routers/websocket/post-run-logs.handler.js +11 -1
- package/dist/src/backend/routers/websocket/post-run-logs.handler.js.map +1 -1
- package/dist/src/backend/routers/websocket/post-run-logs.handler.test.js +37 -3
- package/dist/src/backend/routers/websocket/post-run-logs.handler.test.js.map +1 -1
- package/dist/src/backend/routers/websocket/setup-terminal.handler.d.ts.map +1 -1
- package/dist/src/backend/routers/websocket/setup-terminal.handler.js +8 -11
- package/dist/src/backend/routers/websocket/setup-terminal.handler.js.map +1 -1
- package/dist/src/backend/routers/websocket/snapshots.handler.d.ts.map +1 -1
- package/dist/src/backend/routers/websocket/snapshots.handler.js +11 -1
- package/dist/src/backend/routers/websocket/snapshots.handler.js.map +1 -1
- package/dist/src/backend/routers/websocket/snapshots.handler.test.js +22 -1
- package/dist/src/backend/routers/websocket/snapshots.handler.test.js.map +1 -1
- package/dist/src/backend/routers/websocket/terminal.handler.d.ts.map +1 -1
- package/dist/src/backend/routers/websocket/terminal.handler.js +11 -1
- package/dist/src/backend/routers/websocket/terminal.handler.js.map +1 -1
- package/dist/src/backend/routers/websocket/terminal.handler.test.js +46 -6
- package/dist/src/backend/routers/websocket/terminal.handler.test.js.map +1 -1
- package/dist/src/backend/routers/websocket/upgrade-utils.d.ts +12 -0
- package/dist/src/backend/routers/websocket/upgrade-utils.d.ts.map +1 -1
- package/dist/src/backend/routers/websocket/upgrade-utils.js +15 -0
- package/dist/src/backend/routers/websocket/upgrade-utils.js.map +1 -1
- package/dist/src/backend/routers/websocket/upgrade-utils.test.d.ts +2 -0
- package/dist/src/backend/routers/websocket/upgrade-utils.test.d.ts.map +1 -0
- package/dist/src/backend/routers/websocket/upgrade-utils.test.js +59 -0
- package/dist/src/backend/routers/websocket/upgrade-utils.test.js.map +1 -0
- package/dist/src/backend/routers/websocket/websocket.integration.test.js +91 -7
- package/dist/src/backend/routers/websocket/websocket.integration.test.js.map +1 -1
- package/dist/src/backend/services/auto-iteration/service/auto-iteration-loop-state.d.ts +16 -0
- package/dist/src/backend/services/auto-iteration/service/auto-iteration-loop-state.d.ts.map +1 -0
- package/dist/src/backend/services/auto-iteration/service/auto-iteration-loop-state.js +45 -0
- package/dist/src/backend/services/auto-iteration/service/auto-iteration-loop-state.js.map +1 -0
- package/dist/src/backend/services/auto-iteration/service/auto-iteration.service.d.ts.map +1 -1
- package/dist/src/backend/services/auto-iteration/service/auto-iteration.service.js +25 -50
- package/dist/src/backend/services/auto-iteration/service/auto-iteration.service.js.map +1 -1
- package/dist/src/backend/services/auto-iteration/service/auto-iteration.service.test.d.ts +2 -0
- package/dist/src/backend/services/auto-iteration/service/auto-iteration.service.test.d.ts.map +1 -0
- package/dist/src/backend/services/auto-iteration/service/auto-iteration.service.test.js +114 -0
- package/dist/src/backend/services/auto-iteration/service/auto-iteration.service.test.js.map +1 -0
- package/dist/src/backend/services/check-single-writer.test.js +33 -8
- package/dist/src/backend/services/check-single-writer.test.js.map +1 -1
- package/dist/src/backend/services/env-schemas.d.ts +10 -10
- package/dist/src/backend/services/env-schemas.js +10 -10
- package/dist/src/backend/services/env-schemas.js.map +1 -1
- package/dist/src/backend/services/env-schemas.test.d.ts +2 -0
- package/dist/src/backend/services/env-schemas.test.d.ts.map +1 -0
- package/dist/src/backend/services/env-schemas.test.js +31 -0
- package/dist/src/backend/services/env-schemas.test.js.map +1 -0
- package/dist/src/backend/services/periodic-task/resources/periodic-task.accessor.d.ts +2 -2
- package/dist/src/backend/services/periodic-task/resources/periodic-task.accessor.d.ts.map +1 -1
- package/dist/src/backend/services/periodic-task/resources/periodic-task.accessor.js +115 -50
- package/dist/src/backend/services/periodic-task/resources/periodic-task.accessor.js.map +1 -1
- package/dist/src/backend/services/periodic-task/resources/periodic-task.accessor.test.d.ts +2 -0
- package/dist/src/backend/services/periodic-task/resources/periodic-task.accessor.test.d.ts.map +1 -0
- package/dist/src/backend/services/periodic-task/resources/periodic-task.accessor.test.js +150 -0
- package/dist/src/backend/services/periodic-task/resources/periodic-task.accessor.test.js.map +1 -0
- package/dist/src/backend/services/periodic-task/service/periodic-task.service.d.ts +5 -1
- package/dist/src/backend/services/periodic-task/service/periodic-task.service.d.ts.map +1 -1
- package/dist/src/backend/services/periodic-task/service/periodic-task.service.js +20 -4
- package/dist/src/backend/services/periodic-task/service/periodic-task.service.js.map +1 -1
- package/dist/src/backend/services/periodic-task/service/periodic-task.service.test.d.ts +2 -0
- package/dist/src/backend/services/periodic-task/service/periodic-task.service.test.d.ts.map +1 -0
- package/dist/src/backend/services/periodic-task/service/periodic-task.service.test.js +144 -0
- package/dist/src/backend/services/periodic-task/service/periodic-task.service.test.js.map +1 -0
- package/dist/src/backend/services/ratchet/service/ratchet-decision-logging.helpers.d.ts +64 -0
- package/dist/src/backend/services/ratchet/service/ratchet-decision-logging.helpers.d.ts.map +1 -0
- package/dist/src/backend/services/ratchet/service/ratchet-decision-logging.helpers.js +76 -0
- package/dist/src/backend/services/ratchet/service/ratchet-decision-logging.helpers.js.map +1 -0
- package/dist/src/backend/services/ratchet/service/ratchet-workspace-check-coordinator.d.ts +9 -0
- package/dist/src/backend/services/ratchet/service/ratchet-workspace-check-coordinator.d.ts.map +1 -0
- package/dist/src/backend/services/ratchet/service/ratchet-workspace-check-coordinator.js +36 -0
- package/dist/src/backend/services/ratchet/service/ratchet-workspace-check-coordinator.js.map +1 -0
- package/dist/src/backend/services/ratchet/service/ratchet-workspace-check-coordinator.test.d.ts +2 -0
- package/dist/src/backend/services/ratchet/service/ratchet-workspace-check-coordinator.test.d.ts.map +1 -0
- package/dist/src/backend/services/ratchet/service/ratchet-workspace-check-coordinator.test.js +25 -0
- package/dist/src/backend/services/ratchet/service/ratchet-workspace-check-coordinator.test.js.map +1 -0
- package/dist/src/backend/services/ratchet/service/ratchet.service.d.ts +42 -9
- package/dist/src/backend/services/ratchet/service/ratchet.service.d.ts.map +1 -1
- package/dist/src/backend/services/ratchet/service/ratchet.service.js +38 -105
- package/dist/src/backend/services/ratchet/service/ratchet.service.js.map +1 -1
- package/dist/src/backend/services/ratchet/service/ratchet.service.test.js +45 -0
- package/dist/src/backend/services/ratchet/service/ratchet.service.test.js.map +1 -1
- package/dist/src/backend/services/ratchet/service/reconciliation.service.d.ts +3 -2
- package/dist/src/backend/services/ratchet/service/reconciliation.service.d.ts.map +1 -1
- package/dist/src/backend/services/ratchet/service/reconciliation.service.js +51 -18
- package/dist/src/backend/services/ratchet/service/reconciliation.service.js.map +1 -1
- package/dist/src/backend/services/ratchet/service/reconciliation.service.test.js +94 -16
- package/dist/src/backend/services/ratchet/service/reconciliation.service.test.js.map +1 -1
- package/dist/src/backend/services/run-script/service/run-script-process-utils.d.ts +19 -0
- package/dist/src/backend/services/run-script/service/run-script-process-utils.d.ts.map +1 -0
- package/dist/src/backend/services/run-script/service/run-script-process-utils.js +105 -0
- package/dist/src/backend/services/run-script/service/run-script-process-utils.js.map +1 -0
- package/dist/src/backend/services/run-script/service/run-script.service.d.ts +1 -2
- package/dist/src/backend/services/run-script/service/run-script.service.d.ts.map +1 -1
- package/dist/src/backend/services/run-script/service/run-script.service.js +26 -131
- package/dist/src/backend/services/run-script/service/run-script.service.js.map +1 -1
- package/dist/src/backend/services/run-script/service/run-script.service.test.js +23 -4
- package/dist/src/backend/services/run-script/service/run-script.service.test.js.map +1 -1
- package/dist/src/backend/services/run-script/service/startup-script.service.d.ts.map +1 -1
- package/dist/src/backend/services/run-script/service/startup-script.service.js +32 -7
- package/dist/src/backend/services/run-script/service/startup-script.service.js.map +1 -1
- package/dist/src/backend/services/run-script/service/startup-script.service.test.js +9 -0
- package/dist/src/backend/services/run-script/service/startup-script.service.test.js.map +1 -1
- package/dist/src/backend/services/session/resources/agent-session.accessor.d.ts +11 -0
- package/dist/src/backend/services/session/resources/agent-session.accessor.d.ts.map +1 -1
- package/dist/src/backend/services/session/resources/agent-session.accessor.js +54 -22
- package/dist/src/backend/services/session/resources/agent-session.accessor.js.map +1 -1
- package/dist/src/backend/services/session/resources/agent-session.accessor.test.js +56 -0
- package/dist/src/backend/services/session/resources/agent-session.accessor.test.js.map +1 -1
- package/dist/src/backend/services/session/service/acp/acp-runtime-manager.d.ts +1 -0
- package/dist/src/backend/services/session/service/acp/acp-runtime-manager.d.ts.map +1 -1
- package/dist/src/backend/services/session/service/acp/acp-runtime-manager.js +10 -148
- package/dist/src/backend/services/session/service/acp/acp-runtime-manager.js.map +1 -1
- package/dist/src/backend/services/session/service/acp/acp-runtime-manager.test.js +50 -1
- package/dist/src/backend/services/session/service/acp/acp-runtime-manager.test.js.map +1 -1
- package/dist/src/backend/services/session/service/acp/acp-runtime-spawn.d.ts +16 -0
- package/dist/src/backend/services/session/service/acp/acp-runtime-spawn.d.ts.map +1 -0
- package/dist/src/backend/services/session/service/acp/acp-runtime-spawn.js +153 -0
- package/dist/src/backend/services/session/service/acp/acp-runtime-spawn.js.map +1 -0
- package/dist/src/backend/services/session/service/acp/codex-app-server-adapter/codex-adapter-parsing.d.ts +10 -0
- package/dist/src/backend/services/session/service/acp/codex-app-server-adapter/codex-adapter-parsing.d.ts.map +1 -0
- package/dist/src/backend/services/session/service/acp/codex-app-server-adapter/codex-adapter-parsing.js +162 -0
- package/dist/src/backend/services/session/service/acp/codex-app-server-adapter/codex-adapter-parsing.js.map +1 -0
- package/dist/src/backend/services/session/service/acp/codex-app-server-adapter/codex-app-server-acp-adapter.d.ts +4 -7
- package/dist/src/backend/services/session/service/acp/codex-app-server-adapter/codex-app-server-acp-adapter.d.ts.map +1 -1
- package/dist/src/backend/services/session/service/acp/codex-app-server-adapter/codex-app-server-acp-adapter.js +78 -365
- package/dist/src/backend/services/session/service/acp/codex-app-server-adapter/codex-app-server-acp-adapter.js.map +1 -1
- package/dist/src/backend/services/session/service/acp/codex-app-server-adapter/codex-app-server-acp-adapter.test.js +35 -1
- package/dist/src/backend/services/session/service/acp/codex-app-server-adapter/codex-app-server-acp-adapter.test.js.map +1 -1
- package/dist/src/backend/services/session/service/acp/codex-app-server-adapter/plan-approval-handler.d.ts +23 -0
- package/dist/src/backend/services/session/service/acp/codex-app-server-adapter/plan-approval-handler.d.ts.map +1 -0
- package/dist/src/backend/services/session/service/acp/codex-app-server-adapter/plan-approval-handler.js +191 -0
- package/dist/src/backend/services/session/service/acp/codex-app-server-adapter/plan-approval-handler.js.map +1 -0
- package/dist/src/backend/services/session/service/acp/codex-app-server-adapter/stream-event-handler.d.ts +1 -0
- package/dist/src/backend/services/session/service/acp/codex-app-server-adapter/stream-event-handler.d.ts.map +1 -1
- package/dist/src/backend/services/session/service/acp/codex-app-server-adapter/stream-event-handler.js +22 -5
- package/dist/src/backend/services/session/service/acp/codex-app-server-adapter/stream-event-handler.js.map +1 -1
- package/dist/src/backend/services/session/service/acp/codex-app-server-adapter/stream-event-handler.test.js +48 -0
- package/dist/src/backend/services/session/service/acp/codex-app-server-adapter/stream-event-handler.test.js.map +1 -1
- package/dist/src/backend/services/session/service/chat/chat-message-handlers/attachment-processing.d.ts +4 -1
- package/dist/src/backend/services/session/service/chat/chat-message-handlers/attachment-processing.d.ts.map +1 -1
- package/dist/src/backend/services/session/service/chat/chat-message-handlers/attachment-processing.js +9 -3
- package/dist/src/backend/services/session/service/chat/chat-message-handlers/attachment-processing.js.map +1 -1
- package/dist/src/backend/services/session/service/chat/chat-message-handlers/attachment-processing.test.js +9 -1
- package/dist/src/backend/services/session/service/chat/chat-message-handlers/attachment-processing.test.js.map +1 -1
- package/dist/src/backend/services/session/service/chat/chat-message-handlers/handlers/queue-message.handler.d.ts.map +1 -1
- package/dist/src/backend/services/session/service/chat/chat-message-handlers/handlers/queue-message.handler.js +4 -0
- package/dist/src/backend/services/session/service/chat/chat-message-handlers/handlers/queue-message.handler.js.map +1 -1
- package/dist/src/backend/services/session/service/chat/chat-message-handlers/handlers/queue-message.handler.test.js +16 -5
- package/dist/src/backend/services/session/service/chat/chat-message-handlers/handlers/queue-message.handler.test.js.map +1 -1
- package/dist/src/backend/services/session/service/chat/chat-message-handlers/types.d.ts +1 -1
- package/dist/src/backend/services/session/service/chat/chat-message-handlers/types.d.ts.map +1 -1
- package/dist/src/backend/services/session/service/chat/chat-message-handlers.service.js +2 -2
- package/dist/src/backend/services/session/service/chat/chat-message-handlers.service.js.map +1 -1
- package/dist/src/backend/services/session/service/chat/chat-message-handlers.service.test.js +57 -0
- package/dist/src/backend/services/session/service/chat/chat-message-handlers.service.test.js.map +1 -1
- package/dist/src/backend/services/session/service/data/codex-session-history-loader.service.js +3 -3
- package/dist/src/backend/services/session/service/data/codex-session-history-loader.service.js.map +1 -1
- package/dist/src/backend/services/session/service/data/codex-session-history-loader.service.test.js +35 -0
- package/dist/src/backend/services/session/service/data/codex-session-history-loader.service.test.js.map +1 -1
- package/dist/src/backend/services/session/service/data/session-data.service.d.ts +11 -0
- package/dist/src/backend/services/session/service/data/session-data.service.d.ts.map +1 -1
- package/dist/src/backend/services/session/service/data/session-data.service.js +3 -0
- package/dist/src/backend/services/session/service/data/session-data.service.js.map +1 -1
- package/dist/src/backend/services/session/service/data/session-provider-resolver.service.test.js +2 -0
- package/dist/src/backend/services/session/service/data/session-provider-resolver.service.test.js.map +1 -1
- package/dist/src/backend/services/session/service/index.d.ts +1 -1
- package/dist/src/backend/services/session/service/index.d.ts.map +1 -1
- package/dist/src/backend/services/session/service/index.js +1 -1
- package/dist/src/backend/services/session/service/index.js.map +1 -1
- package/dist/src/backend/services/session/service/lifecycle/session-config-option-helpers.d.ts +19 -0
- package/dist/src/backend/services/session/service/lifecycle/session-config-option-helpers.d.ts.map +1 -0
- package/dist/src/backend/services/session/service/lifecycle/session-config-option-helpers.js +199 -0
- package/dist/src/backend/services/session/service/lifecycle/session-config-option-helpers.js.map +1 -0
- package/dist/src/backend/services/session/service/lifecycle/session-pr-discovery.service.d.ts +5 -0
- package/dist/src/backend/services/session/service/lifecycle/session-pr-discovery.service.d.ts.map +1 -0
- package/dist/src/backend/services/session/service/lifecycle/session-pr-discovery.service.js +37 -0
- package/dist/src/backend/services/session/service/lifecycle/session-pr-discovery.service.js.map +1 -0
- package/dist/src/backend/services/session/service/lifecycle/session-runtime-state.helpers.d.ts +3 -0
- package/dist/src/backend/services/session/service/lifecycle/session-runtime-state.helpers.d.ts.map +1 -0
- package/dist/src/backend/services/session/service/lifecycle/session-runtime-state.helpers.js +12 -0
- package/dist/src/backend/services/session/service/lifecycle/session-runtime-state.helpers.js.map +1 -0
- package/dist/src/backend/services/session/service/lifecycle/session.config.service.d.ts +4 -13
- package/dist/src/backend/services/session/service/lifecycle/session.config.service.d.ts.map +1 -1
- package/dist/src/backend/services/session/service/lifecycle/session.config.service.js +94 -210
- package/dist/src/backend/services/session/service/lifecycle/session.config.service.js.map +1 -1
- package/dist/src/backend/services/session/service/lifecycle/session.config.service.test.js +32 -6
- package/dist/src/backend/services/session/service/lifecycle/session.config.service.test.js.map +1 -1
- package/dist/src/backend/services/session/service/lifecycle/session.lifecycle.service.d.ts +0 -1
- package/dist/src/backend/services/session/service/lifecycle/session.lifecycle.service.d.ts.map +1 -1
- package/dist/src/backend/services/session/service/lifecycle/session.lifecycle.service.js +9 -48
- package/dist/src/backend/services/session/service/lifecycle/session.lifecycle.service.js.map +1 -1
- package/dist/src/backend/services/session/service/lifecycle/session.permission.service.d.ts.map +1 -1
- package/dist/src/backend/services/session/service/lifecycle/session.permission.service.js +4 -0
- package/dist/src/backend/services/session/service/lifecycle/session.permission.service.js.map +1 -1
- package/dist/src/backend/services/session/service/lifecycle/session.permission.service.test.js +34 -0
- package/dist/src/backend/services/session/service/lifecycle/session.permission.service.test.js.map +1 -1
- package/dist/src/backend/services/session/service/lifecycle/session.repository.d.ts +6 -2
- package/dist/src/backend/services/session/service/lifecycle/session.repository.d.ts.map +1 -1
- package/dist/src/backend/services/session/service/lifecycle/session.repository.js +3 -0
- package/dist/src/backend/services/session/service/lifecycle/session.repository.js.map +1 -1
- package/dist/src/backend/services/session/service/lifecycle/session.repository.test.js +6 -0
- package/dist/src/backend/services/session/service/lifecycle/session.repository.test.js.map +1 -1
- package/dist/src/backend/services/session/service/lifecycle/session.service.d.ts +1 -1
- package/dist/src/backend/services/session/service/lifecycle/session.service.d.ts.map +1 -1
- package/dist/src/backend/services/session/service/lifecycle/session.service.js +2 -2
- package/dist/src/backend/services/session/service/lifecycle/session.service.js.map +1 -1
- package/dist/src/backend/services/session/service/lifecycle/session.service.test.js +112 -5
- package/dist/src/backend/services/session/service/lifecycle/session.service.test.js.map +1 -1
- package/dist/src/backend/services/settings/resources/user-settings.accessor.d.ts +2 -0
- package/dist/src/backend/services/settings/resources/user-settings.accessor.d.ts.map +1 -1
- package/dist/src/backend/services/settings/resources/user-settings.accessor.js +18 -0
- package/dist/src/backend/services/settings/resources/user-settings.accessor.js.map +1 -1
- package/dist/src/backend/services/workspace/resources/workspace.accessor.d.ts +2 -0
- package/dist/src/backend/services/workspace/resources/workspace.accessor.d.ts.map +1 -1
- package/dist/src/backend/services/workspace/resources/workspace.accessor.js +15 -0
- package/dist/src/backend/services/workspace/resources/workspace.accessor.js.map +1 -1
- package/dist/src/backend/services/workspace/service/lifecycle/creation.service.test.js +5 -0
- package/dist/src/backend/services/workspace/service/lifecycle/creation.service.test.js.map +1 -1
- package/dist/src/backend/services/workspace/service/lifecycle/data.service.d.ts +9 -0
- package/dist/src/backend/services/workspace/service/lifecycle/data.service.d.ts.map +1 -1
- package/dist/src/backend/services/workspace/service/lifecycle/state-machine.service.d.ts.map +1 -1
- package/dist/src/backend/services/workspace/service/lifecycle/state-machine.service.js +3 -0
- package/dist/src/backend/services/workspace/service/lifecycle/state-machine.service.js.map +1 -1
- package/dist/src/backend/services/workspace/service/query/project-management.service.d.ts +2 -0
- package/dist/src/backend/services/workspace/service/query/project-management.service.d.ts.map +1 -1
- package/dist/src/backend/services/workspace/service/query/user-settings-query.service.d.ts +2 -0
- package/dist/src/backend/services/workspace/service/query/user-settings-query.service.d.ts.map +1 -1
- package/dist/src/backend/services/workspace/service/query/user-settings-query.service.js.map +1 -1
- package/dist/src/backend/services/workspace/service/query/workspace-query.service.d.ts +2 -0
- package/dist/src/backend/services/workspace/service/query/workspace-query.service.d.ts.map +1 -1
- package/dist/src/backend/testing/check-prisma-generated-drift-script.test.d.ts +2 -0
- package/dist/src/backend/testing/check-prisma-generated-drift-script.test.d.ts.map +1 -0
- package/dist/src/backend/testing/check-prisma-generated-drift-script.test.js +48 -0
- package/dist/src/backend/testing/check-prisma-generated-drift-script.test.js.map +1 -0
- package/dist/src/backend/testing/websocket-test-utils.d.ts +2 -2
- package/dist/src/backend/testing/websocket-test-utils.d.ts.map +1 -1
- package/dist/src/backend/testing/websocket-test-utils.js +2 -2
- package/dist/src/backend/testing/websocket-test-utils.js.map +1 -1
- package/dist/src/backend/trpc/admin.trpc.d.ts +4 -0
- package/dist/src/backend/trpc/admin.trpc.d.ts.map +1 -1
- package/dist/src/backend/trpc/github.router.test.js +31 -0
- package/dist/src/backend/trpc/github.router.test.js.map +1 -1
- package/dist/src/backend/trpc/github.trpc.d.ts.map +1 -1
- package/dist/src/backend/trpc/github.trpc.js +12 -4
- package/dist/src/backend/trpc/github.trpc.js.map +1 -1
- package/dist/src/backend/trpc/index.d.ts +95 -0
- package/dist/src/backend/trpc/index.d.ts.map +1 -1
- package/dist/src/backend/trpc/issue-filter.d.ts +7 -0
- package/dist/src/backend/trpc/issue-filter.d.ts.map +1 -0
- package/dist/src/backend/trpc/issue-filter.js +19 -0
- package/dist/src/backend/trpc/issue-filter.js.map +1 -0
- package/dist/src/backend/trpc/linear.router.test.js +35 -0
- package/dist/src/backend/trpc/linear.router.test.js.map +1 -1
- package/dist/src/backend/trpc/linear.trpc.d.ts.map +1 -1
- package/dist/src/backend/trpc/linear.trpc.js +10 -3
- package/dist/src/backend/trpc/linear.trpc.js.map +1 -1
- package/dist/src/backend/trpc/periodic-task.trpc.d.ts +5 -0
- package/dist/src/backend/trpc/periodic-task.trpc.d.ts.map +1 -1
- package/dist/src/backend/trpc/project.trpc.d.ts +2 -0
- package/dist/src/backend/trpc/project.trpc.d.ts.map +1 -1
- package/dist/src/backend/trpc/session.router.test.js +96 -8
- package/dist/src/backend/trpc/session.router.test.js.map +1 -1
- package/dist/src/backend/trpc/session.trpc.d.ts +34 -1
- package/dist/src/backend/trpc/session.trpc.d.ts.map +1 -1
- package/dist/src/backend/trpc/session.trpc.js +70 -37
- package/dist/src/backend/trpc/session.trpc.js.map +1 -1
- package/dist/src/backend/trpc/user-settings.router.test.js +89 -0
- package/dist/src/backend/trpc/user-settings.router.test.js.map +1 -1
- package/dist/src/backend/trpc/user-settings.trpc.d.ts +32 -0
- package/dist/src/backend/trpc/user-settings.trpc.d.ts.map +1 -1
- package/dist/src/backend/trpc/user-settings.trpc.js +81 -0
- package/dist/src/backend/trpc/user-settings.trpc.js.map +1 -1
- package/dist/src/backend/trpc/workspace/init.router.test.js +10 -0
- package/dist/src/backend/trpc/workspace/init.router.test.js.map +1 -1
- package/dist/src/backend/trpc/workspace/init.trpc.d.ts +1 -0
- package/dist/src/backend/trpc/workspace/init.trpc.d.ts.map +1 -1
- package/dist/src/backend/trpc/workspace/init.trpc.js +2 -1
- package/dist/src/backend/trpc/workspace/init.trpc.js.map +1 -1
- package/dist/src/backend/trpc/workspace/workspace-helpers.d.ts +2 -0
- package/dist/src/backend/trpc/workspace/workspace-helpers.d.ts.map +1 -1
- package/dist/src/backend/trpc/workspace.trpc.d.ts +12 -0
- package/dist/src/backend/trpc/workspace.trpc.d.ts.map +1 -1
- package/dist/src/cli/index.js +1 -9
- package/dist/src/cli/index.js.map +1 -1
- package/dist/src/cli/serve-env.d.ts +6 -0
- package/dist/src/cli/serve-env.d.ts.map +1 -0
- package/dist/src/cli/serve-env.js +11 -0
- package/dist/src/cli/serve-env.js.map +1 -0
- package/dist/src/cli/serve-env.test.d.ts +2 -0
- package/dist/src/cli/serve-env.test.d.ts.map +1 -0
- package/dist/src/cli/serve-env.test.js +23 -0
- package/dist/src/cli/serve-env.test.js.map +1 -0
- package/dist/src/shared/schemas/export-data.schema.d.ts +4 -0
- package/dist/src/shared/schemas/export-data.schema.d.ts.map +1 -1
- package/dist/src/shared/schemas/export-data.schema.js +2 -0
- package/dist/src/shared/schemas/export-data.schema.js.map +1 -1
- package/dist/tsconfig.backend.tsbuildinfo +1 -1
- package/package.json +7 -4
- package/prisma/migrations/20260520120000_add_periodic_task_scheduled_day_of_month/migration.sql +10 -0
- package/prisma/migrations/20260529123138_add_workspace_init_script_pid/migration.sql +2 -0
- package/prisma/migrations/20260529140000_add_default_provider_effort_settings/migration.sql +2 -0
- package/prisma/schema.prisma +4 -0
- package/dist/client/assets/channel-B100hIJ8.js +0 -1
- package/dist/client/assets/classDiagram-4FO5ZUOK-DK3mo2gW.js +0 -1
- package/dist/client/assets/classDiagram-v2-Q7XG4LA2-DK3mo2gW.js +0 -1
- package/dist/client/assets/stateDiagram-v2-BHNVJYJU-DxhGA2OY.js +0 -1
|
@@ -5,6 +5,7 @@ import { join } from 'node:path';
|
|
|
5
5
|
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
|
|
6
6
|
import { WS_READY_STATE } from '../../../backend/constants/websocket.js';
|
|
7
7
|
import { createChatUpgradeHandler } from './chat.handler.js';
|
|
8
|
+
const allowedOrigin = 'http://localhost:3000';
|
|
8
9
|
class MockWebSocket extends EventEmitter {
|
|
9
10
|
readyState = WS_READY_STATE.OPEN;
|
|
10
11
|
send = vi.fn();
|
|
@@ -56,6 +57,7 @@ function createTestContext(worktreeBaseDir) {
|
|
|
56
57
|
handleMessage: vi.fn(async () => undefined),
|
|
57
58
|
},
|
|
58
59
|
configService: {
|
|
60
|
+
getCorsConfig: vi.fn(() => ({ allowedOrigins: [allowedOrigin] })),
|
|
59
61
|
getDebugConfig: vi.fn(() => ({ chatWebSocket: false })),
|
|
60
62
|
getWorktreeBaseDir: vi.fn(() => worktreeBaseDir),
|
|
61
63
|
},
|
|
@@ -99,7 +101,7 @@ describe('createChatUpgradeHandler', () => {
|
|
|
99
101
|
it('rejects invalid workingDir with 400 response before upgrade', () => {
|
|
100
102
|
const { appContext, chatMessageHandlerService } = createTestContext(tempRootDir);
|
|
101
103
|
const handler = createChatUpgradeHandler(appContext);
|
|
102
|
-
const request = {};
|
|
104
|
+
const request = { headers: { origin: allowedOrigin } };
|
|
103
105
|
const socket = { write: vi.fn(), destroy: vi.fn() };
|
|
104
106
|
const wss = { handleUpgrade: vi.fn() };
|
|
105
107
|
const wsAliveMap = new WeakMap();
|
|
@@ -110,6 +112,22 @@ describe('createChatUpgradeHandler', () => {
|
|
|
110
112
|
expect(wss.handleUpgrade).not.toHaveBeenCalled();
|
|
111
113
|
expect(chatMessageHandlerService.setClientCreator).toHaveBeenCalledTimes(1);
|
|
112
114
|
});
|
|
115
|
+
it('rejects unauthorized origins before validating workingDir', () => {
|
|
116
|
+
const workingDir = join(tempRootDir, 'workspace-1');
|
|
117
|
+
mkdirSync(workingDir, { recursive: true });
|
|
118
|
+
const { appContext } = createTestContext(tempRootDir);
|
|
119
|
+
const handler = createChatUpgradeHandler(appContext);
|
|
120
|
+
const request = { headers: { origin: 'https://evil.example' } };
|
|
121
|
+
const socket = { write: vi.fn(), destroy: vi.fn() };
|
|
122
|
+
const wss = { handleUpgrade: vi.fn() };
|
|
123
|
+
const wsAliveMap = new WeakMap();
|
|
124
|
+
const url = new URL(`http://localhost/chat?workingDir=${encodeURIComponent(workingDir)}`);
|
|
125
|
+
handler(request, socket, Buffer.alloc(0), url, wss, wsAliveMap);
|
|
126
|
+
expect(socket.write).toHaveBeenCalledWith(expect.stringContaining('Unauthorized origin'));
|
|
127
|
+
expect(appContext.services.configService.getWorktreeBaseDir).not.toHaveBeenCalled();
|
|
128
|
+
expect(socket.destroy).toHaveBeenCalledTimes(1);
|
|
129
|
+
expect(wss.handleUpgrade).not.toHaveBeenCalled();
|
|
130
|
+
});
|
|
113
131
|
it('registers a connection, dispatches valid messages, and cleans up on close', async () => {
|
|
114
132
|
const workingDir = join(tempRootDir, 'workspace-1');
|
|
115
133
|
mkdirSync(workingDir, { recursive: true });
|
|
@@ -119,7 +137,7 @@ describe('createChatUpgradeHandler', () => {
|
|
|
119
137
|
const wss = {
|
|
120
138
|
handleUpgrade: vi.fn((_request, _socket, _head, callback) => callback(ws)),
|
|
121
139
|
};
|
|
122
|
-
const request = {};
|
|
140
|
+
const request = { headers: { origin: allowedOrigin } };
|
|
123
141
|
const socket = { write: vi.fn(), destroy: vi.fn() };
|
|
124
142
|
const wsAliveMap = new WeakMap();
|
|
125
143
|
const url = new URL(`http://localhost/chat?connectionId=conn-1&sessionId=session-1&workingDir=${encodeURIComponent(workingDir)}`);
|
|
@@ -146,7 +164,7 @@ describe('createChatUpgradeHandler', () => {
|
|
|
146
164
|
const wss = {
|
|
147
165
|
handleUpgrade: vi.fn((_request, _socket, _head, callback) => callback(ws)),
|
|
148
166
|
};
|
|
149
|
-
const request = {};
|
|
167
|
+
const request = { headers: { origin: allowedOrigin } };
|
|
150
168
|
const socket = { write: vi.fn(), destroy: vi.fn() };
|
|
151
169
|
const wsAliveMap = new WeakMap();
|
|
152
170
|
const url = new URL('http://localhost/chat?connectionId=conn-1&sessionId=session-1');
|
|
@@ -163,7 +181,7 @@ describe('createChatUpgradeHandler', () => {
|
|
|
163
181
|
const wss = {
|
|
164
182
|
handleUpgrade: vi.fn((_request, _socket, _head, callback) => callback(ws)),
|
|
165
183
|
};
|
|
166
|
-
const request = {};
|
|
184
|
+
const request = { headers: { origin: allowedOrigin } };
|
|
167
185
|
const socket = { write: vi.fn(), destroy: vi.fn() };
|
|
168
186
|
const wsAliveMap = new WeakMap();
|
|
169
187
|
const url = new URL('http://localhost/chat?connectionId=conn-1&sessionId=session-1');
|
|
@@ -186,7 +204,7 @@ describe('createChatUpgradeHandler', () => {
|
|
|
186
204
|
const wss = {
|
|
187
205
|
handleUpgrade: vi.fn((_request, _socket, _head, callback) => callback(ws)),
|
|
188
206
|
};
|
|
189
|
-
const request = {};
|
|
207
|
+
const request = { headers: { origin: allowedOrigin } };
|
|
190
208
|
const socket = { write: vi.fn(), destroy: vi.fn() };
|
|
191
209
|
const wsAliveMap = new WeakMap();
|
|
192
210
|
const url = new URL('http://localhost/chat?connectionId=conn-1&sessionId=session-1');
|
|
@@ -213,7 +231,7 @@ describe('createChatUpgradeHandler', () => {
|
|
|
213
231
|
const wss = {
|
|
214
232
|
handleUpgrade: vi.fn((_request, _socket, _head, callback) => callback(ws)),
|
|
215
233
|
};
|
|
216
|
-
const request = {};
|
|
234
|
+
const request = { headers: { origin: allowedOrigin } };
|
|
217
235
|
const socket = { write: vi.fn(), destroy: vi.fn() };
|
|
218
236
|
const wsAliveMap = new WeakMap();
|
|
219
237
|
const url = new URL('http://localhost/chat?connectionId=conn-1&sessionId=session-1');
|
|
@@ -233,7 +251,7 @@ describe('createChatUpgradeHandler', () => {
|
|
|
233
251
|
const wss = {
|
|
234
252
|
handleUpgrade: vi.fn((_request, _socket, _head, callback) => callback(ws)),
|
|
235
253
|
};
|
|
236
|
-
const request = {};
|
|
254
|
+
const request = { headers: { origin: allowedOrigin } };
|
|
237
255
|
const socket = { write: vi.fn(), destroy: vi.fn() };
|
|
238
256
|
const wsAliveMap = new WeakMap();
|
|
239
257
|
const url = new URL('http://localhost/chat?connectionId=conn-1&sessionId=session-1');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chat.handler.test.js","sourceRoot":"","sources":["../../../../../src/backend/routers/websocket/chat.handler.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"chat.handler.test.js","sourceRoot":"","sources":["../../../../../src/backend/routers/websocket/chat.handler.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE/D,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAGzE,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAE1D,MAAM,aAAa,GAAG,uBAAuB,CAAC;AAE9C,MAAM,aAAc,SAAQ,YAAY;IACtC,UAAU,GAAG,cAAc,CAAC,IAAI,CAAC;IACjC,IAAI,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;IACf,KAAK,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;CACjB;AAED,SAAS,YAAY;IACnB,OAAO;QACL,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE;QACd,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE;QACb,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE;QACb,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE;KACf,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,eAAuB;IAChD,MAAM,MAAM,GAAG,YAAY,EAAE,CAAC;IAC9B,MAAM,WAAW,GAAG,IAAI,GAAG,EAGxB,CAAC;IAEJ,MAAM,qBAAqB,GAAG;QAC5B,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;QACzC,8BAA8B,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,WAA0B,EAAE,EAAE;YACnE,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,OAAO,CAAC,CAAC;YACX,CAAC;YACD,IAAI,KAAK,GAAG,CAAC,CAAC;YACd,KAAK,MAAM,IAAI,IAAI,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC;gBACxC,IAAI,IAAI,CAAC,WAAW,KAAK,WAAW,EAAE,CAAC;oBACrC,KAAK,EAAE,CAAC;gBACV,CAAC;YACH,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC,CAAC;QACF,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,YAAoB,EAAE,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QACnE,QAAQ,EAAE,EAAE,CAAC,EAAE,CACb,CACE,YAAoB,EACpB,IAAkF,EAClF,EAAE;YACF,WAAW,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;QACtC,CAAC,CACF;QACD,UAAU,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,YAAoB,EAAE,EAAE;YACzC,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QACnC,CAAC,CAAC;KACH,CAAC;IAEF,MAAM,UAAU,GAAG;QACjB,QAAQ,EAAE;YACR,qBAAqB;YACrB,yBAAyB,EAAE;gBACzB,iBAAiB,EAAE,EAAE,CAAC,EAAE,EAAE;gBAC1B,2BAA2B,EAAE,EAAE,CAAC,EAAE,EAAE;aACrC;YACD,yBAAyB,EAAE;gBACzB,gBAAgB,EAAE,EAAE,CAAC,EAAE,EAAE;gBACzB,sBAAsB,EAAE,EAAE,CAAC,EAAE,EAAE;gBAC/B,aAAa,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,SAAS,CAAC;aAC5C;YACD,aAAa,EAAE;gBACb,aAAa,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,cAAc,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;gBACjE,cAAc,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC;gBACvD,kBAAkB,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC;aACjD;YACD,YAAY,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC;YACjC,iBAAiB,EAAE;gBACjB,WAAW,EAAE,EAAE,CAAC,EAAE,EAAE;gBACpB,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE;gBACZ,YAAY,EAAE,EAAE,CAAC,EAAE,EAAE;aACtB;YACD,cAAc,EAAE;gBACd,iBAAiB,EAAE,EAAE,CAAC,EAAE,EAAE;gBAC1B,wBAAwB,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;gBACjD,iBAAiB,EAAE,EAAE,CAAC,EAAE,EAAE;gBAC1B,gBAAgB,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC;aACrC;YACD,oBAAoB,EAAE;gBACpB,YAAY,EAAE,EAAE,CAAC,EAAE,EAAE;aACtB;SACF;KACuB,CAAC;IAE3B,OAAO;QACL,UAAU;QACV,qBAAqB;QACrB,yBAAyB,EAAE,UAAU,CAAC,QAAQ,CAAC,yBAAyB;QACxE,yBAAyB,EAAE,UAAU,CAAC,QAAQ,CAAC,yBAAyB;QACxE,MAAM;QACN,iBAAiB,EAAE,UAAU,CAAC,QAAQ,CAAC,iBAAiB;QACxD,oBAAoB,EAAE,UAAU,CAAC,QAAQ,CAAC,oBAAoB;QAC9D,cAAc,EAAE,UAAU,CAAC,QAAQ,CAAC,cAAc;QAClD,WAAW;KACZ,CAAC;AACJ,CAAC;AAED,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE;IACxC,IAAI,WAAmB,CAAC;IAExB,UAAU,CAAC,GAAG,EAAE;QACd,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,oBAAoB,CAAC,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,eAAe,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6DAA6D,EAAE,GAAG,EAAE;QACrE,MAAM,EAAE,UAAU,EAAE,yBAAyB,EAAE,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;QACjF,MAAM,OAAO,GAAG,wBAAwB,CAAC,UAAU,CAAC,CAAC;QAErD,MAAM,OAAO,GAAG,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,EAAqB,CAAC;QAC1E,MAAM,MAAM,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,EAAuB,CAAC;QACzE,MAAM,GAAG,GAAG,EAAE,aAAa,EAAE,EAAE,CAAC,EAAE,EAAE,EAAgC,CAAC;QACrE,MAAM,UAAU,GAAG,IAAI,OAAO,EAAsB,CAAC;QACrD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,6CAA6C,CAAC,CAAC;QAEnE,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;QAEhE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,CAAC,CAAC;QACtF,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAChD,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QACjD,MAAM,CAAC,yBAAyB,CAAC,gBAAgB,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAC9E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2DAA2D,EAAE,GAAG,EAAE;QACnE,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;QACpD,SAAS,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAE3C,MAAM,EAAE,UAAU,EAAE,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;QACtD,MAAM,OAAO,GAAG,wBAAwB,CAAC,UAAU,CAAC,CAAC;QAErD,MAAM,OAAO,GAAG,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,sBAAsB,EAAE,EAAqB,CAAC;QACnF,MAAM,MAAM,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,EAAuB,CAAC;QACzE,MAAM,GAAG,GAAG,EAAE,aAAa,EAAE,EAAE,CAAC,EAAE,EAAE,EAAgC,CAAC;QACrE,MAAM,UAAU,GAAG,IAAI,OAAO,EAAsB,CAAC;QACrD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,oCAAoC,kBAAkB,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QAE1F,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;QAEhE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,CAAC,CAAC;QAC1F,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QACpF,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAChD,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2EAA2E,EAAE,KAAK,IAAI,EAAE;QACzF,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;QACpD,SAAS,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAE3C,MAAM,EACJ,UAAU,EACV,yBAAyB,EACzB,yBAAyB,EACzB,qBAAqB,EACrB,iBAAiB,GAClB,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;QACnC,MAAM,OAAO,GAAG,wBAAwB,CAAC,UAAU,CAAC,CAAC;QAErD,MAAM,EAAE,GAAG,IAAI,aAAa,EAAE,CAAC;QAC/B,MAAM,GAAG,GAAG;YACV,aAAa,EAAE,EAAE,CAAC,EAAE,CAClB,CACE,QAAyB,EACzB,OAAe,EACf,KAAa,EACb,QAAqC,EACrC,EAAE,CAAC,QAAQ,CAAC,EAA0B,CAAC,CAC1C;SAC4B,CAAC;QAEhC,MAAM,OAAO,GAAG,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,EAAqB,CAAC;QAC1E,MAAM,MAAM,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,EAAuB,CAAC;QACzE,MAAM,UAAU,GAAG,IAAI,OAAO,EAAsB,CAAC;QACrD,MAAM,GAAG,GAAG,IAAI,GAAG,CACjB,4EAA4E,kBAAkB,CAAC,UAAU,CAAC,EAAE,CAC7G,CAAC;QAEF,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;QAChE,MAAM,CAAC,yBAAyB,CAAC,2BAA2B,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QACvF,MAAM,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;QACxE,MAAM,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC,oBAAoB,CACzD,QAAQ,EACR,MAAM,CAAC,gBAAgB,CAAC,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC,CACtD,CAAC;QAEF,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC;QAC7D,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QACxB,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QAExB,MAAM,CAAC,yBAAyB,CAAC,aAAa,CAAC,CAAC,oBAAoB,CAClE,EAAE,EACF,WAAW,EACX,YAAY,CAAC,UAAU,CAAC,EACxB,EAAE,IAAI,EAAE,cAAc,EAAE,CACzB,CAAC;QACF,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,oBAAoB,CAAC,WAAW,EAAE,gBAAgB,EAAE;YAChF,IAAI,EAAE,cAAc;SACrB,CAAC,CAAC;QAEH,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACjB,MAAM,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC;QACxE,MAAM,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;IAC3E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gFAAgF,EAAE,GAAG,EAAE;QACxF,MAAM,EAAE,UAAU,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,cAAc,EAAE,GAC/E,iBAAiB,CAAC,WAAW,CAAC,CAAC;QACjC,MAAM,OAAO,GAAG,wBAAwB,CAAC,UAAU,CAAC,CAAC;QACrD,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAElE,MAAM,EAAE,GAAG,IAAI,aAAa,EAAE,CAAC;QAC/B,MAAM,GAAG,GAAG;YACV,aAAa,EAAE,EAAE,CAAC,EAAE,CAClB,CACE,QAAyB,EACzB,OAAe,EACf,KAAa,EACb,QAAqC,EACrC,EAAE,CAAC,QAAQ,CAAC,EAA0B,CAAC,CAC1C;SAC4B,CAAC;QAEhC,MAAM,OAAO,GAAG,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,EAAqB,CAAC;QAC1E,MAAM,MAAM,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,EAAuB,CAAC;QACzE,MAAM,UAAU,GAAG,IAAI,OAAO,EAAsB,CAAC;QACrD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,+DAA+D,CAAC,CAAC;QAErF,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;QAChE,MAAM,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC,oBAAoB,CACzD,QAAQ,EACR,MAAM,CAAC,gBAAgB,CAAC,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC,CACtD,CAAC;QAEF,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAEjB,MAAM,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;IAC9E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+EAA+E,EAAE,GAAG,EAAE;QACvF,MAAM,EAAE,UAAU,EAAE,oBAAoB,EAAE,cAAc,EAAE,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;QAC5F,MAAM,OAAO,GAAG,wBAAwB,CAAC,UAAU,CAAC,CAAC;QACrD,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAEjE,MAAM,EAAE,GAAG,IAAI,aAAa,EAAE,CAAC;QAC/B,MAAM,GAAG,GAAG;YACV,aAAa,EAAE,EAAE,CAAC,EAAE,CAClB,CACE,QAAyB,EACzB,OAAe,EACf,KAAa,EACb,QAAqC,EACrC,EAAE,CAAC,QAAQ,CAAC,EAA0B,CAAC,CAC1C;SAC4B,CAAC;QAEhC,MAAM,OAAO,GAAG,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,EAAqB,CAAC;QAC1E,MAAM,MAAM,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,EAAuB,CAAC;QACzE,MAAM,UAAU,GAAG,IAAI,OAAO,EAAsB,CAAC;QACrD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,+DAA+D,CAAC,CAAC;QAErF,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;QAChE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAEjB,MAAM,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;IACnE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iFAAiF,EAAE,KAAK,IAAI,EAAE;QAC/F,MAAM,EAAE,UAAU,EAAE,yBAAyB,EAAE,oBAAoB,EAAE,cAAc,EAAE,GACnF,iBAAiB,CAAC,WAAW,CAAC,CAAC;QACjC,MAAM,OAAO,GAAG,wBAAwB,CAAC,UAAU,CAAC,CAAC;QACrD,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAElE,IAAI,cAAwC,CAAC;QAC7C,MAAM,cAAc,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YACnD,cAAc,GAAG,OAAO,CAAC;QAC3B,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,MAAM,CAAC,yBAAyB,CAAC,aAAa,CAAC,CAAC,kBAAkB,CAAC,KAAK,IAAI,EAAE;YAC/E,MAAM,cAAc,CAAC;QACvB,CAAC,CAAC,CAAC;QAEH,MAAM,EAAE,GAAG,IAAI,aAAa,EAAE,CAAC;QAC/B,MAAM,GAAG,GAAG;YACV,aAAa,EAAE,EAAE,CAAC,EAAE,CAClB,CACE,QAAyB,EACzB,OAAe,EACf,KAAa,EACb,QAAqC,EACrC,EAAE,CAAC,QAAQ,CAAC,EAA0B,CAAC,CAC1C;SAC4B,CAAC;QAEhC,MAAM,OAAO,GAAG,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,EAAqB,CAAC;QAC1E,MAAM,MAAM,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,EAAuB,CAAC;QACzE,MAAM,UAAU,GAAG,IAAI,OAAO,EAAsB,CAAC;QACrD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,+DAA+D,CAAC,CAAC;QAErF,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;QAEhE,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC;QAC7D,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QAExB,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACjB,MAAM,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QAEjE,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACvD,CAAC;QACD,cAAc,EAAE,CAAC;QACjB,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QACxB,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QAExB,MAAM,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;IAC9E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yFAAyF,EAAE,GAAG,EAAE;QACjG,MAAM,EACJ,UAAU,EACV,WAAW,EACX,qBAAqB,EACrB,yBAAyB,EACzB,iBAAiB,GAClB,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;QACnC,MAAM,OAAO,GAAG,wBAAwB,CAAC,UAAU,CAAC,CAAC;QAErD,MAAM,UAAU,GAAG,IAAI,aAAa,EAAE,CAAC;QACvC,WAAW,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;QAEpF,MAAM,EAAE,GAAG,IAAI,aAAa,EAAE,CAAC;QAC/B,MAAM,OAAO,GAAG,IAAI,aAAa,EAAE,CAAC;QACpC,MAAM,GAAG,GAAG;YACV,aAAa,EAAE,EAAE,CAAC,EAAE,CAClB,CACE,QAAyB,EACzB,OAAe,EACf,KAAa,EACb,QAAqC,EACrC,EAAE,CAAC,QAAQ,CAAC,EAA0B,CAAC,CAC1C;SAC4B,CAAC;QAEhC,MAAM,OAAO,GAAG,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,EAAqB,CAAC;QAC1E,MAAM,MAAM,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,EAAuB,CAAC;QACzE,MAAM,UAAU,GAAG,IAAI,OAAO,EAAsB,CAAC;QACrD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,+DAA+D,CAAC,CAAC;QAErF,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;QAEhE,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC,IAAI,EAAE,kCAAkC,CAAC,CAAC;QACxF,MAAM,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC,oBAAoB,CACzD,QAAQ,EACR,MAAM,CAAC,gBAAgB,CAAC,EAAE,EAAE,EAAE,CAAC,CAChC,CAAC;QACF,MAAM,CAAC,yBAAyB,CAAC,gBAAgB,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAG5E,WAAW,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;QACvF,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAEjB,MAAM,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QAChE,MAAM,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;IAChE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8EAA8E,EAAE,KAAK,IAAI,EAAE;QAC5F,MAAM,EAAE,UAAU,EAAE,yBAAyB,EAAE,iBAAiB,EAAE,MAAM,EAAE,GACxE,iBAAiB,CAAC,WAAW,CAAC,CAAC;QACjC,MAAM,OAAO,GAAG,wBAAwB,CAAC,UAAU,CAAC,CAAC;QAErD,MAAM,EAAE,GAAG,IAAI,aAAa,EAAE,CAAC;QAC/B,MAAM,GAAG,GAAG;YACV,aAAa,EAAE,EAAE,CAAC,EAAE,CAClB,CACE,QAAyB,EACzB,OAAe,EACf,KAAa,EACb,QAAqC,EACrC,EAAE,CAAC,QAAQ,CAAC,EAA0B,CAAC,CAC1C;SAC4B,CAAC;QAEhC,MAAM,OAAO,GAAG,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,EAAqB,CAAC;QAC1E,MAAM,MAAM,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,EAAuB,CAAC;QACzE,MAAM,UAAU,GAAG,IAAI,OAAO,EAAsB,CAAC;QACrD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,+DAA+D,CAAC,CAAC;QAErF,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;QAEhE,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;QACpC,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QACxB,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QAExB,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,sBAAsB,EAAE,CAAC,CAAC,CAAC;QACrE,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QACxB,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QAExB,MAAM,CAAC,yBAAyB,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QACvE,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,oBAAoB,CAClC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,wBAAwB,EAAE,CAAC,CACrE,CAAC;QACF,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,oBAAoB,CAAC,WAAW,EAAE,eAAe,EAAE;YAC/E,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,wBAAwB;SAClC,CAAC,CAAC;QAEH,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC;QAC7C,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC,sBAAsB,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;QACrF,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,oBAAoB,CAAC,WAAW,EAAE,MAAM,EAAE;YACtE,KAAK,EAAE,kBAAkB;YACzB,YAAY,EAAE,QAAQ;YACtB,KAAK,EAAE,eAAe;SACvB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-logs.handler.d.ts","sourceRoot":"","sources":["../../../../../src/backend/routers/websocket/dev-logs.handler.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AACjD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AACrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"dev-logs.handler.d.ts","sourceRoot":"","sources":["../../../../../src/backend/routers/websocket/dev-logs.handler.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AACjD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AACrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAgBxD,MAAM,MAAM,qBAAqB,GAAG,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;AAMhE,eAAO,MAAM,kBAAkB,EAAE,qBAAiC,CAAC;AAQnE,wBAAgB,2BAA2B,CAAC,UAAU,EAAE,UAAU,IAM9D,SAAS,eAAe,EACxB,QAAQ,MAAM,EACd,MAAM,MAAM,EACZ,KAAK,GAAG,EACR,KAAK,eAAe,EACpB,YAAY,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,KACtC,IAAI,CA6ER"}
|
|
@@ -1,11 +1,21 @@
|
|
|
1
1
|
import { WS_READY_STATE } from '../../../backend/constants/websocket.js';
|
|
2
|
-
import { getOrCreateConnectionSet, markWebSocketAlive, sendBadRequest } from './upgrade-utils.js';
|
|
2
|
+
import { getOrCreateConnectionSet, markWebSocketAlive, sendBadRequest, validateWebSocketOrigin, } from './upgrade-utils.js';
|
|
3
3
|
export const devLogsConnections = new Map();
|
|
4
4
|
const devLogsListenerCleanup = new WeakMap();
|
|
5
5
|
export function createDevLogsUpgradeHandler(appContext) {
|
|
6
6
|
const logger = appContext.services.createLogger('dev-logs-handler');
|
|
7
7
|
const runScriptService = appContext.services.runScriptService;
|
|
8
|
+
const { configService } = appContext.services;
|
|
8
9
|
return function handleDevLogsUpgrade(request, socket, head, url, wss, wsAliveMap) {
|
|
10
|
+
if (!validateWebSocketOrigin({
|
|
11
|
+
request,
|
|
12
|
+
socket,
|
|
13
|
+
configService,
|
|
14
|
+
logger,
|
|
15
|
+
connectionName: 'dev logs WebSocket',
|
|
16
|
+
})) {
|
|
17
|
+
return;
|
|
18
|
+
}
|
|
9
19
|
const workspaceId = url.searchParams.get('workspaceId');
|
|
10
20
|
if (!workspaceId) {
|
|
11
21
|
logger.warn('Dev logs WebSocket missing workspaceId');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-logs.handler.js","sourceRoot":"","sources":["../../../../../src/backend/routers/websocket/dev-logs.handler.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,
|
|
1
|
+
{"version":3,"file":"dev-logs.handler.js","sourceRoot":"","sources":["../../../../../src/backend/routers/websocket/dev-logs.handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { EventEmitter } from 'node:events';
|
|
|
2
2
|
import { describe, expect, it, vi } from 'vitest';
|
|
3
3
|
import { WS_READY_STATE } from '../../../backend/constants/websocket.js';
|
|
4
4
|
import { createDevLogsUpgradeHandler } from './dev-logs.handler.js';
|
|
5
|
+
const allowedOrigin = 'http://localhost:3000';
|
|
5
6
|
class MockWebSocket extends EventEmitter {
|
|
6
7
|
readyState = WS_READY_STATE.OPEN;
|
|
7
8
|
send = vi.fn();
|
|
@@ -9,6 +10,35 @@ class MockWebSocket extends EventEmitter {
|
|
|
9
10
|
terminate = vi.fn();
|
|
10
11
|
}
|
|
11
12
|
describe('createDevLogsUpgradeHandler', () => {
|
|
13
|
+
it('rejects unauthorized origins before checking workspaceId', () => {
|
|
14
|
+
const runScriptService = {
|
|
15
|
+
getOutputBuffer: vi.fn(() => ''),
|
|
16
|
+
subscribeToOutput: vi.fn(),
|
|
17
|
+
};
|
|
18
|
+
const logger = {
|
|
19
|
+
debug: vi.fn(),
|
|
20
|
+
info: vi.fn(),
|
|
21
|
+
warn: vi.fn(),
|
|
22
|
+
error: vi.fn(),
|
|
23
|
+
};
|
|
24
|
+
const appContext = {
|
|
25
|
+
services: {
|
|
26
|
+
configService: {
|
|
27
|
+
getCorsConfig: vi.fn(() => ({ allowedOrigins: [allowedOrigin] })),
|
|
28
|
+
},
|
|
29
|
+
createLogger: vi.fn(() => logger),
|
|
30
|
+
runScriptService,
|
|
31
|
+
},
|
|
32
|
+
};
|
|
33
|
+
const handler = createDevLogsUpgradeHandler(appContext);
|
|
34
|
+
const request = { headers: { origin: 'https://attacker.example' } };
|
|
35
|
+
const socket = { write: vi.fn(), destroy: vi.fn() };
|
|
36
|
+
const wss = { handleUpgrade: vi.fn() };
|
|
37
|
+
handler(request, socket, Buffer.alloc(0), new URL('http://localhost/dev-logs'), wss, new WeakMap());
|
|
38
|
+
expect(socket.write).toHaveBeenCalledWith(expect.stringContaining('Unauthorized origin'));
|
|
39
|
+
expect(logger.warn).not.toHaveBeenCalledWith('Dev logs WebSocket missing workspaceId');
|
|
40
|
+
expect(wss.handleUpgrade).not.toHaveBeenCalled();
|
|
41
|
+
});
|
|
12
42
|
it('streams buffered and live output only while socket is open', () => {
|
|
13
43
|
const workspaceId = 'workspace-1';
|
|
14
44
|
const runScriptService = {
|
|
@@ -23,6 +53,9 @@ describe('createDevLogsUpgradeHandler', () => {
|
|
|
23
53
|
};
|
|
24
54
|
const appContext = {
|
|
25
55
|
services: {
|
|
56
|
+
configService: {
|
|
57
|
+
getCorsConfig: vi.fn(() => ({ allowedOrigins: [allowedOrigin] })),
|
|
58
|
+
},
|
|
26
59
|
createLogger: vi.fn(() => logger),
|
|
27
60
|
runScriptService,
|
|
28
61
|
},
|
|
@@ -32,7 +65,7 @@ describe('createDevLogsUpgradeHandler', () => {
|
|
|
32
65
|
const wss = {
|
|
33
66
|
handleUpgrade: vi.fn((_request, _socket, _head, callback) => callback(ws)),
|
|
34
67
|
};
|
|
35
|
-
const request = {};
|
|
68
|
+
const request = { headers: { origin: allowedOrigin } };
|
|
36
69
|
const socket = { write: vi.fn(), destroy: vi.fn() };
|
|
37
70
|
const wsAliveMap = new WeakMap();
|
|
38
71
|
const url = new URL(`http://localhost/dev-logs?workspaceId=${workspaceId}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-logs.handler.test.js","sourceRoot":"","sources":["../../../../../src/backend/routers/websocket/dev-logs.handler.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAG3C,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAGlD,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAEjE,MAAM,aAAc,SAAQ,YAAY;IACtC,UAAU,GAAW,cAAc,CAAC,IAAI,CAAC;IACzC,IAAI,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;IACf,KAAK,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;IAChB,SAAS,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;CACrB;AAED,QAAQ,CAAC,6BAA6B,EAAE,GAAG,EAAE;IAC3C,EAAE,CAAC,4DAA4D,EAAE,GAAG,EAAE;QACpE,MAAM,WAAW,GAAG,aAAa,CAAC;QAElC,MAAM,gBAAgB,GAAG;YACvB,eAAe,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,iBAAiB,CAAC;YAC/C,iBAAiB,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,GAAW,EAAE,SAAiC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;SACtF,CAAC;QAEF,MAAM,MAAM,GAAG;YACb,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE;YACd,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE;YACb,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE;YACb,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE;SACf,CAAC;QAEF,MAAM,UAAU,GAAG;YACjB,QAAQ,EAAE;gBACR,YAAY,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC;gBACjC,gBAAgB;aACjB;SACuB,CAAC;QAE3B,MAAM,OAAO,GAAG,2BAA2B,CAAC,UAAU,CAAC,CAAC;QACxD,MAAM,EAAE,GAAG,IAAI,aAAa,EAAE,CAAC;QAE/B,MAAM,GAAG,GAAG;YACV,aAAa,EAAE,EAAE,CAAC,EAAE,CAClB,CACE,QAAyB,EACzB,OAAe,EACf,KAAa,EACb,QAAqC,EACrC,EAAE,CAAC,QAAQ,CAAC,EAA0B,CAAC,CAC1C;SAC4B,CAAC;QAEhC,MAAM,OAAO,GAAG,EAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"dev-logs.handler.test.js","sourceRoot":"","sources":["../../../../../src/backend/routers/websocket/dev-logs.handler.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"post-run-logs.handler.d.ts","sourceRoot":"","sources":["../../../../../src/backend/routers/websocket/post-run-logs.handler.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AACjD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AACrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"post-run-logs.handler.d.ts","sourceRoot":"","sources":["../../../../../src/backend/routers/websocket/post-run-logs.handler.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AACjD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AACrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAgBxD,MAAM,MAAM,yBAAyB,GAAG,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;AAMpE,eAAO,MAAM,sBAAsB,EAAE,yBAAqC,CAAC;AAQ3E,wBAAgB,+BAA+B,CAAC,UAAU,EAAE,UAAU,IAMlE,SAAS,eAAe,EACxB,QAAQ,MAAM,EACd,MAAM,MAAM,EACZ,KAAK,GAAG,EACR,KAAK,eAAe,EACpB,YAAY,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,KACtC,IAAI,CAiER"}
|
|
@@ -1,11 +1,21 @@
|
|
|
1
1
|
import { WS_READY_STATE } from '../../../backend/constants/websocket.js';
|
|
2
|
-
import { getOrCreateConnectionSet, markWebSocketAlive, sendBadRequest } from './upgrade-utils.js';
|
|
2
|
+
import { getOrCreateConnectionSet, markWebSocketAlive, sendBadRequest, validateWebSocketOrigin, } from './upgrade-utils.js';
|
|
3
3
|
export const postRunLogsConnections = new Map();
|
|
4
4
|
const postRunLogsListenerCleanup = new WeakMap();
|
|
5
5
|
export function createPostRunLogsUpgradeHandler(appContext) {
|
|
6
6
|
const logger = appContext.services.createLogger('post-run-logs-handler');
|
|
7
7
|
const runScriptService = appContext.services.runScriptService;
|
|
8
|
+
const { configService } = appContext.services;
|
|
8
9
|
return function handlePostRunLogsUpgrade(request, socket, head, url, wss, wsAliveMap) {
|
|
10
|
+
if (!validateWebSocketOrigin({
|
|
11
|
+
request,
|
|
12
|
+
socket,
|
|
13
|
+
configService,
|
|
14
|
+
logger,
|
|
15
|
+
connectionName: 'post-run logs WebSocket',
|
|
16
|
+
})) {
|
|
17
|
+
return;
|
|
18
|
+
}
|
|
9
19
|
const workspaceId = url.searchParams.get('workspaceId');
|
|
10
20
|
if (!workspaceId) {
|
|
11
21
|
logger.warn('Post-run logs WebSocket missing workspaceId');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"post-run-logs.handler.js","sourceRoot":"","sources":["../../../../../src/backend/routers/websocket/post-run-logs.handler.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,
|
|
1
|
+
{"version":3,"file":"post-run-logs.handler.js","sourceRoot":"","sources":["../../../../../src/backend/routers/websocket/post-run-logs.handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { EventEmitter } from 'node:events';
|
|
|
2
2
|
import { beforeEach, describe, expect, it, vi } from 'vitest';
|
|
3
3
|
import { WS_READY_STATE } from '../../../backend/constants/websocket.js';
|
|
4
4
|
import { createPostRunLogsUpgradeHandler, postRunLogsConnections } from './post-run-logs.handler.js';
|
|
5
|
+
const allowedOrigin = 'http://localhost:3000';
|
|
5
6
|
class MockWebSocket extends EventEmitter {
|
|
6
7
|
readyState = WS_READY_STATE.OPEN;
|
|
7
8
|
send = vi.fn();
|
|
@@ -38,12 +39,15 @@ describe('createPostRunLogsUpgradeHandler', () => {
|
|
|
38
39
|
};
|
|
39
40
|
const appContext = {
|
|
40
41
|
services: {
|
|
42
|
+
configService: {
|
|
43
|
+
getCorsConfig: vi.fn(() => ({ allowedOrigins: [allowedOrigin] })),
|
|
44
|
+
},
|
|
41
45
|
createLogger: vi.fn(() => logger),
|
|
42
46
|
runScriptService,
|
|
43
47
|
},
|
|
44
48
|
};
|
|
45
49
|
const handler = createPostRunLogsUpgradeHandler(appContext);
|
|
46
|
-
const request = {};
|
|
50
|
+
const request = { headers: { origin: allowedOrigin } };
|
|
47
51
|
const socket = { write: vi.fn(), destroy: vi.fn() };
|
|
48
52
|
const wss = { handleUpgrade: vi.fn() };
|
|
49
53
|
handler(request, socket, Buffer.alloc(0), new URL('http://localhost/post-run-logs'), wss, new WeakMap());
|
|
@@ -52,6 +56,30 @@ describe('createPostRunLogsUpgradeHandler', () => {
|
|
|
52
56
|
expect(socket.destroy).toHaveBeenCalledTimes(1);
|
|
53
57
|
expect(wss.handleUpgrade).not.toHaveBeenCalled();
|
|
54
58
|
});
|
|
59
|
+
it('rejects unauthorized origins before checking workspaceId', () => {
|
|
60
|
+
const logger = createLogger();
|
|
61
|
+
const runScriptService = {
|
|
62
|
+
getPostRunOutputBuffer: vi.fn(() => ''),
|
|
63
|
+
subscribeToPostRunOutput: vi.fn(),
|
|
64
|
+
};
|
|
65
|
+
const appContext = {
|
|
66
|
+
services: {
|
|
67
|
+
configService: {
|
|
68
|
+
getCorsConfig: vi.fn(() => ({ allowedOrigins: [allowedOrigin] })),
|
|
69
|
+
},
|
|
70
|
+
createLogger: vi.fn(() => logger),
|
|
71
|
+
runScriptService,
|
|
72
|
+
},
|
|
73
|
+
};
|
|
74
|
+
const handler = createPostRunLogsUpgradeHandler(appContext);
|
|
75
|
+
const request = { headers: { origin: 'https://attacker.example' } };
|
|
76
|
+
const socket = { write: vi.fn(), destroy: vi.fn() };
|
|
77
|
+
const wss = { handleUpgrade: vi.fn() };
|
|
78
|
+
handler(request, socket, Buffer.alloc(0), new URL('http://localhost/post-run-logs'), wss, new WeakMap());
|
|
79
|
+
expect(socket.write).toHaveBeenCalledWith(expect.stringContaining('Unauthorized origin'));
|
|
80
|
+
expect(logger.warn).not.toHaveBeenCalledWith('Post-run logs WebSocket missing workspaceId');
|
|
81
|
+
expect(wss.handleUpgrade).not.toHaveBeenCalled();
|
|
82
|
+
});
|
|
55
83
|
it('streams buffered/live output and cleans up subscription on close', () => {
|
|
56
84
|
const workspaceId = 'workspace-1';
|
|
57
85
|
const logger = createLogger();
|
|
@@ -66,13 +94,16 @@ describe('createPostRunLogsUpgradeHandler', () => {
|
|
|
66
94
|
};
|
|
67
95
|
const appContext = {
|
|
68
96
|
services: {
|
|
97
|
+
configService: {
|
|
98
|
+
getCorsConfig: vi.fn(() => ({ allowedOrigins: [allowedOrigin] })),
|
|
99
|
+
},
|
|
69
100
|
createLogger: vi.fn(() => logger),
|
|
70
101
|
runScriptService,
|
|
71
102
|
},
|
|
72
103
|
};
|
|
73
104
|
const ws = new MockWebSocket();
|
|
74
105
|
const handler = createPostRunLogsUpgradeHandler(appContext);
|
|
75
|
-
const request = {};
|
|
106
|
+
const request = { headers: { origin: allowedOrigin } };
|
|
76
107
|
const socket = { write: vi.fn(), destroy: vi.fn() };
|
|
77
108
|
const wss = createWssFromQueue([ws]);
|
|
78
109
|
const wsAliveMap = new WeakMap();
|
|
@@ -111,6 +142,9 @@ describe('createPostRunLogsUpgradeHandler', () => {
|
|
|
111
142
|
};
|
|
112
143
|
const appContext = {
|
|
113
144
|
services: {
|
|
145
|
+
configService: {
|
|
146
|
+
getCorsConfig: vi.fn(() => ({ allowedOrigins: [allowedOrigin] })),
|
|
147
|
+
},
|
|
114
148
|
createLogger: vi.fn(() => logger),
|
|
115
149
|
runScriptService,
|
|
116
150
|
},
|
|
@@ -118,7 +152,7 @@ describe('createPostRunLogsUpgradeHandler', () => {
|
|
|
118
152
|
const ws1 = new MockWebSocket();
|
|
119
153
|
const ws2 = new MockWebSocket();
|
|
120
154
|
const handler = createPostRunLogsUpgradeHandler(appContext);
|
|
121
|
-
const request = {};
|
|
155
|
+
const request = { headers: { origin: allowedOrigin } };
|
|
122
156
|
const socket = { write: vi.fn(), destroy: vi.fn() };
|
|
123
157
|
const wss = createWssFromQueue([ws1, ws2]);
|
|
124
158
|
const wsAliveMap = new WeakMap();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"post-run-logs.handler.test.js","sourceRoot":"","sources":["../../../../../src/backend/routers/websocket/post-run-logs.handler.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAG3C,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAG9D,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,+BAA+B,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAElG,MAAM,aAAc,SAAQ,YAAY;IACtC,UAAU,GAAW,cAAc,CAAC,IAAI,CAAC;IACzC,IAAI,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;CAChB;AAED,SAAS,YAAY;IACnB,OAAO;QACL,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE;QACd,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE;QACb,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE;QACb,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE;KACf,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAsB;IAChD,OAAO;QACL,aAAa,EAAE,EAAE,CAAC,EAAE,CAClB,CACE,QAAyB,EACzB,OAAe,EACf,KAAa,EACb,QAAqC,EACrC,EAAE;YACF,MAAM,EAAE,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;YACzB,IAAI,CAAC,EAAE,EAAE,CAAC;gBACR,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;YACjD,CAAC;YACD,QAAQ,CAAC,EAA0B,CAAC,CAAC;QACvC,CAAC,CACF;KAC4B,CAAC;AAClC,CAAC;AAED,QAAQ,CAAC,iCAAiC,EAAE,GAAG,EAAE;IAC/C,UAAU,CAAC,GAAG,EAAE;QACd,sBAAsB,CAAC,KAAK,EAAE,CAAC;QAC/B,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;QACtD,MAAM,MAAM,GAAG,YAAY,EAAE,CAAC;QAC9B,MAAM,gBAAgB,GAAG;YACvB,sBAAsB,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;YACvC,wBAAwB,EAAE,EAAE,CAAC,EAAE,EAAE;SAClC,CAAC;QACF,MAAM,UAAU,GAAG;YACjB,QAAQ,EAAE;gBACR,YAAY,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC;gBACjC,gBAAgB;aACjB;SACuB,CAAC;QAE3B,MAAM,OAAO,GAAG,+BAA+B,CAAC,UAAU,CAAC,CAAC;QAC5D,MAAM,OAAO,GAAG,EAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"post-run-logs.handler.test.js","sourceRoot":"","sources":["../../../../../src/backend/routers/websocket/post-run-logs.handler.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-terminal.handler.d.ts","sourceRoot":"","sources":["../../../../../src/backend/routers/websocket/setup-terminal.handler.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAGjD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AACrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAuHxD,wBAAgB,iCAAiC,CAAC,UAAU,EAAE,UAAU,IAKpE,SAAS,eAAe,EACxB,QAAQ,MAAM,EACd,MAAM,MAAM,EACZ,MAAM,GAAG,EACT,KAAK,eAAe,EACpB,YAAY,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,KACtC,IAAI,
|
|
1
|
+
{"version":3,"file":"setup-terminal.handler.d.ts","sourceRoot":"","sources":["../../../../../src/backend/routers/websocket/setup-terminal.handler.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAGjD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AACrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAuHxD,wBAAgB,iCAAiC,CAAC,UAAU,EAAE,UAAU,IAKpE,SAAS,eAAe,EACxB,QAAQ,MAAM,EACd,MAAM,MAAM,EACZ,MAAM,GAAG,EACT,KAAK,eAAe,EACpB,YAAY,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,KACtC,IAAI,CA6DR"}
|
|
@@ -4,7 +4,7 @@ import { WS_READY_STATE } from '../../../backend/constants/websocket.js';
|
|
|
4
4
|
import { toError } from '../../../backend/lib/error-utils.js';
|
|
5
5
|
import { SetupTerminalMessageSchema, } from '../../../backend/schemas/websocket/index.js';
|
|
6
6
|
import { toMessageString } from './message-utils.js';
|
|
7
|
-
import { markWebSocketAlive,
|
|
7
|
+
import { markWebSocketAlive, validateWebSocketOrigin } from './upgrade-utils.js';
|
|
8
8
|
const require = createRequire(import.meta.url);
|
|
9
9
|
function getNodePty() {
|
|
10
10
|
return require('node-pty');
|
|
@@ -80,16 +80,13 @@ export function createSetupTerminalUpgradeHandler(appContext) {
|
|
|
80
80
|
const logger = appContext.services.createLogger('setup-terminal-handler');
|
|
81
81
|
const { configService } = appContext.services;
|
|
82
82
|
return function handleSetupTerminalUpgrade(request, socket, head, _url, wss, wsAliveMap) {
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
if (!allowedOrigins.includes(origin)) {
|
|
91
|
-
logger.warn('Rejected setup terminal connection from unauthorized origin', { origin });
|
|
92
|
-
sendBadRequest(socket, 'Unauthorized origin');
|
|
83
|
+
if (!validateWebSocketOrigin({
|
|
84
|
+
request,
|
|
85
|
+
socket,
|
|
86
|
+
configService,
|
|
87
|
+
logger,
|
|
88
|
+
connectionName: 'setup terminal',
|
|
89
|
+
})) {
|
|
93
90
|
return;
|
|
94
91
|
}
|
|
95
92
|
wss.handleUpgrade(request, socket, head, (ws) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-terminal.handler.js","sourceRoot":"","sources":["../../../../../src/backend/routers/websocket/setup-terminal.handler.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAK1C,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAEL,0BAA0B,GAC3B,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,
|
|
1
|
+
{"version":3,"file":"setup-terminal.handler.js","sourceRoot":"","sources":["../../../../../src/backend/routers/websocket/setup-terminal.handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"snapshots.handler.d.ts","sourceRoot":"","sources":["../../../../../src/backend/routers/websocket/snapshots.handler.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AACjD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AACrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"snapshots.handler.d.ts","sourceRoot":"","sources":["../../../../../src/backend/routers/websocket/snapshots.handler.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AACjD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AACrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAyBxD,MAAM,MAAM,sBAAsB,GAAG,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;AAMjE,eAAO,MAAM,mBAAmB,EAAE,sBAAkC,CAAC;AAMrE,cAAM,8BAA8B;IAClC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,uBAAuB,CAAwD;IACvF,OAAO,CAAC,uBAAuB,CAAwD;IAEvF,MAAM,CACJ,WAAW,EAAE,sBAAsB,EACnC,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,cAAc,CAAC,CAAC,GACzD,IAAI;IA2DP,KAAK,IAAI,IAAI;CAiBd;AAQD,wBAAgB,kCAAkC,IAAI,IAAI,CAGzD;AAMD,wBAAgB,6BAA6B,CAC3C,UAAU,EAAE,UAAU,EACtB,OAAO,GAAE;IACP,WAAW,CAAC,EAAE,sBAAsB,CAAC;IACrC,iBAAiB,CAAC,EAAE,8BAA8B,CAAC;CAC/C,IAQJ,SAAS,eAAe,EACxB,QAAQ,MAAM,EACd,MAAM,MAAM,EACZ,KAAK,GAAG,EACR,KAAK,eAAe,EACpB,YAAY,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,KACtC,IAAI,CA8ER"}
|
|
@@ -2,7 +2,7 @@ import { WS_READY_STATE } from '../../../backend/constants/websocket.js';
|
|
|
2
2
|
import { snapshotReconciliationService } from '../../../backend/orchestration/snapshot-reconciliation.orchestrator.js';
|
|
3
3
|
import { SNAPSHOT_CHANGED, SNAPSHOT_REMOVED, workspaceSnapshotStore, } from '../../../backend/services/workspace-snapshot-store.service.js';
|
|
4
4
|
import { WorkspaceStatus } from '../../../shared/core/index.js';
|
|
5
|
-
import { getOrCreateConnectionSet, markWebSocketAlive, sendBadRequest } from './upgrade-utils.js';
|
|
5
|
+
import { getOrCreateConnectionSet, markWebSocketAlive, sendBadRequest, validateWebSocketOrigin, } from './upgrade-utils.js';
|
|
6
6
|
export const snapshotConnections = new Map();
|
|
7
7
|
class SnapshotStoreSubscriptionState {
|
|
8
8
|
active = false;
|
|
@@ -80,9 +80,19 @@ export function resetSnapshotsHandlerStateForTests() {
|
|
|
80
80
|
}
|
|
81
81
|
export function createSnapshotsUpgradeHandler(appContext, options = {}) {
|
|
82
82
|
const logger = appContext.services.createLogger('snapshots-handler');
|
|
83
|
+
const { configService } = appContext.services;
|
|
83
84
|
const connections = options.connections ?? snapshotConnections;
|
|
84
85
|
const subscriptionState = options.subscriptionState ?? defaultSnapshotStoreSubscriptionState;
|
|
85
86
|
return function handleSnapshotsUpgrade(request, socket, head, url, wss, wsAliveMap) {
|
|
87
|
+
if (!validateWebSocketOrigin({
|
|
88
|
+
request,
|
|
89
|
+
socket,
|
|
90
|
+
configService,
|
|
91
|
+
logger,
|
|
92
|
+
connectionName: 'snapshots WebSocket',
|
|
93
|
+
})) {
|
|
94
|
+
return;
|
|
95
|
+
}
|
|
86
96
|
subscriptionState.ensure(connections, logger);
|
|
87
97
|
const projectId = url.searchParams.get('projectId');
|
|
88
98
|
if (!projectId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"snapshots.handler.js","sourceRoot":"","sources":["../../../../../src/backend/routers/websocket/snapshots.handler.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,6BAA6B,EAAE,MAAM,8DAA8D,CAAC;AAC7G,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAGhB,sBAAsB,GACvB,MAAM,qDAAqD,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,
|
|
1
|
+
{"version":3,"file":"snapshots.handler.js","sourceRoot":"","sources":["../../../../../src/backend/routers/websocket/snapshots.handler.ts"],"names":[],"mappings":"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"}
|