Merge branch 'master' of github.com:abner/flutter_js

Author: abner

CHANGELOG.md

@@ -1,10 +1,19 @@
+# 0.5.0+1
+
+- Fix the handle_promises when the promise result is not a string
 # 0.5.0+0
 
 - Fixes issue relative to build on Dart 2.13 (issues #41 and #42)
+# 0.4.0+6
+
+- Fix executePendingJobs (wasn't dispatching in the most current version)
+# 0.4.0+5
+
+- Removed console.log from fetch.js
 
 # 0.4.0+4
 
-- Small README.md fix
+- Fixed issue on xhr requests - wasn't passing headers to the requests
 
 # 0.4.0+3
 

assets/js/fetch.js

@@ -15,10 +15,10 @@ function fetch(url, options) {
 json: () => { 
 // TODO: review this handle because it may discard \n from json attributes
 try {
-console.log('RESPONSE TEXT IN FETCH: ' + request.responseText);
+// console.log('RESPONSE TEXT IN FETCH: ' + request.responseText);
 return Promise.resolve(JSON.parse(request.responseText));
 } catch (e) {
-console.log('ERROR on fetch parsing JSON: ' + e.message);
+// console.log('ERROR on fetch parsing JSON: ' + e.message);
 return Promise.resolve(request.responseText);
 }
 },
@@ -47,8 +47,16 @@ function fetch(url, options) {
 
 request.withCredentials = options.credentials=='include';
 
-for (const i in options.headers) {
-request.setRequestHeader(i, options.headers[i]);
+if (options.headers) {
+if (options.headers.constructor.name == 'Object') {
+for (const i in options.headers) {
+request.setRequestHeader(i, options.headers[i]);
+}
+} else { // if it is some Headers pollyfill, the way to iterate is through for of
+for (const header of options.headers) {
+request.setRequestHeader(header[0], header[1]);
+}
+}
 }
 
 request.send(options.body || null);

lib/extensions/handle_promises.dart

@@ -127,7 +127,7 @@ extension HandlePromises on JavascriptRuntime {
  // this.executePendingJob();
  // });
  return await (value.rawResult as Future<dynamic>).then((dynamic res) {
- final resEval = JsEvalResult(res, value.rawResult);
+ final resEval = JsEvalResult("$res", value.rawResult);
  completer.complete(resEval);
  completed = true;
  return resEval;

lib/extensions/xhr.dart

@@ -366,21 +366,21 @@ extension JavascriptRuntimeXhrExtension on JavascriptRuntime {
  try {
  String? method = arguments[0];
  String? url = arguments[1];
- List<String> headersList =
- (arguments[2] as List<dynamic>).cast<String>();
+ dynamic headersList = arguments[2];
  String? body = arguments[3];
  int? idRequest = arguments[4];
 
  Map<String, String> headers = {};
- headersList.forEach((value) {
- final headerMatch = regexpHeader.allMatches(value).first;
- String? headerName = headerMatch.group(0);
- String? headerValue = headerMatch.group(1);
- if (headerName != null) {
- headers[headerName] = headerValue ?? '';
- }
+ headersList.forEach((header) {
+ // final headerMatch = regexpHeader.allMatches(value).first;
+ // String? headerName = headerMatch.group(0);
+ // String? headerValue = headerMatch.group(1);
+ // if (headerName != null) {
+ // headers[headerName] = headerValue ?? '';
+ // }
+ String headerKey = header[0];
+ headers[headerKey] = header[1];
  });
-
  (dartContext[XHR_PENDING_CALLS_KEY] as List<dynamic>).add(
  XhrPendingCall(
  idRequest: idRequest,

lib/quickjs/quickjs_runtime2.dart

@@ -214,7 +214,7 @@ class QuickJsRuntime2 extends JavascriptRuntime {
 
  @override
  int executePendingJob() {
- _executePendingJob();
+ this.dispatch();
  return 0;
  }