crabatool 1.0.10 → 1.0.11

package/index.js

@@ -1,7 +1,9 @@
 var utils = require('./lib/utils.js');
 var config = require('./lib/config.js');
+var upgrade = require('./tool/upgrade.js');
 var fs = require('fs');
 var path = require('path');
+var readline = require('readline');
 
 exports = module.exports;
 
@@ -31,18 +33,14 @@ function checkConfig() {
     throw new Error('平台前端组件不存在，请检查指定的webPath路径是否为craba前端框架的根目录。' + crabaJs);
   }
 
-  var upgrade = require('./tool/upgrade.js');
   var localData = upgrade.getLocalVersion();
-  var newData = upgrade.getNewVersion();
 
-  console.log(`\r\n\r\n本地craba版本：[${localData.version}]\t\t最新craba版本：[${newData.version}]\r\n本地craba日期：[${localData.date}]\t最新craba日期：[${newData.date}]`);
+  console.log(`\r\n\r\n本地craba版本：[${localData.version}]\r\n本地craba日期：[${localData.date}]`);
   console.log("---------------------------------------------------------------------------------------------------------");
 }
 
 
 function waitInput() {
-  var readline = require('readline');
-
   const rl = readline.createInterface({
     input: process.stdin,
     output: process.stdout
@@ -55,35 +53,43 @@ function waitInput() {
   }
 
   const question = rlPromisify(rl.question.bind(rl));
+
   (async () => {
     var ques = [
-      "1. 启动服务。",
-      "2. 更新平台后启动服务。",
-      "3. 安装或更新IDEA环境，主要包含：智能语法、新增页面模板",
-      "4. 安装或更新vscode环境，主要包含：智能语法、新增页面模板、ctrl+alt+n、alt+j快捷键",
-      "5. 新建Craba空白项目",
+      "1. 启动服务。主要包含：自动打包init.js和biz.js，后期还有es6语法兼容等",
+      "2. 更新平台后启动服务。内网才可用",
+      "3. 查询最新平台版本和日期。内网才可用",
+      "4. 安装或更新IDEA环境。内网才可用。主要包含：智能语法、新增页面模板",
+      "5. 安装或更新vscode环境。内网才可用。主要包含：智能语法、新增页面模板、ctrl+alt+n、alt+j快捷键",
+      "6. 新建Craba空白项目。内网才可用。",
+      "7. 结束 或按Ctrl+C即可退出",
       "---------------------------------------------------------------------------------------------------------",
-      "请输入对应功能的编号（数字）:"
+      "请输入对应功能的编号（数字）："
     ];
     const num = await question(ques.join('\r\n'));
-    //utils.log(num);
+    if (num != 6) {
+      rl.close(); // 关闭输入等待
+    }
 
     if (num == 1) {
       start();
     } else if (num == 2) {
       update();
     } else if (num == 3) {
-      installIDEA();
+      showNewVersion();
+      waitInput(); // 重复
     } else if (num == 4) {
-      installvscode();
+      installIDEA();
     } else if (num == 5) {
+      installvscode();
+    } else if (num == 6) {
       const webFolder = await question('请输入项目路径：');
+      rl.close(); // 关闭输入等待
       createProject(webFolder);
-    } else {
-      console.error('无效输入，结束。');
+    } else if (num != 7) {
+      console.error('无效输入,请继续。\r\n\r\n');
+      waitInput(); // 重复
     }
-
-    rl.close(); // 关闭输入等待
   })();
 }
 
@@ -94,7 +100,13 @@ function start() {
 
 // 更新平台后启动服务
 function update() {
-  require('./lib/server.js');
+  upgrade.updateCraba(start);
+}
+
+function showNewVersion() {
+  var data = upgrade.getNewVersion();
+  console.log(`最新平台版本：[${data.version}]`);
+  console.log(`最新平台日期：[${data.date}]\r\n\r\n`);
 }
 
 // 安装或更新IDEA环境，主要包含：智能语法、新增页面模板

package/lib/utils.js

@@ -206,15 +206,29 @@ class utils {
         next(); // 继续处理
     }
 
+    cleardirsSync(dirname) {
+        if (!fs.existsSync(dirname)) return;
+
+        var files = fs.readdirSync(dirname);
+        files.forEach(function(itm, index) {
+            var file = path.join(dirname, itm);
+            var stat = fs.statSync(file);
+            if (stat.isDirectory()) {
+                //递归读取文件
+                that.cleardirsSync(file);
+            } else {
+                fs.unlinkSync(file);
+            }
+        });
+    }
+
     mkdirsSync(dirname) {
-        var dirname = path.dirname(dirname);
         if (fs.existsSync(dirname)) {
             return true;
-        } else {
-            if (that.mkdirsSync(dirname)) {
-                fs.mkdirSync(dirname);
-                return true;
-            }
+        }
+        if (that.mkdirsSync(path.dirname(dirname))) {
+            fs.mkdirSync(dirname);
+            return true;
         }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "description": "crabatool",
   "main": "index.js",
   "scripts": {
@@ -17,7 +17,8 @@
     "crypto": "^1.0.1",
     "nodejs-websocket": "^1.7.2",
     "request": "^2.88.2",
-    "sync-request": "^6.1.0"
+    "sync-request": "^6.1.0",
+    "axios": "^0.27.2"
   },
   "repository": {
     "type": "git",

package/test/node_modules/.bin/sshpk-conv

@@ -0,0 +1,12 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  exec "$basedir/node"  "$basedir/../sshpk/bin/sshpk-conv" "$@"
+else 
+  exec node  "$basedir/../sshpk/bin/sshpk-conv" "$@"
+fi

package/test/node_modules/.bin/sshpk-conv.cmd

@@ -0,0 +1,17 @@
+@ECHO off
+GOTO start
+:find_dp0
+SET dp0=%~dp0
+EXIT /b
+:start
+SETLOCAL
+CALL :find_dp0
+
+IF EXIST "%dp0%\node.exe" (
+  SET "_prog=%dp0%\node.exe"
+) ELSE (
+  SET "_prog=node"
+  SET PATHEXT=%PATHEXT:;.JS;=;%
+)
+
+endLocal & goto #_undefined_# 2>NUL || title %COMSPEC% & "%_prog%"  "%dp0%\..\sshpk\bin\sshpk-conv" %*

package/test/node_modules/.bin/sshpk-conv.ps1

@@ -0,0 +1,28 @@
+#!/usr/bin/env pwsh
+$basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent
+
+$exe=""
+if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) {
+  # Fix case when both the Windows and Linux builds of Node
+  # are installed in the same directory
+  $exe=".exe"
+}
+$ret=0
+if (Test-Path "$basedir/node$exe") {
+  # Support pipeline input
+  if ($MyInvocation.ExpectingInput) {
+    $input | & "$basedir/node$exe"  "$basedir/../sshpk/bin/sshpk-conv" $args
+  } else {
+    & "$basedir/node$exe"  "$basedir/../sshpk/bin/sshpk-conv" $args
+  }
+  $ret=$LASTEXITCODE
+} else {
+  # Support pipeline input
+  if ($MyInvocation.ExpectingInput) {
+    $input | & "node$exe"  "$basedir/../sshpk/bin/sshpk-conv" $args
+  } else {
+    & "node$exe"  "$basedir/../sshpk/bin/sshpk-conv" $args
+  }
+  $ret=$LASTEXITCODE
+}
+exit $ret

package/test/node_modules/.bin/sshpk-sign

@@ -0,0 +1,12 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  exec "$basedir/node"  "$basedir/../sshpk/bin/sshpk-sign" "$@"
+else 
+  exec node  "$basedir/../sshpk/bin/sshpk-sign" "$@"
+fi

package/test/node_modules/.bin/sshpk-sign.cmd

@@ -0,0 +1,17 @@
+@ECHO off
+GOTO start
+:find_dp0
+SET dp0=%~dp0
+EXIT /b
+:start
+SETLOCAL
+CALL :find_dp0
+
+IF EXIST "%dp0%\node.exe" (
+  SET "_prog=%dp0%\node.exe"
+) ELSE (
+  SET "_prog=node"
+  SET PATHEXT=%PATHEXT:;.JS;=;%
+)
+
+endLocal & goto #_undefined_# 2>NUL || title %COMSPEC% & "%_prog%"  "%dp0%\..\sshpk\bin\sshpk-sign" %*

package/test/node_modules/.bin/sshpk-sign.ps1

@@ -0,0 +1,28 @@
+#!/usr/bin/env pwsh
+$basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent
+
+$exe=""
+if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) {
+  # Fix case when both the Windows and Linux builds of Node
+  # are installed in the same directory
+  $exe=".exe"
+}
+$ret=0
+if (Test-Path "$basedir/node$exe") {
+  # Support pipeline input
+  if ($MyInvocation.ExpectingInput) {
+    $input | & "$basedir/node$exe"  "$basedir/../sshpk/bin/sshpk-sign" $args
+  } else {
+    & "$basedir/node$exe"  "$basedir/../sshpk/bin/sshpk-sign" $args
+  }
+  $ret=$LASTEXITCODE
+} else {
+  # Support pipeline input
+  if ($MyInvocation.ExpectingInput) {
+    $input | & "node$exe"  "$basedir/../sshpk/bin/sshpk-sign" $args
+  } else {
+    & "node$exe"  "$basedir/../sshpk/bin/sshpk-sign" $args
+  }
+  $ret=$LASTEXITCODE
+}
+exit $ret

package/test/node_modules/.bin/sshpk-verify

@@ -0,0 +1,12 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  exec "$basedir/node"  "$basedir/../sshpk/bin/sshpk-verify" "$@"
+else 
+  exec node  "$basedir/../sshpk/bin/sshpk-verify" "$@"
+fi

package/test/node_modules/.bin/sshpk-verify.cmd

@@ -0,0 +1,17 @@
+@ECHO off
+GOTO start
+:find_dp0
+SET dp0=%~dp0
+EXIT /b
+:start
+SETLOCAL
+CALL :find_dp0
+
+IF EXIST "%dp0%\node.exe" (
+  SET "_prog=%dp0%\node.exe"
+) ELSE (
+  SET "_prog=node"
+  SET PATHEXT=%PATHEXT:;.JS;=;%
+)
+
+endLocal & goto #_undefined_# 2>NUL || title %COMSPEC% & "%_prog%"  "%dp0%\..\sshpk\bin\sshpk-verify" %*

package/test/node_modules/.bin/sshpk-verify.ps1

@@ -0,0 +1,28 @@
+#!/usr/bin/env pwsh
+$basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent
+
+$exe=""
+if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) {
+  # Fix case when both the Windows and Linux builds of Node
+  # are installed in the same directory
+  $exe=".exe"
+}
+$ret=0
+if (Test-Path "$basedir/node$exe") {
+  # Support pipeline input
+  if ($MyInvocation.ExpectingInput) {
+    $input | & "$basedir/node$exe"  "$basedir/../sshpk/bin/sshpk-verify" $args
+  } else {
+    & "$basedir/node$exe"  "$basedir/../sshpk/bin/sshpk-verify" $args
+  }
+  $ret=$LASTEXITCODE
+} else {
+  # Support pipeline input
+  if ($MyInvocation.ExpectingInput) {
+    $input | & "node$exe"  "$basedir/../sshpk/bin/sshpk-verify" $args
+  } else {
+    & "node$exe"  "$basedir/../sshpk/bin/sshpk-verify" $args
+  }
+  $ret=$LASTEXITCODE
+}
+exit $ret

package/test/node_modules/.bin/uuid

@@ -0,0 +1,12 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  exec "$basedir/node"  "$basedir/../uuid/bin/uuid" "$@"
+else 
+  exec node  "$basedir/../uuid/bin/uuid" "$@"
+fi

package/test/node_modules/.bin/uuid.cmd

@@ -0,0 +1,17 @@
+@ECHO off
+GOTO start
+:find_dp0
+SET dp0=%~dp0
+EXIT /b
+:start
+SETLOCAL
+CALL :find_dp0
+
+IF EXIST "%dp0%\node.exe" (
+  SET "_prog=%dp0%\node.exe"
+) ELSE (
+  SET "_prog=node"
+  SET PATHEXT=%PATHEXT:;.JS;=;%
+)
+
+endLocal & goto #_undefined_# 2>NUL || title %COMSPEC% & "%_prog%"  "%dp0%\..\uuid\bin\uuid" %*

package/test/node_modules/.bin/uuid.ps1

@@ -0,0 +1,28 @@
+#!/usr/bin/env pwsh
+$basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent
+
+$exe=""
+if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) {
+  # Fix case when both the Windows and Linux builds of Node
+  # are installed in the same directory
+  $exe=".exe"
+}
+$ret=0
+if (Test-Path "$basedir/node$exe") {
+  # Support pipeline input
+  if ($MyInvocation.ExpectingInput) {
+    $input | & "$basedir/node$exe"  "$basedir/../uuid/bin/uuid" $args
+  } else {
+    & "$basedir/node$exe"  "$basedir/../uuid/bin/uuid" $args
+  }
+  $ret=$LASTEXITCODE
+} else {
+  # Support pipeline input
+  if ($MyInvocation.ExpectingInput) {
+    $input | & "node$exe"  "$basedir/../uuid/bin/uuid" $args
+  } else {
+    & "node$exe"  "$basedir/../uuid/bin/uuid" $args
+  }
+  $ret=$LASTEXITCODE
+}
+exit $ret