@cerema/cadriciel 1.5.7 → 1.5.9

package/cli/global/init.js

@@ -104,15 +104,12 @@ Host cadriciel
     bar1.start(100, 0);
     progress(bar1, response, async () => {
       console.log(' ');
-      console.log(response);
+
       const step1 = ora('📥 Téléchargement du projet en cours...').start();
       try {
-        console.log('o');
         await updatePK();
-        console.log('o');
+
         try {
-          console.log('git clone ' + response.prj.uri);
-          console.log('git clone ' + response.prj.uri);
           const git = await execPromise('git clone ' + response.prj.uri, {
             cwd: process.cwd(),
           });
@@ -170,7 +167,10 @@ Host cadriciel
 
              💻 ${chalk.bold('Pour manager votre projet :')}
             
-             👉  ${link('studio.cerema.dev', 'studio.cerema.dev')}
+             👉  ${link(
+               global.CACHE_URI.studio.split('://')[1],
+               global.CACHE_URI.studio.split('://')[1]
+             )}
             
     ──────────────────────────────────────────────────────────────`);
             console.log(' ');

package/cli/global/login.js

@@ -16,7 +16,7 @@ module.exports = (args) => {
   const app = express();
   const REALM = 'CeremaApps';
 
-  const KEYCLOAK_SERVER = 'https://orion.cerema.fr';
+  const KEYCLOAK_SERVER = global.CACHE_URI.orion;
   const PORT = 14211;
   const CLIENT_ID = 'cadriciel_login';
 

package/cli.js

@@ -8,11 +8,14 @@ const { spawn } = require('child_process'); // For executing shell commands.
 const os = require('os'); // Operating system-related utilities.
 const userHomeDir = os.homedir(); // Fetching the user's home directory.
 const boxen = require('boxen'); // For creating boxes in the console.
+const axios = require('axios'); // For making HTTP requests.
 
 // Locating the '.cadriciel' directory starting from the current working directory.
 const CADRICIEL_PATH = findCadricielDir(process.cwd());
 const CADRICIEL_COMMAND = 'cad';
-global.CADRICIEL_URI = 'https://cadriciel.cerema.dev/api';
+const CADRICIEL_PERMALINK =
+  'https://gist.githubusercontent.com/zucatti/08b37516b23c08028a2b07694f0329b6/raw/cadriciel-url.json';
+global.CADRICIEL_URI = '';
 //global.CADRICIEL_URI = 'http://localhost:3000/api';
 
 // Initialize command storage objects.
@@ -21,6 +24,55 @@ var CADRICIEL_COMMANDS = {};
 
 // Path for version checking file.
 const VERSION_CHECK_FILE = path.join(userHomeDir, '.cadriciel_last_check.json');
+const CACHE_FILE_PATH = path.join(userHomeDir, '.cadriciel_cache.json');
+global.CACHE_URI = {};
+
+// Function to check internet connection
+const checkInternetConnection = async () => {
+  try {
+    await axios.get('https://www.google.com');
+    return true;
+  } catch {
+    return false;
+  }
+};
+
+// Function to fetch data from permalink URL
+const fetchData = async () => {
+  try {
+    const response = await axios.get(CADRICIEL_PERMALINK);
+    const data = response.data;
+    // Save data to cache file
+    fs.writeFileSync(CACHE_FILE_PATH, JSON.stringify(data, null, 2));
+    console.log('Data fetched and cached successfully.');
+  } catch (error) {
+    console.error('Error fetching data:', error.message);
+  }
+};
+
+// Function to get cached data
+const getCachedData = () => {
+  if (fs.existsSync(CACHE_FILE_PATH)) {
+    const data = fs.readFileSync(CACHE_FILE_PATH, 'utf-8');
+    global.CACHE_URI = JSON.parse(data);
+    return JSON.parse(data);
+  }
+  return null;
+};
+
+// Function to check if the cache file is up-to-date
+const isCacheUpToDate = () => {
+  if (!fs.existsSync(CACHE_FILE_PATH)) {
+    return false;
+  }
+
+  const stats = fs.statSync(CACHE_FILE_PATH);
+  const fileModifiedDate = new Date(stats.mtime);
+  const today = new Date();
+  today.setHours(0, 0, 0, 0); // Set to start of the day
+
+  return fileModifiedDate >= today;
+};
 
 // Function to decide whether a version check is needed.
 const shouldCheckVersion = async () => {
@@ -447,53 +499,63 @@ const parseCommand = (args) => {
   else ExecCommand(path.replace(/ /g, '/'), arguments);
 };
 
-// Main function.
-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@' + version);
-
-      // Options pour le cadre
-      const boxenOptions = {
-        padding: 1,
-        margin: 1,
-        borderColor: 'yellow',
-        borderStyle: 'double',
-      };
-
-      // Mise en forme du message avec Chalk
-      const styledMessage = chalk.yellow(message);
-
-      // Création de l'encadré avec Boxen
-      const framedMessage = boxen(styledMessage, boxenOptions);
-
-      console.log(framedMessage);
-      loadGlobalCommands();
-      process.argv.shift();
-      process.argv.shift();
-      if (process.argv.length <= 0) return displayBanner();
-      processCommands(process.argv);
-    } else {
-      loadGlobalCommands();
-      process.argv.shift();
-      process.argv.shift();
-      if (process.argv.length <= 0) return displayBanner();
-      processCommands(process.argv);
+const checkCachePermaLink = async () => {
+  if (!isCacheUpToDate()) {
+    const isConnected = await checkInternetConnection();
+    if (isConnected) {
+      await fetchData();
     }
-  })
-  .catch((error) => {
-    console.log(error);
-    /*loadGlobalCommands();
+  }
+
+  const cachedData = getCachedData();
+  if (cachedData) {
+    global.CADRICIEL_URI = cachedData.api + '/api';
+  }
+};
+
+// Main function.
+const main = async () => {
+  await checkCachePermaLink();
+
+  let version = await checkVersion();
+  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@' + version);
+
+    // Options pour le cadre
+    const boxenOptions = {
+      padding: 1,
+      margin: 1,
+      borderColor: 'yellow',
+      borderStyle: 'double',
+    };
+
+    // Mise en forme du message avec Chalk
+    const styledMessage = chalk.yellow(message);
+
+    // Création de l'encadré avec Boxen
+    const framedMessage = boxen(styledMessage, boxenOptions);
+
+    console.log(framedMessage);
+    loadGlobalCommands();
     process.argv.shift();
     process.argv.shift();
-    if (process.argv.length <= 2) return displayBanner();
-    processCommands(process.argv.splice(2));*/
-  });
+    if (process.argv.length <= 0) return displayBanner();
+    processCommands(process.argv);
+  } else {
+    loadGlobalCommands();
+    process.argv.shift();
+    process.argv.shift();
+    if (process.argv.length <= 0) return displayBanner();
+    processCommands(process.argv);
+  }
+};
+
+main();

package/lib/cadriciel.js

@@ -7,6 +7,7 @@ const HomeDir = os.homedir() + '/.cadriciel';
 const { error } = require('./message');
 const https = require('https');
 var baseURL = global.CADRICIEL_URI;
+
 class CadricielAPI {
   constructor(token) {
     const httpsAgent = new https.Agent({

package/package.json

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