@seriousme/opifex 1.3.0 → 1.4.0

package/.github/workflows/update-license-year.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+license='LICENSE.txt'
+prefix='2016-'
+current_year=$(date +%Y)
+sed -i -e "s/$prefix\([0-9\]\+\)/$prefix$current_year/" $license
+
+if [ "$(git diff $license)" ]; then
+  git add $license
+  git commit -m "Update license year to $current_year"
+  git push
+else
+  echo "No changes detected in $license"
+fi

package/.github/workflows/update-license-year.yml

@@ -0,0 +1,13 @@
+name: Update License Year
+
+on:
+  schedule:
+    - cron: "5 12 1 1 *"
+
+jobs:
+  update_license:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Update license year
+        run: ./update_license.sh

package/LICENSE.txt

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Hans Klunder
+Copyright (c) 2023-2025 Hans Klunder
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/client/client.ts

@@ -25,6 +25,8 @@ type ConnectOptions = Omit<
 export type ConnectParameters = {
   url?: URL;
   caCerts?: string[];
+  cert?: string;
+  key?: string;
   numberOfRetries?: number;
   options?: ConnectOptions;
 };
@@ -70,6 +72,8 @@ export class Client {
   protected keepAlive = DEFAULT_KEEPALIVE;
   protected autoReconnect = true;
   private caCerts?: string[];
+  private cert?: string;
+  private key?: string;
   private clientId: string;
   private ctx = new Context(new MemoryStore());
   private connectPacket?: ConnectPacket;
@@ -84,6 +88,8 @@ export class Client {
     _hostname: string,
     _port?: number,
     _caCerts?: string[],
+    _cert?: string,
+    _key?: string,
   ): Promise<SockConn> {
     // if you need to support alternative connection types just
     // overload this method in your subclass
@@ -106,6 +112,8 @@ export class Client {
           this.url.hostname,
           Number(this.url.port) ?? undefined,
           this.caCerts,
+          this.cert,
+          this.key,
         );
         // if we get this far we have a connection
         tryConnect =
@@ -137,6 +145,8 @@ export class Client {
     this.url = params?.url || this.url;
     this.numberOfRetries = params.numberOfRetries || this.numberOfRetries;
     this.caCerts = params?.caCerts;
+    this.cert = params?.cert;
+    this.key = params?.key;
     const options = Object.assign(
       {
         keepAlive: this.keepAlive,

package/deno/client.ts

@@ -25,9 +25,11 @@ export class TcpClient extends Client {
     hostname: string,
     port = 8883,
     caCerts?: string[],
+    cert?: string,
+    key?: string,
   ) {
-    logger.debug({ hostname, port, caCerts });
-    return await Deno.connectTls({ hostname, port, caCerts });
+    logger.debug({ hostname, port, caCerts, cert });
+    return await Deno.connectTls({ hostname, port, caCerts, cert, key });
   }
 
   protected override createConn(
@@ -35,11 +37,13 @@ export class TcpClient extends Client {
     hostname: string,
     port?: number,
     caCerts?: string[],
+    cert?: string,
+    key?: string,
   ): Promise<SockConn> {
     // if you need to support alternative connection types just
     // overload this method in your subclass
     if (protocol === "mqtts:") {
-      return this.connectMQTTS(hostname, port, caCerts);
+      return this.connectMQTTS(hostname, port, caCerts, cert, key);
     }
     if (protocol === "mqtt:") {
       return this.connectMQTT(hostname, port);

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@seriousme/opifex",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "exports": {
     "./server": "./server/mod.ts",
     "./client": "./client/mod.ts"

package/deno.lock

@@ -2,29 +2,32 @@
   "version": "4",
   "specifiers": {
     "npm:@types/node@*": "22.5.4",
-    "npm:@types/node@^22.8.6": "22.8.6"
+    "npm:@types/node@^22.10.0": "22.10.0"
   },
   "npm": {
-    "@types/node@22.5.4": {
-      "integrity": "sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==",
+    "@types/node@22.10.0": {
+      "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==",
       "dependencies": [
-        "undici-types"
+        "undici-types@6.20.0"
       ]
     },
-    "@types/node@22.8.6": {
-      "integrity": "sha512-tosuJYKrIqjQIlVCM4PEGxOmyg3FCPa/fViuJChnGeEIhjA46oy8FMVoF9su1/v8PNs2a8Q0iFNyOx0uOF91nw==",
+    "@types/node@22.5.4": {
+      "integrity": "sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==",
       "dependencies": [
-        "undici-types"
+        "undici-types@6.19.8"
       ]
     },
     "undici-types@6.19.8": {
       "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw=="
+    },
+    "undici-types@6.20.0": {
+      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg=="
     }
   },
   "workspace": {
     "packageJson": {
       "dependencies": [
-        "npm:@types/node@^22.8.6"
+        "npm:@types/node@^22.10.0"
       ]
     }
   }

package/dist/client/client.js

@@ -34,6 +34,8 @@ export class Client {
     keepAlive = DEFAULT_KEEPALIVE;
     autoReconnect = true;
     caCerts;
+    cert;
+    key;
     clientId;
     ctx = new Context(new MemoryStore());
     connectPacket;
@@ -41,7 +43,7 @@ export class Client {
         this.clientId = generateClientId(this.clientIdPrefix);
         this.numberOfRetries = DEFAULT_RETRIES;
     }
-    createConn(protocol, _hostname, _port, _caCerts) {
+    createConn(protocol, _hostname, _port, _caCerts, _cert, _key) {
         // if you need to support alternative connection types just
         // overload this method in your subclass
         throw `Unsupported protocol: ${protocol}`;
@@ -57,7 +59,7 @@ export class Client {
         while (tryConnect) {
             logger.debug(`${isReconnect ? "re" : ""}connecting`);
             try {
-                const conn = await this.createConn(this.url.protocol, this.url.hostname, Number(this.url.port) ?? undefined, this.caCerts);
+                const conn = await this.createConn(this.url.protocol, this.url.hostname, Number(this.url.port) ?? undefined, this.caCerts, this.cert, this.key);
                 // if we get this far we have a connection
                 tryConnect =
                     (await this.ctx.handleConnection(conn, this.connectPacket)) &&
@@ -88,6 +90,8 @@ export class Client {
         this.url = params?.url || this.url;
         this.numberOfRetries = params.numberOfRetries || this.numberOfRetries;
         this.caCerts = params?.caCerts;
+        this.cert = params?.cert;
+        this.key = params?.key;
         const options = Object.assign({
             keepAlive: this.keepAlive,
             clientId: this.clientId,

package/dist/node/client.js

@@ -25,7 +25,6 @@ export class TcpClient extends Client {
                 resolve(wrapNodeSocket(socket));
             });
             socket.once("error", (err) => {
-                // @ts-ignore the type spec of err is missing err.code
                 logger.debug("Connection failed: ", err);
                 reject(err);
             });

package/dist/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["../bin/conformanceServer.ts","../bin/demoServer.ts","../bin/mqtt.ts"],"version":"5.7.0-beta"}
+{"root":["../bin/conformanceServer.ts","../bin/demoServer.ts","../bin/mqtt.ts"],"version":"5.7.2"}

package/node/client.ts

@@ -31,7 +31,6 @@ export class TcpClient extends Client {
         },
       );
       socket.once("error", (err) => {
-        // @ts-ignore the type spec of err is missing err.code
         logger.debug("Connection failed: ", err);
         reject(err);
       });

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@seriousme/opifex",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "MQTT client & server for Deno & NodeJS",
   "type": "module",
   "scripts": {
     "test": "node --experimental-strip-types --test --test-skip-pattern='/^Deno/'",
     "prebuild": "rm -rf dist",
-    "build": "npx -p typescript@beta tsc --build",
+    "build": "npx -p typescript tsc --build",
     "postbuild": "deno fmt",
     "preversion": "npm run test",
     "version": "npm run build",
@@ -45,6 +45,6 @@
   },
   "homepage": "https://github.com/seriousme/opifex#readme",
   "devDependencies": {
-    "@types/node": "^22.8.6"
+    "@types/node": "^22.10.0"
   }
 }