Adjust to new version. Introduce mqtt-helper

Author: [email protected]

.vscode/launch.json

@@ -0,0 +1,15 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Python: Current File",
+            "type": "python",
+            "request": "launch",
+            "program": "${file}",
+            "console": "integratedTerminal"
+        }
+    ]
+}

remote-access/README.md

@@ -1,12 +1,12 @@
 # thin-edge.io remote access
 
-To access a device remotely that runs thin edge, `remote_connect.py` can be used. After startup, it will connect to the Cumulocity cloud/edge instance. From that point on you can use the remote access tab in device management to access the device. In addition your can use a local proxy or connect any local port on the device.
+To access a device remotely that runs thin edge, `remote_connect.py` can be used. After startup, it will connect to the Cumulocity cloud/edge instance. From that point on you can use the remote access tab in device management to access the device. In addition you can use a local proxy or connect any local port on the device. This plugin demos how operations can be carried out using  MQTT only connection (omitting the build in operation handling of thinEdge.io)
 
 ## Requirements
 
 - Working thin edge installation
 
-- Python3 and pip3 installation (will not work on python2)
+- >=Python3.7 and pip3 installation (will not work on python2)
 
 - The Cloud Remote Access Feature is assigned to your Tenant. If not ask your Administrator to get it assigned to your Tenant. Please note that the Version must be at least 1007.2.0+
 
@@ -23,10 +23,13 @@ To access a device remotely that runs thin edge, `remote_connect.py` can be used
 
 ## Usage
 
-Make sure thin edge is connected to  Cumulocity.
-
 run 
+```bash
+sudo touch /etc/tedge/operations/c8y/c8y_RemoteAccessConnect
+```
+Make sure thin edge is connected to  Cumulocity.
 
+run
 ```python
 python3 remote_connect.py
 ```

remote-access/c8yMQTT.py

@@ -1,14 +1,16 @@
 import logging
+import sys
+from time import time
 from c8ydp.device_proxy import DeviceProxy, WebSocketFailureException
-from threading import Thread
-import threading
-from c8yMQTT import C8yMQTT
+from paho_mqtt_helper import mqtt_helper
 import concurrent.futures
 import os
+import time
 
 
-logging.basicConfig(level=logging.DEBUG,format='%(asctime)s %(name)s %(message)s')
+logging.basicConfig(filename='remote-access.log',filemode='a',level=logging.DEBUG,format='%(asctime)s %(name)s %(message)s')
 logger = logging.getLogger(__name__)
+logger.addHandler(logging.StreamHandler(sys.stdout))
 
 def setCommandExecuting(command):
     logger.info('Setting command: '+ command + ' to executing')
@@ -34,31 +36,35 @@ def on_message(client, obj, msg):
         tcp_host = fields[2]
         tcp_port = int(fields[3])
         connection_key = fields[4]
-        c8y.logger.info('Received Remote Connect.')
+        logger.info('Received Remote Connect.')
         setCommandExecuting('c8y_RemoteAccessConnect') 
         with concurrent.futures.ThreadPoolExecutor() as executor:
             future = executor.submit(remoteConnect,tcp_host,tcp_port,connection_key,'https://'+url )
             return_value = future.result()
-            c8y.logger.info('Remote Connect Result:' + return_value)
+            logger.info('Remote Connect Result:' + return_value)
             if return_value.startswith('success'):
                 setCommandSuccessfull('c8y_RemoteAccessConnect') 
             else:
                 setCommandFailed('c8y_RemoteAccessConnect',return_value)
 
 
+def on_close_handler(close_status, close_reason):
+    logger.info('Remote connection closed Reason: ' + str(close_reason) + ' Status:'  + str(close_status))
+
 
 
 def remoteConnect( tcp_host,tcp_port,connection_key,base_url):
     try:
-        c8y.logger.info('Starting Remote to: ' + str(tcp_host) + ':' + str(tcp_port) + ' Key: ' + str(connection_key) + ' url: ' + str(base_url))
+        logger.info('Starting Remote to: ' + str(tcp_host) + ':' + str(tcp_port) + ' Key: ' + str(connection_key) + ' url: ' + str(base_url))
         devProx = DeviceProxy(  tcp_host,
                                 tcp_port,
                                 65536,
                                 connection_key,
                                 base_url,
                                 None,
                                 None,
-                                c8y.token
+                                c8y.token,
+                                on_close_handler
                                 )
         devProx.connect()
         logger.info('Remote Connection successfull finished')
@@ -67,17 +73,27 @@ def remoteConnect( tcp_host,tcp_port,connection_key,base_url):
         logger.error('Remote Connection error:' + str(e))
         return str(e)
 
+def refresh_token():
+    logger.info("Starting refresh token thread ")
+    while c8y.connected == 0:
+        logger.info("Refreshing Token")
+        c8y.client.publish("c8y/s/uat", "",0)
+        time.sleep(60.0)
+#
+#  Get connection from tedge config
 stream = os.popen('sudo tedge config get c8y.url')
 url=stream.read().strip() 
 logger.info('Got tenant URL: '+ url)
-c8y = C8yMQTT('remote_connect','localhost',1883,'c8y/s/ds,c8y/s/e,c8y/s/dt,c8y/s/dat')
+c8y = mqtt_helper.MQTTHelper('remote_connect','localhost',1883,'c8y/s/ds,c8y/s/e,c8y/s/dt,c8y/s/dat')
 connected = c8y.connect(on_message)
 logger.info('Connection Result:' + str(connected))
 if connected != 0:
     logger.error('Connection not possible: ' + str(connected))
     exit()
-logger.info('Requesting Token' )
-c8y.client.publish("c8y/s/uat", "",0)
+    
+refresh_token()
+
+
 
 
 

remote-access/remote_connect.py

@@ -1,3 +1,4 @@
 paho-mqtt
+paho-mqtt-helper
 regex
-c8y-device-proxy
+c8y-device-proxy