@contember/engine-actions 1.3.0-beta.2 → 1.3.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/engine-actions",
-  "version": "1.3.0-beta.2",
+  "version": "1.3.0-beta.4",
   "license": "proprietary",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",
@@ -13,25 +13,25 @@
     "test": "vitest --no-threads"
   },
   "dependencies": {
-    "@contember/authorization": "1.3.0-beta.2",
-    "@contember/database": "1.3.0-beta.2",
-    "@contember/database-migrations": "1.3.0-beta.2",
-    "@contember/engine-common": "1.3.0-beta.2",
-    "@contember/engine-content-api": "1.3.0-beta.2",
-    "@contember/engine-http": "1.3.0-beta.2",
-    "@contember/engine-plugins": "1.3.0-beta.2",
-    "@contember/engine-system-api": "1.3.0-beta.2",
-    "@contember/engine-tenant-api": "1.3.0-beta.2",
-    "@contember/graphql-utils": "1.3.0-beta.2",
-    "@contember/logger": "1.3.0-beta.2",
-    "@contember/schema": "1.3.0-beta.2",
-    "@contember/schema-utils": "1.3.0-beta.2",
-    "@contember/typesafe": "1.3.0-beta.2",
+    "@contember/authorization": "1.3.0-beta.4",
+    "@contember/database": "1.3.0-beta.4",
+    "@contember/database-migrations": "1.3.0-beta.4",
+    "@contember/engine-common": "1.3.0-beta.4",
+    "@contember/engine-content-api": "1.3.0-beta.4",
+    "@contember/engine-http": "1.3.0-beta.4",
+    "@contember/engine-plugins": "1.3.0-beta.4",
+    "@contember/engine-system-api": "1.3.0-beta.4",
+    "@contember/engine-tenant-api": "1.3.0-beta.4",
+    "@contember/graphql-utils": "1.3.0-beta.4",
+    "@contember/logger": "1.3.0-beta.4",
+    "@contember/schema": "1.3.0-beta.4",
+    "@contember/schema-utils": "1.3.0-beta.4",
+    "@contember/typesafe": "1.3.0-beta.4",
     "@graphql-tools/schema": "^8.3.5",
     "graphql-tag": "^2.12.5"
   },
   "devDependencies": {
-    "@contember/engine-api-tester": "1.3.0-beta.2",
+    "@contember/engine-api-tester": "1.3.0-beta.4",
     "@graphql-codegen/cli": "^2.6.2",
     "@graphql-codegen/typescript": "^2.5.1",
     "@graphql-codegen/typescript-operations": "^2.4.2",

package/src/dispatch/WebhookTargetHandler.ts

@@ -83,7 +83,14 @@ export class WebhookTargetHandler implements InvokeHandler<Actions.WebhookTarget
 		}
 
 		try {
-			const responseData = ResponseType(JSON.parse(response.responseText))
+			const parsedJson = JSON.parse(response.responseText)
+			if (parsedJson === null || typeof parsedJson !== 'object' || !('failures' in parsedJson)) {
+				return () => ({
+					ok: true,
+					code: response.status,
+				})
+			}
+			const responseData = ResponseType(parsedJson)
 			const eventsInBatch = new Set(events.map(it => it.id))
 			const failedEvents = Object.fromEntries(responseData.failures?.map(it => [it.eventId, it]) ?? [])
 			const missingEvents =  Object.keys(failedEvents).filter(it => !eventsInBatch.has(it))

package/tests/cases/unit/webhookHandler.test.ts

@@ -166,7 +166,7 @@ describe('webhook handler', () => {
 				return Promise.resolve({
 					ok: true,
 					headers: new Headers([['content-type', 'application/json']]),
-					responseText: `{"events": []}`,
+					responseText: `{"failures": [{}]}`,
 					status: 200,
 					statusText: 'OK',
 				})
@@ -196,8 +196,8 @@ describe('webhook handler', () => {
 					ok: false,
 					code: 200,
 					durationMs: -1,
-					errorMessage: 'Invalid response: value at path /failures: must be array, undefined given',
-					response: '{"events": []}',
+					errorMessage: 'Invalid response: value at path /failures/0/eventId: must be string, undefined given',
+					response: '{"failures": [{}]}',
 				},
 			},
 			{
@@ -207,14 +207,71 @@ describe('webhook handler', () => {
 					ok: false,
 					code: 200,
 					durationMs: -1,
-					errorMessage: 'Invalid response: value at path /failures: must be array, undefined given',
-					response: '{"events": []}',
+					errorMessage: 'Invalid response: value at path /failures/0/eventId: must be string, undefined given',
+					response: '{"failures": [{}]}',
 				},
 			},
 		])
 	})
 
 
+	test('ignored invalid response', async () => {
+		const testLoggerHandler = new TestLoggerHandler()
+		const logger = createLogger(testLoggerHandler)
+
+		let fetchCalled = false
+		const webhookHandler = new WebhookTargetHandler({
+			fetch(url: string, init: RequestInit): Promise<FetcherResponse> {
+				fetchCalled = true
+				assert.equal(url, 'http://localhost')
+
+				return Promise.resolve({
+					ok: true,
+					headers: new Headers([['content-type', 'application/json']]),
+					responseText: `{"success": true}`,
+					status: 200,
+					statusText: 'OK',
+				})
+			},
+		})
+
+		const target: Actions.AnyTarget = {
+			name: 'test_target',
+			type: 'webhook',
+			url: 'http://localhost',
+		}
+
+		const event1 = createTestEvent(0)
+		const event2 = createTestEvent(1)
+		const result = await webhookHandler.handle({
+			logger,
+			target: target,
+			events: [event1, event2],
+			variables: {},
+		})
+		assert.equal(fetchCalled, true)
+		assert.deepStrictEqual(dropDuration(result), [
+			{
+				row: event1,
+				target,
+				result: {
+					ok: true,
+					code: 200,
+					durationMs: -1,
+				},
+			},
+			{
+				row: event2,
+				target,
+				result: {
+					ok: true,
+					code: 200,
+					durationMs: -1,
+				},
+			},
+		])
+	})
+
 	test('partially successful response', async () => {
 		const testLoggerHandler = new TestLoggerHandler()
 		const logger = createLogger(testLoggerHandler)