chore: modernize dependencies

.github/workflows/ci.yml

@@ -11,17 +11,17 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [14.x, 16.x, 18.x]
+        node-version: ['lts/-1', 'lts/*', 'node']
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Start Redis
         working-directory: ./docker
-        run:  docker-compose up -d
+        run:  docker compose up -d
 
       - name: Use Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
       - name: Install
@@ -32,4 +32,4 @@ jobs:
           npm run test
       - name: Run tests - clusters
         run: |
-          node test-clusters.js
+          npm run test:clusters

README.md

@@ -1,8 +1,6 @@
 # aedes-persistence-redis
 
 ![.github/workflows/ci.yml](https://github.com/moscajs/aedes-persistence-redis/workflows/.github/workflows/ci.yml/badge.svg)
-[![Dependencies Status](https://david-dm.org/moscajs/aedes-persistence-redis/status.svg)](https://david-dm.org/moscajs/aedes-persistence-redis)
-[![devDependencies Status](https://david-dm.org/moscajs/aedes-persistence-redis/dev-status.svg)](https://david-dm.org/moscajs/aedes-persistence-redis?type=dev)
 \
 [![Known Vulnerabilities](https://snyk.io/test/github/moscajs/aedes-persistence-redis/badge.svg)](https://snyk.io/test/github/moscajs/aedes-persistence-redis)
 [![Coverage Status](https://coveralls.io/repos/moscajs/aedes-persistence-redis/badge.svg?branch=master&service=github)](https://coveralls.io/github/moscajs/aedes-persistence-redis?branch=master)

docker/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   redis-default:
     image: redis:6.2.5-alpine

eslint.config.js

@@ -0,0 +1 @@
+module.exports = require('neostandard')({})

example.js

@@ -4,6 +4,6 @@ const aedes = require('aedes')({
   mq,
   persistence
 })
-const server = require('net').createServer(aedes.handle)
+const server = require('node:net').createServer(aedes.handle)
 
 server.listen(1883)

migrations.js

@@ -6,25 +6,25 @@ async function from9to10 (db, cb) {
   }
 
   // get all topics
-  db.hkeys(RETAINEDKEY, function (err, topics) {
+  db.hkeys(RETAINEDKEY, (err, topics) => {
     if (err) {
       return cb(err)
     }
 
     Promise.all(topics.map(t => {
       return new Promise((resolve, reject) => {
         // get packet payload
-        db.hgetBuffer(RETAINEDKEY, t, function (err, payload) {
+        db.hgetBuffer(RETAINEDKEY, t, (err, payload) => {
           if (err) {
             return reject(err)
           }
           // set packet with new format
-          db.set(retainedKey(t), payload, function (err) {
+          db.set(retainedKey(t), payload, (err) => {
             if (err) {
               return reject(err)
             }
             // remove old packet
-            db.hdel(RETAINEDKEY, t, function (err) {
+            db.hdel(RETAINEDKEY, t, (err) => {
               if (err) {
                 return reject(err)
               }

package.json

@@ -3,12 +3,19 @@
   "version": "10.0.0",
   "description": "Aedes persistence, backed by redis",
   "main": "persistence.js",
+  "engines": {
+    "node": ">=20"
+  },
   "scripts": {
-    "lint": "standard --verbose | snazzy",
-    "test": "tape test.js | faucet",
-    "coverage": "nyc --reporter=lcov tape test.js",
+    "lint": "eslint",
+    "lint:fix": "eslint --fix",
+    "unit": "node --test test.js",
+    "test": "npm run lint && npm run unit",
+    "test:clusters": "node --test test-clusters.js",
+    "coverage": "nyc --reporter=lcov node --test test.js",
     "license-checker": "license-checker --production --onlyAllow='MIT;ISC;BSD-3-Clause;BSD-2-Clause;Apache-2.0;Apache*'",
-    "release": "read -p 'GITHUB_TOKEN: ' GITHUB_TOKEN && export GITHUB_TOKEN=$GITHUB_TOKEN && release-it --disable-metrics"
+    "release": "read -p 'GITHUB_TOKEN: ' GITHUB_TOKEN && export GITHUB_TOKEN=$GITHUB_TOKEN && release-it --disable-metrics",
+    "redis": "cd docker;docker compose up"
   },
   "release-it": {
     "github": {
@@ -27,7 +34,6 @@
     }
   },
   "pre-commit": [
-    "lint",
     "test"
   ],
   "repository": {
@@ -47,27 +53,24 @@
   },
   "homepage": "https://github.com/moscajs/aedes-persistence-redis#readme",
   "devDependencies": {
-    "fastq": "^1.13.0",
-    "faucet": "0.0.1",
+    "@fastify/pre-commit": "^2.2.0",
+    "eslint": "^9.21.0",
+    "fastq": "^1.19.1",
     "license-checker": "^25.0.1",
-    "mqemitter": "^4.5.0",
-    "mqemitter-redis": "^5.0.0",
-    "mqtt": "^4.3.7",
-    "nyc": "^15.1.0",
-    "pre-commit": "^1.2.2",
-    "release-it": "^15.0.0",
-    "snazzy": "^9.0.0",
-    "standard": "^17.0.0",
-    "tape": "^5.5.3"
+    "mqemitter-redis": "^6.1.0",
+    "mqtt": "^5.10.4",
+    "neostandard": "^0.12.1",
+    "nyc": "^17.1.0",
+    "release-it": "^18.1.2"
   },
   "dependencies": {
-    "aedes-cached-persistence": "^9.0.0",
+    "aedes-cached-persistence": "^10.0.0",
     "hashlru": "^2.3.0",
-    "ioredis": "^5.0.5",
+    "ioredis": "^5.5.0",
     "msgpack-lite": "^0.1.26",
-    "pump": "^3.0.0",
-    "qlobber": "^7.0.0",
+    "pump": "^3.0.2",
+    "qlobber": "^8.0.1",
     "through2": "^4.0.2",
     "throughv": "^1.0.4"
   }
-}
+}

persistence.js

@@ -1,5 +1,5 @@
 const Redis = require('ioredis')
-const { Readable } = require('stream')
+const { Readable } = require('node:stream')
 const through = require('through2')
 const throughv = require('throughv')
 const msgpack = require('msgpack-lite')
@@ -256,7 +256,7 @@ class RedisPersistence extends CachedPersistence {
         return cb(err)
       }
 
-      cb(null, that._trie.subscriptionsCount, parseInt(count) || 0)
+      cb(null, that._trie.subscriptionsCount, Number.parseInt(count) || 0)
     })
   }
 
@@ -624,7 +624,7 @@ function returnSubsForClient (subs) {
     if (subs[subKey].length === 1) { // version 8x fallback, QoS saved not encoded object
       toReturn.push({
         topic: subKey,
-        qos: parseInt(subs[subKey])
+        qos: Number.parseInt(subs[subKey])
       })
     } else {
       toReturn.push(msgpack.decode(subs[subKey]))
@@ -653,9 +653,8 @@ function updateWithClientData (that, client, packet, cb) {
     that.messageIdCache.set(messageIdKey, pktKey)
     if (ttl > 0) {
       return that._db.set(pktKey, msgpack.encode(packet), 'EX', ttl, updatePacket)
-    } else {
-      return that._db.set(pktKey, msgpack.encode(packet), updatePacket)
     }
+    return that._db.set(pktKey, msgpack.encode(packet), updatePacket)
   }
 
   // qos=2

test-clusters.js

@@ -1,4 +1,4 @@
-const test = require('tape').test
+const test = require('node:test')
 const persistence = require('./persistence')
 const Redis = require('ioredis')
 const mqemitterRedis = require('mqemitter-redis')
@@ -8,6 +8,10 @@ function unref () {
   this.connector.stream.unref()
 }
 
+function sleep (sec) {
+  return new Promise(resolve => setTimeout(resolve, sec * 1000))
+}
+
 const nodes = [
   { host: 'localhost', port: 6378 },
   { host: 'localhost', port: 6380 },
@@ -23,41 +27,43 @@ db.on('error', e => {
   console.trace(e)
 })
 
-db.on('ready', function () {
+function buildEmitter () {
+  const emitter = mqemitterRedis()
+  emitter.subConn.on('connect', unref)
+  emitter.pubConn.on('connect', unref)
+
+  return emitter
+}
+
+function clusterPersistence (cb) {
+  const slaves = db.nodes('master')
+  Promise.all(slaves.map((node) => {
+    return node.flushdb().catch(err => {
+      console.error('flushRedisKeys-error:', err)
+    })
+  })).then(() => {
+    const conn = new Redis.Cluster(nodes)
+
+    conn.on('error', e => {
+      console.trace(e)
+    })
+
+    conn.on('ready', () => {
+      cb(null, persistence({
+        conn,
+        cluster: true
+      }))
+    })
+  })
+}
+
+db.on('ready', () => {
   abs({
     test,
-    buildEmitter () {
-      const emitter = mqemitterRedis()
-      emitter.subConn.on('connect', unref)
-      emitter.pubConn.on('connect', unref)
-
-      return emitter
-    },
-    persistence (cb) {
-      const slaves = db.nodes('master')
-      Promise.all(slaves.map(function (node) {
-        return node.flushdb().catch(err => {
-          console.error('flushRedisKeys-error:', err)
-        })
-      })).then(() => {
-        const conn = new Redis.Cluster(nodes)
-
-        conn.on('error', e => {
-          console.trace(e)
-        })
-
-        conn.on('ready', function () {
-          cb(null, persistence({
-            conn,
-            cluster: true
-          }))
-        })
-      })
-    },
+    buildEmitter,
+    persistence: clusterPersistence,
     waitForReady: true
   })
-
-  test.onFinish(() => {
-    process.exit(0)
-  })
 })
+
+sleep(10).then(() => process.exit(0))