sentry-cli 2.45.0__tar.gz → 2.46.0a0__tar.gz

{sentry_cli-2.45.0 → sentry_cli-2.46.0a0}/Cargo.lock

@@ -2685,7 +2685,7 @@ dependencies = [
 
 [[package]]
 name = "sentry-cli"
-version = "2.45.0"
+version = "2.46.0-alpha"
 dependencies = [
  "anyhow",
  "anylog",

{sentry_cli-2.45.0 → sentry_cli-2.46.0a0}/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Armin Ronacher <armin.ronacher@active-4.com>"]
 build = "build.rs"
 name = "sentry-cli"
-version = "2.45.0"
+version = "2.46.0-alpha"
 edition = "2021"
 rust-version = "1.80"
 

{sentry_cli-2.45.0 → sentry_cli-2.46.0a0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sentry_cli
-Version: 2.45.0
+Version: 2.46.0a0
 Summary: A command line utility to work with Sentry.
 Home-page: https://github.com/getsentry/sentry-cli
 Author: Sentry

{sentry_cli-2.45.0 → sentry_cli-2.46.0a0}/sentry_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sentry_cli
-Version: 2.45.0
+Version: 2.46.0a0
 Summary: A command line utility to work with Sentry.
 Home-page: https://github.com/getsentry/sentry-cli
 Author: Sentry

{sentry_cli-2.45.0 → sentry_cli-2.46.0a0}/src/api/errors/api_error.rs

@@ -44,8 +44,6 @@ pub(in crate::api) enum ApiErrorKind {
         "DSN missing. Please set the `SENTRY_DSN` environment variable to your project's DSN."
     )]
     DsnMissing,
-    #[error("Error preparing request")]
-    ErrorPreparingRequest,
 }
 
 impl fmt::Display for ApiError {

{sentry_cli-2.45.0 → sentry_cli-2.46.0a0}/src/api/mod.rs

@@ -65,6 +65,13 @@ lazy_static! {
     static ref API: Mutex<Option<Arc<Api>>> = Mutex::new(None);
 }
 
+const RETRY_STATUS_CODES: &[u32] = &[
+    http::HTTP_STATUS_502_BAD_GATEWAY,
+    http::HTTP_STATUS_503_SERVICE_UNAVAILABLE,
+    http::HTTP_STATUS_504_GATEWAY_TIMEOUT,
+    http::HTTP_STATUS_507_INSUFFICIENT_STORAGE,
+];
+
 /// Helper for the API access.
 /// Implements the low-level API access methods, and provides high-level implementations for interacting
 /// with portions of the API that do not require authentication via an auth token.
@@ -113,8 +120,6 @@ pub struct ApiRequest {
     is_authenticated: bool,
     body: Option<Vec<u8>>,
     progress_bar_mode: ProgressBarMode,
-    max_retries: u32,
-    retry_on_statuses: &'static [u32],
 }
 
 /// Represents an API response.
@@ -395,14 +400,6 @@ impl Api {
         let request = self
             .request(Method::Post, url, None)?
             .with_form_data(form)?
-            .with_retry(
-                self.config.get_max_retry_count().unwrap(),
-                &[
-                    http::HTTP_STATUS_502_BAD_GATEWAY,
-                    http::HTTP_STATUS_503_SERVICE_UNAVAILABLE,
-                    http::HTTP_STATUS_504_GATEWAY_TIMEOUT,
-                ],
-            )
             .progress_bar_mode(progress_bar_mode);
 
         // The request is performed to an absolute URL. Thus, `Self::request()` will
@@ -967,14 +964,6 @@ impl<'a> AuthenticatedApi<'a> {
 
         self.request(Method::Post, &url)?
             .with_json_body(request)?
-            .with_retry(
-                self.api.config.get_max_retry_count().unwrap(),
-                &[
-                    http::HTTP_STATUS_502_BAD_GATEWAY,
-                    http::HTTP_STATUS_503_SERVICE_UNAVAILABLE,
-                    http::HTTP_STATUS_504_GATEWAY_TIMEOUT,
-                ],
-            )
             .send()?
             .convert_rnf(ApiErrorKind::ProjectNotFound)
     }
@@ -1000,14 +989,6 @@ impl<'a> AuthenticatedApi<'a> {
                 version: None,
                 dist: None,
             })?
-            .with_retry(
-                self.api.config.get_max_retry_count().unwrap(),
-                &[
-                    http::HTTP_STATUS_502_BAD_GATEWAY,
-                    http::HTTP_STATUS_503_SERVICE_UNAVAILABLE,
-                    http::HTTP_STATUS_504_GATEWAY_TIMEOUT,
-                ],
-            )
             .send()?
             .convert_rnf(ApiErrorKind::ReleaseNotFound)
     }
@@ -1031,14 +1012,6 @@ impl<'a> AuthenticatedApi<'a> {
                 version,
                 dist,
             })?
-            .with_retry(
-                self.api.config.get_max_retry_count().unwrap(),
-                &[
-                    http::HTTP_STATUS_502_BAD_GATEWAY,
-                    http::HTTP_STATUS_503_SERVICE_UNAVAILABLE,
-                    http::HTTP_STATUS_504_GATEWAY_TIMEOUT,
-                ],
-            )
             .send()?
             .convert_rnf(ApiErrorKind::ReleaseNotFound)
     }
@@ -1407,15 +1380,6 @@ impl RegionSpecificApi<'_> {
         form.part("file").file(file).add()?;
         self.request(Method::Post, &path)?
             .with_form_data(form)?
-            .with_retry(
-                self.api.api.config.get_max_retry_count().map_err(|e| {
-                    ApiError::with_source(
-                        ApiErrorKind::ErrorPreparingRequest,
-                        e.context("Could not parse retry count"),
-                    )
-                })?,
-                &[http::HTTP_STATUS_507_INSUFFICIENT_STORAGE],
-            )
             .progress_bar_mode(ProgressBarMode::Request)
             .send()?
             .convert()
@@ -1471,14 +1435,6 @@ impl RegionSpecificApi<'_> {
         let resp = self
             .request(Method::Post, &path)?
             .with_form_data(form)?
-            .with_retry(
-                self.api.api.config.get_max_retry_count().unwrap(),
-                &[
-                    http::HTTP_STATUS_502_BAD_GATEWAY,
-                    http::HTTP_STATUS_503_SERVICE_UNAVAILABLE,
-                    http::HTTP_STATUS_504_GATEWAY_TIMEOUT,
-                ],
-            )
             .progress_bar_mode(progress_bar_mode)
             .send()?;
         if resp.status() == 409 {
@@ -1666,8 +1622,6 @@ impl ApiRequest {
             is_authenticated: false,
             body: None,
             progress_bar_mode: ProgressBarMode::Disabled,
-            max_retries: 0,
-            retry_on_statuses: &[],
         };
 
         let request = match auth {
@@ -1741,13 +1695,6 @@ impl ApiRequest {
         self
     }
 
-    pub fn with_retry(mut self, max_retries: u32, retry_on_statuses: &'static [u32]) -> Self {
-        self.max_retries = max_retries;
-        self.retry_on_statuses = retry_on_statuses;
-
-        self
-    }
-
     /// Get a copy of the header list
     fn get_headers(&self) -> curl::easy::List {
         let mut result = curl::easy::List::new();
@@ -1776,18 +1723,17 @@ impl ApiRequest {
 
     /// Sends the request and reads the response body into the response object.
     pub fn send(mut self) -> ApiResult<ApiResponse> {
+        let max_retries = Config::current().max_retries();
+
         let mut backoff = get_default_backoff();
         let mut retry_number = 0;
 
         loop {
             let mut out = vec![];
-            debug!(
-                "retry number {}, max retries: {}",
-                retry_number, self.max_retries,
-            );
+            debug!("retry number {retry_number}, max retries: {max_retries}",);
 
             let mut rv = self.send_into(&mut out)?;
-            if retry_number >= self.max_retries || !self.retry_on_statuses.contains(&rv.status) {
+            if retry_number >= max_retries || !RETRY_STATUS_CODES.contains(&rv.status) {
                 rv.body = Some(out);
                 return Ok(rv);
             }
@@ -2054,8 +2000,6 @@ pub struct UpdatedRelease {
     pub projects: Option<Vec<String>>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub url: Option<String>,
-    #[serde(rename = "dateStarted", skip_serializing_if = "Option::is_none")]
-    pub date_started: Option<DateTime<Utc>>,
     #[serde(rename = "dateReleased", skip_serializing_if = "Option::is_none")]
     pub date_released: Option<DateTime<Utc>>,
     #[serde(skip_serializing_if = "Option::is_none")]

{sentry_cli-2.45.0 → sentry_cli-2.46.0a0}/src/commands/debug_files/bundle_sources.rs

@@ -71,12 +71,13 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
     let output_path = matches.get_one::<String>("output").map(Path::new);
 
     for orig_path in matches.get_many::<String>("paths").unwrap() {
+        let orig_path: &Path = orig_path.as_ref();
         let canonical_path = get_canonical_path(orig_path)?;
 
         let archive = match DifFile::open_path(&canonical_path, None)? {
             DifFile::Archive(archive) => archive,
             _ => {
-                warn!("Cannot build source bundles from {}", orig_path);
+                warn!("Cannot build source bundles from {}", orig_path.display());
                 continue;
             }
         };
@@ -88,7 +89,11 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
         for (index, object) in archive.get().objects().enumerate() {
             let object = object?;
 
-            let mut out = output_path.unwrap_or(parent_path).join(filename);
+            let mut out = output_path.unwrap_or(parent_path).join(
+                orig_path
+                    .file_name()
+                    .expect("orig_path should have a file name"),
+            );
             match index {
                 0 => out.set_extension("src.zip"),
                 index => out.set_extension(format!("{index}.src.zip")),
@@ -109,7 +114,7 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
                 )?;
 
             if !written {
-                eprintln!("skipped {orig_path} (no files found)");
+                eprintln!("skipped {} (no files found)", orig_path.display());
                 fs::remove_file(&out)?;
                 continue;
             } else {

{sentry_cli-2.45.0 → sentry_cli-2.46.0a0}/src/commands/files/delete.rs

@@ -8,7 +8,8 @@ use crate::config::Config;
 
 pub fn make_command(command: Command) -> Command {
     command
-        .about("Delete a release file.")
+        .about("[DEPRECATED] Delete a release file.")
+        .hide(true)
         // Backward compatibility with `releases files <VERSION>` commands.
         .arg(Arg::new("version").long("version").hide(true))
         .arg(

{sentry_cli-2.45.0 → sentry_cli-2.46.0a0}/src/commands/files/list.rs

@@ -6,7 +6,8 @@ use crate::{api::Api, config::Config, utils::formatting::Table};
 
 pub fn make_command(command: Command) -> Command {
     command
-        .about("List all release files.")
+        .about("[DEPRECATED] List all release files.")
+        .hide(true)
         // Backward compatibility with `releases files <VERSION>` commands.
         .arg(Arg::new("version").long("version").hide(true))
 }

{sentry_cli-2.45.0 → sentry_cli-2.46.0a0}/src/commands/files/mod.rs

@@ -1,5 +1,6 @@
 use anyhow::Result;
 use clap::{ArgMatches, Command};
+use console::style;
 
 use crate::utils::args::ArgExt;
 
@@ -25,7 +26,8 @@ pub fn make_command(mut command: Command) -> Command {
     }
 
     command = command
-        .about("Manage release artifacts.")
+        .about("[DEPRECATED] Manage release artifacts.")
+        .hide(true)
         .subcommand_required(true)
         .arg_required_else_help(true)
         .org_arg()
@@ -42,6 +44,9 @@ pub fn make_command(mut command: Command) -> Command {
 }
 
 pub fn execute(matches: &ArgMatches) -> Result<()> {
+    eprintln!("{}", style("⚠ DEPRECATION NOTICE: This functionality will be removed in a future version of `sentry-cli`. \
+        Use the `sourcemaps` command instead.").yellow());
+
     macro_rules! execute_subcommand {
         ($name:ident) => {{
             if let Some(sub_matches) =

{sentry_cli-2.45.0 → sentry_cli-2.46.0a0}/src/commands/files/upload.rs

@@ -24,7 +24,8 @@ use crate::utils::progress::ProgressBarMode;
 
 pub fn make_command(command: Command) -> Command {
     command
-        .about("Upload files for a release.")
+        .about("[DEPRECATED] Upload files for a release.")
+        .hide(true)
         // Backward compatibility with `releases files <VERSION>` commands.
         .arg(Arg::new("version").long("version").hide(true))
         .arg(

{sentry_cli-2.45.0 → sentry_cli-2.46.0a0}/src/commands/react_native/gradle.rs

@@ -12,7 +12,7 @@ use crate::config::Config;
 use crate::constants::DEFAULT_MAX_WAIT;
 use crate::utils::args::{validate_distribution, ArgExt};
 use crate::utils::file_search::ReleaseFileSearch;
-use crate::utils::file_upload::UploadContext;
+use crate::utils::file_upload::{SourceFile, UploadContext};
 use crate::utils::sourcemaps::SourceMapProcessor;
 
 pub fn make_command(command: Command) -> Command {
@@ -92,16 +92,16 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
         &bundle_url,
         ReleaseFileSearch::collect_file(bundle_path.clone())?,
     );
-    processor.add(
-        &sourcemap_url,
-        ReleaseFileSearch::collect_file(sourcemap_path)?,
-    );
+
+    let sourcemap_match = ReleaseFileSearch::collect_file(sourcemap_path.clone())?;
 
     if let Ok(ram_bundle) = RamBundle::parse_unbundle_from_path(&bundle_path) {
         debug!("File RAM bundle found, extracting its contents...");
-        processor.unpack_ram_bundle(&ram_bundle, &bundle_url)?;
+        let sourcemap_source = SourceFile::from_release_file_match(&sourcemap_url, sourcemap_match);
+        processor.unpack_ram_bundle(&ram_bundle, &bundle_url, &sourcemap_source)?;
     } else {
         debug!("Non-file bundle found");
+        processor.add(&sourcemap_url, sourcemap_match);
     }
 
     processor.rewrite(&[base.to_str().unwrap()])?;

{sentry_cli-2.45.0 → sentry_cli-2.46.0a0}/src/commands/releases/finalize.rs

@@ -20,9 +20,10 @@ pub fn make_command(command: Command) -> Command {
         .arg(
             Arg::new("started")
                 .long("started")
+                .hide(true)
                 .value_parser(get_timestamp)
                 .value_name("TIMESTAMP")
-                .help("Set the release start date."),
+                .help("[DEPRECATED] This value is ignored."),
         )
         .arg(
             Arg::new("released")
@@ -38,13 +39,19 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
     let api = Api::current();
     let version = matches.get_one::<String>("version").unwrap();
 
+    if matches.get_one::<DateTime<Utc>>("started").is_some() {
+        log::warn!(
+            "The --started flag is deprecated. Its value is ignored, \
+            and the argument will be completely removed in a future version."
+        );
+    }
+
     api.authenticated()?.update_release(
         &config.get_org(matches)?,
         version,
         &UpdatedRelease {
             projects: config.get_projects(matches).ok(),
             url: matches.get_one::<String>("url").cloned(),
-            date_started: matches.get_one::<DateTime<Utc>>("started").copied(),
             date_released: Some(
                 matches
                     .get_one::<DateTime<Utc>>("released")

{sentry_cli-2.45.0 → sentry_cli-2.46.0a0}/src/commands/sourcemaps/explain.rs

@@ -16,7 +16,8 @@ use super::resolve::print_source;
 
 pub fn make_command(command: Command) -> Command {
     command
-        .about("Explain why sourcemaps are not working for a given event.")
+        .about("[DEPRECATED] Explain why sourcemaps are not working for a given event.")
+        .hide(true)
         .alias("why")
         .arg(
             Arg::new("event")

{sentry_cli-2.45.0 → sentry_cli-2.46.0a0}/src/commands/sourcemaps/upload.rs

@@ -13,7 +13,7 @@ use crate::config::Config;
 use crate::constants::DEFAULT_MAX_WAIT;
 use crate::utils::args::validate_distribution;
 use crate::utils::file_search::ReleaseFileSearch;
-use crate::utils::file_upload::UploadContext;
+use crate::utils::file_upload::{SourceFile, UploadContext};
 use crate::utils::fs::path_as_url;
 use crate::utils::sourcemaps::SourceMapProcessor;
 
@@ -303,21 +303,23 @@ fn process_sources_from_bundle(
         &bundle_url,
         ReleaseFileSearch::collect_file(bundle_path.clone())?,
     );
-    processor.add(
-        &sourcemap_url,
-        ReleaseFileSearch::collect_file(sourcemap_path)?,
-    );
+    let sourcemap_match = ReleaseFileSearch::collect_file(sourcemap_path)?;
 
     if let Ok(ram_bundle) = sourcemap::ram_bundle::RamBundle::parse_unbundle_from_path(&bundle_path)
     {
         debug!("File RAM bundle found, extracting its contents...");
         // For file ("unbundle") RAM bundles we need to explicitly unpack it, otherwise we cannot detect it
         // reliably inside "processor.rewrite()"
-        processor.unpack_ram_bundle(&ram_bundle, &bundle_url)?;
+
+        let sourcemap_source = SourceFile::from_release_file_match(&sourcemap_url, sourcemap_match);
+        processor.unpack_ram_bundle(&ram_bundle, &bundle_url, &sourcemap_source)?;
     } else if sourcemap::ram_bundle::RamBundle::parse_indexed_from_path(&bundle_path).is_ok() {
         debug!("Indexed RAM bundle found");
+        let sourcemap_source = SourceFile::from_release_file_match(&sourcemap_url, sourcemap_match);
+        processor.unpack_indexed_ram_bundles(&sourcemap_source)?;
     } else {
         warn!("Regular bundle found");
+        processor.add(&sourcemap_url, sourcemap_match);
     }
 
     let mut prefixes = get_prefixes_from_args(matches);

{sentry_cli-2.45.0 → sentry_cli-2.46.0a0}/src/config.rs

@@ -1,8 +1,10 @@
 //! This module implements config access.
 use std::env;
+use std::env::VarError;
 use std::fs;
 use std::fs::OpenOptions;
 use std::io;
+use std::num::ParseIntError;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
 
@@ -26,6 +28,9 @@ use crate::utils::http::is_absolute_url;
 #[cfg(target_os = "macos")]
 use crate::utils::xcode;
 
+const MAX_RETRIES_ENV_VAR: &str = "SENTRY_HTTP_MAX_RETRIES";
+const MAX_RETRIES_INI_KEY: &str = "max_retries";
+
 /// Represents the auth information
 #[derive(Debug, Clone)]
 pub enum Auth {
@@ -48,6 +53,7 @@ pub struct Config {
     cached_log_level: log::LevelFilter,
     cached_vcs_remote: String,
     cached_token_data: Option<AuthTokenPayload>,
+    max_retries: u32,
 }
 
 impl Config {
@@ -86,6 +92,7 @@ impl Config {
             cached_headers: get_default_headers(&ini),
             cached_log_level: get_default_log_level(&ini),
             cached_vcs_remote: get_default_vcs_remote(&ini),
+            max_retries: get_max_retries(&ini),
             ini,
             cached_token_data: token_embedded_data,
         }
@@ -462,14 +469,9 @@ impl Config {
             .unwrap_or(DEFAULT_MAX_DIF_ITEM_SIZE)
     }
 
-    pub fn get_max_retry_count(&self) -> Result<u32> {
-        if env::var_os("SENTRY_HTTP_MAX_RETRIES").is_some() {
-            Ok(env::var("SENTRY_HTTP_MAX_RETRIES")?.parse()?)
-        } else if let Some(val) = self.ini.get_from(Some("http"), "max_retries") {
-            Ok(val.parse()?)
-        } else {
-            Ok(DEFAULT_RETRIES)
-        }
+    /// Returns the configured maximum number of retries for failed HTTP requests.
+    pub fn max_retries(&self) -> u32 {
+        self.max_retries
     }
 
     /// Return the DSN
@@ -520,6 +522,50 @@ impl Config {
     }
 }
 
+/// Obtains the maximum number of retries from the environment or the ini file.
+/// Environment variable takes precedence over the ini file. If neither is set,
+/// the default value is returned.
+fn get_max_retries(ini: &Ini) -> u32 {
+    match max_retries_from_env() {
+        Ok(Some(val)) => return val,
+        Ok(None) => (),
+        Err(e) => {
+            warn!(
+                "Ignoring invalid {MAX_RETRIES_ENV_VAR} environment variable: {}",
+                e
+            );
+        }
+    };
+
+    match max_retries_from_ini(ini) {
+        Ok(Some(val)) => return val,
+        Ok(None) => (),
+        Err(e) => {
+            warn!("Ignoring invalid {MAX_RETRIES_INI_KEY} ini key: {}", e);
+        }
+    };
+
+    DEFAULT_RETRIES
+}
+
+/// Computes the maximum number of retries from the `SENTRY_HTTP_MAX_RETRIES` environment variable.
+/// Returns `Ok(None)` if the environment variable is not set, other errors are returned as is.
+fn max_retries_from_env() -> Result<Option<u32>> {
+    match env::var(MAX_RETRIES_ENV_VAR) {
+        Ok(val) => Ok(Some(val.parse()?)),
+        Err(VarError::NotPresent) => Ok(None),
+        Err(e) => Err(e.into()),
+    }
+}
+
+/// Computes the maximum number of retries from the `max_retries` ini key.
+/// Returns `Ok(None)` if the key is not set, other errors are returned as is.
+fn max_retries_from_ini(ini: &Ini) -> Result<Option<u32>, ParseIntError> {
+    ini.get_from(Some("http"), MAX_RETRIES_INI_KEY)
+        .map(|val| val.parse())
+        .transpose()
+}
+
 fn warn_about_conflicting_urls(token_url: &str, manually_configured_url: Option<&str>) {
     if let Some(manually_configured_url) = manually_configured_url {
         if manually_configured_url != token_url {
@@ -672,6 +718,7 @@ impl Clone for Config {
             cached_log_level: self.cached_log_level,
             cached_vcs_remote: self.cached_vcs_remote.clone(),
             cached_token_data: self.cached_token_data.clone(),
+            max_retries: self.max_retries,
         }
     }
 }
@@ -757,6 +804,7 @@ mod tests {
             cached_log_level: LevelFilter::Off,
             cached_vcs_remote: String::new(),
             cached_token_data: None,
+            max_retries: 0,
         };
 
         assert_eq!(

{sentry_cli-2.45.0 → sentry_cli-2.46.0a0}/src/utils/file_upload.rs

@@ -1,5 +1,6 @@
 //! Searches, processes and uploads release files.
 use std::collections::{BTreeMap, HashMap};
+use std::ffi::OsStr;
 use std::fmt::{self, Display};
 use std::io::BufWriter;
 use std::path::PathBuf;
@@ -16,6 +17,7 @@ use rayon::ThreadPoolBuilder;
 use sentry::types::DebugId;
 use sha1_smol::Digest;
 use symbolic::common::ByteView;
+use symbolic::debuginfo::js;
 use symbolic::debuginfo::sourcebundle::{
     SourceBundleErrorKind, SourceBundleWriter, SourceFileInfo, SourceFileType,
 };
@@ -29,6 +31,8 @@ use crate::utils::chunks::{upload_chunks, Chunk, ASSEMBLE_POLL_INTERVAL};
 use crate::utils::fs::{get_sha1_checksum, get_sha1_checksums, TempFile};
 use crate::utils::progress::{ProgressBar, ProgressBarMode, ProgressStyle};
 
+use super::file_search::ReleaseFileMatch;
+
 /// Fallback concurrency for release file uploads.
 static DEFAULT_CONCURRENCY: usize = 4;
 
@@ -239,6 +243,68 @@ pub struct SourceFile {
 }
 
 impl SourceFile {
+    pub fn from_release_file_match(url: &str, mut file: ReleaseFileMatch) -> SourceFile {
+        let (ty, debug_id) = if sourcemap::is_sourcemap_slice(&file.contents) {
+            (
+                SourceFileType::SourceMap,
+                std::str::from_utf8(&file.contents)
+                    .ok()
+                    .and_then(js::discover_sourcemap_embedded_debug_id),
+            )
+        } else if file
+            .path
+            .file_name()
+            .and_then(OsStr::to_str)
+            .map(|x| x.ends_with("bundle"))
+            .unwrap_or(false)
+            && sourcemap::ram_bundle::is_ram_bundle_slice(&file.contents)
+        {
+            (SourceFileType::IndexedRamBundle, None)
+        } else if is_hermes_bytecode(&file.contents) {
+            // This is actually a big hack:
+            // For the react-native Hermes case, we skip uploading the bytecode bundle,
+            // and rather flag it as an empty "minified source". That way, it
+            // will get a SourceMap reference, and the server side processor
+            // should deal with it accordingly.
+            file.contents.clear();
+            (SourceFileType::MinifiedSource, None)
+        } else {
+            // Here, we use MinifiedSource for historical reasons. We used to guess whether
+            // a JS file was a minified file or a source file, and we would treat these files
+            // differently when uploading or injecting them. However, the desired behavior is
+            // and has always been to treat all JS files the same, since users should be
+            // responsible for providing the file paths for only files they would like to have
+            // uploaded or injected. The minified file guessing furthermore was not reliable,
+            // since minification is not a necessary step in the JS build process.
+            //
+            // We use MinifiedSource here rather than Source because we want to treat all JS
+            // files the way we used to treat minified files only. To use Source, we would need
+            // to analyze all possible code paths that check this value, and update those as
+            // well. To keep the change minimal, we use MinifiedSource here.
+            (
+                SourceFileType::MinifiedSource,
+                std::str::from_utf8(&file.contents)
+                    .ok()
+                    .and_then(js::discover_debug_id),
+            )
+        };
+
+        let mut source_file = SourceFile {
+            url: url.into(),
+            path: file.path,
+            contents: file.contents.into(),
+            ty,
+            headers: BTreeMap::new(),
+            messages: vec![],
+            already_uploaded: false,
+        };
+
+        if let Some(debug_id) = debug_id {
+            source_file.set_debug_id(debug_id.to_string());
+        }
+        source_file
+    }
+
     /// Calculates and returns the SHA1 checksum of the file.
     pub fn checksum(&self) -> Result<Digest> {
         get_sha1_checksum(&**self.contents)
@@ -753,6 +819,13 @@ fn print_upload_context_details(context: &UploadContext) {
     );
 }
 
+fn is_hermes_bytecode(slice: &[u8]) -> bool {
+    // The hermes bytecode format magic is defined here:
+    // https://github.com/facebook/hermes/blob/5243222ef1d92b7393d00599fc5cff01d189a88a/include/hermes/BCGen/HBC/BytecodeFileFormat.h#L24-L25
+    const HERMES_MAGIC: [u8; 8] = [0xC6, 0x1F, 0xBC, 0x03, 0xC1, 0x03, 0x19, 0x1F];
+    slice.starts_with(&HERMES_MAGIC)
+}
+
 #[cfg(test)]
 mod tests {
     use sha1_smol::Sha1;