cloudcc-cli 2.0.0 → 2.0.2

package/README.md

@@ -1,3 +1,19 @@
+# ReleaseV2.0.2
+#### Release Date: 2025-4-2
+#### Release Scope: Full
+#### Release Content
+* Optimization
+    * Fix baseUrl Prefix
+
+# ReleaseV2.0.1
+#### Release Date: 2025-4-2
+#### Release Scope: Full
+#### Release Content
+* Optimization
+    * update error message
+    * Add verification to the pull method
+    * publish plugin change http
+
 # ReleaseV2.0.0
 #### Release Date: 2025-4-2
 #### Release Scope: Full

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudcc-cli",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "cloudcc-cli",
   "keywords": [
     "cloudcc",

package/src/classes/create.js

@@ -49,13 +49,14 @@ public class ${name}Test {
 `
             fs.writeFileSync(path.join(classesPath, name + ".java"), javaTmp)
             fs.writeFileSync(path.join(classesPath, name + "Test.java"), javaTestTmp)
-            fs.writeFileSync(path.join(classesPath, "config.json"), `{"name":"${name}","version":"${await getPackageJson().extandVersion || '2'}"}`)
+            let config = await getPackageJson();
+            fs.writeFileSync(path.join(classesPath, "config.json"), `{"name":"${name}","version":"${config.extandVersion || '2'}"}`)
             console.log()
             console.log(chalk.green("Successfully Created:" + name))
             console.log()
         } catch (e) {
             console.log()
-            console.log(chalk.red("Creation Failed:" + e))
+            console.log(chalk.red("Creation Class Failed:" + e))
             console.log()
         }
     }

package/src/classes/publish.js

@@ -40,7 +40,7 @@ async function publish(name) {
         fs.writeFileSync(path.join(classPath, "config.json"), JSON.stringify(configContent))
       }
     } else {
-      console.log(chalk.red('Failed：' + res.returnInfo));
+      console.log(chalk.red('Publish Class Failed：' + res.returnInfo));
     }
   }
 }

package/src/classes/pull.js

@@ -16,6 +16,10 @@ async function pull(name) {
         console.log();
         const classPath = path.join(process.cwd(), `classes/${name}/`);
         let configContent = JSON.parse(fs.readFileSync(classPath + "config.json", 'utf8'));
+        if (!configContent.id) {
+            console.log(chalk.red('Class ID is not exist, please publish first！'));
+            return;
+        }
         let body = {
             "id": configContent.id,
         }
@@ -40,7 +44,7 @@ async function pull(name) {
             fs.writeFileSync(classPath + `${name}.java`, newContent, 'utf8');
 
         } else {
-            console.log(chalk.red('Fail：' + res.returnInfo));
+            console.log(chalk.red('Pull Class Failed：' + res.returnInfo));
         }
     }
 }

package/src/config/get.js

@@ -2,7 +2,7 @@
 const { getPackageJson } = require("../../utils/config.js")
 
 async function get(projectPath = process.cwd()) {
-    const config = await getPackageJson();
+    const config = await getPackageJson(projectPath);
     console.log(config);
 }
 

package/src/plugin/publish1.js

@@ -3,7 +3,7 @@ const { post } = require('../../utils/http');
 const fs = require('fs');
 const path = require("path")
 const chalk = require("chalk")
-
+const { readCache, writeCache } = require("../../utils/cache")
 const { checkUpdate } = require("../../utils/checkVersion")
 const BaseUrl = "https://developer.apis.cloudcc.cn"
 const { getPackageJson } = require("../../utils/config.js")
@@ -28,7 +28,7 @@ class Builder {
             let config = this.options.devConsoleConfig
 
             if ("private" != this.options.devConsoleConfig.version) {
-                config = { "accessToken": this.options.devConsoleConfig.pluginToken };
+                config = { "accessToken": this.options.devConsoleConfig.pluginToken || await this.getToken(config) };
             }
 
             let answers = { buildFileName: `${name}/${name}.vue` }
@@ -52,7 +52,32 @@ class Builder {
             }
         }
     }
+    async getToken(devConsoleConfig) {
+        const cache = readCache();
+        const cacheKey = `plugin_token_${devConsoleConfig.secretKey}`;
+        const now = Date.now();
+        const oneHour = 60 * 60 * 1000;
+
+        if (cache[cacheKey] &&
+            cache[cacheKey].token &&
+            cache[cacheKey].timestamp &&
+            (now - cache[cacheKey].timestamp) < oneHour) {
+            return cache[cacheKey].token;
+        }
 
+        let res = await post((this.options.devConsoleConfig.baseUrl || BaseUrl) + "/sysconfig/auth/pc/1.0/post/tokenInfo", devConsoleConfig);
+        if (res.returnCode == 200) {
+            cache[cacheKey] = {
+                token: res.data.accessToken,
+                timestamp: now
+            };
+            writeCache(process.cwd(), cache);
+            return res.data.accessToken;
+        } else {
+            console.error(chalk.red(`Login failed`, JSON.stringify(res)));
+            return null;
+        }
+    }
     getVueValue(buildFileName) {
         let vueContent = fs.readFileSync(this.getVueContent(buildFileName), 'utf8');
         let vueData = vueContent + ""
@@ -249,7 +274,7 @@ class Builder {
             console.error(chalk.green(`Success！`));
             console.log();
         } else {
-            console.error(chalk.red(`Fail: ${res.returnInfo}`));
+            console.error(chalk.red(`Publish Plugin Fail: ${res.returnInfo}`));
             console.log();
         }
         return res;

package/src/script/create.js

@@ -26,7 +26,7 @@ async function create(argvs) {
             console.log()
         } catch (e) {
             console.log()
-            console.log(chalk.red("Creation Failed:" + e))
+            console.log(chalk.red("Creation Client Script Failed:" + e))
             console.log()
         }
     }

package/src/script/publish.js

@@ -53,7 +53,7 @@ async function publish(argvs) {
         }
       } else {
         console.log();
-        console.log(chalk.red('Fail：' + res.returnInfo));
+        console.log(chalk.red('Publish Client Scirpt Failed：' + res.returnInfo));
         console.log();
       }
     } else {

package/src/script/pull.js

@@ -18,6 +18,10 @@ async function pull(argvs) {
     let devConsoleConfig = await getPackageJson()
     console.log(chalk.green('Pulling, please wait...'));
     let configContent = JSON.parse(fs.readFileSync(srcPath + "config.json", 'utf8'));
+    if (!configContent.id) {
+      console.log(chalk.red('Script ID is not exist, please publish first！'));
+      return;
+    }
     configContent = {
       "pageSize": 20,
       "pageNo": 1,
@@ -39,7 +43,7 @@ ${res.data.list[0].scriptContent}
       fs.writeFileSync(srcPath + `${name}.js`, newContent);
     } else {
       console.log();
-      console.log(chalk.red('Fail：' + res.returnInfo));
+      console.log(chalk.red('Pull Client Scirpt Failed' + res.returnInfo));
       console.log();
     }
   } else {

package/src/timer/create.js

@@ -24,13 +24,14 @@ public class ${name} extends CCSchedule {
     }
 }`
             fs.writeFileSync(path.join(timerPath, name + ".java"), javaTmp)
-            fs.writeFileSync(path.join(timerPath, "config.json"), `{"name":"${name}","version":"${await getPackageJson().extandVersion || '2'}"}`)
+            let config = await getPackageJson();
+            fs.writeFileSync(path.join(timerPath, "config.json"), `{"name":"${name}","version":"${config.extandVersion || '2'}"}`)
             console.log()
             console.log(chalk.green("Successfully Created:" + name))
             console.log()
         } catch (e) {
             console.log()
-            console.log(chalk.red("Creation Failed:" + e))
+            console.log(chalk.red("Creation Schedule Failed:" + e))
             console.log()
         }
     }

package/src/timer/publish.js

@@ -40,7 +40,7 @@ async function publish(name) {
         fs.writeFileSync(path.join(timerPath, "config.json"), JSON.stringify(configContent))
       }
     } else {
-      console.log(chalk.red('Fail：' + res.returnInfo));
+      console.log(chalk.red('Pull Schedule Failed' + res.returnInfo));
     }
   }
 }

package/src/timer/pull.js

@@ -15,10 +15,11 @@ async function pull(name) {
     console.log(chalk.green('Pulling, please wait...'));
     console.log();
     const timerPath = path.join(process.cwd(), `schedule/${name}/`);
-    let fullContent = fs.readFileSync(timerPath + `${name}.java`, 'utf8');
-
     let configContent = JSON.parse(fs.readFileSync(timerPath + "config.json", 'utf8'));
-
+    if (!configContent.id) {
+      console.log(chalk.red('Schedule ID is not exist, please publish first！'));
+      return;
+    }
     let body = {
       "id": configContent.id,
     }
@@ -42,7 +43,7 @@ async function pull(name) {
       fs.writeFileSync(timerPath + `${name}.java`, newContent, 'utf8');
 
     } else {
-      console.log(chalk.red('Fail：' + res.returnInfo));
+      console.log(chalk.red('Pull Schedule Failed：' + res.returnInfo));
     }
   }
 }

package/src/triggers/create.js

@@ -17,7 +17,7 @@ async function create(argvs) {
             fs.mkdirSync(triggersPath, { recursive: true });
 
             const javaTmp =
-`package triggers.${body.schemetableName.toLowerCase()}.${body.name};
+                `package triggers.${body.schemetableName.toLowerCase()}.${body.name};
 
 import com.cloudcc.core.*;
 
@@ -30,7 +30,8 @@ public class ${body.name} extends CCTrigger {
 }`
 
             fs.writeFileSync(path.join(triggersPath, body.name + ".java"), javaTmp);
-            body.version =await getPackageJson().extandVersion || "2";
+            let config = await getPackageJson();
+            body.version = config.extandVersion || "2";
             body.isactive = true;
             fs.writeFileSync(path.join(triggersPath, "config.json"), JSON.stringify(body));
             console.log();
@@ -38,7 +39,7 @@ public class ${body.name} extends CCTrigger {
             console.log();
         } catch (e) {
             console.log()
-            console.log(chalk.red("Creation Failed:" + e))
+            console.log(chalk.red("Creation Trigger Failed:" + e))
             console.log()
         }
     }

package/src/triggers/publish.js

@@ -45,7 +45,7 @@ async function publish(argvs) {
         fs.writeFileSync(path.join(triggersPath, "config.json"), JSON.stringify(configContent))
       }
     } else {
-      console.log(chalk.red('Fail：' + res.returnInfo));
+      console.log(chalk.red('Publish Trigger Failed：' + res.returnInfo));
     }
   }
 }

package/src/triggers/pull.js

@@ -15,7 +15,10 @@ async function pull(argvs) {
         console.log();
         const triggersPath = path.join(process.cwd(), `triggers/${namePath}/`);
         let configContent = JSON.parse(fs.readFileSync(triggersPath + "config.json", 'utf8'));
-
+        if (!configContent.id) {
+            console.log(chalk.red('Trigger ID is not exist, please publish first！'));
+            return;
+        }
         let body = {
             "id": configContent.id,
         }
@@ -39,7 +42,7 @@ async function pull(argvs) {
             fs.writeFileSync(triggersPath + `${name}.java`, newContent);
 
         } else {
-            console.log(chalk.red('Fail：' + res.returnInfo));
+            console.log(chalk.red('Pull Trigger Failed：' + res.returnInfo));
         }
     }
 }

package/utils/checkVersion.js

@@ -107,7 +107,6 @@ function checkAndReplaceJar(projectPath = process.cwd()) {
     const templateLibPath = path.join(__dirname, '../template/lib');
 
     if (!fs.existsSync(projectLibPath)) {
-        console.log(chalk.red('Project lib folder does not exist.'));
         return;
     }
 

package/utils/config.js

@@ -21,9 +21,9 @@ function getPackageJson_old(projectPath = process.cwd()) {
 async function getPackageJson2(projectPath = process.cwd()) {
     let config = require(path.join(projectPath, "cloudcc-cli.config.js"))
     config = config[config.use]
-    if (config.baseUrl && !config.baseUrl.includes("ccdomaingateway")) {
-        config.baseUrl = config.baseUrl + "/ccdomaingateway"
-    }
+    // if (config.baseUrl && !config.baseUrl.includes("ccdomaingateway")) {
+    //     config.baseUrl = config.baseUrl + "/ccdomaingateway"
+    // }
     config = await getDevConsoleConfig(projectPath, config)
     return config
 }
@@ -41,9 +41,9 @@ async function getPackageJson3(projectPath = process.cwd()) {
         const decryptedInfo = decryptCloudCCDevInfo(config.CloudCCDev);
         if (decryptedInfo) {
             config = { ...decryptedInfo, ...config }
-            if (config.baseUrl && !config.baseUrl.includes("ccdomaingateway")) {
-                config.baseUrl = config.baseUrl + "/ccdomaingateway"
-            }
+            // if (config.baseUrl && !config.baseUrl.includes("ccdomaingateway")) {
+            //     config.baseUrl = config.baseUrl + "/ccdomaingateway"
+            // }
             config = await getDevConsoleConfig(projectPath, config)
         }
     } else {

package/utils/utils.js

@@ -72,19 +72,23 @@ async function getBusToken(config) {
             secretKey: config.openSecretKey,
             orgId: config.orgId
         }
-
-        const res = await axios({
-            method: 'post',
-            url: config.apiSvc + "/api/cauth/token",
-            headers: {
-                'Content-Type': 'application/json; charset=utf-8',
-            },
-            data: body
-        });
-        if (res.data.result) {
-            config.accessToken = res.data.data.accessToken;
-        } else {
-            console.error(chalk.red(`Get OpenAPI Token Failed:`, res.data.returnInfo));
+        try {
+            const res = await axios({
+                method: 'post',
+                url: config.apiSvc + "/api/cauth/token",
+                headers: {
+                    'Content-Type': 'application/json; charset=utf-8',
+                },
+                data: body
+            });
+            if (res.data.result) {
+                config.accessToken = res.data.data.accessToken;
+            } else {
+                console.error(chalk.red(`Get OpenAPI Token Failed:`, res.data.returnInfo));
+                process.exit(1)
+            }
+        } catch (error) {
+            console.error(chalk.red(`Get OpenAPI Token Failed:`, error.message));
             process.exit(1)
         }
     }