Merge branch 'zevv:master' into is-errored

Author: srd424

.github/workflows/main.yml

@@ -5,6 +5,7 @@ on:
     branches: [ master ]
   pull_request:
     branches: [ master ]
+  workflow_dispatch:
 
 jobs:
   build:
@@ -13,28 +14,69 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-          - windows-latest
-          - macOS-latest
+          # - windows-latest
+          # - macOS-latest
         version:
-          - stable
+          # - stable
+          # - 1.6.18
+          - binary:stable
+          - binary:1.6.18
 
     steps:
-    - uses: actions/checkout@v1
-    - uses: jiro4989/setup-nim-action@master
-      with:
-        nim-version: ${{ matrix.version }}
+      - uses: actions/checkout@v4
 
-    - name: Print Nim version
-      run: nim -v
 
-    - name: Print Nimble version
-      run: nimble -v
+      #
+      # Nim
+      #
+      - name: Cache Nim binaries
+        uses: actions/cache@v4
+        with:
+          path: |
+            nimdir
+            ~/.nimble
+          key: "nim-${{ matrix.version }}-${{ matrix.os }}"
 
-    - name: Nimble Refresh
-      run: nimble -y refresh
+      - name: Check for cached Nim binaries
+        id: nim-binaries-cache
+        run: |
+          if [ -f "nimdir/bin/nim" ]; then
+            echo "found=true" >> $GITHUB_OUTPUT
+          else
+            echo "found=false" >> $GITHUB_OUTPUT
+          fi
 
-    - name: Nimble Install dependencies
-      run: nimble -y install --depsOnly
+      - name: Install Nim (if not cached)
+        if: steps.nim-binaries-cache.outputs.found == 'false'
+        uses: iffy/install-nim@v5
+        with:
+          version: ${{ matrix.version }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-    - name: Build binaries
-      run: nimble build -d:release
+      - name: Add cached Nim to PATH
+        if: steps.nim-binaries-cache.outputs.found == 'true'
+        run: |
+          echo "${{ github.workspace }}/nimdir/bin" >> $GITHUB_PATH
+          echo "$HOME/.nimble/bin" >> $GITHUB_PATH
+
+
+      #
+      # Nim
+      #
+      - name: Print Nim version
+        run: |
+          nim -v
+
+      - name: Print Nimble version
+        run: |
+          nimble -v
+
+      - name: Nimble Refresh
+        run: nimble -y refresh
+
+      - name: Nimble Install dependencies
+        run: nimble -y install --depsOnly
+
+      - name: Build binaries
+        run: nimble build -d:release

nmqtt.nim

@@ -835,18 +835,19 @@ proc onPublish(ctx: MqttCtx, pkt: Pkt) {.async.} =
         verbose("Retained   ", mqttbroker.retained)
 
   when not defined(broker):
+    var callbacks: seq[PubCallback]
     for top, cb in ctx.pubCallbacks:
       if top == topic or top == "#":
-        cb.cb(topic, message)
+        callbacks.add(cb)
       if top.endsWith("/#"):
         # the multi-level wildcard can represent zero levels.
         if topic == top[0 .. ^3]:
-          cb.cb(topic, message)
+          callbacks.add(cb)
           continue
         var topicw = top
         topicw.removeSuffix("#")
         if topic.contains(topicw):
-          cb.cb(topic, message)
+          callbacks.add(cb)
       if top.contains("+"):
         var topelem = split(top, '/')
         if len(topelem) == count(topic, '/') + 1:
@@ -855,7 +856,9 @@ proc onPublish(ctx: MqttCtx, pkt: Pkt) {.async.} =
             if topelem[i] != "+" and e != topelem[i]: break
             i = i+1
           if i == len(topelem):
-            cb.cb(topic, message)
+            callbacks.add(cb)
+    for cb in callbacks:
+      cb.cb(topic, message)
 
   if qos == 1:
     ctx.workQueue[msgId] = Work(wk: PubWork, msgId: msgId, state: WorkNew, qos: 1, typ: PubAck)
@@ -1062,36 +1065,40 @@ proc connectBroker(ctx: MqttCtx) {.async.} =
 
   if ctx.verbosity >= 1:
     ctx.dbg "Connecting to " & ctx.host & ":" & $ctx.port
-  try:
-    ctx.s = await asyncnet.dial(ctx.host, ctx.port)
-    if ctx.sslOn:
-      when defined(ssl):
-        ctx.ssl = newContext(protSSLv23, CVerifyNone, ctx.sslCert, ctx.sslKey)
-        wrapConnectedSocket(ctx.ssl, ctx.s, handshakeAsClient)
-      else:
-        ctx.wrn "Requested SSL session but ssl is not enabled"
-        await ctx.close("SSL not enabled")
-        ctx.state = Error
-    let ok = await ctx.sendConnect()
-    if ok:
-      asyncCheck ctx.runRx()
-      asyncCheck ctx.runPing()
-  except OSError as e:
-    if ctx.verbosity >= 1 or not ctx.beenConnected:
-      ctx.dbg "Error connecting to " & ctx.host
-    if ctx.verbosity >= 2:
-      echo e.msg
-    ctx.state = Error
+
+  ctx.state = Error # set to Connecting by sendConnect
+
+  ctx.s = await asyncnet.dial(ctx.host, ctx.port)
+  if ctx.sslOn:
+    when defined(ssl):
+      ctx.ssl = newContext(protSSLv23, CVerifyNone, ctx.sslCert, ctx.sslKey)
+      wrapConnectedSocket(ctx.ssl, ctx.s, handshakeAsClient)
+    else:
+      ctx.wrn "Requested SSL session but ssl is not enabled"
+      await ctx.close("SSL not enabled")
+
+  let ok = await ctx.sendConnect()
+  if ok:
+    asyncCheck ctx.runRx()
+    asyncCheck ctx.runPing()
+
 
 proc runConnect(ctx: MqttCtx) {.async.} =
   ## Auto-connect and reconnect to broker
-  await ctx.connectBroker()
 
   while true:
     if ctx.state == Disabled:
       break
     elif ctx.state in [Disconnected, Error]:
-      await ctx.connectBroker()
+      try:
+        await ctx.connectBroker()
+      except OSError as e:
+        if ctx.verbosity >= 1 or not ctx.beenConnected:
+          ctx.dbg "Error connecting to " & ctx.host
+        if ctx.verbosity >= 2:
+          echo e.msg
+        ctx.state = Error
+
       # If the client has been disconnect, it is necessary to tell the broker,
       # that we still want to be Subscribed. PubCallbacks still holds the
       # callbacks, but we need to re-Subscribe to the broker.
@@ -1111,7 +1118,7 @@ proc runConnect(ctx: MqttCtx) {.async.} =
 
 proc newMqttCtx*(clientId: string): MqttCtx =
   ## Initiate a new MQTT client
-  MqttCtx(clientId: clientId)
+  MqttCtx(clientId: clientId, state: Disconnected)
 
 proc set_ping_interval*(ctx: MqttCtx, txInterval: int = 60) =
   ## Set the clients ping interval in seconds. Default is 60 seconds.

nmqtt.nimble

@@ -1,5 +1,5 @@
 # Package
-version       = "1.0.5"
+version       = "1.0.7"
 author        = "zevv & ThomasTJdev"
 description   = "Native MQTT library and binaries for publishing, subscribing and broker"
 license       = "MIT"