⚡️⚡️⚡️ Self-hosted collaborative bookmark manager to collect, read, annotate, and fully preserve what matters, all in one place.
TypeScript bookmarkbookmark-managercollaborationnextjsreact-nativeread-it-laterself-hostedtypescript
fix(extension): fix #1643
daniel31x1301c1587d151e
diff --git a/apps/extension/manifest.config.ts b/apps/extension/manifest.config.tsindex 07a5325c..97ef1810 100644--- a/apps/extension/manifest.config.ts+++ b/apps/extension/manifest.config.ts@@ -56,7 +56,7 @@ const targets: Record<ManifestTarget, TargetOptions> = {* into `version.xcconfig`, which the Xcode project reads as its base* configuration. Bump it here and nowhere else.*/-export const version = "1.5.5";+export const version = "1.5.6";const icons = {"16": "16.png",diff --git a/apps/extension/src/@/components/BookmarkForm.tsx b/apps/extension/src/@/components/BookmarkForm.tsxindex d5dbb2ab..32422816 100644--- a/apps/extension/src/@/components/BookmarkForm.tsx+++ b/apps/extension/src/@/components/BookmarkForm.tsx@@ -107,9 +107,7 @@ const BookmarkForm = () => {},onSuccess: () => {// Update badge to show link is saved- getCurrentTabInfo().then(({ id }) => {- updateBadge(id);- });+ updateBadge(tabInfo?.id, true);setTimeout(() => {window.close();// I want to show some confirmation before it's closed...@@ -130,8 +128,6 @@ const BookmarkForm = () => {setTabInfo(t);setConfig(c);- updateBadge(t.id);-form.setValue("url", t.url ? t.url : "");form.setValue("name", t.title ? t.title : "");form.setValue("collection", {@@ -139,9 +135,13 @@ const BookmarkForm = () => {});const configured = await getIsConfigured();- const duplicate = await checkLinkExists(c.baseUrl, c.apiKey);- setIsDuplicate(duplicate);setIsConfigured(configured);++ if (!configured) return;++ const duplicate = await checkLinkExists(c.baseUrl, c.apiKey, t.url);+ setIsDuplicate(duplicate);+ updateBadge(t.id, duplicate);};setTabInformation();diff --git a/apps/extension/src/@/lib/actions/links.ts b/apps/extension/src/@/lib/actions/links.tsindex 40d0148a..5972a512 100644--- a/apps/extension/src/@/lib/actions/links.ts+++ b/apps/extension/src/@/lib/actions/links.ts@@ -1,22 +1,21 @@-import captureScreenshot from '../screenshot.ts';-import { bookmarkFormValues } from '../validators/bookmarkForm.ts';-import axios from 'axios';+import captureScreenshot from "../screenshot.ts";+import { bookmarkFormValues } from "../validators/bookmarkForm.ts";+import axios from "axios";// import { bookmarkMetadata } from '../cache.ts';-import { getCurrentTabInfo } from '../utils.ts';export async function postLink(baseUrl: string,uploadImage: boolean,data: bookmarkFormValues,- setState: (state: 'capturing' | 'uploading' | null) => void,+ setState: (state: "capturing" | "uploading" | null) => void,apiKey: string) {const url = `${baseUrl}/api/v1/links`;if (uploadImage) {- setState('capturing');+ setState("capturing");const screenshot = await captureScreenshot();- setState('uploading');+ setState("uploading");const link = await axios.post(url, data, {headers: {@@ -28,11 +27,11 @@ export async function postLink(const archiveUrl = `${baseUrl}/api/v1/archives/${id}?format=0`;const formData = new FormData();- formData.append('file', screenshot, 'screenshot.png');+ formData.append("file", screenshot, "screenshot.png");await axios.post(archiveUrl, formData, {headers: {- 'Content-Type': 'multipart/form-data',+ "Content-Type": "multipart/form-data",Authorization: `Bearer ${apiKey}`,},});@@ -43,7 +42,7 @@ export async function postLink(} else {return await axios.post(url, data, {headers: {- 'Content-Type': 'application/json',+ "Content-Type": "application/json",Authorization: `Bearer ${apiKey}`,},});@@ -58,10 +57,10 @@ export async function postLinkFetch(const url = `${baseUrl}/api/v1/links`;return await fetch(url, {- method: 'POST',+ method: "POST",body: JSON.stringify(data),headers: {- 'Content-Type': 'application/json',+ "Content-Type": "application/json",Authorization: `Bearer ${apiKey}`,},});@@ -76,10 +75,10 @@ export async function updateLinkFetch(const url = `${baseUrl}/api/v1/links/${id}`;return await fetch(url, {- method: 'PUT',+ method: "PUT",body: JSON.stringify(data),headers: {- 'Content-Type': 'application/json',+ "Content-Type": "application/json",Authorization: `Bearer ${apiKey}`,},});@@ -93,7 +92,7 @@ export async function deleteLinkFetch(const url = `${baseUrl}/api/v1/links/${id}`;return await fetch(url, {- method: 'DELETE',+ method: "DELETE",headers: {Authorization: `Bearer ${apiKey}`,},@@ -115,27 +114,29 @@ export async function deleteLinkFetch(export async function checkLinkExists(baseUrl: string,- apiKey: string+ apiKey: string,+ linkUrl: string | undefined): Promise<boolean> {- const tabInfo = await getCurrentTabInfo();- if (!tabInfo.url) {- console.error('No URL found for current tab');+ if (!baseUrl || !apiKey || !linkUrl) {return false;}const url =`${baseUrl}/api/v1/search?sort=0&searchQueryString=` +- encodeURIComponent(`url:${tabInfo.url}`);-- const response = await fetch(url, {- headers: {- Authorization: `Bearer ${apiKey}`,- },- });+ encodeURIComponent(`url:${linkUrl}`);- const { data } = await response.json();+ try {+ const response = await fetch(url, {+ headers: {+ Authorization: `Bearer ${apiKey}`,+ },+ });- const exists = !!data && data.links?.length > 0;+ const { data } = await response.json();- return exists;+ return !!data && data.links?.length > 0;+ } catch (error) {+ console.error(error);+ return false;+ }}diff --git a/apps/extension/src/@/lib/utils.ts b/apps/extension/src/@/lib/utils.tsindex dce2307f..dda7075d 100644--- a/apps/extension/src/@/lib/utils.ts+++ b/apps/extension/src/@/lib/utils.ts@@ -1,7 +1,5 @@-import { type ClassValue, clsx } from 'clsx';-import { twMerge } from 'tailwind-merge';-import { checkLinkExists } from './actions/links.ts';-import { getConfig } from './config.ts';+import { type ClassValue, clsx } from "clsx";+import { twMerge } from "tailwind-merge";export function cn(...inputs: ClassValue[]) {return twMerge(clsx(inputs));@@ -32,11 +30,11 @@ export async function getCurrentTabInfo(): Promise<{export function getBrowser(): typeof chrome {// eslint-disable-next-line @typescript-eslint/ban-ts-comment//@ts-ignore- return typeof browser !== 'undefined' ? browser : chrome;+ return typeof browser !== "undefined" ? browser : chrome;}export function getChromeStorage() {- return typeof chrome !== 'undefined' && !!chrome.storage;+ return typeof chrome !== "undefined" && !!chrome.storage;}export async function getStorageItem(key: string): Promise<string | undefined> {@@ -60,7 +58,7 @@ export async function setStorageItem(key: string, value: string) {export function isSafari(): boolean {try {- return /^safari-web-extension:/.test(getBrowser().runtime.getURL(''));+ return /^safari-web-extension:/.test(getBrowser().runtime.getURL(""));} catch {return false;}@@ -69,38 +67,27 @@ export function isSafari(): boolean {export function hasAPI(api: string): boolean {const b = getBrowser();let obj: any = b;- for (const part of api.split('.')) {- if (!obj || typeof obj[part] === 'undefined') return false;+ for (const part of api.split(".")) {+ if (!obj || typeof obj[part] === "undefined") return false;obj = obj[part];}return true;}-export async function updateBadge(tabId: number | undefined) {+export async function updateBadge(+ tabId: number | undefined,+ linkExists: boolean+) {if (!tabId) return;const browser = getBrowser();- const cachedConfig = await getConfig();- const linkExists = await checkLinkExists(- cachedConfig.baseUrl,- cachedConfig.apiKey- );+ const action = browser.action ?? browser.browserAction;+ if (!action) return;+if (linkExists) {- if (browser.action) {- browser.action.setBadgeText({ tabId, text: '✓' });- browser.action.setBadgeBackgroundColor({ tabId, color: '#98c0ff' });- } else {- browser.browserAction.setBadgeText({ tabId, text: '✓' });- browser.browserAction.setBadgeBackgroundColor({- tabId,- color: '#98c0ff',- });- }+ action.setBadgeText({ tabId, text: "✓" });+ action.setBadgeBackgroundColor({ tabId, color: "#98c0ff" });} else {- if (browser.action) {- browser.action.setBadgeText({ tabId, text: '' });- } else {- browser.browserAction.setBadgeText({ tabId, text: '' });- }+ action.setBadgeText({ tabId, text: "" });}}diff --git a/apps/extension/src/pages/Background/index.ts b/apps/extension/src/pages/Background/index.tsindex e8ee3e71..40ad3b49 100644--- a/apps/extension/src/pages/Background/index.ts+++ b/apps/extension/src/pages/Background/index.ts@@ -4,14 +4,14 @@ import {hasAPI,isSafari,updateBadge,-} from '../../@/lib/utils.ts';+} from "../../@/lib/utils.ts";// import BookmarkTreeNode = chrome.bookmarks.BookmarkTreeNode;-import { getConfig, isConfigured } from '../../@/lib/config.ts';+import { getConfig, isConfigured } from "../../@/lib/config.ts";import {// deleteLinkFetch,// updateLinkFetch,postLinkFetch,-} from '../../@/lib/actions/links.ts';+} from "../../@/lib/actions/links.ts";import {bookmarkMetadata,// deleteBookmarkMetadata,@@ -19,7 +19,7 @@ import {// getBookmarkMetadataByUrl,getBookmarksMetadata,saveBookmarkMetadata,-} from '../../@/lib/cache.ts';+} from "../../@/lib/cache.ts";import OnClickData = chrome.contextMenus.OnClickData;// @types/chrome models these as TS enums, but the runtime APIs take and hand@@ -211,15 +211,15 @@ async function genericOnClick(return;}switch (info.menuItemId) {- case 'save-all-tabs': {+ case "save-all-tabs": {const tabs = await browser.tabs.query({ currentWindow: true });const config = await getConfig();for (const tab of tabs) {if (tab.url &&- !tab.url.startsWith('chrome://') &&- !tab.url.startsWith('about:')+ !tab.url.startsWith("chrome://") &&+ !tab.url.startsWith("about:")) {try {if (new URL(tab.url))@@ -227,8 +227,8 @@ async function genericOnClick(config.baseUrl,{url: tab.url,- name: tab.title || '',- description: tab.title || '',+ name: tab.title || "",+ description: tab.title || "",collection: {name: config.defaultCollection,},@@ -245,9 +245,9 @@ async function genericOnClick(}default:// Handle cases where sync is enabled or not- if (syncBookmarks && hasAPI('bookmarks.create')) {+ if (syncBookmarks && hasAPI("bookmarks.create")) {browser.bookmarks.create({- parentId: '1',+ parentId: "1",title: tab.title,url: tab.url,});@@ -260,7 +260,7 @@ async function genericOnClick({url: tab.url,collection: {- name: 'Unorganized',+ name: "Unorganized",},tags: [],name: tab.title,@@ -283,10 +283,10 @@ async function genericOnClick(browser.runtime.onInstalled.addListener(async function () {// Create one test item for each context type.const contexts: ContextType[] = isSafari()- ? ['page', 'selection', 'link']- : ['page', 'selection', 'link', 'editable', 'image', 'video', 'audio'];+ ? ["page", "selection", "link"]+ : ["page", "selection", "link", "editable", "image", "video", "audio"];for (const context of contexts) {- const title: string = 'Add link to Linkwarden';+ const title: string = "Add link to Linkwarden";browser.contextMenus.create({title: title,contexts: [context],@@ -294,65 +294,29 @@ browser.runtime.onInstalled.addListener(async function () {});}browser.contextMenus.create({- id: 'save-all-tabs',- title: 'Save all tabs to Linkwarden',- contexts: ['page'],+ id: "save-all-tabs",+ title: "Save all tabs to Linkwarden",+ contexts: ["page"],});-- const { id: tabId } = await getCurrentTabInfo();- await updateBadge(tabId);-});--browser.tabs.onActivated.addListener(async ({ tabId }) => {- try {- await updateBadge(tabId);- } catch (error) {- console.error(`Error checking tab ${tabId} on activation:`, error);- }-});--browser.tabs.onUpdated.addListener(async (tabId) => {- try {- await updateBadge(tabId);- } catch (error) {- console.error(`Error checking tab ${tabId} on activation:`, error);- }});-// Listen for URL changes (navigation, page loads)-browser.tabs.onUpdated.addListener(async (tabId, changeInfo, tab) => {+browser.tabs.onUpdated.addListener(async (tabId: any, changeInfo: any) => {+ if (!changeInfo.url) return;try {- if (changeInfo.status === 'complete' && tab?.active) {- await updateBadge(tabId);- }+ await updateBadge(tabId, false);} catch (error) {- console.error(`Error checking tab ${tabId} on update:`, error);+ console.error(`Error clearing the badge of tab ${tabId}:`, error);}});-// On extension startup - check current tab-(async () => {- try {- const [tab] = await browser.tabs.query({- active: true,- currentWindow: true,- });- if (tab?.id) {- await updateBadge(tab.id);- }- } catch (error) {- console.error(`Error checking tab on startup:`, error);- }-})();-// Omnibox implementation (not available in Safari)-if (hasAPI('omnibox.onInputStarted')) {+if (hasAPI("omnibox.onInputStarted")) {browser.omnibox.onInputStarted.addListener(async () => {const configured = await isConfigured();const description = configured- ? 'Search links in linkwarden'- : 'Please configure the extension first';+ ? "Search links in linkwarden"+ : "Please configure the extension first";browser.omnibox.setDefaultSuggestion({description: description,@@ -400,23 +364,23 @@ if (hasAPI('omnibox.onInputStarted')) {// Edge doesn't allow updating the New Tab Page (tested with version 117).// Trying to do so will throw: "Error: Cannot update NTP tab."// As a workaround, open a new tab instead.- if (disposition === 'currentTab') {+ if (disposition === "currentTab") {const tabInfo = await getCurrentTabInfo();- if (tabInfo.url === 'edge://newtab/') {- disposition = 'newForegroundTab';+ if (tabInfo.url === "edge://newtab/") {+ disposition = "newForegroundTab";}}switch (disposition) {- case 'currentTab':+ case "currentTab":// eslint-disable-next-line @typescript-eslint/ban-ts-comment// @ts-ignoreawait browser.tabs.update({ url });break;- case 'newForegroundTab':+ case "newForegroundTab":await browser.tabs.create({ url });break;- case 'newBackgroundTab':+ case "newBackgroundTab":await browser.tabs.create({ url, active: false });break;}