@valbuild/server 0.73.1 → 0.74.0

package/dist/declarations/src/ValServer.d.ts

@@ -9,6 +9,7 @@ export type ValServerOptions = {
     valDisableRedirectUrl?: string;
     formatter?: (code: string, filePath: string) => string | Promise<string>;
     valBuildUrl?: string;
+    valContentUrl: string;
     valSecret?: string;
     apiKey?: string;
     project?: string;
@@ -20,7 +21,6 @@ export type ValServerConfig = ValServerOptions & ({
     config: ValConfig;
 } | {
     mode: "http";
-    valContentUrl: string;
     apiKey: string;
     project: string;
     commit: string;

package/dist/declarations/src/uploadRemoteFile.d.ts

@@ -1,24 +1,11 @@
 /// <reference types="node" />
 /// <reference types="node" />
-import { SerializedFileSchema, SerializedImageSchema } from "@valbuild/core";
-export declare function uploadRemoteFile(remoteHost: string, fileBuffer: Buffer, publicProjectId: string, bucket: string, filePath: `public/val/${string}`, schema: SerializedImageSchema | SerializedFileSchema, metadata: Record<string, unknown> | undefined, auth: {
+export declare function uploadRemoteFile(contentHost: string, project: string, bucket: string, fileHash: string, fileExt: string, fileBuffer: Buffer, auth: {
     pat: string;
 } | {
     apiKey: string;
 }): Promise<{
     success: true;
-    ref: string;
-} | {
-    success: false;
-    error: string;
-}>;
-export declare function uploadRemoteRef(fileBuffer: Buffer, ref: string, auth: {
-    pat: string;
-} | {
-    apiKey: string;
-}): Promise<{
-    success: true;
-    ref: string;
 } | {
     success: false;
     error: string;

package/dist/valbuild-server.cjs.dev.js

@@ -1474,7 +1474,7 @@ function encodeJwt(payload, sessionKey) {
 }
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
-const textEncoder$3 = new TextEncoder();
+const textEncoder$2 = new TextEncoder();
 const jsonOps = new patch.JSONOps();
 const tsOps = new TSOps(document => {
   return fp.pipe(analyzeValModule(document), fp.result.map(({
@@ -1504,12 +1504,12 @@ class ValOps {
     if (typeof input === "object") {
       return this.hashObject(input);
     }
-    return core.Internal.getSHA256Hash(textEncoder$3.encode(input));
+    return core.Internal.getSHA256Hash(textEncoder$2.encode(input));
   }
   hashObject(obj) {
     const collector = [];
     this.collectObjectRecursive(obj, collector);
-    return core.Internal.getSHA256Hash(textEncoder$3.encode(collector.join("")));
+    return core.Internal.getSHA256Hash(textEncoder$2.encode(collector.join("")));
   }
   collectObjectRecursive(item, collector) {
     if (typeof item === "string") {
@@ -2293,7 +2293,7 @@ class ValOps {
             error: new patch.PatchError("Value is not a string")
           };
         } else {
-          const sha256 = core.Internal.getSHA256Hash(textEncoder$3.encode(value));
+          const sha256 = core.Internal.getSHA256Hash(textEncoder$2.encode(value));
           files[filePath] = {
             value,
             sha256,
@@ -2558,33 +2558,13 @@ function computeChangedPatchParentRefs(currentPatches, deletePatchIds) {
   };
 }
 
-function getFileExt(filePath) {
-  // NOTE: We do not import the path module. This code is copied in different projects. We want the same implementation and which means that this might running in browser where path is not available).
-  return filePath.split(".").pop() || "";
-}
-
-const textEncoder$2 = new TextEncoder();
-async function uploadRemoteFile(remoteHost, fileBuffer, publicProjectId, bucket, filePath, schema, metadata, auth) {
-  const fileHash = core.Internal.remote.getFileHash(fileBuffer);
-  const coreVersion = core.Internal.VERSION.core || "unknown";
-  const fileExt = getFileExt(filePath);
-  const ref = core.Internal.remote.createRemoteRef(remoteHost, {
-    publicProjectId,
-    coreVersion,
-    bucket,
-    validationHash: core.Internal.remote.getValidationHash(coreVersion, schema, fileExt, metadata, fileHash, textEncoder$2),
-    fileHash,
-    filePath
-  });
-  return uploadRemoteRef(fileBuffer, ref, auth);
-}
-async function uploadRemoteRef(fileBuffer, ref, auth) {
+async function uploadRemoteFile(contentHost, project, bucket, fileHash, fileExt, fileBuffer, auth) {
   const authHeader = "apiKey" in auth ? {
     Authorization: `Bearer ${auth.apiKey}`
   } : {
     "x-val-pat": auth.pat
   };
-  const res = await fetch(ref, {
+  const res = await fetch(`${contentHost}/v1/${project}/remote/files/b/${bucket}/f/${fileHash}.${fileExt}`, {
     method: "PUT",
     headers: {
       ...authHeader,
@@ -2597,8 +2577,7 @@ async function uploadRemoteRef(fileBuffer, ref, auth) {
     if (res.status === 409) {
       // File already exists
       return {
-        success: true,
-        ref
+        success: true
       };
     }
     if ((_res$headers$get = res.headers.get("content-type")) !== null && _res$headers$get !== void 0 && _res$headers$get.includes("application/json")) {
@@ -2606,30 +2585,35 @@ async function uploadRemoteRef(fileBuffer, ref, auth) {
       if (json.message) {
         return {
           success: false,
-          error: `${ref}. Failed to upload file: ${json.message}.`
+          error: `Failed to upload remote file: ${json.message}.`
         };
       } else {
         return {
           success: false,
-          error: `${ref}. Failed to upload file: ${JSON.stringify(json)}.`
+          error: `Failed to upload remote file: ${JSON.stringify(json)}.`
         };
       }
     }
     return {
       success: false,
-      error: `${ref}. Failed to upload file: ${await res.text()}.`
+      error: `An unexpected error occurred while uploading remote file. HTTP status was: ${await res.text()}.`
     };
   }
   return {
-    success: true,
-    ref
+    success: true
   };
 }
 
+function getFileExt(filePath) {
+  // NOTE: We do not import the path module. This code is copied in different projects. We want the same implementation and which means that this might running in browser where path is not available).
+  return filePath.split(".").pop() || "";
+}
+
 class ValOpsFS extends ValOps {
   static VAL_DIR = ".val";
-  constructor(rootDir, valModules, options) {
+  constructor(contentUrl, rootDir, valModules, options) {
     super(valModules, options);
+    this.contentUrl = contentUrl;
     this.rootDir = rootDir;
     this.host = new FSOpsHost();
   }
@@ -3238,6 +3222,7 @@ class ValOpsFS extends ValOps {
     for (const [ref, {
       patchId
     }] of remoteFileDescriptors) {
+      var _this$options4;
       const splitRemoteRefRes = core.Internal.remote.splitRemoteRef(ref);
       if (splitRemoteRefRes.status === "error") {
         errors[ref] = {
@@ -3256,8 +3241,14 @@ class ValOpsFS extends ValOps {
         console.log("Skip remote flag enabled. Skipping file upload", ref);
         continue;
       }
+      if (!((_this$options4 = this.options) !== null && _this$options4 !== void 0 && _this$options4.config.project)) {
+        errors[ref] = {
+          message: "No project found in config"
+        };
+        continue;
+      }
       console.log("Uploading remote file", ref);
-      const res = await uploadRemoteRef(fileBuffer, ref, auth);
+      const res = await uploadRemoteFile(this.contentUrl, this.options.config.project, splitRemoteRefRes.bucket, splitRemoteRefRes.fileHash, getFileExt(splitRemoteRefRes.filePath), fileBuffer, auth);
       if (!res.success) {
         console.error("Failed to upload remote file", ref, res.error);
         throw new Error(`Failed to upload remote file: ${ref}. ${res.error}`);
@@ -4443,7 +4434,7 @@ async function getSettings(projectName, auth) {
     if (response.status === 404) {
       return {
         success: false,
-        message: `Project '${projectName}' not found: verify that this project exists and that you have access to it.`
+        message: `Project '${projectName}' not found: that the name of the project is correct and that you have access to it.`
       };
     }
     if (response.status !== 200) {
@@ -4527,10 +4518,9 @@ function parsePersonalAccessTokenFile(content) {
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
 const ValServer = (valModules, options, callbacks) => {
-  process.env.VAL_REMOTE_HOST || core.DEFAULT_VAL_REMOTE_HOST;
   let serverOps;
   if (options.mode === "fs") {
-    serverOps = new ValOpsFS(options.cwd, valModules, {
+    serverOps = new ValOpsFS(options.valContentUrl, options.cwd, valModules, {
       formatter: options.formatter,
       config: options.config
     });
@@ -5107,7 +5097,7 @@ const ValServer = (valModules, options, callbacks) => {
             status: 400,
             json: {
               errorCode: "error-could-not-get-settings",
-              message: `Could not get settings: ${settingsRes.message}`
+              message: `Could not get settings id: ${settingsRes.message}`
             }
           };
         }
@@ -6098,12 +6088,12 @@ async function initHandlerOptions(route, opts, config) {
   const valDisableRedirectUrl = opts.valDisableRedirectUrl || process.env.VAL_DISABLE_REDIRECT_URL;
   const maybeValProject = opts.project || process.env.VAL_PROJECT;
   const valBuildUrl = opts.valBuildUrl || process.env.VAL_BUILD_URL || "https://app.val.build";
+  const valContentUrl = opts.valContentUrl || process.env.VAL_CONTENT_URL || "https://content.val.build";
   if (isProxyMode) {
     var _opts$versions, _opts$versions2;
     if (!maybeApiKey || !maybeValSecret) {
       throw new Error("VAL_API_KEY and VAL_SECRET env vars must both be set in proxy mode");
     }
-    const valContentUrl = opts.valContentUrl || process.env.VAL_CONTENT_URL || "https://content.val.build";
     const maybeGitCommit = opts.gitCommit || process.env.VAL_GIT_COMMIT;
     if (!maybeGitCommit) {
       throw new Error("VAL_GIT_COMMIT env var must be set in proxy mode");
@@ -6148,6 +6138,7 @@ async function initHandlerOptions(route, opts, config) {
       valDisableRedirectUrl,
       valEnableRedirectUrl,
       valBuildUrl,
+      valContentUrl,
       apiKey: maybeApiKey,
       valSecret: maybeValSecret,
       project: maybeValProject,
@@ -6794,15 +6785,23 @@ async function createFixPatch(config, apply, sourcePath, validationError, remote
           }
         }
       } else if (fix === "image:add-metadata") {
-        patch$1.push({
-          op: "add",
-          path: patch.sourceToPatchPath(sourcePath).concat("metadata"),
-          value: {
-            width: imageMetadata.width,
-            height: imageMetadata.height,
-            mimeType: imageMetadata.mimeType
-          }
-        });
+        if (!imageMetadata.mimeType) {
+          remainingErrors.push({
+            ...validationError,
+            message: "Failed to get image metadata",
+            fixes: undefined
+          });
+        } else {
+          patch$1.push({
+            op: "add",
+            path: patch.sourceToPatchPath(sourcePath).concat("metadata"),
+            value: {
+              width: imageMetadata.width,
+              height: imageMetadata.height,
+              mimeType: imageMetadata.mimeType
+            }
+          });
+        }
       }
     } else if (fix === "file:add-metadata" || fix === "file:check-metadata") {
       const fileMetadata = await getFileMetadata(config.projectRoot, validationError);
@@ -6864,7 +6863,21 @@ async function createFixPatch(config, apply, sourcePath, validationError, remote
       }
     } else if (fix === "image:upload-remote" || fix === "file:upload-remote") {
       const remoteFile = remoteFiles[sourcePath];
-      if (!remoteFile) {
+      let metadata = remoteFile.metadata;
+      if (!metadata) {
+        if (fix === "image:upload-remote") {
+          metadata = await getImageMetadata(config.projectRoot, validationError);
+        } else if (fix === "file:upload-remote") {
+          metadata = await getFileMetadata(config.projectRoot, validationError);
+        }
+      }
+      if (!metadata) {
+        remainingErrors.push({
+          ...validationError,
+          message: "Failed to get metadata for remote file",
+          fixes: undefined
+        });
+      } else if (!remoteFile) {
         remainingErrors.push({
           ...validationError,
           message: "Cannot fix local to remote image: remote image was not uploaded",
@@ -6876,7 +6889,7 @@ async function createFixPatch(config, apply, sourcePath, validationError, remote
           value: {
             _type: "remote",
             _ref: remoteFile.ref,
-            metadata: remoteFile.metadata
+            metadata
           },
           path: patch.sourceToPatchPath(sourcePath)
         });

package/dist/valbuild-server.cjs.prod.js

@@ -1474,7 +1474,7 @@ function encodeJwt(payload, sessionKey) {
 }
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
-const textEncoder$3 = new TextEncoder();
+const textEncoder$2 = new TextEncoder();
 const jsonOps = new patch.JSONOps();
 const tsOps = new TSOps(document => {
   return fp.pipe(analyzeValModule(document), fp.result.map(({
@@ -1504,12 +1504,12 @@ class ValOps {
     if (typeof input === "object") {
       return this.hashObject(input);
     }
-    return core.Internal.getSHA256Hash(textEncoder$3.encode(input));
+    return core.Internal.getSHA256Hash(textEncoder$2.encode(input));
   }
   hashObject(obj) {
     const collector = [];
     this.collectObjectRecursive(obj, collector);
-    return core.Internal.getSHA256Hash(textEncoder$3.encode(collector.join("")));
+    return core.Internal.getSHA256Hash(textEncoder$2.encode(collector.join("")));
   }
   collectObjectRecursive(item, collector) {
     if (typeof item === "string") {
@@ -2293,7 +2293,7 @@ class ValOps {
             error: new patch.PatchError("Value is not a string")
           };
         } else {
-          const sha256 = core.Internal.getSHA256Hash(textEncoder$3.encode(value));
+          const sha256 = core.Internal.getSHA256Hash(textEncoder$2.encode(value));
           files[filePath] = {
             value,
             sha256,
@@ -2558,33 +2558,13 @@ function computeChangedPatchParentRefs(currentPatches, deletePatchIds) {
   };
 }
 
-function getFileExt(filePath) {
-  // NOTE: We do not import the path module. This code is copied in different projects. We want the same implementation and which means that this might running in browser where path is not available).
-  return filePath.split(".").pop() || "";
-}
-
-const textEncoder$2 = new TextEncoder();
-async function uploadRemoteFile(remoteHost, fileBuffer, publicProjectId, bucket, filePath, schema, metadata, auth) {
-  const fileHash = core.Internal.remote.getFileHash(fileBuffer);
-  const coreVersion = core.Internal.VERSION.core || "unknown";
-  const fileExt = getFileExt(filePath);
-  const ref = core.Internal.remote.createRemoteRef(remoteHost, {
-    publicProjectId,
-    coreVersion,
-    bucket,
-    validationHash: core.Internal.remote.getValidationHash(coreVersion, schema, fileExt, metadata, fileHash, textEncoder$2),
-    fileHash,
-    filePath
-  });
-  return uploadRemoteRef(fileBuffer, ref, auth);
-}
-async function uploadRemoteRef(fileBuffer, ref, auth) {
+async function uploadRemoteFile(contentHost, project, bucket, fileHash, fileExt, fileBuffer, auth) {
   const authHeader = "apiKey" in auth ? {
     Authorization: `Bearer ${auth.apiKey}`
   } : {
     "x-val-pat": auth.pat
   };
-  const res = await fetch(ref, {
+  const res = await fetch(`${contentHost}/v1/${project}/remote/files/b/${bucket}/f/${fileHash}.${fileExt}`, {
     method: "PUT",
     headers: {
       ...authHeader,
@@ -2597,8 +2577,7 @@ async function uploadRemoteRef(fileBuffer, ref, auth) {
     if (res.status === 409) {
       // File already exists
       return {
-        success: true,
-        ref
+        success: true
       };
     }
     if ((_res$headers$get = res.headers.get("content-type")) !== null && _res$headers$get !== void 0 && _res$headers$get.includes("application/json")) {
@@ -2606,30 +2585,35 @@ async function uploadRemoteRef(fileBuffer, ref, auth) {
       if (json.message) {
         return {
           success: false,
-          error: `${ref}. Failed to upload file: ${json.message}.`
+          error: `Failed to upload remote file: ${json.message}.`
         };
       } else {
         return {
           success: false,
-          error: `${ref}. Failed to upload file: ${JSON.stringify(json)}.`
+          error: `Failed to upload remote file: ${JSON.stringify(json)}.`
         };
       }
     }
     return {
       success: false,
-      error: `${ref}. Failed to upload file: ${await res.text()}.`
+      error: `An unexpected error occurred while uploading remote file. HTTP status was: ${await res.text()}.`
     };
   }
   return {
-    success: true,
-    ref
+    success: true
   };
 }
 
+function getFileExt(filePath) {
+  // NOTE: We do not import the path module. This code is copied in different projects. We want the same implementation and which means that this might running in browser where path is not available).
+  return filePath.split(".").pop() || "";
+}
+
 class ValOpsFS extends ValOps {
   static VAL_DIR = ".val";
-  constructor(rootDir, valModules, options) {
+  constructor(contentUrl, rootDir, valModules, options) {
     super(valModules, options);
+    this.contentUrl = contentUrl;
     this.rootDir = rootDir;
     this.host = new FSOpsHost();
   }
@@ -3238,6 +3222,7 @@ class ValOpsFS extends ValOps {
     for (const [ref, {
       patchId
     }] of remoteFileDescriptors) {
+      var _this$options4;
       const splitRemoteRefRes = core.Internal.remote.splitRemoteRef(ref);
       if (splitRemoteRefRes.status === "error") {
         errors[ref] = {
@@ -3256,8 +3241,14 @@ class ValOpsFS extends ValOps {
         console.log("Skip remote flag enabled. Skipping file upload", ref);
         continue;
       }
+      if (!((_this$options4 = this.options) !== null && _this$options4 !== void 0 && _this$options4.config.project)) {
+        errors[ref] = {
+          message: "No project found in config"
+        };
+        continue;
+      }
       console.log("Uploading remote file", ref);
-      const res = await uploadRemoteRef(fileBuffer, ref, auth);
+      const res = await uploadRemoteFile(this.contentUrl, this.options.config.project, splitRemoteRefRes.bucket, splitRemoteRefRes.fileHash, getFileExt(splitRemoteRefRes.filePath), fileBuffer, auth);
       if (!res.success) {
         console.error("Failed to upload remote file", ref, res.error);
         throw new Error(`Failed to upload remote file: ${ref}. ${res.error}`);
@@ -4443,7 +4434,7 @@ async function getSettings(projectName, auth) {
     if (response.status === 404) {
       return {
         success: false,
-        message: `Project '${projectName}' not found: verify that this project exists and that you have access to it.`
+        message: `Project '${projectName}' not found: that the name of the project is correct and that you have access to it.`
       };
     }
     if (response.status !== 200) {
@@ -4527,10 +4518,9 @@ function parsePersonalAccessTokenFile(content) {
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
 const ValServer = (valModules, options, callbacks) => {
-  process.env.VAL_REMOTE_HOST || core.DEFAULT_VAL_REMOTE_HOST;
   let serverOps;
   if (options.mode === "fs") {
-    serverOps = new ValOpsFS(options.cwd, valModules, {
+    serverOps = new ValOpsFS(options.valContentUrl, options.cwd, valModules, {
       formatter: options.formatter,
       config: options.config
     });
@@ -5107,7 +5097,7 @@ const ValServer = (valModules, options, callbacks) => {
             status: 400,
             json: {
               errorCode: "error-could-not-get-settings",
-              message: `Could not get settings: ${settingsRes.message}`
+              message: `Could not get settings id: ${settingsRes.message}`
             }
           };
         }
@@ -6098,12 +6088,12 @@ async function initHandlerOptions(route, opts, config) {
   const valDisableRedirectUrl = opts.valDisableRedirectUrl || process.env.VAL_DISABLE_REDIRECT_URL;
   const maybeValProject = opts.project || process.env.VAL_PROJECT;
   const valBuildUrl = opts.valBuildUrl || process.env.VAL_BUILD_URL || "https://app.val.build";
+  const valContentUrl = opts.valContentUrl || process.env.VAL_CONTENT_URL || "https://content.val.build";
   if (isProxyMode) {
     var _opts$versions, _opts$versions2;
     if (!maybeApiKey || !maybeValSecret) {
       throw new Error("VAL_API_KEY and VAL_SECRET env vars must both be set in proxy mode");
     }
-    const valContentUrl = opts.valContentUrl || process.env.VAL_CONTENT_URL || "https://content.val.build";
     const maybeGitCommit = opts.gitCommit || process.env.VAL_GIT_COMMIT;
     if (!maybeGitCommit) {
       throw new Error("VAL_GIT_COMMIT env var must be set in proxy mode");
@@ -6148,6 +6138,7 @@ async function initHandlerOptions(route, opts, config) {
       valDisableRedirectUrl,
       valEnableRedirectUrl,
       valBuildUrl,
+      valContentUrl,
       apiKey: maybeApiKey,
       valSecret: maybeValSecret,
       project: maybeValProject,
@@ -6794,15 +6785,23 @@ async function createFixPatch(config, apply, sourcePath, validationError, remote
           }
         }
       } else if (fix === "image:add-metadata") {
-        patch$1.push({
-          op: "add",
-          path: patch.sourceToPatchPath(sourcePath).concat("metadata"),
-          value: {
-            width: imageMetadata.width,
-            height: imageMetadata.height,
-            mimeType: imageMetadata.mimeType
-          }
-        });
+        if (!imageMetadata.mimeType) {
+          remainingErrors.push({
+            ...validationError,
+            message: "Failed to get image metadata",
+            fixes: undefined
+          });
+        } else {
+          patch$1.push({
+            op: "add",
+            path: patch.sourceToPatchPath(sourcePath).concat("metadata"),
+            value: {
+              width: imageMetadata.width,
+              height: imageMetadata.height,
+              mimeType: imageMetadata.mimeType
+            }
+          });
+        }
       }
     } else if (fix === "file:add-metadata" || fix === "file:check-metadata") {
       const fileMetadata = await getFileMetadata(config.projectRoot, validationError);
@@ -6864,7 +6863,21 @@ async function createFixPatch(config, apply, sourcePath, validationError, remote
       }
     } else if (fix === "image:upload-remote" || fix === "file:upload-remote") {
       const remoteFile = remoteFiles[sourcePath];
-      if (!remoteFile) {
+      let metadata = remoteFile.metadata;
+      if (!metadata) {
+        if (fix === "image:upload-remote") {
+          metadata = await getImageMetadata(config.projectRoot, validationError);
+        } else if (fix === "file:upload-remote") {
+          metadata = await getFileMetadata(config.projectRoot, validationError);
+        }
+      }
+      if (!metadata) {
+        remainingErrors.push({
+          ...validationError,
+          message: "Failed to get metadata for remote file",
+          fixes: undefined
+        });
+      } else if (!remoteFile) {
         remainingErrors.push({
           ...validationError,
           message: "Cannot fix local to remote image: remote image was not uploaded",
@@ -6876,7 +6889,7 @@ async function createFixPatch(config, apply, sourcePath, validationError, remote
           value: {
             _type: "remote",
             _ref: remoteFile.ref,
-            metadata: remoteFile.metadata
+            metadata
           },
           path: patch.sourceToPatchPath(sourcePath)
         });

package/dist/valbuild-server.esm.js

@@ -1,7 +1,7 @@
 import { newQuickJSWASMModule } from 'quickjs-emscripten';
 import ts from 'typescript';
 import { result, pipe } from '@valbuild/core/fp';
-import { FILE_REF_PROP, FILE_REF_SUBTYPE_TAG, VAL_EXTENSION, derefPatch, Internal, Schema, ImageSchema, RichTextSchema, FileSchema, DEFAULT_VAL_REMOTE_HOST } from '@valbuild/core';
+import { FILE_REF_PROP, FILE_REF_SUBTYPE_TAG, VAL_EXTENSION, derefPatch, Internal, Schema, ImageSchema, RichTextSchema, FileSchema } from '@valbuild/core';
 import { deepEqual, isNotRoot, PatchError, parseAndValidateArrayIndex, applyPatch, JSONOps, deepClone, sourceToPatchPath } from '@valbuild/core/patch';
 import * as fsPath from 'path';
 import fsPath__default from 'path';
@@ -1443,7 +1443,7 @@ function encodeJwt(payload, sessionKey) {
 }
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
-const textEncoder$3 = new TextEncoder();
+const textEncoder$2 = new TextEncoder();
 const jsonOps = new JSONOps();
 const tsOps = new TSOps(document => {
   return pipe(analyzeValModule(document), result.map(({
@@ -1473,12 +1473,12 @@ class ValOps {
     if (typeof input === "object") {
       return this.hashObject(input);
     }
-    return Internal.getSHA256Hash(textEncoder$3.encode(input));
+    return Internal.getSHA256Hash(textEncoder$2.encode(input));
   }
   hashObject(obj) {
     const collector = [];
     this.collectObjectRecursive(obj, collector);
-    return Internal.getSHA256Hash(textEncoder$3.encode(collector.join("")));
+    return Internal.getSHA256Hash(textEncoder$2.encode(collector.join("")));
   }
   collectObjectRecursive(item, collector) {
     if (typeof item === "string") {
@@ -2262,7 +2262,7 @@ class ValOps {
             error: new PatchError("Value is not a string")
           };
         } else {
-          const sha256 = Internal.getSHA256Hash(textEncoder$3.encode(value));
+          const sha256 = Internal.getSHA256Hash(textEncoder$2.encode(value));
           files[filePath] = {
             value,
             sha256,
@@ -2527,33 +2527,13 @@ function computeChangedPatchParentRefs(currentPatches, deletePatchIds) {
   };
 }
 
-function getFileExt(filePath) {
-  // NOTE: We do not import the path module. This code is copied in different projects. We want the same implementation and which means that this might running in browser where path is not available).
-  return filePath.split(".").pop() || "";
-}
-
-const textEncoder$2 = new TextEncoder();
-async function uploadRemoteFile(remoteHost, fileBuffer, publicProjectId, bucket, filePath, schema, metadata, auth) {
-  const fileHash = Internal.remote.getFileHash(fileBuffer);
-  const coreVersion = Internal.VERSION.core || "unknown";
-  const fileExt = getFileExt(filePath);
-  const ref = Internal.remote.createRemoteRef(remoteHost, {
-    publicProjectId,
-    coreVersion,
-    bucket,
-    validationHash: Internal.remote.getValidationHash(coreVersion, schema, fileExt, metadata, fileHash, textEncoder$2),
-    fileHash,
-    filePath
-  });
-  return uploadRemoteRef(fileBuffer, ref, auth);
-}
-async function uploadRemoteRef(fileBuffer, ref, auth) {
+async function uploadRemoteFile(contentHost, project, bucket, fileHash, fileExt, fileBuffer, auth) {
   const authHeader = "apiKey" in auth ? {
     Authorization: `Bearer ${auth.apiKey}`
   } : {
     "x-val-pat": auth.pat
   };
-  const res = await fetch(ref, {
+  const res = await fetch(`${contentHost}/v1/${project}/remote/files/b/${bucket}/f/${fileHash}.${fileExt}`, {
     method: "PUT",
     headers: {
       ...authHeader,
@@ -2566,8 +2546,7 @@ async function uploadRemoteRef(fileBuffer, ref, auth) {
     if (res.status === 409) {
       // File already exists
       return {
-        success: true,
-        ref
+        success: true
       };
     }
     if ((_res$headers$get = res.headers.get("content-type")) !== null && _res$headers$get !== void 0 && _res$headers$get.includes("application/json")) {
@@ -2575,30 +2554,35 @@ async function uploadRemoteRef(fileBuffer, ref, auth) {
       if (json.message) {
         return {
           success: false,
-          error: `${ref}. Failed to upload file: ${json.message}.`
+          error: `Failed to upload remote file: ${json.message}.`
         };
       } else {
         return {
           success: false,
-          error: `${ref}. Failed to upload file: ${JSON.stringify(json)}.`
+          error: `Failed to upload remote file: ${JSON.stringify(json)}.`
         };
       }
     }
     return {
       success: false,
-      error: `${ref}. Failed to upload file: ${await res.text()}.`
+      error: `An unexpected error occurred while uploading remote file. HTTP status was: ${await res.text()}.`
     };
   }
   return {
-    success: true,
-    ref
+    success: true
   };
 }
 
+function getFileExt(filePath) {
+  // NOTE: We do not import the path module. This code is copied in different projects. We want the same implementation and which means that this might running in browser where path is not available).
+  return filePath.split(".").pop() || "";
+}
+
 class ValOpsFS extends ValOps {
   static VAL_DIR = ".val";
-  constructor(rootDir, valModules, options) {
+  constructor(contentUrl, rootDir, valModules, options) {
     super(valModules, options);
+    this.contentUrl = contentUrl;
     this.rootDir = rootDir;
     this.host = new FSOpsHost();
   }
@@ -3207,6 +3191,7 @@ class ValOpsFS extends ValOps {
     for (const [ref, {
       patchId
     }] of remoteFileDescriptors) {
+      var _this$options4;
       const splitRemoteRefRes = Internal.remote.splitRemoteRef(ref);
       if (splitRemoteRefRes.status === "error") {
         errors[ref] = {
@@ -3225,8 +3210,14 @@ class ValOpsFS extends ValOps {
         console.log("Skip remote flag enabled. Skipping file upload", ref);
         continue;
       }
+      if (!((_this$options4 = this.options) !== null && _this$options4 !== void 0 && _this$options4.config.project)) {
+        errors[ref] = {
+          message: "No project found in config"
+        };
+        continue;
+      }
       console.log("Uploading remote file", ref);
-      const res = await uploadRemoteRef(fileBuffer, ref, auth);
+      const res = await uploadRemoteFile(this.contentUrl, this.options.config.project, splitRemoteRefRes.bucket, splitRemoteRefRes.fileHash, getFileExt(splitRemoteRefRes.filePath), fileBuffer, auth);
       if (!res.success) {
         console.error("Failed to upload remote file", ref, res.error);
         throw new Error(`Failed to upload remote file: ${ref}. ${res.error}`);
@@ -4412,7 +4403,7 @@ async function getSettings(projectName, auth) {
     if (response.status === 404) {
       return {
         success: false,
-        message: `Project '${projectName}' not found: verify that this project exists and that you have access to it.`
+        message: `Project '${projectName}' not found: that the name of the project is correct and that you have access to it.`
       };
     }
     if (response.status !== 200) {
@@ -4496,10 +4487,9 @@ function parsePersonalAccessTokenFile(content) {
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
 const ValServer = (valModules, options, callbacks) => {
-  process.env.VAL_REMOTE_HOST || DEFAULT_VAL_REMOTE_HOST;
   let serverOps;
   if (options.mode === "fs") {
-    serverOps = new ValOpsFS(options.cwd, valModules, {
+    serverOps = new ValOpsFS(options.valContentUrl, options.cwd, valModules, {
       formatter: options.formatter,
       config: options.config
     });
@@ -5076,7 +5066,7 @@ const ValServer = (valModules, options, callbacks) => {
             status: 400,
             json: {
               errorCode: "error-could-not-get-settings",
-              message: `Could not get settings: ${settingsRes.message}`
+              message: `Could not get settings id: ${settingsRes.message}`
             }
           };
         }
@@ -6067,12 +6057,12 @@ async function initHandlerOptions(route, opts, config) {
   const valDisableRedirectUrl = opts.valDisableRedirectUrl || process.env.VAL_DISABLE_REDIRECT_URL;
   const maybeValProject = opts.project || process.env.VAL_PROJECT;
   const valBuildUrl = opts.valBuildUrl || process.env.VAL_BUILD_URL || "https://app.val.build";
+  const valContentUrl = opts.valContentUrl || process.env.VAL_CONTENT_URL || "https://content.val.build";
   if (isProxyMode) {
     var _opts$versions, _opts$versions2;
     if (!maybeApiKey || !maybeValSecret) {
       throw new Error("VAL_API_KEY and VAL_SECRET env vars must both be set in proxy mode");
     }
-    const valContentUrl = opts.valContentUrl || process.env.VAL_CONTENT_URL || "https://content.val.build";
     const maybeGitCommit = opts.gitCommit || process.env.VAL_GIT_COMMIT;
     if (!maybeGitCommit) {
       throw new Error("VAL_GIT_COMMIT env var must be set in proxy mode");
@@ -6117,6 +6107,7 @@ async function initHandlerOptions(route, opts, config) {
       valDisableRedirectUrl,
       valEnableRedirectUrl,
       valBuildUrl,
+      valContentUrl,
       apiKey: maybeApiKey,
       valSecret: maybeValSecret,
       project: maybeValProject,
@@ -6763,15 +6754,23 @@ async function createFixPatch(config, apply, sourcePath, validationError, remote
           }
         }
       } else if (fix === "image:add-metadata") {
-        patch.push({
-          op: "add",
-          path: sourceToPatchPath(sourcePath).concat("metadata"),
-          value: {
-            width: imageMetadata.width,
-            height: imageMetadata.height,
-            mimeType: imageMetadata.mimeType
-          }
-        });
+        if (!imageMetadata.mimeType) {
+          remainingErrors.push({
+            ...validationError,
+            message: "Failed to get image metadata",
+            fixes: undefined
+          });
+        } else {
+          patch.push({
+            op: "add",
+            path: sourceToPatchPath(sourcePath).concat("metadata"),
+            value: {
+              width: imageMetadata.width,
+              height: imageMetadata.height,
+              mimeType: imageMetadata.mimeType
+            }
+          });
+        }
       }
     } else if (fix === "file:add-metadata" || fix === "file:check-metadata") {
       const fileMetadata = await getFileMetadata(config.projectRoot, validationError);
@@ -6833,7 +6832,21 @@ async function createFixPatch(config, apply, sourcePath, validationError, remote
       }
     } else if (fix === "image:upload-remote" || fix === "file:upload-remote") {
       const remoteFile = remoteFiles[sourcePath];
-      if (!remoteFile) {
+      let metadata = remoteFile.metadata;
+      if (!metadata) {
+        if (fix === "image:upload-remote") {
+          metadata = await getImageMetadata(config.projectRoot, validationError);
+        } else if (fix === "file:upload-remote") {
+          metadata = await getFileMetadata(config.projectRoot, validationError);
+        }
+      }
+      if (!metadata) {
+        remainingErrors.push({
+          ...validationError,
+          message: "Failed to get metadata for remote file",
+          fixes: undefined
+        });
+      } else if (!remoteFile) {
         remainingErrors.push({
           ...validationError,
           message: "Cannot fix local to remote image: remote image was not uploaded",
@@ -6845,7 +6858,7 @@ async function createFixPatch(config, apply, sourcePath, validationError, remote
           value: {
             _type: "remote",
             _ref: remoteFile.ref,
-            metadata: remoteFile.metadata
+            metadata
           },
           path: sourceToPatchPath(sourcePath)
         });

package/package.json

@@ -12,7 +12,7 @@
     "./package.json": "./package.json"
   },
   "types": "dist/valbuild-server.cjs.d.ts",
-  "version": "0.73.1",
+  "version": "0.74.0",
   "scripts": {
     "typecheck": "tsc --noEmit",
     "test": "jest",
@@ -23,9 +23,9 @@
     "@types/jest": "^29.2.5"
   },
   "dependencies": {
-    "@valbuild/core": "~0.73.1",
-    "@valbuild/shared": "~0.73.1",
-    "@valbuild/ui": "~0.73.1",
+    "@valbuild/core": "~0.74.0",
+    "@valbuild/shared": "~0.74.0",
+    "@valbuild/ui": "~0.74.0",
     "chokidar": "^4.0.1",
     "image-size": "^1.0.2",
     "minimatch": "^3.0.4",