android: do not put js file directly

doric-android/app/src/main/java/pub/doric/demo/DoricSSRActivity.java

@@ -65,7 +65,7 @@ public class DoricSSRActivity extends AppCompatActivity {
         RootNode rootNode = new RootNode(doricContext);
         rootNode.setRootView(doricPanel);
         String filePath = getIntent().getStringExtra("file");
-        String json = DoricUtils.readAssetFile("src/" + filePath);
+        String json = DoricUtils.readAssetBinFile("src/" + filePath);
         try {
             long start = System.currentTimeMillis();
             JSONObject jsonObject = new JSONObject(json);

doric-android/devkit/src/main/java/pub/doric/devkit/ui/DoricDevActivity.java

@@ -63,11 +63,12 @@ import pub.doric.devkit.R;
 import pub.doric.devkit.qrcode.DisplayUtil;
 import pub.doric.devkit.qrcode.activity.CaptureActivity;
 import pub.doric.devkit.qrcode.activity.CodeUtils;
+import pub.doric.utils.DoricUtils;
 
 import static pub.doric.devkit.ui.DoricShowNodeTreeActivity.DORIC_CONTEXT_ID_KEY;
 
 public class DoricDevActivity extends AppCompatActivity implements DoricDev.StatusCallback {
-    private int REQUEST_CODE = 100;
+    private final int REQUEST_CODE = 100;
     private ContextCellAdapter cellAdapter;
 
     @Override
@@ -282,26 +283,6 @@ public class DoricDevActivity extends AppCompatActivity implements DoricDev.Stat
         }
     }
 
-    private static String toHex(byte[] bytes) {
-        char[] hexDigits = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
-        char[] resultCharArray = new char[bytes.length * 2];
-        int index = 0;
-        for (byte b : bytes) {
-            resultCharArray[index++] = hexDigits[b >>> 4 & 0xf];
-            resultCharArray[index++] = hexDigits[b & 0xf];
-        }
-        return new String(resultCharArray);
-    }
-
-    private static String md5(String s) {
-        try {
-            MessageDigest md = MessageDigest.getInstance("MD5");
-            byte[] bytes = md.digest(s.getBytes(Charset.forName("UTF-8")));
-            return toHex(bytes);
-        } catch (Exception e) {
-            return "";
-        }
-    }
 
     private static class ContextCellAdapter extends RecyclerView.Adapter<ContextCellHolder> {
         private final ArrayList<DoricContext> contexts = new ArrayList<>();
@@ -363,7 +344,7 @@ public class DoricDevActivity extends AppCompatActivity implements DoricDev.Stat
                                             String.format(Locale.getDefault(),
                                                     "Size:%d\nMD5:%s\nScript:\n%s",
                                                     context.getScript().length(),
-                                            md5(context.getScript()),
+                                                    DoricUtils.md5(context.getScript()),
                                                     context.getScript()))
                                     .setPositiveButton(btnTitle, new DialogInterface.OnClickListener() {
                                         @Override

doric-android/doric/build.gradle

@@ -20,11 +20,6 @@ android {
             consumerProguardFiles 'proguard-rules.pro'
         }
     }
-    sourceSets {
-        main {
-            assets.srcDirs = ["../../doric-js/bundle"]
-        }
-    }
 }
 
 dependencies {

doric-android/doric/src/main/assets/981b9337ecf85b030e221ee2d2dfbd42

@@ -0,0 +1 @@
+<EFBFBD>޻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ߗ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>×<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>×<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ò<EFBFBD><EFBFBD><EFBFBD>ߜ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݪ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ë<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ߌ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ߙ<EFBFBD><EFBFBD>ߛ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ћ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>З<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ý<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ï<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߷<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Џ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Н<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ì<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ߋ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>݋<EFBFBD><EFBFBD><EFBFBD>Е<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ߌ<EFBFBD><EFBFBD><EFBFBD>ݗ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ќ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ћ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Л<EFBFBD><EFBFBD><EFBFBD><EFBFBD>҈<EFBFBD><EFBFBD>ѕ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ќ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ì<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ߋ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>݋<EFBFBD><EFBFBD><EFBFBD>Е<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ߙ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ߞ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>׌<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ߌ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߄<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ߜ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ߌ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ߛ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ќ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>݌<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ߌ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ы<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>݋<EFBFBD><EFBFBD><EFBFBD>Е<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ߌ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>і<EFBFBD><EFBFBD><EFBFBD>ߌ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ߌ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ь<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ߌ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ߛ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѝ<EFBFBD><EFBFBD><EFBFBD>ў<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>׌<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߂<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ߙ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ߍ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>׌<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߄<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ߜ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ߌ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ߛ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ј<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>׌<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ߛ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѝ<EFBFBD><EFBFBD><EFBFBD>э<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>׌<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߂<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߱<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>э<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ќ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>З<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>

doric-android/doric/src/main/java/pub/doric/engine/DoricJSEngine.java

@@ -263,7 +263,7 @@ public class DoricJSEngine implements Handler.Callback, DoricTimerExtension.Time
             boolean legacy = DoricSingleton.getInstance().legacyMode;
             loadBuiltinJS(legacy ? DoricConstant.DORIC_BUNDLE_SANDBOX_ES5 : DoricConstant.DORIC_BUNDLE_SANDBOX);
             String libName = DoricConstant.DORIC_MODULE_LIB;
-            String libJS = DoricUtils.readAssetFile(legacy ? DoricConstant.DORIC_BUNDLE_LIB_ES5 : DoricConstant.DORIC_BUNDLE_LIB);
+            String libJS = DoricUtils.readAssetBinFile(legacy ? DoricConstant.DORIC_BUNDLE_LIB_ES5 : DoricConstant.DORIC_BUNDLE_LIB);
             mDoricJSE.loadJS(packageModuleScript(libName, libJS), "Module://" + libName);
         } catch (Exception e) {
             mDoricRegistry.onException(null, e);
@@ -283,7 +283,7 @@ public class DoricJSEngine implements Handler.Callback, DoricTimerExtension.Time
     }
 
     private void loadBuiltinJS(String assetName) {
-        String script = DoricUtils.readAssetFile(assetName);
+        String script = DoricUtils.readAssetBinFile(assetName);
         mDoricJSE.loadJS(script, "Assets://" + assetName);
     }
 

doric-android/doric/src/main/java/pub/doric/engine/DoricWebShellJSExecutor.java

@@ -279,7 +279,7 @@ public class DoricWebShellJSExecutor implements IDoricJSE {
 
             @Override
             public WebResourceResponse onIntercept(String url) {
-                String content = DoricUtils.readAssetFile("doric-web.html");
+                String content = DoricUtils.readAssetBinFile("doric-web.html");
                 InputStream inputStream = new ByteArrayInputStream(content.getBytes());
                 return new WebResourceResponse("text/html", "utf-8", inputStream);
             }
@@ -292,7 +292,7 @@ public class DoricWebShellJSExecutor implements IDoricJSE {
 
             @Override
             public WebResourceResponse onIntercept(String url) {
-                String content = DoricUtils.readAssetFile("doric-web.js");
+                String content = DoricUtils.readAssetBinFile("doric-web.js");
                 InputStream inputStream = new ByteArrayInputStream(content.getBytes());
                 return new WebResourceResponse("text/javascript", "utf-8", inputStream);
             }

doric-android/doric/src/main/java/pub/doric/engine/DoricWebViewJSEngine.java

@@ -28,7 +28,7 @@ public class DoricWebViewJSEngine extends DoricJSEngine {
     protected void initJSEngine() {
         mDoricJSE = new DoricWebViewJSExecutor(Doric.application());
         String assetName = "doric-web.js";
-        String script = DoricUtils.readAssetFile(assetName);
+        String script = DoricUtils.readAssetBinFile(assetName);
         mDoricJSE.loadJS(script, "Assets://" + assetName);
     }
 }

doric-android/doric/src/main/java/pub/doric/utils/DoricUtils.java

@@ -54,6 +54,8 @@ import java.io.InputStream;
 import java.lang.reflect.Array;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.nio.charset.Charset;
+import java.security.MessageDigest;
 
 import pub.doric.Doric;
 
@@ -63,6 +65,55 @@ import pub.doric.Doric;
  * @CreateDate: 2019-07-18
  */
 public class DoricUtils {
+    public static String readAssetBinFile(String assetFile) {
+        InputStream inputStream = null;
+        try {
+
+            AssetManager assetManager = Doric.application().getAssets();
+            String md5Name = md5(assetFile);
+            inputStream = assetManager.open(md5Name);
+            int length = inputStream.available();
+            byte[] buffer = new byte[length];
+            inputStream.read(buffer);
+            for (int i = 0; i < buffer.length; i++) {
+                buffer[i] = (byte) (0xff - buffer[i]);
+            }
+            return new String(buffer);
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (inputStream != null) {
+                try {
+                    inputStream.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return "";
+    }
+
+    private static String toHex(byte[] bytes) {
+        char[] hexDigits = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+        char[] resultCharArray = new char[bytes.length * 2];
+        int index = 0;
+        for (byte b : bytes) {
+            resultCharArray[index++] = hexDigits[b >>> 4 & 0xf];
+            resultCharArray[index++] = hexDigits[b & 0xf];
+        }
+        return new String(resultCharArray);
+    }
+
+    public static String md5(String s) {
+        try {
+            MessageDigest md = MessageDigest.getInstance("MD5");
+            byte[] bytes = md.digest(s.getBytes(Charset.forName("UTF-8")));
+            return toHex(bytes);
+        } catch (Exception e) {
+            return "";
+        }
+    }
+
     public static String readAssetFile(String assetFile) {
         InputStream inputStream = null;
         try {

doric-js/generateDts.js

@@ -1,4 +1,6 @@
 const fs = require("fs");
+const path = require("path");
+const crypto = require("crypto");
 
 async function work() {
   const imageDts = await fs.promises.readFile("src/image.d.ts", "utf-8");
@@ -13,6 +15,24 @@ ${indexDts
 ${imageDts}
   `;
   await fs.promises.writeFile("index.d.ts", content);
+  const files = [
+    "bundle/doric-lib.js",
+    "bundle/doric-sandbox.js",
+    "bundle/doric-web.js",
+    "bundle/doric-web.html",
+  ];
+  const androidAssets = "../doric-android/doric/src/main/assets";
+  for (let file of files) {
+    const md5 = crypto.createHash("md5");
+    md5.update(path.basename(file));
+    const name = md5.digest("hex").toLowerCase();
+    const data = await fs.promises.readFile(file);
+    const temp = new Uint8Array(data.buffer);
+    for (let i = 0; i < temp.length; i++) {
+      temp[i] = 0xff - temp[i];
+    }
+    await fs.promises.writeFile(path.resolve(androidAssets, name), data);
+  }
 }
 
 work();