@valbuild/server 0.148.1 → 0.148.3

package/dist/{ValRouterCore-42772c21.cjs.prod.js → ValRouterCore-dfb7b578.cjs.prod.js}

@@ -1463,7 +1463,7 @@ encode = bytesToBase64) {
   }]) => {
     if (remote) return;
     const bytes = await ops.getBase64EncodedBinaryFileFromPatch(filePath, patchId, remote).catch(error => {
-      console.error("Could not read a committed file", filePath, error);
+      core.Internal.log.error("Could not read a committed file", filePath, error);
       return null;
     });
     if (bytes === null) unread.push(filePath);else files[filePath] = encode(bytes);
@@ -2431,7 +2431,7 @@ class ValOps {
     for (const [moduleFilePathS, source] of Object.entries(sources)) {
       const moduleFilePath = moduleFilePathS;
       if (errors[moduleFilePath] !== undefined) {
-        console.error("Val: not adopting the committed source of a module whose patches " + "did not apply cleanly. Its content here stays as it was until the " + "modules are re-evaluated.", {
+        core.Internal.log.error("not adopting the committed source of a module whose patches " + "did not apply cleanly. Its content here stays as it was until the " + "modules are re-evaluated.", {
           moduleFilePath,
           errors: errors[moduleFilePath]
         });
@@ -2981,7 +2981,7 @@ class ValOps {
         if (!errors[path]) {
           errors[path] = [];
         }
-        console.error("Val: Module not found", path);
+        core.Internal.log.error("Module not found", path);
         errors[path].push({
           patchId: patchData.patchId,
           skipped: true,
@@ -2994,7 +2994,7 @@ class ValOps {
       }
       const patchId = patchData.patchId;
       if (errors[path]) {
-        console.error("Cannot apply patch: previous errors exists", path, errors[path]);
+        core.Internal.log.error("Cannot apply patch: previous errors exists", path, errors[path]);
         errors[path].push({
           patchId: patchId,
           skipped: true,
@@ -3158,7 +3158,7 @@ class ValOps {
         // applyPatch mutates the source. On add operations it adds more than once? There is something strange going on... deepClone seems to fix, but is that the right solution?
         jsonOps, applicableOps.concat(...Object.values(fileFixOps)));
         if (fp.result.isErr(patchRes)) {
-          console.error("Could not apply patch", JSON.stringify({
+          core.Internal.log.error("Could not apply patch", JSON.stringify({
             path,
             patchId,
             error: patchRes.error,
@@ -3805,7 +3805,7 @@ class ValOps {
         return fp.result.ok(entries);
       };
       const collectPatchError = (err, patchId, op) => {
-        console.error("Could not patch", JSON.stringify({
+        core.Internal.log.error("Could not patch", JSON.stringify({
           path,
           patchId,
           error: err,
@@ -4334,7 +4334,7 @@ class ValOps {
         // sends it again later, so an error line here would be one a minute.
         return fp.result.err(saveRes.error);
       }
-      console.error(`Could not save source patch at path: '${path}'. Error: ${saveRes.error.errorType === "other" ? saveRes.error.message : saveRes.error.errorType}`);
+      core.Internal.log.error(`Could not save source patch at path: '${path}'. Error: ${saveRes.error.errorType === "other" ? saveRes.error.message : saveRes.error.errorType}`);
       if (saveRes.error.errorType === "patch-head-conflict") {
         return fp.result.err({
           errorType: "patch-head-conflict"
@@ -5574,11 +5574,11 @@ const ValServer = (valModules, options, callbacks, platform) => {
           token
         };
       } else {
-        console.debug("Failed to get data from code: ", res.status);
+        core.Internal.log.debug("Failed to get data from code: ", res.status);
         return null;
       }
     }).catch(err => {
-      console.debug("Failed to get user from code: ", err);
+      core.Internal.log.debug("Failed to get user from code: ", err);
       return null;
     });
   };
@@ -6011,6 +6011,50 @@ const ValServer = (valModules, options, callbacks, platform) => {
         };
       }
     },
+    /**
+     * Content analytics beacons, outside the hosted platform.
+     *
+     * On a site Val hosts, the platform's loader answers this route before a
+     * request reaches the app, and counts. Everywhere else nothing counts yet:
+     * this checks the beacon and answers, so a site with analytics on does not
+     * fill its visitors' consoles with 404s. In local dev it also logs a line
+     * per beacon, which is how the showcase shows analytics working.
+     */
+    "/analytics": {
+      POST: async req => {
+        const parsed = internal.AnalyticsBeacon.safeParse(req.body);
+        if (!parsed.success) {
+          const body = req.body;
+          const version = typeof body === "object" && body !== null && "v" in body ? body.v : undefined;
+          if (typeof version === "number" && version !== 1) {
+            // A newer format than this server knows: not an error.
+            return {
+              status: 200,
+              json: {
+                counted: false
+              }
+            };
+          }
+          return {
+            status: 400,
+            json: {
+              message: "Not a valid Val analytics beacon"
+            }
+          };
+        }
+        if (options.mode === "fs") {
+          const beacon = parsed.data;
+          const count = paths => Object.values(paths).reduce((n, list) => n + list.length, 0);
+          core.Internal.log.debug(`analytics: ${beacon.route}${beacon.view ? " (page view)" : ""}: ${count(beacon.rendered)} rendered, ${count(beacon.viewed)} viewed`);
+        }
+        return {
+          status: 200,
+          json: {
+            counted: false
+          }
+        };
+      }
+    },
     "/draft/stat": {
       GET: async req => {
         const cookies = req.cookies;
@@ -6298,7 +6342,7 @@ const ValServer = (valModules, options, callbacks, platform) => {
         // the environment when @valbuild/server was built. See getSettings.
         const settingsRes = await getSettings(options.project, remoteFileAuth, options.valContentUrl);
         if (!settingsRes.success) {
-          console.warn("Could not get remote files settings: " + settingsRes.message);
+          core.Internal.log.warn("Could not get remote files settings: " + settingsRes.message);
           return {
             status: 400,
             json: {
@@ -6743,7 +6787,7 @@ const ValServer = (valModules, options, callbacks, platform) => {
           let contentBaseUrl = null;
           let contentAuthNonce = null;
           if (!options.project) {
-            console.warn("Direct content-host uploads (AI images) disabled: no `project` set in val.config (and VAL_PROJECT env var is not set).");
+            core.Internal.log.debug("Direct content-host uploads (AI images) disabled: no `project` set in val.config (and VAL_PROJECT env var is not set).");
           } else if (!isFsOps(serverOps)) {
             /*
              * Presigning needs a content host to presign AGAINST, and a local
@@ -6756,11 +6800,11 @@ const ValServer = (valModules, options, callbacks, platform) => {
              * the patch upload base url -- still works, and the only thing lost
              * is the browser posting AI images straight to the content host.
              */
-            console.warn("Direct content-host uploads (AI images) disabled: this store has no content host to presign against.");
+            core.Internal.log.debug("Direct content-host uploads (AI images) disabled: this store has no content host to presign against.");
           } else {
             const authDataRes = await getRemoteFileAuth();
             if (authDataRes.status !== 200) {
-              console.warn("Direct content-host uploads (AI images) disabled: " + authDataRes.json.message);
+              core.Internal.log.warn("Direct content-host uploads (AI images) disabled: " + authDataRes.json.message);
             } else {
               const corsOrigin = "*"; // TODO: add cors origin
               const presignedAuthNonce = await serverOps.getPresignedAuthNonce(options.project, corsOrigin, authDataRes.json.remoteFileAuth);
@@ -6768,7 +6812,7 @@ const ValServer = (valModules, options, callbacks, platform) => {
                 contentBaseUrl = presignedAuthNonce.data.baseUrl;
                 contentAuthNonce = presignedAuthNonce.data.nonce;
               } else {
-                console.warn("Direct content-host uploads (AI images) disabled: " + presignedAuthNonce.error.message);
+                core.Internal.log.warn("Direct content-host uploads (AI images) disabled: " + presignedAuthNonce.error.message);
               }
             }
           }
@@ -6943,7 +6987,7 @@ const ValServer = (valModules, options, callbacks, platform) => {
         });
         if (fetchedPatchesRes.error) {
           // Error is singular
-          console.error("Val: Failed to get patches", fetchedPatchesRes.error);
+          core.Internal.log.error("Failed to get patches", fetchedPatchesRes.error);
           return {
             status: 500,
             json: {
@@ -6954,7 +6998,7 @@ const ValServer = (valModules, options, callbacks, platform) => {
         }
         if (fetchedPatchesRes.errors && Object.keys(fetchedPatchesRes.errors).length > 0) {
           // Errors is plural. Different property than above.
-          console.error("Val: Failed to get patches", fetchedPatchesRes.errors);
+          core.Internal.log.error("Failed to get patches", fetchedPatchesRes.errors);
           return {
             status: 500,
             json: {
@@ -7005,7 +7049,7 @@ const ValServer = (valModules, options, callbacks, platform) => {
         const ids = query.id;
         const deleteRes = await serverOps.deletePatches(ids);
         if (deleteRes.errors && Object.keys(deleteRes.errors).length > 0) {
-          console.error("Val: Failed to delete patches", deleteRes.errors);
+          core.Internal.log.error("Failed to delete patches", deleteRes.errors);
           return {
             status: 500,
             json: {
@@ -7064,7 +7108,7 @@ const ValServer = (valModules, options, callbacks, platform) => {
         }
         const moduleErrors = await serverOps.getModuleErrors();
         if ((moduleErrors === null || moduleErrors === void 0 ? void 0 : moduleErrors.length) > 0) {
-          console.error("Val: Module errors", moduleErrors);
+          core.Internal.log.error("Module errors", moduleErrors);
           return {
             status: 500,
             json: {
@@ -7082,7 +7126,7 @@ const ValServer = (valModules, options, callbacks, platform) => {
             serializedSchemas[moduleFilePath] = schema["executeSerialize"]();
           }
         } catch (e) {
-          console.error("Val: Failed to serialize schemas", e);
+          core.Internal.log.error("Failed to serialize schemas", e);
           return {
             status: 500,
             json: {
@@ -7268,7 +7312,7 @@ const ValServer = (valModules, options, callbacks, platform) => {
         const sourcesSha = await serverOps.getSourcesSha();
         const moduleErrors = await serverOps.getModuleErrors();
         if ((moduleErrors === null || moduleErrors === void 0 ? void 0 : moduleErrors.length) > 0) {
-          console.error("Val: Module errors", moduleErrors);
+          core.Internal.log.error("Module errors", moduleErrors);
           return {
             status: 500,
             json: {
@@ -7977,11 +8021,11 @@ const ValServer = (valModules, options, callbacks, platform) => {
               ...serverOps.analyzePatches(survivors, patches.commits, commit),
               ...survivingPatches
             });
-            console.error("Val: removed unpublished changes that could not be applied", removed);
+            core.Internal.log.error("removed unpublished changes that could not be applied", removed);
           }
         }
         if (preparedCommit.hasErrors) {
-          console.error("Failed to create commit", JSON.stringify({
+          core.Internal.log.error("Failed to create commit", JSON.stringify({
             sourceFilePatchErrors: preparedCommit.sourceFilePatchErrors,
             binaryFilePatchErrors: preparedCommit.binaryFilePatchErrors
           }, null, 2));
@@ -8039,7 +8083,7 @@ const ValServer = (valModules, options, callbacks, platform) => {
               }
               const uploadRes = await serverOps.uploadRemoteFiles(preparedCommit, authRes.json.remoteFileAuth);
               if (Object.keys(uploadRes.errors).length > 0) {
-                console.error("Val: Failed to upload remote files", uploadRes.errors);
+                core.Internal.log.error("Failed to upload remote files", uploadRes.errors);
                 return {
                   status: 400,
                   json: {
@@ -8071,7 +8115,7 @@ const ValServer = (valModules, options, callbacks, platform) => {
             const remoteFileAuth = (_remoteFileAuthRes = remoteFileAuthRes) === null || _remoteFileAuthRes === void 0 || (_remoteFileAuthRes = _remoteFileAuthRes.json) === null || _remoteFileAuthRes === void 0 ? void 0 : _remoteFileAuthRes.remoteFileAuth;
             const saveRes = await serverOps.saveOrUploadFiles(preparedCommit, mode, remoteFileAuth);
             if (Object.keys(saveRes.errors).length > 0) {
-              console.error("Val: Failed to save files", saveRes.errors);
+              core.Internal.log.error("Failed to save files", saveRes.errors);
               return {
                 status: 400,
                 json: {
@@ -8130,13 +8174,13 @@ const ValServer = (valModules, options, callbacks, platform) => {
            */
           const deleteRes = await serverOps.deletePatches(consumed);
           if ("error" in deleteRes && deleteRes.error !== undefined) {
-            console.error(`Val got an error while cleaning up patches after publish: ${deleteRes.error.message}`);
+            core.Internal.log.error(`got an error while cleaning up patches after publish: ${deleteRes.error.message}`);
           } else if ("errors" in deleteRes && deleteRes.errors !== undefined) {
             // Per patch, and not fatal: the files are written, so the save
             // succeeded. A patch left behind is announced again on the next
             // stat, applies to a base that already contains it, and is removed
             // then.
-            console.error("Val: could not clean up some patches after publish", deleteRes.errors);
+            core.Internal.log.error("could not clean up some patches after publish", deleteRes.errors);
           }
           return {
             status: 200,
@@ -8169,7 +8213,7 @@ const ValServer = (valModules, options, callbacks, platform) => {
               commitToGit
             }) : await commitToGit();
             if (commitRes.error) {
-              console.error("Failed to commit", commitRes.error);
+              core.Internal.log.error("Failed to commit", commitRes.error);
               if ("isNotFastForward" in commitRes && commitRes.isNotFastForward) {
                 return {
                   status: 409,
@@ -9058,7 +9102,7 @@ const ValServer = (valModules, options, callbacks, platform) => {
         // TypeScript compiler. See `patch/ts/publishKit.ts`.
         const {
           getJsonEntryAtCommit
-        } = await Promise.resolve().then(function () { return require('./getJsonEntryAtCommit-2e36e805.cjs.prod.js'); });
+        } = await Promise.resolve().then(function () { return require('./getJsonEntryAtCommit-6bbe1c9d.cjs.prod.js'); });
         const res = await getJsonEntryAtCommit(serverOps, req.query.commit_sha, req.query.path, req.query.key);
         if (fp.result.isErr(res)) {
           return historyErrorResponse(res.error);
@@ -9147,7 +9191,7 @@ const ValServer = (valModules, options, callbacks, platform) => {
         const remote = query.remote === "true";
         const patchId = query.patch_id;
         if (!patchId && isHttpOps(serverOps) && remote) {
-          console.error(`Remote file: ${filePath} requested without patch id. This is most likely a bug in Val.`);
+          core.Internal.log.error(`Remote file: ${filePath} requested without patch id. This is most likely a bug in Val.`);
         }
         // Opened, not read: a video is seeked in by many small ranges, and
         // only the asked-for bytes are read where the mode can (fs).
@@ -9379,7 +9423,7 @@ async function withAuth(verifyJwt, secret, cookies, errorMessageType, handler) {
       };
     }
     return handler(verification.data).catch(err => {
-      console.error(`Failed while processing: ${errorMessageType}`, err);
+      core.Internal.log.error(`Failed while processing: ${errorMessageType}`, err);
       return {
         status: 500,
         json: {
@@ -9948,7 +9992,7 @@ class ValOpsMemory extends ValOps {
     this.contentUrl = options.contentUrl;
     this.requiresAuth = !options.unsafelyAllowUnauthenticated;
     if (options.unsafelyAllowUnauthenticated && options.warnUnauthenticated !== false) {
-      console.warn("Val: serving memory mode WITHOUT authentication. Every request that " + "reaches this server may read content, create patches and trigger a " + "publish. Only correct if the host authorises requests before they " + "get here.");
+      core.Internal.log.warn("serving memory mode WITHOUT authentication. Every request that " + "reaches this server may read content, create patches and trigger a " + "publish. Only correct if the host authorises requests before they " + "get here.");
     }
     this.sourceFiles = Object.fromEntries(Object.entries(options.sourceFiles).map(([path, text]) => [ValOpsMemory.key(path), text]));
   }
@@ -10450,7 +10494,7 @@ function createValRequestHandler(route, valServerPromise, convert, serveStatic)
         message: "Val: could not start the Val server",
         details: err instanceof Error ? err.message : String(err)
       };
-      console.error(error.message + ": " + error.details);
+      core.Internal.log.error(error.message + ": " + error.details);
       return convert({
         status: 500,
         json: error
@@ -10462,7 +10506,7 @@ function createValRequestHandler(route, valServerPromise, convert, serveStatic)
         message: "Val: routes are not configured correctly",
         details: `Check you api routes. Expected pathname to start with "${route}", but it was: "${url.pathname}"`
       };
-      console.error(error);
+      core.Internal.log.error(error);
       return convert({
         status: 500,
         json: error
@@ -10653,7 +10697,7 @@ function createValRequestHandler(route, valServerPromise, convert, serveStatic)
         });
       } catch (err) {
         const error = err instanceof Error ? err : new Error(String(err));
-        console.error(`Val: ${method} ${route} threw: ${error.message}`, error.stack);
+        core.Internal.log.error(`${method} ${route} threw: ${error.message}`, error.stack);
         return {
           status: 500,
           json: {