mirrors/PairDrop
1
0
Fork 0
mirror of https://github.com/schlagmichdoch/PairDrop.git synced 2025-04-20 15:06:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

try to fix share target api

Browse source
This commit is contained in:
schlagmichdoch 2023-03-09 17:03:44 +01:00
parent 1bb8a63eed
commit 251df2fbff
4 changed files with 128 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

22
public/scripts/ui.js
View file

@ -1617,17 +1617,24 @@ class WebShareTargetUI {
console.log('Shared Target Text:', '"' + shareTargetText + '"'); console.log('Shared Target Text:', '"' + shareTargetText + '"');
Events.fire('activate-paste-mode', {files: [], text: shareTargetText}) Events.fire('activate-paste-mode', {files: [], text: shareTargetText})
} else if (share_target_type === "files") { } else if (share_target_type === "files") {
const openRequest = window.indexedDB.open('pairdrop_store') let openRequest = window.indexedDB.open('pairdrop_store')
openRequest.onsuccess( db => { openRequest.onsuccess = e => {
const db = e.target.result;
const tx = db.transaction('share_target_files', 'readwrite'); const tx = db.transaction('share_target_files', 'readwrite');
const store = tx.objectStore('share_target_files'); const store = tx.objectStore('share_target_files');
const request = store.getAll(); const request = store.getAll();
request.onsuccess = _ => { request.onsuccess = _ => {
Events.fire('activate-paste-mode', {files: request.result, text: ""}) const fileObjects = request.result;
let filesReceived = [];
for (let i=0; i<fileObjects.length; i++) {
filesReceived.push(new File([fileObjects[i].buffer], fileObjects[i].name));
}
console.debug(filesReceived)
Events.fire('activate-paste-mode', {files: filesReceived, text: ""})
const clearRequest = store.clear() const clearRequest = store.clear()
clearRequest.onsuccess = _ => db.close(); clearRequest.onsuccess = _ => db.close();
} }
}) }
} }
window.history.replaceState({}, "Rewrite URL", '/'); window.history.replaceState({}, "Rewrite URL", '/');
} }
@ -1684,7 +1691,7 @@ class PersistentStorage {
PersistentStorage.logBrowserNotCapable(); PersistentStorage.logBrowserNotCapable();
return; return;
} }
const DBOpenRequest = window.indexedDB.open('pairdrop_store', 2); const DBOpenRequest = window.indexedDB.open('pairdrop_store', 3);
DBOpenRequest.onerror = (e) => { DBOpenRequest.onerror = (e) => {
PersistentStorage.logBrowserNotCapable(); PersistentStorage.logBrowserNotCapable();
console.log('Error initializing database: '); console.log('Error initializing database: ');
@ -1710,7 +1717,10 @@ class PersistentStorage {
} }
try { try {
db.createObjectStore('share_target_files'); if (db.objectStoreNames.contains('share_target_files')) {
db.deleteObjectStore('share_target_files');
}
db.createObjectStore('share_target_files', {autoIncrement: true});
} catch (error) { } catch (error) {
console.log("Object store named 'share_target_files' already exists") console.log("Object store named 'share_target_files' already exists")
} }

72
public/service-worker.js
View file

@ -71,30 +71,12 @@ const update = request =>
self.addEventListener('fetch', function(event) { self.addEventListener('fetch', function(event) {
if (event.request.method === "POST") { if (event.request.method === "POST") {
// Requests related to Web Share Target. // Requests related to Web Share Target.
event.respondWith( evaluateRequestData(event.request).then(share_url => {
(async () => { console.debug(share_url);
const formData = await event.request.formData(); event.respondWith(
const title = formData.get("title"); Response.redirect(encodeURI(share_url), 302)
const text = formData.get("text"); );
const url = formData.get("url"); })
const files = formData.get("files");
let share_url = "/";
if (files.length > 0) {
share_url = "/?share-target=files";
const db = await window.indexedDB.open('pairdrop_store');
const tx = db.transaction('share_target_files', 'readwrite');
const store = tx.objectStore('share_target_files');
for (let i=0; i<files.length; i++) {
await store.add(files[i]);
}
await tx.complete
db.close()
} 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 { } else {
// Regular requests not related to Web Share Target. // Regular requests not related to Web Share Target.
event.respondWith( event.respondWith(
@ -119,3 +101,45 @@ self.addEventListener('activate', evt =>
}) })
) )
); );
const evaluateRequestData = async function (request) {
const formData = await request.formData();
const title = formData.get("title");
const text = formData.get("text");
const url = formData.get("url");
const files = formData.getAll("files");
console.debug(files)
let fileObjects = [];
for (let i=0; i<files.length; i++) {
fileObjects.push({
name: files[i].name,
buffer: await files[i].arrayBuffer()
});
}
return new Promise((resolve, reject) => {
if (fileObjects?.length > 0) {
const DBOpenRequest = indexedDB.open('pairdrop_store');
DBOpenRequest.onsuccess = (e) => {
const db = e.target.result;
for (let i = 0; i < fileObjects.length; i++) {
const transaction = db.transaction('share_target_files', 'readwrite');
const objectStore = transaction.objectStore('share_target_files');
const objectStoreRequest = objectStore.add(fileObjects[i]);
objectStoreRequest.onsuccess = _ => {
if (i === fileObjects.length - 1) resolve('/?share-target=files');
}
}
}
DBOpenRequest.onerror = _ => {
resolve('/');
}
} else if (title?.length > 0 || text?.length > 0 || url?.length > 0) {
console.debug(title || text || url);
resolve(`/?share-target=text&title=${title}&text=${text}&url=${url}`);
} else {
resolve('/');
}
});
}

22
public_included_ws_fallback/scripts/ui.js
View file

@ -1618,17 +1618,24 @@ class WebShareTargetUI {
console.log('Shared Target Text:', '"' + shareTargetText + '"'); console.log('Shared Target Text:', '"' + shareTargetText + '"');
Events.fire('activate-paste-mode', {files: [], text: shareTargetText}) Events.fire('activate-paste-mode', {files: [], text: shareTargetText})
} else if (share_target_type === "files") { } else if (share_target_type === "files") {
const openRequest = window.indexedDB.open('pairdrop_store') let openRequest = window.indexedDB.open('pairdrop_store')
openRequest.onsuccess( db => { openRequest.onsuccess = e => {
const db = e.target.result;
const tx = db.transaction('share_target_files', 'readwrite'); const tx = db.transaction('share_target_files', 'readwrite');
const store = tx.objectStore('share_target_files'); const store = tx.objectStore('share_target_files');
const request = store.getAll(); const request = store.getAll();
request.onsuccess = _ => { request.onsuccess = _ => {
Events.fire('activate-paste-mode', {files: request.result, text: ""}) const fileObjects = request.result;
let filesReceived = [];
for (let i=0; i<fileObjects.length; i++) {
filesReceived.push(new File([fileObjects[i].buffer], fileObjects[i].name));
}
console.debug(filesReceived)
Events.fire('activate-paste-mode', {files: filesReceived, text: ""})
const clearRequest = store.clear() const clearRequest = store.clear()
clearRequest.onsuccess = _ => db.close(); clearRequest.onsuccess = _ => db.close();
} }
}) }
} }
window.history.replaceState({}, "Rewrite URL", '/'); window.history.replaceState({}, "Rewrite URL", '/');
} }
@ -1685,7 +1692,7 @@ class PersistentStorage {
PersistentStorage.logBrowserNotCapable(); PersistentStorage.logBrowserNotCapable();
return; return;
} }
const DBOpenRequest = window.indexedDB.open('pairdrop_store', 2); const DBOpenRequest = window.indexedDB.open('pairdrop_store', 3);
DBOpenRequest.onerror = (e) => { DBOpenRequest.onerror = (e) => {
PersistentStorage.logBrowserNotCapable(); PersistentStorage.logBrowserNotCapable();
console.log('Error initializing database: '); console.log('Error initializing database: ');
@ -1711,7 +1718,10 @@ class PersistentStorage {
} }
try { try {
db.createObjectStore('share_target_files'); if (db.objectStoreNames.contains('share_target_files')) {
db.deleteObjectStore('share_target_files');
}
db.createObjectStore('share_target_files', {autoIncrement: true});
} catch (error) { } catch (error) {
console.log("Object store named 'share_target_files' already exists") console.log("Object store named 'share_target_files' already exists")
} }

72
public_included_ws_fallback/service-worker.js
View file

@ -71,30 +71,12 @@ const update = request =>
self.addEventListener('fetch', function(event) { self.addEventListener('fetch', function(event) {
if (event.request.method === "POST") { if (event.request.method === "POST") {
// Requests related to Web Share Target. // Requests related to Web Share Target.
event.respondWith( evaluateRequestData(event.request).then(share_url => {
(async () => { console.debug(share_url);
const formData = await event.request.formData(); event.respondWith(
const title = formData.get("title"); Response.redirect(encodeURI(share_url), 302)
const text = formData.get("text"); );
const url = formData.get("url"); })
const files = formData.get("files");
let share_url = "/";
if (files.length > 0) {
share_url = "/?share-target=files";
const db = await window.indexedDB.open('pairdrop_store');
const tx = db.transaction('share_target_files', 'readwrite');
const store = tx.objectStore('share_target_files');
for (let i=0; i<files.length; i++) {
await store.add(files[i]);
}
await tx.complete
db.close()
} 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 { } else {
// Regular requests not related to Web Share Target. // Regular requests not related to Web Share Target.
event.respondWith( event.respondWith(
@ -119,3 +101,45 @@ self.addEventListener('activate', evt =>
}) })
) )
); );
const evaluateRequestData = async function (request) {
const formData = await request.formData();
const title = formData.get("title");
const text = formData.get("text");
const url = formData.get("url");
const files = formData.getAll("files");
console.debug(files)
let fileObjects = [];
for (let i=0; i<files.length; i++) {
fileObjects.push({
name: files[i].name,
buffer: await files[i].arrayBuffer()
});
}
return new Promise((resolve, reject) => {
if (fileObjects?.length > 0) {
const DBOpenRequest = indexedDB.open('pairdrop_store');
DBOpenRequest.onsuccess = (e) => {
const db = e.target.result;
for (let i = 0; i < fileObjects.length; i++) {
const transaction = db.transaction('share_target_files', 'readwrite');
const objectStore = transaction.objectStore('share_target_files');
const objectStoreRequest = objectStore.add(fileObjects[i]);
objectStoreRequest.onsuccess = _ => {
if (i === fileObjects.length - 1) resolve('/?share-target=files');
}
}
}
DBOpenRequest.onerror = _ => {
resolve('/');
}
} else if (title?.length > 0 || text?.length > 0 || url?.length > 0) {
console.debug(title || text || url);
resolve(`/?share-target=text&title=${title}&text=${text}&url=${url}`);
} else {
resolve('/');
}
});
}