@kennofizet/apphub-frontend 0.1.7 → 0.1.8

package/package.json

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

@@ -1,11 +1,18 @@
-import { getCurrentInstance } from 'vue'
-import { getAppHubStore } from '../moduleStore.js'
+import { getCurrentInstance, inject } from 'vue'
+import { APPHUB_MODULE_STORE_KEY, getAppHubStore } from '../moduleStore.js'
 
 export function resolveRootApp(instance = getCurrentInstance()) {
   if (!instance) return null
   return instance.appContext?.app ?? instance.app ?? null
 }
 
+/** Resolve module store — inject first (always same instance), then WeakMap by Vue app. */
+export function useAppHubModuleStore() {
+  const fromInject = inject(APPHUB_MODULE_STORE_KEY, null)
+  if (fromInject) return fromInject
+  return getAppHubStore(resolveRootApp())
+}
+
 export function getHostApiForApp(app) {
   return getAppHubStore(app)?.facade ?? null
 }
@@ -20,5 +27,9 @@ export function isBackendReadyForApp(app) {
  * so publisher app code cannot access grantBridgeScope or internal docs.
  */
 export function useAppHubHostApi() {
-  return getHostApiForApp(resolveRootApp())
+  return useAppHubModuleStore()?.facade ?? null
+}
+
+export function isBackendReadyFromStore(store) {
+  return !!(store?.credentials?.backendUrl && store?.credentials?.token)
 }

package/src/index.js

@@ -8,7 +8,7 @@ import { APPHUB_ZONE_CONTEXT_KEY } from './composables/useAppHubZoneContext.js'
 import { createAppStoreState, provideAppStore } from './modules/app-store/index.js'
 import { AppHubDesktop } from './modules/desktop/index.js'
 import { AppHubRunner } from './modules/runner/index.js'
-import { getAppHubStore, registerAppHubStore } from './moduleStore.js'
+import { getAppHubStore, registerAppHubStore, APPHUB_MODULE_STORE_KEY } from './moduleStore.js'
 import {
   createWindowManagerState,
   provideWindowManager,
@@ -417,6 +417,7 @@ export function installAppHubModule(vueApp, options = {}) {
 
   if (store) {
     vueApp.provide('apphubHostApp', vueApp)
+    vueApp.provide(APPHUB_MODULE_STORE_KEY, store)
     apphubDebug('install', 'installAppHubModule re-install', {
       appUid: vueApp._uid ?? null,
       hasToken: !!(options.token),
@@ -454,6 +455,7 @@ export function installAppHubModule(vueApp, options = {}) {
 
   vueApp.provide('apphubOptions', moduleOptions)
   vueApp.provide('apphubHostApp', vueApp)
+  vueApp.provide(APPHUB_MODULE_STORE_KEY, store)
   vueApp.component('AppHubDesktop', AppHubDesktop)
   vueApp.component('AppHubRunner', AppHubRunner)
 
@@ -468,7 +470,7 @@ export function isAppHubModuleInstalled(vueApp) {
   return vueApp != null && getAppHubStore(vueApp) != null
 }
 
-export { useAppHubHostApi } from './composables/useAppHubHostApi.js'
+export { useAppHubHostApi, useAppHubModuleStore } from './composables/useAppHubHostApi.js'
 export { useAppHubZoneContext } from './composables/useAppHubZoneContext.js'
 export { createAppHubApi } from './api/index.js'
 export { createCoreApi } from './api/coreApi.js'

package/src/moduleStore.js

@@ -1,5 +1,18 @@
-/** Private per-Vue-app store — not exposed via provide/inject. */
-const installedApps = new WeakMap()
+/** Internal inject key — package components only; not part of public host API. */
+export const APPHUB_MODULE_STORE_KEY = Symbol('apphubModuleStore')
+
+const REGISTRY_KEY = '__kennofizet_apphub_installed_apps__'
+
+/** Shared WeakMap — Vite may load this module twice (host bundle vs SFC chunks). */
+function getInstalledAppsRegistry() {
+  const root = typeof globalThis !== 'undefined' ? globalThis : global
+  if (!root[REGISTRY_KEY]) {
+    root[REGISTRY_KEY] = new WeakMap()
+  }
+  return root[REGISTRY_KEY]
+}
+
+const installedApps = getInstalledAppsRegistry()
 
 export function registerAppHubStore(app, store) {
   installedApps.set(app, store)

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

@@ -97,11 +97,11 @@
 </template>
 
 <script setup>
-import { computed, getCurrentInstance, inject, onMounted, ref, watch } from 'vue'
+import { computed, inject, onMounted, ref, watch } from 'vue'
 import {
-  getHostApiForApp,
-  isBackendReadyForApp,
-  resolveRootApp,
+  isBackendReadyFromStore,
+  useAppHubHostApi,
+  useAppHubModuleStore,
 } from '../../../composables/useAppHubHostApi.js'
 import { useAppHubZoneContext } from '../../../composables/useAppHubZoneContext.js'
 import { t } from '../../../i18n/index.js'
@@ -109,7 +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 { apphubDebug, describeHostApi } from '../../../utils/apphubDebug.js'
 import AppHubAppStoreCard from './AppHubAppStoreCard.vue'
 import AppHubAppStoreSettingsPanel from './AppHubAppStoreSettingsPanel.vue'
 
@@ -123,8 +123,9 @@ const props = defineProps({
 const settingsOpen = ref(false)
 const appStore = useAppStore()
 const catalog = appStore.catalogs.store
-const rootApp = inject('apphubHostApp', null) ?? resolveRootApp(getCurrentInstance())
-const rootAppSource = inject('apphubHostApp', null) ? 'inject' : 'resolveRootApp'
+const hubStore = useAppHubModuleStore()
+const hostApi = useAppHubHostApi()
+const rootApp = inject('apphubHostApp', null)
 const zone = useAppHubZoneContext()
 const moduleOptions = inject('apphubOptions', {})
 const lang = computed(() => resolveLang(moduleOptions?.language, 'vi'))
@@ -154,35 +155,29 @@ const labels = computed(() => ({
 
 function hostApiOptions() {
   return {
-    backendReady: isBackendReadyForApp(rootApp),
+    backendReady: isBackendReadyFromStore(hubStore),
     mode: CATALOG_MODE_STORE,
   }
 }
 
 async function reloadCatalog(source = 'manual') {
-  if (!rootApp) {
-    apphubDebug('app-store', 'reloadCatalog skipped — no rootApp', { source, rootAppSource })
-    return
-  }
-  const hostApi = getHostApiForApp(rootApp)
+  const api = hostApi
   const opts = hostApiOptions()
   apphubDebug('app-store', 'reloadCatalog', {
     source,
-    rootAppSource,
-    ...describeApp(rootApp),
-    ...describeHostApi(hostApi),
+    storeFromInject: !!hubStore,
+    ...describeHostApi(api),
     backendReady: opts.backendReady,
     originBootstrapLoading: moduleOptions?.originBootstrapLoading,
     originBlocked: moduleOptions?.originBlocked,
     catalogLoaded: catalog.loaded,
     catalogError: catalog.error,
   })
-  await appStore.loadCatalog(hostApi, opts)
+  await appStore.loadCatalog(api, opts)
 }
 
 async function loadMore() {
-  if (!rootApp) return
-  await appStore.loadMoreCatalog(getHostApiForApp(rootApp), CATALOG_MODE_STORE, hostApiOptions())
+  await appStore.loadMoreCatalog(hostApi, CATALOG_MODE_STORE, hostApiOptions())
 }
 
 const { rootRef: scrollRoot, sentinelRef: scrollSentinel } = useCatalogInfiniteScroll({

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

@@ -62,11 +62,11 @@
 </template>
 
 <script setup>
-import { computed, getCurrentInstance, inject, onMounted, reactive, ref, watch } from 'vue'
+import { computed, inject, onMounted, reactive, ref, watch } from 'vue'
 import {
-  getHostApiForApp,
-  isBackendReadyForApp,
-  resolveRootApp,
+  isBackendReadyFromStore,
+  useAppHubHostApi,
+  useAppHubModuleStore,
 } from '../../../composables/useAppHubHostApi.js'
 import { useAppHubZoneContext } from '../../../composables/useAppHubZoneContext.js'
 import { t } from '../../../i18n/index.js'
@@ -83,7 +83,9 @@ const props = defineProps({
 
 const appStore = useAppStore()
 const catalog = appStore.catalogs.draft
-const rootApp = inject('apphubHostApp', null) ?? resolveRootApp(getCurrentInstance())
+const hubStore = useAppHubModuleStore()
+const hostApi = useAppHubHostApi()
+const rootApp = inject('apphubHostApp', null)
 const zone = useAppHubZoneContext()
 const moduleOptions = inject('apphubOptions', {})
 const lang = computed(() => resolveLang(moduleOptions?.language, 'vi'))
@@ -119,19 +121,17 @@ const labels = computed(() => ({
 
 function hostApiOptions() {
   return {
-    backendReady: isBackendReadyForApp(rootApp),
+    backendReady: isBackendReadyFromStore(hubStore),
     mode: CATALOG_MODE_DRAFT,
   }
 }
 
 async function reloadCatalog() {
-  if (!rootApp) return
-  await appStore.loadCatalog(getHostApiForApp(rootApp), hostApiOptions())
+  await appStore.loadCatalog(hostApi, hostApiOptions())
 }
 
 async function loadMore() {
-  if (!rootApp) return
-  await appStore.loadMoreCatalog(getHostApiForApp(rootApp), CATALOG_MODE_DRAFT, hostApiOptions())
+  await appStore.loadMoreCatalog(hostApi, CATALOG_MODE_DRAFT, hostApiOptions())
 }
 
 const { rootRef: scrollRoot, sentinelRef: scrollSentinel } = useCatalogInfiniteScroll({
@@ -150,7 +150,7 @@ async function onUninstall(app) {
 }
 
 async function onPing(app) {
-  const api = getHostApiForApp(rootApp)
+  const api = hostApi
   if (!api?.ping || !app?.slug) return
   pingingSlug.value = app.slug
   delete pingResults[app.slug]