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.

Sign up for GitHub

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

Use URL global in parseUri #162

Closed
wants to merge 2 commits into from
+15 −81
Closed

Use URL global in parseUri #162

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5b708a
Use URL global in uri
jokull Jan 24, 2024
6459b2c
Use entries not values
jokull Jan 24, 2024
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
96 changes: 15 additions & 81 deletions packages/libsql-core/src/uri.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,87 +39,21 @@ export interface KeyValue {
}

export function parseUri(text: string): Uri {
const match = URI_RE.exec(text);
if (match === null) {
throw new LibsqlError("The URL is not in a valid format", "URL_INVALID");
}

const groups = match.groups!;
const scheme = groups["scheme"]!;
const authority = groups["authority"] !== undefined
? parseAuthority(groups["authority"]) : undefined;
const path = percentDecode(groups["path"]!);
const query = groups["query"] !== undefined
? parseQuery(groups["query"]) : undefined;
const fragment = groups["fragment"] !== undefined
? percentDecode(groups["fragment"]) : undefined;
return {scheme, authority, path, query, fragment};
}

const URI_RE = (() => {
const SCHEME = '(?<scheme>[A-Za-z][A-Za-z.+-]*)';
const AUTHORITY = '(?<authority>[^/?#]*)';
const PATH = '(?<path>[^?#]*)';
const QUERY = '(?<query>[^#]*)';
const FRAGMENT = '(?<fragment>.*)'
return new RegExp(`^${SCHEME}:(//${AUTHORITY})?${PATH}(\\?${QUERY})?(#${FRAGMENT})?$`, "su");
})();

function parseAuthority(text: string): Authority {
const match = AUTHORITY_RE.exec(text);
if (match === null) {
throw new LibsqlError("The authority part of the URL is not in a valid format", "URL_INVALID");
}

const groups = match.groups!;
const host = percentDecode(groups["host_br"] ?? groups["host"]);
const port = groups["port"]
? parseInt(groups["port"], 10)
: undefined;
const userinfo = groups["username"] !== undefined
? {
username: percentDecode(groups["username"]),
password: groups["password"] !== undefined
? percentDecode(groups["password"]) : undefined,
}
: undefined;
return {host, port, userinfo};
}

const AUTHORITY_RE = (() => {
const USERINFO = '(?<username>[^:]*)(:(?<password>.*))?';
const HOST = '((?<host>[^:\\[\\]]*)|(\\[(?<host_br>[^\\[\\]]*)\\]))';
const PORT = '(?<port>[0-9]*)';
return new RegExp(`^(${USERINFO}@)?${HOST}(:${PORT})?$`, "su");
})();

// Query string is parsed as application/x-www-form-urlencoded according to the Web URL standard:
// https://url.spec.whatwg.org/#urlencoded-parsing
function parseQuery(text: string): Query {
const sequences = text.split("&");
const pairs = [];
for (const sequence of sequences) {
if (sequence === "") {
continue;
}

let key: string;
let value: string;
const splitIdx = sequence.indexOf("=");
if (splitIdx < 0) {
key = sequence;
value = "";
} else {
key = sequence.substring(0, splitIdx);
value = sequence.substring(splitIdx+1);
}

pairs.push({
key: percentDecode(key.replaceAll("+", " ")),
value: percentDecode(value.replaceAll("+", " ")),
});
}
return {pairs};
const url = new URL(text);
return {
scheme: url.protocol.slice(0, -1),
authority: {
userinfo: {
username: url.username,
password: url.password,
},
host: url.hostname,
port: url.port ? parseInt(url.port) : undefined,
},
path: url.pathname,
query: { pairs: [...url.searchParams.values()].map(([key, value]) => ({ key, value })) },
fragment: url.hash || undefined ? percentDecode(url.hash) : undefined,
};
}

function percentDecode(text: string): string {
Expand Down
Loading