@promptbook/cli 0.112.0-101 → 0.112.0-103

package/apps/agents-server/src/utils/upload/createBookEditorUploadHandler.ts

@@ -1,22 +1,20 @@
 'use client';
 
-import { upload } from '@vercel/blob/client';
-import type { number_percent, string_knowledge_source_content } from '@promptbook-local/types';
+import type { string_knowledge_source_content } from '@promptbook-local/types';
 import { getSafeCdnPath } from '../cdn/utils/getSafeCdnPath';
 import { normalizeUploadFilename } from '../normalization/normalizeUploadFilename';
+import {
+    buildDefaultUserFileUploadPath,
+    uploadFileToServer,
+    type FileUploadProgressCallback,
+} from './uploadFileToServer';
 
 /**
  * Progress callback invoked during file uploads.
  *
  * @private used by chat and book editors.
  */
-export type FileUploadProgressCallback = (
-    progress: number_percent,
-    stats?: {
-        loadedBytes: number;
-        totalBytes: number;
-    },
-) => void;
+export type { FileUploadProgressCallback };
 
 /**
  * Optional upload configuration such as progress reporting or cancellation.
@@ -55,8 +53,8 @@ type UploadPathBuilder = (normalizedFilename: string, pathPrefix: string) => str
 /**
  * Constant for build default user file path.
  */
-const buildDefaultUserFilePath: UploadPathBuilder = (normalizedFilename, pathPrefix) =>
-    pathPrefix ? `${pathPrefix}/user/files/${normalizedFilename}` : `user/files/${normalizedFilename}`;
+const buildDefaultUserFilePath: UploadPathBuilder = (normalizedFilename) =>
+    buildDefaultUserFileUploadPath(normalizedFilename);
 
 /**
  * Configuration of the shared upload handler.
@@ -95,33 +93,26 @@ export function createFileUploadHandler<ReturnType extends string = string>(
         const pathPrefix = process.env.NEXT_PUBLIC_CDN_PATH_PREFIX || '';
         const normalizedFilename = normalizeUploadFilename(file.name);
         const uploadPath = pathBuilder(normalizedFilename, pathPrefix);
-        const safeUploadPath = getSafeCdnPath({ pathname: uploadPath });
-
-        const blob = await upload(safeUploadPath, file, {
-            access: 'public',
-            handleUploadUrl: '/api/upload',
-            clientPayload: JSON.stringify({
-                purpose,
-                contentType: file.type || 'application/octet-stream',
-            }),
+        const safeUploadPath = getSafeCdnPath({ pathname: uploadPath, pathPrefix });
+
+        const uploadResult = await uploadFileToServer({
+            file,
+            pathname: safeUploadPath,
+            purpose,
+            contentType: file.type || 'application/octet-stream',
             abortSignal,
-            onUploadProgress: (progressEvent) => {
-                onProgress?.(progressEvent.percentage / 100, {
-                    loadedBytes: progressEvent.loaded,
-                    totalBytes: progressEvent.total,
-                });
-            },
+            onProgress,
         });
 
         if (returnShortUrl && process.env.NEXT_PUBLIC_CDN_PUBLIC_URL) {
             const slashIndex = uploadPath.lastIndexOf('/');
             const directoryPath = slashIndex === -1 ? '' : `${uploadPath.slice(0, slashIndex + 1)}`;
             const longUrlPrefix = `${process.env.NEXT_PUBLIC_CDN_PUBLIC_URL}/${directoryPath}`;
-            const shortUrl = blob.url.split(longUrlPrefix).join(shortUrlPrefix);
+            const shortUrl = uploadResult.url.split(longUrlPrefix).join(shortUrlPrefix);
             return shortUrl as ReturnType;
         }
 
-        return blob.url as ReturnType;
+        return uploadResult.url as ReturnType;
     };
 }
 

package/apps/agents-server/src/utils/upload/uploadFileToServer.ts

@@ -0,0 +1,113 @@
+'use client';
+
+import type { number_percent } from '@promptbook-local/types';
+
+/**
+ * Progress callback invoked during file uploads.
+ *
+ * @private used by chat, book editor, and admin upload surfaces.
+ */
+export type FileUploadProgressCallback = (
+    progress: number_percent,
+    stats?: {
+        loadedBytes: number;
+        totalBytes: number;
+    },
+) => void;
+
+/**
+ * Options for uploading one file through the Agents Server upload endpoint.
+ *
+ * @private used by browser upload helpers.
+ */
+export type ServerFileUploadOptions = {
+    file: File;
+    pathname: string;
+    purpose?: string;
+    contentType?: string;
+    abortSignal?: AbortSignal;
+    onProgress?: FileUploadProgressCallback;
+};
+
+/**
+ * Response returned by the Agents Server upload endpoint.
+ *
+ * @private used by browser upload helpers.
+ */
+export type ServerFileUploadResult = {
+    url: string;
+    pathname: string;
+    contentType: string;
+    size: number;
+};
+
+/**
+ * Builds the default CDN key used for user-uploaded files.
+ *
+ * @private shared by browser upload surfaces.
+ */
+export function buildDefaultUserFileUploadPath(normalizedFilename: string): string {
+    return `user/files/${normalizedFilename}`;
+}
+
+/**
+ * Uploads one browser file to `/api/upload` using normal multipart form data.
+ *
+ * @private shared by browser upload surfaces.
+ */
+export function uploadFileToServer(options: ServerFileUploadOptions): Promise<ServerFileUploadResult> {
+    const { file, pathname, purpose = 'GENERIC_UPLOAD', contentType = file.type || 'application/octet-stream' } = options;
+
+    return new Promise((resolve, reject) => {
+        const request = new XMLHttpRequest();
+        const formData = new FormData();
+
+        formData.append('file', file);
+        formData.append('pathname', pathname);
+        formData.append('purpose', purpose);
+        formData.append('contentType', contentType);
+
+        request.open('POST', '/api/upload');
+        request.responseType = 'json';
+
+        request.upload.onprogress = (event) => {
+            if (!event.lengthComputable || !options.onProgress) {
+                return;
+            }
+
+            options.onProgress(event.loaded / event.total, {
+                loadedBytes: event.loaded,
+                totalBytes: event.total,
+            });
+        };
+
+        request.onload = () => {
+            const responseBody = request.response as Partial<ServerFileUploadResult> & { error?: string } | null;
+
+            if (request.status >= 200 && request.status < 300 && responseBody?.url) {
+                options.onProgress?.(1 as number_percent, {
+                    loadedBytes: file.size,
+                    totalBytes: file.size,
+                });
+
+                resolve(responseBody as ServerFileUploadResult);
+                return;
+            }
+
+            reject(new Error(responseBody?.error || `File upload failed with HTTP ${request.status}.`));
+        };
+
+        request.onerror = () => reject(new Error('File upload failed.'));
+        request.onabort = () => reject(new DOMException('File upload was aborted.', 'AbortError'));
+
+        options.abortSignal?.addEventListener(
+            'abort',
+            () => {
+                request.abort();
+            },
+            { once: true },
+        );
+
+        request.send(formData);
+    });
+}