cloudcc-cli 1.9.0 → 1.9.2

package/README.md

@@ -1,3 +1,19 @@
+# ReleaseV1.9.2
+#### Release Date: 2025-2-11
+#### Release Scope: Full
+#### Release Content
+* Optimization
+    * change javaContentRegular
+    * trigger add method name
+
+# 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

package/package.json

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

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(/\/\/\s*@SOURCE_CONTENT_START\n([\s\S]*?)\n\/\/\s*@SOURCE_CONTENT_END/);
+    const sourceMatch = fullContent.match(javaContentRegular);
     let classContent = sourceMatch ? sourceMatch[1] : fullContent;
     let configContent = JSON.parse(fs.readFileSync(classPath + "config.json", 'utf8'));
 

package/src/classes/pull.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 pull(name) {
     let res = await checkUpdate();
@@ -26,9 +26,9 @@ async function pull(name) {
                 let fullContent = fs.readFileSync(classPath + `${name}.java`, 'utf8');
 
                 let newContent = '';
-                if (fullContent) {
+                if (fullContent.includes("@SOURCE_CONTENT_START")) {
                     newContent = fullContent.replace(
-                        /\/\/ @SOURCE_CONTENT_START\n[\s\S]*?\n\/\/ @SOURCE_CONTENT_END/,
+                        javaContentRegular,
                         `// @SOURCE_CONTENT_START\n${res.data.trigger.source}\n// @SOURCE_CONTENT_END`
                     );
                 } else {

package/src/timer/create.js

@@ -12,7 +12,7 @@ async function create(name) {
             fs.mkdirSync(timerPath, { recursive: true })
 
             const javaTmp = `public class ${name} extends CCSchedule {
-    public ${name}(){
+    public void demo(){
     // @SOURCE_CONTENT_START
     System.out.print("hello World");
     // @SOURCE_CONTENT_END

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,7 +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(/\/\/\s*@SOURCE_CONTENT_START([\s\S]*?)\/\/\s*@SOURCE_CONTENT_END/);
+    const sourceMatch = fullContent.match(javaContentRegular);
     let classContent = sourceMatch ? sourceMatch[1] : fullContent;
 
     let configContent = JSON.parse(fs.readFileSync(timerPath + "config.json", 'utf8'));

package/src/timer/pull.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 pull(name) {
   let res = await checkUpdate();
@@ -28,9 +28,9 @@ async function pull(name) {
         let fullContent = fs.readFileSync(timerPath + `${name}.java`, 'utf8');
 
         let newContent = '';
-        if (fullContent) {
+        if (fullContent.includes("@SOURCE_CONTENT_START")) {
           newContent = fullContent.replace(
-            /\/\/\s*@SOURCE_CONTENT_START[\s\S]*?\/\/\s*@SOURCE_CONTENT_END/,
+            javaContentRegular,
             `// @SOURCE_CONTENT_START\n${res.data.trigger.source}\n// @SOURCE_CONTENT_END`
           );
         } else {

package/src/triggers/create.js

@@ -17,7 +17,7 @@ async function create(argvs) {
             fs.mkdirSync(triggersPath, { recursive: true });
 
             const javaTmp = `public class ${body.name} extends CCTrigger {
-    public ${body.name}(){
+    public void demo(){
     // @SOURCE_CONTENT_START
     System.out.print("hello World");
     // @SOURCE_CONTENT_END

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,7 +16,7 @@ async function publish(argvs) {
     const triggersPath = path.join(process.cwd(), `triggers/${namePath}/`);
     let fullContent = fs.readFileSync(triggersPath + `${name}.java`, 'utf8');
 
-    const sourceMatch = fullContent.match(/\/\/\s*@SOURCE_CONTENT_START([\s\S]*?)\/\/\s*@SOURCE_CONTENT_END/);
+    const sourceMatch = fullContent.match(javaContentRegular);
     let triggersContent = sourceMatch ? sourceMatch[1] : fullContent;
     let configContent = JSON.parse(fs.readFileSync(triggersPath + "config.json", 'utf8'));
 

package/src/triggers/pull.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 pull(argvs) {
     let namePath = argvs[2]
@@ -27,10 +27,9 @@ async function pull(argvs) {
 
                 let fullContent = fs.readFileSync(triggersPath + `${name}.java`, 'utf8');
                 let newContent = '';
-
-                if (fullContent) {
+                if (fullContent.includes("@SOURCE_CONTENT_START")) {
                     newContent = fullContent.replace(
-                        /\/\/\s*@SOURCE_CONTENT_START([\s\S]*?)\/\/\s*@SOURCE_CONTENT_END/,
+                        javaContentRegular,
                         `// @SOURCE_CONTENT_START\n${res.data.trigger.triggerSource}\n// @SOURCE_CONTENT_END`
                     );
                 } else {

package/template/packagejson

@@ -33,6 +33,9 @@
     "parserOptions": {
       "parser": "babel-eslint"
     },
+    "globals": {
+      "$CCDK": "readonly"
+    },
     "rules": {}
   },
   "browserslist": [

package/utils/utils.js

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