@kennofizet/apphub-frontend 0.1.5 → 0.1.6

package/package.json

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

@@ -243,6 +243,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 +266,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,
@@ -286,11 +301,14 @@ function applyModuleOptions(store, options = {}) {
   })
   applyOriginSafety(store.options, options)
   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) {
@@ -349,13 +367,10 @@ export function installAppHubModule(vueApp, options = {}) {
   let store = getAppHubStore(vueApp)
 
   if (store) {
+    vueApp.provide('apphubHostApp', vueApp)
     applyModuleOptions(store, options)
     ensureModuleInfrastructure(vueApp, store)
-    if (store.options.originBootstrapLoading || store.options.originBlocked) {
-      disableModuleServices(store)
-    } else {
-      enableModuleApi(store)
-    }
+    reconcileOriginSafety(store)
     return store.facade
   }
 
@@ -377,6 +392,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

@@ -122,7 +122,7 @@ 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 zone = useAppHubZoneContext()
 const moduleOptions = inject('apphubOptions', {})
 const lang = computed(() => resolveLang(moduleOptions?.language, 'vi'))
@@ -201,6 +201,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/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],
   () => {