@mysetup/mqtt 1.3.0 → 1.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@mysetup/mqtt",
-    "version": "1.3.0",
+    "version": "1.5.0",
     "license": "MIT",
     "main": "dist/index.js",
     "files": [
@@ -8,27 +8,27 @@
     ],
     "exports": {
         ".": {
-            "types": "./dist/index.d.ts",
             "import": "./dist/index.js",
             "require": "./dist/index.js"
         },
         "./package.json": "./package.json"
     },
     "scripts": {
+        "build": "rm -rf ./dist && tsup",
         "lint": "eslint .",
         "typecheck": "tsc --noEmit",
-        "build": "rm -rf ./dist && tsc",
         "format": "prettier --write \"**/*.{ts,tsx,md,js}\"",
         "checks": "pnpm typecheck && pnpm lint",
         "clean": "rm -rf node_modules .swc dist pnpm-lock.yaml && echo \"✅  Successfully removed \""
     },
     "dependencies": {
-        "mqtt": "^5.10.1"
+        "mqtt": "^5.10.1",
+        "tsup": "8.1.0",
+        "@mysetup/cache": "latest",
+        "@mysetup/logger": "latest"
     },
     "devDependencies": {
-        "@mysetup/cache": "latest",
         "@mysetup/eslint-config": "latest",
-        "@mysetup/logger": "latest",
         "@mysetup/prettier-config": "latest",
         "@mysetup/tsconfig": "latest",
         "@types/node": "^22.8.6",

package/dist/index.d.ts

@@ -1,2 +0,0 @@
-export * from "./mqttClient";
-//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC"}

package/dist/mqttClient.d.ts

@@ -1,16 +0,0 @@
-import type { MqttClient } from "mqtt";
-export type { MqttClient };
-type MQttOptionProps = "web" | "server";
-interface ConnectionProps {
-    value: string;
-    option: MQttOptionProps;
-    topicList: string[];
-    messageCallback?: (topic: string, message: string) => void;
-}
-export declare const mqttSub: (topicList: string[], messageCallback?: (topic: string, message: string) => void, client?: MqttClient) => void;
-export declare const mqttUnSub: (topicList: string[], client?: MqttClient) => void;
-export declare const mqttDisconnect: (props: ConnectionProps, reinit: boolean, client?: MqttClient) => void;
-export declare const mqttOnMessage: (messageCallback: (topic: string, message: string) => void, client?: MqttClient) => void;
-export declare const getMqttClient: () => string;
-export declare const mqttCreateConnection: (props: ConnectionProps) => MqttClient;
-//# sourceMappingURL=mqttClient.d.ts.map

package/dist/mqttClient.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"mqttClient.d.ts","sourceRoot":"","sources":["../mqttClient.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAGvC,YAAY,EAAE,UAAU,EAAE,CAAC;AAE3B,KAAK,eAAe,GAAG,KAAK,GAAG,QAAQ,CAAC;AAcxC,UAAU,eAAe;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,eAAe,CAAC;IACxB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CAC9D;AAkDD,eAAO,MAAM,OAAO,cACL,MAAM,EAAE,oBACD,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,WACjD,UAAU,SAoBtB,CAAC;AAEF,eAAO,MAAM,SAAS,cAAe,MAAM,EAAE,WAAW,UAAU,SAcjE,CAAC;AAEF,eAAO,MAAM,cAAc,UAChB,eAAe,UACd,OAAO,WACN,UAAU,SAetB,CAAC;AAEF,eAAO,MAAM,aAAa,oBACL,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,WAChD,UAAU,SAStB,CAAC;AAmBF,eAAO,MAAM,aAAa,cAEzB,CAAC;AAEF,eAAO,MAAM,oBAAoB,UAAW,eAAe,eAE1D,CAAC"}

package/dist/mqttClient.js

@@ -1,149 +0,0 @@
-"use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.mqttCreateConnection = exports.getMqttClient = exports.mqttOnMessage = exports.mqttDisconnect = exports.mqttUnSub = exports.mqttSub = void 0;
-var mqtt_1 = require("mqtt");
-var logger_1 = require("@mysetup/logger");
-var cache_1 = require("@mysetup/cache");
-var serverConnectOptions = {
-    protocol: "mqtt",
-    port: 1883,
-    host: "test.mosquitto.org",
-};
-var webConnectOptions = {
-    protocol: "wss",
-    port: 8081,
-    host: "test.mosquitto.org",
-};
-var mqttClientId = "";
-var checkInitConnect = function (props) {
-    var _a = props.option === "web" ? webConnectOptions : serverConnectOptions, protocol = _a.protocol, host = _a.host, port = _a.port;
-    var connectUrl = "".concat(protocol, "://").concat(host, ":").concat(port);
-    var client = (0, mqtt_1.connect)(connectUrl, {
-        clientId: props.value,
-        clean: true,
-        rejectUnauthorized: false,
-        resubscribe: true,
-        keepalive: 300,
-    });
-    mqttClientId = props.value;
-    client.setMaxListeners(100);
-    client.on("connect", function () {
-        logger_1.logger.info("MQTT connection successful");
-        (0, cache_1.setCacheData)("mqttClientStatus", "connect");
-        (0, exports.mqttSub)(props.topicList, props.messageCallback, client);
-    });
-    client.on("error", function (err) {
-        logger_1.logger.error("MQTT Connection error: ".concat(JSON.stringify(err)));
-        (0, cache_1.setCacheData)("mqttClientStatus", "error");
-        (0, exports.mqttDisconnect)(props, true, client);
-    });
-    client.on("reconnect", function () {
-        (0, cache_1.setCacheData)("mqttClientStatus", "reconnect");
-        logger_1.logger.info("MQTT Reconnecting");
-    });
-    client.on("close", function () {
-        (0, cache_1.setCacheData)("mqttClientStatus", "close");
-        logger_1.logger.info("MQTT connection closed");
-    });
-    client.on("offline", function () {
-        (0, cache_1.setCacheData)("mqttClientStatus", "offline");
-        logger_1.logger.info("MQTT connection offline");
-    });
-    return client;
-};
-var mqttSub = function (topicList, messageCallback, client) {
-    try {
-        client === null || client === void 0 ? void 0 : client.subscribe(topicList, { qos: 0 }, function (error, granted) {
-            if (error) {
-                logger_1.logger.error("Subscribe to topics error: ".concat(error.message));
-            }
-            var grantedList = [];
-            granted === null || granted === void 0 ? void 0 : granted.forEach(function (element) {
-                grantedList.push(element.topic);
-                logger_1.logger.info("Subscribed to topics: ".concat(element.topic));
-            });
-            (0, cache_1.setCacheData)("subscribedTopic", grantedList);
-            messageCallback && (0, exports.mqttOnMessage)(messageCallback, client);
-        });
-    }
-    catch (error) {
-        logger_1.logger.error("Subscribed error ".concat(JSON.stringify(error)));
-    }
-};
-exports.mqttSub = mqttSub;
-var mqttUnSub = function (topicList, client) {
-    try {
-        client === null || client === void 0 ? void 0 : client.unsubscribe(topicList, function (error) {
-            if (error) {
-                logger_1.logger.error("Unsubscribe to topics error: ".concat(error.message));
-                return;
-            }
-            topicList.forEach(function (topic) {
-                logger_1.logger.info("unsubscribed to topic: ".concat(topic));
-            });
-        });
-    }
-    catch (error) {
-        logger_1.logger.error("unsubscribed error: ".concat(JSON.stringify(error)));
-    }
-};
-exports.mqttUnSub = mqttUnSub;
-var mqttDisconnect = function (props, reinit, client) {
-    try {
-        client === null || client === void 0 ? void 0 : client.end(false, function () {
-            logger_1.logger.info("MQTT disconnected successfully");
-            if (reinit) {
-                cachedConnection(__assign(__assign({}, props), { value: "client".concat(Math.random().toString(36).substring(7)) }));
-            }
-        });
-    }
-    catch (error) {
-        logger_1.logger.error("disconnect error: ".concat(JSON.stringify(error)));
-    }
-};
-exports.mqttDisconnect = mqttDisconnect;
-var mqttOnMessage = function (messageCallback, client) {
-    try {
-        client === null || client === void 0 ? void 0 : client.on("message", function (topic, message) {
-            messageCallback(topic, message.toString());
-        });
-    }
-    catch (error) {
-        logger_1.logger.error("MQTT onmessage error: ".concat(JSON.stringify(error)));
-    }
-};
-exports.mqttOnMessage = mqttOnMessage;
-var memoizedDb = function () {
-    var cache = {};
-    return function (props) {
-        if (props.value in cache) {
-            logger_1.logger.info("fetching mqtt cache");
-            return cache[props.value];
-        }
-        logger_1.logger.info("Creating new mqtt cache");
-        var result = checkInitConnect(props);
-        cache[props.value] = result;
-        return result;
-    };
-};
-// returned function from memoizedDb
-var cachedConnection = memoizedDb();
-var getMqttClient = function () {
-    return mqttClientId;
-};
-exports.getMqttClient = getMqttClient;
-var mqttCreateConnection = function (props) {
-    return cachedConnection(props);
-};
-exports.mqttCreateConnection = mqttCreateConnection;