@terreno/api 57.4.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.
Files changed (208) hide show
  1. package/README.md +5 -5
  2. package/bunfig.toml +1 -1
  3. package/dist/actions.js +197 -368
  4. package/dist/adminModelRouter.js +88 -173
  5. package/dist/api.js +598 -852
  6. package/dist/audit/auditApp.js +48 -89
  7. package/dist/audit/auditEventModel.js +15 -16
  8. package/dist/audit/cloudTasksEnqueue.js +56 -149
  9. package/dist/audit/diff.js +70 -160
  10. package/dist/audit/processQueue.js +25 -70
  11. package/dist/audit/rbacSink.js +25 -66
  12. package/dist/audit/record.js +129 -251
  13. package/dist/auth.js +432 -681
  14. package/dist/authRecovery.js +155 -269
  15. package/dist/authTokens.js +43 -118
  16. package/dist/betterAuthApp.js +25 -26
  17. package/dist/betterAuthSetup.js +258 -413
  18. package/dist/browserLogsRoute.d.ts +6 -0
  19. package/dist/browserLogsRoute.js +97 -0
  20. package/dist/collectionRegistry.js +32 -47
  21. package/dist/config.js +53 -122
  22. package/dist/configurationApp.js +180 -361
  23. package/dist/configurationPlugin.js +130 -302
  24. package/dist/consentApp.js +276 -421
  25. package/dist/docLoader.js +78 -126
  26. package/dist/envConfigurationPlugin.js +25 -147
  27. package/dist/errors.js +151 -247
  28. package/dist/example.js +28 -34
  29. package/dist/expressServer.d.ts +10 -0
  30. package/dist/expressServer.js +109 -255
  31. package/dist/frameworkModelNames.d.ts +24 -0
  32. package/dist/frameworkModelNames.js +31 -0
  33. package/dist/githubAuth.js +152 -216
  34. package/dist/httpClient.js +176 -264
  35. package/dist/index.d.ts +2 -0
  36. package/dist/index.js +7 -2
  37. package/dist/logger.js +145 -278
  38. package/dist/mcp/auth.js +76 -128
  39. package/dist/mcp/createMCPRequest.js +4 -5
  40. package/dist/mcp/handlers.js +268 -480
  41. package/dist/mcp/query.js +56 -150
  42. package/dist/mcp/registry.js +17 -30
  43. package/dist/mcp/schemaGenerator.js +95 -181
  44. package/dist/mcp/server.js +28 -100
  45. package/dist/mcp/serviceTokens.js +102 -191
  46. package/dist/mcp/toolGenerator.js +78 -191
  47. package/dist/middleware.js +15 -27
  48. package/dist/migrations/fixtures/all-down/20260910120000-one.js +2 -42
  49. package/dist/migrations/fixtures/all-down/20260910120001-two.js +2 -42
  50. package/dist/migrations/fixtures/bad-id/20260910120000-mismatch.js +1 -39
  51. package/dist/migrations/fixtures/bad-name/not-a-migration.js +1 -39
  52. package/dist/migrations/fixtures/valid/20260910120000-alpha.js +1 -39
  53. package/dist/migrations/fixtures/valid/20260910120001-beta.js +2 -42
  54. package/dist/migrations/generate.js +107 -229
  55. package/dist/migrations/load.js +75 -201
  56. package/dist/migrations/lock.js +54 -126
  57. package/dist/migrations/runner.js +192 -446
  58. package/dist/migrations/schemaCatalog.js +122 -263
  59. package/dist/models/consentForm.js +6 -6
  60. package/dist/models/consentResponse.js +5 -5
  61. package/dist/models/mcpServiceToken.js +66 -156
  62. package/dist/models/notification.js +6 -6
  63. package/dist/models/notificationPreference.js +6 -6
  64. package/dist/models/versionConfig.js +5 -5
  65. package/dist/notifications/notificationService.js +133 -273
  66. package/dist/notifications/notificationsApp.js +85 -179
  67. package/dist/notifications/notificationsBeforeSend.js +19 -64
  68. package/dist/notifiers/googleChatNotifier.js +36 -117
  69. package/dist/notifiers/slackNotifier.d.ts +31 -2
  70. package/dist/notifiers/slackNotifier.js +170 -119
  71. package/dist/notifiers/zoomNotifier.js +60 -111
  72. package/dist/openApi.js +107 -122
  73. package/dist/openApiBuilder.js +117 -159
  74. package/dist/openApiCompat.js +81 -148
  75. package/dist/openApiEtag.js +7 -7
  76. package/dist/openApiValidator.js +177 -286
  77. package/dist/orgs/orgContext.js +87 -157
  78. package/dist/orgs/orgPermissions.js +29 -68
  79. package/dist/orgs/orgPlugin.js +9 -27
  80. package/dist/orgs/organizationModel.js +65 -166
  81. package/dist/orgs/organizationSettings.js +29 -36
  82. package/dist/orgs/orgsApp.js +346 -608
  83. package/dist/permissions.js +88 -181
  84. package/dist/plugins.js +125 -218
  85. package/dist/populate.js +130 -240
  86. package/dist/rateLimit/applyTrustProxy.js +1 -1
  87. package/dist/rateLimit/createStore.js +7 -8
  88. package/dist/rateLimit/memoryStore.js +22 -100
  89. package/dist/rateLimit/middleware.js +48 -99
  90. package/dist/rateLimit/mongoStore.js +54 -112
  91. package/dist/rateLimit/policies.js +41 -75
  92. package/dist/rateLimit/redisStore.js +39 -133
  93. package/dist/rbac/access.js +119 -267
  94. package/dist/rbac/assertAllowed.js +95 -171
  95. package/dist/rbac/auditModel.js +14 -58
  96. package/dist/rbac/backfillAdmins.js +24 -130
  97. package/dist/rbac/fieldViews.js +46 -141
  98. package/dist/rbac/membershipOrgAdminSource.js +28 -99
  99. package/dist/rbac/middleware.js +30 -96
  100. package/dist/rbac/modelRouterAccess.js +130 -307
  101. package/dist/rbac/permissionUtils.js +40 -179
  102. package/dist/rbac/realtimeAccess.js +81 -147
  103. package/dist/rbac/resolve.d.ts +1 -1
  104. package/dist/rbac/resolve.js +148 -342
  105. package/dist/rbac/roleManager.js +318 -700
  106. package/dist/rbac/roleModel.js +44 -171
  107. package/dist/rbac/routes.js +93 -196
  108. package/dist/rbac/scopes.js +39 -133
  109. package/dist/rbac/statements.js +23 -91
  110. package/dist/rbac/userPlugin.js +3 -29
  111. package/dist/realtime/changeStreamWatcher.js +489 -800
  112. package/dist/realtime/deprecation.js +8 -10
  113. package/dist/realtime/queryMatcher.js +110 -191
  114. package/dist/realtime/queryStore.js +35 -118
  115. package/dist/realtime/realtimeApp.js +247 -401
  116. package/dist/realtime/registry.js +19 -30
  117. package/dist/realtime/sessionRevalidation.js +132 -358
  118. package/dist/realtime/socketAuth.js +89 -208
  119. package/dist/realtime/socketUser.js +10 -56
  120. package/dist/requestContext.js +93 -139
  121. package/dist/schemaMetadata.js +179 -274
  122. package/dist/scriptRunner.js +96 -266
  123. package/dist/scrubAdminFields.js +36 -108
  124. package/dist/secretProviders.js +130 -299
  125. package/dist/seedRunner.js +221 -514
  126. package/dist/sync/adminBroadcastScope.js +58 -170
  127. package/dist/sync/adminWindowAccess.js +15 -86
  128. package/dist/sync/adminWindowMutation.js +110 -181
  129. package/dist/sync/executors.js +425 -629
  130. package/dist/sync/loadHarness.js +392 -689
  131. package/dist/sync/models.js +181 -341
  132. package/dist/sync/mutationHandler.js +533 -801
  133. package/dist/sync/registrationSideEffects.js +41 -95
  134. package/dist/sync/registry.js +29 -49
  135. package/dist/sync/routes.js +484 -817
  136. package/dist/sync/scripts/compactTombstones.js +83 -228
  137. package/dist/sync/serialize.js +18 -58
  138. package/dist/sync/socketHandlers.js +253 -478
  139. package/dist/sync/streams.js +49 -117
  140. package/dist/sync/syncApp.js +12 -15
  141. package/dist/sync/syncBatch.js +63 -168
  142. package/dist/sync/syncSeqPlugin.js +430 -702
  143. package/dist/syncConsents.js +113 -253
  144. package/dist/terrenoApp.js +166 -276
  145. package/dist/tests/createTestData.js +146 -256
  146. package/dist/tests/models.js +14 -54
  147. package/dist/tests/mongoTestSetup.js +42 -103
  148. package/dist/tests/testHelper.js +31 -93
  149. package/dist/tests.js +12 -51
  150. package/dist/transformers.js +61 -164
  151. package/dist/utils.js +31 -93
  152. package/dist/vendor/wesleytodd-openapi/index.js +37 -51
  153. package/dist/vendor/wesleytodd-openapi/lib/generate-doc.js +32 -40
  154. package/dist/vendor/wesleytodd-openapi/lib/layer-schema.js +3 -3
  155. package/dist/vendor/wesleytodd-openapi/lib/ui.js +50 -19
  156. package/dist/vendor/wesleytodd-openapi/lib/validate.js +19 -47
  157. package/dist/versionCheckPlugin.js +52 -100
  158. package/dist/webhooks/headerValue.js +2 -2
  159. package/dist/webhooks/idempotency/memoryStore.js +16 -59
  160. package/dist/webhooks/idempotency/mongoStore.js +55 -130
  161. package/dist/webhooks/idempotency/webhookReceipt.js +9 -9
  162. package/dist/webhooks/rawBody.js +1 -1
  163. package/dist/webhooks/timingSafeEqual.js +4 -5
  164. package/dist/webhooks/verifiers/hmac.js +17 -18
  165. package/dist/webhooks/verifiers/sendgrid.js +20 -22
  166. package/dist/webhooks/verifiers/stripe.js +31 -65
  167. package/dist/webhooks/verifiers/twilio.js +23 -73
  168. package/dist/webhooks/webhooksApp.js +78 -177
  169. package/dist/zodOpenApi.js +2 -2
  170. package/package.json +6 -6
  171. package/src/__tests__/browserLogsRoute.test.ts +165 -0
  172. package/src/audit/auditApp.test.ts +5 -5
  173. package/src/audit/auditEventModel.ts +7 -3
  174. package/src/audit/auditRouter.test.ts +5 -5
  175. package/src/audit/rbacSink.test.ts +2 -2
  176. package/src/audit/record.test.ts +2 -2
  177. package/src/audit/record.ts +3 -2
  178. package/src/auth.ts +1 -1
  179. package/src/authRecovery.test.ts +43 -0
  180. package/src/authRecovery.ts +16 -10
  181. package/src/authTokens.ts +6 -2
  182. package/src/authVerification.test.ts +22 -0
  183. package/src/browserLogsRoute.ts +110 -0
  184. package/src/configurationPlugin.test.ts +1 -11
  185. package/src/expressServer.ts +10 -0
  186. package/src/frameworkModelNames.test.ts +62 -0
  187. package/src/frameworkModelNames.ts +33 -0
  188. package/src/index.ts +7 -0
  189. package/src/isolated/migrateCliConnect.isolated.ts +51 -0
  190. package/src/mcp/auth.test.ts +34 -1
  191. package/src/migrations/cli.test.ts +0 -23
  192. package/src/models/mcpServiceToken.ts +4 -3
  193. package/src/models/notification.ts +3 -2
  194. package/src/models/notificationPreference.ts +1 -1
  195. package/src/notifications/notificationsApp.test.ts +24 -1
  196. package/src/notifiers/slackNotifier.test.ts +186 -1
  197. package/src/notifiers/slackNotifier.ts +167 -8
  198. package/src/orgs/orgPlugin.ts +1 -1
  199. package/src/orgs/organizationModel.ts +11 -6
  200. package/src/plugins.test.ts +5 -0
  201. package/src/plugins.ts +3 -0
  202. package/src/realtime/realtimeApp.ts +1 -1
  203. package/src/sync/integration.test.ts +2 -2
  204. package/src/terrenoApp.ts +3 -0
  205. package/src/types.d.ts +1 -0
  206. package/src/webhooks/idempotency/webhookReceipt.ts +4 -3
  207. package/tsconfig.json +13 -54
  208. package/tsconfig.typedoc.json +2 -0
@@ -1,82 +1,10 @@
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 __read = (this && this.__read) || function (o, n) {
39
- var m = typeof Symbol === "function" && o[Symbol.iterator];
40
- if (!m) return o;
41
- var i = m.call(o), r, ar = [], e;
42
- try {
43
- while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
44
- }
45
- catch (error) { e = { error: error }; }
46
- finally {
47
- try {
48
- if (r && !r.done && (m = i["return"])) m.call(i);
49
- }
50
- finally { if (e) throw e.error; }
51
- }
52
- return ar;
53
- };
54
- var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
55
- if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
56
- if (ar || !(i in from)) {
57
- if (!ar) ar = Array.prototype.slice.call(from, 0, i);
58
- ar[i] = from[i];
59
- }
60
- }
61
- return to.concat(ar || Array.prototype.slice.call(from));
62
- };
63
- var __values = (this && this.__values) || function(o) {
64
- var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
65
- if (m) return m.call(o);
66
- if (o && typeof o.length === "number") return {
67
- next: function () {
68
- if (o && i >= o.length) o = void 0;
69
- return { value: o && o[i++], done: !o };
70
- }
71
- };
72
- throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
73
- };
74
2
  Object.defineProperty(exports, "__esModule", { value: true });
75
3
  exports.createSocketAuthMiddleware = exports.createBetterAuthValidator = exports.createLegacyJwtValidator = void 0;
76
- var socketio_jwt_1 = require("@thream/socketio-jwt");
77
- var errors_1 = require("../errors");
78
- var logger_1 = require("../logger");
79
- var plugins_1 = require("../plugins");
4
+ const socketio_jwt_1 = require("@thream/socketio-jwt");
5
+ const errors_1 = require("../errors");
6
+ const logger_1 = require("../logger");
7
+ const plugins_1 = require("../plugins");
80
8
  /**
81
9
  * Legacy JWT validator: wraps the `@thream/socketio-jwt` middleware so its observable
82
10
  * behavior (token format requirements, secret verification, `decodedToken` payload,
@@ -100,14 +28,12 @@ var plugins_1 = require("../plugins");
100
28
  * per-request freshness; a plain string is still supported for callers who intentionally
101
29
  * want a fixed value.
102
30
  */
103
- var createLegacyJwtValidator = function (tokenSecret, issuer) {
104
- var resolveIssuer = function () {
105
- return typeof issuer === "function" ? issuer() : issuer;
106
- };
107
- var middleware = (0, socketio_jwt_1.authorize)({
108
- onAuthentication: function (decodedToken) {
109
- var expectedIssuer = resolveIssuer();
110
- if (expectedIssuer && (decodedToken === null || decodedToken === void 0 ? void 0 : decodedToken.iss) !== expectedIssuer) {
31
+ const createLegacyJwtValidator = (tokenSecret, issuer) => {
32
+ const resolveIssuer = () => typeof issuer === "function" ? issuer() : issuer;
33
+ const middleware = (0, socketio_jwt_1.authorize)({
34
+ onAuthentication: (decodedToken) => {
35
+ const expectedIssuer = resolveIssuer();
36
+ if (expectedIssuer && decodedToken?.iss !== expectedIssuer) {
111
37
  throw new socketio_jwt_1.UnauthorizedError("invalid_token", {
112
38
  message: "Unauthorized: Token is missing or invalid Bearer",
113
39
  });
@@ -115,35 +41,33 @@ var createLegacyJwtValidator = function (tokenSecret, issuer) {
115
41
  },
116
42
  secret: tokenSecret,
117
43
  });
118
- return function (socket) {
119
- return new Promise(function (resolve, reject) {
120
- // The socketio-jwt middleware types demand a full Socket; it only reads
121
- // handshake.auth.token and writes encodedToken/decodedToken.
122
- middleware(socket, function (error) {
123
- if (error) {
124
- reject(error);
125
- return;
126
- }
127
- // D1: stamp which validator authenticated this socket so the periodic
128
- // re-validation sweep knows to re-check local JWT expiry (not a Better Auth
129
- // session lookup) for it. The library already populated decodedToken with the
130
- // full JWT payload (exp/iss included), so this only adds the discriminator.
131
- if (socket.decodedToken) {
132
- socket.decodedToken.authKind = "jwt";
133
- }
134
- resolve();
135
- });
44
+ return (socket) => new Promise((resolve, reject) => {
45
+ // The socketio-jwt middleware types demand a full Socket; it only reads
46
+ // handshake.auth.token and writes encodedToken/decodedToken.
47
+ middleware(socket, (error) => {
48
+ if (error) {
49
+ reject(error);
50
+ return;
51
+ }
52
+ // D1: stamp which validator authenticated this socket so the periodic
53
+ // re-validation sweep knows to re-check local JWT expiry (not a Better Auth
54
+ // session lookup) for it. The library already populated decodedToken with the
55
+ // full JWT payload (exp/iss included), so this only adds the discriminator.
56
+ if (socket.decodedToken) {
57
+ socket.decodedToken.authKind = "jwt";
58
+ }
59
+ resolve();
136
60
  });
137
- };
61
+ });
138
62
  };
139
63
  exports.createLegacyJwtValidator = createLegacyJwtValidator;
140
64
  /** Strip an optional `Bearer ` prefix from the handshake token. */
141
- var extractRawToken = function (socket) {
142
- var token = socket.handshake.auth.token;
65
+ const extractRawToken = (socket) => {
66
+ const { token } = socket.handshake.auth;
143
67
  if (typeof token !== "string" || token.length === 0) {
144
68
  return null;
145
69
  }
146
- var parts = token.split(" ");
70
+ const parts = token.split(" ");
147
71
  if (parts.length === 2 && parts[0] === "Bearer") {
148
72
  return parts[1];
149
73
  }
@@ -155,128 +79,85 @@ var extractRawToken = function (socket) {
155
79
  * uses). The token is presented both as a bearer Authorization header (for the Better Auth
156
80
  * bearer plugin) and as the session cookie, so either transport configuration works.
157
81
  */
158
- var createBetterAuthValidator = function (options) {
159
- var auth = options.auth, userModel = options.userModel;
160
- return function (socket) { return __awaiter(void 0, void 0, void 0, function () {
161
- var rawToken, session, betterAuthUserId, id, admin, appUser;
162
- var _a;
163
- return __generator(this, function (_b) {
164
- switch (_b.label) {
165
- case 0:
166
- rawToken = extractRawToken(socket);
167
- if (!rawToken) {
168
- throw new socketio_jwt_1.UnauthorizedError("credentials_required", { message: "no token provided" });
169
- }
170
- return [4 /*yield*/, auth.api.getSession({
171
- headers: { authorization: "Bearer ".concat(rawToken) },
172
- })];
173
- case 1:
174
- session = _b.sent();
175
- betterAuthUserId = (_a = session === null || session === void 0 ? void 0 : session.user) === null || _a === void 0 ? void 0 : _a.id;
176
- if (!betterAuthUserId) {
177
- throw new socketio_jwt_1.UnauthorizedError("invalid_token", {
178
- message: "Unauthorized: Better Auth session is missing or invalid",
179
- });
180
- }
181
- id = String(betterAuthUserId);
182
- admin = false;
183
- if (!userModel) return [3 /*break*/, 3];
184
- return [4 /*yield*/, (0, plugins_1.findOneOrNoneFor)(userModel, {
185
- betterAuthId: betterAuthUserId,
186
- })];
187
- case 2:
188
- appUser = (_b.sent());
189
- if (!(appUser === null || appUser === void 0 ? void 0 : appUser._id)) {
190
- throw new socketio_jwt_1.UnauthorizedError("invalid_token", {
191
- message: "Unauthorized: Better Auth user has no application user",
192
- });
193
- }
194
- id = String(appUser._id);
195
- admin = appUser.admin === true;
196
- _b.label = 3;
197
- case 3:
198
- socket.decodedToken = { admin: admin, authKind: "better-auth", id: id, isAnonymous: false };
199
- // D1: retain the raw session token so the periodic re-validation sweep can re-run
200
- // `auth.api.getSession` for this socket without re-deriving it from the handshake
201
- // (which may have since changed if the client reconnected with a new token).
202
- socket.encodedToken = rawToken;
203
- return [2 /*return*/];
204
- }
82
+ const createBetterAuthValidator = (options) => {
83
+ const { auth, userModel } = options;
84
+ return async (socket) => {
85
+ const rawToken = extractRawToken(socket);
86
+ if (!rawToken) {
87
+ throw new socketio_jwt_1.UnauthorizedError("credentials_required", { message: "no token provided" });
88
+ }
89
+ // Validate as a bearer credential only. Better Auth's bearer plugin signs and
90
+ // resolves the raw session token from the Authorization header. We deliberately do
91
+ // NOT also present it as a session cookie: a raw (unsigned) token cookie fails
92
+ // signature verification and, when both are sent, can shadow the working bearer path.
93
+ const session = await auth.api.getSession({
94
+ headers: { authorization: `Bearer ${rawToken}` },
205
95
  });
206
- }); };
96
+ const betterAuthUserId = session?.user?.id;
97
+ if (!betterAuthUserId) {
98
+ throw new socketio_jwt_1.UnauthorizedError("invalid_token", {
99
+ message: "Unauthorized: Better Auth session is missing or invalid",
100
+ });
101
+ }
102
+ let id = String(betterAuthUserId);
103
+ let admin = false;
104
+ if (userModel) {
105
+ const appUser = (await (0, plugins_1.findOneOrNoneFor)(userModel, {
106
+ betterAuthId: betterAuthUserId,
107
+ }));
108
+ if (!appUser?._id) {
109
+ throw new socketio_jwt_1.UnauthorizedError("invalid_token", {
110
+ message: "Unauthorized: Better Auth user has no application user",
111
+ });
112
+ }
113
+ id = String(appUser._id);
114
+ admin = appUser.admin === true;
115
+ }
116
+ socket.decodedToken = { admin, authKind: "better-auth", id, isAnonymous: false };
117
+ // D1: retain the raw session token so the periodic re-validation sweep can re-run
118
+ // `auth.api.getSession` for this socket without re-deriving it from the handshake
119
+ // (which may have since changed if the client reconnected with a new token).
120
+ socket.encodedToken = rawToken;
121
+ };
207
122
  };
208
123
  exports.createBetterAuthValidator = createBetterAuthValidator;
209
124
  /**
210
125
  * Build the Socket.io auth middleware from a validator chain: validators run in order and
211
126
  * the first success wins; when all fail the connection is rejected with the last error.
212
127
  */
213
- var createSocketAuthMiddleware = function (_a) {
214
- var tokenSecret = _a.tokenSecret, issuer = _a.issuer, betterAuth = _a.betterAuth, _b = _a.extraValidators, extraValidators = _b === void 0 ? [] : _b;
215
- var validators = [];
128
+ const createSocketAuthMiddleware = ({ tokenSecret, issuer, betterAuth, extraValidators = [], }) => {
129
+ const validators = [];
216
130
  if (tokenSecret) {
217
131
  validators.push((0, exports.createLegacyJwtValidator)(tokenSecret, issuer));
218
132
  }
219
133
  if (betterAuth) {
220
134
  validators.push((0, exports.createBetterAuthValidator)(betterAuth));
221
135
  }
222
- validators.push.apply(validators, __spreadArray([], __read(extraValidators), false));
136
+ validators.push(...extraValidators);
223
137
  if (validators.length === 0) {
224
138
  throw new errors_1.APIError({
225
139
  status: 500,
226
140
  title: "[realtime] At least one socket authentication validator is required.",
227
141
  });
228
142
  }
229
- return function (socket, next) {
230
- void (function () { return __awaiter(void 0, void 0, void 0, function () {
231
- var lastError, validators_1, validators_1_1, validator, error_1, e_1_1;
232
- var e_1, _a;
233
- return __generator(this, function (_b) {
234
- switch (_b.label) {
235
- case 0:
236
- lastError = new socketio_jwt_1.UnauthorizedError("credentials_required", {
237
- message: "no token provided",
238
- });
239
- _b.label = 1;
240
- case 1:
241
- _b.trys.push([1, 8, 9, 10]);
242
- validators_1 = __values(validators), validators_1_1 = validators_1.next();
243
- _b.label = 2;
244
- case 2:
245
- if (!!validators_1_1.done) return [3 /*break*/, 7];
246
- validator = validators_1_1.value;
247
- _b.label = 3;
248
- case 3:
249
- _b.trys.push([3, 5, , 6]);
250
- return [4 /*yield*/, validator(socket)];
251
- case 4:
252
- _b.sent();
253
- next();
254
- return [2 /*return*/];
255
- case 5:
256
- error_1 = _b.sent();
257
- lastError = error_1 instanceof Error ? error_1 : new Error(String(error_1));
258
- return [3 /*break*/, 6];
259
- case 6:
260
- validators_1_1 = validators_1.next();
261
- return [3 /*break*/, 2];
262
- case 7: return [3 /*break*/, 10];
263
- case 8:
264
- e_1_1 = _b.sent();
265
- e_1 = { error: e_1_1 };
266
- return [3 /*break*/, 10];
267
- case 9:
268
- try {
269
- if (validators_1_1 && !validators_1_1.done && (_a = validators_1.return)) _a.call(validators_1);
270
- }
271
- finally { if (e_1) throw e_1.error; }
272
- return [7 /*endfinally*/];
273
- case 10:
274
- logger_1.logger.debug("[realtime] Socket authentication failed: ".concat(lastError.message));
275
- next(lastError);
276
- return [2 /*return*/];
277
- }
143
+ return (socket, next) => {
144
+ void (async () => {
145
+ let lastError = new socketio_jwt_1.UnauthorizedError("credentials_required", {
146
+ message: "no token provided",
278
147
  });
279
- }); })();
148
+ for (const validator of validators) {
149
+ try {
150
+ await validator(socket);
151
+ next();
152
+ return;
153
+ }
154
+ catch (error) {
155
+ lastError = error instanceof Error ? error : new Error(String(error));
156
+ }
157
+ }
158
+ logger_1.logger.debug(`[realtime] Socket authentication failed: ${lastError.message}`);
159
+ next(lastError);
160
+ })();
280
161
  };
281
162
  };
282
163
  exports.createSocketAuthMiddleware = createSocketAuthMiddleware;
@@ -1,40 +1,4 @@
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
2
  Object.defineProperty(exports, "__esModule", { value: true });
39
3
  exports.awaitSocketFullUser = exports.getSocketUser = void 0;
40
4
  /**
@@ -45,21 +9,20 @@ exports.awaitSocketFullUser = exports.getSocketUser = void 0;
45
9
  * function rather than reading `decodedToken` directly, so they transparently benefit
46
10
  * once a `userModel` is configured.
47
11
  */
48
- var getSocketUser = function (socket) {
49
- var _a, _b, _c, _d;
50
- var fullUser = (_a = socket.data) === null || _a === void 0 ? void 0 : _a.fullUser;
12
+ const getSocketUser = (socket) => {
13
+ const fullUser = socket.data?.fullUser;
51
14
  if (fullUser) {
52
15
  return fullUser;
53
16
  }
54
- var userId = (_b = socket.decodedToken) === null || _b === void 0 ? void 0 : _b.id;
17
+ const userId = socket.decodedToken?.id;
55
18
  if (!userId) {
56
19
  return undefined;
57
20
  }
58
21
  return {
59
22
  _id: userId,
60
- admin: ((_c = socket.decodedToken) === null || _c === void 0 ? void 0 : _c.admin) === true,
23
+ admin: socket.decodedToken?.admin === true,
61
24
  id: userId,
62
- isAnonymous: (_d = socket.decodedToken) === null || _d === void 0 ? void 0 : _d.isAnonymous,
25
+ isAnonymous: socket.decodedToken?.isAnonymous,
63
26
  };
64
27
  };
65
28
  exports.getSocketUser = getSocketUser;
@@ -70,18 +33,9 @@ exports.getSocketUser = getSocketUser;
70
33
  * sees — scope membership must not depend on event timing. Falls back to the synthetic
71
34
  * token user exactly as `getSocketUser` does when no `userModel` is configured.
72
35
  */
73
- var awaitSocketFullUser = function (socket) { return __awaiter(void 0, void 0, void 0, function () {
74
- var _a;
75
- return __generator(this, function (_b) {
76
- switch (_b.label) {
77
- case 0:
78
- // The load swallows and logs its own failures; this await only orders the events.
79
- return [4 /*yield*/, ((_a = socket.data) === null || _a === void 0 ? void 0 : _a.fullUserLoad)];
80
- case 1:
81
- // The load swallows and logs its own failures; this await only orders the events.
82
- _b.sent();
83
- return [2 /*return*/, (0, exports.getSocketUser)(socket)];
84
- }
85
- });
86
- }); };
36
+ const awaitSocketFullUser = async (socket) => {
37
+ // The load swallows and logs its own failures; this await only orders the events.
38
+ await socket.data?.fullUserLoad;
39
+ return (0, exports.getSocketUser)(socket);
40
+ };
87
41
  exports.awaitSocketFullUser = awaitSocketFullUser;