@seriousme/opifex 1.11.3 → 2.0.3

package/dist/server/handlers/completeConnect.js

@@ -0,0 +1,74 @@
+import { AuthenticationResult, PacketType, ReasonCode } from "../deps.js";
+/**
+ * Maps MQTT v5 ReasonCodes to MQTT v3.1.1 ReturnCodes (AuthenticationResult)
+ */
+const V4_RETURN_CODE_MAP = {
+    [ReasonCode.success]: AuthenticationResult.ok, // 0x00
+    [ReasonCode.unsupportedProtocolVersion]: AuthenticationResult.unacceptableProtocol, // 0x01
+    [ReasonCode.clientIdentifierNotValid]: AuthenticationResult.rejectedUsername, // 0x02
+    [ReasonCode.badUserNameOrPassword]: AuthenticationResult.badUsernameOrPassword, // 0x04
+    [ReasonCode.badAuthenticationMethod]: AuthenticationResult.badUsernameOrPassword, // 0x04
+    [ReasonCode.notAuthorized]: AuthenticationResult.notAuthorized, // 0x05
+    [ReasonCode.banned]: AuthenticationResult.notAuthorized, // 0x05
+};
+export function reasonToReturnCode(reasonCode) {
+    return V4_RETURN_CODE_MAP[reasonCode] ??
+        AuthenticationResult.serverUnavailable; // 0x03
+}
+/**
+ * complete connect
+ */
+export async function completeConnect(ctx, protocolLevel, reasonCode, reasonString) {
+    const cfg = ctx.config.context;
+    const connectOpts = ctx.connectOptions || {};
+    const isSuccess = reasonCode === ReasonCode.success;
+    const isProtocolV5 = protocolLevel === 5;
+    let sessionPresent = false;
+    if (isSuccess) {
+        // Establish Session on Success
+        sessionPresent = await ctx.connect();
+    }
+    // Send CONNACK
+    const result = isProtocolV5
+        ? {
+            reasonCode,
+            properties: {
+                // only send full details on success
+                ...(isSuccess
+                    ? {
+                        receiveMaximum: cfg.receiveMaximum,
+                        maximumQos: cfg.maximumQos,
+                        retainAvailable: cfg.retainAvailable,
+                        maximumPacketSize: cfg.maximumIncomingPacketSize,
+                        topicAliasMaximum: cfg.topicAliasMaximum,
+                        wildcardSubscriptionAvailable: cfg.wildcardSubscriptionAvailable,
+                        subscriptionIdentifierAvailable: cfg.subscriptionIdentifierAvailable,
+                        sharedSubscriptionAvailable: cfg.sharedSubscriptionAvailable,
+                        serverKeepAlive: cfg.serverKeepAlive,
+                        assignedClientIdentifier: connectOpts.assignedClientIdentifier,
+                        sessionExpiryInterval: connectOpts.sessionExpiryInterval,
+                    }
+                    : {}),
+                reasonString: reasonString,
+            },
+        }
+        : { returnCode: reasonToReturnCode(reasonCode) };
+    await ctx.send({
+        type: PacketType.connack,
+        protocolLevel,
+        sessionPresent,
+        ...result,
+    });
+    // Finalize or Terminate Connection
+    if (!isSuccess) {
+        await ctx.close(false);
+        return;
+    }
+    // reset connectOptions
+    ctx.connectOptions = undefined;
+    // start redelivery
+    if (sessionPresent) {
+        await ctx.handleRedelivery();
+    }
+}
+//# sourceMappingURL=completeConnect.js.map

package/dist/server/handlers/completeConnect.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"completeConnect.js","sourceRoot":"","sources":["../../../server/handlers/completeConnect.ts"],"names":[],"mappings":"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"}

package/dist/server/handlers/handleAuth.d.ts

@@ -0,0 +1,9 @@
+import type { Context } from "../context.ts";
+import type { AuthPacket } from "../deps.ts";
+/**
+ * Handles v5 Auth packet
+ * @param ctx - The connection context containing send method
+ * @returns Promise that resolves
+ */
+export declare function handleAuth(ctx: Context, authPacket: AuthPacket): Promise<void>;
+//# sourceMappingURL=handleAuth.d.ts.map

package/dist/server/handlers/handleAuth.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"handleAuth.d.ts","sourceRoot":"","sources":["../../../server/handlers/handleAuth.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAuB,OAAO,EAAE,MAAM,eAAe,CAAC;AAElE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAyC7C;;;;GAIG;AAEH,wBAAsB,UAAU,CAC9B,GAAG,EAAE,OAAO,EACZ,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC,IAAI,CAAC,CAkCf"}

package/dist/server/handlers/handleAuth.js

@@ -0,0 +1,69 @@
+import { SessionState } from "../context.js";
+import { PacketType, ReasonCode } from "../deps.js";
+import { completeConnect } from "./completeConnect.js";
+/**
+ * Handle success
+ */
+async function handleResult(ctx, authMethod, result) {
+    await ctx.send({
+        type: PacketType.auth,
+        protocolLevel: 5,
+        reasonCode: result.reasonCode,
+        properties: result.authData
+            ? {
+                authenticationMethod: authMethod,
+                authenticationData: result.authData,
+                reasonString: result.reasonString,
+            }
+            : {},
+    });
+}
+/**
+ * Handle errors
+ */
+async function handleError(ctx, result) {
+    await ctx.send({
+        type: PacketType.disconnect,
+        protocolLevel: 5,
+        reasonCode: result?.reasonCode ?? ReasonCode.badAuthenticationMethod,
+        properties: {
+            reasonString: result?.reasonString ?? "Bad authentication mode",
+        },
+    });
+    await ctx.close(false);
+}
+/**
+ * Handles v5 Auth packet
+ * @param ctx - The connection context containing send method
+ * @returns Promise that resolves
+ */
+export async function handleAuth(ctx, authPacket) {
+    if (ctx.handlers.processAuth) {
+        const authMethod = authPacket.properties?.authenticationMethod;
+        const authData = authPacket.properties?.authenticationData;
+        if (!(authMethod && authData)) {
+            return await ctx.close(false);
+        }
+        if (ctx.state === SessionState.connected) {
+            ctx.state = SessionState.authenticating;
+        }
+        const result = await ctx.handlers.processAuth(ctx, ctx.clientId, authMethod, authData);
+        // we need more data
+        if (result.reasonCode === ReasonCode.continueAuthentication) {
+            return handleResult(ctx, authMethod, result);
+        }
+        // we are done but were still connecting
+        if (ctx.state === SessionState.connecting) {
+            await completeConnect(ctx, 5, result.reasonCode, result.reasonString);
+            return;
+        }
+        // we are done but were reauthentication in flight
+        if (result.reasonCode === ReasonCode.success) {
+            ctx.state = SessionState.connected;
+            return handleResult(ctx, authMethod, result);
+        }
+        return handleError(ctx, result);
+    }
+    return handleError(ctx);
+}
+//# sourceMappingURL=handleAuth.js.map

package/dist/server/handlers/handleAuth.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"handleAuth.js","sourceRoot":"","sources":["../../../server/handlers/handleAuth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAEpD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD;;GAEG;AAEH,KAAK,UAAU,YAAY,CACzB,GAAY,EACZ,UAAkB,EAClB,MAA2B;IAE3B,MAAM,GAAG,CAAC,IAAI,CAAC;QACb,IAAI,EAAE,UAAU,CAAC,IAAI;QACrB,aAAa,EAAE,CAAC;QAChB,UAAU,EAAE,MAAM,CAAC,UAAU;QAC7B,UAAU,EAAE,MAAM,CAAC,QAAQ;YACzB,CAAC,CAAC;gBACA,oBAAoB,EAAE,UAAU;gBAChC,kBAAkB,EAAE,MAAM,CAAC,QAAQ;gBACnC,YAAY,EAAE,MAAM,CAAC,YAAY;aAClC;YACD,CAAC,CAAC,EAAE;KACP,CAAC,CAAC;AACL,CAAC;AACD;;GAEG;AAEH,KAAK,UAAU,WAAW,CAAC,GAAY,EAAE,MAA4B;IACnE,MAAM,GAAG,CAAC,IAAI,CAAC;QACb,IAAI,EAAE,UAAU,CAAC,UAAU;QAC3B,aAAa,EAAE,CAAC;QAChB,UAAU,EAAE,MAAM,EAAE,UAAU,IAAI,UAAU,CAAC,uBAAuB;QACpE,UAAU,EAAE;YACV,YAAY,EAAE,MAAM,EAAE,YAAY,IAAI,yBAAyB;SAChE;KACF,CAAC,CAAC;IACH,MAAM,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;AACzB,CAAC;AAED;;;;GAIG;AAEH,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,GAAY,EACZ,UAAsB;IAEtB,IAAI,GAAG,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;QAC7B,MAAM,UAAU,GAAG,UAAU,CAAC,UAAU,EAAE,oBAAoB,CAAC;QAC/D,MAAM,QAAQ,GAAG,UAAU,CAAC,UAAU,EAAE,kBAAkB,CAAC;QAC3D,IAAI,CAAC,CAAC,UAAU,IAAI,QAAQ,CAAC,EAAE,CAAC;YAC9B,OAAO,MAAM,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAChC,CAAC;QAED,IAAI,GAAG,CAAC,KAAK,KAAK,YAAY,CAAC,SAAS,EAAE,CAAC;YACzC,GAAG,CAAC,KAAK,GAAG,YAAY,CAAC,cAAc,CAAC;QAC1C,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,WAAW,CAC3C,GAAG,EACH,GAAG,CAAC,QAAS,EACb,UAAU,EACV,QAAQ,CACT,CAAC;QACF,oBAAoB;QACpB,IAAI,MAAM,CAAC,UAAU,KAAK,UAAU,CAAC,sBAAsB,EAAE,CAAC;YAC5D,OAAO,YAAY,CAAC,GAAG,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;QAC/C,CAAC;QACD,wCAAwC;QACxC,IAAI,GAAG,CAAC,KAAK,KAAK,YAAY,CAAC,UAAU,EAAE,CAAC;YAC1C,MAAM,eAAe,CAAC,GAAG,EAAE,CAAC,EAAE,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;YACtE,OAAO;QACT,CAAC;QACD,kDAAkD;QAClD,IAAI,MAAM,CAAC,UAAU,KAAK,UAAU,CAAC,OAAO,EAAE,CAAC;YAC7C,GAAG,CAAC,KAAK,GAAG,YAAY,CAAC,SAAS,CAAC;YACnC,OAAO,YAAY,CAAC,GAAG,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;QAC/C,CAAC;QACD,OAAO,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAClC,CAAC;IACD,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC;AAC1B,CAAC"}

package/dist/server/handlers/handleConnect.d.ts

@@ -1,9 +1,7 @@
 import type { Context } from "../context.ts";
 import type { ConnectPacket } from "../deps.ts";
 /**
- * Handles the MQTT CONNECT packet
- * @param ctx - The connection context
- * @param packet - The MQTT CONNECT packet to handle
+ * Handles the MQTT CONNECT packet.
  */
-export declare function handleConnect(ctx: Context, packet: ConnectPacket): void;
+export declare function handleConnect(ctx: Context, packet: ConnectPacket): Promise<void>;
 //# sourceMappingURL=handleConnect.d.ts.map

package/dist/server/handlers/handleConnect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handleConnect.d.ts","sourceRoot":"","sources":["../../../server/handlers/handleConnect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAG7C,OAAO,KAAK,EAAE,aAAa,EAAyB,MAAM,YAAY,CAAC;AA2FvE;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,GAAG,IAAI,CAmBvE"}
+{"version":3,"file":"handleConnect.d.ts","sourceRoot":"","sources":["../../../server/handlers/handleConnect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,OAAO,EACR,MAAM,eAAe,CAAC;AAQvB,OAAO,KAAK,EAAE,aAAa,EAAoB,MAAM,YAAY,CAAC;AAiKlE;;GAEG;AACH,wBAAsB,aAAa,CACjC,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,IAAI,CAAC,CAsDf"}

package/dist/server/handlers/handleConnect.js

@@ -1,89 +1,162 @@
-import { AuthenticationResult, logger, PacketType, Timer } from "../deps.js";
+import { invalidmaxTopicLevels, invalidTopic, logger, PacketType, ReasonCode, } from "../deps.js";
+import { completeConnect } from "./completeConnect.js";
 /**
- * Checks if the client is authenticated based on the provided credentials
- * @param ctx - The connection context
- * @param packet - The MQTT CONNECT packet
- * @returns Authentication result indicating if the client is authenticated
+ * Extracts options from MQTT v5 packet properties.
  */
-function isAuthenticated(ctx, packet) {
-    if (ctx.handlers.isAuthenticated) {
-        return ctx.handlers.isAuthenticated(ctx, packet.clientId || "", packet.username || "", packet.password || new Uint8Array(0));
+function extractConnectOptions(packet) {
+    if (packet.protocolLevel !== 5) {
+        return {};
     }
-    return AuthenticationResult.ok;
+    return {
+        sessionExpiryInterval: packet.properties?.sessionExpiryInterval,
+        willDelayInterval: packet.will?.properties?.willDelayInterval,
+        topicAliasMaximum: packet.properties?.topicAliasMaximum,
+        maximumOutgoingPacketSize: packet.properties?.maximumPacketSize,
+        receiveMaximum: packet.properties?.receiveMaximum,
+    };
 }
 /**
- * Validates the CONNECT packet
- * @param ctx - The connection context
- * @param packet - The MQTT CONNECT packet to validate
- * @returns Authentication result indicating if the CONNECT packet is valid
+ * Checks if client credentials are valid.
  */
-function validateConnect(ctx, packet) {
-    if (packet.protocolLevel !== 4) {
-        return AuthenticationResult.unacceptableProtocol;
+async function authenticateClient(ctx, clientId, packet) {
+    const isProtocolV5 = packet.protocolLevel === 5;
+    const authMethod = isProtocolV5
+        ? packet.properties?.authenticationMethod
+        : undefined;
+    if (ctx.handlers.isAuthenticated) {
+        try {
+            const result = await ctx.handlers.isAuthenticated(ctx, clientId, packet.username || "", packet.password || new Uint8Array(0), packet);
+            if (isProtocolV5 && result.reasonCode === ReasonCode.success &&
+                authMethod !== undefined && ctx.handlers.processAuth) {
+                const authData = packet.properties?.authenticationData;
+                return await ctx.handlers.processAuth(ctx, clientId, authMethod, authData);
+            }
+            return result;
+        }
+        catch (err) {
+            let message = "unknown error";
+            if (err instanceof Error) {
+                message = err.message;
+            }
+            logger.error("Authentication failed with error", message);
+            return {
+                reasonCode: ReasonCode.unspecifiedError,
+                reasonString: "Authentication failed",
+            };
+        }
     }
-    return isAuthenticated(ctx, packet);
+    return { reasonCode: ReasonCode.success };
 }
 /**
- * Processes the validated CONNECT packet
- * @param packet - The MQTT CONNECT packet
- * @param ctx - The connection context
- * @param clientId - The client ID
+ * Validates the CONNECT packet structure and Will configuration.
  */
-function processValidatedConnect(returnCode, packet, ctx, clientId) {
-    if (returnCode === AuthenticationResult.ok) {
-        if (packet.will) {
-            ctx.will = {
-                type: PacketType.publish,
-                protocolLevel: ctx.protocolLevel,
-                qos: packet.will.qos,
-                retain: packet.will.retain,
-                topic: packet.will.topic,
-                payload: packet.will.payload,
+async function validateConnectPacket(ctx, packet, sessionExpiryInterval) {
+    const cfg = ctx.config.context;
+    // Protocol version check
+    if (!cfg.protocols.includes(packet.protocolLevel)) {
+        return {
+            reasonCode: ReasonCode.unsupportedProtocolVersion,
+            reasonString: `Protocol version ${packet.protocolLevel} is not supported`,
+        };
+    }
+    // Will message validation
+    if (packet.will) {
+        const isProtocolV5 = packet.protocolLevel === 5;
+        const will = packet.will;
+        if (will.topic === "" || invalidTopic(will.topic) ||
+            invalidmaxTopicLevels(will.topic, cfg.maxTopicLevels)) {
+            return {
+                reasonCode: ReasonCode.topicNameInvalid,
+                reasonString: "Invalid will topic",
             };
         }
-        ctx.connect(clientId, packet.clean || false);
-        ctx.protocolLevel = packet.protocolLevel;
-        if (ctx.mqttConn) {
-            logger.debug(`Setting protocolLevel to ${ctx.protocolLevel}`);
-            ctx.mqttConn.codecOpts.protocolLevel = ctx.protocolLevel;
+        if (!cfg.retainAvailable && will.retain) {
+            return {
+                reasonCode: ReasonCode.retainNotSupported,
+                reasonString: "Publish will with retain=true is not supported",
+            };
         }
-        const keepAlive = packet.keepAlive || 0;
-        if (keepAlive > 0) {
-            logger.debug(`Setting keepalive to ${keepAlive * 1500} ms`);
-            ctx.timer = new Timer(() => {
-                ctx.close();
-            }, Math.floor(keepAlive * 1500));
+        const checkAuthz = ctx.handlers.isAuthorizedToPublish;
+        if (checkAuthz && !await checkAuthz(ctx, will.topic)) {
+            return {
+                reasonCode: ReasonCode.notAuthorized,
+                reasonString: `Client not authorized to publish will to ${will.topic}`,
+            };
         }
-        // is this a new session?
-        // either because its the first time for the client
-        // or it specifically asked for a clean one
-        const previousSession = ctx.store?.existingSession;
-        // client now has a history
-        if (!previousSession && ctx.store) {
-            ctx.store.existingSession = true;
+        const qos = will.qos || 0;
+        if (qos > cfg.maximumQos) {
+            return {
+                reasonCode: ReasonCode.qosNotSupported,
+                reasonString: `Server does not support publish will with QoS ${qos}`,
+            };
+        }
+        if (isProtocolV5) {
+            const requestedInterval = packet.will.properties?.willDelayInterval || 0;
+            if (requestedInterval > sessionExpiryInterval) {
+                return {
+                    reasonCode: ReasonCode.payloadFormatInvalid,
+                    reasonString: "Will delay interval larger than allowed session expiry interval",
+                };
+            }
+            const expiryInterval = packet.will.properties?.messageExpiryInterval;
+            if (expiryInterval) {
+                will.expiresAtMs = Date.now() + expiryInterval * 1000;
+            }
+            const authMethod = packet.properties?.authenticationMethod;
+            const authData = packet.properties?.authenticationData;
+            if (
+            // both need to be either present or absent, one is not enough
+            (authMethod !== undefined) !== (authData !== undefined) ||
+                // authMethod without a handler won't work
+                (authMethod !== undefined || !ctx.handlers.processAuth)) {
+                return {
+                    reasonCode: ReasonCode.badAuthenticationMethod,
+                    reasonString: "Bad authentication method or missing authentication data",
+                };
+            }
         }
-        return previousSession || false;
     }
-    return false;
+    return null;
 }
 /**
- * Handles the MQTT CONNECT packet
- * @param ctx - The connection context
- * @param packet - The MQTT CONNECT packet to handle
+ * Handles the MQTT CONNECT packet.
  */
-export function handleConnect(ctx, packet) {
-    const clientId = packet.clientId || `Opifex-${crypto.randomUUID()}`;
-    const returnCode = validateConnect(ctx, packet);
-    const sessionPresent = processValidatedConnect(returnCode, packet, ctx, clientId);
-    ctx.send({
-        type: PacketType.connack,
-        protocolLevel: ctx.protocolLevel,
-        sessionPresent,
-        returnCode,
-    });
-    logger.debug("connect returnCode", returnCode);
-    if (returnCode !== AuthenticationResult.ok) {
-        ctx.close();
+export async function handleConnect(ctx, packet) {
+    const isProtocolV5 = packet.protocolLevel === 5;
+    const cfg = ctx.config.context;
+    // Assign Client ID if missing
+    let clientId = packet.clientId;
+    let assignedClientIdentifier = undefined;
+    if (!clientId) {
+        clientId = `Opifex-${crypto.randomUUID()}`;
+        assignedClientIdentifier = clientId;
+    }
+    // Extract connect options for v5
+    const connectOpts = extractConnectOptions(packet);
+    // Limit session Expiry Interval to server maximum
+    connectOpts.sessionExpiryInterval = Math.min(connectOpts.sessionExpiryInterval || 0, cfg.maxSessionExpiryInterval);
+    connectOpts.keepAlive = packet.keepAlive;
+    connectOpts.assignedClientIdentifier = assignedClientIdentifier;
+    // Validate Packet & Authenticate Client
+    const validationError = await validateConnectPacket(ctx, packet, connectOpts.sessionExpiryInterval);
+    const authResult = validationError ??
+        await authenticateClient(ctx, clientId, packet);
+    const { reasonCode, reasonString, authData } = authResult;
+    const requireAuth = reasonCode === ReasonCode.continueAuthentication;
+    ctx.prepareConnect(packet, clientId, connectOpts);
+    if (isProtocolV5 && requireAuth) {
+        const authMethod = packet.properties?.authenticationMethod;
+        await ctx.send({
+            type: PacketType.auth,
+            protocolLevel: 5,
+            reasonCode,
+            properties: {
+                authenticationMethod: authMethod,
+                authenticationData: authData,
+            },
+        });
+        return;
     }
+    await completeConnect(ctx, packet.protocolLevel || 4, reasonCode, reasonString);
 }
 //# sourceMappingURL=handleConnect.js.map

package/dist/server/handlers/handleConnect.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleConnect.js","sourceRoot":"","sources":["../../../server/handlers/handleConnect.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"handleConnect.js","sourceRoot":"","sources":["../../../server/handlers/handleConnect.ts"],"names":[],"mappings":"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"}

package/dist/server/handlers/handleDisconnect.d.ts

@@ -4,5 +4,5 @@ import type { Context } from "../context.ts";
  * @param {Context} ctx - The connection context object
  * @returns {void}
  */
-export declare function handleDisconnect(ctx: Context): void;
+export declare function handleDisconnect(ctx: Context): Promise<void>;
 //# sourceMappingURL=handleDisconnect.d.ts.map

package/dist/server/handlers/handleDisconnect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handleDisconnect.d.ts","sourceRoot":"","sources":["../../../server/handlers/handleDisconnect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI,CAGnD"}
+{"version":3,"file":"handleDisconnect.d.ts","sourceRoot":"","sources":["../../../server/handlers/handleDisconnect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C;;;;GAIG;AACH,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAGlE"}

package/dist/server/handlers/handleDisconnect.js

@@ -3,8 +3,8 @@
  * @param {Context} ctx - The connection context object
  * @returns {void}
  */
-export function handleDisconnect(ctx) {
-    ctx.will = undefined;
-    ctx.close();
+export async function handleDisconnect(ctx) {
+    // close the context without sending the will
+    await ctx.close(false);
 }
 //# sourceMappingURL=handleDisconnect.js.map

package/dist/server/handlers/handleDisconnect.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleDisconnect.js","sourceRoot":"","sources":["../../../server/handlers/handleDisconnect.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAAC,GAAY;IAC3C,GAAG,CAAC,IAAI,GAAG,SAAS,CAAC;IACrB,GAAG,CAAC,KAAK,EAAE,CAAC;AACd,CAAC"}
+{"version":3,"file":"handleDisconnect.js","sourceRoot":"","sources":["../../../server/handlers/handleDisconnect.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,GAAY;IACjD,6CAA6C;IAC7C,MAAM,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;AACzB,CAAC"}

package/dist/server/handlers/handlePacket.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handlePacket.d.ts","sourceRoot":"","sources":["../../../server/handlers/handlePacket.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,KAAK,EACV,SAAS,EAQV,MAAM,YAAY,CAAC;AAapB;;;;;;GAMG;AACH,wBAAsB,YAAY,CAChC,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,SAAS,GAChB,OAAO,CAAC,IAAI,CAAC,CAiDf"}
+{"version":3,"file":"handlePacket.d.ts","sourceRoot":"","sources":["../../../server/handlers/handlePacket.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,KAAK,EACV,SAAS,EASV,MAAM,YAAY,CAAC;AAcpB;;;;;;GAMG;AACH,wBAAsB,YAAY,CAChC,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,SAAS,GAChB,OAAO,CAAC,IAAI,CAAC,CAoEf"}

package/dist/server/handlers/handlePacket.js

@@ -1,3 +1,4 @@
+import { SessionState } from "../context.js";
 import { PacketNameByType, PacketType } from "../deps.js";
 import { handleConnect } from "./handleConnect.js";
 import { handlePingreq } from "./handlePingreq.js";
@@ -9,6 +10,7 @@ import { handlePubcomp } from "./handlePubcomp.js";
 import { handleSubscribe } from "./handleSubscribe.js";
 import { handleUnsubscribe } from "./handleUnsubscribe.js";
 import { handleDisconnect } from "./handleDisconnect.js";
+import { handleAuth } from "./handleAuth.js";
 import { logger } from "../deps.js";
 /**
  * Handles incoming MQTT packets based on their type and connection state
@@ -18,15 +20,23 @@ import { logger } from "../deps.js";
  * @returns Promise that resolves when packet handling is complete
  */
 export async function handlePacket(ctx, packet) {
-    logger.debug("handling", PacketNameByType[packet.type]);
-    logger.debug(JSON.stringify(packet, null, 2));
-    if (!ctx.connected) {
+    logger.debug("server/handlePacket", PacketNameByType[packet.type]);
+    logger.debug("server/handlePacket", () => JSON.stringify(packet, null, 2));
+    if (ctx.state === SessionState.disconnected) {
         if (packet.type === PacketType.connect) {
-            handleConnect(ctx, packet);
+            await handleConnect(ctx, packet);
+            ctx.timer?.reset();
+            return;
         }
-        else {
-            throw new Error(`Received ${PacketNameByType[packet.type]} packet before connect`);
+        throw new Error(`Received ${PacketNameByType[packet.type]} packet before connect`);
+    }
+    if (ctx.state === SessionState.connecting) {
+        if (packet.type === PacketType.auth) {
+            await handleAuth(ctx, packet);
+            ctx.timer?.reset();
+            return;
         }
+        throw new Error(`Received unexpected ${PacketNameByType[packet.type]} packet before connect completed`);
     }
     else {
         switch (packet.type) {
@@ -57,6 +67,9 @@ export async function handlePacket(ctx, packet) {
             case PacketType.disconnect:
                 handleDisconnect(ctx);
                 break;
+            case PacketType.auth:
+                handleAuth(ctx, packet);
+                break;
             default:
                 throw new Error(`Received unexpected ${PacketNameByType[packet.type]} packet after connect`);
         }

package/dist/server/handlers/handlePacket.js.map

@@ -1 +1 @@
-{"version":3,"file":"handlePacket.js","sourceRoot":"","sources":["../../../server/handlers/handlePacket.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAW1D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEpC;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,GAAY,EACZ,MAAiB;IAEjB,MAAM,CAAC,KAAK,CAAC,UAAU,EAAE,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IACxD,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAC9C,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;QACnB,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,OAAO,EAAE,CAAC;YACvC,aAAa,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAC7B,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CACb,YAAY,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,wBAAwB,CAClE,CAAC;QACJ,CAAC;IACH,CAAC;SAAM,CAAC;QACN,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;YACpB,KAAK,UAAU,CAAC,OAAO;gBACrB,MAAM,aAAa,CAAC,GAAG,CAAC,CAAC;gBACzB,MAAM;YACR,KAAK,UAAU,CAAC,OAAO;gBACrB,MAAM,aAAa,CAAC,GAAG,EAAE,MAAuB,CAAC,CAAC;gBAClD,MAAM;YACR,KAAK,UAAU,CAAC,MAAM;gBACpB,YAAY,CAAC,GAAG,EAAE,MAAsB,CAAC,CAAC;gBAC1C,MAAM;YACR,KAAK,UAAU,CAAC,MAAM;gBACpB,MAAM,YAAY,CAAC,GAAG,EAAE,MAAsB,CAAC,CAAC;gBAChD,MAAM;YACR,KAAK,UAAU,CAAC,MAAM;gBACpB,MAAM,YAAY,CAAC,GAAG,EAAE,MAAsB,CAAC,CAAC;gBAChD,MAAM;YACR,KAAK,UAAU,CAAC,OAAO;gBACrB,aAAa,CAAC,GAAG,EAAE,MAAuB,CAAC,CAAC;gBAC5C,MAAM;YACR,KAAK,UAAU,CAAC,SAAS;gBACvB,MAAM,eAAe,CAAC,GAAG,EAAE,MAAyB,CAAC,CAAC;gBACtD,MAAM;YACR,KAAK,UAAU,CAAC,WAAW;gBACzB,MAAM,iBAAiB,CAAC,GAAG,EAAE,MAA2B,CAAC,CAAC;gBAC1D,MAAM;YACR,KAAK,UAAU,CAAC,UAAU;gBACxB,gBAAgB,CAAC,GAAG,CAAC,CAAC;gBACtB,MAAM;YACR;gBACE,MAAM,IAAI,KAAK,CACb,uBACE,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAC9B,uBAAuB,CACxB,CAAC;QACN,CAAC;QACD,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC;IACrB,CAAC;AACH,CAAC"}
+{"version":3,"file":"handlePacket.js","sourceRoot":"","sources":["../../../server/handlers/handlePacket.ts"],"names":[],"mappings":"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"}

package/dist/server/handlers/handlePuback.d.ts

@@ -6,8 +6,6 @@ import type { PubackPacket } from "../deps.ts";
  * @param packet - The PUBACK packet received from the client
  * @description
  * PUBACK packets are sent in response to PUBLISH packets with QoS level 1.
- * This function removes the original PUBLISH packet from the pending outgoing messages store
- * once acknowledgment is received.
  */
-export declare function handlePuback(ctx: Context, packet: PubackPacket): void;
+export declare function handlePuback(ctx: Context, packet: PubackPacket): Promise<void>;
 //# sourceMappingURL=handlePuback.d.ts.map

package/dist/server/handlers/handlePuback.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handlePuback.d.ts","sourceRoot":"","sources":["../../../server/handlers/handlePuback.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,QAM9D"}
+{"version":3,"file":"handlePuback.d.ts","sourceRoot":"","sources":["../../../server/handlers/handlePuback.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C;;;;;;GAMG;AACH,wBAAsB,YAAY,CAChC,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC,IAAI,CAAC,CAEf"}

package/dist/server/handlers/handlePuback.js

@@ -4,14 +4,8 @@
  * @param packet - The PUBACK packet received from the client
  * @description
  * PUBACK packets are sent in response to PUBLISH packets with QoS level 1.
- * This function removes the original PUBLISH packet from the pending outgoing messages store
- * once acknowledgment is received.
  */
-export function handlePuback(ctx, packet) {
-    // qos 1 only
-    const id = packet.id;
-    if (ctx.store?.pendingOutgoing.has(id)) {
-        ctx.store.pendingOutgoing.delete(id);
-    }
+export async function handlePuback(ctx, packet) {
+    await ctx.processAck(packet.id);
 }
 //# sourceMappingURL=handlePuback.js.map

package/dist/server/handlers/handlePuback.js.map

@@ -1 +1 @@
-{"version":3,"file":"handlePuback.js","sourceRoot":"","sources":["../../../server/handlers/handlePuback.ts"],"names":[],"mappings":"AAGA;;;;;;;;GAQG;AACH,MAAM,UAAU,YAAY,CAAC,GAAY,EAAE,MAAoB;IAC7D,aAAa;IACb,MAAM,EAAE,GAAG,MAAM,CAAC,EAAE,CAAC;IACrB,IAAI,GAAG,CAAC,KAAK,EAAE,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;QACvC,GAAG,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACvC,CAAC;AACH,CAAC"}
+{"version":3,"file":"handlePuback.js","sourceRoot":"","sources":["../../../server/handlers/handlePuback.ts"],"names":[],"mappings":"AAGA;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,GAAY,EACZ,MAAoB;IAEpB,MAAM,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAClC,CAAC"}

package/dist/server/handlers/handlePubcomp.d.ts

@@ -8,5 +8,5 @@ import type { PubcompPacket } from "../deps.ts";
  * This is the fourth and final packet of the QoS 2 protocol exchange.
  * When received, it removes the message from the pendingAckOutgoing store.
  */
-export declare function handlePubcomp(ctx: Context, packet: PubcompPacket): void;
+export declare function handlePubcomp(ctx: Context, packet: PubcompPacket): Promise<void>;
 //# sourceMappingURL=handlePubcomp.d.ts.map

package/dist/server/handlers/handlePubcomp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handlePubcomp.d.ts","sourceRoot":"","sources":["../../../server/handlers/handlePubcomp.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhD;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,GAAG,IAAI,CAKvE"}
+{"version":3,"file":"handlePubcomp.d.ts","sourceRoot":"","sources":["../../../server/handlers/handlePubcomp.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhD;;;;;;;GAOG;AACH,wBAAsB,aAAa,CACjC,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,IAAI,CAAC,CAGf"}

package/dist/server/handlers/handlePubcomp.js

@@ -6,10 +6,8 @@
  * This is the fourth and final packet of the QoS 2 protocol exchange.
  * When received, it removes the message from the pendingAckOutgoing store.
  */
-export function handlePubcomp(ctx, packet) {
+export async function handlePubcomp(ctx, packet) {
     const id = packet.id;
-    if (ctx.store?.pendingAckOutgoing.has(id)) {
-        ctx.store.pendingAckOutgoing.delete(id);
-    }
+    await ctx.persistence.deletePendingAck(ctx.clientId, id);
 }
 //# sourceMappingURL=handlePubcomp.js.map