@terreno/api 57.4.0 → 57.6.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +5 -5
- package/bunfig.toml +1 -1
- package/dist/actions.js +197 -368
- package/dist/adminModelRouter.js +88 -173
- package/dist/api.js +617 -852
- package/dist/audit/auditApp.js +48 -89
- package/dist/audit/auditEventModel.js +15 -16
- package/dist/audit/cloudTasksEnqueue.js +56 -149
- package/dist/audit/diff.js +70 -160
- package/dist/audit/processQueue.js +25 -70
- package/dist/audit/rbacSink.js +25 -66
- package/dist/audit/record.js +129 -251
- package/dist/auth.js +432 -681
- package/dist/authRecovery.js +155 -269
- package/dist/authTokens.js +43 -118
- 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.js +32 -47
- 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 +2 -0
- package/dist/index.js +7 -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.js +56 -150
- 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.js +2 -42
- package/dist/migrations/fixtures/all-down/20260910120001-two.js +2 -42
- package/dist/migrations/fixtures/bad-id/20260910120000-mismatch.js +1 -39
- package/dist/migrations/fixtures/bad-name/not-a-migration.js +1 -39
- package/dist/migrations/fixtures/valid/20260910120000-alpha.js +1 -39
- package/dist/migrations/fixtures/valid/20260910120001-beta.js +2 -42
- package/dist/migrations/generate.js +107 -229
- package/dist/migrations/load.js +75 -201
- package/dist/migrations/lock.js +54 -126
- package/dist/migrations/runner.js +192 -446
- package/dist/migrations/schemaCatalog.js +122 -263
- 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.js +6 -6
- package/dist/models/notificationPreference.js +6 -6
- package/dist/models/versionConfig.js +5 -5
- package/dist/notifications/notificationService.js +133 -273
- package/dist/notifications/notificationsApp.js +85 -179
- package/dist/notifications/notificationsBeforeSend.js +19 -64
- 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.js +107 -122
- package/dist/openApiBuilder.js +117 -159
- package/dist/openApiCompat.js +81 -148
- package/dist/openApiEtag.js +7 -7
- package/dist/openApiValidator.js +177 -286
- package/dist/orgs/orgContext.js +87 -157
- package/dist/orgs/orgPermissions.js +29 -68
- package/dist/orgs/orgPlugin.js +9 -27
- package/dist/orgs/organizationModel.js +65 -166
- package/dist/orgs/organizationSettings.js +29 -36
- package/dist/orgs/orgsApp.js +346 -608
- package/dist/permissions.js +88 -181
- 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.js +48 -99
- package/dist/rateLimit/mongoStore.js +54 -112
- package/dist/rateLimit/policies.js +41 -75
- package/dist/rateLimit/redisStore.js +39 -133
- package/dist/rbac/access.js +119 -267
- 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.js +28 -99
- package/dist/rbac/middleware.js +30 -96
- package/dist/rbac/modelRouterAccess.js +130 -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 +148 -342
- package/dist/rbac/roleManager.js +318 -700
- package/dist/rbac/roleModel.js +44 -171
- package/dist/rbac/routes.js +93 -196
- package/dist/rbac/scopes.js +39 -133
- package/dist/rbac/statements.js +23 -91
- package/dist/rbac/userPlugin.js +3 -29
- package/dist/realtime/changeStreamWatcher.js +489 -800
- package/dist/realtime/deprecation.js +8 -10
- package/dist/realtime/queryMatcher.js +110 -191
- package/dist/realtime/queryStore.js +35 -118
- package/dist/realtime/realtimeApp.js +247 -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 +179 -274
- 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.js +58 -170
- package/dist/sync/adminWindowAccess.js +15 -86
- package/dist/sync/adminWindowMutation.js +110 -181
- package/dist/sync/executors.js +425 -629
- package/dist/sync/loadHarness.js +392 -689
- package/dist/sync/models.js +181 -341
- package/dist/sync/mutationHandler.js +533 -801
- package/dist/sync/registrationSideEffects.js +41 -95
- package/dist/sync/registry.js +29 -49
- package/dist/sync/routes.js +484 -817
- package/dist/sync/scripts/compactTombstones.js +83 -228
- package/dist/sync/serialize.js +18 -58
- package/dist/sync/socketHandlers.js +253 -478
- package/dist/sync/streams.js +49 -117
- package/dist/sync/syncApp.js +12 -15
- package/dist/sync/syncBatch.js +63 -168
- package/dist/sync/syncSeqPlugin.js +430 -702
- package/dist/syncConsents.js +113 -253
- package/dist/terrenoApp.js +166 -276
- package/dist/tests/createTestData.js +146 -256
- package/dist/tests/models.js +14 -54
- package/dist/tests/mongoTestSetup.js +42 -103
- package/dist/tests/testHelper.js +31 -93
- package/dist/tests.js +12 -51
- package/dist/transformers.js +61 -164
- 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.js +9 -9
- package/dist/webhooks/rawBody.js +1 -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 +6 -6
- package/src/__tests__/browserLogsRoute.test.ts +165 -0
- package/src/api.arrayOperations.test.ts +44 -0
- package/src/api.ts +64 -39
- package/src/audit/auditApp.test.ts +5 -5
- package/src/audit/auditEventModel.ts +7 -3
- package/src/audit/auditRouter.test.ts +5 -5
- package/src/audit/rbacSink.test.ts +2 -2
- package/src/audit/record.test.ts +2 -2
- package/src/audit/record.ts +3 -2
- 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/browserLogsRoute.ts +110 -0
- package/src/configurationPlugin.test.ts +1 -11
- package/src/expressServer.ts +10 -0
- package/src/frameworkModelNames.test.ts +62 -0
- package/src/frameworkModelNames.ts +33 -0
- package/src/index.ts +7 -0
- package/src/isolated/migrateCliConnect.isolated.ts +51 -0
- package/src/mcp/auth.test.ts +34 -1
- package/src/migrations/cli.test.ts +0 -23
- package/src/models/mcpServiceToken.ts +4 -3
- package/src/models/notification.ts +3 -2
- package/src/models/notificationPreference.ts +1 -1
- package/src/notifications/notificationsApp.test.ts +24 -1
- package/src/notifiers/slackNotifier.test.ts +186 -1
- package/src/notifiers/slackNotifier.ts +167 -8
- package/src/orgs/orgPlugin.ts +1 -1
- package/src/orgs/organizationModel.ts +11 -6
- package/src/plugins.test.ts +5 -0
- package/src/plugins.ts +3 -0
- package/src/realtime/realtimeApp.ts +1 -1
- package/src/sync/integration.test.ts +2 -2
- package/src/terrenoApp.ts +3 -0
- package/src/types.d.ts +1 -0
- package/src/webhooks/idempotency/webhookReceipt.ts +4 -3
- package/tsconfig.json +13 -54
- package/tsconfig.typedoc.json +2 -0
package/dist/terrenoApp.js
CHANGED
|
@@ -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,87 +32,41 @@ 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
|
-
var __values = (this && this.__values) || function(o) {
|
|
83
|
-
var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
|
|
84
|
-
if (m) return m.call(o);
|
|
85
|
-
if (o && typeof o.length === "number") return {
|
|
86
|
-
next: function () {
|
|
87
|
-
if (o && i >= o.length) o = void 0;
|
|
88
|
-
return { value: o && o[i++], done: !o };
|
|
89
|
-
}
|
|
90
|
-
};
|
|
91
|
-
throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
|
|
92
|
-
};
|
|
93
35
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
94
36
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
95
37
|
};
|
|
96
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
97
39
|
exports.TerrenoApp = void 0;
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
40
|
+
const node_events_1 = require("node:events");
|
|
41
|
+
const node_http_1 = require("node:http");
|
|
42
|
+
const Sentry = __importStar(require("@sentry/bun"));
|
|
43
|
+
const cors_1 = __importDefault(require("cors"));
|
|
44
|
+
const express_1 = __importDefault(require("express"));
|
|
45
|
+
const mongoose_1 = __importDefault(require("mongoose"));
|
|
46
|
+
const qs_1 = __importDefault(require("qs"));
|
|
47
|
+
const auth_1 = require("./auth");
|
|
48
|
+
const betterAuthSetup_1 = require("./betterAuthSetup");
|
|
49
|
+
const browserLogsRoute_1 = require("./browserLogsRoute");
|
|
50
|
+
const configurationApp_1 = require("./configurationApp");
|
|
51
|
+
const errors_1 = require("./errors");
|
|
52
|
+
const expressServer_1 = require("./expressServer");
|
|
53
|
+
const githubAuth_1 = require("./githubAuth");
|
|
54
|
+
const logger_1 = require("./logger");
|
|
55
|
+
const server_1 = require("./mcp/server");
|
|
56
|
+
const serviceTokens_1 = require("./mcp/serviceTokens");
|
|
57
|
+
const middleware_1 = require("./middleware");
|
|
58
|
+
const runner_1 = require("./migrations/runner");
|
|
59
|
+
const openApiCompat_1 = require("./openApiCompat");
|
|
60
|
+
const openApiEtag_1 = require("./openApiEtag");
|
|
61
|
+
const orgsApp_1 = require("./orgs/orgsApp");
|
|
62
|
+
const applyTrustProxy_1 = require("./rateLimit/applyTrustProxy");
|
|
63
|
+
const createStore_1 = require("./rateLimit/createStore");
|
|
64
|
+
const middleware_2 = require("./rateLimit/middleware");
|
|
65
|
+
const realtimeApp_1 = require("./realtime/realtimeApp");
|
|
66
|
+
const requestContext_1 = require("./requestContext");
|
|
67
|
+
const registry_1 = require("./sync/registry");
|
|
68
|
+
const index_1 = __importDefault(require("./vendor/wesleytodd-openapi/index"));
|
|
69
|
+
const rawBody_1 = require("./webhooks/rawBody");
|
|
127
70
|
/**
|
|
128
71
|
* Fluent API for building Express applications with Terreno framework.
|
|
129
72
|
*
|
|
@@ -186,72 +129,19 @@ var rawBody_1 = require("./webhooks/rawBody");
|
|
|
186
129
|
* @see TerrenoPlugin for creating reusable plugins
|
|
187
130
|
* @see modelRouter for creating CRUD route registrations
|
|
188
131
|
*/
|
|
189
|
-
|
|
132
|
+
class TerrenoApp {
|
|
133
|
+
options;
|
|
134
|
+
registrations = [];
|
|
135
|
+
middlewareFns = [];
|
|
136
|
+
configurationApp = null;
|
|
137
|
+
adminEvents = new node_events_1.EventEmitter();
|
|
138
|
+
bootPromise = Promise.resolve();
|
|
190
139
|
/**
|
|
191
140
|
* Create a new TerrenoApp builder.
|
|
192
141
|
*
|
|
193
142
|
* @param options - Application configuration options including user model and auth settings
|
|
194
143
|
*/
|
|
195
|
-
|
|
196
|
-
var _this = this;
|
|
197
|
-
this.registrations = [];
|
|
198
|
-
this.middlewareFns = [];
|
|
199
|
-
this.configurationApp = null;
|
|
200
|
-
this.adminEvents = new node_events_1.EventEmitter();
|
|
201
|
-
this.bootPromise = Promise.resolve();
|
|
202
|
-
this.completeStart = function (app) { return __awaiter(_this, void 0, void 0, function () {
|
|
203
|
-
var port_1, existingServer, server, _a, _b, reg;
|
|
204
|
-
var e_1, _c;
|
|
205
|
-
return __generator(this, function (_d) {
|
|
206
|
-
switch (_d.label) {
|
|
207
|
-
case 0:
|
|
208
|
-
if (!!this.options.skipListen) return [3 /*break*/, 2];
|
|
209
|
-
port_1 = process.env.PORT || "9000";
|
|
210
|
-
existingServer = this.options.httpServer;
|
|
211
|
-
server = existingServer !== null && existingServer !== void 0 ? existingServer : (0, node_http_1.createServer)(app);
|
|
212
|
-
if (existingServer) {
|
|
213
|
-
existingServer.removeAllListeners("request");
|
|
214
|
-
existingServer.on("request", app);
|
|
215
|
-
}
|
|
216
|
-
try {
|
|
217
|
-
for (_a = __values(this.registrations), _b = _a.next(); !_b.done; _b = _a.next()) {
|
|
218
|
-
reg = _b.value;
|
|
219
|
-
if (!this.isModelRouterRegistration(reg) && typeof reg.onServerCreated === "function") {
|
|
220
|
-
reg.onServerCreated(server);
|
|
221
|
-
}
|
|
222
|
-
}
|
|
223
|
-
}
|
|
224
|
-
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
225
|
-
finally {
|
|
226
|
-
try {
|
|
227
|
-
if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
|
|
228
|
-
}
|
|
229
|
-
finally { if (e_1) throw e_1.error; }
|
|
230
|
-
}
|
|
231
|
-
// Bind PORT before index/migration work so Cloud Run's startup probe can
|
|
232
|
-
// succeed while `ensureSyncIndexes` still runs. whenReady() still waits.
|
|
233
|
-
if (!existingServer) {
|
|
234
|
-
server.listen(port_1, function () {
|
|
235
|
-
logger_1.logger.info("Listening on port ".concat(port_1));
|
|
236
|
-
});
|
|
237
|
-
}
|
|
238
|
-
else {
|
|
239
|
-
logger_1.logger.info("Listening on port ".concat(port_1));
|
|
240
|
-
}
|
|
241
|
-
return [4 /*yield*/, (0, registry_1.ensureSyncIndexes)()];
|
|
242
|
-
case 1:
|
|
243
|
-
_d.sent();
|
|
244
|
-
_d.label = 2;
|
|
245
|
-
case 2: return [4 /*yield*/, (0, runner_1.runStartupMigrations)({
|
|
246
|
-
migrations: this.options.migrations,
|
|
247
|
-
mongoose: mongoose_1.default,
|
|
248
|
-
})];
|
|
249
|
-
case 3:
|
|
250
|
-
_d.sent();
|
|
251
|
-
return [2 /*return*/];
|
|
252
|
-
}
|
|
253
|
-
});
|
|
254
|
-
}); };
|
|
144
|
+
constructor(options) {
|
|
255
145
|
this.options = options;
|
|
256
146
|
this.adminEvents.setMaxListeners(50);
|
|
257
147
|
}
|
|
@@ -275,35 +165,34 @@ var TerrenoApp = /** @class */ (function () {
|
|
|
275
165
|
* app.register(todoRouter).register(healthPlugin);
|
|
276
166
|
* ```
|
|
277
167
|
*/
|
|
278
|
-
|
|
168
|
+
register(registration) {
|
|
279
169
|
this.registrations.push(registration);
|
|
280
170
|
return this;
|
|
281
|
-
}
|
|
171
|
+
}
|
|
282
172
|
/**
|
|
283
173
|
* Returns registered model routers and plugins in mount order.
|
|
284
174
|
*/
|
|
285
|
-
|
|
175
|
+
getRegistrations() {
|
|
286
176
|
return this.registrations;
|
|
287
|
-
}
|
|
177
|
+
}
|
|
288
178
|
/**
|
|
289
179
|
* Returns only TerrenoPlugin registrations (excludes model routers).
|
|
290
180
|
*/
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
TerrenoApp.prototype.on = function (event, listener) {
|
|
181
|
+
getPlugins() {
|
|
182
|
+
return this.registrations.filter((registration) => !this.isModelRouterRegistration(registration));
|
|
183
|
+
}
|
|
184
|
+
on(event, listener) {
|
|
296
185
|
this.adminEvents.on(event, listener);
|
|
297
186
|
return this;
|
|
298
|
-
}
|
|
299
|
-
|
|
187
|
+
}
|
|
188
|
+
off(event, listener) {
|
|
300
189
|
this.adminEvents.off(event, listener);
|
|
301
190
|
return this;
|
|
302
|
-
}
|
|
191
|
+
}
|
|
303
192
|
/** @internal Emits scrubbed admin model change events from modelRouter hooks. */
|
|
304
|
-
|
|
193
|
+
emitAdminModelChanged(payload) {
|
|
305
194
|
this.adminEvents.emit("admin:model.changed", payload);
|
|
306
|
-
}
|
|
195
|
+
}
|
|
307
196
|
/**
|
|
308
197
|
* Add custom Express middleware to the application.
|
|
309
198
|
*
|
|
@@ -321,10 +210,10 @@ var TerrenoApp = /** @class */ (function () {
|
|
|
321
210
|
* });
|
|
322
211
|
* ```
|
|
323
212
|
*/
|
|
324
|
-
|
|
213
|
+
addMiddleware(fn) {
|
|
325
214
|
this.middlewareFns.push(fn);
|
|
326
215
|
return this;
|
|
327
|
-
}
|
|
216
|
+
}
|
|
328
217
|
/**
|
|
329
218
|
* Register a configuration model with the application.
|
|
330
219
|
*
|
|
@@ -347,10 +236,10 @@ var TerrenoApp = /** @class */ (function () {
|
|
|
347
236
|
* .start();
|
|
348
237
|
* ```
|
|
349
238
|
*/
|
|
350
|
-
|
|
351
|
-
this.configurationApp = new configurationApp_1.ConfigurationApp(
|
|
239
|
+
configure(model, options) {
|
|
240
|
+
this.configurationApp = new configurationApp_1.ConfigurationApp({ model, ...options });
|
|
352
241
|
return this;
|
|
353
|
-
}
|
|
242
|
+
}
|
|
354
243
|
/**
|
|
355
244
|
* Build the Express application without starting the server.
|
|
356
245
|
*
|
|
@@ -375,87 +264,75 @@ var TerrenoApp = /** @class */ (function () {
|
|
|
375
264
|
* await request(app).get("/todos").expect(200);
|
|
376
265
|
* ```
|
|
377
266
|
*/
|
|
378
|
-
|
|
379
|
-
var e_2, _a, e_3, _b;
|
|
380
|
-
var _this = this;
|
|
381
|
-
var _c, _d, _e, _f, _g, _h;
|
|
267
|
+
build() {
|
|
382
268
|
(0, logger_1.setupLogging)(this.options.loggingOptions);
|
|
383
|
-
|
|
384
|
-
|
|
269
|
+
const app = (0, express_1.default)();
|
|
270
|
+
const options = this.options;
|
|
385
271
|
// Record mount paths on layers for Express 5 → OpenAPI compat
|
|
386
272
|
(0, openApiCompat_1.patchAppUse)(app);
|
|
387
|
-
app.set("query parser",
|
|
273
|
+
app.set("query parser", (str) => qs_1.default.parse(str, { arrayLimit: options.arrayLimit ?? 200 }));
|
|
388
274
|
app.use(requestContext_1.requestContextMiddleware);
|
|
389
|
-
app.use((0, cors_1.default)({ credentials: true, origin:
|
|
275
|
+
app.use((0, cors_1.default)({ credentials: true, origin: options.corsOrigin ?? "*" }));
|
|
390
276
|
if (options.beforeJsonSetup) {
|
|
391
277
|
options.beforeJsonSetup(app);
|
|
392
278
|
}
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
// express.RequestHandler (req, res, next)
|
|
399
|
-
app.use(fn);
|
|
400
|
-
}
|
|
401
|
-
else {
|
|
402
|
-
// Function that receives the app
|
|
403
|
-
fn(app);
|
|
404
|
-
}
|
|
279
|
+
// Apply custom middleware before JSON parsing
|
|
280
|
+
for (const fn of this.middlewareFns) {
|
|
281
|
+
if (fn.length <= 3) {
|
|
282
|
+
// express.RequestHandler (req, res, next)
|
|
283
|
+
app.use(fn);
|
|
405
284
|
}
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
try {
|
|
410
|
-
if (_k && !_k.done && (_a = _j.return)) _a.call(_j);
|
|
285
|
+
else {
|
|
286
|
+
// Function that receives the app
|
|
287
|
+
fn(app);
|
|
411
288
|
}
|
|
412
|
-
finally { if (e_2) throw e_2.error; }
|
|
413
289
|
}
|
|
414
290
|
app.use(express_1.default.json(rawBody_1.jsonBodyParserOptions));
|
|
415
291
|
app.use(express_1.default.urlencoded(rawBody_1.urlencodedBodyParserOptions));
|
|
416
292
|
// JWT decode before rate limiting so authenticated keys use userId.
|
|
417
293
|
// Auth routes mount after the limiter so login is in the auth bucket.
|
|
418
294
|
(0, auth_1.setupAuth)(app, options.userModel);
|
|
419
|
-
app.use(
|
|
295
|
+
app.use((req, res, next) => {
|
|
420
296
|
(0, requestContext_1.updateRequestContextFromRequest)(req, res);
|
|
421
297
|
next();
|
|
422
298
|
});
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
if (betterAuthForLimiter === null || betterAuthForLimiter === void 0 ? void 0 : betterAuthForLimiter.ensureAuth) {
|
|
428
|
-
var auth = betterAuthForLimiter.ensureAuth();
|
|
299
|
+
const betterAuthForLimiter = this.registrations.find((registration) => "getAuth" in registration &&
|
|
300
|
+
typeof registration.getAuth === "function");
|
|
301
|
+
if (betterAuthForLimiter?.ensureAuth) {
|
|
302
|
+
const auth = betterAuthForLimiter.ensureAuth();
|
|
429
303
|
app.use((0, betterAuthSetup_1.createBetterAuthSessionMiddleware)(auth, options.userModel));
|
|
430
|
-
|
|
304
|
+
betterAuthForLimiter.markSessionMiddlewareMounted?.();
|
|
431
305
|
}
|
|
432
306
|
if (options.rateLimit) {
|
|
433
|
-
|
|
434
|
-
|
|
307
|
+
const betterAuthBasePath = options.rateLimit.betterAuthBasePath ?? betterAuthForLimiter?.getBetterAuthBasePath?.();
|
|
308
|
+
const rateLimit = {
|
|
309
|
+
...options.rateLimit,
|
|
310
|
+
...(betterAuthBasePath ? { betterAuthBasePath } : {}),
|
|
311
|
+
};
|
|
435
312
|
(0, applyTrustProxy_1.applyRateLimitTrustProxy)(app, rateLimit);
|
|
436
|
-
|
|
313
|
+
const store = (0, createStore_1.createRateLimitStore)(rateLimit);
|
|
437
314
|
app.use((0, middleware_2.createRateLimitMiddleware)(store, rateLimit));
|
|
438
315
|
}
|
|
316
|
+
(0, browserLogsRoute_1.addTerrenoDevBrowserLogsRoute)(app);
|
|
439
317
|
if (!options.authOptions) {
|
|
440
318
|
options.authOptions = {};
|
|
441
319
|
}
|
|
442
|
-
|
|
320
|
+
const authOptions = options.authOptions;
|
|
443
321
|
(0, auth_1.addAuthRoutes)(app, options.userModel, authOptions);
|
|
444
322
|
if (options.logRequests !== false) {
|
|
445
323
|
app.use(expressServer_1.logRequests);
|
|
446
324
|
}
|
|
447
325
|
// Store logging options on the response locals
|
|
448
|
-
app.use(
|
|
326
|
+
app.use((_req, res, next) => {
|
|
449
327
|
res.locals.loggingOptions = options.loggingOptions;
|
|
450
328
|
next();
|
|
451
329
|
});
|
|
452
330
|
// Sentry scopes
|
|
453
|
-
app.use(
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
if (context === null || context === void 0 ? void 0 : context.requestId) {
|
|
331
|
+
app.use((req, _res, next) => {
|
|
332
|
+
const context = (0, requestContext_1.getCurrentRequestContext)();
|
|
333
|
+
const transactionId = req.header("X-Transaction-ID");
|
|
334
|
+
const sessionId = context?.sessionId ?? req.header("X-Session-ID");
|
|
335
|
+
if (context?.requestId) {
|
|
459
336
|
Sentry.getCurrentScope().setTag("request_id", context.requestId);
|
|
460
337
|
}
|
|
461
338
|
if (transactionId) {
|
|
@@ -464,7 +341,7 @@ var TerrenoApp = /** @class */ (function () {
|
|
|
464
341
|
if (sessionId) {
|
|
465
342
|
Sentry.getCurrentScope().setTag("session_id", sessionId);
|
|
466
343
|
}
|
|
467
|
-
if (
|
|
344
|
+
if (req.user?._id) {
|
|
468
345
|
Sentry.getCurrentScope().setTag("user", String(req.user._id));
|
|
469
346
|
}
|
|
470
347
|
next();
|
|
@@ -473,7 +350,7 @@ var TerrenoApp = /** @class */ (function () {
|
|
|
473
350
|
app.use(openApiCompat_1.openApiCompatMiddleware);
|
|
474
351
|
app.use(openApiEtag_1.openApiEtagMiddleware);
|
|
475
352
|
app.use(middleware_1.jsonResponseRequestIdMiddleware);
|
|
476
|
-
|
|
353
|
+
const oapi = (0, index_1.default)({
|
|
477
354
|
info: {
|
|
478
355
|
description: "Generated docs from an Express api",
|
|
479
356
|
title: "Express Application",
|
|
@@ -494,50 +371,31 @@ var TerrenoApp = /** @class */ (function () {
|
|
|
494
371
|
if (this.configurationApp) {
|
|
495
372
|
this.configurationApp.register(app);
|
|
496
373
|
}
|
|
497
|
-
|
|
498
|
-
|
|
499
|
-
|
|
500
|
-
|
|
501
|
-
|
|
502
|
-
|
|
503
|
-
|
|
504
|
-
|
|
505
|
-
|
|
506
|
-
|
|
507
|
-
});
|
|
508
|
-
app.use(registration.path, router);
|
|
509
|
-
}
|
|
510
|
-
else {
|
|
511
|
-
registration.register(app, oapi, this);
|
|
512
|
-
}
|
|
374
|
+
// Mount registered model routers and plugins
|
|
375
|
+
for (const registration of this.registrations) {
|
|
376
|
+
if (this.isModelRouterRegistration(registration)) {
|
|
377
|
+
const router = registration._buildWithContext({
|
|
378
|
+
accessControl: options.accessControl,
|
|
379
|
+
openApi: oapi,
|
|
380
|
+
routePath: registration.path,
|
|
381
|
+
terrenoApp: this,
|
|
382
|
+
});
|
|
383
|
+
app.use(registration.path, router);
|
|
513
384
|
}
|
|
514
|
-
|
|
515
|
-
|
|
516
|
-
finally {
|
|
517
|
-
try {
|
|
518
|
-
if (_m && !_m.done && (_b = _l.return)) _b.call(_l);
|
|
385
|
+
else {
|
|
386
|
+
registration.register(app, oapi, this);
|
|
519
387
|
}
|
|
520
|
-
finally { if (e_3) throw e_3.error; }
|
|
521
388
|
}
|
|
522
389
|
// Mount MCP at POST /mcp when any model opted in or a custom tool was registered.
|
|
523
|
-
|
|
524
|
-
|
|
525
|
-
|
|
526
|
-
});
|
|
527
|
-
var betterAuth = (_h = (_g = betterAuthPlugin === null || betterAuthPlugin === void 0 ? void 0 : betterAuthPlugin.ensureAuth) === null || _g === void 0 ? void 0 : _g.call(betterAuthPlugin)) !== null && _h !== void 0 ? _h : betterAuthPlugin === null || betterAuthPlugin === void 0 ? void 0 : betterAuthPlugin.getAuth();
|
|
390
|
+
const betterAuthPlugin = this.registrations.find((registration) => "getAuth" in registration &&
|
|
391
|
+
typeof registration.getAuth === "function");
|
|
392
|
+
const betterAuth = betterAuthPlugin?.ensureAuth?.() ?? betterAuthPlugin?.getAuth();
|
|
528
393
|
if (betterAuth) {
|
|
529
|
-
authOptions.syncPasswordResetToBetterAuth =
|
|
530
|
-
|
|
531
|
-
|
|
532
|
-
case 0: return [4 /*yield*/, (0, betterAuthSetup_1.applyJwtPasswordResetToBetterAuth)(betterAuth, user, password)];
|
|
533
|
-
case 1:
|
|
534
|
-
_a.sent();
|
|
535
|
-
return [2 /*return*/];
|
|
536
|
-
}
|
|
537
|
-
});
|
|
538
|
-
}); };
|
|
394
|
+
authOptions.syncPasswordResetToBetterAuth = async (user, password) => {
|
|
395
|
+
await (0, betterAuthSetup_1.applyJwtPasswordResetToBetterAuth)(betterAuth, user, password);
|
|
396
|
+
};
|
|
539
397
|
}
|
|
540
|
-
|
|
398
|
+
const mcpServiceTokens = (0, serviceTokens_1.resolveMcpServiceTokensOption)(options.mcpServiceTokens);
|
|
541
399
|
if (mcpServiceTokens.enabled) {
|
|
542
400
|
(0, serviceTokens_1.addMcpServiceTokenRoutes)(app, {
|
|
543
401
|
openApi: oapi,
|
|
@@ -545,7 +403,7 @@ var TerrenoApp = /** @class */ (function () {
|
|
|
545
403
|
});
|
|
546
404
|
}
|
|
547
405
|
(0, server_1.mountMCPServer)(app, {
|
|
548
|
-
betterAuth
|
|
406
|
+
betterAuth,
|
|
549
407
|
mcpServiceTokens: mcpServiceTokens.enabled,
|
|
550
408
|
userModel: options.userModel,
|
|
551
409
|
});
|
|
@@ -561,7 +419,7 @@ var TerrenoApp = /** @class */ (function () {
|
|
|
561
419
|
app.use(errors_1.apiErrorMiddleware);
|
|
562
420
|
app.use(errors_1.apiFallthroughErrorMiddleware);
|
|
563
421
|
return app;
|
|
564
|
-
}
|
|
422
|
+
}
|
|
565
423
|
/**
|
|
566
424
|
* Build the Express application and start listening on the configured port.
|
|
567
425
|
*
|
|
@@ -582,9 +440,7 @@ var TerrenoApp = /** @class */ (function () {
|
|
|
582
440
|
* .start();
|
|
583
441
|
* ```
|
|
584
442
|
*/
|
|
585
|
-
|
|
586
|
-
var _this = this;
|
|
587
|
-
var _a;
|
|
443
|
+
start() {
|
|
588
444
|
if (this.options.organizations) {
|
|
589
445
|
if (!this.options.accessControl) {
|
|
590
446
|
throw new errors_1.APIError({
|
|
@@ -592,48 +448,82 @@ var TerrenoApp = /** @class */ (function () {
|
|
|
592
448
|
title: "TerrenoApp organizations requires accessControl from createAccess({ organizations: true })",
|
|
593
449
|
});
|
|
594
450
|
}
|
|
595
|
-
|
|
596
|
-
return !_this.isModelRouterRegistration(registration) && registration instanceof orgsApp_1.OrgsApp;
|
|
597
|
-
});
|
|
451
|
+
const hasOrgsPlugin = this.registrations.some((registration) => !this.isModelRouterRegistration(registration) && registration instanceof orgsApp_1.OrgsApp);
|
|
598
452
|
if (!hasOrgsPlugin) {
|
|
599
|
-
|
|
600
|
-
this.register(new orgsApp_1.OrgsApp(
|
|
453
|
+
const orgConfig = typeof this.options.organizations === "object" ? this.options.organizations : {};
|
|
454
|
+
this.register(new orgsApp_1.OrgsApp({
|
|
455
|
+
...orgConfig,
|
|
456
|
+
access: this.options.accessControl,
|
|
457
|
+
userModel: this.options.userModel,
|
|
458
|
+
}));
|
|
601
459
|
}
|
|
602
460
|
}
|
|
603
461
|
// If realtime option is set, auto-register the RealtimeApp plugin
|
|
604
462
|
if (this.options.realtime) {
|
|
605
|
-
|
|
463
|
+
const hasRealtimePlugin = this.registrations.some((r) => !this.isModelRouterRegistration(r) && r instanceof realtimeApp_1.RealtimeApp);
|
|
606
464
|
if (!hasRealtimePlugin) {
|
|
607
|
-
|
|
608
|
-
this.register(new realtimeApp_1.RealtimeApp(
|
|
465
|
+
const realtimeConfig = typeof this.options.realtime === "object" ? this.options.realtime : {};
|
|
466
|
+
this.register(new realtimeApp_1.RealtimeApp({
|
|
467
|
+
...realtimeConfig,
|
|
609
468
|
// Task 9.21 (D2): default the socket full-user load to this app's own user
|
|
610
469
|
// model. Without it socket authorization falls back to the synthetic
|
|
611
470
|
// JWT-claim user, which trusts the token's `admin` over the database and
|
|
612
471
|
// carries no membership fields for tenant-scoped sync.
|
|
613
|
-
userModel:
|
|
472
|
+
userModel: realtimeConfig.userModel ?? this.options.userModel,
|
|
473
|
+
}));
|
|
614
474
|
}
|
|
615
475
|
}
|
|
616
|
-
|
|
476
|
+
const app = this.build();
|
|
617
477
|
this.bootPromise = this.completeStart(app);
|
|
618
478
|
if (!this.options.skipListen) {
|
|
619
|
-
void this.bootPromise.catch(
|
|
620
|
-
|
|
621
|
-
logger_1.logger.error(
|
|
479
|
+
void this.bootPromise.catch((error) => {
|
|
480
|
+
const stack = error instanceof Error ? error.stack : String(error);
|
|
481
|
+
logger_1.logger.error(`Error trying to start HTTP server: ${error}\n${stack}`);
|
|
622
482
|
process.exit(1);
|
|
623
483
|
});
|
|
624
484
|
}
|
|
625
485
|
return app;
|
|
626
|
-
}
|
|
486
|
+
}
|
|
627
487
|
/**
|
|
628
488
|
* Resolves after startup migrations (and listen, unless `skipListen`).
|
|
629
489
|
* Tests with `skipListen` should await this instead of assuming `start()` is idle.
|
|
630
490
|
*/
|
|
631
|
-
|
|
491
|
+
whenReady() {
|
|
632
492
|
return this.bootPromise;
|
|
493
|
+
}
|
|
494
|
+
completeStart = async (app) => {
|
|
495
|
+
if (!this.options.skipListen) {
|
|
496
|
+
const port = process.env.PORT || "9000";
|
|
497
|
+
const existingServer = this.options.httpServer;
|
|
498
|
+
const server = existingServer ?? (0, node_http_1.createServer)(app);
|
|
499
|
+
if (existingServer) {
|
|
500
|
+
existingServer.removeAllListeners("request");
|
|
501
|
+
existingServer.on("request", app);
|
|
502
|
+
}
|
|
503
|
+
for (const reg of this.registrations) {
|
|
504
|
+
if (!this.isModelRouterRegistration(reg) && typeof reg.onServerCreated === "function") {
|
|
505
|
+
reg.onServerCreated(server);
|
|
506
|
+
}
|
|
507
|
+
}
|
|
508
|
+
// Bind PORT before index/migration work so Cloud Run's startup probe can
|
|
509
|
+
// succeed while `ensureSyncIndexes` still runs. whenReady() still waits.
|
|
510
|
+
if (!existingServer) {
|
|
511
|
+
server.listen(port, () => {
|
|
512
|
+
logger_1.logger.info(`Listening on port ${port}`);
|
|
513
|
+
});
|
|
514
|
+
}
|
|
515
|
+
else {
|
|
516
|
+
logger_1.logger.info(`Listening on port ${port}`);
|
|
517
|
+
}
|
|
518
|
+
await (0, registry_1.ensureSyncIndexes)();
|
|
519
|
+
}
|
|
520
|
+
await (0, runner_1.runStartupMigrations)({
|
|
521
|
+
migrations: this.options.migrations,
|
|
522
|
+
mongoose: mongoose_1.default,
|
|
523
|
+
});
|
|
633
524
|
};
|
|
634
|
-
|
|
525
|
+
isModelRouterRegistration(registration) {
|
|
635
526
|
return registration.__type === "modelRouter";
|
|
636
|
-
}
|
|
637
|
-
|
|
638
|
-
}());
|
|
527
|
+
}
|
|
528
|
+
}
|
|
639
529
|
exports.TerrenoApp = TerrenoApp;
|