Skip to content

Commit

Permalink
Merge branch 'main' into SubackCallback
Browse files Browse the repository at this point in the history
  • Loading branch information
robertsLando committed Aug 5, 2024
2 parents 2d786fd + 18a357c commit 249e4b3
Showing 1 changed file with 13 additions and 6 deletions.
19 changes: 13 additions & 6 deletions src/lib/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ export interface IClientReconnectOptions {
}
export interface IClientSubscribeProperties {
/*
* MQTT 5.0 properies object of subscribe
* MQTT 5.0 properties object of subscribe
* */
properties?: ISubscribePacket['properties']
}
Expand Down Expand Up @@ -370,6 +370,13 @@ export type ISubscriptionMap = {
resubscribe?: boolean
}

export interface IClientUnsubscribeProperties {
/*
* MQTT 5.0 properties object for unsubscribe
* */
properties?: IUnsubscribePacket['properties']
}

export { IConnackPacket, IDisconnectPacket, IPublishPacket, Packet }
export type OnConnectCallback = (packet: IConnackPacket) => void
export type OnDisconnectCallback = (packet: IDisconnectPacket) => void
Expand Down Expand Up @@ -1301,20 +1308,20 @@ export default class MqttClient extends TypedEventEmitter<MqttClientEventCallbac
public unsubscribe(topic: string | string[]): MqttClient
public unsubscribe(
topic: string | string[],
opts?: IClientSubscribeOptions,
opts?: IClientUnsubscribeProperties,
): MqttClient
public unsubscribe(
topic: string | string[],
callback?: PacketCallback,
): MqttClient
public unsubscribe(
topic: string | string[],
opts?: IClientSubscribeOptions,
opts?: IClientUnsubscribeProperties,
callback?: PacketCallback,
): MqttClient
public unsubscribe(
topic: string | string[],
opts?: IClientSubscribeOptions | PacketCallback,
opts?: IClientUnsubscribeProperties | PacketCallback,
callback?: PacketCallback,
): MqttClient {
if (typeof topic === 'string') {
Expand Down Expand Up @@ -1396,11 +1403,11 @@ export default class MqttClient extends TypedEventEmitter<MqttClientEventCallbac
): Promise<Packet | undefined>
public unsubscribeAsync(
topic: string | string[],
opts?: IClientSubscribeOptions,
opts?: IClientUnsubscribeProperties,
): Promise<Packet | undefined>
public unsubscribeAsync(
topic: string | string[],
opts?: IClientSubscribeOptions,
opts?: IClientUnsubscribeProperties,
): Promise<Packet | undefined> {
return new Promise((resolve, reject) => {
this.unsubscribe(topic, opts, (err, packet) => {
Expand Down

0 comments on commit 249e4b3

Please sign in to comment.