aaden-cli 1.6.85 → 1.6.86

package/AadenDeploy/Utils/start.bat

@@ -1,4 +1,4 @@
-@echo off
-
-wsl.exe --distribution Ubuntu-22.04 --exec dbus-launch true
-wsl.exe --distribution Ubuntu-22.04
+@echo off
+
+wsl.exe --distribution Ubuntu-22.04 --exec dbus-launch true
+wsl.exe --distribution Ubuntu-22.04

package/AadenDeploy/Utils/updateAadenTseOnWindows.sh

@@ -76,7 +76,7 @@ PHP
   $tseDir/AadenTseServiceRegister.exe restart
 
 else
-  echo "当前系统为Windows系统，更新TSE请使用 aaden-cli update-tse"
+  echo "当前系统为Linux系统，更新TSE请使用 aaden-cli update-tse"
   exit 1
 fi
 

package/AadenDeploy/download-broadcast.sh

@@ -0,0 +1,65 @@
+#!/bin/bash
+
+# 设置下载和安装目录
+DOWNLOAD_DIR="/home/aaden"
+INSTALL_DIR="$DOWNLOAD_DIR/aaden-spring-broadcast"
+DOWNLOAD_URL="https://innerken.com/Download/aaden-spring-broadcast.zip"
+ZIP_FILE="$DOWNLOAD_DIR/aaden-spring-broadcast.zip"
+
+# 创建下载和安装目录（如果不存在）
+echo "创建下载目录: $DOWNLOAD_DIR"
+mkdir -p "$DOWNLOAD_DIR"
+echo "创建安装目录: $INSTALL_DIR"
+mkdir -p "$INSTALL_DIR"
+
+# 下载程序包
+echo "开始从 $DOWNLOAD_URL 下载程序包到 $DOWNLOAD_DIR 目录..."
+if command -v wget > /dev/null; then
+    wget -O "$ZIP_FILE" "$DOWNLOAD_URL"
+elif command -v curl > /dev/null; then
+    curl -L -o "$ZIP_FILE" "$DOWNLOAD_URL"
+else
+    echo "错误：未安装wget或curl，无法下载文件。请安装其中一个工具后重试。"
+    exit 1
+fi
+
+if [ $? -ne 0 ]; then
+    echo "错误：下载程序包失败。"
+    exit 1
+fi
+echo "程序包下载完成。"
+
+# 解压程序包
+echo "正在解压程序包到 $INSTALL_DIR..."
+if command -v unzip > /dev/null; then
+    unzip -o "$ZIP_FILE" -d "$INSTALL_DIR"
+else
+    echo "错误：未安装unzip工具。正在尝试安装..."
+    if command -v apt-get > /dev/null; then
+        sudo apt-get update && sudo apt-get install -y unzip
+        unzip -o "$ZIP_FILE" -d "$INSTALL_DIR"
+    elif command -v yum > /dev/null; then
+        sudo yum install -y unzip
+        unzip -o "$ZIP_FILE" -d "$INSTALL_DIR"
+    else
+        echo "错误：无法安装unzip工具。请手动安装后重试。"
+        exit 1
+    fi
+fi
+
+if [ $? -ne 0 ]; then
+    echo "错误：解压程序包失败。"
+    exit 1
+fi
+
+echo "程序包解压完成。"
+echo "下载文件: $ZIP_FILE"
+echo "安装目录: $INSTALL_DIR"
+
+# 设置权限
+echo "设置脚本执行权限..."
+chmod +x "$INSTALL_DIR/setup-service.sh"
+chmod +x "$INSTALL_DIR/change-ip.sh"
+chmod +x "$INSTALL_DIR/uninstall-service.sh"
+
+echo "安装准备就绪，请进入 $INSTALL_DIR 目录并运行 ./setup-service.sh 完成服务安装。"

package/AadenDeploy/purge.sql

@@ -11,3 +11,4 @@ insert into ZbonCombinedRecord (zbonNumber, toTimestamp)
 values (0, current_timestamp);
 delete from MemberCardRecord where true;
 delete from CashAmountLiteral where true;
+delete from ZbonLiteralData where true;

package/AadenDeploy/run_hidden.vbs

@@ -0,0 +1,165 @@
+Option Explicit
+
+' Constant Definitions
+Const ForReading = 1
+Const ForWriting = 2
+Const ForAppending = 8
+Const CreateIfNotExist = True
+
+' Global Variable Declarations
+Dim fso, WshShell
+Set fso = CreateObject("Scripting.FileSystemObject")
+Set WshShell = CreateObject("WScript.Shell")
+
+' File Path Definitions
+Dim folderPath : folderPath = "C:\AadenPOS"
+Dim batFilePath : batFilePath = folderPath & "\start-aaden-server.bat"
+Dim logFilePath : logFilePath = folderPath & "\operation.log"
+
+' Ensure the folder exists
+EnsureFolderExists folderPath, logFilePath
+
+' Get the current script path and startup folder path
+Dim scriptPath : scriptPath = WScript.ScriptFullName
+Dim startupFolderPath : startupFolderPath = WshShell.SpecialFolders("Startup")
+
+' Check if script is already in the startup folder
+If Not IsInStartupFolder(scriptPath, startupFolderPath) Then
+    ' Copy the script to the startup folder
+    Dim targetPath
+    targetPath = startupFolderPath & "\" & fso.GetFileName(scriptPath)
+    CopySelfToStartup scriptPath, targetPath
+
+    ' Log and notify the user
+    WriteLog logFilePath, "Script was not in the Startup folder. Moved to: " & targetPath
+    Dim asciiOK
+    asciiOK = _
+    "  ____    _  __ " & vbCrLf & _
+    " / __ \  | |/ / " & vbCrLf & _
+    "| |  | | | ' /  " & vbCrLf & _
+    "| |  | | |  <   " & vbCrLf & _
+    "| |__| | | . \  " & vbCrLf & _
+    " \____/  |_|\_\ " & vbCrLf
+
+    MsgBox asciiOK & vbCrLf & "Completed successfully!" & vbCrLf & "Please restart to test. The script has been moved to:" & vbCrLf & targetPath, vbInformation, "Script Relocated"
+Else
+    WriteLog logFilePath, "Script is correctly located in the Startup folder."
+End If
+
+' Define the Aaden Desktop executable file path
+Dim appDataPath, aadenExePath
+appDataPath = WshShell.ExpandEnvironmentStrings("%LOCALAPPDATA%")
+aadenExePath = appDataPath & "\Programs\aaden\Aaden Desktop.exe"
+
+' Expected content of the file
+Dim expectedContent
+expectedContent = "@echo off" & 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 & _
+                  "goto monitor_loop"
+
+' Ensure the folder exists
+If Not fso.FolderExists(folderPath) Then
+    fso.CreateFolder(folderPath)
+    WriteLog logFilePath, "Folder created: " & folderPath
+End If
+
+' Check if the .bat file content matches the expected content
+If Not fso.FileExists(batFilePath) Then
+    WriteBatFile batFilePath, expectedContent
+    WriteLog logFilePath, "File created: " & batFilePath
+Else
+    If Not FileContentMatches(batFilePath, expectedContent) Then
+        WriteBatFile batFilePath, expectedContent
+        WriteLog logFilePath, "File updated with expected content: " & batFilePath
+    Else
+        WriteLog logFilePath, "File content is already correct: " & batFilePath
+    End If
+End If
+
+' Run the .bat file without waiting for completion
+' The batch file now includes an infinite loop that monitors WSL and restarts it if it dies
+' This monitoring continues even after the Aaden Desktop application is closed
+' The monitoring checks WSL status every 60 seconds and logs any restart attempts
+Dim oShell : Set oShell = CreateObject("WScript.Shell")
+oShell.Run Chr(34) & batFilePath & Chr(34), 0, False ' The third parameter is set to 0 (hide window), False means don't wait for completion
+WriteLog logFilePath, "Executed bat file with WSL monitoring: " & batFilePath
+Set oShell = Nothing
+
+' Function to check if the script is in the startup folder
+Function IsInStartupFolder(scriptPath, startupFolderPath)
+    IsInStartupFolder = (Left(LCase(scriptPath), Len(LCase(startupFolderPath))) = LCase(startupFolderPath))
+End Function
+
+' Subroutine to copy the script to the startup folder
+Sub CopySelfToStartup(sourcePath, destinationPath)
+    ' If the destination path exists, delete the old script file
+    If fso.FileExists(destinationPath) Then
+        fso.DeleteFile destinationPath
+    End If
+
+    ' Perform the copy operation
+    fso.CopyFile sourcePath, destinationPath
+End Sub
+
+' Ensure the specified folder exists and log the creation or detection
+Sub EnsureFolderExists(folderPath, logFilePath)
+    On Error Resume Next
+    If Not fso.FolderExists(folderPath) Then
+        fso.CreateFolder(folderPath)
+
+        ' Check if creation was successful
+        If fso.FolderExists(folderPath) Then
+            WriteLog logFilePath, "Folder created successfully: " & folderPath
+        Else
+            WriteLog logFilePath, "Error: Failed to create folder: " & folderPath
+            WScript.Echo "Error: Could not create folder: " & folderPath
+        End If
+    Else
+        WriteLog logFilePath, "Folder already exists: " & folderPath
+    End If
+    On Error GoTo 0
+End Sub
+
+' Subroutine to write to the log
+Sub WriteLog(filePath, logEntry)
+    Dim logFile : Set logFile = fso.OpenTextFile(filePath, ForAppending, CreateIfNotExist)
+    logFile.WriteLine Now & " - " & logEntry
+    logFile.Close
+    Set logFile = Nothing
+End Sub
+
+' Subroutine to write .bat file content
+Sub WriteBatFile(filePath, content)
+    Dim batFile : Set batFile = fso.CreateTextFile(filePath, CreateIfNotExist, False)
+    batFile.Write content
+    batFile.Close
+    Set batFile = Nothing
+End Sub
+
+' Function to read file contents
+Function ReadFileContent(filePath)
+    Dim file, content
+    Set file = fso.OpenTextFile(filePath, ForReading, False)
+    content = file.ReadAll
+    file.Close
+    Set file = Nothing
+    ReadFileContent = content
+End Function
+
+' Function to check if file content matches expected content
+Function FileContentMatches(filePath, content)
+    Dim fileContent : fileContent = ReadFileContent(filePath)
+    FileContentMatches = (fileContent = content)
+End Function

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.85"};
+module.exports = {"i8":"1.6.86"};
 
 /***/ })
 
@@ -19262,9 +19262,25 @@ function updateWindowsTse() {
     const tseAdapterDownloadUrl = 'https://innerken.com/Download/tse-0.0.4.jar'
     command.push(`./${scriptPath} ${targetVersion} ${tseAdapterDownloadUrl}`)
 
+    updateWinTseServiceXml()
     cli.executeInShell(command, program.debug)
 }
 
+function updateWinTseServiceXml() {
+    const xmlPaths = fs.readdirSync('/mnt/c/Users')
+        .map(x => `/mnt/c/Users/${x}/Desktop/AadenTseOnWindows/logs/AadenTseServiceRegister.xml`)
+        .filter(x => fs.existsSync(x))
+
+    if (xmlPaths.length === 0) {
+        console.log('更新AadenTseServiceRegister.xml失败：未找到Windows TSE')
+        return
+    }
+
+    const xmlPath = xmlPaths[0]
+
+    cli.executeInShell([`wget -O ${xmlPath} "https://innerken.com/Download/AadenTseServiceRegister.xml"`], program.debug)
+}
+
 function updateTse() {
     const scriptPath = 'AadenDeploy/Utils/updateAadenTse.sh'
     const command = getPrivilegeCMD(scriptPath)
@@ -19276,6 +19292,17 @@ function updateTse() {
     cli.executeInShell(command, program.debug)
 }
 
+function downloadBroadcast() {
+    const scriptPath = 'AadenDeploy/download-broadcast.sh'
+    const command = getPrivilegeCMD(scriptPath)
+
+    const targetVersion = 4
+    const tseAdapterDownloadUrl = 'https://innerken.com/Download/tse-0.0.4.jar'
+    command.push(`./${scriptPath} ${targetVersion} ${tseAdapterDownloadUrl}`)
+
+    cli.executeInShell(command, program.debug)
+}
+
 })();
 
 module.exports = __webpack_exports__;

package/index.js

@@ -681,9 +681,25 @@ function updateWindowsTse() {
     const tseAdapterDownloadUrl = 'https://innerken.com/Download/tse-0.0.4.jar'
     command.push(`./${scriptPath} ${targetVersion} ${tseAdapterDownloadUrl}`)
 
+    updateWinTseServiceXml()
     cli.executeInShell(command, program.debug)
 }
 
+function updateWinTseServiceXml() {
+    const xmlPaths = fs.readdirSync('/mnt/c/Users')
+        .map(x => `/mnt/c/Users/${x}/Desktop/AadenTseOnWindows/logs/AadenTseServiceRegister.xml`)
+        .filter(x => fs.existsSync(x))
+
+    if (xmlPaths.length === 0) {
+        console.log('更新AadenTseServiceRegister.xml失败：未找到Windows TSE')
+        return
+    }
+
+    const xmlPath = xmlPaths[0]
+
+    cli.executeInShell([`wget -O ${xmlPath} "https://innerken.com/Download/AadenTseServiceRegister.xml"`], program.debug)
+}
+
 function updateTse() {
     const scriptPath = 'AadenDeploy/Utils/updateAadenTse.sh'
     const command = getPrivilegeCMD(scriptPath)
@@ -694,3 +710,14 @@ function updateTse() {
 
     cli.executeInShell(command, program.debug)
 }
+
+function downloadBroadcast() {
+    const scriptPath = 'AadenDeploy/download-broadcast.sh'
+    const command = getPrivilegeCMD(scriptPath)
+
+    const targetVersion = 4
+    const tseAdapterDownloadUrl = 'https://innerken.com/Download/tse-0.0.4.jar'
+    command.push(`./${scriptPath} ${targetVersion} ${tseAdapterDownloadUrl}`)
+
+    cli.executeInShell(command, program.debug)
+}

package/install.yaml

@@ -1,55 +1,55 @@
-autoinstall:
-  version: 1
-  apt:
-    sources:
-      curtin-ppa:
-        source: ppa:ondrej/php
-  identity:
-    hostname: aaden0000
-    username: aaden
-    realname: "Aaden POS"
-    password: "$1$T7aN5Eah$SeYUQoPGIVjvdiPA2yBUK0"
-  storage:
-    layout:
-      name: lvm
-  drivers:
-    install: true
-  timezone: geoip
-  keyboard:
-    layout: de
-  ssh:
-    install-server: true
-  packages:
-    - vim
-    - net-tools
-    - software-properties-common
-    - apt-transport-https
-    - curl
-    - nodejs
-    - npm
-    - default-jdk
-    - wget
-    - ca-certificates
-    - gnupg-agent
-    - ttyload
-    - unzip
-    - php7.4
-    - php7.4-common
-    - libapache2-mod-php7.4
-    - php7.4-cli
-    - php7.4-xml
-    - php7.4-curl
-    - php7.4-mysql
-    - php7.4-gd
-    - php7.4-zip
-    - php7.4-intl
-    - php7.4-common
-    - php7.4-mbstring
-  late-commands:
-    - curtin in-target -- npm install aaden-cli -g
-    - curtin in-target -- apt purge gnome-shell
-    - curtin in-target -- apt purge ubuntu-desktop
-    - curtin in-target -- apt autoremove -y
-    - curtin in-target -- apt install --reinstall ubuntu-gnome-desktop
-
-
+autoinstall:
+  version: 1
+  apt:
+    sources:
+      curtin-ppa:
+        source: ppa:ondrej/php
+  identity:
+    hostname: aaden0000
+    username: aaden
+    realname: "Aaden POS"
+    password: "$1$T7aN5Eah$SeYUQoPGIVjvdiPA2yBUK0"
+  storage:
+    layout:
+      name: lvm
+  drivers:
+    install: true
+  timezone: geoip
+  keyboard:
+    layout: de
+  ssh:
+    install-server: true
+  packages:
+    - vim
+    - net-tools
+    - software-properties-common
+    - apt-transport-https
+    - curl
+    - nodejs
+    - npm
+    - default-jdk
+    - wget
+    - ca-certificates
+    - gnupg-agent
+    - ttyload
+    - unzip
+    - php7.4
+    - php7.4-common
+    - libapache2-mod-php7.4
+    - php7.4-cli
+    - php7.4-xml
+    - php7.4-curl
+    - php7.4-mysql
+    - php7.4-gd
+    - php7.4-zip
+    - php7.4-intl
+    - php7.4-common
+    - php7.4-mbstring
+  late-commands:
+    - curtin in-target -- npm install aaden-cli -g
+    - curtin in-target -- apt purge gnome-shell
+    - curtin in-target -- apt purge ubuntu-desktop
+    - curtin in-target -- apt autoremove -y
+    - curtin in-target -- apt install --reinstall ubuntu-gnome-desktop
+
+

package/package.json

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