@qvac/sdk 0.14.0 → 0.15.0

package/dist/server/rpc/handlers/load-model/http.js

@@ -1,15 +1,15 @@
-import fs, { promises as fsPromises } from "bare-fs";
-import path from "bare-path";
-import { Readable } from "bare-stream";
-import fetch, { Headers } from "bare-fetch";
-import { AbortController } from "bare-abort-controller";
-import { withTimeout } from "../../../../utils/withTimeout.js";
-import { getModelsCacheDir, getShardedModelCacheDir, generateShortHash, detectShardedModel, parsePatternBasedShardUrl, extractTensorsFromShards, calculatePercentage, isArchiveUrl, sanitizePathComponent, extractAndValidateShardedArchive, validateShardedModelCache, checkAllShardsExist, generateShardFilenames, hasValidGGUFHeader, } from "../../../utils/index.js";
-import { getSDKConfig } from "../../../bare/registry/config-registry.js";
-import { getLifecycleState, onResume } from "../../../bare/runtime-lifecycle.js";
-import { createHttpDownloadKey, startOrJoinDownload, applyJoinedDownloadStats, } from "./download-manager.js";
-import { DownloadCancelledError, HTTPError, NoResponseBodyError, PartialDownloadOfflineError, ResponseBodyNotReadableError, } from "../../../../utils/errors-server.js";
-import { getServerLogger } from "../../../../logging/index.js";
+import fs, { promises as fsPromises } from 'bare-fs';
+import path from 'bare-path';
+import { Readable } from 'bare-stream';
+import fetch, { Headers } from 'bare-fetch';
+import { AbortController } from 'bare-abort-controller';
+import { withTimeout } from '../../../../utils/withTimeout.js';
+import { getModelsCacheDir, getShardedModelCacheDir, generateShortHash, detectShardedModel, parsePatternBasedShardUrl, extractTensorsFromShards, calculatePercentage, isArchiveUrl, sanitizePathComponent, extractAndValidateShardedArchive, validateShardedModelCache, checkAllShardsExist, generateShardFilenames, hasValidGGUFHeader } from '../../../utils/index.js';
+import { getSDKConfig } from '../../../bare/registry/config-registry.js';
+import { getLifecycleState, onResume } from '../../../bare/runtime-lifecycle.js';
+import { createHttpDownloadKey, startOrJoinDownload, applyJoinedDownloadStats } from './download-manager.js';
+import { DownloadCancelledError, HTTPError, NoResponseBodyError, PartialDownloadOfflineError, ResponseBodyNotReadableError } from '../../../../utils/errors-server.js';
+import { getServerLogger } from '../../../../logging/index.js';
 const logger = getServerLogger();
 const DEFAULT_CONCURRENCY = 3;
 const DEFAULT_HTTP_CONNECTION_TIMEOUT_MS = 10_000;
@@ -19,10 +19,10 @@ const DEFAULT_HTTP_CONNECTION_TIMEOUT_MS = 10_000;
 const HTTP_STREAM_STALL_TIMEOUT_MS = 10_000;
 function extractFilenameFromUrl(url) {
     // Parse URL to get the filename from the path
-    const urlParts = url.split("/");
-    const filename = urlParts[urlParts.length - 1] || "model.gguf";
+    const urlParts = url.split('/');
+    const filename = urlParts[urlParts.length - 1] || 'model.gguf';
     // Remove query parameters if present
-    const cleanFilename = filename.split("?")[0] || "model.gguf";
+    const cleanFilename = filename.split('?')[0] || 'model.gguf';
     // Sanitize to prevent path traversal via crafted URLs
     return sanitizePathComponent(cleanFilename);
 }
@@ -36,10 +36,10 @@ async function validateCachedFile(modelPath, url, signal) {
         let expectedSize = 0;
         try {
             const response = await withTimeout(fetch(url, {
-                method: "HEAD",
-                ...(signal && { signal }),
+                method: 'HEAD',
+                ...(signal && { signal })
             }), connectionTimeout);
-            expectedSize = parseInt(response.headers.get("content-length") || "0");
+            expectedSize = parseInt(response.headers.get('content-length') || '0');
         }
         catch (headError) {
             logger.warn(`⚠️ HEAD request failed: ${headError instanceof Error ? headError.message : String(headError)}`);
@@ -91,19 +91,19 @@ async function performHttpDownload(url, modelPath, downloadKey, progressCallback
     }
     // Prepare headers for resume if needed
     const headers = new Headers({
-        "User-Agent": "qvac-sdk",
+        'User-Agent': 'qvac-sdk'
     });
     if (startOffset > 0) {
-        headers.append("Range", `bytes=${startOffset}-`);
+        headers.append('Range', `bytes=${startOffset}-`);
     }
     const config = getSDKConfig();
     const connectionTimeout = config.httpConnectionTimeoutMs ?? DEFAULT_HTTP_CONNECTION_TIMEOUT_MS;
     let response;
     try {
         response = await withTimeout(fetch(url, {
-            method: "GET",
+            method: 'GET',
             headers,
-            ...(signal && { signal }),
+            ...(signal && { signal })
         }), connectionTimeout);
     }
     catch (error) {
@@ -123,11 +123,11 @@ async function performHttpDownload(url, modelPath, downloadKey, progressCallback
             // Send 100% progress for already complete file
             if (progressCallback) {
                 progressCallback({
-                    type: "modelProgress",
+                    type: 'modelProgress',
                     downloaded: startOffset,
                     total: startOffset,
                     percentage: 100,
-                    downloadKey,
+                    downloadKey
                 });
             }
             return;
@@ -139,11 +139,11 @@ async function performHttpDownload(url, modelPath, downloadKey, progressCallback
             downloadedBytes = 0;
             // Retry without Range header
             response = await fetch(url, {
-                method: "GET",
+                method: 'GET',
                 headers: new Headers({
-                    "User-Agent": "qvac-sdk",
+                    'User-Agent': 'qvac-sdk'
                 }),
-                ...(signal && { signal }),
+                ...(signal && { signal })
             });
             if (!response.ok) {
                 throw new HTTPError(response.status, response.statusText);
@@ -156,10 +156,10 @@ async function performHttpDownload(url, modelPath, downloadKey, progressCallback
     }
     // Get total size from headers
     let totalBytes = 0;
-    const contentLength = response.headers.get("content-length");
+    const contentLength = response.headers.get('content-length');
     if (response.status === 206) {
         // For resumed downloads, parse Content-Range header
-        const contentRange = response.headers.get("content-range");
+        const contentRange = response.headers.get('content-range');
         if (contentRange) {
             const match = contentRange.match(/bytes \d+-\d+\/(\d+)/);
             if (match && match[1]) {
@@ -173,7 +173,7 @@ async function performHttpDownload(url, modelPath, downloadKey, progressCallback
     }
     logger.info(`📏 Total size: ${totalBytes} bytes (${(totalBytes / 1024 / 1024).toFixed(2)} MB)`);
     // Create write stream (append if resuming)
-    const writeStreamOptions = startOffset > 0 && response.status === 206 ? { flags: "a" } : {};
+    const writeStreamOptions = startOffset > 0 && response.status === 206 ? { flags: 'a' } : {};
     const writeStream = fs.createWriteStream(modelPath, writeStreamOptions);
     // Get the response body
     const body = response.body;
@@ -183,8 +183,8 @@ async function performHttpDownload(url, modelPath, downloadKey, progressCallback
     try {
         // Check if body has pipe method (it's a Node/Bare stream)
         const isReadable = body instanceof Readable ||
-            (typeof body.pipe === "function" &&
-                typeof body.on === "function");
+            (typeof body.pipe === 'function' &&
+                typeof body.on === 'function');
         if (isReadable) {
             // Wait for download to complete
             await new Promise((resolve, reject) => {
@@ -200,6 +200,7 @@ async function performHttpDownload(url, modelPath, downloadKey, progressCallback
                 const armStall = () => {
                     clearStall();
                     stallTimer = setTimeout(() => {
+                        ;
                         body.destroy();
                         writeStream.destroy();
                         reject(new Error(`HTTP stream stalled: no data for ${HTTP_STREAM_STALL_TIMEOUT_MS}ms`));
@@ -216,38 +217,38 @@ async function performHttpDownload(url, modelPath, downloadKey, progressCallback
                         abortHandler();
                         return;
                     }
-                    signal.addEventListener("abort", abortHandler);
+                    signal.addEventListener('abort', abortHandler);
                 }
                 // Track progress + keep the stall watchdog fed
-                body.on("data", (chunk) => {
+                ;
+                body.on('data', (chunk) => {
                     armStall();
                     downloadedBytes += chunk.length;
                     if (progressCallback) {
                         progressCallback({
-                            type: "modelProgress",
+                            type: 'modelProgress',
                             downloaded: downloadedBytes,
                             total: totalBytes,
                             percentage: calculatePercentage(downloadedBytes, totalBytes),
-                            downloadKey,
+                            downloadKey
                         });
                     }
                 });
-                // Pipe directly to file
                 body.pipe(writeStream);
                 armStall();
-                writeStream.on("finish", () => {
+                writeStream.on('finish', () => {
                     clearStall();
                     logger.info(`✅ Model downloaded successfully to ${modelPath}`);
                     if (signal) {
-                        signal.removeEventListener("abort", abortHandler);
+                        signal.removeEventListener('abort', abortHandler);
                     }
                     resolve(undefined);
                 });
-                writeStream.on("error", (error) => {
+                writeStream.on('error', (error) => {
                     clearStall();
                     reject(error);
                 });
-                body.on("error", (error) => {
+                body.on('error', (error) => {
                     clearStall();
                     reject(error);
                 });
@@ -274,7 +275,7 @@ async function performHttpDownload(url, modelPath, downloadKey, progressCallback
                                     stalled = true;
                                     reject(new Error(`HTTP stream stalled: no data for ${HTTP_STREAM_STALL_TIMEOUT_MS}ms`));
                                 }, HTTP_STREAM_STALL_TIMEOUT_MS);
-                            }),
+                            })
                         ]);
                     }
                     finally {
@@ -287,17 +288,15 @@ async function performHttpDownload(url, modelPath, downloadKey, progressCallback
                         writeStream.destroy();
                         throw new DownloadCancelledError();
                     }
-                    const buffer = Buffer.isBuffer(step.value)
-                        ? step.value
-                        : Buffer.from(step.value);
+                    const buffer = Buffer.isBuffer(step.value) ? step.value : Buffer.from(step.value);
                     downloadedBytes += buffer.length;
                     if (progressCallback) {
                         progressCallback({
-                            type: "modelProgress",
+                            type: 'modelProgress',
                             downloaded: downloadedBytes,
                             total: totalBytes,
                             percentage: calculatePercentage(downloadedBytes, totalBytes),
-                            downloadKey,
+                            downloadKey
                         });
                     }
                     // Write chunk to file
@@ -327,15 +326,13 @@ async function performHttpDownload(url, modelPath, downloadKey, progressCallback
                     logger.info(`✅ Model downloaded successfully to ${modelPath}`);
                     resolve();
                 });
-                writeStream.on("error", reject);
+                writeStream.on('error', reject);
             });
         }
         else {
             // Fallback: getReader() for a WHATWG ReadableStream (bare-fetch body).
             const readableStreamBody = body;
-            const reader = readableStreamBody.getReader
-                ? readableStreamBody.getReader()
-                : null;
+            const reader = readableStreamBody.getReader ? readableStreamBody.getReader() : null;
             if (reader) {
                 let cancelled = false;
                 try {
@@ -356,7 +353,7 @@ async function performHttpDownload(url, modelPath, downloadKey, progressCallback
                                         cancelled = true;
                                         reject(new Error(`HTTP stream stalled: no data for ${HTTP_STREAM_STALL_TIMEOUT_MS}ms`));
                                     }, HTTP_STREAM_STALL_TIMEOUT_MS);
-                                }),
+                                })
                             ]);
                         }
                         finally {
@@ -374,11 +371,11 @@ async function performHttpDownload(url, modelPath, downloadKey, progressCallback
                         downloadedBytes += buffer.length;
                         if (progressCallback) {
                             progressCallback({
-                                type: "modelProgress",
+                                type: 'modelProgress',
                                 downloaded: downloadedBytes,
                                 total: totalBytes,
                                 percentage: calculatePercentage(downloadedBytes, totalBytes),
-                                downloadKey,
+                                downloadKey
                             });
                         }
                         // Write chunk to file
@@ -409,7 +406,7 @@ async function performHttpDownload(url, modelPath, downloadKey, progressCallback
                         logger.info(`✅ Model downloaded successfully to ${modelPath}`);
                         resolve();
                     });
-                    writeStream.on("error", reject);
+                    writeStream.on('error', reject);
                 });
             }
             else {
@@ -419,7 +416,7 @@ async function performHttpDownload(url, modelPath, downloadKey, progressCallback
     }
     catch (error) {
         writeStream.destroy();
-        logger.error("Error during download:", error instanceof Error ? error.message : String(error));
+        logger.error('Error during download:', error instanceof Error ? error.message : String(error));
         throw error instanceof Error ? error : new Error(String(error));
     }
 }
@@ -453,10 +450,10 @@ function isResumableTransferError(error) {
  * only makes sense once `resume()` has run. Bounded and abort-aware.
  */
 async function waitForLifecycleActive(signal) {
-    if (getLifecycleState() === "active")
+    if (getLifecycleState() === 'active')
         return;
     const start = Date.now();
-    while (getLifecycleState() !== "active") {
+    while (getLifecycleState() !== 'active') {
         if (signal?.aborted)
             throw new DownloadCancelledError();
         if (Date.now() - start > LIFECYCLE_WAIT_MAX_MS)
@@ -485,7 +482,7 @@ async function performHttpDownloadWithResume(url, modelPath, downloadKey, progre
             if (signal.aborted)
                 attemptController.abort();
             else
-                signal.addEventListener("abort", forwardCancel, { once: true });
+                signal.addEventListener('abort', forwardCancel, { once: true });
         }
         // resume() → abort this attempt so it range-resumes now, not after the stall.
         const offResume = onResume(() => attemptController.abort());
@@ -497,9 +494,7 @@ async function performHttpDownloadWithResume(url, modelPath, downloadKey, progre
             // A real consumer cancel is terminal; anything else (resume abort, stall,
             // network error) is recoverable from the partial.
             if (signal?.aborted) {
-                throw error instanceof DownloadCancelledError
-                    ? error
-                    : new DownloadCancelledError();
+                throw error instanceof DownloadCancelledError ? error : new DownloadCancelledError();
             }
             attempt++;
             if (attempt > maxRetries || !isResumableTransferError(error))
@@ -510,7 +505,7 @@ async function performHttpDownloadWithResume(url, modelPath, downloadKey, progre
         }
         finally {
             if (signal)
-                signal.removeEventListener("abort", forwardCancel);
+                signal.removeEventListener('abort', forwardCancel);
             offResume();
         }
     }
@@ -539,17 +534,17 @@ export async function downloadModelFromHttp(url, progressCallback, hooks) {
                 try {
                     const stats = await fsPromises.stat(cachedPath);
                     ctx.broadcastProgress({
-                        type: "modelProgress",
+                        type: 'modelProgress',
                         downloaded: stats.size,
                         total: stats.size,
                         percentage: 100,
-                        downloadKey,
+                        downloadKey
                     });
                 }
                 catch (error) {
-                    logger.debug("Failed to get file stats for progress callback", {
+                    logger.debug('Failed to get file stats for progress callback', {
                         path: cachedPath,
-                        error,
+                        error
                     });
                 }
                 return cachedPath;
@@ -561,40 +556,40 @@ export async function downloadModelFromHttp(url, progressCallback, hooks) {
             try {
                 const stats = await fsPromises.stat(modelPath);
                 ctx.broadcastProgress({
-                    type: "modelProgress",
+                    type: 'modelProgress',
                     downloaded: stats.size,
                     total: stats.size,
                     percentage: 100,
-                    downloadKey,
+                    downloadKey
                 });
             }
             catch (error) {
-                logger.debug("Failed to get file stats for final progress update", {
+                logger.debug('Failed to get file stats for final progress update', {
                     path: modelPath,
-                    error,
+                    error
                 });
             }
             return modelPath;
         }
         catch (error) {
-            logger.error("❌ Error downloading model:", error instanceof Error ? error.message : String(error));
+            logger.error('❌ Error downloading model:', error instanceof Error ? error.message : String(error));
             // Check if we should delete the partial file (clearCache was requested)
             if (error instanceof DownloadCancelledError) {
                 if (ctx.shouldClearCache()) {
-                    logger.info("🗑️ Clearing cache - deleting partial file");
+                    logger.info('🗑️ Clearing cache - deleting partial file');
                     try {
                         await fsPromises.unlink(modelPath);
                         logger.info(`✅ Deleted partial file: ${modelPath}`);
                     }
                     catch (error) {
-                        logger.debug("Failed to delete partial file during cleanup", {
+                        logger.debug('Failed to delete partial file during cleanup', {
                             path: modelPath,
-                            error,
+                            error
                         });
                     }
                 }
                 else {
-                    logger.info("📥 Download paused - partial file preserved for resume");
+                    logger.info('📥 Download paused - partial file preserved for resume');
                 }
             }
             const errorToThrow = error instanceof Error ? error : new Error(String(error));
@@ -618,15 +613,15 @@ async function downloadShardedModelFromHttp(shardUrl, progressCallback, hooks) {
                 let expectedSize = 0;
                 try {
                     const response = await fetch(shard.url, {
-                        method: "HEAD",
-                        signal: ctx.signal,
+                        method: 'HEAD',
+                        signal: ctx.signal
                     });
-                    expectedSize = parseInt(response.headers.get("content-length") || "0");
+                    expectedSize = parseInt(response.headers.get('content-length') || '0');
                 }
                 catch (error) {
-                    logger.warn("Failed to get shard size via HEAD request", {
+                    logger.warn('Failed to get shard size via HEAD request', {
                         url: shard.url,
-                        error,
+                        error
                     });
                 }
                 return {
@@ -635,7 +630,7 @@ async function downloadShardedModelFromHttp(shardUrl, progressCallback, hooks) {
                     shardPath,
                     expectedSize,
                     downloadedBytes: 0,
-                    isComplete: false,
+                    isComplete: false
                 };
             }));
             const overallTotal = shardStates.reduce((sum, s) => sum + s.expectedSize, 0);
@@ -644,9 +639,7 @@ async function downloadShardedModelFromHttp(shardUrl, progressCallback, hooks) {
                 const cached = await validateCachedFile(state.shardPath, state.shard.url, ctx.signal);
                 return { state, isCached: cached !== null };
             }));
-            const shardsToDownload = cacheChecks
-                .filter((c) => !c.isCached)
-                .map((c) => c.state);
+            const shardsToDownload = cacheChecks.filter((c) => !c.isCached).map((c) => c.state);
             for (const check of cacheChecks) {
                 if (check.isCached) {
                     check.state.isComplete = true;
@@ -668,18 +661,18 @@ async function downloadShardedModelFromHttp(shardUrl, progressCallback, hooks) {
             return path.join(shardDir, shardInfos[0].filename);
         }
         catch (error) {
-            logger.error("❌ Error during sharded download:", error instanceof Error ? error.message : String(error));
+            logger.error('❌ Error during sharded download:', error instanceof Error ? error.message : String(error));
             if (error instanceof DownloadCancelledError) {
                 if (ctx.shouldClearCache()) {
-                    logger.info("🗑️ Clearing cache - deleting partial shard files");
+                    logger.info('🗑️ Clearing cache - deleting partial shard files');
                     try {
                         await fsPromises.rm(shardDir, { recursive: true, force: true });
                         logger.info(`✅ Deleted shard directory: ${shardDir}`);
                     }
                     catch (cleanupError) {
-                        logger.debug("Failed to delete shard directory during cleanup", {
+                        logger.debug('Failed to delete shard directory during cleanup', {
                             path: shardDir,
-                            error: cleanupError,
+                            error: cleanupError
                         });
                     }
                 }
@@ -723,11 +716,11 @@ async function downloadShardedModelFromArchive(archiveUrl, progressCallback, hoo
                 hooks?.markCacheHit?.();
                 ctx.setCacheHit(true);
                 ctx.broadcastProgress({
-                    type: "modelProgress",
+                    type: 'modelProgress',
                     downloaded: 1,
                     total: 1,
                     percentage: 100,
-                    downloadKey,
+                    downloadKey
                 });
                 return firstShard;
             }
@@ -738,17 +731,17 @@ async function downloadShardedModelFromArchive(archiveUrl, progressCallback, hoo
                 hooks?.markCacheHit?.();
                 ctx.setCacheHit(true);
                 ctx.broadcastProgress({
-                    type: "modelProgress",
+                    type: 'modelProgress',
                     downloaded: 1,
                     total: 1,
                     percentage: 100,
-                    downloadKey,
+                    downloadKey
                 });
                 return firstShard;
             }
             catch (error) {
                 logger.warn(`Failed to extract tensors, will re-download archive`, {
-                    error,
+                    error
                 });
                 hooks?.markCacheMiss?.();
                 ctx.setCacheHit(false);
@@ -756,21 +749,21 @@ async function downloadShardedModelFromArchive(archiveUrl, progressCallback, hoo
             }
         }
         catch (error) {
-            logger.error("❌ Error downloading/extracting archive:", error);
+            logger.error('❌ Error downloading/extracting archive:', error);
             if (error instanceof DownloadCancelledError) {
                 if (ctx.shouldClearCache()) {
-                    logger.info("🗑️ Clearing cache - deleting archive extract directory");
+                    logger.info('🗑️ Clearing cache - deleting archive extract directory');
                     try {
                         await fsPromises.rm(extractDir, {
                             recursive: true,
-                            force: true,
+                            force: true
                         });
                         logger.info(`✅ Deleted extract directory: ${extractDir}`);
                     }
                     catch (cleanupError) {
-                        logger.debug("Failed to delete extract directory during cleanup", {
+                        logger.debug('Failed to delete extract directory during cleanup', {
                             path: extractDir,
-                            error: cleanupError,
+                            error: cleanupError
                         });
                     }
                 }
@@ -786,9 +779,9 @@ async function downloadShardedModelFromArchive(archiveUrl, progressCallback, hoo
                 logger.info(`🗑️ Cleaned up archive file: ${archivePath}`);
             }
             catch (cleanupError) {
-                logger.debug("Failed to delete archive file during cleanup", {
+                logger.debug('Failed to delete archive file during cleanup', {
                     path: archivePath,
-                    error: cleanupError,
+                    error: cleanupError
                 });
             }
             return firstShardPath;
@@ -812,7 +805,7 @@ async function downloadShardsWithConcurrency(shardsToDownload, allShards, concur
                     if (progressCallback) {
                         const overallDownloaded = allShards.reduce((sum, s) => sum + s.downloadedBytes, 0);
                         progressCallback({
-                            type: "modelProgress",
+                            type: 'modelProgress',
                             downloaded: state.downloadedBytes,
                             total: state.expectedSize,
                             percentage: calculatePercentage(state.downloadedBytes, state.expectedSize),
@@ -823,8 +816,8 @@ async function downloadShardsWithConcurrency(shardsToDownload, allShards, concur
                                 shardName: state.shard.filename,
                                 overallDownloaded,
                                 overallTotal,
-                                overallPercentage: calculatePercentage(overallDownloaded, overallTotal),
-                            },
+                                overallPercentage: calculatePercentage(overallDownloaded, overallTotal)
+                            }
                         });
                     }
                 }, signal);
@@ -845,7 +838,7 @@ async function downloadShardsWithConcurrency(shardsToDownload, allShards, concur
     }
     if (progressCallback) {
         progressCallback({
-            type: "modelProgress",
+            type: 'modelProgress',
             downloaded: overallTotal,
             total: overallTotal,
             percentage: 100,
@@ -856,8 +849,8 @@ async function downloadShardsWithConcurrency(shardsToDownload, allShards, concur
                 shardName: allShards[allShards.length - 1].shard.filename,
                 overallDownloaded: overallTotal,
                 overallTotal,
-                overallPercentage: 100,
-            },
+                overallPercentage: 100
+            }
         });
     }
 }

package/dist/server/rpc/handlers/load-model/hyperdrive.d.ts

@@ -1,5 +1,5 @@
-import type { ModelProgressUpdate } from "../../../../schemas/index";
-import type { DownloadHooks } from "./types";
+import type { ModelProgressUpdate } from '../../../../schemas/index';
+import type { DownloadHooks } from './types';
 export declare function deleteCorestoreDirectory(corestoreDir: string): Promise<void>;
 export declare function downloadModelFromHyperdrive(hyperdriveKey: string, modelFileName: string, seed?: boolean, progressCallback?: (progress: ModelProgressUpdate) => void, hooks?: DownloadHooks, expectedChecksum?: string): Promise<string>;
 //# sourceMappingURL=hyperdrive.d.ts.map