Merge pull request #21 from seriousme/export-tcp-client-server

Export TcpClient,TcpServer, mqttPacket and utils
seriousme · Jan 18, 2025 · 2bc3a86 · 2bc3a86
2 parents 6ace4a3 + 98102b1
commit 2bc3a86
Show file tree

Hide file tree

Showing 16 changed files with 26 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,13 @@
 
 ### Changed
 
+## [v1.6.0] 18-01-2025
+
+### Changed
+
+- added: export TcpClient and TcpServer for both NodeJS and Deno
+- added: export mqttPacket and utils
+
 ## [v1.5.1] 16-01-2025
 
 ### Changed

diff --git a/bin/conformanceServer.ts b/bin/conformanceServer.ts
@@ -5,7 +5,7 @@ import { AuthenticationResult } from "../server/mod.ts";
 import type { Context, TAuthenticationResult, Topic } from "../server/mod.ts";
 import { logger, LogLevel } from "../utils/mod.ts";
 import { getArgs, parseArgs } from "../utils/mod.ts";
-import { TcpServer } from "../node/server.ts";
+import { TcpServer } from "../node/tcpServer.ts";
 
 const utf8Decoder = new TextDecoder();
 const userTable = new Map();

diff --git a/bin/demoServer.ts b/bin/demoServer.ts
@@ -1,5 +1,5 @@
 #!/usr/bin/env -S node --experimental-strip-types
-import { TcpServer } from "../node/server.ts";
+import { TcpServer } from "../node/tcpServer.ts";
 import type { Context, TAuthenticationResult, Topic } from "../server/mod.ts";
 import { AuthenticationResult } from "../server/mod.ts";
 import { getArgs, logger, LogLevel, parseArgs } from "../utils/mod.ts";

diff --git a/bin/mqtt.ts b/bin/mqtt.ts
@@ -2,7 +2,7 @@
 import { DEFAULT_URL } from "../client/mod.ts";
 import { logger, LogLevel } from "../utils/mod.ts";
 import { getArgs, parseArgs } from "../utils/mod.ts";
-import { getFileData, TcpClient } from "../node/client.ts";
+import { getFileData, TcpClient } from "../node/tcpClient.ts";
 import type { Args } from "../utils/args.ts";
 
 const client = new TcpClient();

diff --git a/deno/client.ts → deno/tcpClient.ts b/deno/client.ts → deno/tcpClient.ts
diff --git a/deno/server.test.ts → deno/tcpServer.test.ts b/deno/server.test.ts → deno/tcpServer.test.ts
@@ -1,6 +1,6 @@
 import assert from "node:assert/strict";
 import { test } from "node:test";
-import { TcpServer } from "./server.ts";
+import { TcpServer } from "./tcpServer.ts";
 
 test("Deno testServer", () => {
   const server = new TcpServer({ port: 0 }, {});

diff --git a/deno/server.ts → deno/tcpServer.ts b/deno/server.ts → deno/tcpServer.ts
diff --git a/dist/bin/conformanceServer.js b/dist/bin/conformanceServer.js
@@ -3,7 +3,7 @@
 import { AuthenticationResult } from "../server/mod.js";
 import { logger, LogLevel } from "../utils/mod.js";
 import { getArgs, parseArgs } from "../utils/mod.js";
-import { TcpServer } from "../node/server.js";
+import { TcpServer } from "../node/tcpServer.js";
 const utf8Decoder = new TextDecoder();
 const userTable = new Map();
 userTable.set("IoTester_1", "strong_password");

diff --git a/dist/bin/demoServer.js b/dist/bin/demoServer.js
@@ -1,5 +1,5 @@
 #!/usr/bin/env -S node --experimental-strip-types
-import { TcpServer } from "../node/server.js";
+import { TcpServer } from "../node/tcpServer.js";
 import { AuthenticationResult } from "../server/mod.js";
 import { getArgs, logger, LogLevel, parseArgs } from "../utils/mod.js";
 const utf8Decoder = new TextDecoder();

diff --git a/dist/bin/mqtt.js b/dist/bin/mqtt.js
@@ -2,7 +2,7 @@
 import { DEFAULT_URL } from "../client/mod.js";
 import { logger, LogLevel } from "../utils/mod.js";
 import { getArgs, parseArgs } from "../utils/mod.js";
-import { getFileData, TcpClient } from "../node/client.js";
+import { getFileData, TcpClient } from "../node/tcpClient.js";
 const client = new TcpClient();
 const encoder = new TextEncoder();
 const decoder = new TextDecoder();

diff --git a/dist/node/client.js → dist/node/tcpClient.js b/dist/node/client.js → dist/node/tcpClient.js
diff --git a/dist/node/server.js → dist/node/tcpServer.js b/dist/node/server.js → dist/node/tcpServer.js
diff --git a/node/client.ts → node/tcpClient.ts b/node/client.ts → node/tcpClient.ts
diff --git a/node/server.test.ts → node/tcpServer.test.ts b/node/server.test.ts → node/tcpServer.test.ts
@@ -1,7 +1,7 @@
 import { test } from "node:test";
 import assert from "node:assert/strict";
-import { TcpClient } from "./client.ts";
-import { TcpServer } from "./server.ts";
+import { TcpClient } from "./tcpClient.ts";
+import { TcpServer } from "./tcpServer.ts";
 import { logger, LogLevel } from "../utils/mod.ts";
 import type { PublishPacket, QoS } from "../mqttPacket/mod.ts";
 

diff --git a/node/server.ts → node/tcpServer.ts b/node/server.ts → node/tcpServer.ts
diff --git a/package.json b/package.json
@@ -23,12 +23,20 @@
   },
   "exports": {
     "./server": "./dist/server/mod.js",
-    "./client": "./dist/client/mod.js"
+    "./client": "./dist/client/mod.js",
+    "./mqttPacket": "./dist/mqttPacket/mod.js",
+    "./utils": "./dist/utils/mod.js,",
+    "./tcpClient": "./dist/node/tcpClient.js",
+    "./tcpServer": "./dist/node/tcpServer.js"
   },
   "deno": {
     "exports": {
       "./server": "./server/mod.ts",
-      "./client": "./client/mod.ts"
+      "./client": "./client/mod.ts",
+      "./mqttPacket": "./mqttPacket/mod.ts",
+      "./utils": "./utils/mod.ts,",
+      "./tcpClient": "./deno/tcpClient.ts",
+      "./tcpServer": "./deno/tcpServer.ts"
     },
     "exclude": [
       "dist"