@terreno/api 57.2.0 → 57.3.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/README.md +17 -7
- package/dist/actions.js +19 -7
- package/dist/api.d.ts +4 -0
- package/dist/api.js +12 -24
- package/dist/auth.d.ts +23 -10
- package/dist/auth.js +97 -32
- package/dist/authRecovery.d.ts +5 -0
- package/dist/authRecovery.js +350 -0
- package/dist/authTokens.d.ts +8 -0
- package/dist/authTokens.js +162 -0
- package/dist/betterAuth.d.ts +33 -0
- package/dist/betterAuthApp.d.ts +4 -0
- package/dist/betterAuthApp.js +26 -8
- package/dist/betterAuthSetup.d.ts +44 -2
- package/dist/betterAuthSetup.js +288 -18
- package/dist/collectionRegistry.d.ts +38 -0
- package/dist/collectionRegistry.js +72 -0
- package/dist/configurationApp.d.ts +11 -2
- package/dist/configurationApp.js +2 -4
- package/dist/docLoader.js +35 -6
- package/dist/expressServer.d.ts +26 -3
- package/dist/expressServer.js +79 -11
- package/dist/index.d.ts +16 -0
- package/dist/index.js +38 -2
- package/dist/mcp/auth.d.ts +1 -0
- package/dist/mcp/auth.js +47 -25
- package/dist/mcp/handlers.d.ts +1 -1
- package/dist/mcp/handlers.js +67 -233
- package/dist/mcp/query.d.ts +2 -2
- package/dist/mcp/registry.d.ts +1 -5
- package/dist/mcp/registry.js +31 -20
- package/dist/mcp/schemaGenerator.d.ts +2 -7
- package/dist/mcp/schemaGenerator.js +41 -116
- package/dist/mcp/server.d.ts +1 -0
- package/dist/mcp/server.js +1 -0
- package/dist/mcp/serviceTokens.d.ts +16 -0
- package/dist/mcp/serviceTokens.js +345 -0
- package/dist/mcp/types.d.ts +2 -2
- package/dist/models/mcpServiceToken.d.ts +3 -0
- package/dist/models/mcpServiceToken.js +208 -0
- package/dist/openApiBuilder.d.ts +5 -4
- package/dist/openApiBuilder.js +61 -8
- package/dist/openApiCompat.js +1 -1
- package/dist/openApiValidator.js +0 -2
- package/dist/plugins.d.ts +14 -1
- package/dist/plugins.js +17 -6
- package/dist/populate.d.ts +2 -2
- package/dist/populate.js +47 -42
- package/dist/rateLimit/applyTrustProxy.d.ts +3 -0
- package/dist/rateLimit/applyTrustProxy.js +17 -0
- package/dist/rateLimit/createStore.d.ts +2 -0
- package/dist/rateLimit/createStore.js +28 -0
- package/dist/rateLimit/memoryStore.d.ts +2 -0
- package/dist/rateLimit/memoryStore.js +108 -0
- package/dist/rateLimit/middleware.d.ts +11 -0
- package/dist/rateLimit/middleware.js +110 -0
- package/dist/rateLimit/mongoStore.d.ts +3 -0
- package/dist/rateLimit/mongoStore.js +122 -0
- package/dist/rateLimit/policies.d.ts +14 -0
- package/dist/rateLimit/policies.js +151 -0
- package/dist/rateLimit/redisStore.d.ts +3 -0
- package/dist/rateLimit/redisStore.js +155 -0
- package/dist/rateLimit/types.d.ts +54 -0
- package/dist/rateLimit/types.js +9 -0
- package/dist/rbac/access.js +5 -1
- package/dist/rbac/assertAllowed.d.ts +9 -0
- package/dist/rbac/assertAllowed.js +182 -0
- package/dist/rbac/modelRouterAccess.d.ts +1 -0
- package/dist/rbac/modelRouterAccess.js +8 -4
- package/dist/rbac/permissionUtils.js +3 -2
- package/dist/rbac/resolve.js +5 -4
- package/dist/rbac/routes.js +15 -6
- package/dist/realtime/deprecation.d.ts +12 -0
- package/dist/realtime/deprecation.js +32 -0
- package/dist/realtime/realtimeApp.d.ts +1 -1
- package/dist/realtime/realtimeApp.js +10 -11
- package/dist/realtime/registry.d.ts +0 -31
- package/dist/realtime/registry.js +44 -31
- package/dist/realtime/socketAuth.d.ts +5 -5
- package/dist/realtime/socketAuth.js +11 -1
- package/dist/realtime/socketUser.d.ts +5 -1
- package/dist/realtime/types.d.ts +14 -4
- package/dist/schemaMetadata.d.ts +56 -0
- package/dist/schemaMetadata.js +513 -0
- package/dist/seedRunner.d.ts +88 -0
- package/dist/seedRunner.js +627 -0
- package/dist/sync/executors.d.ts +12 -2
- package/dist/sync/executors.js +8 -10
- package/dist/sync/loadHarness.js +28 -19
- package/dist/sync/models.js +26 -24
- package/dist/sync/mutationHandler.d.ts +9 -0
- package/dist/sync/mutationHandler.js +11 -6
- package/dist/sync/registrationSideEffects.d.ts +35 -0
- package/dist/sync/registrationSideEffects.js +151 -0
- package/dist/sync/registry.d.ts +2 -52
- package/dist/sync/registry.js +38 -187
- package/dist/sync/routes.js +3 -2
- package/dist/sync/scripts/compactTombstones.js +0 -2
- package/dist/sync/syncApp.d.ts +3 -3
- package/dist/sync/syncApp.js +4 -4
- package/dist/sync/syncBatch.js +3 -2
- package/dist/sync/syncSeqPlugin.d.ts +1 -1
- package/dist/sync/syncSeqPlugin.js +20 -16
- package/dist/terrenoApp.d.ts +19 -5
- package/dist/terrenoApp.js +66 -18
- package/dist/tests/models.d.ts +2 -0
- package/dist/tests/models.js +6 -0
- package/dist/types/authToken.d.ts +33 -0
- package/dist/types/authToken.js +2 -0
- package/dist/types/mcpServiceToken.d.ts +41 -0
- package/dist/types/mcpServiceToken.js +2 -0
- package/dist/webhooks/headerValue.d.ts +2 -0
- package/dist/webhooks/headerValue.js +14 -0
- package/dist/webhooks/idempotency/memoryStore.d.ts +10 -0
- package/dist/webhooks/idempotency/memoryStore.js +65 -0
- package/dist/webhooks/idempotency/mongoStore.d.ts +4 -0
- package/dist/webhooks/idempotency/mongoStore.js +150 -0
- package/dist/webhooks/idempotency/webhookReceipt.d.ts +62 -0
- package/dist/webhooks/idempotency/webhookReceipt.js +39 -0
- package/dist/webhooks/rawBody.d.ts +14 -0
- package/dist/webhooks/rawBody.js +22 -0
- package/dist/webhooks/timingSafeEqual.d.ts +4 -0
- package/dist/webhooks/timingSafeEqual.js +17 -0
- package/dist/webhooks/verifiers/hmac.d.ts +15 -0
- package/dist/webhooks/verifiers/hmac.js +49 -0
- package/dist/webhooks/verifiers/sendgrid.d.ts +10 -0
- package/dist/webhooks/verifiers/sendgrid.js +56 -0
- package/dist/webhooks/verifiers/stripe.d.ts +9 -0
- package/dist/webhooks/verifiers/stripe.js +99 -0
- package/dist/webhooks/verifiers/twilio.d.ts +9 -0
- package/dist/webhooks/verifiers/twilio.js +112 -0
- package/dist/webhooks/webhooksApp.d.ts +33 -0
- package/dist/webhooks/webhooksApp.js +195 -0
- package/package.json +4 -5
- package/src/__snapshots__/openApi.test.ts.snap +270 -0
- package/src/__snapshots__/openApiBuilder.test.ts.snap +30 -12
- package/src/__snapshots__/schemaMetadata.test.ts.snap +197 -0
- package/src/actions.ts +20 -13
- package/src/adminModelRouter.test.ts +133 -0
- package/src/api.arrayOperations.test.ts +43 -31
- package/src/api.hooks.test.ts +38 -29
- package/src/api.query.test.ts +31 -31
- package/src/api.test.ts +95 -96
- package/src/api.ts +16 -27
- package/src/auth.test.ts +107 -51
- package/src/auth.ts +98 -29
- package/src/authRecovery.test.ts +281 -0
- package/src/authRecovery.ts +279 -0
- package/src/authTokens.test.ts +94 -0
- package/src/authTokens.ts +118 -0
- package/src/authVerification.test.ts +293 -0
- package/src/betterAuth.ts +24 -0
- package/src/betterAuthApp.test.ts +1 -0
- package/src/betterAuthApp.ts +27 -9
- package/src/betterAuthSetup.test.ts +568 -38
- package/src/betterAuthSetup.ts +260 -5
- package/src/collectionRegistry.test.ts +165 -0
- package/src/collectionRegistry.ts +115 -0
- package/src/configurationApp.ts +13 -7
- package/src/docLoader.test.ts +45 -1
- package/src/docLoader.ts +37 -6
- package/src/express.d.ts +1 -0
- package/src/expressServer.test.ts +130 -66
- package/src/expressServer.ts +75 -19
- package/src/githubAuth.test.ts +60 -55
- package/src/index.ts +58 -0
- package/src/mcp/auth.test.ts +47 -0
- package/src/mcp/auth.ts +32 -11
- package/src/mcp/handlers.ts +45 -172
- package/src/mcp/integration.test.ts +59 -9
- package/src/mcp/query.ts +2 -4
- package/src/mcp/registry.ts +29 -20
- package/src/mcp/schemaGenerator.test.ts +8 -0
- package/src/mcp/schemaGenerator.ts +49 -131
- package/src/mcp/server.ts +2 -0
- package/src/mcp/serviceTokens.test.ts +330 -0
- package/src/mcp/serviceTokens.ts +307 -0
- package/src/mcp/toolGenerator.test.ts +1 -1
- package/src/mcp/types.ts +2 -6
- package/src/models/mcpServiceToken.test.ts +129 -0
- package/src/models/mcpServiceToken.ts +158 -0
- package/src/openApi.test.ts +80 -64
- package/src/openApiBuilder.test.ts +95 -7
- package/src/openApiBuilder.ts +46 -9
- package/src/openApiCompat.ts +1 -1
- package/src/openApiValidator.test.ts +49 -54
- package/src/openApiValidator.ts +1 -3
- package/src/plugins.test.ts +14 -0
- package/src/plugins.ts +34 -9
- package/src/populate.test.ts +34 -0
- package/src/populate.ts +40 -29
- package/src/rateLimit/applyTrustProxy.ts +17 -0
- package/src/rateLimit/createStore.ts +25 -0
- package/src/rateLimit/memoryStore.ts +40 -0
- package/src/rateLimit/middleware.ts +79 -0
- package/src/rateLimit/mongoStore.test.ts +80 -0
- package/src/rateLimit/mongoStore.ts +76 -0
- package/src/rateLimit/policies.ts +130 -0
- package/src/rateLimit/rateLimit.test.ts +328 -0
- package/src/rateLimit/redisStore.ioredis.test.ts +29 -0
- package/src/rateLimit/redisStore.test.ts +114 -0
- package/src/rateLimit/redisStore.ts +85 -0
- package/src/rateLimit/types.ts +64 -0
- package/src/rbac/access.ts +5 -1
- package/src/rbac/assertAllowed.test.ts +325 -0
- package/src/rbac/assertAllowed.ts +157 -0
- package/src/rbac/backfillAdmins.test.ts +124 -0
- package/src/rbac/fieldViews.test.ts +89 -0
- package/src/rbac/modelRouterAccess.test.ts +126 -0
- package/src/rbac/modelRouterAccess.ts +5 -2
- package/src/rbac/permissionUtils.ts +3 -2
- package/src/rbac/realtimeAccess.test.ts +109 -1
- package/src/rbac/resolve.ts +5 -4
- package/src/rbac/roleManager.test.ts +169 -0
- package/src/rbac/routes.test.ts +233 -0
- package/src/rbac/routes.ts +16 -6
- package/src/realtime/deprecation.test.ts +60 -0
- package/src/realtime/deprecation.ts +32 -0
- package/src/realtime/realtime.test.ts +8 -4
- package/src/realtime/realtimeApp.ts +10 -11
- package/src/realtime/realtimeAppSetup.test.ts +32 -5
- package/src/realtime/registry.ts +48 -42
- package/src/realtime/sessionRevalidation.test.ts +57 -44
- package/src/realtime/socketAuth.test.ts +75 -23
- package/src/realtime/socketAuth.ts +17 -6
- package/src/realtime/socketUser.ts +5 -3
- package/src/realtime/types.ts +14 -4
- package/src/schemaMetadata.test.ts +405 -0
- package/src/schemaMetadata.ts +593 -0
- package/src/scrubAdminFields.test.ts +105 -0
- package/src/seedRunner.test.ts +591 -0
- package/src/seedRunner.ts +464 -0
- package/src/sync/docMatchesMutationData.test.ts +16 -0
- package/src/sync/ensureSyncIndexes.test.ts +54 -15
- package/src/sync/executors.test.ts +40 -0
- package/src/sync/executors.ts +24 -12
- package/src/sync/integration.test.ts +15 -7
- package/src/sync/loadHarness.ts +28 -19
- package/src/sync/models.ts +32 -18
- package/src/sync/mutationHandler.test.ts +16 -16
- package/src/sync/mutationHandler.ts +9 -7
- package/src/sync/registrationSideEffects.test.ts +126 -0
- package/src/sync/registrationSideEffects.ts +131 -0
- package/src/sync/registry.ts +45 -171
- package/src/sync/routes.ts +3 -2
- package/src/sync/scripts/compactTombstones.ts +0 -2
- package/src/sync/sessionRevalidationIntegration.test.ts +12 -11
- package/src/sync/sync.test.ts +25 -23
- package/src/sync/syncApp.ts +4 -4
- package/src/sync/syncBatch.ts +3 -2
- package/src/sync/syncFrontier.test.ts +17 -15
- package/src/sync/syncPhaseC.test.ts +54 -43
- package/src/sync/syncRoutes.test.ts +51 -36
- package/src/sync/syncSeqPlugin.ts +66 -44
- package/src/sync/syncSocket.test.ts +112 -81
- package/src/terrenoApp.mcpServiceTokens.test.ts +173 -0
- package/src/terrenoApp.ts +87 -15
- package/src/tests/models.ts +14 -1
- package/src/types/authToken.ts +43 -0
- package/src/types/mcpServiceToken.ts +54 -0
- package/src/webhooks/headerValue.test.ts +22 -0
- package/src/webhooks/headerValue.ts +12 -0
- package/src/webhooks/idempotency/memoryStore.ts +34 -0
- package/src/webhooks/idempotency/mongoStore.test.ts +274 -0
- package/src/webhooks/idempotency/mongoStore.ts +83 -0
- package/src/webhooks/idempotency/webhookReceipt.ts +70 -0
- package/src/webhooks/rawBody.test.ts +74 -0
- package/src/webhooks/rawBody.ts +23 -0
- package/src/webhooks/timingSafeEqual.ts +16 -0
- package/src/webhooks/verifiers/hmac.test.ts +110 -0
- package/src/webhooks/verifiers/hmac.ts +54 -0
- package/src/webhooks/verifiers/providerVerifiers.test.ts +388 -0
- package/src/webhooks/verifiers/sendgrid.ts +59 -0
- package/src/webhooks/verifiers/stripe.ts +67 -0
- package/src/webhooks/verifiers/twilio.ts +69 -0
- package/src/webhooks/webhooksApp.test.ts +221 -0
- package/src/webhooks/webhooksApp.ts +144 -0
package/dist/sync/executors.js
CHANGED
|
@@ -159,7 +159,7 @@ var reloadDocForConflict = function (model, id) { return __awaiter(void 0, void
|
|
|
159
159
|
*/
|
|
160
160
|
var executeCreate = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
|
|
161
161
|
var request, cleanedBody, error_1, data, error_2, populateQuery, error_3, error_4;
|
|
162
|
-
var model = _b.model, options = _b.options, user = _b.user, body = _b.body, req = _b.req, skipPostHooks = _b.skipPostHooks;
|
|
162
|
+
var model = _b.model, options = _b.options, user = _b.user, body = _b.body, req = _b.req, skipPostHooks = _b.skipPostHooks, writeModelName = _b.writeModelName;
|
|
163
163
|
return __generator(this, function (_c) {
|
|
164
164
|
switch (_c.label) {
|
|
165
165
|
case 0:
|
|
@@ -214,7 +214,7 @@ var executeCreate = function (_a) { return __awaiter(void 0, [_a], void 0, funct
|
|
|
214
214
|
}
|
|
215
215
|
_c.label = 6;
|
|
216
216
|
case 6:
|
|
217
|
-
cleanedBody = (0, auth_1.omitUserRolesFromWriteBody)(model.modelName, options.accessControl, cleanedBody, request
|
|
217
|
+
cleanedBody = (0, auth_1.omitUserRolesFromWriteBody)(writeModelName !== null && writeModelName !== void 0 ? writeModelName : model.modelName, options.accessControl, cleanedBody, request
|
|
218
218
|
.terrenoAllowUserAdminWrite === true);
|
|
219
219
|
if (cleanedBody === undefined) {
|
|
220
220
|
throw new errors_1.BadRequestError({
|
|
@@ -250,11 +250,10 @@ var executeCreate = function (_a) { return __awaiter(void 0, [_a], void 0, funct
|
|
|
250
250
|
_c.label = 12;
|
|
251
251
|
case 12:
|
|
252
252
|
_c.trys.push([12, 14, , 15]);
|
|
253
|
-
populateQuery = model.findById(data._id);
|
|
254
|
-
populateQuery = (0, api_1.addPopulateToQuery)(populateQuery, options.populatePaths);
|
|
253
|
+
populateQuery = (0, api_1.addPopulateToQuery)(model.findById(data._id), options.populatePaths);
|
|
255
254
|
return [4 /*yield*/, populateQuery.exec()];
|
|
256
255
|
case 13:
|
|
257
|
-
data = _c.sent();
|
|
256
|
+
data = (_c.sent());
|
|
258
257
|
return [3 /*break*/, 15];
|
|
259
258
|
case 14:
|
|
260
259
|
error_3 = _c.sent();
|
|
@@ -316,7 +315,7 @@ exports.runPostCreate = runPostCreate;
|
|
|
316
315
|
var executeUpdate = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
|
|
317
316
|
var request, doc, _c, cleanedBody, error_5, clientTimestamp, docRecord, serverTimestamp, serverTimestampValue, serverSeq, prevDoc, error_6, current, serverSeq, populateQuery, error_7;
|
|
318
317
|
var _d, _e, _f, _g;
|
|
319
|
-
var model = _b.model, options = _b.options, user = _b.user, id = _b.id, body = _b.body, concurrencyCheck = _b.concurrencyCheck, existingDoc = _b.existingDoc, req = _b.req, skipPostHooks = _b.skipPostHooks;
|
|
318
|
+
var model = _b.model, options = _b.options, user = _b.user, id = _b.id, body = _b.body, concurrencyCheck = _b.concurrencyCheck, existingDoc = _b.existingDoc, req = _b.req, skipPostHooks = _b.skipPostHooks, writeModelName = _b.writeModelName;
|
|
320
319
|
return __generator(this, function (_h) {
|
|
321
320
|
switch (_h.label) {
|
|
322
321
|
case 0:
|
|
@@ -398,7 +397,7 @@ var executeUpdate = function (_a) { return __awaiter(void 0, [_a], void 0, funct
|
|
|
398
397
|
}
|
|
399
398
|
_h.label = 10;
|
|
400
399
|
case 10:
|
|
401
|
-
cleanedBody = (0, auth_1.omitUserRolesFromWriteBody)(model.modelName, options.accessControl, cleanedBody, request
|
|
400
|
+
cleanedBody = (0, auth_1.omitUserRolesFromWriteBody)(writeModelName !== null && writeModelName !== void 0 ? writeModelName : model.modelName, options.accessControl, cleanedBody, request
|
|
402
401
|
.terrenoAllowUserAdminWrite === true);
|
|
403
402
|
return [4 /*yield*/, (0, modelRouterAccess_1.validateAccessWritePayload)({
|
|
404
403
|
body: cleanedBody,
|
|
@@ -494,11 +493,10 @@ var executeUpdate = function (_a) { return __awaiter(void 0, [_a], void 0, funct
|
|
|
494
493
|
});
|
|
495
494
|
case 17:
|
|
496
495
|
if (!options.populatePaths) return [3 /*break*/, 19];
|
|
497
|
-
populateQuery = model.findById(doc._id);
|
|
498
|
-
populateQuery = (0, api_1.addPopulateToQuery)(populateQuery, options.populatePaths);
|
|
496
|
+
populateQuery = (0, api_1.addPopulateToQuery)(model.findById(doc._id), options.populatePaths);
|
|
499
497
|
return [4 /*yield*/, populateQuery.exec()];
|
|
500
498
|
case 18:
|
|
501
|
-
doc = _h.sent();
|
|
499
|
+
doc = (_h.sent());
|
|
502
500
|
_h.label = 19;
|
|
503
501
|
case 19:
|
|
504
502
|
if (!(options.postUpdate && !skipPostHooks)) return [3 /*break*/, 23];
|
package/dist/sync/loadHarness.js
CHANGED
|
@@ -143,10 +143,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
143
143
|
var node_http_1 = require("node:http");
|
|
144
144
|
var syncdb_1 = require("@terreno/syncdb");
|
|
145
145
|
var express_1 = __importDefault(require("express"));
|
|
146
|
+
var luxon_1 = require("luxon");
|
|
146
147
|
var mongoose_1 = __importStar(require("mongoose"));
|
|
147
148
|
var passport_local_mongoose_1 = __importDefault(require("passport-local-mongoose"));
|
|
148
149
|
var api_1 = require("../api");
|
|
149
150
|
var auth_1 = require("../auth");
|
|
151
|
+
var errors_1 = require("../errors");
|
|
150
152
|
var logger_1 = require("../logger");
|
|
151
153
|
var permissions_1 = require("../permissions");
|
|
152
154
|
var plugins_1 = require("../plugins");
|
|
@@ -237,10 +239,10 @@ var waitFor = function (predicate_1) {
|
|
|
237
239
|
return __generator(this, function (_f) {
|
|
238
240
|
switch (_f.label) {
|
|
239
241
|
case 0:
|
|
240
|
-
start =
|
|
242
|
+
start = luxon_1.DateTime.now().toMillis();
|
|
241
243
|
_f.label = 1;
|
|
242
244
|
case 1:
|
|
243
|
-
if (!(
|
|
245
|
+
if (!(luxon_1.DateTime.now().toMillis() - start < timeoutMs)) return [3 /*break*/, 4];
|
|
244
246
|
return [4 /*yield*/, predicate()];
|
|
245
247
|
case 2:
|
|
246
248
|
if (_f.sent()) {
|
|
@@ -250,7 +252,10 @@ var waitFor = function (predicate_1) {
|
|
|
250
252
|
case 3:
|
|
251
253
|
_f.sent();
|
|
252
254
|
return [3 /*break*/, 1];
|
|
253
|
-
case 4: throw new
|
|
255
|
+
case 4: throw new errors_1.APIError({
|
|
256
|
+
status: 500,
|
|
257
|
+
title: "Timed out after ".concat(timeoutMs, "ms waiting for ").concat(label),
|
|
258
|
+
});
|
|
254
259
|
}
|
|
255
260
|
});
|
|
256
261
|
});
|
|
@@ -413,7 +418,7 @@ var main = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
|
413
418
|
perOwnerCount_1.set(owner.ownerId, ((_a = perOwnerCount_1.get(owner.ownerId)) !== null && _a !== void 0 ? _a : 0) + 1);
|
|
414
419
|
return { ownerId: owner.ownerId, title: "seed-".concat(i) };
|
|
415
420
|
});
|
|
416
|
-
bootstrapStart =
|
|
421
|
+
bootstrapStart = luxon_1.DateTime.now().toMillis();
|
|
417
422
|
if (!(seeds.length > 0)) return [3 /*break*/, 12];
|
|
418
423
|
return [4 /*yield*/, LoadTodoModel.insertMany(seeds)];
|
|
419
424
|
case 11:
|
|
@@ -428,7 +433,7 @@ var main = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
|
428
433
|
}, { label: "bootstrap convergence at ".concat(config.seedDocs, " docs"), timeoutMs: 120000 })];
|
|
429
434
|
case 13:
|
|
430
435
|
_w.sent();
|
|
431
|
-
bootstrapWallMs =
|
|
436
|
+
bootstrapWallMs = luxon_1.DateTime.now().toMillis() - bootstrapStart;
|
|
432
437
|
logger_1.logger.info("[loadHarness] bootstrap converged in ".concat(bootstrapWallMs, "ms"));
|
|
433
438
|
mutateLatenciesMs_1 = [];
|
|
434
439
|
fanoutLagsMs_1 = [];
|
|
@@ -451,7 +456,7 @@ var main = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
|
451
456
|
}, { intervalMs: 8, label: "mutation ".concat(mutationId, " terminal"), timeoutMs: 15000 })];
|
|
452
457
|
case 1:
|
|
453
458
|
_b.sent();
|
|
454
|
-
mutateLatenciesMs_1.push(
|
|
459
|
+
mutateLatenciesMs_1.push(luxon_1.DateTime.now().toMillis() - startedAt);
|
|
455
460
|
mutation = hc.client.outbox.getMutation({ mutationId: mutationId });
|
|
456
461
|
if ((mutation === null || mutation === void 0 ? void 0 : mutation.status) === "conflicted") {
|
|
457
462
|
conflictCount_1 += 1;
|
|
@@ -466,7 +471,7 @@ var main = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
|
466
471
|
case 2:
|
|
467
472
|
_a = _b.sent();
|
|
468
473
|
// Timed out waiting; still record whatever elapsed so the report reflects it.
|
|
469
|
-
mutateLatenciesMs_1.push(
|
|
474
|
+
mutateLatenciesMs_1.push(luxon_1.DateTime.now().toMillis() - startedAt);
|
|
470
475
|
return [3 /*break*/, 3];
|
|
471
476
|
case 3: return [2 /*return*/];
|
|
472
477
|
}
|
|
@@ -503,7 +508,7 @@ var main = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
|
503
508
|
}
|
|
504
509
|
loadPromises = [];
|
|
505
510
|
intervalMs_1 = 1000 / config.targetRate;
|
|
506
|
-
loadEnd =
|
|
511
|
+
loadEnd = luxon_1.DateTime.now().plus({ seconds: config.durationSec }).toMillis();
|
|
507
512
|
_loop_1 = function () {
|
|
508
513
|
var hc, opRoll, startedAt, mutationId, target, owner_1, startedAt, mutationId, dupRequest_1, idx, target, owner, startedAt, mutationId, anyOwner, writeStart_1, doc, id_1;
|
|
509
514
|
return __generator(this, function (_x) {
|
|
@@ -512,10 +517,12 @@ var main = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
|
512
517
|
hc = randomClient();
|
|
513
518
|
opRoll = Math.random();
|
|
514
519
|
if (opRoll < 0.5 || knownEntityIds.length === 0) {
|
|
515
|
-
startedAt =
|
|
520
|
+
startedAt = luxon_1.DateTime.now().toMillis();
|
|
516
521
|
mutationId = hc.client.mutate({
|
|
517
522
|
collection: COLLECTION,
|
|
518
|
-
data: {
|
|
523
|
+
data: {
|
|
524
|
+
title: "load-".concat(luxon_1.DateTime.now().toMillis(), "-").concat(Math.random().toString(36).slice(2, 8)),
|
|
525
|
+
},
|
|
519
526
|
operation: "create",
|
|
520
527
|
}).mutationId;
|
|
521
528
|
loadPromises.push(trackMutation(hc, mutationId, startedAt));
|
|
@@ -523,10 +530,10 @@ var main = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
|
523
530
|
else if (opRoll < 0.85) {
|
|
524
531
|
target = knownEntityIds[Math.floor(Math.random() * knownEntityIds.length)];
|
|
525
532
|
owner_1 = harnessClients[target.clientIndex];
|
|
526
|
-
startedAt =
|
|
533
|
+
startedAt = luxon_1.DateTime.now().toMillis();
|
|
527
534
|
mutationId = owner_1.client.mutate({
|
|
528
535
|
collection: COLLECTION,
|
|
529
|
-
data: { title: "updated-".concat(
|
|
536
|
+
data: { title: "updated-".concat(luxon_1.DateTime.now().toMillis()) },
|
|
530
537
|
id: target.id,
|
|
531
538
|
operation: "update",
|
|
532
539
|
}).mutationId;
|
|
@@ -541,7 +548,7 @@ var main = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
|
541
548
|
if (!doc) {
|
|
542
549
|
return;
|
|
543
550
|
}
|
|
544
|
-
doc.title = "server-race-".concat(
|
|
551
|
+
doc.title = "server-race-".concat(luxon_1.DateTime.now().toMillis());
|
|
545
552
|
return doc.save();
|
|
546
553
|
})
|
|
547
554
|
.catch(function () { });
|
|
@@ -553,8 +560,10 @@ var main = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
|
553
560
|
if (Math.random() < 0.05) {
|
|
554
561
|
dupRequest_1 = {
|
|
555
562
|
collection: COLLECTION,
|
|
556
|
-
data: { title: "dup-".concat(
|
|
557
|
-
mutationId: "load-dup-".concat(
|
|
563
|
+
data: { title: "dup-".concat(luxon_1.DateTime.now().toMillis()) },
|
|
564
|
+
mutationId: "load-dup-".concat(luxon_1.DateTime.now().toMillis(), "-").concat(Math.random()
|
|
565
|
+
.toString(36)
|
|
566
|
+
.slice(2, 8)),
|
|
558
567
|
operation: "create",
|
|
559
568
|
};
|
|
560
569
|
loadPromises.push(owner_1.httpChannel
|
|
@@ -570,7 +579,7 @@ var main = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
|
570
579
|
idx = Math.floor(Math.random() * knownEntityIds.length);
|
|
571
580
|
target = knownEntityIds[idx];
|
|
572
581
|
owner = harnessClients[target.clientIndex];
|
|
573
|
-
startedAt =
|
|
582
|
+
startedAt = luxon_1.DateTime.now().toMillis();
|
|
574
583
|
mutationId = owner.client.mutate({
|
|
575
584
|
collection: COLLECTION,
|
|
576
585
|
id: target.id,
|
|
@@ -581,7 +590,7 @@ var main = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
|
581
590
|
}
|
|
582
591
|
if (!(Math.random() < 0.02)) return [3 /*break*/, 2];
|
|
583
592
|
anyOwner = randomClient();
|
|
584
|
-
writeStart_1 =
|
|
593
|
+
writeStart_1 = luxon_1.DateTime.now().toMillis();
|
|
585
594
|
return [4 /*yield*/, LoadTodoModel.create({
|
|
586
595
|
ownerId: anyOwner.ownerId,
|
|
587
596
|
title: "fanout-".concat(writeStart_1),
|
|
@@ -598,7 +607,7 @@ var main = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
|
598
607
|
timeoutMs: 15000,
|
|
599
608
|
})
|
|
600
609
|
.then(function () {
|
|
601
|
-
fanoutLagsMs_1.push(
|
|
610
|
+
fanoutLagsMs_1.push(luxon_1.DateTime.now().toMillis() - writeStart_1);
|
|
602
611
|
})
|
|
603
612
|
.catch(function () { }));
|
|
604
613
|
_x.label = 2;
|
|
@@ -611,7 +620,7 @@ var main = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
|
611
620
|
};
|
|
612
621
|
_w.label = 14;
|
|
613
622
|
case 14:
|
|
614
|
-
if (!(
|
|
623
|
+
if (!(luxon_1.DateTime.now().toMillis() < loadEnd)) return [3 /*break*/, 16];
|
|
615
624
|
return [5 /*yield**/, _loop_1()];
|
|
616
625
|
case 15:
|
|
617
626
|
_w.sent();
|
package/dist/sync/models.js
CHANGED
|
@@ -86,7 +86,9 @@ var _a, _b, _c, _d;
|
|
|
86
86
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
87
87
|
exports.getOrCreateSyncKeyMaterial = exports.ensureSyncModelIndexes = exports.SyncKey = exports.SyncMutation = exports.SYNC_MUTATION_LEASE_MS = exports.SyncScopeMove = exports.getCompactedThroughSeq = exports.recordCompactedThroughSeq = exports.computeStableFrontier = exports.releaseSyncSeqs = exports.confirmSyncSeqs = exports.claimSyncSeqs = exports.SyncCounter = exports.PENDING_CLAIM_LEASE_MS = void 0;
|
|
88
88
|
var node_crypto_1 = __importDefault(require("node:crypto"));
|
|
89
|
+
var luxon_1 = require("luxon");
|
|
89
90
|
var mongoose_1 = __importStar(require("mongoose"));
|
|
91
|
+
var errors_1 = require("../errors");
|
|
90
92
|
var logger_1 = require("../logger");
|
|
91
93
|
var plugins_1 = require("../plugins");
|
|
92
94
|
/**
|
|
@@ -97,7 +99,7 @@ var plugins_1 = require("../plugins");
|
|
|
97
99
|
exports.PENDING_CLAIM_LEASE_MS = 60 * 1000;
|
|
98
100
|
var syncPendingClaimSchema = new mongoose_1.Schema({
|
|
99
101
|
claimedAt: {
|
|
100
|
-
default: function () { return
|
|
102
|
+
default: function () { return luxon_1.DateTime.now().toJSDate(); },
|
|
101
103
|
description: "When this seq was claimed; a claim older than PENDING_CLAIM_LEASE_MS is stale",
|
|
102
104
|
type: Date,
|
|
103
105
|
},
|
|
@@ -175,7 +177,7 @@ var claimSyncSeqs = function (_a) { return __awaiter(void 0, [_a], void 0, funct
|
|
|
175
177
|
return __generator(this, function (_a) {
|
|
176
178
|
switch (_a.label) {
|
|
177
179
|
case 0:
|
|
178
|
-
now =
|
|
180
|
+
now = luxon_1.DateTime.now().toJSDate();
|
|
179
181
|
return [4 /*yield*/, exports.SyncCounter.findOneAndUpdate({ stream: stream }, [
|
|
180
182
|
{ $set: { _syncOldSeq: { $ifNull: ["$seq", 0] } } },
|
|
181
183
|
{ $set: { seq: { $add: ["$_syncOldSeq", count] } } },
|
|
@@ -295,7 +297,7 @@ var computeStableFrontier = function (_a) { return __awaiter(void 0, [_a], void
|
|
|
295
297
|
var stream = _b.stream;
|
|
296
298
|
return __generator(this, function (_e) {
|
|
297
299
|
switch (_e.label) {
|
|
298
|
-
case 0: return [4 /*yield*/, exports.SyncCounter
|
|
300
|
+
case 0: return [4 /*yield*/, (0, plugins_1.findOneOrNoneFor)(exports.SyncCounter, { stream: stream })];
|
|
299
301
|
case 1:
|
|
300
302
|
counter = _e.sent();
|
|
301
303
|
if (!counter) {
|
|
@@ -305,13 +307,13 @@ var computeStableFrontier = function (_a) { return __awaiter(void 0, [_a], void
|
|
|
305
307
|
if (pending.length === 0) {
|
|
306
308
|
return [2 /*return*/, counter.seq];
|
|
307
309
|
}
|
|
308
|
-
cutoff =
|
|
310
|
+
cutoff = luxon_1.DateTime.now().minus({ milliseconds: exports.PENDING_CLAIM_LEASE_MS }).toMillis();
|
|
309
311
|
staleSeqs = [];
|
|
310
312
|
minLiveSeq = Number.POSITIVE_INFINITY;
|
|
311
313
|
try {
|
|
312
314
|
for (pending_1 = __values(pending), pending_1_1 = pending_1.next(); !pending_1_1.done; pending_1_1 = pending_1.next()) {
|
|
313
315
|
claim = pending_1_1.value;
|
|
314
|
-
claimedAtMs =
|
|
316
|
+
claimedAtMs = luxon_1.DateTime.fromJSDate(claim.claimedAt).toMillis();
|
|
315
317
|
if (claimedAtMs < cutoff) {
|
|
316
318
|
staleSeqs.push(claim.seq);
|
|
317
319
|
continue;
|
|
@@ -390,7 +392,7 @@ var syncScopeMoveSchema = new mongoose_1.Schema({
|
|
|
390
392
|
type: String,
|
|
391
393
|
},
|
|
392
394
|
created: {
|
|
393
|
-
default: function () { return
|
|
395
|
+
default: function () { return luxon_1.DateTime.now().toJSDate(); },
|
|
394
396
|
description: "When the move was recorded; reaped by compactTombstones once older than the " +
|
|
395
397
|
"owning model's retentionDays (deliberately NOT TTL-indexed — see the model doc)",
|
|
396
398
|
type: Date,
|
|
@@ -452,13 +454,13 @@ var SYNC_MUTATION_TTL_SECONDS = 30 * 24 * 60 * 60;
|
|
|
452
454
|
exports.SYNC_MUTATION_LEASE_MS = 60 * 1000;
|
|
453
455
|
var syncMutationSchema = new mongoose_1.Schema({
|
|
454
456
|
claimedAt: {
|
|
455
|
-
default: function () { return
|
|
457
|
+
default: function () { return luxon_1.DateTime.now().toJSDate(); },
|
|
456
458
|
description: "When this delivery claimed the mutation (lease); a pending row older than " +
|
|
457
459
|
"SYNC_MUTATION_LEASE_MS may be taken over by a fresh delivery via findOneAndUpdate",
|
|
458
460
|
type: Date,
|
|
459
461
|
},
|
|
460
462
|
created: {
|
|
461
|
-
default: function () { return
|
|
463
|
+
default: function () { return luxon_1.DateTime.now().toJSDate(); },
|
|
462
464
|
description: "When the mutation was first claimed; TTL-indexed so rows expire after 30 days",
|
|
463
465
|
type: Date,
|
|
464
466
|
},
|
|
@@ -515,7 +517,7 @@ syncMutationSchema.index({ created: 1 }, { expireAfterSeconds: SYNC_MUTATION_TTL
|
|
|
515
517
|
exports.SyncMutation = (_c = mongoose_1.default.models.SyncMutation) !== null && _c !== void 0 ? _c : mongoose_1.default.model("SyncMutation", syncMutationSchema);
|
|
516
518
|
var syncKeySchema = new mongoose_1.Schema({
|
|
517
519
|
created: {
|
|
518
|
-
default: function () { return
|
|
520
|
+
default: function () { return luxon_1.DateTime.now().toJSDate(); },
|
|
519
521
|
description: "When this key material was generated",
|
|
520
522
|
type: Date,
|
|
521
523
|
},
|
|
@@ -534,17 +536,12 @@ var syncKeySchema = new mongoose_1.Schema({
|
|
|
534
536
|
// Consumer apps run checkModelsStrict() at startup; framework models must comply.
|
|
535
537
|
{ strict: "throw", toJSON: { virtuals: true }, toObject: { virtuals: true } });
|
|
536
538
|
exports.SyncKey = (_d = mongoose_1.default.models.SyncKey) !== null && _d !== void 0 ? _d : mongoose_1.default.model("SyncKey", syncKeySchema);
|
|
537
|
-
|
|
538
|
-
|
|
539
|
-
|
|
540
|
-
|
|
541
|
-
|
|
542
|
-
|
|
543
|
-
* startup builds them explicitly.
|
|
544
|
-
*/
|
|
545
|
-
// noExplicitAny: a heterogeneous list of models is only used for ensureIndexes
|
|
546
|
-
// biome-ignore lint/suspicious/noExplicitAny: a heterogeneous list of models is only used for ensureIndexes
|
|
547
|
-
var SYNC_BOOKKEEPING_MODELS = [exports.SyncCounter, exports.SyncMutation, exports.SyncScopeMove, exports.SyncKey];
|
|
539
|
+
var SYNC_BOOKKEEPING_MODELS = [
|
|
540
|
+
exports.SyncCounter,
|
|
541
|
+
exports.SyncMutation,
|
|
542
|
+
exports.SyncScopeMove,
|
|
543
|
+
exports.SyncKey,
|
|
544
|
+
];
|
|
548
545
|
/**
|
|
549
546
|
* Best-effort removal of the pre-Task-9.15 `SyncScopeMove` TTL index. Failure is only
|
|
550
547
|
* logged: a leftover TTL index degrades retention accounting but must never block
|
|
@@ -607,9 +604,14 @@ var ensureSyncModelIndexes = function () { return __awaiter(void 0, void 0, void
|
|
|
607
604
|
logger_1.logger.error("[sync] Failed to ensure sync indexes for ".concat(model.modelName), {
|
|
608
605
|
error: String(error_3),
|
|
609
606
|
});
|
|
610
|
-
throw new
|
|
611
|
-
|
|
612
|
-
"
|
|
607
|
+
throw new errors_1.APIError({
|
|
608
|
+
cause: error_3,
|
|
609
|
+
code: "sync-indexes-failed",
|
|
610
|
+
detail: "".concat((0, errors_1.errorDetail)(error_3), ". The sync protocol depends on these indexes (unique mutationId for ") +
|
|
611
|
+
"mutation idempotency, unique stream for seq allocation); fix the DB and restart.",
|
|
612
|
+
status: 500,
|
|
613
|
+
title: "Failed to ensure sync indexes for ".concat(model.modelName),
|
|
614
|
+
});
|
|
613
615
|
case 3: return [2 /*return*/];
|
|
614
616
|
}
|
|
615
617
|
});
|
|
@@ -634,7 +636,7 @@ var getOrCreateSyncKeyMaterial = function (_a) { return __awaiter(void 0, [_a],
|
|
|
634
636
|
switch (_c.label) {
|
|
635
637
|
case 0:
|
|
636
638
|
candidate = node_crypto_1.default.randomBytes(32).toString("base64");
|
|
637
|
-
return [4 /*yield*/, exports.SyncKey.findOneAndUpdate({ userId: userId }, { $setOnInsert: { created:
|
|
639
|
+
return [4 /*yield*/, exports.SyncKey.findOneAndUpdate({ userId: userId }, { $setOnInsert: { created: luxon_1.DateTime.now().toJSDate(), keyMaterial: candidate, userId: userId } }, { new: true, upsert: true })];
|
|
638
640
|
case 1:
|
|
639
641
|
doc = _c.sent();
|
|
640
642
|
return [2 /*return*/, doc.keyMaterial];
|
|
@@ -49,6 +49,15 @@ export type SyncMutationOutcome = {
|
|
|
49
49
|
};
|
|
50
50
|
/** Maximum mutations accepted in a single `sync:mutateBatch` / `POST /sync/mutate/batch` request. */
|
|
51
51
|
export declare const MAX_SYNC_MUTATIONS_PER_BATCH = 100;
|
|
52
|
+
/**
|
|
53
|
+
* C5 (FIX 6): true when every key/value in `data` (the mutation's own
|
|
54
|
+
* intended write) is already present on `doc` — used alongside the
|
|
55
|
+
* expected-post-write-seq check to distinguish "this mutation's own write
|
|
56
|
+
* already landed" (safe to report as already-applied) from "a genuinely
|
|
57
|
+
* different write landed and happens to have advanced the seq by exactly
|
|
58
|
+
* one" (a real conflict; a seq match alone cannot tell these apart).
|
|
59
|
+
*/
|
|
60
|
+
export declare const docMatchesMutationData: (doc: unknown, data: Record<string, unknown> | undefined) => boolean;
|
|
52
61
|
/**
|
|
53
62
|
* Apply a client mutation through the transport-agnostic executors (permissions,
|
|
54
63
|
* pre/post hooks, validation) with an atomic idempotency claim. Always finalizes the
|
|
@@ -77,7 +77,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
77
77
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
78
78
|
};
|
|
79
79
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
80
|
-
exports.applySyncMutationBatch = exports.validateSyncMutationBatch = exports.applySyncMutation = exports.MAX_SYNC_MUTATIONS_PER_BATCH = void 0;
|
|
80
|
+
exports.applySyncMutationBatch = exports.validateSyncMutationBatch = exports.applySyncMutation = exports.docMatchesMutationData = exports.MAX_SYNC_MUTATIONS_PER_BATCH = void 0;
|
|
81
81
|
var luxon_1 = require("luxon");
|
|
82
82
|
var mongoose_1 = __importDefault(require("mongoose"));
|
|
83
83
|
var errors_1 = require("../errors");
|
|
@@ -271,7 +271,7 @@ var takeoverStaleLease = function (mutationId) { return __awaiter(void 0, void 0
|
|
|
271
271
|
switch (_a.label) {
|
|
272
272
|
case 0:
|
|
273
273
|
cutoff = luxon_1.DateTime.now().minus({ milliseconds: models_1.SYNC_MUTATION_LEASE_MS }).toJSDate();
|
|
274
|
-
return [4 /*yield*/, models_1.SyncMutation.findOneAndUpdate({ claimedAt: { $lt: cutoff }, mutationId: mutationId, status: "pending" }, { $set: { claimedAt:
|
|
274
|
+
return [4 /*yield*/, models_1.SyncMutation.findOneAndUpdate({ claimedAt: { $lt: cutoff }, mutationId: mutationId, status: "pending" }, { $set: { claimedAt: luxon_1.DateTime.now().toJSDate() } }, { new: true })];
|
|
275
275
|
case 1:
|
|
276
276
|
claimed = _a.sent();
|
|
277
277
|
return [2 /*return*/, claimed !== null && claimed !== void 0 ? claimed : undefined];
|
|
@@ -321,7 +321,7 @@ var waitForRecordedOutcome = function (_a) { return __awaiter(void 0, [_a], void
|
|
|
321
321
|
if (takenOver) {
|
|
322
322
|
logger_1.logger.warn("[sync] Took over a stale mutation lease", {
|
|
323
323
|
mutationId: mutationId,
|
|
324
|
-
staleForMs:
|
|
324
|
+
staleForMs: luxon_1.DateTime.now().diff(luxon_1.DateTime.fromJSDate(row.claimedAt)).toMillis(),
|
|
325
325
|
});
|
|
326
326
|
return [2 /*return*/, onTakeover(takenOver)];
|
|
327
327
|
}
|
|
@@ -375,11 +375,16 @@ var docMatchesMutationData = function (doc, data) {
|
|
|
375
375
|
var _b = __read(_a, 2), key = _b[0], value = _b[1];
|
|
376
376
|
var current = plain === null || plain === void 0 ? void 0 : plain[key];
|
|
377
377
|
if (current instanceof Date && typeof value === "string") {
|
|
378
|
-
|
|
378
|
+
var parsed = luxon_1.DateTime.fromISO(value, { zone: "utc" });
|
|
379
|
+
if (!parsed.isValid) {
|
|
380
|
+
return false;
|
|
381
|
+
}
|
|
382
|
+
return current.toISOString() === parsed.toJSDate().toISOString();
|
|
379
383
|
}
|
|
380
384
|
return JSON.stringify(current) === JSON.stringify(value);
|
|
381
385
|
});
|
|
382
386
|
};
|
|
387
|
+
exports.docMatchesMutationData = docMatchesMutationData;
|
|
383
388
|
var nackCodeForError = function (error) {
|
|
384
389
|
if (!(0, errors_1.isAPIError)(error)) {
|
|
385
390
|
return "error";
|
|
@@ -623,7 +628,7 @@ var applyClaimedMutation = function (_a) { return __awaiter(void 0, [_a], void 0
|
|
|
623
628
|
(0, executors_1.isExecutorConflictError)(updateError_1) &&
|
|
624
629
|
updateError_1.conflictType === "seq" &&
|
|
625
630
|
updateError_1.serverSeq === ((_h = mutation.baseVersion) !== null && _h !== void 0 ? _h : 0) + 1 &&
|
|
626
|
-
docMatchesMutationData(updateError_1.doc, mutation.data))) return [3 /*break*/, 15];
|
|
631
|
+
(0, exports.docMatchesMutationData)(updateError_1.doc, mutation.data))) return [3 /*break*/, 15];
|
|
627
632
|
return [4 /*yield*/, finalizeAlreadyApplied({
|
|
628
633
|
claimedId: claimed._id,
|
|
629
634
|
doc: updateError_1.doc,
|
|
@@ -737,7 +742,7 @@ var applySyncMutation = function (_a) { return __awaiter(void 0, [_a], void 0, f
|
|
|
737
742
|
case 1:
|
|
738
743
|
_c.trys.push([1, 3, , 4]);
|
|
739
744
|
return [4 /*yield*/, models_1.SyncMutation.create({
|
|
740
|
-
claimedAt:
|
|
745
|
+
claimedAt: luxon_1.DateTime.now().toJSDate(),
|
|
741
746
|
mutationId: mutationId,
|
|
742
747
|
status: "pending",
|
|
743
748
|
userId: String(user.id),
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Schema and Mongo work that must happen when a collection first becomes
|
|
3
|
+
* sync-enabled — kept out of CollectionRegistry so catalog writes stay a
|
|
4
|
+
* Map update, while models can still register before Mongo is connected.
|
|
5
|
+
*
|
|
6
|
+
* Registration only validates the schema and queues index creation.
|
|
7
|
+
* TerrenoApp.start() (or a host that builds Express without it) must later
|
|
8
|
+
* await ensureSyncIndexes() so snapshot/catch-up queries have their indexes.
|
|
9
|
+
*/
|
|
10
|
+
import type { Model } from "mongoose";
|
|
11
|
+
import type { ModelRouterOptions } from "../api";
|
|
12
|
+
import type { SyncConfig } from "./types";
|
|
13
|
+
type IndexCreationTask = () => Promise<void>;
|
|
14
|
+
export interface SyncRegistrationSnapshot {
|
|
15
|
+
collectionTag: string;
|
|
16
|
+
modelName: string;
|
|
17
|
+
}
|
|
18
|
+
/** Queue extra index work (tests and SyncApp bookkeeping models). */
|
|
19
|
+
export declare const trackSyncIndexCreation: (task: IndexCreationTask) => void;
|
|
20
|
+
/**
|
|
21
|
+
* Fail loud if the model cannot participate in sync, then queue the
|
|
22
|
+
* snapshot index. Call only on the first sync enable for a routePath.
|
|
23
|
+
*/
|
|
24
|
+
export declare const applySyncRegistrationSideEffects: <T>({ config, existingSyncEntries, model, routePath, }: {
|
|
25
|
+
config: SyncConfig;
|
|
26
|
+
existingSyncEntries: SyncRegistrationSnapshot[];
|
|
27
|
+
model: Model<T>;
|
|
28
|
+
options: ModelRouterOptions<T>;
|
|
29
|
+
routePath: string;
|
|
30
|
+
}) => void;
|
|
31
|
+
/** Create every queued sync index after Mongo is connected. */
|
|
32
|
+
export declare const ensureSyncIndexes: () => Promise<void>;
|
|
33
|
+
/** Drop queued index work when the collection catalog is wiped (tests). */
|
|
34
|
+
export declare const clearSyncIndexCreationTasks: () => void;
|
|
35
|
+
export {};
|
|
@@ -0,0 +1,151 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
12
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
|
|
13
|
+
return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
14
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
|
+
function step(op) {
|
|
16
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
+
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
18
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
19
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
|
+
switch (op[0]) {
|
|
21
|
+
case 0: case 1: t = op; break;
|
|
22
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
23
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
24
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
25
|
+
default:
|
|
26
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
27
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
28
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
29
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
30
|
+
if (t[2]) _.ops.pop();
|
|
31
|
+
_.trys.pop(); continue;
|
|
32
|
+
}
|
|
33
|
+
op = body.call(thisArg, _);
|
|
34
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
35
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
|
+
}
|
|
37
|
+
};
|
|
38
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
+
exports.clearSyncIndexCreationTasks = exports.ensureSyncIndexes = exports.applySyncRegistrationSideEffects = exports.trackSyncIndexCreation = void 0;
|
|
40
|
+
var errors_1 = require("../errors");
|
|
41
|
+
var logger_1 = require("../logger");
|
|
42
|
+
var streams_1 = require("./streams");
|
|
43
|
+
var indexCreationTasks = [];
|
|
44
|
+
/** Queue extra index work (tests and SyncApp bookkeeping models). */
|
|
45
|
+
var trackSyncIndexCreation = function (task) {
|
|
46
|
+
indexCreationTasks.push(task);
|
|
47
|
+
};
|
|
48
|
+
exports.trackSyncIndexCreation = trackSyncIndexCreation;
|
|
49
|
+
/**
|
|
50
|
+
* Fail loud if the model cannot participate in sync, then queue the
|
|
51
|
+
* snapshot index. Call only on the first sync enable for a routePath.
|
|
52
|
+
*/
|
|
53
|
+
var applySyncRegistrationSideEffects = function (_a) {
|
|
54
|
+
var _b;
|
|
55
|
+
var config = _a.config, existingSyncEntries = _a.existingSyncEntries, model = _a.model, routePath = _a.routePath;
|
|
56
|
+
var name = model.modelName;
|
|
57
|
+
var deletedPath = model.schema.path("deleted");
|
|
58
|
+
if ((deletedPath === null || deletedPath === void 0 ? void 0 : deletedPath.instance) !== "Boolean") {
|
|
59
|
+
throw new errors_1.APIError({
|
|
60
|
+
status: 500,
|
|
61
|
+
title: "Model ".concat(name, " has a sync config but no soft delete support. ") +
|
|
62
|
+
"Apply isDeletedPlugin to the schema — sync catch-up requires delete tombstones.",
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
if (!model.schema.path("_syncSeq")) {
|
|
66
|
+
throw new errors_1.APIError({
|
|
67
|
+
status: 500,
|
|
68
|
+
title: "Model ".concat(name, " has a sync config but syncPlugin is not applied to its schema. ") +
|
|
69
|
+
"Apply syncPlugin so every write stamps a per-stream _syncSeq.",
|
|
70
|
+
});
|
|
71
|
+
}
|
|
72
|
+
var scopeField = (0, streams_1.getScopeField)(config.scope);
|
|
73
|
+
if (scopeField && !model.schema.path(scopeField)) {
|
|
74
|
+
throw new errors_1.APIError({
|
|
75
|
+
status: 500,
|
|
76
|
+
title: "Model ".concat(name, " has a sync scope on field \"").concat(scopeField, "\" but the schema has no such path."),
|
|
77
|
+
});
|
|
78
|
+
}
|
|
79
|
+
if (typeof config.scope === "function" && !config.snapshotFilter) {
|
|
80
|
+
throw new errors_1.APIError({
|
|
81
|
+
status: 500,
|
|
82
|
+
title: "Model ".concat(name, " uses a custom sync scope resolver, which requires a snapshotFilter ") +
|
|
83
|
+
"so the snapshot endpoint can restrict queries to the caller's documents.",
|
|
84
|
+
});
|
|
85
|
+
}
|
|
86
|
+
if (existingSyncEntries.some(function (entry) { return entry.modelName === name; })) {
|
|
87
|
+
throw new errors_1.APIError({
|
|
88
|
+
status: 500,
|
|
89
|
+
title: "Model ".concat(name, " is already registered for sync."),
|
|
90
|
+
});
|
|
91
|
+
}
|
|
92
|
+
var collectionTag = routePath.replace(/^\//, "");
|
|
93
|
+
if (existingSyncEntries.some(function (entry) { return entry.collectionTag === collectionTag; })) {
|
|
94
|
+
throw new errors_1.APIError({
|
|
95
|
+
status: 500,
|
|
96
|
+
title: "Sync collection tag \"".concat(collectionTag, "\" is already registered (routePath ").concat(routePath, "). ") +
|
|
97
|
+
"Each synced model must have a unique route path.",
|
|
98
|
+
});
|
|
99
|
+
}
|
|
100
|
+
model.bulkWrite = function () {
|
|
101
|
+
throw new errors_1.APIError({
|
|
102
|
+
status: 500,
|
|
103
|
+
title: "bulkWrite is not supported on sync-enabled model ".concat(name, ": it bypasses Mongoose ") +
|
|
104
|
+
"middleware, so writes are never stamped with a per-stream _syncSeq and become " +
|
|
105
|
+
"invisible to sync delta emission and snapshot catch-up. Loop per document instead.",
|
|
106
|
+
});
|
|
107
|
+
};
|
|
108
|
+
var indexSpec = scopeField ? (_b = {}, _b[scopeField] = 1, _b._syncSeq = 1, _b) : { _syncSeq: 1 };
|
|
109
|
+
indexCreationTasks.push(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
110
|
+
var error_1;
|
|
111
|
+
return __generator(this, function (_a) {
|
|
112
|
+
switch (_a.label) {
|
|
113
|
+
case 0:
|
|
114
|
+
_a.trys.push([0, 2, , 3]);
|
|
115
|
+
return [4 /*yield*/, model.collection.createIndex(indexSpec)];
|
|
116
|
+
case 1:
|
|
117
|
+
_a.sent();
|
|
118
|
+
return [3 /*break*/, 3];
|
|
119
|
+
case 2:
|
|
120
|
+
error_1 = _a.sent();
|
|
121
|
+
logger_1.logger.error("[sync] Failed to create sync index for ".concat(name), { error: String(error_1) });
|
|
122
|
+
throw new errors_1.APIError({
|
|
123
|
+
cause: error_1,
|
|
124
|
+
code: "sync-snapshot-index-failed",
|
|
125
|
+
detail: "".concat((0, errors_1.errorDetail)(error_1), ". The snapshot/catch-up query requires this index; fix the schema/DB and restart."),
|
|
126
|
+
status: 500,
|
|
127
|
+
title: "Failed to create sync snapshot index for ".concat(name),
|
|
128
|
+
});
|
|
129
|
+
case 3: return [2 /*return*/];
|
|
130
|
+
}
|
|
131
|
+
});
|
|
132
|
+
}); });
|
|
133
|
+
};
|
|
134
|
+
exports.applySyncRegistrationSideEffects = applySyncRegistrationSideEffects;
|
|
135
|
+
/** Create every queued sync index after Mongo is connected. */
|
|
136
|
+
var ensureSyncIndexes = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
137
|
+
return __generator(this, function (_a) {
|
|
138
|
+
switch (_a.label) {
|
|
139
|
+
case 0: return [4 /*yield*/, Promise.all(indexCreationTasks.map(function (task) { return task(); }))];
|
|
140
|
+
case 1:
|
|
141
|
+
_a.sent();
|
|
142
|
+
return [2 /*return*/];
|
|
143
|
+
}
|
|
144
|
+
});
|
|
145
|
+
}); };
|
|
146
|
+
exports.ensureSyncIndexes = ensureSyncIndexes;
|
|
147
|
+
/** Drop queued index work when the collection catalog is wiped (tests). */
|
|
148
|
+
var clearSyncIndexCreationTasks = function () {
|
|
149
|
+
indexCreationTasks.length = 0;
|
|
150
|
+
};
|
|
151
|
+
exports.clearSyncIndexCreationTasks = clearSyncIndexCreationTasks;
|