@terreno/api 57.3.0 → 57.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.ai/skills/mongoose-schema-safety/SKILL.md +23 -10
- package/README.md +11 -5
- package/bunfig.toml +1 -1
- package/dist/actions.js +197 -368
- package/dist/adminModelRouter.js +88 -173
- package/dist/adminTypes.d.ts +7 -0
- package/dist/adminTypes.js +6 -1
- package/dist/api.d.ts +10 -0
- package/dist/api.js +601 -792
- package/dist/audit/auditApp.d.ts +30 -0
- package/dist/audit/auditApp.js +114 -0
- package/dist/audit/auditEventModel.d.ts +29 -0
- package/dist/audit/auditEventModel.js +101 -0
- package/dist/audit/cloudTasksEnqueue.d.ts +32 -0
- package/dist/audit/cloudTasksEnqueue.js +69 -0
- package/dist/audit/diff.d.ts +10 -0
- package/dist/audit/diff.js +140 -0
- package/dist/audit/processQueue.d.ts +6 -0
- package/dist/audit/processQueue.js +56 -0
- package/dist/audit/rbacSink.d.ts +2 -0
- package/dist/audit/rbacSink.js +41 -0
- package/dist/audit/record.d.ts +56 -0
- package/dist/audit/record.js +251 -0
- package/dist/auth.js +432 -681
- package/dist/authRecovery.js +155 -269
- package/dist/authTokens.js +43 -118
- package/dist/betterAuth.d.ts +6 -0
- package/dist/betterAuthApp.js +25 -26
- package/dist/betterAuthSetup.js +258 -413
- package/dist/browserLogsRoute.d.ts +6 -0
- package/dist/browserLogsRoute.js +97 -0
- package/dist/collectionRegistry.d.ts +3 -1
- package/dist/collectionRegistry.js +43 -33
- package/dist/config.js +53 -122
- package/dist/configurationApp.js +180 -361
- package/dist/configurationPlugin.js +130 -302
- package/dist/consentApp.js +276 -421
- package/dist/docLoader.js +78 -126
- package/dist/envConfigurationPlugin.js +25 -147
- package/dist/errors.js +151 -247
- package/dist/example.js +28 -34
- package/dist/expressServer.d.ts +10 -0
- package/dist/expressServer.js +109 -255
- package/dist/frameworkModelNames.d.ts +24 -0
- package/dist/frameworkModelNames.js +31 -0
- package/dist/githubAuth.js +152 -216
- package/dist/httpClient.js +176 -264
- package/dist/index.d.ts +28 -1
- package/dist/index.js +53 -2
- package/dist/logger.js +145 -278
- package/dist/mcp/auth.js +76 -128
- package/dist/mcp/createMCPRequest.js +4 -5
- package/dist/mcp/handlers.js +268 -480
- package/dist/mcp/query.d.ts +0 -13
- package/dist/mcp/query.js +57 -151
- package/dist/mcp/registry.js +17 -30
- package/dist/mcp/schemaGenerator.js +95 -181
- package/dist/mcp/server.js +28 -100
- package/dist/mcp/serviceTokens.js +102 -191
- package/dist/mcp/toolGenerator.js +78 -191
- package/dist/middleware.js +15 -27
- package/dist/migrations/fixtures/all-down/20260910120000-one.d.ts +4 -0
- package/dist/migrations/fixtures/all-down/20260910120000-one.js +9 -0
- package/dist/migrations/fixtures/all-down/20260910120001-two.d.ts +4 -0
- package/dist/migrations/fixtures/all-down/20260910120001-two.js +9 -0
- package/dist/migrations/fixtures/bad-id/20260910120000-mismatch.d.ts +3 -0
- package/dist/migrations/fixtures/bad-id/20260910120000-mismatch.js +7 -0
- package/dist/migrations/fixtures/bad-name/not-a-migration.d.ts +3 -0
- package/dist/migrations/fixtures/bad-name/not-a-migration.js +7 -0
- package/dist/migrations/fixtures/missing-up/20260910120000-noup.d.ts +2 -0
- package/dist/migrations/fixtures/missing-up/20260910120000-noup.js +5 -0
- package/dist/migrations/fixtures/valid/20260910120000-alpha.d.ts +3 -0
- package/dist/migrations/fixtures/valid/20260910120000-alpha.js +7 -0
- package/dist/migrations/fixtures/valid/20260910120001-beta.d.ts +4 -0
- package/dist/migrations/fixtures/valid/20260910120001-beta.js +9 -0
- package/dist/migrations/generate.d.ts +17 -0
- package/dist/migrations/generate.js +155 -0
- package/dist/migrations/load.d.ts +20 -0
- package/dist/migrations/load.js +110 -0
- package/dist/migrations/lock.d.ts +13 -0
- package/dist/migrations/lock.js +73 -0
- package/dist/migrations/runner.d.ts +42 -0
- package/dist/migrations/runner.js +249 -0
- package/dist/migrations/schemaCatalog.d.ts +44 -0
- package/dist/migrations/schemaCatalog.js +185 -0
- package/dist/migrations/types.d.ts +87 -0
- package/dist/migrations/types.js +7 -0
- package/dist/models/consentForm.js +6 -6
- package/dist/models/consentResponse.js +5 -5
- package/dist/models/mcpServiceToken.js +66 -156
- package/dist/models/notification.d.ts +2 -0
- package/dist/models/notification.js +62 -0
- package/dist/models/notificationPreference.d.ts +2 -0
- package/dist/models/notificationPreference.js +49 -0
- package/dist/models/versionConfig.js +5 -5
- package/dist/notifications/notificationService.d.ts +40 -0
- package/dist/notifications/notificationService.js +183 -0
- package/dist/notifications/notificationsApp.d.ts +18 -0
- package/dist/notifications/notificationsApp.js +156 -0
- package/dist/notifications/notificationsBeforeSend.d.ts +14 -0
- package/dist/notifications/notificationsBeforeSend.js +32 -0
- package/dist/notifiers/googleChatNotifier.js +36 -117
- package/dist/notifiers/slackNotifier.d.ts +31 -2
- package/dist/notifiers/slackNotifier.js +170 -119
- package/dist/notifiers/zoomNotifier.js +60 -111
- package/dist/openApi.d.ts +1 -7
- package/dist/openApi.js +113 -127
- package/dist/openApiBuilder.d.ts +14 -3
- package/dist/openApiBuilder.js +117 -159
- package/dist/openApiCompat.js +81 -148
- package/dist/openApiEtag.js +7 -7
- package/dist/openApiValidator.d.ts +13 -1
- package/dist/openApiValidator.js +301 -246
- package/dist/orgs/orgContext.d.ts +23 -0
- package/dist/orgs/orgContext.js +128 -0
- package/dist/orgs/orgPermissions.d.ts +4 -0
- package/dist/orgs/orgPermissions.js +38 -0
- package/dist/orgs/orgPlugin.d.ts +13 -0
- package/dist/orgs/orgPlugin.js +66 -0
- package/dist/orgs/organizationModel.d.ts +13 -0
- package/dist/orgs/organizationModel.js +200 -0
- package/dist/orgs/organizationSettings.d.ts +19 -0
- package/dist/orgs/organizationSettings.js +113 -0
- package/dist/orgs/orgsApp.d.ts +28 -0
- package/dist/orgs/orgsApp.js +416 -0
- package/dist/permissions.d.ts +7 -13
- package/dist/permissions.js +95 -211
- package/dist/plugins.js +125 -218
- package/dist/populate.js +130 -240
- package/dist/rateLimit/applyTrustProxy.js +1 -1
- package/dist/rateLimit/createStore.js +7 -8
- package/dist/rateLimit/memoryStore.js +22 -100
- package/dist/rateLimit/middleware.d.ts +0 -8
- package/dist/rateLimit/middleware.js +49 -101
- package/dist/rateLimit/mongoStore.d.ts +1 -0
- package/dist/rateLimit/mongoStore.js +55 -112
- package/dist/rateLimit/policies.d.ts +0 -4
- package/dist/rateLimit/policies.js +44 -80
- package/dist/rateLimit/redisStore.d.ts +1 -0
- package/dist/rateLimit/redisStore.js +40 -133
- package/dist/rbac/access.js +122 -253
- package/dist/rbac/assertAllowed.js +95 -171
- package/dist/rbac/auditModel.js +14 -58
- package/dist/rbac/backfillAdmins.js +24 -130
- package/dist/rbac/fieldViews.js +46 -141
- package/dist/rbac/membershipOrgAdminSource.d.ts +6 -0
- package/dist/rbac/membershipOrgAdminSource.js +51 -0
- package/dist/rbac/middleware.js +30 -96
- package/dist/rbac/modelRouterAccess.d.ts +3 -0
- package/dist/rbac/modelRouterAccess.js +133 -307
- package/dist/rbac/permissionUtils.js +40 -179
- package/dist/rbac/realtimeAccess.js +81 -147
- package/dist/rbac/resolve.d.ts +1 -1
- package/dist/rbac/resolve.js +154 -319
- package/dist/rbac/roleManager.js +318 -700
- package/dist/rbac/roleModel.d.ts +2 -5
- package/dist/rbac/roleModel.js +60 -173
- package/dist/rbac/routes.js +93 -196
- package/dist/rbac/scopes.js +39 -133
- package/dist/rbac/statements.d.ts +10 -1
- package/dist/rbac/statements.js +42 -93
- package/dist/rbac/types.d.ts +5 -0
- package/dist/rbac/userPlugin.js +3 -29
- package/dist/realtime/changeStreamWatcher.d.ts +10 -4
- package/dist/realtime/changeStreamWatcher.js +499 -764
- package/dist/realtime/deprecation.d.ts +1 -0
- package/dist/realtime/deprecation.js +9 -10
- package/dist/realtime/queryMatcher.js +110 -191
- package/dist/realtime/queryStore.js +35 -118
- package/dist/realtime/realtimeApp.d.ts +1 -0
- package/dist/realtime/realtimeApp.js +248 -401
- package/dist/realtime/registry.js +19 -30
- package/dist/realtime/sessionRevalidation.js +132 -358
- package/dist/realtime/socketAuth.js +89 -208
- package/dist/realtime/socketUser.js +10 -56
- package/dist/requestContext.js +93 -139
- package/dist/schemaMetadata.js +181 -265
- package/dist/scriptRunner.js +96 -266
- package/dist/scrubAdminFields.js +36 -108
- package/dist/secretProviders.js +130 -299
- package/dist/seedRunner.js +221 -514
- package/dist/sync/adminBroadcastScope.d.ts +40 -0
- package/dist/sync/adminBroadcastScope.js +82 -0
- package/dist/sync/adminWindowAccess.d.ts +13 -0
- package/dist/sync/adminWindowAccess.js +25 -0
- package/dist/sync/adminWindowMutation.d.ts +88 -0
- package/dist/sync/adminWindowMutation.js +176 -0
- package/dist/sync/executors.d.ts +9 -3
- package/dist/sync/executors.js +425 -598
- package/dist/sync/loadHarness.js +392 -689
- package/dist/sync/models.js +181 -341
- package/dist/sync/mutationHandler.d.ts +5 -2
- package/dist/sync/mutationHandler.js +549 -697
- package/dist/sync/registrationSideEffects.js +41 -95
- package/dist/sync/registry.js +31 -47
- package/dist/sync/routes.d.ts +13 -0
- package/dist/sync/routes.js +484 -760
- package/dist/sync/scripts/compactTombstones.js +83 -228
- package/dist/sync/serialize.js +18 -58
- package/dist/sync/socketHandlers.d.ts +8 -2
- package/dist/sync/socketHandlers.js +271 -402
- package/dist/sync/streams.d.ts +2 -0
- package/dist/sync/streams.js +54 -116
- package/dist/sync/syncApp.d.ts +2 -1
- package/dist/sync/syncApp.js +14 -16
- package/dist/sync/syncBatch.d.ts +5 -2
- package/dist/sync/syncBatch.js +63 -168
- package/dist/sync/syncSeqPlugin.js +430 -702
- package/dist/sync/types.d.ts +18 -0
- package/dist/syncConsents.js +113 -253
- package/dist/terrenoApp.d.ts +29 -0
- package/dist/terrenoApp.js +184 -257
- package/dist/tests/createTestData.d.ts +1 -3
- package/dist/tests/createTestData.js +147 -259
- package/dist/tests/models.d.ts +1 -0
- package/dist/tests/models.js +23 -56
- package/dist/tests/mongoTestSetup.js +42 -103
- package/dist/tests/testHelper.d.ts +0 -5
- package/dist/tests/testHelper.js +32 -101
- package/dist/tests.js +12 -51
- package/dist/transformers.js +61 -164
- package/dist/types/authToken.d.ts +3 -3
- package/dist/types/mcpServiceToken.d.ts +2 -2
- package/dist/types/membership.d.ts +23 -0
- package/dist/types/membership.js +2 -0
- package/dist/types/notification.d.ts +28 -0
- package/dist/types/notification.js +2 -0
- package/dist/types/notificationPreference.d.ts +20 -0
- package/dist/types/notificationPreference.js +2 -0
- package/dist/types/organization.d.ts +36 -0
- package/dist/types/organization.js +2 -0
- package/dist/utils.js +31 -93
- package/dist/vendor/wesleytodd-openapi/index.js +37 -51
- package/dist/vendor/wesleytodd-openapi/lib/generate-doc.js +32 -40
- package/dist/vendor/wesleytodd-openapi/lib/layer-schema.js +3 -3
- package/dist/vendor/wesleytodd-openapi/lib/ui.js +50 -19
- package/dist/vendor/wesleytodd-openapi/lib/validate.js +19 -47
- package/dist/versionCheckPlugin.js +52 -100
- package/dist/webhooks/headerValue.js +2 -2
- package/dist/webhooks/idempotency/memoryStore.js +16 -59
- package/dist/webhooks/idempotency/mongoStore.js +55 -130
- package/dist/webhooks/idempotency/webhookReceipt.d.ts +4 -49
- package/dist/webhooks/idempotency/webhookReceipt.js +14 -14
- package/dist/webhooks/rawBody.d.ts +1 -0
- package/dist/webhooks/rawBody.js +2 -1
- package/dist/webhooks/timingSafeEqual.js +4 -5
- package/dist/webhooks/verifiers/hmac.js +17 -18
- package/dist/webhooks/verifiers/sendgrid.js +20 -22
- package/dist/webhooks/verifiers/stripe.js +31 -65
- package/dist/webhooks/verifiers/twilio.js +23 -73
- package/dist/webhooks/webhooksApp.js +78 -177
- package/dist/zodOpenApi.js +2 -2
- package/package.json +34 -28
- package/src/__snapshots__/openApi.test.ts.snap +192 -54
- package/src/__snapshots__/openApiBuilder.test.ts.snap +0 -18
- package/src/__snapshots__/schemaMetadata.test.ts.snap +0 -1
- package/src/__tests__/browserLogsRoute.test.ts +165 -0
- package/src/adminTypes.ts +8 -0
- package/src/api.test.ts +39 -2
- package/src/api.ts +68 -0
- package/src/audit/auditApp.test.ts +243 -0
- package/src/audit/auditApp.ts +139 -0
- package/src/audit/auditEventModel.ts +160 -0
- package/src/audit/auditRouter.test.ts +456 -0
- package/src/audit/cloudTasksEnqueue.test.ts +124 -0
- package/src/audit/cloudTasksEnqueue.ts +104 -0
- package/src/audit/diff.ts +163 -0
- package/src/audit/processQueue.ts +69 -0
- package/src/audit/rbacSink.test.ts +86 -0
- package/src/audit/rbacSink.ts +42 -0
- package/src/audit/record.test.ts +402 -0
- package/src/audit/record.ts +329 -0
- package/src/auth.test.ts +1 -1
- package/src/auth.ts +1 -1
- package/src/authRecovery.test.ts +43 -0
- package/src/authRecovery.ts +16 -10
- package/src/authTokens.ts +6 -2
- package/src/authVerification.test.ts +22 -0
- package/src/betterAuth.ts +7 -0
- package/src/betterAuthSetup.test.ts +27 -0
- package/src/betterAuthSetup.ts +1 -0
- package/src/browserLogsRoute.ts +110 -0
- package/src/collectionRegistry.test.ts +8 -9
- package/src/collectionRegistry.ts +21 -1
- package/src/configurationPlugin.test.ts +1 -11
- package/src/express.d.ts +2 -0
- package/src/expressServer.test.ts +50 -2
- package/src/expressServer.ts +10 -0
- package/src/frameworkModelNames.test.ts +62 -0
- package/src/frameworkModelNames.ts +33 -0
- package/src/index.ts +76 -0
- package/src/isolated/migrateCliConnect.isolated.ts +51 -0
- package/src/mcp/auth.test.ts +34 -1
- package/src/mcp/handlers.test.ts +275 -0
- package/src/mcp/query.ts +3 -3
- package/src/mcp/toolGenerator.test.ts +81 -0
- package/src/migrations/cli.test.ts +353 -0
- package/src/migrations/cli.ts +283 -0
- package/src/migrations/fixtures/all-down/20260910120000-one.ts +6 -0
- package/src/migrations/fixtures/all-down/20260910120001-two.ts +6 -0
- package/src/migrations/fixtures/bad-id/20260910120000-mismatch.ts +4 -0
- package/src/migrations/fixtures/bad-name/not-a-migration.ts +4 -0
- package/src/migrations/fixtures/missing-up/20260910120000-noup.ts +2 -0
- package/src/migrations/fixtures/valid/20260910120000-alpha.ts +4 -0
- package/src/migrations/fixtures/valid/20260910120001-beta.ts +6 -0
- package/src/migrations/generate.test.ts +333 -0
- package/src/migrations/generate.ts +216 -0
- package/src/migrations/load.test.ts +103 -0
- package/src/migrations/load.ts +124 -0
- package/src/migrations/lock.test.ts +133 -0
- package/src/migrations/lock.ts +118 -0
- package/src/migrations/runner.test.ts +504 -0
- package/src/migrations/runner.ts +358 -0
- package/src/migrations/schemaCatalog.test.ts +159 -0
- package/src/migrations/schemaCatalog.ts +262 -0
- package/src/migrations/types.ts +94 -0
- package/src/models/mcpServiceToken.ts +4 -3
- package/src/models/notification.ts +69 -0
- package/src/models/notificationPreference.ts +62 -0
- package/src/notifications/notificationService.ts +254 -0
- package/src/notifications/notificationsApp.test.ts +528 -0
- package/src/notifications/notificationsApp.ts +200 -0
- package/src/notifications/notificationsBeforeSend.ts +51 -0
- package/src/notifiers/slackNotifier.test.ts +186 -1
- package/src/notifiers/slackNotifier.ts +167 -8
- package/src/openApi.test.ts +0 -1
- package/src/openApi.ts +2 -1
- package/src/openApiBuilder.ts +14 -3
- package/src/openApiValidator.test.ts +221 -2
- package/src/openApiValidator.ts +218 -33
- package/src/orgs/orgAccessOptIn.test.ts +87 -0
- package/src/orgs/orgContext.test.ts +259 -0
- package/src/orgs/orgContext.ts +151 -0
- package/src/orgs/orgPermissions.test.ts +105 -0
- package/src/orgs/orgPermissions.ts +40 -0
- package/src/orgs/orgPlugin.test.ts +130 -0
- package/src/orgs/orgPlugin.ts +70 -0
- package/src/orgs/orgRbac.test.ts +267 -0
- package/src/orgs/orgSecurityDefects.test.ts +415 -0
- package/src/orgs/organizationModel.test.ts +205 -0
- package/src/orgs/organizationModel.ts +262 -0
- package/src/orgs/organizationSettings.test.ts +113 -0
- package/src/orgs/organizationSettings.ts +126 -0
- package/src/orgs/orgsApp.test.ts +382 -0
- package/src/orgs/orgsApp.ts +563 -0
- package/src/permissions.test.ts +62 -36
- package/src/permissions.ts +8 -30
- package/src/plugins.test.ts +5 -0
- package/src/plugins.ts +3 -0
- package/src/rateLimit/middleware.ts +1 -1
- package/src/rateLimit/mongoStore.ts +1 -0
- package/src/rateLimit/policies.ts +2 -2
- package/src/rateLimit/redisStore.ts +1 -0
- package/src/rbac/access.ts +11 -3
- package/src/rbac/membershipOrgAdminSource.ts +59 -0
- package/src/rbac/modelRouterAccess.ts +3 -0
- package/src/rbac/permissionUtils.test.ts +26 -5
- package/src/rbac/resolve.test.ts +34 -2
- package/src/rbac/resolve.ts +26 -7
- package/src/rbac/roleModel.test.ts +34 -1
- package/src/rbac/roleModel.ts +17 -1
- package/src/rbac/statements.test.ts +19 -0
- package/src/rbac/statements.ts +19 -1
- package/src/rbac/types.ts +5 -0
- package/src/realtime/changeStreamWatcher.ts +73 -33
- package/src/realtime/deprecation.ts +1 -0
- package/src/realtime/realtime.test.ts +357 -185
- package/src/realtime/realtimeApp.ts +2 -1
- package/src/schemaMetadata.test.ts +14 -0
- package/src/schemaMetadata.ts +5 -5
- package/src/sync/adminBroadcastConfig.test.ts +96 -0
- package/src/sync/adminBroadcastScope.test.ts +155 -0
- package/src/sync/adminBroadcastScope.ts +123 -0
- package/src/sync/adminWindowAccess.test.ts +57 -0
- package/src/sync/adminWindowAccess.ts +32 -0
- package/src/sync/adminWindowMutation.test.ts +450 -0
- package/src/sync/adminWindowMutation.ts +283 -0
- package/src/sync/executors.ts +33 -6
- package/src/sync/integration.test.ts +2 -2
- package/src/sync/mutationHandler.test.ts +277 -1
- package/src/sync/mutationHandler.ts +171 -29
- package/src/sync/registry.ts +4 -0
- package/src/sync/routes.ts +52 -8
- package/src/sync/socketHandlers.ts +154 -58
- package/src/sync/streams.ts +6 -0
- package/src/sync/sync.test.ts +3 -2
- package/src/sync/syncApp.ts +2 -1
- package/src/sync/syncBatch.ts +7 -2
- package/src/sync/syncRoutes.test.ts +297 -3
- package/src/sync/syncSocket.test.ts +229 -0
- package/src/sync/types.ts +20 -0
- package/src/terrenoApp.migrations.test.ts +114 -0
- package/src/terrenoApp.test.ts +41 -0
- package/src/terrenoApp.ts +97 -31
- package/src/tests/createTestData.ts +2 -2
- package/src/tests/models.ts +10 -2
- package/src/tests/testHelper.ts +1 -7
- package/src/types/authToken.ts +2 -4
- package/src/types/mcpServiceToken.ts +1 -7
- package/src/types/membership.ts +48 -0
- package/src/types/notification.ts +34 -0
- package/src/types/notificationPreference.ts +28 -0
- package/src/types/organization.ts +49 -0
- package/src/types.d.ts +1 -0
- package/src/webhooks/idempotency/webhookReceipt.ts +8 -10
- package/src/webhooks/rawBody.test.ts +33 -0
- package/src/webhooks/rawBody.ts +1 -0
- package/tsconfig.json +13 -54
- package/tsconfig.typedoc.json +4 -1
- package/dist/vendor/wesleytodd-openapi/lib/convert-yaml.d.ts +0 -2
- package/dist/vendor/wesleytodd-openapi/lib/convert-yaml.js +0 -13
- package/src/vendor/wesleytodd-openapi/lib/convert-yaml.js +0 -13
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {beforeAll, beforeEach, describe, expect, it} from "bun:test";
|
|
1
|
+
import {afterEach, beforeAll, beforeEach, describe, expect, it, spyOn} from "bun:test";
|
|
2
|
+
import {assert} from "chai";
|
|
2
3
|
import mongoose, {model, Schema} from "mongoose";
|
|
3
4
|
import type {ModelRouterOptions} from "../api";
|
|
4
5
|
import type {User} from "../auth";
|
|
@@ -6,10 +7,17 @@ import {APIError} from "../errors";
|
|
|
6
7
|
import {Permissions} from "../permissions";
|
|
7
8
|
import {createdUpdatedPlugin, type IsDeleted, isDeletedPlugin} from "../plugins";
|
|
8
9
|
import {setupDb} from "../tests";
|
|
10
|
+
import {
|
|
11
|
+
type AdminWindowMutationAuditEvent,
|
|
12
|
+
type AdminWindowMutationScope,
|
|
13
|
+
clearAdminWindowMutationScopes,
|
|
14
|
+
registerAdminWindowMutationScope,
|
|
15
|
+
} from "./adminWindowMutation";
|
|
9
16
|
import {computeStableFrontier, SyncCounter, SyncMutation} from "./models";
|
|
10
17
|
import {
|
|
11
18
|
applySyncMutation,
|
|
12
19
|
applySyncMutationBatch,
|
|
20
|
+
docMatchesMutationData,
|
|
13
21
|
MAX_SYNC_MUTATIONS_PER_BATCH,
|
|
14
22
|
type SyncMutationOutcome,
|
|
15
23
|
validateSyncMutationBatch,
|
|
@@ -365,6 +373,32 @@ describe("applySyncMutation", () => {
|
|
|
365
373
|
expect(row?.resultId).toBe(entityId);
|
|
366
374
|
});
|
|
367
375
|
|
|
376
|
+
it("create: surfaces the E11000 as a nack when the colliding _id is not readable (soft-deleted)", async () => {
|
|
377
|
+
const entityId = new mongoose.Types.ObjectId().toHexString();
|
|
378
|
+
await MutStuffModel.create({
|
|
379
|
+
_id: entityId,
|
|
380
|
+
deleted: true,
|
|
381
|
+
name: "tombstone",
|
|
382
|
+
ownerId: owner.id,
|
|
383
|
+
});
|
|
384
|
+
await createStalePendingRow("m-lease-create-tombstone", 90_000);
|
|
385
|
+
|
|
386
|
+
const nack = expectNack(
|
|
387
|
+
await applySyncMutation({
|
|
388
|
+
mutation: {
|
|
389
|
+
collection: "mutStuff",
|
|
390
|
+
data: {name: "tombstone", ownerId: owner.id},
|
|
391
|
+
id: entityId,
|
|
392
|
+
mutationId: "m-lease-create-tombstone",
|
|
393
|
+
operation: "create",
|
|
394
|
+
},
|
|
395
|
+
user: owner,
|
|
396
|
+
})
|
|
397
|
+
);
|
|
398
|
+
assert.notEqual(nack.code, "conflict");
|
|
399
|
+
assert.equal(await MutStuffModel.countDocuments({_id: entityId, deleted: true}), 1);
|
|
400
|
+
});
|
|
401
|
+
|
|
368
402
|
it("update: tolerates the write having already landed (seq already advanced by exactly this mutation) and reads back the doc as the ack", async () => {
|
|
369
403
|
const doc = await MutStuffModel.create({name: "v1", ownerId: owner.id});
|
|
370
404
|
// Simulate the crash: the update write from the FIRST attempt landed
|
|
@@ -813,6 +847,25 @@ describe("applySyncMutation", () => {
|
|
|
813
847
|
expect(nack.message).toContain("Unknown sync collection");
|
|
814
848
|
});
|
|
815
849
|
|
|
850
|
+
it("nacks validation when an update omits baseVersion", async () => {
|
|
851
|
+
const doc = await MutStuffModel.create({name: "no base", ownerId: owner.id});
|
|
852
|
+
const nack = expectNack(
|
|
853
|
+
await applySyncMutation({
|
|
854
|
+
mutation: {
|
|
855
|
+
collection: "mutStuff",
|
|
856
|
+
data: {name: "changed"},
|
|
857
|
+
id: String(doc._id),
|
|
858
|
+
mutationId: "m-no-base-version",
|
|
859
|
+
operation: "update",
|
|
860
|
+
},
|
|
861
|
+
user: owner,
|
|
862
|
+
})
|
|
863
|
+
);
|
|
864
|
+
assert.equal(nack.code, "validation");
|
|
865
|
+
assert.include(nack.message, "baseVersion is required");
|
|
866
|
+
assert.equal(await SyncMutation.countDocuments({mutationId: "m-no-base-version"}), 0);
|
|
867
|
+
});
|
|
868
|
+
|
|
816
869
|
it("nacks validation when update or delete is missing an id", async () => {
|
|
817
870
|
for (const operation of ["update", "delete"] as const) {
|
|
818
871
|
const nack = expectNack(
|
|
@@ -1000,6 +1053,229 @@ describe("applySyncMutation", () => {
|
|
|
1000
1053
|
// Task 9.18: error-class outcomes release the claim rather than recording it.
|
|
1001
1054
|
expect(await SyncMutation.countDocuments({mutationId: "m-plain-error"})).toBe(0);
|
|
1002
1055
|
});
|
|
1056
|
+
|
|
1057
|
+
it("rethrows a non-duplicate failure from the ledger claim insert", async () => {
|
|
1058
|
+
const createSpy = spyOn(SyncMutation, "create").mockImplementation((() => {
|
|
1059
|
+
throw new Error("ledger unavailable");
|
|
1060
|
+
}) as never);
|
|
1061
|
+
try {
|
|
1062
|
+
let thrown: unknown;
|
|
1063
|
+
try {
|
|
1064
|
+
await applySyncMutation({
|
|
1065
|
+
mutation: {
|
|
1066
|
+
collection: "mutStuff",
|
|
1067
|
+
data: {name: "never claimed", ownerId: owner.id},
|
|
1068
|
+
mutationId: "m-claim-crash",
|
|
1069
|
+
operation: "create",
|
|
1070
|
+
},
|
|
1071
|
+
user: owner,
|
|
1072
|
+
});
|
|
1073
|
+
} catch (error: unknown) {
|
|
1074
|
+
thrown = error;
|
|
1075
|
+
}
|
|
1076
|
+
assert.instanceOf(thrown, Error);
|
|
1077
|
+
assert.equal((thrown as Error).message, "ledger unavailable");
|
|
1078
|
+
} finally {
|
|
1079
|
+
createSpy.mockRestore();
|
|
1080
|
+
}
|
|
1081
|
+
assert.equal(await MutStuffModel.countDocuments({name: "never claimed"}), 0);
|
|
1082
|
+
});
|
|
1083
|
+
});
|
|
1084
|
+
|
|
1085
|
+
describe("write scope enforcement", () => {
|
|
1086
|
+
it("skips the write-scope check for broadcast collections", async () => {
|
|
1087
|
+
registerMutStuff({config: {scope: {type: "broadcast"}}});
|
|
1088
|
+
const ack = expectAck(
|
|
1089
|
+
await applySyncMutation({
|
|
1090
|
+
mutation: {
|
|
1091
|
+
collection: "mutStuff",
|
|
1092
|
+
data: {name: "broadcast", ownerId: stranger.id},
|
|
1093
|
+
mutationId: "m-broadcast-create",
|
|
1094
|
+
operation: "create",
|
|
1095
|
+
},
|
|
1096
|
+
user: owner,
|
|
1097
|
+
})
|
|
1098
|
+
);
|
|
1099
|
+
assert.equal(ack.seq, 1);
|
|
1100
|
+
const saved = await MutStuffModel.findById(ack.id);
|
|
1101
|
+
assert.equal(saved?.ownerId, stranger.id);
|
|
1102
|
+
});
|
|
1103
|
+
|
|
1104
|
+
it("nacks error when a tenant-scoped collection has no scope resolver", async () => {
|
|
1105
|
+
registerMutStuff({config: {scope: {field: "ownerId", type: "tenant"}}});
|
|
1106
|
+
const nack = expectNack(
|
|
1107
|
+
await applySyncMutation({
|
|
1108
|
+
mutation: {
|
|
1109
|
+
collection: "mutStuff",
|
|
1110
|
+
data: {name: "tenant", ownerId: "tenant-1"},
|
|
1111
|
+
mutationId: "m-tenant-no-resolver",
|
|
1112
|
+
operation: "create",
|
|
1113
|
+
},
|
|
1114
|
+
user: owner,
|
|
1115
|
+
})
|
|
1116
|
+
);
|
|
1117
|
+
assert.equal(nack.code, "error");
|
|
1118
|
+
assert.include(nack.message, "no getUserScopes resolver");
|
|
1119
|
+
assert.equal(await MutStuffModel.countDocuments({name: "tenant"}), 0);
|
|
1120
|
+
});
|
|
1121
|
+
|
|
1122
|
+
it("acks a tenant-scoped create when the resolver confirms the membership", async () => {
|
|
1123
|
+
registerMutStuff({config: {scope: {field: "ownerId", type: "tenant"}}});
|
|
1124
|
+
const ack = expectAck(
|
|
1125
|
+
await applySyncMutation({
|
|
1126
|
+
mutation: {
|
|
1127
|
+
collection: "mutStuff",
|
|
1128
|
+
data: {name: "tenant ok", ownerId: "tenant-1"},
|
|
1129
|
+
mutationId: "m-tenant-member",
|
|
1130
|
+
operation: "create",
|
|
1131
|
+
},
|
|
1132
|
+
scopeResolver: async () => ["tenant-1", "tenant-2"],
|
|
1133
|
+
user: owner,
|
|
1134
|
+
})
|
|
1135
|
+
);
|
|
1136
|
+
assert.equal(ack.seq, 1);
|
|
1137
|
+
});
|
|
1138
|
+
});
|
|
1139
|
+
|
|
1140
|
+
describe("recorded conflict replay", () => {
|
|
1141
|
+
const recordConflict = async (
|
|
1142
|
+
mutationId: string,
|
|
1143
|
+
resultId: string | undefined
|
|
1144
|
+
): Promise<void> => {
|
|
1145
|
+
await SyncMutation.create({
|
|
1146
|
+
claimedAt: new Date(),
|
|
1147
|
+
error: "recorded conflict",
|
|
1148
|
+
mutationId,
|
|
1149
|
+
resultId,
|
|
1150
|
+
resultSeq: 3,
|
|
1151
|
+
status: "conflicted",
|
|
1152
|
+
userId: String(owner.id),
|
|
1153
|
+
});
|
|
1154
|
+
};
|
|
1155
|
+
|
|
1156
|
+
const replay = (mutationId: string): Promise<SyncMutationOutcome> =>
|
|
1157
|
+
applySyncMutation({
|
|
1158
|
+
mutation: {
|
|
1159
|
+
baseVersion: 1,
|
|
1160
|
+
collection: "mutStuff",
|
|
1161
|
+
data: {name: "replayed"},
|
|
1162
|
+
id: new mongoose.Types.ObjectId().toHexString(),
|
|
1163
|
+
mutationId,
|
|
1164
|
+
operation: "update",
|
|
1165
|
+
},
|
|
1166
|
+
user: owner,
|
|
1167
|
+
});
|
|
1168
|
+
|
|
1169
|
+
it("omits the server doc when the recorded conflict has no resultId", async () => {
|
|
1170
|
+
await recordConflict("m-conflict-no-id", undefined);
|
|
1171
|
+
const nack = expectNack(await replay("m-conflict-no-id"));
|
|
1172
|
+
assert.equal(nack.code, "conflict");
|
|
1173
|
+
assert.equal(nack.message, "recorded conflict");
|
|
1174
|
+
assert.equal(nack.serverSeq, 3);
|
|
1175
|
+
assert.isUndefined(nack.serverDoc);
|
|
1176
|
+
});
|
|
1177
|
+
|
|
1178
|
+
it("omits the server doc when the recorded resultId no longer resolves to a document", async () => {
|
|
1179
|
+
await recordConflict("m-conflict-missing", new mongoose.Types.ObjectId().toHexString());
|
|
1180
|
+
const nack = expectNack(await replay("m-conflict-missing"));
|
|
1181
|
+
assert.equal(nack.code, "conflict");
|
|
1182
|
+
assert.isUndefined(nack.serverDoc);
|
|
1183
|
+
});
|
|
1184
|
+
|
|
1185
|
+
it("omits the server doc when loading it throws", async () => {
|
|
1186
|
+
await recordConflict("m-conflict-bad-id", "not-an-object-id");
|
|
1187
|
+
const nack = expectNack(await replay("m-conflict-bad-id"));
|
|
1188
|
+
assert.equal(nack.code, "conflict");
|
|
1189
|
+
assert.isUndefined(nack.serverDoc);
|
|
1190
|
+
});
|
|
1191
|
+
});
|
|
1192
|
+
|
|
1193
|
+
describe("admin window mutations", () => {
|
|
1194
|
+
const admin = {_id: "mut-admin", admin: true, id: "mut-admin"} as unknown as User;
|
|
1195
|
+
|
|
1196
|
+
const registerAdminScope = (
|
|
1197
|
+
emitAudit?: AdminWindowMutationScope["emitAudit"]
|
|
1198
|
+
): AdminWindowMutationScope => {
|
|
1199
|
+
const scope: AdminWindowMutationScope = {
|
|
1200
|
+
createPermissions: [Permissions.IsAdmin],
|
|
1201
|
+
deletePermissions: [Permissions.IsAdmin],
|
|
1202
|
+
emitAudit,
|
|
1203
|
+
modelName: MutStuffModel.modelName,
|
|
1204
|
+
permissions: {create: true, delete: true, update: true},
|
|
1205
|
+
stripMutationData: (data) => {
|
|
1206
|
+
const next = {...data};
|
|
1207
|
+
delete next.secret;
|
|
1208
|
+
return next;
|
|
1209
|
+
},
|
|
1210
|
+
updatePermissions: [Permissions.IsAdmin],
|
|
1211
|
+
};
|
|
1212
|
+
registerAdminWindowMutationScope(MutStuffModel.modelName, scope);
|
|
1213
|
+
return scope;
|
|
1214
|
+
};
|
|
1215
|
+
|
|
1216
|
+
beforeEach(() => {
|
|
1217
|
+
clearAdminWindowMutationScopes();
|
|
1218
|
+
registerMutStuff({config: {adminBroadcast: true, scope: {type: "owner"}}});
|
|
1219
|
+
});
|
|
1220
|
+
|
|
1221
|
+
afterEach(() => {
|
|
1222
|
+
clearAdminWindowMutationScopes();
|
|
1223
|
+
});
|
|
1224
|
+
|
|
1225
|
+
it("applies an admin window create with stripped data and emits the audit event", async () => {
|
|
1226
|
+
const events: AdminWindowMutationAuditEvent[] = [];
|
|
1227
|
+
registerAdminScope(({event}) => {
|
|
1228
|
+
events.push(event);
|
|
1229
|
+
});
|
|
1230
|
+
const ack = expectAck(
|
|
1231
|
+
await applySyncMutation({
|
|
1232
|
+
mutation: {
|
|
1233
|
+
collection: "mutStuff",
|
|
1234
|
+
data: {name: "admin created", ownerId: owner.id, secret: "strip me"},
|
|
1235
|
+
mutationId: "m-admin-create",
|
|
1236
|
+
mutationMode: "adminWindow",
|
|
1237
|
+
operation: "create",
|
|
1238
|
+
},
|
|
1239
|
+
user: admin,
|
|
1240
|
+
})
|
|
1241
|
+
);
|
|
1242
|
+
assert.equal(ack.seq, 1);
|
|
1243
|
+
assert.isUndefined(ack.warning);
|
|
1244
|
+
const saved = await MutStuffModel.findById(ack.id);
|
|
1245
|
+
assert.equal(saved?.name, "admin created");
|
|
1246
|
+
assert.equal(saved?.ownerId, owner.id);
|
|
1247
|
+
assert.lengthOf(events, 1);
|
|
1248
|
+
assert.equal(events[0].verb, "created");
|
|
1249
|
+
assert.equal(events[0].recordId, ack.id);
|
|
1250
|
+
});
|
|
1251
|
+
|
|
1252
|
+
it("still acks when the admin window audit hook throws after the write committed", async () => {
|
|
1253
|
+
registerAdminScope(() => {
|
|
1254
|
+
throw new Error("audit sink down");
|
|
1255
|
+
});
|
|
1256
|
+
const ack = expectAck(
|
|
1257
|
+
await applySyncMutation({
|
|
1258
|
+
mutation: {
|
|
1259
|
+
collection: "mutStuff",
|
|
1260
|
+
data: {name: "audited anyway", ownerId: owner.id},
|
|
1261
|
+
mutationId: "m-admin-audit-throw",
|
|
1262
|
+
mutationMode: "adminWindow",
|
|
1263
|
+
operation: "create",
|
|
1264
|
+
},
|
|
1265
|
+
user: admin,
|
|
1266
|
+
})
|
|
1267
|
+
);
|
|
1268
|
+
assert.isUndefined(ack.warning);
|
|
1269
|
+
assert.equal(await MutStuffModel.countDocuments({name: "audited anyway"}), 1);
|
|
1270
|
+
const row = await SyncMutation.findOne({mutationId: "m-admin-audit-throw"});
|
|
1271
|
+
assert.equal(row?.status, "applied");
|
|
1272
|
+
});
|
|
1273
|
+
});
|
|
1274
|
+
});
|
|
1275
|
+
|
|
1276
|
+
describe("docMatchesMutationData", () => {
|
|
1277
|
+
it("treats an absent mutation payload as matching any document", () => {
|
|
1278
|
+
assert.isTrue(docMatchesMutationData({name: "anything"}, undefined));
|
|
1003
1279
|
});
|
|
1004
1280
|
});
|
|
1005
1281
|
|
|
@@ -4,7 +4,15 @@ import mongoose from "mongoose";
|
|
|
4
4
|
import type {User} from "../auth";
|
|
5
5
|
import {APIError, isAPIError} from "../errors";
|
|
6
6
|
import {createFeatureFlaggedLogger, logger} from "../logger";
|
|
7
|
+
import {resolveOrgContext, runWithOrgContext} from "../orgs/orgContext";
|
|
7
8
|
import {findOneOrNoneFor} from "../plugins";
|
|
9
|
+
import {
|
|
10
|
+
type AdminWindowMutationScope,
|
|
11
|
+
buildAdminWindowExecutorOptions,
|
|
12
|
+
emitAdminWindowMutationAudit,
|
|
13
|
+
prepareAdminWindowMutation,
|
|
14
|
+
withAdminWindowMutationRequestContext,
|
|
15
|
+
} from "./adminWindowMutation";
|
|
8
16
|
import {
|
|
9
17
|
executeCreate,
|
|
10
18
|
executeDelete,
|
|
@@ -16,6 +24,7 @@ import {
|
|
|
16
24
|
} from "./executors";
|
|
17
25
|
import {SYNC_MUTATION_LEASE_MS, SyncMutation, type SyncMutationDocument} from "./models";
|
|
18
26
|
import {findSyncEntryByCollectionTag, type SyncRegistryEntry} from "./registry";
|
|
27
|
+
import type {SyncAppOptions} from "./routes";
|
|
19
28
|
import {serializeSyncDoc} from "./routes";
|
|
20
29
|
import {getScopeField} from "./streams";
|
|
21
30
|
import type {
|
|
@@ -511,6 +520,38 @@ const finalizeAlreadyApplied = async ({
|
|
|
511
520
|
* - delete: idempotent already (executeDelete on an already-deleted tombstone is a no-op
|
|
512
521
|
* success in this codebase's soft-delete model), so no special tolerance is needed.
|
|
513
522
|
*/
|
|
523
|
+
const organizationIdFromRequest = (request: express.Request): string | undefined => {
|
|
524
|
+
if (typeof request.header !== "function") {
|
|
525
|
+
return undefined;
|
|
526
|
+
}
|
|
527
|
+
const raw = request.header("X-Organization-Id");
|
|
528
|
+
if (typeof raw !== "string") {
|
|
529
|
+
return undefined;
|
|
530
|
+
}
|
|
531
|
+
const trimmed = raw.trim();
|
|
532
|
+
if (!trimmed) {
|
|
533
|
+
return undefined;
|
|
534
|
+
}
|
|
535
|
+
return trimmed;
|
|
536
|
+
};
|
|
537
|
+
|
|
538
|
+
const withRequestOrgContext = async ({
|
|
539
|
+
request,
|
|
540
|
+
run,
|
|
541
|
+
user,
|
|
542
|
+
}: {
|
|
543
|
+
request: express.Request;
|
|
544
|
+
run: () => Promise<SyncMutationOutcome>;
|
|
545
|
+
user: User;
|
|
546
|
+
}): Promise<SyncMutationOutcome> => {
|
|
547
|
+
const organizationId = organizationIdFromRequest(request);
|
|
548
|
+
if (!organizationId) {
|
|
549
|
+
return run();
|
|
550
|
+
}
|
|
551
|
+
const context = await resolveOrgContext({organizationId, required: false, user});
|
|
552
|
+
return runWithOrgContext(context, run);
|
|
553
|
+
};
|
|
554
|
+
|
|
514
555
|
const applyClaimedMutation = async ({
|
|
515
556
|
claimed,
|
|
516
557
|
entry,
|
|
@@ -518,6 +559,7 @@ const applyClaimedMutation = async ({
|
|
|
518
559
|
request,
|
|
519
560
|
user,
|
|
520
561
|
scopeResolver,
|
|
562
|
+
syncOptions,
|
|
521
563
|
isLeaseTakeover = false,
|
|
522
564
|
}: {
|
|
523
565
|
claimed: SyncMutationDocument;
|
|
@@ -526,44 +568,103 @@ const applyClaimedMutation = async ({
|
|
|
526
568
|
request: express.Request;
|
|
527
569
|
user: User;
|
|
528
570
|
scopeResolver?: SyncMutationScopeResolver;
|
|
571
|
+
syncOptions?: SyncAppOptions;
|
|
529
572
|
/** True when `claimed` was re-claimed from a stale lease rather than freshly inserted. */
|
|
530
573
|
isLeaseTakeover?: boolean;
|
|
574
|
+
}): Promise<SyncMutationOutcome> => {
|
|
575
|
+
return withRequestOrgContext({
|
|
576
|
+
request,
|
|
577
|
+
run: () =>
|
|
578
|
+
applyClaimedMutationInContext({
|
|
579
|
+
claimed,
|
|
580
|
+
entry,
|
|
581
|
+
isLeaseTakeover,
|
|
582
|
+
mutation,
|
|
583
|
+
request,
|
|
584
|
+
scopeResolver,
|
|
585
|
+
syncOptions,
|
|
586
|
+
user,
|
|
587
|
+
}),
|
|
588
|
+
user,
|
|
589
|
+
});
|
|
590
|
+
};
|
|
591
|
+
|
|
592
|
+
const applyClaimedMutationInContext = async ({
|
|
593
|
+
claimed,
|
|
594
|
+
entry,
|
|
595
|
+
mutation,
|
|
596
|
+
request,
|
|
597
|
+
user,
|
|
598
|
+
scopeResolver,
|
|
599
|
+
syncOptions,
|
|
600
|
+
isLeaseTakeover = false,
|
|
601
|
+
}: {
|
|
602
|
+
claimed: SyncMutationDocument;
|
|
603
|
+
entry: SyncRegistryEntry;
|
|
604
|
+
mutation: SyncMutateRequest;
|
|
605
|
+
request: express.Request;
|
|
606
|
+
user: User;
|
|
607
|
+
scopeResolver?: SyncMutationScopeResolver;
|
|
608
|
+
syncOptions?: SyncAppOptions;
|
|
609
|
+
isLeaseTakeover?: boolean;
|
|
531
610
|
}): Promise<SyncMutationOutcome> => {
|
|
532
611
|
const mutationId = mutation.mutationId;
|
|
612
|
+
let adminWindowScope: AdminWindowMutationScope | undefined;
|
|
533
613
|
|
|
534
614
|
try {
|
|
535
615
|
// Task 9.18: resolving the model must be INSIDE the try — a MissingSchemaError thrown
|
|
536
616
|
// here would escape without finalizing the claimed row, wedging the mutationId
|
|
537
617
|
// `pending` for the whole lease window instead of nacking it.
|
|
538
618
|
const model = mongoose.model(entry.modelName);
|
|
539
|
-
|
|
540
|
-
await enforceWriteScope({
|
|
541
|
-
data: mutation.data,
|
|
619
|
+
const adminWindow = await prepareAdminWindowMutation({
|
|
542
620
|
entry,
|
|
543
|
-
|
|
544
|
-
|
|
621
|
+
mutation,
|
|
622
|
+
req: request,
|
|
623
|
+
syncOptions,
|
|
545
624
|
user,
|
|
546
625
|
});
|
|
626
|
+
let effectiveMutation = mutation;
|
|
627
|
+
if (adminWindow) {
|
|
628
|
+
effectiveMutation = adminWindow.mutation;
|
|
629
|
+
adminWindowScope = adminWindow.scope;
|
|
630
|
+
} else {
|
|
631
|
+
// C6 (M6): product-path write-scope backstop before any write pipeline runs.
|
|
632
|
+
await enforceWriteScope({
|
|
633
|
+
data: effectiveMutation.data,
|
|
634
|
+
entry,
|
|
635
|
+
operation: effectiveMutation.operation,
|
|
636
|
+
scopeResolver,
|
|
637
|
+
user,
|
|
638
|
+
});
|
|
639
|
+
}
|
|
640
|
+
const skipPermissionChecks = Boolean(adminWindowScope);
|
|
641
|
+
const executorOptions = adminWindowScope
|
|
642
|
+
? buildAdminWindowExecutorOptions({productOptions: entry.options, scope: adminWindowScope})
|
|
643
|
+
: entry.options;
|
|
644
|
+
const executorRequest = adminWindowScope
|
|
645
|
+
? withAdminWindowMutationRequestContext({mutation: effectiveMutation, req: request})
|
|
646
|
+
: request;
|
|
547
647
|
|
|
548
648
|
let doc: mongoose.Document;
|
|
549
649
|
let postHook: (() => Promise<void>) | undefined;
|
|
550
|
-
if (
|
|
551
|
-
const body: Record<string, unknown> = {...(
|
|
552
|
-
if (
|
|
553
|
-
body._id =
|
|
650
|
+
if (effectiveMutation.operation === "create") {
|
|
651
|
+
const body: Record<string, unknown> = {...(effectiveMutation.data ?? {})};
|
|
652
|
+
if (effectiveMutation.id) {
|
|
653
|
+
body._id = effectiveMutation.id;
|
|
554
654
|
}
|
|
555
655
|
try {
|
|
556
656
|
const result = await executeCreate({
|
|
557
657
|
body,
|
|
558
658
|
model,
|
|
559
|
-
options:
|
|
560
|
-
req:
|
|
659
|
+
options: executorOptions,
|
|
660
|
+
req: executorRequest,
|
|
661
|
+
skipPermissionChecks,
|
|
561
662
|
skipPostHooks: true,
|
|
562
663
|
user,
|
|
563
664
|
});
|
|
564
665
|
doc = result.doc;
|
|
565
666
|
postHook = (): Promise<void> =>
|
|
566
|
-
runPostCreate({doc: result.doc, options:
|
|
667
|
+
runPostCreate({doc: result.doc, options: executorOptions, request: executorRequest});
|
|
567
668
|
} catch (createError: unknown) {
|
|
568
669
|
// M4 (lease takeover only): an E11000 on the exact target _id is
|
|
569
670
|
// tolerated as "already applied" — a prior (crashed) attempt at
|
|
@@ -572,8 +673,12 @@ const applyClaimedMutation = async ({
|
|
|
572
673
|
// client-minted UUIDs make a genuine unrelated _id collision
|
|
573
674
|
// vanishingly unlikely, so gating this on isLeaseTakeover keeps the
|
|
574
675
|
// tolerance scoped to its actual crash-recovery purpose.
|
|
575
|
-
if (
|
|
576
|
-
|
|
676
|
+
if (
|
|
677
|
+
isLeaseTakeover &&
|
|
678
|
+
isE11000Error(createError) &&
|
|
679
|
+
typeof effectiveMutation.id === "string"
|
|
680
|
+
) {
|
|
681
|
+
const existing = await findOneOrNoneFor(model, {_id: effectiveMutation.id});
|
|
577
682
|
if (existing) {
|
|
578
683
|
const {resultId, resultSeq} = await finalizeAlreadyApplied({
|
|
579
684
|
claimedId: claimed._id,
|
|
@@ -585,15 +690,16 @@ const applyClaimedMutation = async ({
|
|
|
585
690
|
}
|
|
586
691
|
throw createError;
|
|
587
692
|
}
|
|
588
|
-
} else if (
|
|
693
|
+
} else if (effectiveMutation.operation === "update") {
|
|
589
694
|
try {
|
|
590
695
|
const result = await executeUpdate({
|
|
591
|
-
body:
|
|
592
|
-
concurrencyCheck: {baseSeq:
|
|
593
|
-
id:
|
|
696
|
+
body: effectiveMutation.data ?? {},
|
|
697
|
+
concurrencyCheck: {baseSeq: effectiveMutation.baseVersion ?? 0, type: "seq"},
|
|
698
|
+
id: effectiveMutation.id as string,
|
|
594
699
|
model,
|
|
595
|
-
options:
|
|
596
|
-
req:
|
|
700
|
+
options: executorOptions,
|
|
701
|
+
req: executorRequest,
|
|
702
|
+
skipPermissionChecks,
|
|
597
703
|
skipPostHooks: true,
|
|
598
704
|
user,
|
|
599
705
|
});
|
|
@@ -603,7 +709,13 @@ const applyClaimedMutation = async ({
|
|
|
603
709
|
// biome-ignore lint/style/noNonNullAssertion: executeUpdate with skipPostHooks always returns cleanedBody/prevDoc.
|
|
604
710
|
const prevDoc = result.prevDoc!;
|
|
605
711
|
postHook = (): Promise<void> =>
|
|
606
|
-
runPostUpdate({
|
|
712
|
+
runPostUpdate({
|
|
713
|
+
cleanedBody,
|
|
714
|
+
doc: result.doc,
|
|
715
|
+
options: executorOptions,
|
|
716
|
+
prevDoc,
|
|
717
|
+
request: executorRequest,
|
|
718
|
+
});
|
|
607
719
|
} catch (updateError: unknown) {
|
|
608
720
|
// M4 (lease takeover only): a conflict whose serverSeq is EXACTLY
|
|
609
721
|
// this mutation's own expected post-write seq COULD mean the write
|
|
@@ -619,8 +731,8 @@ const applyClaimedMutation = async ({
|
|
|
619
731
|
isLeaseTakeover &&
|
|
620
732
|
isExecutorConflictError(updateError) &&
|
|
621
733
|
updateError.conflictType === "seq" &&
|
|
622
|
-
updateError.serverSeq === (
|
|
623
|
-
docMatchesMutationData(updateError.doc,
|
|
734
|
+
updateError.serverSeq === (effectiveMutation.baseVersion ?? 0) + 1 &&
|
|
735
|
+
docMatchesMutationData(updateError.doc, effectiveMutation.data)
|
|
624
736
|
) {
|
|
625
737
|
const {resultId, resultSeq} = await finalizeAlreadyApplied({
|
|
626
738
|
claimedId: claimed._id,
|
|
@@ -633,16 +745,17 @@ const applyClaimedMutation = async ({
|
|
|
633
745
|
}
|
|
634
746
|
} else {
|
|
635
747
|
const result = await executeDelete({
|
|
636
|
-
id:
|
|
748
|
+
id: effectiveMutation.id as string,
|
|
637
749
|
model,
|
|
638
|
-
options:
|
|
639
|
-
req:
|
|
750
|
+
options: executorOptions,
|
|
751
|
+
req: executorRequest,
|
|
752
|
+
skipPermissionChecks,
|
|
640
753
|
skipPostHooks: true,
|
|
641
754
|
user,
|
|
642
755
|
});
|
|
643
756
|
doc = result.doc;
|
|
644
757
|
postHook = (): Promise<void> =>
|
|
645
|
-
runPostDelete({doc: result.doc, options:
|
|
758
|
+
runPostDelete({doc: result.doc, options: executorOptions, request: executorRequest});
|
|
646
759
|
}
|
|
647
760
|
|
|
648
761
|
const resultId = String(doc._id);
|
|
@@ -670,6 +783,22 @@ const applyClaimedMutation = async ({
|
|
|
670
783
|
mutationId,
|
|
671
784
|
});
|
|
672
785
|
}
|
|
786
|
+
if (adminWindowScope?.emitAudit) {
|
|
787
|
+
try {
|
|
788
|
+
await emitAdminWindowMutationAudit({
|
|
789
|
+
doc,
|
|
790
|
+
mutation: effectiveMutation,
|
|
791
|
+
req: executorRequest,
|
|
792
|
+
scope: adminWindowScope,
|
|
793
|
+
});
|
|
794
|
+
} catch (auditError: unknown) {
|
|
795
|
+
logger.error("[sync] Admin window audit hook failed after a committed mutation", {
|
|
796
|
+
collection: mutation.collection,
|
|
797
|
+
error: errorMessageOf(auditError),
|
|
798
|
+
mutationId,
|
|
799
|
+
});
|
|
800
|
+
}
|
|
801
|
+
}
|
|
673
802
|
return {
|
|
674
803
|
ack: {id: resultId, mutationId, seq: resultSeq, ...(warning ? {warning} : {})},
|
|
675
804
|
type: "ack",
|
|
@@ -692,12 +821,14 @@ export const applySyncMutation = async ({
|
|
|
692
821
|
mutation,
|
|
693
822
|
req,
|
|
694
823
|
scopeResolver,
|
|
824
|
+
syncOptions,
|
|
695
825
|
}: {
|
|
696
826
|
user: User;
|
|
697
827
|
mutation: SyncMutateRequest;
|
|
698
828
|
/** The real Express request when called over HTTP; hooks receive a `{user}` stub otherwise. */
|
|
699
829
|
req?: express.Request;
|
|
700
830
|
scopeResolver?: SyncMutationScopeResolver;
|
|
831
|
+
syncOptions?: SyncAppOptions;
|
|
701
832
|
}): Promise<SyncMutationOutcome> => {
|
|
702
833
|
const mutationId = typeof mutation?.mutationId === "string" ? mutation.mutationId : "";
|
|
703
834
|
const validationNack = (message: string): SyncMutationOutcome =>
|
|
@@ -753,6 +884,7 @@ export const applySyncMutation = async ({
|
|
|
753
884
|
mutation,
|
|
754
885
|
request,
|
|
755
886
|
scopeResolver,
|
|
887
|
+
syncOptions,
|
|
756
888
|
user,
|
|
757
889
|
}),
|
|
758
890
|
request,
|
|
@@ -760,7 +892,15 @@ export const applySyncMutation = async ({
|
|
|
760
892
|
});
|
|
761
893
|
}
|
|
762
894
|
|
|
763
|
-
return applyClaimedMutation({
|
|
895
|
+
return applyClaimedMutation({
|
|
896
|
+
claimed,
|
|
897
|
+
entry,
|
|
898
|
+
mutation,
|
|
899
|
+
request,
|
|
900
|
+
scopeResolver,
|
|
901
|
+
syncOptions,
|
|
902
|
+
user,
|
|
903
|
+
});
|
|
764
904
|
};
|
|
765
905
|
|
|
766
906
|
/** Outcome of a batch validation pre-check (before any mutation is attempted). */
|
|
@@ -831,16 +971,18 @@ export const applySyncMutationBatch = async ({
|
|
|
831
971
|
mutations,
|
|
832
972
|
req,
|
|
833
973
|
scopeResolver,
|
|
974
|
+
syncOptions,
|
|
834
975
|
}: {
|
|
835
976
|
user: User;
|
|
836
977
|
mutations: SyncMutateRequest[];
|
|
837
978
|
/** The real Express request when called over HTTP; hooks receive a `{user}` stub otherwise. */
|
|
838
979
|
req?: express.Request;
|
|
839
980
|
scopeResolver?: SyncMutationScopeResolver;
|
|
981
|
+
syncOptions?: SyncAppOptions;
|
|
840
982
|
}): Promise<SyncMutateBatchResponse> => {
|
|
841
983
|
const results: SyncMutateBatchResponse["results"] = [];
|
|
842
984
|
for (const mutation of mutations) {
|
|
843
|
-
const outcome = await applySyncMutation({mutation, req, scopeResolver, user});
|
|
985
|
+
const outcome = await applySyncMutation({mutation, req, scopeResolver, syncOptions, user});
|
|
844
986
|
results.push(outcome);
|
|
845
987
|
if (outcome.type === "nack") {
|
|
846
988
|
// Stop-on-error: the client re-sends everything after this point, and
|
package/src/sync/registry.ts
CHANGED
|
@@ -8,6 +8,8 @@ import {
|
|
|
8
8
|
replaceCollectionOptions,
|
|
9
9
|
} from "../collectionRegistry";
|
|
10
10
|
import {logger} from "../logger";
|
|
11
|
+
import {clearAdminBroadcastScopes} from "./adminBroadcastScope";
|
|
12
|
+
import {clearAdminWindowMutationScopes} from "./adminWindowMutation";
|
|
11
13
|
import {
|
|
12
14
|
clearSyncIndexCreationTasks,
|
|
13
15
|
ensureSyncIndexes,
|
|
@@ -116,4 +118,6 @@ export const findSyncEntryByCollectionName = (
|
|
|
116
118
|
export const clearSyncRegistry = (): void => {
|
|
117
119
|
clearCollectionRegistry();
|
|
118
120
|
clearSyncIndexCreationTasks();
|
|
121
|
+
clearAdminBroadcastScopes();
|
|
122
|
+
clearAdminWindowMutationScopes();
|
|
119
123
|
};
|