fix(XenApi): cannot read properties of undefined (reading 'statusCode')

Fixes #5060

.prettierrc.js

@@ -1,8 +1,11 @@
+'use strict'
+
 module.exports = {
   arrowParens: 'avoid',
   jsxSingleQuote: true,
   semi: false,
   singleQuote: true,
+  trailingComma: 'es5',
 
   // 2020-11-24: Requested by nraynaud and approved by the rest of the team
   //

@xen-orchestra/backups-cli/package.json

@@ -9,7 +9,7 @@
     "@xen-orchestra/async-map": "^0.1.2",
     "@xen-orchestra/backups": "^0.40.0",
     "@xen-orchestra/fs": "^4.0.1",
-    "filenamify": "^4.1.0",
+    "filenamify": "^6.0.0",
     "getopts": "^2.2.5",
     "lodash": "^4.17.15",
     "promise-toolbox": "^0.21.0"

@xen-orchestra/backups/RestoreMetadataBackup.mjs

@@ -21,7 +21,12 @@ export class RestoreMetadataBackup {
       })
     } else {
       const metadata = JSON.parse(await handler.readFile(join(backupId, 'metadata.json')))
-      return String(await handler.readFile(resolve(backupId, metadata.data ?? 'data.json')))
+      const dataFileName = resolve(backupId, metadata.data ?? 'data.json')
+      const data = await handler.readFile(dataFileName)
+
+      // if data is JSON, sent it as a plain string, otherwise, consider the data as binary and encode it
+      const isJson = dataFileName.endsWith('.json')
+      return isJson ? data.toString() : { encoding: 'base64', data: data.toString('base64') }
     }
   }
 }

@xen-orchestra/backups/_runners/_XoMetadataBackup.mjs

@@ -22,7 +22,13 @@ export class XoMetadataBackup {
     const dir = `${scheduleDir}/${formatFilenameDate(timestamp)}`
 
     const data = job.xoMetadata
-    const dataBaseName = './data.json'
+    let dataBaseName = './data'
+
+    // JSON data is sent as plain string, binary data is sent as an object with `data` and `encoding properties
+    const isJson = typeof data === 'string'
+    if (isJson) {
+      dataBaseName += '.json'
+    }
 
     const metadata = JSON.stringify(
       {
@@ -54,7 +60,7 @@ export class XoMetadataBackup {
           async () => {
             const handler = adapter.handler
             const dirMode = this._config.dirMode
-            await handler.outputFile(dataFileName, data, { dirMode })
+            await handler.outputFile(dataFileName, isJson ? data : Buffer.from(data.data, data.encoding), { dirMode })
             await handler.outputFile(metaDataFileName, metadata, {
               dirMode,
             })

@xen-orchestra/backups/_runners/_writers/_MixinXapiWriter.mjs

@@ -18,7 +18,7 @@ export const MixinXapiWriter = (BaseClass = Object) =>
       const vdiRefs = await xapi.VM_getDisks(baseVm.$ref)
       for (const vdiRef of vdiRefs) {
         const vdi = xapi.getObject(vdiRef)
-        if (vdi.$SR.uuid !== this._heathCheckSr.uuid) {
+        if (vdi.$SR.uuid !== this._healthCheckSr.uuid) {
           return false
         }
       }

@xen-orchestra/backups/package.json

@@ -30,8 +30,8 @@
     "@xen-orchestra/fs": "^4.0.1",
     "@xen-orchestra/log": "^0.6.0",
     "@xen-orchestra/template": "^0.1.0",
-    "compare-versions": "^5.0.1",
-    "d3-time-format": "^3.0.0",
+    "compare-versions": "^6.0.0",
+    "d3-time-format": "^4.1.0",
     "decorator-synchronized": "^0.6.0",
     "golike-defer": "^0.5.1",
     "limit-concurrency-decorator": "^0.5.0",

@xen-orchestra/lite/.prettierrc.cjs

@@ -1,2 +1,4 @@
 // Keeping this file to prevent applying the global monorepo config for now
-module.exports = {};
+module.exports = {
+  trailingComma: "es5",
+};

@xen-orchestra/lite/docs/xen-api-collections.md

@@ -0,0 +1,144 @@
+<!-- TOC -->
+
+- [XenApiCollection](#xenapicollection)
+  - [Get the collection](#get-the-collection)
+  - [Defer the subscription](#defer-the-subscription)
+  - [Create a dedicated collection](#create-a-dedicated-collection)
+  - [Alter the collection](#alter-the-collection)
+  _ [Example 1: Adding props to records](#example-1-adding-props-to-records)
+  _ [Example 2: Adding props to the collection](#example-2-adding-props-to-the-collection) \* [Example 3, filtering and sorting the collection](#example-3-filtering-and-sorting-the-collection)
+  <!-- TOC -->
+
+# XenApiCollection
+
+## Get the collection
+
+To retrieve a collection, invoke `useXenApiCollection("VM")`.
+
+By doing this, the current component will be automatically subscribed to the collection and will be updated when the
+collection changes.
+
+When the component is unmounted, the subscription will be automatically stopped.
+
+## Defer the subscription
+
+If you don't want to fetch the data of the collection when the component is mounted, you can pass `{ immediate: false }`
+as options: `const { start, isStarted } = useXenApiCollection("VM", { immediate: false })`.
+
+Then you subscribe to the collection by calling `start()`.
+
+## Create a dedicated collection
+
+It is recommended to create a dedicated collection composable for each type of record you want to use.
+
+They are stored in `src/composables/xen-api-collection/*-collection.composable.ts`.
+
+```typescript
+// src/composables/xen-api-collection/console-collection.composable.ts
+
+export const useConsoleCollection = () => useXenApiCollection("console");
+```
+
+If you want to allow the user to defer the subscription, you can propagate the options to `useXenApiCollection`.
+
+```typescript
+// console-collection.composable.ts
+
+export const useConsoleCollection = <
+  Immediate extends boolean = true,
+>(options?: {
+  immediate?: Immediate;
+}) => useXenApiCollection("console", options);
+```
+
+```typescript
+// MyComponent.vue
+
+const collection = useConsoleCollection({ immediate: false });
+
+setTimeout(() => collection.start(), 10000);
+```
+
+## Alter the collection
+
+You can alter the collection by overriding parts of it.
+
+### Example 1: Adding props to records
+
+```typescript
+// xen-api.ts
+
+export interface XenApiConsole extends XenApiRecord<"console"> {
+  // ... existing props
+  someProp: string;
+  someOtherProp: number;
+}
+```
+
+```typescript
+// console-collection.composable.ts
+
+export const useConsoleCollection = () => {
+  const collection = useXenApiCollection("console");
+
+  const records = computed(() => {
+    return collection.records.value.map((console) => ({
+      ...console,
+      someProp: "Some value",
+      someOtherProp: 42,
+    }));
+  });
+
+  return {
+    ...collection,
+    records,
+  };
+};
+```
+
+```typescript
+const consoleCollection = useConsoleCollection();
+
+consoleCollection.getByUuid("...").someProp; // "Some value"
+```
+
+### Example 2: Adding props to the collection
+
+```typescript
+// vm-collection.composable.ts
+
+export const useVmCollection = () => {
+  const collection = useXenApiCollection("VM");
+
+  return {
+    ...collection,
+    runningVms: computed(() =>
+      collection.records.value.filter(
+        (vm) => vm.power_state === POWER_STATE.RUNNING
+      )
+    ),
+  };
+};
+```
+
+### Example 3, filtering and sorting the collection
+
+```typescript
+// vm-collection.composable.ts
+
+export const useVmCollection = () => {
+  const collection = useXenApiCollection("VM");
+
+  return {
+    ...collection,
+    records: computed(() =>
+      collection.records.value
+        .filter(
+          (vm) =>
+            !vm.is_a_snapshot && !vm.is_a_template && !vm.is_control_domain
+        )
+        .sort((vm1, vm2) => vm1.name_label.localeCompare(vm2.name_label))
+    ),
+  };
+};
+```

@xen-orchestra/lite/docs/xen-api-record-stores.md

@@ -1,144 +0,0 @@
-# Stores for XenApiRecord collections
-
-All collections of `XenApiRecord` are stored inside the `xapiCollectionStore`.
-
-To retrieve a collection, invoke `useXapiCollectionStore().get(type)`.
-
-## Accessing a collection
-
-In order to use a collection, you'll need to subscribe to it.
-
-```typescript
-const consoleStore = useXapiCollectionStore().get("console");
-const { records, getByUuid /* ... */ } = consoleStore.subscribe();
-```
-
-## Deferred subscription
-
-If you wish to initialize the subscription on demand, you can pass `{ immediate: false }` as options to `subscribe()`.
-
-```typescript
-const consoleStore = useXapiCollectionStore().get("console");
-const { records, start, isStarted /* ... */ } = consoleStore.subscribe({
-  immediate: false,
-});
-
-// Later, you can then use start() to initialize the subscription.
-```
-
-## Create a dedicated store for a collection
-
-To create a dedicated store for a specific `XenApiRecord`, simply return the collection from the XAPI Collection Store:
-
-```typescript
-export const useConsoleStore = defineStore("console", () =>
-  useXapiCollectionStore().get("console")
-);
-```
-
-## Extending the base Subscription
-
-To extend the base Subscription, you'll need to override the `subscribe` method.
-
-For that, you can use the `createSubscribe<RawObjectType, Extensions>((options) => { /* ... */})` helper.
-
-### Define the extensions
-
-Subscription extensions are defined as `(object | [object, RequiredOptions])[]`.
-
-When using a tuple (`[object, RequiredOptions]`), the corresponding `object` type will be added to the subscription if
-the `RequiredOptions` for that tuple are present in the options passed to `subscribe`.
-
-```typescript
-// Always present extension
-type DefaultExtension = {
-  propA: string;
-  propB: ComputedRef<number>;
-};
-
-// Conditional extension 1
-type FirstConditionalExtension = [
-  { propC: ComputedRef<string> }, // <- This signature will be added
-  { optC: string } // <- if this condition is met
-];
-
-// Conditional extension 2
-type SecondConditionalExtension = [
-  { propD: () => void }, // <- This signature will be added
-  { optD: number } // <- if this condition is met
-];
-
-// Create the extensions array
-type Extensions = [
-  DefaultExtension,
-  FirstConditionalExtension,
-  SecondConditionalExtension
-];
-```
-
-### Define the subscription
-
-```typescript
-export const useConsoleStore = defineStore("console", () => {
-  const consoleCollection = useXapiCollectionStore().get("console");
-
-  const subscribe = createSubscribe<"console", Extensions>((options) => {
-    const originalSubscription = consoleCollection.subscribe(options);
-
-    const extendedSubscription = {
-      propA: "Some string",
-      propB: computed(() => 42),
-    };
-
-    const propCSubscription = options?.optC !== undefined && {
-      propC: computed(() => "Some other string"),
-    };
-
-    const propDSubscription = options?.optD !== undefined && {
-      propD: () => console.log("Hello"),
-    };
-
-    return {
-      ...originalSubscription,
-      ...extendedSubscription,
-      ...propCSubscription,
-      ...propDSubscription,
-    };
-  });
-
-  return {
-    ...consoleCollection,
-    subscribe,
-  };
-});
-```
-
-The generated `subscribe` method will then automatically have the following `options` signature:
-
-```typescript
-type Options = {
-  immediate?: false;
-  optC?: string;
-  optD?: number;
-};
-```
-
-### Use the subscription
-
-In each case, all the default properties (`records`, `getByUuid`, etc.) will be present.
-
-```typescript
-const store = useConsoleStore();
-
-// No options (propA and propB will be present)
-const subscription = store.subscribe();
-
-// optC option (propA, propB and propC will be present)
-const subscription = store.subscribe({ optC: "Hello" });
-
-// optD option (propA, propB and propD will be present)
-const subscription = store.subscribe({ optD: 12 });
-
-// optC and optD options (propA, propB, propC and propD will be present)
-const subscription = store.subscribe({ optC: "Hello", optD: 12 });
-```

@xen-orchestra/lite/package.json

@@ -49,7 +49,7 @@
     "@rushstack/eslint-patch": "^1.1.0",
     "@types/node": "^16.11.41",
     "@vitejs/plugin-vue": "^4.2.3",
-    "@vue/eslint-config-prettier": "^7.0.0",
+    "@vue/eslint-config-prettier": "^8.0.0",
     "@vue/eslint-config-typescript": "^11.0.0",
     "@vue/tsconfig": "^0.1.3",
     "eslint-plugin-vue": "^9.0.0",

@xen-orchestra/lite/src/App.vue

@@ -23,7 +23,7 @@ import AppNavigation from "@/components/AppNavigation.vue";
 import AppTooltips from "@/components/AppTooltips.vue";
 import UnreachableHostsModal from "@/components/UnreachableHostsModal.vue";
 import { useChartTheme } from "@/composables/chart-theme.composable";
-import { usePoolStore } from "@/stores/pool.store";
+import { usePoolCollection } from "@/composables/xen-api-collection/pool-collection.composable";
 import { useUiStore } from "@/stores/ui.store";
 import { useXenApiStore } from "@/stores/xen-api.store";
 import { useActiveElement, useMagicKeys, whenever } from "@vueuse/core";
@@ -42,7 +42,9 @@ if (link == null) {
 link.href = favicon;
 
 const xenApiStore = useXenApiStore();
-const { pool } = usePoolStore().subscribe();
+
+const { pool } = usePoolCollection();
+
 useChartTheme();
 const uiStore = useUiStore();
 

@xen-orchestra/lite/src/components/UnreachableHostsModal.vue

@@ -27,14 +27,14 @@
 </template>
 
 <script lang="ts" setup>
+import { useHostCollection } from "@/composables/xen-api-collection/host-collection.composable";
 import { faServer } from "@fortawesome/free-solid-svg-icons";
 import UiModal from "@/components/ui/UiModal.vue";
 import UiButton from "@/components/ui/UiButton.vue";
 import { computed, ref, watch } from "vue";
 import { difference } from "lodash-es";
-import { useHostStore } from "@/stores/host.store";
 
-const { records: hosts } = useHostStore().subscribe();
+const { records: hosts } = useHostCollection();
 const unreachableHostsUrls = ref<Set<string>>(new Set());
 const clearUnreachableHostsUrls = () => unreachableHostsUrls.value.clear();
 const isSslModalOpen = computed(() => unreachableHostsUrls.value.size > 0);

@xen-orchestra/lite/src/components/component-story/StoryMenu.vue

@@ -2,32 +2,80 @@
   <RouterLink :to="{ name: 'story' }">
     <UiTitle type="h4">Stories</UiTitle>
   </RouterLink>
-  <ul class="links">
-    <li v-for="route in routes" :key="route.name">
-      <RouterLink class="link" :to="route">
-        {{ route.meta.storyTitle }}
-      </RouterLink>
-    </li>
-  </ul>
+  <StoryMenuTree
+    :tree="tree"
+    @toggle-directory="toggleDirectory"
+    :opened-directories="openedDirectories"
+  />
 </template>
 
 <script lang="ts" setup>
-import { useRouter } from "vue-router";
+import StoryMenuTree from "@/components/component-story/StoryMenuTree.vue";
 import UiTitle from "@/components/ui/UiTitle.vue";
+import { type RouteRecordNormalized, useRoute, useRouter } from "vue-router";
+import { ref } from "vue";
 
 const { getRoutes } = useRouter();
 
 const routes = getRoutes().filter((route) => route.meta.isStory);
-</script>
 
-<style lang="postcss" scoped>
-.links {
-  padding: 1rem;
+export type StoryTree = Map<
+  string,
+  { path: string; directory: string; children: StoryTree }
+>;
+
+function createTree(routes: RouteRecordNormalized[]) {
+  const tree: StoryTree = new Map();
+
+  for (const route of routes) {
+    const parts = route.path.slice(7).split("/");
+    let currentNode = tree;
+    let currentPath = "";
+
+    for (const part of parts) {
+      currentPath = currentPath ? `${currentPath}/${part}` : part;
+      if (!currentNode.has(part)) {
+        currentNode.set(part, {
+          children: new Map(),
+          path: route.path,
+          directory: currentPath,
+        });
+      }
+      currentNode = currentNode.get(part)!.children;
+    }
+  }
+
+  return tree;
 }
-.link {
-  display: inline-block;
-  padding: 0.5rem 1rem;
-  text-decoration: none;
-  font-size: 1.6rem;
-}
-</style>
+
+const tree = createTree(routes);
+
+const currentRoute = useRoute();
+
+const getDefaultOpenedDirectories = (): Set<string> => {
+  if (!currentRoute.meta.isStory) {
+    return new Set<string>();
+  }
+
+  const openedDirectories = new Set<string>();
+  const parts = currentRoute.path.split("/");
+  let currentPath = "";
+
+  for (const part of parts) {
+    currentPath = currentPath ? `${currentPath}/${part}` : part;
+    openedDirectories.add(currentPath);
+  }
+
+  return openedDirectories;
+};
+
+const openedDirectories = ref(getDefaultOpenedDirectories());
+
+const toggleDirectory = (directory: string) => {
+  if (openedDirectories.value.has(directory)) {
+    openedDirectories.value.delete(directory);
+  } else {
+    openedDirectories.value.add(directory);
+  }
+};
+</script>

@xen-orchestra/lite/src/components/component-story/StoryMenuTree.vue

@@ -0,0 +1,83 @@
+<template>
+  <ul class="story-menu-tree">
+    <li v-for="[key, node] in tree" :key="key">
+      <span
+        v-if="node.children.size > 0"
+        class="directory"
+        @click="emit('toggle-directory', node.directory)"
+      >
+        <UiIcon
+          :icon="isOpen(node.directory) ? faFolderOpen : faFolderClosed"
+        />
+        {{ formatName(key) }}
+      </span>
+      <RouterLink v-else :to="node.path" class="link">
+        <UiIcon :icon="faFile" />
+        {{ formatName(key) }}
+      </RouterLink>
+
+      <StoryMenuTree
+        v-if="isOpen(node.directory)"
+        :tree="node.children"
+        @toggle-directory="emit('toggle-directory', $event)"
+        :opened-directories="openedDirectories"
+      />
+    </li>
+  </ul>
+</template>
+
+<script lang="ts" setup>
+import type { StoryTree } from "@/components/component-story/StoryMenu.vue";
+import UiIcon from "@/components/ui/icon/UiIcon.vue";
+import {
+  faFile,
+  faFolderClosed,
+  faFolderOpen,
+} from "@fortawesome/free-regular-svg-icons";
+
+const props = defineProps<{
+  tree: StoryTree;
+  openedDirectories: Set<string>;
+}>();
+
+const emit = defineEmits<{
+  (event: "toggle-directory", directory: string): void;
+}>();
+
+const isOpen = (directory: string) => props.openedDirectories.has(directory);
+
+const formatName = (name: string) => {
+  const parts = name.split("-");
+  return parts.map((part) => part[0].toUpperCase() + part.slice(1)).join(" ");
+};
+</script>
+
+<style lang="postcss" scoped>
+.story-menu-tree {
+  padding-left: 1rem;
+
+  .story-menu-tree {
+    padding-left: 2.2rem;
+  }
+}
+
+.directory {
+  font-weight: 500;
+}
+
+.link {
+  padding: 0.5rem 0;
+}
+
+.directory {
+  padding: 0.5rem 0;
+}
+
+.link,
+.directory {
+  cursor: pointer;
+  text-decoration: none;
+  font-size: 1.6rem;
+  display: inline-block;
+}
+</style>

@xen-orchestra/lite/src/components/infra/InfraHostItem.vue

@@ -28,10 +28,10 @@
 import InfraAction from "@/components/infra/InfraAction.vue";
 import InfraItemLabel from "@/components/infra/InfraItemLabel.vue";
 import InfraVmList from "@/components/infra/InfraVmList.vue";
+import { useHostCollection } from "@/composables/xen-api-collection/host-collection.composable";
+import { usePoolCollection } from "@/composables/xen-api-collection/pool-collection.composable";
 import { vTooltip } from "@/directives/tooltip.directive";
 import type { XenApiHost } from "@/libs/xen-api";
-import { useHostStore } from "@/stores/host.store";
-import { usePoolStore } from "@/stores/pool.store";
 import { useUiStore } from "@/stores/ui.store";
 import {
   faAngleDown,
@@ -46,11 +46,10 @@ const props = defineProps<{
   hostOpaqueRef: XenApiHost["$ref"];
 }>();
 
-const { getByOpaqueRef } = useHostStore().subscribe();
+const { getByOpaqueRef } = useHostCollection();
 const host = computed(() => getByOpaqueRef(props.hostOpaqueRef));
 
-const { pool } = usePoolStore().subscribe();
-
+const { pool } = usePoolCollection();
 const isPoolMaster = computed(() => pool.value?.master === props.hostOpaqueRef);
 
 const uiStore = useUiStore();

@xen-orchestra/lite/src/components/infra/InfraHostList.vue

@@ -16,9 +16,9 @@
 
 <script lang="ts" setup>
 import InfraHostItem from "@/components/infra/InfraHostItem.vue";
-import { useHostStore } from "@/stores/host.store";
+import { useHostCollection } from "@/composables/xen-api-collection/host-collection.composable";
 
-const { records: hosts, isReady, hasError } = useHostStore().subscribe();
+const { records: hosts, isReady, hasError } = useHostCollection();
 </script>
 
 <style lang="postcss" scoped>

@xen-orchestra/lite/src/components/infra/InfraPoolList.vue

@@ -28,10 +28,10 @@ import InfraHostList from "@/components/infra/InfraHostList.vue";
 import InfraItemLabel from "@/components/infra/InfraItemLabel.vue";
 import InfraLoadingItem from "@/components/infra/InfraLoadingItem.vue";
 import InfraVmList from "@/components/infra/InfraVmList.vue";
-import { usePoolStore } from "@/stores/pool.store";
+import { usePoolCollection } from "@/composables/xen-api-collection/pool-collection.composable";
 import { faBuilding } from "@fortawesome/free-regular-svg-icons";
 
-const { isReady, hasError, pool } = usePoolStore().subscribe();
+const { isReady, hasError, pool } = usePoolCollection();
 </script>
 
 <style lang="postcss" scoped>

@xen-orchestra/lite/src/components/infra/InfraVmItem.vue

@@ -19,8 +19,8 @@
 import InfraAction from "@/components/infra/InfraAction.vue";
 import InfraItemLabel from "@/components/infra/InfraItemLabel.vue";
 import PowerStateIcon from "@/components/PowerStateIcon.vue";
+import { useVmCollection } from "@/composables/xen-api-collection/vm-collection.composable";
 import type { XenApiVm } from "@/libs/xen-api";
-import { useVmStore } from "@/stores/vm.store";
 import { faDisplay } from "@fortawesome/free-solid-svg-icons";
 import { useIntersectionObserver } from "@vueuse/core";
 import { computed, ref } from "vue";
@@ -29,7 +29,7 @@ const props = defineProps<{
   vmOpaqueRef: XenApiVm["$ref"];
 }>();
 
-const { getByOpaqueRef } = useVmStore().subscribe();
+const { getByOpaqueRef } = useVmCollection();
 const vm = computed(() => getByOpaqueRef(props.vmOpaqueRef));
 const rootElement = ref();
 const isVisible = ref(false);

@xen-orchestra/lite/src/components/infra/InfraVmList.vue

@@ -11,8 +11,8 @@
 <script lang="ts" setup>
 import InfraLoadingItem from "@/components/infra/InfraLoadingItem.vue";
 import InfraVmItem from "@/components/infra/InfraVmItem.vue";
+import { useVmCollection } from "@/composables/xen-api-collection/vm-collection.composable";
 import type { XenApiHost } from "@/libs/xen-api";
-import { useVmStore } from "@/stores/vm.store";
 import { faDisplay } from "@fortawesome/free-solid-svg-icons";
 import { computed } from "vue";
 
@@ -20,7 +20,7 @@ const props = defineProps<{
   hostOpaqueRef?: XenApiHost["$ref"];
 }>();
 
-const { isReady, recordsByHostRef, hasError } = useVmStore().subscribe();
+const { isReady, recordsByHostRef, hasError } = useVmCollection();
 
 const vms = computed(() =>
   recordsByHostRef.value.get(

@xen-orchestra/lite/src/components/pool/PoolHeader.vue

@@ -5,12 +5,12 @@
 </template>
 
 <script lang="ts" setup>
+import { usePoolCollection } from "@/composables/xen-api-collection/pool-collection.composable";
 import { computed } from "vue";
 import { faBuilding } from "@fortawesome/free-regular-svg-icons";
 import TitleBar from "@/components/TitleBar.vue";
-import { usePoolStore } from "@/stores/pool.store";
 
-const { pool } = usePoolStore().subscribe();
+const { pool } = usePoolCollection();
 
 const name = computed(() => pool.value?.name_label ?? "...");
 </script>

@xen-orchestra/lite/src/components/pool/PoolTabBar.vue

@@ -33,7 +33,7 @@
 <script lang="ts" setup>
 import RouterTab from "@/components/RouterTab.vue";
 import UiTabBar from "@/components/ui/UiTabBar.vue";
-import { usePoolStore } from "@/stores/pool.store";
+import { usePoolCollection } from "@/composables/xen-api-collection/pool-collection.composable";
 
-const { pool, isReady } = usePoolStore().subscribe();
+const { pool, isReady } = usePoolCollection();
 </script>

@xen-orchestra/lite/src/components/pool/dashboard/PoolDashboardCpuProvisioning.vue

@@ -37,12 +37,11 @@ import UiCard from "@/components/ui/UiCard.vue";
 import UiCardFooter from "@/components/ui/UiCardFooter.vue";
 import UiCardSpinner from "@/components/ui/UiCardSpinner.vue";
 import UiCardTitle from "@/components/ui/UiCardTitle.vue";
+import { useHostCollection } from "@/composables/xen-api-collection/host-collection.composable";
+import { useVmCollection } from "@/composables/xen-api-collection/vm-collection.composable";
+import { useVmMetricsCollection } from "@/composables/xen-api-collection/vm-metrics-collection.composable";
 import { percent } from "@/libs/utils";
 import { POWER_STATE } from "@/libs/xen-api";
-import { useHostMetricsStore } from "@/stores/host-metrics.store";
-import { useHostStore } from "@/stores/host.store";
-import { useVmMetricsStore } from "@/stores/vm-metrics.store";
-import { useVmStore } from "@/stores/vm.store";
 import { logicAnd } from "@vueuse/math";
 import { computed } from "vue";
 
@@ -52,18 +51,16 @@ const {
   hasError: hostStoreHasError,
   isReady: isHostStoreReady,
   runningHosts,
-} = useHostStore().subscribe({
-  hostMetricsSubscription: useHostMetricsStore().subscribe(),
-});
+} = useHostCollection();
 
 const {
   hasError: vmStoreHasError,
   isReady: isVmStoreReady,
   records: vms,
-} = useVmStore().subscribe();
+} = useVmCollection();
 
 const { getByOpaqueRef: getVmMetrics, isReady: isVmMetricsStoreReady } =
-  useVmMetricsStore().subscribe();
+  useVmMetricsCollection();
 
 const nPCpu = computed(() =>
   runningHosts.value.reduce(

@xen-orchestra/lite/src/components/pool/dashboard/PoolDashboardCpuUsage.vue

@@ -11,20 +11,20 @@
   </UiCard>
 </template>
 <script lang="ts" setup>
+import { useHostCollection } from "@/composables/xen-api-collection/host-collection.composable";
+import { useVmCollection } from "@/composables/xen-api-collection/vm-collection.composable";
 import { vTooltip } from "@/directives/tooltip.directive";
 import HostsCpuUsage from "@/components/pool/dashboard/cpuUsage/HostsCpuUsage.vue";
 import VmsCpuUsage from "@/components/pool/dashboard/cpuUsage/VmsCpuUsage.vue";
 import UiCard from "@/components/ui/UiCard.vue";
 import UiCardTitle from "@/components/ui/UiCardTitle.vue";
-import { useHostStore } from "@/stores/host.store";
-import { useVmStore } from "@/stores/vm.store";
 import { computed, inject, type ComputedRef } from "vue";
 import type { Stat } from "@/composables/fetch-stats.composable";
 import type { HostStats, VmStats } from "@/libs/xapi-stats";
 import UiSpinner from "@/components/ui/UiSpinner.vue";
 
-const { hasError: hasVmError } = useVmStore().subscribe();
-const { hasError: hasHostError } = useHostStore().subscribe();
+const { hasError: hasVmError } = useVmCollection();
+const { hasError: hasHostError } = useHostCollection();
 
 const vmStats = inject<ComputedRef<Stat<VmStats>[]>>(
   "vmStats",

@xen-orchestra/lite/src/components/pool/dashboard/PoolDashboardRamUsage.vue

@@ -12,21 +12,21 @@
 </template>
 
 <script lang="ts" setup>
+import { useHostCollection } from "@/composables/xen-api-collection/host-collection.composable";
+import { useVmCollection } from "@/composables/xen-api-collection/vm-collection.composable";
 import { vTooltip } from "@/directives/tooltip.directive";
 import HostsRamUsage from "@/components/pool/dashboard/ramUsage/HostsRamUsage.vue";
 import VmsRamUsage from "@/components/pool/dashboard/ramUsage/VmsRamUsage.vue";
 import UiCard from "@/components/ui/UiCard.vue";
 import UiCardTitle from "@/components/ui/UiCardTitle.vue";
-import { useHostStore } from "@/stores/host.store";
-import { useVmStore } from "@/stores/vm.store";
 import { computed, inject } from "vue";
 import type { ComputedRef } from "vue";
 import type { HostStats, VmStats } from "@/libs/xapi-stats";
 import type { Stat } from "@/composables/fetch-stats.composable";
 import UiSpinner from "@/components/ui/UiSpinner.vue";
 
-const { hasError: hasVmError } = useVmStore().subscribe();
-const { hasError: hasHostError } = useHostStore().subscribe();
+const { hasError: hasVmError } = useVmCollection();
+const { hasError: hasHostError } = useHostCollection();
 
 const vmStats = inject<ComputedRef<Stat<VmStats>[]>>(
   "vmStats",

@xen-orchestra/lite/src/components/pool/dashboard/PoolDashboardStatus.vue

@@ -26,21 +26,21 @@ import UiCard from "@/components/ui/UiCard.vue";
 import UiCardSpinner from "@/components/ui/UiCardSpinner.vue";
 import UiCardTitle from "@/components/ui/UiCardTitle.vue";
 import UiSeparator from "@/components/ui/UiSeparator.vue";
-import { useHostMetricsStore } from "@/stores/host-metrics.store";
-import { useVmStore } from "@/stores/vm.store";
+import { useHostMetricsCollection } from "@/composables/xen-api-collection/host-metrics-collection.composable";
+import { useVmCollection } from "@/composables/xen-api-collection/vm-collection.composable";
 import { computed } from "vue";
 
 const {
   isReady: isVmReady,
   records: vms,
   hasError: hasVmError,
-} = useVmStore().subscribe();
+} = useVmCollection();
 
 const {
   isReady: isHostMetricsReady,
   records: hostMetrics,
   hasError: hasHostMetricsError,
-} = useHostMetricsStore().subscribe();
+} = useHostMetricsCollection();
 
 const hasError = computed(() => hasVmError.value || hasHostMetricsError.value);
 

@xen-orchestra/lite/src/components/pool/dashboard/PoolDashboardStorageUsage.vue

@@ -23,11 +23,11 @@ import SizeStatsSummary from "@/components/ui/SizeStatsSummary.vue";
 import UiCard from "@/components/ui/UiCard.vue";
 import UiCardTitle from "@/components/ui/UiCardTitle.vue";
 import UsageBar from "@/components/UsageBar.vue";
-import { useSrStore } from "@/stores/storage.store";
+import { useSrCollection } from "@/composables/xen-api-collection/sr-collection.composable";
 import { N_ITEMS } from "@/views/pool/PoolDashboardView.vue";
 import { computed } from "vue";
 
-const { records: srs, isReady, hasError } = useSrStore().subscribe();
+const { records: srs, isReady, hasError } = useSrCollection();
 
 const data = computed<{
   result: { id: string; label: string; value: number }[];

@xen-orchestra/lite/src/components/pool/dashboard/PoolDashboardTasks.vue

@@ -9,9 +9,9 @@
 import TasksTable from "@/components/tasks/TasksTable.vue";
 import UiCard from "@/components/ui/UiCard.vue";
 import UiCardTitle from "@/components/ui/UiCardTitle.vue";
-import { useTaskStore } from "@/stores/task.store";
+import { useTaskCollection } from "@/composables/xen-api-collection/task-collection.composable";
 
-const { pendingTasks } = useTaskStore().subscribe();
+const { pendingTasks } = useTaskCollection();
 </script>
 
 <style lang="postcss" scoped></style>

@xen-orchestra/lite/src/components/pool/dashboard/cpuUsage/HostsCpuUsage.vue

@@ -12,13 +12,13 @@
 import NoDataError from "@/components/NoDataError.vue";
 import UiCardTitle from "@/components/ui/UiCardTitle.vue";
 import UsageBar from "@/components/UsageBar.vue";
+import { useHostCollection } from "@/composables/xen-api-collection/host-collection.composable";
 import { getAvgCpuUsage } from "@/libs/utils";
-import { useHostStore } from "@/stores/host.store";
 import { IK_HOST_STATS } from "@/types/injection-keys";
 import { N_ITEMS } from "@/views/pool/PoolDashboardView.vue";
 import { computed, type ComputedRef, inject } from "vue";
 
-const { hasError } = useHostStore().subscribe();
+const { hasError } = useHostCollection();
 
 const stats = inject(
   IK_HOST_STATS,

@xen-orchestra/lite/src/components/pool/dashboard/cpuUsage/PoolCpuUsageChart.vue

@@ -12,9 +12,9 @@
 </template>
 
 <script lang="ts" setup>
+import { useHostCollection } from "@/composables/xen-api-collection/host-collection.composable";
 import type { HostStats } from "@/libs/xapi-stats";
 import { RRD_STEP_FROM_STRING } from "@/libs/xapi-stats";
-import { useHostStore } from "@/stores/host.store";
 import type { LinearChartData, ValueFormatter } from "@/types/chart";
 import { IK_HOST_LAST_WEEK_STATS } from "@/types/injection-keys";
 import { sumBy } from "lodash-es";
@@ -29,7 +29,7 @@ const { t } = useI18n();
 
 const hostLastWeekStats = inject(IK_HOST_LAST_WEEK_STATS);
 
-const { records: hosts } = useHostStore().subscribe();
+const { records: hosts } = useHostCollection();
 
 const customMaxValue = computed(
   () => 100 * sumBy(hosts.value, (host) => +host.cpu_info.cpu_count)

@xen-orchestra/lite/src/components/pool/dashboard/cpuUsage/VmsCpuUsage.vue

@@ -12,13 +12,13 @@
 import NoDataError from "@/components/NoDataError.vue";
 import UiCardTitle from "@/components/ui/UiCardTitle.vue";
 import UsageBar from "@/components/UsageBar.vue";
+import { useVmCollection } from "@/composables/xen-api-collection/vm-collection.composable";
 import { getAvgCpuUsage } from "@/libs/utils";
-import { useVmStore } from "@/stores/vm.store";
 import { IK_VM_STATS } from "@/types/injection-keys";
 import { N_ITEMS } from "@/views/pool/PoolDashboardView.vue";
 import { computed, type ComputedRef, inject } from "vue";
 
-const { hasError } = useVmStore().subscribe();
+const { hasError } = useVmCollection();
 
 const stats = inject(
   IK_VM_STATS,

@xen-orchestra/lite/src/components/pool/dashboard/ramUsage/HostsRamUsage.vue

@@ -10,15 +10,15 @@
 
 <script lang="ts" setup>
 import UiCardTitle from "@/components/ui/UiCardTitle.vue";
+import { useHostCollection } from "@/composables/xen-api-collection/host-collection.composable";
 import { IK_HOST_STATS } from "@/types/injection-keys";
 import { type ComputedRef, computed, inject } from "vue";
 import UsageBar from "@/components/UsageBar.vue";
 import { formatSize, parseRamUsage } from "@/libs/utils";
 import { N_ITEMS } from "@/views/pool/PoolDashboardView.vue";
 import NoDataError from "@/components/NoDataError.vue";
-import { useHostStore } from "@/stores/host.store";
 
-const { hasError } = useHostStore().subscribe();
+const { hasError } = useHostCollection();
 
 const stats = inject(
   IK_HOST_STATS,

@xen-orchestra/lite/src/components/pool/dashboard/ramUsage/PoolRamUsage.vue

@@ -17,10 +17,10 @@
 
 <script lang="ts" setup>
 import SizeStatsSummary from "@/components/ui/SizeStatsSummary.vue";
-import { formatSize, getHostMemory } from "@/libs/utils";
+import { useHostCollection } from "@/composables/xen-api-collection/host-collection.composable";
+import { useHostMetricsCollection } from "@/composables/xen-api-collection/host-metrics-collection.composable";
+import { formatSize } from "@/libs/utils";
 import { RRD_STEP_FROM_STRING } from "@/libs/xapi-stats";
-import { useHostMetricsStore } from "@/stores/host-metrics.store";
-import { useHostStore } from "@/stores/host.store";
 import type { LinearChartData, ValueFormatter } from "@/types/chart";
 import { IK_HOST_LAST_WEEK_STATS } from "@/types/injection-keys";
 import { sumBy } from "lodash-es";
@@ -31,27 +31,22 @@ const LinearChart = defineAsyncComponent(
   () => import("@/components/charts/LinearChart.vue")
 );
 
-const hostMetricsSubscription = useHostMetricsStore().subscribe();
-
-const hostStore = useHostStore();
-const { runningHosts } = hostStore.subscribe({ hostMetricsSubscription });
+const { runningHosts } = useHostCollection();
+const { getHostMemory } = useHostMetricsCollection();
 
 const { t } = useI18n();
 
 const hostLastWeekStats = inject(IK_HOST_LAST_WEEK_STATS);
 
 const customMaxValue = computed(() =>
-  sumBy(
-    runningHosts.value,
-    (host) => getHostMemory(host, hostMetricsSubscription)?.size ?? 0
-  )
+  sumBy(runningHosts.value, (host) => getHostMemory(host)?.size ?? 0)
 );
 
 const currentData = computed(() => {
   let size = 0,
     usage = 0;
   runningHosts.value.forEach((host) => {
-    const hostMemory = getHostMemory(host, hostMetricsSubscription);
+    const hostMemory = getHostMemory(host);
     size += hostMemory?.size ?? 0;
     usage += hostMemory?.usage ?? 0;
   });

@xen-orchestra/lite/src/components/pool/dashboard/ramUsage/VmsRamUsage.vue

@@ -12,13 +12,13 @@
 import NoDataError from "@/components/NoDataError.vue";
 import UiCardTitle from "@/components/ui/UiCardTitle.vue";
 import UsageBar from "@/components/UsageBar.vue";
+import { useVmCollection } from "@/composables/xen-api-collection/vm-collection.composable";
 import { formatSize, parseRamUsage } from "@/libs/utils";
-import { useVmStore } from "@/stores/vm.store";
 import { IK_VM_STATS } from "@/types/injection-keys";
 import { N_ITEMS } from "@/views/pool/PoolDashboardView.vue";
 import { computed, type ComputedRef, inject } from "vue";
 
-const { hasError } = useVmStore().subscribe();
+const { hasError } = useVmCollection();
 
 const stats = inject(
   IK_VM_STATS,

@xen-orchestra/lite/src/components/tasks/TaskRow.vue

@@ -34,9 +34,9 @@
 <script lang="ts" setup>
 import RelativeTime from "@/components/RelativeTime.vue";
 import UiProgressBar from "@/components/ui/progress/UiProgressBar.vue";
+import { useHostCollection } from "@/composables/xen-api-collection/host-collection.composable";
 import { parseDateTime } from "@/libs/utils";
 import type { XenApiTask } from "@/libs/xen-api";
-import { useHostStore } from "@/stores/host.store";
 import { computed } from "vue";
 
 const props = defineProps<{
@@ -44,7 +44,7 @@ const props = defineProps<{
   task: XenApiTask;
 }>();
 
-const { getByOpaqueRef: getHost } = useHostStore().subscribe();
+const { getByOpaqueRef: getHost } = useHostCollection();
 
 const createdAt = computed(() => parseDateTime(props.task.created));
 

@xen-orchestra/lite/src/components/tasks/TasksTable.vue

@@ -40,8 +40,8 @@
 import TaskRow from "@/components/tasks/TaskRow.vue";
 import UiSpinner from "@/components/ui/UiSpinner.vue";
 import UiTable from "@/components/ui/UiTable.vue";
+import { useTaskCollection } from "@/composables/xen-api-collection/task-collection.composable";
 import type { XenApiTask } from "@/libs/xen-api";
-import { useTaskStore } from "@/stores/task.store";
 import { computed } from "vue";
 
 const props = defineProps<{
@@ -49,7 +49,7 @@ const props = defineProps<{
   finishedTasks?: XenApiTask[];
 }>();
 
-const { hasError, isFetching } = useTaskStore().subscribe();
+const { hasError, isFetching } = useTaskCollection();
 
 const hasTasks = computed(
   () => props.pendingTasks.length > 0 || (props.finishedTasks?.length ?? 0) > 0

@xen-orchestra/lite/src/components/vm/VmActionItems/VmActionCopyItem.vue

@@ -12,10 +12,9 @@
 
 <script lang="ts" setup>
 import MenuItem from "@/components/menu/MenuItem.vue";
+import { useVmCollection } from "@/composables/xen-api-collection/vm-collection.composable";
 import { vTooltip } from "@/directives/tooltip.directive";
-import { isOperationsPending } from "@/libs/utils";
 import { POWER_STATE, VM_OPERATION, type XenApiVm } from "@/libs/xen-api";
-import { useVmStore } from "@/stores/vm.store";
 import { useXenApiStore } from "@/stores/xen-api.store";
 import { faCopy } from "@fortawesome/free-solid-svg-icons";
 import { computed } from "vue";
@@ -24,7 +23,7 @@ const props = defineProps<{
   selectedRefs: XenApiVm["$ref"][];
 }>();
 
-const { getByOpaqueRef } = useVmStore().subscribe();
+const { getByOpaqueRef, isOperationPending } = useVmCollection();
 
 const selectedVms = computed(() =>
   props.selectedRefs
@@ -39,7 +38,7 @@ const areAllSelectedVmsHalted = computed(() =>
 );
 
 const areSomeSelectedVmsCloning = computed(() =>
-  selectedVms.value.some((vm) => isOperationsPending(vm, VM_OPERATION.CLONE))
+  selectedVms.value.some((vm) => isOperationPending(vm, VM_OPERATION.CLONE))
 );
 
 const handleCopy = async () => {

@xen-orchestra/lite/src/components/vm/VmActionItems/VmActionDeleteItem.vue

@@ -35,11 +35,11 @@
 
 <script lang="ts" setup>
 import MenuItem from "@/components/menu/MenuItem.vue";
+import { useVmCollection } from "@/composables/xen-api-collection/vm-collection.composable";
 import { POWER_STATE } from "@/libs/xen-api";
 import UiButton from "@/components/ui/UiButton.vue";
 import UiModal from "@/components/ui/UiModal.vue";
 import useModal from "@/composables/modal.composable";
-import { useVmStore } from "@/stores/vm.store";
 import { useXenApiStore } from "@/stores/xen-api.store";
 import { faSatellite, faTrashCan } from "@fortawesome/free-solid-svg-icons";
 import { computed } from "vue";
@@ -51,7 +51,7 @@ const props = defineProps<{
 }>();
 
 const xenApi = useXenApiStore().getXapi();
-const { getByOpaqueRef: getVm } = useVmStore().subscribe();
+const { getByOpaqueRef: getVm } = useVmCollection();
 const {
   open: openDeleteModal,
   close: closeDeleteModal,

@xen-orchestra/lite/src/components/vm/VmActionItems/VmActionExportItem.vue

@@ -27,6 +27,7 @@
 </template>
 
 <script lang="ts" setup>
+import { useVmCollection } from "@/composables/xen-api-collection/vm-collection.composable";
 import { computed } from "vue";
 import { exportVmsAsCsvFile, exportVmsAsJsonFile } from "@/libs/vm";
 import MenuItem from "@/components/menu/MenuItem.vue";
@@ -36,7 +37,6 @@ import {
   faFileCsv,
   faFileExport,
 } from "@fortawesome/free-solid-svg-icons";
-import { useVmStore } from "@/stores/vm.store";
 import { vTooltip } from "@/directives/tooltip.directive";
 import type { XenApiVm } from "@/libs/xen-api";
 
@@ -44,7 +44,7 @@ const props = defineProps<{
   vmRefs: XenApiVm["$ref"][];
 }>();
 
-const { getByOpaqueRef: getVm } = useVmStore().subscribe();
+const { getByOpaqueRef: getVm } = useVmCollection();
 const vms = computed(() =>
   props.vmRefs.map(getVm).filter((vm): vm is XenApiVm => vm !== undefined)
 );

@xen-orchestra/lite/src/components/vm/VmActionItems/VmActionPowerStateItems.vue

@@ -95,13 +95,12 @@
 import MenuItem from "@/components/menu/MenuItem.vue";
 import PowerStateIcon from "@/components/PowerStateIcon.vue";
 import UiIcon from "@/components/ui/icon/UiIcon.vue";
-import { isHostRunning, isOperationsPending } from "@/libs/utils";
+import { useHostCollection } from "@/composables/xen-api-collection/host-collection.composable";
+import { useHostMetricsCollection } from "@/composables/xen-api-collection/host-metrics-collection.composable";
+import { usePoolCollection } from "@/composables/xen-api-collection/pool-collection.composable";
+import { useVmCollection } from "@/composables/xen-api-collection/vm-collection.composable";
 import type { XenApiHost, XenApiVm } from "@/libs/xen-api";
 import { POWER_STATE, VM_OPERATION } from "@/libs/xen-api";
-import { useHostMetricsStore } from "@/stores/host-metrics.store";
-import { useHostStore } from "@/stores/host.store";
-import { usePoolStore } from "@/stores/pool.store";
-import { useVmStore } from "@/stores/vm.store";
 import { useXenApiStore } from "@/stores/xen-api.store";
 import {
   faCirclePlay,
@@ -121,12 +120,12 @@ const props = defineProps<{
   vmRefs: XenApiVm["$ref"][];
 }>();
 
-const { getByOpaqueRef: getVm } = useVmStore().subscribe();
-const { records: hosts } = useHostStore().subscribe();
-const { pool } = usePoolStore().subscribe();
-const hostMetricsSubscription = useHostMetricsStore().subscribe();
+const { getByOpaqueRef: getVm, isOperationPending } = useVmCollection();
+const { records: hosts } = useHostCollection();
+const { pool } = usePoolCollection();
+const { isHostRunning } = useHostMetricsCollection();
 
-const vms = computed<XenApiVm[]>(() =>
+const vms = computed(() =>
   props.vmRefs.map(getVm).filter((vm): vm is XenApiVm => vm !== undefined)
 );
 
@@ -150,7 +149,7 @@ const areVmsPaused = computed(() =>
 );
 
 const areOperationsPending = (operation: VM_OPERATION | VM_OPERATION[]) =>
-  vms.value.some((vm) => isOperationsPending(vm, operation));
+  vms.value.some((vm) => isOperationPending(vm, operation));
 
 const areVmsBusyToStart = computed(() =>
   areOperationsPending(VM_OPERATION.START)
@@ -180,9 +179,7 @@ const areVmsBusyToForceShutdown = computed(() =>
   areOperationsPending(VM_OPERATION.HARD_SHUTDOWN)
 );
 const getHostState = (host: XenApiHost) =>
-  isHostRunning(host, hostMetricsSubscription)
-    ? POWER_STATE.RUNNING
-    : POWER_STATE.HALTED;
+  isHostRunning(host) ? POWER_STATE.RUNNING : POWER_STATE.HALTED;
 </script>
 
 <style lang="postcss" scoped>

@xen-orchestra/lite/src/components/vm/VmHeader.vue

@@ -20,8 +20,8 @@ import AppMenu from "@/components/menu/AppMenu.vue";
 import TitleBar from "@/components/TitleBar.vue";
 import UiIcon from "@/components/ui/icon/UiIcon.vue";
 import UiButton from "@/components/ui/UiButton.vue";
-import { useVmStore } from "@/stores/vm.store";
 import VmActionPowerStateItems from "@/components/vm/VmActionItems/VmActionPowerStateItems.vue";
+import { useVmCollection } from "@/composables/xen-api-collection/vm-collection.composable";
 import type { XenApiVm } from "@/libs/xen-api";
 import {
   faAngleDown,
@@ -31,7 +31,7 @@ import {
 import { computed } from "vue";
 import { useRouter } from "vue-router";
 
-const { getByUuid: getVmByUuid } = useVmStore().subscribe();
+const { getByUuid: getVmByUuid } = useVmCollection();
 const { currentRoute } = useRouter();
 
 const vm = computed(() =>

@xen-orchestra/lite/src/composables/fetch-stats.composable.ts

@@ -17,9 +17,9 @@ export type Stat<T> = {
   pausable: Pausable;
 };
 
-type GetStats<
+export type GetStats<
   T extends XenApiHost | XenApiVm,
-  S extends HostStats | VmStats
+  S extends HostStats | VmStats = T extends XenApiHost ? HostStats : VmStats,
 > = (
   uuid: T["uuid"],
   granularity: GRANULARITY,
@@ -29,7 +29,7 @@ type GetStats<
 
 export type FetchedStats<
   T extends XenApiHost | XenApiVm,
-  S extends HostStats | VmStats
+  S extends HostStats | VmStats = T extends XenApiHost ? HostStats : VmStats,
 > = {
   register: (object: T) => void;
   unregister: (object: T) => void;
@@ -40,7 +40,7 @@ export type FetchedStats<
 
 export default function useFetchStats<
   T extends XenApiHost | XenApiVm,
-  S extends HostStats | VmStats
+  S extends HostStats | VmStats = T extends XenApiHost ? HostStats : VmStats,
 >(getStats: GetStats<T, S>, granularity: GRANULARITY): FetchedStats<T, S> {
   const stats = ref<Map<string, Stat<S>>>(new Map());
   const timestamp = ref<number[]>([0, 0]);
@@ -108,7 +108,7 @@ export default function useFetchStats<
   return {
     register,
     unregister,
-    stats: computed<Stat<S>[]>(() => Array.from(stats.value.values())),
+    stats: computed(() => Array.from(stats.value.values()) as Stat<S>[]),
     timestampStart: computed(() => timestamp.value[0]),
     timestampEnd: computed(() => timestamp.value[1]),
   };

@xen-orchestra/lite/src/composables/xen-api-collection.composable.ts

@@ -0,0 +1,63 @@
+import type { RawObjectType } from "@/libs/xen-api";
+import { getXenApiCollection } from "@/libs/xen-api-collection";
+import type {
+  RawTypeToRecord,
+  XenApiBaseCollection,
+  XenApiCollectionManager,
+} from "@/types/xen-api-collection";
+import { tryOnUnmounted } from "@vueuse/core";
+import { computed } from "vue";
+
+export const useXenApiCollection = <
+  ObjectType extends RawObjectType,
+  Record extends RawTypeToRecord<ObjectType>,
+  Immediate extends boolean,
+>(
+  type: ObjectType,
+  options?: { immediate?: Immediate }
+): XenApiBaseCollection<Record, Immediate> => {
+  const baseCollection = getXenApiCollection(type);
+  const isDeferred = options?.immediate === false;
+
+  const id = Symbol();
+
+  const collection = {
+    records: baseCollection.records,
+    isFetching: baseCollection.isFetching,
+    isReloading: baseCollection.isReloading,
+    isReady: baseCollection.isReady,
+    hasError: baseCollection.hasError,
+    hasUuid: baseCollection.hasUuid.bind(baseCollection),
+    getByUuid: baseCollection.getByUuid.bind(baseCollection),
+    getByOpaqueRef: baseCollection.getByOpaqueRef.bind(baseCollection),
+  };
+
+  tryOnUnmounted(() => baseCollection.unsubscribe(id));
+
+  if (isDeferred) {
+    return {
+      ...collection,
+      start: () => baseCollection.subscribe(id),
+      isStarted: computed(() => baseCollection.hasSubscriptions.value),
+    } as XenApiBaseCollection<Record, false>;
+  }
+
+  baseCollection.subscribe(id);
+  return collection as XenApiBaseCollection<Record, Immediate>;
+};
+
+export const useXenApiCollectionManager = <
+  ObjectType extends RawObjectType,
+  Record extends RawTypeToRecord<ObjectType>,
+>(
+  type: ObjectType
+): XenApiCollectionManager<Record> => {
+  const collection = getXenApiCollection(type);
+
+  return {
+    hasSubscriptions: collection.hasSubscriptions,
+    add: collection.add.bind(collection),
+    remove: collection.remove.bind(collection),
+    update: collection.update.bind(collection),
+  };
+};

@xen-orchestra/lite/src/composables/xen-api-collection/console-collection.composable.ts

@@ -0,0 +1,3 @@
+import { useXenApiCollection } from "@/composables/xen-api-collection.composable";
+
+export const useConsoleCollection = () => useXenApiCollection("console");

@xen-orchestra/lite/src/composables/xen-api-collection/host-collection.composable.ts

@@ -0,0 +1,45 @@
+import type { GetStats } from "@/composables/fetch-stats.composable";
+import { useXenApiCollection } from "@/composables/xen-api-collection.composable";
+import { useHostMetricsCollection } from "@/composables/xen-api-collection/host-metrics-collection.composable";
+import type { XenApiHost } from "@/libs/xen-api";
+import { useXenApiStore } from "@/stores/xen-api.store";
+import { computed } from "vue";
+
+export const useHostCollection = () => {
+  const collection = useXenApiCollection("host");
+  const hostMetricsCollection = useHostMetricsCollection();
+
+  return {
+    ...collection,
+    runningHosts: computed(() =>
+      collection.records.value.filter((host) =>
+        hostMetricsCollection.isHostRunning(host)
+      )
+    ),
+    getStats: ((
+      hostUuid,
+      granularity,
+      ignoreExpired = false,
+      { abortSignal }
+    ) => {
+      const xenApiStore = useXenApiStore();
+      const host = collection.getByUuid(hostUuid);
+
+      if (host === undefined) {
+        throw new Error(`Host ${hostUuid} could not be found.`);
+      }
+
+      const xapiStats = xenApiStore.isConnected
+        ? xenApiStore.getXapiStats()
+        : undefined;
+
+      return xapiStats?._getAndUpdateStats({
+        abortSignal,
+        host,
+        ignoreExpired,
+        uuid: host.uuid,
+        granularity,
+      });
+    }) as GetStats<XenApiHost>,
+  };
+};

@xen-orchestra/lite/src/composables/xen-api-collection/host-metrics-collection.composable.ts

@@ -0,0 +1,24 @@
+import { useXenApiCollection } from "@/composables/xen-api-collection.composable";
+import type { XenApiHost } from "@/libs/xen-api";
+
+export const useHostMetricsCollection = () => {
+  const collection = useXenApiCollection("host_metrics");
+
+  return {
+    ...collection,
+    getHostMemory: (host: XenApiHost) => {
+      const hostMetrics = collection.getByOpaqueRef(host.metrics);
+
+      if (hostMetrics !== undefined) {
+        const total = +hostMetrics.memory_total;
+        return {
+          usage: total - +hostMetrics.memory_free,
+          size: total,
+        };
+      }
+    },
+    isHostRunning: (host: XenApiHost) => {
+      return collection.getByOpaqueRef(host.metrics)?.live === true;
+    },
+  };
+};

@xen-orchestra/lite/src/composables/xen-api-collection/pool-collection.composable.ts

@@ -0,0 +1,14 @@
+import { useXenApiCollection } from "@/composables/xen-api-collection.composable";
+import type { XenApiPool } from "@/libs/xen-api";
+import { computed } from "vue";
+
+export const usePoolCollection = () => {
+  const poolCollection = useXenApiCollection("pool");
+
+  return {
+    ...poolCollection,
+    pool: computed<XenApiPool | undefined>(
+      () => poolCollection.records.value[0]
+    ),
+  };
+};

@xen-orchestra/lite/src/composables/xen-api-collection/sr-collection.composable.ts

@@ -0,0 +1,3 @@
+import { useXenApiCollection } from "@/composables/xen-api-collection.composable";
+
+export const useSrCollection = () => useXenApiCollection("SR");

@xen-orchestra/lite/src/composables/xen-api-collection/task-collection.composable.ts

@@ -0,0 +1,41 @@
+import useArrayRemovedItemsHistory from "@/composables/array-removed-items-history.composable";
+import useCollectionFilter from "@/composables/collection-filter.composable";
+import useCollectionSorter from "@/composables/collection-sorter.composable";
+import { useXenApiCollection } from "@/composables/xen-api-collection.composable";
+import useFilteredCollection from "@/composables/filtered-collection.composable";
+import useSortedCollection from "@/composables/sorted-collection.composable";
+import type { XenApiTask } from "@/libs/xen-api";
+
+export const useTaskCollection = () => {
+  const collection = useXenApiCollection("task");
+
+  const { compareFn } = useCollectionSorter<XenApiTask>({
+    initialSorts: ["-created"],
+  });
+
+  const { predicate } = useCollectionFilter({
+    initialFilters: [
+      "!name_label:|(SR.scan host.call_plugin)",
+      "status:pending",
+    ],
+  });
+
+  const sortedTasks = useSortedCollection(collection.records, compareFn);
+
+  return {
+    ...collection,
+    pendingTasks: useFilteredCollection<XenApiTask>(sortedTasks, predicate),
+    finishedTasks: useArrayRemovedItemsHistory(
+      sortedTasks,
+      (task) => task.uuid,
+      {
+        limit: 50,
+        onRemove: (tasks) =>
+          tasks.map((task) => ({
+            ...task,
+            finished: new Date().toISOString(),
+          })),
+      }
+    ),
+  };
+};

@xen-orchestra/lite/src/composables/xen-api-collection/vm-collection.composable.ts

@@ -0,0 +1,83 @@
+import type { GetStats } from "@/composables/fetch-stats.composable";
+import { useXenApiCollection } from "@/composables/xen-api-collection.composable";
+import { useHostCollection } from "@/composables/xen-api-collection/host-collection.composable";
+import { sortRecordsByNameLabel } from "@/libs/utils";
+import type { VmStats } from "@/libs/xapi-stats";
+import {
+  POWER_STATE,
+  VM_OPERATION,
+  type XenApiHost,
+  type XenApiVm,
+} from "@/libs/xen-api";
+import { useXenApiStore } from "@/stores/xen-api.store";
+import { castArray } from "lodash-es";
+import { computed } from "vue";
+
+export const useVmCollection = () => {
+  const collection = useXenApiCollection("VM");
+  const hostCollection = useHostCollection();
+  const xenApiStore = useXenApiStore();
+
+  const records = computed(() =>
+    collection.records.value
+      .filter(
+        (vm) => !vm.is_a_snapshot && !vm.is_a_template && !vm.is_control_domain
+      )
+      .sort(sortRecordsByNameLabel)
+  );
+
+  return {
+    ...collection,
+    records,
+    isOperationPending: (
+      vm: XenApiVm,
+      operations: VM_OPERATION[] | VM_OPERATION
+    ) => {
+      const currentOperations = Object.values(vm.current_operations);
+      return castArray(operations).some((operation) =>
+        currentOperations.includes(operation)
+      );
+    },
+    runningVms: computed(() =>
+      records.value.filter((vm) => vm.power_state === POWER_STATE.RUNNING)
+    ),
+    recordsByHostRef: computed(() => {
+      const vmsByHostOpaqueRef = new Map<XenApiHost["$ref"], XenApiVm[]>();
+
+      records.value.forEach((vm) => {
+        if (!vmsByHostOpaqueRef.has(vm.resident_on)) {
+          vmsByHostOpaqueRef.set(vm.resident_on, []);
+        }
+
+        vmsByHostOpaqueRef.get(vm.resident_on)?.push(vm);
+      });
+
+      return vmsByHostOpaqueRef;
+    }),
+    getStats: ((id, granularity, ignoreExpired = false, { abortSignal }) => {
+      if (!xenApiStore.isConnected) {
+        return undefined;
+      }
+
+      const vm = collection.getByUuid(id);
+
+      if (vm === undefined) {
+        throw new Error(`VM ${id} could not be found.`);
+      }
+
+      const host = hostCollection.getByOpaqueRef(vm.resident_on);
+
+      if (host === undefined) {
+        throw new Error(`VM ${id} is halted or host could not be found.`);
+      }
+
+      return xenApiStore.getXapiStats()._getAndUpdateStats<VmStats>({
+        abortSignal,
+        host,
+        ignoreExpired,
+        uuid: vm.uuid,
+        granularity,
+      });
+    }) as GetStats<XenApiVm>,
+  };
+};

@xen-orchestra/lite/src/composables/xen-api-collection/vm-metrics-collection.composable.ts

@@ -0,0 +1,3 @@
+import { useXenApiCollection } from "@/composables/xen-api-collection.composable";
+
+export const useVmMetricsCollection = () => useXenApiCollection("VM_metrics");

@xen-orchestra/lite/src/libs/utils.ts

@@ -1,18 +1,14 @@
 import type {
   RawXenApiRecord,
-  XenApiHost,
   XenApiRecord,
-  XenApiVm,
-  VM_OPERATION,
   RawObjectType,
 } from "@/libs/xen-api";
 import type { Filter } from "@/types/filter";
-import type { Subscription } from "@/types/xapi-collection";
 import { faSquareCheck } from "@fortawesome/free-regular-svg-icons";
 import { faFont, faHashtag, faList } from "@fortawesome/free-solid-svg-icons";
 import { utcParse } from "d3-time-format";
 import humanFormat from "human-format";
-import { castArray, find, forEach, round, size, sum } from "lodash-es";
+import { find, forEach, round, size, sum } from "lodash-es";
 
 export function sortRecordsByNameLabel(
   record1: { name_label: string },
@@ -21,14 +17,7 @@ export function sortRecordsByNameLabel(
   const label1 = record1.name_label.toLocaleLowerCase();
   const label2 = record2.name_label.toLocaleLowerCase();
 
-  switch (true) {
-    case label1 < label2:
-      return -1;
-    case label1 > label2:
-      return 1;
-    default:
-      return 0;
-  }
+  return label1.localeCompare(label2);
 }
 
 export function escapeRegExp(string: string) {
@@ -114,28 +103,6 @@ export function getStatsLength(stats?: object | any[]) {
   return size(find(stats, (stat) => stat != null));
 }
 
-export function isHostRunning(
-  host: XenApiHost,
-  hostMetricsSubscription: Subscription<"host_metrics", object>
-) {
-  return hostMetricsSubscription.getByOpaqueRef(host.metrics)?.live === true;
-}
-
-export function getHostMemory(
-  host: XenApiHost,
-  hostMetricsSubscription: Subscription<"host_metrics", object>
-) {
-  const hostMetrics = hostMetricsSubscription.getByOpaqueRef(host.metrics);
-
-  if (hostMetrics !== undefined) {
-    const total = +hostMetrics.memory_total;
-    return {
-      usage: total - +hostMetrics.memory_free,
-      size: total,
-    };
-  }
-}
-
 export const buildXoObject = <T extends XenApiRecord<RawObjectType>>(
   record: RawXenApiRecord<T>,
   params: { opaqueRef: T["$ref"] }
@@ -182,13 +149,3 @@ export function parseRamUsage(
 
 export const getFirst = <T>(value: T | T[]): T | undefined =>
   Array.isArray(value) ? value[0] : value;
-
-export const isOperationsPending = (
-  obj: XenApiVm,
-  operations: VM_OPERATION[] | VM_OPERATION
-) => {
-  const currentOperations = Object.values(obj.current_operations);
-  return castArray(operations).some((operation) =>
-    currentOperations.includes(operation)
-  );
-};

@xen-orchestra/lite/src/libs/xen-api-collection.ts

@@ -0,0 +1,112 @@
+import type { RawObjectType, XenApiRecord } from "@/libs/xen-api";
+import { useXenApiStore } from "@/stores/xen-api.store";
+import type { RawTypeToRecord } from "@/types/xen-api-collection";
+import { whenever } from "@vueuse/core";
+import { computed, reactive } from "vue";
+
+const collections = new Map<RawObjectType, XenApiCollection<any>>();
+
+export const getXenApiCollection = <
+  ObjectType extends RawObjectType,
+  Record extends RawTypeToRecord<ObjectType> = RawTypeToRecord<ObjectType>,
+>(
+  type: ObjectType
+) => {
+  if (!collections.has(type)) {
+    collections.set(type, new XenApiCollection(type));
+  }
+
+  return collections.get(type)! as XenApiCollection<Record>;
+};
+
+export class XenApiCollection<Record extends XenApiRecord<any>> {
+  private state = reactive({
+    isReady: false,
+    isFetching: false,
+    lastError: undefined as string | undefined,
+    subscriptions: new Set<symbol>(),
+    recordsByOpaqueRef: new Map<Record["$ref"], Record>(),
+    recordsByUuid: new Map<Record["uuid"], Record>(),
+  });
+
+  isReady = computed(() => this.state.isReady);
+
+  isFetching = computed(() => this.state.isFetching);
+
+  isReloading = computed(() => this.state.isReady && this.state.isFetching);
+
+  lastError = computed(() => this.state.lastError);
+
+  hasError = computed(() => this.state.lastError !== undefined);
+
+  hasSubscriptions = computed(() => this.state.subscriptions.size > 0);
+
+  records = computed(() => Array.from(this.state.recordsByOpaqueRef.values()));
+
+  subscribe(id: symbol) {
+    this.state.subscriptions.add(id);
+  }
+
+  unsubscribe(id: symbol) {
+    this.state.subscriptions.delete(id);
+  }
+
+  constructor(private type: RawObjectType) {
+    const xenApiStore = useXenApiStore();
+
+    whenever(
+      () => xenApiStore.isConnected && this.hasSubscriptions.value,
+      () => this.fetchAll(xenApiStore)
+    );
+  }
+
+  getByOpaqueRef(opaqueRef: Record["$ref"]) {
+    return this.state.recordsByOpaqueRef.get(opaqueRef);
+  }
+
+  getByUuid(uuid: Record["uuid"]) {
+    return this.state.recordsByUuid.get(uuid);
+  }
+
+  hasUuid(uuid: Record["uuid"]) {
+    return this.state.recordsByUuid.has(uuid);
+  }
+
+  add(record: Record) {
+    this.state.recordsByOpaqueRef.set(record.$ref, record);
+    this.state.recordsByUuid.set(record.uuid, record);
+  }
+
+  update(record: Record) {
+    this.state.recordsByOpaqueRef.set(record.$ref, record);
+    this.state.recordsByUuid.set(record.uuid, record);
+  }
+
+  remove(opaqueRef: Record["$ref"]) {
+    if (!this.state.recordsByOpaqueRef.has(opaqueRef)) {
+      return;
+    }
+
+    const record = this.state.recordsByOpaqueRef.get(opaqueRef)!;
+    this.state.recordsByOpaqueRef.delete(opaqueRef);
+    this.state.recordsByUuid.delete(record.uuid);
+  }
+
+  private async fetchAll(xenApiStore: ReturnType<typeof useXenApiStore>) {
+    try {
+      this.state.isFetching = true;
+      this.state.lastError = undefined;
+      const records = await xenApiStore
+        .getXapi()
+        .loadRecords<any, Record>(this.type);
+      this.state.recordsByOpaqueRef.clear();
+      this.state.recordsByUuid.clear();
+      records.forEach((record) => this.add(record));
+      this.state.isReady = true;
+    } catch {
+      this.state.lastError = `[${this.type}] Failed to fetch records`;
+    } finally {
+      this.state.isFetching = false;
+    }
+  }
+}

@xen-orchestra/lite/src/libs/xen-api.ts

@@ -1,5 +1,5 @@
 import { buildXoObject, parseDateTime } from "@/libs/utils";
-import type { RawTypeToRecord } from "@/types/xapi-collection";
+import type { RawTypeToRecord } from "@/types/xen-api-collection";
 import { JSONRPCClient } from "json-rpc-2.0";
 import { castArray } from "lodash-es";
 
@@ -295,7 +295,7 @@ export default class XenApi {
 
   async loadRecords<
     T extends RawObjectType,
-    R extends RawTypeToRecord<T> = RawTypeToRecord<T>
+    R extends RawTypeToRecord<T> = RawTypeToRecord<T>,
   >(type: T): Promise<R[]> {
     const result = await this.#call<{ [key: string]: R }>(
       `${type}.get_all_records`,

@xen-orchestra/lite/src/router/story.ts

@@ -1,21 +1,21 @@
 import type { RouteRecordRaw } from "vue-router";
 
-const componentLoaders = import.meta.glob("@/stories/*.story.vue");
-const docLoaders = import.meta.glob("@/stories/*.story.md", { as: "raw" });
+const componentLoaders = import.meta.glob("@/stories/**/*.story.vue");
+const docLoaders = import.meta.glob("@/stories/**/*.story.md", { as: "raw" });
 
 const children: RouteRecordRaw[] = Object.entries(componentLoaders).map(
   ([path, componentLoader]) => {
-    const basename = path.replace(/^\/src\/stories\/(.*)\.story.vue$/, "$1");
+    const basePath = path.replace(/^\/src\/stories\/(.*)\.story.vue$/, "$1");
     const docPath = path.replace(/\.vue$/, ".md");
-    const routeName = `story-${basename}`;
+    const routeName = `story-${basePath}`;
 
     return {
       name: routeName,
-      path: basename,
+      path: basePath,
       component: componentLoader,
       meta: {
         isStory: true,
-        storyTitle: basenameToStoryTitle(basename),
+        storyTitle: basePathToStoryTitle(basePath),
         storyMdLoader: docLoaders[docPath],
       },
     };
@@ -46,8 +46,10 @@ export default {
  *  Basename: `my-component`
  *  Page title: `My Component`
  */
-function basenameToStoryTitle(basename: string) {
-  return basename
+function basePathToStoryTitle(basePath: string) {
+  return basePath
+    .split("/")
+    .pop()!
     .split("-")
     .map((s) => `${s.charAt(0).toUpperCase()}${s.substring(1)}`)
     .join(" ");

@xen-orchestra/lite/src/stores/alarm.store.ts

@@ -1,30 +0,0 @@
-import { useXapiCollectionStore } from "@/stores/xapi-collection.store";
-import { createSubscribe } from "@/types/xapi-collection";
-import { defineStore } from "pinia";
-import { computed } from "vue";
-
-export const useAlarmStore = defineStore("alarm", () => {
-  const messageCollection = useXapiCollectionStore().get("message");
-
-  const subscribe = createSubscribe<"message", []>((options) => {
-    const originalSubscription = messageCollection.subscribe(options);
-
-    const extendedSubscription = {
-      records: computed(() =>
-        originalSubscription.records.value.filter(
-          (record) => record.name === "alarm"
-        )
-      ),
-    };
-
-    return {
-      ...originalSubscription,
-      ...extendedSubscription,
-    };
-  });
-
-  return {
-    ...messageCollection,
-    subscribe,
-  };
-});

@xen-orchestra/lite/src/stores/console.store.ts

@@ -1,6 +0,0 @@
-import { useXapiCollectionStore } from "@/stores/xapi-collection.store";
-import { defineStore } from "pinia";
-
-export const useConsoleStore = defineStore("console", () =>
-  useXapiCollectionStore().get("console")
-);

@xen-orchestra/lite/src/stores/host-metrics.store.ts

@@ -1,6 +0,0 @@
-import { useXapiCollectionStore } from "@/stores/xapi-collection.store";
-import { defineStore } from "pinia";
-
-export const useHostMetricsStore = defineStore("host-metrics", () =>
-  useXapiCollectionStore().get("host_metrics")
-);

@xen-orchestra/lite/src/stores/host.store.ts

@@ -1,91 +0,0 @@
-import { isHostRunning, sortRecordsByNameLabel } from "@/libs/utils";
-import type {
-  GRANULARITY,
-  HostStats,
-  XapiStatsResponse,
-} from "@/libs/xapi-stats";
-import type { XenApiHost } from "@/libs/xen-api";
-import { useXapiCollectionStore } from "@/stores/xapi-collection.store";
-import { useXenApiStore } from "@/stores/xen-api.store";
-import type { Subscription } from "@/types/xapi-collection";
-import { createSubscribe } from "@/types/xapi-collection";
-import { defineStore } from "pinia";
-import { computed, type ComputedRef } from "vue";
-
-type GetStats = (
-  hostUuid: XenApiHost["uuid"],
-  granularity: GRANULARITY,
-  ignoreExpired: boolean,
-  opts: { abortSignal?: AbortSignal }
-) => Promise<XapiStatsResponse<HostStats> | undefined> | undefined;
-
-type GetStatsExtension = {
-  getStats: GetStats;
-};
-
-type RunningHostsExtension = [
-  { runningHosts: ComputedRef<XenApiHost[]> },
-  { hostMetricsSubscription: Subscription<"host_metrics", any> }
-];
-
-type Extensions = [GetStatsExtension, RunningHostsExtension];
-
-export const useHostStore = defineStore("host", () => {
-  const xenApiStore = useXenApiStore();
-  const hostCollection = useXapiCollectionStore().get("host");
-
-  hostCollection.setSort(sortRecordsByNameLabel);
-
-  const subscribe = createSubscribe<"host", Extensions>((options) => {
-    const originalSubscription = hostCollection.subscribe(options);
-
-    const getStats: GetStats = (
-      hostUuid,
-      granularity,
-      ignoreExpired = false,
-      { abortSignal }
-    ) => {
-      const host = originalSubscription.getByUuid(hostUuid);
-
-      if (host === undefined) {
-        throw new Error(`Host ${hostUuid} could not be found.`);
-      }
-
-      const xapiStats = xenApiStore.isConnected
-        ? xenApiStore.getXapiStats()
-        : undefined;
-
-      return xapiStats?._getAndUpdateStats<HostStats>({
-        abortSignal,
-        host,
-        ignoreExpired,
-        uuid: host.uuid,
-        granularity,
-      });
-    };
-
-    const extendedSubscription = {
-      getStats,
-    };
-
-    const hostMetricsSubscription = options?.hostMetricsSubscription;
-
-    const runningHostsSubscription = hostMetricsSubscription !== undefined && {
-      runningHosts: computed(() =>
-        originalSubscription.records.value.filter((host) =>
-          isHostRunning(host, hostMetricsSubscription)
-        )
-      ),
-    };
-    return {
-      ...originalSubscription,
-      ...extendedSubscription,
-      ...runningHostsSubscription,
-    };
-  });
-
-  return {
-    ...hostCollection,
-    subscribe,
-  };
-});

@xen-orchestra/lite/src/stores/pool.store.ts

@@ -1,34 +0,0 @@
-import { getFirst } from "@/libs/utils";
-import type { XenApiPool } from "@/libs/xen-api";
-import { useXapiCollectionStore } from "@/stores/xapi-collection.store";
-import { createSubscribe } from "@/types/xapi-collection";
-import { defineStore } from "pinia";
-import { computed, type ComputedRef } from "vue";
-
-type PoolExtension = {
-  pool: ComputedRef<XenApiPool | undefined>;
-};
-
-type Extensions = [PoolExtension];
-
-export const usePoolStore = defineStore("pool", () => {
-  const poolCollection = useXapiCollectionStore().get("pool");
-
-  const subscribe = createSubscribe<"pool", Extensions>((options) => {
-    const originalSubscription = poolCollection.subscribe(options);
-
-    const extendedSubscription = {
-      pool: computed(() => getFirst(originalSubscription.records.value)),
-    };
-
-    return {
-      ...originalSubscription,
-      ...extendedSubscription,
-    };
-  });
-
-  return {
-    ...poolCollection,
-    subscribe,
-  };
-});

@xen-orchestra/lite/src/stores/storage.store.ts

@@ -1,6 +0,0 @@
-import { useXapiCollectionStore } from "@/stores/xapi-collection.store";
-import { defineStore } from "pinia";
-
-export const useSrStore = defineStore("SR", () =>
-  useXapiCollectionStore().get("SR")
-);

@xen-orchestra/lite/src/stores/task.store.ts

@@ -1,64 +0,0 @@
-import useArrayRemovedItemsHistory from "@/composables/array-removed-items-history.composable";
-import useCollectionFilter from "@/composables/collection-filter.composable";
-import useCollectionSorter from "@/composables/collection-sorter.composable";
-import useFilteredCollection from "@/composables/filtered-collection.composable";
-import useSortedCollection from "@/composables/sorted-collection.composable";
-import type { XenApiTask } from "@/libs/xen-api";
-import { useXapiCollectionStore } from "@/stores/xapi-collection.store";
-import { createSubscribe } from "@/types/xapi-collection";
-import { defineStore } from "pinia";
-import type { ComputedRef, Ref } from "vue";
-
-type PendingTasksExtension = {
-  pendingTasks: ComputedRef<XenApiTask[]>;
-};
-
-type FinishedTasksExtension = {
-  finishedTasks: Ref<XenApiTask[]>;
-};
-
-type Extensions = [PendingTasksExtension, FinishedTasksExtension];
-
-export const useTaskStore = defineStore("task", () => {
-  const tasksCollection = useXapiCollectionStore().get("task");
-
-  const subscribe = createSubscribe<"task", Extensions>(() => {
-    const subscription = tasksCollection.subscribe();
-
-    const { compareFn } = useCollectionSorter<XenApiTask>({
-      initialSorts: ["-created"],
-    });
-
-    const sortedTasks = useSortedCollection(subscription.records, compareFn);
-
-    const { predicate } = useCollectionFilter({
-      initialFilters: [
-        "!name_label:|(SR.scan host.call_plugin)",
-        "status:pending",
-      ],
-    });
-
-    const extendedSubscription = {
-      pendingTasks: useFilteredCollection<XenApiTask>(sortedTasks, predicate),
-      finishedTasks: useArrayRemovedItemsHistory(
-        sortedTasks,
-        (task) => task.uuid,
-        {
-          limit: 50,
-          onRemove: (tasks) =>
-            tasks.map((task) => ({
-              ...task,
-              finished: new Date().toISOString(),
-            })),
-        }
-      ),
-    };
-
-    return {
-      ...subscription,
-      ...extendedSubscription,
-    };
-  });
-
-  return { ...tasksCollection, subscribe };
-});

@xen-orchestra/lite/src/stores/vm-guest-metrics.store.ts

@@ -1,6 +0,0 @@
-import { useXapiCollectionStore } from "@/stores/xapi-collection.store";
-import { defineStore } from "pinia";
-
-export const useVmGuestMetricsStore = defineStore("vm-guest-metrics", () =>
-  useXapiCollectionStore().get("VM_guest_metrics")
-);

@xen-orchestra/lite/src/stores/vm-metrics.store.ts

@@ -1,6 +0,0 @@
-import { useXapiCollectionStore } from "@/stores/xapi-collection.store";
-import { defineStore } from "pinia";
-
-export const useVmMetricsStore = defineStore("vm-metrics", () =>
-  useXapiCollectionStore().get("VM_metrics")
-);

@xen-orchestra/lite/src/stores/vm.store.ts

@@ -1,125 +0,0 @@
-import { sortRecordsByNameLabel } from "@/libs/utils";
-import type {
-  GRANULARITY,
-  VmStats,
-  XapiStatsResponse,
-} from "@/libs/xapi-stats";
-import type { XenApiHost, XenApiVm } from "@/libs/xen-api";
-import { POWER_STATE } from "@/libs/xen-api";
-import { useXapiCollectionStore } from "@/stores/xapi-collection.store";
-import { useXenApiStore } from "@/stores/xen-api.store";
-import { createSubscribe, type Subscription } from "@/types/xapi-collection";
-import { defineStore } from "pinia";
-import { computed, type ComputedRef } from "vue";
-
-type GetStats = (
-  id: XenApiVm["uuid"],
-  granularity: GRANULARITY,
-  ignoreExpired: boolean,
-  opts: { abortSignal?: AbortSignal }
-) => Promise<XapiStatsResponse<VmStats> | undefined> | undefined;
-type DefaultExtension = {
-  recordsByHostRef: ComputedRef<Map<XenApiHost["$ref"], XenApiVm[]>>;
-  runningVms: ComputedRef<XenApiVm[]>;
-};
-
-type GetStatsExtension = [
-  {
-    getStats: GetStats;
-  },
-  { hostSubscription: Subscription<"host", object> }
-];
-
-type Extensions = [DefaultExtension, GetStatsExtension];
-
-export const useVmStore = defineStore("vm", () => {
-  const vmCollection = useXapiCollectionStore().get("VM");
-
-  vmCollection.setFilter(
-    (vm) => !vm.is_a_snapshot && !vm.is_a_template && !vm.is_control_domain
-  );
-
-  vmCollection.setSort(sortRecordsByNameLabel);
-
-  const subscribe = createSubscribe<"VM", Extensions>((options) => {
-    const originalSubscription = vmCollection.subscribe(options);
-
-    const extendedSubscription = {
-      recordsByHostRef: computed(() => {
-        const vmsByHostOpaqueRef = new Map<XenApiHost["$ref"], XenApiVm[]>();
-
-        originalSubscription.records.value.forEach((vm) => {
-          if (!vmsByHostOpaqueRef.has(vm.resident_on)) {
-            vmsByHostOpaqueRef.set(vm.resident_on, []);
-          }
-
-          vmsByHostOpaqueRef.get(vm.resident_on)?.push(vm);
-        });
-
-        return vmsByHostOpaqueRef;
-      }),
-      runningVms: computed(() =>
-        originalSubscription.records.value.filter(
-          (vm) => vm.power_state === POWER_STATE.RUNNING
-        )
-      ),
-    };
-
-    const hostSubscription = options?.hostSubscription;
-
-    const getStatsSubscription:
-      | {
-          getStats: GetStats;
-        }
-      | undefined =
-      hostSubscription !== undefined
-        ? {
-            getStats: (
-              id,
-              granularity,
-              ignoreExpired = false,
-              { abortSignal }
-            ) => {
-              const xenApiStore = useXenApiStore();
-
-              if (!xenApiStore.isConnected) {
-                return undefined;
-              }
-
-              const vm = originalSubscription.getByUuid(id);
-
-              if (vm === undefined) {
-                throw new Error(`VM ${id} could not be found.`);
-              }
-
-              const host = hostSubscription.getByOpaqueRef(vm.resident_on);
-
-              if (host === undefined) {
-                throw new Error(
-                  `VM ${id} is halted or host could not be found.`
-                );
-              }
-
-              return xenApiStore.getXapiStats()._getAndUpdateStats<VmStats>({
-                abortSignal,
-                host,
-                ignoreExpired,
-                uuid: vm.uuid,
-                granularity,
-              });
-            },
-          }
-        : undefined;
-
-    return {
-      ...originalSubscription,
-      ...extendedSubscription,
-      ...getStatsSubscription,
-    };
-  });
-
-  return {
-    ...vmCollection,
-    subscribe,
-  };
-});

@xen-orchestra/lite/src/stores/xapi-collection.store.ts

@@ -1,156 +0,0 @@
-import type { RawObjectType } from "@/libs/xen-api";
-import { useXenApiStore } from "@/stores/xen-api.store";
-import type {
-  RawTypeToRecord,
-  SubscribeOptions,
-  Subscription,
-} from "@/types/xapi-collection";
-import { tryOnUnmounted, whenever } from "@vueuse/core";
-import { defineStore } from "pinia";
-import { computed, readonly, ref } from "vue";
-
-export const useXapiCollectionStore = defineStore("xapiCollection", () => {
-  const collections = ref(new Map());
-
-  function get<T extends RawObjectType>(
-    type: T
-  ): ReturnType<typeof createXapiCollection<T, RawTypeToRecord<T>>> {
-    if (!collections.value.has(type)) {
-      collections.value.set(type, createXapiCollection(type));
-    }
-
-    return collections.value.get(type)!;
-  }
-
-  return { get };
-});
-
-const createXapiCollection = <
-  T extends RawObjectType,
-  R extends RawTypeToRecord<T>
->(
-  type: T
-) => {
-  const isReady = ref(false);
-  const isFetching = ref(false);
-  const isReloading = computed(() => isReady.value && isFetching.value);
-  const lastError = ref<string>();
-  const hasError = computed(() => lastError.value !== undefined);
-  const subscriptions = ref(new Set<symbol>());
-  const recordsByOpaqueRef = ref(new Map<R["$ref"], R>());
-  const recordsByUuid = ref(new Map<R["uuid"], R>());
-  const filter = ref<(record: R) => boolean>();
-  const sort = ref<(record1: R, record2: R) => 1 | 0 | -1>();
-  const xenApiStore = useXenApiStore();
-
-  const setFilter = (newFilter: (record: R) => boolean) =>
-    (filter.value = newFilter);
-
-  const setSort = (newSort: (record1: R, record2: R) => 1 | 0 | -1) =>
-    (sort.value = newSort);
-
-  const records = computed<R[]>(() => {
-    const records = Array.from(recordsByOpaqueRef.value.values()).sort(
-      sort.value
-    );
-    return filter.value !== undefined ? records.filter(filter.value) : records;
-  });
-
-  const getByOpaqueRef = (opaqueRef: R["$ref"]) =>
-    recordsByOpaqueRef.value.get(opaqueRef);
-
-  const getByUuid = (uuid: R["uuid"]) => recordsByUuid.value.get(uuid);
-
-  const hasUuid = (uuid: R["uuid"]) => recordsByUuid.value.has(uuid);
-
-  const hasSubscriptions = computed(() => subscriptions.value.size > 0);
-
-  const fetchAll = async () => {
-    try {
-      isFetching.value = true;
-      lastError.value = undefined;
-      const records = await xenApiStore.getXapi().loadRecords<T, R>(type);
-      recordsByOpaqueRef.value.clear();
-      recordsByUuid.value.clear();
-      records.forEach(add);
-      isReady.value = true;
-    } catch (e) {
-      lastError.value = `[${type}] Failed to fetch records`;
-    } finally {
-      isFetching.value = false;
-    }
-  };
-
-  const add = (record: R) => {
-    recordsByOpaqueRef.value.set(record.$ref, record);
-    recordsByUuid.value.set(record.uuid, record);
-  };
-
-  const update = (record: R) => {
-    recordsByOpaqueRef.value.set(record.$ref, record);
-    recordsByUuid.value.set(record.uuid, record);
-  };
-
-  const remove = (opaqueRef: R["$ref"]) => {
-    if (!recordsByOpaqueRef.value.has(opaqueRef)) {
-      return;
-    }
-
-    const record = recordsByOpaqueRef.value.get(opaqueRef)!;
-    recordsByOpaqueRef.value.delete(opaqueRef);
-    recordsByUuid.value.delete(record.uuid);
-  };
-
-  whenever(
-    () => xenApiStore.isConnected && hasSubscriptions.value,
-    () => fetchAll()
-  );
-
-  function subscribe<O extends SubscribeOptions<any>>(
-    options?: O
-  ): Subscription<T, O> {
-    const id = Symbol();
-
-    tryOnUnmounted(() => {
-      unsubscribe(id);
-    });
-
-    const subscription = {
-      records,
-      getByOpaqueRef,
-      getByUuid,
-      hasUuid,
-      isReady: readonly(isReady),
-      isFetching: readonly(isFetching),
-      isReloading: isReloading,
-      hasError,
-      lastError: readonly(lastError),
-    };
-
-    const start = () => subscriptions.value.add(id);
-
-    if (options?.immediate !== false) {
-      start();
-      return subscription as unknown as Subscription<T, O>;
-    }
-
-    return {
-      ...subscription,
-      start,
-      isStarted: computed(() => subscriptions.value.has(id)),
-    } as unknown as Subscription<T, O>;
-  }
-
-  const unsubscribe = (id: symbol) => subscriptions.value.delete(id);
-
-  return {
-    hasSubscriptions,
-    subscribe,
-    unsubscribe,
-    add,
-    update,
-    remove,
-    setFilter,
-    setSort,
-  };
-};

@xen-orchestra/lite/src/stores/xen-api.store.ts

@@ -1,7 +1,7 @@
+import { useXenApiCollectionManager } from "@/composables/xen-api-collection.composable";
 import { buildXoObject } from "@/libs/utils";
 import XapiStats from "@/libs/xapi-stats";
 import XenApi, { getRawObjectType } from "@/libs/xen-api";
-import { useXapiCollectionStore } from "@/stores/xapi-collection.store";
 import { useLocalStorage } from "@vueuse/core";
 import { defineStore } from "pinia";
 import { computed, ref } from "vue";
@@ -31,11 +31,11 @@ export const useXenApiStore = defineStore("xen-api", () => {
 
   xenApi.registerWatchCallBack((results) => {
     results.forEach((result) => {
-      const collection = useXapiCollectionStore().get(
+      const collectionManager = useXenApiCollectionManager(
         getRawObjectType(result.class)
       );
 
-      if (!collection.hasSubscriptions) {
+      if (!collectionManager.hasSubscriptions.value) {
         return;
       }
 
@@ -44,11 +44,11 @@ export const useXenApiStore = defineStore("xen-api", () => {
 
       switch (result.operation) {
         case "add":
-          return collection.add(buildObject());
+          return collectionManager.add(buildObject());
         case "mod":
-          return collection.update(buildObject());
+          return collectionManager.update(buildObject());
         case "del":
-          return collection.remove(result.ref as any);
+          return collectionManager.remove(result.ref as any);
       }
     });
   });

@xen-orchestra/lite/src/stories/tab-bar/router-tab.story.vue

@@ -18,8 +18,8 @@
 import RouterTab from "@/components/RouterTab.vue";
 import ComponentStory from "@/components/component-story/ComponentStory.vue";
 import UiTabBar from "@/components/ui/UiTabBar.vue";
-import { prop, setting, slot } from "@/libs/story/story-param.js";
-import { text } from "@/libs/story/story-widget.js";
+import { prop, setting, slot } from "@/libs/story/story-param";
+import { text } from "@/libs/story/story-widget";
 </script>
 
 <style lang="postcss" scoped></style>

@xen-orchestra/lite/src/stories/tab-bar/ui-tab-bar.story.vue

@@ -18,7 +18,7 @@
 import ComponentStory from "@/components/component-story/ComponentStory.vue";
 import UiTab from "@/components/ui/UiTab.vue";
 import UiTabBar from "@/components/ui/UiTabBar.vue";
-import { prop, slot } from "@/libs/story/story-param.js";
+import { prop, slot } from "@/libs/story/story-param";
 </script>
 
 <style lang="postcss" scoped></style>

@xen-orchestra/lite/src/stories/tab-bar/ui-tab.story.vue

@@ -19,8 +19,8 @@
 import ComponentStory from "@/components/component-story/ComponentStory.vue";
 import UiTab from "@/components/ui/UiTab.vue";
 import UiTabBar from "@/components/ui/UiTabBar.vue";
-import { prop, setting, slot } from "@/libs/story/story-param.js";
-import { text } from "@/libs/story/story-widget.js";
+import { prop, setting, slot } from "@/libs/story/story-param";
+import { text } from "@/libs/story/story-widget";
 </script>
 
 <style lang="postcss" scoped></style>

@xen-orchestra/lite/src/types/xapi-collection.ts

@@ -1,108 +0,0 @@
-import type {
-  RawObjectType,
-  XenApiConsole,
-  XenApiHost,
-  XenApiHostMetrics,
-  XenApiMessage,
-  XenApiPool,
-  XenApiSr,
-  XenApiTask,
-  XenApiVm,
-  XenApiVmGuestMetrics,
-  XenApiVmMetrics,
-} from "@/libs/xen-api";
-import type { ComputedRef, Ref } from "vue";
-
-type DefaultExtension<
-  T extends RawObjectType,
-  R extends RawTypeToRecord<T> = RawTypeToRecord<T>
-> = {
-  records: ComputedRef<R[]>;
-  getByOpaqueRef: (opaqueRef: R["$ref"]) => R | undefined;
-  getByUuid: (uuid: R["uuid"]) => R | undefined;
-  hasUuid: (uuid: R["uuid"]) => boolean;
-  isReady: Readonly<Ref<boolean>>;
-  isFetching: Readonly<Ref<boolean>>;
-  isReloading: ComputedRef<boolean>;
-  hasError: ComputedRef<boolean>;
-  lastError: Readonly<Ref<string | undefined>>;
-};
-
-type DeferExtension = [
-  {
-    start: () => void;
-    isStarted: ComputedRef<boolean>;
-  },
-  { immediate: false }
-];
-
-type DefaultExtensions<T extends RawObjectType> = [
-  DefaultExtension<T>,
-  DeferExtension
-];
-
-type GenerateSubscribeOptions<Extensions extends any[]> = Extensions extends [
-  infer FirstExtension,
-  ...infer RestExtension
-]
-  ? FirstExtension extends [object, infer FirstCondition]
-    ? FirstCondition & GenerateSubscribeOptions<RestExtension>
-    : GenerateSubscribeOptions<RestExtension>
-  : object;
-
-export type SubscribeOptions<Extensions extends any[]> = Partial<
-  GenerateSubscribeOptions<Extensions> &
-    GenerateSubscribeOptions<DefaultExtensions<any>>
->;
-
-type GenerateSubscription<
-  Options extends object,
-  Extensions extends any[]
-> = Extensions extends [infer FirstExtension, ...infer RestExtension]
-  ? FirstExtension extends [infer FirstObject, infer FirstCondition]
-    ? Options extends FirstCondition
-      ? FirstObject & GenerateSubscription<Options, RestExtension>
-      : GenerateSubscription<Options, RestExtension>
-    : FirstExtension & GenerateSubscription<Options, RestExtension>
-  : object;
-
-export type Subscription<
-  T extends RawObjectType,
-  Options extends object,
-  Extensions extends any[] = []
-> = GenerateSubscription<Options, Extensions> &
-  GenerateSubscription<Options, DefaultExtensions<T>>;
-
-export function createSubscribe<
-  T extends RawObjectType,
-  Extensions extends any[],
-  Options extends object = SubscribeOptions<Extensions>
->(builder: (options?: Options) => Subscription<T, Options, Extensions>) {
-  return function subscribe<O extends Options>(
-    options?: O
-  ): Subscription<T, O, Extensions> {
-    return builder(options);
-  };
-}
-
-export type RawTypeToRecord<T extends RawObjectType> = T extends "SR"
-  ? XenApiSr
-  : T extends "VM"
-  ? XenApiVm
-  : T extends "VM_guest_metrics"
-  ? XenApiVmGuestMetrics
-  : T extends "VM_metrics"
-  ? XenApiVmMetrics
-  : T extends "console"
-  ? XenApiConsole
-  : T extends "host"
-  ? XenApiHost
-  : T extends "host_metrics"
-  ? XenApiHostMetrics
-  : T extends "message"
-  ? XenApiMessage
-  : T extends "pool"
-  ? XenApiPool
-  : T extends "task"
-  ? XenApiTask
-  : never;

@xen-orchestra/lite/src/types/xen-api-collection.ts

@@ -0,0 +1,68 @@
+import type {
+  RawObjectType,
+  XenApiConsole,
+  XenApiHost,
+  XenApiHostMetrics,
+  XenApiMessage,
+  XenApiPool,
+  XenApiRecord,
+  XenApiSr,
+  XenApiTask,
+  XenApiVm,
+  XenApiVmGuestMetrics,
+  XenApiVmMetrics,
+} from "@/libs/xen-api";
+import type { XenApiCollection } from "@/libs/xen-api-collection";
+import type { ComputedRef } from "vue";
+
+export type RawTypeToRecord<ObjectType extends RawObjectType> =
+  ObjectType extends "SR"
+    ? XenApiSr
+    : ObjectType extends "VM"
+    ? XenApiVm
+    : ObjectType extends "VM_guest_metrics"
+    ? XenApiVmGuestMetrics
+    : ObjectType extends "VM_metrics"
+    ? XenApiVmMetrics
+    : ObjectType extends "console"
+    ? XenApiConsole
+    : ObjectType extends "host"
+    ? XenApiHost
+    : ObjectType extends "host_metrics"
+    ? XenApiHostMetrics
+    : ObjectType extends "message"
+    ? XenApiMessage
+    : ObjectType extends "pool"
+    ? XenApiPool
+    : ObjectType extends "task"
+    ? XenApiTask
+    : never;
+
+type XenApiBaseCollectionProps =
+  | "isFetching"
+  | "isReloading"
+  | "hasError"
+  | "hasUuid"
+  | "isReady"
+  | "getByUuid"
+  | "getByOpaqueRef"
+  | "records";
+
+type XenApiCollectionManagerProps =
+  | "add"
+  | "remove"
+  | "update"
+  | "hasSubscriptions";
+
+export type XenApiBaseCollection<
+  Record extends XenApiRecord<any>,
+  Immediate extends boolean,
+> = Pick<XenApiCollection<Record>, XenApiBaseCollectionProps> &
+  (Immediate extends false
+    ? { start: () => void; isStarted: ComputedRef<boolean> }
+    : object);
+
+export type XenApiCollectionManager<Record extends XenApiRecord<any>> = Pick<
+  XenApiCollection<Record>,
+  XenApiCollectionManagerProps
+>;

@xen-orchestra/lite/src/views/HomeView.vue

@@ -1,12 +1,13 @@
 <template>Chargement en cours...</template>
 
 <script lang="ts" setup>
-import { usePoolStore } from "@/stores/pool.store";
+import { usePoolCollection } from "@/composables/xen-api-collection/pool-collection.composable";
 import { whenever } from "@vueuse/core";
 import { useRouter } from "vue-router";
 
 const router = useRouter();
-const { pool } = usePoolStore().subscribe();
+
+const { pool } = usePoolCollection();
 
 whenever(
   () => pool.value?.uuid,

@xen-orchestra/lite/src/views/host/HostRootView.vue

@@ -6,14 +6,14 @@
 
 <script lang="ts" setup>
 import ObjectNotFoundWrapper from "@/components/ObjectNotFoundWrapper.vue";
+import { useHostCollection } from "@/composables/xen-api-collection/host-collection.composable";
 import type { XenApiHost } from "@/libs/xen-api";
-import { useHostStore } from "@/stores/host.store";
 import { usePageTitleStore } from "@/stores/page-title.store";
 import { useUiStore } from "@/stores/ui.store";
 import { computed, watchEffect } from "vue";
 import { useRoute } from "vue-router";
 
-const { hasUuid, isReady, getByUuid } = useHostStore().subscribe();
+const { hasUuid, isReady, getByUuid } = useHostCollection();
 const route = useRoute();
 const uiStore = useUiStore();
 

@xen-orchestra/lite/src/views/pool/PoolDashboardView.vue

@@ -42,13 +42,13 @@ import PoolDashboardStorageUsage from "@/components/pool/dashboard/PoolDashboard
 import PoolDashboardRamUsageChart from "@/components/pool/dashboard/ramUsage/PoolRamUsage.vue";
 import UiCardComingSoon from "@/components/ui/UiCardComingSoon.vue";
 import UiCardGroup from "@/components/ui/UiCardGroup.vue";
+import { useHostCollection } from "@/composables/xen-api-collection/host-collection.composable";
+import { usePoolCollection } from "@/composables/xen-api-collection/pool-collection.composable";
+import { useVmCollection } from "@/composables/xen-api-collection/vm-collection.composable";
 import useFetchStats from "@/composables/fetch-stats.composable";
 import { GRANULARITY, type HostStats, type VmStats } from "@/libs/xapi-stats";
 import type { XenApiHost, XenApiVm } from "@/libs/xen-api";
-import { useHostMetricsStore } from "@/stores/host-metrics.store";
-import { useHostStore } from "@/stores/host.store";
 import { usePageTitleStore } from "@/stores/page-title.store";
-import { useVmStore } from "@/stores/vm.store";
 import {
   IK_HOST_LAST_WEEK_STATS,
   IK_HOST_STATS,
@@ -60,15 +60,8 @@ import { useI18n } from "vue-i18n";
 
 usePageTitleStore().setTitle(useI18n().t("dashboard"));
 
-const hostMetricsSubscription = useHostMetricsStore().subscribe();
-
-const hostSubscription = useHostStore().subscribe({ hostMetricsSubscription });
-
-const { runningHosts, getStats: getHostStats } = hostSubscription;
-
-const { runningVms, getStats: getVmStats } = useVmStore().subscribe({
-  hostSubscription,
-});
+const { getStats: getHostStats, runningHosts } = useHostCollection();
+const { getStats: getVmStats, runningVms } = useVmCollection();
 
 const {
   register: hostRegister,

@xen-orchestra/lite/src/views/pool/PoolRootView.vue

@@ -10,10 +10,11 @@
 <script lang="ts" setup>
 import PoolHeader from "@/components/pool/PoolHeader.vue";
 import PoolTabBar from "@/components/pool/PoolTabBar.vue";
-import { usePoolStore } from "@/stores/pool.store";
+import { usePoolCollection } from "@/composables/xen-api-collection/pool-collection.composable";
 import { usePageTitleStore } from "@/stores/page-title.store";
 
-const { pool } = usePoolStore().subscribe();
+const { pool } = usePoolCollection();
+
 usePageTitleStore().setObject(pool);
 </script>
 

@xen-orchestra/lite/src/views/pool/PoolTasksView.vue

@@ -15,11 +15,12 @@ import UiCard from "@/components/ui/UiCard.vue";
 import UiCardSpinner from "@/components/ui/UiCardSpinner.vue";
 import UiCounter from "@/components/ui/UiCounter.vue";
 import UiTitle from "@/components/ui/UiTitle.vue";
-import { useTaskStore } from "@/stores/task.store";
+import { useTaskCollection } from "@/composables/xen-api-collection/task-collection.composable";
 import { usePageTitleStore } from "@/stores/page-title.store";
 import { useI18n } from "vue-i18n";
 
-const { pendingTasks, finishedTasks, isReady, hasError } = useTaskStore().subscribe();
+const { pendingTasks, finishedTasks, isReady, hasError } = useTaskCollection();
+
 const { t } = useI18n();
 
 const titleStore = usePageTitleStore();

@xen-orchestra/lite/src/views/pool/PoolVmsView.vue

@@ -37,10 +37,10 @@ import PowerStateIcon from "@/components/PowerStateIcon.vue";
 import UiCard from "@/components/ui/UiCard.vue";
 import UiCardTitle from "@/components/ui/UiCardTitle.vue";
 import VmsActionsBar from "@/components/vm/VmsActionsBar.vue";
+import { useVmCollection } from "@/composables/xen-api-collection/vm-collection.composable";
 import { POWER_STATE } from "@/libs/xen-api";
 import { usePageTitleStore } from "@/stores/page-title.store";
 import { useUiStore } from "@/stores/ui.store";
-import { useVmStore } from "@/stores/vm.store";
 import type { Filters } from "@/types/filter";
 import { faPowerOff } from "@fortawesome/free-solid-svg-icons";
 import { storeToRefs } from "pinia";
@@ -52,7 +52,7 @@ const { t } = useI18n();
 const titleStore = usePageTitleStore();
 titleStore.setTitle(t("vms"));
 
-const { records: vms } = useVmStore().subscribe();
+const { records: vms } = useVmCollection();
 const { isMobile, isDesktop } = storeToRefs(useUiStore());
 
 const filters: Filters = {

@xen-orchestra/lite/src/views/settings/SettingsView.vue

@@ -157,6 +157,8 @@
 </template>
 
 <script lang="ts" setup>
+import { useHostCollection } from "@/composables/xen-api-collection/host-collection.composable";
+import { usePoolCollection } from "@/composables/xen-api-collection/pool-collection.composable";
 import { usePageTitleStore } from "@/stores/page-title.store";
 import { computed } from "vue";
 import UiCardTitle from "@/components/ui/UiCardTitle.vue";
@@ -166,8 +168,6 @@ import { useUiStore } from "@/stores/ui.store";
 import { storeToRefs } from "pinia";
 import { watch } from "vue";
 import { useI18n } from "vue-i18n";
-import { useHostStore } from "@/stores/host.store";
-import { usePoolStore } from "@/stores/pool.store";
 import { locales } from "@/i18n";
 import {
   faEarthAmericas,
@@ -186,8 +186,9 @@ const { t, locale } = useI18n();
 
 usePageTitleStore().setTitle(() => t("settings"));
 
-const { pool } = usePoolStore().subscribe();
-const { getByOpaqueRef: getHost } = useHostStore().subscribe();
+const { pool } = usePoolCollection();
+
+const { getByOpaqueRef: getHost } = useHostCollection();
 
 const poolMaster = computed(() =>
   pool.value ? getHost(pool.value.master) : undefined

@xen-orchestra/lite/src/views/vm/VmConsoleView.vue

@@ -31,12 +31,11 @@
 import RemoteConsole from "@/components/RemoteConsole.vue";
 import UiIcon from "@/components/ui/icon/UiIcon.vue";
 import UiSpinner from "@/components/ui/UiSpinner.vue";
-import { isOperationsPending } from "@/libs/utils";
+import { useConsoleCollection } from "@/composables/xen-api-collection/console-collection.composable";
+import { useVmCollection } from "@/composables/xen-api-collection/vm-collection.composable";
 import { POWER_STATE, VM_OPERATION, type XenApiVm } from "@/libs/xen-api";
-import { useConsoleStore } from "@/stores/console.store";
 import { usePageTitleStore } from "@/stores/page-title.store";
 import { useUiStore } from "@/stores/ui.store";
-import { useVmStore } from "@/stores/vm.store";
 import { faArrowUpRightFromSquare } from "@fortawesome/free-solid-svg-icons";
 import { computed } from "vue";
 import { useI18n } from "vue-i18n";
@@ -61,13 +60,14 @@ const {
   isReady: isVmReady,
   getByUuid: getVmByUuid,
   hasError: hasVmError,
-} = useVmStore().subscribe();
+  isOperationPending,
+} = useVmCollection();
 
 const {
   isReady: isConsoleReady,
   getByOpaqueRef: getConsoleByOpaqueRef,
   hasError: hasConsoleError,
-} = useConsoleStore().subscribe();
+} = useConsoleCollection();
 
 const isReady = computed(() => isVmReady.value && isConsoleReady.value);
 
@@ -89,9 +89,8 @@ const vmConsole = computed(() => {
   return getConsoleByOpaqueRef(consoleOpaqueRef);
 });
 
-const isConsoleAvailable = computed(
-  () =>
-    vm.value !== undefined && !isOperationsPending(vm.value, STOP_OPERATIONS)
+const isConsoleAvailable = computed(() =>
+  vm.value !== undefined ? isOperationPending(vm.value, STOP_OPERATIONS) : false
 );
 </script>
 

@xen-orchestra/lite/src/views/vm/VmRootView.vue

@@ -12,16 +12,16 @@
 import ObjectNotFoundWrapper from "@/components/ObjectNotFoundWrapper.vue";
 import VmHeader from "@/components/vm/VmHeader.vue";
 import VmTabBar from "@/components/vm/VmTabBar.vue";
+import { useVmCollection } from "@/composables/xen-api-collection/vm-collection.composable";
 import type { XenApiVm } from "@/libs/xen-api";
 import { usePageTitleStore } from "@/stores/page-title.store";
 import { useUiStore } from "@/stores/ui.store";
-import { useVmStore } from "@/stores/vm.store";
 import { whenever } from "@vueuse/core";
 import { computed } from "vue";
 import { useRoute } from "vue-router";
 
 const route = useRoute();
-const { getByUuid, hasUuid, isReady } = useVmStore().subscribe();
+const { getByUuid, hasUuid, isReady } = useVmCollection();
 const uiStore = useUiStore();
 const vm = computed(() => getByUuid(route.params.uuid as XenApiVm["uuid"]));
 whenever(vm, (vm) => (uiStore.currentHostOpaqueRef = vm.resident_on));

@xen-orchestra/mixins/Tasks.mjs

@@ -56,9 +56,13 @@ export default class Tasks extends EventEmitter {
     },
   })
 
+  #app
+
   constructor(app) {
     super()
 
+    this.#app = app
+
     app.hooks
       .on('clean', () => this.#gc(app.config.getOptional('tasks.gc.keep') ?? 1e3))
       .on('start', async () => {
@@ -131,10 +135,10 @@ export default class Tasks extends EventEmitter {
    *
    * @returns {Task}
    */
-  create({ name, objectId, type }) {
+  create({ name, objectId, userId = this.#app.apiContext?.user?.id, type }) {
     const tasks = this.#tasks
 
-    const task = new Task({ properties: { name, objectId, type }, onProgress: this.#onProgress })
+    const task = new Task({ properties: { name, objectId, userId, type }, onProgress: this.#onProgress })
 
     // Use a compact, sortable, string representation of the creation date
     //

@xen-orchestra/proxy/package.json

@@ -43,7 +43,7 @@
     "app-conf": "^2.3.0",
     "async-iterator-to-stream": "^1.1.0",
     "fs-extra": "^11.1.0",
-    "get-stream": "^6.0.0",
+    "get-stream": "^7.0.1",
     "getopts": "^2.2.3",
     "golike-defer": "^0.5.1",
     "http-server-plus": "^1.0.0",

@xen-orchestra/xapi/host.mjs

@@ -32,9 +32,14 @@ class Host {
    * @param {string} ref - Opaque reference of the host
    */
   async smartReboot($defer, ref) {
+    const suspendedVms = []
     if (await this.getField('host', ref, 'enabled')) {
       await this.callAsync('host.disable', ref)
-      $defer(() => this.callAsync('host.enable', ref))
+      $defer(async () => {
+        await this.callAsync('host.enable', ref)
+        // Resuming VMs should occur after host enabling to avoid triggering a 'NO_HOSTS_AVAILABLE' error
+        return asyncEach(suspendedVms, vmRef => this.callAsync('VM.resume', vmRef, false, false))
+      })
     }
 
     let currentVmRef
@@ -51,7 +56,7 @@ class Host {
 
         try {
           await this.callAsync('VM.suspend', vmRef)
-          $defer(() => this.callAsync('VM.resume', vmRef, false, false))
+          suspendedVms.push(vmRef)
         } catch (error) {
           const { code } = error
 

@xen-orchestra/xapi/package.json

@@ -28,7 +28,7 @@
     "@vates/nbd-client": "^2.0.0",
     "@xen-orchestra/async-map": "^0.1.2",
     "@xen-orchestra/log": "^0.6.0",
-    "d3-time-format": "^3.0.0",
+    "d3-time-format": "^4.1.0",
     "golike-defer": "^0.5.1",
     "http-request-plus": "^1.0.0",
     "json-rpc-protocol": "^0.13.2",

CHANGELOG.unreleased.md

@@ -7,11 +7,21 @@
 
 > Users must be able to say: “Nice enhancement, I'm eager to test it”
 
+- [Netbox] Synchronize VM tags [#5899](https://github.com/vatesfr/xen-orchestra/issues/5899) [Forum#6902](https://xcp-ng.org/forum/topic/6902) (PR [#6957](https://github.com/vatesfr/xen-orchestra/pull/6957))
+- [REST API] Add support for `filter` and `limit` parameters to `backups/logs` and `restore/logs` collections [Forum#64789](https://xcp-ng.org/forum/post/64789)
+- [Pool/Advanced] Ability to set a crash dump SR [#5060](https://github.com/vatesfr/xen-orchestra/issues/5060) (PR [#6973](https://github.com/vatesfr/xen-orchestra/pull/6973))
+
 ### Bug fixes
 
 > Users must be able to say: “I had this issue, happy to know it's fixed”
 
 - [LDAP] Mark the _Id attribute_ setting as required
+- [Incremental Replication] Fix `TypeError: Cannot read properties of undefined (reading 'uuid') at #isAlreadyOnHealthCheckSr` [Forum#7492](https://xcp-ng.org/forum/topic/7492) (PR [#6969](https://github.com/vatesfr/xen-orchestra/pull/6969))
+- [File Restore] Increase timeout from one to ten minutes when restoring through XO Proxy
+- [Home/VMs] Filtering with a UUID will no longer show other VMs on the same host/pool
+- [Jobs] Fixes `invalid parameters` when editing [Forum#64668](https://xcp-ng.org/forum/post/64668)
+- [Smart reboot] Fix cases where VMs remained in a suspended state (PR [#6980](https://github.com/vatesfr/xen-orchestra/pull/6980))
+- [XenApi/stats] Fix `Cannot read properties of undefined (reading 'statusCode')` (PR [#7004](https://github.com/vatesfr/xen-orchestra/pull/7004))
 
 ### Packages to release
 
@@ -29,8 +39,13 @@
 
 <!--packages-start-->
 
-- xo-server patch
+- @xen-orchestra/backups patch
+- @xen-orchestra/mixins minor
+- @xen-orchestra/xapi patch
+- xen-api patch
+- xo-server minor
 - xo-server-auth-ldap patch
-- xo-web patch
+- xo-server-netbox minor
+- xo-web minor
 
 <!--packages-end-->

package.json

@@ -25,7 +25,7 @@
     "jest": "^29.0.3",
     "lint-staged": "^13.0.3",
     "lodash": "^4.17.4",
-    "prettier": "^2.0.5",
+    "prettier": "^3.0.1",
     "promise-toolbox": "^0.21.0",
     "semver": "^7.3.6",
     "sorted-object": "^2.0.1",
@@ -98,7 +98,7 @@
     "prettify": "prettier --ignore-path .gitignore --ignore-unknown --write .",
     "test": "npm run test-lint && npm run test-unit",
     "test-integration": "jest \".integ\\.spec\\.js$\" && scripts/run-script.js --parallel test-integration",
-    "test-lint": "eslint --ignore-path .gitignore --ignore-pattern packages/xo-web .",
+    "test-lint": "eslint --ignore-path .gitignore --ignore-pattern @xen-orchestra/lite --ignore-pattern packages/xo-web .",
     "test-unit": "jest \"^(?!.*\\.integ\\.spec\\.js$)\" && scripts/run-script.js --bail test"
   },
   "workspaces": [

packages/xen-api/src/index.js

@@ -419,7 +419,7 @@ export class Xapi extends EventEmitter {
             signal: $cancelToken,
           }),
         {
-          when: error => error.response.statusCode === 302,
+          when: error => error.response !== undefined && error.response?.statusCode === 302,
           onRetry: async error => {
             const response = error.response
             if (response === undefined) {

packages/xo-server-auth-ldap/package.json

@@ -35,7 +35,7 @@
     "ensure-array": "^1.0.0",
     "exec-promise": "^0.7.0",
     "inquirer": "^8.0.0",
-    "ldapts": "^4.1.0",
+    "ldapts": "^6.0.0",
     "promise-toolbox": "^0.21.0"
   },
   "devDependencies": {