cloudcc-cli 1.8.9 → 1.9.1

package/README.md

@@ -1,3 +1,18 @@
+# ReleaseV1.9.1
+#### Release Date: 2025-2-10
+#### Release Scope: Full
+#### Release Content
+* Optimization
+    * class add javaContentRegular
+    * change judge
+
+# ReleaseV1.9.0
+#### Release Date: 2025-2-10
+#### Release Scope: Full
+#### Release Content
+* Optimization
+    * add pull code method
+
 # ReleaseV1.8.9
 #### Release Date: 2025-2-6
 #### Release Scope: Full

package/package.json

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

package/src/classes/index.js

@@ -1,6 +1,7 @@
 const cc = {}
 cc.create = require("./create")
 cc.publish = require("./publish")
+cc.pull = require("./pull")
 function Classes(action, argvs) {
   cc[action](argvs[2])
 }

package/src/classes/publish.js

@@ -4,7 +4,7 @@ const path = require("path")
 const chalk = require("chalk")
 const { postNormal } = require("../../utils/http")
 
-const { getBusToken } = require("../../utils/utils")
+const { getBusToken, javaContentRegular } = require("../../utils/utils")
 
 async function publish(name) {
   let res = await checkUpdate();
@@ -15,7 +15,7 @@ async function publish(name) {
     const classPath = path.join(process.cwd(), `classes/${name}/`);
     let fullContent = fs.readFileSync(classPath + `${name}.java`, 'utf8');
 
-    const sourceMatch = fullContent.match(/\/\/ @SOURCE_CONTENT_START\n([\s\S]*?)\n\/\/ @SOURCE_CONTENT_END/);
+    const sourceMatch = fullContent.match(javaContentRegular);
     let classContent = sourceMatch ? sourceMatch[1] : fullContent;
     let configContent = JSON.parse(fs.readFileSync(classPath + "config.json", 'utf8'));
 
@@ -23,7 +23,7 @@ async function publish(name) {
       let body = {
         "id": configContent.id,
         "name": name,
-        "source": encodeURIComponent(classContent),
+        "source": encodeURIComponent(classContent.trim()),
         "version": configContent.version || "2",
         "folderId": "wgd"
       }

package/src/classes/pull.js

@@ -0,0 +1,46 @@
+const { checkUpdate } = require("../../utils/checkVersion")
+const fs = require("fs");
+const path = require("path")
+const chalk = require("chalk")
+const { postNormal } = require("../../utils/http")
+
+const { getBusToken, javaContentRegular } = require("../../utils/utils")
+
+async function pull(name) {
+    let res = await checkUpdate();
+    if (!res) {
+        console.log();
+        console.log(chalk.green('Pulling, please wait...'));
+        console.log();
+        const classPath = path.join(process.cwd(), `classes/${name}/`);
+        let configContent = JSON.parse(fs.readFileSync(classPath + "config.json", 'utf8'));
+        if (await getBusToken()) {
+            let body = {
+                "id": configContent.id,
+            }
+            let res = await postNormal(global.setupSvc + "/api/ccfag/detail", body)
+            if (res.result) {
+                console.log(chalk.green('Success！'));
+                console.log();
+
+                let fullContent = fs.readFileSync(classPath + `${name}.java`, 'utf8');
+
+                let newContent = '';
+                if (fullContent.includes("@SOURCE_CONTENT_START")) {
+                    newContent = fullContent.replace(
+                        javaContentRegular,
+                        `// @SOURCE_CONTENT_START\n${res.data.trigger.source}\n// @SOURCE_CONTENT_END`
+                    );
+                } else {
+                    newContent = res.data.trigger.source;
+                }
+
+                fs.writeFileSync(classPath + `${name}.java`, newContent, 'utf8');
+
+            } else {
+                console.log(chalk.red('Fail：' + res.returnInfo));
+            }
+        }
+    }
+}
+module.exports = pull;

package/src/object/get.js

@@ -2,31 +2,44 @@ const { getBusToken } = require("../../utils/utils")
 const { postNormal } = require("../../utils/http")
 
 
-async function get(path) {
+async function get(path, type) {
     if (await getBusToken(path)) {
         let res = [];
-        //get standar object
-        let standardObjList = await postNormal(global.setupSvc + "/api/customObject/standardObjList")
-        standardObjList.data.forEach((item) => {
-            res.push({
-                id: item.id,
-                label: item.objname,
-                objname: item.label,
-                objprefix: item.objprefix,
-                schemetableName: item.label
+        if ("trigger" === type) {
+            //get trigger object
+            let triggerObjList = await postNormal(global.setupSvc + "/api/trigger/newobjtrigger")
+            triggerObjList.data.targetObjList.map((item) => {
+                res.push({
+                    id: item.id,
+                    label: item.label,
+                    objname: item.schemetable_name,
+                    schemetableName: item.schemetableName
+                })
             })
-        })
-        //get custom object
-        let customObjList = await postNormal(global.setupSvc + "/api/customObject/list")
-        customObjList.data.objList.map((item) => {
-            res.push({
-                id: item.id,
-                label: item.objLabel,
-                objname: item.schemetable_name,
-                objprefix: item.prefix,
-                schemetableName: item.schemetableName
+        } else {
+            //get standar object
+            let standardObjList = await postNormal(global.setupSvc + "/api/customObject/standardObjList")
+            standardObjList.data.forEach((item) => {
+                res.push({
+                    id: item.id,
+                    label: item.objname,
+                    objname: item.label,
+                    objprefix: item.objprefix,
+                    schemetableName: item.label
+                })
             })
-        })
+            //get custom object
+            let customObjList = await postNormal(global.setupSvc + "/api/customObject/list")
+            customObjList.data.objList.map((item) => {
+                res.push({
+                    id: item.id,
+                    label: item.objLabel,
+                    objname: item.schemetable_name,
+                    objprefix: item.prefix,
+                    schemetableName: item.schemetableName
+                })
+            })
+        }
         console.log(JSON.stringify(res))
         return res
     }

package/src/object/index.js

@@ -1,7 +1,7 @@
 const cc = {}
 cc.get = require("./get")
 function main(action, argvs) {
-  cc[action](argvs[2])
+  cc[action](argvs[2], argvs[3])
 }
 
 module.exports = main;

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 { readCache, writeCache } = require("../../utils/cache")
 
 const { checkUpdate } = require("../../utils/checkVersion")
 const BaseUrl = "https://developer.apis.cloudcc.cn"
@@ -61,11 +61,10 @@ class Builder {
 
     async getToken(devConsoleConfig) {
         const cache = readCache();
-        const cacheKey = `plugin_token_${devConsoleConfig.secretKey}`;  // 使用orgId确保唯一性
+        const cacheKey = `plugin_token_${devConsoleConfig.secretKey}`;
         const now = Date.now();
         const oneHour = 60 * 60 * 1000;
 
-        // 检查缓存是否有效
         if (cache[cacheKey] &&
             cache[cacheKey].token &&
             cache[cacheKey].timestamp &&
@@ -75,7 +74,6 @@ class Builder {
 
         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

package/src/script/create.js

@@ -12,7 +12,6 @@ async function create(argvs) {
         const filePath = path.join(objectFolderPath, body.scriptName);
 
         try {
-            // 确保对象文件夹和脚本文件夹都存在
             fs.mkdirSync(objectFolderPath, { recursive: true });
             fs.mkdirSync(filePath, { recursive: true });
 

package/src/script/index.js

@@ -1,6 +1,7 @@
 const cc = {}
 cc.create = require("./create")
 cc.publish = require("./publish")
+cc.pull = require("./pull")
 function main(action, argvs) {
   cc[action](argvs)
 }

package/src/script/publish.js

@@ -44,7 +44,7 @@ async function publish(argvs) {
         devConsoleConfig.accessToken = await getBusToken();
       }
       console.log(chalk.green('Posting, please wait...'));
-      configContent.scriptContent = scriptContent
+      configContent.scriptContent = scriptContent.trim()
       let res = await post((devConsoleConfig.baseUrl || BaseUrl) + "/devconsole/script/saveClientScript", configContent, devConsoleConfig)
       if (res.result) {
         console.log();

package/src/script/pull.js

@@ -0,0 +1,60 @@
+
+const { checkUpdate } = require("../../utils/checkVersion.js")
+const fs = require("fs");
+const path = require("path")
+const chalk = require("chalk")
+const { post } = require("../../utils/http.js")
+const { getPackageJson } = require("../../utils/config.js")
+const BaseUrl = "https://developer.apis.cloudcc.cn"
+const { getBusToken } = require("../../utils/utils.js")
+
+function checkMainFunctionExists(content) {
+  const mainFunctionPattern = /^function\s+main\s*\(\$CCDK,\s*obj\)\s*\{/m;
+  return mainFunctionPattern.test(content);
+}
+
+async function pull(argvs) {
+  let namePath = argvs[2]
+  let name = namePath.split("/")[1]
+  let res = await checkUpdate();
+  if (!res) {
+    const srcPath = path.join(process.cwd(), `script/${namePath}/`);
+
+    let devConsoleConfig = getPackageJson()
+    if ("private" != devConsoleConfig.version) {
+      devConsoleConfig.accessToken = await getBusToken();
+    }
+    console.log(chalk.green('Pulling, please wait...'));
+    let configContent = JSON.parse(fs.readFileSync(srcPath + "config.json", 'utf8'));
+    configContent = {
+      "pageSize": 20,
+      "pageNo": 1,
+      "condition": {
+        "id": configContent.id,
+        "pageLabel": "",
+        "objName": ""
+      }
+    }
+    let res = await post((devConsoleConfig.baseUrl || BaseUrl) + "/devconsoleone/script/pageClientScript", configContent, devConsoleConfig)
+    if (res.result) {
+      console.log();
+      console.log(chalk.green('Success！'));
+      console.log();
+
+      let newContent = `function main($CCDK, obj){
+${res.data.list[0].scriptContent}
+}`
+      fs.writeFileSync(srcPath + `${name}.js`, newContent);
+    } else {
+      console.log();
+      console.log(chalk.red('Fail：' + res.returnInfo));
+      console.log();
+    }
+  } else {
+    console.log();
+    console.log(chalk.red('Invalid Script Content'));
+    console.log();
+  }
+}
+
+module.exports = pull;

package/src/timer/create.js

@@ -10,9 +10,14 @@ async function create(name) {
         const timerPath = path.join(process.cwd(), "schedule/" + name);
         try {
             fs.mkdirSync(timerPath, { recursive: true })
-            const javaTmp = `// @SOURCE_CONTENT_START
-System.out.print("hello World");
-// @SOURCE_CONTENT_END`
+
+            const javaTmp = `public class ${name} extends CCSchedule {
+    public ${name}(){
+    // @SOURCE_CONTENT_START
+    System.out.print("hello World");
+    // @SOURCE_CONTENT_END
+    }
+}`
             fs.writeFileSync(path.join(timerPath, name + ".java"), javaTmp)
             fs.writeFileSync(path.join(timerPath, "config.json"), `{"name":"${name}","version":"${getPackageJson().extandVersion || '2'}"}`)
             console.log()

package/src/timer/index.js

@@ -1,6 +1,7 @@
 const cc = {}
 cc.create = require("./create")
 cc.publish = require("./publish")
+cc.pull = require("./pull")
 function Timer(action, argvs) {
   cc[action](argvs[2])
 }

package/src/timer/publish.js

@@ -4,7 +4,7 @@ const path = require("path")
 const chalk = require("chalk")
 const { postNormal } = require("../../utils/http")
 
-const { getBusToken } = require("../../utils/utils")
+const { getBusToken, javaContentRegular } = require("../../utils/utils")
 
 async function publish(name) {
   let res = await checkUpdate();
@@ -15,8 +15,7 @@ async function publish(name) {
     const timerPath = path.join(process.cwd(), `schedule/${name}/`);
     let fullContent = fs.readFileSync(timerPath + `${name}.java`, 'utf8');
 
-    // 提取标记之间的内容
-    const sourceMatch = fullContent.match(/\/\/ @SOURCE_CONTENT_START\n([\s\S]*?)\n\/\/ @SOURCE_CONTENT_END/);
+    const sourceMatch = fullContent.match(javaContentRegular);
     let classContent = sourceMatch ? sourceMatch[1] : fullContent;
 
     let configContent = JSON.parse(fs.readFileSync(timerPath + "config.json", 'utf8'));
@@ -26,7 +25,7 @@ async function publish(name) {
         "id": configContent.id,
         "name": name,
         "version": configContent.version || "2",
-        "source": encodeURIComponent(classContent),
+        "source": encodeURIComponent(classContent.trim()),
         "folderId": "wgd"
       }
       let res = await postNormal(global.setupSvc + "/api/ccPeak/save", body)

package/src/timer/pull.js

@@ -0,0 +1,48 @@
+const { checkUpdate } = require("../../utils/checkVersion")
+const fs = require("fs");
+const path = require("path")
+const chalk = require("chalk")
+const { postNormal } = require("../../utils/http")
+
+const { getBusToken, javaContentRegular } = require("../../utils/utils")
+
+async function pull(name) {
+  let res = await checkUpdate();
+  if (!res) {
+    console.log();
+    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 (await getBusToken()) {
+      let body = {
+        "id": configContent.id,
+      }
+      let res = await postNormal(global.setupSvc + "/api/ccPeak/detail", body)
+      if (res.result) {
+        console.log(chalk.green('Success！'));
+        console.log
+        let fullContent = fs.readFileSync(timerPath + `${name}.java`, 'utf8');
+
+        let newContent = '';
+        if (fullContent.includes("@SOURCE_CONTENT_START")) {
+          newContent = fullContent.replace(
+            javaContentRegular,
+            `// @SOURCE_CONTENT_START\n${res.data.trigger.source}\n// @SOURCE_CONTENT_END`
+          );
+        } else {
+          newContent = res.data.trigger.tsource;
+        }
+
+        fs.writeFileSync(timerPath + `${name}.java`, newContent, 'utf8');
+
+      } else {
+        console.log(chalk.red('Fail：' + res.returnInfo));
+      }
+    }
+  }
+}
+module.exports = pull;

package/src/triggers/create.js

@@ -13,13 +13,16 @@ async function create(argvs) {
         const triggersPath = path.join(objectFolderPath, body.name);
 
         try {
-            // 确保对象文件夹和触发器文件夹都存在
             fs.mkdirSync(objectFolderPath, { recursive: true });
             fs.mkdirSync(triggersPath, { recursive: true });
 
-            const javaTmp = `// @SOURCE_CONTENT_START
-System.out.print("hello World");
-// @SOURCE_CONTENT_END`
+            const javaTmp = `public class ${body.name} extends CCTrigger {
+    public ${body.name}(){
+    // @SOURCE_CONTENT_START
+    System.out.print("hello World");
+    // @SOURCE_CONTENT_END
+    }
+}`
 
             fs.writeFileSync(path.join(triggersPath, body.name + ".java"), javaTmp);
             body.version = getPackageJson().extandVersion || "2";

package/src/triggers/index.js

@@ -1,6 +1,7 @@
 const cc = {}
 cc.create = require("./create")
 cc.publish = require("./publish")
+cc.pull = require("./pull")
 function Classes(action, argvs) {
   cc[action](argvs)
 }

package/src/triggers/publish.js

@@ -3,7 +3,7 @@ const fs = require("fs");
 const path = require("path")
 const chalk = require("chalk")
 const { postNormal } = require("../../utils/http")
-const { getBusToken } = require("../../utils/utils")
+const { getBusToken ,javaContentRegular} = require("../../utils/utils")
 
 async function publish(argvs) {
   let namePath = argvs[2]
@@ -16,10 +16,8 @@ async function publish(argvs) {
     const triggersPath = path.join(process.cwd(), `triggers/${namePath}/`);
     let fullContent = fs.readFileSync(triggersPath + `${name}.java`, 'utf8');
 
-    // 提取标记之间的内容
-    const sourceMatch = fullContent.match(/\/\/ @SOURCE_CONTENT_START\n([\s\S]*?)\n\/\/ @SOURCE_CONTENT_END/);
-    let classContent = sourceMatch ? sourceMatch[1] : fullContent;
-
+    const sourceMatch = fullContent.match(javaContentRegular);
+    let triggersContent = sourceMatch ? sourceMatch[1] : fullContent;
     let configContent = JSON.parse(fs.readFileSync(triggersPath + "config.json", 'utf8'));
 
     if (await getBusToken()) {
@@ -31,7 +29,7 @@ async function publish(argvs) {
         "triggerTime": configContent.triggerTime,
         "name": name,
         "version": configContent.version || "2",
-        "triggerSource": encodeURIComponent(classContent),
+        "triggerSource": encodeURIComponent(triggersContent.trim()),
         "folderId": "wgd"
       }
       let res = await postNormal(global.setupSvc + "/api/triggerSetup/saveTrigger", body)

package/src/triggers/pull.js

@@ -0,0 +1,47 @@
+const { checkUpdate } = require("../../utils/checkVersion")
+const fs = require("fs");
+const path = require("path")
+const chalk = require("chalk")
+const { postNormal } = require("../../utils/http")
+const { getBusToken, javaContentRegular } = require("../../utils/utils")
+
+async function pull(argvs) {
+    let namePath = argvs[2]
+    let name = namePath.split("/")[1]
+    let res = await checkUpdate();
+    if (!res) {
+        console.log();
+        console.log(chalk.green('Pulling, please wait...'));
+        console.log();
+        const triggersPath = path.join(process.cwd(), `triggers/${namePath}/`);
+        let configContent = JSON.parse(fs.readFileSync(triggersPath + "config.json", 'utf8'));
+
+        if (await getBusToken()) {
+            let body = {
+                "id": configContent.id,
+            }
+            let res = await postNormal(global.setupSvc + "/api/trigger/newobjtrigger", body)
+            if (res.result) {
+                console.log(chalk.green('Success！'));
+                console.log();
+
+                let fullContent = fs.readFileSync(triggersPath + `${name}.java`, 'utf8');
+                let newContent = '';
+                if (fullContent.includes("@SOURCE_CONTENT_START")) {
+                    newContent = fullContent.replace(
+                        javaContentRegular,
+                        `// @SOURCE_CONTENT_START\n${res.data.trigger.triggerSource}\n// @SOURCE_CONTENT_END`
+                    );
+                } else {
+                    newContent = res.data.trigger.triggerSource;
+                }
+
+                fs.writeFileSync(triggersPath + `${name}.java`, newContent);
+
+            } else {
+                console.log(chalk.red('Fail：' + res.returnInfo));
+            }
+        }
+    }
+}
+module.exports = pull;

package/utils/checkVersion.js

@@ -9,11 +9,9 @@ function checkNpmVersion() {
     let onlineVersionNum
     let onlineVersion = '0.0.1'
 
-    // 获取在线版本
     onlineVersion = exec(`npm view cloudcc-cli version --registry http://registry.npmmirror.com`)
     onlineVersion = onlineVersion.toString("utf8").trim();
 
-    // 获取发布时间信息
     const timeInfo = exec(`npm view cloudcc-cli time --json --registry http://registry.npmmirror.com`)
     const timeData = JSON.parse(timeInfo.toString().trim());
     const formattedTime = new Date(timeData[onlineVersion]).toLocaleString('zh-CN', {
@@ -66,13 +64,11 @@ function update(onlineVersion) {
 
 
 async function checkUpdate(path = process.cwd()) {
-    // 检查缓存
     const cache = readCache(path);
     const cacheKey = 'version_check';
     const now = Date.now();
     const oneHour = 60 * 60 * 1000;
 
-    // 如果缓存有效，跳过版本检查
     if (cache[cacheKey] &&
         cache[cacheKey].timestamp &&
         (now - cache[cacheKey].timestamp) < oneHour) {
@@ -82,7 +78,6 @@ async function checkUpdate(path = process.cwd()) {
     let onlineVersion;
     try {
         onlineVersion = checkNpmVersion();
-        // 更新缓存
         cache[cacheKey] = {
             timestamp: now
         };

package/utils/utils.js

@@ -92,5 +92,6 @@ async function getBusToken(path = process.cwd()) {
     }
     return false;
 }
+const javaContentRegular = /\/\/\s*@SOURCE_CONTENT_START\n([\s\S]*?)\n\/\/\s*@SOURCE_CONTENT_END/
 
-module.exports = { getBusToken }
+module.exports = { getBusToken, javaContentRegular }