@tothalex/nulljs 0.0.43 → 0.0.46

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tothalex/nulljs",
   "module": "index.ts",
-  "version": "0.0.43",
+  "version": "0.0.46",
   "type": "module",
   "bin": {
     "nulljs": "./src/index.ts"

package/scripts/install-server.js

@@ -6,6 +6,12 @@ const path = require('path')
 const { createWriteStream } = require('fs')
 const tar = require('tar')
 
+// --- Configuration ---
+const S3_BASE_URL = 'https://nulljs.s3.eu-north-1.amazonaws.com'
+const S3_PREFIX = 'releases/'
+const DOWNLOAD_BASE_URL = `${S3_BASE_URL}/${S3_PREFIX}`
+// ---------------------
+
 function getPlatformInfo() {
   const platform = process.platform
   const arch = process.arch
@@ -32,6 +38,67 @@ function getPlatformInfo() {
   return { target, extension, binaryName }
 }
 
+// Helper to fetch XML and return response data
+async function fetchXml(url) {
+  return new Promise((resolve, reject) => {
+    https
+      .get(url, (res) => {
+        if (res.statusCode !== 200) {
+          reject(
+            new Error(`S3 Request Failed: ${res.statusCode}. Check if public listing is enabled.`)
+          )
+          return
+        }
+        let data = ''
+        res.on('data', (chunk) => (data += chunk))
+        res.on('end', () => resolve(data))
+      })
+      .on('error', reject)
+  })
+}
+
+/**
+ * Lists the S3 prefix, parses the XML, and determines the latest version tag.
+ */
+async function getLatestVersionFromS3() {
+  // Query S3 for folders using delimiter and prefix
+  const listUrl = `${S3_BASE_URL}/?delimiter=/&prefix=${S3_PREFIX}`
+  const xmlData = await fetchXml(listUrl)
+
+  // Regex to find all CommonPrefixes entries (the version folders)
+  const prefixRegex = /<Prefix>(releases\/v[^<]+)\/<\/Prefix>/g
+  const versionFolders = []
+  let match
+
+  while ((match = prefixRegex.exec(xmlData)) !== null) {
+    // Extract version part: "releases/v1.0.0/" -> "v1.0.0"
+    const fullPrefix = match[1]
+    const version = fullPrefix.substring(S3_PREFIX.length)
+    versionFolders.push(version)
+  }
+
+  if (versionFolders.length === 0) {
+    throw new Error('No version folders found in S3 bucket.')
+  }
+
+  // Sort versions to find the latest (using semantic versioning logic)
+  const sortedVersions = versionFolders.sort((a, b) => {
+    // Strips 'v', splits by '.', and converts to number arrays for comparison
+    const aParts = a.replace('v', '').split('.').map(Number)
+    const bParts = b.replace('v', '').split('.').map(Number)
+
+    // Compare major, minor, and patch numbers
+    for (let i = 0; i < 3; i++) {
+      if (aParts[i] > bParts[i]) return 1
+      if (aParts[i] < bParts[i]) return -1
+    }
+    return 0
+  })
+
+  // The latest version is the last one after sorting
+  return sortedVersions[sortedVersions.length - 1]
+}
+
 async function downloadFile(url, destination) {
   return new Promise((resolve, reject) => {
     const file = createWriteStream(destination)
@@ -70,12 +137,9 @@ async function extractArchive(archivePath, extractPath, binaryName) {
 
   // Make binary executable
   const binaryPath = path.join(extractPath, binaryName)
-  fs.chmodSync(binaryPath, '755')
-}
-
-async function getLatestReleaseUrl(target, extension) {
-  const baseUrl = 'https://nulljs.s3.eu-north-1.amazonaws.com/releases'
-  return `${baseUrl}/nulljs-server-${target}/nulljs-server-${target}${extension}`
+  if (fs.existsSync(binaryPath)) {
+    fs.chmodSync(binaryPath, '755')
+  }
 }
 
 async function installServer() {
@@ -83,7 +147,6 @@ async function installServer() {
     console.log('📦 Installing nulljs server binary...')
 
     const { target, extension, binaryName } = getPlatformInfo()
-
     const binDir = path.join(__dirname, '..', 'bin')
     const archivePath = path.join(binDir, `server${extension}`)
     const binaryPath = path.join(binDir, 'server')
@@ -93,33 +156,38 @@ async function installServer() {
       fs.mkdirSync(binDir, { recursive: true })
     }
 
-    // Check if binary already exists
+    // Check if binary already exists (optional optimization)
     if (fs.existsSync(binaryPath)) {
       console.log('✅ Server binary already installed')
       return
     }
 
-    console.log(`🔍 Downloading server for ${target}...`)
+    // 1. Determine Version from S3
+    console.log('🔍 Checking for latest version on S3...')
+    const version = await getLatestVersionFromS3()
+    console.log(`   Found version: ${version}`)
 
-    // Get download URL from latest release
-    const downloadUrl = await getLatestReleaseUrl(target, extension)
+    // 2. Construct URL
+    // URL format: https://.../releases/VERSION/nulljs-server-TARGET.tar.gz
+    const downloadUrl = `${DOWNLOAD_BASE_URL}${version}/nulljs-server-${target}${extension}`
+    console.log(`   Downloading from: ${downloadUrl}`)
 
-    // Download the archive
+    // 3. Download
     await downloadFile(downloadUrl, archivePath)
     console.log('✅ Download completed')
 
-    // Extract the binary
+    // 4. Extract
     console.log('📂 Extracting binary...')
     await extractArchive(archivePath, binDir, binaryName)
 
-    // Clean up archive
+    // 5. Clean up archive
     fs.unlinkSync(archivePath)
 
     console.log('✅ nulljs server installed successfully')
   } catch (error) {
     console.error('❌ Failed to install server binary:', error.message)
     console.error('⚠️  You may need to build the server manually')
-    process.exit(0) // Don't fail the installation
+    process.exit(0)
   }
 }
 
@@ -129,4 +197,3 @@ if (require.main === module) {
 }
 
 module.exports = { installServer }
-

package/src/lib/update-server.ts

@@ -5,12 +5,25 @@ import https from 'node:https'
 import * as tar from 'tar'
 import chalk from 'chalk'
 
+// --- Configuration ---
+const S3_BASE_URL = 'https://nulljs.s3.eu-north-1.amazonaws.com'
+const S3_PREFIX = 'releases/'
+const DOWNLOAD_BASE_URL = `${S3_BASE_URL}/${S3_PREFIX}`
+// ---------------------
+
 interface PlatformInfo {
   target: string
   extension: string
   binaryName: string
 }
 
+interface S3DownloadInfo {
+  downloadUrl: string
+  version: string
+}
+
+// --- Core Helper Functions (Unchanged) ---
+
 function getPlatformInfo(): PlatformInfo {
   const platform = process.platform
   const arch = process.arch
@@ -82,19 +95,87 @@ async function extractArchive(
   chmodSync(binaryPath, '755')
 }
 
-async function getLatestReleaseUrl(target: string, extension: string): Promise<string> {
-  const baseUrl = 'https://nulljs.s3.eu-north-1.amazonaws.com/releases'
-  return `${baseUrl}/nulljs-server-${target}/nulljs-server-${target}${extension}`
-}
-
 function getServerBinPath(): string {
   // Try to find the server binary relative to this module
-  // This works both in development and when installed globally
   const currentFile = fileURLToPath(import.meta.url)
   const moduleRoot = join(dirname(currentFile), '../..')
   return join(moduleRoot, 'bin', 'server')
 }
 
+// --- S3 LISTING Functions (New) ---
+
+/**
+ * Fetches the raw XML listing from S3.
+ */
+async function fetchXml(url: string): Promise<string> {
+  return new Promise((resolve, reject) => {
+    https
+      .get(url, (res) => {
+        if (res.statusCode !== 200) {
+          // This likely indicates a 403 Access Denied error
+          reject(
+            new Error(`S3 Request Failed (${res.statusCode}): Check public 's3:ListBucket' policy.`)
+          )
+          return
+        }
+        let data = ''
+        res.on('data', (chunk) => (data += chunk))
+        res.on('end', () => resolve(data))
+      })
+      .on('error', reject)
+  })
+}
+
+/**
+ * Lists the S3 prefix, parses the XML, and determines the latest version tag.
+ */
+async function getLatestVersionFromS3(target: string, extension: string): Promise<S3DownloadInfo> {
+  // Query S3 for folders using delimiter and prefix
+  const listUrl = `${S3_BASE_URL}/?delimiter=/&prefix=${S3_PREFIX}`
+  const xmlData = await fetchXml(listUrl)
+
+  // Regex to find all CommonPrefixes entries (the version folders)
+  // Example: <Prefix>releases/v1.0.0/</Prefix>
+  const prefixRegex = /<Prefix>(releases\/v[^<]+)\/<\/Prefix>/g
+  const versionFolders: string[] = []
+  let match: RegExpExecArray | null
+
+  while ((match = prefixRegex.exec(xmlData)) !== null) {
+    // Extract version part: "releases/v1.0.0/" -> "v1.0.0"
+    const fullPrefix = match[1]
+    const version = fullPrefix.substring(S3_PREFIX.length)
+    versionFolders.push(version)
+  }
+
+  if (versionFolders.length === 0) {
+    throw new Error('No version folders found in S3 bucket. Has the CI/CD run?')
+  }
+
+  // Sort versions to find the latest (using semantic versioning logic)
+  const sortedVersions = versionFolders.sort((a, b) => {
+    // Strips 'v', splits by '.', and converts to number arrays for comparison
+    const aParts = a.replace('v', '').split('.').map(Number)
+    const bParts = b.replace('v', '').split('.').map(Number)
+
+    // Compare major, minor, and patch numbers (assuming vX.Y.Z)
+    for (let i = 0; i < 3; i++) {
+      if (aParts[i] > bParts[i]) return 1
+      if (aParts[i] < bParts[i]) return -1
+    }
+    return 0
+  })
+
+  // The latest version is the last one after sorting
+  const latestVersion = sortedVersions[sortedVersions.length - 1]
+
+  // Construct the full download URL
+  const downloadUrl = `${DOWNLOAD_BASE_URL}${latestVersion}/nulljs-server-${target}${extension}`
+
+  return { downloadUrl, version: latestVersion }
+}
+
+// --- Main Update Function (Modified) ---
+
 export async function updateServer(): Promise<void> {
   try {
     console.log(chalk.blue('🔄 Updating nulljs server binary...'))
@@ -115,21 +196,21 @@ export async function updateServer(): Promise<void> {
     if (existsSync(serverBinPath)) {
       console.log(chalk.blue('💾 Backing up existing binary...'))
 
-      // Remove old backup if it exists
       if (existsSync(backupPath)) {
         unlinkSync(backupPath)
       }
 
-      // Create backup
       const fs = await import('node:fs/promises')
       await fs.copyFile(serverBinPath, backupPath)
       console.log(chalk.green('✅ Backup created'))
     }
 
-    console.log(chalk.blue(`🔍 Downloading latest server for ${target}...`))
+    console.log(chalk.blue(`🔍 Searching for latest server version...`))
 
-    // Get download URL from latest release
-    const downloadUrl = await getLatestReleaseUrl(target, extension)
+    // 1. Get download URL and version from S3 listing (NEW LOGIC)
+    const { downloadUrl, version } = await getLatestVersionFromS3(target, extension)
+    console.log(chalk.blue(`   Found latest version: ${version} for ${target}`))
+    console.log(chalk.blue(`   Downloading from: ${downloadUrl}`))
 
     try {
       // Download the archive
@@ -157,7 +238,7 @@ export async function updateServer(): Promise<void> {
     } catch (error) {
       // If update failed and we have a backup, restore it
       if (existsSync(backupPath)) {
-        console.log(chalk.yellow('⚠️  Update failed, restoring backup...'))
+        console.log(chalk.yellow('⚠️ Update failed, restoring backup...'))
 
         if (existsSync(serverBinPath)) {
           unlinkSync(serverBinPath)
@@ -173,8 +254,9 @@ export async function updateServer(): Promise<void> {
       throw error
     }
   } catch (error) {
-    console.error(chalk.red('❌ Failed to update server binary:'), error.message)
+    // Ensure the error message is available if it's not a standard Error object
+    const errorMessage = error instanceof Error ? error.message : String(error)
+    console.error(chalk.red('❌ Failed to update server binary:'), errorMessage)
     throw error
   }
 }
-