launchpd 1.0.2 → 1.0.5

package/src/utils/upload.js

@@ -1,12 +1,12 @@
-import { readdir, readFile } from 'node:fs/promises';
-import { join, relative, posix, sep } from 'node:path';
-import mime from 'mime-types';
-import { config } from '../config.js';
-import { getApiKey, getApiSecret } from './credentials.js';
-import { createHmac } from 'node:crypto';
-import { isIgnored } from './ignore.js';
+import { readdir, readFile } from 'node:fs/promises'
+import { join, relative, posix, sep } from 'node:path'
+import mime from 'mime-types'
+import { config } from '../config.js'
+import { getApiKey, getApiSecret } from './credentials.js'
+import { createHmac } from 'node:crypto'
+import { isIgnored } from './ignore.js'
 
-const API_BASE_URL = config.apiUrl;
+const API_BASE_URL = config.apiUrl
 
 /**
  * Convert Windows path to POSIX for R2 keys
@@ -14,7 +14,7 @@ const API_BASE_URL = config.apiUrl;
  * @returns {string}
  */
 function toPosixPath(windowsPath) {
-    return windowsPath.split(sep).join(posix.sep);
+  return windowsPath.split(sep).join(posix.sep)
 }
 
 /**
@@ -26,42 +26,49 @@ function toPosixPath(windowsPath) {
  * @param {string} contentType - MIME type
  */
 async function uploadFile(content, subdomain, version, filePath, contentType) {
-    const apiKey = await getApiKey();
-    const apiSecret = await getApiSecret();
-    const headers = {
-        'X-API-Key': apiKey,
-        'X-Subdomain': subdomain,
-        'X-Version': String(version),
-        'X-File-Path': filePath,
-        'X-Content-Type': contentType,
-        'Content-Type': 'application/octet-stream',
-    };
-
-    if (apiSecret) {
-        const timestamp = Date.now().toString();
-        const endpoint = '/api/upload/file'; // Match the worker path
-        const hmac = createHmac('sha256', apiSecret);
-        hmac.update('POST');
-        hmac.update(endpoint);
-        hmac.update(timestamp);
-        hmac.update(content); // Buffer is fine for update()
-
-        headers['X-Timestamp'] = timestamp;
-        headers['X-Signature'] = hmac.digest('hex');
+  const apiKey = await getApiKey()
+  const apiSecret = await getApiSecret()
+  const headers = {
+    'X-API-Key': apiKey,
+    'X-Subdomain': subdomain,
+    'X-Version': String(version),
+    'X-File-Path': filePath,
+    'X-Content-Type': contentType,
+    'Content-Type': 'application/octet-stream'
+  }
+
+  if (apiSecret) {
+    const timestamp = Date.now().toString()
+    const endpoint = '/api/upload/file' // Match the worker path
+    const hmac = createHmac('sha256', apiSecret)
+    hmac.update('POST')
+    hmac.update(endpoint)
+    hmac.update(timestamp)
+    hmac.update(content) // Buffer is fine for update()
+
+    headers['X-Timestamp'] = timestamp
+    headers['X-Signature'] = hmac.digest('hex')
+  }
+
+  const response = await fetch(`${API_BASE_URL}/api/upload/file`, {
+    method: 'POST',
+    headers,
+    body: content
+  })
+
+  if (!response.ok) {
+    const text = await response.text().catch(() => '')
+    let errorMsg = ''
+    try {
+      const data = JSON.parse(text)
+      errorMsg = data.error
+    } catch {
+      if (text) errorMsg = text
     }
+    throw new Error(errorMsg || `Upload failed: ${response.status}`)
+  }
 
-    const response = await fetch(`${API_BASE_URL}/api/upload/file`, {
-        method: 'POST',
-        headers,
-        body: content,
-    });
-
-    if (!response.ok) {
-        const error = await response.json().catch(() => ({ error: 'Upload failed' }));
-        throw new Error(error.error || `Upload failed: ${response.status}`);
-    }
-
-    return response.json();
+  return response.json()
 }
 
 /**
@@ -73,56 +80,67 @@ async function uploadFile(content, subdomain, version, filePath, contentType) {
  * @param {string} folderName - Original folder name
  * @param {string|null} expiresAt - ISO expiration timestamp
  */
-async function completeUpload(subdomain, version, fileCount, totalBytes, folderName, expiresAt, message) {
-    const apiKey = await getApiKey();
-    const apiSecret = await getApiSecret();
-    const headers = {
-        'X-API-Key': apiKey,
-        'Content-Type': 'application/json',
-    };
-
-    const body = JSON.stringify({
-        subdomain,
-        version,
-        fileCount,
-        totalBytes,
-        folderName,
-        expiresAt,
-        message,
-    });
-
-    if (apiSecret) {
-        const timestamp = Date.now().toString();
-        const endpoint = '/api/upload/complete';
-        const hmac = createHmac('sha256', apiSecret);
-        hmac.update('POST');
-        hmac.update(endpoint);
-        hmac.update(timestamp);
-        hmac.update(body);
-
-        headers['X-Timestamp'] = timestamp;
-        headers['X-Signature'] = hmac.digest('hex');
+async function completeUpload(
+  subdomain,
+  version,
+  fileCount,
+  totalBytes,
+  folderName,
+  expiresAt,
+  message
+) {
+  const apiKey = await getApiKey()
+  const apiSecret = await getApiSecret()
+  const headers = {
+    'X-API-Key': apiKey,
+    'Content-Type': 'application/json'
+  }
+
+  const body = JSON.stringify({
+    subdomain,
+    version,
+    fileCount,
+    totalBytes,
+    folderName,
+    expiresAt,
+    message,
+    cliVersion: config.version
+  })
+
+  if (apiSecret) {
+    const timestamp = Date.now().toString()
+    const endpoint = '/api/upload/complete'
+    const hmac = createHmac('sha256', apiSecret)
+    hmac.update('POST')
+    hmac.update(endpoint)
+    hmac.update(timestamp)
+    hmac.update(body)
+
+    headers['X-Timestamp'] = timestamp
+    headers['X-Signature'] = hmac.digest('hex')
+  }
+
+  const response = await fetch(`${API_BASE_URL}/api/upload/complete`, {
+    method: 'POST',
+    headers,
+    body
+  })
+
+  if (!response.ok) {
+    let errorMsg = 'Complete upload failed'
+    const text = await response.text()
+    try {
+      const data = JSON.parse(text)
+      errorMsg =
+        data.error ||
+        `Complete upload failed: ${response.status} ${response.statusText}`
+    } catch {
+      errorMsg = `Complete upload failed: ${response.status} ${response.statusText} - ${text.substring(0, 100)}`
     }
+    throw new Error(errorMsg)
+  }
 
-    const response = await fetch(`${API_BASE_URL}/api/upload/complete`, {
-        method: 'POST',
-        headers,
-        body,
-    });
-
-    if (!response.ok) {
-        let errorMsg = 'Complete upload failed';
-        const text = await response.text();
-        try {
-            const data = JSON.parse(text);
-            errorMsg = data.error || `Complete upload failed: ${response.status} ${response.statusText}`;
-        } catch {
-            errorMsg = `Complete upload failed: ${response.status} ${response.statusText} - ${text.substring(0, 100)}`;
-        }
-        throw new Error(errorMsg);
-    }
-
-    return response.json();
+  return response.json()
 }
 
 /**
@@ -132,56 +150,64 @@ async function completeUpload(subdomain, version, fileCount, totalBytes, folderN
  * @param {number} version - Version number for this deployment
  * @param {function} onProgress - Progress callback (uploaded, total, fileName)
  */
-export async function uploadFolder(localPath, subdomain, version = 1, onProgress = null) {
-    const files = await readdir(localPath, { recursive: true, withFileTypes: true });
-
-    let uploaded = 0;
-    let totalBytes = 0;
-    const total = files.filter(f => f.isFile()).length;
-
-    for (const file of files) {
-        if (!file.isFile()) continue;
-
-        const fileName = file.name;
-        const parentDir = file.parentPath || file.path;
-
-        // Skip ignored directories in the path
-        const relativePath = relative(localPath, join(parentDir, fileName));
-        const pathParts = relativePath.split(sep);
-
-        if (pathParts.some(part => isIgnored(part, true))) {
-            continue;
-        }
+export async function uploadFolder(
+  localPath,
+  subdomain,
+  version = 1,
+  onProgress = null
+) {
+  const files = await readdir(localPath, {
+    recursive: true,
+    withFileTypes: true
+  })
+
+  let uploaded = 0
+  let totalBytes = 0
+  const total = files.filter((f) => f.isFile()).length
+
+  for (const file of files) {
+    if (!file.isFile()) continue
+
+    const fileName = file.name
+    const parentDir = file.parentPath || file.path
+
+    // Skip ignored directories in the path
+    const relativePath = relative(localPath, join(parentDir, fileName))
+    const pathParts = relativePath.split(sep)
+
+    if (pathParts.some((part) => isIgnored(part, true))) {
+      continue
+    }
 
-        // Skip ignored files
-        if (isIgnored(fileName, false)) {
-            continue;
-        }
+    // Skip ignored files
+    if (isIgnored(fileName, false)) {
+      continue
+    }
 
-        // Build full local path
-        const fullPath = join(parentDir, fileName);
+    // Build full local path
+    const fullPath = join(parentDir, fileName)
 
-        // Build relative path for R2 key
-        const posixPath = toPosixPath(relativePath);
+    // Build relative path for R2 key
+    const posixPath = toPosixPath(relativePath)
 
-        // Detect content type
-        const contentType = mime.lookup(file.name) || 'application/octet-stream';
+    // Detect content type
+    const contentType = mime.lookup(file.name) || 'application/octet-stream'
 
-        // Read file and upload via API
-        const body = await readFile(fullPath);
-        totalBytes += body.length;
+    // Read file and upload via API
+    const body = await readFile(fullPath)
+    totalBytes += body.length
 
-        await uploadFile(body, subdomain, version, posixPath, contentType);
+    await uploadFile(body, subdomain, version, posixPath, contentType)
 
-        uploaded++;
+    uploaded++
 
-        // Call progress callback if provided
-        if (onProgress) {
-            onProgress(uploaded, total, posixPath);
-        }
+    // Call progress callback if provided
+    if (onProgress) {
+      onProgress(uploaded, total, posixPath)
     }
+  }
 
-    return { uploaded, subdomain, totalBytes };
+  return { uploaded, subdomain, totalBytes }
 }
 
 /**
@@ -193,6 +219,22 @@ export async function uploadFolder(localPath, subdomain, version = 1, onProgress
  * @param {string} folderName - Folder name
  * @param {string|null} expiresAt - Expiration ISO timestamp
  */
-export async function finalizeUpload(subdomain, version, fileCount, totalBytes, folderName, expiresAt = null, message = null) {
-    return completeUpload(subdomain, version, fileCount, totalBytes, folderName, expiresAt, message);
+export async function finalizeUpload(
+  subdomain,
+  version,
+  fileCount,
+  totalBytes,
+  folderName,
+  expiresAt = null,
+  message = null
+) {
+  return await completeUpload(
+    subdomain,
+    version,
+    fileCount,
+    totalBytes,
+    folderName,
+    expiresAt,
+    message
+  )
 }

package/src/utils/validator.js

@@ -1,90 +1,138 @@
-import { readdir } from 'node:fs/promises';
-import { extname } from 'node:path';
-import { isIgnored } from './ignore.js';
+import { readdir } from 'node:fs/promises'
+import { extname } from 'node:path'
+import { isIgnored } from './ignore.js'
 
 // Allowed static file extensions
 const ALLOWED_EXTENSIONS = new Set([
-    '.html', '.htm',
-    '.css', '.scss', '.sass',
-    '.js', '.mjs', '.cjs',
-    '.json', '.jsonld',
-    '.svg', '.png', '.jpg', '.jpeg', '.gif', '.webp', '.ico', '.avif',
-    '.woff', '.woff2', '.ttf', '.otf', '.eot',
-    '.mp4', '.webm', '.ogg', '.mp3', '.wav', '.flac',
-    '.pdf', '.txt', '.md', '.xml', '.yaml', '.yml'
-]);
+  '.html',
+  '.htm',
+  '.css',
+  '.scss',
+  '.sass',
+  '.js',
+  '.mjs',
+  '.cjs',
+  '.json',
+  '.jsonld',
+  '.svg',
+  '.png',
+  '.jpg',
+  '.jpeg',
+  '.gif',
+  '.webp',
+  '.ico',
+  '.avif',
+  '.woff',
+  '.woff2',
+  '.ttf',
+  '.otf',
+  '.eot',
+  '.mp4',
+  '.webm',
+  '.ogg',
+  '.mp3',
+  '.wav',
+  '.flac',
+  '.pdf',
+  '.txt',
+  '.md',
+  '.xml',
+  '.yaml',
+  '.yml'
+])
 
 // Forbidden indicators (frameworks, build tools, backend code)
-const FORBIDDEN_INDICATORS = [
-    // Build systems & Frameworks
-    'package.json',
-    'package-lock.json',
-    'yarn.lock',
-    'pnpm-lock.yaml',
-    'node_modules',
-    'composer.json',
-    'vendor',
-    'requirements.txt',
-    'Gemfile',
-    'Makefile',
-    'tsconfig.json',
-    'next.config.js',
-    'nuxt.config.js',
-    'svelte.config.js',
-    'vite.config.js',
-    'webpack.config.js',
-    'rollup.config.js',
-    'angular.json',
+const FORBIDDEN_INDICATORS = new Set([
+  // Build systems & Frameworks
+  'package.json',
+  'package-lock.json',
+  'yarn.lock',
+  'pnpm-lock.yaml',
+  'node_modules',
+  'composer.json',
+  'vendor',
+  'requirements.txt',
+  'Gemfile',
+  'Makefile',
+  'tsconfig.json',
+  'next.config.js',
+  'nuxt.config.js',
+  'svelte.config.js',
+  'vite.config.js',
+  'webpack.config.js',
+  'rollup.config.js',
+  'angular.json',
 
-    // Backend/Source
-    '.jsx', '.tsx', '.ts', '.vue', '.svelte', '.php', '.py', '.rb', '.go', '.rs', '.java', '.cs', '.cpp', '.c',
-    '.env', '.env.local', '.env.production',
-    '.dockerfile', 'docker-compose.yml',
+  // Backend/Source
+  '.jsx',
+  '.tsx',
+  '.ts',
+  '.vue',
+  '.svelte',
+  '.php',
+  '.py',
+  '.rb',
+  '.go',
+  '.rs',
+  '.java',
+  '.cs',
+  '.cpp',
+  '.c',
+  '.env',
+  '.env.local',
+  '.env.production',
+  '.dockerfile',
+  'docker-compose.yml',
 
-    // Hidden/System
-    '.git', '.svn', '.hg'
-];
+  // Hidden/System
+  '.git',
+  '.svn',
+  '.hg'
+])
 
 /**
  * Validates that a folder contains ONLY static files.
  * @param {string} folderPath
  * @returns {Promise<{success: boolean, violations: string[]}>}
  */
-export async function validateStaticOnly(folderPath) {
-    const violations = [];
+export async function validateStaticOnly (folderPath) {
+  const violations = []
 
-    try {
-        const files = await readdir(folderPath, { recursive: true, withFileTypes: true });
+  try {
+    const files = await readdir(folderPath, {
+      recursive: true,
+      withFileTypes: true
+    })
 
-        for (const file of files) {
-            const fileName = file.name.toLowerCase();
-            const ext = extname(fileName);
+    for (const file of files) {
+      const fileName = file.name.toLowerCase()
+      const ext = extname(fileName)
 
-            // 1. Check if the file/dir itself is a forbidden indicator
-            if (FORBIDDEN_INDICATORS.includes(fileName) || FORBIDDEN_INDICATORS.includes(ext)) {
-                violations.push(file.name);
-                continue;
-            }
+      // 1. Check if the file/dir itself is a forbidden indicator
+      if (FORBIDDEN_INDICATORS.has(fileName) || FORBIDDEN_INDICATORS.has(ext)) {
+        violations.push(file.name)
+        continue
+      }
 
-            // 2. Skip ignored files and directories
-            if (isIgnored(fileName, file.isDirectory())) {
-                continue;
-            }
+      // 2. Skip ignored files and directories
+      if (isIgnored(fileName, file.isDirectory())) {
+        continue
+      }
 
-            // 2. Check extension for non-allowed types (only for files)
-            if (file.isFile()) {
-                // Ignore files without extensions or if they start with a dot (but handle indicators above)
-                if (ext && !ALLOWED_EXTENSIONS.has(ext)) {
-                    violations.push(file.name);
-                }
-            }
+      // 2. Check extension for non-allowed types (only for files)
+      if (file.isFile()) {
+        // Ignore files without extensions or if they start with a dot (but handle indicators above)
+        if (ext && !ALLOWED_EXTENSIONS.has(ext)) {
+          violations.push(file.name)
         }
+      }
+    }
 
-        return {
-            success: violations.length === 0,
-            violations: [...new Set(violations)] // Deduplicate
-        };
-    } catch (err) {
-        throw new Error(`Failed to validate folder: ${err.message}`);
+    return {
+      success: violations.length === 0,
+      violations: [...new Set(violations)] // Deduplicate
     }
+  } catch (err) {
+    throw new Error(`Failed to validate folder: ${err.message}`)
+  }
 }