switch ftpclient class to support A1/P1 devices hopefully

update requirements and related adjustments

octoprint_bambu_printer/__init__.py

@@ -27,7 +27,11 @@ class BambuPrintPlugin(
                 "flow_cali": False,
                 "vibration_cali": True,
                 "layer_inspect": True,
-                "use_ams": False}
+                "use_ams": False,
+                "local_mqtt": True,
+                "region": "",
+                "email": "",
+                "auth_token": ""}
 
     def support_3mf_files(self):
         return {'machinecode': {'3mf': ["3mf"]}}

octoprint_bambu_printer/ftpsclient/__init__.py

@@ -1,2 +1 @@
-from ._client import IoTFTPSClient
-from ._version import __version__
+from .ftpsclient import IoTFTPSClient

octoprint_bambu_printer/ftpsclient/_client.py

@@ -1,159 +0,0 @@
-"""wrapper for FTPS server interactions"""
-
-import ftplib
-import ssl
-from typing import List, Optional, Union
-
-
-class ImplicitTLS(ftplib.FTP_TLS):
-    """ftplib.FTP_TLS sub-class to support implicit SSL FTPS"""
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self._sock = None
-
-    @property
-    def sock(self):
-        """return socket"""
-        return self._sock
-
-    @sock.setter
-    def sock(self, value):
-        """wrap and set SSL socket"""
-        if value is not None and not isinstance(value, ssl.SSLSocket):
-            value = self.context.wrap_socket(value)
-        self._sock = value
-
-    def ntransfercmd(self, cmd, rest=None):
-        conn, size = ftplib.FTP.ntransfercmd(self, cmd, rest)
-        if self._prot_p:
-            conn = self.context.wrap_socket(conn,
-                                            server_hostname=self.host,
-                                            session=self.sock.session)  # this is the fix
-        return conn, size
-
-
-class IoTFTPSClient:
-    """iot ftps ftpsclient"""
-
-    ftps_host: str
-    ftps_port: int
-    ftps_user: str
-    ftps_pass: str
-    ssl_implicit: bool
-    ftps_session: Union[ftplib.FTP, ImplicitTLS]
-
-    def __init__(
-        self,
-        ftps_host: str,
-        ftps_port: Optional[int] = 21,
-        ftps_user: Optional[str] = "",
-        ftps_pass: Optional[str] = "",
-        ssl_implicit: Optional[bool] = False,
-    ) -> None:
-        self.ftps_host = ftps_host
-        self.ftps_port = ftps_port
-        self.ftps_user = ftps_user
-        self.ftps_pass = ftps_pass
-        self.ssl_implicit = ssl_implicit
-        self.instantiate_ftps_session()
-
-    def __repr__(self) -> str:
-        return (
-            "IoT FTPS Client\n"
-            "--------------------\n"
-            f"host: {self.ftps_host}\n"
-            f"port: {self.ftps_port}\n"
-            f"user: {self.ftps_user}\n"
-            f"ssl: {self.ssl_implicit}"
-        )
-
-    def instantiate_ftps_session(self) -> None:
-        """init ftps_session based on input params"""
-        try:
-            if self.ssl_implicit:
-                self.ftps_session = ImplicitTLS()
-            else:
-                self.ftps_session = ftplib.FTP()
-
-            self.ftps_session.connect(host=self.ftps_host, port=self.ftps_port)
-
-            if self.ftps_user != "" and self.ftps_pass != "":
-                self.ftps_session.login(user=self.ftps_user, passwd=self.ftps_pass)
-            else:
-                self.ftps_session.login()
-
-            if self.ssl_implicit:
-                self.ftps_session.prot_p()
-
-        except Exception as ex:
-            print(f"unexpected exception occurred: {ex}")
-            pass
-        return
-
-    def disconnect(self) -> None:
-        """disconnect the current session from the ftps server"""
-        try:
-            self.ftps_session.close()
-        except Exception as ex:
-            print(f"unexpected exception occurred: {ex}")
-            pass
-        return
-
-    def download_file(self, source: str, dest: str) -> bool:
-        """download a file to a path on the local filesystem"""
-        try:
-            with open(dest, "wb") as file:
-                self.ftps_session.retrbinary(f"RETR {source}", file.write)
-            return True
-        except Exception as ex:
-            print(f"unexpected exception occurred: {ex}")
-            pass
-        return False
-
-    def upload_file(self, source: str, dest: str) -> bool:
-        """upload a file to a path inside the FTPS server"""
-        try:
-            with open(source, "rb") as file:
-                self.ftps_session.storbinary(f"STOR {dest}", file)
-            return True
-        except Exception as ex:
-            print(f"unexpected exception occurred: {ex}")
-            pass
-        return False
-
-    def delete_file(self, path: str) -> bool:
-        """delete a file from under a path inside the FTPS server"""
-        try:
-            self.ftps_session.delete(path)
-            return True
-        except Exception as ex:
-            print(f"unexpected exception occurred: {ex}")
-            pass
-        return False
-
-    def move_file(self, source: str, dest: str) -> bool:
-        """move a file inside the FTPS server to another path inside the FTPS server"""
-        try:
-            self.ftps_session.rename(source, dest)
-            return True
-        except Exception as ex:
-            print(f"unexpected exception occurred: {ex}")
-            pass
-        return False
-
-    def list_files(
-        self, path: str, file_pattern: Optional[str] = None
-    ) -> Union[List[str], None]:
-        """list files under a path inside the FTPS server"""
-        try:
-            files = self.ftps_session.nlst(path)
-            if not files:
-                return
-            if file_pattern:
-                return [f for f in files if file_pattern in f]
-            return files
-        except Exception as ex:
-            print(f"unexpected exception occurred: {ex}")
-            pass
-        return

octoprint_bambu_printer/ftpsclient/_version.py

@@ -1,3 +0,0 @@
-VERSION = "1.1.1"
-
-__version__ = VERSION

octoprint_bambu_printer/ftpsclient/ftpsclient.py

@@ -0,0 +1,221 @@
+"""
+Based on: <https://github.com/dgonzo27/py-iot-utils>
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+wrapper for FTPS server interactions
+"""
+
+import ftplib
+import os
+import socket
+import ssl
+from typing import Optional, Union, List
+
+from contextlib import redirect_stdout
+import io
+import re
+
+class ImplicitTLS(ftplib.FTP_TLS):
+    """ftplib.FTP_TLS sub-class to support implicit SSL FTPS"""
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._sock = None
+
+    @property
+    def sock(self):
+        """return socket"""
+        return self._sock
+
+    @sock.setter
+    def sock(self, value):
+        """wrap and set SSL socket"""
+        if value is not None and not isinstance(value, ssl.SSLSocket):
+            value = self.context.wrap_socket(value)
+        self._sock = value
+
+    def ntransfercmd(self, cmd, rest=None):
+        conn, size = ftplib.FTP.ntransfercmd(self, cmd, rest)
+
+        if self._prot_p:
+            conn = self.context.wrap_socket(conn,
+                                            server_hostname=self.host,
+                                            session=self.sock.session)  # this is the fix
+        return conn, size
+
+
+class IoTFTPSClient:
+    """iot ftps ftpsclient"""
+
+    ftps_host: str
+    ftps_port: int
+    ftps_user: str
+    ftps_pass: str
+    ssl_implicit: bool
+    ftps_session: Union[ftplib.FTP, ImplicitTLS]
+    last_error: Optional[str] = None
+    welcome: str
+
+    def __init__(
+            self,
+            ftps_host: str,
+            ftps_port: Optional[int] = 21,
+            ftps_user: Optional[str] = "",
+            ftps_pass: Optional[str] = "",
+            ssl_implicit: Optional[bool] = False,
+    ) -> None:
+        self.ftps_host = ftps_host
+        self.ftps_port = ftps_port
+        self.ftps_user = ftps_user
+        self.ftps_pass = ftps_pass
+        self.ssl_implicit = ssl_implicit
+        self.instantiate_ftps_session()
+
+    def __repr__(self) -> str:
+        return (
+            "IoT FTPS Client\n"
+            "--------------------\n"
+            f"host: {self.ftps_host}\n"
+            f"port: {self.ftps_port}\n"
+            f"user: {self.ftps_user}\n"
+            f"ssl: {self.ssl_implicit}"
+        )
+
+    def instantiate_ftps_session(self) -> None:
+        """init ftps_session based on input params"""
+        self.ftps_session = ImplicitTLS() if self.ssl_implicit else ftplib.FTP()
+        self.ftps_session.set_debuglevel(0)
+
+        self.welcome = self.ftps_session.connect(
+            host=self.ftps_host, port=self.ftps_port)
+
+        if self.ftps_user and self.ftps_pass:
+            self.ftps_session.login(user=self.ftps_user, passwd=self.ftps_pass)
+        else:
+            self.ftps_session.login()
+
+        if self.ssl_implicit:
+            self.ftps_session.prot_p()
+
+    def disconnect(self) -> None:
+        """disconnect the current session from the ftps server"""
+        self.ftps_session.close()
+
+    def download_file(self, source: str, dest: str):
+        """download a file to a path on the local filesystem"""
+        with open(dest, "wb") as file:
+            self.ftps_session.retrbinary(f"RETR {source}", file.write)
+
+    def upload_file(self, source: str, dest: str, callback=None):
+        """upload a file to a path inside the FTPS server"""
+
+        file_size = os.path.getsize(source)
+
+        block_size = max(file_size // 100, 8192)
+        rest = None
+
+        # Taken from ftplib.storbinary but with custom ssl handling
+        # due to the shitty bambu p1p ftps server TODO fix properly.
+        with open(source, "rb") as fp:
+            self.ftps_session.voidcmd('TYPE I')
+
+            with self.ftps_session.transfercmd(f"STOR {dest}", rest) as conn:
+                while 1:
+                    buf = fp.read(block_size)
+
+                    if not buf:
+                        break
+
+                    conn.sendall(buf)
+
+                    if callback:
+                        callback(buf)
+
+                # shutdown ssl layer
+                if ftplib._SSLSocket is not None and isinstance(conn, ftplib._SSLSocket):
+                    # Yeah this is suposed to be conn.unwrap
+                    # But since we operate in prot p mode
+                    # we can close the connection always.
+                    # This is cursed but it works.
+                    if "vsFTPd" in self.welcome:
+                        conn.unwrap()
+                    else:
+                        conn.shutdown(socket.SHUT_RDWR)
+
+            return self.ftps_session.voidresp()
+
+            # Old api call.
+            # self.ftps_session.storbinary(
+            #    f"STOR {dest}", file, blocksize=block_size, callback=callback)
+
+    def delete_file(self, path: str):
+        """delete a file from under a path inside the FTPS server"""
+        self.ftps_session.delete(path)
+
+    def move_file(self, source: str, dest: str):
+        """move a file inside the FTPS server to another path inside the FTPS server"""
+        self.ftps_session.rename(source, dest)
+
+    def mkdir(self, path: str) -> str:
+        return self.ftps_session.mkd(path)
+
+    def list_files(self, path: str, file_pattern: Optional[str] = None) -> Union[List[str], None]:
+        """list files under a path inside the FTPS server"""
+        try:
+            files = self.ftps_session.nlst(path)
+            if not files:
+                return
+            if file_pattern:
+                return [f for f in files if file_pattern in f]
+            return files
+        except Exception as ex:
+            print(f"unexpected exception occurred: {ex}")
+            pass
+        return
+
+    def list_files_ex(self, path: str) -> Union[list[str], None]:
+        """list files under a path inside the FTPS server"""
+        try:
+            f = io.StringIO()
+            with redirect_stdout(f):
+                self.ftps_session.dir(path)
+            s = f.getvalue()
+            files = []
+            for row in s.split("\n"):
+                if len(row) <= 0: continue
+
+                attribs = row.split(" ")
+
+                match = re.search(r".*\ (\d\d\:\d\d|\d\d\d\d)\ (.*)", row)
+                name = ""
+                if match:
+                    name = match.groups(1)[1]
+                else:
+                    name = attribs[len(attribs) - 1]
+
+                file = ( attribs[0], name )
+                files.append(file)
+            return files
+        except Exception as ex:
+            print(f"unexpected exception occurred: [{ex}]")
+            pass
+        return

octoprint_bambu_printer/virtual.py

@@ -3,6 +3,7 @@ __license__ = "GNU Affero General Public License http://www.gnu.org/licenses/agp
 
 
 import collections
+import datetime
 import os
 import queue
 import re
@@ -14,6 +15,7 @@ from pybambu import BambuClient, commands
 
 from serial import SerialTimeoutException
 from octoprint.util import RepeatedTimer, to_bytes, to_unicode, get_dos_filename
+from octoprint.util.files import unix_timestamp_to_m20_timestamp
 
 from .ftpsclient import IoTFTPSClient
 
@@ -45,10 +47,11 @@ class BambuPrinter:
             }
         self._sendBusy = False
         self._ambient_temperature = 21.3
-        self.temp = [self._ambient_temperature ]
+        self.temp = [self._ambient_temperature]
         self.targetTemp = [0.0]
         self.bedTemp = self._ambient_temperature
         self.bedTargetTemp = 0.0
+        self._hasChamber = printer_profile_manager.get_current().get("heatedChamber")
         self.chamberTemp = self._ambient_temperature
         self.chamberTargetTemp = 0.0
         self.lastTempAt = time.monotonic()
@@ -128,6 +131,7 @@ class BambuPrinter:
         # )
         # bufferThread.start()
 
+        # Move this into M110 command response?
         connectionThread = threading.Thread(
             target=self._create_connection,
             name="octoprint.plugins.bambu_printer.connection_thread",
@@ -147,7 +151,7 @@ class BambuPrinter:
         elif event_type == "event_printer_data_update":
             device_data = self.bambu.get_device()
             ams = device_data.ams.__dict__
-            info = device_data.info.__dict__
+            print_job = device_data.print_job.__dict__
             temperatures = device_data.temperature.__dict__
             lights = device_data.lights.__dict__
             fans = device_data.fans.__dict__
@@ -159,20 +163,21 @@ class BambuPrinter:
             self.bedTargetTemp = temperatures.get("target_bed_temp", 0.0)
             self.chamberTemp = temperatures.get("chamber_temp", 0.0)
 
-            if info.get("gcode_state") == "RUNNING":
+            if print_job.get("gcode_state") == "RUNNING":
                 if not self._sdPrintingSemaphore.is_set():
                     self._sdPrintingSemaphore.set()
                 if self._sdPrintingPausedSemaphore.is_set():
                     self._sdPrintingPausedSemaphore.clear()
                 if not self._sdPrinting:
-                    filename = info.get("subtask_name")
+                    filename = print_job.get("subtask_name")
+                    # TODO: swap this out to use 8 dot 3 name based on long name/path
                     self._selectSdFile(filename)
                     self._startSdPrint(from_printer=True)
 
                 # fuzzy math here to get print percentage to match BambuStudio
-                self._selectedSdFilePos = int(self._selectedSdFileSize * ((info.get("print_percentage") + 1)/100))
+                self._selectedSdFilePos = int(self._selectedSdFileSize * ((print_job.get("print_percentage") + 1)/100))
 
-            if info.get("gcode_state") == "PAUSE":
+            if print_job.get("gcode_state") == "PAUSE":
                 if not self._sdPrintingPausedSemaphore.is_set():
                     self._sdPrintingPausedSemaphore.set()
                 if self._sdPrintingSemaphore.is_set():
@@ -180,7 +185,7 @@ class BambuPrinter:
                     self._send("// action:paused")
                     self._sendPaused()
 
-            if info.get("gcode_state") == "FINISH" and self._sdPrintingSemaphore.is_set():
+            if print_job.get("gcode_state") == "FINISH" and self._sdPrintingSemaphore.is_set():
                 self._selectedSdFilePos = self._selectedSdFileSize
                 self._finishSdPrint()
     def _create_connection(self):
@@ -197,10 +202,14 @@ class BambuPrinter:
                                  serial=self._settings.get(["serial"]),
                                  host=self._settings.get(["host"]),
                                  username=self._settings.get(["username"]),
-                                 access_code=self._settings.get(["access_code"])
+                                 access_code=self._settings.get(["access_code"]),
+                                 local_mqtt=self._settings.get_boolean(["local_mqtt"]),
+                                 region=self._settings.get(["region"]),
+                                 email=self._settings.get(["email"]),
+                                 auth_token=self._settings.get(["auth_token"])
                                  )
 
-        await self.bambu.connect(callback=self.new_update)
+        self.bambu.connect(callback=self.new_update)
         self._logger.info(f"bambu connection status: {self.bambu.connected}")
         self._sendOk()
         # while True:
@@ -463,6 +472,11 @@ class BambuPrinter:
             self._pauseSdPrint()
         return True
 
+    def _gcode_M524(self, data: str) -> bool:
+        if self._sdCardReady:
+            self._cancelSdPrint()
+        return False
+
     def _gcode_M26(self, data: str) -> bool:
         self._logger.debug("ignoring M26 command.")
         self._send("M26 disabled for Bambu")
@@ -598,7 +612,7 @@ class BambuPrinter:
             request_resend()
 
     def _listSd(self, incl_long=False, incl_timestamp=False):
-        line = "{name} {size} \"{name}\""
+        line = "{dosname} {size} {timestamp} \"{name}\""
 
         self._send("Begin file list")
         for item in map(lambda x: line.format(**x), self._getSdFiles()):
@@ -619,15 +633,18 @@ class BambuPrinter:
             else:
                 filename = entry
             filesize = ftp.ftps_session.size(entry)
+            date_str = ftp.ftps_session.sendcmd(f"MDTM {entry}").replace("213 ", "")
+            filedate = datetime.datetime.strptime(date_str, "%Y%m%d%H%M%S").replace(tzinfo=datetime.timezone.utc).timestamp()
             dosname = get_dos_filename(filename, existing_filenames=list(result.keys())).lower()
             data = {
                 "dosname": dosname,
                 "name": filename,
                 "path": filename,
                 "size": filesize,
+                "timestamp": unix_timestamp_to_m20_timestamp(int(filedate))
             }
             result[filename.lower()] = data
-            # result[dosname.lower()] = filename.lower()
+            result[dosname.lower()] = filename.lower()
 
         return result
 
@@ -682,6 +699,13 @@ class BambuPrinter:
             else:
                 self._logger.info("print pause failed")
 
+    def _cancelSdPrint(self):
+        if self.bambu.connected:
+            if self.bambu.publish(commands.STOP):
+                self._logger.info("print cancelled")
+            else:
+                self._logger.info("print cancel failed")
+
     def _setSdPos(self, pos):
         self._newSdFilePos = pos
 
@@ -694,10 +718,10 @@ class BambuPrinter:
     def _generateTemperatureOutput(self) -> str:
         template = "{heater}:{actual:.2f}/ {target:.2f}"
         temps = collections.OrderedDict()
-        heater = "T"
-        temps[heater] = (self.temp[0], self.targetTemp[0])
+        temps["T"] = (self.temp[0], self.targetTemp[0])
         temps["B"] = (self.bedTemp, self.bedTargetTemp)
-        temps["C"] = (self.chamberTemp, self.chamberTargetTemp)
+        if self._hasChamber:
+            temps["C"] = (self.chamberTemp, self.chamberTargetTemp)
 
         output = " ".join(
             map(
@@ -741,7 +765,7 @@ class BambuPrinter:
                                            "command": "project_file",
                                            "param": "Metadata/plate_1.gcode",
                                            "subtask_name": f"{self._selectedSdFile}",
-                                           "url": f"file:///mnt/sdcard/{self._selectedSdFile}",
+                                           "url": f"file:///mnt/sdcard/{self._selectedSdFile}" if self._settings.get_boolean(["device_type"]) in ["X1", "X1C"] else f"file:///sdcard/{self._selectedSdFile}",
                                            "timelapse": self._settings.get_boolean(["timelapse"]),
                                            "bed_leveling": self._settings.get_boolean(["bed_leveling"]),
                                            "flow_cali": self._settings.get_boolean(["flow_cali"]),

setup.py

@@ -14,7 +14,7 @@ plugin_package = "octoprint_bambu_printer"
 plugin_name = "OctoPrint-BambuPrinter"
 
 # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
-plugin_version = "0.0.1"
+plugin_version = "0.0.6"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module
@@ -33,7 +33,7 @@ plugin_url = "https://github.com/jneilliii/OctoPrint-BambuPrinter"
 plugin_license = "AGPLv3"
 
 # Any additional requirements besides OctoPrint should be listed here
-plugin_requires = ["paho-mqtt", "pybambu>=1.0.0"]
+plugin_requires = ["paho-mqtt", "python-dateutil", "pybambu>=1.0.1"]
 
 ### --------------------------------------------------------------------------------------------------------------------
 ### More advanced options that you usually shouldn't have to touch follow after this point
@@ -61,7 +61,7 @@ plugin_ignored_packages = []
 #     additional_setup_parameters = {"dependency_links": ["https://github.com/someUser/someRepo/archive/master.zip#egg=someDependency-dev"]}
 # "python_requires": ">=3,<4" blocks installation on Python 2 systems, to prevent confused users and provide a helpful error.
 # Remove it if you would like to support Python 2 as well as 3 (not recommended).
-additional_setup_parameters = {"python_requires": ">=3,<4"}
+additional_setup_parameters = {"python_requires": ">=3.9,<4"}
 
 ########################################################################################################################