@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,28 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __assign = (this && this.__assign) || function () {
|
|
3
|
-
__assign = Object.assign || function(t) {
|
|
4
|
-
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
5
|
-
s = arguments[i];
|
|
6
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
7
|
-
t[p] = s[p];
|
|
8
|
-
}
|
|
9
|
-
return t;
|
|
10
|
-
};
|
|
11
|
-
return __assign.apply(this, arguments);
|
|
12
|
-
};
|
|
13
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
3
|
exports.clearRealtimeRegistry = exports.findRegistryEntryByRoutePath = exports.findRegistryEntryByCollection = exports.getRealtimeRegistry = exports.updateRealtimeRegistryOptions = exports.registerRealtime = void 0;
|
|
15
|
-
|
|
16
|
-
|
|
4
|
+
const collectionRegistry_1 = require("../collectionRegistry");
|
|
5
|
+
const toRealtimeEntry = (record) => ({
|
|
17
6
|
collectionName: record.model.collection.collectionName,
|
|
18
7
|
config: record.options.realtime,
|
|
19
8
|
modelName: record.model.modelName,
|
|
20
9
|
options: record.options,
|
|
21
10
|
routePath: record.routePath,
|
|
22
|
-
});
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
var registered = (_a = (0, collectionRegistry_1.listCollections)().find(function (record) { return record.routePath === entry.routePath; })) === null || _a === void 0 ? void 0 : _a.model;
|
|
11
|
+
});
|
|
12
|
+
const realtimeModelForEntry = (entry) => {
|
|
13
|
+
const registered = (0, collectionRegistry_1.listCollections)().find((record) => record.routePath === entry.routePath)?.model;
|
|
26
14
|
if (registered) {
|
|
27
15
|
return registered;
|
|
28
16
|
}
|
|
@@ -31,33 +19,34 @@ var realtimeModelForEntry = function (entry) {
|
|
|
31
19
|
modelName: entry.modelName,
|
|
32
20
|
};
|
|
33
21
|
};
|
|
34
|
-
|
|
22
|
+
const registerRealtime = (entry) => {
|
|
35
23
|
(0, collectionRegistry_1.registerCollection)({
|
|
36
24
|
model: realtimeModelForEntry(entry),
|
|
37
|
-
options:
|
|
25
|
+
options: {
|
|
26
|
+
...entry.options,
|
|
27
|
+
realtime: entry.config,
|
|
28
|
+
},
|
|
38
29
|
routePath: entry.routePath,
|
|
39
30
|
});
|
|
40
31
|
};
|
|
41
32
|
exports.registerRealtime = registerRealtime;
|
|
42
|
-
|
|
33
|
+
const updateRealtimeRegistryOptions = (routePath, options) => {
|
|
43
34
|
(0, collectionRegistry_1.replaceCollectionOptions)(routePath, options);
|
|
44
35
|
};
|
|
45
36
|
exports.updateRealtimeRegistryOptions = updateRealtimeRegistryOptions;
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
.map(toRealtimeEntry);
|
|
50
|
-
};
|
|
37
|
+
const getRealtimeRegistry = () => (0, collectionRegistry_1.listCollections)()
|
|
38
|
+
.filter((record) => record.surfaces.realtime)
|
|
39
|
+
.map(toRealtimeEntry);
|
|
51
40
|
exports.getRealtimeRegistry = getRealtimeRegistry;
|
|
52
|
-
|
|
53
|
-
return (0, exports.getRealtimeRegistry)().find(
|
|
41
|
+
const findRegistryEntryByCollection = (collectionName) => {
|
|
42
|
+
return (0, exports.getRealtimeRegistry)().find((entry) => entry.collectionName === collectionName);
|
|
54
43
|
};
|
|
55
44
|
exports.findRegistryEntryByCollection = findRegistryEntryByCollection;
|
|
56
|
-
|
|
57
|
-
return (0, exports.getRealtimeRegistry)().find(
|
|
45
|
+
const findRegistryEntryByRoutePath = (collection) => {
|
|
46
|
+
return (0, exports.getRealtimeRegistry)().find((entry) => entry.routePath === `/${collection}` || entry.routePath === collection);
|
|
58
47
|
};
|
|
59
48
|
exports.findRegistryEntryByRoutePath = findRegistryEntryByRoutePath;
|
|
60
|
-
|
|
49
|
+
const clearRealtimeRegistry = () => {
|
|
61
50
|
(0, collectionRegistry_1.clearCollectionRegistry)();
|
|
62
51
|
};
|
|
63
52
|
exports.clearRealtimeRegistry = clearRealtimeRegistry;
|
|
@@ -1,92 +1,20 @@
|
|
|
1
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
|
-
var __values = (this && this.__values) || function(o) {
|
|
39
|
-
var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
|
|
40
|
-
if (m) return m.call(o);
|
|
41
|
-
if (o && typeof o.length === "number") return {
|
|
42
|
-
next: function () {
|
|
43
|
-
if (o && i >= o.length) o = void 0;
|
|
44
|
-
return { value: o && o[i++], done: !o };
|
|
45
|
-
}
|
|
46
|
-
};
|
|
47
|
-
throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
|
|
48
|
-
};
|
|
49
|
-
var __read = (this && this.__read) || function (o, n) {
|
|
50
|
-
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
51
|
-
if (!m) return o;
|
|
52
|
-
var i = m.call(o), r, ar = [], e;
|
|
53
|
-
try {
|
|
54
|
-
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
55
|
-
}
|
|
56
|
-
catch (error) { e = { error: error }; }
|
|
57
|
-
finally {
|
|
58
|
-
try {
|
|
59
|
-
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
60
|
-
}
|
|
61
|
-
finally { if (e) throw e.error; }
|
|
62
|
-
}
|
|
63
|
-
return ar;
|
|
64
|
-
};
|
|
65
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
66
|
-
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
67
|
-
if (ar || !(i in from)) {
|
|
68
|
-
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
69
|
-
ar[i] = from[i];
|
|
70
|
-
}
|
|
71
|
-
}
|
|
72
|
-
return to.concat(ar || Array.prototype.slice.call(from));
|
|
73
|
-
};
|
|
74
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
75
3
|
exports.loadFullUserForSocket = exports.startSessionRevalidationSweep = exports.runSessionRevalidationSweep = exports.reresolveSyncRoomsForSocket = exports.revalidateSocketSession = exports.DEFAULT_SESSION_REVALIDATION_INTERVAL_MS = void 0;
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
4
|
+
const luxon_1 = require("luxon");
|
|
5
|
+
const logger_1 = require("../logger");
|
|
6
|
+
const plugins_1 = require("../plugins");
|
|
7
|
+
const registry_1 = require("../sync/registry");
|
|
8
|
+
const socketHandlers_1 = require("../sync/socketHandlers");
|
|
9
|
+
const streams_1 = require("../sync/streams");
|
|
10
|
+
const socketUser_1 = require("./socketUser");
|
|
83
11
|
/**
|
|
84
12
|
* Default interval for the periodic socket session re-validation sweep (D1): 60
|
|
85
13
|
* seconds. Sockets authenticate once at handshake; without a sweep, a revoked
|
|
86
14
|
* session, an expired token, or a user subsequently disabled keeps streaming deltas
|
|
87
15
|
* (including PHI) indefinitely.
|
|
88
16
|
*/
|
|
89
|
-
exports.DEFAULT_SESSION_REVALIDATION_INTERVAL_MS =
|
|
17
|
+
exports.DEFAULT_SESSION_REVALIDATION_INTERVAL_MS = 60_000;
|
|
90
18
|
/**
|
|
91
19
|
* Re-run the cheap parts of the auth validator for an already-connected socket:
|
|
92
20
|
* - JWT sockets (`decodedToken.authKind === "jwt"`): verify `exp` locally (no
|
|
@@ -97,54 +25,41 @@ exports.DEFAULT_SESSION_REVALIDATION_INTERVAL_MS = 60000;
|
|
|
97
25
|
* Also reloads the user's `disabled` flag (and the full user document, refreshing
|
|
98
26
|
* `socket.data.fullUser` for D2) when a `userModel` is configured.
|
|
99
27
|
*/
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
}
|
|
117
|
-
return [4 /*yield*/, options.betterAuth.auth.api.getSession({
|
|
118
|
-
headers: { authorization: "Bearer ".concat(socket.encodedToken) },
|
|
119
|
-
})];
|
|
120
|
-
case 2:
|
|
121
|
-
session = _d.sent();
|
|
122
|
-
if (!((_c = session === null || session === void 0 ? void 0 : session.user) === null || _c === void 0 ? void 0 : _c.id)) {
|
|
123
|
-
return [2 /*return*/, "invalid-session"];
|
|
124
|
-
}
|
|
125
|
-
_d.label = 3;
|
|
126
|
-
case 3:
|
|
127
|
-
if (!(options.userModel && userId)) return [3 /*break*/, 5];
|
|
128
|
-
return [4 /*yield*/, (0, plugins_1.findOneOrNoneFor)(options.userModel, { _id: userId })];
|
|
129
|
-
case 4:
|
|
130
|
-
fullUser = _d.sent();
|
|
131
|
-
if (!fullUser) {
|
|
132
|
-
return [2 /*return*/, "invalid-session"];
|
|
133
|
-
}
|
|
134
|
-
if (fullUser.disabled === true) {
|
|
135
|
-
return [2 /*return*/, "disabled"];
|
|
136
|
-
}
|
|
137
|
-
// D2: refresh the cached full user so subsequent authorization checks (and the
|
|
138
|
-
// next sweep tick's stream re-resolution below) see current fields — e.g. a
|
|
139
|
-
// membership change to `organizationIds` takes effect without a reconnect.
|
|
140
|
-
if (socket.data) {
|
|
141
|
-
socket.data.fullUser = fullUser;
|
|
142
|
-
}
|
|
143
|
-
_d.label = 5;
|
|
144
|
-
case 5: return [2 /*return*/, "valid"];
|
|
28
|
+
const revalidateSocketSession = async (socket, options) => {
|
|
29
|
+
const { authKind, id: userId, exp } = socket.decodedToken ?? {};
|
|
30
|
+
if (authKind === "jwt") {
|
|
31
|
+
if (typeof exp === "number" && exp <= luxon_1.DateTime.now().toSeconds()) {
|
|
32
|
+
return "expired";
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
else if (authKind === "better-auth") {
|
|
36
|
+
if (!options.betterAuth || !socket.encodedToken) {
|
|
37
|
+
return "invalid-session";
|
|
38
|
+
}
|
|
39
|
+
const session = await options.betterAuth.auth.api.getSession({
|
|
40
|
+
headers: { authorization: `Bearer ${socket.encodedToken}` },
|
|
41
|
+
});
|
|
42
|
+
if (!session?.user?.id) {
|
|
43
|
+
return "invalid-session";
|
|
145
44
|
}
|
|
146
|
-
}
|
|
147
|
-
|
|
45
|
+
}
|
|
46
|
+
if (options.userModel && userId) {
|
|
47
|
+
const fullUser = await (0, plugins_1.findOneOrNoneFor)(options.userModel, { _id: userId });
|
|
48
|
+
if (!fullUser) {
|
|
49
|
+
return "invalid-session";
|
|
50
|
+
}
|
|
51
|
+
if (fullUser.disabled === true) {
|
|
52
|
+
return "disabled";
|
|
53
|
+
}
|
|
54
|
+
// D2: refresh the cached full user so subsequent authorization checks (and the
|
|
55
|
+
// next sweep tick's stream re-resolution below) see current fields — e.g. a
|
|
56
|
+
// membership change to `organizationIds` takes effect without a reconnect.
|
|
57
|
+
if (socket.data) {
|
|
58
|
+
socket.data.fullUser = fullUser;
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
return "valid";
|
|
62
|
+
};
|
|
148
63
|
exports.revalidateSocketSession = revalidateSocketSession;
|
|
149
64
|
/**
|
|
150
65
|
* D4: re-resolve the streams the socket's user currently belongs to for every
|
|
@@ -153,204 +68,80 @@ exports.revalidateSocketSession = revalidateSocketSession;
|
|
|
153
68
|
* granted rooms too, mirroring what a fresh `sync:subscribe` would do, so a
|
|
154
69
|
* membership grant also takes effect without a reconnect.
|
|
155
70
|
*/
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
streams = [(0, streams_1.streamForScopeValue)({ collectionTag: collection, scope: scope, scopeValue: user.id })];
|
|
189
|
-
return [3 /*break*/, 8];
|
|
190
|
-
case 2:
|
|
191
|
-
if (!((_d = options.sync) === null || _d === void 0 ? void 0 : _d.getUserScopes)) return [3 /*break*/, 7];
|
|
192
|
-
scopeValues = void 0;
|
|
193
|
-
_h.label = 3;
|
|
194
|
-
case 3:
|
|
195
|
-
_h.trys.push([3, 5, , 6]);
|
|
196
|
-
return [4 /*yield*/, options.sync.getUserScopes(user, entry)];
|
|
197
|
-
case 4:
|
|
198
|
-
scopeValues = _h.sent();
|
|
199
|
-
return [3 /*break*/, 6];
|
|
200
|
-
case 5:
|
|
201
|
-
error_1 = _h.sent();
|
|
202
|
-
logger_1.logger.error("[realtime] getUserScopes threw during session revalidation: ".concat(error_1));
|
|
203
|
-
return [2 /*return*/, "continue"];
|
|
204
|
-
case 6:
|
|
205
|
-
streams = scopeValues.map(function (scopeValue) {
|
|
206
|
-
return (0, streams_1.streamForScopeValue)({ collectionTag: collection, scope: scope, scopeValue: scopeValue });
|
|
207
|
-
});
|
|
208
|
-
return [3 /*break*/, 8];
|
|
209
|
-
case 7: return [2 /*return*/, "continue"];
|
|
210
|
-
case 8:
|
|
211
|
-
nextRooms = new Set(streams.map(socketHandlers_1.syncRoomForStream));
|
|
212
|
-
_h.label = 9;
|
|
213
|
-
case 9:
|
|
214
|
-
_h.trys.push([9, 14, 15, 16]);
|
|
215
|
-
currentRooms_1 = (e_2 = void 0, __values(currentRooms)), currentRooms_1_1 = currentRooms_1.next();
|
|
216
|
-
_h.label = 10;
|
|
217
|
-
case 10:
|
|
218
|
-
if (!!currentRooms_1_1.done) return [3 /*break*/, 13];
|
|
219
|
-
room = currentRooms_1_1.value;
|
|
220
|
-
if (!!nextRooms.has(room)) return [3 /*break*/, 12];
|
|
221
|
-
return [4 /*yield*/, socket.leave(room)];
|
|
222
|
-
case 11:
|
|
223
|
-
_h.sent();
|
|
224
|
-
_h.label = 12;
|
|
225
|
-
case 12:
|
|
226
|
-
currentRooms_1_1 = currentRooms_1.next();
|
|
227
|
-
return [3 /*break*/, 10];
|
|
228
|
-
case 13: return [3 /*break*/, 16];
|
|
229
|
-
case 14:
|
|
230
|
-
e_2_1 = _h.sent();
|
|
231
|
-
e_2 = { error: e_2_1 };
|
|
232
|
-
return [3 /*break*/, 16];
|
|
233
|
-
case 15:
|
|
234
|
-
try {
|
|
235
|
-
if (currentRooms_1_1 && !currentRooms_1_1.done && (_f = currentRooms_1.return)) _f.call(currentRooms_1);
|
|
236
|
-
}
|
|
237
|
-
finally { if (e_2) throw e_2.error; }
|
|
238
|
-
return [7 /*endfinally*/];
|
|
239
|
-
case 16:
|
|
240
|
-
_h.trys.push([16, 21, 22, 23]);
|
|
241
|
-
nextRooms_1 = (e_3 = void 0, __values(nextRooms)), nextRooms_1_1 = nextRooms_1.next();
|
|
242
|
-
_h.label = 17;
|
|
243
|
-
case 17:
|
|
244
|
-
if (!!nextRooms_1_1.done) return [3 /*break*/, 20];
|
|
245
|
-
room = nextRooms_1_1.value;
|
|
246
|
-
if (!!currentRooms.has(room)) return [3 /*break*/, 19];
|
|
247
|
-
return [4 /*yield*/, socket.join(room)];
|
|
248
|
-
case 18:
|
|
249
|
-
_h.sent();
|
|
250
|
-
_h.label = 19;
|
|
251
|
-
case 19:
|
|
252
|
-
nextRooms_1_1 = nextRooms_1.next();
|
|
253
|
-
return [3 /*break*/, 17];
|
|
254
|
-
case 20: return [3 /*break*/, 23];
|
|
255
|
-
case 21:
|
|
256
|
-
e_3_1 = _h.sent();
|
|
257
|
-
e_3 = { error: e_3_1 };
|
|
258
|
-
return [3 /*break*/, 23];
|
|
259
|
-
case 22:
|
|
260
|
-
try {
|
|
261
|
-
if (nextRooms_1_1 && !nextRooms_1_1.done && (_g = nextRooms_1.return)) _g.call(nextRooms_1);
|
|
262
|
-
}
|
|
263
|
-
finally { if (e_3) throw e_3.error; }
|
|
264
|
-
return [7 /*endfinally*/];
|
|
265
|
-
case 23:
|
|
266
|
-
subscriptions.set(collection, nextRooms);
|
|
267
|
-
return [2 /*return*/];
|
|
268
|
-
}
|
|
269
|
-
});
|
|
270
|
-
};
|
|
271
|
-
_e.label = 1;
|
|
272
|
-
case 1:
|
|
273
|
-
_e.trys.push([1, 6, 7, 8]);
|
|
274
|
-
subscriptions_1 = __values(subscriptions), subscriptions_1_1 = subscriptions_1.next();
|
|
275
|
-
_e.label = 2;
|
|
276
|
-
case 2:
|
|
277
|
-
if (!!subscriptions_1_1.done) return [3 /*break*/, 5];
|
|
278
|
-
_a = __read(subscriptions_1_1.value, 2), collection = _a[0], currentRooms = _a[1];
|
|
279
|
-
return [5 /*yield**/, _loop_1(collection, currentRooms)];
|
|
280
|
-
case 3:
|
|
281
|
-
_e.sent();
|
|
282
|
-
_e.label = 4;
|
|
283
|
-
case 4:
|
|
284
|
-
subscriptions_1_1 = subscriptions_1.next();
|
|
285
|
-
return [3 /*break*/, 2];
|
|
286
|
-
case 5: return [3 /*break*/, 8];
|
|
287
|
-
case 6:
|
|
288
|
-
e_1_1 = _e.sent();
|
|
289
|
-
e_1 = { error: e_1_1 };
|
|
290
|
-
return [3 /*break*/, 8];
|
|
291
|
-
case 7:
|
|
292
|
-
try {
|
|
293
|
-
if (subscriptions_1_1 && !subscriptions_1_1.done && (_b = subscriptions_1.return)) _b.call(subscriptions_1);
|
|
294
|
-
}
|
|
295
|
-
finally { if (e_1) throw e_1.error; }
|
|
296
|
-
return [7 /*endfinally*/];
|
|
297
|
-
case 8: return [2 /*return*/];
|
|
71
|
+
const reresolveSyncRoomsForSocket = async (socket, options) => {
|
|
72
|
+
const subscriptions = socket.data?.syncSubscriptions;
|
|
73
|
+
if (!subscriptions || subscriptions.size === 0) {
|
|
74
|
+
return;
|
|
75
|
+
}
|
|
76
|
+
const user = (0, socketUser_1.getSocketUser)(socket);
|
|
77
|
+
if (!user) {
|
|
78
|
+
return;
|
|
79
|
+
}
|
|
80
|
+
for (const [collection, currentRooms] of subscriptions) {
|
|
81
|
+
const entry = (0, registry_1.findSyncEntryByCollectionTag)(collection);
|
|
82
|
+
if (!entry) {
|
|
83
|
+
continue;
|
|
84
|
+
}
|
|
85
|
+
const { scope } = entry.config;
|
|
86
|
+
let streams;
|
|
87
|
+
if (typeof scope !== "function" && scope.type === "broadcast") {
|
|
88
|
+
streams = [(0, streams_1.streamForScopeValue)({ collectionTag: collection, scope, scopeValue: null })];
|
|
89
|
+
}
|
|
90
|
+
else if (typeof scope !== "function" && scope.type === "owner") {
|
|
91
|
+
streams = [(0, streams_1.streamForScopeValue)({ collectionTag: collection, scope, scopeValue: user.id })];
|
|
92
|
+
}
|
|
93
|
+
else if (options.sync?.getUserScopes) {
|
|
94
|
+
let scopeValues;
|
|
95
|
+
try {
|
|
96
|
+
scopeValues = await options.sync.getUserScopes(user, entry);
|
|
97
|
+
}
|
|
98
|
+
catch (error) {
|
|
99
|
+
logger_1.logger.error(`[realtime] getUserScopes threw during session revalidation: ${error}`);
|
|
100
|
+
continue;
|
|
101
|
+
}
|
|
102
|
+
streams = scopeValues.map((scopeValue) => (0, streams_1.streamForScopeValue)({ collectionTag: collection, scope, scopeValue }));
|
|
298
103
|
}
|
|
299
|
-
|
|
300
|
-
|
|
104
|
+
else {
|
|
105
|
+
continue;
|
|
106
|
+
}
|
|
107
|
+
const nextRooms = new Set(streams.map(socketHandlers_1.syncRoomForStream));
|
|
108
|
+
for (const room of currentRooms) {
|
|
109
|
+
if (!nextRooms.has(room)) {
|
|
110
|
+
await socket.leave(room);
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
for (const room of nextRooms) {
|
|
114
|
+
if (!currentRooms.has(room)) {
|
|
115
|
+
await socket.join(room);
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
subscriptions.set(collection, nextRooms);
|
|
119
|
+
}
|
|
120
|
+
};
|
|
301
121
|
exports.reresolveSyncRoomsForSocket = reresolveSyncRoomsForSocket;
|
|
302
122
|
/**
|
|
303
123
|
* Run one sweep pass over every connected socket: re-validate the session (D1),
|
|
304
124
|
* disconnecting (`sync:auth-expired` then `disconnect(true)`) any socket that fails,
|
|
305
125
|
* and re-resolve sync room membership (D4) for sockets that remain valid.
|
|
306
126
|
*/
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
case 0:
|
|
319
|
-
logInfo = (_a = options.logInfo) !== null && _a !== void 0 ? _a : (function () { });
|
|
320
|
-
sockets = __spreadArray([], __read(io.sockets.sockets.values()), false);
|
|
321
|
-
return [4 /*yield*/, Promise.all(sockets.map(function (socket) { return __awaiter(void 0, void 0, void 0, function () {
|
|
322
|
-
var outcome, error_2;
|
|
323
|
-
return __generator(this, function (_a) {
|
|
324
|
-
switch (_a.label) {
|
|
325
|
-
case 0:
|
|
326
|
-
_a.trys.push([0, 3, , 4]);
|
|
327
|
-
return [4 /*yield*/, (0, exports.revalidateSocketSession)(socket, options)];
|
|
328
|
-
case 1:
|
|
329
|
-
outcome = _a.sent();
|
|
330
|
-
if (outcome !== "valid") {
|
|
331
|
-
logInfo("[realtime] Session revalidation sweep disconnecting socket ".concat(socket.id, ": ").concat(outcome));
|
|
332
|
-
socket.emit("sync:auth-expired", { reason: outcome });
|
|
333
|
-
socket.disconnect(true);
|
|
334
|
-
return [2 /*return*/];
|
|
335
|
-
}
|
|
336
|
-
return [4 /*yield*/, (0, exports.reresolveSyncRoomsForSocket)(socket, options)];
|
|
337
|
-
case 2:
|
|
338
|
-
_a.sent();
|
|
339
|
-
return [3 /*break*/, 4];
|
|
340
|
-
case 3:
|
|
341
|
-
error_2 = _a.sent();
|
|
342
|
-
logger_1.logger.error("[realtime] Session revalidation sweep failed for socket ".concat(socket.id, ": ").concat(error_2));
|
|
343
|
-
return [3 /*break*/, 4];
|
|
344
|
-
case 4: return [2 /*return*/];
|
|
345
|
-
}
|
|
346
|
-
});
|
|
347
|
-
}); }))];
|
|
348
|
-
case 1:
|
|
349
|
-
_b.sent();
|
|
350
|
-
return [2 /*return*/];
|
|
127
|
+
const runSessionRevalidationSweep = async (io, options = {}) => {
|
|
128
|
+
const logInfo = options.logInfo ?? (() => { });
|
|
129
|
+
const sockets = [...io.sockets.sockets.values()];
|
|
130
|
+
await Promise.all(sockets.map(async (socket) => {
|
|
131
|
+
try {
|
|
132
|
+
const outcome = await (0, exports.revalidateSocketSession)(socket, options);
|
|
133
|
+
if (outcome !== "valid") {
|
|
134
|
+
logInfo(`[realtime] Session revalidation sweep disconnecting socket ${socket.id}: ${outcome}`);
|
|
135
|
+
socket.emit("sync:auth-expired", { reason: outcome });
|
|
136
|
+
socket.disconnect(true);
|
|
137
|
+
return;
|
|
351
138
|
}
|
|
352
|
-
|
|
353
|
-
|
|
139
|
+
await (0, exports.reresolveSyncRoomsForSocket)(socket, options);
|
|
140
|
+
}
|
|
141
|
+
catch (error) {
|
|
142
|
+
logger_1.logger.error(`[realtime] Session revalidation sweep failed for socket ${socket.id}: ${error}`);
|
|
143
|
+
}
|
|
144
|
+
}));
|
|
354
145
|
};
|
|
355
146
|
exports.runSessionRevalidationSweep = runSessionRevalidationSweep;
|
|
356
147
|
/**
|
|
@@ -365,23 +156,19 @@ exports.runSessionRevalidationSweep = runSessionRevalidationSweep;
|
|
|
365
156
|
* sweep, mirroring the per-handshake freshness `createLegacyJwtValidator`'s issuer
|
|
366
157
|
* thunk already provides.
|
|
367
158
|
*/
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
var resolveOptions = function () {
|
|
372
|
-
return typeof optionsOrThunk === "function" ? optionsOrThunk() : optionsOrThunk;
|
|
373
|
-
};
|
|
374
|
-
var intervalMs = (_a = resolveOptions().intervalMs) !== null && _a !== void 0 ? _a : exports.DEFAULT_SESSION_REVALIDATION_INTERVAL_MS;
|
|
159
|
+
const startSessionRevalidationSweep = (io, optionsOrThunk = {}) => {
|
|
160
|
+
const resolveOptions = () => typeof optionsOrThunk === "function" ? optionsOrThunk() : optionsOrThunk;
|
|
161
|
+
const intervalMs = resolveOptions().intervalMs ?? exports.DEFAULT_SESSION_REVALIDATION_INTERVAL_MS;
|
|
375
162
|
if (intervalMs <= 0) {
|
|
376
|
-
return { stop:
|
|
163
|
+
return { stop: () => { } };
|
|
377
164
|
}
|
|
378
|
-
|
|
379
|
-
void (0, exports.runSessionRevalidationSweep)(io, resolveOptions()).catch(
|
|
380
|
-
logger_1.logger.error(
|
|
165
|
+
const timer = setInterval(() => {
|
|
166
|
+
void (0, exports.runSessionRevalidationSweep)(io, resolveOptions()).catch((error) => {
|
|
167
|
+
logger_1.logger.error(`[realtime] Session revalidation sweep tick failed: ${error}`);
|
|
381
168
|
});
|
|
382
169
|
}, intervalMs);
|
|
383
170
|
return {
|
|
384
|
-
stop:
|
|
171
|
+
stop: () => {
|
|
385
172
|
clearInterval(timer);
|
|
386
173
|
},
|
|
387
174
|
};
|
|
@@ -395,8 +182,8 @@ exports.startSessionRevalidationSweep = startSessionRevalidationSweep;
|
|
|
395
182
|
* `getSocketUser`) or the decoded token carries no id (should not happen for a
|
|
396
183
|
* socket that passed auth, but guarded defensively).
|
|
397
184
|
*/
|
|
398
|
-
|
|
399
|
-
|
|
185
|
+
const loadFullUserForSocket = (socket, userModel) => {
|
|
186
|
+
const load = loadFullUserIntoSocketData(socket, userModel);
|
|
400
187
|
// Task 9.21: publish the in-flight load so the sync handlers can await it. An event that
|
|
401
188
|
// arrived inside the handshake window would otherwise be authorized against the synthetic
|
|
402
189
|
// JWT-claim user — no `organizationIds`, so a tenant `sync:subscribe` resolved to no
|
|
@@ -408,31 +195,18 @@ var loadFullUserForSocket = function (socket, userModel) {
|
|
|
408
195
|
};
|
|
409
196
|
exports.loadFullUserForSocket = loadFullUserForSocket;
|
|
410
197
|
/** The actual load; separated so {@link loadFullUserForSocket} can publish the promise. */
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
}
|
|
421
|
-
_b.label = 1;
|
|
422
|
-
case 1:
|
|
423
|
-
_b.trys.push([1, 3, , 4]);
|
|
424
|
-
return [4 /*yield*/, (0, plugins_1.findOneOrNoneFor)(userModel, { _id: userId })];
|
|
425
|
-
case 2:
|
|
426
|
-
fullUser = _b.sent();
|
|
427
|
-
if (fullUser) {
|
|
428
|
-
socket.data.fullUser = fullUser;
|
|
429
|
-
}
|
|
430
|
-
return [3 /*break*/, 4];
|
|
431
|
-
case 3:
|
|
432
|
-
error_3 = _b.sent();
|
|
433
|
-
logger_1.logger.error("[realtime] Failed to load full user at handshake for socket ".concat(socket.id, ": ").concat(error_3));
|
|
434
|
-
return [3 /*break*/, 4];
|
|
435
|
-
case 4: return [2 /*return*/];
|
|
198
|
+
const loadFullUserIntoSocketData = async (socket, userModel) => {
|
|
199
|
+
const userId = socket.decodedToken?.id;
|
|
200
|
+
if (!userModel || !userId) {
|
|
201
|
+
return;
|
|
202
|
+
}
|
|
203
|
+
try {
|
|
204
|
+
const fullUser = await (0, plugins_1.findOneOrNoneFor)(userModel, { _id: userId });
|
|
205
|
+
if (fullUser) {
|
|
206
|
+
socket.data.fullUser = fullUser;
|
|
436
207
|
}
|
|
437
|
-
}
|
|
438
|
-
|
|
208
|
+
}
|
|
209
|
+
catch (error) {
|
|
210
|
+
logger_1.logger.error(`[realtime] Failed to load full user at handshake for socket ${socket.id}: ${error}`);
|
|
211
|
+
}
|
|
212
|
+
};
|