From 6ae09710c67b6539c54580ff3a08cd041951c620 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 28 Feb 2025 10:59:16 +0000
Subject: [PATCH] Test keytar-forked

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .node-version          | 2 +-
 knip.ts                | 2 +-
 package.json           | 4 ++--
 src/@types/keytar.d.ts | 2 +-
 src/keytar.ts          | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.node-version b/.node-version
index 43779377..c5ddcef4 100644
--- a/.node-version
+++ b/.node-version
@@ -1 +1 @@
-v22.13.1
\ No newline at end of file
+v22.14.0
\ No newline at end of file
diff --git a/knip.ts b/knip.ts
index a2b79549..96ff9e11 100644
--- a/knip.ts
+++ b/knip.ts
@@ -5,7 +5,7 @@ export default {
     project: ["**/*.{js,ts}"],
     ignoreDependencies: [
         // Brought in via hak scripts
-        "keytar",
+        "keytar-forked",
         "matrix-seshat",
         // Required for `action-validator`
         "@action-validator/*",
diff --git a/package.json b/package.json
index c40c2a74..9baaa843 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "type": "module",
     "files": [],
     "engines": {
-        "node": ">=18.0.0 <=22.13.1 || >22"
+        "node": ">=18.0.0"
     },
     "scripts": {
         "i18n": "matrix-gen-i18n && yarn i18n:sort && yarn i18n:lint",
@@ -112,7 +112,7 @@
     },
     "hakDependencies": {
         "matrix-seshat": "^4.0.1",
-        "keytar": "^7.9.0"
+        "keytar-forked": "^7.9.0"
     },
     "resolutions": {
         "@types/node": "18.19.76",
diff --git a/src/@types/keytar.d.ts b/src/@types/keytar.d.ts
index ba396b51..20563bce 100644
--- a/src/@types/keytar.d.ts
+++ b/src/@types/keytar.d.ts
@@ -2,7 +2,7 @@
 // Definitions by: Milan Burda <https://github.com/miniak>, Brendan Forster <https://github.com/shiftkey>, Hari Juturu <https://github.com/juturu>
 // Adapted from DefinitelyTyped: https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/keytar/index.d.ts
 
-declare module "keytar" {
+declare module "keytar-forked" {
     /**
      * Get the stored password for the service and account.
      *
diff --git a/src/keytar.ts b/src/keytar.ts
index fdcddfde..e02672a6 100644
--- a/src/keytar.ts
+++ b/src/keytar.ts
@@ -5,11 +5,11 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import type * as Keytar from "keytar"; // Hak dependency type
+import type * as Keytar from "keytar-forked"; // Hak dependency type
 
 let keytar: typeof Keytar | undefined;
 try {
-    ({ default: keytar } = await import("keytar"));
+    ({ default: keytar } = await import("keytar-forked"));
 } catch (e) {
     if ((<NodeJS.ErrnoException>e).code === "MODULE_NOT_FOUND") {
         console.log("Keytar isn't installed; secure key storage is disabled.");