secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Manual encoding/decoding of specific URI elements

Browse Source
This commit is contained in:
James Barnsley
2021-01-19 06:47:24 +13:00
parent 50f106c710
commit 1464dd5986
3 changed files with 28 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
mopidy_iris/static/app.js
View File

@ -126643,10 +126643,11 @@ var encodeUri = function encodeUri(uri) {
/**
* Rebuild a URI with some ugly-ass handling of encoding.
*
* Basically the ID part of a Mopidy URI needs to be encoded, but the rest of the URI can't be.
* This means we need to break down the URI (decoded) and then reconstruct with an encoded ID.
* This is all required because he URI is passed to us *from* a URL which has been encoded for
* obvious reasons.
* We can't just run encodeURIComponent because it will encode ':' and '/' elements which are
* required to properly map to Mopidy's internal structure. Some things need encoding, and others
* need decoding *sigh*.
*
* Instead, we pluck the individual encodings as needed.
*
* For example somebackend:track:https://youtube.com/1234 would cause issues with the
* https:// section. Our explode-by-':' approach would break this type of URI.
@ -126657,40 +126658,15 @@ var encodeUri = function encodeUri(uri) {
var decodeUri = function decodeUri(rawUri) {
var uri = decodeURIComponent(rawUri);
var source = Object(_helpers__WEBPACK_IMPORTED_MODULE_1__["uriSource"])(uri);
var type = Object(_helpers__WEBPACK_IMPORTED_MODULE_1__["uriType"])(uri);
/**
* TODO
* Why the hell is this so difficult?
*/
// Reinstate slashes for the Mopidy-Local structure
//uri = uri.replace(/%2F/g, '/');
// Ensure all ':' are uri encoded to lowercase
//uri = uri.replace(/%3A/g, '%3a');
return uri; // Escape unreserved characters (RFC 3986)
// https://stackoverflow.com/questions/18251399/why-doesnt-encodeuricomponent-encode-single-quotes-apostrophes
var id = Object(_helpers__WEBPACK_IMPORTED_MODULE_1__["getFromUri"])("".concat(type, "id"), uri);
var rest = uri.substring(uri.indexOf(id) + id.length);
id = encodeURIComponent(id).replace(/[!'()*]/g, escape); // Reinstate slashes for the Mopidy-Local structure
id = id.replace(/%2F/g, '/'); // Ensure all ':' are uri encoded to lowercase
id = id.replace(/%3A/g, '%3a');
var decoded = "".concat(source, ":");
switch (source) {
case 'dleyna':
// Doesn't contain URI type within it's URI schema *facepalm*
break;
default:
decoded += "".concat(type, ":");
}
decoded += "".concat(id).concat(rest);
return decoded;
uri = uri.replace(/,/g, '%2C');
uri = uri.replace(/'/g, '%27');
uri = uri.replace(/ /g, '%20');
uri = uri.replace(/\(/g, '%28');
uri = uri.replace(/\)/g, '%29');
uri = uri.replace(/\[/g, '%5B');
uri = uri.replace(/\]/g, '%5D');
console.debug(uri);
return uri;
};
/**
* Format our album objects into a universal format

2
mopidy_iris/static/app.js.map
View File

File diff suppressed because one or more lines are too long

55
src/js/util/format.js
View File

@ -289,10 +289,11 @@ const encodeUri = (uri) => {
/**
* Rebuild a URI with some ugly-ass handling of encoding.
*
* Basically the ID part of a Mopidy URI needs to be encoded, but the rest of the URI can't be.
* This means we need to break down the URI (decoded) and then reconstruct with an encoded ID.
* This is all required because he URI is passed to us *from* a URL which has been encoded for
* obvious reasons.
* We can't just run encodeURIComponent because it will encode ':' and '/' elements which are
* required to properly map to Mopidy's internal structure. Some things need encoding, and others
* need decoding *sigh*.
*
* Instead, we pluck the individual encodings as needed.
*
* For example somebackend:track:https://youtube.com/1234 would cause issues with the
* https:// section. Our explode-by-':' approach would break this type of URI.
@ -301,46 +302,16 @@ const encodeUri = (uri) => {
*/
const decodeUri = (rawUri) => {
let uri = decodeURIComponent(rawUri);
const source = uriSource(uri);
const type = uriType(uri);
uri = uri.replace(/,/g, '%2C');
uri = uri.replace(/'/g, '%27');
uri = uri.replace(/ /g, '%20');
uri = uri.replace(/\(/g, '%28');
uri = uri.replace(/\)/g, '%29');
uri = uri.replace(/\[/g, '%5B');
uri = uri.replace(/\]/g, '%5D');
/**
* TODO
* Why the hell is this so difficult?
*/
// Reinstate slashes for the Mopidy-Local structure
//uri = uri.replace(/%2F/g, '/');
// Ensure all ':' are uri encoded to lowercase
//uri = uri.replace(/%3A/g, '%3a');
console.debug(uri);
return uri;
// Escape unreserved characters (RFC 3986)
// https://stackoverflow.com/questions/18251399/why-doesnt-encodeuricomponent-encode-single-quotes-apostrophes
let id = getFromUri(`${type}id`, uri);
const rest = uri.substring(uri.indexOf(id) + id.length);
id = encodeURIComponent(id).replace(/[!'()*]/g, escape);
// Reinstate slashes for the Mopidy-Local structure
id = id.replace(/%2F/g, '/');
// Ensure all ':' are uri encoded to lowercase
id = id.replace(/%3A/g, '%3a');
let decoded = `${source}:`;
switch (source) {
case 'dleyna':
// Doesn't contain URI type within it's URI schema *facepalm*
break;
default:
decoded += `${type}:`;
}
decoded += `${id}${rest}`;
return decoded;
};
/**