improve dependency handling

bin/conformanceServer.ts

@@ -2,7 +2,7 @@
 
 import { AuthenticationResult, Context, Topic } from "../server/mod.ts";
 import { DenoServer } from "../deno/server.ts";
-import { logger, LogLevel } from "../utils/utils.ts";
+import { logger, LogLevel } from "../utils/mod.ts";
 
 const utf8Decoder = new TextDecoder();
 const userTable = new Map();

bin/demoServer.ts

@@ -1,6 +1,6 @@
 import { AuthenticationResult, Context, Topic } from "../server/mod.ts";
 import { DenoServer } from "../deno/server.ts";
-import { logger, LogLevel } from "../utils/utils.ts";
+import { logger, LogLevel } from "../utils/mod.ts";
 
 const utf8Decoder = new TextDecoder();
 const userTable = new Map();

bin/mqtt.ts

@@ -1,4 +1,4 @@
-import { parseArgs } from "../utils/deps.ts";
+import { parseArgs } from "../utils/mod.ts";
 import { DenoClient as Client } from "../deno/client.ts";
 import { DEFAULT_URL, logger } from "../client/mod.ts";
 

client/client.ts

@@ -51,7 +51,7 @@ const CLIENTID_PREFIX = "opifex"; // on first connect
 export class Client {
   protected clientIdPrefix = CLIENTID_PREFIX;
   protected numberOfRetries = DEFAULT_RETRIES;
-  protected url = new URL(DEFAULT_URL);
+  protected url: URL = new URL(DEFAULT_URL);
   protected keepAlive = DEFAULT_KEEPALIVE;
   protected autoReconnect = true;
   private caCerts?: string[];

client/deps.ts

@@ -29,5 +29,5 @@ export {
 export { MqttConn } from "../mqttConn/mqttConn.ts";
 export type { SockConn } from "../mqttConn/mqttConn.ts";
 export { Timer } from "../timer/timer.ts";
-export { AsyncQueue, Deferred, logger } from "../utils/utils.ts";
+export { AsyncQueue, Deferred, logger } from "../utils/mod.ts";
 export { MemoryStore } from "./store/memoryStore.ts";

client/store/deps.ts

@@ -19,4 +19,4 @@ export type {
   UnsubscribePacket,
 } from "../../mqttPacket/mod.ts";
 
-export { assert } from "../../utils/deps.ts";
+export { assert } from "../../utils/mod.ts";

deno/server.test.ts

@@ -1,5 +1,5 @@
 import { DenoServer } from "./server.ts";
-import { assertEquals } from "../utils/dev_deps.ts";
+import { assertEquals } from "../dev_utils/mod.ts";
 
 Deno.test("testServer", () => {
   const server = new DenoServer({ port: 0 }, {});

utils/dev_utils.ts → dev_utils/dummyConn.ts

@@ -1,4 +1,4 @@
-import { AsyncQueue } from "./utils.ts";
+import { AsyncQueue } from "../utils/mod.ts";
 import { SockConn } from "../mqttConn/mqttConn.ts";
 
 class Uint8Writer implements WritableStreamDefaultWriter {

utils/dev_deps.ts → dev_utils/mod.ts

@@ -4,3 +4,5 @@ export {
   assertThrows,
 } from "https://deno.land/[email protected]/assert/mod.ts";
 export { readerFromIterable } from "https://deno.land/[email protected]/streams/mod.ts";
+
+export { DummyConn, DummyQueueConn } from "./dummyConn.ts";

mqttConn/mqttConn.test.ts

@@ -1,7 +1,6 @@
 import { MqttConn, MqttConnError } from "./mqttConn.ts";
-import { AnyPacket, encode } from "./deps.ts";
-import { assertEquals, DummyConn } from "./dev_deps.ts";
-import { PacketType } from "../mqttPacket/types.ts";
+import { assertEquals, DummyConn } from "../dev_utils/mod.ts";
+import { PacketType, AnyPacket, encode } from "../mqttPacket/mod.ts";
 
 const connectPacket: AnyPacket = {
   type: PacketType.connect,

mqttConn/mqttConn.ts

@@ -1,11 +1,12 @@
 import {
   AnyPacket,
-  assert,
   decodePayload,
   encode,
   getLengthDecoder,
   LengthDecoderResult,
-} from "./deps.ts";
+} from "../mqttPacket/mod.ts";
+
+import { assert } from "../utils/mod.ts"
 
 export type SockConn = {
   readable: ReadableStream<Uint8Array>;
@@ -49,7 +50,7 @@ async function readFull(conn: SockConn, buf: Uint8Array): Promise<void> {
   }
 }
 
-/** Read MQTT packet from given BufReader
+/** Read MQTT packet
  * @throws `Error` if packet is invalid
  */
 export async function readPacket(

mqttPacket/connack.test.ts

@@ -1,5 +1,5 @@
 import { PacketType } from "./types.ts";
-import { assertEquals, assertThrows } from "./dev_deps.ts";
+import { assertEquals, assertThrows } from "../dev_utils/mod.ts";
 import { decode, encode } from "./mod.ts";
 
 Deno.test("encode Connack packet", () => {

mqttPacket/connect.test.ts

@@ -1,5 +1,5 @@
 import { PacketType } from "./types.ts";
-import { assertEquals, assertThrows } from "./dev_deps.ts";
+import { assertEquals, assertThrows } from "../dev_utils/mod.ts";
 import { ConnectPacket, decode, encode } from "./mod.ts";
 
 Deno.test("encode Connect with ClientId", () => {

mqttPacket/decoder.test.ts

@@ -1,4 +1,4 @@
-import { assertEquals, assertThrows } from "./dev_deps.ts";
+import { assertEquals, assertThrows } from "../dev_utils/mod.ts";
 import { Decoder } from "./decoder.ts";
 
 const utf8encoder = new TextEncoder();

mqttPacket/disconnect.test.ts

@@ -1,5 +1,5 @@
 import { PacketType } from "./types.ts";
-import { assertEquals, assertThrows } from "./dev_deps.ts";
+import { assertEquals, assertThrows } from "../dev_utils/mod.ts";
 import { decode, encode } from "./mod.ts";
 
 Deno.test("encode Disconnect", () => {

mqttPacket/encoder.test.ts

@@ -1,4 +1,4 @@
-import { assertEquals } from "./dev_deps.ts";
+import { assertEquals } from "../dev_utils/mod.ts";
 import { Encoder } from "./encoder.ts";
 
 const utf8Encoder = new TextEncoder();

mqttPacket/length.test.ts

@@ -1,4 +1,4 @@
-import { assertEquals, assertThrows } from "./dev_deps.ts";
+import { assertEquals, assertThrows } from "../dev_utils/mod.ts";
 import { decodeLength as decode, encodeLength as encode } from "./length.ts";
 
 Deno.test("encodeLength", function encodeLength() {

mqttPacket/mod.ts

@@ -136,3 +136,6 @@ export function decode(buffer: Uint8Array): AnyPacket {
   const end = start + length;
   return decodePayload(buffer[0], buffer.subarray(start, end));
 }
+
+export { getLengthDecoder } from "../mqttPacket/length.ts";
+export type { LengthDecoderResult } from "../mqttPacket/length.ts";

mqttPacket/pingreq.test.ts

@@ -1,5 +1,5 @@
 import { PacketType } from "./types.ts";
-import { assertEquals, assertThrows } from "./dev_deps.ts";
+import { assertEquals, assertThrows } from "../dev_utils/mod.ts";
 import { decode, encode } from "./mod.ts";
 
 Deno.test("encode Pingreq", () => {

mqttPacket/pingres.test.ts

@@ -1,5 +1,5 @@
 import { PacketType } from "./types.ts";
-import { assertEquals, assertThrows } from "./dev_deps.ts";
+import { assertEquals, assertThrows } from "../dev_utils/mod.ts";
 import { decode, encode } from "./mod.ts";
 
 Deno.test("encode Pingres", () => {

mqttPacket/puback.test.ts

@@ -1,5 +1,5 @@
 import { PacketType } from "./types.ts";
-import { assertEquals, assertThrows } from "./dev_deps.ts";
+import { assertEquals, assertThrows } from "../dev_utils/mod.ts";
 import { decode, encode } from "./mod.ts";
 
 Deno.test("encode Puback", () => {

mqttPacket/pubcomp.test.ts

@@ -1,5 +1,5 @@
 import { PacketType } from "./types.ts";
-import { assertEquals, assertThrows } from "./dev_deps.ts";
+import { assertEquals, assertThrows } from "../dev_utils/mod.ts";
 import { decode, encode } from "./mod.ts";
 
 Deno.test("encode Pubcomp", () => {

mqttPacket/publish.test.ts

@@ -1,5 +1,5 @@
 import { PacketType } from "./types.ts";
-import { assertEquals, assertThrows } from "./dev_deps.ts";
+import { assertEquals, assertThrows } from "../dev_utils/mod.ts";
 import { decode, encode } from "./mod.ts";
 
 // const utf8Decoder = new TextDecoder();

mqttPacket/pubrec.test.ts

@@ -1,5 +1,5 @@
 import { PacketType } from "./types.ts";
-import { assertEquals, assertThrows } from "./dev_deps.ts";
+import { assertEquals, assertThrows } from "../dev_utils/mod.ts";
 import { decode, encode } from "./mod.ts";
 
 Deno.test("encode Pubrec", () => {

mqttPacket/pubrel.test.ts

@@ -1,5 +1,5 @@
 import { PacketType } from "./types.ts";
-import { assertEquals, assertThrows } from "./dev_deps.ts";
+import { assertEquals, assertThrows } from "../dev_utils/mod.ts";
 import { decode, encode } from "./mod.ts";
 
 Deno.test("encode Pubrel", () => {

mqttPacket/suback.test.ts

@@ -1,5 +1,5 @@
 import { PacketType } from "./types.ts";
-import { assertEquals } from "./dev_deps.ts";
+import { assertEquals } from "../dev_utils/mod.ts";
 import { decode, encode } from "./mod.ts";
 
 Deno.test("encode Suback", () => {

mqttPacket/subscribe.test.ts

@@ -1,5 +1,5 @@
 import { PacketType } from "./types.ts";
-import { assertEquals, assertThrows } from "./dev_deps.ts";
+import { assertEquals, assertThrows } from "../dev_utils/mod.ts";
 import { decode, encode } from "./mod.ts";
 
 Deno.test("encode Subscribe", () => {

mqttPacket/unsuback.test.ts

@@ -1,5 +1,5 @@
 import { PacketType } from "./types.ts";
-import { assertEquals, assertThrows } from "./dev_deps.ts";
+import { assertEquals, assertThrows } from "../dev_utils/mod.ts";
 import { decode, encode } from "./mod.ts";
 
 Deno.test("encode Puback", () => {

mqttPacket/unsubscribe.test.ts

@@ -1,5 +1,5 @@
 import { PacketType } from "./types.ts";
-import { assertEquals, assertThrows } from "./dev_deps.ts";
+import { assertEquals, assertThrows } from "../dev_utils/mod.ts";
 import { decode, encode } from "./mod.ts";
 
 Deno.test("encode Unsubscribe", () => {

persistence/deps.ts

@@ -9,4 +9,4 @@ export type {
 } from "../mqttPacket/mod.ts";
 export { PacketType } from "../mqttPacket/mod.ts";
 export { Trie } from "../trie/trie.ts";
-export { logger } from "../utils/utils.ts";
+export { logger } from "../utils/mod.ts";

persistence/memory/memoryPersistence.test.ts

@@ -4,7 +4,7 @@ import {
 } from "./memoryPersistence.ts";
 
 import { PacketType, PublishPacket } from "../deps.ts";
-import { assertEquals } from "../../utils/dev_deps.ts";
+import { assertEquals } from "../../dev_utils/mod.ts";
 
 const payloadAny = new TextEncoder().encode("any");
 const qos = 1;

persistence/memory/memoryPersistence.ts

@@ -10,7 +10,7 @@ import {
 
 import { Client, Handler, IPersistence, RetainStore } from "../persistence.ts";
 import { IStore, PacketStore, SubscriptionStore } from "../store.ts";
-import { assert } from "../../utils/deps.ts";
+import { assert } from "../../utils/mod.ts";
 
 const maxPacketId = 0xffff;
 // const maxQueueLength = 0xffff;

server/deps.ts

@@ -27,6 +27,6 @@ export type {
   UnsubscribePacket,
 } from "../mqttPacket/mod.ts";
 
-export { AuthenticationResult, PacketType } from "../mqttConn/deps.ts";
+export { AuthenticationResult, PacketType } from "../mqttPacket/mod.ts";
 export { Timer } from "../timer/timer.ts";
-export { logger } from "../utils/utils.ts";
+export { logger } from "../utils/mod.ts";

server/test/handleConnect.test.ts

@@ -1,4 +1,4 @@
-import { assertEquals, DummyQueueConn } from "./dev_deps.ts";
+import { assertEquals, DummyQueueConn } from "../../dev_utils/mod.ts";
 import { handlers } from "./test-handlers.ts";
 import {
   AnyPacket,
@@ -7,7 +7,7 @@ import {
 } from "../../mqttPacket/mod.ts";
 import { MqttServer } from "../mod.ts";
 import { MqttConn } from "../deps.ts";
-import { AsyncQueue, nextTick } from "../../utils/utils.ts";
+import { AsyncQueue, nextTick } from "../../utils/mod.ts";
 
 const txtEncoder = new TextEncoder();
 // logger.level(LogLevel.debug);

server/test/test-handlers.ts

@@ -1,5 +1,5 @@
 import { AuthenticationResult, Context, Topic } from "../mod.ts";
-import { logger } from "../../utils/utils.ts";
+import { logger } from "../../utils/mod.ts";
 
 const utf8Decoder = new TextDecoder();
 const userTable = new Map();

timer/timer.test.ts

@@ -1,5 +1,5 @@
 import { Timer } from "./timer.ts";
-import { assertEquals } from "../utils/dev_deps.ts";
+import { assertEquals } from "../dev_utils/mod.ts";
 
 function delay(ms: number) {
   return new Promise((resolve) => setTimeout(resolve, ms));

trie/trie.test.ts

@@ -1,5 +1,5 @@
 import { Trie } from "./trie.ts";
-import { assertArrayIncludes, assertEquals } from "../utils/dev_deps.ts";
+import { assertArrayIncludes, assertEquals } from "../dev_utils/mod.ts";
 
 type Data = Array<[string, number]>;
 type Matches = Array<[string, number[]]>;

utils/deps.ts → utils/mod.ts

@@ -1,4 +1,10 @@
-export { parse } from "https://deno.land/[email protected]/flags/mod.ts";
 export { parseArgs } from "https://deno.land/[email protected]/cli/parse_args.ts";
 export { assert } from "https://deno.land/[email protected]/assert/mod.ts";
-export { BufReader } from "https://deno.land/[email protected]/io/mod.ts";
+export {
+  AsyncQueue,
+  Deferred,
+  Logger,
+  logger,
+  LogLevel,
+  nextTick,
+} from "./utils.ts";

utils/utils.ts

@@ -85,7 +85,7 @@ export enum LogLevel {
   debug = 4,
 }
 
-class Logger {
+export class Logger {
   private defaultError = console.error;
   private defaultWarn = console.warn;
   private defaultInfo = console.info;