Merge branch 'master' into feature/declared-acks

Signed-off-by: Yannic Klem <yannic.klem@bosch.io>

Author: Yannic92

java/src/main/java/org/eclipse/ditto/client/messaging/internal/WebSocketMessagingProvider.java

@@ -421,20 +421,15 @@ private WebSocket recreateWebSocket() {
 
     @Override
     public void onBinaryMessage(final WebSocket websocket, final byte[] binary) {
-        callbackExecutor.execute(() -> {
-            final String stringMessage = new String(binary, StandardCharsets.UTF_8);
-            LOGGER.debug(
-                    "Client <{}>: Received WebSocket byte array message <{}>, as string <{}> - don't know what to do" +
-                            " with it!.", sessionId, binary, stringMessage);
-        });
+        final String stringMessage = new String(binary, StandardCharsets.UTF_8);
+        LOGGER.debug("Client <{}>: Received WebSocket byte array message <{}>, as string <{}> - don't know what to do" +
+                " with it!.", sessionId, binary, stringMessage);
     }
 
     @Override
     public void onTextMessage(final WebSocket websocket, final String text) {
-        callbackExecutor.execute(() -> {
-            LOGGER.debug("Client <{}>: Received WebSocket string message <{}>", sessionId, text);
-            handleIncomingMessage(text);
-        });
+        LOGGER.debug("Client <{}>: Received WebSocket string message <{}>", sessionId, text);
+        handleIncomingMessage(text);
     }
 
     private void handleIncomingMessage(final String message) {

javascript/lib/node/src/node-http.ts

@@ -96,7 +96,7 @@ export class NodeRequester implements HttpRequester {
       host: parsedUrl.host,
       path: parsedUrl.pathname
     };
-    if (this.proxyAgent !== undefined) {
+    if (this.proxyAgent !== undefined && this.proxyAgent.options.path !== undefined) {
       request['agent'] = this.proxyAgent;
     }
     return request;

javascript/lib/node/src/node-websocket.ts

@@ -63,7 +63,7 @@ export class NodeWebSocket implements WebSocketImplementation {
       const [authenticatedUrl, authenticatedHeaders] = authenticateWithUrlAndHeaders(url, new Map(), authProviders);
       const plainHeaders = mapToPlainObject(authenticatedHeaders);
       const options: ClientOptions = {
-        agent: agent.proxyAgent,
+        agent: agent.proxyAgent.options.path !== undefined ? agent.proxyAgent : false,
         rejectUnauthorized: false,
         headers: plainHeaders
       };

legal/NOTICE.md

@@ -23,6 +23,7 @@ SPDX-License-Identifier: EPL-2.0
 
 * Copyright 2019 Bosch Software Innovations GmbH
 * Copyright 2020 Bosch.IO GmbH
+* Copyright 2020 Zeptio AB
 
 All content is the property of the respective authors or their employers.
 For more information regarding authorship of content, please consult the