@terreno/ai 57.8.0 → 57.10.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.cursorrules +2 -2
- package/README.md +2 -1
- package/bunfig.toml +1 -1
- package/dist/aiApp.d.ts +16 -5
- package/dist/aiApp.js +17 -7
- package/dist/harness/adminScreens.d.ts +6 -0
- package/dist/harness/adminScreens.js +11 -0
- package/dist/harness/agentLoop.d.ts +61 -0
- package/dist/harness/agentLoop.js +798 -0
- package/dist/harness/agentTaskNames.d.ts +4 -0
- package/dist/harness/agentTaskNames.js +7 -0
- package/dist/harness/approvalPolicy.d.ts +3 -0
- package/dist/harness/approvalPolicy.js +23 -0
- package/dist/harness/approvals.d.ts +101 -0
- package/dist/harness/approvals.js +468 -0
- package/dist/harness/commit.d.ts +238 -0
- package/dist/harness/commit.js +678 -0
- package/dist/harness/conversation.d.ts +75 -0
- package/dist/harness/conversation.js +397 -0
- package/dist/harness/defineAgent.d.ts +9 -0
- package/dist/harness/defineAgent.js +65 -0
- package/dist/harness/defineTask.d.ts +11 -0
- package/dist/harness/defineTask.js +59 -0
- package/dist/harness/defineTool.d.ts +7 -0
- package/dist/harness/defineTool.js +36 -0
- package/dist/harness/definitionError.d.ts +8 -0
- package/dist/harness/definitionError.js +15 -0
- package/dist/harness/errors.d.ts +127 -0
- package/dist/harness/errors.js +101 -0
- package/dist/harness/eventHub.d.ts +45 -0
- package/dist/harness/eventHub.js +135 -0
- package/dist/harness/events.d.ts +95 -0
- package/dist/harness/events.js +267 -0
- package/dist/harness/executionEnv.d.ts +31 -0
- package/dist/harness/executionEnv.js +2 -0
- package/dist/harness/extensions.d.ts +82 -0
- package/dist/harness/extensions.js +274 -0
- package/dist/harness/harness.d.ts +163 -0
- package/dist/harness/harness.js +520 -0
- package/dist/harness/harnessApp.d.ts +44 -0
- package/dist/harness/harnessApp.js +62 -0
- package/dist/harness/internalRuntime.d.ts +16 -0
- package/dist/harness/internalRuntime.js +18 -0
- package/dist/harness/leases.d.ts +35 -0
- package/dist/harness/leases.js +86 -0
- package/dist/harness/memo.d.ts +24 -0
- package/dist/harness/memo.js +78 -0
- package/dist/harness/modelCall.d.ts +45 -0
- package/dist/harness/modelCall.js +147 -0
- package/dist/harness/models/harnessApproval.d.ts +2 -0
- package/dist/harness/models/harnessApproval.js +100 -0
- package/dist/harness/models/harnessConversation.d.ts +2 -0
- package/dist/harness/models/harnessConversation.js +117 -0
- package/dist/harness/models/harnessEvent.d.ts +3 -0
- package/dist/harness/models/harnessEvent.js +73 -0
- package/dist/harness/models/harnessInboxEvent.d.ts +2 -0
- package/dist/harness/models/harnessInboxEvent.js +58 -0
- package/dist/harness/models/harnessMemo.d.ts +2 -0
- package/dist/harness/models/harnessMemo.js +42 -0
- package/dist/harness/models/harnessMessage.d.ts +2 -0
- package/dist/harness/models/harnessMessage.js +73 -0
- package/dist/harness/models/harnessOwner.d.ts +2 -0
- package/dist/harness/models/harnessOwner.js +36 -0
- package/dist/harness/models/harnessTask.d.ts +2 -0
- package/dist/harness/models/harnessTask.js +186 -0
- package/dist/harness/ownership.d.ts +89 -0
- package/dist/harness/ownership.js +438 -0
- package/dist/harness/registry.d.ts +29 -0
- package/dist/harness/registry.js +93 -0
- package/dist/harness/retryBackoff.d.ts +31 -0
- package/dist/harness/retryBackoff.js +50 -0
- package/dist/harness/routes/approvals.d.ts +13 -0
- package/dist/harness/routes/approvals.js +93 -0
- package/dist/harness/routes/conversations.d.ts +11 -0
- package/dist/harness/routes/conversations.js +66 -0
- package/dist/harness/routes/events.d.ts +19 -0
- package/dist/harness/routes/events.js +215 -0
- package/dist/harness/routes/tasks.d.ts +11 -0
- package/dist/harness/routes/tasks.js +108 -0
- package/dist/harness/runners/inProcessRunner.d.ts +57 -0
- package/dist/harness/runners/inProcessRunner.js +196 -0
- package/dist/harness/runtime.d.ts +34 -0
- package/dist/harness/runtime.js +551 -0
- package/dist/harness/subagent.d.ts +53 -0
- package/dist/harness/subagent.js +134 -0
- package/dist/harness/suspend.d.ts +8 -0
- package/dist/harness/suspend.js +16 -0
- package/dist/harness/transaction.d.ts +3 -0
- package/dist/harness/transaction.js +22 -0
- package/dist/harness/waits.d.ts +100 -0
- package/dist/harness/waits.js +214 -0
- package/dist/index.d.ts +19 -1
- package/dist/index.js +45 -2
- package/dist/models/aiDataset.d.ts +2 -0
- package/dist/models/aiDataset.js +67 -0
- package/dist/models/aiRequest.js +1 -1
- package/dist/models/gptHistory.js +88 -2
- package/dist/observability/adminScreens.d.ts +5 -0
- package/dist/observability/adminScreens.js +32 -0
- package/dist/observability/compileTemplate.d.ts +1 -0
- package/dist/observability/compileTemplate.js +13 -0
- package/dist/observability/datasetImport.d.ts +11 -0
- package/dist/observability/datasetImport.js +185 -0
- package/dist/observability/evaluate.d.ts +31 -0
- package/dist/observability/evaluate.js +200 -0
- package/dist/observability/evaluatorTemplates.d.ts +17 -0
- package/dist/observability/evaluatorTemplates.js +111 -0
- package/dist/observability/jsonPath.d.ts +2 -0
- package/dist/observability/jsonPath.js +57 -0
- package/dist/observability/local/datasetStore.d.ts +87 -0
- package/dist/observability/local/datasetStore.js +326 -0
- package/dist/observability/local/evaluatorStore.d.ts +44 -0
- package/dist/observability/local/evaluatorStore.js +182 -0
- package/dist/observability/local/experimentRunner.d.ts +96 -0
- package/dist/observability/local/experimentRunner.js +419 -0
- package/dist/observability/local/localPlugin.d.ts +22 -0
- package/dist/observability/local/localPlugin.js +76 -0
- package/dist/observability/local/models/obsDataset.d.ts +2 -0
- package/dist/observability/local/models/obsDataset.js +37 -0
- package/dist/observability/local/models/obsDatasetItem.d.ts +2 -0
- package/dist/observability/local/models/obsDatasetItem.js +76 -0
- package/dist/observability/local/models/obsEvaluator.d.ts +2 -0
- package/dist/observability/local/models/obsEvaluator.js +98 -0
- package/dist/observability/local/models/obsExperiment.d.ts +2 -0
- package/dist/observability/local/models/obsExperiment.js +87 -0
- package/dist/observability/local/models/obsExperimentItem.d.ts +2 -0
- package/dist/observability/local/models/obsExperimentItem.js +45 -0
- package/dist/observability/local/models/obsPrompt.d.ts +2 -0
- package/dist/observability/local/models/obsPrompt.js +42 -0
- package/dist/observability/local/models/obsPromptLabel.d.ts +2 -0
- package/dist/observability/local/models/obsPromptLabel.js +39 -0
- package/dist/observability/local/models/obsPromptVersion.d.ts +2 -0
- package/dist/observability/local/models/obsPromptVersion.js +96 -0
- package/dist/observability/local/models/obsReviewItem.d.ts +2 -0
- package/dist/observability/local/models/obsReviewItem.js +75 -0
- package/dist/observability/local/models/obsScore.d.ts +2 -0
- package/dist/observability/local/models/obsScore.js +58 -0
- package/dist/observability/local/models/obsSpan.d.ts +2 -0
- package/dist/observability/local/models/obsSpan.js +64 -0
- package/dist/observability/local/models/obsTrace.d.ts +2 -0
- package/dist/observability/local/models/obsTrace.js +93 -0
- package/dist/observability/local/promptStore.d.ts +180 -0
- package/dist/observability/local/promptStore.js +444 -0
- package/dist/observability/local/reviewStore.d.ts +50 -0
- package/dist/observability/local/reviewStore.js +203 -0
- package/dist/observability/local/traceStore.d.ts +103 -0
- package/dist/observability/local/traceStore.js +325 -0
- package/dist/observability/observabilityApp.d.ts +24 -0
- package/dist/observability/observabilityApp.js +157 -0
- package/dist/observability/observabilityAppRegistry.d.ts +14 -0
- package/dist/observability/observabilityAppRegistry.js +16 -0
- package/dist/observability/permissions.d.ts +7 -0
- package/dist/observability/permissions.js +60 -0
- package/dist/observability/reviewPanels.d.ts +18 -0
- package/dist/observability/reviewPanels.js +46 -0
- package/dist/observability/routes/datasets.d.ts +7 -0
- package/dist/observability/routes/datasets.js +149 -0
- package/dist/observability/routes/evaluators.d.ts +7 -0
- package/dist/observability/routes/evaluators.js +123 -0
- package/dist/observability/routes/experiments.d.ts +7 -0
- package/dist/observability/routes/experiments.js +95 -0
- package/dist/observability/routes/observabilityRouteAccess.d.ts +13 -0
- package/dist/observability/routes/observabilityRouteAccess.js +67 -0
- package/dist/observability/routes/prompts.d.ts +12 -0
- package/dist/observability/routes/prompts.js +172 -0
- package/dist/observability/routes/requestAiService.d.ts +13 -0
- package/dist/observability/routes/requestAiService.js +21 -0
- package/dist/observability/routes/review.d.ts +7 -0
- package/dist/observability/routes/review.js +79 -0
- package/dist/observability/routes/status.d.ts +5 -0
- package/dist/observability/routes/status.js +31 -0
- package/dist/observability/routes/testMultiStage.d.ts +9 -0
- package/dist/observability/routes/testMultiStage.js +67 -0
- package/dist/observability/routes/traces.d.ts +7 -0
- package/dist/observability/routes/traces.js +129 -0
- package/dist/observability/schemaValidation.d.ts +5 -0
- package/dist/observability/schemaValidation.js +26 -0
- package/dist/observability/sopThresholds.d.ts +2 -0
- package/dist/observability/sopThresholds.js +21 -0
- package/dist/observability/status.d.ts +23 -0
- package/dist/observability/status.js +34 -0
- package/dist/observability/testMultiStageSchemas.d.ts +10 -0
- package/dist/observability/testMultiStageSchemas.js +79 -0
- package/dist/observability/testMultiStageWorkflow.d.ts +20 -0
- package/dist/observability/testMultiStageWorkflow.js +218 -0
- package/dist/observability/types.d.ts +159 -0
- package/dist/observability/types.js +67 -0
- package/dist/routes/files.js +20 -7
- package/dist/routes/gpt.js +179 -488
- package/dist/routes/gptActions.d.ts +9 -0
- package/dist/routes/gptActions.js +212 -0
- package/dist/routes/gptDatasets.d.ts +5 -0
- package/dist/routes/gptDatasets.js +94 -0
- package/dist/routes/gptHistories.d.ts +3 -1
- package/dist/routes/gptHistories.js +188 -2
- package/dist/service/aiDatasets.d.ts +57 -0
- package/dist/service/aiDatasets.js +253 -0
- package/dist/service/aiService.d.ts +50 -1
- package/dist/service/aiService.js +431 -77
- package/dist/service/askFiles.d.ts +49 -0
- package/dist/service/askFiles.js +162 -0
- package/dist/service/asks.d.ts +76 -0
- package/dist/service/asks.js +284 -0
- package/dist/service/chatTurn.d.ts +128 -0
- package/dist/service/chatTurn.js +1674 -0
- package/dist/service/fileStorage.d.ts +4 -0
- package/dist/service/fileStorage.js +7 -2
- package/dist/service/fileUploadsGate.d.ts +8 -0
- package/dist/service/fileUploadsGate.js +18 -0
- package/dist/service/fillActionIds.d.ts +6 -0
- package/dist/service/fillActionIds.js +79 -0
- package/dist/service/gemini.d.ts +3 -3
- package/dist/service/gemini.js +3 -3
- package/dist/service/jsonFenceModel.d.ts +7 -0
- package/dist/service/jsonFenceModel.js +45 -0
- package/dist/service/prompts.d.ts +52 -0
- package/dist/service/prompts.js +96 -1
- package/dist/service/sanitizeHtml.d.ts +11 -0
- package/dist/service/sanitizeHtml.js +108 -0
- package/dist/service/vertex.d.ts +6 -6
- package/dist/service/vertex.js +5 -5
- package/dist/types/harness.d.ts +934 -0
- package/dist/types/harness.js +133 -0
- package/dist/types/index.d.ts +219 -13
- package/dist/types/index.js +2 -0
- package/dist/types/observability.d.ts +288 -0
- package/dist/types/observability.js +2 -0
- package/package.json +17 -5
- package/src/aiApp.test.ts +207 -1
- package/src/aiApp.ts +31 -8
- package/src/harness/adminScreens.test.ts +34 -0
- package/src/harness/adminScreens.ts +11 -0
- package/src/harness/agentLoop.test.ts +1034 -0
- package/src/harness/agentLoop.ts +1082 -0
- package/src/harness/agentRecovery.test.ts +380 -0
- package/src/harness/agentTaskNames.ts +4 -0
- package/src/harness/approvalPolicy.ts +28 -0
- package/src/harness/approvals.test.ts +1094 -0
- package/src/harness/approvals.ts +644 -0
- package/src/harness/commit.ts +1049 -0
- package/src/harness/conversation.ts +503 -0
- package/src/harness/defineAgent.test.ts +92 -0
- package/src/harness/defineAgent.ts +82 -0
- package/src/harness/defineTask.test.ts +59 -0
- package/src/harness/defineTask.ts +76 -0
- package/src/harness/defineTool.ts +45 -0
- package/src/harness/definitionError.ts +13 -0
- package/src/harness/errors.test.ts +90 -0
- package/src/harness/errors.ts +119 -0
- package/src/harness/eventHub.test.ts +124 -0
- package/src/harness/eventHub.ts +159 -0
- package/src/harness/events.test.ts +757 -0
- package/src/harness/events.ts +384 -0
- package/src/harness/executionEnv.ts +34 -0
- package/src/harness/extensions.test.ts +1218 -0
- package/src/harness/extensions.ts +382 -0
- package/src/harness/harness.test.ts +693 -0
- package/src/harness/harness.ts +767 -0
- package/src/harness/harnessApp.ts +76 -0
- package/src/harness/internalRuntime.ts +44 -0
- package/src/harness/leases.ts +132 -0
- package/src/harness/memo.ts +107 -0
- package/src/harness/modelCall.test.ts +134 -0
- package/src/harness/modelCall.ts +200 -0
- package/src/harness/models/harnessApproval.ts +109 -0
- package/src/harness/models/harnessConversation.ts +142 -0
- package/src/harness/models/harnessEvent.ts +92 -0
- package/src/harness/models/harnessInboxEvent.ts +73 -0
- package/src/harness/models/harnessMemo.ts +43 -0
- package/src/harness/models/harnessMessage.ts +85 -0
- package/src/harness/models/harnessModels.test.ts +60 -0
- package/src/harness/models/harnessOwner.ts +40 -0
- package/src/harness/models/harnessTask.ts +201 -0
- package/src/harness/ownership.test.ts +1087 -0
- package/src/harness/ownership.ts +618 -0
- package/src/harness/recovery.test.ts +912 -0
- package/src/harness/registry.ts +124 -0
- package/src/harness/retries.test.ts +292 -0
- package/src/harness/retryBackoff.test.ts +100 -0
- package/src/harness/retryBackoff.ts +77 -0
- package/src/harness/routes/approvals.ts +123 -0
- package/src/harness/routes/conversations.test.ts +518 -0
- package/src/harness/routes/conversations.ts +102 -0
- package/src/harness/routes/events.ts +280 -0
- package/src/harness/routes/tasks.test.ts +198 -0
- package/src/harness/routes/tasks.ts +146 -0
- package/src/harness/runners/inProcessRunner.test.ts +402 -0
- package/src/harness/runners/inProcessRunner.ts +220 -0
- package/src/harness/runtime.ts +714 -0
- package/src/harness/subagent.test.ts +696 -0
- package/src/harness/subagent.ts +192 -0
- package/src/harness/suspend.ts +13 -0
- package/src/harness/transaction.ts +17 -0
- package/src/harness/versioning.test.ts +288 -0
- package/src/harness/waits.test.ts +693 -0
- package/src/harness/waits.ts +356 -0
- package/src/index.test.ts +13 -0
- package/src/index.ts +70 -0
- package/src/isolated/adminScreensConfig.isolated.ts +143 -0
- package/src/models/aiDataset.test.ts +34 -0
- package/src/models/aiDataset.ts +78 -0
- package/src/models/aiRequest.test.ts +2 -2
- package/src/models/aiRequest.ts +2 -1
- package/src/models/gptHistory.test.ts +156 -0
- package/src/models/gptHistory.ts +106 -4
- package/src/observability/adminScreens.test.ts +71 -0
- package/src/observability/adminScreens.ts +42 -0
- package/src/observability/compileTemplate.test.ts +14 -0
- package/src/observability/compileTemplate.ts +10 -0
- package/src/observability/datasetImport.test.ts +95 -0
- package/src/observability/datasetImport.ts +220 -0
- package/src/observability/evaluate.test.ts +549 -0
- package/src/observability/evaluate.ts +254 -0
- package/src/observability/evaluatorTemplates.ts +124 -0
- package/src/observability/jsonPath.test.ts +52 -0
- package/src/observability/jsonPath.ts +60 -0
- package/src/observability/local/datasetStore.test.ts +230 -0
- package/src/observability/local/datasetStore.ts +452 -0
- package/src/observability/local/evaluatorStore.test.ts +138 -0
- package/src/observability/local/evaluatorStore.ts +224 -0
- package/src/observability/local/experimentRunner.test.ts +489 -0
- package/src/observability/local/experimentRunner.ts +548 -0
- package/src/observability/local/localPlugin.ts +88 -0
- package/src/observability/local/models/obsDataset.ts +38 -0
- package/src/observability/local/models/obsDatasetItem.ts +80 -0
- package/src/observability/local/models/obsEvaluator.ts +102 -0
- package/src/observability/local/models/obsExperiment.ts +91 -0
- package/src/observability/local/models/obsExperimentItem.ts +52 -0
- package/src/observability/local/models/obsPrompt.ts +43 -0
- package/src/observability/local/models/obsPromptLabel.ts +43 -0
- package/src/observability/local/models/obsPromptVersion.ts +107 -0
- package/src/observability/local/models/obsReviewItem.ts +79 -0
- package/src/observability/local/models/obsScore.ts +59 -0
- package/src/observability/local/models/obsSpan.ts +65 -0
- package/src/observability/local/models/obsTrace.ts +94 -0
- package/src/observability/local/obsModels.test.ts +119 -0
- package/src/observability/local/promptStore.test.ts +351 -0
- package/src/observability/local/promptStore.ts +665 -0
- package/src/observability/local/reviewStore.test.ts +164 -0
- package/src/observability/local/reviewStore.ts +264 -0
- package/src/observability/local/traceStore.test.ts +264 -0
- package/src/observability/local/traceStore.ts +440 -0
- package/src/observability/observabilityApp.test.ts +92 -0
- package/src/observability/observabilityApp.ts +185 -0
- package/src/observability/observabilityAppRegistry.test.ts +30 -0
- package/src/observability/observabilityAppRegistry.ts +35 -0
- package/src/observability/permissions.test.ts +96 -0
- package/src/observability/permissions.ts +78 -0
- package/src/observability/reviewPanels.test.ts +35 -0
- package/src/observability/reviewPanels.ts +64 -0
- package/src/observability/routes/datasets.test.ts +176 -0
- package/src/observability/routes/datasets.ts +252 -0
- package/src/observability/routes/evaluators.test.ts +119 -0
- package/src/observability/routes/evaluators.ts +207 -0
- package/src/observability/routes/experiments.test.ts +282 -0
- package/src/observability/routes/experiments.ts +152 -0
- package/src/observability/routes/observabilityRbac.test.ts +767 -0
- package/src/observability/routes/observabilityRouteAccess.ts +106 -0
- package/src/observability/routes/prompts.test.ts +320 -0
- package/src/observability/routes/prompts.ts +263 -0
- package/src/observability/routes/requestAiService.ts +36 -0
- package/src/observability/routes/review.test.ts +120 -0
- package/src/observability/routes/review.ts +125 -0
- package/src/observability/routes/status.test.ts +116 -0
- package/src/observability/routes/status.ts +47 -0
- package/src/observability/routes/testMultiStage.test.ts +214 -0
- package/src/observability/routes/testMultiStage.ts +96 -0
- package/src/observability/routes/traces.test.ts +167 -0
- package/src/observability/routes/traces.ts +172 -0
- package/src/observability/schemaValidation.ts +29 -0
- package/src/observability/sopThresholds.ts +20 -0
- package/src/observability/status.test.ts +38 -0
- package/src/observability/status.ts +56 -0
- package/src/observability/testMultiStageSchemas.ts +95 -0
- package/src/observability/testMultiStageWorkflow.test.ts +114 -0
- package/src/observability/testMultiStageWorkflow.ts +307 -0
- package/src/observability/types.ts +262 -0
- package/src/routes/files.test.ts +84 -9
- package/src/routes/files.ts +23 -7
- package/src/routes/gpt.test.ts +3279 -0
- package/src/routes/gpt.ts +214 -552
- package/src/routes/gptActions.test.ts +241 -0
- package/src/routes/gptActions.ts +255 -0
- package/src/routes/gptApprovals.test.ts +762 -0
- package/src/routes/gptDatasets.test.ts +86 -0
- package/src/routes/gptDatasets.ts +104 -0
- package/src/routes/gptFiles.test.ts +589 -0
- package/src/routes/gptHistories.test.ts +933 -0
- package/src/routes/gptHistories.ts +266 -5
- package/src/routes/routes.test.ts +676 -5
- package/src/service/aiDatasets.test.ts +123 -0
- package/src/service/aiDatasets.ts +316 -0
- package/src/service/aiService.test.ts +614 -0
- package/src/service/aiService.ts +575 -111
- package/src/service/askFiles.test.ts +96 -0
- package/src/service/askFiles.ts +222 -0
- package/src/service/asks.test.ts +946 -0
- package/src/service/asks.ts +423 -0
- package/src/service/chatTurn.ts +2287 -0
- package/src/service/fileStorage.test.ts +11 -0
- package/src/service/fileStorage.ts +10 -2
- package/src/service/fileUploadsGate.ts +23 -0
- package/src/service/fillActionIds.test.ts +65 -0
- package/src/service/fillActionIds.ts +98 -0
- package/src/service/gemini.test.ts +16 -10
- package/src/service/gemini.ts +3 -3
- package/src/service/jsonFenceModel.test.ts +47 -0
- package/src/service/jsonFenceModel.ts +53 -0
- package/src/service/prompts.test.ts +21 -0
- package/src/service/prompts.ts +147 -0
- package/src/service/sanitizeHtml.test.ts +61 -0
- package/src/service/sanitizeHtml.ts +109 -0
- package/src/service/vertex.test.ts +49 -49
- package/src/service/vertex.ts +7 -8
- package/src/tests/bunSetup.test.ts +7 -4
- package/src/tests/bunSetup.ts +7 -7
- package/src/tests/chatHarness.ts +478 -0
- package/src/tests/generateStream.ts +49 -0
- package/src/tests/harnessErrors.ts +22 -0
- package/src/tests/harnessStreaming.ts +227 -0
- package/src/tests/helpers.ts +9 -2
- package/src/types/harness.ts +1095 -0
- package/src/types/index.ts +237 -12
- package/src/types/observability.ts +344 -0
- package/src/types/sanitize-html.d.ts +25 -0
package/src/routes/files.test.ts
CHANGED
|
@@ -34,6 +34,7 @@ describe("File Routes", () => {
|
|
|
34
34
|
async (params: UploadFileParams): Promise<UploadFileResult> => ({
|
|
35
35
|
filename: params.filename,
|
|
36
36
|
gcsKey: `uploads/${params.userId.toString()}/${params.filename}`,
|
|
37
|
+
id: "6710c2a4f1c0de0000000001",
|
|
37
38
|
mimeType: params.mimeType,
|
|
38
39
|
size: params.buffer.length,
|
|
39
40
|
url: `https://example.com/${params.filename}`,
|
|
@@ -69,6 +70,27 @@ describe("File Routes", () => {
|
|
|
69
70
|
expect(res.status).toBe(400);
|
|
70
71
|
});
|
|
71
72
|
|
|
73
|
+
it("rejects uploads when file uploads are disabled", async () => {
|
|
74
|
+
const gated = new TerrenoApp({
|
|
75
|
+
configureApp: (router, options) => {
|
|
76
|
+
addFileRoutes(router, {
|
|
77
|
+
fileStorageService: fileStorageService as FileStorageService,
|
|
78
|
+
fileUploadsEnabled: async () => false,
|
|
79
|
+
openApiOptions: options,
|
|
80
|
+
});
|
|
81
|
+
},
|
|
82
|
+
skipListen: true,
|
|
83
|
+
userModel: UserModel,
|
|
84
|
+
}).build();
|
|
85
|
+
const agent = await authAsUser(gated, "notAdmin");
|
|
86
|
+
const res = await agent
|
|
87
|
+
.post("/files/upload")
|
|
88
|
+
.attach("file", Buffer.from("hello"), {contentType: "text/plain", filename: "hi.txt"});
|
|
89
|
+
expect(res.status).toBe(403);
|
|
90
|
+
expect(res.body.title).toBe("File uploads are disabled");
|
|
91
|
+
expect(fileStorageService.upload as ReturnType<typeof mock>).not.toHaveBeenCalled();
|
|
92
|
+
});
|
|
93
|
+
|
|
72
94
|
it("rejects unsupported mime types", async () => {
|
|
73
95
|
const agent = await authAsUser(app, "notAdmin");
|
|
74
96
|
const res = await agent.post("/files/upload").attach("file", Buffer.from("<html></html>"), {
|
|
@@ -80,25 +102,62 @@ describe("File Routes", () => {
|
|
|
80
102
|
});
|
|
81
103
|
|
|
82
104
|
describe("GET /files/*gcsKey", () => {
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
expect(res.status).toBe(404);
|
|
86
|
-
});
|
|
87
|
-
|
|
88
|
-
it("returns the signed URL when the file exists", async () => {
|
|
89
|
-
const attachment = await FileAttachment.create({
|
|
105
|
+
const createUserFile = (): Promise<unknown> =>
|
|
106
|
+
FileAttachment.create({
|
|
90
107
|
filename: "hi.txt",
|
|
91
|
-
gcsKey:
|
|
108
|
+
gcsKey: `uploads/${userId.toString()}/1727550000000-hi.txt`,
|
|
92
109
|
mimeType: "text/plain",
|
|
93
110
|
size: 5,
|
|
94
111
|
url: "https://example.com/hi.txt",
|
|
95
112
|
userId,
|
|
96
113
|
});
|
|
97
|
-
|
|
114
|
+
const userFilePath = (): string => `/files/uploads/${userId.toString()}/1727550000000-hi.txt`;
|
|
115
|
+
|
|
116
|
+
it("returns 404 when the file is missing", async () => {
|
|
117
|
+
const agent = await authAsUser(app, "notAdmin");
|
|
118
|
+
const res = await agent.get("/files/missing/key.txt");
|
|
119
|
+
expect(res.status).toBe(404);
|
|
120
|
+
});
|
|
121
|
+
|
|
122
|
+
it("returns the signed URL when the requester owns the file", async () => {
|
|
123
|
+
await createUserFile();
|
|
124
|
+
const agent = await authAsUser(app, "notAdmin");
|
|
125
|
+
const res = await agent.get(userFilePath());
|
|
98
126
|
expect(res.status).toBe(200);
|
|
99
127
|
expect(res.body.data.url).toBe("https://example.com/signed");
|
|
100
128
|
expect(fileStorageService.getSignedUrl as ReturnType<typeof mock>).toHaveBeenCalledTimes(1);
|
|
101
129
|
});
|
|
130
|
+
|
|
131
|
+
it("requires authentication and signs no URL without it", async () => {
|
|
132
|
+
await createUserFile();
|
|
133
|
+
const res = await supertest(app).get(userFilePath());
|
|
134
|
+
expect(res.status).toBe(401);
|
|
135
|
+
expect(fileStorageService.getSignedUrl as ReturnType<typeof mock>).not.toHaveBeenCalled();
|
|
136
|
+
});
|
|
137
|
+
|
|
138
|
+
it("returns 404, as for a missing file, when another user owns the file", async () => {
|
|
139
|
+
await FileAttachment.create({
|
|
140
|
+
filename: "theirs.txt",
|
|
141
|
+
gcsKey: `uploads/${adminId.toString()}/1727550000000-theirs.txt`,
|
|
142
|
+
mimeType: "text/plain",
|
|
143
|
+
size: 6,
|
|
144
|
+
url: "https://example.com/theirs.txt",
|
|
145
|
+
userId: adminId,
|
|
146
|
+
});
|
|
147
|
+
const agent = await authAsUser(app, "notAdmin");
|
|
148
|
+
const res = await agent.get(`/files/uploads/${adminId.toString()}/1727550000000-theirs.txt`);
|
|
149
|
+
expect(res.status).toBe(404);
|
|
150
|
+
expect(res.body.title).toBe("File not found");
|
|
151
|
+
expect(fileStorageService.getSignedUrl as ReturnType<typeof mock>).not.toHaveBeenCalled();
|
|
152
|
+
});
|
|
153
|
+
|
|
154
|
+
it("returns 404 to an admin who does not own the file, as DELETE refuses them", async () => {
|
|
155
|
+
await createUserFile();
|
|
156
|
+
const agent = await authAsUser(app, "admin");
|
|
157
|
+
const res = await agent.get(userFilePath());
|
|
158
|
+
expect(res.status).toBe(404);
|
|
159
|
+
expect(fileStorageService.getSignedUrl as ReturnType<typeof mock>).not.toHaveBeenCalled();
|
|
160
|
+
});
|
|
102
161
|
});
|
|
103
162
|
|
|
104
163
|
describe("DELETE /files/*gcsKey", () => {
|
|
@@ -129,6 +188,22 @@ describe("File Routes", () => {
|
|
|
129
188
|
expect(fileStorageService.delete as ReturnType<typeof mock>).toHaveBeenCalledTimes(1);
|
|
130
189
|
});
|
|
131
190
|
|
|
191
|
+
it("deletes a file by the nested key an upload gets", async () => {
|
|
192
|
+
const gcsKey = `uploads/${userId.toString()}/1727550000000-mine.txt`;
|
|
193
|
+
await FileAttachment.create({
|
|
194
|
+
filename: "mine.txt",
|
|
195
|
+
gcsKey,
|
|
196
|
+
mimeType: "text/plain",
|
|
197
|
+
size: 4,
|
|
198
|
+
url: "https://example.com/mine.txt",
|
|
199
|
+
userId,
|
|
200
|
+
});
|
|
201
|
+
const agent = await authAsUser(app, "notAdmin");
|
|
202
|
+
const res = await agent.delete(`/files/${gcsKey}`);
|
|
203
|
+
expect(res.status).toBe(200);
|
|
204
|
+
expect(fileStorageService.delete as ReturnType<typeof mock>).toHaveBeenCalledWith(gcsKey);
|
|
205
|
+
});
|
|
206
|
+
|
|
132
207
|
it("returns 403 when the requester does not own the file", async () => {
|
|
133
208
|
const attachment = await FileAttachment.create({
|
|
134
209
|
filename: "theirs.txt",
|
package/src/routes/files.ts
CHANGED
|
@@ -5,6 +5,7 @@ import multer from "multer";
|
|
|
5
5
|
|
|
6
6
|
import {FileAttachment} from "../models/fileAttachment";
|
|
7
7
|
import type {FileStorageService} from "../service/fileStorage";
|
|
8
|
+
import {assertFileUploadsEnabled} from "../service/fileUploadsGate";
|
|
8
9
|
import type {FileRouteOptions} from "../types";
|
|
9
10
|
|
|
10
11
|
const ALLOWED_MIME_TYPES = new Set([
|
|
@@ -20,6 +21,15 @@ const ALLOWED_MIME_TYPES = new Set([
|
|
|
20
21
|
|
|
21
22
|
const DEFAULT_MAX_FILE_SIZE = 10 * 1024 * 1024; // 10MB
|
|
22
23
|
|
|
24
|
+
/** The `*gcsKey` wildcard as a key: Express 5 passes it as its path segments. */
|
|
25
|
+
const gcsKeyParam = (req: express.Request): string => {
|
|
26
|
+
const param = (req.params as Record<string, string | string[]>).gcsKey ?? "";
|
|
27
|
+
return Array.isArray(param) ? param.join("/") : param;
|
|
28
|
+
};
|
|
29
|
+
|
|
30
|
+
const requestUserId = (req: express.Request): mongoose.Types.ObjectId =>
|
|
31
|
+
(req.user as {_id?: mongoose.Types.ObjectId} | undefined)?._id as mongoose.Types.ObjectId;
|
|
32
|
+
|
|
23
33
|
export const addFileRoutes = (
|
|
24
34
|
router: express.Router,
|
|
25
35
|
options: FileRouteOptions & {fileStorageService: FileStorageService}
|
|
@@ -49,6 +59,7 @@ export const addFileRoutes = (
|
|
|
49
59
|
.withResponse(200, {
|
|
50
60
|
filename: {type: "string"},
|
|
51
61
|
gcsKey: {type: "string"},
|
|
62
|
+
id: {type: "string"},
|
|
52
63
|
mimeType: {type: "string"},
|
|
53
64
|
size: {type: "number"},
|
|
54
65
|
url: {type: "string"},
|
|
@@ -56,9 +67,9 @@ export const addFileRoutes = (
|
|
|
56
67
|
.build(),
|
|
57
68
|
],
|
|
58
69
|
asyncHandler(async (req: express.Request, res: express.Response) => {
|
|
70
|
+
await assertFileUploadsEnabled(req, options.fileUploadsEnabled);
|
|
59
71
|
const file = (req as express.Request & {file?: Express.Multer.File}).file;
|
|
60
|
-
const userId = (req
|
|
61
|
-
?._id as mongoose.Types.ObjectId;
|
|
72
|
+
const userId = requestUserId(req);
|
|
62
73
|
|
|
63
74
|
if (!file) {
|
|
64
75
|
throw new APIError({status: 400, title: "No file provided"});
|
|
@@ -78,6 +89,7 @@ export const addFileRoutes = (
|
|
|
78
89
|
router.get(
|
|
79
90
|
"/files/*gcsKey",
|
|
80
91
|
[
|
|
92
|
+
authenticateMiddleware(),
|
|
81
93
|
createOpenApiBuilder(options.openApiOptions ?? {})
|
|
82
94
|
.withTags(["files"])
|
|
83
95
|
.withSummary("Get file URL")
|
|
@@ -86,9 +98,14 @@ export const addFileRoutes = (
|
|
|
86
98
|
.build(),
|
|
87
99
|
],
|
|
88
100
|
asyncHandler(async (req: express.Request, res: express.Response) => {
|
|
89
|
-
const gcsKey = req
|
|
101
|
+
const gcsKey = gcsKeyParam(req);
|
|
90
102
|
|
|
91
|
-
|
|
103
|
+
// Another user's file is "not found", so keys cannot be probed.
|
|
104
|
+
const attachment = await FileAttachment.findOneOrNone({
|
|
105
|
+
deleted: false,
|
|
106
|
+
gcsKey,
|
|
107
|
+
userId: requestUserId(req),
|
|
108
|
+
});
|
|
92
109
|
if (!attachment) {
|
|
93
110
|
throw new APIError({status: 404, title: "File not found"});
|
|
94
111
|
}
|
|
@@ -110,9 +127,8 @@ export const addFileRoutes = (
|
|
|
110
127
|
.build(),
|
|
111
128
|
],
|
|
112
129
|
asyncHandler(async (req: express.Request, res: express.Response) => {
|
|
113
|
-
const gcsKey = req
|
|
114
|
-
const userId = (req
|
|
115
|
-
?._id as mongoose.Types.ObjectId;
|
|
130
|
+
const gcsKey = gcsKeyParam(req);
|
|
131
|
+
const userId = requestUserId(req);
|
|
116
132
|
|
|
117
133
|
const attachment = await FileAttachment.findOneOrNone({deleted: false, gcsKey});
|
|
118
134
|
if (!attachment) {
|