launchpd 0.1.2 → 0.1.5

package/src/utils/upload.js

@@ -1,22 +1,15 @@
-import { S3Client, PutObjectCommand } from '@aws-sdk/client-s3';
 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 { info } from './logger.js';
+
+const API_BASE_URL = `https://api.${config.domain}`;
 
 /**
- * Create S3-compatible client for Cloudflare R2
+ * Get API key for requests
  */
-function createR2Client() {
-    return new S3Client({
-        region: 'auto',
-        endpoint: `https://${config.r2.accountId}.r2.cloudflarestorage.com`,
-        credentials: {
-            accessKeyId: config.r2.accessKeyId,
-            secretAccessKey: config.r2.secretAccessKey,
-        },
-    });
+function getApiKey() {
+    return process.env.STATICLAUNCH_API_KEY || 'public-beta-key';
 }
 
 /**
@@ -29,13 +22,77 @@ function toPosixPath(windowsPath) {
 }
 
 /**
- * Upload a folder to R2 under a subdomain prefix with versioning
+ * Upload a single file via API proxy
+ * @param {Buffer} content - File content
+ * @param {string} subdomain - Target subdomain
+ * @param {number} version - Version number
+ * @param {string} filePath - Relative file path
+ * @param {string} contentType - MIME type
+ */
+async function uploadFile(content, subdomain, version, filePath, contentType) {
+    const response = await fetch(`${API_BASE_URL}/api/upload/file`, {
+        method: 'POST',
+        headers: {
+            'X-API-Key': getApiKey(),
+            'X-Subdomain': subdomain,
+            'X-Version': String(version),
+            'X-File-Path': filePath,
+            'X-Content-Type': contentType,
+            'Content-Type': 'application/octet-stream',
+        },
+        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();
+}
+
+/**
+ * Mark upload complete and set active version
+ * @param {string} subdomain - Target subdomain
+ * @param {number} version - Version number
+ * @param {number} fileCount - Number of files uploaded
+ * @param {number} totalBytes - Total bytes uploaded
+ * @param {string} folderName - Original folder name
+ * @param {string|null} expiresAt - ISO expiration timestamp
+ */
+async function completeUpload(subdomain, version, fileCount, totalBytes, folderName, expiresAt) {
+    const response = await fetch(`${API_BASE_URL}/api/upload/complete`, {
+        method: 'POST',
+        headers: {
+            'X-API-Key': getApiKey(),
+            'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({
+            subdomain,
+            version,
+            fileCount,
+            totalBytes,
+            folderName,
+            expiresAt,
+        }),
+    });
+
+    if (!response.ok) {
+        const error = await response.json().catch(() => ({ error: 'Complete upload failed' }));
+        throw new Error(error.error || `Complete upload failed: ${response.status}`);
+    }
+
+    return response.json();
+}
+
+/**
+ * Upload a folder to Launchpd via API proxy
  * @param {string} localPath - Local folder path
  * @param {string} subdomain - Subdomain to use as bucket prefix
  * @param {number} version - Version number for this deployment
+ * @param {function} onProgress - Progress callback (uploaded, total, fileName)
  */
-export async function uploadFolder(localPath, subdomain, version = 1) {
-    const client = createR2Client();
+export async function uploadFolder(localPath, subdomain, version = 1, onProgress = null) {
     const files = await readdir(localPath, { recursive: true, withFileTypes: true });
 
     let uploaded = 0;
@@ -48,27 +105,39 @@ export async function uploadFolder(localPath, subdomain, version = 1) {
         // Build full local path
         const fullPath = join(file.parentPath || file.path, file.name);
 
-        // Build R2 key: subdomain/v{version}/relative/path/to/file.ext
+        // Build relative path for R2 key
         const relativePath = relative(localPath, fullPath);
-        const key = `${subdomain}/v${version}/${toPosixPath(relativePath)}`;
+        const posixPath = toPosixPath(relativePath);
 
         // Detect content type
         const contentType = mime.lookup(file.name) || 'application/octet-stream';
 
-        // Read file and upload
+        // Read file and upload via API
         const body = await readFile(fullPath);
         totalBytes += body.length;
 
-        await client.send(new PutObjectCommand({
-            Bucket: config.r2.bucketName,
-            Key: key,
-            Body: body,
-            ContentType: contentType,
-        }));
+        await uploadFile(body, subdomain, version, posixPath, contentType);
 
         uploaded++;
-        info(`  Uploaded (${uploaded}/${total}): ${toPosixPath(relativePath)}`);
+
+        // Call progress callback if provided
+        if (onProgress) {
+            onProgress(uploaded, total, posixPath);
+        }
     }
 
     return { uploaded, subdomain, totalBytes };
 }
+
+/**
+ * Complete the upload and set active version
+ * @param {string} subdomain - Target subdomain
+ * @param {number} version - Version number
+ * @param {number} fileCount - Number of files
+ * @param {number} totalBytes - Total bytes
+ * @param {string} folderName - Folder name
+ * @param {string|null} expiresAt - Expiration ISO timestamp
+ */
+export async function finalizeUpload(subdomain, version, fileCount, totalBytes, folderName, expiresAt = null) {
+    return completeUpload(subdomain, version, fileCount, totalBytes, folderName, expiresAt);
+}