@kennofizet/apphub-frontend 0.1.2 → 0.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kennofizet/apphub-frontend",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "App Hub Vue 3 UI — Windows-style desktop shell and modular apps (App Store default).",
   "main": "./src/index.js",
   "module": "./src/index.js",

package/src/index.js

@@ -208,8 +208,6 @@ function reconcileOriginSafety(store) {
 
   if (store.options.originBlocked && !wasBlocked) {
     disableModuleServices(store)
-  } else if (!store.options.originBlocked && (wasBlocked || wasLoading)) {
-    enableModuleApi(store)
   }
 }
 
@@ -294,6 +292,7 @@ function applyModuleOptions(store, options = {}) {
     enforceDevFriendlyOrigins: nextPublic.enforceDevFriendlyOrigins,
   })
   Object.assign(store.credentials, buildCredentials(options))
+  store._zonesSyncKey = null
   applyOriginSafety(store.options, options)
   if (store.credentials.backendUrl && store.credentials.token) {
     void startBootstrapSession(store)
@@ -332,11 +331,29 @@ function ensureZoneContext(app, store) {
   app.provide(APPHUB_ZONE_CONTEXT_KEY, store.zoneContext)
 }
 
-function syncZoneContext(store) {
+function zoneSyncKey(store) {
+  const { coreUrl, token } = store.credentials
+  return `${coreUrl}::${token}`
+}
+
+function syncZoneContext(store, { force = false } = {}) {
   syncCoreApi(store)
-  if (store.zoneContext) {
-    store.zoneContext.refresh({ skipBootstrap: true })
+  if (!store.zoneContext || !store.coreApi) return
+
+  const key = zoneSyncKey(store)
+  if (!force && store._zonesSyncKey === key && store.zoneContext.state.zones.length > 0) {
+    return store._zonesRefreshInflight ?? undefined
+  }
+  if (store._zonesRefreshInflight) {
+    return store._zonesRefreshInflight
   }
+
+  store._zonesSyncKey = key
+  store._zonesRefreshInflight = store.zoneContext.refresh({ skipBootstrap: true })
+    .finally(() => {
+      store._zonesRefreshInflight = null
+    })
+  return store._zonesRefreshInflight
 }
 
 function ensureModuleState(app, store) {
@@ -390,11 +407,7 @@ export function installAppHubModule(vueApp, options = {}) {
   vueApp.component('AppHubRunner', AppHubRunner)
 
   ensureModuleInfrastructure(vueApp, store)
-  void startBootstrapSession(store).then(() => {
-    if (!store.options.originBlocked) {
-      enableModuleApi(store)
-    }
-  })
+  void startBootstrapSession(store)
 
   return facade
 }

package/src/modules/app-store/components/AppHubAppStoreApp.vue

@@ -210,21 +210,21 @@ watch(
 )
 
 watch(
-  () => [
-    moduleOptions?.originBootstrapLoading,
-    moduleOptions?.originBlocked,
-    isHostApiReadyForApp(rootApp),
-  ],
-  () => {
-    if (!canLoadCatalog()) return
-    if (!catalog.loaded || catalog.error === 'no_api') reloadCatalog()
+  () => moduleOptions?.originBootstrapLoading,
+  (loading, prevLoading) => {
+    if (prevLoading && !loading && canLoadCatalog()) {
+      reloadCatalog()
+    }
   },
 )
 
 watch(
   () => [zone?.state?.selectedZoneId, zone?.state?.viewAllZones],
-  () => {
-    if (canLoadCatalog()) reloadCatalog()
+  (current, previous) => {
+    if (!previous) return
+    if (current[0] === previous[0] && current[1] === previous[1]) return
+    if (!canLoadCatalog() || !catalog.loaded) return
+    reloadCatalog()
   },
 )
 </script>

package/src/modules/app-store/components/AppHubDraftStoreApp.vue

@@ -184,21 +184,21 @@ watch(
 )
 
 watch(
-  () => [
-    moduleOptions?.originBootstrapLoading,
-    moduleOptions?.originBlocked,
-    isHostApiReadyForApp(rootApp),
-  ],
-  () => {
-    if (!canLoadCatalog()) return
-    if (!catalog.loaded || catalog.error === 'no_api') reloadCatalog()
+  () => moduleOptions?.originBootstrapLoading,
+  (loading, prevLoading) => {
+    if (prevLoading && !loading && canLoadCatalog()) {
+      reloadCatalog()
+    }
   },
 )
 
 watch(
   () => [zone?.state?.selectedZoneId, zone?.state?.viewAllZones],
-  () => {
-    if (canLoadCatalog()) reloadCatalog()
+  (current, previous) => {
+    if (!previous) return
+    if (current[0] === previous[0] && current[1] === previous[1]) return
+    if (!canLoadCatalog() || !catalog.loaded) return
+    reloadCatalog()
   },
 )
 </script>