@valbuild/server 0.60.11 → 0.60.13

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

@@ -82,7 +82,7 @@ type ValServerOverrides = Partial<{
      *
      * @example "myorg/my-project"
      */
-    valCloud: string;
+    remote: string;
     /**
      * After Val is enabled, redirect to this url.
      *

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

@@ -2560,7 +2560,7 @@ class ProxyValServer extends ValServer {
         };
       }
       const params = `commit=${encodeURIComponent(commit)}&root=${encodeURIComponent(this.apiOptions.root || "/")}&cwd=${encodeURIComponent(this.cwd)}`;
-      const url = new URL(`/v1/commit/${this.options.valName}/heads/${this.options.git.branch}/~?${params}`, this.options.valContentUrl);
+      const url = new URL(`/v1/commit/${this.options.remote}/heads/${this.options.git.branch}/~?${params}`, this.options.valContentUrl);
 
       // Creates a fresh copy of the fs. We cannot touch the existing fs, since there might be parallel operations?
       // We could perhaps free up the other fs while doing this operation, but uncertain if we can actually do that and if that would actually help on memory.
@@ -2615,13 +2615,11 @@ class ProxyValServer extends ValServer {
   async initRemoteFS(commit, remoteFS, token) {
     const params = new URLSearchParams(this.apiOptions.root ? {
       root: this.apiOptions.root,
-      commit,
-      cwd: this.cwd
+      commit
     } : {
-      commit,
-      cwd: this.cwd
+      commit
     });
-    const url = new URL(`/v1/fs/${this.options.valName}/heads/${this.options.git.branch}/~?${params}`, this.options.valContentUrl);
+    const url = new URL(`/v1/fs/${this.options.remote}/heads/${this.options.git.branch}/~?${params}`, this.options.valContentUrl);
     try {
       const fetchRes = await fetch(url, {
         headers: getAuthHeaders(token, "application/json")
@@ -2658,7 +2656,8 @@ class ProxyValServer extends ValServer {
             }
           };
         }
-        remoteFS.initializeWith(json.directories);
+        remoteFS.initializeWith(Object.fromEntries(Object.entries(json.directories).map(([dir, content]) => [path__namespace["default"].join(this.cwd, ...dir.split("/") // content is always posix - not sure that matters...
+        ), content])));
         return {
           status: 200
         };
@@ -2800,7 +2799,7 @@ class ProxyValServer extends ValServer {
   }
   async session(cookies) {
     return withAuth(this.options.valSecret, cookies, "session", async data => {
-      const url = new URL(`/api/val/${this.options.valName}/auth/session`, this.options.valBuildUrl);
+      const url = new URL(`/api/val/${this.options.remote}/auth/session`, this.options.valBuildUrl);
       const fetchRes = await fetch(url, {
         headers: getAuthHeaders(data.token, "application/json")
       });
@@ -2825,7 +2824,7 @@ class ProxyValServer extends ValServer {
     });
   }
   async consumeCode(code) {
-    const url = new URL(`/api/val/${this.options.valName}/auth/token`, this.options.valBuildUrl);
+    const url = new URL(`/api/val/${this.options.remote}/auth/token`, this.options.valBuildUrl);
     url.searchParams.set("code", encodeURIComponent(code));
     return fetch(url, {
       method: "POST",
@@ -2851,13 +2850,13 @@ class ProxyValServer extends ValServer {
     });
   }
   getAuthorizeUrl(publicValApiRoute, token) {
-    const url = new URL(`/auth/${this.options.valName}/authorize`, this.options.valBuildUrl);
+    const url = new URL(`/auth/${this.options.remote}/authorize`, this.options.valBuildUrl);
     url.searchParams.set("redirect_uri", encodeURIComponent(`${publicValApiRoute}/callback`));
     url.searchParams.set("state", token);
     return url.toString();
   }
   getAppErrorUrl(error) {
-    const url = new URL(`/auth/${this.options.valName}/authorize`, this.options.valBuildUrl);
+    const url = new URL(`/auth/${this.options.remote}/authorize`, this.options.valBuildUrl);
     url.searchParams.set("error", encodeURIComponent(error));
     return url.toString();
   }
@@ -2872,7 +2871,7 @@ class ProxyValServer extends ValServer {
       token
     }) => {
       const patchIds = query.id || [];
-      const url = new URL(`/v1/patches/${this.options.valName}/heads/${this.options.git.branch}/~`, this.options.valContentUrl);
+      const url = new URL(`/v1/patches/${this.options.remote}/heads/${this.options.git.branch}/~`, this.options.valContentUrl);
       const fetchRes = await fetch(url, {
         method: "DELETE",
         headers: getAuthHeaders(token, "application/json"),
@@ -2905,7 +2904,7 @@ class ProxyValServer extends ValServer {
       }
       const patchIds = query.id || [];
       const params = patchIds.length > 0 ? `commit=${encodeURIComponent(commit)}&${patchIds.map(id => `id=${encodeURIComponent(id)}`).join("&")}` : `commit=${encodeURIComponent(commit)}`;
-      const url = new URL(`/v1/patches/${this.options.valName}/heads/${this.options.git.branch}/~?${params}`, this.options.valContentUrl);
+      const url = new URL(`/v1/patches/${this.options.remote}/heads/${this.options.git.branch}/~?${params}`, this.options.valContentUrl);
       // Proxy patch to val.build
       const fetchRes = await fetch(url, {
         method: "GET",
@@ -2949,7 +2948,7 @@ class ProxyValServer extends ValServer {
         };
       }
       const patches = parsedPatches.data;
-      const url = new URL(`/v1/patches/${this.options.valName}/heads/${this.options.git.branch}/~?${params}`, this.options.valContentUrl);
+      const url = new URL(`/v1/patches/${this.options.remote}/heads/${this.options.git.branch}/~?${params}`, this.options.valContentUrl);
       // Proxy patch to val.build
       const fetchRes = await fetch(url, {
         method: "POST",
@@ -2968,7 +2967,7 @@ class ProxyValServer extends ValServer {
   }
   async getFiles(filePath, query, cookies) {
     return withAuth(this.options.valSecret, cookies, "getFiles", async data => {
-      const url = new URL(`/v1/files/${this.options.valName}${filePath}`, this.options.valContentUrl);
+      const url = new URL(`/v1/files/${this.options.remote}${filePath}`, this.options.valContentUrl);
       if (typeof query.sha256 === "string") {
         url.searchParams.append("sha256", query.sha256);
       } else {
@@ -3253,9 +3252,9 @@ async function initHandlerOptions(route, opts) {
     if (!maybeGitBranch) {
       throw new Error("VAL_GIT_BRANCH env var must be set in proxy mode");
     }
-    const maybeValName = opts.valCloud || process.env.VAL_CLOUD_NAME || process.env.VAL_NAME; // VAL_NAME is deprecated
-    if (!maybeValName) {
-      throw new Error("VAL_CLOUD_NAME env var must be set in proxy mode");
+    const maybeValRemote = opts.remote || process.env.VAL_REMOTE;
+    if (!maybeValRemote) {
+      throw new Error("Proxy mode does not work unless the 'remote' option in val.config is defined or the VAL_REMOTE env var is set.");
     }
     return {
       mode: "proxy",
@@ -3268,7 +3267,7 @@ async function initHandlerOptions(route, opts) {
         commit: maybeGitCommit,
         branch: maybeGitBranch
       },
-      valName: maybeValName,
+      remote: maybeValRemote,
       valEnableRedirectUrl: opts.valEnableRedirectUrl || process.env.VAL_ENABLE_REDIRECT_URL,
       valDisableRedirectUrl: opts.valDisableRedirectUrl || process.env.VAL_DISABLE_REDIRECT_URL
     };

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

@@ -2560,7 +2560,7 @@ class ProxyValServer extends ValServer {
         };
       }
       const params = `commit=${encodeURIComponent(commit)}&root=${encodeURIComponent(this.apiOptions.root || "/")}&cwd=${encodeURIComponent(this.cwd)}`;
-      const url = new URL(`/v1/commit/${this.options.valName}/heads/${this.options.git.branch}/~?${params}`, this.options.valContentUrl);
+      const url = new URL(`/v1/commit/${this.options.remote}/heads/${this.options.git.branch}/~?${params}`, this.options.valContentUrl);
 
       // Creates a fresh copy of the fs. We cannot touch the existing fs, since there might be parallel operations?
       // We could perhaps free up the other fs while doing this operation, but uncertain if we can actually do that and if that would actually help on memory.
@@ -2615,13 +2615,11 @@ class ProxyValServer extends ValServer {
   async initRemoteFS(commit, remoteFS, token) {
     const params = new URLSearchParams(this.apiOptions.root ? {
       root: this.apiOptions.root,
-      commit,
-      cwd: this.cwd
+      commit
     } : {
-      commit,
-      cwd: this.cwd
+      commit
     });
-    const url = new URL(`/v1/fs/${this.options.valName}/heads/${this.options.git.branch}/~?${params}`, this.options.valContentUrl);
+    const url = new URL(`/v1/fs/${this.options.remote}/heads/${this.options.git.branch}/~?${params}`, this.options.valContentUrl);
     try {
       const fetchRes = await fetch(url, {
         headers: getAuthHeaders(token, "application/json")
@@ -2658,7 +2656,8 @@ class ProxyValServer extends ValServer {
             }
           };
         }
-        remoteFS.initializeWith(json.directories);
+        remoteFS.initializeWith(Object.fromEntries(Object.entries(json.directories).map(([dir, content]) => [path__namespace["default"].join(this.cwd, ...dir.split("/") // content is always posix - not sure that matters...
+        ), content])));
         return {
           status: 200
         };
@@ -2800,7 +2799,7 @@ class ProxyValServer extends ValServer {
   }
   async session(cookies) {
     return withAuth(this.options.valSecret, cookies, "session", async data => {
-      const url = new URL(`/api/val/${this.options.valName}/auth/session`, this.options.valBuildUrl);
+      const url = new URL(`/api/val/${this.options.remote}/auth/session`, this.options.valBuildUrl);
       const fetchRes = await fetch(url, {
         headers: getAuthHeaders(data.token, "application/json")
       });
@@ -2825,7 +2824,7 @@ class ProxyValServer extends ValServer {
     });
   }
   async consumeCode(code) {
-    const url = new URL(`/api/val/${this.options.valName}/auth/token`, this.options.valBuildUrl);
+    const url = new URL(`/api/val/${this.options.remote}/auth/token`, this.options.valBuildUrl);
     url.searchParams.set("code", encodeURIComponent(code));
     return fetch(url, {
       method: "POST",
@@ -2851,13 +2850,13 @@ class ProxyValServer extends ValServer {
     });
   }
   getAuthorizeUrl(publicValApiRoute, token) {
-    const url = new URL(`/auth/${this.options.valName}/authorize`, this.options.valBuildUrl);
+    const url = new URL(`/auth/${this.options.remote}/authorize`, this.options.valBuildUrl);
     url.searchParams.set("redirect_uri", encodeURIComponent(`${publicValApiRoute}/callback`));
     url.searchParams.set("state", token);
     return url.toString();
   }
   getAppErrorUrl(error) {
-    const url = new URL(`/auth/${this.options.valName}/authorize`, this.options.valBuildUrl);
+    const url = new URL(`/auth/${this.options.remote}/authorize`, this.options.valBuildUrl);
     url.searchParams.set("error", encodeURIComponent(error));
     return url.toString();
   }
@@ -2872,7 +2871,7 @@ class ProxyValServer extends ValServer {
       token
     }) => {
       const patchIds = query.id || [];
-      const url = new URL(`/v1/patches/${this.options.valName}/heads/${this.options.git.branch}/~`, this.options.valContentUrl);
+      const url = new URL(`/v1/patches/${this.options.remote}/heads/${this.options.git.branch}/~`, this.options.valContentUrl);
       const fetchRes = await fetch(url, {
         method: "DELETE",
         headers: getAuthHeaders(token, "application/json"),
@@ -2905,7 +2904,7 @@ class ProxyValServer extends ValServer {
       }
       const patchIds = query.id || [];
       const params = patchIds.length > 0 ? `commit=${encodeURIComponent(commit)}&${patchIds.map(id => `id=${encodeURIComponent(id)}`).join("&")}` : `commit=${encodeURIComponent(commit)}`;
-      const url = new URL(`/v1/patches/${this.options.valName}/heads/${this.options.git.branch}/~?${params}`, this.options.valContentUrl);
+      const url = new URL(`/v1/patches/${this.options.remote}/heads/${this.options.git.branch}/~?${params}`, this.options.valContentUrl);
       // Proxy patch to val.build
       const fetchRes = await fetch(url, {
         method: "GET",
@@ -2949,7 +2948,7 @@ class ProxyValServer extends ValServer {
         };
       }
       const patches = parsedPatches.data;
-      const url = new URL(`/v1/patches/${this.options.valName}/heads/${this.options.git.branch}/~?${params}`, this.options.valContentUrl);
+      const url = new URL(`/v1/patches/${this.options.remote}/heads/${this.options.git.branch}/~?${params}`, this.options.valContentUrl);
       // Proxy patch to val.build
       const fetchRes = await fetch(url, {
         method: "POST",
@@ -2968,7 +2967,7 @@ class ProxyValServer extends ValServer {
   }
   async getFiles(filePath, query, cookies) {
     return withAuth(this.options.valSecret, cookies, "getFiles", async data => {
-      const url = new URL(`/v1/files/${this.options.valName}${filePath}`, this.options.valContentUrl);
+      const url = new URL(`/v1/files/${this.options.remote}${filePath}`, this.options.valContentUrl);
       if (typeof query.sha256 === "string") {
         url.searchParams.append("sha256", query.sha256);
       } else {
@@ -3253,9 +3252,9 @@ async function initHandlerOptions(route, opts) {
     if (!maybeGitBranch) {
       throw new Error("VAL_GIT_BRANCH env var must be set in proxy mode");
     }
-    const maybeValName = opts.valCloud || process.env.VAL_CLOUD_NAME || process.env.VAL_NAME; // VAL_NAME is deprecated
-    if (!maybeValName) {
-      throw new Error("VAL_CLOUD_NAME env var must be set in proxy mode");
+    const maybeValRemote = opts.remote || process.env.VAL_REMOTE;
+    if (!maybeValRemote) {
+      throw new Error("Proxy mode does not work unless the 'remote' option in val.config is defined or the VAL_REMOTE env var is set.");
     }
     return {
       mode: "proxy",
@@ -3268,7 +3267,7 @@ async function initHandlerOptions(route, opts) {
         commit: maybeGitCommit,
         branch: maybeGitBranch
       },
-      valName: maybeValName,
+      remote: maybeValRemote,
       valEnableRedirectUrl: opts.valEnableRedirectUrl || process.env.VAL_ENABLE_REDIRECT_URL,
       valDisableRedirectUrl: opts.valDisableRedirectUrl || process.env.VAL_DISABLE_REDIRECT_URL
     };

package/dist/valbuild-server.esm.js

@@ -2529,7 +2529,7 @@ class ProxyValServer extends ValServer {
         };
       }
       const params = `commit=${encodeURIComponent(commit)}&root=${encodeURIComponent(this.apiOptions.root || "/")}&cwd=${encodeURIComponent(this.cwd)}`;
-      const url = new URL(`/v1/commit/${this.options.valName}/heads/${this.options.git.branch}/~?${params}`, this.options.valContentUrl);
+      const url = new URL(`/v1/commit/${this.options.remote}/heads/${this.options.git.branch}/~?${params}`, this.options.valContentUrl);
 
       // Creates a fresh copy of the fs. We cannot touch the existing fs, since there might be parallel operations?
       // We could perhaps free up the other fs while doing this operation, but uncertain if we can actually do that and if that would actually help on memory.
@@ -2584,13 +2584,11 @@ class ProxyValServer extends ValServer {
   async initRemoteFS(commit, remoteFS, token) {
     const params = new URLSearchParams(this.apiOptions.root ? {
       root: this.apiOptions.root,
-      commit,
-      cwd: this.cwd
+      commit
     } : {
-      commit,
-      cwd: this.cwd
+      commit
     });
-    const url = new URL(`/v1/fs/${this.options.valName}/heads/${this.options.git.branch}/~?${params}`, this.options.valContentUrl);
+    const url = new URL(`/v1/fs/${this.options.remote}/heads/${this.options.git.branch}/~?${params}`, this.options.valContentUrl);
     try {
       const fetchRes = await fetch(url, {
         headers: getAuthHeaders(token, "application/json")
@@ -2627,7 +2625,8 @@ class ProxyValServer extends ValServer {
             }
           };
         }
-        remoteFS.initializeWith(json.directories);
+        remoteFS.initializeWith(Object.fromEntries(Object.entries(json.directories).map(([dir, content]) => [path__default.join(this.cwd, ...dir.split("/") // content is always posix - not sure that matters...
+        ), content])));
         return {
           status: 200
         };
@@ -2769,7 +2768,7 @@ class ProxyValServer extends ValServer {
   }
   async session(cookies) {
     return withAuth(this.options.valSecret, cookies, "session", async data => {
-      const url = new URL(`/api/val/${this.options.valName}/auth/session`, this.options.valBuildUrl);
+      const url = new URL(`/api/val/${this.options.remote}/auth/session`, this.options.valBuildUrl);
       const fetchRes = await fetch(url, {
         headers: getAuthHeaders(data.token, "application/json")
       });
@@ -2794,7 +2793,7 @@ class ProxyValServer extends ValServer {
     });
   }
   async consumeCode(code) {
-    const url = new URL(`/api/val/${this.options.valName}/auth/token`, this.options.valBuildUrl);
+    const url = new URL(`/api/val/${this.options.remote}/auth/token`, this.options.valBuildUrl);
     url.searchParams.set("code", encodeURIComponent(code));
     return fetch(url, {
       method: "POST",
@@ -2820,13 +2819,13 @@ class ProxyValServer extends ValServer {
     });
   }
   getAuthorizeUrl(publicValApiRoute, token) {
-    const url = new URL(`/auth/${this.options.valName}/authorize`, this.options.valBuildUrl);
+    const url = new URL(`/auth/${this.options.remote}/authorize`, this.options.valBuildUrl);
     url.searchParams.set("redirect_uri", encodeURIComponent(`${publicValApiRoute}/callback`));
     url.searchParams.set("state", token);
     return url.toString();
   }
   getAppErrorUrl(error) {
-    const url = new URL(`/auth/${this.options.valName}/authorize`, this.options.valBuildUrl);
+    const url = new URL(`/auth/${this.options.remote}/authorize`, this.options.valBuildUrl);
     url.searchParams.set("error", encodeURIComponent(error));
     return url.toString();
   }
@@ -2841,7 +2840,7 @@ class ProxyValServer extends ValServer {
       token
     }) => {
       const patchIds = query.id || [];
-      const url = new URL(`/v1/patches/${this.options.valName}/heads/${this.options.git.branch}/~`, this.options.valContentUrl);
+      const url = new URL(`/v1/patches/${this.options.remote}/heads/${this.options.git.branch}/~`, this.options.valContentUrl);
       const fetchRes = await fetch(url, {
         method: "DELETE",
         headers: getAuthHeaders(token, "application/json"),
@@ -2874,7 +2873,7 @@ class ProxyValServer extends ValServer {
       }
       const patchIds = query.id || [];
       const params = patchIds.length > 0 ? `commit=${encodeURIComponent(commit)}&${patchIds.map(id => `id=${encodeURIComponent(id)}`).join("&")}` : `commit=${encodeURIComponent(commit)}`;
-      const url = new URL(`/v1/patches/${this.options.valName}/heads/${this.options.git.branch}/~?${params}`, this.options.valContentUrl);
+      const url = new URL(`/v1/patches/${this.options.remote}/heads/${this.options.git.branch}/~?${params}`, this.options.valContentUrl);
       // Proxy patch to val.build
       const fetchRes = await fetch(url, {
         method: "GET",
@@ -2918,7 +2917,7 @@ class ProxyValServer extends ValServer {
         };
       }
       const patches = parsedPatches.data;
-      const url = new URL(`/v1/patches/${this.options.valName}/heads/${this.options.git.branch}/~?${params}`, this.options.valContentUrl);
+      const url = new URL(`/v1/patches/${this.options.remote}/heads/${this.options.git.branch}/~?${params}`, this.options.valContentUrl);
       // Proxy patch to val.build
       const fetchRes = await fetch(url, {
         method: "POST",
@@ -2937,7 +2936,7 @@ class ProxyValServer extends ValServer {
   }
   async getFiles(filePath, query, cookies) {
     return withAuth(this.options.valSecret, cookies, "getFiles", async data => {
-      const url = new URL(`/v1/files/${this.options.valName}${filePath}`, this.options.valContentUrl);
+      const url = new URL(`/v1/files/${this.options.remote}${filePath}`, this.options.valContentUrl);
       if (typeof query.sha256 === "string") {
         url.searchParams.append("sha256", query.sha256);
       } else {
@@ -3222,9 +3221,9 @@ async function initHandlerOptions(route, opts) {
     if (!maybeGitBranch) {
       throw new Error("VAL_GIT_BRANCH env var must be set in proxy mode");
     }
-    const maybeValName = opts.valCloud || process.env.VAL_CLOUD_NAME || process.env.VAL_NAME; // VAL_NAME is deprecated
-    if (!maybeValName) {
-      throw new Error("VAL_CLOUD_NAME env var must be set in proxy mode");
+    const maybeValRemote = opts.remote || process.env.VAL_REMOTE;
+    if (!maybeValRemote) {
+      throw new Error("Proxy mode does not work unless the 'remote' option in val.config is defined or the VAL_REMOTE env var is set.");
     }
     return {
       mode: "proxy",
@@ -3237,7 +3236,7 @@ async function initHandlerOptions(route, opts) {
         commit: maybeGitCommit,
         branch: maybeGitBranch
       },
-      valName: maybeValName,
+      remote: maybeValRemote,
       valEnableRedirectUrl: opts.valEnableRedirectUrl || process.env.VAL_ENABLE_REDIRECT_URL,
       valDisableRedirectUrl: opts.valDisableRedirectUrl || process.env.VAL_DISABLE_REDIRECT_URL
     };

package/package.json

@@ -12,7 +12,7 @@
     "./package.json": "./package.json"
   },
   "types": "dist/valbuild-server.cjs.d.ts",
-  "version": "0.60.11",
+  "version": "0.60.13",
   "scripts": {
     "typecheck": "tsc --noEmit",
     "test": "jest",
@@ -24,9 +24,9 @@
     "concurrently": "^7.6.0"
   },
   "dependencies": {
-    "@valbuild/core": "~0.60.11",
-    "@valbuild/shared": "~0.60.11",
-    "@valbuild/ui": "~0.60.11",
+    "@valbuild/core": "~0.60.13",
+    "@valbuild/shared": "~0.60.13",
+    "@valbuild/ui": "~0.60.13",
     "express": "^4.18.2",
     "image-size": "^1.0.2",
     "minimatch": "^3.0.4",