refactor: continue decoupling from chatgpt

Author: L-a-r-t

src/api/chatgpt/getConversation.ts

@@ -18,7 +18,7 @@ export const getConversation = async ({
     )
     const data = await res.json()
 
-    return data as Conversation
+    return data as Conversation["chatgpt"]
   } catch (err) {
     console.error(err)
 

src/api/chatgpt/getConversationTextdocs.ts

@@ -1,16 +1,15 @@
+import type { Conversation, ConversationTextdocs } from "~utils/types"
 import type {
   CanvasHistoryResponse,
-  CanvasMessageMetadata,
-  Conversation,
-  ConversationTextdocs
-} from "~utils/types"
+  CanvasMessageMetadata
+} from "~utils/types/chatgpt"
 
 export const getConversationTextdocs = async ({
   conv,
   headers,
   includeVersions
 }: {
-  conv: Conversation
+  conv: Conversation["chatgpt"]
   headers: any
   includeVersions?: boolean
 }) => {

src/api/getConversationTextdocs.ts

@@ -21,7 +21,7 @@ type Params =
   | {
       model: "chatgpt"
       params: {
-        rawConversation: Conversation
+        rawConversation: Conversation["chatgpt"]
         headers: any
         includeVersions?: boolean
       }

src/background/functions/save.ts

@@ -47,24 +47,31 @@ const save = async (
 
     await storage.set("saveStatus", "fetching" as SaveStatus)
 
-    const headers = convertHeaders(rawHeaders)
+    console.log({ rawHeaders })
+    const headers = convertHeaders(
+      rawHeaders.filter((h) => h.name.toLowerCase() != "cookie")
+    )
     const rawConversation = await getConversation({
       model: model,
       params: { convId, headers }
     })
 
     console.log({ rawConversation })
 
-    if (!rawConversation?.mapping) throw new Error("Conversation not found")
+    if (!rawConversation) throw new Error("Conversation not found")
 
-    const textDocs =
-      (await getConversationTextdocs({
-        model: model as any,
-        params: { rawConversation, headers, includeVersions: true }
-      })) ?? []
+    let textDocs: any[] = []
+    if (model == "chatgpt") {
+      textDocs =
+        (await getConversationTextdocs({
+          model: model as any,
+          params: { rawConversation, headers, includeVersions: true }
+        })) ?? []
+    }
 
     const conversation = parseConversation({
-      model: "chatgpt",
+      model: model,
+      // @ts-ignore
       params: { rawConversation, textDocs }
     })
 

src/background/index.ts

@@ -71,6 +71,11 @@ main()
 
 const trackedURLs = ["https://chatgpt.com/*", "https://chat.deepseek.com/*"]
 
+const deepseekUrls = [
+  "https://chat.deepseek.com/api/v0/chat/history_messages"
+  // "ttps://chat.deepseek.com/api/v0/chat_session/fetch_page?count=100"
+]
+
 chrome.webRequest.onSendHeaders.addListener(
   (res) => {
     if (
@@ -84,13 +89,26 @@ chrome.webRequest.onSendHeaders.addListener(
     if (
       // cacheHeaders ||
       !res.requestHeaders ||
-      !res.requestHeaders.some((h) => h.name === "Authorization")
+      !res.requestHeaders.some((h) => h.name.toLowerCase() === "authorization")
     )
       return
 
+    if (res.url.includes("chatgpt.com")) {
+      session.set(STORAGE_KEYS.cacheHeaders, res.requestHeaders)
+      storage.set(STORAGE_KEYS.hasCacheHeaders, true)
+      return
+    }
+
+    if (deepseekUrls.some((url) => res.url.includes(url))) {
+      // console.log({ url: res.url, headers: res.requestHeaders })
+      // console.log("Setting cache headers")
+
+      session.set(STORAGE_KEYS.cacheHeaders, res.requestHeaders)
+      storage.set(STORAGE_KEYS.hasCacheHeaders, true)
+      return
+    }
+
     // cacheHeaders = res.requestHeaders
-    session.set(STORAGE_KEYS.cacheHeaders, res.requestHeaders)
-    storage.set(STORAGE_KEYS.hasCacheHeaders, true)
   },
   { urls: trackedURLs, types: ["xmlhttprequest"] },
   ["requestHeaders", "extraHeaders"]

src/background/messages/getCurrentTab.ts

@@ -4,6 +4,7 @@ import type { PlasmoMessaging } from "@plasmohq/messaging"
 import { Storage } from "@plasmohq/storage"
 
 import { STORAGE_KEYS } from "~utils/consts"
+import type { SupportedModels } from "~utils/types"
 
 const handler: PlasmoMessaging.MessageHandler = async (req, res) => {
   try {
@@ -16,18 +17,18 @@ const handler: PlasmoMessaging.MessageHandler = async (req, res) => {
 
     const tab = tabs[0]
 
-    if (tab.url) {
-      const tabURL = new URL(tab.url)
+    let model: SupportedModels | null = null
 
-      if (tabURL.hostname.includes("chatgpt.com")) {
-        await storage.set(STORAGE_KEYS.model, "chatgpt")
-      }
-      if (tabURL.hostname.includes("chat.deepseek.com")) {
-        await storage.set(STORAGE_KEYS.model, "deepseek")
-      }
+    if (tab.url?.includes("chatgpt.com")) {
+      model = "chatgpt"
+      await storage.set(STORAGE_KEYS.model, "chatgpt")
+    }
+    if (tab.url?.includes("chat.deepseek.com")) {
+      model = "deepseek"
+      await storage.set(STORAGE_KEYS.model, "deepseek")
     }
 
-    res.send({ tabId: tab.id, tabUrl: tab.url })
+    res.send({ tabId: tab.id, tabUrl: tab.url, model })
   } catch (err) {
     console.error(err)
     res.send({ err })

src/popup/IndexPopup.tsx

@@ -3,13 +3,14 @@ import bannerEco1 from "data-base64:../../assets/banner-eco-1.png"
 
 import { useStorage } from "@plasmohq/storage/hook"
 
-import type {
-  AutosaveStatus,
-  Error,
-  PopupEnum,
-  SaveBehavior,
-  SaveStatus,
-  StoredDatabase
+import {
+  type AutosaveStatus,
+  type Error,
+  type PopupEnum,
+  type SaveBehavior,
+  type SaveStatus,
+  type StoredDatabase,
+  type SupportedModels
 } from "~utils/types"
 
 import "~styles.css"
@@ -38,11 +39,13 @@ import {
   i18n,
   updateChatConfig
 } from "~utils/functions"
+import { getConversationIdFromUrl } from "~utils/functions/llms"
 
 import ConflictPopup from "./ConflictPopup"
 
 function IndexPopup() {
   const [popup, setPopup] = useStorage<PopupEnum>(STORAGE_KEYS.popup, "index")
+  const [model] = useStorage<SupportedModels | undefined>(STORAGE_KEYS.model)
   const [selectedDB, setSelectedDB] = useStorage<number>(
     STORAGE_KEYS.selectedDB,
     0
@@ -83,9 +86,12 @@ function IndexPopup() {
   const savePercent = useSavePercentage(saveStatus, 5000)
 
   useEffect(() => {
-    sendToBackground({ name: "getCurrentTab" }).then(({ tabUrl }) => {
-      const id = tabUrl?.split("/c/").pop()
-      setChatID(id?.length != 36 ? null : id)
+    console.log({ cacheHeaders, chatID })
+  }, [cacheHeaders, chatID])
+
+  useEffect(() => {
+    sendToBackground({ name: "getCurrentTab" }).then(({ tabUrl, model }) => {
+      setChatID(getConversationIdFromUrl(model, tabUrl))
     })
   }, [])
 

src/popup/index.tsx

@@ -66,11 +66,8 @@ export default function Wrapper() {
         active: true,
         currentWindow: true
       })
-      if (
-        !tabs[0].url?.match(
-          /^((https:\/\/chat.openai.com)|(https:\/\/chatgpt.com)).*/
-        )
-      ) {
+      const urlObj = new URL(tabs[0].url!)
+      if (!urlObj.hostname.match(/((chatgpt.com)|(chat.deepseek.com))/)) {
         if (!popup || popup === "index" || popup === "save")
           await setPopup("wrongpage")
       } else if (popup === "wrongpage") {

src/utils/functions/chatgpt.ts

@@ -1,12 +1,8 @@
-import type {
-  CanvasMessageMetadata,
-  Conversation,
-  ConversationTextdocs,
-  Message
-} from "~utils/types"
+import type { Conversation, ConversationTextdocs, Message } from "~utils/types"
+import type { CanvasMessageMetadata } from "~utils/types/chatgpt"
 
 export const parseConversation = (
-  rawConv: Conversation,
+  rawConv: Conversation["chatgpt"],
   textDocs: ConversationTextdocs
 ) => {
   const { conversation_id: id, title, mapping } = rawConv
@@ -45,7 +41,7 @@ export const parseConversation = (
     },
     { prev: "system", rawPrompts: [] } as {
       prev: string
-      rawPrompts: Message[]
+      rawPrompts: Message["chatgpt"][]
     }
   )
 
@@ -66,8 +62,8 @@ export const parseConversation = (
 }
 
 export const flattenMessage = (
-  msg: Message,
-  mapping: Conversation["mapping"],
+  msg: Message["chatgpt"],
+  mapping: Conversation["chatgpt"]["mapping"],
   flattenedMessage: string[],
   textDocs: ConversationTextdocs
 ) => {

src/utils/functions/llms.ts

@@ -1,4 +1,5 @@
 import { parseConversation as chatgptParseConversation } from "~utils/functions/chatgpt"
+import { parseConversation as deepseekParseConversation } from "~utils/functions/deepseek"
 import type {
   Conversation,
   ConversationTextdocs,
@@ -12,30 +13,44 @@ export const parseConversation = ({
   switch (model) {
     case "chatgpt":
       return chatgptParseConversation(params.rawConversation, params.textDocs)
+    case "deepseek":
+      return deepseekParseConversation(params.rawConversation)
     default:
       throw new Error("Model not supported")
   }
 }
 
-type ParseConversationParams = {
-  model: "chatgpt"
-  params: {
-    rawConversation: Conversation
-    textDocs: ConversationTextdocs
-  }
-}
+type ParseConversationParams =
+  | {
+      model: "chatgpt"
+      params: {
+        rawConversation: Conversation["chatgpt"]
+        textDocs: ConversationTextdocs
+      }
+    }
+  | {
+      model: "deepseek"
+      params: {
+        rawConversation: Conversation["deepseek"]
+        textDocs: null
+      }
+    }
 
 export const getConversationIdFromUrl = (
   model: SupportedModels,
   url: string
 ) => {
   const urlObj = new URL(url)
 
+  let id: string | undefined
+
   switch (model) {
     case "chatgpt":
-      return urlObj.pathname.split("/").pop()
+      id = urlObj.pathname.split("/").pop()
+      return id?.length != 36 ? null : id
     case "deepseek":
-      return urlObj.pathname.split("/").pop()
+      id = urlObj.pathname.split("/").pop()
+      return id?.length != 36 ? null : id
     default:
       throw new Error("Model not supported")
   }

src/utils/types/chatgpt.ts

@@ -0,0 +1,50 @@
+export type ChatGPTConversation = {
+  title: string
+  conversation_id: string
+  mapping: Record<string, ChatGPTMessage>
+}
+
+export type ChatGPTMessage = {
+  message?: {
+    create_time: number
+    author?: {
+      role: string
+      name: string
+    }
+    content: {
+      content_type: string
+      parts?: any[]
+      text?: string
+    }
+    recipient: string
+    metadata: Record<string, any>
+    end_turn?: true
+  }
+  children?: string[]
+}
+
+export type CanvasMessageMetadata = {
+  textdoc_id: string
+  textdoc_type: string
+  version: number
+  title: string
+}
+
+export type CanvasHistoryResponse = {
+  previous_doc_states: {
+    id: string
+    version: number
+    title: string
+    textdoc_type: string
+    content: string
+    comments: []
+    updated_at: string
+  }[]
+}
+
+export type CreateCanvasData = {
+  name: string
+  title?: string // futureproofing
+  type: string
+  content: string
+}