gingee-cli 1.0.2 → 1.0.3

package/commands/apiClient.js

@@ -43,6 +43,26 @@ async function getAuthenticatedClient(serverUrl = 'http://localhost:7070') {
     return { client, serverUrl };
 }
 
+async function ensureAuthenticated(serverUrl) {
+    const { default: ora } = await import('ora');
+    const spinner = ora('Verifying session...').start();
+    try {
+        const { client } = await getAuthenticatedClient(serverUrl);
+        // Use a simple, lightweight endpoint for the check.
+        await client.get(`${serverUrl}/glade/api/apps`);
+        spinner.succeed('Session verified.');
+    } catch (err) {
+        spinner.fail('Session verification failed.');
+        if (err.response && err.response.status === 401) {
+            throw new Error(`Authentication failed. Your session may have expired. Please run 'gingee-cli login --serverUrl ${serverUrl}' again.`);
+        }else if(err.message.includes('You are not logged in')) {
+            throw err; // Propagate the not logged in error as is.
+        }
+        // For other errors (e.g., network, server down), provide a generic message.
+        throw new Error(`Could not connect to the server at ${serverUrl}. Please ensure it is running and accessible.`);
+    }
+}
+
 function deleteSession(serverUrl) {
     const credsPath = getCredsFilePath(serverUrl);
     if (fs.existsSync(credsPath)) {
@@ -125,6 +145,7 @@ async function getAppPermissions(serverUrl, appName) {
 module.exports = { 
     getCredsFilePath, 
     getAuthenticatedClient, 
+    ensureAuthenticated,
     deleteSession,
     installApp,
     upgradeApp,

package/commands/deleteApp.js

@@ -10,6 +10,8 @@ async function deleteApp(options) {
     const spinner = ora();
 
     try {
+        await apiClient.ensureAuthenticated(serverUrl);
+        
         let confirmation = false;
         if (presetFilePath) {
             // --- NON-INTERACTIVE MODE ---

package/commands/installApp.js

@@ -22,6 +22,8 @@ async function installApp(options) {
         const { serverUrl = 'http://localhost:7070', appName, ginPath: ginFilePath, file: presetFilePath } = options;
         let finalPermissions, finalDbConfig;
 
+        await apiClient.ensureAuthenticated(serverUrl);
+
         if (!fs.existsSync(ginFilePath)) {
             throw new Error(`Package file not found at: ${ginFilePath}`);
         }

package/commands/installStoreApp.js

@@ -22,6 +22,8 @@ async function installStoreApp(appName, options) {
     const { gStoreUrl, serverUrl } = options;
 
     try {
+        await apiClient.ensureAuthenticated(serverUrl);
+
         // Step 1: Resolve the manifest URL using the new utility
         const resolvedStoreUrl = _resolveStoreUrl(gStoreUrl);
         spinner.start(`Fetching manifest from ${resolvedStoreUrl}...`);

package/commands/listApps.js

@@ -1,13 +1,18 @@
-const { getAuthenticatedClient } = require('./apiClient');
+const apiClient = require('./apiClient');
 
 async function listApps(options) {
     const { default: chalk } = await import('chalk');
     const { default: ora } = await import('ora');
-    const spinner = ora('Fetching application list...').start();
+    const spinner = ora();
 
     try {
         const { serverUrl = 'http://localhost:7070' } = options;
-        const { client } = await getAuthenticatedClient(serverUrl);
+
+        await apiClient.ensureAuthenticated(serverUrl);
+
+        spinner.start('Fetching installed applications...');
+        
+        const { client } = await apiClient.getAuthenticatedClient(serverUrl);
         const response = await client.get(`${serverUrl}/glade/api/apps`);
         
         if (response.data.status !== 'success' || !response.data.apps) {

package/commands/listBackups.js

@@ -1,12 +1,16 @@
 const apiClient = require('./apiClient');
+const { _getHttpClientErrorMessage } = require('./installerUtils');
 
 async function listBackups(options) {
     const { default: chalk } = await import('chalk');
     const { default: ora } = await import('ora');
     const { serverUrl, appName } = options;
-    const spinner = ora(`Fetching backups for '${appName}'...`).start();
+    const spinner = ora();
 
     try {
+        await apiClient.ensureAuthenticated(serverUrl);
+
+        spinner.start(`Fetching backups for '${appName}'...`);
         const result = await apiClient.listBackups(serverUrl, appName);
         
         if (result.status !== 'success' || !result.backups) {

package/commands/packageApp.js

@@ -1,14 +1,18 @@
 const apiClient = require('./apiClient');
 const fs = require('fs-extra');
 const path = require('path');
+const { _getHttpClientErrorMessage } = require('./installerUtils');
 
 async function packageApp(options) {
     const { default: chalk } = await import('chalk');
     const { default: ora } = await import('ora');
     const { serverUrl, appName, dest: destFolder } = options;
-    const spinner = ora(`Requesting package for '${appName}' from server...`).start();
+    const spinner = ora();
 
     try {
+        await apiClient.ensureAuthenticated(serverUrl);
+
+        spinner.start(`Requesting package for '${appName}' from server...`);
         // This returns a readable stream of the file being downloaded.
         const response = await apiClient.packageApp(serverUrl, appName);
         const fileStream = response.data;

package/commands/rollbackApp.js

@@ -10,6 +10,8 @@ async function rollbackApp(options) {
     const spinner = ora();
 
     try {
+        await apiClient.ensureAuthenticated(serverUrl);
+        
         if (presetFilePath) {
             // --- NON-INTERACTIVE MODE ---
             console.log(chalk.blueBright(`Running in non-interactive mode using preset file: ${presetFilePath}`));

package/commands/upgradeApp.js

@@ -15,6 +15,8 @@ async function upgradeApp(options) {
 
     try {
 
+        await apiClient.ensureAuthenticated(serverUrl);
+
         if (!fs.existsSync(ginFilePath)) {
             throw new Error(`Package file not found at: ${ginFilePath}`);
         }

package/commands/upgradeStoreApp.js

@@ -21,12 +21,14 @@ async function upgradeStoreApp(appName, options) {
     const { gStoreUrl, serverUrl } = options;
 
     try {
+        await apiClient.ensureAuthenticated(serverUrl);
+
         // 1. Resolve URL and fetch the store manifest
         const resolvedStoreUrl = _resolveStoreUrl(gStoreUrl);
         spinner.start(`Fetching manifest from ${resolvedStoreUrl}...`);
         
         const manifestResponse = await axios.get(resolvedStoreUrl);
-        const appConfig = manifestResponse.data.apps.find(a => a.name === appName);
+        const appConfig = manifestResponse.data.apps.find(a => a.installName === appName);
         if (!appConfig) {
             throw new Error(`App '${appName}' not found in the store manifest.`);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gingee-cli",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "The Gingee Command Line Interface (CLI), official command line tool for creating and managing Gingee projects.",
   "main": "index.js",
   "bin": {
@@ -41,7 +41,7 @@
     "commander": "^14.0.0",
     "form-data": "^4.0.4",
     "fs-extra": "^11.3.1",
-    "gingee": "^1.0.1",
+    "gingee": "^1.0.2",
     "inquirer": "^12.9.2",
     "ora": "^8.2.0",
     "yauzl": "^3.2.0"