[hapjs-platform#629]支持沙箱运行模式

jianghai33 · Dec 12, 2023 · 2ad3f50 · 2ad3f50
1 parent fb0688b
commit 2ad3f50
Show file tree

Hide file tree

Showing 101 changed files with 6,171 additions and 2,189 deletions.
diff --git a/.../plugins/android/features/share/src/main/java/org/hapjs/features/service/share/Share.java b/.../plugins/android/features/share/src/main/java/org/hapjs/features/service/share/Share.java
@@ -11,6 +11,7 @@
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Handler;
+import android.os.Looper;
 import android.os.Message;
 import android.text.TextUtils;
 import android.util.Log;
@@ -84,7 +85,7 @@ public class Share extends FeatureExtension {
 
     private ShareAction mShareAction;
     private static final int MSG_ONLINE_SHARE = 0x01;
-    private Handler mHandler = new Handler() {
+    private Handler mHandler = new Handler(Looper.getMainLooper()) {
         @Override
         public void handleMessage(Message msg) {
             switch (msg.what) {

diff --git a/...ime/android/card-support/src/main/java/org/hapjs/card/support/impl/CardServiceWorker.java b/...ime/android/card-support/src/main/java/org/hapjs/card/support/impl/CardServiceWorker.java
@@ -41,8 +41,11 @@
 import org.hapjs.logging.CardLogManager;
 import org.hapjs.model.AppInfo;
 import org.hapjs.render.jsruntime.JsThreadFactory;
+import org.hapjs.render.jsruntime.SandboxProvider;
+import org.hapjs.render.jsruntime.SandboxProviderImpl;
 import org.hapjs.render.jsruntime.module.ModuleBridge;
 import org.hapjs.runtime.HapEngine;
+import org.hapjs.runtime.ProviderManager;
 import org.hapjs.runtime.ResourceConfig;
 import org.hapjs.runtime.Runtime;
 
@@ -54,6 +57,7 @@ public void init(Context context, String platform) {
         Log.i(TAG, "CardServiceWorker init, platform=" + platform);
         ResourceConfig.getInstance().init(context, platform);
         Runtime.setPlatform(platform);
+        ProviderManager.getDefault().addProvider(SandboxProvider.NAME, new SandboxProviderImpl());
         Runtime.getInstance().onCreate(context);
         configBlacklist();
         JsThreadFactory.getInstance().preload(context);

diff --git a/core/runtime/android/features/src/main/java/org/hapjs/features/AbstractRequest.java b/core/runtime/android/features/src/main/java/org/hapjs/features/AbstractRequest.java
@@ -255,16 +255,12 @@ private RequestBody getSimplePostBody(Headers headers, Object objData, String pk
             String textParams = joinParams((SerializeObject) objData);
             return RequestBody.create(
                     MediaType.parse(RequestHelper.CONTENT_TYPE_FORM_URLENCODED), textParams);
-        } else if (objData instanceof ArrayBuffer) {
+        } else if (objData instanceof byte[]) {
             if (TextUtils.isEmpty(contentType)) {
                 contentType = RequestHelper.CONTENT_TYPE_OCTET_STREAM;
             }
 
-            //copy memory to heap
-            V8ArrayBuffer v8ArrayBuffer = ((ArrayBuffer) objData).getV8ArrayBuffer();
-            byte[] buffer = new byte[v8ArrayBuffer.remaining()];
-            v8ArrayBuffer.get(buffer);
-            return RequestBody.create(MediaType.parse(contentType), buffer);
+            return RequestBody.create(MediaType.parse(contentType), (byte[]) objData);
         }
 
         contentType =
@@ -440,10 +436,7 @@ private void parseData(Request request, SerializeObject result, okhttp3.Response
                 }
             } else if (RESPONSE_TYPE_ARRAYBUFFER.equalsIgnoreCase(responseType)) {
                 byte[] bytes = response.body().bytes();
-                ByteBuffer byteBuffer = ByteBuffer.allocateDirect(bytes.length);
-                byteBuffer.put(bytes);
-                byteBuffer.rewind();
-                result.put(RESULT_KEY_DATA, byteBuffer);
+                result.put(RESULT_KEY_DATA, bytes);
             } else if (RESPONSE_TYPE_FILE.equalsIgnoreCase(responseType)) {
                 result.put(RESULT_KEY_DATA, parseFile(request, response));
             } else {

diff --git a/core/runtime/android/features/src/main/java/org/hapjs/features/Record.java b/core/runtime/android/features/src/main/java/org/hapjs/features/Record.java
@@ -473,10 +473,7 @@ public void run() {
         private SerializeObject makeResult(boolean isLastFrame, byte[] bytes) {
             SerializeObject result = new JavaSerializeObject();
             result.put(RESULT_IS_LAST_FRAME, isLastFrame);
-            ByteBuffer byteBuffer = ByteBuffer.allocateDirect(bytes.length);
-            byteBuffer.put(bytes);
-            byteBuffer.rewind();
-            result.put(RESULT_FRAME_BUFFER, new TypedArrayProxy(V8Value.UNSIGNED_INT_8_ARRAY, byteBuffer));
+            result.put(RESULT_FRAME_BUFFER, new TypedArrayProxy(V8Value.UNSIGNED_INT_8_ARRAY, bytes));
             return result;
         }
 

diff --git a/core/runtime/android/features/src/main/java/org/hapjs/features/bluetooth/Bluetooth.java b/core/runtime/android/features/src/main/java/org/hapjs/features/bluetooth/Bluetooth.java
@@ -635,11 +635,7 @@ private void writeCharacteristic(final Request request) throws SerializeExceptio
         String address = params.getString(PARAM_DEVICE_ID);
         String serviceUUID = params.getString(PARAM_SERVICE_UUID);
         String charaUUID = params.getString(PARAM_CHARACTERISTIC_UUID);
-        ArrayBuffer value = (ArrayBuffer) params.get(PARAM_VALUE);
-        // copy memory to heap
-        V8ArrayBuffer v8ArrayBuffer = value.getV8ArrayBuffer();
-        byte[] buffer = new byte[v8ArrayBuffer.remaining()];
-        v8ArrayBuffer.get(buffer);
+        byte[] buffer = (byte[]) params.get(PARAM_VALUE);
         BleManager.getInstance()
                 .writeCharacteristic(
                         address, serviceUUID, charaUUID, buffer, getOperationCallback(request));
@@ -867,10 +863,7 @@ public void onCharacteristicChanged(
                                                     serviceUUID.toUpperCase());
                                             result.put(RESULT_CHARACTERISTIC_UUID,
                                                     characteristicUUID.toUpperCase());
-                                            ByteBuffer byteBuffer = ByteBuffer.allocateDirect(data.length);
-                                            byteBuffer.put(data);
-                                            byteBuffer.rewind();
-                                            result.put(RESULT_VALUE, byteBuffer);
+                                            result.put(RESULT_VALUE, data);
                                             runCallbackContext(
                                                     EVENT_ON_CHARACTERISTIC_VALUE_CHANGE,
                                                     CODE_ON_CHARACTERISTIC_VALUE_CHANGE,
@@ -980,16 +973,10 @@ private JavaSerializeObject toJavaSerializeObject() {
             JavaSerializeObject serviceData = new JavaSerializeObject();
             for (Pair<String, byte[]> d : mServiceData) {
                 byte[] bytes = d.second;
-                ByteBuffer byteBuffer = ByteBuffer.allocateDirect(bytes.length);
-                byteBuffer.put(bytes);
-                byteBuffer.rewind();
-                serviceData.put(d.first, byteBuffer);
+                serviceData.put(d.first, bytes);
             }
             result.put(RESULT_SERVICE_DATA, serviceData);
-            ByteBuffer byteBuffer = ByteBuffer.allocateDirect(mAdvertisData.length);
-            byteBuffer.put(mAdvertisData);
-            byteBuffer.rewind();
-            result.put(RESULT_ADVERTIS_DATA, byteBuffer);
+            result.put(RESULT_ADVERTIS_DATA, mAdvertisData);
             return result;
         }
 

diff --git a/core/runtime/android/features/src/main/java/org/hapjs/features/net/task/RequestTaskImpl.java b/core/runtime/android/features/src/main/java/org/hapjs/features/net/task/RequestTaskImpl.java
@@ -35,7 +35,6 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
-import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -253,17 +252,14 @@ private RequestBody getSimplePostBody(Headers headers, Object objData)
             return RequestBody.create(
                     MediaType.parse(CONTENT_TYPE_FORM_URLENCODED),
                     textParams);
-        } else if (objData instanceof ByteBuffer) {
+        } else if (objData instanceof byte[]) {
             Log.d(TAG, "getSimplePost objData is ArrayBuffer, contentType=" + contentType);
             if (TextUtils.isEmpty(contentType)) {
                 contentType = CONTENT_TYPE_JSON;
             }
-            //copy memory to heap
-            ByteBuffer byteBuffer = (ByteBuffer) objData;
-            byte[] buffer = new byte[byteBuffer.remaining()];
-            byteBuffer.get(buffer);
+
             try {
-                return RequestBody.create(MediaType.parse(contentType), new JSONArray(buffer).toString());
+                return RequestBody.create(MediaType.parse(contentType), new JSONArray(objData).toString());
             } catch (JSONException e) {
                 throw new RuntimeException(e);
             }
@@ -325,11 +321,8 @@ public void onResponse(Call call, okhttp3.Response response) throws IOException
                     result.put(RequestTask.RESULT_KEY_HEADER, parseHeaders(response));
                     if (response.body() != null) {
                         byte[] bytes = response.body().bytes();
-                        ByteBuffer byteBuffer = ByteBuffer.allocateDirect(bytes.length);
-                        byteBuffer.put(bytes);
-                        byteBuffer.rewind();
 
-                        result.put(RequestTask.RESULT_KEY_DATA, new TypedArrayProxy(V8Value.UNSIGNED_INT_8_ARRAY, byteBuffer));
+                        result.put(RequestTask.RESULT_KEY_DATA, new TypedArrayProxy(V8Value.UNSIGNED_INT_8_ARRAY, bytes));
                     } else {
                         Log.w(TAG, "response body is invalid");
                     }

diff --git a/...untime/android/features/src/main/java/org/hapjs/features/net/task/UploadCallbackImpl.java b/...untime/android/features/src/main/java/org/hapjs/features/net/task/UploadCallbackImpl.java
@@ -97,10 +97,7 @@ private void parseData(SerializeObject result, okhttp3.Response response, String
             }
         } else if (RESPONSE_TYPE_ARRAYBUFFER.equalsIgnoreCase(responseType)) {
             byte[] bytes = response.body().bytes();
-            ByteBuffer byteBuffer = ByteBuffer.allocateDirect(bytes.length);
-            byteBuffer.put(bytes);
-            byteBuffer.rewind();
-            result.put(RESULT_KEY_DATA, byteBuffer);
+            result.put(RESULT_KEY_DATA, bytes);
         } else if (RESPONSE_TYPE_FILE.equalsIgnoreCase(responseType)) {
             result.put(RESULT_KEY_DATA, parseFile(response));
         } else {

diff --git a/core/runtime/android/features/src/main/java/org/hapjs/features/nfc/IsoDepInstance.java b/core/runtime/android/features/src/main/java/org/hapjs/features/nfc/IsoDepInstance.java
@@ -43,10 +43,7 @@ public byte[] transceive(byte[] buffer) throws IOException {
     public void getHistoricalBytes(Request request) {
         byte[] historicalBytes = mIsoDep.getHistoricalBytes();
         JavaSerializeObject result = new JavaSerializeObject();
-        ByteBuffer byteBuffer = ByteBuffer.allocateDirect(historicalBytes.length);
-        byteBuffer.put(historicalBytes);
-        byteBuffer.rewind();
-        result.put(NFC.RESULT_HISTORICAL_BYTES, byteBuffer);
+        result.put(NFC.RESULT_HISTORICAL_BYTES, historicalBytes);
         request.getCallback().callback(new Response(result));
     }
 

diff --git a/core/runtime/android/features/src/main/java/org/hapjs/features/nfc/NFCAdapterInstance.java b/core/runtime/android/features/src/main/java/org/hapjs/features/nfc/NFCAdapterInstance.java
@@ -211,10 +211,7 @@ private void onTagDiscovered(Intent intent) {
 
                     byte[] id = mDiscoveredTag.getId();
                     Log.d(TAG, "id: " + Arrays.toString(id));
-                    ByteBuffer byteBuffer = ByteBuffer.allocateDirect(id.length);
-                    byteBuffer.put(id);
-                    byteBuffer.rewind();
-                    resultObj.put(RESULT_ID, byteBuffer);
+                    resultObj.put(RESULT_ID, id);
                 } else {
                     Log.e(TAG, "null of discovered tag");
                 }
@@ -266,18 +263,9 @@ private SerializeArray getMessages(Parcelable[] rawMessages) {
                 SerializeArray arrayRecord = new JavaSerializeArray();
                 for (NdefRecord record : ndefRecords) {
                     SerializeObject recordObj = new JavaSerializeObject();
-                    ByteBuffer idByteBuffer = ByteBuffer.allocateDirect(record.getId().length);
-                    idByteBuffer.put(record.getId());
-                    idByteBuffer.rewind();
-                    recordObj.put(RESULT_MESSAGES_RECORD_ID, idByteBuffer);
-                    ByteBuffer payloadByteBuffer = ByteBuffer.allocateDirect(record.getPayload().length);
-                    payloadByteBuffer.put(record.getPayload());
-                    payloadByteBuffer.rewind();
-                    recordObj.put(RESULT_MESSAGES_RECORD_PAYLOAD, payloadByteBuffer);
-                    ByteBuffer typeByteBuffer = ByteBuffer.allocateDirect(record.getType().length);
-                    typeByteBuffer.put(record.getType());
-                    typeByteBuffer.rewind();
-                    recordObj.put(RESULT_MESSAGES_RECORD_TYPE, typeByteBuffer);
+                    recordObj.put(RESULT_MESSAGES_RECORD_ID, record.getId());
+                    recordObj.put(RESULT_MESSAGES_RECORD_PAYLOAD, record.getPayload());
+                    recordObj.put(RESULT_MESSAGES_RECORD_TYPE, record.getType());
                     recordObj.put(RESULT_MESSAGES_RECORD_TNF, record.getTnf());
                     arrayRecord.put(recordObj);
                 }

diff --git a/core/runtime/android/features/src/main/java/org/hapjs/features/nfc/NfcAInstance.java b/core/runtime/android/features/src/main/java/org/hapjs/features/nfc/NfcAInstance.java
@@ -46,10 +46,7 @@ public byte[] transceive(byte[] buffer) throws IOException {
     public void getAtqa(Request request) {
         byte[] atqa = mNfcA.getAtqa();
         SerializeObject resultObj = new JavaSerializeObject();
-        ByteBuffer byteBuffer = ByteBuffer.allocateDirect(atqa.length);
-        byteBuffer.put(atqa);
-        byteBuffer.rewind();
-        resultObj.put(NFC.RESULT_ATQA, byteBuffer);
+        resultObj.put(NFC.RESULT_ATQA, atqa);
         request.getCallback().callback(new Response(resultObj));
     }
 

diff --git a/...ntime/android/features/src/main/java/org/hapjs/features/nfc/base/BaseTagTechInstance.java b/...ntime/android/features/src/main/java/org/hapjs/features/nfc/base/BaseTagTechInstance.java
@@ -87,10 +87,7 @@ public void transceive(Request request) {
 
                     byte[] resultBytes = transceive(transceiveParams);
                     SerializeObject resultObj = new JavaSerializeObject();
-                    ByteBuffer byteBuffer = ByteBuffer.allocateDirect(resultBytes.length);
-                    byteBuffer.put(resultBytes);
-                    byteBuffer.rewind();
-                    resultObj.put(NFC.RESULT_TRANSCEIVE_DATA, byteBuffer);
+                    resultObj.put(NFC.RESULT_TRANSCEIVE_DATA, resultBytes);
                     request.getCallback().callback(new Response(resultObj));
                 } else {
                     request.getCallback().callback(new Response(NFCConstants.CODE_INVALID_PARAMETER, NFCConstants.DESC_INVALID_PARAMETER));

diff --git a/core/runtime/android/features/src/main/java/org/hapjs/features/storage/file/FileStorage.java b/core/runtime/android/features/src/main/java/org/hapjs/features/storage/file/FileStorage.java
@@ -283,9 +283,9 @@ public Response readArrayBuffer(
                         "Fail to get resource by " + internalUri);
             }
             InputStream input = resource.openInputStream();
-            ByteBuffer byteBuffer = FileUtils.readStreamAsBuffer(input, position, length, true);
+            byte[] bytes = FileUtils.readStreamAsBytes(input, position, length, true);
             SerializeObject result = new JavaSerializeObject();
-            result.put(FileStorageFeature.RESULT_BUFFER, new TypedArrayProxy(V8Value.UNSIGNED_INT_8_ARRAY, byteBuffer));
+            result.put(FileStorageFeature.RESULT_BUFFER, new TypedArrayProxy(V8Value.UNSIGNED_INT_8_ARRAY, bytes));
             return new Response(result);
         } catch (FileNotFoundException e) {
             return new Response(Response.CODE_FILE_NOT_FOUND, e.getMessage());

diff --git a/core/runtime/android/features/src/main/java/org/hapjs/features/websocket/SocketTask.java b/core/runtime/android/features/src/main/java/org/hapjs/features/websocket/SocketTask.java
@@ -180,11 +180,8 @@ private void onSocketMessage(ByteString byteString) {
         if (request != null) {
             byte[] bytes = byteString != null ? byteString.toByteArray() : new byte[0];
             SerializeObject serializeObject = new JavaSerializeObject();
-            ByteBuffer byteBuffer = ByteBuffer.allocateDirect(bytes.length);
-            byteBuffer.put(bytes);
-            byteBuffer.rewind();
 
-            serializeObject.put(WebSocket.RESULT_DATA, byteBuffer);
+            serializeObject.put(WebSocket.RESULT_DATA, bytes);
             request.getCallback().callback(new Response(serializeObject));
         }
     }

diff --git a/core/runtime/android/features/src/main/java/org/hapjs/features/websocket/WebSocket.java b/core/runtime/android/features/src/main/java/org/hapjs/features/websocket/WebSocket.java
@@ -128,6 +128,12 @@ private void send(Request request) throws Exception {
             ByteBuffer buffer = ((TypedArrayProxy) dataObj).getBuffer();
             ByteString data = getByteString(buffer);
             sendOk = null != data && socketTask.send(data);
+        } else if (dataObj instanceof byte[]) {
+            ByteBuffer byteBuffer = ByteBuffer.allocateDirect(((byte[]) dataObj).length);
+            byteBuffer.put((byte[]) dataObj);
+            byteBuffer.rewind();
+            ByteString data = getByteString(byteBuffer);
+            sendOk = null != data && socketTask.send(data);
         } else if (null != dataObj) {
             String str = dataObj.toString();
             sendOk = !TextUtils.isEmpty(str) && socketTask.send(str);

diff --git a/core/runtime/android/runtime/build.gradle b/core/runtime/android/runtime/build.gradle
@@ -92,6 +92,8 @@ dependencies {
     implementation "androidx.recyclerview:recyclerview:${rootProject.recyclerviewVersion}"
     implementation "androidx.constraintlayout:constraintlayout:${rootProject.androidXconstraintlayoutVersion}"
     implementation "com.google.android.material:material:${rootProject.androidXVersion}"
+
+    implementation 'com.esotericsoftware:kryo:5.5.0'
 }
 
 apply plugin: 'com.moowork.node'
@@ -117,4 +119,4 @@ task copyInfrasJS(type: Copy, dependsOn: 'buildInfrasJS') {
 task cleanJS(type: Delete) {
     delete 'src/main/assets/js'
 }
-clean.dependsOn cleanJS
+clean.dependsOn cleanJS
diff --git a/core/runtime/android/runtime/libs/jsenv-no-v8symbols.aar b/core/runtime/android/runtime/libs/jsenv-no-v8symbols.aar
diff --git a/core/runtime/android/runtime/proguard-rules.pro b/core/runtime/android/runtime/proguard-rules.pro
@@ -38,3 +38,11 @@
 -keep class * extends com.eclipsesource.v8.V8Object {
     public *;
 }
+
+-keep class * extends com.eclipsesource.v8.V8Object$Undefined {
+    *;
+}
+
+-keep class org.hapjs.render.jsruntime.V8InspectorNative {
+    public *;
+}
diff --git a/core/runtime/android/runtime/src/main/AndroidManifest.xml b/core/runtime/android/runtime/src/main/AndroidManifest.xml
@@ -123,6 +123,27 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </service>
+
+        <service android:name=".sandbox.SandboxService$Sandbox0"
+            android:isolatedProcess="true"
+            android:process=":Sandbox0"
+            android:exported="false" />
+        <service android:name=".sandbox.SandboxService$Sandbox1"
+            android:isolatedProcess="true"
+            android:process=":Sandbox1"
+            android:exported="false" />
+        <service android:name=".sandbox.SandboxService$Sandbox2"
+            android:isolatedProcess="true"
+            android:process=":Sandbox2"
+            android:exported="false" />
+        <service android:name=".sandbox.SandboxService$Sandbox3"
+            android:isolatedProcess="true"
+            android:process=":Sandbox3"
+            android:exported="false" />
+        <service android:name=".sandbox.SandboxService$Sandbox4"
+            android:isolatedProcess="true"
+            android:process=":Sandbox4"
+            android:exported="false" />
     </application>
 
 </manifest>
diff --git a/core/runtime/android/runtime/src/main/aidl/org/hapjs/analyzer/model/LogData.aidl b/core/runtime/android/runtime/src/main/aidl/org/hapjs/analyzer/model/LogData.aidl
@@ -0,0 +1,6 @@
+/*
+ * Copyright (C) 2023, hapjs.org. All rights reserved.
+ */
+package org.hapjs.analyzer.model;
+
+parcelable LogData;
diff --git a/core/runtime/android/runtime/src/main/aidl/org/hapjs/runtime/sandbox/ILogListener.aidl b/core/runtime/android/runtime/src/main/aidl/org/hapjs/runtime/sandbox/ILogListener.aidl
@@ -0,0 +1,11 @@
+/*
+ * Copyright (C) 2023, hapjs.org. All rights reserved.
+ */
+
+package org.hapjs.runtime.sandbox;
+
+import org.hapjs.analyzer.model.LogData;
+
+interface ILogListener {
+    void onLog(in List<LogData> logs);
+}
diff --git a/core/runtime/android/runtime/src/main/aidl/org/hapjs/runtime/sandbox/ILogProvider.aidl b/core/runtime/android/runtime/src/main/aidl/org/hapjs/runtime/sandbox/ILogProvider.aidl
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2023, hapjs.org. All rights reserved.
+ */
+package org.hapjs.runtime.sandbox;
+
+interface ILogProvider {
+    void logCountEvent(String appPackage, String category, String key);
+
+    void logCountEventWithParams(String appPackage, String category, String key, in Map params);
+
+    void logCalculateEvent(String appPackage, String category, String key, long value);
+
+    void logCalculateEventWithParams(String appPackage, String category, String key, long value, in Map params);
+
+    void logNumericPropertyEvent(String appPackage, String category, String key, long value);
+
+    void logNumericPropertyEventWithParams(String appPackage, String category, String key, long value, in Map params);
+
+    void logStringPropertyEvent(String appPackage, String category, String key, String value);
+
+    void logStringPropertyEventWithParams(String appPackage, String category, String key, String value, in Map params);
+}