@versori/run 0.2.25 → 0.2.27

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 (27) hide show
  1. package/esm/src/dsl/http/versori/roundtripper.d.ts +9 -0
  2. package/esm/src/dsl/http/versori/roundtripper.d.ts.map +1 -1
  3. package/esm/src/dsl/http/versori/roundtripper.js +355 -38
  4. package/esm/src/dsl/triggers/WebhookTrigger.d.ts +9 -0
  5. package/esm/src/dsl/triggers/WebhookTrigger.d.ts.map +1 -1
  6. package/esm/src/interpreter/durable/DurableInterpreter.d.ts.map +1 -1
  7. package/esm/src/interpreter/durable/DurableInterpreter.js +0 -9
  8. package/esm/src/interpreter/durable/compilers/webhook.d.ts.map +1 -1
  9. package/esm/src/interpreter/durable/compilers/webhook.js +16 -1
  10. package/esm/src/interpreter/memory/MemoryInterpreter.d.ts.map +1 -1
  11. package/esm/src/interpreter/memory/MemoryInterpreter.js +0 -9
  12. package/esm/src/interpreter/memory/compilers/webhook.d.ts.map +1 -1
  13. package/esm/src/interpreter/memory/compilers/webhook.js +16 -1
  14. package/package.json +2 -1
  15. package/script/src/dsl/http/versori/roundtripper.d.ts +9 -0
  16. package/script/src/dsl/http/versori/roundtripper.d.ts.map +1 -1
  17. package/script/src/dsl/http/versori/roundtripper.js +355 -38
  18. package/script/src/dsl/triggers/WebhookTrigger.d.ts +9 -0
  19. package/script/src/dsl/triggers/WebhookTrigger.d.ts.map +1 -1
  20. package/script/src/interpreter/durable/DurableInterpreter.d.ts.map +1 -1
  21. package/script/src/interpreter/durable/DurableInterpreter.js +0 -9
  22. package/script/src/interpreter/durable/compilers/webhook.d.ts.map +1 -1
  23. package/script/src/interpreter/durable/compilers/webhook.js +16 -1
  24. package/script/src/interpreter/memory/MemoryInterpreter.d.ts.map +1 -1
  25. package/script/src/interpreter/memory/MemoryInterpreter.js +0 -9
  26. package/script/src/interpreter/memory/compilers/webhook.d.ts.map +1 -1
  27. package/script/src/interpreter/memory/compilers/webhook.js +16 -1
@@ -25,12 +25,21 @@ export declare class VersoriCredentialsFactory implements RoundTripperFactory {
25
25
  private cfgReader;
26
26
  private log;
27
27
  private tracer;
28
+ private oauth2Cache;
28
29
  private readonly defaultDynamic;
29
30
  constructor(credsClient: VersoriCredentialClient, credsBaseURL: string, platformAPIClient: PlatformAPIClient, logger: Logger, tracer: Tracer, cfgReader: ConfigReader);
30
31
  static fromEnv(logger: Logger, tracer: Tracer): VersoriCredentialsFactory;
31
32
  private changeRequestInit;
32
33
  private changeBaseUrl;
33
34
  create(connName: string): Promise<denoFetch | undefined>;
35
+ private apiKeyFetcherStatic;
36
+ private basicAuthFetcherStatic;
37
+ private bearerTokenFetcherStatic;
38
+ private getOAuth2Token;
39
+ private checkExpiry;
40
+ private oauth2FetcherStatic;
41
+ private oauth1FetcherStatic;
42
+ private mtlsFetcherStatic;
34
43
  createDynamic(templateName: string): Promise<DynamicFetcher | undefined>;
35
44
  private traceFetch;
36
45
  credentials(): CredentialsProvider;
@@ -1 +1 @@
1
- {"version":3,"file":"roundtripper.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/roundtripper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,0CAA0C,CAAC;AAElE,OAAO,EAEH,cAAc,EACd,YAAY,EAGZ,cAAc,EACd,mBAAmB,EACtB,MAAM,aAAa,CAAC;AAQrB,OAAO,EAAE,mBAAmB,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAQ9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAOrD,KAAK,SAAS,GAAG,CACb,KAAK,EAAE,WAAW,GAAG,GAAG,EACxB,IAAI,CAAC,EAAE,WAAW,GAAG;IAAE,MAAM,CAAC,EAAE,IAAI,CAAC,UAAU,CAAA;CAAE,KAChD,OAAO,CAAC,QAAQ,CAAC,CAAC;AAEvB;;;;;;;;;;GAUG;AACH,qBAAa,yBAA0B,YAAW,mBAAmB;IACjE,OAAO,CAAC,WAAW,CAA0B;IAC7C,OAAO,CAAC,YAAY,CAAS;IAE7B,OAAO,CAAC,iBAAiB,CAAoB;IAE7C,OAAO,CAAC,SAAS,CAAe;IAEhC,OAAO,CAAC,GAAG,CAAS;IAEpB,OAAO,CAAC,MAAM,CAAS;IAEvB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAK7B;gBAGE,WAAW,EAAE,uBAAuB,EACpC,YAAY,EAAE,MAAM,EACpB,iBAAiB,EAAE,iBAAiB,EACpC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,YAAY;IAe3B,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,yBAAyB;IAoCzE,OAAO,CAAC,iBAAiB;IAezB,OAAO,CAAC,aAAa;IAwBrB,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IAqDxD,aAAa,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IA6DxE,OAAO,CAAC,UAAU;IAqClB,WAAW,IAAI,mBAAmB;IAQlC,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,cAAc;IAyC9C,cAAc,CAChB,IAAI,EAAE,MAAM,EACZ,YAAY,UAAQ,EACpB,YAAY,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,KAAK,CAAC;IAiBX,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;YAqB9D,uBAAuB;IAoDrC,OAAO,CAAC,aAAa;IAoDrB,OAAO,CAAC,gBAAgB;IAmCxB,OAAO,CAAC,kBAAkB;IAiC1B,OAAO,CAAC,aAAa;IAqErB,OAAO,CAAC,aAAa;IAyErB,OAAO,CAAC,WAAW;YA6BL,QAAQ;YA2BR,MAAM;YA2BN,iBAAiB;CA0BlC"}
1
+ {"version":3,"file":"roundtripper.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/roundtripper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,0CAA0C,CAAC;AAElE,OAAO,EAGH,cAAc,EACd,YAAY,EAGZ,cAAc,EACd,mBAAmB,EACtB,MAAM,aAAa,CAAC;AAQrB,OAAO,EAAE,mBAAmB,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAQ9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AASrD,KAAK,SAAS,GAAG,CACb,KAAK,EAAE,WAAW,GAAG,GAAG,EACxB,IAAI,CAAC,EAAE,WAAW,GAAG;IAAE,MAAM,CAAC,EAAE,IAAI,CAAC,UAAU,CAAA;CAAE,KAChD,OAAO,CAAC,QAAQ,CAAC,CAAC;AAcvB;;;;;;;;;;GAUG;AACH,qBAAa,yBAA0B,YAAW,mBAAmB;IACjE,OAAO,CAAC,WAAW,CAA0B;IAC7C,OAAO,CAAC,YAAY,CAAS;IAE7B,OAAO,CAAC,iBAAiB,CAAoB;IAE7C,OAAO,CAAC,SAAS,CAAe;IAEhC,OAAO,CAAC,GAAG,CAAS;IAEpB,OAAO,CAAC,MAAM,CAAS;IAEvB,OAAO,CAAC,WAAW,CAAoC;IAEvD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAK7B;gBAGE,WAAW,EAAE,uBAAuB,EACpC,YAAY,EAAE,MAAM,EACpB,iBAAiB,EAAE,iBAAiB,EACpC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,YAAY;IAoB3B,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,yBAAyB;IAoCzE,OAAO,CAAC,iBAAiB;IAezB,OAAO,CAAC,aAAa;IAwBf,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IAuG9D,OAAO,CAAC,mBAAmB;IAoD3B,OAAO,CAAC,sBAAsB;IA2B9B,OAAO,CAAC,wBAAwB;YA6BlB,cAAc;IAqC5B,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,mBAAmB;IA+D3B,OAAO,CAAC,mBAAmB;IAuE3B,OAAO,CAAC,iBAAiB;IAqBzB,aAAa,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAyDxE,OAAO,CAAC,UAAU;IAqClB,WAAW,IAAI,mBAAmB;IAQlC,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,cAAc;IAyC9C,cAAc,CAChB,IAAI,EAAE,MAAM,EACZ,YAAY,UAAQ,EACpB,YAAY,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,KAAK,CAAC;IAiBX,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;YAqB9D,uBAAuB;IAoDrC,OAAO,CAAC,aAAa;IAoDrB,OAAO,CAAC,gBAAgB;IAmCxB,OAAO,CAAC,kBAAkB;IAiC1B,OAAO,CAAC,aAAa;IAqErB,OAAO,CAAC,aAAa;IAyErB,OAAO,CAAC,WAAW;YA6BL,QAAQ;YA2BR,MAAM;YA2BN,iBAAiB;CA0BlC"}
@@ -7,6 +7,8 @@ import { isValidURL } from './helpers.js';
7
7
  import { PlatformAPIClient } from './platformapi.js';
8
8
  import { URLSearchParams } from 'node:url';
9
9
  import { createHmac } from 'node:crypto';
10
+ import { LRUCache } from 'lru-cache';
11
+ import { timestampMs } from '@bufbuild/protobuf/wkt';
10
12
  import OAuth from 'oauth-1.0a'; // Importing the OAuth class as default export
11
13
  /**
12
14
  * VersoriRoundTripper is an implementation of the RoundTripperFactory interface for Versori connections.
@@ -57,6 +59,12 @@ export class VersoriCredentialsFactory {
57
59
  writable: true,
58
60
  value: void 0
59
61
  });
62
+ Object.defineProperty(this, "oauth2Cache", {
63
+ enumerable: true,
64
+ configurable: true,
65
+ writable: true,
66
+ value: void 0
67
+ });
60
68
  Object.defineProperty(this, "defaultDynamic", {
61
69
  enumerable: true,
62
70
  configurable: true,
@@ -74,6 +82,10 @@ export class VersoriCredentialsFactory {
74
82
  this.cfgReader = cfgReader;
75
83
  this.log = logger;
76
84
  this.tracer = tracer;
85
+ this.oauth2Cache = new LRUCache({
86
+ max: 1000,
87
+ ttl: 2000 * 60 * 5,
88
+ });
77
89
  // lost 15 minutes because of this one
78
90
  this.traceFetch = this.traceFetch.bind(this);
79
91
  this.credentials = this.credentials.bind(this);
@@ -137,58 +149,363 @@ export class VersoriCredentialsFactory {
137
149
  this.log.debug('Using baseURL from connection', { url: newURL.toString() });
138
150
  return newURL.toString();
139
151
  }
140
- create(connName) {
152
+ async create(connName) {
141
153
  const cnxId = this.cfgReader.getConnectionID(connName);
142
154
  if (!cnxId) {
143
- this.log.debug('Connection not found in config, could be a dynamic connection', {
144
- connectionName: connName,
145
- });
146
155
  return Promise.resolve(undefined);
147
156
  }
148
- const _fn = async (input, init) => {
149
- const conn = await this.platformAPIClient.getStaticConnection(cnxId);
150
- if (!conn) {
151
- this.log.error('Connection not found for user, using default fetch', {
152
- connectionName: connName,
153
- });
154
- return this.traceFetch(input, init);
157
+ const conn = await this.platformAPIClient.getStaticConnection(cnxId);
158
+ let _fetch = this.traceFetch;
159
+ if (!conn) {
160
+ this.log.error('Connection not found - using default fetch', { 'connectionName': connName, 'connectionID': cnxId });
161
+ return _fetch;
162
+ }
163
+ for (const cred of conn?.credentials ?? []) {
164
+ switch (cred.authSchemeConfig.type) {
165
+ case 'api-key': {
166
+ const apiTokenResponse = await this.getToken(cred.credential.id);
167
+ if (!apiTokenResponse?.token?.accessToken || !cred.authSchemeConfig.apiKey) {
168
+ this.log.error('API Key credential is missing token or configuration', {
169
+ connectionName: connName,
170
+ credentialId: cred.credential.id,
171
+ });
172
+ continue;
173
+ }
174
+ _fetch = this.apiKeyFetcherStatic(apiTokenResponse.token.accessToken, cred.authSchemeConfig.apiKey, _fetch);
175
+ break;
176
+ }
177
+ case 'basic-auth': {
178
+ const basicTokenResponse = await this.getToken(cred.credential.id);
179
+ if (!basicTokenResponse?.token?.accessToken) {
180
+ this.log.error('Basic Auth credential is missing token', {
181
+ connectionName: connName,
182
+ credentialId: cred.credential.id,
183
+ });
184
+ continue;
185
+ }
186
+ _fetch = this.basicAuthFetcherStatic(basicTokenResponse.token.accessToken, _fetch);
187
+ break;
188
+ }
189
+ case 'jwt-bearer': {
190
+ const bearerTokenResponse = await this.getToken(cred.credential.id);
191
+ if (!bearerTokenResponse?.token?.accessToken) {
192
+ this.log.error('Bearer Token credential is missing token', {
193
+ connectionName: connName,
194
+ credentialId: cred.credential.id,
195
+ });
196
+ continue;
197
+ }
198
+ _fetch = this.bearerTokenFetcherStatic(bearerTokenResponse.token.accessToken, _fetch);
199
+ break;
200
+ }
201
+ case 'oauth2': {
202
+ if (!cred.credential?.id) {
203
+ this.log.error('OAuth2 credential is missing credential ID', {
204
+ connectionName: connName,
205
+ credentialId: cred.credential.id,
206
+ });
207
+ continue;
208
+ }
209
+ _fetch = this.oauth2FetcherStatic(cred.credential.id, _fetch);
210
+ break;
211
+ }
212
+ case 'oauth1': {
213
+ const oauth1Metadata = await this.getOAuth1Metadata(cred.credential.id);
214
+ if (!oauth1Metadata?.authorizationMetadata) {
215
+ this.log.error('OAuth1 credential is missing metadata', {
216
+ connectionName: connName,
217
+ credentialId: cred.credential.id,
218
+ });
219
+ continue;
220
+ }
221
+ _fetch = this.oauth1FetcherStatic(oauth1Metadata, _fetch);
222
+ break;
223
+ }
224
+ case 'certificate': {
225
+ const mtlsData = await this.getRaw(cred.credential.id);
226
+ if (!mtlsData?.credential?.data['cert'] || !mtlsData?.credential?.data['key']) {
227
+ this.log.error('mTLS credential is missing cert or key data', {
228
+ connectionName: connName,
229
+ credentialId: cred.credential.id,
230
+ });
231
+ continue;
232
+ }
233
+ _fetch = this.mtlsFetcherStatic({
234
+ cert: mtlsData.credential.data['cert'],
235
+ key: mtlsData.credential.data['key'],
236
+ ca: mtlsData.credential.data['ca'],
237
+ }, _fetch);
238
+ break;
239
+ }
155
240
  }
241
+ }
242
+ const _fn = async (input, init) => {
156
243
  const _input = this.changeRequestInit(input, conn);
157
- let _fetch = this.traceFetch;
158
- conn.credentials.forEach((cred) => {
159
- switch (cred.authSchemeConfig.type) {
160
- case 'api-key':
161
- _fetch = this.apiKeyFetcher(cred, _fetch);
162
- break;
163
- case 'basic-auth':
164
- _fetch = this.basicAuthFetcher(cred, _fetch);
165
- break;
166
- case 'jwt-bearer':
167
- _fetch = this.bearerTokenFetcher(cred, _fetch);
168
- break;
169
- case 'oauth2':
170
- _fetch = this.oauth2Fetcher(cred, _fetch);
171
- break;
172
- case 'certificate':
173
- _fetch = this.mtlsFetcher(cred, _fetch);
174
- break;
175
- case 'oauth1':
176
- _fetch = this.oauth1Fetcher(cred, _fetch);
177
- break;
244
+ return _fetch(_input, init);
245
+ };
246
+ return _fn;
247
+ }
248
+ apiKeyFetcherStatic(token, asc, fn) {
249
+ const _fn = async (input, init) => {
250
+ if (!token) {
251
+ throw new Error('Token not found');
252
+ }
253
+ if (!asc) {
254
+ throw new Error('API Key configuration not found');
255
+ }
256
+ if (!init) {
257
+ init = {};
258
+ }
259
+ switch (asc.in) {
260
+ case 'header':
261
+ if (!init.headers) {
262
+ init.headers = new Headers();
263
+ }
264
+ if (init.headers instanceof Headers) {
265
+ init.headers.set(asc.name, token);
266
+ }
267
+ else if (init.headers instanceof Array) {
268
+ init.headers.push([asc.name, token]);
269
+ }
270
+ else {
271
+ init.headers = {
272
+ ...init.headers,
273
+ [asc.name]: token,
274
+ };
275
+ }
276
+ break;
277
+ case 'query':
278
+ if (typeof input === 'string') {
279
+ const _input = new URL(input);
280
+ _input.searchParams.append(asc.name, token);
281
+ input = _input.toString();
282
+ }
283
+ else if (input instanceof Request) {
284
+ const _input = new URL(input.url);
285
+ _input.searchParams.append(asc.name, token);
286
+ input = new Request(_input.toString(), init);
287
+ }
288
+ else if (input instanceof URL) {
289
+ input.searchParams.append(asc.name, token);
290
+ }
291
+ break;
292
+ }
293
+ return fn(input, init);
294
+ };
295
+ return _fn;
296
+ }
297
+ basicAuthFetcherStatic(token, fn) {
298
+ const _fn = async (input, init) => {
299
+ if (!init) {
300
+ init = {};
301
+ }
302
+ if (!init.headers) {
303
+ init.headers = new Headers();
304
+ }
305
+ if (init.headers instanceof Headers) {
306
+ init.headers.set('Authorization', `Basic ${token}`);
307
+ }
308
+ else if (init.headers instanceof Array) {
309
+ init.headers.push(['Authorization', `Basic ${token}`]);
310
+ }
311
+ else {
312
+ init.headers = {
313
+ ...init.headers,
314
+ ['Authorization']: `Basic ${token}`,
315
+ };
316
+ }
317
+ return fn(input, init);
318
+ };
319
+ return _fn;
320
+ }
321
+ bearerTokenFetcherStatic(token, fn) {
322
+ const _fn = async (input, init) => {
323
+ if (!init) {
324
+ init = {};
325
+ }
326
+ if (!init.headers) {
327
+ init.headers = new Headers();
328
+ }
329
+ if (init.headers instanceof Headers) {
330
+ init.headers.set('Authorization', `Bearer ${token}`);
331
+ }
332
+ else if (init.headers instanceof Array) {
333
+ init.headers.push(['Authorization', `Bearer ${token}`]);
334
+ }
335
+ else {
336
+ init.headers = {
337
+ ...init.headers,
338
+ ['Authorization']: `Bearer ${token}`,
339
+ };
340
+ }
341
+ return fn(input, init);
342
+ };
343
+ return _fn;
344
+ }
345
+ // getOauth2Token fetches an OAuth2 token, stores the result in a cache, and returns the token.
346
+ // If forceRefresh is true, it will bypass the cache and fetch a new token then update the cache.
347
+ async getOAuth2Token(credId, forceRefresh = false) {
348
+ if (!forceRefresh && this.oauth2Cache.has(credId)) {
349
+ // we do cache.has so it will be there, hence the ! operator
350
+ const cached = this.oauth2Cache.get(credId);
351
+ // check the expiry: if the oauth2 token has an expiry and it is going to expire
352
+ // after the next 10 minutes, then simply return. Otherswise set forceRefresh to true,
353
+ // get a new token and update the cache
354
+ if (cached.expiry) {
355
+ if (this.checkExpiry(cached.expiry)) {
356
+ return Promise.resolve(cached);
357
+ }
358
+ else {
359
+ forceRefresh = true;
360
+ }
361
+ }
362
+ }
363
+ let tokenResponse = await this.getToken(credId, forceRefresh);
364
+ // we need to check the expiry of this new token in case it is going to expire soon.
365
+ if (tokenResponse?.token?.expiry && !this.checkExpiry(tokenResponse.token.expiry)) {
366
+ tokenResponse = await this.getToken(credId, true);
367
+ }
368
+ const newOauthTokenData = {
369
+ token: tokenResponse.token?.accessToken || '',
370
+ tokenType: tokenResponse.token?.tokenType,
371
+ expiry: tokenResponse.token?.expiry,
372
+ };
373
+ this.oauth2Cache.set(credId, newOauthTokenData);
374
+ return Promise.resolve(newOauthTokenData);
375
+ }
376
+ // Check if the given timestamp is expiring in the next 10 minutes.
377
+ // Returns true if not expiring, false otherwise
378
+ checkExpiry(ts) {
379
+ return timestampMs(ts) > (Date.now() + 10 * 60 * 1000);
380
+ }
381
+ oauth2FetcherStatic(credId, fn) {
382
+ const refreshFn = async (input, init, forceRefresh = false) => {
383
+ const tokenResponse = await this.getOAuth2Token(credId, forceRefresh);
384
+ const token = tokenResponse.token;
385
+ const _tokenType = () => {
386
+ const _tt = tokenResponse.tokenType?.toLowerCase();
387
+ switch (_tt) {
388
+ case 'bearer':
389
+ return 'Bearer';
390
+ case 'mac':
391
+ return 'MAC';
392
+ case 'basic':
393
+ return 'Basic';
178
394
  default:
179
- break;
395
+ return 'Bearer';
180
396
  }
397
+ };
398
+ if (!init) {
399
+ init = {};
400
+ }
401
+ if (!init.headers) {
402
+ init.headers = new Headers();
403
+ }
404
+ if (init.headers instanceof Headers) {
405
+ init.headers.set('Authorization', `${_tokenType()} ${token}`);
406
+ }
407
+ else if (init.headers instanceof Array) {
408
+ init.headers.push(['Authorization', `${_tokenType()} ${token}`]);
409
+ }
410
+ else {
411
+ init.headers = {
412
+ ...init.headers,
413
+ ['Authorization']: `${_tokenType()} ${token}`,
414
+ };
415
+ }
416
+ return fn(input, init);
417
+ };
418
+ const _fn = async (input, init) => {
419
+ const resp = await refreshFn(input, init);
420
+ if (resp.status === 401 || resp.status === 403) {
421
+ this.log.debug('Received unauthorized response, attempting to refresh token', {
422
+ url: input,
423
+ status: resp.status,
424
+ });
425
+ return refreshFn(input, init, true);
426
+ }
427
+ return resp;
428
+ };
429
+ return _fn;
430
+ }
431
+ oauth1FetcherStatic(metadata, fn) {
432
+ const _fn = async (input, init) => {
433
+ const authParams = new URLSearchParams(metadata.authorizationMetadata?.authorizationParams);
434
+ if (!metadata.authorizationMetadata) {
435
+ throw new Error('OAuth1 metadata not found');
436
+ }
437
+ const oauth = new OAuth({
438
+ consumer: {
439
+ key: metadata.authorizationMetadata.consumerKey,
440
+ secret: metadata.authorizationMetadata.consumerSecret,
441
+ },
442
+ signature_method: 'HMAC-SHA256',
443
+ hash_function: (baseString, key) => createHmac('sha256', key).update(baseString).digest('base64'),
444
+ realm: authParams.get('realm') || undefined,
181
445
  });
182
- return _fetch(_input, init);
446
+ let url;
447
+ if (input instanceof Request) {
448
+ url = input.url;
449
+ }
450
+ else if (input instanceof URL) {
451
+ url = input.toString();
452
+ }
453
+ else if (typeof input === 'string') {
454
+ url = input;
455
+ }
456
+ else {
457
+ throw new Error('Invalid input type for OAuth1 fetcher');
458
+ }
459
+ const header = oauth.toHeader(oauth.authorize({
460
+ url: url,
461
+ method: init?.method || 'GET',
462
+ }, {
463
+ key: metadata.authorizationMetadata?.oauthToken,
464
+ secret: metadata.authorizationMetadata?.oauthTokenSecret,
465
+ }));
466
+ const authHeader = header.Authorization;
467
+ if (!init) {
468
+ init = {};
469
+ }
470
+ if (!init.headers) {
471
+ init.headers = new Headers();
472
+ }
473
+ if (init.headers instanceof Headers) {
474
+ init.headers.set('Authorization', authHeader);
475
+ }
476
+ else if (init.headers instanceof Array) {
477
+ init.headers.push(['Authorization', authHeader]);
478
+ }
479
+ else {
480
+ init.headers = {
481
+ ...init.headers,
482
+ ['Authorization']: authHeader,
483
+ };
484
+ }
485
+ return fn(input, init);
183
486
  };
184
- return Promise.resolve(_fn);
487
+ return _fn;
488
+ }
489
+ mtlsFetcherStatic(mtlsdata, fn) {
490
+ const _fn = async (input, init) => {
491
+ const cert = new TextDecoder().decode(mtlsdata.cert);
492
+ const key = new TextDecoder().decode(mtlsdata.key);
493
+ const caCerts = new TextDecoder().decode(mtlsdata.ca ?? new Uint8Array());
494
+ const httpClient = Deno.createHttpClient({
495
+ cert,
496
+ key,
497
+ caCerts: caCerts ? [caCerts] : [],
498
+ });
499
+ return fn(input, {
500
+ ...init,
501
+ client: httpClient,
502
+ });
503
+ };
504
+ return _fn;
185
505
  }
186
506
  createDynamic(templateName) {
187
507
  const template = this.cfgReader.getTemplateID(templateName);
188
508
  if (!template) {
189
- this.log.debug('Template not found in config, could be a static connection', {
190
- templateName: templateName,
191
- });
192
509
  return Promise.resolve(undefined);
193
510
  }
194
511
  const _fn = async (activation, input, init) => {
@@ -10,6 +10,14 @@ export type WebhookCorsOptions = boolean | {
10
10
  exposedHeaders: string[];
11
11
  credentials: boolean;
12
12
  };
13
+ export type WebhookRequestOptions = {
14
+ /**
15
+ * If true, the raw body of the request will be passed to the context. Users will need to
16
+ * handle the parsing of the body themselves, and `data` in context will be undefined. Instead,
17
+ * you should call `const req = await ctx.request()` to retrieve the raw request.
18
+ */
19
+ rawBody?: boolean;
20
+ };
13
21
  export type WebhookResponseOptions = {
14
22
  /**
15
23
  * Mode determines how the response is sent to the client. The response can be customized by
@@ -44,6 +52,7 @@ export type WebhookOptions = {
44
52
  cors?: WebhookCorsOptions;
45
53
  response?: WebhookResponseOptions;
46
54
  connection?: string;
55
+ request?: WebhookRequestOptions;
47
56
  };
48
57
  export declare class WebhookTrigger implements Trigger<WebhookData> {
49
58
  id: string;
@@ -1 +1 @@
1
- {"version":3,"file":"WebhookTrigger.d.ts","sourceRoot":"","sources":["../../../../src/src/dsl/triggers/WebhookTrigger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAgB,MAAM,gBAAgB,CAAC;AAExD,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AAEhD,MAAM,MAAM,kBAAkB,GAAG,OAAO,GAAG;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,WAAW,EAAE,OAAO,CAAC;CACxB,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG;IACjC;;;;;;;;OAQG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAExB;;;;;;;OAOG;IACH,SAAS,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC;IAE7C;;;;;;;OAOG;IACH,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC;CAC9C,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IACzB,IAAI,CAAC,EAAE,kBAAkB,CAAC;IAC1B,QAAQ,CAAC,EAAE,sBAAsB,CAAC;IAClC,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB,CAAA;AAED,qBAAa,cAAe,YAAW,OAAO,CAAC,WAAW,CAAC;IACvD,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,cAAc,CAAC;IAExB,CAAC,WAAW,CAAC,EAAE,MAAM,CAAa;gBAEtB,EAAE,EAAE,MAAM,EAAE,OAAO,GAAE,cAAmB;IAKpD,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC;CAG1D;AAED,wBAAgB,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC,CAElF"}
1
+ {"version":3,"file":"WebhookTrigger.d.ts","sourceRoot":"","sources":["../../../../src/src/dsl/triggers/WebhookTrigger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAgB,MAAM,gBAAgB,CAAC;AAExD,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AAEhD,MAAM,MAAM,kBAAkB,GAAG,OAAO,GAAG;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,WAAW,EAAE,OAAO,CAAC;CACxB,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG;IAChC;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG;IACjC;;;;;;;;OAQG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAExB;;;;;;;OAOG;IACH,SAAS,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC;IAE7C;;;;;;;OAOG;IACH,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC;CAC9C,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IACzB,IAAI,CAAC,EAAE,kBAAkB,CAAC;IAC1B,QAAQ,CAAC,EAAE,sBAAsB,CAAC;IAClC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,qBAAqB,CAAC;CACnC,CAAA;AAED,qBAAa,cAAe,YAAW,OAAO,CAAC,WAAW,CAAC;IACvD,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,cAAc,CAAC;IAExB,CAAC,WAAW,CAAC,EAAE,MAAM,CAAa;gBAEtB,EAAE,EAAE,MAAM,EAAE,OAAO,GAAE,cAAmB;IAKpD,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC;CAG1D;AAED,wBAAgB,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC,CAElF"}
@@ -1 +1 @@
1
- {"version":3,"file":"DurableInterpreter.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/durable/DurableInterpreter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DurableInterpreter.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/durable/DurableInterpreter.ts"],"names":[],"mappings":"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"}
@@ -3,7 +3,6 @@ import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-proto';
3
3
  import { resourceFromAttributes } from '@opentelemetry/resources';
4
4
  import { NodeSDK } from '@opentelemetry/sdk-node';
5
5
  import express from 'express';
6
- import xmlparser from 'express-xml-bodyparser';
7
6
  import { catchError, EMPTY, mergeMap, of, tap } from 'rxjs';
8
7
  import { ContextProviderImpl } from '../../context/ContextProvider.js';
9
8
  import { DefaultRoundTripperFactory } from '../../dsl/http/default.js';
@@ -251,16 +250,8 @@ export class DurableInterpreter {
251
250
  const port = Deno.env.get('PORT') || 3000;
252
251
  const cronPort = Deno.env.get('CRON_PORT') || 3001;
253
252
  const webhookApp = express();
254
- webhookApp.use(express.json({ limit: '50mb' })); // Add JSON body parser middleware
255
253
  const cronApp = express();
256
254
  cronApp.use(express.json());
257
- const xml2jsDefaults = {
258
- explicitArray: false,
259
- normalize: false,
260
- normalizeTags: false,
261
- trim: true,
262
- };
263
- webhookApp.use(xmlparser(xml2jsDefaults));
264
255
  // Add health check route
265
256
  this.webhookRouter.get('/health', (_req, res) => {
266
257
  res.json({ status: 'healthy' });
@@ -1 +1 @@
1
- {"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/webhook.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAEtF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAgD7C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,CA8RxE,CAAC"}
1
+ {"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/webhook.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAEtF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAwD7C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,CAgSxE,CAAC"}
@@ -1,8 +1,16 @@
1
1
  import cors from 'cors';
2
+ import express from 'express';
2
3
  import { pipeline } from 'node:stream/promises';
3
4
  import { Observable } from 'rxjs';
4
5
  import { createActIdDynamicWebhookMiddleware, createStaticWebhookMiddleware, createUserIdDynamicWebhookMiddleware, } from '../../../dsl/http/versori/webhookmiddleware.js';
5
6
  import { WebhookTrigger } from '../../../dsl/triggers/WebhookTrigger.js';
7
+ import xmlparser from 'express-xml-bodyparser';
8
+ const xml2jsDefaults = {
9
+ explicitArray: false,
10
+ normalize: false,
11
+ normalizeTags: false,
12
+ trim: true,
13
+ };
6
14
  const DEFAULT_SYNC_ON_SUCCESS = (ctx) => new Response(JSON.stringify(ctx.data), {
7
15
  status: 200,
8
16
  headers: {
@@ -40,7 +48,7 @@ const DEFAULT_ASYNC_ON_ERROR = (ctx) => new Response(JSON.stringify({
40
48
  export const webhookCompiler = {
41
49
  ctor: WebhookTrigger,
42
50
  compile: (ctx, trigger, signal) => {
43
- const { response: { mode = 'async', } = {}, cors: corsOptions, } = trigger.options;
51
+ const { response: { mode = 'async' } = {}, cors: corsOptions } = trigger.options;
44
52
  const isSync = mode === 'sync';
45
53
  const isAsync = mode === 'async';
46
54
  if (!isSync && !isAsync) {
@@ -67,6 +75,13 @@ export const webhookCompiler = {
67
75
  },
68
76
  request: req,
69
77
  });
78
+ if (!trigger.options.request?.rawBody) {
79
+ ctx.webhookRouter.use(express.json({ limit: '50mb' }));
80
+ ctx.webhookRouter.use(xmlparser(xml2jsDefaults));
81
+ }
82
+ else {
83
+ ctx.webhookRouter.use(express.raw({ type: '*/*', limit: '50mb' }));
84
+ }
70
85
  return new Observable((subscriber) => {
71
86
  if (!ctx.webhookRouter) {
72
87
  throw new Error('Router not available in compiler context');
@@ -1 +1 @@
1
- {"version":3,"file":"MemoryInterpreter.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/memory/MemoryInterpreter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"MemoryInterpreter.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/memory/MemoryInterpreter.ts"],"names":[],"mappings":"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"}
@@ -3,7 +3,6 @@ import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-proto';
3
3
  import { resourceFromAttributes } from '@opentelemetry/resources';
4
4
  import { NodeSDK } from '@opentelemetry/sdk-node';
5
5
  import express from 'express';
6
- import xmlparser from 'express-xml-bodyparser';
7
6
  import { catchError, EMPTY, mergeMap, of, tap } from 'rxjs';
8
7
  import { ContextProviderImpl } from '../../context/ContextProvider.js';
9
8
  import { DefaultRoundTripperFactory } from '../../dsl/http/default.js';
@@ -240,16 +239,8 @@ export class MemoryInterpreter {
240
239
  const port = Deno.env.get('PORT') || 3000;
241
240
  const cronPort = Deno.env.get('CRON_PORT') || 3001;
242
241
  const webhookApp = express();
243
- webhookApp.use(express.json({ limit: '50mb' })); // Add JSON body parser middleware
244
242
  const cronApp = express();
245
243
  cronApp.use(express.json());
246
- const xml2jsDefaults = {
247
- explicitArray: false,
248
- normalize: false,
249
- normalizeTags: false,
250
- trim: true,
251
- };
252
- webhookApp.use(xmlparser(xml2jsDefaults));
253
244
  // Add health check route
254
245
  this.webhookRouter.get('/health', (_req, res) => {
255
246
  res.json({ status: 'healthy' });
@@ -1 +1 @@
1
- {"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/webhook.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAEtF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAgD7C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,CA8RxE,CAAC"}
1
+ {"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/webhook.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAEtF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAwD7C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,CAgSxE,CAAC"}