@observerkit/metro 0.2.0 → 0.2.1

package/README.md

@@ -26,7 +26,7 @@ The `observerkit-upload` CLI reads the project key from `--project-key` or the `
 
 ### Expo
 
-Add the config plugin; prebuild wires both native builds automatically:
+Add the config plugin; prebuild wires both native builds automatically, including the Android R8 mapping upload described below:
 
 ```json
 {
@@ -94,6 +94,18 @@ tasks.configureEach { task ->
 
 The composed map lands in `generated/sourcemaps/react/<variant>/`, while the pre-compose packager map (needed to restore the `debugId`, see Hermes below) stays behind in `intermediates/sourcemaps/react/<variant>/`. `ignoreExitValue` plus the logged warning make sure a failed upload never fails `assembleRelease`.
 
+## Android R8/ProGuard mapping upload
+
+Release Android builds run through R8/ProGuard, so JVM crash and ANR stack traces are obfuscated unless a mapping file is uploaded. The Expo config plugin wires this automatically: a Gradle hook runs after the release R8 minify task (`minify<Flavor>ReleaseWithR8`) and uploads `mapping.txt`, keyed by `versionName` and `versionCode` read from `android.defaultConfig`. The hook is release-only, mirroring the source map hook above: every variant shares `defaultConfig`'s version pair, and the server stores mappings last-upload-wins, so a minified debug or staging build would otherwise clobber the release mapping for the same version. Rebuilding the same version overwrites the stored mapping, so re-upload happens naturally on every release build.
+
+For bare React Native, or apps that override the version per flavor, upload the mapping manually with the CLI:
+
+```bash
+observerkit-upload --mapping android/app/build/outputs/mapping/release/mapping.txt --version-name 1.2.0 --version-code 42
+```
+
+The server retraces JVM crash and ANR frames with the uploaded mapping before grouping, so deobfuscated frames stay grouped consistently across releases.
+
 ## Hermes
 
 Symbolication support targets Hermes, the React Native default JS engine; JSC is not supported.
@@ -108,9 +120,14 @@ Hermes release builds compose the Metro source map with the bytecode map, which
 ```
 observerkit-upload --map <path> [--packager-map <path>] [--bundle <path>]
 observerkit-upload --dir <path>
-
---project-key <key>   Defaults to $OBSERVERKIT_PROJECT_KEY
---endpoint <url>      Defaults to $OBSERVERKIT_ENDPOINT or https://ingest.observerkit.com
+observerkit-upload --mapping <path> --version-name <name> --version-code <code>
+
+--project-key <key>    Defaults to $OBSERVERKIT_PROJECT_KEY
+--endpoint <url>       Defaults to $OBSERVERKIT_ENDPOINT or https://ingest.observerkit.com
+--mapping <path>       R8/ProGuard mapping.txt to upload, keyed by
+                       --version-name and --version-code
+--version-name <name>  App versionName, required with --mapping
+--version-code <code>  App versionCode (digits only), required with --mapping
 ```
 
 ## pnpm note

package/dist/{chunk-DFCKYXBG.js → chunk-3IIVAXY2.js}

@@ -10,6 +10,14 @@ function isJsonObject(value) {
 // ../plugin-core/src/upload.ts
 var DEFAULT_MAX_FILE_BYTES = 50 * 1024 * 1024;
 var DEFAULT_MAX_BATCH_BYTES = 100 * 1024 * 1024;
+var RETRY_DELAYS_MS = [1e3, 4e3];
+var sleep = (ms) => new Promise((resolveSleep) => setTimeout(resolveSleep, ms));
+function isDirectoryMissing(error) {
+  return error instanceof Error && "code" in error && error.code === "ENOENT";
+}
+function isCssMap(mapFile) {
+  return mapFile.endsWith(".css.map");
+}
 function hasDebugId(content) {
   if (!content.includes('"debugId"')) return false;
   try {
@@ -49,6 +57,18 @@ async function deleteMapFiles(directory, mapFiles) {
     `[ObserverKit] Deleted ${mapFiles.length - failures.length} .map files from output`
   );
 }
+var UploadResponseError = class extends Error {
+  status;
+  constructor(status, message) {
+    super(message);
+    this.name = "UploadResponseError";
+    this.status = status;
+  }
+};
+function isTransient(error) {
+  if (error instanceof UploadResponseError) return error.status >= 500;
+  return error instanceof TypeError;
+}
 async function uploadBatch(batch, options) {
   const formData = new FormData();
   for (const [index, entry] of batch.entries()) {
@@ -70,11 +90,28 @@ async function uploadBatch(batch, options) {
   });
   if (!response.ok) {
     const text = await response.text();
-    throw new Error(
+    throw new UploadResponseError(
+      response.status,
       `[ObserverKit] Source map upload failed: ${response.status} ${text}`
     );
   }
 }
+async function uploadBatchWithRetry(batch, options) {
+  for (let attempt = 0; ; attempt++) {
+    try {
+      await uploadBatch(batch, options);
+      return;
+    } catch (err) {
+      const wait = RETRY_DELAYS_MS[attempt];
+      if (wait === void 0 || !isTransient(err)) throw err;
+      const reason = err instanceof UploadResponseError ? `(${err.status})` : "(network error)";
+      console.warn(
+        `[ObserverKit] Upload failed ${reason}, retrying in ${wait / 1e3}s (attempt ${attempt + 2}/${RETRY_DELAYS_MS.length + 1})`
+      );
+      await options.delay(wait);
+    }
+  }
+}
 var JS_SOURCE_MAPPING_URL = /^\/\/[#@] sourceMappingURL=\S+[ \t]*$/gm;
 var CSS_SOURCE_MAPPING_URL = /^\/\*# sourceMappingURL=\S+[ \t]*\*\/[ \t]*$/gm;
 function isChunkFile(name) {
@@ -105,10 +142,28 @@ async function uploadSourceMaps(options) {
   const { projectKey, directory, endpoint, deleteAfterUpload, pluginVersion, pluginName } = options;
   const maxFileBytes = options.maxFileBytes ?? DEFAULT_MAX_FILE_BYTES;
   const maxBatchBytes = options.maxBatchBytes ?? DEFAULT_MAX_BATCH_BYTES;
-  const allFiles = options.files ? [...options.files] : await readdir(directory, { recursive: true, encoding: "utf-8" });
+  const delay = options.delay ?? sleep;
+  let allFiles;
+  if (options.files) {
+    allFiles = [...options.files];
+  } else {
+    try {
+      allFiles = await readdir(directory, { recursive: true, encoding: "utf-8" });
+    } catch (err) {
+      if (isDirectoryMissing(err)) {
+        console.error(
+          `[ObserverKit] Output directory not found: ${directory}. No source maps were uploaded. Check that this is where your build writes its output.`
+        );
+        return;
+      }
+      throw err;
+    }
+  }
   const allMapFiles = allFiles.filter((f) => f.endsWith(".map"));
   if (allMapFiles.length === 0) {
-    console.log("[ObserverKit] No .map files found, skipping source map upload");
+    console.warn(
+      `[ObserverKit] No .map files found in ${directory}, skipping source map upload. Source map emission is enabled by this plugin, so an empty scan usually means the build wrote its output elsewhere.`
+    );
     return;
   }
   try {
@@ -125,7 +180,7 @@ async function uploadSourceMaps(options) {
         continue;
       }
       if (!hasDebugId(content)) {
-        skippedNoDebugId += 1;
+        if (!isCssMap(mapFile)) skippedNoDebugId += 1;
         continue;
       }
       if (content.byteLength > maxFileBytes) {
@@ -158,11 +213,23 @@ async function uploadSourceMaps(options) {
     const url = `${endpoint.replace(/\/+$/, "")}/v1/sourcemaps`;
     const batches = batchBySize(uploadable, maxBatchBytes);
     for (const [index, batch] of batches.entries()) {
-      await uploadBatch(batch, { directory, url, projectKey, pluginVersion, pluginName });
-      console.log(
-        `[ObserverKit] Uploaded batch ${index + 1}/${batches.length} (${batch.length} source maps)`
-      );
+      await uploadBatchWithRetry(batch, {
+        directory,
+        url,
+        projectKey,
+        pluginVersion,
+        pluginName,
+        delay
+      });
+      if (batches.length > 1) {
+        console.log(
+          `[ObserverKit] Uploaded batch ${index + 1}/${batches.length} (${batch.length} source maps)`
+        );
+      }
     }
+    console.log(
+      `[ObserverKit] Uploaded ${uploadable.length} source map(s) from ${directory}`
+    );
   } catch (err) {
     if (deleteAfterUpload) {
       console.warn(
@@ -178,6 +245,44 @@ async function uploadSourceMaps(options) {
   }
 }
 
+// ../plugin-core/src/upload-mapping.ts
+import { readFile as readFile2 } from "fs/promises";
+var DEFAULT_MAX_MAPPING_BYTES = 50 * 1024 * 1024;
+async function uploadProguardMapping(options) {
+  const maxFileBytes = options.maxFileBytes ?? DEFAULT_MAX_MAPPING_BYTES;
+  const content = await readFile2(options.mappingPath);
+  if (content.byteLength > maxFileBytes) {
+    throw new Error(
+      `[ObserverKit] Mapping file exceeds the per-file ingest limit (${maxFileBytes} bytes)`
+    );
+  }
+  const formData = new FormData();
+  formData.append("versionName", options.versionName);
+  formData.append("versionCode", options.versionCode);
+  formData.append(
+    "file",
+    new Blob([new Uint8Array(content)], { type: "text/plain" }),
+    "mapping.txt"
+  );
+  const url = `${options.endpoint.replace(/\/+$/, "")}/v1/mappings`;
+  const response = await fetch(url, {
+    method: "POST",
+    headers: {
+      "X-ObserverKit-Key": options.projectKey,
+      "X-ObserverKit-Plugin-Version": options.pluginVersion,
+      "X-ObserverKit-Plugin-Name": options.pluginName
+    },
+    body: formData
+  });
+  if (!response.ok) {
+    const text = await response.text();
+    throw new Error(`[ObserverKit] Mapping upload failed: ${response.status} ${text}`);
+  }
+  console.log(
+    `[ObserverKit] Uploaded R8 mapping for version ${options.versionName} (${options.versionCode})`
+  );
+}
+
 // ../plugin-core/src/debug-id.ts
 import { v5 } from "uuid";
 var OBSERVERKIT_NAMESPACE = "a1b2c3d4-e5f6-4a7b-8c9d-0e1f2a3b4c5d";
@@ -195,5 +300,6 @@ export {
   generateDebugId,
   isJsonObject,
   buildStackKeyedDebugIdSnippet,
-  uploadSourceMaps
+  uploadSourceMaps,
+  uploadProguardMapping
 };

package/dist/{chunk-6RJOM2CO.cjs → chunk-DFKRMIQJ.cjs}

@@ -10,6 +10,14 @@ function isJsonObject(value) {
 // ../plugin-core/src/upload.ts
 var DEFAULT_MAX_FILE_BYTES = 50 * 1024 * 1024;
 var DEFAULT_MAX_BATCH_BYTES = 100 * 1024 * 1024;
+var RETRY_DELAYS_MS = [1e3, 4e3];
+var sleep = (ms) => new Promise((resolveSleep) => setTimeout(resolveSleep, ms));
+function isDirectoryMissing(error) {
+  return error instanceof Error && "code" in error && error.code === "ENOENT";
+}
+function isCssMap(mapFile) {
+  return mapFile.endsWith(".css.map");
+}
 function hasDebugId(content) {
   if (!content.includes('"debugId"')) return false;
   try {
@@ -49,6 +57,18 @@ async function deleteMapFiles(directory, mapFiles) {
     `[ObserverKit] Deleted ${mapFiles.length - failures.length} .map files from output`
   );
 }
+var UploadResponseError = class extends Error {
+  
+  constructor(status, message) {
+    super(message);
+    this.name = "UploadResponseError";
+    this.status = status;
+  }
+};
+function isTransient(error) {
+  if (error instanceof UploadResponseError) return error.status >= 500;
+  return error instanceof TypeError;
+}
 async function uploadBatch(batch, options) {
   const formData = new FormData();
   for (const [index, entry] of batch.entries()) {
@@ -70,11 +90,28 @@ async function uploadBatch(batch, options) {
   });
   if (!response.ok) {
     const text = await response.text();
-    throw new Error(
+    throw new UploadResponseError(
+      response.status,
       `[ObserverKit] Source map upload failed: ${response.status} ${text}`
     );
   }
 }
+async function uploadBatchWithRetry(batch, options) {
+  for (let attempt = 0; ; attempt++) {
+    try {
+      await uploadBatch(batch, options);
+      return;
+    } catch (err) {
+      const wait = RETRY_DELAYS_MS[attempt];
+      if (wait === void 0 || !isTransient(err)) throw err;
+      const reason = err instanceof UploadResponseError ? `(${err.status})` : "(network error)";
+      console.warn(
+        `[ObserverKit] Upload failed ${reason}, retrying in ${wait / 1e3}s (attempt ${attempt + 2}/${RETRY_DELAYS_MS.length + 1})`
+      );
+      await options.delay(wait);
+    }
+  }
+}
 var JS_SOURCE_MAPPING_URL = /^\/\/[#@] sourceMappingURL=\S+[ \t]*$/gm;
 var CSS_SOURCE_MAPPING_URL = /^\/\*# sourceMappingURL=\S+[ \t]*\*\/[ \t]*$/gm;
 function isChunkFile(name) {
@@ -105,10 +142,28 @@ async function uploadSourceMaps(options) {
   const { projectKey, directory, endpoint, deleteAfterUpload, pluginVersion, pluginName } = options;
   const maxFileBytes = _nullishCoalesce(options.maxFileBytes, () => ( DEFAULT_MAX_FILE_BYTES));
   const maxBatchBytes = _nullishCoalesce(options.maxBatchBytes, () => ( DEFAULT_MAX_BATCH_BYTES));
-  const allFiles = options.files ? [...options.files] : await _promises.readdir.call(void 0, directory, { recursive: true, encoding: "utf-8" });
+  const delay = _nullishCoalesce(options.delay, () => ( sleep));
+  let allFiles;
+  if (options.files) {
+    allFiles = [...options.files];
+  } else {
+    try {
+      allFiles = await _promises.readdir.call(void 0, directory, { recursive: true, encoding: "utf-8" });
+    } catch (err) {
+      if (isDirectoryMissing(err)) {
+        console.error(
+          `[ObserverKit] Output directory not found: ${directory}. No source maps were uploaded. Check that this is where your build writes its output.`
+        );
+        return;
+      }
+      throw err;
+    }
+  }
   const allMapFiles = allFiles.filter((f) => f.endsWith(".map"));
   if (allMapFiles.length === 0) {
-    console.log("[ObserverKit] No .map files found, skipping source map upload");
+    console.warn(
+      `[ObserverKit] No .map files found in ${directory}, skipping source map upload. Source map emission is enabled by this plugin, so an empty scan usually means the build wrote its output elsewhere.`
+    );
     return;
   }
   try {
@@ -125,7 +180,7 @@ async function uploadSourceMaps(options) {
         continue;
       }
       if (!hasDebugId(content)) {
-        skippedNoDebugId += 1;
+        if (!isCssMap(mapFile)) skippedNoDebugId += 1;
         continue;
       }
       if (content.byteLength > maxFileBytes) {
@@ -158,11 +213,23 @@ async function uploadSourceMaps(options) {
     const url = `${endpoint.replace(/\/+$/, "")}/v1/sourcemaps`;
     const batches = batchBySize(uploadable, maxBatchBytes);
     for (const [index, batch] of batches.entries()) {
-      await uploadBatch(batch, { directory, url, projectKey, pluginVersion, pluginName });
-      console.log(
-        `[ObserverKit] Uploaded batch ${index + 1}/${batches.length} (${batch.length} source maps)`
-      );
+      await uploadBatchWithRetry(batch, {
+        directory,
+        url,
+        projectKey,
+        pluginVersion,
+        pluginName,
+        delay
+      });
+      if (batches.length > 1) {
+        console.log(
+          `[ObserverKit] Uploaded batch ${index + 1}/${batches.length} (${batch.length} source maps)`
+        );
+      }
     }
+    console.log(
+      `[ObserverKit] Uploaded ${uploadable.length} source map(s) from ${directory}`
+    );
   } catch (err) {
     if (deleteAfterUpload) {
       console.warn(
@@ -178,6 +245,44 @@ async function uploadSourceMaps(options) {
   }
 }
 
+// ../plugin-core/src/upload-mapping.ts
+
+var DEFAULT_MAX_MAPPING_BYTES = 50 * 1024 * 1024;
+async function uploadProguardMapping(options) {
+  const maxFileBytes = _nullishCoalesce(options.maxFileBytes, () => ( DEFAULT_MAX_MAPPING_BYTES));
+  const content = await _promises.readFile.call(void 0, options.mappingPath);
+  if (content.byteLength > maxFileBytes) {
+    throw new Error(
+      `[ObserverKit] Mapping file exceeds the per-file ingest limit (${maxFileBytes} bytes)`
+    );
+  }
+  const formData = new FormData();
+  formData.append("versionName", options.versionName);
+  formData.append("versionCode", options.versionCode);
+  formData.append(
+    "file",
+    new Blob([new Uint8Array(content)], { type: "text/plain" }),
+    "mapping.txt"
+  );
+  const url = `${options.endpoint.replace(/\/+$/, "")}/v1/mappings`;
+  const response = await fetch(url, {
+    method: "POST",
+    headers: {
+      "X-ObserverKit-Key": options.projectKey,
+      "X-ObserverKit-Plugin-Version": options.pluginVersion,
+      "X-ObserverKit-Plugin-Name": options.pluginName
+    },
+    body: formData
+  });
+  if (!response.ok) {
+    const text = await response.text();
+    throw new Error(`[ObserverKit] Mapping upload failed: ${response.status} ${text}`);
+  }
+  console.log(
+    `[ObserverKit] Uploaded R8 mapping for version ${options.versionName} (${options.versionCode})`
+  );
+}
+
 // ../plugin-core/src/debug-id.ts
 var _uuid = require('uuid');
 var OBSERVERKIT_NAMESPACE = "a1b2c3d4-e5f6-4a7b-8c9d-0e1f2a3b4c5d";
@@ -196,4 +301,5 @@ function buildStackKeyedDebugIdSnippet(debugId) {
 
 
 
-exports.generateDebugId = generateDebugId; exports.isJsonObject = isJsonObject; exports.buildStackKeyedDebugIdSnippet = buildStackKeyedDebugIdSnippet; exports.uploadSourceMaps = uploadSourceMaps;
+
+exports.generateDebugId = generateDebugId; exports.isJsonObject = isJsonObject; exports.buildStackKeyedDebugIdSnippet = buildStackKeyedDebugIdSnippet; exports.uploadSourceMaps = uploadSourceMaps; exports.uploadProguardMapping = uploadProguardMapping;

package/dist/cli.cjs

@@ -2,7 +2,8 @@
 "use strict"; function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
 
-var _chunk6RJOM2COcjs = require('./chunk-6RJOM2CO.cjs');
+
+var _chunkDFKRMIQJcjs = require('./chunk-DFKRMIQJ.cjs');
 require('./chunk-AUOVSTQX.cjs');
 
 // src/cli.ts
@@ -31,7 +32,7 @@ async function readDebugIdFromMap(path) {
   } catch (e2) {
     return null;
   }
-  if (!_chunk6RJOM2COcjs.isJsonObject.call(void 0, parsed)) return null;
+  if (!_chunkDFKRMIQJcjs.isJsonObject.call(void 0, parsed)) return null;
   return typeof parsed["debugId"] === "string" ? parsed["debugId"] : null;
 }
 async function readDebugIdFromBundle(path) {
@@ -52,7 +53,7 @@ async function repairDebugId(mapPath, packagerMapPath, bundlePath) {
   } catch (e4) {
     throw new Error(`[ObserverKit] ${mapPath} is not valid JSON`);
   }
-  if (!_chunk6RJOM2COcjs.isJsonObject.call(void 0, parsed)) {
+  if (!_chunkDFKRMIQJcjs.isJsonObject.call(void 0, parsed)) {
     throw new Error(`[ObserverKit] ${mapPath} is not a source map object`);
   }
   if (typeof parsed["debugId"] === "string") return;
@@ -71,10 +72,11 @@ async function repairDebugId(mapPath, packagerMapPath, bundlePath) {
 }
 
 // src/cli.ts
-var PLUGIN_VERSION = "0.2.0";
+var PLUGIN_VERSION = "0.2.1";
 var USAGE = `Usage:
   observerkit-upload --map <path> [--packager-map <path>] [--bundle <path>]
   observerkit-upload --dir <path>
+  observerkit-upload --mapping <path> --version-name <name> --version-code <code>
 
 Options:
   --map <path>           Final source map to upload (repairs debugId first)
@@ -84,6 +86,11 @@ Options:
                          packager map is available (Hermes iOS builds)
   --dir <path>           Upload every debug-id source map in a directory
                          (e.g. an expo export output)
+  --mapping <path>       R8/ProGuard mapping.txt to upload, keyed by
+                         --version-name and --version-code
+  --version-name <name>  App versionName, required with --mapping
+  --version-code <code>  App versionCode (digits only), required with
+                         --mapping
   --project-key <key>    Defaults to $OBSERVERKIT_PROJECT_KEY
   --endpoint <url>       Defaults to $OBSERVERKIT_ENDPOINT or
                          https://ingest.observerkit.com`;
@@ -94,6 +101,9 @@ async function main() {
       "packager-map": { type: "string" },
       bundle: { type: "string" },
       dir: { type: "string" },
+      mapping: { type: "string" },
+      "version-name": { type: "string" },
+      "version-code": { type: "string" },
       "project-key": { type: "string" },
       endpoint: { type: "string" }
     }
@@ -106,7 +116,7 @@ async function main() {
     process.exit(1);
   }
   const endpoint = _nullishCoalesce(_nullishCoalesce(values.endpoint, () => ( process.env["OBSERVERKIT_ENDPOINT"])), () => ( "https://ingest.observerkit.com"));
-  if (!values.map && !values.dir) {
+  if (!values.map && !values.dir && !values.mapping) {
     console.error(USAGE);
     process.exit(1);
   }
@@ -115,6 +125,34 @@ async function main() {
       "[ObserverKit] --packager-map and --bundle are ignored when --dir is set"
     );
   }
+  if (values.mapping) {
+    if (values.map || values.dir) {
+      console.error("[ObserverKit] --mapping cannot be combined with --map or --dir");
+      process.exit(1);
+    }
+    const versionName = values["version-name"];
+    const versionCode = values["version-code"];
+    if (!versionName || !versionCode) {
+      console.error("[ObserverKit] --mapping requires --version-name and --version-code");
+      process.exit(1);
+    }
+    if (!/^\d+$/.test(versionCode)) {
+      console.error(
+        `[ObserverKit] --version-code must be a string of digits, got "${versionCode}"`
+      );
+      process.exit(1);
+    }
+    await _chunkDFKRMIQJcjs.uploadProguardMapping.call(void 0, {
+      projectKey,
+      endpoint,
+      mappingPath: _path.resolve.call(void 0, values.mapping),
+      versionName,
+      versionCode,
+      pluginVersion: PLUGIN_VERSION,
+      pluginName: "metro"
+    });
+    return;
+  }
   if (values.map) {
     if (!values.map.endsWith(".map")) {
       console.error(`[ObserverKit] --map must point at a .map file, got "${values.map}"`);
@@ -128,7 +166,7 @@ async function main() {
       packagerMap ? _path.resolve.call(void 0, packagerMap) : void 0,
       bundle ? _path.resolve.call(void 0, bundle) : void 0
     );
-    await _chunk6RJOM2COcjs.uploadSourceMaps.call(void 0, {
+    await _chunkDFKRMIQJcjs.uploadSourceMaps.call(void 0, {
       projectKey,
       directory: _path.dirname.call(void 0, mapPath),
       endpoint,
@@ -140,7 +178,7 @@ async function main() {
     return;
   }
   if (values.dir) {
-    await _chunk6RJOM2COcjs.uploadSourceMaps.call(void 0, {
+    await _chunkDFKRMIQJcjs.uploadSourceMaps.call(void 0, {
       projectKey,
       directory: _path.resolve.call(void 0, values.dir),
       endpoint,

package/dist/cli.js

@@ -1,8 +1,9 @@
 #!/usr/bin/env node
 import {
   isJsonObject,
+  uploadProguardMapping,
   uploadSourceMaps
-} from "./chunk-DFCKYXBG.js";
+} from "./chunk-3IIVAXY2.js";
 
 // src/cli.ts
 import { parseArgs } from "util";
@@ -70,10 +71,11 @@ async function repairDebugId(mapPath, packagerMapPath, bundlePath) {
 }
 
 // src/cli.ts
-var PLUGIN_VERSION = "0.2.0";
+var PLUGIN_VERSION = "0.2.1";
 var USAGE = `Usage:
   observerkit-upload --map <path> [--packager-map <path>] [--bundle <path>]
   observerkit-upload --dir <path>
+  observerkit-upload --mapping <path> --version-name <name> --version-code <code>
 
 Options:
   --map <path>           Final source map to upload (repairs debugId first)
@@ -83,6 +85,11 @@ Options:
                          packager map is available (Hermes iOS builds)
   --dir <path>           Upload every debug-id source map in a directory
                          (e.g. an expo export output)
+  --mapping <path>       R8/ProGuard mapping.txt to upload, keyed by
+                         --version-name and --version-code
+  --version-name <name>  App versionName, required with --mapping
+  --version-code <code>  App versionCode (digits only), required with
+                         --mapping
   --project-key <key>    Defaults to $OBSERVERKIT_PROJECT_KEY
   --endpoint <url>       Defaults to $OBSERVERKIT_ENDPOINT or
                          https://ingest.observerkit.com`;
@@ -93,6 +100,9 @@ async function main() {
       "packager-map": { type: "string" },
       bundle: { type: "string" },
       dir: { type: "string" },
+      mapping: { type: "string" },
+      "version-name": { type: "string" },
+      "version-code": { type: "string" },
       "project-key": { type: "string" },
       endpoint: { type: "string" }
     }
@@ -105,7 +115,7 @@ async function main() {
     process.exit(1);
   }
   const endpoint = values.endpoint ?? process.env["OBSERVERKIT_ENDPOINT"] ?? "https://ingest.observerkit.com";
-  if (!values.map && !values.dir) {
+  if (!values.map && !values.dir && !values.mapping) {
     console.error(USAGE);
     process.exit(1);
   }
@@ -114,6 +124,34 @@ async function main() {
       "[ObserverKit] --packager-map and --bundle are ignored when --dir is set"
     );
   }
+  if (values.mapping) {
+    if (values.map || values.dir) {
+      console.error("[ObserverKit] --mapping cannot be combined with --map or --dir");
+      process.exit(1);
+    }
+    const versionName = values["version-name"];
+    const versionCode = values["version-code"];
+    if (!versionName || !versionCode) {
+      console.error("[ObserverKit] --mapping requires --version-name and --version-code");
+      process.exit(1);
+    }
+    if (!/^\d+$/.test(versionCode)) {
+      console.error(
+        `[ObserverKit] --version-code must be a string of digits, got "${versionCode}"`
+      );
+      process.exit(1);
+    }
+    await uploadProguardMapping({
+      projectKey,
+      endpoint,
+      mappingPath: resolve(values.mapping),
+      versionName,
+      versionCode,
+      pluginVersion: PLUGIN_VERSION,
+      pluginName: "metro"
+    });
+    return;
+  }
   if (values.map) {
     if (!values.map.endsWith(".map")) {
       console.error(`[ObserverKit] --map must point at a .map file, got "${values.map}"`);

package/dist/expo.cjs

@@ -5,6 +5,9 @@ var _configplugins = require('@expo/config-plugins');
 
 // src/native-scripts.ts
 var UPLOAD_MARKER = "observerkit-upload";
+var MAPPING_UPLOAD_MARKER = "observerkit-mapping-upload";
+var UPLOAD_MARKER_COMMENT = `// ${UPLOAD_MARKER} (added`;
+var MAPPING_UPLOAD_MARKER_COMMENT = `// ${MAPPING_UPLOAD_MARKER} (added`;
 function escapeForDoubleQuoted(value) {
   return value.replace(/[\\"]/g, "\\$&");
 }
@@ -25,11 +28,14 @@ function patchIosShellScript(script, props) {
   const patched = `${exportLine}${inner}${uploadBlock}`;
   return hasQuotes ? `"${patched}"` : patched;
 }
-function buildGradleSnippet(props) {
+function gradleEnvLines(props) {
   const envLine = props.projectKey ? `
                 environment "OBSERVERKIT_PROJECT_KEY", "${escapeForDoubleQuoted(props.projectKey)}"` : "";
   const endpointLine = props.endpoint ? `
                 environment "OBSERVERKIT_ENDPOINT", "${escapeForDoubleQuoted(props.endpoint)}"` : "";
+  return `${envLine}${endpointLine}`;
+}
+function buildGradleSnippet(props) {
   return `
 // ${UPLOAD_MARKER} (added by @observerkit/metro/expo; do not edit)
 tasks.configureEach { task ->
@@ -44,7 +50,7 @@ tasks.configureEach { task ->
             def packagerMapFile = file("$buildDir/intermediates/sourcemaps/react/" + variant + "/index.android.bundle.packager.map")
             if (mapFile.exists()) {
                 def result = exec {
-                    workingDir rootProject.projectDir.parentFile${envLine}${endpointLine}
+                    workingDir rootProject.projectDir.parentFile${gradleEnvLines(props)}
                     commandLine "npx", "observerkit-upload", "--map", mapFile.absolutePath, "--packager-map", packagerMapFile.absolutePath
                     ignoreExitValue true
                 }
@@ -59,6 +65,38 @@ tasks.configureEach { task ->
 }
 `;
 }
+function mappingGradleSnippet(props) {
+  return `
+// ${MAPPING_UPLOAD_MARKER} (added by @observerkit/metro/expo; do not edit)
+tasks.configureEach { task ->
+    def matcher = task.name =~ /^minify(\\w*)ReleaseWithR8$/
+    if (matcher.matches()) {
+        task.doLast {
+            def flavor = matcher.group(1)
+            def variant = flavor.isEmpty()
+                ? "release"
+                : flavor.substring(0, 1).toLowerCase() + flavor.substring(1) + "Release"
+            def mappingFile = file("$buildDir/outputs/mapping/" + variant + "/mapping.txt")
+            def androidExt = project.extensions.getByName("android")
+            def versionName = androidExt.defaultConfig.versionName
+            def versionCode = androidExt.defaultConfig.versionCode
+            if (mappingFile.exists() && versionName != null && versionCode != null) {
+                def result = exec {
+                    workingDir rootProject.projectDir.parentFile${gradleEnvLines(props)}
+                    commandLine "npx", "observerkit-upload", "--mapping", mappingFile.absolutePath, "--version-name", versionName.toString(), "--version-code", versionCode.toString()
+                    ignoreExitValue true
+                }
+                if (result.exitValue != 0) {
+                    logger.warn("[ObserverKit] R8 mapping upload failed")
+                }
+            } else {
+                logger.warn("[ObserverKit] No R8 mapping found at " + mappingFile + ", skipping upload")
+            }
+        }
+    }
+}
+`;
+}
 
 // src/expo.ts
 var BUNDLE_PHASE_NAME = "Bundle React Native code and images";
@@ -75,9 +113,12 @@ var withObserverkitIos = (config, props) => _configplugins.withXcodeProject.call
   return c;
 });
 var withObserverkitAndroid = (config, props) => _configplugins.withAppBuildGradle.call(void 0, config, (c) => {
-  if (!c.modResults.contents.includes(UPLOAD_MARKER)) {
+  if (!c.modResults.contents.includes(UPLOAD_MARKER_COMMENT)) {
     c.modResults.contents = c.modResults.contents + buildGradleSnippet(props);
   }
+  if (!c.modResults.contents.includes(MAPPING_UPLOAD_MARKER_COMMENT)) {
+    c.modResults.contents = c.modResults.contents + mappingGradleSnippet(props);
+  }
   return c;
 });
 var withObserverkitExpo = (config, props) => {

package/dist/expo.js

@@ -3,6 +3,9 @@ import { withAppBuildGradle, withXcodeProject } from "@expo/config-plugins";
 
 // src/native-scripts.ts
 var UPLOAD_MARKER = "observerkit-upload";
+var MAPPING_UPLOAD_MARKER = "observerkit-mapping-upload";
+var UPLOAD_MARKER_COMMENT = `// ${UPLOAD_MARKER} (added`;
+var MAPPING_UPLOAD_MARKER_COMMENT = `// ${MAPPING_UPLOAD_MARKER} (added`;
 function escapeForDoubleQuoted(value) {
   return value.replace(/[\\"]/g, "\\$&");
 }
@@ -23,11 +26,14 @@ function patchIosShellScript(script, props) {
   const patched = `${exportLine}${inner}${uploadBlock}`;
   return hasQuotes ? `"${patched}"` : patched;
 }
-function buildGradleSnippet(props) {
+function gradleEnvLines(props) {
   const envLine = props.projectKey ? `
                 environment "OBSERVERKIT_PROJECT_KEY", "${escapeForDoubleQuoted(props.projectKey)}"` : "";
   const endpointLine = props.endpoint ? `
                 environment "OBSERVERKIT_ENDPOINT", "${escapeForDoubleQuoted(props.endpoint)}"` : "";
+  return `${envLine}${endpointLine}`;
+}
+function buildGradleSnippet(props) {
   return `
 // ${UPLOAD_MARKER} (added by @observerkit/metro/expo; do not edit)
 tasks.configureEach { task ->
@@ -42,7 +48,7 @@ tasks.configureEach { task ->
             def packagerMapFile = file("$buildDir/intermediates/sourcemaps/react/" + variant + "/index.android.bundle.packager.map")
             if (mapFile.exists()) {
                 def result = exec {
-                    workingDir rootProject.projectDir.parentFile${envLine}${endpointLine}
+                    workingDir rootProject.projectDir.parentFile${gradleEnvLines(props)}
                     commandLine "npx", "observerkit-upload", "--map", mapFile.absolutePath, "--packager-map", packagerMapFile.absolutePath
                     ignoreExitValue true
                 }
@@ -57,6 +63,38 @@ tasks.configureEach { task ->
 }
 `;
 }
+function mappingGradleSnippet(props) {
+  return `
+// ${MAPPING_UPLOAD_MARKER} (added by @observerkit/metro/expo; do not edit)
+tasks.configureEach { task ->
+    def matcher = task.name =~ /^minify(\\w*)ReleaseWithR8$/
+    if (matcher.matches()) {
+        task.doLast {
+            def flavor = matcher.group(1)
+            def variant = flavor.isEmpty()
+                ? "release"
+                : flavor.substring(0, 1).toLowerCase() + flavor.substring(1) + "Release"
+            def mappingFile = file("$buildDir/outputs/mapping/" + variant + "/mapping.txt")
+            def androidExt = project.extensions.getByName("android")
+            def versionName = androidExt.defaultConfig.versionName
+            def versionCode = androidExt.defaultConfig.versionCode
+            if (mappingFile.exists() && versionName != null && versionCode != null) {
+                def result = exec {
+                    workingDir rootProject.projectDir.parentFile${gradleEnvLines(props)}
+                    commandLine "npx", "observerkit-upload", "--mapping", mappingFile.absolutePath, "--version-name", versionName.toString(), "--version-code", versionCode.toString()
+                    ignoreExitValue true
+                }
+                if (result.exitValue != 0) {
+                    logger.warn("[ObserverKit] R8 mapping upload failed")
+                }
+            } else {
+                logger.warn("[ObserverKit] No R8 mapping found at " + mappingFile + ", skipping upload")
+            }
+        }
+    }
+}
+`;
+}
 
 // src/expo.ts
 var BUNDLE_PHASE_NAME = "Bundle React Native code and images";
@@ -73,9 +111,12 @@ var withObserverkitIos = (config, props) => withXcodeProject(config, (c) => {
   return c;
 });
 var withObserverkitAndroid = (config, props) => withAppBuildGradle(config, (c) => {
-  if (!c.modResults.contents.includes(UPLOAD_MARKER)) {
+  if (!c.modResults.contents.includes(UPLOAD_MARKER_COMMENT)) {
     c.modResults.contents = c.modResults.contents + buildGradleSnippet(props);
   }
+  if (!c.modResults.contents.includes(MAPPING_UPLOAD_MARKER_COMMENT)) {
+    c.modResults.contents = c.modResults.contents + mappingGradleSnippet(props);
+  }
   return c;
 });
 var withObserverkitExpo = (config, props) => {

package/dist/index.cjs

@@ -2,7 +2,7 @@
 
 
 
-var _chunk6RJOM2COcjs = require('./chunk-6RJOM2CO.cjs');
+var _chunkDFKRMIQJcjs = require('./chunk-DFKRMIQJ.cjs');
 
 
 var _chunkAUOVSTQXcjs = require('./chunk-AUOVSTQX.cjs');
@@ -42,15 +42,15 @@ function addDebugIdToMap(map, debugId) {
   } catch (e) {
     return map;
   }
-  if (!_chunk6RJOM2COcjs.isJsonObject.call(void 0, parsed)) return map;
+  if (!_chunkDFKRMIQJcjs.isJsonObject.call(void 0, parsed)) return map;
   return JSON.stringify({ ...parsed, debugId });
 }
 function unwrapModuleExport(mod, exportName) {
   if (exportName) {
-    const named = _chunk6RJOM2COcjs.isJsonObject.call(void 0, mod) ? mod[exportName] : void 0;
+    const named = _chunkDFKRMIQJcjs.isJsonObject.call(void 0, mod) ? mod[exportName] : void 0;
     if (typeof named === "function") return named;
   }
-  const defaultExport = _chunk6RJOM2COcjs.isJsonObject.call(void 0, mod) ? mod["default"] : void 0;
+  const defaultExport = _chunkDFKRMIQJcjs.isJsonObject.call(void 0, mod) ? mod["default"] : void 0;
   if (typeof defaultExport === "function") return defaultExport;
   if (typeof mod === "function") return mod;
   throw new Error(
@@ -103,12 +103,12 @@ function createObserverkitSerializer(wrapped) {
     if (options.dev) {
       return serializer(entryPoint, preModules, graph, options);
     }
-    const { snippet } = _chunk6RJOM2COcjs.buildStackKeyedDebugIdSnippet.call(void 0, DEBUG_ID_PLACEHOLDER);
+    const { snippet } = _chunkDFKRMIQJcjs.buildStackKeyedDebugIdSnippet.call(void 0, DEBUG_ID_PLACEHOLDER);
     const withDebugId = injectDebugIdModule(preModules, createDebugIdModule(snippet));
     const result = await serializer(entryPoint, withDebugId, graph, options);
     const code = typeof result === "string" ? result : result.code;
     const map = typeof result === "string" ? null : result.map;
-    const debugId = _chunk6RJOM2COcjs.generateDebugId.call(void 0, code);
+    const debugId = _chunkDFKRMIQJcjs.generateDebugId.call(void 0, code);
     const finalCode = `${code.split(DEBUG_ID_PLACEHOLDER).join(debugId)}
 //# debugId=${debugId}`;
     if (map === null) return finalCode;

package/dist/index.js

@@ -2,7 +2,7 @@ import {
   buildStackKeyedDebugIdSnippet,
   generateDebugId,
   isJsonObject
-} from "./chunk-DFCKYXBG.js";
+} from "./chunk-3IIVAXY2.js";
 
 // src/serializer.ts
 import { createRequire } from "module";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@observerkit/metro",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Metro plugin for ObserverKit: injects debug IDs and uploads React Native source maps",
   "type": "module",
   "publishConfig": {
@@ -45,7 +45,7 @@
     "tsup": "^8.3.5",
     "typescript": "5.9.2",
     "vitest": "^3.2.4",
-    "@repo/plugin-core": "0.0.0"
+    "@repo/plugin-core": "0.0.1"
   },
   "dependencies": {
     "uuid": "^13.0.0"