mirror of
https://github.com/schlagmichdoch/PairDrop.git
synced 2025-04-20 15:06:15 -04:00
implemented WebShareTarget in manifest and serviceworker for testing
This commit is contained in:
parent
2394a4793a
commit
be6813d714
5 changed files with 107 additions and 54 deletions
|
@ -18,6 +18,9 @@ server {
|
||||||
location /ca.crt {
|
location /ca.crt {
|
||||||
alias /etc/ssl/certs/snapdropCA.crt;
|
alias /etc/ssl/certs/snapdropCA.crt;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# To allow POST on static pages
|
||||||
|
error_page 405 =200 $uri;
|
||||||
}
|
}
|
||||||
|
|
||||||
server {
|
server {
|
||||||
|
@ -42,5 +45,7 @@ server {
|
||||||
location /ca.crt {
|
location /ca.crt {
|
||||||
alias /etc/ssl/certs/snapdropCA.crt;
|
alias /etc/ssl/certs/snapdropCA.crt;
|
||||||
}
|
}
|
||||||
|
# To allow POST on static pages
|
||||||
|
error_page 405 =200 $uri;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -10,6 +10,8 @@ server {
|
||||||
location /ca.crt {
|
location /ca.crt {
|
||||||
alias /etc/ssl/certs/snapdropCA.crt;
|
alias /etc/ssl/certs/snapdropCA.crt;
|
||||||
}
|
}
|
||||||
|
# To allow POST on static pages
|
||||||
|
error_page 405 =200 $uri;
|
||||||
}
|
}
|
||||||
|
|
||||||
server {
|
server {
|
||||||
|
@ -34,5 +36,7 @@ server {
|
||||||
location /ca.crt {
|
location /ca.crt {
|
||||||
alias /etc/ssl/certs/snapdropCA.crt;
|
alias /etc/ssl/certs/snapdropCA.crt;
|
||||||
}
|
}
|
||||||
|
# To allow POST on static pages
|
||||||
|
error_page 405 =200 $uri;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -30,12 +30,18 @@
|
||||||
"display": "minimal-ui",
|
"display": "minimal-ui",
|
||||||
"theme_color": "#3367d6",
|
"theme_color": "#3367d6",
|
||||||
"share_target": {
|
"share_target": {
|
||||||
"method":"GET",
|
"action": "/",
|
||||||
"action": "/?share_target",
|
"method":"POST",
|
||||||
|
"enctype": "multipart/form-data",
|
||||||
"params": {
|
"params": {
|
||||||
"title": "title",
|
"title": "title",
|
||||||
"text": "text",
|
"text": "text",
|
||||||
"url": "url"
|
"url": "url",
|
||||||
|
"files": [{
|
||||||
|
"name": "allfiles",
|
||||||
|
"accept": ["*/*"]
|
||||||
|
}]
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"file_handlers": [
|
"file_handlers": [
|
||||||
|
|
|
@ -931,7 +931,6 @@ class SendTextDialog extends Dialog {
|
||||||
|
|
||||||
_onRecipient(recipient) {
|
_onRecipient(recipient) {
|
||||||
this._recipient = recipient;
|
this._recipient = recipient;
|
||||||
this._handleShareTargetText();
|
|
||||||
this.show();
|
this.show();
|
||||||
|
|
||||||
const range = document.createRange();
|
const range = document.createRange();
|
||||||
|
@ -943,12 +942,6 @@ class SendTextDialog extends Dialog {
|
||||||
sel.addRange(range);
|
sel.addRange(range);
|
||||||
}
|
}
|
||||||
|
|
||||||
_handleShareTargetText() {
|
|
||||||
if (!window.shareTargetText) return;
|
|
||||||
this.$text.textContent = window.shareTargetText;
|
|
||||||
window.shareTargetText = '';
|
|
||||||
}
|
|
||||||
|
|
||||||
_send() {
|
_send() {
|
||||||
Events.fire('send-text', {
|
Events.fire('send-text', {
|
||||||
to: this._recipient,
|
to: this._recipient,
|
||||||
|
@ -1135,20 +1128,34 @@ class NetworkStatusUI {
|
||||||
|
|
||||||
class WebShareTargetUI {
|
class WebShareTargetUI {
|
||||||
constructor() {
|
constructor() {
|
||||||
const parsedUrl = new URL(window.location);
|
const urlParams = new URL(window.location).searchParams;
|
||||||
const title = parsedUrl.searchParams.get('title');
|
const share_target_type = urlParams.get("share-target")
|
||||||
const text = parsedUrl.searchParams.get('text');
|
if (share_target_type) {
|
||||||
const url = parsedUrl.searchParams.get('url');
|
if (share_target_type === "text") {
|
||||||
|
const title = urlParams.get('title') || '';
|
||||||
|
const text = urlParams.get('text') || '';
|
||||||
|
const url = urlParams.get('url') || '';
|
||||||
|
let shareTargetText;
|
||||||
|
|
||||||
let shareTargetText = title ? title : '';
|
if (url) {
|
||||||
shareTargetText += text ? shareTargetText ? ' ' + text : text : '';
|
shareTargetText = url; // We share only the Link - no text. Because link-only text becomes clickable.
|
||||||
|
} else if (title && text) {
|
||||||
|
shareTargetText = title + '\r\n' + text;
|
||||||
|
} else {
|
||||||
|
shareTargetText = title + text;
|
||||||
|
}
|
||||||
|
|
||||||
if(url) shareTargetText = url; // We share only the Link - no text. Because link-only text becomes clickable.
|
|
||||||
|
|
||||||
if (!shareTargetText) return;
|
|
||||||
window.shareTargetText = shareTargetText;
|
|
||||||
history.pushState({}, 'URL Rewrite', '/');
|
|
||||||
console.log('Shared Target Text:', '"' + shareTargetText + '"');
|
console.log('Shared Target Text:', '"' + shareTargetText + '"');
|
||||||
|
Events.fire('activate-paste-mode', {files: [], text: shareTargetText})
|
||||||
|
} else if (share_target_type === "files") {
|
||||||
|
caches.match("share_target_files")
|
||||||
|
.then(files => {
|
||||||
|
console.debug(files)
|
||||||
|
Events.fire('activate-paste-mode', {files: files, text: ""})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
history.pushState({}, 'URL Rewrite', '/');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -27,6 +27,36 @@ self.addEventListener('install', function(event) {
|
||||||
|
|
||||||
|
|
||||||
self.addEventListener('fetch', function(event) {
|
self.addEventListener('fetch', function(event) {
|
||||||
|
if (event.request.method === "POST") {
|
||||||
|
// Requests related to Web Share Target.
|
||||||
|
event.respondWith(
|
||||||
|
(async () => {
|
||||||
|
const formData = await event.request.formData();
|
||||||
|
const title = formData.get("title");
|
||||||
|
const text = formData.get("text");
|
||||||
|
const url = formData.get("url");
|
||||||
|
const files = formData.get("files");
|
||||||
|
console.debug(title)
|
||||||
|
console.debug(text)
|
||||||
|
console.debug(url)
|
||||||
|
console.debug(files)
|
||||||
|
let share_url = "/";
|
||||||
|
if (files.length > 0) {
|
||||||
|
// Save to Cache?
|
||||||
|
caches.open("share_target_files")
|
||||||
|
.then(cache => {
|
||||||
|
cache.addAll(files)
|
||||||
|
console.debug("files added to cache")
|
||||||
|
});
|
||||||
|
share_url = "/?share-target=files";
|
||||||
|
} else if (title.length > 0 || text.length > 0 || url.length) {
|
||||||
|
share_url = `/?share-target=text&title=${title}&text=${text}&url=${url}`;
|
||||||
|
}
|
||||||
|
return Response.redirect(encodeURI(share_url), 303);
|
||||||
|
})()
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
// Regular requests not related to Web Share Target.
|
||||||
event.respondWith(
|
event.respondWith(
|
||||||
caches.match(event.request)
|
caches.match(event.request)
|
||||||
.then(function (response) {
|
.then(function (response) {
|
||||||
|
@ -38,6 +68,7 @@ self.addEventListener('fetch', function(event) {
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue