chore: Upgrade to @webext-core/proxy-service v2

Author: aklinker1

bun.lock

@@ -21,7 +21,7 @@
     "@aklinker1/check": "^2.1.2",
     "@tanstack/vue-query": "^5.59.13",
     "@webext-core/messaging": "^2.0.2",
-    "@webext-core/proxy-service": "^1.2.0",
+    "@webext-core/proxy-service": "^2.0.0-rc.1",
     "async-mutex": "^0.5.0",
     "fast-deep-equal": "^3.1.3",
     "minimatch": "^10.0.1",

package.json

@@ -1,7 +1,8 @@
-import { getGithubService, Github } from "@/utils/github";
+import { Github } from "@/utils/github";
+import { createProxyService } from "@webext-core/proxy-service";
 
 export default function (token: { value: string | undefined }) {
-  const github = getGithubService();
+  const github = createProxyService(GITHUB_SERVICE_KEY);
 
   return useQuery<Github.User | undefined>({
     queryKey: [QueryKeys.GithubUser, token],

src/composables/useGithubUserQuery.ts

@@ -1,8 +1,10 @@
-import { registerGithubService, createGithubApi } from "@/utils/github";
+import { createGithubApi, createGithubService } from "@/utils/github";
+import { registerService } from "@webext-core/proxy-service";
 
 export default defineBackground(() => {
-  const api = createGithubApi();
-  registerGithubService(api);
+  const githubApi = createGithubApi();
+  const githubService = createGithubService(githubApi);
+  registerService(GITHUB_SERVICE_KEY, githubService);
 
   browser.runtime.onInstalled.addListener(async ({ reason }) => {
     if (reason === "install") {

src/entrypoints/background.ts

@@ -0,0 +1,5 @@
+import type { ProxyServiceKey } from "@webext-core/proxy-service";
+import type { GithubService } from "./github";
+
+export const GITHUB_SERVICE_KEY =
+  "github-service" as ProxyServiceKey<GithubService>;

src/utils/ProxyServiceKeys.ts

@@ -1,15 +1,14 @@
-import { defineProxyService } from "@webext-core/proxy-service";
-import type { GithubApi } from "./api";
-import type { DiffEntry } from "./types";
 import { minimatch } from "minimatch";
 import { GitAttributes } from "../gitattributes";
+import type { GithubApi } from "./api";
+import type { DiffEntry, User } from "./types";
 
-export const [registerGithubService, getGithubService] = defineProxyService(
-  "GithubService",
-  createGithubService,
-);
+export interface GithubService {
+  recalculateDiff(options: RecalculateOptions): Promise<RecalculateResult>;
+  getUser(token: string): Promise<User>;
+}
 
-function createGithubService(api: GithubApi) {
+export function createGithubService(api: GithubApi): GithubService {
   const mountCache: { [mountId: number]: RecalculateResult } = {};
 
   /**
@@ -121,9 +120,7 @@ function createGithubService(api: GithubApi) {
   }
 
   return {
-    async recalculateDiff(
-      options: RecalculateOptions,
-    ): Promise<RecalculateResult> {
+    async recalculateDiff(options) {
       // Cache the result if the same content script tries to get the result multiple times.
       if (mountCache[options.mountId]) {
         logger.debug("[recalculateDiff] Using mount cache");

src/utils/github/service.ts

@@ -1,4 +1,4 @@
-import { getGithubService } from "./github";
+import { createProxyService } from "@webext-core/proxy-service";
 import type { RecalculateOptions, RecalculateResult } from "./github";
 
 /**
@@ -12,7 +12,7 @@ export function replaceCount(
   if (existing) return;
 
   const start = Date.now();
-  const github = getGithubService();
+  const github = createProxyService(GITHUB_SERVICE_KEY);
   const stats = github.recalculateDiff(options).then((diff) => {
     logger.debug("Diff:", diff);
     logger.debug(`Diff calculated in ${Date.now() - start}ms`);