expo-crypto 10.2.0 → 11.0.0

package/CHANGELOG.md

@@ -10,6 +10,16 @@
 
 ### 💡 Others
 
+## 11.0.0 — 2022-07-07
+
+### 🎉 New features
+
+- The module on Android now uses JSI host object instead of the bridge module for communication between JavaScript and native code. ([#17614](https://github.com/expo/expo/pull/17614) by [@lukmccall](https://github.com/lukmccall))
+
+### 💡 Others
+
+- Migrated Expo modules definitions to the new naming convention. ([#17193](https://github.com/expo/expo/pull/17193) by [@tsapeta](https://github.com/tsapeta))
+
 ## 10.2.0 — 2022-04-18
 
 ### 🎉 New features

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '10.2.0'
+version = '11.0.0'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -74,7 +74,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 31)
     versionCode 25
-    versionName "10.2.0"
+    versionName "11.0.0"
   }
   lintOptions {
     abortOnError false

package/android/src/main/java/expo/modules/crypto/CryptoModule.kt

@@ -1,45 +1,32 @@
 package expo.modules.crypto
 
-import android.content.Context
 import android.util.Base64
-
-import expo.modules.core.ExportedModule
-import expo.modules.core.Promise
-import expo.modules.core.interfaces.ExpoMethod
-
+import expo.modules.kotlin.modules.Module
+import expo.modules.kotlin.modules.ModuleDefinition
 import java.security.MessageDigest
-import java.security.NoSuchAlgorithmException
 
-class CryptoModule(context: Context) : ExportedModule(context) {
-  override fun getName() = "ExpoCrypto"
+class CryptoModule : Module() {
+  override fun definition() = ModuleDefinition {
+    Name("ExpoCrypto")
 
-  @ExpoMethod
-  fun digestStringAsync(algorithm: String, data: String, options: Map<String, Any?>, promise: Promise) {
-    val encoding = options["encoding"] as String?
+    Function("digestString", this@CryptoModule::digestString)
+    AsyncFunction("digestStringAsync", this@CryptoModule::digestString)
+  }
 
-    val messageDigest = try {
-      MessageDigest.getInstance(algorithm).apply { update(data.toByteArray()) }
-    } catch (e: NoSuchAlgorithmException) {
-      promise.reject("ERR_CRYPTO_DIGEST", e)
-      return
-    }
+  private fun digestString(algorithm: DigestAlgorithm, data: String, options: DigestOptions): String {
+    val messageDigest = MessageDigest.getInstance(algorithm.value).apply { update(data.toByteArray()) }
 
     val digest: ByteArray = messageDigest.digest()
-    when (encoding) {
-      "base64" -> {
-        val output = Base64.encodeToString(digest, Base64.NO_WRAP)
-        promise.resolve(output)
+    return when (options.encoding) {
+      DigestOptions.Encoding.BASE64 -> {
+        Base64.encodeToString(digest, Base64.NO_WRAP)
       }
-      "hex" -> {
-        val output = digest.joinToString(separator = "") { byte ->
+      DigestOptions.Encoding.HEX -> {
+        digest.joinToString(separator = "") { byte ->
           ((byte.toInt() and 0xff) + 0x100)
             .toString(radix = 16)
             .substring(startIndex = 1)
         }
-        promise.resolve(output)
-      }
-      else -> {
-        promise.reject("ERR_CRYPTO_DIGEST", "Invalid encoding type provided.")
       }
     }
   }

package/android/src/main/java/expo/modules/crypto/DigestAlgorithm.kt

@@ -0,0 +1,9 @@
+package expo.modules.crypto
+
+enum class DigestAlgorithm(val value: String) {
+  MD5("MD5"),
+  SHA1("SHA-1"),
+  SHA256("SHA-256"),
+  SHA384("SHA-384"),
+  SHA512("SHA-512")
+}

package/android/src/main/java/expo/modules/crypto/DigestOptions.kt

@@ -0,0 +1,14 @@
+package expo.modules.crypto
+
+import expo.modules.kotlin.records.Field
+import expo.modules.kotlin.records.Record
+
+class DigestOptions : Record {
+  @Field
+  var encoding: Encoding = Encoding.HEX
+
+  enum class Encoding(val value: String) {
+    HEX("hex"),
+    BASE64("base64")
+  }
+}

package/expo-module.config.json

@@ -1,6 +1,10 @@
 {
+  "name": "expo-crypto",
   "platforms": ["ios", "android"],
   "ios": {
     "modulesClassNames": ["CryptoModule"]
+  },
+  "android": {
+    "modulesClassNames": ["expo.modules.crypto.CryptoModule"]
   }
 }

package/ios/CryptoModule.swift

@@ -5,12 +5,11 @@ import ExpoModulesCore
 
 public class CryptoModule: Module {
   public func definition() -> ModuleDefinition {
-    name("ExpoCrypto")
+    Name("ExpoCrypto")
 
-    function("digestStringAsync", digestString)
+    AsyncFunction("digestStringAsync", digestString)
 
-    function("digestString", digestString)
-      .runSynchronously()
+    Function("digestString", digestString)
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-crypto",
-  "version": "10.2.0",
+  "version": "11.0.0",
   "description": "Expo universal module for crypto",
   "main": "build/Crypto.js",
   "types": "build/Crypto.d.ts",
@@ -45,5 +45,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "89a27c0ca0ca8becd7546697298e874a15e94faf"
+  "gitHead": "e893ff2b01e108cf246cec02318c0df9d6bc603c"
 }

package/tsconfig.json

@@ -5,5 +5,5 @@
     "outDir": "./build"
   },
   "include": ["./src"],
-  "exclude": ["**/__mocks__/*", "**/__tests__/*"]
+  "exclude": ["**/__mocks__/*", "**/__tests__/*", "**/__stories__/*"]
 }

package/android/src/main/java/expo/modules/crypto/CryptoPackage.kt

@@ -1,9 +0,0 @@
-package expo.modules.crypto
-
-import android.content.Context
-import expo.modules.core.BasePackage
-import expo.modules.core.ExportedModule
-
-class CryptoPackage : BasePackage() {
-  override fun createExportedModules(context: Context): List<ExportedModule> = listOf(CryptoModule(context))
-}