@inspecto-dev/plugin 0.3.4 → 0.3.6

package/dist/rspack.cjs

@@ -76,12 +76,57 @@ var DEFAULT_ESCAPE_TAGS = /* @__PURE__ */ new Set([
   "NuxtLink"
 ]);
 var JSX_EXTENSIONS = /* @__PURE__ */ new Set([".jsx", ".tsx", ".js", ".ts", ".mjs", ".mts"]);
+function normalizeWebpackModuleRequest(id) {
+  return id.replace(/!+$/, "").replace(/^\((?:app-pages-browser|rsc|ssr)\)\/\.\//, "");
+}
+function extractNextModuleRequest(id) {
+  if (!id.includes("next-flight-client-entry-loader.js?")) {
+    return void 0;
+  }
+  const queryIndex = id.indexOf("?");
+  if (queryIndex === -1) {
+    return void 0;
+  }
+  const params = new URLSearchParams(id.slice(queryIndex + 1).replace(/!+$/, ""));
+  for (const entry of params.getAll("modules")) {
+    try {
+      const parsed = JSON.parse(entry);
+      if (typeof parsed.request === "string" && parsed.request.length > 0) {
+        return parsed.request;
+      }
+    } catch {
+      continue;
+    }
+  }
+  return void 0;
+}
+function extractTransformFilePath(requestId) {
+  const normalizedRequestId = normalizeWebpackModuleRequest(requestId);
+  const nextModuleRequest = extractNextModuleRequest(normalizedRequestId);
+  if (nextModuleRequest) {
+    return {
+      requestId,
+      filePath: nextModuleRequest,
+      wrapped: true
+    };
+  }
+  const lastLoaderSeparator = normalizedRequestId.lastIndexOf("!");
+  const resourceRequest = lastLoaderSeparator >= 0 ? normalizedRequestId.slice(lastLoaderSeparator + 1) : normalizedRequestId;
+  const queryIndex = resourceRequest.indexOf("?");
+  const filePath = queryIndex >= 0 ? resourceRequest.slice(0, queryIndex) : resourceRequest;
+  return {
+    requestId,
+    filePath,
+    wrapped: filePath !== requestId
+  };
+}
 function shouldTransform(filePath, options) {
+  const resolvedFilePath = extractTransformFilePath(filePath).filePath;
   if (process.env["NODE_ENV"] === "production") return false;
-  if (filePath.includes("node_modules")) return false;
-  if (filePath.startsWith("\0")) return false;
-  if (/[/\\](dist|build|\.next|\.nuxt)[/\\]/.test(filePath)) return false;
-  const ext = filePath.split(".").pop()?.toLowerCase();
+  if (resolvedFilePath.includes("node_modules")) return false;
+  if (resolvedFilePath.startsWith("\0")) return false;
+  if (/[/\\](dist|build|\.next|\.nuxt)[/\\]/.test(resolvedFilePath)) return false;
+  const ext = resolvedFilePath.split(".").pop()?.toLowerCase();
   if (ext && !["js", "jsx", "ts", "tsx", "mjs", "mts", "vue"].includes(ext)) {
     return false;
   }
@@ -309,7 +354,7 @@ function transformRouter(options) {
 
 // src/server/index.ts
 var import_node_http = __toESM(require("http"), 1);
-var import_node_fs3 = __toESM(require("fs"), 1);
+var import_node_fs4 = __toESM(require("fs"), 1);
 var import_node_path7 = __toESM(require("path"), 1);
 var import_node_os2 = __toESM(require("os"), 1);
 var import_node_crypto2 = __toESM(require("crypto"), 1);
@@ -843,6 +888,7 @@ function hasOverrides(overrides) {
 
 // src/server/path-guards.ts
 var import_node_path5 = __toESM(require("path"), 1);
+var import_node_fs2 = __toESM(require("fs"), 1);
 function isWindowsAbsolutePath(file) {
   return /^[a-zA-Z]:[\\/]/.test(file) || /^\\\\[^\\]+\\[^\\]+/.test(file);
 }
@@ -853,9 +899,94 @@ function resolveWorkspacePath(file, cwd) {
   return import_node_path5.default.isAbsolute(file) ? import_node_path5.default.resolve(file) : import_node_path5.default.resolve(cwd, file);
 }
 function assertPathWithinProject(file, projectRoot) {
-  const relativeToRoot = isWindowsAbsolutePath(file) || isWindowsAbsolutePath(projectRoot) ? import_node_path5.default.win32.relative(import_node_path5.default.win32.normalize(projectRoot), import_node_path5.default.win32.normalize(file)) : import_node_path5.default.relative(projectRoot, file);
-  if (relativeToRoot.startsWith("..") || import_node_path5.default.isAbsolute(relativeToRoot)) {
-    throw new Error("Access denied: File is outside of project workspace");
+  let realFile = file;
+  let realProjectRoot = projectRoot;
+  try {
+    if (import_node_fs2.default.existsSync(file)) {
+      realFile = import_node_fs2.default.realpathSync(file);
+    }
+  } catch {
+  }
+  try {
+    if (import_node_fs2.default.existsSync(projectRoot)) {
+      realProjectRoot = import_node_fs2.default.realpathSync(projectRoot);
+    }
+  } catch {
+  }
+  if (isWithinPath(file, projectRoot) || isWithinPath(realFile, realProjectRoot)) {
+    return;
+  }
+  throw new Error(
+    `Access denied: File ${normalizeForComparison(realFile)} is outside of project workspace ${normalizeForComparison(realProjectRoot)}`
+  );
+}
+function tryReadPackageName(packageRoot) {
+  try {
+    const packageJsonPath = import_node_path5.default.join(packageRoot, "package.json");
+    if (!import_node_fs2.default.existsSync(packageJsonPath)) return void 0;
+    const packageJson = JSON.parse(import_node_fs2.default.readFileSync(packageJsonPath, "utf8"));
+    return typeof packageJson.name === "string" ? packageJson.name : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function findNearestPackageRoot(file) {
+  let current = import_node_path5.default.dirname(file);
+  while (true) {
+    if (import_node_fs2.default.existsSync(import_node_path5.default.join(current, "package.json"))) {
+      return current;
+    }
+    const parent = import_node_path5.default.dirname(current);
+    if (parent === current) {
+      return void 0;
+    }
+    current = parent;
+  }
+}
+function normalizeForComparison(file) {
+  return isWindowsAbsolutePath(file) ? import_node_path5.default.win32.normalize(file) : import_node_path5.default.normalize(file);
+}
+function pathSeparatorFor(file) {
+  return isWindowsAbsolutePath(file) ? import_node_path5.default.win32.sep : import_node_path5.default.sep;
+}
+function isWithinPath(file, root) {
+  const normalizedFile = normalizeForComparison(file);
+  const normalizedRoot = normalizeForComparison(root);
+  const separator = pathSeparatorFor(normalizedRoot);
+  const rootWithSep = normalizedRoot.endsWith(separator) ? normalizedRoot : normalizedRoot + separator;
+  return normalizedFile === normalizedRoot || normalizedFile.startsWith(rootWithSep);
+}
+function resolveLinkedDependencyEntry(projectRoot, packageName) {
+  const packageSegments = packageName.split("/");
+  const dependencyPath = import_node_path5.default.join(projectRoot, "node_modules", ...packageSegments);
+  if (!import_node_fs2.default.existsSync(dependencyPath)) return void 0;
+  try {
+    return import_node_fs2.default.realpathSync(dependencyPath);
+  } catch {
+    return dependencyPath;
+  }
+}
+function isLinkedDependencyPath(file, projectRoot, packageName) {
+  const linkedDependencyRoot = resolveLinkedDependencyEntry(projectRoot, packageName);
+  if (!linkedDependencyRoot) return false;
+  return isWithinPath(file, linkedDependencyRoot);
+}
+function isLinkedDependencySourcePath(file, projectRoot) {
+  const packageRoot = findNearestPackageRoot(file);
+  if (!packageRoot) return false;
+  const packageName = tryReadPackageName(packageRoot);
+  if (!packageName) return false;
+  return isLinkedDependencyPath(file, projectRoot, packageName);
+}
+function assertPathWithinIdeOpenScope(file, projectRoot) {
+  try {
+    assertPathWithinProject(file, projectRoot);
+    return;
+  } catch {
+    if (isLinkedDependencySourcePath(file, projectRoot)) {
+      return;
+    }
+    throw new Error(`Access denied: File is outside of project workspace`);
   }
 }
 
@@ -1060,7 +1191,7 @@ var VSCODE_FAMILY_SCHEMES = [
 ];
 function handleOpenFileRequest(body, serverState2) {
   const absolutePath = resolveWorkspacePath(body.file, serverState2.cwd);
-  assertPathWithinProject(absolutePath, serverState2.projectRoot);
+  assertPathWithinIdeOpenScope(absolutePath, serverState2.projectRoot);
   const userConfig = loadUserConfigSync(false, serverState2.cwd, serverState2.configRoot);
   const configuredIde = userConfig.ide;
   const activeIde = serverState2.ideInfo?.ide;
@@ -1118,7 +1249,7 @@ function handleOpenFileRequest(body, serverState2) {
 }
 
 // src/server/project-root.ts
-var import_node_fs2 = __toESM(require("fs"), 1);
+var import_node_fs3 = __toESM(require("fs"), 1);
 var import_node_path6 = __toESM(require("path"), 1);
 var import_node_child_process3 = require("child_process");
 var serverLogger3 = createLogger("inspecto:server", { logLevel: getGlobalLogLevel() });
@@ -1136,7 +1267,7 @@ function resolveProjectRoot() {
     let current = start;
     while (!visited.has(current)) {
       visited.add(current);
-      if (import_node_fs2.default.existsSync(import_node_path6.default.join(current, ".inspecto"))) return current;
+      if (import_node_fs3.default.existsSync(import_node_path6.default.join(current, ".inspecto"))) return current;
       if (current === stop) break;
       const parent = import_node_path6.default.dirname(current);
       if (parent === current) break;
@@ -1208,28 +1339,28 @@ async function startServer() {
   const portFile = import_node_path7.default.join(import_node_os2.default.tmpdir(), "inspecto.port.json");
   try {
     let portData = {};
-    if (import_node_fs3.default.existsSync(portFile)) {
+    if (import_node_fs4.default.existsSync(portFile)) {
       try {
-        portData = JSON.parse(import_node_fs3.default.readFileSync(portFile, "utf-8"));
+        portData = JSON.parse(import_node_fs4.default.readFileSync(portFile, "utf-8"));
       } catch (e) {
       }
     }
     const rootHash = import_node_crypto2.default.createHash("md5").update(serverState.projectRoot).digest("hex");
     portData[rootHash] = port;
-    import_node_fs3.default.writeFileSync(portFile, JSON.stringify(portData, null, 2), "utf-8");
+    import_node_fs4.default.writeFileSync(portFile, JSON.stringify(portData, null, 2), "utf-8");
   } catch (e) {
     serverLogger4.warn("Failed to write port file:", e);
   }
   process.once("exit", () => {
     try {
-      if (import_node_fs3.default.existsSync(portFile)) {
-        const portData = JSON.parse(import_node_fs3.default.readFileSync(portFile, "utf-8"));
+      if (import_node_fs4.default.existsSync(portFile)) {
+        const portData = JSON.parse(import_node_fs4.default.readFileSync(portFile, "utf-8"));
         const rootHash = import_node_crypto2.default.createHash("md5").update(serverState.projectRoot).digest("hex");
         delete portData[rootHash];
         if (Object.keys(portData).length === 0) {
-          import_node_fs3.default.unlinkSync(portFile);
+          import_node_fs4.default.unlinkSync(portFile);
         } else {
-          import_node_fs3.default.writeFileSync(portFile, JSON.stringify(portData, null, 2), "utf-8");
+          import_node_fs4.default.writeFileSync(portFile, JSON.stringify(portData, null, 2), "utf-8");
         }
       }
     } catch {
@@ -1298,8 +1429,10 @@ async function handleRequest(url, req, res) {
     }
     try {
       handleOpenFileRequest(body, serverState);
-    } catch {
-      serverLogger4.warn(`Security: Blocked path traversal attempt in IDE_OPEN: ${body.file}`);
+    } catch (err) {
+      serverLogger4.warn(
+        `Security: Blocked path traversal attempt in IDE_OPEN: ${body.file}. Reason: ${err.message}`
+      );
       res.writeHead(403, { "Content-Type": "application/json" });
       res.end(JSON.stringify({ error: "Access denied: File is outside of project workspace" }));
       return;
@@ -1317,8 +1450,10 @@ async function handleRequest(url, req, res) {
       const absolutePath = resolveWorkspacePath(file, serverState.cwd);
       try {
         assertPathWithinProject(absolutePath, serverState.projectRoot);
-      } catch {
-        serverLogger4.warn(`Security: Blocked path traversal attempt in PROJECT_SNIPPET: ${file}`);
+      } catch (err) {
+        serverLogger4.warn(
+          `Security: Blocked path traversal attempt in PROJECT_SNIPPET: ${file}. Reason: ${err.message}`
+        );
         res.writeHead(403, { "Content-Type": "application/json" });
         res.end(
           JSON.stringify({
@@ -1485,23 +1620,25 @@ function injectWebpack(compiler, serverPortFn, resolveClientModule2) {
         return data;
       });
     } else {
-      compilation.hooks.processAssets.tapPromise(
-        {
-          name: "inspecto-overlay",
-          stage: compiler.webpack.Compilation.PROCESS_ASSETS_STAGE_ADDITIONS
-        },
-        async (assets) => {
-          const port = await serverPortFn();
-          const mainAssetKey = Object.keys(assets).find(
-            (key) => key.endsWith(".js") && (key.includes("main") || key.includes("app"))
-          );
-          if (!mainAssetKey) return;
-          const originalSource = assets[mainAssetKey].source();
-          assets[mainAssetKey] = new compiler.webpack.sources.RawSource(
-            getWebpackAssetScript(port) + "\n" + originalSource
-          );
-        }
-      );
+      if (compilation.hooks.processAssets) {
+        compilation.hooks.processAssets.tapPromise(
+          {
+            name: "inspecto-overlay",
+            stage: compiler.webpack.Compilation.PROCESS_ASSETS_STAGE_ADDITIONS
+          },
+          async (assets) => {
+            const port = await serverPortFn();
+            const mainAssetKey = Object.keys(assets).find(
+              (key) => key.endsWith(".js") && (key.includes("main") || key.includes("app") || key.includes("umi"))
+            );
+            if (!mainAssetKey) return;
+            const originalSource = assets[mainAssetKey].source();
+            assets[mainAssetKey] = new compiler.webpack.sources.RawSource(
+              getWebpackAssetScript(port) + "\n" + originalSource
+            );
+          }
+        );
+      }
     }
   });
 }
@@ -1553,7 +1690,6 @@ var DEFAULT_OPTIONS = {
   logLevel: "warn"
 };
 var DEFAULT_PORT = 5678;
-var getCleanId = (id) => id.split("?")[0];
 var InspectoPlugin = (0, import_unplugin.createUnplugin)((userOptions = {}) => {
   const options = {
     ...DEFAULT_OPTIONS,
@@ -1640,14 +1776,13 @@ var InspectoPlugin = (0, import_unplugin.createUnplugin)((userOptions = {}) => {
     },
     transformInclude(id) {
       if (isProduction || !id) return false;
-      const cleanId = getCleanId(id);
-      return shouldTransform(cleanId, options);
+      return shouldTransform(id, options);
     },
     transform(code, id) {
       if (isProduction || !id) return null;
-      const cleanId = getCleanId(id);
+      const { filePath } = extractTransformFilePath(id);
       const result = transformRouter({
-        filePath: cleanId,
+        filePath,
         source: code,
         projectRoot,
         pluginOptions: options