@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,15 +1,4 @@
|
|
|
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
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
14
3
|
if (k2 === undefined) k2 = k;
|
|
15
4
|
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
@@ -43,58 +32,22 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
43
32
|
return result;
|
|
44
33
|
};
|
|
45
34
|
})();
|
|
46
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
47
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
48
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
49
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
50
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
51
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
52
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
53
|
-
});
|
|
54
|
-
};
|
|
55
|
-
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
56
|
-
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);
|
|
57
|
-
return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
58
|
-
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
59
|
-
function step(op) {
|
|
60
|
-
if (f) throw new TypeError("Generator is already executing.");
|
|
61
|
-
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
62
|
-
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;
|
|
63
|
-
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
64
|
-
switch (op[0]) {
|
|
65
|
-
case 0: case 1: t = op; break;
|
|
66
|
-
case 4: _.label++; return { value: op[1], done: false };
|
|
67
|
-
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
68
|
-
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
69
|
-
default:
|
|
70
|
-
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
71
|
-
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
72
|
-
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
73
|
-
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
74
|
-
if (t[2]) _.ops.pop();
|
|
75
|
-
_.trys.pop(); continue;
|
|
76
|
-
}
|
|
77
|
-
op = body.call(thisArg, _);
|
|
78
|
-
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
79
|
-
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
80
|
-
}
|
|
81
|
-
};
|
|
82
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
83
36
|
exports.RealtimeApp = exports.installRealtimeSocketHandlers = exports.redactCredentials = exports.MAX_QUERY_SUBSCRIPTIONS = exports.MAX_DOCUMENT_SUBSCRIPTIONS = exports.MAX_MODEL_SUBSCRIPTIONS = void 0;
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
37
|
+
const Sentry = __importStar(require("@sentry/bun"));
|
|
38
|
+
const socket_io_1 = require("socket.io");
|
|
39
|
+
const errors_1 = require("../errors");
|
|
40
|
+
const logger_1 = require("../logger");
|
|
41
|
+
const realtimeAccess_1 = require("../rbac/realtimeAccess");
|
|
42
|
+
const registry_1 = require("../sync/registry");
|
|
43
|
+
const socketHandlers_1 = require("../sync/socketHandlers");
|
|
44
|
+
const syncApp_1 = require("../sync/syncApp");
|
|
45
|
+
const changeStreamWatcher_1 = require("./changeStreamWatcher");
|
|
46
|
+
const queryStore_1 = require("./queryStore");
|
|
47
|
+
const registry_2 = require("./registry");
|
|
48
|
+
const sessionRevalidation_1 = require("./sessionRevalidation");
|
|
49
|
+
const socketAuth_1 = require("./socketAuth");
|
|
50
|
+
const socketUser_1 = require("./socketUser");
|
|
98
51
|
/**
|
|
99
52
|
* Caps on per-socket subscriptions. Prevents a malicious or buggy client from
|
|
100
53
|
* exhausting server memory by opening unbounded subscriptions.
|
|
@@ -109,58 +62,46 @@ exports.MAX_QUERY_SUBSCRIPTIONS = 100;
|
|
|
109
62
|
*
|
|
110
63
|
* Exported for testing.
|
|
111
64
|
*/
|
|
112
|
-
|
|
65
|
+
/** @internal */
|
|
66
|
+
const redactCredentials = (url) => {
|
|
113
67
|
try {
|
|
114
|
-
|
|
68
|
+
const parsed = new URL(url);
|
|
115
69
|
if (parsed.username || parsed.password) {
|
|
116
70
|
parsed.username = "";
|
|
117
71
|
parsed.password = "";
|
|
118
72
|
// URL serialization drops the empty userinfo; reinsert a sentinel so logs make it
|
|
119
73
|
// obvious credentials were stripped rather than silently absent from the source URL.
|
|
120
|
-
return parsed.toString().replace(
|
|
74
|
+
return parsed.toString().replace(`${parsed.protocol}//`, `${parsed.protocol}//***@`);
|
|
121
75
|
}
|
|
122
76
|
return parsed.toString();
|
|
123
77
|
}
|
|
124
|
-
catch
|
|
78
|
+
catch {
|
|
125
79
|
return url.replace(/^(\w+):\/\/[^@/]*@/, "$1://***@");
|
|
126
80
|
}
|
|
127
81
|
};
|
|
128
82
|
exports.redactCredentials = redactCredentials;
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
case 4:
|
|
152
|
-
error_1 = _a.sent();
|
|
153
|
-
logger_1.logger.error("[realtime] queryFilter threw for ".concat(entry.modelName, "/list: ").concat(error_1, ". Denying query subscription."));
|
|
154
|
-
Sentry.captureException(error_1);
|
|
155
|
-
return [2 /*return*/, null];
|
|
156
|
-
case 5:
|
|
157
|
-
if (filteredQuery === null) {
|
|
158
|
-
return [2 /*return*/, null];
|
|
159
|
-
}
|
|
160
|
-
return [2 /*return*/, __assign(__assign({}, query), filteredQuery)];
|
|
161
|
-
}
|
|
162
|
-
});
|
|
163
|
-
}); };
|
|
83
|
+
const canSubscribe = async (entry, method, user) => (0, realtimeAccess_1.canSubscribeRealtime)(entry, method, user);
|
|
84
|
+
const getAuthorizedQuery = async (entry, query, user) => {
|
|
85
|
+
if (!(await canSubscribe(entry, "list", user))) {
|
|
86
|
+
return null;
|
|
87
|
+
}
|
|
88
|
+
if (!entry.options.queryFilter) {
|
|
89
|
+
return query;
|
|
90
|
+
}
|
|
91
|
+
let filteredQuery;
|
|
92
|
+
try {
|
|
93
|
+
filteredQuery = await entry.options.queryFilter(user, query);
|
|
94
|
+
}
|
|
95
|
+
catch (error) {
|
|
96
|
+
logger_1.logger.error(`[realtime] queryFilter threw for ${entry.modelName}/list: ${error}. Denying query subscription.`);
|
|
97
|
+
Sentry.captureException(error);
|
|
98
|
+
return null;
|
|
99
|
+
}
|
|
100
|
+
if (filteredQuery === null) {
|
|
101
|
+
return null;
|
|
102
|
+
}
|
|
103
|
+
return { ...query, ...filteredQuery };
|
|
104
|
+
};
|
|
164
105
|
/**
|
|
165
106
|
* Install the realtime subscription handlers on a single socket. Extracted from the
|
|
166
107
|
* RealtimeApp connection handler so this logic can be unit-tested with a mock socket
|
|
@@ -172,228 +113,155 @@ var getAuthorizedQuery = function (entry, query, user) { return __awaiter(void 0
|
|
|
172
113
|
* - owner-strategy isolation (non-admin users cannot subscribe to other users' rooms)
|
|
173
114
|
* - server-side queryId computation (clients can't hijack queries by colliding ids)
|
|
174
115
|
*/
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
var userId = (_b = socket.decodedToken) === null || _b === void 0 ? void 0 : _b.id;
|
|
180
|
-
var isAdmin = ((_c = socket.decodedToken) === null || _c === void 0 ? void 0 : _c.admin) === true;
|
|
116
|
+
const installRealtimeSocketHandlers = (socket, options = {}) => {
|
|
117
|
+
const logInfo = options.logInfo ?? (() => { });
|
|
118
|
+
const userId = socket.decodedToken?.id;
|
|
119
|
+
const isAdmin = socket.decodedToken?.admin === true;
|
|
181
120
|
// D2: re-derive per event rather than capturing once at install time, so a
|
|
182
121
|
// handshake-time-loaded full user (or one refreshed by D1's sweep) is always used.
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
logInfo("[realtime] User ".concat(userId, " connected"));
|
|
197
|
-
_a.label = 3;
|
|
198
|
-
case 3:
|
|
199
|
-
if (!isAdmin) return [3 /*break*/, 5];
|
|
200
|
-
return [4 /*yield*/, socket.join("admin")];
|
|
201
|
-
case 4:
|
|
202
|
-
_a.sent();
|
|
203
|
-
logInfo("[realtime] Admin user ".concat(userId, " joined admin room"));
|
|
204
|
-
_a.label = 5;
|
|
205
|
-
case 5: return [2 /*return*/];
|
|
206
|
-
}
|
|
207
|
-
});
|
|
208
|
-
}); };
|
|
122
|
+
const currentUser = () => (0, socketUser_1.getSocketUser)(socket);
|
|
123
|
+
const counts = { document: 0, model: 0, query: 0 };
|
|
124
|
+
const joinUserRooms = async () => {
|
|
125
|
+
if (userId) {
|
|
126
|
+
await socket.join(`user:${userId}`);
|
|
127
|
+
await socket.join("authenticated");
|
|
128
|
+
logInfo(`[realtime] User ${userId} connected`);
|
|
129
|
+
}
|
|
130
|
+
if (isAdmin) {
|
|
131
|
+
await socket.join("admin");
|
|
132
|
+
logInfo(`[realtime] Admin user ${userId} joined admin room`);
|
|
133
|
+
}
|
|
134
|
+
};
|
|
209
135
|
// Fire-and-forget — there is nothing useful for the caller to await.
|
|
210
136
|
void joinUserRooms();
|
|
211
|
-
socket.on("subscribe:model",
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
if (!((payload === null || payload === void 0 ? void 0 : payload.collection) && (payload === null || payload === void 0 ? void 0 : payload.id))) return [3 /*break*/, 2];
|
|
315
|
-
room = "document:".concat(payload.collection, ":").concat(payload.id);
|
|
316
|
-
return [4 /*yield*/, socket.leave(room)];
|
|
317
|
-
case 1:
|
|
318
|
-
_a.sent();
|
|
319
|
-
counts.document = Math.max(0, counts.document - 1);
|
|
320
|
-
logInfo("[realtime] User ".concat(userId, " unsubscribed from ").concat(room));
|
|
321
|
-
_a.label = 2;
|
|
322
|
-
case 2: return [2 /*return*/];
|
|
323
|
-
}
|
|
324
|
-
});
|
|
325
|
-
}); });
|
|
326
|
-
socket.on("subscribe:query", function (payload) { return __awaiter(void 0, void 0, void 0, function () {
|
|
327
|
-
var entry, query, queryId;
|
|
328
|
-
return __generator(this, function (_a) {
|
|
329
|
-
switch (_a.label) {
|
|
330
|
-
case 0:
|
|
331
|
-
if (!(payload === null || payload === void 0 ? void 0 : payload.collection) ||
|
|
332
|
-
!(payload === null || payload === void 0 ? void 0 : payload.query) ||
|
|
333
|
-
typeof payload.collection !== "string" ||
|
|
334
|
-
typeof payload.query !== "object" ||
|
|
335
|
-
Array.isArray(payload.query)) {
|
|
336
|
-
return [2 /*return*/];
|
|
337
|
-
}
|
|
338
|
-
if (counts.query >= exports.MAX_QUERY_SUBSCRIPTIONS) {
|
|
339
|
-
logInfo("[realtime] User ".concat(userId, " hit query subscription limit"));
|
|
340
|
-
return [2 /*return*/];
|
|
341
|
-
}
|
|
342
|
-
entry = (0, registry_2.findRegistryEntryByRoutePath)(payload.collection);
|
|
343
|
-
if (!entry) {
|
|
344
|
-
logInfo("[realtime] User ".concat(userId, " denied query subscription: ") +
|
|
345
|
-
"collection \"".concat(payload.collection, "\" not registered"));
|
|
346
|
-
return [2 /*return*/];
|
|
347
|
-
}
|
|
348
|
-
return [4 /*yield*/, getAuthorizedQuery(entry, __assign({}, payload.query), currentUser())];
|
|
349
|
-
case 1:
|
|
350
|
-
query = _a.sent();
|
|
351
|
-
if (!query) {
|
|
352
|
-
logInfo("[realtime] User ".concat(userId, " denied query subscription for ").concat(payload.collection, ": ") +
|
|
353
|
-
"list permission or query filter denied");
|
|
354
|
-
return [2 /*return*/];
|
|
355
|
-
}
|
|
356
|
-
if (entry.config.roomStrategy === "owner" && !isAdmin) {
|
|
357
|
-
if (!userId) {
|
|
358
|
-
return [2 /*return*/];
|
|
359
|
-
}
|
|
360
|
-
query = __assign(__assign({}, query), { ownerId: userId });
|
|
361
|
-
}
|
|
362
|
-
queryId = (0, queryStore_1.computeQueryId)(payload.collection, query);
|
|
363
|
-
(0, queryStore_1.addQuerySubscription)(socket.id, payload.collection, query, queryId);
|
|
364
|
-
counts.query += 1;
|
|
365
|
-
return [4 /*yield*/, socket.join("query:".concat(queryId))];
|
|
366
|
-
case 2:
|
|
367
|
-
_a.sent();
|
|
368
|
-
socket.emit("query:subscribed", {
|
|
369
|
-
clientQueryId: payload.queryId,
|
|
370
|
-
collection: payload.collection,
|
|
371
|
-
queryId: queryId,
|
|
372
|
-
});
|
|
373
|
-
logInfo("[realtime] User ".concat(userId, " subscribed to query:").concat(queryId, " on ").concat(payload.collection));
|
|
374
|
-
return [2 /*return*/];
|
|
375
|
-
}
|
|
376
|
-
});
|
|
377
|
-
}); });
|
|
378
|
-
socket.on("unsubscribe:query", function (payload) { return __awaiter(void 0, void 0, void 0, function () {
|
|
379
|
-
return __generator(this, function (_a) {
|
|
380
|
-
switch (_a.label) {
|
|
381
|
-
case 0:
|
|
382
|
-
if (!(payload === null || payload === void 0 ? void 0 : payload.queryId)) return [3 /*break*/, 2];
|
|
383
|
-
(0, queryStore_1.removeQuerySubscription)(socket.id, payload.queryId);
|
|
384
|
-
return [4 /*yield*/, socket.leave("query:".concat(payload.queryId))];
|
|
385
|
-
case 1:
|
|
386
|
-
_a.sent();
|
|
387
|
-
counts.query = Math.max(0, counts.query - 1);
|
|
388
|
-
logInfo("[realtime] User ".concat(userId, " unsubscribed from query:").concat(payload.queryId));
|
|
389
|
-
_a.label = 2;
|
|
390
|
-
case 2: return [2 /*return*/];
|
|
137
|
+
socket.on("subscribe:model", async (modelName) => {
|
|
138
|
+
if (typeof modelName !== "string" || modelName.length === 0) {
|
|
139
|
+
return;
|
|
140
|
+
}
|
|
141
|
+
if (counts.model >= exports.MAX_MODEL_SUBSCRIPTIONS) {
|
|
142
|
+
logInfo(`[realtime] User ${userId} hit model subscription limit`);
|
|
143
|
+
return;
|
|
144
|
+
}
|
|
145
|
+
const entry = (0, registry_2.findRegistryEntryByRoutePath)(modelName);
|
|
146
|
+
if (!entry) {
|
|
147
|
+
logInfo(`[realtime] User ${userId} denied model subscription: collection "${modelName}" not registered`);
|
|
148
|
+
return;
|
|
149
|
+
}
|
|
150
|
+
// Owner-strategy models fan out via user:{ownerId} — there is no shared model room
|
|
151
|
+
// that should be open to all users. Owners receive events through their user room
|
|
152
|
+
// automatically; admins can use the admin room to see everything.
|
|
153
|
+
if (entry.config.roomStrategy === "owner" && !isAdmin) {
|
|
154
|
+
logInfo(`[realtime] User ${userId} denied model subscription for ${modelName}: ` +
|
|
155
|
+
"owner strategy restricts model room to admins");
|
|
156
|
+
return;
|
|
157
|
+
}
|
|
158
|
+
if (!(await canSubscribe(entry, "list", currentUser()))) {
|
|
159
|
+
logInfo(`[realtime] User ${userId} denied model subscription for ${modelName}: list permission denied`);
|
|
160
|
+
return;
|
|
161
|
+
}
|
|
162
|
+
counts.model += 1;
|
|
163
|
+
await socket.join(`model:${modelName}`);
|
|
164
|
+
logInfo(`[realtime] User ${userId} subscribed to model:${modelName}`);
|
|
165
|
+
});
|
|
166
|
+
socket.on("unsubscribe:model", async (modelName) => {
|
|
167
|
+
if (typeof modelName === "string" && modelName.length > 0) {
|
|
168
|
+
await socket.leave(`model:${modelName}`);
|
|
169
|
+
counts.model = Math.max(0, counts.model - 1);
|
|
170
|
+
logInfo(`[realtime] User ${userId} unsubscribed from model:${modelName}`);
|
|
171
|
+
}
|
|
172
|
+
});
|
|
173
|
+
socket.on("subscribe:document", async (payload) => {
|
|
174
|
+
if (!payload?.collection ||
|
|
175
|
+
!payload?.id ||
|
|
176
|
+
typeof payload.collection !== "string" ||
|
|
177
|
+
typeof payload.id !== "string") {
|
|
178
|
+
return;
|
|
179
|
+
}
|
|
180
|
+
if (counts.document >= exports.MAX_DOCUMENT_SUBSCRIPTIONS) {
|
|
181
|
+
logInfo(`[realtime] User ${userId} hit document subscription limit`);
|
|
182
|
+
return;
|
|
183
|
+
}
|
|
184
|
+
const entry = (0, registry_2.findRegistryEntryByRoutePath)(payload.collection);
|
|
185
|
+
if (!entry) {
|
|
186
|
+
logInfo(`[realtime] User ${userId} denied document subscription: ` +
|
|
187
|
+
`collection "${payload.collection}" not registered`);
|
|
188
|
+
return;
|
|
189
|
+
}
|
|
190
|
+
if (!(await canSubscribe(entry, "read", currentUser()))) {
|
|
191
|
+
logInfo(`[realtime] User ${userId} denied document subscription for ` +
|
|
192
|
+
`${payload.collection}/${payload.id}: read permission denied`);
|
|
193
|
+
return;
|
|
194
|
+
}
|
|
195
|
+
if (entry.config.roomStrategy === "owner" && !isAdmin) {
|
|
196
|
+
logInfo(`[realtime] User ${userId} denied document subscription for ` +
|
|
197
|
+
`${payload.collection}/${payload.id}: owner strategy requires admin`);
|
|
198
|
+
return;
|
|
199
|
+
}
|
|
200
|
+
counts.document += 1;
|
|
201
|
+
const room = `document:${payload.collection}:${payload.id}`;
|
|
202
|
+
await socket.join(room);
|
|
203
|
+
logInfo(`[realtime] User ${userId} subscribed to ${room}`);
|
|
204
|
+
});
|
|
205
|
+
socket.on("unsubscribe:document", async (payload) => {
|
|
206
|
+
if (payload?.collection && payload?.id) {
|
|
207
|
+
const room = `document:${payload.collection}:${payload.id}`;
|
|
208
|
+
await socket.leave(room);
|
|
209
|
+
counts.document = Math.max(0, counts.document - 1);
|
|
210
|
+
logInfo(`[realtime] User ${userId} unsubscribed from ${room}`);
|
|
211
|
+
}
|
|
212
|
+
});
|
|
213
|
+
socket.on("subscribe:query", async (payload) => {
|
|
214
|
+
if (!payload?.collection ||
|
|
215
|
+
!payload?.query ||
|
|
216
|
+
typeof payload.collection !== "string" ||
|
|
217
|
+
typeof payload.query !== "object" ||
|
|
218
|
+
Array.isArray(payload.query)) {
|
|
219
|
+
return;
|
|
220
|
+
}
|
|
221
|
+
if (counts.query >= exports.MAX_QUERY_SUBSCRIPTIONS) {
|
|
222
|
+
logInfo(`[realtime] User ${userId} hit query subscription limit`);
|
|
223
|
+
return;
|
|
224
|
+
}
|
|
225
|
+
const entry = (0, registry_2.findRegistryEntryByRoutePath)(payload.collection);
|
|
226
|
+
if (!entry) {
|
|
227
|
+
logInfo(`[realtime] User ${userId} denied query subscription: ` +
|
|
228
|
+
`collection "${payload.collection}" not registered`);
|
|
229
|
+
return;
|
|
230
|
+
}
|
|
231
|
+
let query = await getAuthorizedQuery(entry, { ...payload.query }, currentUser());
|
|
232
|
+
if (!query) {
|
|
233
|
+
logInfo(`[realtime] User ${userId} denied query subscription for ${payload.collection}: ` +
|
|
234
|
+
"list permission or query filter denied");
|
|
235
|
+
return;
|
|
236
|
+
}
|
|
237
|
+
if (entry.config.roomStrategy === "owner" && !isAdmin) {
|
|
238
|
+
if (!userId) {
|
|
239
|
+
return;
|
|
391
240
|
}
|
|
241
|
+
query = { ...query, ownerId: userId };
|
|
242
|
+
}
|
|
243
|
+
const queryId = (0, queryStore_1.computeQueryId)(payload.collection, query);
|
|
244
|
+
(0, queryStore_1.addQuerySubscription)(socket.id, payload.collection, query, queryId);
|
|
245
|
+
counts.query += 1;
|
|
246
|
+
await socket.join(`query:${queryId}`);
|
|
247
|
+
socket.emit("query:subscribed", {
|
|
248
|
+
clientQueryId: payload.queryId,
|
|
249
|
+
collection: payload.collection,
|
|
250
|
+
queryId,
|
|
392
251
|
});
|
|
393
|
-
|
|
394
|
-
|
|
252
|
+
logInfo(`[realtime] User ${userId} subscribed to query:${queryId} on ${payload.collection}`);
|
|
253
|
+
});
|
|
254
|
+
socket.on("unsubscribe:query", async (payload) => {
|
|
255
|
+
if (payload?.queryId) {
|
|
256
|
+
(0, queryStore_1.removeQuerySubscription)(socket.id, payload.queryId);
|
|
257
|
+
await socket.leave(`query:${payload.queryId}`);
|
|
258
|
+
counts.query = Math.max(0, counts.query - 1);
|
|
259
|
+
logInfo(`[realtime] User ${userId} unsubscribed from query:${payload.queryId}`);
|
|
260
|
+
}
|
|
261
|
+
});
|
|
262
|
+
socket.on("disconnect", () => {
|
|
395
263
|
(0, queryStore_1.removeAllSocketQueries)(socket.id);
|
|
396
|
-
logInfo(
|
|
264
|
+
logInfo(`[realtime] User ${userId} disconnected`);
|
|
397
265
|
});
|
|
398
266
|
};
|
|
399
267
|
exports.installRealtimeSocketHandlers = installRealtimeSocketHandlers;
|
|
@@ -421,39 +289,35 @@ exports.installRealtimeSocketHandlers = installRealtimeSocketHandlers;
|
|
|
421
289
|
* .start();
|
|
422
290
|
* ```
|
|
423
291
|
*/
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
292
|
+
class RealtimeApp {
|
|
293
|
+
app = null;
|
|
294
|
+
io = null;
|
|
295
|
+
config;
|
|
296
|
+
sessionRevalidation = null;
|
|
297
|
+
constructor(config = {}) {
|
|
430
298
|
this.config = config;
|
|
431
299
|
}
|
|
432
300
|
/**
|
|
433
301
|
* Register routes and middleware. Adds a /realtime/health endpoint.
|
|
434
302
|
*/
|
|
435
|
-
|
|
436
|
-
var _this = this;
|
|
303
|
+
register(app) {
|
|
437
304
|
this.app = app;
|
|
438
|
-
app.get("/realtime/health",
|
|
439
|
-
|
|
440
|
-
var connected = (_c = (_b = (_a = _this.io) === null || _a === void 0 ? void 0 : _a.engine) === null || _b === void 0 ? void 0 : _b.clientsCount) !== null && _c !== void 0 ? _c : 0;
|
|
305
|
+
app.get("/realtime/health", (_req, res) => {
|
|
306
|
+
const connected = this.io?.engine?.clientsCount ?? 0;
|
|
441
307
|
res.json({
|
|
442
308
|
clients: connected,
|
|
443
|
-
debug:
|
|
444
|
-
status:
|
|
309
|
+
debug: this.config.debug ?? false,
|
|
310
|
+
status: this.io ? "running" : "not_started",
|
|
445
311
|
});
|
|
446
312
|
});
|
|
447
|
-
}
|
|
313
|
+
}
|
|
448
314
|
/**
|
|
449
315
|
* Called after the HTTP server is created. Sets up Socket.io, auth, rooms,
|
|
450
316
|
* and starts the change stream watcher.
|
|
451
317
|
*/
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
var debug = (_a = this.config.debug) !== null && _a !== void 0 ? _a : false;
|
|
456
|
-
var logInfo = function (message) {
|
|
318
|
+
onServerCreated(server) {
|
|
319
|
+
const debug = this.config.debug ?? false;
|
|
320
|
+
const logInfo = (message) => {
|
|
457
321
|
if (debug) {
|
|
458
322
|
logger_1.logger.info(message);
|
|
459
323
|
}
|
|
@@ -462,15 +326,15 @@ var RealtimeApp = /** @class */ (function () {
|
|
|
462
326
|
logInfo("[realtime] Setting up Socket.io server...");
|
|
463
327
|
// Prefer an injected Server constructor in tests so callers never need
|
|
464
328
|
// process-wide `mock.module("socket.io")` (which poisons later files).
|
|
465
|
-
|
|
329
|
+
const SocketServerCtor = this.config.SocketServer ?? socket_io_1.Server;
|
|
466
330
|
this.io = new SocketServerCtor(server, {
|
|
467
|
-
cors:
|
|
331
|
+
cors: this.config.cors ?? {
|
|
468
332
|
methods: ["GET", "POST"],
|
|
469
333
|
origin: "*",
|
|
470
334
|
},
|
|
471
335
|
});
|
|
472
336
|
// Authentication middleware: legacy JWT first when configured, optionally Better Auth sessions.
|
|
473
|
-
|
|
337
|
+
const tokenSecret = this.config.tokenSecret ?? process.env.TOKEN_SECRET;
|
|
474
338
|
if (!tokenSecret && !this.config.betterAuth) {
|
|
475
339
|
throw new errors_1.APIError({
|
|
476
340
|
status: 500,
|
|
@@ -484,12 +348,16 @@ var RealtimeApp = /** @class */ (function () {
|
|
|
484
348
|
// thunk (not a value captured once here) so a later change to
|
|
485
349
|
// process.env.TOKEN_ISSUER — or to an explicitly configured tokenIssuer — is
|
|
486
350
|
// honored on every handshake, matching the HTTP path's per-request env read.
|
|
487
|
-
|
|
488
|
-
this.io.use((0, socketAuth_1.createSocketAuthMiddleware)(
|
|
489
|
-
|
|
351
|
+
const resolveTokenIssuer = () => this.config.tokenIssuer ?? process.env.TOKEN_ISSUER;
|
|
352
|
+
this.io.use((0, socketAuth_1.createSocketAuthMiddleware)({
|
|
353
|
+
betterAuth: this.config.betterAuth,
|
|
354
|
+
issuer: resolveTokenIssuer,
|
|
355
|
+
tokenSecret,
|
|
356
|
+
}));
|
|
357
|
+
const authKinds = [tokenSecret ? "JWT" : null, this.config.betterAuth ? "Better Auth" : null]
|
|
490
358
|
.filter(Boolean)
|
|
491
359
|
.join(" + ");
|
|
492
|
-
logInfo(
|
|
360
|
+
logInfo(`[realtime] Socket auth middleware added (${authKinds})`);
|
|
493
361
|
// Task 9.21: tenant/custom sync scopes can only be resolved from the full user
|
|
494
362
|
// document, so warn loudly here (once, at startup) rather than silently serving
|
|
495
363
|
// empty tenant streams for the life of the process.
|
|
@@ -497,106 +365,86 @@ var RealtimeApp = /** @class */ (function () {
|
|
|
497
365
|
// Configure adapter for multi-instance deployments
|
|
498
366
|
this.setupAdapter(logInfo);
|
|
499
367
|
// Connection handling
|
|
500
|
-
this.io.on("connection",
|
|
501
|
-
var _a, _b;
|
|
368
|
+
this.io.on("connection", (socket) => {
|
|
502
369
|
try {
|
|
503
370
|
// D2: load the full user document once at handshake (by the decoded
|
|
504
371
|
// token's id) and cache it on socket.data.fullUser — getSocketUser prefers
|
|
505
372
|
// it over the synthetic {_id, admin, id} shape for every authorization
|
|
506
373
|
// check below. Fire-and-forget: handlers install synchronously and fall
|
|
507
374
|
// back to the synthetic shape until this resolves.
|
|
508
|
-
void (0, sessionRevalidation_1.loadFullUserForSocket)(socket,
|
|
375
|
+
void (0, sessionRevalidation_1.loadFullUserForSocket)(socket, this.config.userModel);
|
|
509
376
|
// The auth middleware adds `decodedToken` at runtime; cast through
|
|
510
377
|
// RealtimeSocketLike (a structural subset) to keep socket handler logic testable.
|
|
511
|
-
(0, exports.installRealtimeSocketHandlers)(socket, { logInfo
|
|
378
|
+
(0, exports.installRealtimeSocketHandlers)(socket, { logInfo });
|
|
512
379
|
// Sync protocol handlers (sync:subscribe / sync:mutate). Options come from the
|
|
513
380
|
// SyncApp registered on this Express app or an explicit `sync` override here;
|
|
514
381
|
// with neither, the handlers still install and reject unknown collections.
|
|
515
|
-
(0, socketHandlers_1.installSyncSocketHandlers)(
|
|
382
|
+
(0, socketHandlers_1.installSyncSocketHandlers)(this.io, socket, this.config.sync ?? (this.app ? (0, syncApp_1.getSyncAppOptions)(this.app) : undefined) ?? {}, { logInfo });
|
|
516
383
|
}
|
|
517
384
|
catch (error) {
|
|
518
|
-
logger_1.logger.error(
|
|
385
|
+
logger_1.logger.error(`[realtime] Error handling connection: ${error}`);
|
|
519
386
|
Sentry.captureException(error);
|
|
520
387
|
}
|
|
521
388
|
});
|
|
522
|
-
this.io.on("connect_error",
|
|
523
|
-
logger_1.logger.error(
|
|
389
|
+
this.io.on("connect_error", (error) => {
|
|
390
|
+
logger_1.logger.error(`[realtime] Connection error: ${error.message}`);
|
|
524
391
|
Sentry.captureException(error);
|
|
525
392
|
});
|
|
526
393
|
// Start the change stream watcher (injectable for unit tests — see SocketServer).
|
|
527
|
-
|
|
394
|
+
const startWatcher = this.config.startChangeStreamWatcher ?? changeStreamWatcher_1.startChangeStreamWatcher;
|
|
528
395
|
startWatcher(this.io, this.config.changeStream, debug);
|
|
529
396
|
// D1: periodic session re-validation sweep — disconnects sockets whose JWT has
|
|
530
397
|
// expired, whose Better Auth session is no longer valid, or whose user has
|
|
531
398
|
// since been disabled; also refreshes socket.data.fullUser (D2) and
|
|
532
399
|
// re-resolves sync room membership (D4) for sockets that remain valid.
|
|
533
400
|
// A thunk (not a snapshot) reads this app's SyncApp options fresh on every sweep.
|
|
534
|
-
this.sessionRevalidation = (0, sessionRevalidation_1.startSessionRevalidationSweep)(this.io,
|
|
535
|
-
|
|
536
|
-
|
|
537
|
-
|
|
538
|
-
|
|
539
|
-
|
|
540
|
-
|
|
541
|
-
userModel: _this.config.userModel,
|
|
542
|
-
});
|
|
543
|
-
});
|
|
401
|
+
this.sessionRevalidation = (0, sessionRevalidation_1.startSessionRevalidationSweep)(this.io, () => ({
|
|
402
|
+
betterAuth: this.config.betterAuth,
|
|
403
|
+
intervalMs: this.config.sessionRevalidationIntervalMs,
|
|
404
|
+
logInfo,
|
|
405
|
+
sync: this.config.sync ?? (this.app ? (0, syncApp_1.getSyncAppOptions)(this.app) : undefined),
|
|
406
|
+
userModel: this.config.userModel,
|
|
407
|
+
}));
|
|
544
408
|
logInfo("[realtime] Socket.io server setup complete");
|
|
545
409
|
}
|
|
546
410
|
catch (error) {
|
|
547
|
-
logger_1.logger.error(
|
|
411
|
+
logger_1.logger.error(`[realtime] Failed to set up Socket.io: ${error}`);
|
|
548
412
|
Sentry.captureException(error);
|
|
549
413
|
throw error;
|
|
550
414
|
}
|
|
551
|
-
}
|
|
415
|
+
}
|
|
552
416
|
/**
|
|
553
417
|
* Get the Socket.io server instance.
|
|
554
418
|
*/
|
|
555
|
-
|
|
419
|
+
getIo() {
|
|
556
420
|
return this.io;
|
|
557
|
-
}
|
|
421
|
+
}
|
|
558
422
|
/**
|
|
559
423
|
* Gracefully shut down the real-time server.
|
|
560
424
|
*/
|
|
561
|
-
|
|
562
|
-
|
|
563
|
-
|
|
564
|
-
|
|
565
|
-
|
|
566
|
-
|
|
567
|
-
|
|
568
|
-
|
|
569
|
-
|
|
570
|
-
|
|
571
|
-
|
|
572
|
-
|
|
573
|
-
|
|
574
|
-
|
|
575
|
-
|
|
576
|
-
case 2:
|
|
577
|
-
_b.sent();
|
|
578
|
-
this.io = null;
|
|
579
|
-
_b.label = 3;
|
|
580
|
-
case 3: return [3 /*break*/, 5];
|
|
581
|
-
case 4:
|
|
582
|
-
error_2 = _b.sent();
|
|
583
|
-
logger_1.logger.error("[realtime] Error closing: ".concat(error_2));
|
|
584
|
-
return [3 /*break*/, 5];
|
|
585
|
-
case 5: return [2 /*return*/];
|
|
586
|
-
}
|
|
587
|
-
});
|
|
588
|
-
});
|
|
589
|
-
};
|
|
590
|
-
RealtimeApp.prototype.setupAdapter = function (logInfo) {
|
|
591
|
-
var _a, _b, _c;
|
|
425
|
+
async close() {
|
|
426
|
+
try {
|
|
427
|
+
this.sessionRevalidation?.stop();
|
|
428
|
+
this.sessionRevalidation = null;
|
|
429
|
+
await (0, changeStreamWatcher_1.stopChangeStreamWatcher)();
|
|
430
|
+
if (this.io) {
|
|
431
|
+
await this.io.close();
|
|
432
|
+
this.io = null;
|
|
433
|
+
}
|
|
434
|
+
}
|
|
435
|
+
catch (error) {
|
|
436
|
+
logger_1.logger.error(`[realtime] Error closing: ${error}`);
|
|
437
|
+
}
|
|
438
|
+
}
|
|
439
|
+
setupAdapter(logInfo) {
|
|
592
440
|
if (!this.io) {
|
|
593
441
|
return;
|
|
594
442
|
}
|
|
595
|
-
|
|
443
|
+
const adapter = this.config.adapter ?? "none";
|
|
596
444
|
if (adapter === "redis") {
|
|
597
|
-
|
|
445
|
+
const redisUrl = this.config.redisUrl ?? process.env.VALKEY_URL ?? process.env.REDIS_URL;
|
|
598
446
|
if (redisUrl) {
|
|
599
|
-
logInfo(
|
|
447
|
+
logInfo(`[realtime] Redis adapter configured with URL: ${(0, exports.redactCredentials)(redisUrl)}`);
|
|
600
448
|
// Redis adapter must be configured externally by the consuming app
|
|
601
449
|
// since @socket.io/redis-adapter and ioredis are optional peer dependencies.
|
|
602
450
|
// Use realtimeApp.getIo() to access the Socket.io instance and call
|
|
@@ -609,7 +457,6 @@ var RealtimeApp = /** @class */ (function () {
|
|
|
609
457
|
}
|
|
610
458
|
}
|
|
611
459
|
// 'none' — no adapter, single instance mode
|
|
612
|
-
}
|
|
613
|
-
|
|
614
|
-
}());
|
|
460
|
+
}
|
|
461
|
+
}
|
|
615
462
|
exports.RealtimeApp = RealtimeApp;
|