aaden-cli 1.6.88 → 1.6.90

package/.junie/guidelines.md

@@ -0,0 +1,260 @@
+# Aaden CLI Development Guidelines
+
+This document provides guidelines and instructions for developing and maintaining the Aaden CLI project.
+
+## Special Note from Human
+1. don't create test script if not asked to.
+
+## Build and Configuration
+
+### Prerequisites
+
+- Node.js (v12 or higher recommended)
+- npm (v6 or higher recommended)
+- Git
+
+### Build Process
+
+The project uses [@vercel/ncc](https://github.com/vercel/ncc) to compile the application into a single file. This process is automatically triggered during the release process, but can also be run manually:
+
+```bash
+# Install dependencies if not already installed
+npm install
+
+# Build the project manually
+npx ncc build index.js -o dist -C
+```
+
+The `-C` flag ensures that assets are copied to the dist directory.
+
+### Release Process
+
+The project uses [release-it](https://github.com/release-it/release-it) for versioning and releasing. The release process is configured in the `package.json` file:
+
+```json
+"release-it": {
+  "hooks": {
+    "after:bump": "ncc build index.js -o dist -C"
+  },
+  "github.release": true,
+  "git": {
+    "commitMessage": "aaden-cli: release v${version}",
+    "requireCleanWorkingDir": false
+  }
+}
+```
+
+To create a new release:
+
+```bash
+npm run update
+```
+
+This will:
+1. Add all changes to git
+2. Bump the version according to release-it's prompts
+3. Build the project using ncc
+4. Create a git commit with the new version
+5. Create a GitHub release
+
+## Testing
+
+### Running Existing Tests
+
+The project includes a basic test script that can be run with:
+
+```bash
+npm test
+```
+
+### Creating New Tests
+
+For more comprehensive testing, a structured approach is recommended. Here's an example of how to create and run tests:
+
+1. Create a test file (e.g., `my-test.js`) with the following structure:
+
+```javascript
+const assert = require('assert');
+const path = require('path');
+const fs = require('fs');
+
+// Test suite
+const tests = {
+  // Test function
+  testSomething: () => {
+    console.log('Testing something...');
+    
+    // Your test logic here
+    assert.strictEqual(true, true, 'This should be true');
+    
+    console.log('✅ Test passed');
+    return true;
+  }
+};
+
+// Run all tests
+console.log('Running tests...\n');
+let passedTests = 0;
+let failedTests = 0;
+
+for (const [testName, testFunction] of Object.entries(tests)) {
+  try {
+    const result = testFunction();
+    if (result) {
+      passedTests++;
+    } else {
+      failedTests++;
+      console.error(`❌ Test ${testName} failed`);
+    }
+  } catch (error) {
+    failedTests++;
+    console.error(`❌ Test ${testName} failed with error: ${error.message}`);
+  }
+  console.log(''); // Add a newline between tests
+}
+
+// Print test summary
+console.log(`\nTest summary: ${passedTests} passed, ${failedTests} failed`);
+
+// Exit with appropriate code
+process.exit(failedTests > 0 ? 1 : 0);
+```
+
+2. Run the test:
+
+```bash
+node my-test.js
+```
+
+### Testing Best Practices
+
+- Use Node.js's built-in `assert` module for assertions
+- Group related tests in a test suite
+- Provide clear error messages
+- Test both success and failure cases
+- Test edge cases
+- Use descriptive test names
+
+## Code Style and Development Guidelines
+
+### Code Style
+
+- Use CommonJS module system (require/module.exports)
+- No semicolons at the end of statements
+- Use single quotes for strings
+- Use 4 spaces for indentation
+- Use descriptive function and variable names
+- Use color coding for console output (via the colors package)
+
+### Error Handling
+
+- Use try/catch blocks for error handling
+- Log errors with color highlighting
+- Return objects with result status
+
+### Shell Command Execution
+
+The project includes utility functions for executing shell commands in `modules/cli-utils.js`:
+
+```javascript
+// Execute a shell command asynchronously
+executeInShell(cmd, debug = false)
+
+// Execute a shell command synchronously
+executeInShellSync(cmd)
+```
+
+Example usage:
+
+```javascript
+const cli = require('./modules/cli-utils');
+
+// Asynchronous execution
+async function runCommand() {
+  const { result, code } = await cli.executeInShell(['command1', 'command2'], false);
+  if (result) {
+    console.log('Command executed successfully');
+  } else {
+    console.log('Command failed');
+  }
+}
+
+// Synchronous execution
+function runCommandSync() {
+  const { result, output } = cli.executeInShellSync('command');
+  if (result) {
+    console.log('Output:', output);
+  } else {
+    console.log('Command failed');
+  }
+}
+```
+
+### Adding New Commands
+
+To add a new command to the CLI:
+
+1. Define the command in `index.js`:
+
+```javascript
+program.command('new-command').action(newCommandFunction)
+```
+
+2. Implement the command function:
+
+```javascript
+function newCommandFunction() {
+  // Command implementation
+}
+```
+
+3. If the command requires shell execution, use the cli-utils module:
+
+```javascript
+async function newCommandFunction() {
+  const command = [
+    'command1',
+    'command2'
+  ]
+  await cli.executeInShell(command, program.debug)
+}
+```
+
+## Deployment
+
+The project includes deployment scripts in the `AadenDeploy` directory:
+
+- `aadensetup.sh`: Main installation script
+- `update.sh`: For updating the system
+- `upgrade.sh`: For upgrading components
+- `mountTSE.sh`: For mounting the TSE device
+
+To deploy the application:
+
+```bash
+# Install on a new device
+./AadenDeploy/aadensetup.sh <deviceId> <channel>
+
+# Update an existing installation
+./AadenDeploy/update.sh
+
+# Upgrade the CLI itself
+./AadenDeploy/upgrade.sh
+```
+
+## Project Structure
+
+- `index.js`: Main entry point
+- `dist/index.js`: Compiled version (generated by ncc)
+- `modules/`: Utility modules
+- `AadenDeploy/`: Deployment scripts
+  - `files/`: Files needed for deployment
+  - `ngrok/`: Ngrok service configuration
+  - `Utils/`: Utility scripts
+- `package.json`: Project configuration and dependencies
+
+## Additional Resources
+
+- [Commander.js Documentation](https://github.com/tj/commander.js)
+- [Vercel NCC Documentation](https://github.com/vercel/ncc)
+- [Release-It Documentation](https://github.com/release-it/release-it)

package/AadenDeploy/Utils/printlogRotate.conf

@@ -0,0 +1,8 @@
+# version=1 important: do NOT remove this line
+/var/www/html/Resource/printlog/*.log {
+    compress
+    daily
+    rotate 14
+    missingok
+    notifempty
+}

package/AadenDeploy/run_hidden.vbs

@@ -5,6 +5,7 @@ Const ForReading = 1
 Const ForWriting = 2
 Const ForAppending = 8
 Const CreateIfNotExist = True
+Const AadenVersion = "1.6.88"
 
 ' Global Variable Declarations
 Dim fso, WshShell
@@ -46,6 +47,9 @@ Else
     WriteLog logFilePath, "Script is correctly located in the Startup folder."
 End If
 
+' Log the current Aaden CLI version
+WriteLog logFilePath, "Aaden CLI version: " & AadenVersion
+
 ' Define the Aaden Desktop executable file path
 Dim appDataPath, aadenExePath
 appDataPath = WshShell.ExpandEnvironmentStrings("%LOCALAPPDATA%")
@@ -54,20 +58,61 @@ aadenExePath = appDataPath & "\Programs\aaden\Aaden Desktop.exe"
 ' Expected content of the file
 Dim expectedContent
 expectedContent = "@echo off" & vbCrLf & _
+                  "setlocal enabledelayedexpansion" & vbCrLf & _
                   "echo %date% %time% - Starting WSL and Aaden Desktop >> C:\AadenPOS\operation.log" & vbCrLf & _
-                  "wsl.exe --distribution Ubuntu --exec dbus-launch true" & vbCrLf & _
-                  "start """" /wait """ & aadenExePath & """" & vbCrLf & _
-                  "echo %date% %time% - Aaden Desktop closed, starting WSL monitoring >> C:\AadenPOS\operation.log" & vbCrLf & _
-                  "rem Monitor and restart WSL if it dies" & vbCrLf & _
-                  ":monitor_loop" & vbCrLf & _
-                  "timeout /t 60 /nobreak > nul" & vbCrLf & _
-                  "wsl.exe --distribution Ubuntu --exec echo ""Checking WSL status..."" > nul 2>&1" & vbCrLf & _
-                  "if %errorlevel% neq 0 (" & vbCrLf & _
-                  "    echo %date% %time% - WSL is not running. Restarting... >> C:\AadenPOS\operation.log" & vbCrLf & _
-                  "    wsl.exe --distribution Ubuntu --exec dbus-launch true" & vbCrLf & _
-                  "    echo %date% %time% - WSL restart attempted >> C:\AadenPOS\operation.log" & vbCrLf & _
+                  "" & vbCrLf & _
+                  "set WSL_UTF8=1" & vbCrLf & _
+                  "" & vbCrLf & _
+                  "REM Start Aaden Desktop application once at the beginning" & vbCrLf & _
+                  "start """" """ & aadenExePath & """" & vbCrLf & _
+                  "" & vbCrLf & _
+                  "REM Initial WSL startup" & vbCrLf & _
+                  "call :start_distro" & vbCrLf & _
+                  "echo %date% %time% - Starting WSL monitoring >> C:\AadenPOS\operation.log" & vbCrLf & _
+                  "goto main" & vbCrLf & _
+                  "" & vbCrLf & _
+                  "REM Function to check WSL status" & vbCrLf & _
+                  ":check_status" & vbCrLf & _
+                  "wsl -l --running | FINDSTR Ubuntu >nul 2>&1" & vbCrLf & _
+                  "if %errorlevel% equ 0 (" & vbCrLf & _
+                  "    set ""STATUS=running""" & vbCrLf & _
+                  ") else (" & vbCrLf & _
+                  "    set ""STATUS=down""" & vbCrLf & _
+                  ")" & vbCrLf & _
+                  "goto :eof" & vbCrLf & _
+                  "" & vbCrLf & _
+                  "REM Function to start distro" & vbCrLf & _
+                  ":start_distro" & vbCrLf & _
+                  "wsl --exec dbus-launch true" & vbCrLf & _
+                  "if %errorlevel% equ 0 (" & vbCrLf & _
+                  "    echo %DATE% %TIME% - WSL started successfully >> C:\AadenPOS\operation.log" & vbCrLf & _
+                  ") else (" & vbCrLf & _
+                  "    echo %DATE% %TIME% - Failed to start WSL (error code: %errorlevel%) >> C:\AadenPOS\operation.log" & vbCrLf & _
+                  ")" & vbCrLf & _
+                  "goto :eof" & vbCrLf & _
+                  "" & vbCrLf & _
+                  "REM Main monitoring loop" & vbCrLf & _
+                  ":main" & vbCrLf & _
+                  "timeout /t 15 /nobreak > nul" & vbCrLf & _
+                  "" & vbCrLf & _
+                  "call :check_status" & vbCrLf & _
+                  "if ""%STATUS%""==""running"" (" & vbCrLf & _
+                  "    goto main" & vbCrLf & _
+                  ")" & vbCrLf & _
+                  "" & vbCrLf & _
+                  "echo %date% %time% - WSL Ubuntu is down, trying to start >> C:\AadenPOS\operation.log" & vbCrLf & _
+                  "call :start_distro" & vbCrLf & _
+                  "" & vbCrLf & _
+                  "timeout /t 5 /nobreak >nul" & vbCrLf & _
+                  "" & vbCrLf & _
+                  "call :check_status" & vbCrLf & _
+                  "if ""%STATUS%""==""running"" (" & vbCrLf & _
+                  "    echo %DATE% %TIME% - WSL restart successful >> C:\AadenPOS\operation.log" & vbCrLf & _
+                  ") else (" & vbCrLf & _
+                  "    echo %DATE% %TIME% - WSL restart failed, will try again in next cycle >> C:\AadenPOS\operation.log" & vbCrLf & _
                   ")" & vbCrLf & _
-                  "goto monitor_loop"
+                  "" & vbCrLf & _
+                  "goto main"
 
 ' Ensure the folder exists
 If Not fso.FolderExists(folderPath) Then

package/dist/index.js

@@ -18507,7 +18507,7 @@ module.exports = JSON.parse('{"name":"axios","version":"0.19.2","description":"P
 /***/ ((module) => {
 
 "use strict";
-module.exports = {"i8":"1.6.88"};
+module.exports = {"i8":"1.6.90"};
 
 /***/ })
 
@@ -18644,6 +18644,7 @@ program.command('export-tse').action(exportTse)
 program.command('fix-ngrok').action(fixNgrok)
 program.command('do-log').action(doLog)
 program.command('clean-backup-space').action(doCompress)
+program.command('ensure-print-log-rotate').action(ensurePrintLogRotate)
 
 if (program.debug) {
     debugInfo()
@@ -19303,6 +19304,37 @@ function downloadBroadcast() {
     cli.executeInShell(command, program.debug)
 }
 
+
+function sudo() {
+    return 'echo "Innerken322." | sudo -S'
+}
+
+function ensurePrintLogRotate() {
+    const targetVersion = 1
+    const confPath = '/etc/logrotate.d/printlog'
+    try {
+        const printLogRotateConf = fs.readFileSync(confPath).toString()
+        const firstLine = printLogRotateConf.split('\n')[0]
+        const versionRegex = /\d+/
+        if (!firstLine.search(versionRegex)) {
+            throw new Error('no version detected')
+        }
+        const currentVersion = firstLine.match(/\d+/)[0];
+        const currentVersionNum = parseInt(currentVersion, 10)
+        if (currentVersionNum < targetVersion) {
+            throw new Error('version low')
+        }
+        console.log('no need to set logrotate')
+    } catch (e) {
+        const command = []
+        const sourcePath = `${__dirname}/../AadenDeploy/Utils/printlogRotate.conf`
+
+        command.push(`${sudo()} cp ${sourcePath} ${confPath}`)
+
+        cli.executeInShell(command, program.debug)
+    }
+}
+
 })();
 
 module.exports = __webpack_exports__;

package/index.js

@@ -63,6 +63,7 @@ program.command('export-tse').action(exportTse)
 program.command('fix-ngrok').action(fixNgrok)
 program.command('do-log').action(doLog)
 program.command('clean-backup-space').action(doCompress)
+program.command('ensure-print-log-rotate').action(ensurePrintLogRotate)
 
 if (program.debug) {
     debugInfo()
@@ -721,3 +722,34 @@ function downloadBroadcast() {
 
     cli.executeInShell(command, program.debug)
 }
+
+
+function sudo() {
+    return 'echo "Innerken322." | sudo -S'
+}
+
+function ensurePrintLogRotate() {
+    const targetVersion = 1
+    const confPath = '/etc/logrotate.d/printlog'
+    try {
+        const printLogRotateConf = fs.readFileSync(confPath).toString()
+        const firstLine = printLogRotateConf.split('\n')[0]
+        const versionRegex = /\d+/
+        if (!firstLine.search(versionRegex)) {
+            throw new Error('no version detected')
+        }
+        const currentVersion = firstLine.match(/\d+/)[0];
+        const currentVersionNum = parseInt(currentVersion, 10)
+        if (currentVersionNum < targetVersion) {
+            throw new Error('version low')
+        }
+        console.log('no need to set logrotate')
+    } catch (e) {
+        const command = []
+        const sourcePath = `${__dirname}/../AadenDeploy/Utils/printlogRotate.conf`
+
+        command.push(`${sudo()} cp ${sourcePath} ${confPath}`)
+
+        cli.executeInShell(command, program.debug)
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aaden-cli",
-  "version": "1.6.88",
+  "version": "1.6.90",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/AadenDeploy/readme.md

@@ -1,179 +0,0 @@
-
-
-## Aaden配置说明
----
-
-下载地址[https://2.gp/a72RO]
-
-请将本文件夹整个拷贝到目标电脑上
-
-右键目标电脑上到文件夹
-
-选择在此打开终端
-
-打开终端后 输入
-
-./aadensetup.sh
-
-如果提示权限不够，需要右键sh文件，给予她执行权限
-
-按照流程配置要求配置，请注意查看所有提示文字
-
-----
-
-执行结束后，建立一个最高权限的匿名用户，在终端中执行下面的语句
-
-mysql < aaden.sql
-
----
-
-更改服务器权限
-
-将var/www/html 目录改为777权限，注意选择需要recurisive。
-
-
----
-
-## 配置CronJob
-
-
-进入webmin
-
-在搜索栏中搜索cronjob 选择 Scheduled Cron Jobs
-
-在右上角选择create a new Schedule cron job后进入创建CronJob窗口
-
-选择Execute cron job as root 或 aaden
-
-command 一栏中填写
-```
-/var/www/html/crontab.sh > /dev/null 2>&1
-```
-
-When to execute 一项选择 每分钟执行一次
-
- Times and dates selected below ..
-
- 后面全部选择All
-
-然后点Create
-
-然后会退出
-
-然后点击Save and run now
-
-看到这样的显示说明正常
-
-下面同理，命令换成
-
-每小时执行一次
-
-command:
-```
-	wget -O /dev/null "http://localhost/PHP/AccessLog.php?op=reportStatus" 
-   ```
-
-
-
-
-## 最后一步
-
-记录ip，并获取其他安装包
-
----
-
-如果自动配置失败，此处以下是之前保留的手动配置脚本
-
-## 结构说明
-
-注：ip内容为服务器的ip，如果在服务器本身上访问，可以使用Localhost代替
-
-1. 依赖环境
-PHP，Mysql，Webmin，Crontab，sshserver，net-tools
-
-webmin网址： https://{{ip}}:10000
-
-2. 数据库
-   
-默认用户名:aaden
-
-默认密码:Innerken322.
-
-默认库名：aaden
-
-
-订单 DishesOrder表，DishesOrderDetail表，Zbon表
-
-打印记录 PrintQuest
-
-操作记录 AccessLog
-
-### 重要表：
-
-菜品 Dishes，Category
-
-跑堂 Servant
-
-桌子 Tables
-
-打印机 Printers
-
-
-1. 后台
-
-PHP,Resource 必须放在一起
-
-PHP,Resource 默认应该部署在/var/www/html/
-
-PHP文件夹中，有两个地方是重要的配置文件，第一个是PHP/DB/DBDriver.php 看第一行，使用的是哪一个config文件。进入Configs目录中找到对应的文件，更改相关数据库信息。
-第二个是PHP/GlobalSettings.php,
-edit
- 
-$SERVEMAIL="support@innerken.com"; 这里可以设置客服邮箱，
-
-$DEVICE_NAME='IKDEV';//取名字
-
-$DEVICE_ID=1;//分一个
-
-
-第三个是PHP/Bon/BonBase.php
-
- const LINE_LENGTH = self::LINE_LENGTH_80;
-
- 改为对应的打印机毫米数
-
-
-根链接：http://{{ip}}/PHP/   
--> 
-如果有改动，需要告知技术人员，并且更改前台代码
-
-其中，Resource文件夹必须拥有777权限，否则会导致菜品图片无法上传。
-
-
-
-1. 前台
-前台
-源码/usr/lib/aaden下 找到resources 文件夹 
-
-app/app/下的index.js
-
-这个文件负责控制窗口和命令行的开关
-
-   //     win.webContents.openDevTools(); 
-
-该行，如果取消注释，那么就会打开命令行
-
-app/app/htmlTpl/js/common/tpl.js 
-
-注：需要改变 DEVICEID
-
-
-
-1. 扫码点餐
-
-
-目录在/var/www/html/ScanToOrder/asset/js/GlobalSetting.js
-
-更改
-
-Configs.DEVICEID=1;