Merge pull request #347 from gnh1201/dev
Some checks failed
CodeQL / Analyze (javascript) (push) Has been cancelled
Deploy Jekyll with GitHub Pages dependencies preinstalled / build (push) Has been cancelled
Deploy Jekyll with GitHub Pages dependencies preinstalled / deploy (push) Has been cancelled

Refactor install script and add websocat support
This commit is contained in:
Namhyeon Go 2025-11-21 19:29:35 +09:00 committed by GitHub
commit 6af55ec007
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 229 additions and 124 deletions

View File

@ -3,7 +3,7 @@
# ================================
$AppName = "welsonjs"
$TargetDir = Join-Path $env:APPDATA $AppName
$TmpDir = Join-Path $env:TEMP "$AppName-downloads"
$TmpDir = Join-Path $env:TEMP "$AppName-downloads"
Write-Host ""
Write-Host "[*] Target directory : $TargetDir"
@ -31,20 +31,19 @@ Write-Host ""
# ================================
# HELPER FUNCTIONS
# ================================
function Ensure-EmptyDirectory {
param(
[Parameter(Mandatory=$true)]
[Parameter(Mandatory = $true)]
[string]$Path
)
# If a file exists at the path, remove it
# If a file exists at this path, delete it
if (Test-Path $Path -PathType Leaf) {
Write-Host "[WARN] A file exists at path '$Path'. Deleting it..."
Write-Host "[WARN] File exists at '$Path'. Removing..."
Remove-Item -Path $Path -Force
}
# Ensure directory exists
# Ensure a directory exists at this path
if (-not (Test-Path $Path -PathType Container)) {
Write-Host "[*] Creating directory: $Path"
New-Item -ItemType Directory -Path $Path -Force | Out-Null
@ -53,126 +52,137 @@ function Ensure-EmptyDirectory {
function Download-File {
param(
[Parameter(Mandatory=$true)]
[Parameter(Mandatory = $true)]
[string]$Url,
[Parameter(Mandatory=$true)]
[string]$Destination
[Parameter(Mandatory = $true)]
[string]$DestinationPath
)
Write-Host "[*] Downloading file..."
Write-Host " URL : $Url"
Write-Host " OUT : $Destination"
Write-Host " OUT : $DestinationPath"
try {
Invoke-WebRequest -Uri $Url -OutFile $Destination -UseBasicParsing -ErrorAction Stop
Invoke-WebRequest -Uri $Url -OutFile $DestinationPath -UseBasicParsing -ErrorAction Stop
Write-Host "[OK] Download completed."
Write-Host ""
}
catch {
Write-Host "[ERROR] Failed to download: $Url"
Write-Host $_.Exception.Message
if ($_ -is [System.Exception]) {
Write-Host $_.Exception.Message
} else {
Write-Host $_
}
throw
}
}
function Extract-Zip {
function Extract-CompressedFile {
param(
[Parameter(Mandatory=$true)]
[string]$ZipPath,
[Parameter(Mandatory=$true)]
[string]$DestDir
[Parameter(Mandatory = $true)]
[string]$CompressedPath,
[Parameter(Mandatory = $true)]
[string]$DestinationDirectory
)
Write-Host "[*] Extracting ZIP:"
Write-Host " $ZipPath"
Write-Host " -> $DestDir"
Write-Host "[*] Extracting compressed file:"
Write-Host " $CompressedPath"
Write-Host " -> $DestinationDirectory"
# Make sure destination directory exists and is a directory
Ensure-EmptyDirectory -Path $DestDir
# Ensure destination directory exists
Ensure-EmptyDirectory -Path $DestinationDirectory
# Temporary extraction folder inside destination
$TmpExtract = Join-Path $DestDir "__tmp_extract__"
Ensure-EmptyDirectory -Path $TmpExtract
# Temporary extraction workspace inside destination directory
$TemporaryExtractDirectory = Join-Path $DestinationDirectory "__tmp_extract__"
Ensure-EmptyDirectory -Path $TemporaryExtractDirectory
Write-Host "[DEBUG] PowerShell command:"
Write-Host " Expand-Archive -LiteralPath `"$ZipPath`" -DestinationPath `"$TmpExtract`" -Force"
Write-Host "[DEBUG] Expand-Archive command:"
Write-Host " Expand-Archive -LiteralPath `"$CompressedPath`" -DestinationPath `"$TemporaryExtractDirectory`" -Force"
try {
Expand-Archive -LiteralPath $ZipPath -DestinationPath $TmpExtract -Force -ErrorAction Stop
Expand-Archive -LiteralPath $CompressedPath -DestinationPath $TemporaryExtractDirectory -Force -ErrorAction Stop
}
catch {
Write-Host "[ERROR] Failed to extract ZIP with Expand-Archive: $ZipPath"
Write-Host $_.Exception.Message
Write-Host "[ERROR] Failed to extract: $CompressedPath"
if ($_ -is [System.Exception]) {
Write-Host $_.Exception.Message
} else {
Write-Host $_
}
throw
}
# Check extracted entries
$entries = Get-ChildItem -LiteralPath $TmpExtract
# Move extracted content into final destination
$entries = Get-ChildItem -LiteralPath $TemporaryExtractDirectory
if (-not $entries -or $entries.Count -eq 0) {
Write-Host "[ERROR] No entries were extracted from ZIP: $ZipPath"
throw "ZIP appears to be empty or extraction failed."
Write-Host "[ERROR] No entries were extracted from archive: $CompressedPath"
throw "Archive appears to be empty or extraction failed."
}
if ($entries.Count -eq 1 -and $entries[0].PSIsContainer) {
Write-Host "[*] Detected single root directory inside ZIP. Flattening..."
# Move children of the single root directory into destination
$innerItems = Get-ChildItem -LiteralPath $entries[0].FullName
# Single root directory inside archive -> flatten
Write-Host "[*] Archive has a single root directory. Flattening..."
$innerItems = Get-ChildItem -LiteralPath $entries[0].FullName -Force
foreach ($item in $innerItems) {
Move-Item -LiteralPath $item.FullName -Destination $DestDir -Force
Move-Item -LiteralPath $item.FullName -Destination $DestinationDirectory -Force
}
}
else {
Write-Host "[*] ZIP has multiple top-level entries. Copying all..."
# Multiple top-level entries
Write-Host "[*] Archive has multiple top-level entries. Moving all..."
foreach ($item in $entries) {
Move-Item -LiteralPath $item.FullName -Destination $DestDir -Force
Move-Item -LiteralPath $item.FullName -Destination $DestinationDirectory -Force
}
}
# Clean up temp extraction folder
Remove-Item -LiteralPath $TmpExtract -Recurse -Force
# Clean up temporary extraction directory
Remove-Item -LiteralPath $TemporaryExtractDirectory -Recurse -Force
Write-Host "[OK] ZIP extraction completed."
Write-Host "[OK] Extraction completed."
Write-Host ""
}
function Extract-TarGz {
function Extract-TarGzArchive {
param(
[Parameter(Mandatory=$true)]
[string]$TarGzPath,
[Parameter(Mandatory=$true)]
[string]$DestDir
[Parameter(Mandatory = $true)]
[string]$ArchivePath,
[Parameter(Mandatory = $true)]
[string]$DestinationDirectory
)
Write-Host "[*] Extracting TAR.GZ:"
Write-Host " $TarGzPath"
Write-Host " -> $DestDir"
Write-Host "[*] Extracting TAR.GZ archive:"
Write-Host " $ArchivePath"
Write-Host " -> $DestinationDirectory"
Ensure-EmptyDirectory -Path $DestDir
Ensure-EmptyDirectory -Path $DestinationDirectory
# Modern Windows ships with tar, but we validate its presence
$tarCmd = Get-Command tar -ErrorAction SilentlyContinue
if (-not $tarCmd) {
Write-Host "[ERROR] 'tar' command not found. Cannot extract TAR.GZ."
throw "tar command not found."
# Validate tar availability
$tarCommand = Get-Command tar -ErrorAction SilentlyContinue
if (-not $tarCommand) {
Write-Host "[ERROR] 'tar' command not found."
throw "tar not available on this system."
}
Write-Host "[DEBUG] tar command:"
Write-Host " tar -xzf `"$TarGzPath`" -C `"$DestDir`""
Write-Host " tar -xzf `"$ArchivePath`" -C `"$DestinationDirectory`""
try {
& tar -xzf "$TarGzPath" -C "$DestDir"
& tar -xzf "$ArchivePath" -C "$DestinationDirectory"
if ($LASTEXITCODE -ne 0) {
throw "tar exit code $LASTEXITCODE"
throw "tar exited with code $LASTEXITCODE"
}
Write-Host "[OK] TAR.GZ extraction completed."
Write-Host ""
}
catch {
Write-Host "[ERROR] Failed to extract TAR.GZ: $TarGzPath"
Write-Host $_.Exception.Message
Write-Host "[ERROR] Failed to extract TAR.GZ archive: $ArchivePath"
if ($_ -is [System.Exception]) {
Write-Host $_.Exception.Message
} else {
Write-Host $_
}
throw
}
}
@ -185,115 +195,201 @@ $PythonUrl = $null
$CurlUrl = $null
$YaraUrl = $null
$WamrUrl = $null
# WelsonJS binary artifacts
$ArtifactsUrl = "https://catswords.blob.core.windows.net/welsonjs/artifacts.zip"
$WebsocatUrl = $null
$ArtifactsUrl = $null
switch ($arch) {
"x64" {
# Python embeddable (x64)
$PythonUrl = "https://www.python.org/ftp/python/3.13.9/python-3.13.9-embeddable-amd64.zip"
$PythonUrl = "https://www.python.org/ftp/python/3.13.9/python-3.13.9-embeddable-amd64.zip"
# curl (x64, mingw)
$CurlUrl = "https://curl.se/windows/latest.cgi?p=win64-mingw.zip"
$CurlUrl = "https://curl.se/windows/latest.cgi?p=win64-mingw.zip"
# YARA (x64, GitHub — as you specified)
$YaraUrl = "https://github.com/VirusTotal/yara/releases/download/v4.5.5/yara-4.5.5-2368-win64.zip"
# YARA (x64)
$YaraUrl = "https://github.com/VirusTotal/yara/releases/download/v4.5.5/yara-4.5.5-2368-win64.zip"
# WAMR (x64 only)
$WamrUrl = "https://github.com/bytecodealliance/wasm-micro-runtime/releases/download/WAMR-2.4.3/iwasm-2.4.3-x86_64-windows-2022.tar.gz"
# WAMR (x64)
$WamrUrl = "https://github.com/bytecodealliance/wasm-micro-runtime/releases/download/WAMR-2.4.3/iwasm-2.4.3-x86_64-windows-2022.tar.gz"
# websocat (x64)
$WebsocatUrl = "https://catswords.blob.core.windows.net/welsonjs/websocat-1.14.0.x86_64-pc-windows-gnu.zip"
# WelsonJS binary artifacts (x86 compatible)
$ArtifactsUrl = "https://catswords.blob.core.windows.net/welsonjs/artifacts.zip"
}
"arm64" {
# Python embeddable (ARM64)
$PythonUrl = "https://www.python.org/ftp/python/3.13.9/python-3.13.9-embeddable-arm64.zip"
$PythonUrl = "https://www.python.org/ftp/python/3.13.9/python-3.13.9-embeddable-arm64.zip"
# curl (ARM64)
$CurlUrl = "https://curl.se/windows/latest.cgi?p=win64a-mingw.zip"
$CurlUrl = "https://curl.se/windows/latest.cgi?p=win64a-mingw.zip"
# DO NOT install YARA/WAMR on ARM64
$YaraUrl = $null
$WamrUrl = $null
# No YARA / WAMR / websocat / artifacts for ARM64 in this script
$YaraUrl = $null
$WamrUrl = $null
$WebsocatUrl = $null
$ArtifactsUrl = $null
}
default {
# Treat anything else as x86
# Python embeddable (x86)
$PythonUrl = "https://www.python.org/ftp/python/3.13.9/python-3.13.9-embeddable-win32.zip"
$PythonUrl = "https://www.python.org/ftp/python/3.13.9/python-3.13.9-embeddable-win32.zip"
# curl (x86)
$CurlUrl = "https://downloads.sourceforge.net/project/muldersoft/cURL/curl-8.17.0-win-x86-full.2025-11-09.zip";
$CurlUrl = "https://downloads.sourceforge.net/project/muldersoft/cURL/curl-8.17.0-win-x86-full.2025-11-09.zip"
# Do NOT install YARA/WAMR on x86 (same policy as before)
$YaraUrl = $null
$WamrUrl = $null
# YARA (x86)
$YaraUrl = "https://github.com/VirusTotal/yara/releases/download/v4.5.5/yara-4.5.5-2368-win32.zip"
# No WAMR for x86
$WamrUrl = $null
# websocat (x86)
$WebsocatUrl = "https://catswords.blob.core.windows.net/welsonjs/websocat-1.14.0.i686-pc-windows-gnu.zip"
# WelsonJS binary artifacts (x86 compatible)
$ArtifactsUrl = "https://catswords.blob.core.windows.net/welsonjs/artifacts.zip"
}
}
Write-Host "[*] Python URL : $PythonUrl"
Write-Host "[*] curl URL : $CurlUrl"
Write-Host "[*] Python URL : $PythonUrl"
Write-Host "[*] curl URL : $CurlUrl"
if ($YaraUrl) {
Write-Host "[*] YARA URL : $YaraUrl"
Write-Host "[*] YARA URL : $YaraUrl"
} else {
Write-Host "[*] YARA : skipped on this architecture"
Write-Host "[*] YARA : skipped on this architecture"
}
if ($WamrUrl) {
Write-Host "[*] WAMR URL : $WamrUrl"
Write-Host "[*] WAMR URL : $WamrUrl"
} else {
Write-Host "[*] WAMR : skipped on this architecture"
Write-Host "[*] WAMR : skipped on this architecture"
}
if ($WebsocatUrl) {
Write-Host "[*] websocat URL : $WebsocatUrl"
} else {
Write-Host "[*] websocat : skipped on this architecture"
}
if ($ArtifactsUrl) {
Write-Host "[*] artifacts URL : $ArtifactsUrl"
} else {
Write-Host "[*] artifacts : skipped on this architecture"
}
Write-Host "[*] artifacts URL: $ArtifactsUrl"
Write-Host ""
# ================================
# DOWNLOAD FILES
# DOWNLOAD FILES (websocat before artifacts)
# ================================
$PythonZip = Join-Path $TmpDir "python.zip"
$CurlZip = Join-Path $TmpDir "curl.zip"
$YaraZip = Join-Path $TmpDir "yara.zip"
$WamrTgz = Join-Path $TmpDir "wamr.tar.gz"
$ArtifactsZip = Join-Path $TmpDir "artifacts.zip"
$PythonCompressed = Join-Path $TmpDir "python.zip"
$CurlCompressed = Join-Path $TmpDir "curl.zip"
$YaraCompressed = Join-Path $TmpDir "yara.zip"
$WamrArchive = Join-Path $TmpDir "wamr.tar.gz"
$WebsocatCompressed = Join-Path $TmpDir "websocat.zip"
$ArtifactsCompressed = Join-Path $TmpDir "artifacts.zip"
try {
Download-File -Url $PythonUrl -Destination $PythonZip
Download-File -Url $CurlUrl -Destination $CurlZip
# Python
Download-File -Url $PythonUrl -DestinationPath $PythonCompressed
# curl
Download-File -Url $CurlUrl -DestinationPath $CurlCompressed
# YARA (optional)
if ($YaraUrl) {
Download-File -Url $YaraUrl -Destination $YaraZip
Download-File -Url $YaraUrl -DestinationPath $YaraCompressed
}
else
{
Write-Host "[*] YARA download skipped on this architecture."
}
# WAMR (optional)
if ($WamrUrl) {
Download-File -Url $WamrUrl -Destination $WamrTgz
Download-File -Url $WamrUrl -DestinationPath $WamrArchive
}
else
{
Write-Host "[*] WAMR download skipped on this architecture."
}
Download-File -Url $ArtifactsUrl -Destination $ArtifactsZip
# websocat (optional)
if ($WebsocatUrl) {
Download-File -Url $WebsocatUrl -DestinationPath $WebsocatCompressed
}
else {
Write-Host "[*] websocat download skipped on this architecture."
}
# artifacts
if ($ArtifactsUrl) {
Download-File -Url $ArtifactsUrl -DestinationPath $ArtifactsCompressed
}
else {
Write-Host "[*] artifacts download skipped on this architecture."
}
}
catch {
Write-Host "[FATAL] Download phase failed."
if ($_ -is [System.Exception]) {
Write-Host $_.Exception.Message
} else {
Write-Host $_
}
exit 1
}
# ================================
# EXTRACT FILES
# EXTRACT / INSTALL (websocat before artifacts)
# ================================
try {
Extract-Zip -ZipPath $PythonZip -DestDir (Join-Path $TargetDir "python")
Extract-Zip -ZipPath $CurlZip -DestDir (Join-Path $TargetDir "curl")
# Python
Extract-CompressedFile -CompressedPath $PythonCompressed -DestinationDirectory (Join-Path $TargetDir "python")
# curl
Extract-CompressedFile -CompressedPath $CurlCompressed -DestinationDirectory (Join-Path $TargetDir "curl")
# YARA
if ($YaraUrl) {
Extract-Zip -ZipPath $YaraZip -DestDir (Join-Path $TargetDir "yara")
Extract-CompressedFile -CompressedPath $YaraCompressed -DestinationDirectory (Join-Path $TargetDir "yara")
}
else {
Write-Host "[*] YARA installation skipped on this architecture."
}
# WAMR (TAR.GZ)
if ($WamrUrl) {
Extract-TarGz -TarGzPath $WamrTgz -DestDir (Join-Path $TargetDir "wamr")
Extract-TarGzArchive -ArchivePath $WamrArchive -DestinationDirectory (Join-Path $TargetDir "wamr")
}
else {
Write-Host "[*] WAMR installation skipped on this architecture."
}
Extract-Zip -ZipPath $ArtifactsZip -DestDir (Join-Path $TargetDir "bin")
# websocat
if ($WebsocatUrl) {
Extract-CompressedFile -CompressedPath $WebsocatCompressed -DestinationDirectory (Join-Path $TargetDir "websocat")
}
else {
Write-Host "[*] websocat installation skipped on this architecture."
}
# artifacts
if ($ArtifactsUrl) {
Extract-CompressedFile -CompressedPath $ArtifactsCompressed -DestinationDirectory (Join-Path $TargetDir "bin")
}
else {
Write-Host "[*] artifacts installation skipped on this architecture."
}
}
catch {
Write-Host "[FATAL] Extraction phase failed."
Write-Host "[FATAL] Extraction/installation phase failed."
if ($_ -is [System.Exception]) {
Write-Host $_.Exception.Message
} else {
Write-Host $_
}
exit 1
}
@ -301,7 +397,7 @@ catch {
# ================================
# FINISH
# ================================
Write-Host "[*] All tools installed successfully."
Write-Host "[*] Installation completed successfully."
Write-Host "[*] Installed into: $TargetDir"
Write-Host ""
exit 0

View File

@ -111,7 +111,7 @@ var ChromeObject = function() {
if (dirname != null) {
this.userDataDir = dirname;
} else {
this.userDataDir = SYS.getEnvString("APPDATA") + "\\WelsonJS\\" + publisherName.get() + "_user_profile";
this.userDataDir = SYS.getAppDataDir() + "\\" + publisherName.get() + "_user_profile";
}
return this;
};
@ -1498,7 +1498,7 @@ exports.startDebugInPrivate = function(url, proxy, profileName, debuggingPort, i
exports.publisherName = publisherName;
exports.VERSIONINFO = "Chrome Web Browser Debugging Interface (chrome.js) version 0.5.3";
exports.VERSIONINFO = "Chrome Web Browser Debugging Interface (chrome.js) version 0.5.4";
exports.AUTHOR = "gnh1201@catswords.re.kr";
exports.global = global;
exports.require = global.require;

View File

@ -38,7 +38,7 @@ function getEnvString(envName) {
}
function getAppDataDir() {
return getEnvString("APPDATA") + "\\WelsonJS";
return getEnvString("APPDATA") + "\\welsonjs";
}
function get32BitFolder() {
@ -224,6 +224,6 @@ exports.createShortcut = createShortcut;
exports.ping = ping;
exports.getProcessVersion = getProcessVersion;
exports.VERSIONINFO = "System Module (system.js) version 0.1.6";
exports.VERSIONINFO = "System Module (system.js) version 0.1.7";
exports.global = global;
exports.require = global.require;

View File

@ -1,11 +1,15 @@
// websocket.js
// Copyright 2019-2025, Namhyeon Go <gnh1201@catswords.re.kr> and the WelsonJS contributors.
// Namhyeon Go <gnh1201@catswords.re.kr> and the WelsonJS contributors.
// SPDX-License-Identifier: GPL-3.0-or-later
// https://github.com/gnh1201/welsonjs
//
// references:
// https://stackoverflow.com/questions/52783655/use-curl-with-chrome-remote-debugging
// https://github.com/vi/websocat
// Please Note:
// If you want more fine-grained control over WebSockets, please refer to the WebSocket implementation in the WelsonJS Launcher.
// This file exists for compatibility with previous versions.
//
// References:
// * https://stackoverflow.com/questions/52783655/use-curl-with-chrome-remote-debugging
// * https://github.com/vi/websocat
//
var SHELL = require("lib/shell");
var SYS = require("lib/system");
@ -20,11 +24,16 @@ var WebsocketObject = function() {
if (typeof(path) !== "undefined") {
this._interface.setPrefix(path);
} else {
var arch = SYS.getArch();
if(arch.indexOf("64") > -1) {
this._interface.setPrefix("bin\\x64\\websocat.x86_64-pc-windows-gnu.exe");
var default_websocat_path = SYS.getAppDataDir() + "\\websocat\\websocat.exe";
if (FILE.fileExists(default_websocat_path)) {
this._interface.setPrefix(default_websocat_path);
} else {
this._interface.setPrefix("bin\\x86\\websocat.i686-pc-windows-gnu.exe");
var arch = SYS.getArch();
if(arch.indexOf("64") > -1) {
this._interface.setPrefix("bin\\x64\\websocat.x86_64-pc-windows-gnu.exe");
} else {
this._interface.setPrefix("bin\\x86\\websocat.i686-pc-windows-gnu.exe");
}
}
}
};
@ -67,7 +76,7 @@ var WebsocketObject = function() {
this.create();
};
exports.VERSIONINFO = "Websocket Interface (websocket.js) version 0.2.3";
exports.VERSIONINFO = "Websocket interface (websocket.js) version 0.2.4";
exports.global = global;
exports.require = global.require;

View File

@ -36,7 +36,7 @@ Root: HKCR; Subkey: "{cm:AppName}.Script"; ValueType: string; ValueData: "{cm:Ap
Root: HKCR; Subkey: "{cm:AppName}.Script\DefaultIcon"; ValueType: string; ValueData: "{app}\app\favicon.ico,0"; Flags: uninsdeletekey
Root: HKCR; Subkey: "{cm:AppName}.Script\shell"; ValueType: string; ValueData: "open"; Flags: uninsdeletevalue
Root: HKCR; Subkey: "{cm:AppName}.Script\shell\open"; ValueType: string; ValueData: "Run with {cm:AppName}"; Flags: uninsdeletevalue
Root: HKCR; Subkey: "{cm:AppName}.Script\shell\open\command"; ValueType: string; ValueData: """{userappdata}\{cm:AppName}\WelsonJS.Launcher.exe"" --file ""%1"""; Flags: uninsdeletevalue
Root: HKCR; Subkey: "{cm:AppName}.Script\shell\open\command"; ValueType: string; ValueData: """{userappdata}\{cm:AppName}\bin\WelsonJS.Launcher.exe"" --file ""%1"""; Flags: uninsdeletevalue
Root: HKCR; Subkey: ".js"; ValueType: string; ValueData: "{cm:AppName}.Script"; Flags: uninsdeletevalue
Root: HKCR; Subkey: ".ts"; ValueType: string; ValueData: "{cm:AppName}.Script"; Flags: uninsdeletevalue
Root: HKCR; Subkey: ".re"; ValueType: string; ValueData: "{cm:AppName}.Script"; Flags: uninsdeletevalue