fix: allow msmsg decryption and emit view-once unavailable fanout

Two issues found during view-once testing on linked devices: 1. msmsg block removal: The "temporary fix" that discarded all msmsg-type encrypted messages was also blocking legitimate view-once messages. On linked devices, view-once arrives as msmsg encryption type. The block was originally added to prevent crashes from missing messageSecret, but the existing try/catch in the decrypt path already handles those errors gracefully by marking the message as a CIPHERTEXT stub. 2. view_once_unavailable_fanout emission: When a linked device receives a view-once, the WA server sends only <unavailable type="view_once"/> (no <enc> with actual media content). Previously this was silently acknowledged without emitting any event, so consumers (zpro, astra-api, etc.) never knew a view-once arrived. Now it emits the message as a CIPHERTEXT stub with key.isViewOnce=true so consumers can display "view-once message received" in their UI. Co-Authored-By: Renato Alcara
2026-04-11 23:13:10 -03:00
24 changed files with 46 additions and 847 deletions
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package proto;

-/// WhatsApp Version: 2.3000.1038024963
+/// WhatsApp Version: 2.3000.1037082622

 message ADVDeviceIdentity {
    optional uint32 rawId = 1;
@@ -4221,8 +4221,6 @@ enum MutationProps {
    CUSTOMER_DATA_ACTION = 83;
    SUBSCRIPTIONS_SYNC_V2_ACTION = 84;
    THREAD_PIN_ACTION = 85;
-    AUTO_ORGANIZE_BUSINESS_CHAT_SETTING = 86;
-    BIZ_AI_SETTINGS_NUDGE_ACTION = 87;
    SHARE_OWN_PN = 10001;
    BUSINESS_BROADCAST_ACTION = 10002;
    AI_THREAD_DELETE_ACTION = 10003;
@@ -4868,8 +4866,6 @@ message SyncActionValue {
    optional CustomerDataAction customerDataAction = 83;
    optional SubscriptionsSyncV2Action subscriptionsSyncV2Action = 84;
    optional ThreadPinAction threadPinAction = 85;
-    optional AutoOrganizeBusinessChatSetting autoOrganizeBusinessChatSetting = 86;
-    optional BizAISettingsNudgeAction bizAiSettingsNudgeAction = 87;
    message AgentAction {
        optional string name = 1;
        optional int32 deviceID = 2;
@@ -4889,10 +4885,6 @@ message SyncActionValue {
        optional SyncActionValue.SyncActionMessageRange messageRange = 2;
    }
    
-    message AutoOrganizeBusinessChatSetting {
-        optional bool autoOrganize = 1;
-    }
-    
    message AvatarUpdatedAction {
        optional AvatarEventType eventType = 1;
        repeated SyncActionValue.StickerAction recentAvatarStickers = 2;
@@ -4903,20 +4895,6 @@ message SyncActionValue {
        }
    }
    
-    message BizAISettingsNudgeAction {
-        optional BizAISettingsCategory category = 1;
-        optional int64 version = 2;
-        optional int64 updatedAtMs = 3;
-        enum BizAISettingsCategory {
-            UNKNOWN = 0;
-            INSTRUCTIONS = 1;
-            RESPONSE_SETTINGS = 2;
-            EXAMPLE_RESPONSES = 3;
-            KNOWLEDGE = 4;
-            LEAD_GEN = 5;
-        }
-    }
-    
    message BotWelcomeRequestAction {
        optional bool isSent = 1;
    }
@@ -5380,7 +5358,6 @@ message SyncActionValue {
        optional bool shareToFB = 3;
        optional bool shareToIG = 4;
        repeated CustomList customLists = 5;
-        repeated StatusDistributionMode modes = 6;
        message CustomList {
            optional string listId = 1;
            optional string name = 2;
@@ -10692,8 +10692,6 @@ export namespace proto {
        CUSTOMER_DATA_ACTION = 83,
        SUBSCRIPTIONS_SYNC_V2_ACTION = 84,
        THREAD_PIN_ACTION = 85,
-        AUTO_ORGANIZE_BUSINESS_CHAT_SETTING = 86,
-        BIZ_AI_SETTINGS_NUDGE_ACTION = 87,
        SHARE_OWN_PN = 10001,
        BUSINESS_BROADCAST_ACTION = 10002,
        AI_THREAD_DELETE_ACTION = 10003
@@ -12311,8 +12309,6 @@ export namespace proto {
        customerDataAction?: (proto.SyncActionValue.ICustomerDataAction|null);
        subscriptionsSyncV2Action?: (proto.SyncActionValue.ISubscriptionsSyncV2Action|null);
        threadPinAction?: (proto.SyncActionValue.IThreadPinAction|null);
-        autoOrganizeBusinessChatSetting?: (proto.SyncActionValue.IAutoOrganizeBusinessChatSetting|null);
-        bizAiSettingsNudgeAction?: (proto.SyncActionValue.IBizAISettingsNudgeAction|null);
    }

    class SyncActionValue implements ISyncActionValue {
@@ -12393,8 +12389,6 @@ export namespace proto {
        public customerDataAction?: (proto.SyncActionValue.ICustomerDataAction|null);
        public subscriptionsSyncV2Action?: (proto.SyncActionValue.ISubscriptionsSyncV2Action|null);
        public threadPinAction?: (proto.SyncActionValue.IThreadPinAction|null);
-        public autoOrganizeBusinessChatSetting?: (proto.SyncActionValue.IAutoOrganizeBusinessChatSetting|null);
-        public bizAiSettingsNudgeAction?: (proto.SyncActionValue.IBizAISettingsNudgeAction|null);
        public static create(properties?: proto.ISyncActionValue): proto.SyncActionValue;
        public static encode(m: proto.ISyncActionValue, w?: $protobuf.Writer): $protobuf.Writer;
        public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.SyncActionValue;
@@ -12476,22 +12470,6 @@ export namespace proto {
            public static getTypeUrl(typeUrlPrefix?: string): string;
        }

-        interface IAutoOrganizeBusinessChatSetting {
-            autoOrganize?: (boolean|null);
-        }
-
-        class AutoOrganizeBusinessChatSetting implements IAutoOrganizeBusinessChatSetting {
-            constructor(p?: proto.SyncActionValue.IAutoOrganizeBusinessChatSetting);
-            public autoOrganize?: (boolean|null);
-            public static create(properties?: proto.SyncActionValue.IAutoOrganizeBusinessChatSetting): proto.SyncActionValue.AutoOrganizeBusinessChatSetting;
-            public static encode(m: proto.SyncActionValue.IAutoOrganizeBusinessChatSetting, w?: $protobuf.Writer): $protobuf.Writer;
-            public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.SyncActionValue.AutoOrganizeBusinessChatSetting;
-            public static fromObject(d: { [k: string]: any }): proto.SyncActionValue.AutoOrganizeBusinessChatSetting;
-            public static toObject(m: proto.SyncActionValue.AutoOrganizeBusinessChatSetting, o?: $protobuf.IConversionOptions): { [k: string]: any };
-            public toJSON(): { [k: string]: any };
-            public static getTypeUrl(typeUrlPrefix?: string): string;
-        }
-
        interface IAvatarUpdatedAction {
            eventType?: (proto.SyncActionValue.AvatarUpdatedAction.AvatarEventType|null);
            recentAvatarStickers?: (proto.SyncActionValue.IStickerAction[]|null);
@@ -12519,38 +12497,6 @@ export namespace proto {
            }
        }

-        interface IBizAISettingsNudgeAction {
-            category?: (proto.SyncActionValue.BizAISettingsNudgeAction.BizAISettingsCategory|null);
-            version?: (number|Long|null);
-            updatedAtMs?: (number|Long|null);
-        }
-
-        class BizAISettingsNudgeAction implements IBizAISettingsNudgeAction {
-            constructor(p?: proto.SyncActionValue.IBizAISettingsNudgeAction);
-            public category?: (proto.SyncActionValue.BizAISettingsNudgeAction.BizAISettingsCategory|null);
-            public version?: (number|Long|null);
-            public updatedAtMs?: (number|Long|null);
-            public static create(properties?: proto.SyncActionValue.IBizAISettingsNudgeAction): proto.SyncActionValue.BizAISettingsNudgeAction;
-            public static encode(m: proto.SyncActionValue.IBizAISettingsNudgeAction, w?: $protobuf.Writer): $protobuf.Writer;
-            public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.SyncActionValue.BizAISettingsNudgeAction;
-            public static fromObject(d: { [k: string]: any }): proto.SyncActionValue.BizAISettingsNudgeAction;
-            public static toObject(m: proto.SyncActionValue.BizAISettingsNudgeAction, o?: $protobuf.IConversionOptions): { [k: string]: any };
-            public toJSON(): { [k: string]: any };
-            public static getTypeUrl(typeUrlPrefix?: string): string;
-        }
-
-        namespace BizAISettingsNudgeAction {
-
-            enum BizAISettingsCategory {
-                UNKNOWN = 0,
-                INSTRUCTIONS = 1,
-                RESPONSE_SETTINGS = 2,
-                EXAMPLE_RESPONSES = 3,
-                KNOWLEDGE = 4,
-                LEAD_GEN = 5
-            }
-        }
-
        interface IBotWelcomeRequestAction {
            isSent?: (boolean|null);
        }
@@ -13898,7 +13844,6 @@ export namespace proto {
            shareToFB?: (boolean|null);
            shareToIG?: (boolean|null);
            customLists?: (proto.SyncActionValue.StatusPrivacyAction.ICustomList[]|null);
-            modes?: (proto.SyncActionValue.StatusPrivacyAction.StatusDistributionMode[]|null);
        }

        class StatusPrivacyAction implements IStatusPrivacyAction {
@@ -13908,7 +13853,6 @@ export namespace proto {
            public shareToFB?: (boolean|null);
            public shareToIG?: (boolean|null);
            public customLists: proto.SyncActionValue.StatusPrivacyAction.ICustomList[];
-            public modes: proto.SyncActionValue.StatusPrivacyAction.StatusDistributionMode[];
            public static create(properties?: proto.SyncActionValue.IStatusPrivacyAction): proto.SyncActionValue.StatusPrivacyAction;
            public static encode(m: proto.SyncActionValue.IStatusPrivacyAction, w?: $protobuf.Writer): $protobuf.Writer;
            public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.SyncActionValue.StatusPrivacyAction;
@@ -75158,8 +75158,6 @@ export const proto = $root.proto = (() => {
        values[valuesById[83] = "CUSTOMER_DATA_ACTION"] = 83;
        values[valuesById[84] = "SUBSCRIPTIONS_SYNC_V2_ACTION"] = 84;
        values[valuesById[85] = "THREAD_PIN_ACTION"] = 85;
-        values[valuesById[86] = "AUTO_ORGANIZE_BUSINESS_CHAT_SETTING"] = 86;
-        values[valuesById[87] = "BIZ_AI_SETTINGS_NUDGE_ACTION"] = 87;
        values[valuesById[10001] = "SHARE_OWN_PN"] = 10001;
        values[valuesById[10002] = "BUSINESS_BROADCAST_ACTION"] = 10002;
        values[valuesById[10003] = "AI_THREAD_DELETE_ACTION"] = 10003;
@@ -85558,8 +85556,6 @@ export const proto = $root.proto = (() => {
        SyncActionValue.prototype.customerDataAction = null;
        SyncActionValue.prototype.subscriptionsSyncV2Action = null;
        SyncActionValue.prototype.threadPinAction = null;
-        SyncActionValue.prototype.autoOrganizeBusinessChatSetting = null;
-        SyncActionValue.prototype.bizAiSettingsNudgeAction = null;

        let $oneOfFields;

@@ -86019,18 +86015,6 @@ export const proto = $root.proto = (() => {
            set: $util.oneOfSetter($oneOfFields)
        });

-        // Virtual OneOf for proto3 optional field
-        Object.defineProperty(SyncActionValue.prototype, "_autoOrganizeBusinessChatSetting", {
-            get: $util.oneOfGetter($oneOfFields = ["autoOrganizeBusinessChatSetting"]),
-            set: $util.oneOfSetter($oneOfFields)
-        });
-
-        // Virtual OneOf for proto3 optional field
-        Object.defineProperty(SyncActionValue.prototype, "_bizAiSettingsNudgeAction", {
-            get: $util.oneOfGetter($oneOfFields = ["bizAiSettingsNudgeAction"]),
-            set: $util.oneOfSetter($oneOfFields)
-        });
-
        SyncActionValue.create = function create(properties) {
            return new SyncActionValue(properties);
        };
@@ -86190,10 +86174,6 @@ export const proto = $root.proto = (() => {
                $root.proto.SyncActionValue.SubscriptionsSyncV2Action.encode(m.subscriptionsSyncV2Action, w.uint32(674).fork()).ldelim();
            if (m.threadPinAction != null && Object.hasOwnProperty.call(m, "threadPinAction"))
                $root.proto.SyncActionValue.ThreadPinAction.encode(m.threadPinAction, w.uint32(682).fork()).ldelim();
-            if (m.autoOrganizeBusinessChatSetting != null && Object.hasOwnProperty.call(m, "autoOrganizeBusinessChatSetting"))
-                $root.proto.SyncActionValue.AutoOrganizeBusinessChatSetting.encode(m.autoOrganizeBusinessChatSetting, w.uint32(690).fork()).ldelim();
-            if (m.bizAiSettingsNudgeAction != null && Object.hasOwnProperty.call(m, "bizAiSettingsNudgeAction"))
-                $root.proto.SyncActionValue.BizAISettingsNudgeAction.encode(m.bizAiSettingsNudgeAction, w.uint32(698).fork()).ldelim();
            return w;
        };

@@ -86510,14 +86490,6 @@ export const proto = $root.proto = (() => {
                        m.threadPinAction = $root.proto.SyncActionValue.ThreadPinAction.decode(r, r.uint32());
                        break;
                    }
-                case 86: {
-                        m.autoOrganizeBusinessChatSetting = $root.proto.SyncActionValue.AutoOrganizeBusinessChatSetting.decode(r, r.uint32());
-                        break;
-                    }
-                case 87: {
-                        m.bizAiSettingsNudgeAction = $root.proto.SyncActionValue.BizAISettingsNudgeAction.decode(r, r.uint32());
-                        break;
-                    }
                default:
                    r.skipType(t & 7);
                    break;
@@ -86915,16 +86887,6 @@ export const proto = $root.proto = (() => {
                    throw TypeError(".proto.SyncActionValue.threadPinAction: object expected");
                m.threadPinAction = $root.proto.SyncActionValue.ThreadPinAction.fromObject(d.threadPinAction);
            }
-            if (d.autoOrganizeBusinessChatSetting != null) {
-                if (typeof d.autoOrganizeBusinessChatSetting !== "object")
-                    throw TypeError(".proto.SyncActionValue.autoOrganizeBusinessChatSetting: object expected");
-                m.autoOrganizeBusinessChatSetting = $root.proto.SyncActionValue.AutoOrganizeBusinessChatSetting.fromObject(d.autoOrganizeBusinessChatSetting);
-            }
-            if (d.bizAiSettingsNudgeAction != null) {
-                if (typeof d.bizAiSettingsNudgeAction !== "object")
-                    throw TypeError(".proto.SyncActionValue.bizAiSettingsNudgeAction: object expected");
-                m.bizAiSettingsNudgeAction = $root.proto.SyncActionValue.BizAISettingsNudgeAction.fromObject(d.bizAiSettingsNudgeAction);
-            }
            return m;
        };

@@ -87315,16 +87277,6 @@ export const proto = $root.proto = (() => {
                if (o.oneofs)
                    d._threadPinAction = "threadPinAction";
            }
-            if (m.autoOrganizeBusinessChatSetting != null && m.hasOwnProperty("autoOrganizeBusinessChatSetting")) {
-                d.autoOrganizeBusinessChatSetting = $root.proto.SyncActionValue.AutoOrganizeBusinessChatSetting.toObject(m.autoOrganizeBusinessChatSetting, o);
-                if (o.oneofs)
-                    d._autoOrganizeBusinessChatSetting = "autoOrganizeBusinessChatSetting";
-            }
-            if (m.bizAiSettingsNudgeAction != null && m.hasOwnProperty("bizAiSettingsNudgeAction")) {
-                d.bizAiSettingsNudgeAction = $root.proto.SyncActionValue.BizAISettingsNudgeAction.toObject(m.bizAiSettingsNudgeAction, o);
-                if (o.oneofs)
-                    d._bizAiSettingsNudgeAction = "bizAiSettingsNudgeAction";
-            }
            return d;
        };

@@ -87756,94 +87708,6 @@ export const proto = $root.proto = (() => {
            return ArchiveChatAction;
        })();

-        SyncActionValue.AutoOrganizeBusinessChatSetting = (function() {
-
-            function AutoOrganizeBusinessChatSetting(p) {
-                if (p)
-                    for (var ks = Object.keys(p), i = 0; i < ks.length; ++i)
-                        if (p[ks[i]] != null)
-                            this[ks[i]] = p[ks[i]];
-            }
-
-            AutoOrganizeBusinessChatSetting.prototype.autoOrganize = null;
-
-            let $oneOfFields;
-
-            // Virtual OneOf for proto3 optional field
-            Object.defineProperty(AutoOrganizeBusinessChatSetting.prototype, "_autoOrganize", {
-                get: $util.oneOfGetter($oneOfFields = ["autoOrganize"]),
-                set: $util.oneOfSetter($oneOfFields)
-            });
-
-            AutoOrganizeBusinessChatSetting.create = function create(properties) {
-                return new AutoOrganizeBusinessChatSetting(properties);
-            };
-
-            AutoOrganizeBusinessChatSetting.encode = function encode(m, w) {
-                if (!w)
-                    w = $Writer.create();
-                if (m.autoOrganize != null && Object.hasOwnProperty.call(m, "autoOrganize"))
-                    w.uint32(8).bool(m.autoOrganize);
-                return w;
-            };
-
-            AutoOrganizeBusinessChatSetting.decode = function decode(r, l, e) {
-                if (!(r instanceof $Reader))
-                    r = $Reader.create(r);
-                var c = l === undefined ? r.len : r.pos + l, m = new $root.proto.SyncActionValue.AutoOrganizeBusinessChatSetting();
-                while (r.pos < c) {
-                    var t = r.uint32();
-                    if (t === e)
-                        break;
-                    switch (t >>> 3) {
-                    case 1: {
-                            m.autoOrganize = r.bool();
-                            break;
-                        }
-                    default:
-                        r.skipType(t & 7);
-                        break;
-                    }
-                }
-                return m;
-            };
-
-            AutoOrganizeBusinessChatSetting.fromObject = function fromObject(d) {
-                if (d instanceof $root.proto.SyncActionValue.AutoOrganizeBusinessChatSetting)
-                    return d;
-                var m = new $root.proto.SyncActionValue.AutoOrganizeBusinessChatSetting();
-                if (d.autoOrganize != null) {
-                    m.autoOrganize = Boolean(d.autoOrganize);
-                }
-                return m;
-            };
-
-            AutoOrganizeBusinessChatSetting.toObject = function toObject(m, o) {
-                if (!o)
-                    o = {};
-                var d = {};
-                if (m.autoOrganize != null && m.hasOwnProperty("autoOrganize")) {
-                    d.autoOrganize = m.autoOrganize;
-                    if (o.oneofs)
-                        d._autoOrganize = "autoOrganize";
-                }
-                return d;
-            };
-
-            AutoOrganizeBusinessChatSetting.prototype.toJSON = function toJSON() {
-                return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
-            };
-
-            AutoOrganizeBusinessChatSetting.getTypeUrl = function getTypeUrl(typeUrlPrefix) {
-                if (typeUrlPrefix === undefined) {
-                    typeUrlPrefix = "type.googleapis.com";
-                }
-                return typeUrlPrefix + "/proto.SyncActionValue.AutoOrganizeBusinessChatSetting";
-            };
-
-            return AutoOrganizeBusinessChatSetting;
-        })();
-
        SyncActionValue.AvatarUpdatedAction = (function() {

            function AvatarUpdatedAction(p) {
@@ -87988,196 +87852,6 @@ export const proto = $root.proto = (() => {
            return AvatarUpdatedAction;
        })();

-        SyncActionValue.BizAISettingsNudgeAction = (function() {
-
-            function BizAISettingsNudgeAction(p) {
-                if (p)
-                    for (var ks = Object.keys(p), i = 0; i < ks.length; ++i)
-                        if (p[ks[i]] != null)
-                            this[ks[i]] = p[ks[i]];
-            }
-
-            BizAISettingsNudgeAction.prototype.category = null;
-            BizAISettingsNudgeAction.prototype.version = null;
-            BizAISettingsNudgeAction.prototype.updatedAtMs = null;
-
-            let $oneOfFields;
-
-            // Virtual OneOf for proto3 optional field
-            Object.defineProperty(BizAISettingsNudgeAction.prototype, "_category", {
-                get: $util.oneOfGetter($oneOfFields = ["category"]),
-                set: $util.oneOfSetter($oneOfFields)
-            });
-
-            // Virtual OneOf for proto3 optional field
-            Object.defineProperty(BizAISettingsNudgeAction.prototype, "_version", {
-                get: $util.oneOfGetter($oneOfFields = ["version"]),
-                set: $util.oneOfSetter($oneOfFields)
-            });
-
-            // Virtual OneOf for proto3 optional field
-            Object.defineProperty(BizAISettingsNudgeAction.prototype, "_updatedAtMs", {
-                get: $util.oneOfGetter($oneOfFields = ["updatedAtMs"]),
-                set: $util.oneOfSetter($oneOfFields)
-            });
-
-            BizAISettingsNudgeAction.create = function create(properties) {
-                return new BizAISettingsNudgeAction(properties);
-            };
-
-            BizAISettingsNudgeAction.encode = function encode(m, w) {
-                if (!w)
-                    w = $Writer.create();
-                if (m.category != null && Object.hasOwnProperty.call(m, "category"))
-                    w.uint32(8).int32(m.category);
-                if (m.version != null && Object.hasOwnProperty.call(m, "version"))
-                    w.uint32(16).int64(m.version);
-                if (m.updatedAtMs != null && Object.hasOwnProperty.call(m, "updatedAtMs"))
-                    w.uint32(24).int64(m.updatedAtMs);
-                return w;
-            };
-
-            BizAISettingsNudgeAction.decode = function decode(r, l, e) {
-                if (!(r instanceof $Reader))
-                    r = $Reader.create(r);
-                var c = l === undefined ? r.len : r.pos + l, m = new $root.proto.SyncActionValue.BizAISettingsNudgeAction();
-                while (r.pos < c) {
-                    var t = r.uint32();
-                    if (t === e)
-                        break;
-                    switch (t >>> 3) {
-                    case 1: {
-                            m.category = r.int32();
-                            break;
-                        }
-                    case 2: {
-                            m.version = r.int64();
-                            break;
-                        }
-                    case 3: {
-                            m.updatedAtMs = r.int64();
-                            break;
-                        }
-                    default:
-                        r.skipType(t & 7);
-                        break;
-                    }
-                }
-                return m;
-            };
-
-            BizAISettingsNudgeAction.fromObject = function fromObject(d) {
-                if (d instanceof $root.proto.SyncActionValue.BizAISettingsNudgeAction)
-                    return d;
-                var m = new $root.proto.SyncActionValue.BizAISettingsNudgeAction();
-                switch (d.category) {
-                default:
-                    if (typeof d.category === "number") {
-                        m.category = d.category;
-                        break;
-                    }
-                    break;
-                case "UNKNOWN":
-                case 0:
-                    m.category = 0;
-                    break;
-                case "INSTRUCTIONS":
-                case 1:
-                    m.category = 1;
-                    break;
-                case "RESPONSE_SETTINGS":
-                case 2:
-                    m.category = 2;
-                    break;
-                case "EXAMPLE_RESPONSES":
-                case 3:
-                    m.category = 3;
-                    break;
-                case "KNOWLEDGE":
-                case 4:
-                    m.category = 4;
-                    break;
-                case "LEAD_GEN":
-                case 5:
-                    m.category = 5;
-                    break;
-                }
-                if (d.version != null) {
-                    if ($util.Long)
-                        (m.version = $util.Long.fromValue(d.version)).unsigned = false;
-                    else if (typeof d.version === "string")
-                        m.version = parseInt(d.version, 10);
-                    else if (typeof d.version === "number")
-                        m.version = d.version;
-                    else if (typeof d.version === "object")
-                        m.version = new $util.LongBits(d.version.low >>> 0, d.version.high >>> 0).toNumber();
-                }
-                if (d.updatedAtMs != null) {
-                    if ($util.Long)
-                        (m.updatedAtMs = $util.Long.fromValue(d.updatedAtMs)).unsigned = false;
-                    else if (typeof d.updatedAtMs === "string")
-                        m.updatedAtMs = parseInt(d.updatedAtMs, 10);
-                    else if (typeof d.updatedAtMs === "number")
-                        m.updatedAtMs = d.updatedAtMs;
-                    else if (typeof d.updatedAtMs === "object")
-                        m.updatedAtMs = new $util.LongBits(d.updatedAtMs.low >>> 0, d.updatedAtMs.high >>> 0).toNumber();
-                }
-                return m;
-            };
-
-            BizAISettingsNudgeAction.toObject = function toObject(m, o) {
-                if (!o)
-                    o = {};
-                var d = {};
-                if (m.category != null && m.hasOwnProperty("category")) {
-                    d.category = o.enums === String ? $root.proto.SyncActionValue.BizAISettingsNudgeAction.BizAISettingsCategory[m.category] === undefined ? m.category : $root.proto.SyncActionValue.BizAISettingsNudgeAction.BizAISettingsCategory[m.category] : m.category;
-                    if (o.oneofs)
-                        d._category = "category";
-                }
-                if (m.version != null && m.hasOwnProperty("version")) {
-                    if (typeof m.version === "number")
-                        d.version = o.longs === String ? String(m.version) : m.version;
-                    else
-                        d.version = o.longs === String ? longToString(m.version) : o.longs === Number ? longToNumber(m.version) : m.version;
-                    if (o.oneofs)
-                        d._version = "version";
-                }
-                if (m.updatedAtMs != null && m.hasOwnProperty("updatedAtMs")) {
-                    if (typeof m.updatedAtMs === "number")
-                        d.updatedAtMs = o.longs === String ? String(m.updatedAtMs) : m.updatedAtMs;
-                    else
-                        d.updatedAtMs = o.longs === String ? longToString(m.updatedAtMs) : o.longs === Number ? longToNumber(m.updatedAtMs) : m.updatedAtMs;
-                    if (o.oneofs)
-                        d._updatedAtMs = "updatedAtMs";
-                }
-                return d;
-            };
-
-            BizAISettingsNudgeAction.prototype.toJSON = function toJSON() {
-                return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
-            };
-
-            BizAISettingsNudgeAction.getTypeUrl = function getTypeUrl(typeUrlPrefix) {
-                if (typeUrlPrefix === undefined) {
-                    typeUrlPrefix = "type.googleapis.com";
-                }
-                return typeUrlPrefix + "/proto.SyncActionValue.BizAISettingsNudgeAction";
-            };
-
-            BizAISettingsNudgeAction.BizAISettingsCategory = (function() {
-                const valuesById = {}, values = Object.create(valuesById);
-                values[valuesById[0] = "UNKNOWN"] = 0;
-                values[valuesById[1] = "INSTRUCTIONS"] = 1;
-                values[valuesById[2] = "RESPONSE_SETTINGS"] = 2;
-                values[valuesById[3] = "EXAMPLE_RESPONSES"] = 3;
-                values[valuesById[4] = "KNOWLEDGE"] = 4;
-                values[valuesById[5] = "LEAD_GEN"] = 5;
-                return values;
-            })();
-
-            return BizAISettingsNudgeAction;
-        })();
-
        SyncActionValue.BotWelcomeRequestAction = (function() {

            function BotWelcomeRequestAction(p) {
@@ -96406,7 +96080,6 @@ export const proto = $root.proto = (() => {
            function StatusPrivacyAction(p) {
                this.userJid = [];
                this.customLists = [];
-                this.modes = [];
                if (p)
                    for (var ks = Object.keys(p), i = 0; i < ks.length; ++i)
                        if (p[ks[i]] != null)
@@ -96418,7 +96091,6 @@ export const proto = $root.proto = (() => {
            StatusPrivacyAction.prototype.shareToFB = null;
            StatusPrivacyAction.prototype.shareToIG = null;
            StatusPrivacyAction.prototype.customLists = $util.emptyArray;
-            StatusPrivacyAction.prototype.modes = $util.emptyArray;

            let $oneOfFields;

@@ -96461,12 +96133,6 @@ export const proto = $root.proto = (() => {
                    for (var i = 0; i < m.customLists.length; ++i)
                        $root.proto.SyncActionValue.StatusPrivacyAction.CustomList.encode(m.customLists[i], w.uint32(42).fork()).ldelim();
                }
-                if (m.modes != null && m.modes.length) {
-                    w.uint32(50).fork();
-                    for (var i = 0; i < m.modes.length; ++i)
-                        w.int32(m.modes[i]);
-                    w.ldelim();
-                }
                return w;
            };

@@ -96503,17 +96169,6 @@ export const proto = $root.proto = (() => {
                            m.customLists.push($root.proto.SyncActionValue.StatusPrivacyAction.CustomList.decode(r, r.uint32()));
                            break;
                        }
-                    case 6: {
-                            if (!(m.modes && m.modes.length))
-                                m.modes = [];
-                            if ((t & 7) === 2) {
-                                var c2 = r.uint32() + r.pos;
-                                while (r.pos < c2)
-                                    m.modes.push(r.int32());
-                            } else
-                                m.modes.push(r.int32());
-                            break;
-                        }
                    default:
                        r.skipType(t & 7);
                        break;
@@ -96578,40 +96233,6 @@ export const proto = $root.proto = (() => {
                        m.customLists[i] = $root.proto.SyncActionValue.StatusPrivacyAction.CustomList.fromObject(d.customLists[i]);
                    }
                }
-                if (d.modes) {
-                    if (!Array.isArray(d.modes))
-                        throw TypeError(".proto.SyncActionValue.StatusPrivacyAction.modes: array expected");
-                    m.modes = [];
-                    for (var i = 0; i < d.modes.length; ++i) {
-                        switch (d.modes[i]) {
-                        default:
-                            if (typeof d.modes[i] === "number") {
-                                m.modes[i] = d.modes[i];
-                                break;
-                            }
-                        case "ALLOW_LIST":
-                        case 0:
-                            m.modes[i] = 0;
-                            break;
-                        case "DENY_LIST":
-                        case 1:
-                            m.modes[i] = 1;
-                            break;
-                        case "CONTACTS":
-                        case 2:
-                            m.modes[i] = 2;
-                            break;
-                        case "CLOSE_FRIENDS":
-                        case 3:
-                            m.modes[i] = 3;
-                            break;
-                        case "CUSTOM_LIST":
-                        case 4:
-                            m.modes[i] = 4;
-                            break;
-                        }
-                    }
-                }
                return m;
            };

@@ -96622,7 +96243,6 @@ export const proto = $root.proto = (() => {
                if (o.arrays || o.defaults) {
                    d.userJid = [];
                    d.customLists = [];
-                    d.modes = [];
                }
                if (m.mode != null && m.hasOwnProperty("mode")) {
                    d.mode = o.enums === String ? $root.proto.SyncActionValue.StatusPrivacyAction.StatusDistributionMode[m.mode] === undefined ? m.mode : $root.proto.SyncActionValue.StatusPrivacyAction.StatusDistributionMode[m.mode] : m.mode;
@@ -96651,12 +96271,6 @@ export const proto = $root.proto = (() => {
                        d.customLists[j] = $root.proto.SyncActionValue.StatusPrivacyAction.CustomList.toObject(m.customLists[j], o);
                    }
                }
-                if (m.modes && m.modes.length) {
-                    d.modes = [];
-                    for (var j = 0; j < m.modes.length; ++j) {
-                        d.modes[j] = o.enums === String ? $root.proto.SyncActionValue.StatusPrivacyAction.StatusDistributionMode[m.modes[j]] === undefined ? m.modes[j] : $root.proto.SyncActionValue.StatusPrivacyAction.StatusDistributionMode[m.modes[j]] : m.modes[j];
-                    }
-                }
                return d;
            };

@@ -1 +1 @@
-{"version":[2,3000,1038147544]}
+{"version":[2,3000,1037137890]}
@@ -31,26 +31,9 @@ export const STATUS_EXPIRY_SECONDS = 24 * 60 * 60
 export const PLACEHOLDER_MAX_AGE_SECONDS = 7 * 24 * 60 * 60

 export const NOISE_MODE = 'Noise_XX_25519_AESGCM_SHA256\0\0\0\0'
-
-/**
- * Protocol mode: 'web' (default) or 'native' (experimental)
- * - web: WA\x06\x03 — standard WhatsApp Web protocol
- * - native: WAM\x05 — native Android protocol (may enable view-once media on companions)
- *
- * Set via BAILEYS_PROTOCOL env var:
- *   BAILEYS_PROTOCOL=native
- */
-const PROTOCOL_MODE = process.env.BAILEYS_PROTOCOL?.trim().toLowerCase() === 'native' ? 'native' : 'web'
-
-export const DICT_VERSION = PROTOCOL_MODE === 'native' ? 5 : 3
+export const DICT_VERSION = 3
 export const KEY_BUNDLE_TYPE = Buffer.from([5])
-
-// WA\x06\x03 = web protocol, WAM\x05 = native Android protocol
-export const NOISE_WA_HEADER = PROTOCOL_MODE === 'native'
-	? Buffer.from([87, 65, 77, DICT_VERSION]) // WAM\x05
-	: Buffer.from([87, 65, 6, DICT_VERSION])  // WA\x06\x03
-
-export { PROTOCOL_MODE }
+export const NOISE_WA_HEADER = Buffer.from([87, 65, 6, DICT_VERSION]) // last is "DICT_VERSION"
 /** from: https://stackoverflow.com/questions/3809401/what-is-a-good-regular-expression-to-match-a-url */
 export const URL_REGEX = /https:\/\/(?![^:@\/\s]+:[^:@\/\s]+@)[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}(:\d+)?(\/[^\s]*)?/g

@@ -1060,21 +1060,22 @@ export const makeChatsSocket = (config: SocketConfig) => {
 		}
 	}

-	/** fetch AB props */
+	/** sending non-abt props may fix QR scan fail if server expects */
 	const fetchProps = async () => {
+		//TODO: implement both protocol 1 and protocol 2 prop fetching, specially for abKey for WM
 		const resultNode = await query({
 			tag: 'iq',
 			attrs: {
 				to: S_WHATSAPP_NET,
-				xmlns: 'abt',
+				xmlns: 'w',
 				type: 'get'
 			},
 			content: [
 				{
 					tag: 'props',
 					attrs: {
-						protocol: '1',
-						...(authState?.creds?.lastPropHash ? { hash: authState.creds.lastPropHash } : {})
+						protocol: '2',
+						hash: authState?.creds?.lastPropHash || ''
 					}
 				}
 			]
@@ -343,13 +343,11 @@ export const extractGroupMetadata = (result: BinaryNode) => {
 	let descId: string | undefined
 	let descOwner: string | undefined
 	let descOwnerPn: string | undefined
-	let descOwnerUsername: string | undefined
 	let descTime: number | undefined
 	if (descChild) {
 		desc = getBinaryNodeChildString(descChild, 'body')
 		descOwner = descChild.attrs.participant ? jidNormalizedUser(descChild.attrs.participant) : undefined
 		descOwnerPn = descChild.attrs.participant_pn ? jidNormalizedUser(descChild.attrs.participant_pn) : undefined
-		descOwnerUsername = descChild.attrs.participant_username || undefined
 		descTime = +descChild.attrs.t!
 		descId = descChild.attrs.id
 	}
@@ -364,19 +362,16 @@ export const extractGroupMetadata = (result: BinaryNode) => {
 		subject: group.attrs.subject!,
 		subjectOwner: group.attrs.s_o,
 		subjectOwnerPn: group.attrs.s_o_pn,
-		subjectOwnerUsername: group.attrs.s_o_username,
 		subjectTime: +(group.attrs.s_t ?? '0'),
 		size: group.attrs.size ? +group.attrs.size : getBinaryNodeChildren(group, 'participant').length,
 		creation: +(group.attrs.creation ?? '0'),
 		owner: group.attrs.creator ? jidNormalizedUser(group.attrs.creator) : undefined,
 		ownerPn: group.attrs.creator_pn ? jidNormalizedUser(group.attrs.creator_pn) : undefined,
-		ownerUsername: group.attrs.creator_username || undefined,
 		owner_country_code: group.attrs.creator_country_code,
 		desc,
 		descId,
 		descOwner,
 		descOwnerPn,
-		descOwnerUsername,
 		descTime,
 		linkedParent: getBinaryNodeChild(group, 'linked_parent')?.attrs.jid || undefined,
 		restrict: !!getBinaryNodeChild(group, 'locked'),
@@ -391,7 +386,6 @@ export const extractGroupMetadata = (result: BinaryNode) => {
 				id: attrs.jid!,
 				phoneNumber: isLidUser(attrs.jid) && isPnUser(attrs.phone_number) ? attrs.phone_number : undefined,
 				lid: isPnUser(attrs.jid) && isLidUser(attrs.lid) ? attrs.lid : undefined,
-				username: attrs.participant_username || attrs.username || undefined,
 				admin: (attrs.type || null) as GroupParticipant['admin']
 			}
 		}),
@@ -2124,6 +2124,12 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
 		if (resolvedRemoteJid) key.remoteJid = resolvedRemoteJid
 		if (resolvedParticipant) key.participant = resolvedParticipant

+		if (shouldIgnoreJid(remoteJid!) && remoteJid !== S_WHATSAPP_NET) {
+			logger.trace({ remoteJid }, 'ignoring receipt from jid')
+			await sendMessageAck(node)
+			return
+		}
+
 		const ids = [attrs.id!]
 		if (Array.isArray(content)) {
 			const items = getBinaryNodeChildren(content[0], 'item')
@@ -2199,6 +2205,11 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {

 	const handleNotification = async (node: BinaryNode) => {
 		const remoteJid = node.attrs.from
+		if (shouldIgnoreJid(remoteJid!) && remoteJid !== S_WHATSAPP_NET) {
+			logger.trace({ remoteJid }, 'ignored notification')
+			await sendMessageAck(node)
+			return
+		}

 		try {
 			await Promise.all([
@@ -2212,7 +2223,6 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
 							fromMe,
 							participant: node.attrs.participant,
 							participantAlt,
-							participantUsername: node.attrs.participant_username,
 							addressingMode,
 							id: node.attrs.id,
 							...(msg.key || {})
@@ -2221,10 +2231,6 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
 						msg.messageTimestamp = +node.attrs.t!

 						const fullMsg = proto.WebMessageInfo.fromObject(msg) as WAMessage
-						// Preserve custom WAMessageKey fields (participantAlt, participantUsername,
-						// addressingMode) that proto.WebMessageInfo.fromObject strips because
-						// they aren't part of the proto.MessageKey schema.
-						fullMsg.key = msg.key
 						await upsertMessage(fullMsg, 'append')
 					}
 				})
@@ -2235,55 +2241,25 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
 	}

 	const handleMessage = async (node: BinaryNode) => {
+		if (shouldIgnoreJid(node.attrs.from!) && node.attrs.from !== S_WHATSAPP_NET) {
+			logger.trace({ from: node.attrs.from }, 'ignored message')
+			// Send a clean ACK (no error code) so the server considers the
+			// message delivered. Using error 500 (UnhandledError) previously
+			// caused the server to retry delivery, generating duplicate traffic.
+			await sendMessageAck(node)
+			return
+		}
+
 		const encNode = getBinaryNodeChild(node, 'enc')
-		const unavailableNode = getBinaryNodeChild(node, 'unavailable')
-
 		// msmsg block removed — allow msmsg decryption (required for view-once on linked devices)
+
+		// Handle view-once unavailable sync from primary device.
+		// When the primary device sends a view-once, linked companions receive
+		// <unavailable type="view_once"/> — no enc content, just a sync signal.
+		// Acknowledge and skip decryption (nothing to decrypt).
+		const unavailableNode = getBinaryNodeChild(node, 'unavailable')
 		if (unavailableNode?.attrs?.type === 'view_once') {
-			const { fullMessage: voMsg } = decryptMessageNode(
-				node,
-				authState.creds.me!.id,
-				authState.creds.me!.lid || '',
-				signalRepository,
-				logger,
-			)
-			voMsg.key.isViewOnce = true
-
-			// Try to request the actual view-once content from the primary phone via PDO
-			// The phone may resend the full media (url, mediaKey, directPath, etc.)
-			console.log(`[VO_PDO] Requesting view-once content via PDO for ${voMsg.key.id} from ${voMsg.key.remoteJid}`)
-			try {
-				const requestId = await requestPlaceholderResend(voMsg.key, {
-					key: { ...voMsg.key },
-					pushName: voMsg.pushName,
-					messageTimestamp: voMsg.messageTimestamp,
-					participant: voMsg.key.participant,
-					participantAlt: voMsg.key.participantAlt
-				})
-				if (requestId && requestId !== 'RESOLVED') {
-					console.log(`[VO_PDO] PDO request sent! requestId=${requestId} — waiting for phone to resend`)
-				} else if (requestId === 'RESOLVED') {
-					console.log(`[VO_PDO] Message arrived during PDO delay!`)
-				} else {
-					console.log(`[VO_PDO] Already requested or no response`)
-				}
-			} catch (err: any) {
-				console.log(`[VO_PDO] PDO request failed: ${err.message} — falling back to placeholder`)
-			}
-
-			// Emit placeholder immediately so consumers see the notification
-			// If PDO succeeds, the real message will arrive via messages.upsert later
-			voMsg.message = {
-				viewOnceMessage: {
-					message: {
-						imageMessage: {
-							viewOnce: true,
-						}
-					}
-				}
-			}
-			const upsertType = node.attrs.offline ? 'append' : 'notify'
-			await upsertMessage(voMsg, upsertType)
+			logger.debug({ id: node.attrs.id, from: node.attrs.from }, 'received view_once unavailable sync from primary device')
 			await sendMessageAck(node)
 			return
 		}
@@ -2401,20 +2377,12 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
 								{ msgId: msg.key?.id, messageType },
 								'CTWA: Skipping placeholder resend for unavailable fanout type'
 							)
-							// For view-once: emit the message with a viewOnceMessage placeholder
-							// so consumers (zpro, etc.) can detect and display it.
-							// Include a message wrapper so isValidMsg accepts it.
+							// For view-once: emit the message as a stub so consumers know it arrived.
+							// Use 'notify' for live messages so realtime consumers get the event.
 							if (messageType === 'view_once_unavailable_fanout') {
 								msg.key.isViewOnce = true
-								msg.message = {
-									viewOnceMessage: {
-										message: {
-											imageMessage: {
-												viewOnce: true,
-											}
-										}
-									}
-								}
+								msg.messageStubType = proto.WebMessageInfo.StubType.CIPHERTEXT
+								msg.messageStubParameters = ['view_once_unavailable']
 								const upsertType = node.attrs.offline ? 'append' : 'notify'
 								await upsertMessage(msg, upsertType)
 							}
@@ -3088,40 +3056,6 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
 		identifier: string,
 		exec: (node: BinaryNode) => Promise<void>
 	) => {
-		// Fast path: ack and drop ignored JIDs before entering the buffer/queue.
-		// Skips type='call' so call events are never silently dropped via
-		// shouldIgnoreJid (preserves InfiniteAPI's pre-existing behavior).
-		// Wrapped in try/catch so a throw from shouldIgnoreJid (user callback)
-		// or sendMessageAck (e.g. websocket closed) is routed through
-		// onUnexpectedError instead of becoming an unhandled rejection —
-		// matches the protection processNodeWithBuffer provides.
-		if (type !== 'call') {
-			try {
-				const from = node.attrs.from
-				let ignoreJid = from
-				if (type === 'receipt' && from) {
-					const attrs = node.attrs
-					const isLid = attrs.from!.includes('lid')
-					const isNodeFromMe = areJidsSameUser(
-						attrs.participant || attrs.from,
-						isLid ? authState.creds.me?.lid : authState.creds.me?.id
-					)
-					ignoreJid = !isNodeFromMe || isJidGroup(attrs.from) ? attrs.from : attrs.recipient
-				}
-
-				if (ignoreJid && ignoreJid !== S_WHATSAPP_NET && shouldIgnoreJid(ignoreJid)) {
-					// Plain ack (no NACK error code) preserves InfiniteAPI's prior
-					// behavior — ignored stanzas are an intentional drop, not a
-					// processing failure, so we don't want server-side retries.
-					await sendMessageAck(node)
-					return
-				}
-			} catch (error) {
-				onUnexpectedError(error as Error, identifier)
-				return
-			}
-		}
-
 		const isOffline = !!node.attrs.offline

 		if (isOffline) {
@@ -9,8 +9,6 @@ export interface Contact {
 	name?: string
 	/** name of the contact, the contact has set on their own on WA */
 	notify?: string
-	/** username associated with this contact, when provided by WA */
-	username?: string
 	/** I have no idea */
 	verifiedName?: string
 	// Baileys Added
@@ -81,7 +81,6 @@ export type BaileysEventMap = {
 		id: string
 		author: string
 		authorPn?: string
-		authorUsername?: string
 		participants: GroupParticipant[]
 		action: ParticipantAction
 	}
@@ -89,7 +88,6 @@ export type BaileysEventMap = {
 		id: string
 		author: string
 		authorPn?: string
-		authorUsername?: string
 		participant: string
 		participantPn?: string
 		action: RequestJoinAction
@@ -20,20 +20,17 @@ export interface GroupMetadata {
 	addressingMode?: WAMessageAddressingMode
 	owner: string | undefined
 	ownerPn?: string | undefined
-	ownerUsername?: string | undefined
 	owner_country_code?: string | undefined
 	subject: string
 	/** group subject owner */
 	subjectOwner?: string
 	subjectOwnerPn?: string
-	subjectOwnerUsername?: string
 	/** group subject modification date */
 	subjectTime?: number
 	creation?: number
 	desc?: string
 	descOwner?: string
 	descOwnerPn?: string
-	descOwnerUsername?: string
 	descId?: string
 	descTime?: number
 	/** if this group is part of a community, it returns the jid of the community to which it belongs */
@@ -59,7 +56,6 @@ export interface GroupMetadata {
 	/** the person who added you to group or changed some setting in group */
 	author?: string
 	authorPn?: string
-	authorUsername?: string
 }

 export interface WAGroupCreateResponse {
@@ -19,9 +19,7 @@ export type WAContactMessage = proto.Message.IContactMessage
 export type WAContactsArrayMessage = proto.Message.IContactsArrayMessage
 export type WAMessageKey = proto.IMessageKey & {
 	remoteJidAlt?: string
-	remoteJidUsername?: string
 	participantAlt?: string
-	participantUsername?: string
 	server_id?: string
 	addressingMode?: string
 	isViewOnce?: boolean // TODO: remove out of the message key, place in WebMessageInfo
@@ -1083,7 +1083,6 @@ export const processSyncAction = (
 					action.lidContactAction.firstName ||
 					action.lidContactAction.username ||
 					undefined,
-				username: action.lidContactAction.username || undefined,
 				lid: id!,
 				phoneNumber: undefined
 			}
@@ -242,14 +242,10 @@ export function decodeMessageNode(stanza: BinaryNode, meId: string, meLid: strin
 	const key: WAMessageKey = {
 		remoteJid: chatId,
 		remoteJidAlt: !isJidGroup(chatId) ? addressingContext.senderAlt : undefined,
-		remoteJidUsername: !isJidGroup(chatId)
-			? stanza.attrs.peer_recipient_username || stanza.attrs.recipient_username
-			: undefined,
 		fromMe,
 		id: msgId,
 		participant,
 		participantAlt: isJidGroup(chatId) ? addressingContext.senderAlt : undefined,
-		participantUsername: stanza.attrs.participant ? stanza.attrs.participant_username : undefined,
 		addressingMode: addressingContext.addressingMode,
 		...(msgType === 'newsletter' && stanza.attrs.server_id ? { server_id: stanza.attrs.server_id } : {})
 	}
@@ -315,7 +315,6 @@ export const processHistoryMessage = (item: proto.IHistorySync, logger?: ILogger
 				contacts.push({
 					id: chatId,
 					name: chat.displayName || chat.name || chat.username || undefined,
-					username: chat.username || undefined,
 					lid: chat.lidJid || chat.accountLid || undefined,
 					phoneNumber: chat.pnJid || undefined
 				})
@@ -763,19 +763,12 @@ const processMessage = async (
 				id: jid,
 				author: message.key.participant!,
 				authorPn: message.key.participantAlt!,
-				authorUsername: message.key.participantUsername!,
 				participants,
 				action
 			})
 		const emitGroupUpdate = (update: Partial<GroupMetadata>) => {
 			ev.emit('groups.update', [
-				{
-					id: jid,
-					...update,
-					author: message.key.participant ?? undefined,
-					authorPn: message.key.participantAlt,
-					authorUsername: message.key.participantUsername
-				}
+				{ id: jid, ...update, author: message.key.participant ?? undefined, authorPn: message.key.participantAlt }
 			])
 		}

@@ -784,7 +777,6 @@ const processMessage = async (
 				id: jid,
 				author: message.key.participant!,
 				authorPn: message.key.participantAlt!,
-				authorUsername: message.key.participantUsername!,
 				participant: participant.lid,
 				participantPn: participant.pn,
 				action,
@@ -46,7 +46,6 @@ export const processContactAction = (
 			{
 				id,
 				name: action.fullName || action.firstName || action.username || undefined,
-				username: action.username || undefined,
 				lid: lidJid || undefined,
 				phoneNumber
 			}
@@ -3,7 +3,6 @@ import { createHash } from 'crypto'
 import { proto } from '../../WAProto/index.js'
 import {
 	KEY_BUNDLE_TYPE,
-	PROTOCOL_MODE,
 	WA_ADV_ACCOUNT_SIG_PREFIX,
 	WA_ADV_DEVICE_SIG_PREFIX,
 	WA_ADV_HOSTED_ACCOUNT_SIG_PREFIX
@@ -59,10 +58,7 @@ const getClientPayload = (config: SocketConfig) => {
 		userAgent: getUserAgent(config)
 	}

-	// Native protocol (WAM\x05) does not use WebInfo — only web protocol does
-	if (PROTOCOL_MODE !== 'native') {
-		payload.webInfo = getWebInfo(config)
-	}
+	payload.webInfo = getWebInfo(config)

 	return payload
 }
@@ -13,37 +13,11 @@ export class USyncContactProtocol implements USyncQueryProtocol {
 	}

 	getUserElement(user: USyncUser): BinaryNode {
-		if (user.phone) {
-			return {
-				tag: 'contact',
-				attrs: {},
-				content: user.phone
-			}
-		}
-
-		if (user.username) {
-			return {
-				tag: 'contact',
-				attrs: {
-					username: user.username,
-					...(user.usernameKey ? { pin: user.usernameKey } : {}),
-					...(user.lid ? { lid: user.lid } : {})
-				}
-			}
-		}
-
-		if (user.type) {
-			return {
-				tag: 'contact',
-				attrs: {
-					type: user.type
-				}
-			}
-		}
-
+		//TODO: Implement type / username fields (not yet supported)
 		return {
 			tag: 'contact',
-			attrs: {}
+			attrs: {},
+			content: user.phone
 		}
 	}

@@ -1,28 +0,0 @@
-import type { USyncQueryProtocol } from '../../Types/USync'
-import { assertNodeErrorFree, type BinaryNode } from '../../WABinary'
-import { USyncUser } from '../USyncUser'
-
-export class USyncUsernameProtocol implements USyncQueryProtocol {
-	name = 'username'
-
-	getQueryElement(): BinaryNode {
-		return {
-			tag: 'username',
-			attrs: {}
-		}
-	}
-
-	getUserElement(user: USyncUser): BinaryNode | null {
-		void user
-		return null
-	}
-
-	parser(node: BinaryNode): string | null {
-		if (node.tag === 'username') {
-			assertNodeErrorFree(node)
-			return typeof node.content === 'string' ? node.content : null
-		}
-
-		return null
-	}
-}
@@ -2,4 +2,3 @@ export * from './USyncDeviceProtocol'
 export * from './USyncContactProtocol'
 export * from './USyncStatusProtocol'
 export * from './USyncDisappearingModeProtocol'
-export * from './USyncUsernameProtocol'
@@ -6,8 +6,7 @@ import {
 	USyncContactProtocol,
 	USyncDeviceProtocol,
 	USyncDisappearingModeProtocol,
-	USyncStatusProtocol,
-	USyncUsernameProtocol
+	USyncStatusProtocol
 } from './Protocols'
 import { USyncUser } from './USyncUser'

@@ -138,9 +137,4 @@ export class USyncQuery {
 		this.protocols.push(new USyncLIDProtocol())
 		return this
 	}
-
-	withUsernameProtocol() {
-		this.protocols.push(new USyncUsernameProtocol())
-		return this
-	}
 }
@@ -2,8 +2,6 @@ export class USyncUser {
 	id?: string
 	lid?: string
 	phone?: string
-	username?: string
-	usernameKey?: string
 	type?: string
 	personaId?: string

@@ -22,16 +20,6 @@ export class USyncUser {
 		return this
 	}

-	withUsername(username: string) {
-		this.username = username
-		return this
-	}
-
-	withUsernameKey(usernameKey: string) {
-		this.usernameKey = usernameKey
-		return this
-	}
-
 	withType(type: string) {
 		this.type = type
 		return this
@@ -1,146 +0,0 @@
-import { jest } from '@jest/globals'
-import { proto, type WAMessage } from '../..'
-import { DEFAULT_CONNECTION_CONFIG } from '../../Defaults'
-import makeWASocket from '../../Socket'
-import { makeSession, mockWebSocket } from '../TestUtils/session'
-
-mockWebSocket()
-
-// chats.ts treats a connection as a reconnection when EITHER signal is true:
-//   1. authState.creds.accountSyncCounter > 0
-//      (at least one full history sync completed in a previous session)
-//   2. socketSkippedOfflineBuffer (forwarded from socket.ts as `skipOfflineBuffer`)
-//      (socket.ts already decided to skip the offline buffer, e.g. because
-//       routingInfo was stale and was discarded on startup)
-// On reconnection, AwaitingInitialSync is skipped and the buffer is flushed
-// immediately so live messages are not held in the initial-sync window.
-describe('Reconnection Sync Skip', () => {
-	it('should skip the history sync wait on reconnection (accountSyncCounter > 0)', async () => {
-		const { state, clear } = await makeSession()
-
-		state.creds.me = { id: '1234567890:1@s.whatsapp.net', name: 'Test User' }
-		// Simulate a session that has already synced before
-		state.creds.accountSyncCounter = 1
-
-		const sock = makeWASocket({
-			...DEFAULT_CONNECTION_CONFIG,
-			auth: state
-		})
-
-		const messageListener = jest.fn()
-		sock.ev.on('messages.upsert', messageListener)
-
-		// Simulate receiving pending notifications (triggers AwaitingInitialSync)
-		sock.ev.emit('connection.update', { receivedPendingNotifications: true })
-
-		// Emit a message immediately after — if the wait is skipped,
-		// the buffer should already be flushed and this message should be delivered.
-		const msg = proto.WebMessageInfo.fromObject({
-			key: { remoteJid: '1234567890@s.whatsapp.net', fromMe: false, id: 'MSG_AFTER_RECONNECT' },
-			messageTimestamp: Date.now() / 1000,
-			message: { conversation: 'Hello after reconnect' }
-		}) as WAMessage
-		sock.ev.emit('messages.upsert', { messages: [msg], type: 'notify' })
-
-		await new Promise(resolve => setTimeout(resolve, 50))
-
-		// Message should be delivered immediately, NOT buffered
-		expect(messageListener).toHaveBeenCalledTimes(1)
-		expect(messageListener).toHaveBeenCalledWith(
-			expect.objectContaining({
-				messages: expect.arrayContaining([expect.objectContaining({ key: msg.key })]),
-				type: 'notify'
-			})
-		)
-
-		await sock.end(new Error('Test completed'))
-		await clear()
-	})
-
-	it('should skip the history sync wait when socketSkippedOfflineBuffer is true (stale routingInfo, accountSyncCounter === 0)', async () => {
-		const { state, clear } = await makeSession()
-
-		state.creds.me = { id: '1234567890:1@s.whatsapp.net', name: 'Test User' }
-		// Fresh-looking session from the counter perspective
-		state.creds.accountSyncCounter = 0
-		// But routingInfo is present and we ask the socket to discard it on start.
-		// socket.ts will set hadStaleRoutingInfo=true → skipOfflineBuffer=true,
-		// which chats.ts forwards as socketSkippedOfflineBuffer. Without this
-		// branch, the buffers would be misaligned (offline buffer skipped while
-		// AwaitingInitialSync still waits) and live messages would stall.
-		state.creds.routingInfo = Buffer.from([1, 2, 3, 4])
-
-		const sock = makeWASocket({
-			...DEFAULT_CONNECTION_CONFIG,
-			auth: state,
-			clearRoutingInfoOnStart: true
-		})
-
-		const messageListener = jest.fn()
-		sock.ev.on('messages.upsert', messageListener)
-
-		sock.ev.emit('connection.update', { receivedPendingNotifications: true })
-
-		const msg = proto.WebMessageInfo.fromObject({
-			key: { remoteJid: '1234567890@s.whatsapp.net', fromMe: false, id: 'MSG_AFTER_STALE_ROUTING' },
-			messageTimestamp: Date.now() / 1000,
-			message: { conversation: 'Hello after stale routing reconnect' }
-		}) as WAMessage
-		sock.ev.emit('messages.upsert', { messages: [msg], type: 'notify' })
-
-		await new Promise(resolve => setTimeout(resolve, 50))
-
-		expect(messageListener).toHaveBeenCalledTimes(1)
-		expect(messageListener).toHaveBeenCalledWith(
-			expect.objectContaining({
-				messages: expect.arrayContaining([expect.objectContaining({ key: msg.key })]),
-				type: 'notify'
-			})
-		)
-
-		await sock.end(new Error('Test completed'))
-		await clear()
-	})
-
-	it('should still wait for history sync on fresh pairing (both signals false)', async () => {
-		const { state, clear } = await makeSession()
-
-		state.creds.me = { id: '1234567890:1@s.whatsapp.net', name: 'Test User' }
-		// Fresh pairing — both reconnect signals are false:
-		// accountSyncCounter is 0 (default) and no stale routingInfo to clear.
-		state.creds.accountSyncCounter = 0
-
-		const sock = makeWASocket({
-			...DEFAULT_CONNECTION_CONFIG,
-			auth: state
-		})
-
-		const messageListener = jest.fn()
-		sock.ev.on('messages.upsert', messageListener)
-
-		sock.ev.emit('connection.update', { receivedPendingNotifications: true })
-
-		const msg = proto.WebMessageInfo.fromObject({
-			key: { remoteJid: '1234567890@s.whatsapp.net', fromMe: false, id: 'MSG_DURING_INITIAL_SYNC' },
-			messageTimestamp: Date.now() / 1000,
-			message: { conversation: 'Hello during initial sync' }
-		}) as WAMessage
-		sock.ev.emit('messages.upsert', { messages: [msg], type: 'notify' })
-
-		await new Promise(resolve => setTimeout(resolve, 50))
-
-		// Message should be BUFFERED (not delivered) because we're waiting for history sync
-		expect(messageListener).toHaveBeenCalledTimes(0)
-
-		// Drain the 2s AwaitingInitialSync timeout (chats.ts:1522) so its callback
-		// doesn't fire after Jest considers the test done — otherwise we get a
-		// "Cannot log after tests are done" warning from the post-teardown flush
-		// and the suite is flagged with --detectOpenHandles. After the timer
-		// fires, syncState becomes Online and the buffer flushes; that delivery
-		// is post-assertion and irrelevant to the test goal.
-		await new Promise(resolve => setTimeout(resolve, 2_100))
-
-		await sock.end(new Error('Test completed'))
-		await clear()
-	}, 10_000)
-})