node-sword-interface 1.0.46 → 1.0.48

package/binding.gyp

@@ -44,7 +44,7 @@
                         'message': 'Downloading sword-build-win32 artifacts from GitHub ...',
                         'inputs': [],
                         'outputs': ['sword-build-win32'],
-                        'action': ['PowerShell.exe', '-ExecutionPolicy', 'Bypass', '-File', '<(module_root_dir)/scripts/get_sword_build_win32.ps1'],
+                        'action': ['node', '<(module_root_dir)/scripts/get_sword_build_win32.js'],
                     }
                 ]
             }]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-sword-interface",
-  "version": "1.0.46",
+  "version": "1.0.48",
   "description": "Javascript (N-API) interface to SWORD library",
   "keywords": [
     "C++",

package/scripts/get_sword_build_win32.js

@@ -0,0 +1,172 @@
+#!/usr/bin/env node
+/* This file is part of node-sword-interface.
+
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
+
+   node-sword-interface is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 2 of the License, or
+   (at your option) any later version.
+
+   node-sword-interface is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of 
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+   See the GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with node-sword-interface. See the file COPYING.
+   If not, see <http://www.gnu.org/licenses/>. */
+
+const https = require('https');
+const fs = require('fs');
+const path = require('path');
+const { execFileSync } = require('child_process');
+
+const RELEASE_TAG = 'v1.8.900-2022-11-06';
+const API_URL = `https://api.github.com/repos/ezra-bible-app/sword-build-win32/releases/tags/${RELEASE_TAG}`;
+
+function fetchJson(url, headers = {}) {
+  return new Promise((resolve, reject) => {
+    const req = https.get(url, {
+      headers: {
+        'User-Agent': 'node-sword-interface',
+        'Accept': 'application/vnd.github+json',
+        ...headers,
+      }
+    }, res => {
+      let data = '';
+      res.on('data', chunk => data += chunk);
+      res.on('end', () => {
+        if (res.statusCode && res.statusCode >= 200 && res.statusCode < 300) {
+          try {
+            resolve(JSON.parse(data));
+          } catch (e) {
+            reject(e);
+          }
+        } else {
+          reject(new Error(`Request failed: ${res.statusCode} ${data}`));
+        }
+      });
+    });
+    req.on('error', reject);
+  });
+}
+
+function downloadFile(url, outPath, headers = {}, maxRedirects = 5) {
+  return new Promise((resolve, reject) => {
+    let redirects = 0;
+
+    const doRequest = (reqUrl) => {
+      const file = fs.createWriteStream(outPath);
+      const req = https.get(reqUrl, {
+        headers: {
+          'User-Agent': 'node-sword-interface',
+          'Accept': 'application/octet-stream',
+          ...headers,
+        }
+      }, res => {
+        // Handle redirects
+        if (res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
+          file.close(); // ensure stream closed before re-request
+          fs.unlink(outPath, () => {
+            if (redirects >= maxRedirects) {
+              reject(new Error(`Too many redirects downloading: ${reqUrl}`));
+              return;
+            }
+            redirects++;
+            const nextUrl = res.headers.location.startsWith('http')
+              ? res.headers.location
+              : new URL(res.headers.location, reqUrl).toString();
+            doRequest(nextUrl);
+          });
+          return;
+        }
+
+        if (res.statusCode && (res.statusCode < 200 || res.statusCode >= 300)) {
+          file.close();
+          fs.unlink(outPath, () => reject(new Error(`Download failed: ${res.statusCode}`)));
+          return;
+        }
+
+        res.pipe(file);
+        file.on('finish', () => file.close(resolve));
+      });
+
+      req.on('error', err => {
+        file.close();
+        fs.unlink(outPath, () => reject(err));
+      });
+    };
+
+    doRequest(url);
+  });
+}
+
+async function main() {
+  try {
+    const isCI = process.env.CI === 'true';
+    const githubToken = process.env.GITHUB_TOKEN;
+    const authHeader = (isCI && githubToken) ? { Authorization: `Bearer ${githubToken}` } : {};
+
+    if (isCI) {
+      console.log('GitHub actions build ... using GITHUB_TOKEN for authentication!');
+    }
+
+    const release = await fetchJson(API_URL, authHeader);
+    if (!release.assets || !release.assets.length) {
+      throw new Error('No assets found in release.');
+    }
+
+    const asset = release.assets[0];
+    const zipName = asset.name;
+    const zipUrl = asset.browser_download_url;
+
+    const cwd = process.cwd();
+
+    // Remove existing folder if present
+    const existingDir = path.join(cwd, 'sword-build-win32');
+    if (fs.existsSync(existingDir)) {
+      fs.rmSync(existingDir, { recursive: true, force: true });
+    }
+
+    const zipPath = path.join(cwd, zipName);
+    console.log(`Downloading ${zipUrl} -> ${zipPath}`);
+    await downloadFile(zipUrl, zipPath, authHeader);
+
+    // Extract ZIP file
+    const extractedDirName = zipName.replace(/\.zip$/i, '');
+    try {
+      if (process.platform === 'win32') {
+        execFileSync('powershell', ['-NoProfile', '-Command', `Expand-Archive -Path '${zipPath}' -DestinationPath '.' -Force`], { stdio: 'inherit' });
+      } else {
+        // Prefer system unzip if available
+        try {
+          execFileSync('unzip', ['-o', zipPath], { stdio: 'inherit' });
+        } catch (unzipErr) {
+          // Fallback to 7z if unzip is not present
+          execFileSync('7z', ['x', zipPath], { stdio: 'inherit' });
+        }
+      }
+    } catch (e) {
+      throw new Error(`Extraction failed: ${e.message}`);
+    }
+
+    // Remove zip file
+    fs.unlinkSync(zipPath);
+
+    // Rename extracted folder
+    if (!fs.existsSync(path.join(cwd, extractedDirName))) {
+      throw new Error(`Expected extracted directory '${extractedDirName}' not found.`);
+    }
+    fs.renameSync(path.join(cwd, extractedDirName), existingDir);
+
+    console.log('Download of Windows library artifacts completed!');
+  } catch (err) {
+    console.error('Error:', err.message);
+    process.exit(1);
+  }
+}
+
+if (require.main === module) {
+  main();
+}

package/scripts/get_sword_build_win32.ps1

@@ -1,74 +0,0 @@
-#   This file is part of node-sword-interface.
-#
-#   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
-#
-#   node-sword-interface is free software: you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation, either version 2 of the License, or
-#   (at your option) any later version.
-#
-#   node-sword-interface is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#   See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with node-sword-interface. See the file COPYING.
-#   If not, see <http://www.gnu.org/licenses/>.
-
-# see https://www.helloitscraig.co.uk/2016/02/download-the-latest-repo.html
-# see https://www.saotn.org/unzip-file-powershell/
-
-Add-Type -AssemblyName System.IO.Compression.FileSystem
-function unzip {
-	param( [string]$ziparchive, [string]$extractpath )
-	[System.IO.Compression.ZipFile]::ExtractToDirectory( $ziparchive, $extractpath )
-}
-
-# --- Only allow TLS1.1 and TLS1.2
-$AllProtocols = [System.Net.SecurityProtocolType]'Tls11,Tls12'
-[System.Net.ServicePointManager]::SecurityProtocol = $AllProtocols
-
-$headers = @{}
-
-$github_token = $env:GITHUB_TOKEN
-
-# --- Set the uri for the release
-$URI = "https://api.github.com/repos/ezra-bible-app/sword-build-win32/releases/tags/v1.8.900-2022-11-06"
-
-if ($Env:CI -eq "true") {
-		Write-Host "GitHub actions build ... using GITHUB_TOKEN for authentication!"
-
-		$headers = @{
-			Authorization="Bearer $github_token"
-			ContentType='application/json'
-		}
-}
-
-# --- Query the API to get the url of the zip
-$Response = Invoke-RestMethod -Method Get -Uri $URI -Headers $headers
-
-$ZipName = $Response.assets[0].name
-$ZipUrl = $Response.assets[0].browser_download_url
-
-# --- Remove the existing folder
-if (Test-Path sword-build-win32) {
-		Remove-Item -Recurse -Force sword-build-win32
-}
-
-# --- Download the file to the current location
-$OutputPath = Join-Path -Path (Get-Location).Path -ChildPath $ZipName
-Invoke-RestMethod -Method Get -Uri $ZipUrl -OutFile $OutputPath -Headers $headers
-
-Write-Host "OutputPath: $OutputPath"
-Write-Host "ZipUrl: $ZipUrl"
-
-# --- Unzip the zip file and remove it afterwards
-unzip $OutputPath $((Get-Location).Path)
-Remove-Item $OutputPath
-
-# --- Rename the extracted folder to a standard name
-$LibDirName = $ZipName.Replace(".zip", "")
-Rename-Item -Path $LibDirName -NewName sword-build-win32
-
-Write-Host "Download of Windows library artifacts completed!"