diff --git a/ability/dmsfwk/dmsfwkstageserver/hvigorw.bat b/ability/dmsfwk/dmsfwkstageserver/hvigorw.bat
index 537484a..89f8b0c 100644
--- a/ability/dmsfwk/dmsfwkstageserver/hvigorw.bat
+++ b/ability/dmsfwk/dmsfwkstageserver/hvigorw.bat
@@ -11,67 +11,53 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @echo off
-@if NOT "%DEBUG%" == "" @echo on
-@rem ##########################################################################
 @rem
-@rem  Hvigor startup script for Windows
+@rem  -------------------------------------------------------------------
+@rem  Hvigor startup script for Windows, version 1.0.0
+@rem
+@rem  Required ENV vars:
+@rem  ------------------
+@rem    NODE_HOME - location of a Node home dir
+@rem    or
+@rem    Add %NODE_HOME%/bin to the PATH environment variable
+@rem  -------------------------------------------------------------------
 @rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
+set NODE_EXE_PATH=""
+set APP_HOME=.
+set WRAPPER_MODULE_PATH=%APP_HOME%\hvigor\hvigor-wrapper.js
+set NODE_EXE=node.exe
+@rem set NODE_OPTS="--max-old-space-size=4096"
 
 @rem Resolve any "." and ".." in APP_HOME to make it shorter.
 for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
 
-set WRAPPER_MODULE_PATH=%APP_HOME%\hvigor\hvigor-wrapper.js
-set NODE_EXE=node.exe
+if not defined NODE_OPTS set NODE_OPTS="--"
 
-goto start
-
-:start
 @rem Find node.exe
-if defined NODE_HOME goto findNodeFromNodeHome
+if defined NODE_HOME (
+    set NODE_HOME=%NODE_HOME:"=%
+    set "PATH=%PATH%;%NODE_HOME%"
+    set NODE_EXE_PATH=%NODE_HOME%/%NODE_EXE%
+)
 
 %NODE_EXE% --version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if "%ERRORLEVEL%" == "0" (
+    "%NODE_EXE%" "%NODE_OPTS%" "%WRAPPER_MODULE_PATH%" %*
+) else if exist "%NODE_EXE_PATH%" (
+    "%NODE_EXE_PATH%" "%NODE_OPTS%" "%WRAPPER_MODULE_PATH%" %*
+) else (
+    echo.
+    echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
+    echo.
+    echo Please set the NODE_HOME variable in your environment to match the
+    echo location of your NodeJs installation.
+)
 
-echo.
-echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
-echo.
-echo Please set the NODE_HOME variable in your environment to match the
-echo location of your NodeJs installation.
-
-goto fail
-
-:findNodeFromNodeHome
-set NODE_HOME=%NODE_HOME:"=%
-set NODE_EXE_PATH=%NODE_HOME%/%NODE_EXE%
-
-if exist "%NODE_EXE_PATH%" goto execute
-echo.
-echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
-echo.
-echo Please set the NODE_HOME variable in your environment to match the
-echo location of your NodeJs installation.
-
-goto fail
-
-:execute
-@rem Execute hvigor
-"%NODE_EXE%" %WRAPPER_MODULE_PATH% %*
-
-if "%ERRORLEVEL%" == "0" goto hvigorwEnd
-
-:fail
-exit /b 1
-
-:hvigorwEnd
-if "%OS%" == "Windows_NT" endlocal
-
-:end
+if "%ERRORLEVEL%" == "0"(
+    if "%OS%" == "Windows_NT" endlocal
+) else (
+    exit /b %ERRORLEVEL%
+)
diff --git a/ability/dmsfwk/dmsfwkstagetestserver/hvigorw.bat b/ability/dmsfwk/dmsfwkstagetestserver/hvigorw.bat
index 537484a..89f8b0c 100644
--- a/ability/dmsfwk/dmsfwkstagetestserver/hvigorw.bat
+++ b/ability/dmsfwk/dmsfwkstagetestserver/hvigorw.bat
@@ -11,67 +11,53 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @echo off
-@if NOT "%DEBUG%" == "" @echo on
-@rem ##########################################################################
 @rem
-@rem  Hvigor startup script for Windows
+@rem  -------------------------------------------------------------------
+@rem  Hvigor startup script for Windows, version 1.0.0
+@rem
+@rem  Required ENV vars:
+@rem  ------------------
+@rem    NODE_HOME - location of a Node home dir
+@rem    or
+@rem    Add %NODE_HOME%/bin to the PATH environment variable
+@rem  -------------------------------------------------------------------
 @rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
+set NODE_EXE_PATH=""
+set APP_HOME=.
+set WRAPPER_MODULE_PATH=%APP_HOME%\hvigor\hvigor-wrapper.js
+set NODE_EXE=node.exe
+@rem set NODE_OPTS="--max-old-space-size=4096"
 
 @rem Resolve any "." and ".." in APP_HOME to make it shorter.
 for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
 
-set WRAPPER_MODULE_PATH=%APP_HOME%\hvigor\hvigor-wrapper.js
-set NODE_EXE=node.exe
+if not defined NODE_OPTS set NODE_OPTS="--"
 
-goto start
-
-:start
 @rem Find node.exe
-if defined NODE_HOME goto findNodeFromNodeHome
+if defined NODE_HOME (
+    set NODE_HOME=%NODE_HOME:"=%
+    set "PATH=%PATH%;%NODE_HOME%"
+    set NODE_EXE_PATH=%NODE_HOME%/%NODE_EXE%
+)
 
 %NODE_EXE% --version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if "%ERRORLEVEL%" == "0" (
+    "%NODE_EXE%" "%NODE_OPTS%" "%WRAPPER_MODULE_PATH%" %*
+) else if exist "%NODE_EXE_PATH%" (
+    "%NODE_EXE_PATH%" "%NODE_OPTS%" "%WRAPPER_MODULE_PATH%" %*
+) else (
+    echo.
+    echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
+    echo.
+    echo Please set the NODE_HOME variable in your environment to match the
+    echo location of your NodeJs installation.
+)
 
-echo.
-echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
-echo.
-echo Please set the NODE_HOME variable in your environment to match the
-echo location of your NodeJs installation.
-
-goto fail
-
-:findNodeFromNodeHome
-set NODE_HOME=%NODE_HOME:"=%
-set NODE_EXE_PATH=%NODE_HOME%/%NODE_EXE%
-
-if exist "%NODE_EXE_PATH%" goto execute
-echo.
-echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
-echo.
-echo Please set the NODE_HOME variable in your environment to match the
-echo location of your NodeJs installation.
-
-goto fail
-
-:execute
-@rem Execute hvigor
-"%NODE_EXE%" %WRAPPER_MODULE_PATH% %*
-
-if "%ERRORLEVEL%" == "0" goto hvigorwEnd
-
-:fail
-exit /b 1
-
-:hvigorwEnd
-if "%OS%" == "Windows_NT" endlocal
-
-:end
+if "%ERRORLEVEL%" == "0"(
+    if "%OS%" == "Windows_NT" endlocal
+) else (
+    exit /b %ERRORLEVEL%
+)
diff --git a/communication/dsoftbus/rpcserver/hvigorw.bat b/communication/dsoftbus/rpcserver/hvigorw.bat
index 537484a..89f8b0c 100644
--- a/communication/dsoftbus/rpcserver/hvigorw.bat
+++ b/communication/dsoftbus/rpcserver/hvigorw.bat
@@ -11,67 +11,53 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @echo off
-@if NOT "%DEBUG%" == "" @echo on
-@rem ##########################################################################
 @rem
-@rem  Hvigor startup script for Windows
+@rem  -------------------------------------------------------------------
+@rem  Hvigor startup script for Windows, version 1.0.0
+@rem
+@rem  Required ENV vars:
+@rem  ------------------
+@rem    NODE_HOME - location of a Node home dir
+@rem    or
+@rem    Add %NODE_HOME%/bin to the PATH environment variable
+@rem  -------------------------------------------------------------------
 @rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
+set NODE_EXE_PATH=""
+set APP_HOME=.
+set WRAPPER_MODULE_PATH=%APP_HOME%\hvigor\hvigor-wrapper.js
+set NODE_EXE=node.exe
+@rem set NODE_OPTS="--max-old-space-size=4096"
 
 @rem Resolve any "." and ".." in APP_HOME to make it shorter.
 for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
 
-set WRAPPER_MODULE_PATH=%APP_HOME%\hvigor\hvigor-wrapper.js
-set NODE_EXE=node.exe
+if not defined NODE_OPTS set NODE_OPTS="--"
 
-goto start
-
-:start
 @rem Find node.exe
-if defined NODE_HOME goto findNodeFromNodeHome
+if defined NODE_HOME (
+    set NODE_HOME=%NODE_HOME:"=%
+    set "PATH=%PATH%;%NODE_HOME%"
+    set NODE_EXE_PATH=%NODE_HOME%/%NODE_EXE%
+)
 
 %NODE_EXE% --version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if "%ERRORLEVEL%" == "0" (
+    "%NODE_EXE%" "%NODE_OPTS%" "%WRAPPER_MODULE_PATH%" %*
+) else if exist "%NODE_EXE_PATH%" (
+    "%NODE_EXE_PATH%" "%NODE_OPTS%" "%WRAPPER_MODULE_PATH%" %*
+) else (
+    echo.
+    echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
+    echo.
+    echo Please set the NODE_HOME variable in your environment to match the
+    echo location of your NodeJs installation.
+)
 
-echo.
-echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
-echo.
-echo Please set the NODE_HOME variable in your environment to match the
-echo location of your NodeJs installation.
-
-goto fail
-
-:findNodeFromNodeHome
-set NODE_HOME=%NODE_HOME:"=%
-set NODE_EXE_PATH=%NODE_HOME%/%NODE_EXE%
-
-if exist "%NODE_EXE_PATH%" goto execute
-echo.
-echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
-echo.
-echo Please set the NODE_HOME variable in your environment to match the
-echo location of your NodeJs installation.
-
-goto fail
-
-:execute
-@rem Execute hvigor
-"%NODE_EXE%" %WRAPPER_MODULE_PATH% %*
-
-if "%ERRORLEVEL%" == "0" goto hvigorwEnd
-
-:fail
-exit /b 1
-
-:hvigorwEnd
-if "%OS%" == "Windows_NT" endlocal
-
-:end
+if "%ERRORLEVEL%" == "0"(
+    if "%OS%" == "Windows_NT" endlocal
+) else (
+    exit /b %ERRORLEVEL%
+)
diff --git a/communication/dsoftbus_request/rpcserver/hvigorw.bat b/communication/dsoftbus_request/rpcserver/hvigorw.bat
index 537484a..89f8b0c 100644
--- a/communication/dsoftbus_request/rpcserver/hvigorw.bat
+++ b/communication/dsoftbus_request/rpcserver/hvigorw.bat
@@ -11,67 +11,53 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @echo off
-@if NOT "%DEBUG%" == "" @echo on
-@rem ##########################################################################
 @rem
-@rem  Hvigor startup script for Windows
+@rem  -------------------------------------------------------------------
+@rem  Hvigor startup script for Windows, version 1.0.0
+@rem
+@rem  Required ENV vars:
+@rem  ------------------
+@rem    NODE_HOME - location of a Node home dir
+@rem    or
+@rem    Add %NODE_HOME%/bin to the PATH environment variable
+@rem  -------------------------------------------------------------------
 @rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
+set NODE_EXE_PATH=""
+set APP_HOME=.
+set WRAPPER_MODULE_PATH=%APP_HOME%\hvigor\hvigor-wrapper.js
+set NODE_EXE=node.exe
+@rem set NODE_OPTS="--max-old-space-size=4096"
 
 @rem Resolve any "." and ".." in APP_HOME to make it shorter.
 for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
 
-set WRAPPER_MODULE_PATH=%APP_HOME%\hvigor\hvigor-wrapper.js
-set NODE_EXE=node.exe
+if not defined NODE_OPTS set NODE_OPTS="--"
 
-goto start
-
-:start
 @rem Find node.exe
-if defined NODE_HOME goto findNodeFromNodeHome
+if defined NODE_HOME (
+    set NODE_HOME=%NODE_HOME:"=%
+    set "PATH=%PATH%;%NODE_HOME%"
+    set NODE_EXE_PATH=%NODE_HOME%/%NODE_EXE%
+)
 
 %NODE_EXE% --version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if "%ERRORLEVEL%" == "0" (
+    "%NODE_EXE%" "%NODE_OPTS%" "%WRAPPER_MODULE_PATH%" %*
+) else if exist "%NODE_EXE_PATH%" (
+    "%NODE_EXE_PATH%" "%NODE_OPTS%" "%WRAPPER_MODULE_PATH%" %*
+) else (
+    echo.
+    echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
+    echo.
+    echo Please set the NODE_HOME variable in your environment to match the
+    echo location of your NodeJs installation.
+)
 
-echo.
-echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
-echo.
-echo Please set the NODE_HOME variable in your environment to match the
-echo location of your NodeJs installation.
-
-goto fail
-
-:findNodeFromNodeHome
-set NODE_HOME=%NODE_HOME:"=%
-set NODE_EXE_PATH=%NODE_HOME%/%NODE_EXE%
-
-if exist "%NODE_EXE_PATH%" goto execute
-echo.
-echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
-echo.
-echo Please set the NODE_HOME variable in your environment to match the
-echo location of your NodeJs installation.
-
-goto fail
-
-:execute
-@rem Execute hvigor
-"%NODE_EXE%" %WRAPPER_MODULE_PATH% %*
-
-if "%ERRORLEVEL%" == "0" goto hvigorwEnd
-
-:fail
-exit /b 1
-
-:hvigorwEnd
-if "%OS%" == "Windows_NT" endlocal
-
-:end
+if "%ERRORLEVEL%" == "0"(
+    if "%OS%" == "Windows_NT" endlocal
+) else (
+    exit /b %ERRORLEVEL%
+)
diff --git a/communication/dsoftbus_rpcets/rpcserver/hvigorw.bat b/communication/dsoftbus_rpcets/rpcserver/hvigorw.bat
index 537484a..89f8b0c 100644
--- a/communication/dsoftbus_rpcets/rpcserver/hvigorw.bat
+++ b/communication/dsoftbus_rpcets/rpcserver/hvigorw.bat
@@ -11,67 +11,53 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @echo off
-@if NOT "%DEBUG%" == "" @echo on
-@rem ##########################################################################
 @rem
-@rem  Hvigor startup script for Windows
+@rem  -------------------------------------------------------------------
+@rem  Hvigor startup script for Windows, version 1.0.0
+@rem
+@rem  Required ENV vars:
+@rem  ------------------
+@rem    NODE_HOME - location of a Node home dir
+@rem    or
+@rem    Add %NODE_HOME%/bin to the PATH environment variable
+@rem  -------------------------------------------------------------------
 @rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
+set NODE_EXE_PATH=""
+set APP_HOME=.
+set WRAPPER_MODULE_PATH=%APP_HOME%\hvigor\hvigor-wrapper.js
+set NODE_EXE=node.exe
+@rem set NODE_OPTS="--max-old-space-size=4096"
 
 @rem Resolve any "." and ".." in APP_HOME to make it shorter.
 for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
 
-set WRAPPER_MODULE_PATH=%APP_HOME%\hvigor\hvigor-wrapper.js
-set NODE_EXE=node.exe
+if not defined NODE_OPTS set NODE_OPTS="--"
 
-goto start
-
-:start
 @rem Find node.exe
-if defined NODE_HOME goto findNodeFromNodeHome
+if defined NODE_HOME (
+    set NODE_HOME=%NODE_HOME:"=%
+    set "PATH=%PATH%;%NODE_HOME%"
+    set NODE_EXE_PATH=%NODE_HOME%/%NODE_EXE%
+)
 
 %NODE_EXE% --version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if "%ERRORLEVEL%" == "0" (
+    "%NODE_EXE%" "%NODE_OPTS%" "%WRAPPER_MODULE_PATH%" %*
+) else if exist "%NODE_EXE_PATH%" (
+    "%NODE_EXE_PATH%" "%NODE_OPTS%" "%WRAPPER_MODULE_PATH%" %*
+) else (
+    echo.
+    echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
+    echo.
+    echo Please set the NODE_HOME variable in your environment to match the
+    echo location of your NodeJs installation.
+)
 
-echo.
-echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
-echo.
-echo Please set the NODE_HOME variable in your environment to match the
-echo location of your NodeJs installation.
-
-goto fail
-
-:findNodeFromNodeHome
-set NODE_HOME=%NODE_HOME:"=%
-set NODE_EXE_PATH=%NODE_HOME%/%NODE_EXE%
-
-if exist "%NODE_EXE_PATH%" goto execute
-echo.
-echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
-echo.
-echo Please set the NODE_HOME variable in your environment to match the
-echo location of your NodeJs installation.
-
-goto fail
-
-:execute
-@rem Execute hvigor
-"%NODE_EXE%" %WRAPPER_MODULE_PATH% %*
-
-if "%ERRORLEVEL%" == "0" goto hvigorwEnd
-
-:fail
-exit /b 1
-
-:hvigorwEnd
-if "%OS%" == "Windows_NT" endlocal
-
-:end
+if "%ERRORLEVEL%" == "0"(
+    if "%OS%" == "Windows_NT" endlocal
+) else (
+    exit /b %ERRORLEVEL%
+)
diff --git a/distributeddatamgr/jstest/distributed_kv_store/client/hap/hvigorw.bat b/distributeddatamgr/jstest/distributed_kv_store/client/hap/hvigorw.bat
index 127b4d2..89f8b0c 100644
--- a/distributeddatamgr/jstest/distributed_kv_store/client/hap/hvigorw.bat
+++ b/distributeddatamgr/jstest/distributed_kv_store/client/hap/hvigorw.bat
@@ -11,67 +11,53 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @echo off
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
 @rem
-@rem  Hvigor startup script for Windows
+@rem  -------------------------------------------------------------------
+@rem  Hvigor startup script for Windows, version 1.0.0
+@rem
+@rem  Required ENV vars:
+@rem  ------------------
+@rem    NODE_HOME - location of a Node home dir
+@rem    or
+@rem    Add %NODE_HOME%/bin to the PATH environment variable
+@rem  -------------------------------------------------------------------
 @rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
+set NODE_EXE_PATH=""
+set APP_HOME=.
+set WRAPPER_MODULE_PATH=%APP_HOME%\hvigor\hvigor-wrapper.js
+set NODE_EXE=node.exe
+@rem set NODE_OPTS="--max-old-space-size=4096"
 
 @rem Resolve any "." and ".." in APP_HOME to make it shorter.
 for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
 
-set WRAPPER_MODULE_PATH=%APP_HOME%\hvigor\hvigor-wrapper.js
-set NODE_EXE=node.exe
+if not defined NODE_OPTS set NODE_OPTS="--"
 
-goto start
-
-:start
 @rem Find node.exe
-if defined NODE_HOME goto findNodeFromNodeHome
+if defined NODE_HOME (
+    set NODE_HOME=%NODE_HOME:"=%
+    set "PATH=%PATH%;%NODE_HOME%"
+    set NODE_EXE_PATH=%NODE_HOME%/%NODE_EXE%
+)
 
 %NODE_EXE% --version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if "%ERRORLEVEL%" == "0" (
+    "%NODE_EXE%" "%NODE_OPTS%" "%WRAPPER_MODULE_PATH%" %*
+) else if exist "%NODE_EXE_PATH%" (
+    "%NODE_EXE_PATH%" "%NODE_OPTS%" "%WRAPPER_MODULE_PATH%" %*
+) else (
+    echo.
+    echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
+    echo.
+    echo Please set the NODE_HOME variable in your environment to match the
+    echo location of your NodeJs installation.
+)
 
-echo.
-echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
-echo.
-echo Please set the NODE_HOME variable in your environment to match the
-echo location of your NodeJs installation.
-
-goto fail
-
-:findNodeFromNodeHome
-set NODE_HOME=%NODE_HOME:"=%
-set NODE_EXE_PATH=%NODE_HOME%/%NODE_EXE%
-
-if exist "%NODE_EXE_PATH%" goto execute
-echo.
-echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
-echo.
-echo Please set the NODE_HOME variable in your environment to match the
-echo location of your NodeJs installation.
-
-goto fail
-
-:execute
-@rem Execute hvigor
-"%NODE_EXE%" %WRAPPER_MODULE_PATH% %*
-
-if "%ERRORLEVEL%" == "0" goto hvigorwEnd
-
-:fail
-exit /b 1
-
-:hvigorwEnd
-if "%OS%" == "Windows_NT" endlocal
-
-:end
+if "%ERRORLEVEL%" == "0"(
+    if "%OS%" == "Windows_NT" endlocal
+) else (
+    exit /b %ERRORLEVEL%
+)
diff --git a/distributeddatamgr/jstest/distributed_rdb_stage_store/server/hvigorw.bat b/distributeddatamgr/jstest/distributed_rdb_stage_store/server/hvigorw.bat
index 537484a..89f8b0c 100644
--- a/distributeddatamgr/jstest/distributed_rdb_stage_store/server/hvigorw.bat
+++ b/distributeddatamgr/jstest/distributed_rdb_stage_store/server/hvigorw.bat
@@ -11,67 +11,53 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @echo off
-@if NOT "%DEBUG%" == "" @echo on
-@rem ##########################################################################
 @rem
-@rem  Hvigor startup script for Windows
+@rem  -------------------------------------------------------------------
+@rem  Hvigor startup script for Windows, version 1.0.0
+@rem
+@rem  Required ENV vars:
+@rem  ------------------
+@rem    NODE_HOME - location of a Node home dir
+@rem    or
+@rem    Add %NODE_HOME%/bin to the PATH environment variable
+@rem  -------------------------------------------------------------------
 @rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
+set NODE_EXE_PATH=""
+set APP_HOME=.
+set WRAPPER_MODULE_PATH=%APP_HOME%\hvigor\hvigor-wrapper.js
+set NODE_EXE=node.exe
+@rem set NODE_OPTS="--max-old-space-size=4096"
 
 @rem Resolve any "." and ".." in APP_HOME to make it shorter.
 for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
 
-set WRAPPER_MODULE_PATH=%APP_HOME%\hvigor\hvigor-wrapper.js
-set NODE_EXE=node.exe
+if not defined NODE_OPTS set NODE_OPTS="--"
 
-goto start
-
-:start
 @rem Find node.exe
-if defined NODE_HOME goto findNodeFromNodeHome
+if defined NODE_HOME (
+    set NODE_HOME=%NODE_HOME:"=%
+    set "PATH=%PATH%;%NODE_HOME%"
+    set NODE_EXE_PATH=%NODE_HOME%/%NODE_EXE%
+)
 
 %NODE_EXE% --version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if "%ERRORLEVEL%" == "0" (
+    "%NODE_EXE%" "%NODE_OPTS%" "%WRAPPER_MODULE_PATH%" %*
+) else if exist "%NODE_EXE_PATH%" (
+    "%NODE_EXE_PATH%" "%NODE_OPTS%" "%WRAPPER_MODULE_PATH%" %*
+) else (
+    echo.
+    echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
+    echo.
+    echo Please set the NODE_HOME variable in your environment to match the
+    echo location of your NodeJs installation.
+)
 
-echo.
-echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
-echo.
-echo Please set the NODE_HOME variable in your environment to match the
-echo location of your NodeJs installation.
-
-goto fail
-
-:findNodeFromNodeHome
-set NODE_HOME=%NODE_HOME:"=%
-set NODE_EXE_PATH=%NODE_HOME%/%NODE_EXE%
-
-if exist "%NODE_EXE_PATH%" goto execute
-echo.
-echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
-echo.
-echo Please set the NODE_HOME variable in your environment to match the
-echo location of your NodeJs installation.
-
-goto fail
-
-:execute
-@rem Execute hvigor
-"%NODE_EXE%" %WRAPPER_MODULE_PATH% %*
-
-if "%ERRORLEVEL%" == "0" goto hvigorwEnd
-
-:fail
-exit /b 1
-
-:hvigorwEnd
-if "%OS%" == "Windows_NT" endlocal
-
-:end
+if "%ERRORLEVEL%" == "0"(
+    if "%OS%" == "Windows_NT" endlocal
+) else (
+    exit /b %ERRORLEVEL%
+)
diff --git a/distributeddatamgr/jstest/distributed_rdb_store/client/hap/hvigorw.bat b/distributeddatamgr/jstest/distributed_rdb_store/client/hap/hvigorw.bat
index 127b4d2..89f8b0c 100644
--- a/distributeddatamgr/jstest/distributed_rdb_store/client/hap/hvigorw.bat
+++ b/distributeddatamgr/jstest/distributed_rdb_store/client/hap/hvigorw.bat
@@ -11,67 +11,53 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @echo off
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
 @rem
-@rem  Hvigor startup script for Windows
+@rem  -------------------------------------------------------------------
+@rem  Hvigor startup script for Windows, version 1.0.0
+@rem
+@rem  Required ENV vars:
+@rem  ------------------
+@rem    NODE_HOME - location of a Node home dir
+@rem    or
+@rem    Add %NODE_HOME%/bin to the PATH environment variable
+@rem  -------------------------------------------------------------------
 @rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
+set NODE_EXE_PATH=""
+set APP_HOME=.
+set WRAPPER_MODULE_PATH=%APP_HOME%\hvigor\hvigor-wrapper.js
+set NODE_EXE=node.exe
+@rem set NODE_OPTS="--max-old-space-size=4096"
 
 @rem Resolve any "." and ".." in APP_HOME to make it shorter.
 for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
 
-set WRAPPER_MODULE_PATH=%APP_HOME%\hvigor\hvigor-wrapper.js
-set NODE_EXE=node.exe
+if not defined NODE_OPTS set NODE_OPTS="--"
 
-goto start
-
-:start
 @rem Find node.exe
-if defined NODE_HOME goto findNodeFromNodeHome
+if defined NODE_HOME (
+    set NODE_HOME=%NODE_HOME:"=%
+    set "PATH=%PATH%;%NODE_HOME%"
+    set NODE_EXE_PATH=%NODE_HOME%/%NODE_EXE%
+)
 
 %NODE_EXE% --version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if "%ERRORLEVEL%" == "0" (
+    "%NODE_EXE%" "%NODE_OPTS%" "%WRAPPER_MODULE_PATH%" %*
+) else if exist "%NODE_EXE_PATH%" (
+    "%NODE_EXE_PATH%" "%NODE_OPTS%" "%WRAPPER_MODULE_PATH%" %*
+) else (
+    echo.
+    echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
+    echo.
+    echo Please set the NODE_HOME variable in your environment to match the
+    echo location of your NodeJs installation.
+)
 
-echo.
-echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
-echo.
-echo Please set the NODE_HOME variable in your environment to match the
-echo location of your NodeJs installation.
-
-goto fail
-
-:findNodeFromNodeHome
-set NODE_HOME=%NODE_HOME:"=%
-set NODE_EXE_PATH=%NODE_HOME%/%NODE_EXE%
-
-if exist "%NODE_EXE_PATH%" goto execute
-echo.
-echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
-echo.
-echo Please set the NODE_HOME variable in your environment to match the
-echo location of your NodeJs installation.
-
-goto fail
-
-:execute
-@rem Execute hvigor
-"%NODE_EXE%" %WRAPPER_MODULE_PATH% %*
-
-if "%ERRORLEVEL%" == "0" goto hvigorwEnd
-
-:fail
-exit /b 1
-
-:hvigorwEnd
-if "%OS%" == "Windows_NT" endlocal
-
-:end
+if "%ERRORLEVEL%" == "0"(
+    if "%OS%" == "Windows_NT" endlocal
+) else (
+    exit /b %ERRORLEVEL%
+)
diff --git a/distributeddatamgr/jstest/distributed_rdb_store/server/hap/hvigorw.bat b/distributeddatamgr/jstest/distributed_rdb_store/server/hap/hvigorw.bat
index 537484a..89f8b0c 100644
--- a/distributeddatamgr/jstest/distributed_rdb_store/server/hap/hvigorw.bat
+++ b/distributeddatamgr/jstest/distributed_rdb_store/server/hap/hvigorw.bat
@@ -11,67 +11,53 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @echo off
-@if NOT "%DEBUG%" == "" @echo on
-@rem ##########################################################################
 @rem
-@rem  Hvigor startup script for Windows
+@rem  -------------------------------------------------------------------
+@rem  Hvigor startup script for Windows, version 1.0.0
+@rem
+@rem  Required ENV vars:
+@rem  ------------------
+@rem    NODE_HOME - location of a Node home dir
+@rem    or
+@rem    Add %NODE_HOME%/bin to the PATH environment variable
+@rem  -------------------------------------------------------------------
 @rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
+set NODE_EXE_PATH=""
+set APP_HOME=.
+set WRAPPER_MODULE_PATH=%APP_HOME%\hvigor\hvigor-wrapper.js
+set NODE_EXE=node.exe
+@rem set NODE_OPTS="--max-old-space-size=4096"
 
 @rem Resolve any "." and ".." in APP_HOME to make it shorter.
 for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
 
-set WRAPPER_MODULE_PATH=%APP_HOME%\hvigor\hvigor-wrapper.js
-set NODE_EXE=node.exe
+if not defined NODE_OPTS set NODE_OPTS="--"
 
-goto start
-
-:start
 @rem Find node.exe
-if defined NODE_HOME goto findNodeFromNodeHome
+if defined NODE_HOME (
+    set NODE_HOME=%NODE_HOME:"=%
+    set "PATH=%PATH%;%NODE_HOME%"
+    set NODE_EXE_PATH=%NODE_HOME%/%NODE_EXE%
+)
 
 %NODE_EXE% --version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if "%ERRORLEVEL%" == "0" (
+    "%NODE_EXE%" "%NODE_OPTS%" "%WRAPPER_MODULE_PATH%" %*
+) else if exist "%NODE_EXE_PATH%" (
+    "%NODE_EXE_PATH%" "%NODE_OPTS%" "%WRAPPER_MODULE_PATH%" %*
+) else (
+    echo.
+    echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
+    echo.
+    echo Please set the NODE_HOME variable in your environment to match the
+    echo location of your NodeJs installation.
+)
 
-echo.
-echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
-echo.
-echo Please set the NODE_HOME variable in your environment to match the
-echo location of your NodeJs installation.
-
-goto fail
-
-:findNodeFromNodeHome
-set NODE_HOME=%NODE_HOME:"=%
-set NODE_EXE_PATH=%NODE_HOME%/%NODE_EXE%
-
-if exist "%NODE_EXE_PATH%" goto execute
-echo.
-echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
-echo.
-echo Please set the NODE_HOME variable in your environment to match the
-echo location of your NodeJs installation.
-
-goto fail
-
-:execute
-@rem Execute hvigor
-"%NODE_EXE%" %WRAPPER_MODULE_PATH% %*
-
-if "%ERRORLEVEL%" == "0" goto hvigorwEnd
-
-:fail
-exit /b 1
-
-:hvigorwEnd
-if "%OS%" == "Windows_NT" endlocal
-
-:end
+if "%ERRORLEVEL%" == "0"(
+    if "%OS%" == "Windows_NT" endlocal
+) else (
+    exit /b %ERRORLEVEL%
+)
diff --git a/filemanagement/fileio/server/hvigorw.bat b/filemanagement/fileio/server/hvigorw.bat
index 537484a..89f8b0c 100644
--- a/filemanagement/fileio/server/hvigorw.bat
+++ b/filemanagement/fileio/server/hvigorw.bat
@@ -11,67 +11,53 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @echo off
-@if NOT "%DEBUG%" == "" @echo on
-@rem ##########################################################################
 @rem
-@rem  Hvigor startup script for Windows
+@rem  -------------------------------------------------------------------
+@rem  Hvigor startup script for Windows, version 1.0.0
+@rem
+@rem  Required ENV vars:
+@rem  ------------------
+@rem    NODE_HOME - location of a Node home dir
+@rem    or
+@rem    Add %NODE_HOME%/bin to the PATH environment variable
+@rem  -------------------------------------------------------------------
 @rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
+set NODE_EXE_PATH=""
+set APP_HOME=.
+set WRAPPER_MODULE_PATH=%APP_HOME%\hvigor\hvigor-wrapper.js
+set NODE_EXE=node.exe
+@rem set NODE_OPTS="--max-old-space-size=4096"
 
 @rem Resolve any "." and ".." in APP_HOME to make it shorter.
 for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
 
-set WRAPPER_MODULE_PATH=%APP_HOME%\hvigor\hvigor-wrapper.js
-set NODE_EXE=node.exe
+if not defined NODE_OPTS set NODE_OPTS="--"
 
-goto start
-
-:start
 @rem Find node.exe
-if defined NODE_HOME goto findNodeFromNodeHome
+if defined NODE_HOME (
+    set NODE_HOME=%NODE_HOME:"=%
+    set "PATH=%PATH%;%NODE_HOME%"
+    set NODE_EXE_PATH=%NODE_HOME%/%NODE_EXE%
+)
 
 %NODE_EXE% --version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if "%ERRORLEVEL%" == "0" (
+    "%NODE_EXE%" "%NODE_OPTS%" "%WRAPPER_MODULE_PATH%" %*
+) else if exist "%NODE_EXE_PATH%" (
+    "%NODE_EXE_PATH%" "%NODE_OPTS%" "%WRAPPER_MODULE_PATH%" %*
+) else (
+    echo.
+    echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
+    echo.
+    echo Please set the NODE_HOME variable in your environment to match the
+    echo location of your NodeJs installation.
+)
 
-echo.
-echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
-echo.
-echo Please set the NODE_HOME variable in your environment to match the
-echo location of your NodeJs installation.
-
-goto fail
-
-:findNodeFromNodeHome
-set NODE_HOME=%NODE_HOME:"=%
-set NODE_EXE_PATH=%NODE_HOME%/%NODE_EXE%
-
-if exist "%NODE_EXE_PATH%" goto execute
-echo.
-echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
-echo.
-echo Please set the NODE_HOME variable in your environment to match the
-echo location of your NodeJs installation.
-
-goto fail
-
-:execute
-@rem Execute hvigor
-"%NODE_EXE%" %WRAPPER_MODULE_PATH% %*
-
-if "%ERRORLEVEL%" == "0" goto hvigorwEnd
-
-:fail
-exit /b 1
-
-:hvigorwEnd
-if "%OS%" == "Windows_NT" endlocal
-
-:end
+if "%ERRORLEVEL%" == "0"(
+    if "%OS%" == "Windows_NT" endlocal
+) else (
+    exit /b %ERRORLEVEL%
+)
diff --git a/multimedia/avsessionserver/hvigorw.bat b/multimedia/avsessionserver/hvigorw.bat
index 537484a..89f8b0c 100644
--- a/multimedia/avsessionserver/hvigorw.bat
+++ b/multimedia/avsessionserver/hvigorw.bat
@@ -11,67 +11,53 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @echo off
-@if NOT "%DEBUG%" == "" @echo on
-@rem ##########################################################################
 @rem
-@rem  Hvigor startup script for Windows
+@rem  -------------------------------------------------------------------
+@rem  Hvigor startup script for Windows, version 1.0.0
+@rem
+@rem  Required ENV vars:
+@rem  ------------------
+@rem    NODE_HOME - location of a Node home dir
+@rem    or
+@rem    Add %NODE_HOME%/bin to the PATH environment variable
+@rem  -------------------------------------------------------------------
 @rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
+set NODE_EXE_PATH=""
+set APP_HOME=.
+set WRAPPER_MODULE_PATH=%APP_HOME%\hvigor\hvigor-wrapper.js
+set NODE_EXE=node.exe
+@rem set NODE_OPTS="--max-old-space-size=4096"
 
 @rem Resolve any "." and ".." in APP_HOME to make it shorter.
 for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
 
-set WRAPPER_MODULE_PATH=%APP_HOME%\hvigor\hvigor-wrapper.js
-set NODE_EXE=node.exe
+if not defined NODE_OPTS set NODE_OPTS="--"
 
-goto start
-
-:start
 @rem Find node.exe
-if defined NODE_HOME goto findNodeFromNodeHome
+if defined NODE_HOME (
+    set NODE_HOME=%NODE_HOME:"=%
+    set "PATH=%PATH%;%NODE_HOME%"
+    set NODE_EXE_PATH=%NODE_HOME%/%NODE_EXE%
+)
 
 %NODE_EXE% --version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if "%ERRORLEVEL%" == "0" (
+    "%NODE_EXE%" "%NODE_OPTS%" "%WRAPPER_MODULE_PATH%" %*
+) else if exist "%NODE_EXE_PATH%" (
+    "%NODE_EXE_PATH%" "%NODE_OPTS%" "%WRAPPER_MODULE_PATH%" %*
+) else (
+    echo.
+    echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
+    echo.
+    echo Please set the NODE_HOME variable in your environment to match the
+    echo location of your NodeJs installation.
+)
 
-echo.
-echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
-echo.
-echo Please set the NODE_HOME variable in your environment to match the
-echo location of your NodeJs installation.
-
-goto fail
-
-:findNodeFromNodeHome
-set NODE_HOME=%NODE_HOME:"=%
-set NODE_EXE_PATH=%NODE_HOME%/%NODE_EXE%
-
-if exist "%NODE_EXE_PATH%" goto execute
-echo.
-echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
-echo.
-echo Please set the NODE_HOME variable in your environment to match the
-echo location of your NodeJs installation.
-
-goto fail
-
-:execute
-@rem Execute hvigor
-"%NODE_EXE%" %WRAPPER_MODULE_PATH% %*
-
-if "%ERRORLEVEL%" == "0" goto hvigorwEnd
-
-:fail
-exit /b 1
-
-:hvigorwEnd
-if "%OS%" == "Windows_NT" endlocal
-
-:end
+if "%ERRORLEVEL%" == "0"(
+    if "%OS%" == "Windows_NT" endlocal
+) else (
+    exit /b %ERRORLEVEL%
+)