gnh1201/welsonjs
1
0
Fork 0
mirror of https://github.com/gnh1201/welsonjs.git synced 2025-05-13 13:11:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update http.js

Browse Source
This commit is contained in:
Namhyeon Go 2022-01-13 16:46:02 +09:00 committed by GitHub
parent 80711da772
commit edca0f9d45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/http.js
View File

@ -257,11 +257,6 @@ var HTTPObject = function(engine) {
this.serializeParameters = function(url) { this.serializeParameters = function(url) {
console.log(Object.keys(this.parameters).join(",")); console.log(Object.keys(this.parameters).join(","));
// UUID v4
while (url.indexOf("{uuidv4}") > -1) {
url = url.replace("{uuidv4}", uuidv4());
}
// Bind parameters // Bind parameters
if (Object.keys(this.parameters).length > 0) { if (Object.keys(this.parameters).length > 0) {
// Type 2 // Type 2
@ -269,6 +264,8 @@ var HTTPObject = function(engine) {
for (var k in this.parameters) { for (var k in this.parameters) {
if (url.indexOf(':' + k) > -1) { if (url.indexOf(':' + k) > -1) {
url = url.replace(':' + k, this.parameters[k]); url = url.replace(':' + k, this.parameters[k]);
} else if(this.parameters[k] == "{uuidv4}") {
parameters[k] = uuidv4(); // Generate UUID v4
} else { } else {
parameters[k] = this.parameters[k]; parameters[k] = this.parameters[k];
} }
@ -351,6 +348,7 @@ var HTTPObject = function(engine) {
// Make CURL context // Make CURL context
var state = this.states[this.states.length - 1]; var state = this.states[this.states.length - 1];
var cmd = ["bin\\curl", "-X", this.method]; var cmd = ["bin\\curl", "-X", this.method];
var url = state.url;
if (Object.keys(this.headers).length > 0) { if (Object.keys(this.headers).length > 0) {
for (var key in this.headers) { for (var key in this.headers) {
@ -372,7 +370,14 @@ var HTTPObject = function(engine) {
cmd.push(this.userAgent); cmd.push(this.userAgent);
} }
var pos = url.indexOf('?');
if (pos > -1) {
cmd.push("-d");
cmd.push(state.url.substring(pos + 1));
cmd.push(state.url.substring(0, pos));
} else {
cmd.push(state.url); cmd.push(state.url);
}
// Get response text // Get response text
responseText = this.interface.exec(cmd); responseText = this.interface.exec(cmd);