@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.
- 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 +598 -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/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/scriptRunner.js
CHANGED
|
@@ -1,30 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __extends = (this && this.__extends) || (function () {
|
|
3
|
-
var extendStatics = function (d, b) {
|
|
4
|
-
extendStatics = Object.setPrototypeOf ||
|
|
5
|
-
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
|
|
6
|
-
function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
|
|
7
|
-
return extendStatics(d, b);
|
|
8
|
-
};
|
|
9
|
-
return function (d, b) {
|
|
10
|
-
if (typeof b !== "function" && b !== null)
|
|
11
|
-
throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
|
|
12
|
-
extendStatics(d, b);
|
|
13
|
-
function __() { this.constructor = d; }
|
|
14
|
-
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
|
|
15
|
-
};
|
|
16
|
-
})();
|
|
17
|
-
var __assign = (this && this.__assign) || function () {
|
|
18
|
-
__assign = Object.assign || function(t) {
|
|
19
|
-
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
20
|
-
s = arguments[i];
|
|
21
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
22
|
-
t[p] = s[p];
|
|
23
|
-
}
|
|
24
|
-
return t;
|
|
25
|
-
};
|
|
26
|
-
return __assign.apply(this, arguments);
|
|
27
|
-
};
|
|
28
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
29
3
|
if (k2 === undefined) k2 = k;
|
|
30
4
|
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
@@ -58,107 +32,35 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
58
32
|
return result;
|
|
59
33
|
};
|
|
60
34
|
})();
|
|
61
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
62
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
63
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
64
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
65
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
66
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
67
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
68
|
-
});
|
|
69
|
-
};
|
|
70
|
-
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
71
|
-
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);
|
|
72
|
-
return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
73
|
-
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
74
|
-
function step(op) {
|
|
75
|
-
if (f) throw new TypeError("Generator is already executing.");
|
|
76
|
-
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
77
|
-
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;
|
|
78
|
-
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
79
|
-
switch (op[0]) {
|
|
80
|
-
case 0: case 1: t = op; break;
|
|
81
|
-
case 4: _.label++; return { value: op[1], done: false };
|
|
82
|
-
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
83
|
-
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
84
|
-
default:
|
|
85
|
-
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
86
|
-
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
87
|
-
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
88
|
-
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
89
|
-
if (t[2]) _.ops.pop();
|
|
90
|
-
_.trys.pop(); continue;
|
|
91
|
-
}
|
|
92
|
-
op = body.call(thisArg, _);
|
|
93
|
-
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
94
|
-
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
95
|
-
}
|
|
96
|
-
};
|
|
97
|
-
var __values = (this && this.__values) || function(o) {
|
|
98
|
-
var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
|
|
99
|
-
if (m) return m.call(o);
|
|
100
|
-
if (o && typeof o.length === "number") return {
|
|
101
|
-
next: function () {
|
|
102
|
-
if (o && i >= o.length) o = void 0;
|
|
103
|
-
return { value: o && o[i++], done: !o };
|
|
104
|
-
}
|
|
105
|
-
};
|
|
106
|
-
throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
|
|
107
|
-
};
|
|
108
|
-
var __read = (this && this.__read) || function (o, n) {
|
|
109
|
-
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
110
|
-
if (!m) return o;
|
|
111
|
-
var i = m.call(o), r, ar = [], e;
|
|
112
|
-
try {
|
|
113
|
-
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
114
|
-
}
|
|
115
|
-
catch (error) { e = { error: error }; }
|
|
116
|
-
finally {
|
|
117
|
-
try {
|
|
118
|
-
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
119
|
-
}
|
|
120
|
-
finally { if (e) throw e.error; }
|
|
121
|
-
}
|
|
122
|
-
return ar;
|
|
123
|
-
};
|
|
124
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
125
|
-
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
126
|
-
if (ar || !(i in from)) {
|
|
127
|
-
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
128
|
-
ar[i] = from[i];
|
|
129
|
-
}
|
|
130
|
-
}
|
|
131
|
-
return to.concat(ar || Array.prototype.slice.call(from));
|
|
132
|
-
};
|
|
133
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
134
36
|
exports.BackgroundTask = exports.TaskCancelledError = exports.parseScriptArgs = exports.createScriptArgs = void 0;
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
37
|
+
const luxon_1 = require("luxon");
|
|
38
|
+
const mongoose_1 = __importStar(require("mongoose"));
|
|
39
|
+
const plugins_1 = require("./plugins");
|
|
40
|
+
const coerceArgValue = (value, type) => {
|
|
139
41
|
if (type === "number") {
|
|
140
|
-
|
|
42
|
+
const num = typeof value === "number" ? value : Number(Array.isArray(value) ? value[0] : value);
|
|
141
43
|
if (Number.isNaN(num)) {
|
|
142
|
-
return { error:
|
|
44
|
+
return { error: `expected a number but received "${String(value)}"`, value };
|
|
143
45
|
}
|
|
144
46
|
return { value: num };
|
|
145
47
|
}
|
|
146
48
|
if (type === "boolean") {
|
|
147
49
|
if (typeof value === "boolean") {
|
|
148
|
-
return { value
|
|
50
|
+
return { value };
|
|
149
51
|
}
|
|
150
|
-
|
|
52
|
+
const normalized = String(Array.isArray(value) ? value[0] : value).toLowerCase();
|
|
151
53
|
if (["true", "1", "yes", "on"].includes(normalized)) {
|
|
152
54
|
return { value: true };
|
|
153
55
|
}
|
|
154
56
|
if (["false", "0", "no", "off"].includes(normalized)) {
|
|
155
57
|
return { value: false };
|
|
156
58
|
}
|
|
157
|
-
return { error:
|
|
59
|
+
return { error: `expected a boolean but received "${String(value)}"`, value };
|
|
158
60
|
}
|
|
159
|
-
return { value
|
|
61
|
+
return { value };
|
|
160
62
|
};
|
|
161
|
-
|
|
63
|
+
const toStringValue = (value) => {
|
|
162
64
|
if (value === undefined) {
|
|
163
65
|
return undefined;
|
|
164
66
|
}
|
|
@@ -172,63 +74,49 @@ var toStringValue = function (value) {
|
|
|
172
74
|
* Applies declared defaults, coerces declared types, and validates required args.
|
|
173
75
|
* Returns the accessor plus any validation errors (callers decide how to surface them).
|
|
174
76
|
*/
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
var def = defs_1_1.value;
|
|
183
|
-
if (raw[def.name] === undefined) {
|
|
184
|
-
if (def.default !== undefined) {
|
|
185
|
-
raw[def.name] = def.default;
|
|
186
|
-
}
|
|
187
|
-
else if (def.required) {
|
|
188
|
-
errors.push("Missing required argument: --".concat(def.name, " (").concat(def.description, ")"));
|
|
189
|
-
}
|
|
190
|
-
continue;
|
|
77
|
+
const createScriptArgs = ({ values, positional = [], defs = [], }) => {
|
|
78
|
+
const errors = [];
|
|
79
|
+
const raw = { ...values };
|
|
80
|
+
for (const def of defs) {
|
|
81
|
+
if (raw[def.name] === undefined) {
|
|
82
|
+
if (def.default !== undefined) {
|
|
83
|
+
raw[def.name] = def.default;
|
|
191
84
|
}
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
errors.push("Invalid argument --".concat(def.name, ": ").concat(coerced.error));
|
|
195
|
-
continue;
|
|
85
|
+
else if (def.required) {
|
|
86
|
+
errors.push(`Missing required argument: --${def.name} (${def.description})`);
|
|
196
87
|
}
|
|
197
|
-
|
|
88
|
+
continue;
|
|
198
89
|
}
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
if (defs_1_1 && !defs_1_1.done && (_b = defs_1.return)) _b.call(defs_1);
|
|
90
|
+
const coerced = coerceArgValue(raw[def.name], def.type);
|
|
91
|
+
if (coerced.error) {
|
|
92
|
+
errors.push(`Invalid argument --${def.name}: ${coerced.error}`);
|
|
93
|
+
continue;
|
|
204
94
|
}
|
|
205
|
-
|
|
95
|
+
raw[def.name] = coerced.value;
|
|
206
96
|
}
|
|
207
|
-
|
|
208
|
-
getBoolean:
|
|
209
|
-
|
|
210
|
-
if (fallback === void 0) { fallback = false; }
|
|
211
|
-
var value = raw[name];
|
|
97
|
+
const args = {
|
|
98
|
+
getBoolean: (name, fallback = false) => {
|
|
99
|
+
const value = raw[name];
|
|
212
100
|
if (value === undefined) {
|
|
213
101
|
return fallback;
|
|
214
102
|
}
|
|
215
103
|
if (typeof value === "boolean") {
|
|
216
104
|
return value;
|
|
217
105
|
}
|
|
218
|
-
|
|
106
|
+
const normalized = toStringValue(value)?.toLowerCase();
|
|
219
107
|
return normalized !== undefined && ["true", "1", "yes", "on"].includes(normalized);
|
|
220
108
|
},
|
|
221
|
-
getNumber:
|
|
222
|
-
|
|
109
|
+
getNumber: (name, fallback) => {
|
|
110
|
+
const value = raw[name];
|
|
223
111
|
if (value === undefined) {
|
|
224
112
|
return fallback;
|
|
225
113
|
}
|
|
226
|
-
|
|
114
|
+
const num = typeof value === "number" ? value : Number(toStringValue(value));
|
|
227
115
|
return Number.isNaN(num) ? fallback : num;
|
|
228
116
|
},
|
|
229
|
-
getString:
|
|
230
|
-
getStringArray:
|
|
231
|
-
|
|
117
|
+
getString: (name, fallback) => toStringValue(raw[name]) ?? fallback,
|
|
118
|
+
getStringArray: (name) => {
|
|
119
|
+
const value = raw[name];
|
|
232
120
|
if (value === undefined) {
|
|
233
121
|
return [];
|
|
234
122
|
}
|
|
@@ -237,11 +125,11 @@ var createScriptArgs = function (_a) {
|
|
|
237
125
|
}
|
|
238
126
|
return [String(value)];
|
|
239
127
|
},
|
|
240
|
-
has:
|
|
241
|
-
positional
|
|
242
|
-
raw
|
|
128
|
+
has: (name) => raw[name] !== undefined,
|
|
129
|
+
positional,
|
|
130
|
+
raw,
|
|
243
131
|
};
|
|
244
|
-
return { args
|
|
132
|
+
return { args, errors };
|
|
245
133
|
};
|
|
246
134
|
exports.createScriptArgs = createScriptArgs;
|
|
247
135
|
/**
|
|
@@ -257,74 +145,50 @@ exports.createScriptArgs = createScriptArgs;
|
|
|
257
145
|
* When {@link ScriptArgDef declarations} are supplied, values are coerced to the
|
|
258
146
|
* declared type, defaults are applied, and required args are validated.
|
|
259
147
|
*/
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
for (var defs_2 = __values(defs), defs_2_1 = defs_2.next(); !defs_2_1.done; defs_2_1 = defs_2.next()) {
|
|
268
|
-
var def = defs_2_1.value;
|
|
269
|
-
defByName.set(def.name, def);
|
|
270
|
-
try {
|
|
271
|
-
for (var _f = (e_3 = void 0, __values((_c = def.aliases) !== null && _c !== void 0 ? _c : [])), _g = _f.next(); !_g.done; _g = _f.next()) {
|
|
272
|
-
var alias = _g.value;
|
|
273
|
-
aliasToName.set(alias, def.name);
|
|
274
|
-
}
|
|
275
|
-
}
|
|
276
|
-
catch (e_3_1) { e_3 = { error: e_3_1 }; }
|
|
277
|
-
finally {
|
|
278
|
-
try {
|
|
279
|
-
if (_g && !_g.done && (_b = _f.return)) _b.call(_f);
|
|
280
|
-
}
|
|
281
|
-
finally { if (e_3) throw e_3.error; }
|
|
282
|
-
}
|
|
283
|
-
}
|
|
284
|
-
}
|
|
285
|
-
catch (e_2_1) { e_2 = { error: e_2_1 }; }
|
|
286
|
-
finally {
|
|
287
|
-
try {
|
|
288
|
-
if (defs_2_1 && !defs_2_1.done && (_a = defs_2.return)) _a.call(defs_2);
|
|
148
|
+
const parseScriptArgs = (tokens, defs = []) => {
|
|
149
|
+
const aliasToName = new Map();
|
|
150
|
+
const defByName = new Map();
|
|
151
|
+
for (const def of defs) {
|
|
152
|
+
defByName.set(def.name, def);
|
|
153
|
+
for (const alias of def.aliases ?? []) {
|
|
154
|
+
aliasToName.set(alias, def.name);
|
|
289
155
|
}
|
|
290
|
-
finally { if (e_2) throw e_2.error; }
|
|
291
156
|
}
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
var existing = values[name];
|
|
157
|
+
const values = {};
|
|
158
|
+
const positional = [];
|
|
159
|
+
const missingValueErrors = [];
|
|
160
|
+
const assign = (key, value) => {
|
|
161
|
+
const name = aliasToName.get(key) ?? key;
|
|
162
|
+
const existing = values[name];
|
|
299
163
|
if (existing === undefined) {
|
|
300
164
|
values[name] = value;
|
|
301
165
|
return;
|
|
302
166
|
}
|
|
303
167
|
// Repeated flag: collapse into an array of strings.
|
|
304
|
-
|
|
305
|
-
values[name] =
|
|
168
|
+
const asArray = Array.isArray(existing) ? existing : [String(existing)];
|
|
169
|
+
values[name] = [...asArray, String(value)];
|
|
306
170
|
};
|
|
307
|
-
for (
|
|
308
|
-
|
|
171
|
+
for (let i = 0; i < tokens.length; i++) {
|
|
172
|
+
const token = tokens[i];
|
|
309
173
|
if (!token.startsWith("-") || token === "-") {
|
|
310
174
|
positional.push(token);
|
|
311
175
|
continue;
|
|
312
176
|
}
|
|
313
|
-
|
|
177
|
+
const flag = token.replace(/^-+/, "");
|
|
314
178
|
if (flag.startsWith("no-") && !flag.includes("=")) {
|
|
315
179
|
assign(flag.slice(3), false);
|
|
316
180
|
continue;
|
|
317
181
|
}
|
|
318
|
-
|
|
182
|
+
const eqIndex = flag.indexOf("=");
|
|
319
183
|
if (eqIndex !== -1) {
|
|
320
184
|
assign(flag.slice(0, eqIndex), flag.slice(eqIndex + 1));
|
|
321
185
|
continue;
|
|
322
186
|
}
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
if (
|
|
187
|
+
const canonical = aliasToName.get(flag) ?? flag;
|
|
188
|
+
const def = defByName.get(canonical);
|
|
189
|
+
const next = tokens[i + 1];
|
|
190
|
+
const nextIsValue = next !== undefined && (next === "-" || !next.startsWith("-"));
|
|
191
|
+
if (def?.type === "boolean") {
|
|
328
192
|
assign(flag, true);
|
|
329
193
|
continue;
|
|
330
194
|
}
|
|
@@ -332,7 +196,7 @@ var parseScriptArgs = function (tokens, defs) {
|
|
|
332
196
|
// A declared string/number flag was given without a value. Record an error
|
|
333
197
|
// instead of silently storing `true` (which would coerce to 1 / "true").
|
|
334
198
|
if (def) {
|
|
335
|
-
missingValueErrors.push(
|
|
199
|
+
missingValueErrors.push(`Argument --${canonical} expects a ${def.type ?? "string"} value`);
|
|
336
200
|
continue;
|
|
337
201
|
}
|
|
338
202
|
assign(flag, true);
|
|
@@ -341,26 +205,23 @@ var parseScriptArgs = function (tokens, defs) {
|
|
|
341
205
|
assign(flag, next);
|
|
342
206
|
i++;
|
|
343
207
|
}
|
|
344
|
-
|
|
345
|
-
return { args
|
|
208
|
+
const { args, errors } = (0, exports.createScriptArgs)({ defs, positional, values });
|
|
209
|
+
return { args, errors: [...missingValueErrors, ...errors] };
|
|
346
210
|
};
|
|
347
211
|
exports.parseScriptArgs = parseScriptArgs;
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
_this.name = "TaskCancelledError";
|
|
353
|
-
return _this;
|
|
212
|
+
class TaskCancelledError extends Error {
|
|
213
|
+
constructor(taskId) {
|
|
214
|
+
super(`Task ${taskId} was cancelled`);
|
|
215
|
+
this.name = "TaskCancelledError";
|
|
354
216
|
}
|
|
355
|
-
|
|
356
|
-
}(Error));
|
|
217
|
+
}
|
|
357
218
|
exports.TaskCancelledError = TaskCancelledError;
|
|
358
|
-
|
|
219
|
+
const progressSchema = new mongoose_1.Schema({
|
|
359
220
|
message: { description: "Human-readable progress message", type: String },
|
|
360
221
|
percentage: { description: "Progress percentage from 0 to 100", max: 100, min: 0, type: Number },
|
|
361
222
|
stage: { description: "Current stage of the task", type: String },
|
|
362
223
|
}, { _id: false, strict: "throw" });
|
|
363
|
-
|
|
224
|
+
const logSchema = new mongoose_1.Schema({
|
|
364
225
|
level: {
|
|
365
226
|
description: "Log level",
|
|
366
227
|
enum: ["info", "warn", "error"],
|
|
@@ -370,7 +231,7 @@ var logSchema = new mongoose_1.Schema({
|
|
|
370
231
|
message: { description: "Log message", required: true, type: String },
|
|
371
232
|
timestamp: { description: "When this log entry was created", required: true, type: Date },
|
|
372
233
|
}, { _id: false, strict: "throw" });
|
|
373
|
-
|
|
234
|
+
const backgroundTaskSchema = new mongoose_1.Schema({
|
|
374
235
|
completedAt: {
|
|
375
236
|
description: "When the task completed (success or failure)",
|
|
376
237
|
type: Date,
|
|
@@ -419,63 +280,32 @@ var backgroundTaskSchema = new mongoose_1.Schema({
|
|
|
419
280
|
},
|
|
420
281
|
}, { strict: "throw", toJSON: { virtuals: true }, toObject: { virtuals: true } });
|
|
421
282
|
backgroundTaskSchema.methods = {
|
|
422
|
-
addLog
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
this.logs.push({
|
|
431
|
-
level: level,
|
|
432
|
-
message: message,
|
|
433
|
-
timestamp: luxon_1.DateTime.now().toJSDate(),
|
|
434
|
-
});
|
|
435
|
-
return [4 /*yield*/, this.save()];
|
|
436
|
-
case 1:
|
|
437
|
-
_a.sent();
|
|
438
|
-
return [2 /*return*/];
|
|
439
|
-
}
|
|
440
|
-
});
|
|
283
|
+
async addLog(level, message) {
|
|
284
|
+
if (!this.logs) {
|
|
285
|
+
this.logs = [];
|
|
286
|
+
}
|
|
287
|
+
this.logs.push({
|
|
288
|
+
level,
|
|
289
|
+
message,
|
|
290
|
+
timestamp: luxon_1.DateTime.now().toJSDate(),
|
|
441
291
|
});
|
|
292
|
+
await this.save();
|
|
442
293
|
},
|
|
443
|
-
updateProgress
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
message: message !== null && message !== void 0 ? message : (_a = this.progress) === null || _a === void 0 ? void 0 : _a.message,
|
|
451
|
-
percentage: percentage,
|
|
452
|
-
stage: stage !== null && stage !== void 0 ? stage : (_b = this.progress) === null || _b === void 0 ? void 0 : _b.stage,
|
|
453
|
-
};
|
|
454
|
-
return [4 /*yield*/, this.save()];
|
|
455
|
-
case 1:
|
|
456
|
-
_c.sent();
|
|
457
|
-
return [2 /*return*/];
|
|
458
|
-
}
|
|
459
|
-
});
|
|
460
|
-
});
|
|
294
|
+
async updateProgress(percentage, stage, message) {
|
|
295
|
+
this.progress = {
|
|
296
|
+
message: message ?? this.progress?.message,
|
|
297
|
+
percentage,
|
|
298
|
+
stage: stage ?? this.progress?.stage,
|
|
299
|
+
};
|
|
300
|
+
await this.save();
|
|
461
301
|
},
|
|
462
302
|
};
|
|
463
303
|
backgroundTaskSchema.statics = {
|
|
464
|
-
checkCancellation
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
case 0: return [4 /*yield*/, this.findById(taskId).select("status").lean()];
|
|
470
|
-
case 1:
|
|
471
|
-
task = _a.sent();
|
|
472
|
-
if ((task === null || task === void 0 ? void 0 : task.status) === "cancelled") {
|
|
473
|
-
throw new TaskCancelledError(taskId);
|
|
474
|
-
}
|
|
475
|
-
return [2 /*return*/];
|
|
476
|
-
}
|
|
477
|
-
});
|
|
478
|
-
});
|
|
304
|
+
async checkCancellation(taskId) {
|
|
305
|
+
const task = await this.findById(taskId).select("status").lean();
|
|
306
|
+
if (task?.status === "cancelled") {
|
|
307
|
+
throw new TaskCancelledError(taskId);
|
|
308
|
+
}
|
|
479
309
|
},
|
|
480
310
|
};
|
|
481
311
|
backgroundTaskSchema.index({ createdBy: 1, status: 1 });
|