@fatehan/tsrp 1.0.10 → 1.0.12

package/dist/fatehan/packets/messages.d.ts

@@ -1,36 +1,35 @@
 import { BinaryReader, BinaryWriter } from "@bufbuild/protobuf/wire";
 export declare const protobufPackage = "com.fatehan.packets";
-export declare enum MessageType {
-    None = 0,
-    DeviceCommandMessage = 1,
-    DeviceCommandAknMessage = 2,
-    DeviceAnswerMessage = 3,
-    UNRECOGNIZED = -1
-}
-export declare function messageTypeFromJSON(object: any): MessageType;
-export declare function messageTypeToJSON(object: MessageType): string;
 export interface DeviceCommand {
-    deviceId: number;
     command: string;
-    commandId: number;
 }
 export interface DeviceCommandAkn {
-    command: DeviceCommand | undefined;
-    status: number;
-    message: string;
+    status: DeviceCommandAkn_Status;
+    code?: number | undefined;
+    message?: string | undefined;
 }
+export declare enum DeviceCommandAkn_Status {
+    OFFLINE = 0,
+    SENT = 1,
+    ERROR = 2,
+    UNRECOGNIZED = -1
+}
+export declare function deviceCommandAkn_StatusFromJSON(object: any): DeviceCommandAkn_Status;
+export declare function deviceCommandAkn_StatusToJSON(object: DeviceCommandAkn_Status): string;
 export interface DeviceAnswer {
-    deviceId: number;
     answer: string;
 }
-export interface BrokerMessage {
-    type: MessageType;
-    message: Uint8Array;
+export interface DeviceMessage {
+    deviceId: number;
+    transactionId: number;
+    command?: DeviceCommand | undefined;
+    akn?: DeviceCommandAkn | undefined;
+    answer?: DeviceAnswer | undefined;
 }
 export declare const DeviceCommand: MessageFns<DeviceCommand>;
 export declare const DeviceCommandAkn: MessageFns<DeviceCommandAkn>;
 export declare const DeviceAnswer: MessageFns<DeviceAnswer>;
-export declare const BrokerMessage: MessageFns<BrokerMessage>;
+export declare const DeviceMessage: MessageFns<DeviceMessage>;
 type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
 export type DeepPartial<T> = T extends Builtin ? T : T extends globalThis.Array<infer U> ? globalThis.Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>> : T extends {} ? {
     [K in keyof T]?: DeepPartial<T[K]>;

package/dist/fatehan/packets/messages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../../src/fatehan/packets/messages.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../../src/fatehan/packets/messages.ts"],"names":[],"mappings":"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"}

package/dist/fatehan/packets/messages.js

@@ -5,68 +5,56 @@
 //   protoc               v3.21.12
 // source: packets/messages.proto
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BrokerMessage = exports.DeviceAnswer = exports.DeviceCommandAkn = exports.DeviceCommand = exports.MessageType = exports.protobufPackage = void 0;
-exports.messageTypeFromJSON = messageTypeFromJSON;
-exports.messageTypeToJSON = messageTypeToJSON;
+exports.DeviceMessage = exports.DeviceAnswer = exports.DeviceCommandAkn = exports.DeviceCommand = exports.DeviceCommandAkn_Status = exports.protobufPackage = void 0;
+exports.deviceCommandAkn_StatusFromJSON = deviceCommandAkn_StatusFromJSON;
+exports.deviceCommandAkn_StatusToJSON = deviceCommandAkn_StatusToJSON;
 /* eslint-disable */
 const wire_1 = require("@bufbuild/protobuf/wire");
 exports.protobufPackage = "com.fatehan.packets";
-var MessageType;
-(function (MessageType) {
-    MessageType[MessageType["None"] = 0] = "None";
-    MessageType[MessageType["DeviceCommandMessage"] = 1] = "DeviceCommandMessage";
-    MessageType[MessageType["DeviceCommandAknMessage"] = 2] = "DeviceCommandAknMessage";
-    MessageType[MessageType["DeviceAnswerMessage"] = 3] = "DeviceAnswerMessage";
-    MessageType[MessageType["UNRECOGNIZED"] = -1] = "UNRECOGNIZED";
-})(MessageType || (exports.MessageType = MessageType = {}));
-function messageTypeFromJSON(object) {
+var DeviceCommandAkn_Status;
+(function (DeviceCommandAkn_Status) {
+    DeviceCommandAkn_Status[DeviceCommandAkn_Status["OFFLINE"] = 0] = "OFFLINE";
+    DeviceCommandAkn_Status[DeviceCommandAkn_Status["SENT"] = 1] = "SENT";
+    DeviceCommandAkn_Status[DeviceCommandAkn_Status["ERROR"] = 2] = "ERROR";
+    DeviceCommandAkn_Status[DeviceCommandAkn_Status["UNRECOGNIZED"] = -1] = "UNRECOGNIZED";
+})(DeviceCommandAkn_Status || (exports.DeviceCommandAkn_Status = DeviceCommandAkn_Status = {}));
+function deviceCommandAkn_StatusFromJSON(object) {
     switch (object) {
         case 0:
-        case "None":
-            return MessageType.None;
+        case "OFFLINE":
+            return DeviceCommandAkn_Status.OFFLINE;
         case 1:
-        case "DeviceCommandMessage":
-            return MessageType.DeviceCommandMessage;
+        case "SENT":
+            return DeviceCommandAkn_Status.SENT;
         case 2:
-        case "DeviceCommandAknMessage":
-            return MessageType.DeviceCommandAknMessage;
-        case 3:
-        case "DeviceAnswerMessage":
-            return MessageType.DeviceAnswerMessage;
+        case "ERROR":
+            return DeviceCommandAkn_Status.ERROR;
         case -1:
         case "UNRECOGNIZED":
         default:
-            return MessageType.UNRECOGNIZED;
+            return DeviceCommandAkn_Status.UNRECOGNIZED;
     }
 }
-function messageTypeToJSON(object) {
+function deviceCommandAkn_StatusToJSON(object) {
     switch (object) {
-        case MessageType.None:
-            return "None";
-        case MessageType.DeviceCommandMessage:
-            return "DeviceCommandMessage";
-        case MessageType.DeviceCommandAknMessage:
-            return "DeviceCommandAknMessage";
-        case MessageType.DeviceAnswerMessage:
-            return "DeviceAnswerMessage";
-        case MessageType.UNRECOGNIZED:
+        case DeviceCommandAkn_Status.OFFLINE:
+            return "OFFLINE";
+        case DeviceCommandAkn_Status.SENT:
+            return "SENT";
+        case DeviceCommandAkn_Status.ERROR:
+            return "ERROR";
+        case DeviceCommandAkn_Status.UNRECOGNIZED:
         default:
             return "UNRECOGNIZED";
     }
 }
 function createBaseDeviceCommand() {
-    return { deviceId: 0, command: "", commandId: 0 };
+    return { command: "" };
 }
 exports.DeviceCommand = {
     encode(message, writer = new wire_1.BinaryWriter()) {
-        if (message.deviceId !== 0) {
-            writer.uint32(8).uint64(message.deviceId);
-        }
         if (message.command !== "") {
-            writer.uint32(18).string(message.command);
-        }
-        if (message.commandId !== 0) {
-            writer.uint32(24).uint64(message.commandId);
+            writer.uint32(10).string(message.command);
         }
         return writer;
     },
@@ -78,26 +66,12 @@ exports.DeviceCommand = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1: {
-                    if (tag !== 8) {
-                        break;
-                    }
-                    message.deviceId = longToNumber(reader.uint64());
-                    continue;
-                }
-                case 2: {
-                    if (tag !== 18) {
+                    if (tag !== 10) {
                         break;
                     }
                     message.command = reader.string();
                     continue;
                 }
-                case 3: {
-                    if (tag !== 24) {
-                        break;
-                    }
-                    message.commandId = longToNumber(reader.uint64());
-                    continue;
-                }
             }
             if ((tag & 7) === 4 || tag === 0) {
                 break;
@@ -107,49 +81,37 @@ exports.DeviceCommand = {
         return message;
     },
     fromJSON(object) {
-        return {
-            deviceId: isSet(object.device_id) ? globalThis.Number(object.device_id) : 0,
-            command: isSet(object.command) ? globalThis.String(object.command) : "",
-            commandId: isSet(object.command_id) ? globalThis.Number(object.command_id) : 0,
-        };
+        return { command: isSet(object.command) ? globalThis.String(object.command) : "" };
     },
     toJSON(message) {
         const obj = {};
-        if (message.deviceId !== 0) {
-            obj.device_id = Math.round(message.deviceId);
-        }
         if (message.command !== "") {
             obj.command = message.command;
         }
-        if (message.commandId !== 0) {
-            obj.command_id = Math.round(message.commandId);
-        }
         return obj;
     },
     create(base) {
         return exports.DeviceCommand.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
-        var _a, _b, _c;
+        var _a;
         const message = createBaseDeviceCommand();
-        message.deviceId = (_a = object.deviceId) !== null && _a !== void 0 ? _a : 0;
-        message.command = (_b = object.command) !== null && _b !== void 0 ? _b : "";
-        message.commandId = (_c = object.commandId) !== null && _c !== void 0 ? _c : 0;
+        message.command = (_a = object.command) !== null && _a !== void 0 ? _a : "";
         return message;
     },
 };
 function createBaseDeviceCommandAkn() {
-    return { command: undefined, status: 0, message: "" };
+    return { status: 0, code: undefined, message: undefined };
 }
 exports.DeviceCommandAkn = {
     encode(message, writer = new wire_1.BinaryWriter()) {
-        if (message.command !== undefined) {
-            exports.DeviceCommand.encode(message.command, writer.uint32(10).fork()).join();
-        }
         if (message.status !== 0) {
-            writer.uint32(16).uint32(message.status);
+            writer.uint32(8).int32(message.status);
+        }
+        if (message.code !== undefined) {
+            writer.uint32(16).sint64(message.code);
         }
-        if (message.message !== "") {
+        if (message.message !== undefined) {
             writer.uint32(26).string(message.message);
         }
         return writer;
@@ -162,17 +124,17 @@ exports.DeviceCommandAkn = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1: {
-                    if (tag !== 10) {
+                    if (tag !== 8) {
                         break;
                     }
-                    message.command = exports.DeviceCommand.decode(reader, reader.uint32());
+                    message.status = reader.int32();
                     continue;
                 }
                 case 2: {
                     if (tag !== 16) {
                         break;
                     }
-                    message.status = reader.uint32();
+                    message.code = longToNumber(reader.sint64());
                     continue;
                 }
                 case 3: {
@@ -192,20 +154,20 @@ exports.DeviceCommandAkn = {
     },
     fromJSON(object) {
         return {
-            command: isSet(object.command) ? exports.DeviceCommand.fromJSON(object.command) : undefined,
-            status: isSet(object.status) ? globalThis.Number(object.status) : 0,
-            message: isSet(object.message) ? globalThis.String(object.message) : "",
+            status: isSet(object.status) ? deviceCommandAkn_StatusFromJSON(object.status) : 0,
+            code: isSet(object.code) ? globalThis.Number(object.code) : undefined,
+            message: isSet(object.message) ? globalThis.String(object.message) : undefined,
         };
     },
     toJSON(message) {
         const obj = {};
-        if (message.command !== undefined) {
-            obj.command = exports.DeviceCommand.toJSON(message.command);
-        }
         if (message.status !== 0) {
-            obj.status = Math.round(message.status);
+            obj.status = deviceCommandAkn_StatusToJSON(message.status);
+        }
+        if (message.code !== undefined) {
+            obj.code = Math.round(message.code);
         }
-        if (message.message !== "") {
+        if (message.message !== undefined) {
             obj.message = message.message;
         }
         return obj;
@@ -214,26 +176,21 @@ exports.DeviceCommandAkn = {
         return exports.DeviceCommandAkn.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
-        var _a, _b;
+        var _a, _b, _c;
         const message = createBaseDeviceCommandAkn();
-        message.command = (object.command !== undefined && object.command !== null)
-            ? exports.DeviceCommand.fromPartial(object.command)
-            : undefined;
         message.status = (_a = object.status) !== null && _a !== void 0 ? _a : 0;
-        message.message = (_b = object.message) !== null && _b !== void 0 ? _b : "";
+        message.code = (_b = object.code) !== null && _b !== void 0 ? _b : undefined;
+        message.message = (_c = object.message) !== null && _c !== void 0 ? _c : undefined;
         return message;
     },
 };
 function createBaseDeviceAnswer() {
-    return { deviceId: 0, answer: "" };
+    return { answer: "" };
 }
 exports.DeviceAnswer = {
     encode(message, writer = new wire_1.BinaryWriter()) {
-        if (message.deviceId !== 0) {
-            writer.uint32(8).uint64(message.deviceId);
-        }
         if (message.answer !== "") {
-            writer.uint32(18).string(message.answer);
+            writer.uint32(10).string(message.answer);
         }
         return writer;
     },
@@ -245,14 +202,7 @@ exports.DeviceAnswer = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1: {
-                    if (tag !== 8) {
-                        break;
-                    }
-                    message.deviceId = longToNumber(reader.uint64());
-                    continue;
-                }
-                case 2: {
-                    if (tag !== 18) {
+                    if (tag !== 10) {
                         break;
                     }
                     message.answer = reader.string();
@@ -267,16 +217,10 @@ exports.DeviceAnswer = {
         return message;
     },
     fromJSON(object) {
-        return {
-            deviceId: isSet(object.device_id) ? globalThis.Number(object.device_id) : 0,
-            answer: isSet(object.answer) ? globalThis.String(object.answer) : "",
-        };
+        return { answer: isSet(object.answer) ? globalThis.String(object.answer) : "" };
     },
     toJSON(message) {
         const obj = {};
-        if (message.deviceId !== 0) {
-            obj.device_id = Math.round(message.deviceId);
-        }
         if (message.answer !== "") {
             obj.answer = message.answer;
         }
@@ -286,30 +230,38 @@ exports.DeviceAnswer = {
         return exports.DeviceAnswer.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
-        var _a, _b;
+        var _a;
         const message = createBaseDeviceAnswer();
-        message.deviceId = (_a = object.deviceId) !== null && _a !== void 0 ? _a : 0;
-        message.answer = (_b = object.answer) !== null && _b !== void 0 ? _b : "";
+        message.answer = (_a = object.answer) !== null && _a !== void 0 ? _a : "";
         return message;
     },
 };
-function createBaseBrokerMessage() {
-    return { type: 0, message: new Uint8Array(0) };
+function createBaseDeviceMessage() {
+    return { deviceId: 0, transactionId: 0, command: undefined, akn: undefined, answer: undefined };
 }
-exports.BrokerMessage = {
+exports.DeviceMessage = {
     encode(message, writer = new wire_1.BinaryWriter()) {
-        if (message.type !== 0) {
-            writer.uint32(8).int32(message.type);
+        if (message.deviceId !== 0) {
+            writer.uint32(8).uint64(message.deviceId);
+        }
+        if (message.transactionId !== 0) {
+            writer.uint32(16).uint64(message.transactionId);
+        }
+        if (message.command !== undefined) {
+            exports.DeviceCommand.encode(message.command, writer.uint32(26).fork()).join();
+        }
+        if (message.akn !== undefined) {
+            exports.DeviceCommandAkn.encode(message.akn, writer.uint32(34).fork()).join();
         }
-        if (message.message.length !== 0) {
-            writer.uint32(18).bytes(message.message);
+        if (message.answer !== undefined) {
+            exports.DeviceAnswer.encode(message.answer, writer.uint32(42).fork()).join();
         }
         return writer;
     },
     decode(input, length) {
         const reader = input instanceof wire_1.BinaryReader ? input : new wire_1.BinaryReader(input);
         let end = length === undefined ? reader.len : reader.pos + length;
-        const message = createBaseBrokerMessage();
+        const message = createBaseDeviceMessage();
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
@@ -317,14 +269,35 @@ exports.BrokerMessage = {
                     if (tag !== 8) {
                         break;
                     }
-                    message.type = reader.int32();
+                    message.deviceId = longToNumber(reader.uint64());
                     continue;
                 }
                 case 2: {
-                    if (tag !== 18) {
+                    if (tag !== 16) {
+                        break;
+                    }
+                    message.transactionId = longToNumber(reader.uint64());
+                    continue;
+                }
+                case 3: {
+                    if (tag !== 26) {
+                        break;
+                    }
+                    message.command = exports.DeviceCommand.decode(reader, reader.uint32());
+                    continue;
+                }
+                case 4: {
+                    if (tag !== 34) {
                         break;
                     }
-                    message.message = reader.bytes();
+                    message.akn = exports.DeviceCommandAkn.decode(reader, reader.uint32());
+                    continue;
+                }
+                case 5: {
+                    if (tag !== 42) {
+                        break;
+                    }
+                    message.answer = exports.DeviceAnswer.decode(reader, reader.uint32());
                     continue;
                 }
             }
@@ -337,56 +310,52 @@ exports.BrokerMessage = {
     },
     fromJSON(object) {
         return {
-            type: isSet(object.type) ? messageTypeFromJSON(object.type) : 0,
-            message: isSet(object.message) ? bytesFromBase64(object.message) : new Uint8Array(0),
+            deviceId: isSet(object.device_id) ? globalThis.Number(object.device_id) : 0,
+            transactionId: isSet(object.transaction_id) ? globalThis.Number(object.transaction_id) : 0,
+            command: isSet(object.command) ? exports.DeviceCommand.fromJSON(object.command) : undefined,
+            akn: isSet(object.akn) ? exports.DeviceCommandAkn.fromJSON(object.akn) : undefined,
+            answer: isSet(object.answer) ? exports.DeviceAnswer.fromJSON(object.answer) : undefined,
         };
     },
     toJSON(message) {
         const obj = {};
-        if (message.type !== 0) {
-            obj.type = messageTypeToJSON(message.type);
+        if (message.deviceId !== 0) {
+            obj.device_id = Math.round(message.deviceId);
+        }
+        if (message.transactionId !== 0) {
+            obj.transaction_id = Math.round(message.transactionId);
+        }
+        if (message.command !== undefined) {
+            obj.command = exports.DeviceCommand.toJSON(message.command);
+        }
+        if (message.akn !== undefined) {
+            obj.akn = exports.DeviceCommandAkn.toJSON(message.akn);
         }
-        if (message.message.length !== 0) {
-            obj.message = base64FromBytes(message.message);
+        if (message.answer !== undefined) {
+            obj.answer = exports.DeviceAnswer.toJSON(message.answer);
         }
         return obj;
     },
     create(base) {
-        return exports.BrokerMessage.fromPartial(base !== null && base !== void 0 ? base : {});
+        return exports.DeviceMessage.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
         var _a, _b;
-        const message = createBaseBrokerMessage();
-        message.type = (_a = object.type) !== null && _a !== void 0 ? _a : 0;
-        message.message = (_b = object.message) !== null && _b !== void 0 ? _b : new Uint8Array(0);
+        const message = createBaseDeviceMessage();
+        message.deviceId = (_a = object.deviceId) !== null && _a !== void 0 ? _a : 0;
+        message.transactionId = (_b = object.transactionId) !== null && _b !== void 0 ? _b : 0;
+        message.command = (object.command !== undefined && object.command !== null)
+            ? exports.DeviceCommand.fromPartial(object.command)
+            : undefined;
+        message.akn = (object.akn !== undefined && object.akn !== null)
+            ? exports.DeviceCommandAkn.fromPartial(object.akn)
+            : undefined;
+        message.answer = (object.answer !== undefined && object.answer !== null)
+            ? exports.DeviceAnswer.fromPartial(object.answer)
+            : undefined;
         return message;
     },
 };
-function bytesFromBase64(b64) {
-    if (globalThis.Buffer) {
-        return Uint8Array.from(globalThis.Buffer.from(b64, "base64"));
-    }
-    else {
-        const bin = globalThis.atob(b64);
-        const arr = new Uint8Array(bin.length);
-        for (let i = 0; i < bin.length; ++i) {
-            arr[i] = bin.charCodeAt(i);
-        }
-        return arr;
-    }
-}
-function base64FromBytes(arr) {
-    if (globalThis.Buffer) {
-        return globalThis.Buffer.from(arr).toString("base64");
-    }
-    else {
-        const bin = [];
-        arr.forEach((byte) => {
-            bin.push(globalThis.String.fromCharCode(byte));
-        });
-        return globalThis.btoa(bin.join(""));
-    }
-}
 function longToNumber(int64) {
     const num = globalThis.Number(int64.toString());
     if (num > globalThis.Number.MAX_SAFE_INTEGER) {