@tarojs/plugin-platform-harmony-ets 4.0.0-beta.44 → 4.0.0-beta.46

package/dist/runtime-utils.js

@@ -3235,6 +3235,7 @@ const createCacheManager = /* @__PURE__ */ temporarilyNotSupport('createCacheMan
 let context;
 let kvManager;
 let kvStore;
+let kvStorePromise;
 Current.contextPromise.then((ctx) => {
     context = ctx;
     const kvManagerConfig = {
@@ -3256,13 +3257,16 @@ Current.contextPromise.then((ctx) => {
             securityLevel: distributedKVStore.SecurityLevel.S1
         };
         const data = bundleManager.getBundleInfoForSelfSync(bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_APPLICATION);
-        kvManager.getKVStore(`${data.appInfo.uid}Store`, options, (err, store) => {
-            if (err) {
-                console.error(`Failed to get KVStore: Code:${err.code},message:${err.message}`);
-                return;
-            }
-            kvStore = store;
-            // 请确保获取到键值数据库实例后，再进行相关数据操作
+        kvStorePromise = new Promise(resolve => {
+            kvManager.getKVStore(`${data.appInfo.uid}Store`, options, (err, store) => {
+                if (err) {
+                    console.error(`Failed to get KVStore: Code:${err.code},message:${err.message}`);
+                    return;
+                }
+                kvStore = store;
+                // 请确保获取到键值数据库实例后，再进行相关数据操作
+                resolve();
+            });
         });
     }
     catch (e) {
@@ -3274,7 +3278,7 @@ const storageSchema = {
     key: 'String'
 };
 function checkContextExist(api, isAsync = false) {
-    if (!context || !kvStore) {
+    if (!context) {
         const message = `${api} 调用失败，Taro 不支持过早地调用 ${api}，请确保页面已经渲染完成再调用此 API`;
         if (isAsync) {
             return {
@@ -3302,20 +3306,22 @@ function getStorage(options) {
     const { key, success, fail, complete } = options || {};
     const handle = new MethodHandler({ name, success, fail, complete });
     return new Promise((resolve, reject) => {
-        try {
-            validateParams(name, options, storageSchema);
-        }
-        catch (error) {
-            const res = { errMsg: error.message };
-            return handle.fail(res, { resolve, reject });
-        }
-        kvStore = kvStore;
-        kvStore.get(key, (err, data) => {
-            if (err) {
-                handle.fail({ errMsg: `Failed to get data. Code:${err.code},message:${err.message}` }, { resolve, reject });
-                return;
+        kvStorePromise.then(() => {
+            try {
+                validateParams(name, options, storageSchema);
+            }
+            catch (error) {
+                const res = { errMsg: error.message };
+                return handle.fail(res, { resolve, reject });
             }
-            handle.success({ data }, { resolve, reject });
+            kvStore = kvStore;
+            kvStore.get(key, (err, data) => {
+                if (err) {
+                    handle.fail({ errMsg: `Failed to get data. Code:${err.code},message:${err.message}` }, { resolve, reject });
+                    return;
+                }
+                handle.success({ data }, { resolve, reject });
+            });
         });
     });
 }
@@ -3328,20 +3334,22 @@ function setStorage(options) {
     const { key, data, success, fail, complete } = options || {};
     const handle = new MethodHandler({ name, success, fail, complete });
     return new Promise((resolve, reject) => {
-        try {
-            validateParams(name, options, storageSchema);
-        }
-        catch (error) {
-            const res = { errMsg: error.message };
-            return handle.fail(res, { resolve, reject });
-        }
-        kvStore = kvStore;
-        kvStore.put(key, data, (err) => {
-            if (err) {
-                handle.fail({ errMsg: `Failed to put data. Code:${err.code},message:${err.message}` }, { resolve, reject });
-                return;
+        kvStorePromise.then(() => {
+            try {
+                validateParams(name, options, storageSchema);
             }
-            handle.success({}, { resolve, reject });
+            catch (error) {
+                const res = { errMsg: error.message };
+                return handle.fail(res, { resolve, reject });
+            }
+            kvStore = kvStore;
+            kvStore.put(key, data, (err) => {
+                if (err) {
+                    handle.fail({ errMsg: `Failed to put data. Code:${err.code},message:${err.message}` }, { resolve, reject });
+                    return;
+                }
+                handle.success({}, { resolve, reject });
+            });
         });
     });
 }
@@ -3354,20 +3362,22 @@ function removeStorage(options) {
     const { key, success, fail, complete } = options || {};
     const handle = new MethodHandler({ name, success, fail, complete });
     return new Promise((resolve, reject) => {
-        try {
-            validateParams(name, options, storageSchema);
-        }
-        catch (error) {
-            const res = { errMsg: error.message };
-            return handle.fail(res, { resolve, reject });
-        }
-        kvStore = kvStore;
-        kvStore.delete(key, (err) => {
-            if (err) {
-                handle.fail({ errMsg: `Failed to delete data. Code:${err.code},message:${err.message}` }, { resolve, reject });
-                return;
+        kvStorePromise.then(() => {
+            try {
+                validateParams(name, options, storageSchema);
+            }
+            catch (error) {
+                const res = { errMsg: error.message };
+                return handle.fail(res, { resolve, reject });
             }
-            handle.success({}, { resolve, reject });
+            kvStore = kvStore;
+            kvStore.delete(key, (err) => {
+                if (err) {
+                    handle.fail({ errMsg: `Failed to delete data. Code:${err.code},message:${err.message}` }, { resolve, reject });
+                    return;
+                }
+                handle.success({}, { resolve, reject });
+            });
         });
     });
 }