修复打包后无法加载加密模块

app/src/main/java/org/autojs/autojs/engine/module/AssetAndUrlModuleSourceProvider.kt

@@ -6,8 +6,12 @@ import android.net.Uri
 import com.google.gson.Gson
 import okhttp3.OkHttpClient
 import okhttp3.Request
+import org.autojs.autojs.engine.encryption.ScriptEncryption.decrypt
+import org.autojs.autojs.script.EncryptedScriptFileHeader
+import org.autojs.autojs.script.EncryptedScriptFileHeader.isValidFile
 import org.mozilla.javascript.commonjs.module.provider.ModuleSource
 import org.mozilla.javascript.commonjs.module.provider.ModuleSourceProviderBase
+import java.io.ByteArrayInputStream
 import java.io.File
 import java.io.InputStream
 import java.io.InputStreamReader
@@ -22,11 +26,13 @@ class AssetAndUrlModuleSourceProvider(
     private val okHttpClient = OkHttpClient.Builder().followRedirects(true).build()
     private val contentResolver: ContentResolver = context.contentResolver
     private val moduleSources: ArrayList<URI> = arrayListOf(mBaseURI, npmModuleSource)
+    private val encryptionSource = File(context.filesDir, "project")
 
     companion object {
         val mBaseURI: URI = URI.create("file:/android_asset/modules")
-        val npmModuleSource:URI = URI.create("file:/android_asset/modules/npm")
+        val npmModuleSource: URI = URI.create("file:/android_asset/modules/npm")
     }
+
     //初始化脚本以及启动文件只会从此方法加载模块，子模块加载没有以"./"或"../"开头的模块也会从此方法加载
     override fun loadFromPrivilegedLocations(moduleId: String, validator: Any?): ModuleSource? {
         //println("加载私有模块：$moduleId")
@@ -75,10 +81,8 @@ class AssetAndUrlModuleSourceProvider(
                 InputStreamReader(packageFile.inputStream()),
                 Map::class.java
             )
-            val main = json["main"] as String?
+            val main = json["main"] as String
-            main?.let {
+            packageFile.toURI().resolve(main)
-                packageFile.toURI().resolve(main)
-            }
         } catch (e: Exception) {
             null
         }
@@ -95,13 +99,32 @@ class AssetAndUrlModuleSourceProvider(
                 mContext.assets.open(uri.path.replace("/android_asset/", ""))
             } else contentResolver.openInputStream(Uri.parse(uri.toString()))
             if (inputStream != null) {
-                createModuleSource(inputStream, uri, base, validator)
+                createModuleEncryptionSource(inputStream, uri, base, validator)
             } else null
         } catch (e: Exception) {
             null
         }
     }
 
+    private fun createModuleEncryptionSource(
+        inputStream: InputStream,
+        uri: URI,
+        base: URI?,
+        validator: Any?,
+    ): ModuleSource? {
+        //只处理内部位于apk内部资源的脚本文件
+        val i = if (uri.path.startsWith(encryptionSource.path)) {
+            val bytes = ByteArray(inputStream.available())
+            inputStream.read(bytes)
+            inputStream.close()
+            if (isValidFile(bytes)) {
+                val clearText = decrypt(bytes, EncryptedScriptFileHeader.BLOCK_SIZE, bytes.size)
+                ByteArrayInputStream(clearText)
+            } else inputStream
+        } else inputStream
+        return createModuleSource(i, uri, base, validator)
+    }
+
     private fun loadFromHttp(uri: URI, base: URI?, validator: Any?): ModuleSource? {
         return try {
             Request.Builder().url(uri.toString()).build().let { request ->

version.properties

@@ -1,8 +1,8 @@
-#Sat Jun 10 19:42:58 CST 2023
+#Wed Jun 14 13:27:56 CST 2023
-BUILD_TIME=1686397378556
+BUILD_TIME=1686720476407
 COMPILE_SDK_VERSION=33
 JAVA_VERSION=20
 MIN_SDK_VERSION=24
 TARGET_SDK_VERSION=33
-VERSION_BUILD=1911
+VERSION_BUILD=1914
 VERSION_NAME=6.3.1