@kennofizet/apphub-frontend 0.1.0 → 0.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kennofizet/apphub-frontend",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "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/composables/useAppHubHostApi.js

@@ -15,6 +15,12 @@ export function isBackendReadyForApp(app) {
   return !!(store?.credentials?.backendUrl && store?.credentials?.token)
 }
 
+export function isHostApiReadyForApp(app) {
+  const store = getAppHubStore(app)
+  if (!store?.credentials?.backendUrl || !store?.credentials?.token) return false
+  return store.facade?.hasImpl?.() === true
+}
+
 /**
  * Host-only API — use in Hub shell components. Not provided via inject
  * so publisher app code cannot access grantBridgeScope or internal docs.

package/src/index.js

@@ -120,7 +120,6 @@ function applyBootstrapOrigins(store, bootstrapResponse, { fromCache = false } =
   }
 
   store.options.serverOriginsResolved = true
-  store.options.originBootstrapLoading = false
 
   if (!fromCache) {
     saveBootstrapCache(store.credentials.backendUrl, bootstrapResponse)
@@ -132,7 +131,14 @@ function applyBootstrapOrigins(store, bootstrapResponse, { fromCache = false } =
     store.zoneContext.state.user.name = user.name
   }
 
+  // Reconcile while originBootstrapLoading may still be true so enableModuleApi runs
+  // after disableModuleServices (wasLoading must be captured before clearing the flag).
   reconcileOriginSafety(store)
+  store.options.originBootstrapLoading = false
+  applyOriginSafety(store.options)
+  if (!store.options.originBlocked) {
+    enableModuleApi(store)
+  }
 }
 
 function applyCachedBootstrapIfAny(store) {
@@ -153,9 +159,12 @@ async function fetchBootstrapSession(store) {
     const res = await store.facade.bootstrap()
     if (res) applyBootstrapOrigins(store, res)
   })().catch(() => {
+    const wasLoading = store.options.originBootstrapLoading === true
     store.options.originBootstrapLoading = false
     if (!store.options.serverOriginsResolved) {
       reconcileOriginSafety(store)
+    } else if (!store.options.originBlocked && (wasLoading || !store.facade?.hasImpl?.())) {
+      enableModuleApi(store)
     }
   }).finally(() => {
     bootstrapInflight.delete(store)
@@ -240,6 +249,9 @@ function createApiFacade() {
     setImpl(next) {
       impl = next
     },
+    hasImpl() {
+      return impl != null
+    },
     bootstrap: (...args) => impl?.bootstrap?.(...args),
     apps: (...args) => impl?.apps?.(...args),
     launch: (...args) => impl?.launch?.(...args),
@@ -281,13 +293,13 @@ function applyModuleOptions(store, options = {}) {
     hostedSandboxSameOrigin: nextPublic.hostedSandboxSameOrigin,
     enforceDevFriendlyOrigins: nextPublic.enforceDevFriendlyOrigins,
   })
+  Object.assign(store.credentials, buildCredentials(options))
   applyOriginSafety(store.options, options)
   if (store.credentials.backendUrl && store.credentials.token) {
     void startBootstrapSession(store)
   } else {
     reconcileOriginSafety(store)
   }
-  Object.assign(store.credentials, buildCredentials(options))
 }
 
 function syncApi(store) {
@@ -378,7 +390,11 @@ export function installAppHubModule(vueApp, options = {}) {
   vueApp.component('AppHubRunner', AppHubRunner)
 
   ensureModuleInfrastructure(vueApp, store)
-  void startBootstrapSession(store)
+  void startBootstrapSession(store).then(() => {
+    if (!store.options.originBlocked) {
+      enableModuleApi(store)
+    }
+  })
 
   return facade
 }

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

@@ -100,7 +100,7 @@
 import { computed, getCurrentInstance, inject, onMounted, ref, watch } from 'vue'
 import {
   getHostApiForApp,
-  isBackendReadyForApp,
+  isHostApiReadyForApp,
   resolveRootApp,
 } from '../../../composables/useAppHubHostApi.js'
 import { useAppHubZoneContext } from '../../../composables/useAppHubZoneContext.js'
@@ -152,11 +152,19 @@ const labels = computed(() => ({
 
 function hostApiOptions() {
   return {
-    backendReady: isBackendReadyForApp(rootApp),
+    backendReady: isHostApiReadyForApp(rootApp),
     mode: CATALOG_MODE_STORE,
   }
 }
 
+function canLoadCatalog() {
+  return (
+    !moduleOptions?.originBootstrapLoading
+    && !moduleOptions?.originBlocked
+    && isHostApiReadyForApp(rootApp)
+  )
+}
+
 async function reloadCatalog() {
   if (!rootApp) return
   await appStore.loadCatalog(getHostApiForApp(rootApp), hostApiOptions())
@@ -197,14 +205,26 @@ onMounted(() => {
 watch(
   () => moduleOptions?.hasToken,
   (hasToken) => {
-    if (hasToken && !catalog.loaded) reloadCatalog()
+    if (hasToken && canLoadCatalog() && !catalog.loaded) reloadCatalog()
+  },
+)
+
+watch(
+  () => [
+    moduleOptions?.originBootstrapLoading,
+    moduleOptions?.originBlocked,
+    isHostApiReadyForApp(rootApp),
+  ],
+  () => {
+    if (!canLoadCatalog()) return
+    if (!catalog.loaded || catalog.error === 'no_api') reloadCatalog()
   },
 )
 
 watch(
   () => [zone?.state?.selectedZoneId, zone?.state?.viewAllZones],
   () => {
-    if (moduleOptions?.hasToken) reloadCatalog()
+    if (canLoadCatalog()) reloadCatalog()
   },
 )
 </script>

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

@@ -65,7 +65,7 @@
 import { computed, getCurrentInstance, inject, onMounted, reactive, ref, watch } from 'vue'
 import {
   getHostApiForApp,
-  isBackendReadyForApp,
+  isHostApiReadyForApp,
   resolveRootApp,
 } from '../../../composables/useAppHubHostApi.js'
 import { useAppHubZoneContext } from '../../../composables/useAppHubZoneContext.js'
@@ -119,11 +119,19 @@ const labels = computed(() => ({
 
 function hostApiOptions() {
   return {
-    backendReady: isBackendReadyForApp(rootApp),
+    backendReady: isHostApiReadyForApp(rootApp),
     mode: CATALOG_MODE_DRAFT,
   }
 }
 
+function canLoadCatalog() {
+  return (
+    !moduleOptions?.originBootstrapLoading
+    && !moduleOptions?.originBlocked
+    && isHostApiReadyForApp(rootApp)
+  )
+}
+
 async function reloadCatalog() {
   if (!rootApp) return
   await appStore.loadCatalog(getHostApiForApp(rootApp), hostApiOptions())
@@ -171,14 +179,26 @@ onMounted(() => {
 watch(
   () => moduleOptions?.hasToken,
   (hasToken) => {
-    if (hasToken && !catalog.loaded) reloadCatalog()
+    if (hasToken && canLoadCatalog() && !catalog.loaded) reloadCatalog()
+  },
+)
+
+watch(
+  () => [
+    moduleOptions?.originBootstrapLoading,
+    moduleOptions?.originBlocked,
+    isHostApiReadyForApp(rootApp),
+  ],
+  () => {
+    if (!canLoadCatalog()) return
+    if (!catalog.loaded || catalog.error === 'no_api') reloadCatalog()
   },
 )
 
 watch(
   () => [zone?.state?.selectedZoneId, zone?.state?.viewAllZones],
   () => {
-    if (moduleOptions?.hasToken) reloadCatalog()
+    if (canLoadCatalog()) reloadCatalog()
   },
 )
 </script>

package/src/modules/app-store/composables/useAppStore.js

@@ -102,7 +102,7 @@ export function createAppStoreState(options = {}) {
     const append = options.append === true
     const backendReady = options.backendReady !== false
 
-    if (!backendReady || !hostApi?.apps) {
+    if (!backendReady || !hostApi?.hasImpl?.()) {
       if (!append) {
         bucket.items = []
         bucket.error = 'no_api'