diff --git a/apple/Sources/SafariExtension/Resources/manifest.json b/apple/Sources/SafariExtension/Resources/manifest.json index a5c39db66..f9512292b 100644 --- a/apple/Sources/SafariExtension/Resources/manifest.json +++ b/apple/Sources/SafariExtension/Resources/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "Omnivore", "short_name": "Omnivore", - "version": "0.1.22", + "version": "0.1.24", "description": "Save articles to your Omnivore library", "author": "Omnivore Media, Inc", "default_locale": "en", @@ -80,6 +80,14 @@ }, "default_title": "Omnivore Save Article" }, + "commands": { + "_execute_browser_action": { + "suggested_key": { + "default": "Alt + O" + }, + "description": "Save the current tab to Omnivore" + } + }, "web_accessible_resources": [ "views/cta-popup.html" ] diff --git a/apple/Sources/SafariExtension/Resources/scripts/background.js b/apple/Sources/SafariExtension/Resources/scripts/background.js index 5dcad7d2f..4c1369ce6 100644 --- a/apple/Sources/SafariExtension/Resources/scripts/background.js +++ b/apple/Sources/SafariExtension/Resources/scripts/background.js @@ -1 +1 @@ -(()=>{"use strict";let e;const t="https://omnivore.app",s="https://omnivore.app/api/";function o(e){return new Promise((t=>{browserApi.storage.local.get(e,(s=>{const o=s&&s[e]||null;t(o)}))}))}function n(e){return new Promise((t=>{browserApi.storage.local.set(e,t)}))}function r(e){return new Promise((t=>{browserApi.storage.local.remove(e,t)}))}function a(t){t.setRequestHeader("Content-Type","application/json"),e&&t.setRequestHeader("Authorization",e)}function i(){o("postInstallClickComplete").then((e=>{e&&r("postInstallClickComplete")}))}function l(e){browserApi.tabs.sendMessage(e.id,{action:ACTIONS.ShowMessage,payload:{type:"loading",text:"Saving..."}});const o=new XMLHttpRequest,n={BAD_DATA:"Unable to save page",NOT_ALLOWED_TO_PARSE:"Not allowed to parse this article",UNAUTHORIZED:"Please login to Omnivore to authorize this action",UNABLE_TO_FETCH:"Unable to fetch page",PAYLOAD_TOO_LARGE:"This article is too large"};o.onreadystatechange=function(){if(4===o.readyState)if(200===o.status){const{data:s}=JSON.parse(o.response);if("createArticle"in s)if("errorCodes"in s.createArticle){const o={text:n[s.createArticle.errorCodes[0]]||"Unable to save page",type:"error"};"UNAUTHORIZED"===s.createArticle.errorCodes[0]&&(o.errorCode=401,o.url=t,i()),browserApi.tabs.sendMessage(e.id,{action:ACTIONS.ShowMessage,payload:o})}else{const o=s.createArticle.createdArticle,n=s.createArticle.user,r=t+(o.hasContent?`/${n.profile.username}/`+o.slug:"/home");browserApi.tabs.sendMessage(e.id,{action:ACTIONS.ShowMessage,payload:{text:"Saved to Omnivore",link:r,linkText:"View",type:"success"}})}else if("errorCodes"in s.createArticleSavingRequest)browserApi.tabs.sendMessage(e.id,{action:ACTIONS.ShowMessage,payload:{text:n[s.createArticleSavingRequest.errorCodes[0]]||"Unable to save page",type:"error"}});else{const o=s.createArticleSavingRequest.articleSavingRequest,n=t+"/article/sr/"+o.id;browserApi.tabs.sendMessage(e.id,{action:ACTIONS.ShowMessage,payload:{text:"Saved to Omnivore",link:n,linkText:"View",type:"success"}})}}else 400===o.status&&browserApi.tabs.sendMessage(e.id,{action:ACTIONS.ShowMessage,payload:{text:"Unable to save page",type:"error"}})},browserApi.tabs.sendMessage(e.id,{action:ACTIONS.GetContent},(async n=>{if(!n||"object"!=typeof n)return;const{type:r,pageInfo:l,doc:c,uploadContentObjUrl:p}=n;let d=null;switch(r){case"pdf":if(d=await function(e,o,n,r){return new Promise((l=>{const c=new XMLHttpRequest;c.onreadystatechange=async function(){if(4===c.readyState){if(200===c.status){const{data:s}=JSON.parse(c.response);if("errorCodes"in s.uploadFileRequest&&"UNAUTHORIZED"===s.uploadFileRequest.errorCodes[0]&&(i(),browserApi.tabs.sendMessage(e.id,{action:ACTIONS.ShowMessage,payload:{text:"Unable to save page",type:"error",errorCode:401,url:t}})),s.uploadFileRequest&&s.uploadFileRequest.id&&!("errorCodes"in s.uploadFileRequest)){const e=await function({id:e,uploadSignedUrl:t},s,o){return fetch(o).then((e=>e.blob())).then((o=>new Promise((n=>{const r=new XMLHttpRequest;r.open("PUT",t,!0),r.setRequestHeader("Content-Type",s),r.onerror=()=>{n(null)},r.onload=()=>{n({id:e})},r.send(o)})))).catch((e=>{console.error("error uploading file",e)}))}(s.uploadFileRequest,n,r);return URL.revokeObjectURL(r),l(e)}browserApi.tabs.sendMessage(e.id,{action:ACTIONS.ShowMessage,payload:{text:"Unable to save page",type:"error"}})}else 400===c.status&&browserApi.tabs.sendMessage(e.id,{action:ACTIONS.ShowMessage,payload:{text:"Unable to save page",type:"error"}});l(!1)}};const p=JSON.stringify({query:"mutation UploadFileRequest($input: UploadFileRequestInput!) {\n uploadFileRequest(input:$input) {\n ... on UploadFileRequestError {\n errorCodes\n }\n ... on UploadFileRequestSuccess {\n id\n uploadSignedUrl\n }\n }\n }",variables:{input:{url:o,contentType:n}}});c.open("POST",s+"graphql",!0),a(c),c.send(p)}))}(e,encodeURI(e.url),l.contentType,p),!d||!d.id)return void browserApi.tabs.sendMessage(e.id,{action:ACTIONS.ShowMessage,payload:{text:"Unable to save page",type:"error"}})}const u=c&&c.length||d,g=u?CREATE_ARTICLE_QUERY:CREATE_ARTICLE_SAVING_REQUEST_QUERY,b={url:encodeURI(e.url)};u&&(b.preparedDocument={document:c,pageInfo:l},b.uploadFileId=d&&d.id||null);const A=JSON.stringify({query:g,variables:{input:b}});o.open("POST",s+"graphql",!0),a(o),o.send(A)}))}async function c(e){const t=await o(e+"_saveInProgress");if(!t)return;clearInterval(t);const s=await o(e+"_saveInProgressTimeoutId_"+t);s&&clearTimeout(s)}function p(e){function t(t,s){browserApi.tabs.get(e,(e=>{"complete"!==e.status?(browserApi.tabs.sendMessage(e.id,{action:ACTIONS.ShowMessage,payload:{type:"loading",text:"Page loading..."}}),s&&"function"==typeof s&&s()):(t&&"function"==typeof t&&t(),l(e))}))}c(e),t(null,(()=>{!function(e,t,s,o=1e3,n=10500){const r=setInterval(e,o),a=setTimeout((()=>{clearInterval(r),t()}),n);s&&"function"==typeof s&&s(r,a)}((()=>{t((()=>{c(e)}))}),(()=>{c(e),browserApi.tabs.get(e,(e=>{l(e)}))}),((t,s)=>{const o={};o[e+"_saveInProgress"]=t,o[e+"_saveInProgressTimeoutId_"+t]=s,n(o)}))}))}function d(r){return o("postInstallClickComplete").then((async o=>{if(o)return!0;if("undefined"!=typeof browser&&browser.runtime&&browser.runtime.sendNativeMessage){const t=await browser.runtime.sendNativeMessage("omnivore",{message:ACTIONS.GetAuthToken});t.authToken&&(e=t.authToken)}return new Promise((e=>{const o=new XMLHttpRequest;o.onreadystatechange=function(){if(4===o.readyState&&200===o.status){const{data:s}=JSON.parse(o.response);s.me?(n({postInstallClickComplete:!0}),e(!0)):(browserApi.tabs.sendMessage(r,{action:ACTIONS.ShowMessage,payload:{type:"loading",text:"Loading..."}}),browserApi.tabs.sendMessage(r,{action:ACTIONS.ShowMessage,payload:{text:"",type:"error",errorCode:401,url:t}}),e(null))}};const i=JSON.stringify({query:"{me{id}}"});o.open("POST",s+"graphql",!0),a(o),o.send(i)}))}))}function u(e,t){let s="/images/toolbar/icon";if(ENV_IS_FIREFOX?s+="_firefox":ENV_IS_EDGE&&(s+="_edge"),e||(s+="_inactive"),("boolean"==typeof t?t:window.matchMedia("(prefers-color-scheme: dark)").matches)&&(s+="_dark"),ENV_IS_FIREFOX)return s+".svg";const o=["16","24","32","48"];ENV_IS_EDGE||o.push("19","38");const n={};for(let e=0;e{!function t(){browserApi.tabs.get(e,(function(e){browserApi.runtime.lastError&&setTimeout(t,150),b(e)}))}()})),browserApi.tabs.onUpdated.addListener(((e,t,s)=>{t.status&&s&&s.active&&b(s)})),browserApi.tabs.onRemoved.addListener((e=>{!function(e){new Promise((e=>{browserApi.storage.local.get(null,(t=>{e(t||{})}))})).then((function(t){const s=[],o=Object.keys(t),n=e+"_saveInProgress";for(let e=0;e{browserApi.tabs.query({active:!0,currentWindow:!0},(function(t){e(t[0]||null)}))})).then((e=>{browserApi.tabs.sendMessage(e.id,{action:ACTIONS.Ping},(async function(t){if(t&&t.pong)await d(e.id)&&p(e.id);else{const t=browserApi.runtime.getManifest().content_scripts,s=[...t[0].js,...t[1].js];!function(t,s,o){function n(e,t,s){return function(){browserScriptingApi.executeScript(e,t,s)}}let r=async function(){await d(e.id)&&p(e.id)};for(let e=s.length-1;e>=0;--e)r=n(t,{file:s[e]},r);null!==r&&r()}(e.id,s)}}))}))})),browserApi.runtime.onMessage.addListener(((e,t,s)=>{if(e.forwardToTab)return delete e.forwardToTab,void browserApi.tabs.sendRequest(t.tab.id,e);e.action===ACTIONS.RefreshDarkMode&&g(t.tab.id,e.payload.value)})),browserActionApi.setIcon({path:u(!0)})})(); \ No newline at end of file +(()=>{"use strict";let e;const t="https://omnivore.app",s="https://omnivore.app/api/";function n(e){return new Promise((t=>{browserApi.storage.local.get(e,(s=>{const n=s&&s[e]||null;t(n)}))}))}function o(e){return new Promise((t=>{browserApi.storage.local.set(e,t)}))}function r(e){return new Promise((t=>{browserApi.storage.local.remove(e,t)}))}function a(t){t.setRequestHeader("Content-Type","application/json"),e&&t.setRequestHeader("Authorization",e)}function i(){n("postInstallClickComplete").then((e=>{e&&r("postInstallClickComplete")}))}function c(e,s){if(4===s.readyState)if(200===s.status){const{data:n}=JSON.parse(s.response);if("createArticle"in n)if("errorCodes"in n.createArticle){const s={text:descriptions[n.createArticle.errorCodes[0]]||"Unable to save page",type:"error"};"UNAUTHORIZED"===n.createArticle.errorCodes[0]&&(s.errorCode=401,s.url=t,i()),browserApi.tabs.sendMessage(e.id,{action:ACTIONS.ShowMessage,payload:s})}else{const s=n.createArticle.createdArticle,o=n.createArticle.user,r=t+(s.hasContent?`/${o.profile.username}/`+s.slug:"/home");browserApi.tabs.sendMessage(e.id,{action:ACTIONS.ShowMessage,payload:{text:"Saved to Omnivore",link:r,linkText:"View",type:"success"}})}else if("errorCodes"in n.createArticleSavingRequest)browserApi.tabs.sendMessage(e.id,{action:ACTIONS.ShowMessage,payload:{text:descriptions[n.createArticleSavingRequest.errorCodes[0]]||"Unable to save page",type:"error"}});else{const s=n.createArticleSavingRequest.articleSavingRequest,o=t+"/article/sr/"+s.id;browserApi.tabs.sendMessage(e.id,{action:ACTIONS.ShowMessage,payload:{text:"Saved to Omnivore",link:o,linkText:"View",type:"success"}})}}else 400===s.status&&browserApi.tabs.sendMessage(e.id,{action:ACTIONS.ShowMessage,payload:{text:"Unable to save page",type:"error"}})}function l(e){browserApi.tabs.sendMessage(e.id,{action:ACTIONS.ShowMessage,payload:{type:"loading",text:"Saving..."}});const n=new XMLHttpRequest;n.onreadystatechange=function(){4===n.readyState&&c(e,n)},browserApi.tabs.sendMessage(e.id,{action:ACTIONS.GetContent},(async o=>{if(!o||"object"!=typeof o)return;const{type:r,pageInfo:c,doc:l,uploadContentObjUrl:p}=o;let d=null;switch(r){case"pdf":if(d=await function(e,n,o,r){return new Promise((c=>{const l=new XMLHttpRequest;l.onreadystatechange=async function(){if(4===l.readyState){if(200===l.status){const{data:s}=JSON.parse(l.response);if("errorCodes"in s.uploadFileRequest&&"UNAUTHORIZED"===s.uploadFileRequest.errorCodes[0]&&(i(),browserApi.tabs.sendMessage(e.id,{action:ACTIONS.ShowMessage,payload:{text:"Unable to save page",type:"error",errorCode:401,url:t}})),s.uploadFileRequest&&s.uploadFileRequest.id&&!("errorCodes"in s.uploadFileRequest)){const e=await function({id:e,uploadSignedUrl:t},s,n){return fetch(n).then((e=>e.blob())).then((n=>new Promise((o=>{const r=new XMLHttpRequest;r.open("PUT",t,!0),r.setRequestHeader("Content-Type",s),r.onerror=()=>{o(null)},r.onload=()=>{o({id:e})},r.send(n)})))).catch((e=>{console.error("error uploading file",e)}))}(s.uploadFileRequest,o,r);return URL.revokeObjectURL(r),c(e)}browserApi.tabs.sendMessage(e.id,{action:ACTIONS.ShowMessage,payload:{text:"Unable to save page",type:"error"}})}else 400===l.status&&browserApi.tabs.sendMessage(e.id,{action:ACTIONS.ShowMessage,payload:{text:"Unable to save page",type:"error"}});c(!1)}};const p=JSON.stringify({query:"mutation UploadFileRequest($input: UploadFileRequestInput!) {\n uploadFileRequest(input:$input) {\n ... on UploadFileRequestError {\n errorCodes\n }\n ... on UploadFileRequestSuccess {\n id\n uploadSignedUrl\n }\n }\n }",variables:{input:{url:n,contentType:o}}});l.open("POST",s+"graphql",!0),a(l),l.send(p)}))}(e,encodeURI(e.url),c.contentType,p),!d||!d.id)return void browserApi.tabs.sendMessage(e.id,{action:ACTIONS.ShowMessage,payload:{text:"Unable to save page",type:"error"}})}const u=l&&l.length||d,g=u?CREATE_ARTICLE_QUERY:CREATE_ARTICLE_SAVING_REQUEST_QUERY,b={url:encodeURI(e.url)};u&&(b.preparedDocument={document:l,pageInfo:c},b.uploadFileId=d&&d.id||null);const f=JSON.stringify({query:g,variables:{input:b}});n.open("POST",s+"graphql",!0),a(n),n.send(f)}))}async function p(e){const t=await n(e+"_saveInProgress");if(!t)return;clearInterval(t);const s=await n(e+"_saveInProgressTimeoutId_"+t);s&&clearTimeout(s)}function d(r){return n("postInstallClickComplete").then((async n=>{if(n)return!0;if("undefined"!=typeof browser&&browser.runtime&&browser.runtime.sendNativeMessage){const t=await browser.runtime.sendNativeMessage("omnivore",{message:ACTIONS.GetAuthToken});t.authToken&&(e=t.authToken)}return new Promise((e=>{const n=new XMLHttpRequest;n.onreadystatechange=function(){if(4===n.readyState&&200===n.status){const{data:s}=JSON.parse(n.response);s.me?(o({postInstallClickComplete:!0}),e(!0)):(browserApi.tabs.sendMessage(r,{action:ACTIONS.ShowMessage,payload:{type:"loading",text:"Loading..."}}),browserApi.tabs.sendMessage(r,{action:ACTIONS.ShowMessage,payload:{text:"",type:"error",errorCode:401,url:t}}),e(null))}};const i=JSON.stringify({query:"{me{id}}"});n.open("POST",s+"graphql",!0),a(n),n.send(i)}))}))}function u(e){new Promise((e=>{browserApi.tabs.query({active:!0,currentWindow:!0},(function(t){e(t[0]||null)}))})).then((t=>{browserApi.tabs.sendMessage(t.id,{action:ACTIONS.Ping},(async function(s){if(s&&s.pong)await d(t.id)&&e(t);else{const s=browserApi.runtime.getManifest().content_scripts,n=[...s[0].js,...s[1].js];!function(s,n,o){function r(e,t,s){return function(){browserScriptingApi.executeScript(e,t,s)}}let a=async function(){await d(t.id)&&e(t)};for(let e=n.length-1;e>=0;--e)a=r(s,{file:n[e]},a);null!==a&&a()}(t.id,n)}}))}))}function g(e,t){let s="/images/toolbar/icon";if(ENV_IS_FIREFOX?s+="_firefox":ENV_IS_EDGE&&(s+="_edge"),e||(s+="_inactive"),("boolean"==typeof t?t:window.matchMedia("(prefers-color-scheme: dark)").matches)&&(s+="_dark"),ENV_IS_FIREFOX)return s+".svg";const n=["16","24","32","48"];ENV_IS_EDGE||n.push("19","38");const o={};for(let e=0;e{!function t(){browserApi.tabs.get(e,(function(e){browserApi.runtime.lastError&&setTimeout(t,150),f(e)}))}()})),browserApi.tabs.onUpdated.addListener(((e,t,s)=>{t.status&&s&&s.active&&f(s)})),browserApi.tabs.onRemoved.addListener((e=>{!function(e){new Promise((e=>{browserApi.storage.local.get(null,(t=>{e(t||{})}))})).then((function(t){const s=[],n=Object.keys(t),o=e+"_saveInProgress";for(let e=0;e{"complete"!==e.status?(browserApi.tabs.sendMessage(e.id,{action:ACTIONS.ShowMessage,payload:{type:"loading",text:"Page loading..."}}),s&&"function"==typeof s&&s()):(t&&"function"==typeof t&&t(),l(e))}))}p(e),t(null,(()=>{!function(e,t,s,n=1e3,o=10500){const r=setInterval(e,n),a=setTimeout((()=>{clearInterval(r),t()}),o);s&&"function"==typeof s&&s(r,a)}((()=>{t((()=>{p(e)}))}),(()=>{p(e),browserApi.tabs.get(e,(e=>{l(e)}))}),((t,s)=>{const n={};n[e+"_saveInProgress"]=t,n[e+"_saveInProgressTimeoutId_"+t]=s,o(n)}))}))}(e.id)}))})),browserApi.runtime.onMessage.addListener(((e,t,s)=>{if(e.forwardToTab)return delete e.forwardToTab,void browserApi.tabs.sendRequest(t.tab.id,e);e.action===ACTIONS.RefreshDarkMode&&b(t.tab.id,e.payload.value)})),browserActionApi.setIcon({path:g(!0)}),browserApi.contextMenus.create({id:"log-selection",title:"Save to Omnivore",contexts:["link"],onclick:async function(e){u((async function(t){await async function(e,t){return browserApi.tabs.sendMessage(e.id,{action:ACTIONS.ShowMessage,payload:{type:"loading",text:"Saving..."}}),new Promise(((n,o)=>{const r=new XMLHttpRequest;r.open("POST",s+"graphql",!0),a(r),r.onerror=e=>{n(null)},r.onload=t=>{try{c(e,r)}catch(e){console.log("response error",e)}n({})};const i=JSON.stringify({query:CREATE_ARTICLE_SAVING_REQUEST_QUERY,variables:{input:{url:t}}});r.send(i)})).catch((e=>{console.error("error saving url",e)}))}(t,e.linkUrl)}))}})})(); \ No newline at end of file diff --git a/packages/api/src/resolvers/upload_files/index.ts b/packages/api/src/resolvers/upload_files/index.ts index d6c9684e5..b21945c30 100644 --- a/packages/api/src/resolvers/upload_files/index.ts +++ b/packages/api/src/resolvers/upload_files/index.ts @@ -163,6 +163,7 @@ export const uploadFileRequestResolver: ResolverFn< } } + console.log("createdPageId", createdPageId) return { id: uploadFileData.id, uploadSignedUrl, diff --git a/packages/api/src/services/save_file.ts b/packages/api/src/services/save_file.ts index c7248ef44..da3e32f4f 100644 --- a/packages/api/src/services/save_file.ts +++ b/packages/api/src/services/save_file.ts @@ -23,13 +23,11 @@ export const saveFile = async ( ): Promise => { console.log('saving file with input', input) - // /* We do not trust the values from client, lookup upload file by querying - // * with filtering on user ID and URL to verify client's uploadFileId is valid. - // */ const uploadFile = await ctx.models.uploadFile.getWhere({ id: input.uploadFileId, userId: saver.id, }) + if (!uploadFile) { return { errorCodes: [SaveErrorCode.Unauthorized], @@ -45,64 +43,6 @@ export const saveFile = async ( return ctx.models.uploadFile.setFileUploadComplete(input.uploadFileId, tx) }) - // if (!uploadFileData || !uploadFileData.id || !uploadFileData.fileName) { - // console.log('error completing upload file request', input) - // return { - // errorCodes: [SaveErrorCode.Unknown], - // } - // } - - // // const uploadFileUrlOverride = await makeStorageFilePublic( - // // uploadFileData.id, - // // uploadFileData.fileName - // // ) - - // const matchedUserArticleRecord = await getPageByParam({ - // userId: saver.id, - // url: uploadFileData.url, - // state: ArticleSavingRequestStatus.Succeeded, - // }) - - // if (matchedUserArticleRecord) { - // await updatePage( - // matchedUserArticleRecord.id, - // { - // savedAt: new Date(), - // archivedAt: null, - // }, - // ctx - // ) - // input.clientRequestId = matchedUserArticleRecord.id - // } else { - // const pageId = await createPage( - // { - // url: uploadFile.url, - // title: uploadFile.fileName, - // hash: uploadFileDetails.md5Hash, - // content: '', - // pageType: PageType.File, - // uploadFileId: input.uploadFileId, - // slug: generateSlug(uploadFile.fileName), - // userId: saver.id, - // id: input.clientRequestId, - // createdAt: new Date(), - // savedAt: new Date(), - // readingProgressPercent: 0, - // readingProgressAnchorIndex: 0, - // state: ArticleSavingRequestStatus.Succeeded, - // }, - // ctx - // ) - - // if (!pageId) { - // console.log('error creating page in elastic', input) - // return { - // errorCodes: [SaveErrorCode.Unknown], - // } - // } - // input.clientRequestId = pageId - // } - return { clientRequestId: input.clientRequestId, url: `${homePageURL()}/${saver.profile.username}/links/${ diff --git a/pkg/extension/package.json b/pkg/extension/package.json index 514aef5d5..47e06ea77 100644 --- a/pkg/extension/package.json +++ b/pkg/extension/package.json @@ -22,5 +22,8 @@ "webpack": "^5.11.1", "webpack-cli": "^4.3.1", "webpack-merge": "^5.7.3" + }, + "dependencies": { + "uuid": "^8.3.2" } } diff --git a/pkg/extension/src/scripts/background.js b/pkg/extension/src/scripts/background.js index 600c17c13..dade644d9 100644 --- a/pkg/extension/src/scripts/background.js +++ b/pkg/extension/src/scripts/background.js @@ -13,6 +13,8 @@ 'use strict'; +import { v4 as uuidv4 } from 'uuid'; + let authToken = undefined; const omnivoreURL = process.env.OMNIVORE_URL; const omnivoreGraphqlURL = process.env.OMNIVORE_GRAPHQL_URL; @@ -76,7 +78,7 @@ function uploadFile ({ id, uploadSignedUrl }, contentType, contentObjUrl) { xhr.setRequestHeader('Content-Type', contentType); xhr.onerror = () => { - resolve(null); + resolve(undefined); }; xhr.onload = () => { // Uploaded. @@ -91,14 +93,13 @@ function uploadFile ({ id, uploadSignedUrl }, contentType, contentObjUrl) { }); } -function savePdfFile (tab, url, contentType, contentObjUrl) { +function savePdfFile(tab, url, contentType, contentObjUrl) { return new Promise(resolve => { const xhr = new XMLHttpRequest(); xhr.onreadystatechange = async function () { if (xhr.readyState === 4) { if (xhr.status === 200) { const { data } = JSON.parse(xhr.response); - if ('errorCodes' in data.uploadFileRequest) { if (data.uploadFileRequest.errorCodes[0] === 'UNAUTHORIZED') { clearClickCompleteState(); @@ -114,7 +115,7 @@ function savePdfFile (tab, url, contentType, contentObjUrl) { } } - if (!data.uploadFileRequest || !data.uploadFileRequest.id || 'errorCodes' in data.uploadFileRequest) { + if (!data.uploadFileRequest || !data.uploadFileRequest.id || !data.uploadFileRequest.createdPageId || 'errorCodes' in data.uploadFileRequest) { browserApi.tabs.sendMessage(tab.id, { action: ACTIONS.ShowMessage, payload: { @@ -123,9 +124,26 @@ function savePdfFile (tab, url, contentType, contentObjUrl) { } }); } else { - const uploadFileId = await uploadFile(data.uploadFileRequest, contentType, contentObjUrl); + const result = await uploadFile(data.uploadFileRequest, contentType, contentObjUrl); URL.revokeObjectURL(contentObjUrl); - return resolve(uploadFileId); + + if (!result) { + return undefined + } + + const createdPageId = data.uploadFileRequest.createdPageId + const url = omnivoreURL + '/article/sr/' + createdPageId + + browserApi.tabs.sendMessage(tab.id, { + action: ACTIONS.ShowMessage, + payload: { + text: 'Saved to Omnivore', + link: url, + linkText: 'Read Now', + type: 'success' + } + }) + return resolve(data.uploadFileRequest); } } else if (xhr.status === 400) { browserApi.tabs.sendMessage(tab.id, { @@ -148,6 +166,7 @@ function savePdfFile (tab, url, contentType, contentObjUrl) { } ... on UploadFileRequestSuccess { id + createdPageId uploadSignedUrl } } @@ -155,7 +174,8 @@ function savePdfFile (tab, url, contentType, contentObjUrl) { variables: { input: { url, - contentType + contentType, + createPageEntry: true, } } }); @@ -175,65 +195,47 @@ function clearClickCompleteState () { }); } -function handleSaveResponse (tab, xhr) { +function handleSaveResponse(tab, field, xhr) { if (xhr.readyState === 4) { if (xhr.status === 200) { const { data } = JSON.parse(xhr.response); - if ('createArticle' in data) { - if ('errorCodes' in data.createArticle) { - const messagePayload = { - text: descriptions[data.createArticle.errorCodes[0]] || 'Unable to save page', - type: 'error' - }; - - if (data.createArticle.errorCodes[0] === 'UNAUTHORIZED') { - messagePayload.errorCode = 401; - messagePayload.url = omnivoreURL; - - clearClickCompleteState(); - } - - browserApi.tabs.sendMessage(tab.id, { - action: ACTIONS.ShowMessage, - payload: messagePayload - }); - } else { - const article = data.createArticle.createdArticle; - const user = data.createArticle.user; - const link = omnivoreURL + (article.hasContent ? (`/${user.profile.username}/` + article.slug) : '/home'); - browserApi.tabs.sendMessage(tab.id, { - action: ACTIONS.ShowMessage, - payload: { - text: 'Saved to Omnivore', - link: link, - linkText: 'View', - type: 'success' - } - }); - } - } else { - if ('errorCodes' in data.createArticleSavingRequest) { - browserApi.tabs.sendMessage(tab.id, { - action: ACTIONS.ShowMessage, - payload: { - text: descriptions[data.createArticleSavingRequest.errorCodes[0]] || 'Unable to save page', - type: 'error' - } - }); - } else { - const articleSavingRequest = data.createArticleSavingRequest.articleSavingRequest; - const link = omnivoreURL + '/article/sr/' + articleSavingRequest.id; - browserApi.tabs.sendMessage(tab.id, { - action: ACTIONS.ShowMessage, - payload: { - text: 'Saved to Omnivore', - link: link, - linkText: 'View', - type: 'success' - } - }); - } + const item = data[field] + if (!item) { + return undefined } + + if ('errorCodes' in item) { + const messagePayload = { + text: descriptions[data.createArticle.errorCodes[0]] || 'Unable to save page', + type: 'error' + } + + if (item.errorCodes[0] === 'UNAUTHORIZED') { + messagePayload.errorCode = 401 + messagePayload.url = omnivoreURL + clearClickCompleteState() + } + + browserApi.tabs.sendMessage(tab.id, { + action: ACTIONS.ShowMessage, + payload: messagePayload + }) + + return undefined + } + + const url = item['url'] + browserApi.tabs.sendMessage(tab.id, { + action: ACTIONS.ShowMessage, + payload: { + text: 'Saved to Omnivore', + link: url ?? omnivoreURL + '/home', + linkText: 'Read Now', + type: 'success' + } + }) + + return item } else if (xhr.status === 400) { browserApi.tabs.sendMessage(tab.id, { action: ACTIONS.ShowMessage, @@ -241,12 +243,22 @@ function handleSaveResponse (tab, xhr) { text: 'Unable to save page', type: 'error' } - }); + }) + return undefined } } } -async function saveUrl (currentTab, url) { +async function saveUrl(currentTab, url) { + const requestId = uuidv4() + await saveApiRequest(currentTab, SAVE_URL_QUERY, 'saveUrl', { + source: 'extension', + clientRequestId: requestId, + url: encodeURI(url), + }) +} + +async function saveApiRequest(currentTab, query, field, input) { browserApi.tabs.sendMessage(currentTab.id, { action: ACTIONS.ShowMessage, payload: { @@ -256,61 +268,47 @@ async function saveUrl (currentTab, url) { }); return new Promise((resolve, reject) => { - const xhr = new XMLHttpRequest(); - xhr.open('POST', omnivoreGraphqlURL + 'graphql', true); - setupConnection(xhr); - xhr.onerror = (err) => { - resolve(null); - }; - xhr.onload = (res) => { + const xhr = new XMLHttpRequest() + xhr.open('POST', omnivoreGraphqlURL + 'graphql', true) + setupConnection(xhr) + + xhr.onerror = (err) => { reject(err) } + + xhr.onload = () => { try { - handleSaveResponse(currentTab, xhr) + const res = handleSaveResponse(currentTab, field, xhr) + if (!res) { + return reject() + } + resolve(res); } catch (err) { - console.log('response error', err) + reject(err) } - resolve({}); - }; + } const data = JSON.stringify({ - query: CREATE_ARTICLE_SAVING_REQUEST_QUERY, + query, variables: { - input: { - url - } + input } - }); + }) xhr.send(data); }) .catch((err) => { - console.error('error saving url', err) + console.log('error saving page', err) + browserApi.tabs.sendMessage(currentTab.id, { + action: ACTIONS.ShowMessage, + payload: { + text: 'Unable to save page', + type: 'error', + } + }); return undefined }); } function saveArticle (tab) { - browserApi.tabs.sendMessage(tab.id, { - action: ACTIONS.ShowMessage, - payload: { - type: 'loading', - text: 'Saving...' - } - }); - - const xhr = new XMLHttpRequest(); - const descriptions = { - BAD_DATA: 'Unable to save page', - NOT_ALLOWED_TO_PARSE: 'Not allowed to parse this article', - UNAUTHORIZED: 'Please login to Omnivore to authorize this action', - UNABLE_TO_FETCH: 'Unable to fetch page', - PAYLOAD_TOO_LARGE: 'This article is too large' - }; - xhr.onreadystatechange = function () { - if (xhr.readyState === 4) { - handleSaveResponse(tab, xhr) - } - }; - browserApi.tabs.sendMessage(tab.id, { action: ACTIONS.GetContent }, async (response) => { @@ -319,56 +317,42 @@ function saveArticle (tab) { return; } + const requestId = uuidv4() const { type, pageInfo, doc, uploadContentObjUrl } = response; - let uploadResult = null; - switch(type) { - case 'pdf': { - // For PDFs, we first upload the PDF file before passing the upload file ID in createArticle - uploadResult = await savePdfFile(tab, encodeURI(tab.url), pageInfo.contentType, uploadContentObjUrl); - if (!uploadResult || !uploadResult.id) { - browserApi.tabs.sendMessage(tab.id, { - action: ACTIONS.ShowMessage, - payload: { - text: 'Unable to save page', - type: 'error' - } - }); - return; - } + case 'html': { + await saveApiRequest(tab, SAVE_PAGE_QUERY, 'savePage', { + source: 'extension', + clientRequestId: requestId, + originalContent: doc, + title: pageInfo.title, + url: encodeURI(tab.url), + }) + break } case 'url': { - // We don't have to special case URL, it will fall through - // and be handled when isContentAvailable returns false + await saveApiRequest(tab, SAVE_URL_QUERY, 'saveUrl', { + source: 'extension', + clientRequestId: requestId, + url: encodeURI(tab.url), + }) + break + } + case 'pdf': { + const uploadResult = await savePdfFile(tab, encodeURI(tab.url), pageInfo.contentType, uploadContentObjUrl); + if (!uploadResult || !uploadResult.id) { + // If the upload failed for any reason, try to save the PDF URL instead + await saveApiRequest(tab, SAVE_URL_QUERY, 'saveUrl', { + source: 'extension', + clientRequestId: requestId, + url: encodeURI(tab.url), + }) + return; + } + break } } - - const isContentAvailable = (doc && doc.length) || uploadResult; - const query = isContentAvailable ? CREATE_ARTICLE_QUERY : CREATE_ARTICLE_SAVING_REQUEST_QUERY; - const input = { - url: encodeURI(tab.url) - }; - - if (isContentAvailable) { - input.preparedDocument = { - document: doc, - pageInfo - }; - input.uploadFileId = (uploadResult && uploadResult.id) || null; - } - - const data = JSON.stringify({ - query, - variables: { - input - } - }); - - xhr.open('POST', omnivoreGraphqlURL + 'graphql', true); - setupConnection(xhr); - - xhr.send(data); }); } @@ -700,7 +684,7 @@ function init () { }); browserApi.contextMenus.create({ - id: "log-selection", + id: "save-selection", title: "Save to Omnivore", contexts: ["link"], onclick: async function(obj) { diff --git a/pkg/extension/src/scripts/constants.js b/pkg/extension/src/scripts/constants.js index 596447c31..4d169fdcf 100644 --- a/pkg/extension/src/scripts/constants.js +++ b/pkg/extension/src/scripts/constants.js @@ -30,6 +30,39 @@ window.DONT_REMOVE_ELEMENTS = [ 'title' ]; +window.SAVE_URL_QUERY = `mutation SaveUrl ($input: SaveUrlInput!) { + saveUrl(input:$input){ + ... on SaveSuccess { + url + } + ... on SaveError { + errorCodes + } + } +}` + +window.SAVE_FILE_QUERY = `mutation SaveFile ($input: SaveFileInput!) { + saveFile(input:$input){ + ... on SaveSuccess { + url + } + ... on SaveError { + errorCodes + } + } +}` + +window.SAVE_PAGE_QUERY = `mutation SavePage ($input: SavePageInput!) { + savePage(input:$input){ + ... on SaveSuccess { + url + } + ... on SaveError { + errorCodes + } + } +}` + window.CREATE_ARTICLE_QUERY = `mutation CreateArticle ($input: CreateArticleInput!){ createArticle(input:$input){ ... on CreateArticleSuccess{ diff --git a/pkg/extension/yarn.lock b/pkg/extension/yarn.lock index aab637b0b..0af7516c1 100644 --- a/pkg/extension/yarn.lock +++ b/pkg/extension/yarn.lock @@ -4655,7 +4655,7 @@ uuid@^3.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== -uuid@^8.3.0: +uuid@^8.3.0, uuid@^8.3.2: version "8.3.2" resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== diff --git a/yarn.lock b/yarn.lock index 45ca87bfb..9412790f6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7678,6 +7678,13 @@ dependencies: "@types/node" "*" +"@types/graphql-fields@^1.3.4": + version "1.3.4" + resolved "https://registry.yarnpkg.com/@types/graphql-fields/-/graphql-fields-1.3.4.tgz#868ffe444ba8027ea1eccb0909f9c331d1bd620a" + integrity sha512-McLJaAaqY7lk9d9y7E61iQrj0AwcEjSb8uHlPh7KgYV+XX1MSLlSt/alhd5k2BPRE8gy/f4lnkLGb5ke3iG66Q== + dependencies: + graphql "^15.3.0" + "@types/hast@^2.0.0": version "2.3.4" resolved "https://registry.yarnpkg.com/@types/hast/-/hast-2.3.4.tgz#8aa5ef92c117d20d974a82bdfb6a648b08c0bafc" @@ -14649,6 +14656,11 @@ graphql-config@^4.1.0: minimatch "3.0.4" string-env-interpolation "1.0.1" +graphql-fields@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/graphql-fields/-/graphql-fields-2.0.3.tgz#5e68dff7afbb202be4f4f40623e983b22c96ab8f" + integrity sha512-x3VE5lUcR4XCOxPIqaO4CE+bTK8u6gVouOdpQX9+EKHr+scqtK5Pp/l8nIGqIpN1TUlkKE6jDCCycm/WtLRAwA== + graphql-middleware@^6.0.10: version "6.1.4" resolved "https://registry.yarnpkg.com/graphql-middleware/-/graphql-middleware-6.1.4.tgz#1b4dd66195477046282acc8937cb5fca32b6bfd5"