@kennofizet/apphub-frontend 0.1.4 → 0.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kennofizet/apphub-frontend",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "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

@@ -6,36 +6,15 @@ export function resolveRootApp(instance = getCurrentInstance()) {
   return instance.appContext?.app ?? instance.app ?? null
 }
 
-export function resolveHostApp(app) {
-  if (app != null) return app
-  const instance = getCurrentInstance()
-  if (!instance) return null
-  return instance.appContext?.app ?? instance.app ?? null
-}
-
-export function getAppHubStoreForApp(app) {
-  const resolved = resolveHostApp(app)
-  return resolved != null ? getAppHubStore(resolved) : null
-}
-
 export function getHostApiForApp(app) {
-  return getAppHubStoreForApp(app)?.facade ?? null
+  return getAppHubStore(app)?.facade ?? null
 }
 
 export function isBackendReadyForApp(app) {
-  const store = getAppHubStoreForApp(app)
+  const store = getAppHubStore(app)
   return !!(store?.credentials?.backendUrl && store?.credentials?.token)
 }
 
-export function isHostApiReadyForApp(app) {
-  const store = getAppHubStoreForApp(app)
-  if (!store?.credentials?.backendUrl || !store?.credentials?.token) return false
-  if (typeof store.facade?.hasImpl === 'function') {
-    return store.facade.hasImpl()
-  }
-  return !!store.facade
-}
-
 /**
  * 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

@@ -136,9 +136,6 @@ function applyBootstrapOrigins(store, bootstrapResponse, { fromCache = false } =
   reconcileOriginSafety(store)
   store.options.originBootstrapLoading = false
   applyOriginSafety(store.options)
-  if (!store.options.originBlocked) {
-    enableModuleApi(store)
-  }
 }
 
 function applyCachedBootstrapIfAny(store) {
@@ -159,12 +156,9 @@ 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)
@@ -208,6 +202,8 @@ function reconcileOriginSafety(store) {
 
   if (store.options.originBlocked && !wasBlocked) {
     disableModuleServices(store)
+  } else if (!store.options.originBlocked && (wasBlocked || wasLoading)) {
+    enableModuleApi(store)
   }
 }
 
@@ -247,9 +243,6 @@ 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),
@@ -291,14 +284,13 @@ function applyModuleOptions(store, options = {}) {
     hostedSandboxSameOrigin: nextPublic.hostedSandboxSameOrigin,
     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)
   } else {
     reconcileOriginSafety(store)
   }
+  Object.assign(store.credentials, buildCredentials(options))
 }
 
 function syncApi(store) {
@@ -331,29 +323,11 @@ function ensureZoneContext(app, store) {
   app.provide(APPHUB_ZONE_CONTEXT_KEY, store.zoneContext)
 }
 
-function zoneSyncKey(store) {
-  const { coreUrl, token } = store.credentials
-  return `${coreUrl}::${token}`
-}
-
-function syncZoneContext(store, { force = false } = {}) {
+function syncZoneContext(store) {
   syncCoreApi(store)
-  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
+  if (store.zoneContext) {
+    store.zoneContext.refresh({ skipBootstrap: true })
   }
-
-  store._zonesSyncKey = key
-  store._zonesRefreshInflight = store.zoneContext.refresh({ skipBootstrap: true })
-    .finally(() => {
-      store._zonesRefreshInflight = null
-    })
-  return store._zonesRefreshInflight
 }
 
 function ensureModuleState(app, store) {
@@ -375,14 +349,11 @@ export function installAppHubModule(vueApp, options = {}) {
   let store = getAppHubStore(vueApp)
 
   if (store) {
-    vueApp.provide('apphubHostApp', vueApp)
     applyModuleOptions(store, options)
     ensureModuleInfrastructure(vueApp, store)
-    // While bootstrap is in flight, leave API state to startBootstrapSession — do not
-    // disable again (hub-host-starter may re-apply config when parent re-sends postMessage).
-    if (store.options.originBlocked) {
+    if (store.options.originBootstrapLoading || store.options.originBlocked) {
       disableModuleServices(store)
-    } else if (!store.options.originBootstrapLoading) {
+    } else {
       enableModuleApi(store)
     }
     return store.facade
@@ -405,7 +376,6 @@ export function installAppHubModule(vueApp, options = {}) {
   }
   registerAppHubStore(vueApp, store)
 
-  vueApp.provide('apphubHostApp', vueApp)
   vueApp.provide('apphubOptions', moduleOptions)
   vueApp.component('AppHubDesktop', AppHubDesktop)
   vueApp.component('AppHubRunner', AppHubRunner)

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

@@ -100,7 +100,7 @@
 import { computed, getCurrentInstance, inject, onMounted, ref, watch } from 'vue'
 import {
   getHostApiForApp,
-  isHostApiReadyForApp,
+  isBackendReadyForApp,
   resolveRootApp,
 } from '../../../composables/useAppHubHostApi.js'
 import { useAppHubZoneContext } from '../../../composables/useAppHubZoneContext.js'
@@ -122,7 +122,7 @@ const props = defineProps({
 const settingsOpen = ref(false)
 const appStore = useAppStore()
 const catalog = appStore.catalogs.store
-const rootApp = inject('apphubHostApp', null) ?? resolveRootApp(getCurrentInstance())
+const rootApp = resolveRootApp(getCurrentInstance())
 const zone = useAppHubZoneContext()
 const moduleOptions = inject('apphubOptions', {})
 const lang = computed(() => resolveLang(moduleOptions?.language, 'vi'))
@@ -152,19 +152,11 @@ const labels = computed(() => ({
 
 function hostApiOptions() {
   return {
-    backendReady: isHostApiReadyForApp(rootApp),
+    backendReady: isBackendReadyForApp(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())
@@ -205,26 +197,14 @@ onMounted(() => {
 watch(
   () => moduleOptions?.hasToken,
   (hasToken) => {
-    if (hasToken && canLoadCatalog() && !catalog.loaded) reloadCatalog()
-  },
-)
-
-watch(
-  () => moduleOptions?.originBootstrapLoading,
-  (loading, prevLoading) => {
-    if (prevLoading && !loading && canLoadCatalog()) {
-      reloadCatalog()
-    }
+    if (hasToken && !catalog.loaded) reloadCatalog()
   },
 )
 
 watch(
   () => [zone?.state?.selectedZoneId, zone?.state?.viewAllZones],
-  (current, previous) => {
-    if (!previous) return
-    if (current[0] === previous[0] && current[1] === previous[1]) return
-    if (!canLoadCatalog() || !catalog.loaded) return
-    reloadCatalog()
+  () => {
+    if (moduleOptions?.hasToken) 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,
-  isHostApiReadyForApp,
+  isBackendReadyForApp,
   resolveRootApp,
 } from '../../../composables/useAppHubHostApi.js'
 import { useAppHubZoneContext } from '../../../composables/useAppHubZoneContext.js'
@@ -83,7 +83,7 @@ const props = defineProps({
 
 const appStore = useAppStore()
 const catalog = appStore.catalogs.draft
-const rootApp = inject('apphubHostApp', null) ?? resolveRootApp(getCurrentInstance())
+const rootApp = resolveRootApp(getCurrentInstance())
 const zone = useAppHubZoneContext()
 const moduleOptions = inject('apphubOptions', {})
 const lang = computed(() => resolveLang(moduleOptions?.language, 'vi'))
@@ -119,19 +119,11 @@ const labels = computed(() => ({
 
 function hostApiOptions() {
   return {
-    backendReady: isHostApiReadyForApp(rootApp),
+    backendReady: isBackendReadyForApp(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())
@@ -179,26 +171,14 @@ onMounted(() => {
 watch(
   () => moduleOptions?.hasToken,
   (hasToken) => {
-    if (hasToken && canLoadCatalog() && !catalog.loaded) reloadCatalog()
-  },
-)
-
-watch(
-  () => moduleOptions?.originBootstrapLoading,
-  (loading, prevLoading) => {
-    if (prevLoading && !loading && canLoadCatalog()) {
-      reloadCatalog()
-    }
+    if (hasToken && !catalog.loaded) reloadCatalog()
   },
 )
 
 watch(
   () => [zone?.state?.selectedZoneId, zone?.state?.viewAllZones],
-  (current, previous) => {
-    if (!previous) return
-    if (current[0] === previous[0] && current[1] === previous[1]) return
-    if (!canLoadCatalog() || !catalog.loaded) return
-    reloadCatalog()
+  () => {
+    if (moduleOptions?.hasToken) reloadCatalog()
   },
 )
 </script>

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

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