Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: replace legacy url API #113

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions request.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
const http = require('http')
const https = require('https')
const crypto = require('crypto')
const parse = require('url').parse
const URL = require('url').URL
const querystring = require('querystring')

URL.prototype.resolve = function(relative){
return new URL(relative, this).toString();
}

const parse = (url) => new URL(url)

let user = {}

const encrypt = object => {
Expand All @@ -14,7 +20,7 @@ const encrypt = object => {

const request = (method, url, headers, body = null) =>
new Promise((resolve, reject) => {
(url.startsWith('https://') ? https : http).request(Object.assign(parse(url), { method, headers }))
(url.startsWith('https://') ? https : http).request(parse(url), { method, headers })
.on('response', response => resolve([201, 301, 302, 303, 307, 308].includes(response.statusCode) ? request(method, parse(url).resolve(response.headers.location), headers, body) : response))
.on('error', error => reject(error)).end(body)
})
Expand Down
8 changes: 7 additions & 1 deletion runtime.js
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,13 @@ const DuplexChannel = context => {
}

const AssistServer = context => {
const urlParse = require('url').parse
const URL = require('url').URL
Object.defineProperty(URL.prototype, 'query', {
get: function query(){
return this.searchParams.toString()
}
})
const urlParse = (url) => new URL(url, url.startsWith('/')?'relative://':'')
const queryify = require('querystring').stringify
const queryParse = require('querystring').parse

Expand Down