Merge remote-tracking branch 'origin/main' into feat/quickjs

Author: andycall

.gitignore

@@ -65,3 +65,5 @@ libkraken.dylib
 Podfile.lock
 .cxx
 
+temp
+coverage

bridge/bindings/jsc/DOM/elements/input_element.cc

@@ -101,8 +101,16 @@ bool JSInputElement::InputElementInstance::setProperty(std::string &name, JSValu
   if (prototypePropertyMap.count(name) > 0) return false;
 
   if (propertyMap.count(name) > 0) {
-    JSStringRef stringRef = JSValueToStringCopy(_hostClass->ctx, value, exception);
-    std::string string = JSStringToStdString(stringRef);
+    JSStringRef valueString;
+    // https://github.com/WebKit/WebKit/blob/main/Source/WebCore/html/HTMLInputElement.cpp#L1060
+    // Webkit have specific logic when value is null.
+    if (name == "value" && JSValueIsNull(ctx, value)) {
+      valueString = JSStringCreateWithUTF8CString(""); // input's fallback value is null.
+    } else {
+      valueString = JSValueToStringCopy(_hostClass->ctx, value, exception);
+    }
+
+    std::string string = JSStringToStdString(valueString);
     NativeString args_01{};
     NativeString args_02{};
     buildUICommandArgs(name, string, args_01, args_02);

bridge/bindings/jsc/kraken.cc

@@ -16,8 +16,6 @@ void bindKraken(std::unique_ptr<JSContext> &context) {
   JSValueProtect(context->context(), kraken);
 
   // Other properties are injected by dart.
-  JSStringRef userAgentStr = JSStringCreateWithUTF8CString(krakenInfo->getUserAgent(krakenInfo));
-  JSC_SET_STRING_PROPERTY(context, kraken, "userAgent", JSValueMakeString(context->context(), userAgentStr));
   JSC_GLOBAL_SET_PROPERTY(context, "__kraken__", kraken);
 }
 

bridge/bindings/qjs/kraken.cc

@@ -10,12 +10,7 @@ namespace kraken::binding::qjs {
 
 void bindKraken(std::unique_ptr<JSContext> &context) {
   JSValue krakenObject = JS_NewObject(context->ctx());
-  KrakenInfo *krakenInfo = getKrakenInfo();
-  const char *userAgent = krakenInfo->getUserAgent(krakenInfo);
-  JSAtom userAgentKey = JS_NewAtom(context->ctx(), "userAgent");
-  JS_DefinePropertyValue(context->ctx(), krakenObject, userAgentKey, JS_NewString(context->ctx(), userAgent), JS_PROP_NORMAL);
 
   context->defineGlobalProperty("__kraken__", krakenObject);
-  JS_FreeAtom(context->ctx(), userAgentKey);
 }
 }

bridge/bindings/qjs/module_manager.cc

@@ -117,13 +117,16 @@ JSValue krakenInvokeModule(QjsContext *ctx, JSValueConst this_val, int argc, JSV
       return JS_NULL;
     };
     JSValue callbackFunc = JS_NewCFunction(ctx, emptyFunction, "_f", 0);
-    moduleContext = new ModuleContext{callbackFunc};
+    moduleContext = new ModuleContext{
+      callbackFunc, context
+    };
   } else {
     moduleContext = new ModuleContext{
-      JS_DupValue(ctx, callbackValue)
+      JS_DupValue(ctx, callbackValue),
+      context
     };
   }
-  list_add_tail(&context->module_list, &moduleContext->link);
+  list_add_tail(&moduleContext->link, &context->module_list);
 
   NativeString *result;
 

bridge/include/kraken_bridge.h

@@ -33,13 +33,11 @@ struct KRAKEN_EXPORT NativeString {
 
 struct KrakenInfo;
 
-using GetUserAgent = const char *(*)(KrakenInfo *);
 struct KrakenInfo {
   const char *app_name{nullptr};
   const char *app_version{nullptr};
   const char *app_revision{nullptr};
   const char *system_name{nullptr};
-  GetUserAgent getUserAgent;
 };
 
 struct Screen {

bridge/kraken_bridge.cc

@@ -186,23 +186,13 @@ Screen *createScreen(double width, double height) {
 
 static KrakenInfo *krakenInfo{nullptr};
 
-const char *getUserAgent(KrakenInfo *info) {
-  const char *format = "%s/%s (%s; %s/%s)";
-  int32_t length = strlen(format) + sizeof(*info);
-  char *buf = new char[length];
-  std::string result;
-  std::snprintf(&buf[0], length, format, info->app_name, info->app_version, info->system_name, info->app_name, info->app_revision);
-  return buf;
-}
-
 KrakenInfo *getKrakenInfo() {
   if (krakenInfo == nullptr) {
     krakenInfo = new KrakenInfo();
     krakenInfo->app_name = "Kraken";
     krakenInfo->app_revision = APP_REV;
     krakenInfo->app_version = APP_VERSION;
     krakenInfo->system_name = SYSTEM_NAME;
-    krakenInfo->getUserAgent = getUserAgent;
   }
 
   return krakenInfo;

bridge/polyfill/src/bridge.ts

@@ -14,7 +14,6 @@ export interface PrivateKraken {
   product: string;
   productSub: string;
   comment: string;
-  userAgent: string;
 }
 
 declare const __kraken__: PrivateKraken;

bridge/polyfill/src/navigator.ts

@@ -7,7 +7,7 @@ export const navigator = {
   connection,
   // UA is read-only.
   get userAgent() {
-    return kraken.userAgent;
+    return kraken.invokeModule('Navigator', 'getUserAgent');
   },
   get hardwareConcurrency() {
     const logicalProcessors = kraken.invokeModule('DeviceInfo', 'getHardwareConcurrency');

integration_tests/assets/GET_json_with_content_length_expires_etag_and_last_modified

@@ -0,0 +1,13 @@
+HTTP/1.1 200 OK
+Content-Type: application/json
+Content-Length: 72
+ETag: "4EE5B35FB8C5FB2CF8041FC41D3D199E"
+expires: Mon, 16 Aug 2221 10:17:45 GMT
+Last-Modified: Sun, 15 Mar 2020 11:32:20 GMT
+
+{
+    "method": "GET",
+    "data": {
+        "userName": "12345"
+    }
+}

integration_tests/lib/local_http_server.dart

@@ -0,0 +1 @@
+../../kraken/test/local_http_server.dart

integration_tests/lib/main.dart

@@ -2,11 +2,12 @@ import 'dart:async';
 import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
+import 'package:kraken/css.dart';
 import 'package:kraken/bridge.dart';
 import 'package:kraken/dom.dart';
+import 'package:kraken/foundation.dart';
 import 'package:kraken/module.dart';
 import 'package:kraken/widget.dart';
-import 'package:kraken/css.dart';
 import 'package:ansicolor/ansicolor.dart';
 import 'package:path/path.dart' as path;
 import 'bridge/from_native.dart';
@@ -20,6 +21,7 @@ import 'package:kraken/foundation.dart';
 // import 'package:kraken_animation_player/kraken_animation_player.dart';
 // import 'package:kraken_video_player/kraken_video_player.dart';
 // import 'package:kraken_webview/kraken_webview.dart';
+import 'local_http_server.dart'
 
 String? pass = (AnsiPen()..green())('[TEST PASS]');
 String? err = (AnsiPen()..red())('[TEST FAILED]');
@@ -53,11 +55,16 @@ class NativeGestureClient implements GestureClient {
   }
 }
 
-class MyUriParser extends UriParser {
+// Test for UriParser.
+class IntegrationTestUriParser extends UriParser {
   @override
-  String resolve(Uri base, Uri relative) {
-    String uri = super.resolve(base, relative);
-    return uri;
+  Uri resolve(Uri base, Uri relative) {
+    if (base.toString().isEmpty
+        && relative.path.startsWith('assets/')) {
+      return Uri.file(relative.path);
+    } else {
+      return super.resolve(base, relative);
+    }
   }
 }
 
@@ -68,6 +75,17 @@ void main() async {
   // KrakenVideoPlayer.initialize();
   // KrakenWebView.initialize();
   // defineKrakenCustomElements();
+
+  // Local HTTP server.
+  var httpServer = LocalHttpServer.getInstance();
+  print('Local HTTP server started at: ${httpServer.getUri()}');
+
+  String codeInjection = '''
+    // This segment inject variables for test environment.
+    LOCAL_HTTP_SERVER = '${httpServer.getUri().toString()}';
+  ''';
+
+
   // Set render font family AlibabaPuHuiTi to resolve rendering difference.
   CSSText.DEFAULT_FONT_FAMILY_FALLBACK = ['AlibabaPuHuiTi'];
   // setObjectElementFactory(customObjectElementFactory);
@@ -99,21 +117,21 @@ void main() async {
       return 'method: ' + method;
     };
 
-    krakenMap[i] = Kraken(
+    var kraken = krakenMap[i] = Kraken(
       viewportWidth: 360,
       viewportHeight: 640,
       bundleContent: 'console.log("Starting integration tests...")',
       disableViewportWidthAssertion: true,
       disableViewportHeightAssertion: true,
       javaScriptChannel: javaScriptChannel,
-      gestureClient: NativeGestureClient(gestureClientID:i),
-      uriParser: MyUriParser(),
+      gestureClient: NativeGestureClient(gestureClientID: i),
+      uriParser: IntegrationTestUriParser(),
     );
-    widgets.add(krakenMap[i]!);
+    widgets.add(kraken);
   }
 
   runApp(MaterialApp(
-    title: 'Kraken Intergration Tests',
+    title: 'Kraken Integration Tests',
     debugShowCheckedModeBanner: false,
     home: Scaffold(
       appBar: AppBar(
@@ -146,7 +164,7 @@ void main() async {
       for (Map spec in testPayload) {
         String filename = spec['filename'];
         String code = spec['code'];
-        evaluateTestScripts(contextId, code, url: filename);
+        evaluateTestScripts(contextId, codeInjection + code, url: filename);
       }
 
       testResults.add(executeTest(contextId));

integration_tests/runtime/kraken.d.ts

@@ -62,3 +62,8 @@ interface HTMLMediaElement {
 interface HTMLElement {
     toBlob(devicePixcelRatio: number): Promise<Blob>;
 }
+
+/**
+ * The mocked local http server origin.
+ */
+declare const LOCAL_HTTP_SERVER :string;

integration_tests/snapshots/css/css-backgrounds/background-size.ts.c21f24bb1.png

@@ -357,6 +357,29 @@ describe('Background-size', () => {
     await snapshot(0.1);
   });
 
+  it('should works with background size bigger than image container', async () => {
+    let div1;
+    let div = createElement(
+     'div',
+     {
+       style: {},
+     },
+     [
+       (div1 = createElement('div', {
+         style: {
+           height: '150px',
+           width: '200px',
+           backgroundColor: '#999',
+           backgroundImage: 'url(assets/bg.jpg)',
+           backgroundRepeat: 'no-repeat',
+           backgroundSize: '250px',
+         },
+       })),
+     ]
+    );
+    append(BODY, div);
+    await snapshot(0.1);
+  });
 
   it('should not work with negative value', async () => {
     let div1;