refactor: consolidate platform engines into senbei-engine

senbei-wasm/Cargo.lock

@@ -429,7 +429,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "senbei-android-crypto"
+name = "senbei-crypto"
 version = "1.2.0"
 dependencies = [
  "aes",
@@ -437,25 +437,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "senbei-android-elf"
-version = "1.2.0"
-dependencies = [
- "memmap2",
- "senbei-android-crypto",
- "serde",
- "serde_json",
- "sha2",
- "tempfile",
- "thiserror",
-]
-
-[[package]]
-name = "senbei-android-engine"
+name = "senbei-engine"
 version = "1.2.0"
 dependencies = [
  "goblin",
  "memmap2",
- "senbei-android-crypto",
+ "senbei-crypto",
  "serde",
  "serde_json",
  "sha2",
@@ -463,21 +450,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "senbei-android-metadata"
-version = "1.2.0"
-dependencies = [
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "senbei-crypto"
-version = "1.2.0"
-dependencies = [
- "thiserror",
-]
-
 [[package]]
 name = "senbei-io"
 version = "1.2.0"
@@ -487,11 +459,8 @@ dependencies = [
  "indicatif",
  "libc",
  "owo-colors",
- "senbei-android-elf",
- "senbei-android-engine",
- "senbei-android-metadata",
+ "senbei-engine",
  "senbei-metadata",
- "senbei-pe",
  "sha2",
  "tempfile",
  "walkdir",
@@ -502,12 +471,8 @@ dependencies = [
 [[package]]
 name = "senbei-metadata"
 version = "1.2.0"
-
-[[package]]
-name = "senbei-pe"
-version = "1.2.0"
 dependencies = [
- "senbei-crypto",
+ "serde",
  "thiserror",
 ]
 
@@ -516,9 +481,9 @@ name = "senbei-wasm"
 version = "1.2.0"
 dependencies = [
  "console_error_panic_hook",
+ "senbei-engine",
  "senbei-io",
  "senbei-metadata",
- "senbei-pe",
  "wasm-bindgen",
 ]
 

senbei-wasm/Cargo.toml

@@ -11,7 +11,7 @@ crate-type = ["cdylib"]
 [dependencies]
 senbei-io = { path = "../senbei-io" }
 senbei-metadata = { path = "../senbei-metadata" }
-senbei-pe = { path = "../senbei-pe" }
+senbei-engine = { path = "../senbei-engine" }
 wasm-bindgen = "0.2"
 console_error_panic_hook = "0.1"
 

senbei-wasm/src/lib.rs

@@ -101,12 +101,12 @@ impl MetadataResult {
     }
 }
 
-fn kind_str(kind: senbei_pe::Kind) -> &'static str {
+fn kind_str(kind: senbei_engine::Kind) -> &'static str {
     match kind {
-        senbei_pe::Kind::NativeExe => "native-exe",
-        senbei_pe::Kind::ManagedExe => "managed-exe",
-        senbei_pe::Kind::NativeDll => "native-dll",
-        senbei_pe::Kind::ManagedDll => "managed-dll",
+        senbei_engine::Kind::NativeExe => "native-exe",
+        senbei_engine::Kind::ManagedExe => "managed-exe",
+        senbei_engine::Kind::NativeDll => "native-dll",
+        senbei_engine::Kind::ManagedDll => "managed-dll",
     }
 }
 
@@ -120,7 +120,7 @@ pub fn detect(input: &[u8]) -> Option<String> {
     if senbei_metadata::is_metadata(input) {
         return Some("metadata".to_string());
     }
-    senbei_pe::detect(input).map(|d| kind_str(d.kind).to_string())
+    senbei_engine::detect(input).map(|d| kind_str(d.kind).to_string())
 }
 
 /// Unpack a protected module.