crabatool 1.0.10 → 1.0.13

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. 启动服务。\t\t\t\t主要包含：自动打包init.js和biz.js，后期还有es6语法兼容等",
+      "2. 更新平台后启动服务。\t\t\t[内网才可用]",
+      "3. 查询最新平台版本和日期。\t\t[内网才可用]",
+      "4. 安装或更新IDEA环境。\t\t\t[内网才可用] 主要包含：智能语法、新增页面模板",
+      "5. 安装或更新vscode环境。\t\t[内网才可用] 主要包含：智能语法、新增页面模板、ctrl+alt+n、alt+j快捷键",
+      "6. 新建Craba空白项目。\t\t\t[内网才可用]",
+      "7. 结束 \t\t\t\t或按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.13",
   "description": "crabatool",
   "main": "index.js",
   "scripts": {
@@ -17,7 +17,10 @@
     "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",
+    "single-line-log": "^1.1.2",
+    "node-stream-zip": "^1.15.0"
   },
   "repository": {
     "type": "git",

package/tool/progressbar.js

@@ -0,0 +1,41 @@
+// 这里用到一个很实用的 npm 模块，用以在同一行打印文本
+var slog = require('single-line-log').stdout;
+
+// 封装的 ProgressBar 工具
+function ProgressBar(description, bar_length) {
+  // 两个基本参数(属性)
+  this.description = description || 'Progress';       // 命令行开头的文字信息
+  this.length = bar_length || 25;                     // 进度条的长度(单位：字符)，默认设为 25
+
+  // 刷新进度条图案、文字的方法
+  this.render = function(opts) {
+    if (!opts.total) opts.total = 100;
+    var percent = (opts.completed / opts.total).toFixed(4);    // 计算进度(子任务的 完成数 除以 总数)
+    var cell_num = Math.floor(percent * this.length);             // 计算需要多少个 █ 符号来拼凑图案
+
+    // 拼接黑色条
+    var cell = '';
+    for (var i = 0; i < cell_num; i++) {
+      cell += '█';
+    }
+
+    // 拼接灰色条
+    var empty = '';
+    for (var i = 0; i < this.length - cell_num; i++) {
+      empty += '░';
+    }
+
+    // 拼接最终文本
+    var cmdText = this.description + ': ' + (100 * percent).toFixed(2) + '% ' + cell + empty + ' ' + (opts.text || '');
+
+    // 在单行输出文本
+    slog(cmdText);
+  };
+
+  this.clear = function(text) {
+    slog(text || '');
+  }
+}
+
+// 模块导出
+module.exports = ProgressBar;

package/tool/upgrade.js

@@ -3,6 +3,10 @@ var path = require('path');
 var fs = require('fs');
 var request = require('request');
 var requestSync = require('sync-request');
+var utils = require('../lib/utils.js');
+var axios = require('axios');
+var ProgressBar = require('./progressbar.js');
+var StreamZip = require('node-stream-zip');
 
 class Upgrade {
   constructor() {
@@ -24,6 +28,13 @@ class Upgrade {
     return url;
   }
 
+  getCrabaFileUrl() {
+    var url = this.Host;
+    if (!url.endsWith("/")) url += "/";
+    url += "setup/craba.zip";
+    return url;
+  }
+
   getLocalVersion() {
     // 获取本地craba平台版本
     var crabaJs = path.join(config.webPath, 'js/craba.min.js');
@@ -44,14 +55,87 @@ class Upgrade {
   }
 
   getNewVersion() {
-    var res = requestSync("Get", this.getVersionUrl());
-    console.log(res.getBody().toString());
+    var version = "error";
+    var vDate = "error";
 
-    var version = "";
-    var vDate = "";
+    try {
+      var res = requestSync("GET", this.getVersionUrl());
+      var jsonData = res.getBody().toString();
+      var data = JSON.parse(jsonData);
+      version = data.crabaVersion;
+      vDate = data.crabaDate;
+    } catch (ex) {
 
+    }
     return { version: version, date: vDate };
   }
-}
 
-module.exports = new Upgrade();
+  updateCraba(cb) {
+    var localData = this.getLocalVersion();
+    var newData = this.getNewVersion();
+    if (localData.version == newData.version) {
+      console.log('本地已经是最新版本，不需要更新。');
+      if (cb) cb();
+      return;
+    }
+
+    this.pb = new ProgressBar('更新进度', 50);
+    this._deleteCache();
+
+    this.downloadFile(this.getCrabaFileUrl(), this.CacheFileName, utils.createDelegate(this, this._doCrabaLoaded));
+  }
+
+  _doCrabaLoaded(filePath) {
+    if (!fs.existsSync(filePath)) {// 检查文件
+      console.log("服务不可用，拉取文件失败，请联系平台管理员");
+      return;
+    }
+    this.pb.render({ completed: 50, text: '下载完成' });
+
+    //console.log(filePath);
+    var zip = new StreamZip({ file: filePath });
+    zip.on('ready', () => {
+      that.pb.render({ completed: 60, text: '解压文件' });
+      utils.mkdirsSync(that.CachePath);
+      zip.extract(null, that.CachePath, (err, count) => {
+        that.pb.render({ completed: 70, text: `解压完成，开始拷贝文件` });
+        zip.close();
+        that.copyFile();
+      });
+    });
+  }
+
+  copyFile() {
+
+  }
+
+  downloadFile(uri, filePath, callback) {
+    if (!uri || !filePath) throw new Error('uri或filePath不能为空');
+
+    //console.log('下载craba文件');
+
+    // 获取远端图片
+    axios({
+      method: 'get',
+      url: this.getCrabaFileUrl(),
+      responseType: 'stream'
+    }).then(function(response) {
+      that.pb.render({ completed: 40, text: '下载资源' });
+      response.data
+        .pipe(fs.createWriteStream(that.CacheFileName))
+        .on('close', () => {
+          if (callback) callback(filePath);
+        });
+    }).catch(function(error) {
+      that.pb.clear('[内网才能访问]，出错了:', error.message);
+    });
+  }
+
+  _deleteCache() {
+    this.pb.render({ completed: 10, text: '清理缓存' });
+    utils.cleardirsSync(this.SaveFilePath);
+    utils.mkdirsSync(this.SaveFilePath); // 创建缓存目录
+    this.pb.render({ completed: 20, text: '清理完成' });
+  }
+}
+that = module.exports = new Upgrade();

package/test/node_modules/.bin/mime

@@ -1,12 +0,0 @@
-#!/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/../mime/cli.js" "$@"
-else 
-  exec node  "$basedir/../mime/cli.js" "$@"
-fi

package/test/node_modules/.bin/mime.cmd

@@ -1,17 +0,0 @@
-@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%\..\mime\cli.js" %*

package/test/node_modules/.bin/mime.ps1

@@ -1,28 +0,0 @@
-#!/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/../mime/cli.js" $args
-  } else {
-    & "$basedir/node$exe"  "$basedir/../mime/cli.js" $args
-  }
-  $ret=$LASTEXITCODE
-} else {
-  # Support pipeline input
-  if ($MyInvocation.ExpectingInput) {
-    $input | & "node$exe"  "$basedir/../mime/cli.js" $args
-  } else {
-    & "node$exe"  "$basedir/../mime/cli.js" $args
-  }
-  $ret=$LASTEXITCODE
-}
-exit $ret

package/test/node_modules/.bin/uglifyjs

@@ -1,12 +0,0 @@
-#!/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/../uglify-js/bin/uglifyjs" "$@"
-else 
-  exec node  "$basedir/../uglify-js/bin/uglifyjs" "$@"
-fi

package/test/node_modules/.bin/uglifyjs.cmd

@@ -1,17 +0,0 @@
-@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%\..\uglify-js\bin\uglifyjs" %*

package/test/node_modules/.bin/uglifyjs.ps1

@@ -1,28 +0,0 @@
-#!/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/../uglify-js/bin/uglifyjs" $args
-  } else {
-    & "$basedir/node$exe"  "$basedir/../uglify-js/bin/uglifyjs" $args
-  }
-  $ret=$LASTEXITCODE
-} else {
-  # Support pipeline input
-  if ($MyInvocation.ExpectingInput) {
-    $input | & "node$exe"  "$basedir/../uglify-js/bin/uglifyjs" $args
-  } else {
-    & "node$exe"  "$basedir/../uglify-js/bin/uglifyjs" $args
-  }
-  $ret=$LASTEXITCODE
-}
-exit $ret