feat: Simplify update endpoint and remove app manager version handling in the frontend

Author: tacxou

apps/api/src/app.controller.ts

@@ -102,20 +102,19 @@ export class AppController extends AbstractController {
    * ```
    */
   @ApiQuery({ name: 'current', required: false })
-  @Get('/get-update/:project(sesame-orchestrator|sesame-daemon|sesame-app-manager)')
+  @Get('/get-update/:project(sesame-orchestrator|sesame-daemon)')
   public async update(
     @Res() res: Response,
     @Param('project') project?: ProjectsList,
     @Query('current') current?: string,
   ): Promise<Response> {
     const pkgInfo = this.appService.getInfo();
     const currentVersion = current || pkgInfo.version;
-    const [lastMajor, lastMinor, lastPatch] = currentVersion.split('.').map(Number);
+    const [currentMajor, currentMinor, currentPatch] = currentVersion.split('.').map(Number);
 
-    // Validation du format de version si le projet est différent ou si une version est fournie
-    if (project !== pkgInfo.name || current) {
-      if (!/[0-9]+\.[0-9]+\.[0-9]+/.test(current)) {
-        throw new BadRequestException('Invalid version for current parameter');
+    if (project !== pkgInfo.name) {
+      if (!/[0-9]+\.[0-9]+\.[0-9]+/.test(currentVersion)) {
+        throw new BadRequestException('Invalid version for current parameter or project info');
       }
     }
 
@@ -125,8 +124,8 @@ export class AppController extends AbstractController {
 
     if (data) {
       lastVersion = data.tag_name.replace(/^v/, '');
-      const [currentMajor, currentMinor, currentPatch] = lastVersion.split('.').map(Number);
-      updateAvailable = currentMajor > lastMajor || currentMinor > lastMinor || currentPatch > lastPatch;
+      const [lastMajor, lastMinor, lastPatch] = lastVersion.split('.').map(Number);
+      updateAvailable = lastMajor > currentMajor || (lastMajor === currentMajor && lastMinor > currentMinor) || (lastMajor === currentMajor && lastMinor === currentMinor && lastPatch > currentPatch);
     }
 
     return res.json({

apps/api/src/app.service.ts

@@ -2,6 +2,7 @@ import { BadRequestException, Injectable, Logger, OnApplicationBootstrap } from
 import { PackageJson } from 'types-package-json';
 import { ModuleRef } from '@nestjs/core';
 import { readFileSync } from 'fs';
+import { join } from 'path';
 import { AbstractService } from '~/_common/abstracts/abstract.service';
 import { pick } from 'radash';
 import { HttpService } from '@nestjs/axios';
@@ -138,7 +139,7 @@ export class AppService extends AbstractService implements OnApplicationBootstra
     private readonly config: ConfigService<any>,
   ) {
     super({ moduleRef });
-    this.package = JSON.parse(readFileSync('package.json', 'utf-8'));
+    this.package = JSON.parse(readFileSync(join(__dirname, '../../../package.json'), 'utf-8'));
   }
 
   /**
@@ -241,11 +242,19 @@ export class AppService extends AbstractService implements OnApplicationBootstra
    * Cette méthode ne fait pas d'appel à l'API GitHub, elle consulte uniquement
    * le cache. Les données sont mises en cache par fetchGithubRelease().
    */
-  public getProjectUpdate(project: ProjectsList): GithubUpdate {
+  public async getProjectUpdate(project: ProjectsList): Promise<GithubUpdate | null> {
     if (!Object.values(ProjectsList).includes(project)) {
       throw new BadRequestException(`Invalid project: ${project}`);
     }
 
+    if (process.env.NODE_ENV === 'development') {
+      this.logger.warn('GitHub release fetch in development mode.');
+      for (const project of Object.values(ProjectsList)) {
+        this.logger.verbose(`Checking for updates for project: ${project}`);
+        await this.fetchGithubRelease(project);
+      }
+    }
+
     if (this.storage.has(project)) {
       this.logger.debug(`Fetching ${project} tags from cache`);
 

apps/web/src/layouts/default.vue

@@ -35,10 +35,10 @@ q-layout(view="hHh LpR lff" style="margin-top: -1px;")
           q-btn(flat round icon="mdi-close" v-close-popup)
   q-footer(:class="$q.dark.isActive ? 'bg-dark' : 'bg-white'" bordered)
     q-bar(:class="$q.dark.isActive ? 'bg-dark' : 'bg-white text-black'")
-      span
-        small AppManager 
-        small(v-text="'v' + (appManagerVersion?.currentVersion || '0.0.0')")
-      small.bold  / 
+      //- span
+      //-   small AppManager 
+      //-   small(v-text="'v' + (appManagerVersion?.currentVersion || '0.0.0')")
+      //- small.bold  / 
       span
         small Orchestrator 
         small(v-text="'v' + (orchestratorVersion?.currentVersion || '0.0.0')")
@@ -47,15 +47,15 @@ q-layout(view="hHh LpR lff" style="margin-top: -1px;")
         small Daemon 
         small(v-text="'v' + (daemonVersion?.currentVersion || '0.0.0')")
       div.q-pr-xs
-      q-btn.q-px-xs(
-        v-show="appManagerVersion?.updateAvailable"
-        flat stretch icon="mdi-alert-box" color="amber-9"
-        href="https://github.com/Libertech-FR/sesame-app-manager/releases" target="_blank"
-      ) App Manager
-        q-tooltip.text-body2.bg-amber-9
-          | MAJ disponible (
-          span(v-text="appManagerVersion?.lastVersion || '0.0.0'")
-          | )
+      //- q-btn.q-px-xs(
+      //-   v-show="appManagerVersion?.updateAvailable"
+      //-   flat stretch icon="mdi-alert-box" color="amber-9"
+      //-   href="https://github.com/Libertech-FR/sesame-app-manager/releases" target="_blank"
+      //- ) App Manager
+      //-   q-tooltip.text-body2.bg-amber-9
+      //-     | MAJ disponible (
+      //-     span(v-text="appManagerVersion?.lastVersion || '0.0.0'")
+      //-     | )
       q-btn.q-px-xs(
         v-show="orchestratorVersion?.updateAvailable"
         flat stretch icon="mdi-alert-box" color="amber-9"
@@ -91,26 +91,26 @@ const auth = useAuth()
 const config = useAppConfig()
 
 let orchestratorVersion = ref<object | null>(null)
-let appManagerVersion = ref<object | null>(null)
+// let appManagerVersion = ref<object | null>(null)
 let daemonVersion = ref<object | null>(null)
 
 onMounted(async () => {
   if (process.env.NODE_ENV === 'development') {
     orchestratorVersion.value = { currentVersion: '0.0.0-dev', lastVersion: '0.0.0-dev', updateAvailable: false }
-    appManagerVersion.value = { currentVersion: '0.0.0-dev', lastVersion: '0.0.0-dev', updateAvailable: false }
+    // appManagerVersion.value = { currentVersion: '0.0.0-dev', lastVersion: '0.0.0-dev', updateAvailable: false }
     daemonVersion.value = { currentVersion: '0.0.0-dev', lastVersion: '0.0.0-dev', updateAvailable: false }
     return
   }
 
   const { data: orchestratorVersionRes } = await useHttp<any>('/get-update/sesame-orchestrator', {
     signal: AbortSignal.timeout(2000),
   })
-  const { data: appManagerVersionRes } = await useHttp<any>('/get-update/sesame-app-manager', {
-    signal: AbortSignal.timeout(2000),
-    query: {
-      current: config.appManagerVersion || '0.0.0',
-    },
-  })
+  // const { data: appManagerVersionRes } = await useHttp<any>('/get-update/sesame-app-manager', {
+  //   signal: AbortSignal.timeout(2000),
+  //   query: {
+  //     current: config.appManagerVersion || '0.0.0',
+  //   },
+  // })
   const { data: daemonVersionDump } = await useHttp<any>('/core/backends/execute', {
     signal: AbortSignal.timeout(2000),
     method: 'POST',
@@ -131,7 +131,7 @@ onMounted(async () => {
     },
   })
   orchestratorVersion.value = orchestratorVersionRes.value?.data
-  appManagerVersion.value = appManagerVersionRes.value?.data
+  // appManagerVersion.value = appManagerVersionRes.value?.data
   daemonVersion.value = daemonVersionRes.value?.data
 })