Merge pull request #479 from Coding/plugin-config-bug-fix

fix plugin config persist bug

Author: KevenYoung

app/initialize/index.js

@@ -84,8 +84,9 @@ async function initialize () {
     return true
   })
 
-  await step(`[${stepNum++}] Persist Store.`, () => {
-    persistTask()
+  await step(`[${stepNum++}] Persist Store.`, async () => {
+    await persistTask()
+
     return true
   })
 

app/persist.js

@@ -17,39 +17,45 @@ const mainStore = localforage.createInstance({
 // the delay to set
 
 function persistStore (store, transform) {
-  autorunAsync(() => {
-    const customTransform = transform || createTransformer(store => mobxToJS(store))
-    const transformedPluginStore = mobxToJS(pluginSettingStore)
-    const transformedStore = customTransform(store)
-    // 初次等spacekey出现存
-    if (config.spaceKey && !mainStore._config.storeName) {
-      mainStore.config({ storeName: config.spaceKey })
-    } else if (mainStore._config.storeName && (config.globalKey || !config.isPlatform)) {
-      if (config.hasRehydrated) {
-        mainStore.setItem(`${config.spaceKey}.${config.globalKey}`, transformedStore)
-        mainStore.setItem(`${config.spaceKey}.${config.globalKey}.plugins`, transformedPluginStore)
-      } else {
-        mainStore.getItem(`${config.spaceKey}.${config.globalKey}`).then((store) => {
-          if (store) {
-            autoRehydrate(store)
-          } else {
-            dispatchCommand('global:show_env')
-            dispatchCommand('file:open_welcome')
-          }
-          fileState.initData.set('_init', false)
-          config.hasRehydrated = true
-        })
-        mainStore.getItem(`${config.spaceKey}.${config.globalKey}.plugins`).then((plugins) => {
-          for (const plugin in plugins) {
-            pluginSettingStore[plugin] = observable(plugins[plugin])
-          }
-          if (!config.hasRehydrated) {
-            config.hasRehydrated = true
-          }
-        })
+  return new Promise((resolve, reject) => {
+    autorunAsync(() => {
+      const customTransform = transform || createTransformer(store => mobxToJS(store))
+      const transformedPluginStore = mobxToJS(pluginSettingStore)
+      const transformedStore = customTransform(store)
+      // 初次等spacekey出现存
+      if (config.spaceKey && !mainStore._config.storeName) {
+        mainStore.config({ storeName: config.spaceKey })
+      } else if (mainStore._config.storeName && (config.globalKey || !config.isPlatform)) {
+        if (config.hasRehydrated) {
+          mainStore.setItem(`${config.spaceKey}.${config.globalKey}`, transformedStore)
+          mainStore.setItem(`${config.spaceKey}.${config.globalKey}.plugins`, transformedPluginStore)
+          resolve(true)
+        } else {
+          const tasks = [
+            mainStore.getItem(`${config.spaceKey}.${config.globalKey}`),
+            mainStore.getItem(`${config.spaceKey}.${config.globalKey}.plugins`)
+          ]
+          Promise.all(tasks)
+            .then(([store, pluginsStore]) => {
+              if (store) {
+                autoRehydrate(store)
+              } else {
+                dispatchCommand('global:show_env')
+                dispatchCommand('file:open_welcome')
+              }
+              fileState.initData.set('_init', false)
+
+              for (const plugin in pluginsStore) {
+                pluginSettingStore[plugin] = observable(pluginsStore[plugin])
+              }
+
+              config.hasRehydrated = true
+              resolve(true)
+            })
+        }
       }
-    }
-  }, 200)
+    }, 200)
+  })
 }
 
 export const clearPersist = (key) => {