@ray-js/lock-sdk 1.1.1-beta.19 → 1.1.1-beta.20

package/lib/temporary.js

@@ -3,47 +3,17 @@ import config from "./config";
 import { formatWeek, isUseNearChannel, parallelOnly, parseOfflinePassword, parseWeek, validateEffectiveConfig, } from "./utils";
 import { LoopTypes } from "./utils/constant";
 import { encrypt } from "./utils/device";
-import { getError } from "./utils/errors";
+import { getError, handleCloudError } from "./utils/errors";
 import { addTempPwd as addTempPwdDpMap, reportAddTempPwd as reportAddTempPwdDpMap, removeTempPwd as removeTempPwdDpMap, reportRemoveTempPwd as reportRemoveTempPwdDpMap, } from "./config/dp-map/unlock-method";
 import { addTempPwd as addTempPwdBigDpMap, reportAddTempPwd as reportAddTempPwdDBigpMap, removeTempPwd as removeTempPwdBigDpMap, reportRemoveTempPwd as reportRemoveTempPwdBigDpMap, } from "./config/dp-map/unlock-method-big";
 import { publishDps } from "./utils/publishDps";
 import dpCodes from "./config/dp-code";
 import dpUtils from "@ray-js/tuya-dp-transform";
 const PASSWORD_REGEX = /^[0-9]+$/;
-const handleError = (err) => {
-    if (err?.innerError?.errorCode) {
-        let error;
-        switch (err.innerError.errorCode) {
-            case "USER_PWD_ALREADY_EXIST":
-                error = getError(1037);
-                break;
-            case "LOCK_PWD_NAME_REPEAT":
-            case "OFFLINE_PWD_NAME_REPEAT":
-                error = getError(1038);
-                break;
-            case "START_END_DATE_NOT_RIGHT":
-                error = getError(1039);
-                break;
-            case "RECORD_NOT_EXIST":
-                error = getError(1040);
-                break;
-            case "OFFLINE_PWD_EXAUST_IN_PERIOD":
-                error = getError(1067);
-                break;
-            default:
-        }
-        if (error) {
-            error.errorMsg = err.innerError.errorMsg;
-            error.innerError = err.innerError;
-            throw error;
-        }
-    }
-    throw err;
-};
 const isValidPassword = async (params) => {
     const validateResult = await validateTempPwd(params);
     if (!validateResult.valid) {
-        handleError(validateResult);
+        handleCloudError(validateResult);
     }
     return true;
 };
@@ -160,7 +130,7 @@ export const createTempCustom = parallelOnly(async (params) => {
             };
         }
         catch (error) {
-            throw handleError(error);
+            throw handleCloudError(error);
         }
     }
 });
@@ -202,7 +172,7 @@ export const removeTempCustom = async (params) => {
         }
     }
     catch (e) {
-        handleError(e);
+        handleCloudError(e);
     }
 };
 export const updateTempCustom = async (params) => {
@@ -236,7 +206,7 @@ export const updateTempCustom = async (params) => {
         });
     }
     catch (error) {
-        handleError(error);
+        handleCloudError(error);
     }
 };
 const getOfflinePassword = async (params) => {
@@ -244,7 +214,7 @@ const getOfflinePassword = async (params) => {
         return await createOfflinePassword(params);
     }
     catch (error) {
-        throw handleError(error);
+        throw handleCloudError(error);
     }
 };
 export const createTempLimit = async (params) => {
@@ -512,7 +482,7 @@ const changePasswordPhase = async (unlockBindingId, phase) => {
         });
     }
     catch (e) {
-        handleError(e);
+        handleCloudError(e);
     }
     return true;
 };
@@ -548,7 +518,7 @@ export const renameTemp = async (params) => {
         }
     }
     catch (e) {
-        handleError(e);
+        handleCloudError(e);
     }
 };
 export const saveTempOnlineUnlimited = async (params) => {
@@ -594,7 +564,7 @@ export const saveTempOnlineUnlimited = async (params) => {
         };
     }
     catch (error) {
-        throw handleError(error);
+        throw handleCloudError(error);
     }
 };
 export const createTempOffline = async (params) => {
@@ -652,7 +622,7 @@ export const removeTempOnlineUnlimited = async (id) => {
         });
     }
     catch (error) {
-        throw handleError(error);
+        throw handleCloudError(error);
     }
 };
 const onLinePasswordStatusMap = {
@@ -686,7 +656,7 @@ export const getTempOnlineUnlimitedList = async () => {
         return newPswList;
     }
     catch (error) {
-        throw handleError(error);
+        throw handleCloudError(error);
     }
 };
 const offlinePasswordTypeMap = {
@@ -705,7 +675,7 @@ export const getTempOfflineEffectiveList = async (pwdTypeCode) => {
         return offLineValidPswList;
     }
     catch (error) {
-        throw handleError(error);
+        throw handleCloudError(error);
     }
 };
 export const getTempOfflineInvalidList = async (pwdTypeCode) => {
@@ -718,6 +688,6 @@ export const getTempOfflineInvalidList = async (pwdTypeCode) => {
         return offLineFailurePswList;
     }
     catch (error) {
-        throw handleError(error);
+        throw handleCloudError(error);
     }
 };

package/lib/user.d.ts

@@ -19,7 +19,7 @@ interface updateUserLimitTimeParams {
     effective?: EffectiveConfig;
     offlineUnlock?: boolean;
 }
-export declare const updateUserLimitTime: (params: updateUserLimitTimeParams) => Promise<boolean>;
+export declare const updateUserLimitTime: (params: updateUserLimitTimeParams) => Promise<true | undefined>;
 export declare const openAddFamilyUser: () => Promise<unknown>;
 export declare const openFamilyUserDetail: (userId: string) => Promise<undefined>;
 interface AddUserParams {

package/lib/user.js

@@ -5,7 +5,7 @@ import { update as updateMapBig, reportUpdate as reportUpdateMapBig, } from "./c
 import { publishDps } from "./utils/publishDps";
 import dpCodes from "./config/dp-code";
 import DpUtils from "@ray-js/tuya-dp-transform";
-import { getError } from "./utils/errors";
+import { getError, handleCloudError } from "./utils/errors";
 import { updateUserTimeSchedule, addNormalUser, removeNormalUser, } from "./api/user";
 import { validConfigDpMap } from "./config/dp-map/common";
 import { formatTimestampToMilliseconds, formatWeek, getPermanentSetting, isAdmin, isUseNearChannel, parseWeek, unlockMethodConfigs, validateEffectiveConfig, } from "./utils";
@@ -159,33 +159,33 @@ export const updateUserLimitTime = async (params) => {
                 endMinute: expiredTime % 60,
             },
     };
-    try {
-        const dpCode = config.supportBigData
-            ? dpCodes.unlockMethodEditW
-            : dpCodes.unlockMethodEdit;
-        const res = (await publishDps({
-            [dpCode]: DpUtils.format(dpValue, (config.supportBigData ? updateMapBig : updateMap)),
-        }, {
-            checkReport: (dps) => {
-                if (typeof dps[dpCode] !== "undefined") {
-                    const result = DpUtils.parse(dps[dpCode], (config.supportBigData
-                        ? reportUpdateMapBig
-                        : reportUpdateMap));
-                    if (result.type === 0) {
-                        if (result.memberId === lockUserId) {
-                            return result;
-                        }
-                        else {
-                            console.warn("An incorrect member id was returned");
-                        }
+    const dpCode = config.supportBigData
+        ? dpCodes.unlockMethodEditW
+        : dpCodes.unlockMethodEdit;
+    const res = (await publishDps({
+        [dpCode]: DpUtils.format(dpValue, (config.supportBigData ? updateMapBig : updateMap)),
+    }, {
+        checkReport: (dps) => {
+            if (typeof dps[dpCode] !== "undefined") {
+                const result = DpUtils.parse(dps[dpCode], (config.supportBigData
+                    ? reportUpdateMapBig
+                    : reportUpdateMap));
+                if (result.type === 0) {
+                    if (result.memberId === lockUserId) {
+                        return result;
+                    }
+                    else {
+                        console.warn("An incorrect member id was returned");
                     }
                 }
-                return false;
-            },
-        }));
-        if (res.status !== 255) {
-            throw getError(1011);
-        }
+            }
+            return false;
+        },
+    }));
+    if (res.status !== 255) {
+        throw getError(1011);
+    }
+    try {
         await updateUserTimeSchedule({
             devId: config.devInfo.devId,
             userId: userId,
@@ -204,11 +204,11 @@ export const updateUserLimitTime = async (params) => {
                 ],
             },
         });
+        return true;
     }
     catch (e) {
-        throw getError(1012);
+        handleCloudError(e, 1012);
     }
-    return true;
 };
 export const openAddFamilyUser = async () => {
     const homeInfo = await getCurrentHomeInfo();

package/lib/utils/errors.d.ts

@@ -1,2 +1,3 @@
 import { ErrorData } from "../interface";
 export declare const getError: (code: number, ...places: string[]) => ErrorData;
+export declare const handleCloudError: (err: any, code?: number) => never;

package/lib/utils/errors.js

@@ -87,3 +87,36 @@ export const getError = (code, ...places) => {
         errorMsg: "unknow error",
     };
 };
+export const handleCloudError = (err, code) => {
+    if (err?.innerError?.errorCode) {
+        let error;
+        switch (err.innerError.errorCode) {
+            case "USER_PWD_ALREADY_EXIST":
+                error = getError(1037);
+                break;
+            case "LOCK_PWD_NAME_REPEAT":
+            case "OFFLINE_PWD_NAME_REPEAT":
+                error = getError(1038);
+                break;
+            case "START_END_DATE_NOT_RIGHT":
+                error = getError(1039);
+                break;
+            case "RECORD_NOT_EXIST":
+                error = getError(1040);
+                break;
+            case "OFFLINE_PWD_EXAUST_IN_PERIOD":
+                error = getError(1067);
+                break;
+            default:
+        }
+        if (error) {
+            error.errorMsg = err.innerError.errorMsg;
+            error.innerError = err.innerError;
+            throw error;
+        }
+    }
+    if (code) {
+        throw getError(code);
+    }
+    throw err;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/lock-sdk",
-  "version": "1.1.1-beta.19",
+  "version": "1.1.1-beta.20",
   "files": [
     "lib",
     "LICENSE.md"