Dave Conway-Jones 
							
						 
					 
					
						
						
							
						
						f2cb5ea44e 
					 
					
						
						
							
							Allow msg.reset to reset connection when tcp request in stay connected mode  
						
						 
						
						
						
						
					 
					
						2023-11-01 12:07:50 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rotzbua 
							
						 
					 
					
						
						
							
						
						65d2ad68d3 
					 
					
						
						
							
							Fix duplicate declaration  
						
						 
						
						
						
						
					 
					
						2023-09-05 19:02:39 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						1f98d19f77 
					 
					
						
						
							
							Merge pull request  #4309  from node-red/pr_4265  
						
						 
						
						... 
						
						
						
						Adding function timeout to settings file (#4265 ) 
						
						
					 
					
						2023-09-05 11:44:41 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						9a934c941f 
					 
					
						
						
							
							Tidy up functionTimeout setting  
						
						 
						
						
						
						
					 
					
						2023-09-05 10:34:18 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						1bad643b30 
					 
					
						
						
							
							Merge pull request  #4302  from node-red/4291-auto-sub-mqtt-error  
						
						 
						
						... 
						
						
						
						Remove unnecessary check for clientid if autoUnsub set 
						
						
					 
					
						2023-09-05 09:43:52 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						a12826e719 
					 
					
						
						
							
							Remove unnecessary check for clientid if autoUnsub set  
						
						 
						
						... 
						
						
						
						Fixes  #4291  
						
						
					 
					
						2023-09-02 20:48:13 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						f6f36c5599 
					 
					
						
						
							
							Fix function setup tab layout  
						
						 
						
						
						
						
					 
					
						2023-09-01 16:17:29 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kazuhito Yokoi 
							
						 
					 
					
						
						
							
						
						3fd2b5f4e1 
					 
					
						
						
							
							Merge branch 'dev' into dev-tostring4filenodes  
						
						 
						
						
						
						
					 
					
						2023-08-14 21:16:57 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kazuhito Yokoi 
							
						 
					 
					
						
						
							
						
						8a4128defb 
					 
					
						
						
							
							Fix handling in file nodes when 0 is specified as file name  
						
						 
						
						
						
						
					 
					
						2023-08-14 19:53:00 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						97470e94f1 
					 
					
						
						
							
							Merge pull request  #4262  from sammachin/patch-3  
						
						 
						
						... 
						
						
						
						Handle 204 in httprequest JSON 
						
						
					 
					
						2023-08-14 11:10:24 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kazuhito Yokoi 
							
						 
					 
					
						
						
							
						
						0dd771351d 
					 
					
						
						
							
							Fix handling in file nodes when number is specified as file name  
						
						 
						
						
						
						
					 
					
						2023-08-06 20:35:33 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kilian Hertel 
							
						 
					 
					
						
						
							
						
						f7b64b101e 
					 
					
						
						
							
							adding function timeout to settings file  
						
						 
						
						... 
						
						
						
						adding function timeout to settings file 
						
						
					 
					
						2023-08-04 14:20:49 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Machin 
							
						 
					 
					
						
						
							
						
						2b01a3fcd3 
					 
					
						
						
							
							Handle 204 in httprequest JSON  
						
						 
						
						... 
						
						
						
						If the http statusCode is 204 (Success, No Content) and the node return type is set to JSON this sets msg.payload as an empty json object so as to supress the JSON parse error 
						
						
					 
					
						2023-08-02 14:15:29 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						8b7b3e22d7 
					 
					
						
						
							
							Merge branch 'master' into dev  
						
						 
						
						
						
						
					 
					
						2023-07-26 16:59:12 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						d21c0758b1 
					 
					
						
						
							
							Merge pull request  #4246  from kazuhitoyokoi/dev-fixfilenode  
						
						 
						
						... 
						
						
						
						Fix JSONata in file nodes 
						
						
					 
					
						2023-07-26 11:55:32 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Manuel Buchner 
							
						 
					 
					
						
						
							
						
						21be329008 
					 
					
						
						
							
							fix html syntax in 21-httprequest.html  
						
						 
						
						
						
						
					 
					
						2023-07-18 17:16:17 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kazuhito Yokoi 
							
						 
					 
					
						
						
							
						
						9dcb8a729c 
					 
					
						
						
							
							Show timeout icon in link call node  
						
						 
						
						
						
						
					 
					
						2023-07-15 18:16:42 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kazuhito Yokoi 
							
						 
					 
					
						
						
							
						
						b66237efa8 
					 
					
						
						
							
							Show timeout icon in function node  
						
						 
						
						
						
						
					 
					
						2023-07-15 18:15:34 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kazuhito Yokoi 
							
						 
					 
					
						
						
							
						
						f3847a17f3 
					 
					
						
						
							
							Fix JSONata in file-in node  
						
						 
						
						
						
						
					 
					
						2023-07-14 00:24:50 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kazuhito Yokoi 
							
						 
					 
					
						
						
							
						
						80e33489d9 
					 
					
						
						
							
							Fix JSONata in file nodes  
						
						 
						
						
						
						
					 
					
						2023-07-12 02:36:39 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						271b1327c7 
					 
					
						
						
							
							Merge branch 'dev' into revert-4225-4196-fix-jsonata-env-var-async  
						
						 
						
						
						
						
					 
					
						2023-07-10 12:37:41 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						69aacc6256 
					 
					
						
						
							
							Merge pull request  #4228  from node-red/4223-fix-http-request-keep-alive  
						
						 
						
						... 
						
						
						
						Fix connection keep-alive in http request node 
						
						
					 
					
						2023-07-10 12:31:28 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kazuhito Yokoi 
							
						 
					 
					
						
						
							
						
						18e1b670ca 
					 
					
						
						
							
							Make handlings one line  
						
						 
						
						
						
						
					 
					
						2023-07-02 01:33:11 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kazuhito Yokoi 
							
						 
					 
					
						
						
							
						
						cd76c934b6 
					 
					
						
						
							
							Fix broken text input in the switch node  
						
						 
						
						
						
						
					 
					
						2023-07-02 00:40:15 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						51a0b68d8e 
					 
					
						
						
							
							Revert "Add callback to getSetting to support async jsonata access"  
						
						 
						
						
						
						
					 
					
						2023-06-22 10:17:48 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						ce679f90ee 
					 
					
						
						
							
							Merge pull request  #4177  from k1ln/adding-timeout-to-functio-node  
						
						 
						
						... 
						
						
						
						adding timeout attribute to function node 
						
						
					 
					
						2023-06-21 15:57:44 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						8fb379079b 
					 
					
						
						
							
							Merge pull request  #4225  from node-red/4196-fix-jsonata-env-var-async  
						
						 
						
						... 
						
						
						
						Add callback to getSetting to support async jsonata access 
						
						
					 
					
						2023-06-21 15:56:11 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						610cb170e7 
					 
					
						
						
							
							Fix connection keep-alive in http request node  
						
						 
						
						
						
						
					 
					
						2023-06-21 15:45:23 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						aa0225f59f 
					 
					
						
						
							
							Apply suggestions from code review  
						
						 
						
						
						
						
					 
					
						2023-06-21 14:27:32 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						2571949e90 
					 
					
						
						
							
							Merge pull request  #4143  from inNETMonitoring/fix/joinManual  
						
						 
						
						... 
						
						
						
						fix: closes  #4142  
						
						
					 
					
						2023-06-21 14:24:53 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						3f604e9d93 
					 
					
						
						
							
							Adds optional callback to env.get in function node  
						
						 
						
						
						
						
					 
					
						2023-06-21 14:20:23 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						aafb86ef09 
					 
					
						
						
							
							Merge branch 'dev' into adding-timeout-to-functio-node  
						
						 
						
						
						
						
					 
					
						2023-06-21 13:35:48 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						0b3f7dbb1f 
					 
					
						
						
							
							Merge pull request  #4203  from node-red/fix-delay-node-flush-issue-4202  
						
						 
						
						... 
						
						
						
						Fix delay node flush issue 
						
						
					 
					
						2023-06-21 13:27:32 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kilian Hertel 
							
						 
					 
					
						
						
							
						
						876053f858 
					 
					
						
						
							
							Merge branch 'dev' into adding-timeout-to-functio-node  
						
						 
						
						
						
						
					 
					
						2023-05-30 14:55:56 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								BitCaesar 
							
						 
					 
					
						
						
							
						
						4fe29dd33f 
					 
					
						
						
							
							Merge branch 'dev' into fix/joinManual  
						
						 
						
						
						
						
					 
					
						2023-05-30 10:42:04 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Steve-Mcl 
							
						 
					 
					
						
						
							
						
						a78da0db1e 
					 
					
						
						
							
							Update status and catch node labels in group mode  
						
						 
						
						
						
						
					 
					
						2023-05-29 22:47:29 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dave Conway-Jones 
							
						 
					 
					
						
						
							
						
						5e4fce1e12 
					 
					
						
						
							
							Fix delay node flush issue  
						
						 
						
						... 
						
						
						
						to close  #4202  
						
						
					 
					
						2023-05-27 17:51:21 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Steve-Mcl 
							
						 
					 
					
						
						
							
						
						6cb4c9224d 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/dev' into fix-mqtt-keep-subscription-4132  
						
						 
						
						
						
						
					 
					
						2023-05-26 10:46:59 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						1978a360af 
					 
					
						
						
							
							Merge pull request  #4191  from node-red/update-xml2js  
						
						 
						
						... 
						
						
						
						Update xml2js 
						
						
					 
					
						2023-05-26 10:30:13 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						3a9f38a873 
					 
					
						
						
							
							Merge branch 'master' into dev  
						
						 
						
						
						
						
					 
					
						2023-05-25 17:42:34 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						0697c26dd1 
					 
					
						
						
							
							Merge branch 'dev' into adding-timeout-to-functio-node  
						
						 
						
						
						
						
					 
					
						2023-05-25 17:33:41 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						cfa25dc655 
					 
					
						
						
							
							Update xml2js  
						
						 
						
						
						
						
					 
					
						2023-05-25 17:30:17 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Steve-Mcl 
							
						 
					 
					
						
						
							
						
						0528c12782 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/dev' into fix-mqtt-keep-subscription-4132  
						
						 
						
						
						
						
					 
					
						2023-05-25 12:07:33 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						11ded1e497 
					 
					
						
						
							
							Merge branch 'dev' into 3843-alternative-impl  
						
						 
						
						
						
						
					 
					
						2023-05-22 17:41:23 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kilian Hertel 
							
						 
					 
					
						
						
							
						
						c2812b05a4 
					 
					
						
						
							
							Merge branch 'master' into adding-timeout-to-functio-node  
						
						 
						
						
						
						
					 
					
						2023-05-22 17:42:59 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						a790136164 
					 
					
						
						
							
							Merge branch 'master' into 4133-mqtt-v5-disconnects-when-subscribing-to-aws-core-broker  
						
						 
						
						
						
						
					 
					
						2023-05-22 15:16:58 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						69d643942c 
					 
					
						
						
							
							Merge branch 'dev' into update-deps  
						
						 
						
						
						
						
					 
					
						2023-05-22 13:57:47 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						6e1b298282 
					 
					
						
						
							
							Reconstruct xml2js output as proper object  
						
						 
						
						
						
						
					 
					
						2023-05-22 13:57:12 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						c2387777c9 
					 
					
						
						
							
							Merge branch 'master' into dev  
						
						 
						
						
						
						
					 
					
						2023-05-22 12:52:07 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kilian Hertel 
							
						 
					 
					
						
						
							
						
						2253417459 
					 
					
						
						
							
							adding timeout attribute to function node  
						
						 
						
						... 
						
						
						
						- [x] New feature (non-breaking change which adds functionality)
Discussion here:
https://discourse.nodered.org/t/function-node-doesnt-have-timeout-feature/78483 
## Proposed changes
Adding a timeout attribute to the function node, so an endless funciton doesnt break the node red server.
## Checklist
- [x] I have read the [contribution guidelines](https://github.com/node-red/node-red/blob/master/CONTRIBUTING.md )
- [x] For non-bugfix PRs, I have discussed this change on the forum/slack team.
- [x] I have run `grunt` to verify the unit tests pass
- [x] I have added suitable unit tests to cover the new/changed functionality 
						
						
					 
					
						2023-05-22 10:16:37 +02:00