eufy-security-client 3.6.0 → 3.7.1

package/build/http/api.js

@@ -69,7 +69,7 @@ class HTTPApi extends tiny_typed_emitter_1.TypedEmitter {
         nick_name: "",
         device_public_keys: {},
         clientPrivateKey: "",
-        serverPublicKey: this.SERVER_PUBLIC_KEY
+        serverPublicKey: this.SERVER_PUBLIC_KEY,
     };
     headers = {
         "User-Agent": undefined,
@@ -89,32 +89,61 @@ class HTTPApi extends tiny_typed_emitter_1.TypedEmitter {
         Timezone: "GMT+01:00",
         "Cache-Control": "no-cache",
     };
+    apiVerifyCode = "v1/sms/send/verify_code";
+    apiTrustDevice = "v1/app/trust_device/add";
+    apiGetStations = "v2/house/station_list";
+    apiGetDevices = "v2/house/device_list";
+    apiPushCheck = "v1/app/review/app_push_check";
+    apiRegisterPushToken = "v1/apppush/register_push_token";
+    apiSetParameters = "v1/app/upload_devs_params";
+    apiGetCiphers = "v2/app/cipher/get_ciphers";
+    apiEventGetAllVideoRecord = "v2/event/app/get_all_video_record";
+    apiEventGetAllAlarmRecord = "v2/event/app/get_all_alarm_record";
+    apiEventGetAllHistoryRecord = "v2/event/app/get_all_history_record";
+    apiGetInvites = "v2/family/get_invites";
+    apiConfirmInvite = "v1/family/confirm_invite";
+    apiGetSensorHistory = "v1/app/get_sensor_history";
+    apiGetHouseDetail = "v2/house/detail";
+    apiGetHouseList = "v1/house/list";
+    apiGetHouseInvites = "v1/house/invite_list";
+    apiConfirmHouseInvite = "v1/house/confirm_invite";
+    apiAddLocalUser = "v1/app/device/local_user/add";
+    apiDeleteLocalUser = "v1/app/device/user/delete";
+    apiUpdateLocalUser = "v1/app/device/local_user/update";
+    apiUpdateUserPassword = "v1/app/device/password/save_or_update";
+    FIFTEEN_YEARS_IN_MS = 15 * 365 * 24 * 60 * 60 * 1000;
     constructor(apiBase, country, username, password, persistentData) {
         super();
         this.username = username;
         this.password = password;
         this.apiBase = apiBase;
-        logging_1.rootHTTPLogger.debug(`Loaded API`, { apieBase: apiBase, country: country, username: username, persistentData: persistentData });
+        logging_1.rootHTTPLogger.debug(`Loaded API`, {
+            apieBase: apiBase,
+            country: country,
+            username: username,
+            persistentData: persistentData,
+        });
         this.headers.timezone = (0, utils_1.getTimezoneGMTString)();
         this.headers.country = country.toUpperCase();
         if (persistentData) {
             this.persistentData = persistentData;
         }
-        if (this.persistentData.clientPrivateKey === undefined || this.persistentData.clientPrivateKey === "") {
-            this.ecdh.generateKeys();
-            this.persistentData.clientPrivateKey = this.ecdh.getPrivateKey().toString("hex");
-        }
-        else {
+        // Generated key based on the provided one
+        if (this.persistentData.clientPrivateKey !== undefined && this.persistentData.clientPrivateKey !== "") {
             try {
                 this.ecdh.setPrivateKey(Buffer.from(this.persistentData.clientPrivateKey, "hex"));
             }
             catch (err) {
                 const error = (0, error_1.ensureError)(err);
-                logging_1.rootHTTPLogger.debug(`Invalid client private key, generate new client private key...`, { error: (0, utils_2.getError)(error) });
-                this.ecdh.generateKeys();
-                this.persistentData.clientPrivateKey = this.ecdh.getPrivateKey().toString("hex");
+                logging_1.rootHTTPLogger.debug(`Invalid client private key, generate new client private key...`, {
+                    error: (0, utils_2.getError)(error),
+                });
+                this.generateNewKey();
             }
         }
+        else {
+            this.generateNewKey();
+        }
         if (this.persistentData.serverPublicKey === undefined || this.persistentData.serverPublicKey === "") {
             this.persistentData.serverPublicKey = this.SERVER_PUBLIC_KEY;
         }
@@ -124,12 +153,26 @@ class HTTPApi extends tiny_typed_emitter_1.TypedEmitter {
             }
             catch (err) {
                 const error = (0, error_1.ensureError)(err);
-                logging_1.rootHTTPLogger.debug(`Invalid server public key, fallback to default server public key...`, { error: (0, utils_2.getError)(error) });
+                logging_1.rootHTTPLogger.debug(`Invalid server public key, fallback to default server public key...`, {
+                    error: (0, utils_2.getError)(error),
+                });
                 this.persistentData.serverPublicKey = this.SERVER_PUBLIC_KEY;
             }
         }
     }
+    generateNewKey() {
+        /*
+                Generate a new client private key
+             */
+        this.ecdh.generateKeys();
+        this.persistentData.clientPrivateKey = this.ecdh.getPrivateKey().toString("hex");
+    }
     static async getApiBaseFromCloud(country) {
+        /**
+                Query the main api with the country code ton ensure it is a valid and returns the correct api
+    
+                @param country
+             **/
         const { default: got } = await import("got");
         const response = await got(`domain/${country}`, {
             prefixUrl: this.apiDomainBase,
@@ -137,16 +180,22 @@ class HTTPApi extends tiny_typed_emitter_1.TypedEmitter {
             responseType: "json",
             retry: {
                 limit: 1,
-                methods: ["GET"]
-            }
+                methods: ["GET"],
+            },
         });
         const result = response.body;
         if (result.code == types_1.ResponseErrorCode.CODE_OK) {
             return `https://${result.data.domain}`;
         }
-        throw new error_2.ApiBaseLoadError("Error identifying API base from cloud", { context: { code: result.code, message: result.msg } });
+        throw new error_2.ApiBaseLoadError("Error identifying API base from cloud", {
+            context: { code: result.code, message: result.msg },
+        });
     }
     async loadLibraries() {
+        /**
+         * Load library
+         *
+         */
         const { default: pThrottle } = await import("p-throttle");
         const { default: got } = await import("got");
         this.throttle = pThrottle({
@@ -161,23 +210,10 @@ class HTTPApi extends tiny_typed_emitter_1.TypedEmitter {
             retry: {
                 limit: 3,
                 methods: ["GET", "POST"],
-                statusCodes: [
-                    404,
-                    408,
-                    413,
-                    423,
-                    429,
-                    500,
-                    502,
-                    503,
-                    504,
-                    521,
-                    522,
-                    524
-                ],
+                statusCodes: [404, 408, 413, 423, 429, 500, 502, 503, 504, 521, 522, 524],
                 calculateDelay: ({ computedValue }) => {
                     return computedValue * 3;
-                }
+                },
             },
             hooks: {
                 afterResponse: [
@@ -185,15 +221,19 @@ class HTTPApi extends tiny_typed_emitter_1.TypedEmitter {
                         // Unauthorized
                         if (response.statusCode === 401) {
                             const oldToken = this.token;
-                            logging_1.rootHTTPLogger.debug("Invalidate token an get a new one...", { requestUrl: response.requestUrl, statusCode: response.statusCode, statusMessage: response.statusMessage });
+                            logging_1.rootHTTPLogger.debug("Invalidate token an get a new one...", {
+                                requestUrl: response.requestUrl,
+                                statusCode: response.statusCode,
+                                statusMessage: response.statusMessage,
+                            });
                             this.invalidateToken();
                             await this.login({ force: true });
                             if (oldToken !== this.token && this.token) {
                                 // Refresh the access token
                                 const updatedOptions = {
                                     headers: {
-                                        "X-Auth-Token": this.token
-                                    }
+                                        "X-Auth-Token": this.token,
+                                    },
                                 };
                                 // Update the defaults
                                 this.requestEufyCloud.defaults.options.merge(updatedOptions);
@@ -203,7 +243,7 @@ class HTTPApi extends tiny_typed_emitter_1.TypedEmitter {
                         }
                         // No changes otherwise
                         return response;
-                    }
+                    },
                 ],
                 beforeRetry: [
                     (error) => {
@@ -214,10 +254,10 @@ class HTTPApi extends tiny_typed_emitter_1.TypedEmitter {
                         const body = error.response?.body ? error.response?.body : error.message;
                         logging_1.rootHTTPLogger.debug(`Retrying [${error.request?.retryCount !== undefined ? error.request?.retryCount + 1 : 1}]: ${error.code} (${error.request?.requestUrl})\n${statusCode} ${method} ${shortUrl}\n${body}`);
                         // Retrying [1]: ERR_NON_2XX_3XX_RESPONSE
-                    }
+                    },
                 ],
                 beforeError: [
-                    error => {
+                    (error) => {
                         const { response, options } = error;
                         const statusCode = response?.statusCode || 0;
                         const { method, url, prefixUrl } = options;
@@ -228,15 +268,17 @@ class HTTPApi extends tiny_typed_emitter_1.TypedEmitter {
                             error.message = `${statusCode} ${method} ${shortUrl}\n${body}`;
                         }
                         return error;
-                    }
+                    },
                 ],
                 beforeRequest: [
                     async (_options) => {
-                        await this.throttle(async () => { return; })();
-                    }
-                ]
+                        await this.throttle(async () => {
+                            return;
+                        })();
+                    },
+                ],
             },
-            mutableDefaults: true
+            mutableDefaults: true,
         });
     }
     static async initialize(country, username, password, persistentData) {
@@ -249,6 +291,10 @@ class HTTPApi extends tiny_typed_emitter_1.TypedEmitter {
         throw new error_1.InvalidCountryCodeError("Invalid ISO 3166-1 Alpha-2 country code", { context: { countryCode: country } });
     }
     clearScheduleRenewAuthToken() {
+        /**
+         *  Clear schedule to renew the auth token if running
+         *
+         **/
         if (this.renewAuthTokenJob !== undefined) {
             this.renewAuthTokenJob.cancel();
         }
@@ -256,7 +302,7 @@ class HTTPApi extends tiny_typed_emitter_1.TypedEmitter {
     scheduleRenewAuthToken() {
         this.clearScheduleRenewAuthToken();
         if (this.tokenExpiration !== null) {
-            const scheduleDate = new Date(this.tokenExpiration.getTime() - (1000 * 60 * 60 * 24));
+            const scheduleDate = new Date(this.tokenExpiration.getTime() - 1000 * 60 * 60 * 24);
             if (this.renewAuthTokenJob === undefined) {
                 this.renewAuthTokenJob = schedule.scheduleJob("renewAuthToken", scheduleDate, async () => {
                     logging_1.rootHTTPLogger.info("Authentication token is soon expiring, fetching a new one...");
@@ -273,32 +319,49 @@ class HTTPApi extends tiny_typed_emitter_1.TypedEmitter {
         this.token = null;
         this.requestEufyCloud.defaults.options.merge({
             headers: {
-                "X-Auth-Token": undefined
-            }
+                "X-Auth-Token": undefined,
+            },
         });
         this.tokenExpiration = null;
         this.persistentData.serverPublicKey = this.SERVER_PUBLIC_KEY;
         this.clearScheduleRenewAuthToken();
         this.emit("auth token invalidated");
     }
+    updateApiHeader() {
+        this.requestEufyCloud.defaults.options.merge({
+            headers: this.headers,
+        });
+    }
     setPhoneModel(model) {
+        /**
+         *
+         * Set a new phone model for the http request
+         *
+         */
         this.headers.phone_model = model.toUpperCase();
         this.requestEufyCloud.defaults.options.merge({
-            headers: this.headers
+            headers: this.headers,
         });
     }
     getPhoneModel() {
+        /**
+         *
+         * Return the current phone model used
+         *
+         */
         return this.headers.phone_model;
     }
     getCountry() {
+        /**
+         *  Return the current country
+         *
+         */
         return this.headers.country;
     }
     setLanguage(language) {
         if ((0, i18n_iso_languages_1.isValid)(language) && language.length === 2) {
             this.headers.language = language;
-            this.requestEufyCloud.defaults.options.merge({
-                headers: this.headers
-            });
+            this.updateApiHeader();
         }
         else
             throw new error_1.InvalidLanguageCodeError("Invalid ISO 639 language code", { context: { languageCode: language } });
@@ -306,88 +369,132 @@ class HTTPApi extends tiny_typed_emitter_1.TypedEmitter {
     getLanguage() {
         return this.headers.language;
     }
+    loginCompleted(dataResult) {
+        if (dataResult.server_secret_info?.public_key)
+            this.persistentData.serverPublicKey = dataResult.server_secret_info.public_key;
+        this.persistentData.user_id = dataResult.user_id;
+        this.persistentData.email = this.decryptAPIData(dataResult.email, false);
+        this.persistentData.nick_name = dataResult.nick_name;
+        this.setToken(dataResult.auth_token);
+        this.tokenExpiration = new Date(dataResult.token_expires_at * 1000);
+        this.headers = {
+            ...this.headers,
+            gtoken: (0, utils_2.md5)(dataResult.user_id),
+        };
+        logging_1.rootHTTPLogger.debug("Login - Token data", {
+            token: this.token,
+            tokenExpiration: this.tokenExpiration,
+            serverPublicKey: this.persistentData.serverPublicKey,
+        });
+        if (!this.connected) {
+            this.connected = true;
+            this.emit("connect");
+        }
+        this.scheduleRenewAuthToken();
+    }
+    async loginVerifyCode(dataResult) {
+        /**
+         *  Send verification code
+         */
+        logging_1.rootHTTPLogger.debug(`Login - Send verification code...`);
+        this.setToken(dataResult.auth_token);
+        this.tokenExpiration = new Date(dataResult.token_expires_at * 1000);
+        logging_1.rootHTTPLogger.debug("Token data", { token: this.token, tokenExpiration: this.tokenExpiration });
+        await this.sendVerifyCode(types_1.VerfyCodeTypes.TYPE_EMAIL);
+        logging_1.rootHTTPLogger.info("Please send required verification code to proceed with authentication");
+        this.emit("tfa request");
+    }
+    loginRequestCaptcha(dataResult) {
+        logging_1.rootHTTPLogger.debug("Login - Captcha verification received", {
+            captchaId: dataResult.captcha_id,
+            item: dataResult.item,
+        });
+        logging_1.rootHTTPLogger.info("Please send requested captcha to proceed with authentication");
+        this.emit("captcha request", dataResult.captcha_id, dataResult.item);
+    }
     async login(options) {
         options = (0, utils_2.mergeDeep)(options, {
-            force: false
+            force: false,
+        });
+        logging_1.rootHTTPLogger.debug("Login and get an access token", {
+            token: this.token,
+            tokenExpiration: this.tokenExpiration,
+            options: options,
         });
-        logging_1.rootHTTPLogger.debug("Login and get an access token", { token: this.token, tokenExpiration: this.tokenExpiration, options: options });
-        if (!this.token || (this.tokenExpiration && (new Date()).getTime() >= this.tokenExpiration.getTime()) || options.verifyCode || options.captcha || options.force) {
+        const isInvalidToken = !this.token;
+        const isTokenExpired = this.tokenExpiration && new Date().getTime() >= this.tokenExpiration.getTime();
+        if (isInvalidToken || isTokenExpired || options.verifyCode || options.captcha || options.force) {
             try {
+                const timezoneOffset = new Date().getTimezoneOffset();
                 const data = {
                     ab: this.headers.country,
                     client_secret_info: {
-                        public_key: this.ecdh.getPublicKey("hex")
+                        public_key: this.ecdh.getPublicKey("hex"),
                     },
                     enc: 0,
                     email: this.username,
                     password: (0, utils_1.encryptAPIData)(this.password, this.ecdh.computeSecret(Buffer.from(this.SERVER_PUBLIC_KEY, "hex"))),
-                    time_zone: new Date().getTimezoneOffset() !== 0 ? -new Date().getTimezoneOffset() * 60 * 1000 : 0,
-                    transaction: `${new Date().getTime()}`
+                    time_zone: timezoneOffset !== 0 ? -timezoneOffset * 60 * 1000 : 0,
+                    transaction: `${new Date().getTime()}`,
                 };
+                // Add verification code to the data
                 if (options.verifyCode) {
                     data.verify_code = options.verifyCode;
                 }
                 else if (options.captcha) {
+                    // Add captcha response
                     data.captcha_id = options.captcha.captchaId;
                     data.answer = options.captcha.captchaCode;
                 }
                 const response = await this.request({
                     method: "post",
                     endpoint: "v2/passport/login_sec",
-                    data: data
+                    data: data,
                 });
                 if (response.status == 200) {
                     const result = response.data;
                     if (result.data !== undefined) {
                         if (result.code == types_1.ResponseErrorCode.CODE_OK) {
-                            const dataresult = result.data;
-                            if (dataresult.server_secret_info?.public_key)
-                                this.persistentData.serverPublicKey = dataresult.server_secret_info.public_key;
-                            this.persistentData.user_id = dataresult.user_id;
-                            this.persistentData.email = this.decryptAPIData(dataresult.email, false);
-                            this.persistentData.nick_name = dataresult.nick_name;
-                            this.setToken(dataresult.auth_token);
-                            this.tokenExpiration = new Date(dataresult.token_expires_at * 1000);
-                            this.headers = {
-                                ...this.headers,
-                                gtoken: (0, utils_2.md5)(dataresult.user_id)
-                            };
-                            logging_1.rootHTTPLogger.debug("Login - Token data", { token: this.token, tokenExpiration: this.tokenExpiration, serverPublicKey: this.persistentData.serverPublicKey });
-                            if (!this.connected) {
-                                this.connected = true;
-                                this.emit("connect");
-                            }
-                            this.scheduleRenewAuthToken();
+                            this.loginCompleted(result.data);
                         }
                         else if (result.code == types_1.ResponseErrorCode.CODE_NEED_VERIFY_CODE) {
-                            logging_1.rootHTTPLogger.debug(`Login - Send verification code...`);
-                            const dataresult = result.data;
-                            this.setToken(dataresult.auth_token);
-                            this.tokenExpiration = new Date(dataresult.token_expires_at * 1000);
-                            logging_1.rootHTTPLogger.debug("Token data", { token: this.token, tokenExpiration: this.tokenExpiration });
-                            await this.sendVerifyCode(types_1.VerfyCodeTypes.TYPE_EMAIL);
-                            logging_1.rootHTTPLogger.info("Please send required verification code to proceed with authentication");
-                            this.emit("tfa request");
+                            this.loginVerifyCode(result.data);
                         }
-                        else if (result.code == types_1.ResponseErrorCode.LOGIN_NEED_CAPTCHA || result.code == types_1.ResponseErrorCode.LOGIN_CAPTCHA_ERROR) {
-                            const dataresult = result.data;
-                            logging_1.rootHTTPLogger.debug("Login - Captcha verification received", { captchaId: dataresult.captcha_id, item: dataresult.item });
-                            logging_1.rootHTTPLogger.info("Please send requested captcha to proceed with authentication");
-                            this.emit("captcha request", dataresult.captcha_id, dataresult.item);
+                        else if (result.code == types_1.ResponseErrorCode.LOGIN_NEED_CAPTCHA ||
+                            result.code == types_1.ResponseErrorCode.LOGIN_CAPTCHA_ERROR) {
+                            this.loginRequestCaptcha(result.data);
                         }
                         else {
-                            logging_1.rootHTTPLogger.error("Login - Response code not ok", { code: result.code, msg: result.msg, data: response.data });
-                            this.emit("connection error", new error_2.ApiResponseCodeError("API response code not ok", { context: { code: result.code, message: result.msg } }));
+                            logging_1.rootHTTPLogger.error("Login - Response code not ok", {
+                                code: result.code,
+                                msg: result.msg,
+                                data: response.data,
+                            });
+                            this.emit("connection error", new error_2.ApiResponseCodeError("API response code not ok", {
+                                context: { code: result.code, message: result.msg },
+                            }));
                         }
                     }
                     else {
-                        logging_1.rootHTTPLogger.error("Login - Response data is missing", { code: result.code, msg: result.msg, data: result.data });
-                        this.emit("connection error", new error_2.ApiInvalidResponseError("API response data is missing", { context: { code: result.code, message: result.msg, data: result.data } }));
+                        logging_1.rootHTTPLogger.error("Login - Response data is missing", {
+                            code: result.code,
+                            msg: result.msg,
+                            data: result.data,
+                        });
+                        this.emit("connection error", new error_2.ApiInvalidResponseError("API response data is missing", {
+                            context: { code: result.code, message: result.msg, data: result.data },
+                        }));
                     }
                 }
                 else {
-                    logging_1.rootHTTPLogger.error("Login - Status return code not 200", { status: response.status, statusText: response.statusText, data: response.data });
-                    this.emit("connection error", new error_2.ApiHTTPResponseCodeError("API HTTP response code not ok", { context: { status: response.status, statusText: response.statusText } }));
+                    logging_1.rootHTTPLogger.error("Login - Status return code not 200", {
+                        status: response.status,
+                        statusText: response.statusText,
+                        data: response.data,
+                    });
+                    this.emit("connection error", new error_2.ApiHTTPResponseCodeError("API HTTP response code not ok", {
+                        context: { status: response.status, statusText: response.statusText },
+                    }));
                 }
             }
             catch (err) {
@@ -417,18 +524,41 @@ class HTTPApi extends tiny_typed_emitter_1.TypedEmitter {
             }
         }
     }
-    async sendVerifyCode(type) {
-        try {
-            if (!type)
-                type = types_1.VerfyCodeTypes.TYPE_EMAIL;
-            const response = await this.request({
-                method: "post",
-                endpoint: "v1/sms/send/verify_code",
-                data: {
-                    message_type: type,
-                    transaction: `${new Date().getTime()}`
+    async makePostRequest(endPoint, data) {
+        if (this.connected) {
+            try {
+                const response = await this.request({
+                    method: "post",
+                    endpoint: endPoint,
+                    data: data,
+                });
+                if (response.status == 200) {
+                    return response;
                 }
-            });
+                else {
+                    logging_1.rootHTTPLogger.error(`Post to ${endPoint}  - Status return code not 200`, {
+                        status: response.status,
+                        statusText: response.statusText,
+                        data: response.data,
+                    });
+                }
+            }
+            catch (err) {
+                const error = (0, error_1.ensureError)(err);
+                logging_1.rootHTTPLogger.error("Send verify code - Generic Error", { error: (0, utils_2.getError)(error) });
+            }
+        }
+        return undefined;
+    }
+    async sendVerifyCode(type) {
+        if (!type)
+            type = types_1.VerfyCodeTypes.TYPE_EMAIL;
+        const data = {
+            message_type: type,
+            transaction: `${new Date().getTime()}`,
+        };
+        const response = await this.makePostRequest(this.apiVerifyCode, data);
+        if (response != undefined) {
             if (response.status == 200) {
                 const result = response.data;
                 if (result.code == types_1.ResponseErrorCode.CODE_OK) {
@@ -436,17 +566,21 @@ class HTTPApi extends tiny_typed_emitter_1.TypedEmitter {
                     return true;
                 }
                 else {
-                    logging_1.rootHTTPLogger.error("Send verify code - Response code not ok", { code: result.code, msg: result.msg, data: response.data });
+                    logging_1.rootHTTPLogger.error("Send verify code - Response code not ok", {
+                        code: result.code,
+                        msg: result.msg,
+                        data: response.data,
+                    });
                 }
             }
             else {
-                logging_1.rootHTTPLogger.error("Send verify code - Status return code not 200", { status: response.status, statusText: response.statusText, data: response.data });
+                logging_1.rootHTTPLogger.error("Send verify code - Status return code not 200", {
+                    status: response.status,
+                    statusText: response.statusText,
+                    data: response.data,
+                });
             }
         }
-        catch (err) {
-            const error = (0, error_1.ensureError)(err);
-            logging_1.rootHTTPLogger.error("Send verify code - Generic Error", { error: (0, utils_2.getError)(error) });
-        }
         return false;
     }
     async listTrustDevice() {
@@ -454,7 +588,7 @@ class HTTPApi extends tiny_typed_emitter_1.TypedEmitter {
             try {
                 const response = await this.request({
                     method: "get",
-                    endpoint: "v1/app/trust_device/list"
+                    endpoint: "v1/app/trust_device/list",
                 });
                 if (response.status == 200) {
                     const result = response.data;
@@ -464,11 +598,19 @@ class HTTPApi extends tiny_typed_emitter_1.TypedEmitter {
                         }
                     }
                     else {
-                        logging_1.rootHTTPLogger.error("List trust device - Response code not ok", { code: result.code, msg: result.msg, data: response.data });
+                        logging_1.rootHTTPLogger.error("List trust device - Response code not ok", {
+                            code: result.code,
+                            msg: result.msg,
+                            data: response.data,
+                        });
                     }
                 }
                 else {
-                    logging_1.rootHTTPLogger.error("List trust device - Status return code not 200", { status: response.status, statusText: response.statusText, data: response.data });
+                    logging_1.rootHTTPLogger.error("List trust device - Status return code not 200", {
+                        status: response.status,
+                        statusText: response.statusText,
+                        data: response.data,
+                    });
                 }
             }
             catch (err) {
@@ -479,120 +621,122 @@ class HTTPApi extends tiny_typed_emitter_1.TypedEmitter {
         return [];
     }
     async addTrustDevice(verifyCode) {
-        if (this.connected) {
-            try {
-                const response = await this.request({
-                    method: "post",
-                    endpoint: "v1/app/trust_device/add",
-                    data: {
-                        verify_code: verifyCode,
-                        transaction: `${new Date().getTime()}`
-                    }
-                });
-                logging_1.rootHTTPLogger.debug("Add trust device - Response trust device", { verifyCode: verifyCode, data: response.data });
-                if (response.status == 200) {
-                    const result = response.data;
-                    if (result.code == types_1.ResponseErrorCode.CODE_OK) {
-                        logging_1.rootHTTPLogger.info(`2FA authentication successfully done. Device trusted.`);
-                        const trusted_devices = await this.listTrustDevice();
-                        trusted_devices.forEach((trusted_device) => {
-                            if (trusted_device.is_current_device === 1) {
-                                logging_1.rootHTTPLogger.debug("Add trust device - This device is trusted. Token expiration extended:", { trustDevice: { phoneModel: trusted_device.phone_model, openUdid: trusted_device.open_udid }, tokenExpiration: this.tokenExpiration });
-                            }
-                        });
-                        return true;
-                    }
-                    else {
-                        logging_1.rootHTTPLogger.error("Add trust device - Response code not ok", { code: result.code, msg: result.msg, verifyCode: verifyCode, data: response.data });
-                    }
+        const data = {
+            verify_code: verifyCode,
+            transaction: `${new Date().getTime()}`,
+        };
+        const response = await this.makePostRequest(this.apiTrustDevice, data);
+        if (response != undefined) {
+            logging_1.rootHTTPLogger.debug("Add trust device - Response trust device", { verifyCode: verifyCode, data: response.data });
+            if (response.status == 200) {
+                const result = response.data;
+                if (result.code == types_1.ResponseErrorCode.CODE_OK) {
+                    logging_1.rootHTTPLogger.info(`2FA authentication successfully done. Device trusted.`);
+                    const trusted_devices = await this.listTrustDevice();
+                    trusted_devices.forEach((trusted_device) => {
+                        if (trusted_device.is_current_device === 1) {
+                            logging_1.rootHTTPLogger.debug("Add trust device - This device is trusted. Token expiration extended:", {
+                                trustDevice: { phoneModel: trusted_device.phone_model, openUdid: trusted_device.open_udid },
+                                tokenExpiration: this.tokenExpiration,
+                            });
+                        }
+                    });
+                    return true;
                 }
                 else {
-                    logging_1.rootHTTPLogger.error("Add trust device - Status return code not 200", { status: response.status, statusText: response.statusText, verifyCode: verifyCode, data: response.data });
+                    logging_1.rootHTTPLogger.error("Add trust device - Response code not ok", {
+                        code: result.code,
+                        msg: result.msg,
+                        verifyCode: verifyCode,
+                        data: response.data,
+                    });
                 }
             }
-            catch (err) {
-                const error = (0, error_1.ensureError)(err);
-                logging_1.rootHTTPLogger.error("Add trust device - Generic Error", { error: (0, utils_2.getError)(error) });
+            else {
+                logging_1.rootHTTPLogger.error("Add trust device - Status return code not 200", {
+                    status: response.status,
+                    statusText: response.statusText,
+                    verifyCode: verifyCode,
+                    data: response.data,
+                });
             }
         }
         return false;
     }
     async getStationList() {
-        if (this.connected) {
-            try {
-                const response = await this.request({
-                    method: "post",
-                    endpoint: "v2/house/station_list",
-                    data: {
-                        device_sn: "",
-                        num: 1000,
-                        orderby: "",
-                        page: 0,
-                        station_sn: "",
-                        time_zone: new Date().getTimezoneOffset() !== 0 ? -new Date().getTimezoneOffset() * 60 * 1000 : 0,
-                        transaction: `${new Date().getTime()}`
-                    }
-                });
-                if (response.status == 200) {
-                    const result = response.data;
-                    if (result.code == 0) {
-                        if (result.data) {
-                            const stationList = this.decryptAPIData(result.data);
-                            logging_1.rootHTTPLogger.debug("Decrypted station list data", stationList);
-                            return stationList;
-                        }
-                    }
-                    else {
-                        logging_1.rootHTTPLogger.error("Station list - Response code not ok", { code: result.code, msg: result.msg, data: response.data });
+        const data = {
+            device_sn: "",
+            num: 1000,
+            orderby: "",
+            page: 0,
+            station_sn: "",
+            time_zone: new Date().getTimezoneOffset() !== 0 ? -new Date().getTimezoneOffset() * 60 * 1000 : 0,
+            transaction: `${new Date().getTime()}`,
+        };
+        const response = await this.makePostRequest(this.apiGetStations, data);
+        if (response != undefined) {
+            if (response.status == 200) {
+                const result = response.data;
+                if (result.code == 0) {
+                    if (result.data) {
+                        const stationList = this.decryptAPIData(result.data);
+                        logging_1.rootHTTPLogger.debug("Decrypted station list data", stationList);
+                        return stationList;
                     }
                 }
                 else {
-                    logging_1.rootHTTPLogger.error("Station list - Status return code not 200", { status: response.status, statusText: response.statusText, data: response.data });
+                    logging_1.rootHTTPLogger.error("Station list - Response code not ok", {
+                        code: result.code,
+                        msg: result.msg,
+                        data: response.data,
+                    });
                 }
             }
-            catch (err) {
-                const error = (0, error_1.ensureError)(err);
-                logging_1.rootHTTPLogger.error("Station list - Generic Error", { error: (0, utils_2.getError)(error) });
+            else {
+                logging_1.rootHTTPLogger.error("Station list - Status return code not 200", {
+                    status: response.status,
+                    statusText: response.statusText,
+                    data: response.data,
+                });
             }
         }
         return [];
     }
     async getDeviceList() {
-        if (this.connected) {
-            try {
-                const response = await this.request({
-                    method: "post",
-                    endpoint: "v2/house/device_list",
-                    data: {
-                        device_sn: "",
-                        num: 1000,
-                        orderby: "",
-                        page: 0,
-                        station_sn: "",
-                        time_zone: new Date().getTimezoneOffset() !== 0 ? -new Date().getTimezoneOffset() * 60 * 1000 : 0,
-                        transaction: `${new Date().getTime()}`
-                    }
-                });
-                if (response.status == 200) {
-                    const result = response.data;
-                    if (result.code == 0) {
-                        if (result.data) {
-                            const deviceList = this.decryptAPIData(result.data);
-                            logging_1.rootHTTPLogger.debug("Decrypted device list data", deviceList);
-                            return deviceList;
-                        }
-                    }
-                    else {
-                        logging_1.rootHTTPLogger.error("Device list - Response code not ok", { code: result.code, msg: result.msg, data: response.data });
+        const data = {
+            device_sn: "",
+            num: 1000,
+            orderby: "",
+            page: 0,
+            station_sn: "",
+            time_zone: new Date().getTimezoneOffset() !== 0 ? -new Date().getTimezoneOffset() * 60 * 1000 : 0,
+            transaction: `${new Date().getTime()}`,
+        };
+        const response = await this.makePostRequest(this.apiGetDevices, data);
+        if (response != undefined) {
+            if (response.status == 200) {
+                const result = response.data;
+                if (result.code == 0) {
+                    if (result.data) {
+                        const deviceList = this.decryptAPIData(result.data);
+                        logging_1.rootHTTPLogger.debug("Decrypted device list data", deviceList);
+                        return deviceList;
                     }
                 }
                 else {
-                    logging_1.rootHTTPLogger.error("Device list - Status return code not 200", { status: response.status, statusText: response.statusText, data: response.data });
+                    logging_1.rootHTTPLogger.error("Device list - Response code not ok", {
+                        code: result.code,
+                        msg: result.msg,
+                        data: response.data,
+                    });
                 }
             }
-            catch (err) {
-                const error = (0, error_1.ensureError)(err);
-                logging_1.rootHTTPLogger.error("Device list - Generic Error", { error: (0, utils_2.getError)(error) });
+            else {
+                logging_1.rootHTTPLogger.error("Device list - Status return code not 200", {
+                    status: response.status,
+                    statusText: response.statusText,
+                    data: response.data,
+                });
             }
         }
         return [];
@@ -601,7 +745,7 @@ class HTTPApi extends tiny_typed_emitter_1.TypedEmitter {
         //Get Houses
         const houses = await this.getHouseList();
         if (houses && houses.length > 0) {
-            houses.forEach(element => {
+            houses.forEach((element) => {
                 this.houses[element.house_id] = element;
             });
         }
@@ -614,7 +758,7 @@ class HTTPApi extends tiny_typed_emitter_1.TypedEmitter {
         //Get Stations
         const stations = await this.getStationList();
         if (stations && stations.length > 0) {
-            stations.forEach(element => {
+            stations.forEach((element) => {
                 this.hubs[element.station_sn] = element;
             });
         }
@@ -627,7 +771,7 @@ class HTTPApi extends tiny_typed_emitter_1.TypedEmitter {
         //Get Devices
         const devices = await this.getDeviceList();
         if (devices && devices.length > 0) {
-            devices.forEach(element => {
+            devices.forEach((element) => {
                 this.devices[element.device_sn] = element;
             });
         }
@@ -646,7 +790,13 @@ class HTTPApi extends tiny_typed_emitter_1.TypedEmitter {
         await this.refreshDeviceData();
     }
     async request(request, withoutUrlPrefix = false) {
-        logging_1.rootHTTPLogger.debug("Api request", { method: request.method, endpoint: request.endpoint, responseType: request.responseType, token: this.token, data: request.data });
+        logging_1.rootHTTPLogger.debug("Api request", {
+            method: request.method,
+            endpoint: request.endpoint,
+            responseType: request.responseType,
+            token: this.token,
+            data: request.data,
+        });
         try {
             let options;
             switch (request.responseType) {
@@ -690,159 +840,187 @@ class HTTPApi extends tiny_typed_emitter_1.TypedEmitter {
             if (error instanceof (await import("got")).HTTPError) {
                 if (error.response.statusCode === 401) {
                     this.invalidateToken();
-                    logging_1.rootHTTPLogger.error("Status return code 401, invalidate token", { status: error.response.statusCode, statusText: error.response.statusMessage });
+                    logging_1.rootHTTPLogger.error("Status return code 401, invalidate token", {
+                        status: error.response.statusCode,
+                        statusText: error.response.statusMessage,
+                    });
                     this.emit("close");
                 }
             }
-            throw new error_2.ApiRequestError("API request error", { cause: error, context: { method: request.method, endpoint: request.endpoint, responseType: request.responseType, token: this.token, data: request.data } });
+            throw new error_2.ApiRequestError("API request error", {
+                cause: error,
+                context: {
+                    method: request.method,
+                    endpoint: request.endpoint,
+                    responseType: request.responseType,
+                    token: this.token,
+                    data: request.data,
+                },
+            });
         }
     }
     async checkPushToken() {
         //Check push notification token
-        if (this.connected) {
-            try {
-                const response = await this.request({
-                    method: "post",
-                    endpoint: "v1/app/review/app_push_check",
-                    data: {
-                        app_type: "eufySecurity",
-                        transaction: `${new Date().getTime()}`
-                    }
-                });
-                if (response.status == 200) {
-                    const result = response.data;
-                    if (result.code == 0) {
-                        logging_1.rootHTTPLogger.debug(`Check push token - Push token OK`);
-                        return true;
-                    }
-                    else {
-                        logging_1.rootHTTPLogger.error("Check push token - Response code not ok", { code: result.code, msg: result.msg, data: response.data });
-                    }
+        const data = {
+            app_type: "eufySecurity",
+            transaction: `${new Date().getTime()}`,
+        };
+        const response = await this.makePostRequest(this.apiPushCheck, data);
+        if (response !== undefined) {
+            if (response.status == 200) {
+                const result = response.data;
+                if (result.code == 0) {
+                    logging_1.rootHTTPLogger.debug(`Check push token - Push token OK`);
+                    return true;
                 }
                 else {
-                    logging_1.rootHTTPLogger.error("Check push token - Status return code not 200", { status: response.status, statusText: response.statusText, data: response.data });
+                    logging_1.rootHTTPLogger.error("Check push token - Response code not ok", {
+                        code: result.code,
+                        msg: result.msg,
+                        data: response.data,
+                    });
                 }
             }
-            catch (err) {
-                const error = (0, error_1.ensureError)(err);
-                logging_1.rootHTTPLogger.error("Check push token - Generic Error", { error: (0, utils_2.getError)(error) });
+            else {
+                logging_1.rootHTTPLogger.error("Check push token - Status return code not 200", {
+                    status: response.status,
+                    statusText: response.statusText,
+                    data: response.data,
+                });
             }
         }
         return false;
     }
     async registerPushToken(token) {
         //Register push notification token
-        if (this.connected) {
-            try {
-                const response = await this.request({
-                    method: "post",
-                    endpoint: "v1/apppush/register_push_token",
-                    data: {
-                        is_notification_enable: true,
-                        token: token,
-                        transaction: `${new Date().getTime().toString()}`
-                    }
-                });
-                if (response.status == 200) {
-                    const result = response.data;
-                    if (result.code == 0) {
-                        logging_1.rootHTTPLogger.debug(`Register push token - Push token registered successfully`);
-                        return true;
-                    }
-                    else {
-                        logging_1.rootHTTPLogger.error("Register push token - Response code not ok", { code: result.code, msg: result.msg, data: response.data, token: token });
-                    }
+        const data = {
+            is_notification_enable: true,
+            token: token,
+            transaction: `${new Date().getTime().toString()}`,
+        };
+        const response = await this.makePostRequest(this.apiRegisterPushToken, data);
+        if (response !== undefined) {
+            if (response.status == 200) {
+                const result = response.data;
+                if (result.code == 0) {
+                    logging_1.rootHTTPLogger.debug(`Register push token - Push token registered successfully`);
+                    return true;
                 }
                 else {
-                    logging_1.rootHTTPLogger.error("Register push token - Status return code not 200", { status: response.status, statusText: response.statusText, data: response.data, token: token });
+                    logging_1.rootHTTPLogger.error("Register push token - Response code not ok", {
+                        code: result.code,
+                        msg: result.msg,
+                        data: response.data,
+                        token: token,
+                    });
                 }
             }
-            catch (err) {
-                const error = (0, error_1.ensureError)(err);
-                logging_1.rootHTTPLogger.error("Register push token - Generic Error", { error: (0, utils_2.getError)(error), token: token });
+            else {
+                logging_1.rootHTTPLogger.error("Register push token - Status return code not 200", {
+                    status: response.status,
+                    statusText: response.statusText,
+                    data: response.data,
+                    token: token,
+                });
             }
         }
         return false;
     }
     async setParameters(stationSN, deviceSN, params) {
-        if (this.connected) {
-            const tmp_params = [];
-            params.forEach(param => {
-                tmp_params.push({ param_type: param.paramType, param_value: parameter_1.ParameterHelper.writeValue(param.paramType, param.paramValue) });
+        const tmp_params = [];
+        params.forEach((param) => {
+            tmp_params.push({
+                param_type: param.paramType,
+                param_value: parameter_1.ParameterHelper.writeValue(param.paramType, param.paramValue),
             });
-            try {
-                const response = await this.request({
-                    method: "post",
-                    endpoint: "v1/app/upload_devs_params",
-                    data: {
-                        device_sn: deviceSN,
-                        station_sn: stationSN,
-                        params: tmp_params,
-                        transaction: `${new Date().getTime().toString()}`
-                    }
-                });
-                logging_1.rootHTTPLogger.debug("Set parameter - Response:", { stationSN: stationSN, deviceSN: deviceSN, params: tmp_params, response: response.data });
-                if (response.status == 200) {
-                    const result = response.data;
-                    if (result.code == 0) {
-                        const dataresult = result.data;
-                        logging_1.rootHTTPLogger.debug("Set parameter - New parameters set", { params: tmp_params, response: dataresult });
-                        return true;
-                    }
-                    else {
-                        logging_1.rootHTTPLogger.error("Set parameter - Response code not ok", { code: result.code, msg: result.msg, data: response.data, stationSN: stationSN, deviceSN: deviceSN, params: params });
-                    }
+        });
+        const data = {
+            device_sn: deviceSN,
+            station_sn: stationSN,
+            params: tmp_params,
+            transaction: `${new Date().getTime().toString()}`,
+        };
+        const response = await this.makePostRequest(this.apiSetParameters, data);
+        if (response !== undefined) {
+            logging_1.rootHTTPLogger.debug("Set parameter - Response:", {
+                stationSN: stationSN,
+                deviceSN: deviceSN,
+                params: tmp_params,
+                response: response.data,
+            });
+            if (response.status == 200) {
+                const result = response.data;
+                if (result.code == 0) {
+                    const dataresult = result.data;
+                    logging_1.rootHTTPLogger.debug("Set parameter - New parameters set", { params: tmp_params, response: dataresult });
+                    return true;
                 }
                 else {
-                    logging_1.rootHTTPLogger.error("Set parameter - Status return code not 200", { status: response.status, statusText: response.statusText, data: response.data, stationSN: stationSN, deviceSN: deviceSN, params: params });
+                    logging_1.rootHTTPLogger.error("Set parameter - Response code not ok", {
+                        code: result.code,
+                        msg: result.msg,
+                        data: response.data,
+                        stationSN: stationSN,
+                        deviceSN: deviceSN,
+                        params: params,
+                    });
                 }
             }
-            catch (err) {
-                const error = (0, error_1.ensureError)(err);
-                logging_1.rootHTTPLogger.error("Set parameter - Generic Error", { error: (0, utils_2.getError)(error), stationSN: stationSN, deviceSN: deviceSN, params: params });
+            else {
+                logging_1.rootHTTPLogger.error("Set parameter - Status return code not 200", {
+                    status: response.status,
+                    statusText: response.statusText,
+                    data: response.data,
+                    stationSN: stationSN,
+                    deviceSN: deviceSN,
+                    params: params,
+                });
             }
         }
         return false;
     }
     async getCiphers(/*stationSN: string, */ cipherIDs, userID) {
-        if (this.connected) {
-            try {
-                const response = await this.request({
-                    method: "post",
-                    endpoint: "v2/app/cipher/get_ciphers",
-                    data: {
-                        cipher_ids: cipherIDs,
-                        user_id: userID,
-                        //sn: stationSN
-                        transaction: `${new Date().getTime().toString()}`
-                    }
-                });
-                if (response.status == 200) {
-                    const result = response.data;
-                    if (result.code == types_1.ResponseErrorCode.CODE_OK) {
-                        if (result.data) {
-                            const ciphers = {};
-                            const decrypted = this.decryptAPIData(result.data);
-                            logging_1.rootHTTPLogger.debug("Get ciphers - Decrypted ciphers data", { ciphers: decrypted });
-                            if (Array.isArray(decrypted)) {
-                                decrypted.forEach((cipher) => {
-                                    ciphers[cipher.cipher_id] = cipher;
-                                });
-                            }
-                            return ciphers;
+        const data = {
+            cipher_ids: cipherIDs,
+            user_id: userID,
+            //sn: stationSN
+            transaction: `${new Date().getTime().toString()}`,
+        };
+        const response = await this.makePostRequest(this.apiGetCiphers, data);
+        if (response !== undefined) {
+            if (response.status == 200) {
+                const result = response.data;
+                if (result.code == types_1.ResponseErrorCode.CODE_OK) {
+                    if (result.data) {
+                        const ciphers = {};
+                        const decrypted = this.decryptAPIData(result.data);
+                        logging_1.rootHTTPLogger.debug("Get ciphers - Decrypted ciphers data", { ciphers: decrypted });
+                        if (Array.isArray(decrypted)) {
+                            decrypted.forEach((cipher) => {
+                                ciphers[cipher.cipher_id] = cipher;
+                            });
                         }
-                    }
-                    else {
-                        logging_1.rootHTTPLogger.error("Get ciphers - Response code not ok", { code: result.code, msg: result.msg, data: response.data, cipherIDs: cipherIDs, userID: userID });
+                        return ciphers;
                     }
                 }
                 else {
-                    logging_1.rootHTTPLogger.error("Get ciphers - Status return code not 200", { status: response.status, statusText: response.statusText, data: response.data, cipherIDs: cipherIDs, userID: userID });
+                    logging_1.rootHTTPLogger.error("Get ciphers - Response code not ok", {
+                        code: result.code,
+                        msg: result.msg,
+                        data: response.data,
+                        cipherIDs: cipherIDs,
+                        userID: userID,
+                    });
                 }
             }
-            catch (err) {
-                const error = (0, error_1.ensureError)(err);
-                logging_1.rootHTTPLogger.error("Get ciphers - Generic Error", { error: (0, utils_2.getError)(error), cipherIDs: cipherIDs, userID: userID });
+            else {
+                logging_1.rootHTTPLogger.error("Get ciphers - Status return code not 200", {
+                    status: response.status,
+                    statusText: response.statusText,
+                    data: response.data,
+                    cipherIDs: cipherIDs,
+                    userID: userID,
+                });
             }
         }
         return {};
@@ -852,7 +1030,7 @@ class HTTPApi extends tiny_typed_emitter_1.TypedEmitter {
             try {
                 const response = await this.request({
                     method: "get",
-                    endpoint: `v1/voice/response/lists/${deviceSN}`
+                    endpoint: `v1/voice/response/lists/${deviceSN}`,
                 });
                 if (response.status == 200) {
                     const result = response.data;
@@ -866,11 +1044,21 @@ class HTTPApi extends tiny_typed_emitter_1.TypedEmitter {
                         }
                     }
                     else {
-                        logging_1.rootHTTPLogger.error("Get Voices - Response code not ok", { code: result.code, msg: result.msg, data: response.data, deviceSN: deviceSN });
+                        logging_1.rootHTTPLogger.error("Get Voices - Response code not ok", {
+                            code: result.code,
+                            msg: result.msg,
+                            data: response.data,
+                            deviceSN: deviceSN,
+                        });
                     }
                 }
                 else {
-                    logging_1.rootHTTPLogger.error("Get Voices - Status return code not 200", { status: response.status, statusText: response.statusText, data: response.data, deviceSN: deviceSN });
+                    logging_1.rootHTTPLogger.error("Get Voices - Status return code not 200", {
+                        status: response.status,
+                        statusText: response.statusText,
+                        data: response.data,
+                        deviceSN: deviceSN,
+                    });
                 }
             }
             catch (err) {
@@ -899,188 +1087,201 @@ class HTTPApi extends tiny_typed_emitter_1.TypedEmitter {
         this.token = token;
         this.requestEufyCloud.defaults.options.merge({
             headers: {
-                "X-Auth-Token": token
-            }
+                "X-Auth-Token": token,
+            },
         });
     }
     setTokenExpiration(tokenExpiration) {
         this.tokenExpiration = tokenExpiration;
     }
     getAPIBase() {
-        return typeof this.requestEufyCloud.defaults.options.prefixUrl === "string" ? this.requestEufyCloud.defaults.options.prefixUrl : this.requestEufyCloud.defaults.options.prefixUrl.toString();
+        return typeof this.requestEufyCloud.defaults.options.prefixUrl === "string"
+            ? this.requestEufyCloud.defaults.options.prefixUrl
+            : this.requestEufyCloud.defaults.options.prefixUrl.toString();
     }
     setOpenUDID(openudid) {
         this.headers.openudid = openudid;
-        this.requestEufyCloud.defaults.options.merge({
-            headers: this.headers
-        });
+        this.updateApiHeader();
     }
     setSerialNumber(serialnumber) {
         this.headers.sn = serialnumber;
-        this.requestEufyCloud.defaults.options.merge({
-            headers: this.headers
-        });
+        this.updateApiHeader();
     }
     async _getEvents(functionName, endpoint, startTime, endTime, filter, maxResults) {
         const records = [];
-        if (this.connected) {
-            try {
-                if (filter === undefined)
-                    filter = { deviceSN: "", stationSN: "", storageType: types_1.StorageType.NONE };
-                if (maxResults === undefined)
-                    maxResults = 1000;
-                const response = await this.request({
-                    method: "post",
-                    endpoint: endpoint,
-                    data: {
-                        device_sn: filter.deviceSN !== undefined ? filter.deviceSN : "",
-                        end_time: Math.trunc(endTime.getTime() / 1000),
-                        exclude_guest: false,
-                        house_id: "HOUSEID_ALL_DEVICE",
-                        id: 0,
-                        id_type: 1,
-                        is_favorite: false,
-                        num: maxResults,
-                        pullup: true,
-                        shared: true,
-                        start_time: Math.trunc(startTime.getTime() / 1000),
-                        station_sn: filter.stationSN !== undefined ? filter.stationSN : "",
-                        storage: filter.storageType !== undefined ? filter.storageType : types_1.StorageType.NONE,
-                        transaction: `${new Date().getTime().toString()}`
-                    }
-                });
-                logging_1.rootHTTPLogger.debug(`${functionName} - Response:`, response.data);
-                if (response.status == 200) {
-                    const result = response.data;
-                    if (result.code == 0) {
-                        if (result.data) {
-                            const dataresult = this.decryptAPIData(result.data);
-                            logging_1.rootHTTPLogger.debug(`${functionName} - Decrypted data:`, dataresult);
-                            if (dataresult) {
-                                dataresult.forEach(record => {
-                                    logging_1.rootHTTPLogger.debug(`${functionName} - Record:`, record);
-                                    records.push(record);
-                                });
-                            }
-                        }
-                        else {
-                            logging_1.rootHTTPLogger.error(`${functionName} - Response data is missing`, { code: result.code, msg: result.msg, data: response.data, endpoint: endpoint, startTime: startTime, endTime: endTime, filter: filter, maxResults: maxResults });
-                        }
+        if (filter === undefined)
+            filter = { deviceSN: "", stationSN: "", storageType: types_1.StorageType.NONE };
+        if (maxResults === undefined)
+            maxResults = 1000;
+        const data = {
+            device_sn: filter.deviceSN !== undefined ? filter.deviceSN : "",
+            end_time: Math.trunc(endTime.getTime() / 1000),
+            exclude_guest: false,
+            house_id: "HOUSEID_ALL_DEVICE",
+            id: 0,
+            id_type: 1,
+            is_favorite: false,
+            num: maxResults,
+            pullup: true,
+            shared: true,
+            start_time: Math.trunc(startTime.getTime() / 1000),
+            station_sn: filter.stationSN !== undefined ? filter.stationSN : "",
+            storage: filter.storageType !== undefined ? filter.storageType : types_1.StorageType.NONE,
+            transaction: `${new Date().getTime().toString()}`,
+        };
+        const response = await this.makePostRequest(endpoint, data);
+        if (response !== undefined) {
+            logging_1.rootHTTPLogger.debug(`${functionName} - Response:`, response.data);
+            if (response.status == 200) {
+                const result = response.data;
+                if (result.code == 0) {
+                    if (result.data) {
+                        const dataresult = this.decryptAPIData(result.data);
+                        logging_1.rootHTTPLogger.debug(`${functionName} - Decrypted data:`, dataresult);
+                        if (dataresult) {
+                            dataresult.forEach((record) => {
+                                logging_1.rootHTTPLogger.debug(`${functionName} - Record:`, record);
+                                records.push(record);
+                            });
+                        }
                     }
                     else {
-                        logging_1.rootHTTPLogger.error(`${functionName} - Response code not ok`, { code: result.code, msg: result.msg, data: response.data, endpoint: endpoint, startTime: startTime, endTime: endTime, filter: filter, maxResults: maxResults });
+                        logging_1.rootHTTPLogger.error(`${functionName} - Response data is missing`, {
+                            code: result.code,
+                            msg: result.msg,
+                            data: response.data,
+                            endpoint: endpoint,
+                            startTime: startTime,
+                            endTime: endTime,
+                            filter: filter,
+                            maxResults: maxResults,
+                        });
                     }
                 }
                 else {
-                    logging_1.rootHTTPLogger.error(`${functionName} - Status return code not 200`, { status: response.status, statusText: response.statusText, data: response.data, endpoint: endpoint, startTime: startTime, endTime: endTime, filter: filter, maxResults: maxResults });
+                    logging_1.rootHTTPLogger.error(`${functionName} - Response code not ok`, {
+                        code: result.code,
+                        msg: result.msg,
+                        data: response.data,
+                        endpoint: endpoint,
+                        startTime: startTime,
+                        endTime: endTime,
+                        filter: filter,
+                        maxResults: maxResults,
+                    });
                 }
             }
-            catch (err) {
-                const error = (0, error_1.ensureError)(err);
-                logging_1.rootHTTPLogger.error(`${functionName} - Generic Error`, { error: (0, utils_2.getError)(error), endpoint: endpoint, startTime: startTime, endTime: endTime, filter: filter, maxResults: maxResults });
+            else {
+                logging_1.rootHTTPLogger.error(`${functionName} - Status return code not 200`, {
+                    status: response.status,
+                    statusText: response.statusText,
+                    data: response.data,
+                    endpoint: endpoint,
+                    startTime: startTime,
+                    endTime: endTime,
+                    filter: filter,
+                    maxResults: maxResults,
+                });
             }
         }
         return records;
     }
     async getVideoEvents(startTime, endTime, filter, maxResults) {
-        return this._getEvents("getVideoEvents", "v2/event/app/get_all_video_record", startTime, endTime, filter, maxResults);
+        return this._getEvents("getVideoEvents", this.apiEventGetAllVideoRecord, startTime, endTime, filter, maxResults);
     }
     async getAlarmEvents(startTime, endTime, filter, maxResults) {
-        return this._getEvents("getAlarmEvents", "v2/event/app/get_all_alarm_record", startTime, endTime, filter, maxResults);
+        return this._getEvents("getAlarmEvents", this.apiEventGetAllAlarmRecord, startTime, endTime, filter, maxResults);
     }
     async getHistoryEvents(startTime, endTime, filter, maxResults) {
-        return this._getEvents("getHistoryEvents", "v2/event/app/get_all_history_record", startTime, endTime, filter, maxResults);
+        return this._getEvents("getHistoryEvents", this.apiEventGetAllHistoryRecord, startTime, endTime, filter, maxResults);
     }
     async getAllVideoEvents(filter, maxResults) {
-        const fifteenYearsInMilliseconds = 15 * 365 * 24 * 60 * 60 * 1000;
-        return this.getVideoEvents(new Date(new Date().getTime() - fifteenYearsInMilliseconds), new Date(), filter, maxResults);
+        return this.getVideoEvents(new Date(new Date().getTime() - this.FIFTEEN_YEARS_IN_MS), new Date(), filter, maxResults);
     }
     async getAllAlarmEvents(filter, maxResults) {
-        const fifteenYearsInMilliseconds = 15 * 365 * 24 * 60 * 60 * 1000;
-        return this.getAlarmEvents(new Date(new Date().getTime() - fifteenYearsInMilliseconds), new Date(), filter, maxResults);
+        return this.getAlarmEvents(new Date(new Date().getTime() - this.FIFTEEN_YEARS_IN_MS), new Date(), filter, maxResults);
     }
     async getAllHistoryEvents(filter, maxResults) {
-        const fifteenYearsInMilliseconds = 15 * 365 * 24 * 60 * 60 * 1000;
-        return this.getHistoryEvents(new Date(new Date().getTime() - fifteenYearsInMilliseconds), new Date(), filter, maxResults);
+        return this.getHistoryEvents(new Date(new Date().getTime() - this.FIFTEEN_YEARS_IN_MS), new Date(), filter, maxResults);
     }
     isConnected() {
         return this.connected;
     }
     async getInvites() {
-        if (this.connected) {
-            try {
-                const response = await this.request({
-                    method: "post",
-                    endpoint: "v2/family/get_invites",
-                    data: {
-                        num: 100,
-                        orderby: "",
-                        own: false,
-                        page: 0,
-                        transaction: `${new Date().getTime().toString()}`
-                    }
-                });
-                if (response.status == 200) {
-                    const result = response.data;
-                    if (result.code == types_1.ResponseErrorCode.CODE_OK) {
-                        if (result.data) {
-                            const invites = {};
-                            const decrypted = this.decryptAPIData(result.data);
-                            logging_1.rootHTTPLogger.debug("Get invites - Decrypted invites data", { invites: decrypted });
-                            if (Array.isArray(decrypted)) {
-                                decrypted.forEach((invite) => {
-                                    invites[invite.invite_id] = invite;
-                                    let data = (0, utils_2.parseJSON)(invites[invite.invite_id].devices, logging_1.rootHTTPLogger);
-                                    if (data === undefined)
-                                        data = [];
-                                    invites[invite.invite_id].devices = data;
-                                });
-                            }
-                            return invites;
+        const data = {
+            num: 100,
+            orderby: "",
+            own: false,
+            page: 0,
+            transaction: `${new Date().getTime().toString()}`,
+        };
+        const response = await this.makePostRequest(this.apiGetInvites, data);
+        if (response !== undefined) {
+            if (response.status == 200) {
+                const result = response.data;
+                if (result.code == types_1.ResponseErrorCode.CODE_OK) {
+                    if (result.data) {
+                        const invites = {};
+                        const decrypted = this.decryptAPIData(result.data);
+                        logging_1.rootHTTPLogger.debug("Get invites - Decrypted invites data", { invites: decrypted });
+                        if (Array.isArray(decrypted)) {
+                            decrypted.forEach((invite) => {
+                                invites[invite.invite_id] = invite;
+                                let data = (0, utils_2.parseJSON)(invites[invite.invite_id].devices, logging_1.rootHTTPLogger);
+                                if (data === undefined)
+                                    data = [];
+                                invites[invite.invite_id].devices = data;
+                            });
                         }
-                    }
-                    else {
-                        logging_1.rootHTTPLogger.error("Get invites - Response code not ok", { code: result.code, msg: result.msg, data: response.data });
+                        return invites;
                     }
                 }
                 else {
-                    logging_1.rootHTTPLogger.error("Get invites - Status return code not 200", { status: response.status, statusText: response.statusText, data: response.data });
+                    logging_1.rootHTTPLogger.error("Get invites - Response code not ok", {
+                        code: result.code,
+                        msg: result.msg,
+                        data: response.data,
+                    });
                 }
             }
-            catch (err) {
-                const error = (0, error_1.ensureError)(err);
-                logging_1.rootHTTPLogger.error("Get invites - Generic Error", { error: (0, utils_2.getError)(error) });
+            else {
+                logging_1.rootHTTPLogger.error("Get invites - Status return code not 200", {
+                    status: response.status,
+                    statusText: response.statusText,
+                    data: response.data,
+                });
             }
         }
         return {};
     }
     async confirmInvites(confirmInvites) {
-        if (this.connected) {
-            try {
-                const response = await this.request({
-                    method: "post",
-                    endpoint: "v1/family/confirm_invite",
-                    data: {
-                        invites: confirmInvites,
-                        transaction: `${new Date().getTime().toString()}`
-                    }
-                });
-                if (response.status == 200) {
-                    const result = response.data;
-                    if (result.code == types_1.ResponseErrorCode.CODE_OK) {
-                        return true;
-                    }
-                    else {
-                        logging_1.rootHTTPLogger.error("Confirm invites - Response code not ok", { code: result.code, msg: result.msg, data: response.data, confirmInvites: confirmInvites });
-                    }
+        const data = {
+            invites: confirmInvites,
+            transaction: `${new Date().getTime().toString()}`,
+        };
+        const response = await this.makePostRequest(this.apiConfirmInvite, data);
+        if (response !== undefined) {
+            if (response.status == 200) {
+                const result = response.data;
+                if (result.code == types_1.ResponseErrorCode.CODE_OK) {
+                    return true;
                 }
                 else {
-                    logging_1.rootHTTPLogger.error("Confirm invites - Status return code not 200", { status: response.status, statusText: response.statusText, data: response.data, confirmInvites: confirmInvites });
+                    logging_1.rootHTTPLogger.error("Confirm invites - Response code not ok", {
+                        code: result.code,
+                        msg: result.msg,
+                        data: response.data,
+                        confirmInvites: confirmInvites,
+                    });
                 }
             }
-            catch (err) {
-                const error = (0, error_1.ensureError)(err);
-                logging_1.rootHTTPLogger.error("Confirm invites - Generic Error", { error: (0, utils_2.getError)(error), confirmInvites: confirmInvites });
+            else {
+                logging_1.rootHTTPLogger.error("Confirm invites - Status return code not 200", {
+                    status: response.status,
+                    statusText: response.statusText,
+                    data: response.data,
+                    confirmInvites: confirmInvites,
+                });
             }
         }
         return false;
@@ -1095,7 +1296,7 @@ class HTTPApi extends tiny_typed_emitter_1.TypedEmitter {
                 else {
                     const response = await this.request({
                         method: "get",
-                        endpoint: `v1/app/public_key/query?device_sn=${deviceSN}&type=${type}`
+                        endpoint: `v1/app/public_key/query?device_sn=${deviceSN}&type=${type}`,
                     });
                     if (response.status == 200) {
                         const result = response.data;
@@ -1107,17 +1308,33 @@ class HTTPApi extends tiny_typed_emitter_1.TypedEmitter {
                             }
                         }
                         else {
-                            logging_1.rootHTTPLogger.error("Get public key - Response code not ok", { code: result.code, msg: result.msg, data: response.data, deviceSN: deviceSN, type: type });
+                            logging_1.rootHTTPLogger.error("Get public key - Response code not ok", {
+                                code: result.code,
+                                msg: result.msg,
+                                data: response.data,
+                                deviceSN: deviceSN,
+                                type: type,
+                            });
                         }
                     }
                     else {
-                        logging_1.rootHTTPLogger.error("Get public key - Status return code not 200", { status: response.status, statusText: response.statusText, data: response.data, deviceSN: deviceSN, type: type });
+                        logging_1.rootHTTPLogger.error("Get public key - Status return code not 200", {
+                            status: response.status,
+                            statusText: response.statusText,
+                            data: response.data,
+                            deviceSN: deviceSN,
+                            type: type,
+                        });
                     }
                 }
             }
             catch (err) {
                 const error = (0, error_1.ensureError)(err);
-                logging_1.rootHTTPLogger.error("Get public key - Generic Error", { error: (0, utils_2.getError)(error), deviceSN: deviceSN, type: type });
+                logging_1.rootHTTPLogger.error("Get public key - Generic Error", {
+                    error: (0, utils_2.getError)(error),
+                    deviceSN: deviceSN,
+                    type: type,
+                });
             }
         }
         return "";
@@ -1130,7 +1347,10 @@ class HTTPApi extends tiny_typed_emitter_1.TypedEmitter {
             }
             catch (err) {
                 const error = (0, error_1.ensureError)(err);
-                logging_1.rootHTTPLogger.error("Data decryption error, invalidating session data and reconnecting...", { error: (0, utils_2.getError)(error), serverPublicKey: this.persistentData.serverPublicKey });
+                logging_1.rootHTTPLogger.error("Data decryption error, invalidating session data and reconnecting...", {
+                    error: (0, utils_2.getError)(error),
+                    serverPublicKey: this.persistentData.serverPublicKey,
+                });
                 this.persistentData.serverPublicKey = this.SERVER_PUBLIC_KEY;
                 this.invalidateToken();
                 this.emit("close");
@@ -1147,179 +1367,186 @@ class HTTPApi extends tiny_typed_emitter_1.TypedEmitter {
         return undefined;
     }
     async getSensorHistory(stationSN, deviceSN) {
-        if (this.connected) {
-            try {
-                const response = await this.request({
-                    method: "post",
-                    endpoint: "v1/app/get_sensor_history",
-                    data: {
-                        devicse_sn: deviceSN,
-                        max_time: 0, //TODO: Finish implementation
-                        num: 500, //TODO: Finish implementation
-                        page: 0, //TODO: Finish implementation
-                        station_sn: stationSN,
-                        transaction: `${new Date().getTime().toString()}`
-                    }
-                });
-                if (response.status == 200) {
-                    const result = response.data;
-                    if (result.code == types_1.ResponseErrorCode.CODE_OK) {
-                        if (result.data) {
-                            const entries = result.data;
-                            return entries;
-                        }
-                    }
-                    else {
-                        logging_1.rootHTTPLogger.error("Get sensor history - Response code not ok", { code: result.code, msg: result.msg, data: response.data, stationSN: stationSN, deviceSN: deviceSN });
+        const data = {
+            devicse_sn: deviceSN,
+            max_time: 0, //TODO: Finish implementation
+            num: 500, //TODO: Finish implementation
+            page: 0, //TODO: Finish implementation
+            station_sn: stationSN,
+            transaction: `${new Date().getTime().toString()}`,
+        };
+        const response = await this.makePostRequest(this.apiGetSensorHistory, data);
+        if (response !== undefined) {
+            if (response.status == 200) {
+                const result = response.data;
+                if (result.code == types_1.ResponseErrorCode.CODE_OK) {
+                    if (result.data) {
+                        const entries = result.data;
+                        return entries;
                     }
                 }
                 else {
-                    logging_1.rootHTTPLogger.error("Get sensor history - Status return code not 200", { status: response.status, statusText: response.statusText, data: response.data, stationSN: stationSN, deviceSN: deviceSN });
+                    logging_1.rootHTTPLogger.error("Get sensor history - Response code not ok", {
+                        code: result.code,
+                        msg: result.msg,
+                        data: response.data,
+                        stationSN: stationSN,
+                        deviceSN: deviceSN,
+                    });
                 }
             }
-            catch (err) {
-                const error = (0, error_1.ensureError)(err);
-                logging_1.rootHTTPLogger.error("Get sensor history - Generic Error", { error: (0, utils_2.getError)(error), stationSN: stationSN, deviceSN: deviceSN });
+            else {
+                logging_1.rootHTTPLogger.error("Get sensor history - Status return code not 200", {
+                    status: response.status,
+                    statusText: response.statusText,
+                    data: response.data,
+                    stationSN: stationSN,
+                    deviceSN: deviceSN,
+                });
             }
         }
         return [];
     }
     async getHouseDetail(houseID) {
-        if (this.connected) {
-            try {
-                const response = await this.request({
-                    method: "post",
-                    endpoint: "v2/house/detail",
-                    data: {
-                        house_id: houseID,
-                        transaction: `${new Date().getTime().toString()}`
-                    }
-                });
-                if (response.status == 200) {
-                    const result = response.data;
-                    if (result.code == types_1.ResponseErrorCode.CODE_OK) {
-                        if (result.data) {
-                            const houseDetail = this.decryptAPIData(result.data);
-                            logging_1.rootHTTPLogger.debug("Get house detail - Decrypted house detail data", { details: houseDetail });
-                            return houseDetail;
-                        }
-                    }
-                    else {
-                        logging_1.rootHTTPLogger.error("Get house detail - Response code not ok", { code: result.code, msg: result.msg, data: response.data, houseID: houseID });
+        const data = {
+            house_id: houseID,
+            transaction: `${new Date().getTime().toString()}`,
+        };
+        const response = await this.makePostRequest(this.apiGetHouseDetail, data);
+        if (response !== undefined) {
+            if (response.status == 200) {
+                const result = response.data;
+                if (result.code == types_1.ResponseErrorCode.CODE_OK) {
+                    if (result.data) {
+                        const houseDetail = this.decryptAPIData(result.data);
+                        logging_1.rootHTTPLogger.debug("Get house detail - Decrypted house detail data", { details: houseDetail });
+                        return houseDetail;
                     }
                 }
                 else {
-                    logging_1.rootHTTPLogger.error("Get house detail - Status return code not 200", { status: response.status, statusText: response.statusText, data: response.data, houseID: houseID });
+                    logging_1.rootHTTPLogger.error("Get house detail - Response code not ok", {
+                        code: result.code,
+                        msg: result.msg,
+                        data: response.data,
+                        houseID: houseID,
+                    });
                 }
             }
-            catch (err) {
-                const error = (0, error_1.ensureError)(err);
-                logging_1.rootHTTPLogger.error("Get house detail - Generic Error", { error: (0, utils_2.getError)(error), houseID: houseID });
+            else {
+                logging_1.rootHTTPLogger.error("Get house detail - Status return code not 200", {
+                    status: response.status,
+                    statusText: response.statusText,
+                    data: response.data,
+                    houseID: houseID,
+                });
             }
         }
         return null;
     }
     async getHouseList() {
-        if (this.connected) {
-            try {
-                const response = await this.request({
-                    method: "post",
-                    endpoint: "v1/house/list",
-                    data: {
-                        transaction: `${new Date().getTime().toString()}`
-                    }
-                });
-                if (response.status == 200) {
-                    const result = response.data;
-                    if (result.code == types_1.ResponseErrorCode.CODE_OK) {
-                        if (result.data) {
-                            logging_1.rootHTTPLogger.debug("Get house list - houses", { houses: result.data });
-                            return result.data;
-                        }
-                    }
-                    else {
-                        logging_1.rootHTTPLogger.error("Get house list - Response code not ok", { code: result.code, msg: result.msg, data: response.data });
+        const data = {
+            transaction: `${new Date().getTime().toString()}`,
+        };
+        const response = await this.makePostRequest(this.apiGetHouseList, data);
+        if (response !== undefined) {
+            if (response.status == 200) {
+                const result = response.data;
+                if (result.code == types_1.ResponseErrorCode.CODE_OK) {
+                    if (result.data) {
+                        logging_1.rootHTTPLogger.debug("Get house list - houses", { houses: result.data });
+                        return result.data;
                     }
                 }
                 else {
-                    logging_1.rootHTTPLogger.error("Get house list - Status return code not 200", { status: response.status, statusText: response.statusText, data: response.data });
+                    logging_1.rootHTTPLogger.error("Get house list - Response code not ok", {
+                        code: result.code,
+                        msg: result.msg,
+                        data: response.data,
+                    });
                 }
             }
-            catch (err) {
-                const error = (0, error_1.ensureError)(err);
-                logging_1.rootHTTPLogger.error("Get house list - Generic Error", { error: (0, utils_2.getError)(error) });
+            else {
+                logging_1.rootHTTPLogger.error("Get house list - Status return code not 200", {
+                    status: response.status,
+                    statusText: response.statusText,
+                    data: response.data,
+                });
             }
         }
         return [];
     }
     async getHouseInviteList(isInviter = 1) {
         //TODO: Understand the other values of isInviter and document it
-        if (this.connected) {
-            try {
-                const response = await this.request({
-                    method: "post",
-                    endpoint: "v1/house/invite_list",
-                    data: {
-                        is_inviter: isInviter,
-                        transaction: `${new Date().getTime().toString()}`
-                    }
-                });
-                if (response.status == 200) {
-                    const result = response.data;
-                    if (result.code == types_1.ResponseErrorCode.CODE_OK) {
-                        if (result.data) {
-                            //const houseInviteList = this.decryptAPIData(result.data) as Array<HouseInviteListResponse>;   // No more encrypted!?
-                            //rootHTTPLogger.debug("Get house invite list - Decrypted house invite list data", houseInviteList);
-                            const houseInviteList = result.data;
-                            logging_1.rootHTTPLogger.debug("Get house invite list - House invite list data", houseInviteList);
-                            return houseInviteList;
-                        }
-                    }
-                    else {
-                        logging_1.rootHTTPLogger.error("Get house invite list - Response code not ok", { code: result.code, msg: result.msg, data: response.data, isInviter: isInviter });
+        const data = {
+            is_inviter: isInviter,
+            transaction: `${new Date().getTime().toString()}`,
+        };
+        const response = await this.makePostRequest(this.apiGetHouseInvites, data);
+        if (response !== undefined) {
+            if (response.status == 200) {
+                const result = response.data;
+                if (result.code == types_1.ResponseErrorCode.CODE_OK) {
+                    if (result.data) {
+                        //const houseInviteList = this.decryptAPIData(result.data) as Array<HouseInviteListResponse>;   // No more encrypted!?
+                        //rootHTTPLogger.debug("Get house invite list - Decrypted house invite list data", houseInviteList);
+                        const houseInviteList = result.data;
+                        logging_1.rootHTTPLogger.debug("Get house invite list - House invite list data", houseInviteList);
+                        return houseInviteList;
                     }
                 }
                 else {
-                    logging_1.rootHTTPLogger.error("Get house invite list - Status return code not 200", { status: response.status, statusText: response.statusText, data: response.data, isInviter: isInviter });
+                    logging_1.rootHTTPLogger.error("Get house invite list - Response code not ok", {
+                        code: result.code,
+                        msg: result.msg,
+                        data: response.data,
+                        isInviter: isInviter,
+                    });
                 }
             }
-            catch (err) {
-                const error = (0, error_1.ensureError)(err);
-                logging_1.rootHTTPLogger.error("Get house invite list - Generic Error", { error: (0, utils_2.getError)(error), isInviter: isInviter });
+            else {
+                logging_1.rootHTTPLogger.error("Get house invite list - Status return code not 200", {
+                    status: response.status,
+                    statusText: response.statusText,
+                    data: response.data,
+                    isInviter: isInviter,
+                });
             }
         }
         return [];
     }
     async confirmHouseInvite(houseID, inviteID) {
-        if (this.connected) {
-            try {
-                const response = await this.request({
-                    method: "post",
-                    endpoint: "v1/house/confirm_invite",
-                    data: {
-                        house_id: houseID,
-                        invite_id: inviteID,
-                        is_inviter: 1, // 1 = true, 0 = false
-                        //user_id: "",
-                        transaction: `${new Date().getTime().toString()}`
-                    }
-                });
-                if (response.status == 200) {
-                    const result = response.data;
-                    if (result.code == types_1.ResponseErrorCode.CODE_OK) {
-                        return true;
-                    }
-                    else {
-                        logging_1.rootHTTPLogger.error("Confirm house invite - Response code not ok", { code: result.code, msg: result.msg, data: response.data, houseID: houseID, inviteID: inviteID });
-                    }
+        const data = {
+            house_id: houseID,
+            invite_id: inviteID,
+            is_inviter: 1, // 1 = true, 0 = false
+            //user_id: "",
+            transaction: `${new Date().getTime().toString()}`,
+        };
+        const response = await this.makePostRequest(this.apiConfirmHouseInvite, data);
+        if (response !== undefined) {
+            if (response.status == 200) {
+                const result = response.data;
+                if (result.code == types_1.ResponseErrorCode.CODE_OK) {
+                    return true;
                 }
                 else {
-                    logging_1.rootHTTPLogger.error("Confirm house invite - Status return code not 200", { status: response.status, statusText: response.statusText, data: response.data, houseID: houseID, inviteID: inviteID });
+                    logging_1.rootHTTPLogger.error("Confirm house invite - Response code not ok", {
+                        code: result.code,
+                        msg: result.msg,
+                        data: response.data,
+                        houseID: houseID,
+                        inviteID: inviteID,
+                    });
                 }
             }
-            catch (err) {
-                const error = (0, error_1.ensureError)(err);
-                logging_1.rootHTTPLogger.error("Confirm house invite - Generic Error", { error: (0, utils_2.getError)(error), houseID: houseID, inviteID: inviteID });
+            else {
+                logging_1.rootHTTPLogger.error("Confirm house invite - Status return code not 200", {
+                    status: response.status,
+                    statusText: response.statusText,
+                    data: response.data,
+                    houseID: houseID,
+                    inviteID: inviteID,
+                });
             }
         }
         return false;
@@ -1331,7 +1558,7 @@ class HTTPApi extends tiny_typed_emitter_1.TypedEmitter {
         try {
             const response = await this.request({
                 method: "get",
-                endpoint: "v2/passport/profile"
+                endpoint: "v2/passport/profile",
             });
             if (response.status == 200) {
                 const result = response.data;
@@ -1346,11 +1573,19 @@ class HTTPApi extends tiny_typed_emitter_1.TypedEmitter {
                     }
                 }
                 else {
-                    logging_1.rootHTTPLogger.error("Get passport profile - Response code not ok", { code: result.code, msg: result.msg, data: response.data });
+                    logging_1.rootHTTPLogger.error("Get passport profile - Response code not ok", {
+                        code: result.code,
+                        msg: result.msg,
+                        data: response.data,
+                    });
                 }
             }
             else {
-                logging_1.rootHTTPLogger.error("Get passport profile - Status return code not 200", { status: response.status, statusText: response.statusText, data: response.data });
+                logging_1.rootHTTPLogger.error("Get passport profile - Status return code not 200", {
+                    status: response.status,
+                    statusText: response.statusText,
+                    data: response.data,
+                });
             }
         }
         catch (err) {
@@ -1360,68 +1595,78 @@ class HTTPApi extends tiny_typed_emitter_1.TypedEmitter {
         return null;
     }
     async addUser(deviceSN, nickname, stationSN = "") {
-        if (this.connected) {
-            try {
-                const response = await this.request({
-                    method: "post",
-                    endpoint: "v1/app/device/local_user/add",
-                    data: {
-                        device_sn: deviceSN,
-                        nick_name: nickname,
-                        station_sn: stationSN === deviceSN ? "" : stationSN,
-                        transaction: `${new Date().getTime().toString()}`
-                    }
-                });
-                if (response.status == 200) {
-                    const result = response.data;
-                    if (result.code == types_1.ResponseErrorCode.CODE_OK) {
-                        if (result.data)
-                            return result.data;
-                    }
-                    else {
-                        logging_1.rootHTTPLogger.error("Add user - Response code not ok", { code: result.code, msg: result.msg, data: response.data, deviceSN: deviceSN, nickname: nickname, stationSN: stationSN });
-                    }
+        const data = {
+            device_sn: deviceSN,
+            nick_name: nickname,
+            station_sn: stationSN === deviceSN ? "" : stationSN,
+            transaction: `${new Date().getTime().toString()}`,
+        };
+        const response = await this.makePostRequest(this.apiAddLocalUser, data);
+        if (response !== undefined) {
+            if (response.status == 200) {
+                const result = response.data;
+                if (result.code == types_1.ResponseErrorCode.CODE_OK) {
+                    if (result.data)
+                        return result.data;
                 }
                 else {
-                    logging_1.rootHTTPLogger.error("Add user - Status return code not 200", { status: response.status, statusText: response.statusText, data: response.data, deviceSN: deviceSN, nickname: nickname, stationSN: stationSN });
+                    logging_1.rootHTTPLogger.error("Add user - Response code not ok", {
+                        code: result.code,
+                        msg: result.msg,
+                        data: response.data,
+                        deviceSN: deviceSN,
+                        nickname: nickname,
+                        stationSN: stationSN,
+                    });
                 }
             }
-            catch (err) {
-                const error = (0, error_1.ensureError)(err);
-                logging_1.rootHTTPLogger.error("Add user - Generic Error", { error: (0, utils_2.getError)(error), deviceSN: deviceSN, nickname: nickname, stationSN: stationSN });
+            else {
+                logging_1.rootHTTPLogger.error("Add user - Status return code not 200", {
+                    status: response.status,
+                    statusText: response.statusText,
+                    data: response.data,
+                    deviceSN: deviceSN,
+                    nickname: nickname,
+                    stationSN: stationSN,
+                });
             }
         }
         return null;
     }
     async deleteUser(deviceSN, shortUserId, stationSN = "") {
-        if (this.connected) {
-            try {
-                const response = await this.request({
-                    method: "post",
-                    endpoint: "v1/app/device/user/delete",
-                    data: {
-                        device_sn: deviceSN,
-                        short_user_ids: [shortUserId],
-                        station_sn: stationSN === deviceSN ? "" : stationSN,
-                        transaction: `${new Date().getTime().toString()}`
-                    }
-                });
-                if (response.status == 200) {
-                    const result = response.data;
-                    if (result.code == types_1.ResponseErrorCode.CODE_OK) {
-                        return true;
-                    }
-                    else {
-                        logging_1.rootHTTPLogger.error("Delete user - Response code not ok", { code: result.code, msg: result.msg, data: response.data, deviceSN: deviceSN, shortUserId: shortUserId, stationSN: stationSN });
-                    }
+        const data = {
+            device_sn: deviceSN,
+            short_user_ids: [shortUserId],
+            station_sn: stationSN === deviceSN ? "" : stationSN,
+            transaction: `${new Date().getTime().toString()}`,
+        };
+        const response = await this.makePostRequest(this.apiDeleteLocalUser, data);
+        if (response !== undefined) {
+            if (response.status == 200) {
+                const result = response.data;
+                if (result.code == types_1.ResponseErrorCode.CODE_OK) {
+                    return true;
                 }
                 else {
-                    logging_1.rootHTTPLogger.error("Delete user - Status return code not 200", { status: response.status, statusText: response.statusText, data: response.data, deviceSN: deviceSN, shortUserId: shortUserId, stationSN: stationSN });
+                    logging_1.rootHTTPLogger.error("Delete user - Response code not ok", {
+                        code: result.code,
+                        msg: result.msg,
+                        data: response.data,
+                        deviceSN: deviceSN,
+                        shortUserId: shortUserId,
+                        stationSN: stationSN,
+                    });
                 }
             }
-            catch (err) {
-                const error = (0, error_1.ensureError)(err);
-                logging_1.rootHTTPLogger.error("Delete user - Generic Error", { error: (0, utils_2.getError)(error), deviceSN: deviceSN, shortUserId: shortUserId, stationSN: stationSN });
+            else {
+                logging_1.rootHTTPLogger.error("Delete user - Status return code not 200", {
+                    status: response.status,
+                    statusText: response.statusText,
+                    data: response.data,
+                    deviceSN: deviceSN,
+                    shortUserId: shortUserId,
+                    stationSN: stationSN,
+                });
             }
         }
         return false;
@@ -1430,7 +1675,7 @@ class HTTPApi extends tiny_typed_emitter_1.TypedEmitter {
         try {
             const response = await this.request({
                 method: "get",
-                endpoint: `v1/app/device/user/list?device_sn=${deviceSN}&station_sn=${stationSN}`
+                endpoint: `v1/app/device/user/list?device_sn=${deviceSN}&station_sn=${stationSN}`,
             });
             if (response.status == 200) {
                 const result = response.data;
@@ -1441,16 +1686,32 @@ class HTTPApi extends tiny_typed_emitter_1.TypedEmitter {
                     }
                 }
                 else {
-                    logging_1.rootHTTPLogger.error("Get users - Response code not ok", { code: result.code, msg: result.msg, data: response.data, deviceSN: deviceSN, stationSN: stationSN });
+                    logging_1.rootHTTPLogger.error("Get users - Response code not ok", {
+                        code: result.code,
+                        msg: result.msg,
+                        data: response.data,
+                        deviceSN: deviceSN,
+                        stationSN: stationSN,
+                    });
                 }
             }
             else {
-                logging_1.rootHTTPLogger.error("Get users - Status return code not 200", { status: response.status, statusText: response.statusText, data: response.data, deviceSN: deviceSN, stationSN: stationSN });
+                logging_1.rootHTTPLogger.error("Get users - Status return code not 200", {
+                    status: response.status,
+                    statusText: response.statusText,
+                    data: response.data,
+                    deviceSN: deviceSN,
+                    stationSN: stationSN,
+                });
             }
         }
         catch (err) {
             const error = (0, error_1.ensureError)(err);
-            logging_1.rootHTTPLogger.error("Get users - Generic Error", { error: (0, utils_2.getError)(error), deviceSN: deviceSN, stationSN: stationSN });
+            logging_1.rootHTTPLogger.error("Get users - Generic Error", {
+                error: (0, utils_2.getError)(error),
+                deviceSN: deviceSN,
+                stationSN: stationSN,
+            });
         }
         return null;
     }
@@ -1467,45 +1728,57 @@ class HTTPApi extends tiny_typed_emitter_1.TypedEmitter {
         }
         catch (err) {
             const error = (0, error_1.ensureError)(err);
-            logging_1.rootHTTPLogger.error("Get user - Generic Error", { error: (0, utils_2.getError)(error), deviceSN: deviceSN, stationSN: stationSN, shortUserId: shortUserId });
+            logging_1.rootHTTPLogger.error("Get user - Generic Error", {
+                error: (0, utils_2.getError)(error),
+                deviceSN: deviceSN,
+                stationSN: stationSN,
+                shortUserId: shortUserId,
+            });
         }
         return null;
     }
     async updateUser(deviceSN, stationSN, shortUserId, nickname) {
-        if (this.connected) {
-            try {
-                const user = await this.getUser(deviceSN, stationSN, shortUserId);
-                if (user !== null) {
-                    const response = await this.request({
-                        method: "post",
-                        endpoint: "v1/app/device/local_user/update",
-                        data: {
-                            device_sn: deviceSN,
-                            nick_name: nickname,
-                            password_list: user.password_list,
-                            short_user_id: shortUserId,
-                            station_sn: stationSN === deviceSN ? "" : stationSN,
-                            user_type: user.user_type,
-                            transaction: `${new Date().getTime().toString()}`
-                        }
-                    });
-                    if (response.status == 200) {
-                        const result = response.data;
-                        if (result.code == types_1.ResponseErrorCode.CODE_OK) {
-                            return true;
-                        }
-                        else {
-                            logging_1.rootHTTPLogger.error("Update user - Response code not ok", { code: result.code, msg: result.msg, data: response.data, deviceSN: deviceSN, stationSN: stationSN, shortUserId: shortUserId, nickname: nickname });
-                        }
+        const user = await this.getUser(deviceSN, stationSN, shortUserId);
+        if (user !== null) {
+            const data = {
+                device_sn: deviceSN,
+                nick_name: nickname,
+                password_list: user.password_list,
+                short_user_id: shortUserId,
+                station_sn: stationSN === deviceSN ? "" : stationSN,
+                user_type: user.user_type,
+                transaction: `${new Date().getTime().toString()}`,
+            };
+            const response = await this.makePostRequest(this.apiUpdateLocalUser, data);
+            if (response !== undefined) {
+                if (response.status == 200) {
+                    const result = response.data;
+                    if (result.code == types_1.ResponseErrorCode.CODE_OK) {
+                        return true;
                     }
                     else {
-                        logging_1.rootHTTPLogger.error("Update user - Status return code not 200", { status: response.status, statusText: response.statusText, data: response.data, deviceSN: deviceSN, stationSN: stationSN, shortUserId: shortUserId, nickname: nickname });
+                        logging_1.rootHTTPLogger.error("Update user - Response code not ok", {
+                            code: result.code,
+                            msg: result.msg,
+                            data: response.data,
+                            deviceSN: deviceSN,
+                            stationSN: stationSN,
+                            shortUserId: shortUserId,
+                            nickname: nickname,
+                        });
                     }
                 }
-            }
-            catch (err) {
-                const error = (0, error_1.ensureError)(err);
-                logging_1.rootHTTPLogger.error("Update user - Generic Error", { error: (0, utils_2.getError)(error), deviceSN: deviceSN, stationSN: stationSN, shortUserId: shortUserId, nickname: nickname });
+                else {
+                    logging_1.rootHTTPLogger.error("Update user - Status return code not 200", {
+                        status: response.status,
+                        statusText: response.statusText,
+                        data: response.data,
+                        deviceSN: deviceSN,
+                        stationSN: stationSN,
+                        shortUserId: shortUserId,
+                        nickname: nickname,
+                    });
+                }
             }
         }
         return false;
@@ -1520,13 +1793,19 @@ class HTTPApi extends tiny_typed_emitter_1.TypedEmitter {
                         const response = await this.request({
                             method: "GET",
                             endpoint: url,
-                            responseType: "buffer"
+                            responseType: "buffer",
                         }, true);
                         if (response.status == 200) {
                             return (0, utils_1.decodeImage)(station.p2p_did, response.data);
                         }
                         else {
-                            logging_1.rootHTTPLogger.error("Get Image - Status return code not 200", { status: response.status, statusText: response.statusText, data: response.data, deviceSN: deviceSN, url: url });
+                            logging_1.rootHTTPLogger.error("Get Image - Status return code not 200", {
+                                status: response.status,
+                                statusText: response.statusText,
+                                data: response.data,
+                                deviceSN: deviceSN,
+                                url: url,
+                            });
                         }
                     }
                 }
@@ -1539,45 +1818,56 @@ class HTTPApi extends tiny_typed_emitter_1.TypedEmitter {
         return Buffer.alloc(0);
     }
     async updateUserPassword(deviceSN, shortUserId, passwordId, schedule, stationSN = "") {
-        if (this.connected) {
-            try {
-                const response = await this.request({
-                    method: "post",
-                    endpoint: "v1/app/device/password/save_or_update",
-                    data: {
-                        device_sn: deviceSN,
-                        password_list: [{
-                                password_id: passwordId,
-                                password_type: types_1.UserPasswordType.PIN,
-                                schedule: JSON.stringify({
-                                    endDay: schedule !== undefined && schedule.endDateTime !== undefined ? (0, utils_1.hexDate)(schedule.endDateTime) : "ffffffff",
-                                    endTime: schedule !== undefined && schedule.endDateTime !== undefined ? (0, utils_1.hexTime)(schedule.endDateTime) : "ffff",
-                                    startDay: schedule !== undefined && schedule.startDateTime !== undefined ? (0, utils_1.hexDate)(schedule.startDateTime) : "00000000",
-                                    startTime: schedule !== undefined && schedule.startDateTime !== undefined ? (0, utils_1.hexTime)(schedule.startDateTime) : "0000",
-                                    week: schedule !== undefined && schedule.week !== undefined ? (0, utils_1.hexWeek)(schedule) : "ff",
-                                })
-                            }],
-                        short_user_id: shortUserId,
-                        station_sn: stationSN === deviceSN ? "" : stationSN,
-                        transaction: `${new Date().getTime().toString()}`
-                    }
-                });
-                if (response.status == 200) {
-                    const result = response.data;
-                    if (result.code == types_1.ResponseErrorCode.CODE_OK) {
-                        return true;
-                    }
-                    else {
-                        logging_1.rootHTTPLogger.error("Add user - Response code not ok", { code: result.code, msg: result.msg, data: response.data, deviceSN: deviceSN, shortUserId: shortUserId, schedule: schedule, stationSN: stationSN });
-                    }
+        const data = {
+            device_sn: deviceSN,
+            password_list: [
+                {
+                    password_id: passwordId,
+                    password_type: types_1.UserPasswordType.PIN,
+                    schedule: JSON.stringify({
+                        endDay: schedule !== undefined && schedule.endDateTime !== undefined ? (0, utils_1.hexDate)(schedule.endDateTime) : "ffffffff",
+                        endTime: schedule !== undefined && schedule.endDateTime !== undefined ? (0, utils_1.hexTime)(schedule.endDateTime) : "ffff",
+                        startDay: schedule !== undefined && schedule.startDateTime !== undefined
+                            ? (0, utils_1.hexDate)(schedule.startDateTime)
+                            : "00000000",
+                        startTime: schedule !== undefined && schedule.startDateTime !== undefined ? (0, utils_1.hexTime)(schedule.startDateTime) : "0000",
+                        week: schedule !== undefined && schedule.week !== undefined ? (0, utils_1.hexWeek)(schedule) : "ff",
+                    }),
+                },
+            ],
+            short_user_id: shortUserId,
+            station_sn: stationSN === deviceSN ? "" : stationSN,
+            transaction: `${new Date().getTime().toString()}`,
+        };
+        const response = await this.makePostRequest(this.apiUpdateUserPassword, data);
+        if (response !== undefined) {
+            if (response.status == 200) {
+                const result = response.data;
+                if (result.code == types_1.ResponseErrorCode.CODE_OK) {
+                    return true;
                 }
                 else {
-                    logging_1.rootHTTPLogger.error("Add user - Status return code not 200", { status: response.status, statusText: response.statusText, data: response.data, deviceSN: deviceSN, shortUserId: shortUserId, schedule: schedule, stationSN: stationSN });
+                    logging_1.rootHTTPLogger.error("Add user - Response code not ok", {
+                        code: result.code,
+                        msg: result.msg,
+                        data: response.data,
+                        deviceSN: deviceSN,
+                        shortUserId: shortUserId,
+                        schedule: schedule,
+                        stationSN: stationSN,
+                    });
                 }
             }
-            catch (err) {
-                const error = (0, error_1.ensureError)(err);
-                logging_1.rootHTTPLogger.error("Add user - Generic Error", { error: (0, utils_2.getError)(error), deviceSN: deviceSN, shortUserId: shortUserId, schedule: schedule, stationSN: stationSN });
+            else {
+                logging_1.rootHTTPLogger.error("Add user - Status return code not 200", {
+                    status: response.status,
+                    statusText: response.statusText,
+                    data: response.data,
+                    deviceSN: deviceSN,
+                    shortUserId: shortUserId,
+                    schedule: schedule,
+                    stationSN: stationSN,
+                });
             }
         }
         return false;