@cerema/cadriciel 1.4.17 → 1.4.19

package/cli/assets/index.html

@@ -5,7 +5,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Cadriciel</title>
-    <link rel="stylesheet" type="text/css" href="http://127.0.0.1:4200/index.css">
+    <link rel="stylesheet" type="text/css" href="/index.css">
     </link>
 </head>
 
@@ -16,13 +16,13 @@
 
 
     <div style="position:absolute;bottom:0px;right:0px;">
-        <img src="http://127.0.0.1:4200/nono.png" width="300px" height="300px">
+        <img src="/nono.png" width="300px" height="300px">
     </div>
     <div
-        style="position:absolute;top:30px;left:0px;background-image:url(http://127.0.0.1:4200/cerema.jpeg);background-position:center;background-repeat:no-repeat;background-size:contain;width:100%;height:150px">
+        style="position:absolute;top:30px;left:0px;background-image:url(/cerema.jpeg);background-position:center;background-repeat:no-repeat;background-size:contain;width:100%;height:150px">
     </div>
     <div
-        style="position:absolute;top:150px;left:30px;background-image:url(http://127.0.0.1:4200/logo.png);background-position:center;background-repeat:no-repeat;background-size:contain;width:100%;height:100px">
+        style="position:absolute;top:150px;left:30px;background-image:url(/logo.png);background-position:center;background-repeat:no-repeat;background-size:contain;width:100%;height:100px">
     </div>
 </body>
 

package/cli/global/install.js

@@ -4,24 +4,6 @@ module.exports = (args) => {
   const os = require('os');
   const fs = require('fs');
   const { spawn } = require('child_process');
-  const HOSTS_PATH = '/etc/hosts';
-  const MAPPING_ENTRY = '127.0.0.1 keycloak';
-
-  function addMapping() {
-    try {
-      const hostsContent = fs.readFileSync(HOSTS_PATH, 'utf8');
-      if (!hostsContent.includes(MAPPING_ENTRY)) {
-        fs.appendFileSync(HOSTS_PATH, os.EOL + MAPPING_ENTRY);
-      }
-    } catch (e) {
-      console.error(
-        chalk.red.bold(
-          "\nVous devez lancer la commande en tant qu'administrateur.\n"
-        )
-      );
-      return process.exit(0);
-    }
-  }
 
   const checkIfCommandExists = (command, callback) => {
     const proc = spawn('which', [command], { shell: true });
@@ -94,7 +76,6 @@ module.exports = (args) => {
       description: 'Installation des images Docker',
     },
     start: () => {
-      addMapping();
       const dockerImagesToInstall = [
         'postgis/postgis',
         'dpage/pgadmin4',

package/cli/global/login.js

@@ -20,9 +20,6 @@ module.exports = (args) => {
   const PORT = 14211;
   const CLIENT_ID = 'cadriciel_login';
 
-  //const KEYCLOAK_SERVER = 'https://orion-recette.cerema.fr';
-  //const PORT = 4200;
-  //const CLIENT_ID = 'marep_dev';
   const REDIRECT_URI = 'http://localhost:' + PORT + '/login';
 
   const INDEX_HTML = fs.readFileSync(

package/cli.js

@@ -22,7 +22,31 @@ try {
   fs.unlinkSync(`${userHomeDir}/.cadriciel/account.json`);
 } catch (e) {}
 
+const VERSION_CHECK_FILE = path.join(userHomeDir, '.cadriciel_last_check.json');
+
+const shouldCheckVersion = async () => {
+  try {
+    const data = fs.readFileSync(VERSION_CHECK_FILE, 'utf8');
+    const lastCheck = JSON.parse(data);
+    const lastCheckDate = new Date(lastCheck.date);
+    const diff = Date.now() - lastCheckDate.getTime();
+    const twelveHours = 12 * 60 * 60 * 1000;
+
+    return diff > twelveHours;
+  } catch (e) {
+    return true;
+  }
+};
+
+const updateLastCheckDate = () => {
+  const data = JSON.stringify({ date: new Date() });
+  fs.writeFileSync(VERSION_CHECK_FILE, data, 'utf8');
+};
+
 const checkVersion = async () => {
+  if (!(await shouldCheckVersion())) {
+    return Promise.resolve(null); // Aucune version à vérifier, renvoie null
+  }
   return new Promise((resolve, reject) => {
     const packageName = '@cerema/cadriciel';
     const child = spawn('npm', ['view', packageName, 'version'], {
@@ -35,12 +59,27 @@ const checkVersion = async () => {
       version += data.toString();
     });
 
+    child.stderr.on('data', (data) => {
+      console.error(`err: ${data}`);
+    });
+
+    child.on('error', (error) => {
+      console.error(`Erreur lors de l'exécution de npm view: ${error.message}`);
+      reject(error);
+    });
+
     child.on('close', (code) => {
       if (code !== 0) {
-        return;
+        console.error(
+          `Le processus npm view s'est terminé avec le code ${code}`
+        );
+        return reject(
+          new Error('Erreur lors de la récupération de la version')
+        );
       }
 
       version = version.trim();
+      updateLastCheckDate();
       resolve(version);
     });
   });
@@ -258,13 +297,15 @@ const processCommands = (args) => {
 checkVersion()
   .then((version) => {
     const current_version = require(__dirname + '/package.json').version;
-
+    if (version === null) {
+      version = current_version;
+    }
     if (current_version != version) {
       const message =
         'Une nouvelle version (' +
         version +
         ') a été détectée. Veuillez mettre à jour.\n' +
-        chalk.white.bold('npm i -g @cerema/cadriciel');
+        chalk.white.bold('npm i -g @cerema/cadriciel@' + version);
 
       // Options pour le cadre
       const boxenOptions = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cerema/cadriciel",
-  "version": "1.4.17",
+  "version": "1.4.19",
   "main": "index.js",
   "license": "MIT",
   "npm": ">=8.0.0",