@autter/runtime-cli 1.1.0 → 1.3.0

package/dist/vite.d.ts

@@ -1,4 +1,4 @@
-import { A as AutterSourceMapsOptions } from './build-CPXR9Xd3.js';
+import { A as AutterSourceMapsOptions } from './build-DGeoDkTh.js';
 
 type SourcemapSetting = boolean | "inline" | "hidden";
 /** The parts of Vite's / Rollup's types this plugin touches (structural, so
@@ -11,6 +11,7 @@ interface UserConfigLike {
 }
 interface ResolvedConfigLike {
     base?: string;
+    root?: string;
     build?: {
         sourcemap?: SourcemapSetting;
         ssr?: boolean | string;
@@ -43,6 +44,9 @@ interface AutterSourceMapsPlugin {
  * chunk a debug id after the bundle is written, and uploads the maps when
  * AUTTER_RUNTIME_KEY (or `key`) is set. Maps it turned on are deleted after
  * the upload step whatever its outcome; without a key it turns none on.
+ * SSR builds and Vite 6 server environments are uploaded too (RF-05), under
+ * their output directory's path in the project (`/dist/server/`), unless
+ * `serverBundles: false`.
  *
  * ```ts
  * // vite.config.ts

package/dist/vite.js

@@ -2,8 +2,9 @@ import {
   logMapsNotGenerated,
   processBuildOutput,
   removeSourceMaps,
+  serverUrlPrefix,
   shouldGenerateMaps
-} from "./chunk-DQLLM2NT.js";
+} from "./chunk-Q23FB5X3.js";
 
 // src/vite.ts
 import { dirname, resolve } from "path";
@@ -12,6 +13,8 @@ function autterSourceMaps(options = {}) {
   let enabledMaps = false;
   let ssr = false;
   let base = "/";
+  let root = process.cwd();
+  const serverBundles = options.serverBundles !== false;
   return {
     name: "autter-runtime-sourcemaps",
     apply: "build",
@@ -19,7 +22,7 @@ function autterSourceMaps(options = {}) {
     config(config) {
       isVite = true;
       const current = config.build?.sourcemap;
-      if ((current === void 0 || current === false) && !config.build?.ssr) {
+      if ((current === void 0 || current === false) && (serverBundles || !config.build?.ssr)) {
         if (!shouldGenerateMaps(options)) {
           logMapsNotGenerated(options);
           return void 0;
@@ -31,6 +34,7 @@ function autterSourceMaps(options = {}) {
     },
     configResolved(config) {
       ssr = Boolean(config.build?.ssr);
+      if (config.root) root = config.root;
       if (config.base && /^(\/|[a-z][\w+.-]*:\/\/)/i.test(config.base)) base = config.base;
       if (config.build?.sourcemap === "inline" && !options.silent) {
         console.warn('[autter-runtime] build.sourcemap is "inline": there are no map files to upload; use "hidden"');
@@ -49,8 +53,23 @@ function autterSourceMaps(options = {}) {
       const dir = output.dir ?? (output.file ? dirname(output.file) : void 0);
       if (!dir) return;
       const maps = Object.values(bundle).filter((file) => file.fileName.endsWith(".map")).map((file) => resolve(dir, file.fileName));
+      const files = Object.values(bundle).filter((file) => file.type === "chunk").map((file) => resolve(dir, file.fileName));
       const environment = this?.environment;
-      if (ssr || environment?.config?.consumer === "server") {
+      const server = ssr || environment?.config?.consumer === "server";
+      if (server && serverBundles) {
+        await processBuildOutput({
+          dir,
+          files,
+          maps,
+          urlPrefix: serverUrlPrefix(root, dir),
+          options,
+          deleteAfterUpload: enabledMaps,
+          ownMaps: enabledMaps,
+          server: true
+        });
+        return;
+      }
+      if (server) {
         if (enabledMaps && options.deleteAfterUpload !== false) {
           try {
             const removed = await removeSourceMaps(maps);
@@ -63,7 +82,6 @@ function autterSourceMaps(options = {}) {
         }
         return;
       }
-      const files = Object.values(bundle).filter((file) => file.type === "chunk").map((file) => resolve(dir, file.fileName));
       await processBuildOutput({
         dir,
         files,

package/dist/webpack.cjs

@@ -22,7 +22,8 @@ var webpack_exports = {};
 __export(webpack_exports, {
   AutterSourceMapsWebpackPlugin: () => AutterSourceMapsWebpackPlugin,
   autterSourceMapsWebpack: () => autterSourceMapsWebpack,
-  default: () => webpack_default
+  default: () => webpack_default,
+  isServerTarget: () => isServerTarget
 });
 module.exports = __toCommonJS(webpack_exports);
 var import_node_path3 = require("path");
@@ -699,6 +700,9 @@ var DEFAULT_ENDPOINT = "https://otlp.autter.dev";
 var MAX_MAP_CHARS = 32 * 1024 * 1024;
 var MAX_UPLOAD_BYTES = MAX_MAP_CHARS + 1024 * 1024;
 var LEGACY_MAX_BYTES = 5 * 1024 * 1024;
+var UPLOAD_KEY_PREFIX = "autter_rtu_";
+var CLIENT_KEY_PREFIX = "autter_rtc_";
+var KEY_ADVICE = "set AUTTER_RUNTIME_KEY to an upload-only key (autter_rtu_\u2026, recommended for CI: it can only upload source maps) or the full server key (autter_rt_\u2026, also works)";
 var gzip = (0, import_node_util.promisify)(import_node_zlib.gzip);
 var CHECK_BATCH = 500;
 var MAX_ATTEMPTS = 3;
@@ -712,9 +716,56 @@ function servedFilename(urlPrefix, path) {
   if (!/^[a-z][\w+.-]*:\/\//i.test(prefix) && !prefix.startsWith("/")) prefix = `/${prefix}`;
   return `${prefix.replace(/\/+$/, "")}/${path.replace(/^\/+/, "")}`;
 }
-function storedMapJson(map) {
-  const { sourcesContent: _omitted, ...safe } = map;
-  return JSON.stringify(safe);
+var NOT_IN_APP_PATH_PARTS = ["node_modules/", "/site-packages/", "/dist-packages/", "/vendor/", "/.pnpm/"];
+var NOT_IN_APP_PATH_PREFIXES = ["node:", "internal/"];
+var EXTENSION_SCHEMES = ["chrome-extension:", "moz-extension:", "safari-extension:", "safari-web-extension:", "webkit-masked-url:"];
+function isInAppSource(path) {
+  if (!path) return true;
+  const normalized = path.replace(/\\/g, "/");
+  if (NOT_IN_APP_PATH_PARTS.some((part) => normalized.includes(part))) return false;
+  if (NOT_IN_APP_PATH_PREFIXES.some((prefix) => normalized.startsWith(prefix))) return false;
+  const lower = normalized.toLowerCase();
+  return !EXTENSION_SCHEMES.some((scheme) => lower.startsWith(scheme));
+}
+var SOURCES_CONTENT_WRAPPER_BYTES = Buffer.byteLength(',"sourcesContent":[]');
+var NULL_ENTRY_BYTES = 4;
+function storedSourcesContent(fields, baseBytes, limit = MAX_MAP_CHARS) {
+  const { sources, sourcesContent } = fields;
+  if (!Array.isArray(sources) || !Array.isArray(sourcesContent) || sources.length === 0) return null;
+  const ignored = /* @__PURE__ */ new Set();
+  for (const list of [fields.ignoreList, fields.x_google_ignoreList]) {
+    if (!Array.isArray(list)) continue;
+    for (const index of list) if (Number.isInteger(index)) ignored.add(index);
+  }
+  const count = sources.length;
+  const candidates = [];
+  for (let index = 0; index < count; index++) {
+    const source = sources[index];
+    const content = sourcesContent[index];
+    if (typeof source !== "string" || typeof content !== "string") continue;
+    if (ignored.has(index) || !isInAppSource(source)) continue;
+    candidates.push({ index, content, bytes: Buffer.byteLength(JSON.stringify(content)) });
+  }
+  if (candidates.length === 0) return null;
+  candidates.sort((a, b) => a.bytes - b.bytes || a.index - b.index);
+  let remaining = limit - baseBytes - SOURCES_CONTENT_WRAPPER_BYTES - NULL_ENTRY_BYTES * count - (count - 1);
+  const kept = new Array(count).fill(null);
+  let any = false;
+  for (const candidate of candidates) {
+    const extra = candidate.bytes - NULL_ENTRY_BYTES;
+    if (extra > remaining) break;
+    remaining -= extra;
+    kept[candidate.index] = candidate.content;
+    any = true;
+  }
+  return any ? kept : null;
+}
+function storedMapJson(map, options = {}) {
+  const { sourcesContent: _content, ...rest } = map;
+  const base = JSON.stringify(rest);
+  if (options.sourcesContent === false) return base;
+  const content = storedSourcesContent(map, Buffer.byteLength(base));
+  return content ? JSON.stringify({ ...rest, sourcesContent: content }) : base;
 }
 function bytesOf(buffer) {
   return new Uint8Array(buffer.buffer, buffer.byteOffset, buffer.byteLength);
@@ -725,7 +776,7 @@ function fits(json, body) {
 function uploadBody(release, filename, debugId, json) {
   return `{"release":${JSON.stringify(release)},"filename":${JSON.stringify(filename)},${debugId ? `"debugId":${JSON.stringify(debugId)},` : ""}"map":${json}}`;
 }
-async function prepare(bundle, urlPrefix, release, log, compress) {
+async function prepare(bundle, urlPrefix, release, log, compress, sourcesContent) {
   let map;
   try {
     map = JSON.parse(await (0, import_promises3.readFile)(bundle.map, "utf8"));
@@ -740,9 +791,10 @@ async function prepare(bundle, urlPrefix, release, log, compress) {
   const filename = servedFilename(urlPrefix, bundle.path);
   const { [SCOPES_KEY]: _stale, ...plain } = map;
   const scopes = computeScopes(code, map);
-  let json = storedMapJson(plain);
+  const stored = { sourcesContent };
+  let json = storedMapJson(plain, stored);
   if ("scopes" in scopes) {
-    const scoped = storedMapJson({ ...plain, [SCOPES_KEY]: scopes.scopes });
+    const scoped = storedMapJson({ ...plain, [SCOPES_KEY]: scopes.scopes }, stored);
     if (fits(scoped, uploadBody(release, filename, debugId, scoped))) json = scoped;
     else if (fits(json, uploadBody(release, filename, debugId, json))) {
       log(`warning: ${bundle.path}: its map is over 32 MB with function scopes, so it is uploaded without them (frames keep call-site names)`);
@@ -789,7 +841,7 @@ async function uploadDir(dir, options = {}) {
   };
   const items = [];
   for (const bundle of await findBundles(dir, options.files)) {
-    const prepared = await prepare(bundle, options.urlPrefix, release, log, !options.dryRun);
+    const prepared = await prepare(bundle, options.urlPrefix, release, log, !options.dryRun, options.sourcesContent !== false);
     if ("error" in prepared) {
       summary.failed.push({ path: bundle.path, filename: servedFilename(options.urlPrefix, bundle.path), error: prepared.error });
     } else if (prepared.mapChars > MAX_MAP_CHARS || prepared.bytes > MAX_UPLOAD_BYTES) {
@@ -807,10 +859,13 @@ async function uploadDir(dir, options = {}) {
     return summary;
   }
   const key = (options.key ?? env.AUTTER_RUNTIME_KEY ?? "").trim();
-  if (!key) throw new FatalUploadError("no ingest key: set AUTTER_RUNTIME_KEY to a server key (autter_rt_\u2026)");
-  if (key.startsWith("autter_rtc_")) {
-    throw new FatalUploadError("AUTTER_RUNTIME_KEY is a publishable client key (autter_rtc_\u2026); uploads need a server key (autter_rt_\u2026)");
+  if (!key) throw new FatalUploadError(`no ingest key: ${KEY_ADVICE}`);
+  if (key.startsWith(CLIENT_KEY_PREFIX)) {
+    throw new FatalUploadError(`AUTTER_RUNTIME_KEY is a publishable client key (autter_rtc_\u2026), which cannot upload source maps: ${KEY_ADVICE}`);
   }
+  const rejected = (status, detail) => new FatalUploadError(
+    `the ingester rejected the key (${status}): ${detail}` + (key.startsWith(UPLOAD_KEY_PREFIX) ? " (upload keys, autter_rtu_\u2026, need ingester 1.7.0 or later; the server key works with any)" : "")
+  );
   const headers = { "content-type": "application/json", authorization: `Bearer ${key}` };
   const uploadHeaders = { ...headers, "content-encoding": "gzip" };
   const skipped = /* @__PURE__ */ new Set();
@@ -832,9 +887,7 @@ async function uploadDir(dir, options = {}) {
         );
         break;
       }
-      if (res.status === 401 || res.status === 403) {
-        throw new FatalUploadError(`the ingester rejected the key (${res.status}): ${(await res.text()).slice(0, 300)}`);
-      }
+      if (res.status === 401 || res.status === 403) throw rejected(res.status, (await res.text()).slice(0, 300));
       if (!res.ok) throw new Error(`HTTP ${res.status}`);
       const body = await res.json();
       const present = new Set(Array.isArray(body.present) ? body.present : []);
@@ -865,7 +918,7 @@ async function uploadDir(dir, options = {}) {
         detail = err.message;
       }
       if (status === 401 || status === 403) {
-        fatal = new FatalUploadError(`the ingester rejected the key (${status}): ${detail}`);
+        fatal = rejected(status, detail);
         return;
       }
       const retryable = status === 0 || status === 429 || status >= 500;
@@ -907,6 +960,10 @@ function strip(item) {
 }
 
 // src/build.ts
+function serverUrlPrefix(projectRoot, dir) {
+  const rel = (0, import_node_path2.relative)(projectRoot, dir).split(import_node_path2.sep).join("/");
+  return !rel || rel.startsWith("..") || (0, import_node_path2.isAbsolute)(rel) ? "/" : `/${rel.replace(/\/+$/, "")}/`;
+}
 function buildKey(options) {
   const key = (options.key ?? process.env.AUTTER_RUNTIME_KEY ?? "").trim();
   return key || null;
@@ -969,12 +1026,13 @@ async function processBuildOutput(input) {
       result.upload = await uploadDir(input.dir, {
         files: input.files,
         release: options.release,
-        urlPrefix: options.urlPrefix ?? input.urlPrefix,
+        urlPrefix: input.server ? input.urlPrefix : options.urlPrefix ?? input.urlPrefix,
         endpoint: options.endpoint,
         key: key ?? void 0,
         dryRun: options.dryRun,
         concurrency: options.concurrency,
         deleteAfterUpload: options.deleteAfterUpload ?? input.deleteAfterUpload,
+        ...options.sourcesContent === false ? { sourcesContent: false } : {},
         log
       });
       for (const line of formatUploadSummary(result.upload)) log(line);
@@ -1025,6 +1083,11 @@ async function processBuildOutput(input) {
 
 // src/webpack.ts
 var PLUGIN_NAME = "AutterSourceMapsWebpackPlugin";
+var SERVER_TARGET_RE = /^(?:async-)?node|^electron-(?:main|preload)/;
+function isServerTarget(target) {
+  const targets = Array.isArray(target) ? target : [target];
+  return targets.some((value) => typeof value === "string" && SERVER_TARGET_RE.test(value));
+}
 var AutterSourceMapsWebpackPlugin = class {
   constructor(options = {}, internal = {}) {
     this.options = options;
@@ -1035,6 +1098,8 @@ var AutterSourceMapsWebpackPlugin = class {
   apply(compiler) {
     const mode = compiler.options.mode ?? (process.env.NODE_ENV === "development" ? "development" : void 0);
     if (mode === "development") return;
+    const server = this.internal.server ?? isServerTarget(compiler.options.target);
+    if (server && this.options.serverBundles === false) return;
     let enabledMaps = this.internal.ownMaps ?? false;
     if (!compiler.options.devtool) {
       if (shouldGenerateMaps(this.options)) {
@@ -1048,7 +1113,7 @@ var AutterSourceMapsWebpackPlugin = class {
       const dir = compilation.outputOptions.path ?? compiler.outputPath;
       if (!dir) return;
       const publicPath = compilation.outputOptions.publicPath;
-      const urlPrefix = typeof publicPath === "string" && publicPath !== "auto" && publicPath !== "" ? publicPath : "/";
+      const urlPrefix = server ? serverUrlPrefix(compiler.context ?? process.cwd(), dir) : typeof publicPath === "string" && publicPath !== "auto" && publicPath !== "" ? publicPath : "/";
       const assets = compilation.getAssets().map((asset) => asset.name);
       const files = assets.filter((name) => BUNDLE_RE.test(name)).map((name) => (0, import_node_path3.resolve)(dir, name));
       const maps = assets.filter((name) => name.endsWith(".map")).map((name) => (0, import_node_path3.resolve)(dir, name));
@@ -1059,7 +1124,8 @@ var AutterSourceMapsWebpackPlugin = class {
         urlPrefix,
         options: this.options,
         deleteAfterUpload: enabledMaps,
-        ownMaps: enabledMaps
+        ownMaps: enabledMaps,
+        ...server ? { server: true } : {}
       });
     });
   }
@@ -1071,5 +1137,6 @@ var webpack_default = AutterSourceMapsWebpackPlugin;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AutterSourceMapsWebpackPlugin,
-  autterSourceMapsWebpack
+  autterSourceMapsWebpack,
+  isServerTarget
 });

package/dist/webpack.d.cts

@@ -1,4 +1,4 @@
-import { A as AutterSourceMapsOptions } from './build-CPXR9Xd3.cjs';
+import { A as AutterSourceMapsOptions } from './build-DGeoDkTh.cjs';
 
 /** The parts of webpack's types this plugin touches (structural, so webpack
  * is not a dependency). */
@@ -15,7 +15,10 @@ interface CompilerLike {
     options: {
         mode?: string;
         devtool?: string | false;
+        target?: unknown;
     };
+    /** The project directory webpack resolves from (`context`). */
+    context?: string;
     outputPath?: string;
     hooks: {
         afterEmit: {
@@ -23,6 +26,8 @@ interface CompilerLike {
         };
     };
 }
+/** Whether a webpack `target` (string, list or false) builds server code. */
+declare function isServerTarget(target: unknown): boolean;
 /**
  * webpack 5 plugin: turns on `hidden-source-map` in production builds that
  * have no `devtool`, gives every emitted JS asset a debug id after emit, and
@@ -30,6 +35,12 @@ interface CompilerLike {
  * on are deleted after the upload step whatever its outcome; without a key
  * it turns none on. Development builds are left alone.
  *
+ * Builds for a Node target (`target: "node"`, `"async-node"`,
+ * `"electron-main"`) are server bundles (RF-05): their maps are stored under
+ * the output directory's path in the project (`/dist/`), which the ingester
+ * matches against the path Node runs them from, not under
+ * `output.publicPath`. `serverBundles: false` leaves them alone.
+ *
  * ```js
  * // webpack.config.js
  * const { AutterSourceMapsWebpackPlugin } = require("@autter/runtime-cli/webpack");
@@ -38,16 +49,19 @@ interface CompilerLike {
  */
 declare class AutterSourceMapsWebpackPlugin {
     private readonly options;
-    /** Set by withAutterSourceMaps, which chooses the devtool itself. */
+    /** Set by withAutterSourceMaps, which chooses the devtool itself and
+     * knows which compilations are Next's server ones. */
     private readonly internal;
     constructor(options?: AutterSourceMapsOptions, 
-    /** Set by withAutterSourceMaps, which chooses the devtool itself. */
+    /** Set by withAutterSourceMaps, which chooses the devtool itself and
+     * knows which compilations are Next's server ones. */
     internal?: {
         ownMaps?: boolean;
+        server?: boolean;
     });
     apply(compiler: CompilerLike): void;
 }
 /** Functional form: `plugins: [autterSourceMapsWebpack()]`. */
 declare function autterSourceMapsWebpack(options?: AutterSourceMapsOptions): AutterSourceMapsWebpackPlugin;
 
-export { AutterSourceMapsOptions, AutterSourceMapsWebpackPlugin, autterSourceMapsWebpack, AutterSourceMapsWebpackPlugin as default };
+export { AutterSourceMapsOptions, AutterSourceMapsWebpackPlugin, autterSourceMapsWebpack, AutterSourceMapsWebpackPlugin as default, isServerTarget };

package/dist/webpack.d.ts

@@ -1,4 +1,4 @@
-import { A as AutterSourceMapsOptions } from './build-CPXR9Xd3.js';
+import { A as AutterSourceMapsOptions } from './build-DGeoDkTh.js';
 
 /** The parts of webpack's types this plugin touches (structural, so webpack
  * is not a dependency). */
@@ -15,7 +15,10 @@ interface CompilerLike {
     options: {
         mode?: string;
         devtool?: string | false;
+        target?: unknown;
     };
+    /** The project directory webpack resolves from (`context`). */
+    context?: string;
     outputPath?: string;
     hooks: {
         afterEmit: {
@@ -23,6 +26,8 @@ interface CompilerLike {
         };
     };
 }
+/** Whether a webpack `target` (string, list or false) builds server code. */
+declare function isServerTarget(target: unknown): boolean;
 /**
  * webpack 5 plugin: turns on `hidden-source-map` in production builds that
  * have no `devtool`, gives every emitted JS asset a debug id after emit, and
@@ -30,6 +35,12 @@ interface CompilerLike {
  * on are deleted after the upload step whatever its outcome; without a key
  * it turns none on. Development builds are left alone.
  *
+ * Builds for a Node target (`target: "node"`, `"async-node"`,
+ * `"electron-main"`) are server bundles (RF-05): their maps are stored under
+ * the output directory's path in the project (`/dist/`), which the ingester
+ * matches against the path Node runs them from, not under
+ * `output.publicPath`. `serverBundles: false` leaves them alone.
+ *
  * ```js
  * // webpack.config.js
  * const { AutterSourceMapsWebpackPlugin } = require("@autter/runtime-cli/webpack");
@@ -38,16 +49,19 @@ interface CompilerLike {
  */
 declare class AutterSourceMapsWebpackPlugin {
     private readonly options;
-    /** Set by withAutterSourceMaps, which chooses the devtool itself. */
+    /** Set by withAutterSourceMaps, which chooses the devtool itself and
+     * knows which compilations are Next's server ones. */
     private readonly internal;
     constructor(options?: AutterSourceMapsOptions, 
-    /** Set by withAutterSourceMaps, which chooses the devtool itself. */
+    /** Set by withAutterSourceMaps, which chooses the devtool itself and
+     * knows which compilations are Next's server ones. */
     internal?: {
         ownMaps?: boolean;
+        server?: boolean;
     });
     apply(compiler: CompilerLike): void;
 }
 /** Functional form: `plugins: [autterSourceMapsWebpack()]`. */
 declare function autterSourceMapsWebpack(options?: AutterSourceMapsOptions): AutterSourceMapsWebpackPlugin;
 
-export { AutterSourceMapsOptions, AutterSourceMapsWebpackPlugin, autterSourceMapsWebpack, AutterSourceMapsWebpackPlugin as default };
+export { AutterSourceMapsOptions, AutterSourceMapsWebpackPlugin, autterSourceMapsWebpack, AutterSourceMapsWebpackPlugin as default, isServerTarget };

package/dist/webpack.js

@@ -1,11 +1,13 @@
 import {
   AutterSourceMapsWebpackPlugin,
   autterSourceMapsWebpack,
+  isServerTarget,
   webpack_default
-} from "./chunk-I2743JCN.js";
-import "./chunk-DQLLM2NT.js";
+} from "./chunk-V66S2YHN.js";
+import "./chunk-Q23FB5X3.js";
 export {
   AutterSourceMapsWebpackPlugin,
   autterSourceMapsWebpack,
-  webpack_default as default
+  webpack_default as default,
+  isServerTarget
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@autter/runtime-cli",
-	"version": "1.1.0",
+	"version": "1.3.0",
 	"description": "Readable stack traces for Autter Runtime: inject debug ids into JS bundles and upload their source maps (CLI, Vite/Rollup, webpack and Next.js plugins)",
 	"license": "MIT",
 	"type": "module",
@@ -51,6 +51,7 @@
 		"test": "npm run build -w @autter/otlp-ingester && npm run build && node --test test/*.test.mjs"
 	},
 	"dependencies": {
+		"@sveltejs/acorn-typescript": "^1.0.13",
 		"acorn": "^8.17.0"
 	},
 	"peerDependencies": {