@smoothglue/sync-whiteboard 1.1.0 → 1.1.2

package/dist/assets.js

@@ -15,8 +15,26 @@ if (!ASSET_STORAGE_URL) {
     process.exit(1);
 }
 logger_1.default.info({ assetStorageUrl: ASSET_STORAGE_URL }, `[ASSETS] Using Asset Storage URL`);
+/**
+ * Buffers a Readable stream into an ArrayBuffer.
+ * @param stream The Node.js Readable stream.
+ * @returns A promise that resolves with an ArrayBuffer.
+ */
+async function streamToArrayBuffer(stream) {
+    return new Promise((resolve, reject) => {
+        const chunks = [];
+        stream.on("data", (chunk) => chunks.push(chunk));
+        stream.on("end", () => {
+            const buffer = Buffer.concat(chunks);
+            // Convert the final Node.js Buffer to a standard ArrayBuffer
+            resolve(buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength));
+        });
+        stream.on("error", reject);
+    });
+}
 /**
  * Stores an asset by proxying a PUT request to the configured asset storage backend.
+ * Wraps the file in a multipart/form-data request.
  * @param id - The unique identifier for the asset (generated by the client).
  * @param fileStream - The readable stream containing the asset data (from the client request).
  * @param contentType - The MIME type of the asset.
@@ -32,39 +50,35 @@ async function storeAsset(id, fileStream, contentType = "application/octet-strea
         logger_1.default.error({ assetId: id, receivedType: typeof fileStream }, "[ASSETS] Error: storeAsset received a non-readable stream type.");
         throw new Error("Invalid stream type provided to storeAsset.");
     }
-    let webStream = null;
     try {
-        // Convert Node.js stream to Web Standard stream for fetch body
-        webStream = stream_1.Readable.toWeb(fileStream);
-        // Sanitize the filename for use in the Content-Disposition header
-        // This removes non-ASCII characters that can crash the fetch call.
-        const sanitizedFilename = originalFilename.replace(/[^\x00-\x7F]/g, "");
+        // Buffer the stream into memory to create a Blob.
+        const arrayBuffer = await streamToArrayBuffer(fileStream);
+        const blob = new Blob([arrayBuffer], { type: contentType });
+        // Create a FormData payload. The backend expects the file under the 'file' field name.
+        const formData = new FormData();
+        formData.append("file", blob, originalFilename);
+        // Prepare headers. Do NOT manually set the 'Content-Type' header.
+        // The 'fetch' API will automatically set the correct 'multipart/form-data' boundary.
         const headers = {
-            "Content-Type": contentType,
-            "X-Original-Filename": encodeURIComponent(originalFilename), // Pass the original filename (properly encoded) for the backend to use
-            "Content-Disposition": `attachment; filename="${sanitizedFilename}"`, // Use the sanitized filename in the Content-Disposition header to avoid errors
+            "X-Original-Filename": encodeURIComponent(originalFilename),
+            "Content-Disposition": `attachment; filename="${originalFilename.replace(/[^\x00-\x7F]/g, "")}"`,
         };
-        // forward auth headers if included from client
-        // Prioritize Authorization header, but fall back to Cookie
         if (credentials?.authorization) {
             headers["Authorization"] = credentials.authorization;
         }
         if (credentials?.cookie) {
             headers["Cookie"] = credentials.cookie;
         }
-        // Make the PUT request to the asset storage backend
+        // Make the request using the FormData as the body.
         const response = await fetch(url, {
             method: "PUT",
             headers: headers,
-            body: webStream, // Cast is necessary due to type mismatches
-            // @ts-ignore - duplex: 'half' is required for streaming request bodies with Node fetch
-            duplex: "half",
+            body: formData, // Use the FormData object as the body
         });
         logger_1.default.debug({ assetId: id, status: response.status }, `[ASSETS] Backend PUT response status`);
-        // Handle backend errors
         if (!response.ok) {
             const errorBody = await response.text();
-            const err = new Error(`Backend failed to store asset ${id}. Status: ${response.status}. Body: ${errorBody}. Headers ${headers}`);
+            const err = new Error(`Backend failed to store asset ${id}. Status: ${response.status}. Body: ${errorBody}. Headers ${JSON.stringify(headers)}`);
             logger_1.default.error({
                 err,
                 assetId: id,
@@ -72,33 +86,17 @@ async function storeAsset(id, fileStream, contentType = "application/octet-strea
                 responseStatusText: response.statusText,
                 responseBody: errorBody,
             }, `[ASSETS] Error response from backend storing asset`);
-            // Ensure streams are closed on error
-            if (webStream) {
-                await webStream.cancel().catch((cancelErr) => logger_1.default.error({
-                    err: cancelErr,
-                    assetId: id,
-                    stage: "cancel_upload_after_failed_fetch",
-                }, `[ASSETS] Error cancelling upload webStream`));
-            }
             throw err;
         }
         logger_1.default.debug({ assetId: id, targetUrl: url }, `[ASSETS] Successfully proxied storage for asset`);
-        return id; // Return the ID, confirming success
+        return id;
     }
     catch (error) {
         logger_1.default.error({ err: error, assetId: id, targetUrl: url, operation: "storeAsset" }, `[ASSETS] Network or fetch error storing asset`);
-        // Clean up streams on error
         if (fileStream instanceof stream_1.Readable && !fileStream.destroyed) {
             fileStream.destroy(error instanceof Error ? error : new Error(String(error)));
         }
-        if (webStream) {
-            await webStream.cancel().catch((cancelErr) => logger_1.default.error({
-                err: cancelErr,
-                assetId: id,
-                stage: "cancel_upload_during_error_handling",
-            }, `[ASSETS] Error cancelling upload webStream`));
-        }
-        throw error; // Re-throw error for the server handler
+        throw error;
     }
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smoothglue/sync-whiteboard",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "main": "dist/server.js",
   "scripts": {
     "dev": "ts-node-dev --respawn --transpile-only src/server.ts",
@@ -25,19 +25,22 @@
     "url": "https://code.build.smoothglue.io/braingu/smoothglue/frontend/sync-whiteboard.git"
   },
   "devDependencies": {
-    "@types/node": "^22.18.0",
-    "@types/ws": "^8.18.1",
-    "ts-node": "^10.9.2",
-    "ts-node-dev": "^2.0.0",
-    "typescript": "^5.9.2"
+    "@types/node": "22.18.0",
+    "@types/ws": "8.18.1",
+    "ts-node": "10.9.2",
+    "ts-node-dev": "2.0.0",
+    "typescript": "5.9.2"
   },
   "dependencies": {
     "@fastify/cors": "^11.0.1",
     "@fastify/websocket": "^11.0.2",
     "@tldraw/sync-core": "^3.12.0",
     "@tldraw/tlschema": "^3.12.0",
-    "fastify": "^5.3.0",
-    "pino": "^9.7.0",
+    "fastify": "^5.7.4",
+    "pino": "^10.3.0",
     "ws": "^8.18.1"
+  },
+  "overrides": {
+    "diff": "^4.0.4"
   }
 }