fix: axios is added and fetch issues fixed

This commit is contained in:
Vidya Sagar
2024-01-03 21:27:17 +05:30
parent 8d7f745bd5
commit e98ee3d2b1
2 changed files with 69 additions and 31 deletions

View File

@ -1,8 +1,14 @@
import 'dart:convert';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:apidash/utils/extensions/request_model_extension.dart';
import 'package:jinja/jinja.dart' as jj; import 'package:jinja/jinja.dart' as jj;
import 'package:apidash/utils/utils.dart' import 'package:apidash/utils/utils.dart'
show requestModelToHARJsonRequest, padMultilineString, stripUrlParams; show
import 'package:apidash/models/models.dart' show RequestModel; padMultilineString,
requestModelToHARJsonRequest,
rowsToFormDataMap,
stripUrlParams;
import 'package:apidash/models/models.dart' show FormDataModel, RequestModel;
class AxiosCodeGen { class AxiosCodeGen {
AxiosCodeGen({this.isNodeJs = false}); AxiosCodeGen({this.isNodeJs = false});
@ -10,6 +16,8 @@ class AxiosCodeGen {
final bool isNodeJs; final bool isNodeJs;
String kStringImportNode = """import axios from 'axios'; String kStringImportNode = """import axios from 'axios';
{% if isFormDataRequest and isNodeJs %}const fs = require('fs');
{% endif %}
"""; """;
@ -46,13 +54,45 @@ axios(config)
console.log(error); console.log(error);
}); });
"""; """;
String kMultiPartBodyTemplate = r'''
async function buildFormData(fields) {
var formdata = new FormData();
for (const field of fields) {
const name = field.name || '';
const value = field.value || '';
const type = field.type || 'text';
if (type === 'text') {
formdata.append(name, value);
} else if (type === 'file') {
formdata.append(name,{% if isNodeJs %} fs.createReadStream(value){% else %} fileInput.files[0],value{% endif %});
}
}
return formdata;
}
''';
var kGetFormDataTemplate = '''buildFormData({{fields_list}});
''';
String? getCode( String? getCode(
RequestModel requestModel, RequestModel requestModel,
String defaultUriScheme, String defaultUriScheme,
) { ) {
try { try {
String result = isNodeJs ? kStringImportNode : ""; List<FormDataModel> formDataList = requestModel.formDataList ?? [];
jj.Template kNodejsImportTemplate = jj.Template(kStringImportNode);
String importsData = kNodejsImportTemplate.render({
"isFormDataRequest": requestModel.isFormDataRequest,
"isNodeJs": isNodeJs,
});
String result = importsData;
var templateMultiPartBody = jj.Template(kMultiPartBodyTemplate);
var renderedMultiPartBody = templateMultiPartBody.render({
"isNodeJs": isNodeJs,
});
result += renderedMultiPartBody;
String url = requestModel.url; String url = requestModel.url;
if (!url.contains("://") && url.isNotEmpty) { if (!url.contains("://") && url.isNotEmpty) {
@ -80,18 +120,30 @@ axios(config)
} }
var headers = harJson["headers"]; var headers = harJson["headers"];
if (headers.isNotEmpty) { if (headers.isNotEmpty || requestModel.isFormDataRequest) {
var templateHeader = jj.Template(kTemplateHeader); var templateHeader = jj.Template(kTemplateHeader);
var m = {}; var m = {};
for (var i in headers) { for (var i in headers) {
m[i["name"]] = i["value"]; m[i["name"]] = i["value"];
} }
if (requestModel.isFormDataRequest) {
m['Content-Type'] = 'multipart/form-data';
}
result += templateHeader result += templateHeader
.render({"headers": padMultilineString(kEncoder.convert(m), 2)}); .render({"headers": padMultilineString(kEncoder.convert(m), 2)});
} }
if (harJson["postData"]?["text"] != null) {
var templateBody = jj.Template(kTemplateBody); var templateBody = jj.Template(kTemplateBody);
if (requestModel.isFormDataRequest) {
var getFieldDataTemplate = jj.Template(kGetFormDataTemplate);
result += templateBody.render({
"body": getFieldDataTemplate.render({
"fields_list": json.encode(rowsToFormDataMap(formDataList)),
})
});
}
if (harJson["postData"]?["text"] != null) {
result += templateBody result += templateBody
.render({"body": kEncoder.convert(harJson["postData"]["text"])}); .render({"body": kEncoder.convert(harJson["postData"]["text"])});
} }

View File

@ -5,7 +5,7 @@ import 'package:apidash/utils/convert_utils.dart';
import 'package:apidash/utils/extensions/request_model_extension.dart'; import 'package:apidash/utils/extensions/request_model_extension.dart';
import 'package:jinja/jinja.dart' as jj; import 'package:jinja/jinja.dart' as jj;
import 'package:apidash/utils/utils.dart' import 'package:apidash/utils/utils.dart'
show getNewUuid, padMultilineString, requestModelToHARJsonRequest; show padMultilineString, requestModelToHARJsonRequest;
import 'package:apidash/models/models.dart' show FormDataModel, RequestModel; import 'package:apidash/models/models.dart' show FormDataModel, RequestModel;
class FetchCodeGen { class FetchCodeGen {
@ -13,14 +13,16 @@ class FetchCodeGen {
final bool isNodeJs; final bool isNodeJs;
String kStringImportNode = """ String kStringImportNode =
"""
import fetch from 'node-fetch'; import fetch from 'node-fetch';
{% if isFormDataRequest %}const fs = require('fs');{% endif %} {% if isFormDataRequest %}const fs = require('fs');{% endif %}
"""; """;
String kTemplateStart = """let url = '{{url}}'; String kTemplateStart =
"""let url = '{{url}}';
let options = { let options = {
method: '{{method}}' method: '{{method}}'
@ -33,19 +35,9 @@ let options = {
String kTemplateBody = """, String kTemplateBody = """,
body: {{body}} body: {{body}}
"""; """;
String kMultiPartFileReader = '''
function readFile(file) {
{% if isNodeJs %} return fs.readFile(file, 'binary'); {% else %} return new Promise((resolve, reject) => {
const reader = new FileReader();
reader.onload = () => resolve(reader.result);
reader.onerror = reject;
reader.readAsArrayBuffer(file);
});
{% endif %}
}
'''; String kMultiPartBodyTemplate =
String kMultiPartBodyTemplate = r''' r'''
async function buildDataList(fields) { async function buildDataList(fields) {
var formdata = new FormData(); var formdata = new FormData();
for (const field of fields) { for (const field of fields) {
@ -58,13 +50,15 @@ async function buildDataList(fields) {
} else if (type === 'file') { } else if (type === 'file') {
formdata.append(name,{% if isNodeJs %} fs.createReadStream(value){% else %} fileInput.files[0],value{% endif %}); formdata.append(name,{% if isNodeJs %} fs.createReadStream(value){% else %} fileInput.files[0],value{% endif %});
} }
}
return formdata;
} }
const payload = buildDataList({{fields_list}}); const payload = buildDataList({{fields_list}});
'''; ''';
String kStringRequest = """ String kStringRequest =
"""
}; };
@ -90,7 +84,6 @@ fetch(url, options)
) { ) {
try { try {
List<FormDataModel> formDataList = requestModel.formDataList ?? []; List<FormDataModel> formDataList = requestModel.formDataList ?? [];
String uuid = getNewUuid();
jj.Template kNodejsImportTemplate = jj.Template(kStringImportNode); jj.Template kNodejsImportTemplate = jj.Template(kStringImportNode);
String importsData = kNodejsImportTemplate.render({ String importsData = kNodejsImportTemplate.render({
"isFormDataRequest": requestModel.isFormDataRequest, "isFormDataRequest": requestModel.isFormDataRequest,
@ -98,15 +91,8 @@ fetch(url, options)
String result = isNodeJs ? importsData : ""; String result = isNodeJs ? importsData : "";
if (requestModel.isFormDataRequest) { if (requestModel.isFormDataRequest) {
jj.Template kMultiPartFileReaderTemplate =
jj.Template(kMultiPartFileReader);
result += kMultiPartFileReaderTemplate.render({
"isNodeJs": isNodeJs,
});
var boundary = uuid;
var templateMultiPartBody = jj.Template(kMultiPartBodyTemplate); var templateMultiPartBody = jj.Template(kMultiPartBodyTemplate);
result += templateMultiPartBody.render({ result += templateMultiPartBody.render({
"boundary": boundary,
"isNodeJs": isNodeJs, "isNodeJs": isNodeJs,
"fields_list": json.encode(rowsToFormDataMap(formDataList)), "fields_list": json.encode(rowsToFormDataMap(formDataList)),
}); });
@ -131,7 +117,7 @@ fetch(url, options)
var templateHeader = jj.Template(kTemplateHeader); var templateHeader = jj.Template(kTemplateHeader);
var m = {}; var m = {};
if (requestModel.isFormDataRequest) { if (requestModel.isFormDataRequest) {
m["Content-Type"] = "multipart/form-data; boundary=$uuid"; m["Content-Type"] = "multipart/form-data";
} }
for (var i in headers) { for (var i in headers) {
m[i["name"]] = i["value"]; m[i["name"]] = i["value"];