@fatehan/tsrp 1.3.48 → 1.4.1

package/dist/fatehan/notifies/notify.js

@@ -8,7 +8,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IsRunningCache = exports.EventModule = exports.GsmEvent = exports.GpsEvent = exports.OfflineEvent = exports.BatteryEvent = exports.IgnitionEvent = exports.SpeedEvent = exports.ProtocolEvent = exports.AlertNotify = exports.MuteMask = exports.EventData = exports.EventTemplate = exports.EventList = exports.Event = exports.FormulaEvent = exports.AnalogEvent = exports.DigitalEvent = exports.AreaEvent = exports.AlertModel = exports.Notification_DataEntry = exports.Notification = exports.Notify_DataEntry = exports.Notify = exports.UserDeviceAlertList = exports.UserDeviceAlert_TimingEntry = exports.UserDeviceAlert_ConditionEntry = exports.UserDeviceAlert_ConditionList = exports.UserDeviceAlert_Condition = exports.UserDeviceAlert = exports.NotifyJob = exports.NotifyJob_Priority = exports.TriggerGate = exports.AnalogEventType = exports.AreaEventType = exports.ObjectType = exports.Via = exports.protobufPackage = void 0;
+exports.IsRunningCache = exports.EventModule = exports.GsmEvent = exports.GpsEvent = exports.OfflineEvent = exports.BatteryEvent = exports.IgnitionEvent = exports.SpeedEvent = exports.ProtocolEvent = exports.FormulaEvent = exports.AnalogEvent = exports.DigitalEvent = exports.AreaEvent = exports.AlertNotify = exports.MuteMask = exports.EventData = exports.EventTemplate = exports.EventList = exports.Event = exports.AlertModel = exports.Notification_DataEntry = exports.Notification = exports.Notify_DataEntry = exports.Notify = exports.UserDeviceAlertList = exports.UserDeviceAlert_TimingEntry = exports.UserDeviceAlert_ConditionEntry = exports.UserDeviceAlert_ConditionList = exports.UserDeviceAlert_Condition = exports.UserDeviceAlert = exports.NotifyJob = exports.TestMessage = exports.NotifyJob_Priority = exports.TriggerGate = exports.AnalogEventType = exports.AreaEventType = exports.ObjectType = exports.Via = exports.protobufPackage = void 0;
 exports.viaFromJSON = viaFromJSON;
 exports.viaToJSON = viaToJSON;
 exports.objectTypeFromJSON = objectTypeFromJSON;
@@ -274,6 +274,58 @@ function notifyJob_PriorityToJSON(object) {
             return "UNRECOGNIZED";
     }
 }
+function createBaseTestMessage() {
+    return { name: "" };
+}
+exports.TestMessage = {
+    encode(message, writer = new wire_1.BinaryWriter()) {
+        if (message.name !== "") {
+            writer.uint32(10).string(message.name);
+        }
+        return writer;
+    },
+    decode(input, length) {
+        const reader = input instanceof wire_1.BinaryReader ? input : new wire_1.BinaryReader(input);
+        const end = length === undefined ? reader.len : reader.pos + length;
+        const message = createBaseTestMessage();
+        while (reader.pos < end) {
+            const tag = reader.uint32();
+            switch (tag >>> 3) {
+                case 1: {
+                    if (tag !== 10) {
+                        break;
+                    }
+                    message.name = reader.string();
+                    continue;
+                }
+            }
+            if ((tag & 7) === 4 || tag === 0) {
+                break;
+            }
+            reader.skip(tag & 7);
+        }
+        return message;
+    },
+    fromJSON(object) {
+        return { name: isSet(object.name) ? globalThis.String(object.name) : "" };
+    },
+    toJSON(message) {
+        const obj = {};
+        if (message.name !== "") {
+            obj.name = message.name;
+        }
+        return obj;
+    },
+    create(base) {
+        return exports.TestMessage.fromPartial(base !== null && base !== void 0 ? base : {});
+    },
+    fromPartial(object) {
+        var _a;
+        const message = createBaseTestMessage();
+        message.name = (_a = object.name) !== null && _a !== void 0 ? _a : "";
+        return message;
+    },
+};
 function createBaseNotifyJob() {
     return { id: long_1.default.UZERO, userId: long_1.default.UZERO, retries: 0, priority: 0, notify: undefined, via: [] };
 }
@@ -2092,23 +2144,58 @@ exports.AlertModel = {
         return message;
     },
 };
-function createBaseAreaEvent() {
-    return { areaId: long_1.default.UZERO, eventType: 0 };
+function createBaseEvent() {
+    return {
+        id: long_1.default.UZERO,
+        userId: long_1.default.UZERO,
+        deviceId: long_1.default.UZERO,
+        organizationId: long_1.default.UZERO,
+        createdBy: undefined,
+        name: "",
+        eventData: undefined,
+        status: false,
+        createdAt: undefined,
+        updatedAt: undefined,
+    };
 }
-exports.AreaEvent = {
+exports.Event = {
     encode(message, writer = new wire_1.BinaryWriter()) {
-        if (!message.areaId.equals(long_1.default.UZERO)) {
-            writer.uint32(8).uint64(message.areaId.toString());
+        if (!message.id.equals(long_1.default.UZERO)) {
+            writer.uint32(8).uint64(message.id.toString());
         }
-        if (message.eventType !== 0) {
-            writer.uint32(16).int32(message.eventType);
+        if (!message.userId.equals(long_1.default.UZERO)) {
+            writer.uint32(16).uint64(message.userId.toString());
+        }
+        if (!message.deviceId.equals(long_1.default.UZERO)) {
+            writer.uint32(24).uint64(message.deviceId.toString());
+        }
+        if (!message.organizationId.equals(long_1.default.UZERO)) {
+            writer.uint32(32).uint64(message.organizationId.toString());
+        }
+        if (message.createdBy !== undefined) {
+            writer.uint32(40).uint64(message.createdBy.toString());
+        }
+        if (message.name !== "") {
+            writer.uint32(50).string(message.name);
+        }
+        if (message.eventData !== undefined) {
+            exports.EventData.encode(message.eventData, writer.uint32(58).fork()).join();
+        }
+        if (message.status !== false) {
+            writer.uint32(72).bool(message.status);
+        }
+        if (message.createdAt !== undefined) {
+            timestamp_1.Timestamp.encode(toTimestamp(message.createdAt), writer.uint32(82).fork()).join();
+        }
+        if (message.updatedAt !== undefined) {
+            timestamp_1.Timestamp.encode(toTimestamp(message.updatedAt), writer.uint32(90).fork()).join();
         }
         return writer;
     },
     decode(input, length) {
         const reader = input instanceof wire_1.BinaryReader ? input : new wire_1.BinaryReader(input);
         const end = length === undefined ? reader.len : reader.pos + length;
-        const message = createBaseAreaEvent();
+        const message = createBaseEvent();
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
@@ -2116,14 +2203,70 @@ exports.AreaEvent = {
                     if (tag !== 8) {
                         break;
                     }
-                    message.areaId = long_1.default.fromString(reader.uint64().toString(), true);
+                    message.id = long_1.default.fromString(reader.uint64().toString(), true);
                     continue;
                 }
                 case 2: {
                     if (tag !== 16) {
                         break;
                     }
-                    message.eventType = reader.int32();
+                    message.userId = long_1.default.fromString(reader.uint64().toString(), true);
+                    continue;
+                }
+                case 3: {
+                    if (tag !== 24) {
+                        break;
+                    }
+                    message.deviceId = long_1.default.fromString(reader.uint64().toString(), true);
+                    continue;
+                }
+                case 4: {
+                    if (tag !== 32) {
+                        break;
+                    }
+                    message.organizationId = long_1.default.fromString(reader.uint64().toString(), true);
+                    continue;
+                }
+                case 5: {
+                    if (tag !== 40) {
+                        break;
+                    }
+                    message.createdBy = long_1.default.fromString(reader.uint64().toString(), true);
+                    continue;
+                }
+                case 6: {
+                    if (tag !== 50) {
+                        break;
+                    }
+                    message.name = reader.string();
+                    continue;
+                }
+                case 7: {
+                    if (tag !== 58) {
+                        break;
+                    }
+                    message.eventData = exports.EventData.decode(reader, reader.uint32());
+                    continue;
+                }
+                case 9: {
+                    if (tag !== 72) {
+                        break;
+                    }
+                    message.status = reader.bool();
+                    continue;
+                }
+                case 10: {
+                    if (tag !== 82) {
+                        break;
+                    }
+                    message.createdAt = fromTimestamp(timestamp_1.Timestamp.decode(reader, reader.uint32()));
+                    continue;
+                }
+                case 11: {
+                    if (tag !== 90) {
+                        break;
+                    }
+                    message.updatedAt = fromTimestamp(timestamp_1.Timestamp.decode(reader, reader.uint32()));
                     continue;
                 }
             }
@@ -2136,50 +2279,107 @@ exports.AreaEvent = {
     },
     fromJSON(object) {
         return {
-            areaId: isSet(object.area_id) ? long_1.default.fromValue(object.area_id) : long_1.default.UZERO,
-            eventType: isSet(object.event_type) ? areaEventTypeFromJSON(object.event_type) : 0,
+            id: isSet(object.id) ? long_1.default.fromValue(object.id) : long_1.default.UZERO,
+            userId: isSet(object.user_id) ? long_1.default.fromValue(object.user_id) : long_1.default.UZERO,
+            deviceId: isSet(object.device_id) ? long_1.default.fromValue(object.device_id) : long_1.default.UZERO,
+            organizationId: isSet(object.organization_id) ? long_1.default.fromValue(object.organization_id) : long_1.default.UZERO,
+            createdBy: isSet(object.created_by) ? long_1.default.fromValue(object.created_by) : undefined,
+            name: isSet(object.name) ? globalThis.String(object.name) : "",
+            eventData: isSet(object.event_data) ? exports.EventData.fromJSON(object.event_data) : undefined,
+            status: isSet(object.status) ? globalThis.Boolean(object.status) : false,
+            createdAt: isSet(object.created_at) ? fromJsonTimestamp(object.created_at) : undefined,
+            updatedAt: isSet(object.updated_at) ? fromJsonTimestamp(object.updated_at) : undefined,
         };
     },
     toJSON(message) {
         const obj = {};
-        if (!message.areaId.equals(long_1.default.UZERO)) {
-            obj.area_id = (message.areaId || long_1.default.UZERO).toString();
+        if (!message.id.equals(long_1.default.UZERO)) {
+            obj.id = (message.id || long_1.default.UZERO).toString();
         }
-        if (message.eventType !== 0) {
-            obj.event_type = areaEventTypeToJSON(message.eventType);
+        if (!message.userId.equals(long_1.default.UZERO)) {
+            obj.user_id = (message.userId || long_1.default.UZERO).toString();
+        }
+        if (!message.deviceId.equals(long_1.default.UZERO)) {
+            obj.device_id = (message.deviceId || long_1.default.UZERO).toString();
+        }
+        if (!message.organizationId.equals(long_1.default.UZERO)) {
+            obj.organization_id = (message.organizationId || long_1.default.UZERO).toString();
+        }
+        if (message.createdBy !== undefined) {
+            obj.created_by = (message.createdBy || long_1.default.UZERO).toString();
+        }
+        if (message.name !== "") {
+            obj.name = message.name;
+        }
+        if (message.eventData !== undefined) {
+            obj.event_data = exports.EventData.toJSON(message.eventData);
+        }
+        if (message.status !== false) {
+            obj.status = message.status;
+        }
+        if (message.createdAt !== undefined) {
+            obj.created_at = message.createdAt.toISOString();
+        }
+        if (message.updatedAt !== undefined) {
+            obj.updated_at = message.updatedAt.toISOString();
         }
         return obj;
     },
     create(base) {
-        return exports.AreaEvent.fromPartial(base !== null && base !== void 0 ? base : {});
+        return exports.Event.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
-        var _a;
-        const message = createBaseAreaEvent();
-        message.areaId = (object.areaId !== undefined && object.areaId !== null)
-            ? long_1.default.fromValue(object.areaId)
+        var _a, _b, _c, _d;
+        const message = createBaseEvent();
+        message.id = (object.id !== undefined && object.id !== null) ? long_1.default.fromValue(object.id) : long_1.default.UZERO;
+        message.userId = (object.userId !== undefined && object.userId !== null)
+            ? long_1.default.fromValue(object.userId)
             : long_1.default.UZERO;
-        message.eventType = (_a = object.eventType) !== null && _a !== void 0 ? _a : 0;
+        message.deviceId = (object.deviceId !== undefined && object.deviceId !== null)
+            ? long_1.default.fromValue(object.deviceId)
+            : long_1.default.UZERO;
+        message.organizationId = (object.organizationId !== undefined && object.organizationId !== null)
+            ? long_1.default.fromValue(object.organizationId)
+            : long_1.default.UZERO;
+        message.createdBy = (object.createdBy !== undefined && object.createdBy !== null)
+            ? long_1.default.fromValue(object.createdBy)
+            : undefined;
+        message.name = (_a = object.name) !== null && _a !== void 0 ? _a : "";
+        message.eventData = (object.eventData !== undefined && object.eventData !== null)
+            ? exports.EventData.fromPartial(object.eventData)
+            : undefined;
+        message.status = (_b = object.status) !== null && _b !== void 0 ? _b : false;
+        message.createdAt = (_c = object.createdAt) !== null && _c !== void 0 ? _c : undefined;
+        message.updatedAt = (_d = object.updatedAt) !== null && _d !== void 0 ? _d : undefined;
         return message;
     },
 };
-function createBaseDigitalEvent() {
-    return { trigger: false, io: "" };
+function createBaseEventList() {
+    return { total: 0, currentPage: 0, lastPage: 0, perPage: 0, events: [] };
 }
-exports.DigitalEvent = {
+exports.EventList = {
     encode(message, writer = new wire_1.BinaryWriter()) {
-        if (message.trigger !== false) {
-            writer.uint32(8).bool(message.trigger);
+        if (message.total !== 0) {
+            writer.uint32(8).uint32(message.total);
         }
-        if (message.io !== "") {
-            writer.uint32(18).string(message.io);
+        if (message.currentPage !== 0) {
+            writer.uint32(16).uint32(message.currentPage);
+        }
+        if (message.lastPage !== 0) {
+            writer.uint32(24).uint32(message.lastPage);
+        }
+        if (message.perPage !== 0) {
+            writer.uint32(32).uint32(message.perPage);
+        }
+        for (const v of message.events) {
+            exports.Event.encode(v, writer.uint32(42).fork()).join();
         }
         return writer;
     },
     decode(input, length) {
         const reader = input instanceof wire_1.BinaryReader ? input : new wire_1.BinaryReader(input);
         const end = length === undefined ? reader.len : reader.pos + length;
-        const message = createBaseDigitalEvent();
+        const message = createBaseEventList();
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
@@ -2187,103 +2387,35 @@ exports.DigitalEvent = {
                     if (tag !== 8) {
                         break;
                     }
-                    message.trigger = reader.bool();
+                    message.total = reader.uint32();
                     continue;
                 }
                 case 2: {
-                    if (tag !== 18) {
+                    if (tag !== 16) {
                         break;
                     }
-                    message.io = reader.string();
-                    continue;
-                }
-            }
-            if ((tag & 7) === 4 || tag === 0) {
-                break;
-            }
-            reader.skip(tag & 7);
-        }
-        return message;
-    },
-    fromJSON(object) {
-        return {
-            trigger: isSet(object.trigger) ? globalThis.Boolean(object.trigger) : false,
-            io: isSet(object.io) ? globalThis.String(object.io) : "",
-        };
-    },
-    toJSON(message) {
-        const obj = {};
-        if (message.trigger !== false) {
-            obj.trigger = message.trigger;
-        }
-        if (message.io !== "") {
-            obj.io = message.io;
-        }
-        return obj;
-    },
-    create(base) {
-        return exports.DigitalEvent.fromPartial(base !== null && base !== void 0 ? base : {});
-    },
-    fromPartial(object) {
-        var _a, _b;
-        const message = createBaseDigitalEvent();
-        message.trigger = (_a = object.trigger) !== null && _a !== void 0 ? _a : false;
-        message.io = (_b = object.io) !== null && _b !== void 0 ? _b : "";
-        return message;
-    },
-};
-function createBaseAnalogEvent() {
-    return { value: 0, io: "", type: 0, tolerancePercent: undefined };
-}
-exports.AnalogEvent = {
-    encode(message, writer = new wire_1.BinaryWriter()) {
-        if (message.value !== 0) {
-            writer.uint32(9).double(message.value);
-        }
-        if (message.io !== "") {
-            writer.uint32(18).string(message.io);
-        }
-        if (message.type !== 0) {
-            writer.uint32(24).int32(message.type);
-        }
-        if (message.tolerancePercent !== undefined) {
-            writer.uint32(32).uint32(message.tolerancePercent);
-        }
-        return writer;
-    },
-    decode(input, length) {
-        const reader = input instanceof wire_1.BinaryReader ? input : new wire_1.BinaryReader(input);
-        const end = length === undefined ? reader.len : reader.pos + length;
-        const message = createBaseAnalogEvent();
-        while (reader.pos < end) {
-            const tag = reader.uint32();
-            switch (tag >>> 3) {
-                case 1: {
-                    if (tag !== 9) {
-                        break;
-                    }
-                    message.value = reader.double();
-                    continue;
-                }
-                case 2: {
-                    if (tag !== 18) {
-                        break;
-                    }
-                    message.io = reader.string();
+                    message.currentPage = reader.uint32();
                     continue;
                 }
                 case 3: {
                     if (tag !== 24) {
                         break;
                     }
-                    message.type = reader.int32();
+                    message.lastPage = reader.uint32();
                     continue;
                 }
                 case 4: {
                     if (tag !== 32) {
                         break;
                     }
-                    message.tolerancePercent = reader.uint32();
+                    message.perPage = reader.uint32();
+                    continue;
+                }
+                case 5: {
+                    if (tag !== 42) {
+                        break;
+                    }
+                    message.events.push(exports.Event.decode(reader, reader.uint32()));
                     continue;
                 }
             }
@@ -2296,145 +2428,87 @@ exports.AnalogEvent = {
     },
     fromJSON(object) {
         return {
-            value: isSet(object.value) ? globalThis.Number(object.value) : 0,
-            io: isSet(object.io) ? globalThis.String(object.io) : "",
-            type: isSet(object.type) ? analogEventTypeFromJSON(object.type) : 0,
-            tolerancePercent: isSet(object.tolerance_percent) ? globalThis.Number(object.tolerance_percent) : undefined,
+            total: isSet(object.total) ? globalThis.Number(object.total) : 0,
+            currentPage: isSet(object.current_page) ? globalThis.Number(object.current_page) : 0,
+            lastPage: isSet(object.last_page) ? globalThis.Number(object.last_page) : 0,
+            perPage: isSet(object.per_page) ? globalThis.Number(object.per_page) : 0,
+            events: globalThis.Array.isArray(object === null || object === void 0 ? void 0 : object.events) ? object.events.map((e) => exports.Event.fromJSON(e)) : [],
         };
     },
     toJSON(message) {
+        var _a;
         const obj = {};
-        if (message.value !== 0) {
-            obj.value = message.value;
-        }
-        if (message.io !== "") {
-            obj.io = message.io;
-        }
-        if (message.type !== 0) {
-            obj.type = analogEventTypeToJSON(message.type);
+        if (message.total !== 0) {
+            obj.total = Math.round(message.total);
         }
-        if (message.tolerancePercent !== undefined) {
-            obj.tolerance_percent = Math.round(message.tolerancePercent);
+        if (message.currentPage !== 0) {
+            obj.current_page = Math.round(message.currentPage);
         }
-        return obj;
-    },
-    create(base) {
-        return exports.AnalogEvent.fromPartial(base !== null && base !== void 0 ? base : {});
-    },
-    fromPartial(object) {
-        var _a, _b, _c, _d;
-        const message = createBaseAnalogEvent();
-        message.value = (_a = object.value) !== null && _a !== void 0 ? _a : 0;
-        message.io = (_b = object.io) !== null && _b !== void 0 ? _b : "";
-        message.type = (_c = object.type) !== null && _c !== void 0 ? _c : 0;
-        message.tolerancePercent = (_d = object.tolerancePercent) !== null && _d !== void 0 ? _d : undefined;
-        return message;
-    },
-};
-function createBaseFormulaEvent() {
-    return { formula: "" };
-}
-exports.FormulaEvent = {
-    encode(message, writer = new wire_1.BinaryWriter()) {
-        if (message.formula !== "") {
-            writer.uint32(10).string(message.formula);
+        if (message.lastPage !== 0) {
+            obj.last_page = Math.round(message.lastPage);
         }
-        return writer;
-    },
-    decode(input, length) {
-        const reader = input instanceof wire_1.BinaryReader ? input : new wire_1.BinaryReader(input);
-        const end = length === undefined ? reader.len : reader.pos + length;
-        const message = createBaseFormulaEvent();
-        while (reader.pos < end) {
-            const tag = reader.uint32();
-            switch (tag >>> 3) {
-                case 1: {
-                    if (tag !== 10) {
-                        break;
-                    }
-                    message.formula = reader.string();
-                    continue;
-                }
-            }
-            if ((tag & 7) === 4 || tag === 0) {
-                break;
-            }
-            reader.skip(tag & 7);
+        if (message.perPage !== 0) {
+            obj.per_page = Math.round(message.perPage);
         }
-        return message;
-    },
-    fromJSON(object) {
-        return { formula: isSet(object.formula) ? globalThis.String(object.formula) : "" };
-    },
-    toJSON(message) {
-        const obj = {};
-        if (message.formula !== "") {
-            obj.formula = message.formula;
+        if ((_a = message.events) === null || _a === void 0 ? void 0 : _a.length) {
+            obj.events = message.events.map((e) => exports.Event.toJSON(e));
         }
         return obj;
     },
     create(base) {
-        return exports.FormulaEvent.fromPartial(base !== null && base !== void 0 ? base : {});
+        return exports.EventList.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
-        var _a;
-        const message = createBaseFormulaEvent();
-        message.formula = (_a = object.formula) !== null && _a !== void 0 ? _a : "";
+        var _a, _b, _c, _d, _e;
+        const message = createBaseEventList();
+        message.total = (_a = object.total) !== null && _a !== void 0 ? _a : 0;
+        message.currentPage = (_b = object.currentPage) !== null && _b !== void 0 ? _b : 0;
+        message.lastPage = (_c = object.lastPage) !== null && _c !== void 0 ? _c : 0;
+        message.perPage = (_d = object.perPage) !== null && _d !== void 0 ? _d : 0;
+        message.events = ((_e = object.events) === null || _e === void 0 ? void 0 : _e.map((e) => exports.Event.fromPartial(e))) || [];
         return message;
     },
 };
-function createBaseEvent() {
+function createBaseEventTemplate() {
     return {
         id: long_1.default.UZERO,
-        userId: long_1.default.UZERO,
-        deviceId: long_1.default.UZERO,
-        organizationId: long_1.default.UZERO,
+        organizationId: undefined,
         createdBy: undefined,
         name: "",
         eventData: undefined,
-        status: false,
         createdAt: undefined,
         updatedAt: undefined,
     };
 }
-exports.Event = {
+exports.EventTemplate = {
     encode(message, writer = new wire_1.BinaryWriter()) {
         if (!message.id.equals(long_1.default.UZERO)) {
             writer.uint32(8).uint64(message.id.toString());
         }
-        if (!message.userId.equals(long_1.default.UZERO)) {
-            writer.uint32(16).uint64(message.userId.toString());
-        }
-        if (!message.deviceId.equals(long_1.default.UZERO)) {
-            writer.uint32(24).uint64(message.deviceId.toString());
-        }
-        if (!message.organizationId.equals(long_1.default.UZERO)) {
-            writer.uint32(32).uint64(message.organizationId.toString());
+        if (message.organizationId !== undefined) {
+            writer.uint32(16).uint64(message.organizationId.toString());
         }
         if (message.createdBy !== undefined) {
-            writer.uint32(40).uint64(message.createdBy.toString());
+            writer.uint32(24).uint64(message.createdBy.toString());
         }
         if (message.name !== "") {
-            writer.uint32(50).string(message.name);
+            writer.uint32(34).string(message.name);
         }
         if (message.eventData !== undefined) {
-            exports.EventData.encode(message.eventData, writer.uint32(58).fork()).join();
-        }
-        if (message.status !== false) {
-            writer.uint32(72).bool(message.status);
+            exports.EventData.encode(message.eventData, writer.uint32(42).fork()).join();
         }
         if (message.createdAt !== undefined) {
-            timestamp_1.Timestamp.encode(toTimestamp(message.createdAt), writer.uint32(82).fork()).join();
+            timestamp_1.Timestamp.encode(toTimestamp(message.createdAt), writer.uint32(50).fork()).join();
         }
         if (message.updatedAt !== undefined) {
-            timestamp_1.Timestamp.encode(toTimestamp(message.updatedAt), writer.uint32(90).fork()).join();
+            timestamp_1.Timestamp.encode(toTimestamp(message.updatedAt), writer.uint32(58).fork()).join();
         }
         return writer;
     },
     decode(input, length) {
         const reader = input instanceof wire_1.BinaryReader ? input : new wire_1.BinaryReader(input);
         const end = length === undefined ? reader.len : reader.pos + length;
-        const message = createBaseEvent();
+        const message = createBaseEventTemplate();
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
@@ -2449,62 +2523,41 @@ exports.Event = {
                     if (tag !== 16) {
                         break;
                     }
-                    message.userId = long_1.default.fromString(reader.uint64().toString(), true);
+                    message.organizationId = long_1.default.fromString(reader.uint64().toString(), true);
                     continue;
                 }
                 case 3: {
                     if (tag !== 24) {
                         break;
                     }
-                    message.deviceId = long_1.default.fromString(reader.uint64().toString(), true);
+                    message.createdBy = long_1.default.fromString(reader.uint64().toString(), true);
                     continue;
                 }
                 case 4: {
-                    if (tag !== 32) {
+                    if (tag !== 34) {
                         break;
                     }
-                    message.organizationId = long_1.default.fromString(reader.uint64().toString(), true);
+                    message.name = reader.string();
                     continue;
                 }
                 case 5: {
-                    if (tag !== 40) {
+                    if (tag !== 42) {
                         break;
                     }
-                    message.createdBy = long_1.default.fromString(reader.uint64().toString(), true);
+                    message.eventData = exports.EventData.decode(reader, reader.uint32());
                     continue;
                 }
                 case 6: {
                     if (tag !== 50) {
                         break;
                     }
-                    message.name = reader.string();
+                    message.createdAt = fromTimestamp(timestamp_1.Timestamp.decode(reader, reader.uint32()));
                     continue;
                 }
                 case 7: {
                     if (tag !== 58) {
                         break;
                     }
-                    message.eventData = exports.EventData.decode(reader, reader.uint32());
-                    continue;
-                }
-                case 9: {
-                    if (tag !== 72) {
-                        break;
-                    }
-                    message.status = reader.bool();
-                    continue;
-                }
-                case 10: {
-                    if (tag !== 82) {
-                        break;
-                    }
-                    message.createdAt = fromTimestamp(timestamp_1.Timestamp.decode(reader, reader.uint32()));
-                    continue;
-                }
-                case 11: {
-                    if (tag !== 90) {
-                        break;
-                    }
                     message.updatedAt = fromTimestamp(timestamp_1.Timestamp.decode(reader, reader.uint32()));
                     continue;
                 }
@@ -2519,13 +2572,10 @@ exports.Event = {
     fromJSON(object) {
         return {
             id: isSet(object.id) ? long_1.default.fromValue(object.id) : long_1.default.UZERO,
-            userId: isSet(object.user_id) ? long_1.default.fromValue(object.user_id) : long_1.default.UZERO,
-            deviceId: isSet(object.device_id) ? long_1.default.fromValue(object.device_id) : long_1.default.UZERO,
-            organizationId: isSet(object.organization_id) ? long_1.default.fromValue(object.organization_id) : long_1.default.UZERO,
+            organizationId: isSet(object.organization_id) ? long_1.default.fromValue(object.organization_id) : undefined,
             createdBy: isSet(object.created_by) ? long_1.default.fromValue(object.created_by) : undefined,
             name: isSet(object.name) ? globalThis.String(object.name) : "",
             eventData: isSet(object.event_data) ? exports.EventData.fromJSON(object.event_data) : undefined,
-            status: isSet(object.status) ? globalThis.Boolean(object.status) : false,
             createdAt: isSet(object.created_at) ? fromJsonTimestamp(object.created_at) : undefined,
             updatedAt: isSet(object.updated_at) ? fromJsonTimestamp(object.updated_at) : undefined,
         };
@@ -2535,13 +2585,7 @@ exports.Event = {
         if (!message.id.equals(long_1.default.UZERO)) {
             obj.id = (message.id || long_1.default.UZERO).toString();
         }
-        if (!message.userId.equals(long_1.default.UZERO)) {
-            obj.user_id = (message.userId || long_1.default.UZERO).toString();
-        }
-        if (!message.deviceId.equals(long_1.default.UZERO)) {
-            obj.device_id = (message.deviceId || long_1.default.UZERO).toString();
-        }
-        if (!message.organizationId.equals(long_1.default.UZERO)) {
+        if (message.organizationId !== undefined) {
             obj.organization_id = (message.organizationId || long_1.default.UZERO).toString();
         }
         if (message.createdBy !== undefined) {
@@ -2553,9 +2597,6 @@ exports.Event = {
         if (message.eventData !== undefined) {
             obj.event_data = exports.EventData.toJSON(message.eventData);
         }
-        if (message.status !== false) {
-            obj.status = message.status;
-        }
         if (message.createdAt !== undefined) {
             obj.created_at = message.createdAt.toISOString();
         }
@@ -2565,21 +2606,15 @@ exports.Event = {
         return obj;
     },
     create(base) {
-        return exports.Event.fromPartial(base !== null && base !== void 0 ? base : {});
+        return exports.EventTemplate.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
-        var _a, _b, _c, _d;
-        const message = createBaseEvent();
+        var _a, _b, _c;
+        const message = createBaseEventTemplate();
         message.id = (object.id !== undefined && object.id !== null) ? long_1.default.fromValue(object.id) : long_1.default.UZERO;
-        message.userId = (object.userId !== undefined && object.userId !== null)
-            ? long_1.default.fromValue(object.userId)
-            : long_1.default.UZERO;
-        message.deviceId = (object.deviceId !== undefined && object.deviceId !== null)
-            ? long_1.default.fromValue(object.deviceId)
-            : long_1.default.UZERO;
         message.organizationId = (object.organizationId !== undefined && object.organizationId !== null)
             ? long_1.default.fromValue(object.organizationId)
-            : long_1.default.UZERO;
+            : undefined;
         message.createdBy = (object.createdBy !== undefined && object.createdBy !== null)
             ? long_1.default.fromValue(object.createdBy)
             : undefined;
@@ -2587,38 +2622,53 @@ exports.Event = {
         message.eventData = (object.eventData !== undefined && object.eventData !== null)
             ? exports.EventData.fromPartial(object.eventData)
             : undefined;
-        message.status = (_b = object.status) !== null && _b !== void 0 ? _b : false;
-        message.createdAt = (_c = object.createdAt) !== null && _c !== void 0 ? _c : undefined;
-        message.updatedAt = (_d = object.updatedAt) !== null && _d !== void 0 ? _d : undefined;
+        message.createdAt = (_b = object.createdAt) !== null && _b !== void 0 ? _b : undefined;
+        message.updatedAt = (_c = object.updatedAt) !== null && _c !== void 0 ? _c : undefined;
         return message;
     },
 };
-function createBaseEventList() {
-    return { total: 0, currentPage: 0, lastPage: 0, perPage: 0, events: [] };
+function createBaseEventData() {
+    return {
+        continuous: false,
+        blindFilter: false,
+        notify: undefined,
+        triggerGate: 0,
+        muteMask: [],
+        eventModules: [],
+        via: [],
+    };
 }
-exports.EventList = {
+exports.EventData = {
     encode(message, writer = new wire_1.BinaryWriter()) {
-        if (message.total !== 0) {
-            writer.uint32(8).uint32(message.total);
+        if (message.continuous !== false) {
+            writer.uint32(8).bool(message.continuous);
         }
-        if (message.currentPage !== 0) {
-            writer.uint32(16).uint32(message.currentPage);
+        if (message.blindFilter !== false) {
+            writer.uint32(16).bool(message.blindFilter);
         }
-        if (message.lastPage !== 0) {
-            writer.uint32(24).uint32(message.lastPage);
+        if (message.notify !== undefined) {
+            exports.AlertNotify.encode(message.notify, writer.uint32(26).fork()).join();
         }
-        if (message.perPage !== 0) {
-            writer.uint32(32).uint32(message.perPage);
+        if (message.triggerGate !== 0) {
+            writer.uint32(32).int32(message.triggerGate);
         }
-        for (const v of message.events) {
-            exports.Event.encode(v, writer.uint32(42).fork()).join();
+        for (const v of message.muteMask) {
+            exports.MuteMask.encode(v, writer.uint32(42).fork()).join();
         }
+        for (const v of message.eventModules) {
+            exports.EventModule.encode(v, writer.uint32(50).fork()).join();
+        }
+        writer.uint32(58).fork();
+        for (const v of message.via) {
+            writer.int32(v);
+        }
+        writer.join();
         return writer;
     },
     decode(input, length) {
         const reader = input instanceof wire_1.BinaryReader ? input : new wire_1.BinaryReader(input);
         const end = length === undefined ? reader.len : reader.pos + length;
-        const message = createBaseEventList();
+        const message = createBaseEventData();
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
@@ -2626,37 +2676,58 @@ exports.EventList = {
                     if (tag !== 8) {
                         break;
                     }
-                    message.total = reader.uint32();
+                    message.continuous = reader.bool();
                     continue;
                 }
                 case 2: {
                     if (tag !== 16) {
                         break;
                     }
-                    message.currentPage = reader.uint32();
+                    message.blindFilter = reader.bool();
                     continue;
                 }
                 case 3: {
-                    if (tag !== 24) {
+                    if (tag !== 26) {
                         break;
                     }
-                    message.lastPage = reader.uint32();
+                    message.notify = exports.AlertNotify.decode(reader, reader.uint32());
                     continue;
                 }
                 case 4: {
                     if (tag !== 32) {
                         break;
                     }
-                    message.perPage = reader.uint32();
+                    message.triggerGate = reader.int32();
                     continue;
                 }
                 case 5: {
                     if (tag !== 42) {
                         break;
                     }
-                    message.events.push(exports.Event.decode(reader, reader.uint32()));
+                    message.muteMask.push(exports.MuteMask.decode(reader, reader.uint32()));
+                    continue;
+                }
+                case 6: {
+                    if (tag !== 50) {
+                        break;
+                    }
+                    message.eventModules.push(exports.EventModule.decode(reader, reader.uint32()));
                     continue;
                 }
+                case 7: {
+                    if (tag === 56) {
+                        message.via.push(reader.int32());
+                        continue;
+                    }
+                    if (tag === 58) {
+                        const end2 = reader.uint32() + reader.pos;
+                        while (reader.pos < end2) {
+                            message.via.push(reader.int32());
+                        }
+                        continue;
+                    }
+                    break;
+                }
             }
             if ((tag & 7) === 4 || tag === 0) {
                 break;
@@ -2667,87 +2738,86 @@ exports.EventList = {
     },
     fromJSON(object) {
         return {
-            total: isSet(object.total) ? globalThis.Number(object.total) : 0,
-            currentPage: isSet(object.current_page) ? globalThis.Number(object.current_page) : 0,
-            lastPage: isSet(object.last_page) ? globalThis.Number(object.last_page) : 0,
-            perPage: isSet(object.per_page) ? globalThis.Number(object.per_page) : 0,
-            events: globalThis.Array.isArray(object === null || object === void 0 ? void 0 : object.events) ? object.events.map((e) => exports.Event.fromJSON(e)) : [],
+            continuous: isSet(object.continuous) ? globalThis.Boolean(object.continuous) : false,
+            blindFilter: isSet(object.blind_filter) ? globalThis.Boolean(object.blind_filter) : false,
+            notify: isSet(object.notify) ? exports.AlertNotify.fromJSON(object.notify) : undefined,
+            triggerGate: isSet(object.trigger_gate) ? triggerGateFromJSON(object.trigger_gate) : 0,
+            muteMask: globalThis.Array.isArray(object === null || object === void 0 ? void 0 : object.mute_mask)
+                ? object.mute_mask.map((e) => exports.MuteMask.fromJSON(e))
+                : [],
+            eventModules: globalThis.Array.isArray(object === null || object === void 0 ? void 0 : object.event_modules)
+                ? object.event_modules.map((e) => exports.EventModule.fromJSON(e))
+                : [],
+            via: globalThis.Array.isArray(object === null || object === void 0 ? void 0 : object.via) ? object.via.map((e) => viaFromJSON(e)) : [],
         };
     },
     toJSON(message) {
-        var _a;
+        var _a, _b, _c;
         const obj = {};
-        if (message.total !== 0) {
-            obj.total = Math.round(message.total);
+        if (message.continuous !== false) {
+            obj.continuous = message.continuous;
         }
-        if (message.currentPage !== 0) {
-            obj.current_page = Math.round(message.currentPage);
+        if (message.blindFilter !== false) {
+            obj.blind_filter = message.blindFilter;
         }
-        if (message.lastPage !== 0) {
-            obj.last_page = Math.round(message.lastPage);
+        if (message.notify !== undefined) {
+            obj.notify = exports.AlertNotify.toJSON(message.notify);
         }
-        if (message.perPage !== 0) {
-            obj.per_page = Math.round(message.perPage);
+        if (message.triggerGate !== 0) {
+            obj.trigger_gate = triggerGateToJSON(message.triggerGate);
         }
-        if ((_a = message.events) === null || _a === void 0 ? void 0 : _a.length) {
-            obj.events = message.events.map((e) => exports.Event.toJSON(e));
+        if ((_a = message.muteMask) === null || _a === void 0 ? void 0 : _a.length) {
+            obj.mute_mask = message.muteMask.map((e) => exports.MuteMask.toJSON(e));
+        }
+        if ((_b = message.eventModules) === null || _b === void 0 ? void 0 : _b.length) {
+            obj.event_modules = message.eventModules.map((e) => exports.EventModule.toJSON(e));
+        }
+        if ((_c = message.via) === null || _c === void 0 ? void 0 : _c.length) {
+            obj.via = message.via.map((e) => viaToJSON(e));
         }
         return obj;
     },
     create(base) {
-        return exports.EventList.fromPartial(base !== null && base !== void 0 ? base : {});
+        return exports.EventData.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
-        var _a, _b, _c, _d, _e;
-        const message = createBaseEventList();
-        message.total = (_a = object.total) !== null && _a !== void 0 ? _a : 0;
-        message.currentPage = (_b = object.currentPage) !== null && _b !== void 0 ? _b : 0;
-        message.lastPage = (_c = object.lastPage) !== null && _c !== void 0 ? _c : 0;
-        message.perPage = (_d = object.perPage) !== null && _d !== void 0 ? _d : 0;
-        message.events = ((_e = object.events) === null || _e === void 0 ? void 0 : _e.map((e) => exports.Event.fromPartial(e))) || [];
+        var _a, _b, _c, _d, _e, _f;
+        const message = createBaseEventData();
+        message.continuous = (_a = object.continuous) !== null && _a !== void 0 ? _a : false;
+        message.blindFilter = (_b = object.blindFilter) !== null && _b !== void 0 ? _b : false;
+        message.notify = (object.notify !== undefined && object.notify !== null)
+            ? exports.AlertNotify.fromPartial(object.notify)
+            : undefined;
+        message.triggerGate = (_c = object.triggerGate) !== null && _c !== void 0 ? _c : 0;
+        message.muteMask = ((_d = object.muteMask) === null || _d === void 0 ? void 0 : _d.map((e) => exports.MuteMask.fromPartial(e))) || [];
+        message.eventModules = ((_e = object.eventModules) === null || _e === void 0 ? void 0 : _e.map((e) => exports.EventModule.fromPartial(e))) || [];
+        message.via = ((_f = object.via) === null || _f === void 0 ? void 0 : _f.map((e) => e)) || [];
         return message;
     },
 };
-function createBaseEventTemplate() {
-    return {
-        id: long_1.default.UZERO,
-        organizationId: undefined,
-        createdBy: undefined,
-        name: "",
-        eventData: undefined,
-        createdAt: undefined,
-        updatedAt: undefined,
-    };
+function createBaseMuteMask() {
+    return { dayOfMonth: undefined, dayOfWeek: undefined, fromSeconds: undefined, toSeconds: undefined };
 }
-exports.EventTemplate = {
+exports.MuteMask = {
     encode(message, writer = new wire_1.BinaryWriter()) {
-        if (!message.id.equals(long_1.default.UZERO)) {
-            writer.uint32(8).uint64(message.id.toString());
-        }
-        if (message.organizationId !== undefined) {
-            writer.uint32(16).uint64(message.organizationId.toString());
-        }
-        if (message.createdBy !== undefined) {
-            writer.uint32(24).uint64(message.createdBy.toString());
-        }
-        if (message.name !== "") {
-            writer.uint32(34).string(message.name);
+        if (message.dayOfMonth !== undefined) {
+            writer.uint32(8).uint32(message.dayOfMonth);
         }
-        if (message.eventData !== undefined) {
-            exports.EventData.encode(message.eventData, writer.uint32(42).fork()).join();
+        if (message.dayOfWeek !== undefined) {
+            writer.uint32(16).uint32(message.dayOfWeek);
         }
-        if (message.createdAt !== undefined) {
-            timestamp_1.Timestamp.encode(toTimestamp(message.createdAt), writer.uint32(50).fork()).join();
+        if (message.fromSeconds !== undefined) {
+            writer.uint32(24).uint32(message.fromSeconds);
         }
-        if (message.updatedAt !== undefined) {
-            timestamp_1.Timestamp.encode(toTimestamp(message.updatedAt), writer.uint32(58).fork()).join();
+        if (message.toSeconds !== undefined) {
+            writer.uint32(32).uint32(message.toSeconds);
         }
         return writer;
     },
     decode(input, length) {
         const reader = input instanceof wire_1.BinaryReader ? input : new wire_1.BinaryReader(input);
         const end = length === undefined ? reader.len : reader.pos + length;
-        const message = createBaseEventTemplate();
+        const message = createBaseMuteMask();
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
@@ -2755,49 +2825,28 @@ exports.EventTemplate = {
                     if (tag !== 8) {
                         break;
                     }
-                    message.id = long_1.default.fromString(reader.uint64().toString(), true);
+                    message.dayOfMonth = reader.uint32();
                     continue;
                 }
                 case 2: {
                     if (tag !== 16) {
                         break;
                     }
-                    message.organizationId = long_1.default.fromString(reader.uint64().toString(), true);
+                    message.dayOfWeek = reader.uint32();
                     continue;
                 }
                 case 3: {
                     if (tag !== 24) {
                         break;
                     }
-                    message.createdBy = long_1.default.fromString(reader.uint64().toString(), true);
+                    message.fromSeconds = reader.uint32();
                     continue;
                 }
                 case 4: {
-                    if (tag !== 34) {
-                        break;
-                    }
-                    message.name = reader.string();
-                    continue;
-                }
-                case 5: {
-                    if (tag !== 42) {
-                        break;
-                    }
-                    message.eventData = exports.EventData.decode(reader, reader.uint32());
-                    continue;
-                }
-                case 6: {
-                    if (tag !== 50) {
-                        break;
-                    }
-                    message.createdAt = fromTimestamp(timestamp_1.Timestamp.decode(reader, reader.uint32()));
-                    continue;
-                }
-                case 7: {
-                    if (tag !== 58) {
+                    if (tag !== 32) {
                         break;
                     }
-                    message.updatedAt = fromTimestamp(timestamp_1.Timestamp.decode(reader, reader.uint32()));
+                    message.toSeconds = reader.uint32();
                     continue;
                 }
             }
@@ -2810,162 +2859,188 @@ exports.EventTemplate = {
     },
     fromJSON(object) {
         return {
-            id: isSet(object.id) ? long_1.default.fromValue(object.id) : long_1.default.UZERO,
-            organizationId: isSet(object.organization_id) ? long_1.default.fromValue(object.organization_id) : undefined,
-            createdBy: isSet(object.created_by) ? long_1.default.fromValue(object.created_by) : undefined,
-            name: isSet(object.name) ? globalThis.String(object.name) : "",
-            eventData: isSet(object.event_data) ? exports.EventData.fromJSON(object.event_data) : undefined,
-            createdAt: isSet(object.created_at) ? fromJsonTimestamp(object.created_at) : undefined,
-            updatedAt: isSet(object.updated_at) ? fromJsonTimestamp(object.updated_at) : undefined,
+            dayOfMonth: isSet(object.day_of_month) ? globalThis.Number(object.day_of_month) : undefined,
+            dayOfWeek: isSet(object.day_of_week) ? globalThis.Number(object.day_of_week) : undefined,
+            fromSeconds: isSet(object.from_minute) ? globalThis.Number(object.from_minute) : undefined,
+            toSeconds: isSet(object.to_minute) ? globalThis.Number(object.to_minute) : undefined,
         };
     },
     toJSON(message) {
         const obj = {};
-        if (!message.id.equals(long_1.default.UZERO)) {
-            obj.id = (message.id || long_1.default.UZERO).toString();
-        }
-        if (message.organizationId !== undefined) {
-            obj.organization_id = (message.organizationId || long_1.default.UZERO).toString();
-        }
-        if (message.createdBy !== undefined) {
-            obj.created_by = (message.createdBy || long_1.default.UZERO).toString();
-        }
-        if (message.name !== "") {
-            obj.name = message.name;
+        if (message.dayOfMonth !== undefined) {
+            obj.day_of_month = Math.round(message.dayOfMonth);
         }
-        if (message.eventData !== undefined) {
-            obj.event_data = exports.EventData.toJSON(message.eventData);
+        if (message.dayOfWeek !== undefined) {
+            obj.day_of_week = Math.round(message.dayOfWeek);
         }
-        if (message.createdAt !== undefined) {
-            obj.created_at = message.createdAt.toISOString();
+        if (message.fromSeconds !== undefined) {
+            obj.from_minute = Math.round(message.fromSeconds);
         }
-        if (message.updatedAt !== undefined) {
-            obj.updated_at = message.updatedAt.toISOString();
+        if (message.toSeconds !== undefined) {
+            obj.to_minute = Math.round(message.toSeconds);
         }
         return obj;
     },
     create(base) {
-        return exports.EventTemplate.fromPartial(base !== null && base !== void 0 ? base : {});
+        return exports.MuteMask.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
-        var _a, _b, _c;
-        const message = createBaseEventTemplate();
-        message.id = (object.id !== undefined && object.id !== null) ? long_1.default.fromValue(object.id) : long_1.default.UZERO;
-        message.organizationId = (object.organizationId !== undefined && object.organizationId !== null)
-            ? long_1.default.fromValue(object.organizationId)
-            : undefined;
-        message.createdBy = (object.createdBy !== undefined && object.createdBy !== null)
-            ? long_1.default.fromValue(object.createdBy)
-            : undefined;
-        message.name = (_a = object.name) !== null && _a !== void 0 ? _a : "";
-        message.eventData = (object.eventData !== undefined && object.eventData !== null)
-            ? exports.EventData.fromPartial(object.eventData)
-            : undefined;
-        message.createdAt = (_b = object.createdAt) !== null && _b !== void 0 ? _b : undefined;
-        message.updatedAt = (_c = object.updatedAt) !== null && _c !== void 0 ? _c : undefined;
+        var _a, _b, _c, _d;
+        const message = createBaseMuteMask();
+        message.dayOfMonth = (_a = object.dayOfMonth) !== null && _a !== void 0 ? _a : undefined;
+        message.dayOfWeek = (_b = object.dayOfWeek) !== null && _b !== void 0 ? _b : undefined;
+        message.fromSeconds = (_c = object.fromSeconds) !== null && _c !== void 0 ? _c : undefined;
+        message.toSeconds = (_d = object.toSeconds) !== null && _d !== void 0 ? _d : undefined;
         return message;
     },
 };
-function createBaseEventData() {
-    return {
-        continuous: false,
-        blindFilter: false,
-        notify: undefined,
-        triggerGate: 0,
-        muteMask: [],
-        eventModules: [],
-        via: [],
-    };
+function createBaseAlertNotify() {
+    return { title: "", body: undefined, sound: undefined, image: undefined, icon: undefined };
 }
-exports.EventData = {
+exports.AlertNotify = {
     encode(message, writer = new wire_1.BinaryWriter()) {
-        if (message.continuous !== false) {
-            writer.uint32(8).bool(message.continuous);
-        }
-        if (message.blindFilter !== false) {
-            writer.uint32(16).bool(message.blindFilter);
-        }
-        if (message.notify !== undefined) {
-            exports.AlertNotify.encode(message.notify, writer.uint32(26).fork()).join();
+        if (message.title !== "") {
+            writer.uint32(10).string(message.title);
         }
-        if (message.triggerGate !== 0) {
-            writer.uint32(32).int32(message.triggerGate);
+        if (message.body !== undefined) {
+            writer.uint32(18).string(message.body);
         }
-        for (const v of message.muteMask) {
-            exports.MuteMask.encode(v, writer.uint32(42).fork()).join();
+        if (message.sound !== undefined) {
+            writer.uint32(24).uint64(message.sound.toString());
         }
-        for (const v of message.eventModules) {
-            exports.EventModule.encode(v, writer.uint32(50).fork()).join();
+        if (message.image !== undefined) {
+            writer.uint32(34).string(message.image);
         }
-        writer.uint32(58).fork();
-        for (const v of message.via) {
-            writer.int32(v);
+        if (message.icon !== undefined) {
+            writer.uint32(42).string(message.icon);
         }
-        writer.join();
         return writer;
     },
     decode(input, length) {
         const reader = input instanceof wire_1.BinaryReader ? input : new wire_1.BinaryReader(input);
         const end = length === undefined ? reader.len : reader.pos + length;
-        const message = createBaseEventData();
+        const message = createBaseAlertNotify();
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1: {
-                    if (tag !== 8) {
+                    if (tag !== 10) {
                         break;
                     }
-                    message.continuous = reader.bool();
+                    message.title = reader.string();
                     continue;
                 }
                 case 2: {
-                    if (tag !== 16) {
+                    if (tag !== 18) {
                         break;
                     }
-                    message.blindFilter = reader.bool();
+                    message.body = reader.string();
                     continue;
                 }
                 case 3: {
-                    if (tag !== 26) {
+                    if (tag !== 24) {
                         break;
                     }
-                    message.notify = exports.AlertNotify.decode(reader, reader.uint32());
+                    message.sound = long_1.default.fromString(reader.uint64().toString(), true);
                     continue;
                 }
                 case 4: {
-                    if (tag !== 32) {
+                    if (tag !== 34) {
                         break;
                     }
-                    message.triggerGate = reader.int32();
+                    message.image = reader.string();
                     continue;
                 }
                 case 5: {
                     if (tag !== 42) {
                         break;
                     }
-                    message.muteMask.push(exports.MuteMask.decode(reader, reader.uint32()));
+                    message.icon = reader.string();
                     continue;
                 }
-                case 6: {
-                    if (tag !== 50) {
+            }
+            if ((tag & 7) === 4 || tag === 0) {
+                break;
+            }
+            reader.skip(tag & 7);
+        }
+        return message;
+    },
+    fromJSON(object) {
+        return {
+            title: isSet(object.title) ? globalThis.String(object.title) : "",
+            body: isSet(object.body) ? globalThis.String(object.body) : undefined,
+            sound: isSet(object.sound) ? long_1.default.fromValue(object.sound) : undefined,
+            image: isSet(object.image) ? globalThis.String(object.image) : undefined,
+            icon: isSet(object.icon) ? globalThis.String(object.icon) : undefined,
+        };
+    },
+    toJSON(message) {
+        const obj = {};
+        if (message.title !== "") {
+            obj.title = message.title;
+        }
+        if (message.body !== undefined) {
+            obj.body = message.body;
+        }
+        if (message.sound !== undefined) {
+            obj.sound = (message.sound || long_1.default.UZERO).toString();
+        }
+        if (message.image !== undefined) {
+            obj.image = message.image;
+        }
+        if (message.icon !== undefined) {
+            obj.icon = message.icon;
+        }
+        return obj;
+    },
+    create(base) {
+        return exports.AlertNotify.fromPartial(base !== null && base !== void 0 ? base : {});
+    },
+    fromPartial(object) {
+        var _a, _b, _c, _d;
+        const message = createBaseAlertNotify();
+        message.title = (_a = object.title) !== null && _a !== void 0 ? _a : "";
+        message.body = (_b = object.body) !== null && _b !== void 0 ? _b : undefined;
+        message.sound = (object.sound !== undefined && object.sound !== null) ? long_1.default.fromValue(object.sound) : undefined;
+        message.image = (_c = object.image) !== null && _c !== void 0 ? _c : undefined;
+        message.icon = (_d = object.icon) !== null && _d !== void 0 ? _d : undefined;
+        return message;
+    },
+};
+function createBaseAreaEvent() {
+    return { areaId: long_1.default.UZERO, eventType: 0 };
+}
+exports.AreaEvent = {
+    encode(message, writer = new wire_1.BinaryWriter()) {
+        if (!message.areaId.equals(long_1.default.UZERO)) {
+            writer.uint32(8).uint64(message.areaId.toString());
+        }
+        if (message.eventType !== 0) {
+            writer.uint32(16).int32(message.eventType);
+        }
+        return writer;
+    },
+    decode(input, length) {
+        const reader = input instanceof wire_1.BinaryReader ? input : new wire_1.BinaryReader(input);
+        const end = length === undefined ? reader.len : reader.pos + length;
+        const message = createBaseAreaEvent();
+        while (reader.pos < end) {
+            const tag = reader.uint32();
+            switch (tag >>> 3) {
+                case 1: {
+                    if (tag !== 8) {
                         break;
                     }
-                    message.eventModules.push(exports.EventModule.decode(reader, reader.uint32()));
+                    message.areaId = long_1.default.fromString(reader.uint64().toString(), true);
                     continue;
                 }
-                case 7: {
-                    if (tag === 56) {
-                        message.via.push(reader.int32());
-                        continue;
-                    }
-                    if (tag === 58) {
-                        const end2 = reader.uint32() + reader.pos;
-                        while (reader.pos < end2) {
-                            message.via.push(reader.int32());
-                        }
-                        continue;
+                case 2: {
+                    if (tag !== 16) {
+                        break;
                     }
-                    break;
+                    message.eventType = reader.int32();
+                    continue;
                 }
             }
             if ((tag & 7) === 4 || tag === 0) {
@@ -2977,115 +3052,154 @@ exports.EventData = {
     },
     fromJSON(object) {
         return {
-            continuous: isSet(object.continuous) ? globalThis.Boolean(object.continuous) : false,
-            blindFilter: isSet(object.blind_filter) ? globalThis.Boolean(object.blind_filter) : false,
-            notify: isSet(object.notify) ? exports.AlertNotify.fromJSON(object.notify) : undefined,
-            triggerGate: isSet(object.trigger_gate) ? triggerGateFromJSON(object.trigger_gate) : 0,
-            muteMask: globalThis.Array.isArray(object === null || object === void 0 ? void 0 : object.mute_mask)
-                ? object.mute_mask.map((e) => exports.MuteMask.fromJSON(e))
-                : [],
-            eventModules: globalThis.Array.isArray(object === null || object === void 0 ? void 0 : object.event_modules)
-                ? object.event_modules.map((e) => exports.EventModule.fromJSON(e))
-                : [],
-            via: globalThis.Array.isArray(object === null || object === void 0 ? void 0 : object.via) ? object.via.map((e) => viaFromJSON(e)) : [],
+            areaId: isSet(object.area_id) ? long_1.default.fromValue(object.area_id) : long_1.default.UZERO,
+            eventType: isSet(object.event_type) ? areaEventTypeFromJSON(object.event_type) : 0,
+        };
+    },
+    toJSON(message) {
+        const obj = {};
+        if (!message.areaId.equals(long_1.default.UZERO)) {
+            obj.area_id = (message.areaId || long_1.default.UZERO).toString();
+        }
+        if (message.eventType !== 0) {
+            obj.event_type = areaEventTypeToJSON(message.eventType);
+        }
+        return obj;
+    },
+    create(base) {
+        return exports.AreaEvent.fromPartial(base !== null && base !== void 0 ? base : {});
+    },
+    fromPartial(object) {
+        var _a;
+        const message = createBaseAreaEvent();
+        message.areaId = (object.areaId !== undefined && object.areaId !== null)
+            ? long_1.default.fromValue(object.areaId)
+            : long_1.default.UZERO;
+        message.eventType = (_a = object.eventType) !== null && _a !== void 0 ? _a : 0;
+        return message;
+    },
+};
+function createBaseDigitalEvent() {
+    return { trigger: false, io: "" };
+}
+exports.DigitalEvent = {
+    encode(message, writer = new wire_1.BinaryWriter()) {
+        if (message.trigger !== false) {
+            writer.uint32(8).bool(message.trigger);
+        }
+        if (message.io !== "") {
+            writer.uint32(18).string(message.io);
+        }
+        return writer;
+    },
+    decode(input, length) {
+        const reader = input instanceof wire_1.BinaryReader ? input : new wire_1.BinaryReader(input);
+        const end = length === undefined ? reader.len : reader.pos + length;
+        const message = createBaseDigitalEvent();
+        while (reader.pos < end) {
+            const tag = reader.uint32();
+            switch (tag >>> 3) {
+                case 1: {
+                    if (tag !== 8) {
+                        break;
+                    }
+                    message.trigger = reader.bool();
+                    continue;
+                }
+                case 2: {
+                    if (tag !== 18) {
+                        break;
+                    }
+                    message.io = reader.string();
+                    continue;
+                }
+            }
+            if ((tag & 7) === 4 || tag === 0) {
+                break;
+            }
+            reader.skip(tag & 7);
+        }
+        return message;
+    },
+    fromJSON(object) {
+        return {
+            trigger: isSet(object.trigger) ? globalThis.Boolean(object.trigger) : false,
+            io: isSet(object.io) ? globalThis.String(object.io) : "",
         };
     },
     toJSON(message) {
-        var _a, _b, _c;
         const obj = {};
-        if (message.continuous !== false) {
-            obj.continuous = message.continuous;
-        }
-        if (message.blindFilter !== false) {
-            obj.blind_filter = message.blindFilter;
-        }
-        if (message.notify !== undefined) {
-            obj.notify = exports.AlertNotify.toJSON(message.notify);
-        }
-        if (message.triggerGate !== 0) {
-            obj.trigger_gate = triggerGateToJSON(message.triggerGate);
-        }
-        if ((_a = message.muteMask) === null || _a === void 0 ? void 0 : _a.length) {
-            obj.mute_mask = message.muteMask.map((e) => exports.MuteMask.toJSON(e));
-        }
-        if ((_b = message.eventModules) === null || _b === void 0 ? void 0 : _b.length) {
-            obj.event_modules = message.eventModules.map((e) => exports.EventModule.toJSON(e));
+        if (message.trigger !== false) {
+            obj.trigger = message.trigger;
         }
-        if ((_c = message.via) === null || _c === void 0 ? void 0 : _c.length) {
-            obj.via = message.via.map((e) => viaToJSON(e));
+        if (message.io !== "") {
+            obj.io = message.io;
         }
         return obj;
     },
     create(base) {
-        return exports.EventData.fromPartial(base !== null && base !== void 0 ? base : {});
+        return exports.DigitalEvent.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
-        var _a, _b, _c, _d, _e, _f;
-        const message = createBaseEventData();
-        message.continuous = (_a = object.continuous) !== null && _a !== void 0 ? _a : false;
-        message.blindFilter = (_b = object.blindFilter) !== null && _b !== void 0 ? _b : false;
-        message.notify = (object.notify !== undefined && object.notify !== null)
-            ? exports.AlertNotify.fromPartial(object.notify)
-            : undefined;
-        message.triggerGate = (_c = object.triggerGate) !== null && _c !== void 0 ? _c : 0;
-        message.muteMask = ((_d = object.muteMask) === null || _d === void 0 ? void 0 : _d.map((e) => exports.MuteMask.fromPartial(e))) || [];
-        message.eventModules = ((_e = object.eventModules) === null || _e === void 0 ? void 0 : _e.map((e) => exports.EventModule.fromPartial(e))) || [];
-        message.via = ((_f = object.via) === null || _f === void 0 ? void 0 : _f.map((e) => e)) || [];
+        var _a, _b;
+        const message = createBaseDigitalEvent();
+        message.trigger = (_a = object.trigger) !== null && _a !== void 0 ? _a : false;
+        message.io = (_b = object.io) !== null && _b !== void 0 ? _b : "";
         return message;
     },
 };
-function createBaseMuteMask() {
-    return { dayOfMonth: undefined, dayOfWeek: undefined, fromSeconds: undefined, toSeconds: undefined };
+function createBaseAnalogEvent() {
+    return { value: 0, io: "", type: 0, tolerancePercent: undefined };
 }
-exports.MuteMask = {
+exports.AnalogEvent = {
     encode(message, writer = new wire_1.BinaryWriter()) {
-        if (message.dayOfMonth !== undefined) {
-            writer.uint32(8).uint32(message.dayOfMonth);
+        if (message.value !== 0) {
+            writer.uint32(9).double(message.value);
         }
-        if (message.dayOfWeek !== undefined) {
-            writer.uint32(16).uint32(message.dayOfWeek);
+        if (message.io !== "") {
+            writer.uint32(18).string(message.io);
         }
-        if (message.fromSeconds !== undefined) {
-            writer.uint32(24).uint32(message.fromSeconds);
+        if (message.type !== 0) {
+            writer.uint32(24).int32(message.type);
         }
-        if (message.toSeconds !== undefined) {
-            writer.uint32(32).uint32(message.toSeconds);
+        if (message.tolerancePercent !== undefined) {
+            writer.uint32(32).uint32(message.tolerancePercent);
         }
         return writer;
     },
     decode(input, length) {
         const reader = input instanceof wire_1.BinaryReader ? input : new wire_1.BinaryReader(input);
         const end = length === undefined ? reader.len : reader.pos + length;
-        const message = createBaseMuteMask();
+        const message = createBaseAnalogEvent();
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1: {
-                    if (tag !== 8) {
+                    if (tag !== 9) {
                         break;
                     }
-                    message.dayOfMonth = reader.uint32();
+                    message.value = reader.double();
                     continue;
                 }
                 case 2: {
-                    if (tag !== 16) {
+                    if (tag !== 18) {
                         break;
                     }
-                    message.dayOfWeek = reader.uint32();
+                    message.io = reader.string();
                     continue;
                 }
                 case 3: {
                     if (tag !== 24) {
                         break;
                     }
-                    message.fromSeconds = reader.uint32();
+                    message.type = reader.int32();
                     continue;
                 }
                 case 4: {
                     if (tag !== 32) {
                         break;
                     }
-                    message.toSeconds = reader.uint32();
+                    message.tolerancePercent = reader.uint32();
                     continue;
                 }
             }
@@ -3098,67 +3212,55 @@ exports.MuteMask = {
     },
     fromJSON(object) {
         return {
-            dayOfMonth: isSet(object.day_of_month) ? globalThis.Number(object.day_of_month) : undefined,
-            dayOfWeek: isSet(object.day_of_week) ? globalThis.Number(object.day_of_week) : undefined,
-            fromSeconds: isSet(object.from_minute) ? globalThis.Number(object.from_minute) : undefined,
-            toSeconds: isSet(object.to_minute) ? globalThis.Number(object.to_minute) : undefined,
+            value: isSet(object.value) ? globalThis.Number(object.value) : 0,
+            io: isSet(object.io) ? globalThis.String(object.io) : "",
+            type: isSet(object.type) ? analogEventTypeFromJSON(object.type) : 0,
+            tolerancePercent: isSet(object.tolerance_percent) ? globalThis.Number(object.tolerance_percent) : undefined,
         };
     },
     toJSON(message) {
         const obj = {};
-        if (message.dayOfMonth !== undefined) {
-            obj.day_of_month = Math.round(message.dayOfMonth);
+        if (message.value !== 0) {
+            obj.value = message.value;
         }
-        if (message.dayOfWeek !== undefined) {
-            obj.day_of_week = Math.round(message.dayOfWeek);
+        if (message.io !== "") {
+            obj.io = message.io;
         }
-        if (message.fromSeconds !== undefined) {
-            obj.from_minute = Math.round(message.fromSeconds);
+        if (message.type !== 0) {
+            obj.type = analogEventTypeToJSON(message.type);
         }
-        if (message.toSeconds !== undefined) {
-            obj.to_minute = Math.round(message.toSeconds);
+        if (message.tolerancePercent !== undefined) {
+            obj.tolerance_percent = Math.round(message.tolerancePercent);
         }
         return obj;
     },
     create(base) {
-        return exports.MuteMask.fromPartial(base !== null && base !== void 0 ? base : {});
+        return exports.AnalogEvent.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
         var _a, _b, _c, _d;
-        const message = createBaseMuteMask();
-        message.dayOfMonth = (_a = object.dayOfMonth) !== null && _a !== void 0 ? _a : undefined;
-        message.dayOfWeek = (_b = object.dayOfWeek) !== null && _b !== void 0 ? _b : undefined;
-        message.fromSeconds = (_c = object.fromSeconds) !== null && _c !== void 0 ? _c : undefined;
-        message.toSeconds = (_d = object.toSeconds) !== null && _d !== void 0 ? _d : undefined;
+        const message = createBaseAnalogEvent();
+        message.value = (_a = object.value) !== null && _a !== void 0 ? _a : 0;
+        message.io = (_b = object.io) !== null && _b !== void 0 ? _b : "";
+        message.type = (_c = object.type) !== null && _c !== void 0 ? _c : 0;
+        message.tolerancePercent = (_d = object.tolerancePercent) !== null && _d !== void 0 ? _d : undefined;
         return message;
     },
 };
-function createBaseAlertNotify() {
-    return { title: "", body: undefined, sound: undefined, image: undefined, icon: undefined };
+function createBaseFormulaEvent() {
+    return { formula: "" };
 }
-exports.AlertNotify = {
+exports.FormulaEvent = {
     encode(message, writer = new wire_1.BinaryWriter()) {
-        if (message.title !== "") {
-            writer.uint32(10).string(message.title);
-        }
-        if (message.body !== undefined) {
-            writer.uint32(18).string(message.body);
-        }
-        if (message.sound !== undefined) {
-            writer.uint32(24).uint64(message.sound.toString());
-        }
-        if (message.image !== undefined) {
-            writer.uint32(34).string(message.image);
-        }
-        if (message.icon !== undefined) {
-            writer.uint32(42).string(message.icon);
+        if (message.formula !== "") {
+            writer.uint32(10).string(message.formula);
         }
         return writer;
     },
     decode(input, length) {
         const reader = input instanceof wire_1.BinaryReader ? input : new wire_1.BinaryReader(input);
         const end = length === undefined ? reader.len : reader.pos + length;
-        const message = createBaseAlertNotify();
+        const message = createBaseFormulaEvent();
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
@@ -3166,35 +3268,7 @@ exports.AlertNotify = {
                     if (tag !== 10) {
                         break;
                     }
-                    message.title = reader.string();
-                    continue;
-                }
-                case 2: {
-                    if (tag !== 18) {
-                        break;
-                    }
-                    message.body = reader.string();
-                    continue;
-                }
-                case 3: {
-                    if (tag !== 24) {
-                        break;
-                    }
-                    message.sound = long_1.default.fromString(reader.uint64().toString(), true);
-                    continue;
-                }
-                case 4: {
-                    if (tag !== 34) {
-                        break;
-                    }
-                    message.image = reader.string();
-                    continue;
-                }
-                case 5: {
-                    if (tag !== 42) {
-                        break;
-                    }
-                    message.icon = reader.string();
+                    message.formula = reader.string();
                     continue;
                 }
             }
@@ -3206,44 +3280,22 @@ exports.AlertNotify = {
         return message;
     },
     fromJSON(object) {
-        return {
-            title: isSet(object.title) ? globalThis.String(object.title) : "",
-            body: isSet(object.body) ? globalThis.String(object.body) : undefined,
-            sound: isSet(object.sound) ? long_1.default.fromValue(object.sound) : undefined,
-            image: isSet(object.image) ? globalThis.String(object.image) : undefined,
-            icon: isSet(object.icon) ? globalThis.String(object.icon) : undefined,
-        };
+        return { formula: isSet(object.formula) ? globalThis.String(object.formula) : "" };
     },
     toJSON(message) {
         const obj = {};
-        if (message.title !== "") {
-            obj.title = message.title;
-        }
-        if (message.body !== undefined) {
-            obj.body = message.body;
-        }
-        if (message.sound !== undefined) {
-            obj.sound = (message.sound || long_1.default.UZERO).toString();
-        }
-        if (message.image !== undefined) {
-            obj.image = message.image;
-        }
-        if (message.icon !== undefined) {
-            obj.icon = message.icon;
+        if (message.formula !== "") {
+            obj.formula = message.formula;
         }
         return obj;
     },
     create(base) {
-        return exports.AlertNotify.fromPartial(base !== null && base !== void 0 ? base : {});
+        return exports.FormulaEvent.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
-        var _a, _b, _c, _d;
-        const message = createBaseAlertNotify();
-        message.title = (_a = object.title) !== null && _a !== void 0 ? _a : "";
-        message.body = (_b = object.body) !== null && _b !== void 0 ? _b : undefined;
-        message.sound = (object.sound !== undefined && object.sound !== null) ? long_1.default.fromValue(object.sound) : undefined;
-        message.image = (_c = object.image) !== null && _c !== void 0 ? _c : undefined;
-        message.icon = (_d = object.icon) !== null && _d !== void 0 ? _d : undefined;
+        var _a;
+        const message = createBaseFormulaEvent();
+        message.formula = (_a = object.formula) !== null && _a !== void 0 ? _a : "";
         return message;
     },
 };
@@ -3636,6 +3688,12 @@ function createBaseEventModule() {
         analogEvent: undefined,
         formulaEvent: undefined,
         protocolEvent: undefined,
+        speedEvent: undefined,
+        ignitionEvent: undefined,
+        batteryEvent: undefined,
+        offlineEvent: undefined,
+        gpsEvent: undefined,
+        gsmEvent: undefined,
     };
 }
 exports.EventModule = {
@@ -3655,6 +3713,24 @@ exports.EventModule = {
         if (message.protocolEvent !== undefined) {
             exports.ProtocolEvent.encode(message.protocolEvent, writer.uint32(202).fork()).join();
         }
+        if (message.speedEvent !== undefined) {
+            exports.SpeedEvent.encode(message.speedEvent, writer.uint32(210).fork()).join();
+        }
+        if (message.ignitionEvent !== undefined) {
+            exports.IgnitionEvent.encode(message.ignitionEvent, writer.uint32(218).fork()).join();
+        }
+        if (message.batteryEvent !== undefined) {
+            exports.BatteryEvent.encode(message.batteryEvent, writer.uint32(226).fork()).join();
+        }
+        if (message.offlineEvent !== undefined) {
+            exports.OfflineEvent.encode(message.offlineEvent, writer.uint32(234).fork()).join();
+        }
+        if (message.gpsEvent !== undefined) {
+            exports.GpsEvent.encode(message.gpsEvent, writer.uint32(242).fork()).join();
+        }
+        if (message.gsmEvent !== undefined) {
+            exports.GsmEvent.encode(message.gsmEvent, writer.uint32(250).fork()).join();
+        }
         return writer;
     },
     decode(input, length) {
@@ -3699,6 +3775,48 @@ exports.EventModule = {
                     message.protocolEvent = exports.ProtocolEvent.decode(reader, reader.uint32());
                     continue;
                 }
+                case 26: {
+                    if (tag !== 210) {
+                        break;
+                    }
+                    message.speedEvent = exports.SpeedEvent.decode(reader, reader.uint32());
+                    continue;
+                }
+                case 27: {
+                    if (tag !== 218) {
+                        break;
+                    }
+                    message.ignitionEvent = exports.IgnitionEvent.decode(reader, reader.uint32());
+                    continue;
+                }
+                case 28: {
+                    if (tag !== 226) {
+                        break;
+                    }
+                    message.batteryEvent = exports.BatteryEvent.decode(reader, reader.uint32());
+                    continue;
+                }
+                case 29: {
+                    if (tag !== 234) {
+                        break;
+                    }
+                    message.offlineEvent = exports.OfflineEvent.decode(reader, reader.uint32());
+                    continue;
+                }
+                case 30: {
+                    if (tag !== 242) {
+                        break;
+                    }
+                    message.gpsEvent = exports.GpsEvent.decode(reader, reader.uint32());
+                    continue;
+                }
+                case 31: {
+                    if (tag !== 250) {
+                        break;
+                    }
+                    message.gsmEvent = exports.GsmEvent.decode(reader, reader.uint32());
+                    continue;
+                }
             }
             if ((tag & 7) === 4 || tag === 0) {
                 break;
@@ -3714,6 +3832,12 @@ exports.EventModule = {
             analogEvent: isSet(object.analogEvent) ? exports.AnalogEvent.fromJSON(object.analogEvent) : undefined,
             formulaEvent: isSet(object.formulaEvent) ? exports.FormulaEvent.fromJSON(object.formulaEvent) : undefined,
             protocolEvent: isSet(object.protocolEvent) ? exports.ProtocolEvent.fromJSON(object.protocolEvent) : undefined,
+            speedEvent: isSet(object.speedEvent) ? exports.SpeedEvent.fromJSON(object.speedEvent) : undefined,
+            ignitionEvent: isSet(object.ignitionEvent) ? exports.IgnitionEvent.fromJSON(object.ignitionEvent) : undefined,
+            batteryEvent: isSet(object.batteryEvent) ? exports.BatteryEvent.fromJSON(object.batteryEvent) : undefined,
+            offlineEvent: isSet(object.offlineEvent) ? exports.OfflineEvent.fromJSON(object.offlineEvent) : undefined,
+            gpsEvent: isSet(object.gpsEvent) ? exports.GpsEvent.fromJSON(object.gpsEvent) : undefined,
+            gsmEvent: isSet(object.gsmEvent) ? exports.GsmEvent.fromJSON(object.gsmEvent) : undefined,
         };
     },
     toJSON(message) {
@@ -3733,6 +3857,24 @@ exports.EventModule = {
         if (message.protocolEvent !== undefined) {
             obj.protocolEvent = exports.ProtocolEvent.toJSON(message.protocolEvent);
         }
+        if (message.speedEvent !== undefined) {
+            obj.speedEvent = exports.SpeedEvent.toJSON(message.speedEvent);
+        }
+        if (message.ignitionEvent !== undefined) {
+            obj.ignitionEvent = exports.IgnitionEvent.toJSON(message.ignitionEvent);
+        }
+        if (message.batteryEvent !== undefined) {
+            obj.batteryEvent = exports.BatteryEvent.toJSON(message.batteryEvent);
+        }
+        if (message.offlineEvent !== undefined) {
+            obj.offlineEvent = exports.OfflineEvent.toJSON(message.offlineEvent);
+        }
+        if (message.gpsEvent !== undefined) {
+            obj.gpsEvent = exports.GpsEvent.toJSON(message.gpsEvent);
+        }
+        if (message.gsmEvent !== undefined) {
+            obj.gsmEvent = exports.GsmEvent.toJSON(message.gsmEvent);
+        }
         return obj;
     },
     create(base) {
@@ -3755,6 +3897,24 @@ exports.EventModule = {
         message.protocolEvent = (object.protocolEvent !== undefined && object.protocolEvent !== null)
             ? exports.ProtocolEvent.fromPartial(object.protocolEvent)
             : undefined;
+        message.speedEvent = (object.speedEvent !== undefined && object.speedEvent !== null)
+            ? exports.SpeedEvent.fromPartial(object.speedEvent)
+            : undefined;
+        message.ignitionEvent = (object.ignitionEvent !== undefined && object.ignitionEvent !== null)
+            ? exports.IgnitionEvent.fromPartial(object.ignitionEvent)
+            : undefined;
+        message.batteryEvent = (object.batteryEvent !== undefined && object.batteryEvent !== null)
+            ? exports.BatteryEvent.fromPartial(object.batteryEvent)
+            : undefined;
+        message.offlineEvent = (object.offlineEvent !== undefined && object.offlineEvent !== null)
+            ? exports.OfflineEvent.fromPartial(object.offlineEvent)
+            : undefined;
+        message.gpsEvent = (object.gpsEvent !== undefined && object.gpsEvent !== null)
+            ? exports.GpsEvent.fromPartial(object.gpsEvent)
+            : undefined;
+        message.gsmEvent = (object.gsmEvent !== undefined && object.gsmEvent !== null)
+            ? exports.GsmEvent.fromPartial(object.gsmEvent)
+            : undefined;
         return message;
     },
 };