@kennofizet/apphub-frontend 0.1.5 → 0.1.7

package/package.json

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

@@ -24,6 +24,11 @@ import {
   loadBootstrapCache,
   saveBootstrapCache,
 } from './utils/bootstrapCache.js'
+import {
+  apphubDebug,
+  describeHostApi,
+  describeStore,
+} from './utils/apphubDebug.js'
 
 const bootstrapInflight = new WeakMap()
 
@@ -136,6 +141,7 @@ function applyBootstrapOrigins(store, bootstrapResponse, { fromCache = false } =
   reconcileOriginSafety(store)
   store.options.originBootstrapLoading = false
   applyOriginSafety(store.options)
+  apphubDebug('bootstrap', 'applyBootstrapOrigins done', describeStore(store))
 }
 
 function applyCachedBootstrapIfAny(store) {
@@ -150,12 +156,24 @@ async function fetchBootstrapSession(store) {
   if (promise) return promise
 
   promise = (async () => {
+    apphubDebug('bootstrap', 'fetchBootstrapSession start', describeStore(store))
     syncApi(store)
-    if (!store.facade?.bootstrap) return
+    if (!store.facade?.bootstrap) {
+      apphubDebug('bootstrap', 'fetchBootstrapSession abort — no bootstrap fn', describeStore(store))
+      return
+    }
 
     const res = await store.facade.bootstrap()
+    apphubDebug('bootstrap', 'fetchBootstrapSession bootstrap response', {
+      ...describeStore(store),
+      hasResponse: !!res,
+    })
     if (res) applyBootstrapOrigins(store, res)
-  })().catch(() => {
+  })().catch((err) => {
+    apphubDebug('bootstrap', 'fetchBootstrapSession failed', {
+      ...describeStore(store),
+      error: err?.message ?? String(err),
+    })
     store.options.originBootstrapLoading = false
     if (!store.options.serverOriginsResolved) {
       reconcileOriginSafety(store)
@@ -170,6 +188,11 @@ async function fetchBootstrapSession(store) {
 
 function startBootstrapSession(store) {
   const { backendUrl, token } = store.credentials
+  apphubDebug('bootstrap', 'startBootstrapSession', {
+    ...describeStore(store),
+    hasBackendUrl: !!backendUrl,
+    hasToken: !!token,
+  })
   if (!backendUrl || !token) {
     store.options.originBootstrapLoading = false
     reconcileOriginSafety(store)
@@ -180,11 +203,15 @@ function startBootstrapSession(store) {
   applyOriginSafety(store.options)
 
   const hadCache = applyCachedBootstrapIfAny(store)
+  apphubDebug('bootstrap', 'startBootstrapSession after cache', {
+    hadCache,
+    ...describeStore(store),
+  })
   if (!hadCache && !store.options.originBlocked) {
     store.options.originBootstrapLoading = true
     store.options.originBlocked = false
     applyOriginSafety(store.options)
-    disableModuleServices(store)
+    disableModuleServices(store, 'startBootstrapSession:no-cache')
   }
 
   return fetchBootstrapSession(store)
@@ -195,21 +222,30 @@ function reconcileOriginSafety(store) {
   const wasLoading = store.options.originBootstrapLoading === true
   applyOriginSafety(store.options)
 
+  let action = 'noop'
   if (store.options.originBootstrapLoading) {
-    disableModuleServices(store)
-    return
-  }
-
-  if (store.options.originBlocked && !wasBlocked) {
-    disableModuleServices(store)
+    disableModuleServices(store, 'reconcileOriginSafety:loading')
+    action = 'disable:loading'
+  } else if (store.options.originBlocked && !wasBlocked) {
+    disableModuleServices(store, 'reconcileOriginSafety:blocked')
+    action = 'disable:blocked'
   } else if (!store.options.originBlocked && (wasBlocked || wasLoading)) {
     enableModuleApi(store)
+    action = 'enable'
   }
+
+  apphubDebug('origin', 'reconcileOriginSafety', {
+    wasLoading,
+    wasBlocked,
+    action,
+    ...describeStore(store),
+  })
 }
 
-function disableModuleServices(store) {
+function disableModuleServices(store, reason = 'unknown') {
   store.facade.setImpl(null)
   store.coreApi = null
+  apphubDebug('api', 'disableModuleServices', { reason, ...describeStore(store) })
 }
 
 /** Window manager + app store — required even when origin is blocked (AppHubDesktop setup). */
@@ -221,6 +257,7 @@ function ensureModuleInfrastructure(vueApp, store) {
 function enableModuleApi(store) {
   syncApi(store)
   syncZoneContext(store)
+  apphubDebug('api', 'enableModuleApi', describeStore(store))
 }
 
 function enableModuleServices(vueApp, store) {
@@ -243,6 +280,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),
@@ -263,7 +303,19 @@ function createApiFacade() {
   }
 }
 
+function credentialsUnchanged(prev, next) {
+  return prev.backendUrl === next.backendUrl
+    && prev.token === next.token
+    && prev.coreUrl === next.coreUrl
+    && prev.hostAccessSecret === next.hostAccessSecret
+}
+
 function applyModuleOptions(store, options = {}) {
+  const prevCredentials = { ...store.credentials }
+  const nextCredentials = buildCredentials(options)
+  Object.assign(store.credentials, nextCredentials)
+  const credsUnchanged = credentialsUnchanged(prevCredentials, nextCredentials)
+
   const nextPublic = buildPublicOptions({ ...options, token: options.token ?? store.credentials.token })
   Object.assign(store.options, {
     language: nextPublic.language,
@@ -285,12 +337,23 @@ function applyModuleOptions(store, options = {}) {
     enforceDevFriendlyOrigins: nextPublic.enforceDevFriendlyOrigins,
   })
   applyOriginSafety(store.options, options)
+  const branch = !store.credentials.backendUrl || !store.credentials.token
+    ? 'no-credentials'
+    : (credsUnchanged ? 'creds-unchanged' : 'start-bootstrap')
+  apphubDebug('install', 'applyModuleOptions', {
+    branch,
+    credsUnchanged,
+    ...describeStore(store),
+  })
   if (store.credentials.backendUrl && store.credentials.token) {
-    void startBootstrapSession(store)
+    if (credsUnchanged) {
+      reconcileOriginSafety(store)
+    } else {
+      void startBootstrapSession(store)
+    }
   } else {
     reconcileOriginSafety(store)
   }
-  Object.assign(store.credentials, buildCredentials(options))
 }
 
 function syncApi(store) {
@@ -302,6 +365,10 @@ function syncApi(store) {
       })
     : null
   facade.setImpl(api)
+  apphubDebug('api', 'syncApi', {
+    implSet: api != null,
+    ...describeStore(store),
+  })
 }
 
 function syncCoreApi(store) {
@@ -349,16 +416,25 @@ export function installAppHubModule(vueApp, options = {}) {
   let store = getAppHubStore(vueApp)
 
   if (store) {
+    vueApp.provide('apphubHostApp', vueApp)
+    apphubDebug('install', 'installAppHubModule re-install', {
+      appUid: vueApp._uid ?? null,
+      hasToken: !!(options.token),
+      theme: options.theme,
+      language: options.language,
+    })
     applyModuleOptions(store, options)
     ensureModuleInfrastructure(vueApp, store)
-    if (store.options.originBootstrapLoading || store.options.originBlocked) {
-      disableModuleServices(store)
-    } else {
-      enableModuleApi(store)
-    }
+    reconcileOriginSafety(store)
     return store.facade
   }
 
+  apphubDebug('install', 'installAppHubModule first install', {
+    appUid: vueApp._uid ?? null,
+    hasToken: !!(options.token),
+    backendUrl: options.backendUrl ? '(set)' : '(empty)',
+  })
+
   const facade = createApiFacade()
   const moduleOptions = reactive(buildPublicOptions(options))
   applyOriginSafety(moduleOptions, options)
@@ -377,6 +453,7 @@ export function installAppHubModule(vueApp, options = {}) {
   registerAppHubStore(vueApp, store)
 
   vueApp.provide('apphubOptions', moduleOptions)
+  vueApp.provide('apphubHostApp', vueApp)
   vueApp.component('AppHubDesktop', AppHubDesktop)
   vueApp.component('AppHubRunner', AppHubRunner)
 

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

@@ -109,6 +109,7 @@ import { resolveLang } from '../../../i18n/resolveLang.js'
 import { CATALOG_MODE_STORE } from '../constants/catalogModes.js'
 import { useCatalogInfiniteScroll } from '../composables/useCatalogInfiniteScroll.js'
 import { useAppStore } from '../composables/useAppStore.js'
+import { apphubDebug, describeApp, describeHostApi } from '../../../utils/apphubDebug.js'
 import AppHubAppStoreCard from './AppHubAppStoreCard.vue'
 import AppHubAppStoreSettingsPanel from './AppHubAppStoreSettingsPanel.vue'
 
@@ -122,7 +123,8 @@ const props = defineProps({
 const settingsOpen = ref(false)
 const appStore = useAppStore()
 const catalog = appStore.catalogs.store
-const rootApp = resolveRootApp(getCurrentInstance())
+const rootApp = inject('apphubHostApp', null) ?? resolveRootApp(getCurrentInstance())
+const rootAppSource = inject('apphubHostApp', null) ? 'inject' : 'resolveRootApp'
 const zone = useAppHubZoneContext()
 const moduleOptions = inject('apphubOptions', {})
 const lang = computed(() => resolveLang(moduleOptions?.language, 'vi'))
@@ -157,9 +159,25 @@ function hostApiOptions() {
   }
 }
 
-async function reloadCatalog() {
-  if (!rootApp) return
-  await appStore.loadCatalog(getHostApiForApp(rootApp), hostApiOptions())
+async function reloadCatalog(source = 'manual') {
+  if (!rootApp) {
+    apphubDebug('app-store', 'reloadCatalog skipped — no rootApp', { source, rootAppSource })
+    return
+  }
+  const hostApi = getHostApiForApp(rootApp)
+  const opts = hostApiOptions()
+  apphubDebug('app-store', 'reloadCatalog', {
+    source,
+    rootAppSource,
+    ...describeApp(rootApp),
+    ...describeHostApi(hostApi),
+    backendReady: opts.backendReady,
+    originBootstrapLoading: moduleOptions?.originBootstrapLoading,
+    originBlocked: moduleOptions?.originBlocked,
+    catalogLoaded: catalog.loaded,
+    catalogError: catalog.error,
+  })
+  await appStore.loadCatalog(hostApi, opts)
 }
 
 async function loadMore() {
@@ -191,20 +209,36 @@ async function onUninstall(app) {
 }
 
 onMounted(() => {
-  if (!catalog.loaded) reloadCatalog()
+  if (!catalog.loaded) reloadCatalog('onMounted')
 })
 
 watch(
   () => moduleOptions?.hasToken,
   (hasToken) => {
-    if (hasToken && !catalog.loaded) reloadCatalog()
+    if (hasToken && !catalog.loaded) reloadCatalog('watch:hasToken')
+  },
+)
+
+watch(
+  () => moduleOptions?.originBootstrapLoading,
+  (loading, wasLoading) => {
+    apphubDebug('app-store', 'watch originBootstrapLoading', {
+      loading,
+      wasLoading,
+      originBlocked: moduleOptions?.originBlocked,
+      catalogLoaded: catalog.loaded,
+      catalogError: catalog.error,
+    })
+    if (wasLoading && !loading && !moduleOptions?.originBlocked) {
+      if (!catalog.loaded || catalog.error === 'no_api') reloadCatalog('watch:bootstrap-done')
+    }
   },
 )
 
 watch(
   () => [zone?.state?.selectedZoneId, zone?.state?.viewAllZones],
   () => {
-    if (moduleOptions?.hasToken) reloadCatalog()
+    if (moduleOptions?.hasToken) reloadCatalog('watch:zone')
   },
 )
 </script>

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

@@ -83,7 +83,7 @@ const props = defineProps({
 
 const appStore = useAppStore()
 const catalog = appStore.catalogs.draft
-const rootApp = resolveRootApp(getCurrentInstance())
+const rootApp = inject('apphubHostApp', null) ?? resolveRootApp(getCurrentInstance())
 const zone = useAppHubZoneContext()
 const moduleOptions = inject('apphubOptions', {})
 const lang = computed(() => resolveLang(moduleOptions?.language, 'vi'))
@@ -175,6 +175,15 @@ watch(
   },
 )
 
+watch(
+  () => moduleOptions?.originBootstrapLoading,
+  (loading, wasLoading) => {
+    if (wasLoading && !loading && !moduleOptions?.originBlocked) {
+      if (!catalog.loaded || catalog.error === 'no_api') reloadCatalog()
+    }
+  },
+)
+
 watch(
   () => [zone?.state?.selectedZoneId, zone?.state?.viewAllZones],
   () => {

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

@@ -1,6 +1,7 @@
 import { computed, inject, reactive } from 'vue'
 import { CATALOG_MODE_DRAFT, CATALOG_MODE_STORE } from '../constants/catalogModes.js'
 import { normalizeCatalogList } from '../utils/normalizeCatalogApp.js'
+import { apphubDebug, describeHostApi } from '../../../utils/apphubDebug.js'
 
 const APP_STORE_KEY = 'apphubAppStore'
 
@@ -28,6 +29,12 @@ function filterItems(items, search) {
   )
 }
 
+function hostApiReady(hostApi) {
+  if (!hostApi?.apps) return false
+  if (typeof hostApi.hasImpl === 'function') return hostApi.hasImpl()
+  return true
+}
+
 /**
  * Independent App Store module — separate catalog buckets per mode (store / draft).
  */
@@ -102,7 +109,20 @@ export function createAppStoreState(options = {}) {
     const append = options.append === true
     const backendReady = options.backendReady !== false
 
-    if (!backendReady || !hostApi?.apps) {
+    apphubDebug('catalog', 'loadCatalog called', {
+      mode,
+      append,
+      backendReady,
+      ...describeHostApi(hostApi),
+    })
+
+    if (!backendReady || !hostApiReady(hostApi)) {
+      apphubDebug('catalog', 'loadCatalog → no_api (not ready)', {
+        mode,
+        append,
+        backendReady,
+        ...describeHostApi(hostApi),
+      })
       if (!append) {
         bucket.items = []
         bucket.error = 'no_api'
@@ -131,8 +151,16 @@ export function createAppStoreState(options = {}) {
       }
 
       const res = await hostApi.apps(params)
+      apphubDebug('catalog', 'loadCatalog apps() response', {
+        mode,
+        append,
+        ...describeHostApi(hostApi),
+        resUndefined: res === undefined,
+        resNull: res === null,
+      })
       if (res === undefined || res === null) {
         if (!append) {
+          apphubDebug('catalog', 'loadCatalog → no_api (undefined response)', { mode })
           bucket.items = []
           bucket.error = 'no_api'
           bucket.loaded = false

package/src/utils/apphubDebug.js

@@ -0,0 +1,47 @@
+/** Temporary diagnostics — filter console with `[apphub:debug]`. Disable: localStorage.setItem('apphub:debug','0') */
+export function isAppHubDebugEnabled() {
+  try {
+    if (typeof localStorage !== 'undefined' && localStorage.getItem('apphub:debug') === '0') {
+      return false
+    }
+    if (typeof window !== 'undefined' && window.__APPHUB_DEBUG__ === false) {
+      return false
+    }
+  } catch {
+    /* ignore */
+  }
+  return true
+}
+
+export function apphubDebug(scope, message, data) {
+  if (!isAppHubDebugEnabled()) return
+  const payload = data !== undefined ? { ts: Date.now(), ...data } : { ts: Date.now() }
+  console.info(`[apphub:debug] ${scope}: ${message}`, payload)
+}
+
+export function describeHostApi(hostApi) {
+  if (!hostApi) return { hostApi: null }
+  return {
+    hasImpl: typeof hostApi.hasImpl === 'function' ? hostApi.hasImpl() : null,
+    hasAppsFn: typeof hostApi.apps === 'function',
+  }
+}
+
+export function describeStore(store) {
+  if (!store) return { store: null }
+  return {
+    hasImpl: store.facade?.hasImpl?.() ?? null,
+    originBootstrapLoading: store.options?.originBootstrapLoading ?? null,
+    originBlocked: store.options?.originBlocked ?? null,
+    originBlockReason: store.options?.originBlockReason ?? null,
+    hasToken: store.options?.hasToken ?? null,
+    backendUrl: store.credentials?.backendUrl ? '(set)' : '(empty)',
+    token: store.credentials?.token ? `(len ${store.credentials.token.length})` : '(empty)',
+    serverOriginsResolved: store.options?.serverOriginsResolved ?? null,
+  }
+}
+
+export function describeApp(app) {
+  if (!app) return { app: null }
+  return { appUid: app._uid ?? null }
+}