@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
package/dist/logger.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,42 +32,6 @@ var __importStar = (this && this.__importStar) || (function () {
43
32
  return result;
44
33
  };
45
34
  })();
46
- var __values = (this && this.__values) || function(o) {
47
- var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
48
- if (m) return m.call(o);
49
- if (o && typeof o.length === "number") return {
50
- next: function () {
51
- if (o && i >= o.length) o = void 0;
52
- return { value: o && o[i++], done: !o };
53
- }
54
- };
55
- throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
56
- };
57
- var __read = (this && this.__read) || function (o, n) {
58
- var m = typeof Symbol === "function" && o[Symbol.iterator];
59
- if (!m) return o;
60
- var i = m.call(o), r, ar = [], e;
61
- try {
62
- while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
63
- }
64
- catch (error) { e = { error: error }; }
65
- finally {
66
- try {
67
- if (r && !r.done && (m = i["return"])) m.call(i);
68
- }
69
- finally { if (e) throw e.error; }
70
- }
71
- return ar;
72
- };
73
- var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
74
- if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
75
- if (ar || !(i in from)) {
76
- if (!ar) ar = Array.prototype.slice.call(from, 0, i);
77
- ar[i] = from[i];
78
- }
79
- }
80
- return to.concat(ar || Array.prototype.slice.call(from));
81
- };
82
35
  var __importDefault = (this && this.__importDefault) || function (mod) {
83
36
  return (mod && mod.__esModule) ? mod : { "default": mod };
84
37
  };
@@ -110,29 +63,32 @@ exports.setupLogging = exports.createFeatureFlaggedLogger = exports.createScoped
110
63
  * @see {@link formatLogContextSuffix}
111
64
  * @module logger
112
65
  */
113
- var node_fs_1 = __importDefault(require("node:fs"));
114
- var node_path_1 = require("node:path");
115
- var node_util_1 = require("node:util");
116
- var Sentry = __importStar(require("@sentry/bun"));
117
- var winston_1 = __importDefault(require("winston"));
118
- var requestContext_1 = require("./requestContext");
119
- var isPrimitive = function (val) {
66
+ const node_fs_1 = __importDefault(require("node:fs"));
67
+ const node_path_1 = require("node:path");
68
+ const node_util_1 = require("node:util");
69
+ const Sentry = __importStar(require("@sentry/bun"));
70
+ const winston_1 = __importDefault(require("winston"));
71
+ const requestContext_1 = require("./requestContext");
72
+ const isPrimitive = (val) => {
120
73
  return val === null || (typeof val !== "object" && typeof val !== "function");
121
74
  };
122
- var formatWithInspect = function (val) {
123
- var prefix = isPrimitive(val) ? "" : "\n";
124
- var shouldFormat = typeof val !== "string";
75
+ const formatWithInspect = (val) => {
76
+ const prefix = isPrimitive(val) ? "" : "\n";
77
+ const shouldFormat = typeof val !== "string";
125
78
  return prefix + (shouldFormat ? (0, node_util_1.inspect)(val, { colors: true, depth: null }) : val);
126
79
  };
127
- var buildTerrenoRequestLog = function (active) {
128
- var _a;
80
+ const buildTerrenoRequestLog = (active) => {
129
81
  return {
130
82
  requestId: active.requestId,
131
- userId: (_a = active.userId) !== null && _a !== void 0 ? _a : null,
83
+ userId: active.userId ?? null,
132
84
  };
133
85
  };
134
- var mergeActiveRequestIntoInfo = function (info, active) {
135
- var next = __assign(__assign({}, info), { requestId: active.requestId, terrenoRequestLog: buildTerrenoRequestLog(active) });
86
+ const mergeActiveRequestIntoInfo = (info, active) => {
87
+ const next = {
88
+ ...info,
89
+ requestId: active.requestId,
90
+ terrenoRequestLog: buildTerrenoRequestLog(active),
91
+ };
136
92
  if (active.jobId) {
137
93
  next.jobId = active.jobId;
138
94
  }
@@ -153,10 +109,10 @@ var mergeActiveRequestIntoInfo = function (info, active) {
153
109
  }
154
110
  return next;
155
111
  };
156
- var addRequestContextFormat = winston_1.default.format(function (info) {
157
- var active = (0, requestContext_1.getCurrentRequestContext)();
112
+ const addRequestContextFormat = winston_1.default.format((info) => {
113
+ const active = (0, requestContext_1.getCurrentRequestContext)();
158
114
  if (!active) {
159
- return __assign({}, info);
115
+ return { ...info };
160
116
  }
161
117
  return mergeActiveRequestIntoInfo(info, active);
162
118
  });
@@ -167,42 +123,31 @@ var addRequestContextFormat = winston_1.default.format(function (info) {
167
123
  * (`requestId` + `userId` including `null` when anonymous) is attached on the Winston info
168
124
  * object for structured transports only, not repeated in this suffix.
169
125
  */
170
- var formatLogContextSuffix = function (fields) {
171
- var e_1, _a;
172
- var contextParts = [
173
- fields.requestId ? "requestId=".concat(fields.requestId) : undefined,
174
- fields.jobId ? "jobId=".concat(fields.jobId) : undefined,
175
- fields.sessionId ? "sessionId=".concat(fields.sessionId) : undefined,
176
- fields.userId ? "userId=".concat(fields.userId) : undefined,
177
- fields.traceId ? "traceId=".concat(fields.traceId) : undefined,
178
- fields.terrenoLogPrefix ? "logPrefix=".concat(fields.terrenoLogPrefix) : undefined,
126
+ const formatLogContextSuffix = (fields) => {
127
+ const contextParts = [
128
+ fields.requestId ? `requestId=${fields.requestId}` : undefined,
129
+ fields.jobId ? `jobId=${fields.jobId}` : undefined,
130
+ fields.sessionId ? `sessionId=${fields.sessionId}` : undefined,
131
+ fields.userId ? `userId=${fields.userId}` : undefined,
132
+ fields.traceId ? `traceId=${fields.traceId}` : undefined,
133
+ fields.terrenoLogPrefix ? `logPrefix=${fields.terrenoLogPrefix}` : undefined,
179
134
  ].filter(Boolean);
180
135
  if (fields.terrenoLabels && typeof fields.terrenoLabels === "object") {
181
- var sortedKeys = Object.keys(fields.terrenoLabels).sort();
182
- try {
183
- for (var sortedKeys_1 = __values(sortedKeys), sortedKeys_1_1 = sortedKeys_1.next(); !sortedKeys_1_1.done; sortedKeys_1_1 = sortedKeys_1.next()) {
184
- var key = sortedKeys_1_1.value;
185
- var value = fields.terrenoLabels[key];
186
- if (value !== undefined && value !== "") {
187
- contextParts.push("".concat(key, "=").concat(value));
188
- }
136
+ const sortedKeys = Object.keys(fields.terrenoLabels).sort();
137
+ for (const key of sortedKeys) {
138
+ const value = fields.terrenoLabels[key];
139
+ if (value !== undefined && value !== "") {
140
+ contextParts.push(`${key}=${value}`);
189
141
  }
190
142
  }
191
- catch (e_1_1) { e_1 = { error: e_1_1 }; }
192
- finally {
193
- try {
194
- if (sortedKeys_1_1 && !sortedKeys_1_1.done && (_a = sortedKeys_1.return)) _a.call(sortedKeys_1);
195
- }
196
- finally { if (e_1) throw e_1.error; }
197
- }
198
143
  }
199
144
  if (contextParts.length === 0) {
200
145
  return "";
201
146
  }
202
- return " ".concat(contextParts.join(" "));
147
+ return ` ${contextParts.join(" ")}`;
203
148
  };
204
149
  exports.formatLogContextSuffix = formatLogContextSuffix;
205
- var formatContext = function (info) {
150
+ const formatContext = (info) => {
206
151
  return (0, exports.formatLogContextSuffix)({
207
152
  jobId: info.jobId,
208
153
  requestId: info.requestId,
@@ -216,22 +161,21 @@ var formatContext = function (info) {
216
161
  // Winston doesn't operate like console.log by default, e.g. `logger.error('error',
217
162
  // error)` only prints the message and no args. Add handling for all the args,
218
163
  // while also supporting splat logging.
219
- var printf = function (timestamp) {
220
- if (timestamp === void 0) { timestamp = false; }
221
- return function (info) {
222
- var msg = formatWithInspect(info.message);
223
- var splatKey = Symbol.for("splat");
224
- var splatArgs = (info[splatKey] || []);
225
- var rest = splatArgs.map(function (data) { return formatWithInspect(data); }).join(" ");
226
- var context = formatContext(info);
164
+ const printf = (timestamp = false) => {
165
+ return (info) => {
166
+ const msg = formatWithInspect(info.message);
167
+ const splatKey = Symbol.for("splat");
168
+ const splatArgs = (info[splatKey] || []);
169
+ const rest = splatArgs.map((data) => formatWithInspect(data)).join(" ");
170
+ const context = formatContext(info);
227
171
  if (timestamp) {
228
- return "".concat(info.timestamp, " - ").concat(info.level, ": ").concat(msg).concat(context, " ").concat(rest);
172
+ return `${info.timestamp} - ${info.level}: ${msg}${context} ${rest}`;
229
173
  }
230
- return "".concat(info.level, ": ").concat(msg).concat(context, " ").concat(rest);
174
+ return `${info.level}: ${msg}${context} ${rest}`;
231
175
  };
232
176
  };
233
- var terrenoDevJsonlAttached = false;
234
- var shouldAttachTerrenoDevJsonl = function () {
177
+ let terrenoDevJsonlAttached = false;
178
+ const shouldAttachTerrenoDevJsonl = () => {
235
179
  if (process.env.TERRENO_LOG_FILE === "false" || process.env.TERRENO_LOG_FILE === "0") {
236
180
  return false;
237
181
  }
@@ -240,8 +184,8 @@ var shouldAttachTerrenoDevJsonl = function () {
240
184
  }
241
185
  return process.env.NODE_ENV !== "production";
242
186
  };
243
- var attachTerrenoDevJsonlTransportIfEnabled = function (logger, options) {
244
- if (options === null || options === void 0 ? void 0 : options.disable) {
187
+ const attachTerrenoDevJsonlTransportIfEnabled = (logger, options) => {
188
+ if (options?.disable) {
245
189
  return;
246
190
  }
247
191
  if (!shouldAttachTerrenoDevJsonl()) {
@@ -250,11 +194,11 @@ var attachTerrenoDevJsonlTransportIfEnabled = function (logger, options) {
250
194
  if (terrenoDevJsonlAttached) {
251
195
  return;
252
196
  }
253
- var logDir = (0, node_path_1.join)(process.cwd(), ".terreno", "logs");
197
+ const logDir = (0, node_path_1.join)(process.cwd(), ".terreno", "logs");
254
198
  if (!node_fs_1.default.existsSync(logDir)) {
255
199
  node_fs_1.default.mkdirSync(logDir, { recursive: true });
256
200
  }
257
- var maxBytes = 5 * 1024 * 1024;
201
+ const maxBytes = 5 * 1024 * 1024;
258
202
  logger.add(new winston_1.default.transports.File({
259
203
  filename: (0, node_path_1.join)(logDir, "app.log"),
260
204
  format: winston_1.default.format.combine(addRequestContextFormat(), winston_1.default.format.timestamp(), winston_1.default.format.json()),
@@ -263,7 +207,7 @@ var attachTerrenoDevJsonlTransportIfEnabled = function (logger, options) {
263
207
  level: "debug",
264
208
  maxFiles: 3,
265
209
  maxsize: maxBytes,
266
- options: { flags: "a", mode: 384 },
210
+ options: { flags: "a", mode: 0o600 },
267
211
  }));
268
212
  terrenoDevJsonlAttached = true;
269
213
  };
@@ -289,9 +233,9 @@ exports.winstonLogger = winston_1.default.createLogger({
289
233
  }),
290
234
  ],
291
235
  });
292
- var mergeSentryLogAttributes = function (extra) {
293
- var active = (0, requestContext_1.getCurrentRequestContext)();
294
- var out = __assign(__assign({}, (0, requestContext_1.getCurrentLogContext)()), (extra !== null && extra !== void 0 ? extra : {}));
236
+ const mergeSentryLogAttributes = (extra) => {
237
+ const active = (0, requestContext_1.getCurrentRequestContext)();
238
+ const out = { ...(0, requestContext_1.getCurrentLogContext)(), ...(extra ?? {}) };
295
239
  if (active) {
296
240
  out.terrenoRequestLog = buildTerrenoRequestLog(active);
297
241
  }
@@ -299,9 +243,9 @@ var mergeSentryLogAttributes = function (extra) {
299
243
  };
300
244
  attachTerrenoDevJsonlTransportIfEnabled(exports.winstonLogger);
301
245
  // Helper function to send logs to Sentry if enabled
302
- var sendToSentry = function (message, level, extraAttributes) {
246
+ const sendToSentry = (message, level, extraAttributes) => {
303
247
  if (process.env.USE_SENTRY_LOGGING === "true" && Sentry.logger) {
304
- var logWithContext = Sentry.logger[level];
248
+ const logWithContext = Sentry.logger[level];
305
249
  logWithContext(message, mergeSentryLogAttributes(extraAttributes));
306
250
  }
307
251
  };
@@ -327,8 +271,8 @@ var sendToSentry = function (message, level, extraAttributes) {
327
271
  */
328
272
  exports.logger = {
329
273
  // simple way to log a caught exception. e.g. promise().catch(logger.catch)
330
- catch: function (e) {
331
- var errorMsg = "Caught: ".concat(e === null || e === void 0 ? void 0 : e.message, " ").concat(e === null || e === void 0 ? void 0 : e.stack);
274
+ catch: (e) => {
275
+ const errorMsg = `Caught: ${e?.message} ${e?.stack}`;
332
276
  exports.winstonLogger.error(errorMsg);
333
277
  if (process.env.USE_SENTRY_LOGGING === "true") {
334
278
  if (e instanceof Error) {
@@ -339,89 +283,51 @@ exports.logger = {
339
283
  }
340
284
  }
341
285
  },
342
- debug: function (msg) {
343
- var args = [];
344
- for (var _i = 1; _i < arguments.length; _i++) {
345
- args[_i - 1] = arguments[_i];
346
- }
347
- exports.winstonLogger.debug.apply(exports.winstonLogger, __spreadArray([msg], __read(args), false));
286
+ debug: (msg, ...args) => {
287
+ exports.winstonLogger.debug(msg, ...args);
348
288
  sendToSentry(msg, "debug");
349
289
  },
350
- error: function (msg) {
351
- var args = [];
352
- for (var _i = 1; _i < arguments.length; _i++) {
353
- args[_i - 1] = arguments[_i];
354
- }
355
- exports.winstonLogger.error.apply(exports.winstonLogger, __spreadArray([msg], __read(args), false));
290
+ error: (msg, ...args) => {
291
+ exports.winstonLogger.error(msg, ...args);
356
292
  sendToSentry(msg, "error");
357
293
  },
358
- info: function (msg) {
359
- var args = [];
360
- for (var _i = 1; _i < arguments.length; _i++) {
361
- args[_i - 1] = arguments[_i];
362
- }
363
- exports.winstonLogger.info.apply(exports.winstonLogger, __spreadArray([msg], __read(args), false));
294
+ info: (msg, ...args) => {
295
+ exports.winstonLogger.info(msg, ...args);
364
296
  sendToSentry(msg, "info");
365
297
  },
366
- warn: function (msg) {
367
- var args = [];
368
- for (var _i = 1; _i < arguments.length; _i++) {
369
- args[_i - 1] = arguments[_i];
370
- }
371
- exports.winstonLogger.warn.apply(exports.winstonLogger, __spreadArray([msg], __read(args), false));
298
+ warn: (msg, ...args) => {
299
+ exports.winstonLogger.warn(msg, ...args);
372
300
  sendToSentry(msg, "warn");
373
301
  },
374
302
  };
375
- var normalizeLogLabels = function (labels) {
376
- var e_2, _a;
303
+ const normalizeLogLabels = (labels) => {
377
304
  if (!labels) {
378
305
  return undefined;
379
306
  }
380
- var out = {};
381
- try {
382
- for (var _b = __values(Object.entries(labels)), _c = _b.next(); !_c.done; _c = _b.next()) {
383
- var _d = __read(_c.value, 2), key = _d[0], value = _d[1];
384
- if (value === undefined || value === null) {
385
- continue;
386
- }
387
- out[key] = String(value);
388
- }
389
- }
390
- catch (e_2_1) { e_2 = { error: e_2_1 }; }
391
- finally {
392
- try {
393
- if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
307
+ const out = {};
308
+ for (const [key, value] of Object.entries(labels)) {
309
+ if (value === undefined || value === null) {
310
+ continue;
394
311
  }
395
- finally { if (e_2) throw e_2.error; }
312
+ out[key] = String(value);
396
313
  }
397
314
  return Object.keys(out).length > 0 ? out : undefined;
398
315
  };
399
- var applyMessagePrefix = function (prefix, msg) {
400
- var trimmed = prefix === null || prefix === void 0 ? void 0 : prefix.trim();
316
+ const applyMessagePrefix = (prefix, msg) => {
317
+ const trimmed = prefix?.trim();
401
318
  if (!trimmed) {
402
319
  return msg;
403
320
  }
404
- return "".concat(trimmed, " ").concat(msg);
321
+ return `${trimmed} ${msg}`;
405
322
  };
406
- var buildScopedLoggerSentryExtras = function (labels, logPrefix) {
407
- var e_3, _a;
408
- var out = {};
323
+ const buildScopedLoggerSentryExtras = (labels, logPrefix) => {
324
+ const out = {};
409
325
  if (logPrefix) {
410
326
  out.terrenoLogPrefix = logPrefix;
411
327
  }
412
328
  if (labels) {
413
- try {
414
- for (var _b = __values(Object.entries(labels)), _c = _b.next(); !_c.done; _c = _b.next()) {
415
- var _d = __read(_c.value, 2), key = _d[0], value = _d[1];
416
- out[key] = value;
417
- }
418
- }
419
- catch (e_3_1) { e_3 = { error: e_3_1 }; }
420
- finally {
421
- try {
422
- if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
423
- }
424
- finally { if (e_3) throw e_3.error; }
329
+ for (const [key, value] of Object.entries(labels)) {
330
+ out[key] = value;
425
331
  }
426
332
  }
427
333
  return Object.keys(out).length > 0 ? out : undefined;
@@ -462,28 +368,24 @@ var buildScopedLoggerSentryExtras = function (labels, logPrefix) {
462
368
  * await capture(invoice).catch(log.catch);
463
369
  * ```
464
370
  */
465
- var createScopedLogger = function (options) {
466
- var _a;
467
- if (options === void 0) { options = {}; }
468
- var trimmedPrefix = ((_a = options.prefix) === null || _a === void 0 ? void 0 : _a.trim()) ? options.prefix.trim() : undefined;
469
- var terrenoLabels = normalizeLogLabels(options.labels);
371
+ const createScopedLogger = (options = {}) => {
372
+ const trimmedPrefix = options.prefix?.trim() ? options.prefix.trim() : undefined;
373
+ const terrenoLabels = normalizeLogLabels(options.labels);
470
374
  if (!trimmedPrefix && !terrenoLabels) {
471
375
  return exports.logger;
472
376
  }
473
- var childDefaults = {};
377
+ const childDefaults = {};
474
378
  if (terrenoLabels) {
475
379
  childDefaults.terrenoLabels = terrenoLabels;
476
380
  }
477
381
  if (trimmedPrefix) {
478
382
  childDefaults.terrenoLogPrefix = trimmedPrefix;
479
383
  }
480
- var base = exports.winstonLogger.child(childDefaults);
481
- var sentryExtras = function () {
482
- return buildScopedLoggerSentryExtras(terrenoLabels, trimmedPrefix);
483
- };
384
+ const base = exports.winstonLogger.child(childDefaults);
385
+ const sentryExtras = () => buildScopedLoggerSentryExtras(terrenoLabels, trimmedPrefix);
484
386
  return {
485
- catch: function (e) {
486
- var errorMsg = applyMessagePrefix(trimmedPrefix, "Caught: ".concat(e === null || e === void 0 ? void 0 : e.message, " ").concat(e === null || e === void 0 ? void 0 : e.stack));
387
+ catch: (e) => {
388
+ const errorMsg = applyMessagePrefix(trimmedPrefix, `Caught: ${e?.message} ${e?.stack}`);
487
389
  base.error(errorMsg);
488
390
  if (process.env.USE_SENTRY_LOGGING === "true") {
489
391
  if (e instanceof Error) {
@@ -494,40 +396,24 @@ var createScopedLogger = function (options) {
494
396
  }
495
397
  }
496
398
  },
497
- debug: function (msg) {
498
- var args = [];
499
- for (var _i = 1; _i < arguments.length; _i++) {
500
- args[_i - 1] = arguments[_i];
501
- }
502
- var line = applyMessagePrefix(trimmedPrefix, msg);
503
- base.debug.apply(base, __spreadArray([line], __read(args), false));
399
+ debug: (msg, ...args) => {
400
+ const line = applyMessagePrefix(trimmedPrefix, msg);
401
+ base.debug(line, ...args);
504
402
  sendToSentry(line, "debug", sentryExtras());
505
403
  },
506
- error: function (msg) {
507
- var args = [];
508
- for (var _i = 1; _i < arguments.length; _i++) {
509
- args[_i - 1] = arguments[_i];
510
- }
511
- var line = applyMessagePrefix(trimmedPrefix, msg);
512
- base.error.apply(base, __spreadArray([line], __read(args), false));
404
+ error: (msg, ...args) => {
405
+ const line = applyMessagePrefix(trimmedPrefix, msg);
406
+ base.error(line, ...args);
513
407
  sendToSentry(line, "error", sentryExtras());
514
408
  },
515
- info: function (msg) {
516
- var args = [];
517
- for (var _i = 1; _i < arguments.length; _i++) {
518
- args[_i - 1] = arguments[_i];
519
- }
520
- var line = applyMessagePrefix(trimmedPrefix, msg);
521
- base.info.apply(base, __spreadArray([line], __read(args), false));
409
+ info: (msg, ...args) => {
410
+ const line = applyMessagePrefix(trimmedPrefix, msg);
411
+ base.info(line, ...args);
522
412
  sendToSentry(line, "info", sentryExtras());
523
413
  },
524
- warn: function (msg) {
525
- var args = [];
526
- for (var _i = 1; _i < arguments.length; _i++) {
527
- args[_i - 1] = arguments[_i];
528
- }
529
- var line = applyMessagePrefix(trimmedPrefix, msg);
530
- base.warn.apply(base, __spreadArray([line], __read(args), false));
414
+ warn: (msg, ...args) => {
415
+ const line = applyMessagePrefix(trimmedPrefix, msg);
416
+ base.warn(line, ...args);
531
417
  sendToSentry(line, "warn", sentryExtras());
532
418
  },
533
419
  };
@@ -568,83 +454,64 @@ exports.createScopedLogger = createScopedLogger;
568
454
  * });
569
455
  * ```
570
456
  */
571
- var createFeatureFlaggedLogger = function (options) {
572
- var _a, _b;
573
- var target = (_a = options.target) !== null && _a !== void 0 ? _a : exports.logger;
574
- var gateCatch = (_b = options.gateCatch) !== null && _b !== void 0 ? _b : false;
457
+ const createFeatureFlaggedLogger = (options) => {
458
+ const target = options.target ?? exports.logger;
459
+ const gateCatch = options.gateCatch ?? false;
575
460
  return {
576
- catch: function (e) {
461
+ catch: (e) => {
577
462
  if (gateCatch && !options.isEnabled()) {
578
463
  return;
579
464
  }
580
465
  target.catch(e);
581
466
  },
582
- debug: function (msg) {
583
- var args = [];
584
- for (var _i = 1; _i < arguments.length; _i++) {
585
- args[_i - 1] = arguments[_i];
586
- }
467
+ debug: (msg, ...args) => {
587
468
  if (!options.isEnabled()) {
588
469
  return;
589
470
  }
590
- target.debug.apply(target, __spreadArray([msg], __read(args), false));
471
+ target.debug(msg, ...args);
591
472
  },
592
- error: function (msg) {
593
- var args = [];
594
- for (var _i = 1; _i < arguments.length; _i++) {
595
- args[_i - 1] = arguments[_i];
596
- }
473
+ error: (msg, ...args) => {
597
474
  if (!options.isEnabled()) {
598
475
  return;
599
476
  }
600
- target.error.apply(target, __spreadArray([msg], __read(args), false));
477
+ target.error(msg, ...args);
601
478
  },
602
- info: function (msg) {
603
- var args = [];
604
- for (var _i = 1; _i < arguments.length; _i++) {
605
- args[_i - 1] = arguments[_i];
606
- }
479
+ info: (msg, ...args) => {
607
480
  if (!options.isEnabled()) {
608
481
  return;
609
482
  }
610
- target.info.apply(target, __spreadArray([msg], __read(args), false));
483
+ target.info(msg, ...args);
611
484
  },
612
- warn: function (msg) {
613
- var args = [];
614
- for (var _i = 1; _i < arguments.length; _i++) {
615
- args[_i - 1] = arguments[_i];
616
- }
485
+ warn: (msg, ...args) => {
617
486
  if (!options.isEnabled()) {
618
487
  return;
619
488
  }
620
- target.warn.apply(target, __spreadArray([msg], __read(args), false));
489
+ target.warn(msg, ...args);
621
490
  },
622
491
  };
623
492
  };
624
493
  exports.createFeatureFlaggedLogger = createFeatureFlaggedLogger;
625
- var setupLogging = function (options) {
626
- var _a, e_4, _b;
627
- var _c, _d;
494
+ const setupLogging = (options) => {
628
495
  exports.winstonLogger.clear();
629
496
  terrenoDevJsonlAttached = false;
630
- if (!(options === null || options === void 0 ? void 0 : options.disableConsoleLogging)) {
631
- var formats = [addRequestContextFormat(), winston_1.default.format.simple()];
632
- if (!(options === null || options === void 0 ? void 0 : options.disableConsoleColors)) {
497
+ if (!options?.disableConsoleLogging) {
498
+ const formats = [addRequestContextFormat(), winston_1.default.format.simple()];
499
+ if (!options?.disableConsoleColors) {
633
500
  formats.push(winston_1.default.format.colorize());
634
501
  }
635
- formats.push(winston_1.default.format.printf(printf(options === null || options === void 0 ? void 0 : options.showConsoleTimestamps)));
502
+ formats.push(winston_1.default.format.printf(printf(options?.showConsoleTimestamps)));
636
503
  exports.winstonLogger.add(new winston_1.default.transports.Console({
637
- debugStdout: !(options === null || options === void 0 ? void 0 : options.level) || (options === null || options === void 0 ? void 0 : options.level) === "debug",
638
- format: (_a = winston_1.default.format).combine.apply(_a, __spreadArray([], __read(formats), false)),
639
- level: (_c = options === null || options === void 0 ? void 0 : options.level) !== null && _c !== void 0 ? _c : "debug",
504
+ debugStdout: !options?.level || options?.level === "debug",
505
+ format: winston_1.default.format.combine(...formats),
506
+ level: options?.level ?? "debug",
640
507
  }));
641
508
  }
642
- if (!(options === null || options === void 0 ? void 0 : options.disableFileLogging)) {
643
- var logDirectory = (_d = options === null || options === void 0 ? void 0 : options.logDirectory) !== null && _d !== void 0 ? _d : "./log";
509
+ if (!options?.disableFileLogging) {
510
+ const logDirectory = options?.logDirectory ?? "./log";
644
511
  if (!node_fs_1.default.existsSync(logDirectory)) {
645
512
  node_fs_1.default.mkdirSync(logDirectory, { recursive: true });
646
513
  }
647
- var FILE_LOG_DEFAULTS = {
514
+ const FILE_LOG_DEFAULTS = {
648
515
  colorize: false,
649
516
  compress: true,
650
517
  dirname: logDirectory,
@@ -654,37 +521,37 @@ var setupLogging = function (options) {
654
521
  // 50MB max file size
655
522
  maxSize: 1024 * 1024 * 50,
656
523
  // Only readable by server user
657
- options: { mode: 384 },
524
+ options: { mode: 0o600 },
658
525
  };
659
- exports.winstonLogger.add(new winston_1.default.transports.Stream(__assign(__assign({}, FILE_LOG_DEFAULTS), { handleExceptions: true, level: "error",
526
+ exports.winstonLogger.add(new winston_1.default.transports.Stream({
527
+ ...FILE_LOG_DEFAULTS,
528
+ handleExceptions: true,
529
+ level: "error",
660
530
  // Use stream so we can open log in append mode rather than overwriting.
661
- stream: node_fs_1.default.createWriteStream("error.log", { flags: "a" }) })));
662
- exports.winstonLogger.add(new winston_1.default.transports.Stream(__assign(__assign({}, FILE_LOG_DEFAULTS), { level: "info",
531
+ stream: node_fs_1.default.createWriteStream("error.log", { flags: "a" }),
532
+ }));
533
+ exports.winstonLogger.add(new winston_1.default.transports.Stream({
534
+ ...FILE_LOG_DEFAULTS,
535
+ level: "info",
663
536
  // Use stream so we can open log in append mode rather than overwriting.
664
- stream: node_fs_1.default.createWriteStream("out.log", { flags: "a" }) })));
665
- if (!(options === null || options === void 0 ? void 0 : options.level) || (options === null || options === void 0 ? void 0 : options.level) === "debug") {
666
- exports.winstonLogger.add(new winston_1.default.transports.Stream(__assign(__assign({}, FILE_LOG_DEFAULTS), { level: "debug",
537
+ stream: node_fs_1.default.createWriteStream("out.log", { flags: "a" }),
538
+ }));
539
+ if (!options?.level || options?.level === "debug") {
540
+ exports.winstonLogger.add(new winston_1.default.transports.Stream({
541
+ ...FILE_LOG_DEFAULTS,
542
+ level: "debug",
667
543
  // Use stream so we can open log in append mode rather than overwriting.
668
- stream: node_fs_1.default.createWriteStream("debug.log", { flags: "a" }) })));
544
+ stream: node_fs_1.default.createWriteStream("debug.log", { flags: "a" }),
545
+ }));
669
546
  }
670
547
  }
671
- if (options === null || options === void 0 ? void 0 : options.transports) {
672
- try {
673
- for (var _e = __values(options.transports), _f = _e.next(); !_f.done; _f = _e.next()) {
674
- var transport = _f.value;
675
- exports.winstonLogger.add(transport);
676
- }
677
- }
678
- catch (e_4_1) { e_4 = { error: e_4_1 }; }
679
- finally {
680
- try {
681
- if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
682
- }
683
- finally { if (e_4) throw e_4.error; }
548
+ if (options?.transports) {
549
+ for (const transport of options.transports) {
550
+ exports.winstonLogger.add(transport);
684
551
  }
685
552
  }
686
553
  attachTerrenoDevJsonlTransportIfEnabled(exports.winstonLogger, {
687
- disable: (options === null || options === void 0 ? void 0 : options.disableTerrenoDevJsonlLog) === true,
554
+ disable: options?.disableTerrenoDevJsonlLog === true,
688
555
  });
689
556
  };
690
557
  exports.setupLogging = setupLogging;