@jsenv/core 38.3.4 → 38.3.6

package/src/plugins/inlining/jsenv_plugin_inlining_as_data_url.js

@@ -66,9 +66,11 @@ export const jsenvPluginInliningAsDataUrl = () => {
       return (async () => {
         await urlInfoInlined.cook();
         const base64Url = DATA_URL.stringify({
-          mediaType: urlInfoInlined.contentType,
+          contentType: urlInfoInlined.contentType,
           base64Flag: true,
-          data: urlInfoInlined.content,
+          data: urlInfoInlined.data.base64Flag
+            ? urlInfoInlined.content
+            : dataToBase64(urlInfoInlined.content),
         });
         return base64Url;
       })();
@@ -83,6 +85,7 @@ export const jsenvPluginInliningAsDataUrl = () => {
       const contentAsBase64 = Buffer.from(
         withoutBase64ParamUrlInfo.content,
       ).toString("base64");
+      urlInfo.data.base64Flag = true;
       return {
         originalContent: withoutBase64ParamUrlInfo.originalContent,
         content: contentAsBase64,
@@ -91,3 +94,5 @@ export const jsenvPluginInliningAsDataUrl = () => {
     },
   };
 };
+
+const dataToBase64 = (data) => Buffer.from(data).toString("base64");

package/src/plugins/reference_analysis/data_urls/jsenv_plugin_data_urls_analysis.js

@@ -46,8 +46,9 @@ export const jsenvPluginDataUrlsAnalysis = () => {
         data: urlData,
       } = DATA_URL.parse(urlInfo.url);
       urlInfo.data.base64Flag = base64Flag;
+      const content = contentFromUrlData({ contentType, base64Flag, urlData });
       return {
-        content: contentFromUrlData({ contentType, base64Flag, urlData }),
+        content,
         contentType,
       };
     },

package/src/dev/file_service.js

@@ -1,413 +0,0 @@
-import { readFileSync } from "node:fs";
-import { serveDirectory, composeTwoResponses } from "@jsenv/server";
-import { bufferToEtag } from "@jsenv/filesystem";
-import { URL_META } from "@jsenv/url-meta";
-
-import { WEB_URL_CONVERTER } from "../helpers/web_url_converter.js";
-import { watchSourceFiles } from "../helpers/watch_source_files.js";
-import { createEventEmitter } from "../helpers/event_emitter.js";
-import { createKitchen } from "../kitchen/kitchen.js";
-import { getCorePlugins } from "../plugins/plugins.js";
-import { jsenvPluginServerEventsClientInjection } from "../plugins/server_events/jsenv_plugin_server_events_client_injection.js";
-import { parseUserAgentHeader } from "./user_agent.js";
-
-export const createFileService = ({
-  signal,
-  logLevel,
-  serverStopCallbacks,
-  serverEventsDispatcher,
-  kitchenCache,
-  onKitchenCreated = () => {},
-
-  sourceDirectoryUrl,
-  sourceMainFilePath,
-  ignore,
-  sourceFilesConfig,
-  runtimeCompat,
-
-  plugins,
-  referenceAnalysis,
-  nodeEsmResolution,
-  magicExtensions,
-  magicDirectoryIndex,
-  supervisor,
-  injections,
-  transpilation,
-  clientAutoreload,
-  cacheControl,
-  ribbon,
-  sourcemaps,
-  sourcemapsSourcesContent,
-  outDirectoryUrl,
-}) => {
-  if (clientAutoreload === true) {
-    clientAutoreload = {};
-  }
-  if (clientAutoreload === false) {
-    clientAutoreload = { enabled: false };
-  }
-  const clientFileChangeEventEmitter = createEventEmitter();
-  const clientFileDereferencedEventEmitter = createEventEmitter();
-
-  clientAutoreload = {
-    enabled: true,
-    clientServerEventsConfig: {},
-    clientFileChangeEventEmitter,
-    clientFileDereferencedEventEmitter,
-    ...clientAutoreload,
-  };
-
-  const stopWatchingSourceFiles = watchSourceFiles(
-    sourceDirectoryUrl,
-    (fileInfo) => {
-      clientFileChangeEventEmitter.emit(fileInfo);
-    },
-    {
-      sourceFilesConfig,
-      keepProcessAlive: false,
-      cooldownBetweenFileEvents: clientAutoreload.cooldownBetweenFileEvents,
-    },
-  );
-  serverStopCallbacks.push(stopWatchingSourceFiles);
-
-  const getOrCreateKitchen = (request) => {
-    const { runtimeName, runtimeVersion } = parseUserAgentHeader(
-      request.headers["user-agent"] || "",
-    );
-    const runtimeId = `${runtimeName}@${runtimeVersion}`;
-    const existing = kitchenCache.get(runtimeId);
-    if (existing) {
-      return existing;
-    }
-    const watchAssociations = URL_META.resolveAssociations(
-      { watch: stopWatchingSourceFiles.watchPatterns },
-      sourceDirectoryUrl,
-    );
-    let kitchen;
-    clientFileChangeEventEmitter.on(({ url }) => {
-      const urlInfo = kitchen.graph.getUrlInfo(url);
-      if (urlInfo) {
-        urlInfo.onModified();
-      }
-    });
-    const clientRuntimeCompat = { [runtimeName]: runtimeVersion };
-
-    kitchen = createKitchen({
-      name: runtimeId,
-      signal,
-      logLevel,
-      rootDirectoryUrl: sourceDirectoryUrl,
-      mainFilePath: sourceMainFilePath,
-      ignore,
-      dev: true,
-      runtimeCompat,
-      clientRuntimeCompat,
-      plugins: [
-        ...plugins,
-        ...getCorePlugins({
-          rootDirectoryUrl: sourceDirectoryUrl,
-          runtimeCompat,
-
-          referenceAnalysis,
-          nodeEsmResolution,
-          magicExtensions,
-          magicDirectoryIndex,
-          supervisor,
-          injections,
-          transpilation,
-
-          clientAutoreload,
-          cacheControl,
-          ribbon,
-        }),
-      ],
-      supervisor,
-      minification: false,
-      sourcemaps,
-      sourcemapsSourcesContent,
-      outDirectoryUrl: outDirectoryUrl
-        ? new URL(`${runtimeName}@${runtimeVersion}/`, outDirectoryUrl)
-        : undefined,
-    });
-    kitchen.graph.urlInfoCreatedEventEmitter.on((urlInfoCreated) => {
-      const { watch } = URL_META.applyAssociations({
-        url: urlInfoCreated.url,
-        associations: watchAssociations,
-      });
-      urlInfoCreated.isWatched = watch;
-      // when an url depends on many others, we check all these (like package.json)
-      urlInfoCreated.isValid = () => {
-        if (!urlInfoCreated.url.startsWith("file:")) {
-          return false;
-        }
-        if (urlInfoCreated.content === undefined) {
-          // urlInfo content is undefined when:
-          // - url info content never fetched
-          // - it is considered as modified because undelying file is watched and got saved
-          // - it is considered as modified because underlying file content
-          //   was compared using etag and it has changed
-          return false;
-        }
-        if (!watch) {
-          // file is not watched, check the filesystem
-          let fileContentAsBuffer;
-          try {
-            fileContentAsBuffer = readFileSync(new URL(urlInfoCreated.url));
-          } catch (e) {
-            if (e.code === "ENOENT") {
-              urlInfoCreated.onModified();
-              return false;
-            }
-            return false;
-          }
-          const fileContentEtag = bufferToEtag(fileContentAsBuffer);
-          if (fileContentEtag !== urlInfoCreated.originalContentEtag) {
-            urlInfoCreated.onModified();
-            // restore content to be able to compare it again later
-            urlInfoCreated.kitchen.urlInfoTransformer.setContent(
-              urlInfoCreated,
-              String(fileContentAsBuffer),
-              {
-                contentEtag: fileContentEtag,
-              },
-            );
-            return false;
-          }
-        }
-        for (const implicitUrl of urlInfoCreated.implicitUrlSet) {
-          const implicitUrlInfo = urlInfoCreated.graph.getUrlInfo(implicitUrl);
-          if (implicitUrlInfo && !implicitUrlInfo.isValid()) {
-            return false;
-          }
-        }
-        return true;
-      };
-    });
-    kitchen.graph.urlInfoDereferencedEventEmitter.on(
-      (urlInfoDereferenced, lastReferenceFromOther) => {
-        clientFileDereferencedEventEmitter.emit(
-          urlInfoDereferenced,
-          lastReferenceFromOther,
-        );
-      },
-    );
-
-    serverStopCallbacks.push(() => {
-      kitchen.pluginController.callHooks("destroy", kitchen.context);
-    });
-    server_events: {
-      const allServerEvents = {};
-      kitchen.pluginController.plugins.forEach((plugin) => {
-        const { serverEvents } = plugin;
-        if (serverEvents) {
-          Object.keys(serverEvents).forEach((serverEventName) => {
-            // we could throw on serverEvent name conflict
-            // we could throw if serverEvents[serverEventName] is not a function
-            allServerEvents[serverEventName] = serverEvents[serverEventName];
-          });
-        }
-      });
-      const serverEventNames = Object.keys(allServerEvents);
-      if (serverEventNames.length > 0) {
-        Object.keys(allServerEvents).forEach((serverEventName) => {
-          const serverEventInfo = {
-            ...kitchen.context,
-            sendServerEvent: (data) => {
-              serverEventsDispatcher.dispatch({
-                type: serverEventName,
-                data,
-              });
-            },
-          };
-          const serverEventInit = allServerEvents[serverEventName];
-          serverEventInit(serverEventInfo);
-        });
-        // "pushPlugin" so that event source client connection can be put as early as possible in html
-        kitchen.pluginController.pushPlugin(
-          jsenvPluginServerEventsClientInjection(
-            clientAutoreload.clientServerEventsConfig,
-          ),
-        );
-      }
-    }
-
-    kitchenCache.set(runtimeId, kitchen);
-    onKitchenCreated(kitchen);
-    return kitchen;
-  };
-
-  return async (request) => {
-    const kitchen = getOrCreateKitchen(request);
-    const serveHookInfo = {
-      ...kitchen.context,
-      request,
-    };
-    const responseFromPlugin =
-      await kitchen.pluginController.callAsyncHooksUntil(
-        "serve",
-        serveHookInfo,
-      );
-    if (responseFromPlugin) {
-      return responseFromPlugin;
-    }
-    const { referer } = request.headers;
-    const parentUrl = referer
-      ? WEB_URL_CONVERTER.asFileUrl(referer, {
-          origin: request.origin,
-          rootDirectoryUrl: sourceDirectoryUrl,
-        })
-      : sourceDirectoryUrl;
-    let reference = kitchen.graph.inferReference(request.resource, parentUrl);
-    if (!reference) {
-      reference =
-        kitchen.graph.rootUrlInfo.dependencies.createResolveAndFinalize({
-          trace: { message: parentUrl },
-          type: "http_request",
-          specifier: request.resource,
-        });
-    }
-    const urlInfo = reference.urlInfo;
-    const ifNoneMatch = request.headers["if-none-match"];
-    const urlInfoTargetedByCache = urlInfo.findParentIfInline() || urlInfo;
-
-    try {
-      if (!urlInfo.error && ifNoneMatch) {
-        const [clientOriginalContentEtag, clientContentEtag] =
-          ifNoneMatch.split("_");
-        if (
-          urlInfoTargetedByCache.originalContentEtag ===
-            clientOriginalContentEtag &&
-          urlInfoTargetedByCache.contentEtag === clientContentEtag &&
-          urlInfoTargetedByCache.isValid()
-        ) {
-          const headers = {
-            "cache-control": `private,max-age=0,must-revalidate`,
-          };
-          Object.keys(urlInfo.headers).forEach((key) => {
-            if (key !== "content-length") {
-              headers[key] = urlInfo.headers[key];
-            }
-          });
-          return {
-            status: 304,
-            headers,
-          };
-        }
-      }
-
-      await urlInfo.cook({ request, reference });
-      let { response } = urlInfo;
-      if (response) {
-        return response;
-      }
-      response = {
-        url: reference.url,
-        status: 200,
-        headers: {
-          // when we send eTag to the client the next request to the server
-          // will send etag in request headers.
-          // If they match jsenv bypass cooking and returns 304
-          // This must not happen when a plugin uses "no-store" or "no-cache" as it means
-          // plugin logic wants to happens for every request to this url
-          ...(urlInfo.headers["cache-control"] === "no-store" ||
-          urlInfo.headers["cache-control"] === "no-cache"
-            ? {}
-            : {
-                "cache-control": `private,max-age=0,must-revalidate`,
-                // it's safe to use "_" separator because etag is encoded with base64 (see https://stackoverflow.com/a/13195197)
-                "eTag": `${urlInfoTargetedByCache.originalContentEtag}_${urlInfoTargetedByCache.contentEtag}`,
-              }),
-          ...urlInfo.headers,
-          "content-type": urlInfo.contentType,
-          "content-length": urlInfo.contentLength,
-        },
-        body: urlInfo.content,
-        timing: urlInfo.timing,
-      };
-      const augmentResponseInfo = {
-        ...kitchen.context,
-        reference,
-        urlInfo,
-      };
-      kitchen.pluginController.callHooks(
-        "augmentResponse",
-        augmentResponseInfo,
-        (returnValue) => {
-          response = composeTwoResponses(response, returnValue);
-        },
-      );
-      return response;
-    } catch (e) {
-      urlInfo.error = e;
-      const originalError = e ? e.cause || e : e;
-      if (originalError.asResponse) {
-        return originalError.asResponse();
-      }
-      const code = originalError.code;
-      if (code === "PARSE_ERROR") {
-        // when possible let browser re-throw the syntax error
-        // it's not possible to do that when url info content is not available
-        // (happens for js_module_fallback for instance)
-        if (urlInfo.content !== undefined) {
-          kitchen.context.logger.error(`Error while handling ${request.url}:
-${originalError.reasonCode || originalError.code}
-${e.traceMessage}`);
-          return {
-            url: reference.url,
-            status: 200,
-            // reason becomes the http response statusText, it must not contain invalid chars
-            // https://github.com/nodejs/node/blob/0c27ca4bc9782d658afeaebcec85ec7b28f1cc35/lib/_http_common.js#L221
-            statusText: e.reason,
-            statusMessage: originalError.message,
-            headers: {
-              "content-type": urlInfo.contentType,
-              "content-length": urlInfo.contentLength,
-              "cache-control": "no-store",
-            },
-            body: urlInfo.content,
-          };
-        }
-        return {
-          url: reference.url,
-          status: 500,
-          statusText: e.reason,
-          statusMessage: originalError.message,
-          headers: {
-            "cache-control": "no-store",
-          },
-          body: urlInfo.content,
-        };
-      }
-      if (code === "DIRECTORY_REFERENCE_NOT_ALLOWED") {
-        return serveDirectory(reference.url, {
-          headers: {
-            accept: "text/html",
-          },
-          canReadDirectory: true,
-          rootDirectoryUrl: sourceDirectoryUrl,
-        });
-      }
-      if (code === "NOT_ALLOWED") {
-        return {
-          url: reference.url,
-          status: 403,
-          statusText: originalError.reason,
-        };
-      }
-      if (code === "NOT_FOUND") {
-        return {
-          url: reference.url,
-          status: 404,
-          statusText: originalError.reason,
-          statusMessage: originalError.message,
-        };
-      }
-      return {
-        url: reference.url,
-        status: 500,
-        statusText: e.reason,
-        statusMessage: e.stack,
-      };
-    }
-  };
-};

package/src/plugins/import_meta_url/client/import_meta_url_browser.js

@@ -1,51 +0,0 @@
-const getCurrentScriptSrc = () => {
-  const { currentScript } = document;
-  if (currentScript) return currentScript.src;
-
-  // https://github.com/amiller-gh/currentScript-polyfill
-
-  const scripts = Array.prototype.slice.call(
-    document.getElementsByTagName("script"),
-  );
-
-  const readyScript = scripts.find((script) => {
-    return script.readyState === "interactive";
-  });
-  if (readyScript) return readyScript;
-
-  try {
-    throw new Error();
-  } catch (err) {
-    // Find the second match for the "at" string to get file src url from stack.
-    // Specifically works with the format of stack traces in IE.
-    const stackDetails = /.*at [^(]*\((.*):(.+):(.+)\)$/gi.exec(err.stack);
-    const scriptLocation = (stackDetails || [false])[1];
-    const line = (stackDetails || [false])[2];
-    const currentLocation = document.location.href.replace(
-      document.location.hash,
-      "",
-    );
-
-    if (scriptLocation === currentLocation) {
-      const source = document.documentElement.outerHTML;
-      const codeRegExp = new RegExp(
-        `(?:[^\\n]+?\\n){0,${
-          line - 2
-        }}[^<]*<script>([\\d\\D]*?)<\\/script>[\\d\\D]*`,
-        "i",
-      );
-      const code = source.replace(codeRegExp, "$1").trim();
-
-      return scripts.find((script) => {
-        return script.innerHTML && script.innerHTML.trim() === code;
-      });
-    }
-
-    return scripts.find((script) => {
-      return script.src === scriptLocation;
-    });
-  }
-};
-
-const url = getCurrentScriptSrc();
-export { url };

package/src/plugins/import_meta_url/client/import_meta_url_commonjs.mjs

@@ -1,9 +0,0 @@
-/* global __filename */
-
-const filenameContainsBackSlashes = __filename.indexOf("\\") > -1;
-
-const url = filenameContainsBackSlashes
-  ? `file:///${__filename.replace(/\\/g, "/")}`
-  : `file://${__filename}`;
-
-export { url };