chrivers/webserver-mainsail-rpc

ankerctl.py

@@ -142,10 +142,7 @@ def mqtt_send(env, command_type, args, force):
     To see a list of known command types, run this command without arguments.
     """
 
-    cmd = {
-        "commandType": command_type,
-        **{key: value for (key, value) in args},
-    }
+    cmd = cli.util.make_mqtt_req(command_type, args)
 
     if not force:
         if command_type == MqttMsgType.ZZ_MQTT_CMD_RECOVER_FACTORY.value:

cli/config.py

@@ -52,7 +52,7 @@ def _save_json(val):
         if not isinstance(val, Serialize):
             return val
 
-        data = val.to_dict()
+        data = val.to_dict(recursive=False)
         data["__type__"] = type(val).__name__
         return data
 

cli/logfmt.py

@@ -23,6 +23,8 @@ def __init__(self, fmt):
             logging.DEBUG:    "D",
         }
 
+    default_msec_format = click.style("%s.%03d", dim=True)
+
     def format(self, rec):
         marks, colors = self._marks, self._colors
         return "".join([
@@ -47,5 +49,6 @@ def setup_logging(level=logging.INFO):
     log = logging.getLogger()
     log.setLevel(level)
     handler = log.handlers[0]
-    handler.setFormatter(ColorFormatter("%(message)s"))
+    name_fmt = click.style('%(name)s', fg='blue', bold=True)
+    handler.setFormatter(ColorFormatter(f"[%(asctime)s] {name_fmt}: %(message)s"))
     return log

cli/model.py

@@ -1,11 +1,35 @@
 import json
+from types import UnionType
 from datetime import datetime
 from dataclasses import dataclass
 from libflagship.util import unhex, enhex
 
 
 class Serialize:
 
+    @staticmethod
+    def _safe_hash(obj):
+        h = 0
+        if isinstance(obj, list):
+            for e in obj:
+                h ^= Serialize._safe_hash(e)
+        elif isinstance(obj, dict):
+            for k, v in obj.items():
+                h ^= Serialize._safe_hash(k)
+                h ^= Serialize._safe_hash(v)
+        elif hasattr(obj, "__dataclass_fields__"):
+            return Serialize.__hash__(obj)
+        else:
+            h ^= hash(obj)
+        return h
+
+    def __hash__(self):
+        h = 0
+        for name in self.__dataclass_fields__:
+            field = getattr(self, name)
+            h ^= self._safe_hash(field)
+        return h
+
     @classmethod
     def from_dict(cls, data):
         res = {}
@@ -15,16 +39,31 @@ def from_dict(cls, data):
                 res[k] = unhex(res[k])
             elif v.type == datetime:
                 res[k] = datetime.fromtimestamp(res[k])
+            elif isinstance(v.type, UnionType):
+                if res[k] and v.type.__args__[0] == datetime:
+                    res[k] = datetime.fromtimestamp(res[k])
         return cls(**res)
 
-    def to_dict(self):
+    @staticmethod
+    def _to_dict(val, recursive):
+        if isinstance(val, bytes):
+            return enhex(val)
+        elif isinstance(val, datetime):
+            return val.timestamp()
+        elif isinstance(val, Serialize) and recursive:
+            return val.to_dict()
+        elif isinstance(val, dict) and recursive:
+            res = {}
+            for k, v in val.items():
+                res[k] = Serialize._to_dict(v, recursive)
+            return res
+        else:
+            return val
+
+    def to_dict(self, recursive=True):
         res = {}
         for k, v in self.__dataclass_fields__.items():
-            res[k] = getattr(self, k)
-            if v.type == bytes:
-                res[k] = enhex(res[k])
-            elif v.type == datetime:
-                res[k] = res[k].timestamp()
+            res[k] = self._to_dict(getattr(self, k), recursive)
         return res
 
     @classmethod

cli/util.py

@@ -28,6 +28,18 @@ def json_key_value(str):
         except ValueError:
             return key, value
 
+def make_mqtt_req(command_type, args):
+    cmd = { "commandType": command_type }
+    for path, value in args:
+        path = path.split(".")
+        obj = cmd
+        for step in path[:-1]:
+            obj = obj.setdefault(step, {})
+
+        obj[path[-1]] = value
+
+    return cmd
+
 
 class EnumType(click.ParamType):
     def __init__(self, enum):

libflagship/mqtt.py

@@ -76,6 +76,53 @@ def parse(cls, p):
     def pack(self):
         return struct.pack("B", self)
 
+class MqttPrintEvent(enum.IntEnum):
+    ZZ_MQTT_PRINT_EVENT_IDLE          = 0x00 # unknown
+    ZZ_MQTT_PRINT_EVENT_PRINTING      = 0x01 # unknown (guess: print job starting)
+    ZZ_MQTT_PRINT_EVENT_PAUSED        = 0x02 # print paused
+    ZZ_MQTT_PRINT_EVENT_STOPPED       = 0x03 # print stopped
+    ZZ_MQTT_PRINT_EVENT_COMPLETED     = 0x04 # print completed
+    ZZ_MQTT_PRINT_EVENT_LEVELING      = 0x05 # printer needs leveling
+    ZZ_MQTT_PRINT_EVENT_DOWNLOADING   = 0x06 # unknown
+    ZZ_MQTT_PRINT_EVENT_LEVEL_HEATING = 0x07 # heating for leveling
+    ZZ_MQTT_PRINT_EVENT_HEATING       = 0x08 # heating for printing
+    ZZ_MQTT_PRINT_EVENT_PREHEAT       = 0x09 # unknown
+    ZZ_MQTT_PRINT_EVENT_PRINT_DL      = 0x0a # unknown
+
+    @classmethod
+    def parse(cls, p):
+        return cls(struct.unpack("B", p[:1])[0]), p[1:]
+
+    def pack(self):
+        return struct.pack("B", self)
+
+class MqttMarlinEvent(enum.IntEnum):
+    ZZ_MQTT_MARLIN_ALERT_HALTED      = 0x01 # 
+    ZZ_MQTT_MARLIN_ALERT_OFFLINE     = 0x02 # 
+    ZZ_MQTT_MARLIN_ALERT_NOZZEL_HEAT = 0x03 # 
+    ZZ_MQTT_MARLIN_ALERT_PANEL_HEAT  = 0x04 # 
+    ZZ_MQTT_MARLIN_ALERT_PRINT       = 0x05 # 
+    ZZ_MQTT_MARLIN_ALERT_BLANKING    = 0x06 # 
+    ZZ_MQTT_MARLIN_ALERT_BLOCKING    = 0x07 # 
+    ZZ_MQTT_MARLIN_ALERT_LEVELING    = 0x08 # 
+    ZZ_MQTT_MARLIN_COMM_ERR          = 0x09 # 
+    ZZ_MQTT_LBOARD_COMM_ERR          = 0x0a # 
+    ZZ_MQTT_NOZZLE_HIGH_TEMP         = 0x0b # 
+    ZZ_MQTT_HEATBED_HIGH_TEMP        = 0x0c # 
+    ZZ_MQTT_HEATBED_MOS1             = 0x0d # 
+    ZZ_MQTT_LEVEL_FAILED             = 0x0e # 
+    ZZ_MQTT_HEATBED_MOS2             = 0x0f # 
+    ZZ_MQTT_NOZZLE_LOW_TEMP          = 0x10 # 
+    ZZ_MQTT_MARLIN_AUTO_PAUSE        = 0x11 # M600 encountered
+    ZZ_MQTT_PRINT_DL_FAILED          = 0x12 # print failed to download
+
+    @classmethod
+    def parse(cls, p):
+        return cls(struct.unpack("B", p[:1])[0]), p[1:]
+
+    def pack(self):
+        return struct.pack("B", self)
+
 @dataclass
 class _MqttMsg:
     signature  : bytes = field(repr=False, kw_only=True, default=b'MA') # Signature: 'MA'

libflagship/ppppapi.py

@@ -145,7 +145,7 @@ def rx_drw(self, index, data):
         # drop any packets we have already recieved
         if self.rx_ctr > index:
             if self.max_age_warn and (self.rx_ctr - index > self.max_age_warn):
-                log.warn(f"Dropping old packet: index {index} while expecting {self.rx_ctr}.")
+                log.warning(f"Dropping old packet: index {index} while expecting {self.rx_ctr}.")
             return
 
         # record packet in queue
@@ -298,7 +298,7 @@ def process(self, msg):
 
         if msg.type == Type.CLOSE:
             log.error("CLOSE")
-            raise ConnectionResetError
+            raise ConnectionResetError("Printer rejected connection")
 
         elif msg.type == Type.REPORT_SESSION_READY:
             pkt = PktSessionReady(
@@ -352,7 +352,7 @@ def recv(self, timeout=None):
         if self.dumper:
             self.dumper.rx(data, self.addr)
         msg = Message.parse(data)[0]
-        log.debug(f"RX <--  {str(msg)[:128]}")
+        # log.debug(f"RX <--  {str(msg)[:128]}")
         return msg
 
     def send(self, pkt, addr=None):
@@ -363,7 +363,7 @@ def send(self, pkt, addr=None):
         if self.dumper:
             self.dumper.tx(resp, self.addr)
         msg = Message.parse(resp)[0]
-        log.debug(f"TX  --> {str(msg)[:128]}")
+        # log.debug(f"TX  --> {str(msg)[:128]}")
         self.sock.sendto(resp, addr or self.addr)
 
     def send_xzyh(self, data, cmd, chan=0, unk0=0, unk1=0, sign_code=0, unk3=0, dev_type=0, block=True):

libflagship/seccode.py

@@ -55,15 +55,15 @@ def gen_check_code_v1(base_code, seed):
 
 
 def gen_rand_seed(mac):
-    rnd = random.randint(10000000,99999999)
+    rnd = random.randint(10000000, 99999999)
 
     suffix = cal_hw_id_suffix(mac)
     txtbuf = str(1000 - suffix) + str(rnd)
 
     sec_ts = "01%d" % rnd
-    sec_code = hashlib.md5(txtbuf.encode()).hexdigest().upper().encode()
+    seed = hashlib.md5(txtbuf.encode()).hexdigest().upper().encode()
 
-    return sec_ts, sec_code
+    return sec_ts, seed
 
 
 def create_check_code_v1(sn, mac):

requirements.txt

@@ -9,4 +9,9 @@ crcmod==1.7
 tqdm==4.65.0
 flask==2.3.2
 flask-sock==0.6.0
+Flask-Cors==3.0.10
 user-agents==2.2.0
+json-rpc==1.14.0
+psutil==5.9.5
+distro==1.8.0
+py-cpuinfo==9.0.0

specification/mqtt.stf

@@ -186,3 +186,67 @@ enum MqttMsgType
 
     #
     ZZ_MQTT_CMD_ALEXA_MSG              = 0xbb8
+
+
+enum MqttPrintEvent
+    # unknown
+    ZZ_MQTT_PRINT_EVENT_IDLE           = 0x00
+    # unknown (guess: print job starting)
+    ZZ_MQTT_PRINT_EVENT_PRINTING       = 0x01
+    # print paused
+    ZZ_MQTT_PRINT_EVENT_PAUSED         = 0x02
+    # print stopped
+    ZZ_MQTT_PRINT_EVENT_STOPPED        = 0x03
+    # print completed
+    ZZ_MQTT_PRINT_EVENT_COMPLETED      = 0x04
+    # printer needs leveling
+    ZZ_MQTT_PRINT_EVENT_LEVELING       = 0x05
+    # unknown
+    ZZ_MQTT_PRINT_EVENT_DOWNLOADING    = 0x06
+    # heating for leveling
+    ZZ_MQTT_PRINT_EVENT_LEVEL_HEATING  = 0x07
+    # heating for printing
+    ZZ_MQTT_PRINT_EVENT_HEATING        = 0x08
+    # unknown
+    ZZ_MQTT_PRINT_EVENT_PREHEAT        = 0x09
+    # unknown
+    ZZ_MQTT_PRINT_EVENT_PRINT_DL       = 0x0a
+
+
+enum MqttMarlinEvent
+    #
+    ZZ_MQTT_MARLIN_ALERT_HALTED        = 0x01
+    #
+    ZZ_MQTT_MARLIN_ALERT_OFFLINE       = 0x02
+    #
+    ZZ_MQTT_MARLIN_ALERT_NOZZEL_HEAT   = 0x03
+    #
+    ZZ_MQTT_MARLIN_ALERT_PANEL_HEAT    = 0x04
+    #
+    ZZ_MQTT_MARLIN_ALERT_PRINT         = 0x05
+    #
+    ZZ_MQTT_MARLIN_ALERT_BLANKING      = 0x06
+    #
+    ZZ_MQTT_MARLIN_ALERT_BLOCKING      = 0x07
+    #
+    ZZ_MQTT_MARLIN_ALERT_LEVELING      = 0x08
+    #
+    ZZ_MQTT_MARLIN_COMM_ERR            = 0x09
+    #
+    ZZ_MQTT_LBOARD_COMM_ERR            = 0x0a
+    #
+    ZZ_MQTT_NOZZLE_HIGH_TEMP           = 0x0b
+    #
+    ZZ_MQTT_HEATBED_HIGH_TEMP          = 0x0c
+    #
+    ZZ_MQTT_HEATBED_MOS1               = 0x0d
+    #
+    ZZ_MQTT_LEVEL_FAILED               = 0x0e
+    #
+    ZZ_MQTT_HEATBED_MOS2               = 0x0f
+    #
+    ZZ_MQTT_NOZZLE_LOW_TEMP            = 0x10
+    # M600 encountered
+    ZZ_MQTT_MARLIN_AUTO_PAUSE          = 0x11
+    # print failed to download
+    ZZ_MQTT_PRINT_DL_FAILED            = 0x12

static/tabs/print.html

@@ -17,7 +17,7 @@
                     </div>
                     <div class="card-body">
                         <form
-                            action="{{ url_for('app_api_ankerctl_file_upload') }}"
+                            action="{{ url_for('ankerctl.app_api_ankerctl_file_upload') }}"
                             method="POST"
                             enctype="multipart/form-data"
                             id="gcode-upload-form"

static/tabs/setup.html

@@ -8,7 +8,7 @@
         <div class="row g-3">
             <div class="col-lg-6">
                 <form
-                    action="{{ url_for('app_api_ankerctl_config_upload') }}"
+                    action="{{ url_for('ankerctl.app_api_ankerctl_config_upload') }}"
                     method="POST"
                     enctype="multipart/form-data"
                     class="mb-3"
@@ -53,7 +53,7 @@
                             <button id="reload" type="button" class="btn btn-danger"
                                     data-bs-toggle="modal" data-bs-target="#popupModal"
                                     data-msg="Reloading ankerctl..."
-                                    data-href="{{ url_for('app_api_ankerctl_server_reload') }}">
+                                    data-href="{{ url_for('ankerctl.app_api_ankerctl_server_reload') }}">
                                 {{ macro.bi_icon("bootstrap-reboot", "Reload Services") }}
                             </button>
                         </div>