@terreno/api 57.3.0 → 57.4.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 +6 -0
- package/dist/adminTypes.d.ts +7 -0
- package/dist/adminTypes.js +6 -1
- package/dist/api.d.ts +10 -0
- package/dist/api.js +99 -36
- package/dist/audit/auditApp.d.ts +30 -0
- package/dist/audit/auditApp.js +155 -0
- package/dist/audit/auditEventModel.d.ts +29 -0
- package/dist/audit/auditEventModel.js +102 -0
- package/dist/audit/cloudTasksEnqueue.d.ts +32 -0
- package/dist/audit/cloudTasksEnqueue.js +162 -0
- package/dist/audit/diff.d.ts +10 -0
- package/dist/audit/diff.js +230 -0
- package/dist/audit/processQueue.d.ts +6 -0
- package/dist/audit/processQueue.js +101 -0
- package/dist/audit/rbacSink.d.ts +2 -0
- package/dist/audit/rbacSink.js +82 -0
- package/dist/audit/record.d.ts +56 -0
- package/dist/audit/record.js +373 -0
- package/dist/betterAuth.d.ts +6 -0
- package/dist/betterAuthSetup.js +1 -1
- package/dist/collectionRegistry.d.ts +3 -1
- package/dist/collectionRegistry.js +25 -0
- package/dist/index.d.ts +26 -1
- package/dist/index.js +48 -2
- package/dist/mcp/query.d.ts +0 -13
- package/dist/mcp/query.js +8 -8
- package/dist/migrations/fixtures/all-down/20260910120000-one.d.ts +4 -0
- package/dist/migrations/fixtures/all-down/20260910120000-one.js +49 -0
- package/dist/migrations/fixtures/all-down/20260910120001-two.d.ts +4 -0
- package/dist/migrations/fixtures/all-down/20260910120001-two.js +49 -0
- package/dist/migrations/fixtures/bad-id/20260910120000-mismatch.d.ts +3 -0
- package/dist/migrations/fixtures/bad-id/20260910120000-mismatch.js +45 -0
- package/dist/migrations/fixtures/bad-name/not-a-migration.d.ts +3 -0
- package/dist/migrations/fixtures/bad-name/not-a-migration.js +45 -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 +45 -0
- package/dist/migrations/fixtures/valid/20260910120001-beta.d.ts +4 -0
- package/dist/migrations/fixtures/valid/20260910120001-beta.js +49 -0
- package/dist/migrations/generate.d.ts +17 -0
- package/dist/migrations/generate.js +277 -0
- package/dist/migrations/load.d.ts +20 -0
- package/dist/migrations/load.js +236 -0
- package/dist/migrations/lock.d.ts +13 -0
- package/dist/migrations/lock.js +145 -0
- package/dist/migrations/runner.d.ts +42 -0
- package/dist/migrations/runner.js +503 -0
- package/dist/migrations/schemaCatalog.d.ts +44 -0
- package/dist/migrations/schemaCatalog.js +326 -0
- package/dist/migrations/types.d.ts +87 -0
- package/dist/migrations/types.js +7 -0
- 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/notifications/notificationService.d.ts +40 -0
- package/dist/notifications/notificationService.js +323 -0
- package/dist/notifications/notificationsApp.d.ts +18 -0
- package/dist/notifications/notificationsApp.js +250 -0
- package/dist/notifications/notificationsBeforeSend.d.ts +14 -0
- package/dist/notifications/notificationsBeforeSend.js +77 -0
- package/dist/openApi.d.ts +1 -7
- package/dist/openApi.js +7 -6
- package/dist/openApiBuilder.d.ts +14 -3
- package/dist/openApiValidator.d.ts +13 -1
- package/dist/openApiValidator.js +200 -36
- package/dist/orgs/orgContext.d.ts +23 -0
- package/dist/orgs/orgContext.js +198 -0
- package/dist/orgs/orgPermissions.d.ts +4 -0
- package/dist/orgs/orgPermissions.js +77 -0
- package/dist/orgs/orgPlugin.d.ts +13 -0
- package/dist/orgs/orgPlugin.js +84 -0
- package/dist/orgs/organizationModel.d.ts +13 -0
- package/dist/orgs/organizationModel.js +301 -0
- package/dist/orgs/organizationSettings.d.ts +19 -0
- package/dist/orgs/organizationSettings.js +120 -0
- package/dist/orgs/orgsApp.d.ts +28 -0
- package/dist/orgs/orgsApp.js +678 -0
- package/dist/permissions.d.ts +7 -13
- package/dist/permissions.js +8 -31
- package/dist/rateLimit/middleware.d.ts +0 -8
- package/dist/rateLimit/middleware.js +2 -3
- package/dist/rateLimit/mongoStore.d.ts +1 -0
- package/dist/rateLimit/mongoStore.js +1 -0
- package/dist/rateLimit/policies.d.ts +0 -4
- package/dist/rateLimit/policies.js +5 -7
- package/dist/rateLimit/redisStore.d.ts +1 -0
- package/dist/rateLimit/redisStore.js +1 -0
- package/dist/rbac/access.js +30 -13
- package/dist/rbac/membershipOrgAdminSource.d.ts +6 -0
- package/dist/rbac/membershipOrgAdminSource.js +122 -0
- package/dist/rbac/modelRouterAccess.d.ts +3 -0
- package/dist/rbac/modelRouterAccess.js +3 -0
- package/dist/rbac/resolve.js +60 -31
- package/dist/rbac/roleModel.d.ts +2 -5
- package/dist/rbac/roleModel.js +18 -4
- package/dist/rbac/statements.d.ts +10 -1
- package/dist/rbac/statements.js +19 -2
- package/dist/rbac/types.d.ts +5 -0
- package/dist/realtime/changeStreamWatcher.d.ts +10 -4
- package/dist/realtime/changeStreamWatcher.js +110 -64
- package/dist/realtime/deprecation.d.ts +1 -0
- package/dist/realtime/deprecation.js +1 -0
- package/dist/realtime/realtimeApp.d.ts +1 -0
- package/dist/realtime/realtimeApp.js +1 -0
- package/dist/schemaMetadata.js +16 -5
- package/dist/sync/adminBroadcastScope.d.ts +40 -0
- package/dist/sync/adminBroadcastScope.js +194 -0
- package/dist/sync/adminWindowAccess.d.ts +13 -0
- package/dist/sync/adminWindowAccess.js +96 -0
- package/dist/sync/adminWindowMutation.d.ts +88 -0
- package/dist/sync/adminWindowMutation.js +247 -0
- package/dist/sync/executors.d.ts +9 -3
- package/dist/sync/executors.js +190 -159
- package/dist/sync/mutationHandler.d.ts +5 -2
- package/dist/sync/mutationHandler.js +191 -71
- package/dist/sync/registry.js +4 -0
- package/dist/sync/routes.d.ts +13 -0
- package/dist/sync/routes.js +113 -56
- package/dist/sync/socketHandlers.d.ts +8 -2
- package/dist/sync/socketHandlers.js +144 -50
- package/dist/sync/streams.d.ts +2 -0
- package/dist/sync/streams.js +7 -1
- package/dist/sync/syncApp.d.ts +2 -1
- package/dist/sync/syncApp.js +2 -1
- package/dist/sync/syncBatch.d.ts +5 -2
- package/dist/sync/syncBatch.js +4 -4
- package/dist/sync/types.d.ts +18 -0
- package/dist/terrenoApp.d.ts +29 -0
- package/dist/terrenoApp.js +91 -54
- package/dist/tests/createTestData.d.ts +1 -3
- package/dist/tests/createTestData.js +3 -5
- package/dist/tests/models.d.ts +1 -0
- package/dist/tests/models.js +9 -2
- package/dist/tests/testHelper.d.ts +0 -5
- package/dist/tests/testHelper.js +2 -9
- 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/webhooks/idempotency/webhookReceipt.d.ts +4 -49
- package/dist/webhooks/idempotency/webhookReceipt.js +7 -7
- package/dist/webhooks/rawBody.d.ts +1 -0
- package/dist/webhooks/rawBody.js +1 -0
- package/package.json +31 -25
- 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/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 +156 -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 +328 -0
- package/src/auth.test.ts +1 -1
- package/src/betterAuth.ts +7 -0
- package/src/betterAuthSetup.test.ts +27 -0
- package/src/betterAuthSetup.ts +1 -0
- package/src/collectionRegistry.test.ts +8 -9
- package/src/collectionRegistry.ts +21 -1
- package/src/express.d.ts +2 -0
- package/src/expressServer.test.ts +50 -2
- package/src/index.ts +69 -0
- 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 +376 -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/notification.ts +68 -0
- package/src/models/notificationPreference.ts +62 -0
- package/src/notifications/notificationService.ts +254 -0
- package/src/notifications/notificationsApp.test.ts +505 -0
- package/src/notifications/notificationsApp.ts +200 -0
- package/src/notifications/notificationsBeforeSend.ts +51 -0
- 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 +257 -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/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 +1 -0
- 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/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 +94 -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/webhooks/idempotency/webhookReceipt.ts +4 -7
- package/src/webhooks/rawBody.test.ts +33 -0
- package/src/webhooks/rawBody.ts +1 -0
- package/tsconfig.json +1 -1
- package/tsconfig.typedoc.json +2 -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
|
@@ -82,7 +82,9 @@ var luxon_1 = require("luxon");
|
|
|
82
82
|
var mongoose_1 = __importDefault(require("mongoose"));
|
|
83
83
|
var errors_1 = require("../errors");
|
|
84
84
|
var logger_1 = require("../logger");
|
|
85
|
+
var orgContext_1 = require("../orgs/orgContext");
|
|
85
86
|
var plugins_1 = require("../plugins");
|
|
87
|
+
var adminWindowMutation_1 = require("./adminWindowMutation");
|
|
86
88
|
var executors_1 = require("./executors");
|
|
87
89
|
var models_1 = require("./models");
|
|
88
90
|
var registry_1 = require("./registry");
|
|
@@ -533,134 +535,221 @@ var finalizeAlreadyApplied = function (_a) { return __awaiter(void 0, [_a], void
|
|
|
533
535
|
* - delete: idempotent already (executeDelete on an already-deleted tombstone is a no-op
|
|
534
536
|
* success in this codebase's soft-delete model), so no special tolerance is needed.
|
|
535
537
|
*/
|
|
538
|
+
var organizationIdFromRequest = function (request) {
|
|
539
|
+
if (typeof request.header !== "function") {
|
|
540
|
+
return undefined;
|
|
541
|
+
}
|
|
542
|
+
var raw = request.header("X-Organization-Id");
|
|
543
|
+
if (typeof raw !== "string") {
|
|
544
|
+
return undefined;
|
|
545
|
+
}
|
|
546
|
+
var trimmed = raw.trim();
|
|
547
|
+
if (!trimmed) {
|
|
548
|
+
return undefined;
|
|
549
|
+
}
|
|
550
|
+
return trimmed;
|
|
551
|
+
};
|
|
552
|
+
var withRequestOrgContext = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
|
|
553
|
+
var organizationId, context;
|
|
554
|
+
var request = _b.request, run = _b.run, user = _b.user;
|
|
555
|
+
return __generator(this, function (_c) {
|
|
556
|
+
switch (_c.label) {
|
|
557
|
+
case 0:
|
|
558
|
+
organizationId = organizationIdFromRequest(request);
|
|
559
|
+
if (!organizationId) {
|
|
560
|
+
return [2 /*return*/, run()];
|
|
561
|
+
}
|
|
562
|
+
return [4 /*yield*/, (0, orgContext_1.resolveOrgContext)({ organizationId: organizationId, required: false, user: user })];
|
|
563
|
+
case 1:
|
|
564
|
+
context = _c.sent();
|
|
565
|
+
return [2 /*return*/, (0, orgContext_1.runWithOrgContext)(context, run)];
|
|
566
|
+
}
|
|
567
|
+
});
|
|
568
|
+
}); };
|
|
536
569
|
var applyClaimedMutation = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
|
|
537
|
-
var
|
|
570
|
+
var claimed = _b.claimed, entry = _b.entry, mutation = _b.mutation, request = _b.request, user = _b.user, scopeResolver = _b.scopeResolver, syncOptions = _b.syncOptions, _c = _b.isLeaseTakeover, isLeaseTakeover = _c === void 0 ? false : _c;
|
|
571
|
+
return __generator(this, function (_d) {
|
|
572
|
+
return [2 /*return*/, withRequestOrgContext({
|
|
573
|
+
request: request,
|
|
574
|
+
run: function () {
|
|
575
|
+
return applyClaimedMutationInContext({
|
|
576
|
+
claimed: claimed,
|
|
577
|
+
entry: entry,
|
|
578
|
+
isLeaseTakeover: isLeaseTakeover,
|
|
579
|
+
mutation: mutation,
|
|
580
|
+
request: request,
|
|
581
|
+
scopeResolver: scopeResolver,
|
|
582
|
+
syncOptions: syncOptions,
|
|
583
|
+
user: user,
|
|
584
|
+
});
|
|
585
|
+
},
|
|
586
|
+
user: user,
|
|
587
|
+
})];
|
|
588
|
+
});
|
|
589
|
+
}); };
|
|
590
|
+
var applyClaimedMutationInContext = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
|
|
591
|
+
var mutationId, adminWindowScope, model, adminWindow, effectiveMutation, skipPermissionChecks, executorOptions_1, executorRequest_1, doc, postHook, body, result_1, createError_1, existing, _c, resultId_1, resultSeq_1, result_2, cleanedBody_1, prevDoc_1, updateError_1, _d, resultId_2, resultSeq_2, result_3, resultId, resultSeq, warning, postHookError_1, auditError_1, error_2;
|
|
538
592
|
var _e, _f, _g, _h, _j;
|
|
539
|
-
var claimed = _b.claimed, entry = _b.entry, mutation = _b.mutation, request = _b.request, user = _b.user, scopeResolver = _b.scopeResolver, _k = _b.isLeaseTakeover, isLeaseTakeover = _k === void 0 ? false : _k;
|
|
593
|
+
var claimed = _b.claimed, entry = _b.entry, mutation = _b.mutation, request = _b.request, user = _b.user, scopeResolver = _b.scopeResolver, syncOptions = _b.syncOptions, _k = _b.isLeaseTakeover, isLeaseTakeover = _k === void 0 ? false : _k;
|
|
540
594
|
return __generator(this, function (_l) {
|
|
541
595
|
switch (_l.label) {
|
|
542
596
|
case 0:
|
|
543
597
|
mutationId = mutation.mutationId;
|
|
544
598
|
_l.label = 1;
|
|
545
599
|
case 1:
|
|
546
|
-
_l.trys.push([1,
|
|
600
|
+
_l.trys.push([1, 32, , 33]);
|
|
547
601
|
model = mongoose_1.default.model(entry.modelName);
|
|
548
|
-
|
|
549
|
-
return [4 /*yield*/, enforceWriteScope({
|
|
550
|
-
data: mutation.data,
|
|
602
|
+
return [4 /*yield*/, (0, adminWindowMutation_1.prepareAdminWindowMutation)({
|
|
551
603
|
entry: entry,
|
|
552
|
-
|
|
553
|
-
|
|
604
|
+
mutation: mutation,
|
|
605
|
+
req: request,
|
|
606
|
+
syncOptions: syncOptions,
|
|
554
607
|
user: user,
|
|
555
608
|
})];
|
|
556
609
|
case 2:
|
|
557
|
-
|
|
610
|
+
adminWindow = _l.sent();
|
|
611
|
+
effectiveMutation = mutation;
|
|
612
|
+
if (!adminWindow) return [3 /*break*/, 3];
|
|
613
|
+
effectiveMutation = adminWindow.mutation;
|
|
614
|
+
adminWindowScope = adminWindow.scope;
|
|
615
|
+
return [3 /*break*/, 5];
|
|
616
|
+
case 3:
|
|
617
|
+
// C6 (M6): product-path write-scope backstop before any write pipeline runs.
|
|
618
|
+
return [4 /*yield*/, enforceWriteScope({
|
|
619
|
+
data: effectiveMutation.data,
|
|
620
|
+
entry: entry,
|
|
621
|
+
operation: effectiveMutation.operation,
|
|
622
|
+
scopeResolver: scopeResolver,
|
|
623
|
+
user: user,
|
|
624
|
+
})];
|
|
625
|
+
case 4:
|
|
626
|
+
// C6 (M6): product-path write-scope backstop before any write pipeline runs.
|
|
558
627
|
_l.sent();
|
|
628
|
+
_l.label = 5;
|
|
629
|
+
case 5:
|
|
630
|
+
skipPermissionChecks = Boolean(adminWindowScope);
|
|
631
|
+
executorOptions_1 = adminWindowScope
|
|
632
|
+
? (0, adminWindowMutation_1.buildAdminWindowExecutorOptions)({ productOptions: entry.options, scope: adminWindowScope })
|
|
633
|
+
: entry.options;
|
|
634
|
+
executorRequest_1 = adminWindowScope
|
|
635
|
+
? (0, adminWindowMutation_1.withAdminWindowMutationRequestContext)({ mutation: effectiveMutation, req: request })
|
|
636
|
+
: request;
|
|
559
637
|
doc = void 0;
|
|
560
638
|
postHook = void 0;
|
|
561
|
-
if (!(
|
|
562
|
-
body = __assign({}, ((_e =
|
|
563
|
-
if (
|
|
564
|
-
body._id =
|
|
639
|
+
if (!(effectiveMutation.operation === "create")) return [3 /*break*/, 13];
|
|
640
|
+
body = __assign({}, ((_e = effectiveMutation.data) !== null && _e !== void 0 ? _e : {}));
|
|
641
|
+
if (effectiveMutation.id) {
|
|
642
|
+
body._id = effectiveMutation.id;
|
|
565
643
|
}
|
|
566
|
-
_l.label =
|
|
567
|
-
case
|
|
568
|
-
_l.trys.push([
|
|
644
|
+
_l.label = 6;
|
|
645
|
+
case 6:
|
|
646
|
+
_l.trys.push([6, 8, , 12]);
|
|
569
647
|
return [4 /*yield*/, (0, executors_1.executeCreate)({
|
|
570
648
|
body: body,
|
|
571
649
|
model: model,
|
|
572
|
-
options:
|
|
573
|
-
req:
|
|
650
|
+
options: executorOptions_1,
|
|
651
|
+
req: executorRequest_1,
|
|
652
|
+
skipPermissionChecks: skipPermissionChecks,
|
|
574
653
|
skipPostHooks: true,
|
|
575
654
|
user: user,
|
|
576
655
|
})];
|
|
577
|
-
case
|
|
656
|
+
case 7:
|
|
578
657
|
result_1 = _l.sent();
|
|
579
658
|
doc = result_1.doc;
|
|
580
659
|
postHook = function () {
|
|
581
|
-
return (0, executors_1.runPostCreate)({ doc: result_1.doc, options:
|
|
660
|
+
return (0, executors_1.runPostCreate)({ doc: result_1.doc, options: executorOptions_1, request: executorRequest_1 });
|
|
582
661
|
};
|
|
583
|
-
return [3 /*break*/,
|
|
584
|
-
case
|
|
662
|
+
return [3 /*break*/, 12];
|
|
663
|
+
case 8:
|
|
585
664
|
createError_1 = _l.sent();
|
|
586
|
-
if (!(isLeaseTakeover &&
|
|
587
|
-
|
|
588
|
-
|
|
665
|
+
if (!(isLeaseTakeover &&
|
|
666
|
+
isE11000Error(createError_1) &&
|
|
667
|
+
typeof effectiveMutation.id === "string")) return [3 /*break*/, 11];
|
|
668
|
+
return [4 /*yield*/, (0, plugins_1.findOneOrNoneFor)(model, { _id: effectiveMutation.id })];
|
|
669
|
+
case 9:
|
|
589
670
|
existing = _l.sent();
|
|
590
|
-
if (!existing) return [3 /*break*/,
|
|
671
|
+
if (!existing) return [3 /*break*/, 11];
|
|
591
672
|
return [4 /*yield*/, finalizeAlreadyApplied({
|
|
592
673
|
claimedId: claimed._id,
|
|
593
674
|
doc: existing,
|
|
594
675
|
mutation: mutation,
|
|
595
676
|
})];
|
|
596
|
-
case
|
|
677
|
+
case 10:
|
|
597
678
|
_c = _l.sent(), resultId_1 = _c.resultId, resultSeq_1 = _c.resultSeq;
|
|
598
679
|
return [2 /*return*/, { ack: { id: resultId_1, mutationId: mutationId, seq: resultSeq_1 }, type: "ack" }];
|
|
599
|
-
case
|
|
600
|
-
case
|
|
601
|
-
case
|
|
602
|
-
if (!(
|
|
603
|
-
_l.label =
|
|
604
|
-
case
|
|
605
|
-
_l.trys.push([
|
|
680
|
+
case 11: throw createError_1;
|
|
681
|
+
case 12: return [3 /*break*/, 22];
|
|
682
|
+
case 13:
|
|
683
|
+
if (!(effectiveMutation.operation === "update")) return [3 /*break*/, 20];
|
|
684
|
+
_l.label = 14;
|
|
685
|
+
case 14:
|
|
686
|
+
_l.trys.push([14, 16, , 19]);
|
|
606
687
|
return [4 /*yield*/, (0, executors_1.executeUpdate)({
|
|
607
|
-
body: (_f =
|
|
608
|
-
concurrencyCheck: { baseSeq: (_g =
|
|
609
|
-
id:
|
|
688
|
+
body: (_f = effectiveMutation.data) !== null && _f !== void 0 ? _f : {},
|
|
689
|
+
concurrencyCheck: { baseSeq: (_g = effectiveMutation.baseVersion) !== null && _g !== void 0 ? _g : 0, type: "seq" },
|
|
690
|
+
id: effectiveMutation.id,
|
|
610
691
|
model: model,
|
|
611
|
-
options:
|
|
612
|
-
req:
|
|
692
|
+
options: executorOptions_1,
|
|
693
|
+
req: executorRequest_1,
|
|
694
|
+
skipPermissionChecks: skipPermissionChecks,
|
|
613
695
|
skipPostHooks: true,
|
|
614
696
|
user: user,
|
|
615
697
|
})];
|
|
616
|
-
case
|
|
698
|
+
case 15:
|
|
617
699
|
result_2 = _l.sent();
|
|
618
700
|
doc = result_2.doc;
|
|
619
701
|
cleanedBody_1 = result_2.cleanedBody;
|
|
620
702
|
prevDoc_1 = result_2.prevDoc;
|
|
621
703
|
postHook = function () {
|
|
622
|
-
return (0, executors_1.runPostUpdate)({
|
|
704
|
+
return (0, executors_1.runPostUpdate)({
|
|
705
|
+
cleanedBody: cleanedBody_1,
|
|
706
|
+
doc: result_2.doc,
|
|
707
|
+
options: executorOptions_1,
|
|
708
|
+
prevDoc: prevDoc_1,
|
|
709
|
+
request: executorRequest_1,
|
|
710
|
+
});
|
|
623
711
|
};
|
|
624
|
-
return [3 /*break*/,
|
|
625
|
-
case
|
|
712
|
+
return [3 /*break*/, 19];
|
|
713
|
+
case 16:
|
|
626
714
|
updateError_1 = _l.sent();
|
|
627
715
|
if (!(isLeaseTakeover &&
|
|
628
716
|
(0, executors_1.isExecutorConflictError)(updateError_1) &&
|
|
629
717
|
updateError_1.conflictType === "seq" &&
|
|
630
|
-
updateError_1.serverSeq === ((_h =
|
|
631
|
-
(0, exports.docMatchesMutationData)(updateError_1.doc,
|
|
718
|
+
updateError_1.serverSeq === ((_h = effectiveMutation.baseVersion) !== null && _h !== void 0 ? _h : 0) + 1 &&
|
|
719
|
+
(0, exports.docMatchesMutationData)(updateError_1.doc, effectiveMutation.data))) return [3 /*break*/, 18];
|
|
632
720
|
return [4 /*yield*/, finalizeAlreadyApplied({
|
|
633
721
|
claimedId: claimed._id,
|
|
634
722
|
doc: updateError_1.doc,
|
|
635
723
|
mutation: mutation,
|
|
636
724
|
})];
|
|
637
|
-
case
|
|
725
|
+
case 17:
|
|
638
726
|
_d = _l.sent(), resultId_2 = _d.resultId, resultSeq_2 = _d.resultSeq;
|
|
639
727
|
return [2 /*return*/, { ack: { id: resultId_2, mutationId: mutationId, seq: resultSeq_2 }, type: "ack" }];
|
|
640
|
-
case
|
|
641
|
-
case
|
|
642
|
-
case
|
|
643
|
-
id:
|
|
728
|
+
case 18: throw updateError_1;
|
|
729
|
+
case 19: return [3 /*break*/, 22];
|
|
730
|
+
case 20: return [4 /*yield*/, (0, executors_1.executeDelete)({
|
|
731
|
+
id: effectiveMutation.id,
|
|
644
732
|
model: model,
|
|
645
|
-
options:
|
|
646
|
-
req:
|
|
733
|
+
options: executorOptions_1,
|
|
734
|
+
req: executorRequest_1,
|
|
735
|
+
skipPermissionChecks: skipPermissionChecks,
|
|
647
736
|
skipPostHooks: true,
|
|
648
737
|
user: user,
|
|
649
738
|
})];
|
|
650
|
-
case
|
|
739
|
+
case 21:
|
|
651
740
|
result_3 = _l.sent();
|
|
652
741
|
doc = result_3.doc;
|
|
653
742
|
postHook = function () {
|
|
654
|
-
return (0, executors_1.runPostDelete)({ doc: result_3.doc, options:
|
|
743
|
+
return (0, executors_1.runPostDelete)({ doc: result_3.doc, options: executorOptions_1, request: executorRequest_1 });
|
|
655
744
|
};
|
|
656
|
-
_l.label =
|
|
657
|
-
case
|
|
745
|
+
_l.label = 22;
|
|
746
|
+
case 22:
|
|
658
747
|
resultId = String(doc._id);
|
|
659
748
|
resultSeq = (_j = doc._syncSeq) !== null && _j !== void 0 ? _j : 0;
|
|
660
749
|
// M5: finalize the ledger BEFORE the post-hook runs — a post-hook throw
|
|
661
750
|
// must never make a committed write look like a failure.
|
|
662
751
|
return [4 /*yield*/, models_1.SyncMutation.updateOne({ _id: claimed._id }, { $set: { resultId: resultId, resultSeq: resultSeq, status: "applied" } })];
|
|
663
|
-
case
|
|
752
|
+
case 23:
|
|
664
753
|
// M5: finalize the ledger BEFORE the post-hook runs — a post-hook throw
|
|
665
754
|
// must never make a committed write look like a failure.
|
|
666
755
|
_l.sent();
|
|
@@ -670,14 +759,14 @@ var applyClaimedMutation = function (_a) { return __awaiter(void 0, [_a], void 0
|
|
|
670
759
|
seq: resultSeq,
|
|
671
760
|
});
|
|
672
761
|
warning = void 0;
|
|
673
|
-
_l.label =
|
|
674
|
-
case
|
|
675
|
-
_l.trys.push([
|
|
762
|
+
_l.label = 24;
|
|
763
|
+
case 24:
|
|
764
|
+
_l.trys.push([24, 26, , 27]);
|
|
676
765
|
return [4 /*yield*/, postHook()];
|
|
677
|
-
case
|
|
766
|
+
case 25:
|
|
678
767
|
_l.sent();
|
|
679
|
-
return [3 /*break*/,
|
|
680
|
-
case
|
|
768
|
+
return [3 /*break*/, 27];
|
|
769
|
+
case 26:
|
|
681
770
|
postHookError_1 = _l.sent();
|
|
682
771
|
warning = errorMessageOf(postHookError_1);
|
|
683
772
|
logger_1.logger.error("[sync] Post-hook failed after a committed mutation", {
|
|
@@ -685,15 +774,37 @@ var applyClaimedMutation = function (_a) { return __awaiter(void 0, [_a], void 0
|
|
|
685
774
|
error: warning,
|
|
686
775
|
mutationId: mutationId,
|
|
687
776
|
});
|
|
688
|
-
return [3 /*break*/,
|
|
689
|
-
case
|
|
777
|
+
return [3 /*break*/, 27];
|
|
778
|
+
case 27:
|
|
779
|
+
if (!(adminWindowScope === null || adminWindowScope === void 0 ? void 0 : adminWindowScope.emitAudit)) return [3 /*break*/, 31];
|
|
780
|
+
_l.label = 28;
|
|
781
|
+
case 28:
|
|
782
|
+
_l.trys.push([28, 30, , 31]);
|
|
783
|
+
return [4 /*yield*/, (0, adminWindowMutation_1.emitAdminWindowMutationAudit)({
|
|
784
|
+
doc: doc,
|
|
785
|
+
mutation: effectiveMutation,
|
|
786
|
+
req: executorRequest_1,
|
|
787
|
+
scope: adminWindowScope,
|
|
788
|
+
})];
|
|
789
|
+
case 29:
|
|
790
|
+
_l.sent();
|
|
791
|
+
return [3 /*break*/, 31];
|
|
792
|
+
case 30:
|
|
793
|
+
auditError_1 = _l.sent();
|
|
794
|
+
logger_1.logger.error("[sync] Admin window audit hook failed after a committed mutation", {
|
|
795
|
+
collection: mutation.collection,
|
|
796
|
+
error: errorMessageOf(auditError_1),
|
|
797
|
+
mutationId: mutationId,
|
|
798
|
+
});
|
|
799
|
+
return [3 /*break*/, 31];
|
|
800
|
+
case 31: return [2 /*return*/, {
|
|
690
801
|
ack: __assign({ id: resultId, mutationId: mutationId, seq: resultSeq }, (warning ? { warning: warning } : {})),
|
|
691
802
|
type: "ack",
|
|
692
803
|
}];
|
|
693
|
-
case
|
|
804
|
+
case 32:
|
|
694
805
|
error_2 = _l.sent();
|
|
695
806
|
return [2 /*return*/, finalizeNack({ claimedId: claimed._id, entry: entry, error: error_2, mutation: mutation, request: request })];
|
|
696
|
-
case
|
|
807
|
+
case 33: return [2 /*return*/];
|
|
697
808
|
}
|
|
698
809
|
});
|
|
699
810
|
}); };
|
|
@@ -707,7 +818,7 @@ var errorMessageOf = function (error) {
|
|
|
707
818
|
*/
|
|
708
819
|
var applySyncMutation = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
|
|
709
820
|
var mutationId, validationNack, entry, request, claimed, error_3;
|
|
710
|
-
var user = _b.user, mutation = _b.mutation, req = _b.req, scopeResolver = _b.scopeResolver;
|
|
821
|
+
var user = _b.user, mutation = _b.mutation, req = _b.req, scopeResolver = _b.scopeResolver, syncOptions = _b.syncOptions;
|
|
711
822
|
return __generator(this, function (_c) {
|
|
712
823
|
switch (_c.label) {
|
|
713
824
|
case 0:
|
|
@@ -766,13 +877,22 @@ var applySyncMutation = function (_a) { return __awaiter(void 0, [_a], void 0, f
|
|
|
766
877
|
mutation: mutation,
|
|
767
878
|
request: request,
|
|
768
879
|
scopeResolver: scopeResolver,
|
|
880
|
+
syncOptions: syncOptions,
|
|
769
881
|
user: user,
|
|
770
882
|
});
|
|
771
883
|
},
|
|
772
884
|
request: request,
|
|
773
885
|
user: user,
|
|
774
886
|
})];
|
|
775
|
-
case 4: return [2 /*return*/, applyClaimedMutation({
|
|
887
|
+
case 4: return [2 /*return*/, applyClaimedMutation({
|
|
888
|
+
claimed: claimed,
|
|
889
|
+
entry: entry,
|
|
890
|
+
mutation: mutation,
|
|
891
|
+
request: request,
|
|
892
|
+
scopeResolver: scopeResolver,
|
|
893
|
+
syncOptions: syncOptions,
|
|
894
|
+
user: user,
|
|
895
|
+
})];
|
|
776
896
|
}
|
|
777
897
|
});
|
|
778
898
|
}); };
|
|
@@ -847,7 +967,7 @@ exports.validateSyncMutationBatch = validateSyncMutationBatch;
|
|
|
847
967
|
var applySyncMutationBatch = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
|
|
848
968
|
var results, mutations_2, mutations_2_1, mutation, outcome, e_2_1;
|
|
849
969
|
var e_2, _c;
|
|
850
|
-
var user = _b.user, mutations = _b.mutations, req = _b.req, scopeResolver = _b.scopeResolver;
|
|
970
|
+
var user = _b.user, mutations = _b.mutations, req = _b.req, scopeResolver = _b.scopeResolver, syncOptions = _b.syncOptions;
|
|
851
971
|
return __generator(this, function (_d) {
|
|
852
972
|
switch (_d.label) {
|
|
853
973
|
case 0:
|
|
@@ -860,7 +980,7 @@ var applySyncMutationBatch = function (_a) { return __awaiter(void 0, [_a], void
|
|
|
860
980
|
case 2:
|
|
861
981
|
if (!!mutations_2_1.done) return [3 /*break*/, 5];
|
|
862
982
|
mutation = mutations_2_1.value;
|
|
863
|
-
return [4 /*yield*/, (0, exports.applySyncMutation)({ mutation: mutation, req: req, scopeResolver: scopeResolver, user: user })];
|
|
983
|
+
return [4 /*yield*/, (0, exports.applySyncMutation)({ mutation: mutation, req: req, scopeResolver: scopeResolver, syncOptions: syncOptions, user: user })];
|
|
864
984
|
case 3:
|
|
865
985
|
outcome = _d.sent();
|
|
866
986
|
results.push(outcome);
|
package/dist/sync/registry.js
CHANGED
|
@@ -14,6 +14,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
14
14
|
exports.clearSyncRegistry = exports.findSyncEntryByCollectionName = exports.findSyncEntryByCollectionTag = exports.findSyncEntryByModelName = exports.warnOnSyncScopesWithoutUserModel = exports.getSyncRegistry = exports.updateSyncRegistryOptions = exports.registerSync = exports.trackSyncIndexCreation = exports.ensureSyncIndexes = void 0;
|
|
15
15
|
var collectionRegistry_1 = require("../collectionRegistry");
|
|
16
16
|
var logger_1 = require("../logger");
|
|
17
|
+
var adminBroadcastScope_1 = require("./adminBroadcastScope");
|
|
18
|
+
var adminWindowMutation_1 = require("./adminWindowMutation");
|
|
17
19
|
var registrationSideEffects_1 = require("./registrationSideEffects");
|
|
18
20
|
Object.defineProperty(exports, "ensureSyncIndexes", { enumerable: true, get: function () { return registrationSideEffects_1.ensureSyncIndexes; } });
|
|
19
21
|
Object.defineProperty(exports, "trackSyncIndexCreation", { enumerable: true, get: function () { return registrationSideEffects_1.trackSyncIndexCreation; } });
|
|
@@ -82,5 +84,7 @@ exports.findSyncEntryByCollectionName = findSyncEntryByCollectionName;
|
|
|
82
84
|
var clearSyncRegistry = function () {
|
|
83
85
|
(0, collectionRegistry_1.clearCollectionRegistry)();
|
|
84
86
|
(0, registrationSideEffects_1.clearSyncIndexCreationTasks)();
|
|
87
|
+
(0, adminBroadcastScope_1.clearAdminBroadcastScopes)();
|
|
88
|
+
(0, adminWindowMutation_1.clearAdminWindowMutationScopes)();
|
|
85
89
|
};
|
|
86
90
|
exports.clearSyncRegistry = clearSyncRegistry;
|
package/dist/sync/routes.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import express from "express";
|
|
2
2
|
import mongoose from "mongoose";
|
|
3
3
|
import { type User } from "../auth";
|
|
4
|
+
import type { AnyTerrenoAccess } from "../rbac/types";
|
|
4
5
|
import { type SyncRegistryEntry } from "./registry";
|
|
5
6
|
/**
|
|
6
7
|
* Maximum mutations per user per second on the HTTP mutate routes.
|
|
@@ -21,6 +22,18 @@ export interface SyncAppOptions {
|
|
|
21
22
|
getUserScopes?: (user: User, entry: SyncRegistryEntry) => Promise<string[]> | string[];
|
|
22
23
|
/** Default page size for snapshots (default 100, max 100). */
|
|
23
24
|
defaultSnapshotLimit?: number;
|
|
25
|
+
/**
|
|
26
|
+
* When set, `{collection}|admin` window subscribe and cross-owner entity
|
|
27
|
+
* hydrate require `admin:access` instead of the legacy `user.admin` flag.
|
|
28
|
+
* AdminApp also registers per-model list/read/`queryFilter` so hydrate and
|
|
29
|
+
* `|admin` deltas match `/admin` REST, not product `IsOwner`.
|
|
30
|
+
*/
|
|
31
|
+
accessControl?: AnyTerrenoAccess;
|
|
32
|
+
/**
|
|
33
|
+
* Override the admin-window gate. Defaults to `admin:access` when
|
|
34
|
+
* `accessControl` is set, otherwise `Permissions.IsAdmin`.
|
|
35
|
+
*/
|
|
36
|
+
canOpenAdminWindow?: (user: User) => boolean | Promise<boolean>;
|
|
24
37
|
}
|
|
25
38
|
/**
|
|
26
39
|
* Serialize a document for a sync payload through the fallback chain:
|