@steedos-labs/plugin-workflow 3.0.99 → 3.0.101

package/main/default/client/flow2_render.client.js

@@ -1,5 +1,5 @@
 waitForThing(window, 'antd').then(function(){
-    var v = '3.0.99';
+    var v = '3.0.101';
     loadJs('/amis-renderer/amis-renderer.js?v=' + v);
     loadCss('/amis-renderer/amis-renderer.css?v=' + v)
 })

package/main/default/test/test_webhook_error_message.js

@@ -0,0 +1,37 @@
+const assert = require('assert');
+const { getWebhookErrorMessage } = require('../../../src/webhook_error');
+
+console.log('[webhook-error-message] running tests...');
+
+assert.strictEqual(
+	getWebhookErrorMessage({
+		message: 'Request failed with status code 500',
+		response: { data: 'name is required' }
+	}),
+	'name is required'
+);
+
+assert.strictEqual(
+	getWebhookErrorMessage({ response: { data: { errcode: 400, message: '参数错误' } } }),
+	'{"errcode":400,"message":"参数错误"}'
+);
+
+assert.strictEqual(
+	getWebhookErrorMessage(new Error('connect ECONNREFUSED')),
+	'connect ECONNREFUSED'
+);
+
+const circularResponse = {};
+circularResponse.self = circularResponse;
+assert.strictEqual(
+	getWebhookErrorMessage({
+		message: 'Request failed with circular response data',
+		response: { data: circularResponse }
+	}),
+	'Request failed with circular response data'
+);
+
+assert.strictEqual(getWebhookErrorMessage('network error'), 'network error');
+assert.strictEqual(getWebhookErrorMessage(null), 'Unknown webhook error');
+
+console.log('[webhook-error-message] all tests passed');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-labs/plugin-workflow",
-  "version": "3.0.99",
+  "version": "3.0.101",
   "main": "package.service.js",
   "license": "MIT",
   "files": [
@@ -27,7 +27,8 @@
     "test:approve-values": "node main/default/test/test_getApproveValues.js",
     "test:skip-handler-error": "node main/default/test/test_handleSkipProcessed_handlerError.js",
     "test:flow-validator": "node main/default/test/test_flow_validator.js",
-    "test:ajax-error-message": "node main/default/test/test_ajax_error_message.js"
+    "test:ajax-error-message": "node main/default/test/test_ajax_error_message.js",
+    "test:webhook-error-message": "node main/default/test/test_webhook_error_message.js"
   },
   "dependencies": {
     "graphql-parse-resolve-info": "^4.12.3",

package/package.service.js

@@ -7,6 +7,7 @@ const rests = require('./src/rests');
 const InstanceRecordQueue = require('./src/instance_record_queue')
 const WebhookQueue = require('./src/webhook_queue')
 const TimeoutAutoSubmit = require('./src/timeout_auto_submit')
+const { getCollection } = require('./main/default/utils/collection')
 
 /**
  * @typedef {import('moleculer').Context} Context Moleculer's Context
@@ -140,6 +141,8 @@ module.exports = {
 	 * Service started lifecycle event handler
 	 */
 	async started(ctx) {
+		WebhookQueue.collection = await getCollection('_webhook_queue');
+
 		// 注册 app_launcher widgets: 待审核、已审核
 		try {
 			const widgetsObj = this.getObject('widgets');

package/src/webhook_error.js

@@ -0,0 +1,36 @@
+/*
+ * Convert Axios and generic errors to a MongoDB-safe string while preserving
+ * the downstream response body whenever one is available.
+ */
+const getWebhookErrorMessage = function (error) {
+	const responseData = error && error.response && error.response.data;
+
+	if (responseData !== undefined && responseData !== null && responseData !== '') {
+		if (typeof responseData === 'string') {
+			return responseData;
+		}
+
+		try {
+			const serializedResponse = JSON.stringify(responseData);
+			if (typeof serializedResponse === 'string') {
+				return serializedResponse;
+			}
+		} catch (stringifyError) {
+			// Fall through to the regular error message for circular response data.
+		}
+	}
+
+	if (error && error.message) {
+		return String(error.message);
+	}
+
+	if (responseData !== undefined && responseData !== null) {
+		return String(responseData);
+	}
+
+	return error ? String(error) : 'Unknown webhook error';
+};
+
+module.exports = {
+	getWebhookErrorMessage
+};

package/src/webhook_queue.js

@@ -10,6 +10,7 @@ const _ = require("lodash");
 const axios = require('axios');
 
 const { getCollection } = require("../main/default/utils/collection");
+const { getWebhookErrorMessage } = require('./webhook_error');
 
 const WebhookQueue = {};
 
@@ -123,13 +124,14 @@ WebhookQueue.Configure = async function (options) {
 
 			}
 		} catch (error) {
-			console.error(error);
+			const errMsg = getWebhookErrorMessage(error);
+			console.error('WebhookQueue: Error while sending:', errMsg);
 			await WebhookQueue.collection.updateOne({
 				_id: webhook._id
 			}, {
 				$set: {
 					// error message
-					errMsg: error
+					errMsg: errMsg
 				}
 			});
 		}
@@ -280,4 +282,4 @@ WebhookQueue.Configure = async function (options) {
 
 };
 
-module.exports = WebhookQueue;
+module.exports = WebhookQueue;