Updated dependencies (typescript)

homebridge · May 19, 2024 · cf05da9 · cf05da9
1 parent 110a692
commit cf05da9
Show file tree

Hide file tree

Showing 18 changed files with 274 additions and 244 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ All notable changes to `hap-nodejs` will be documented in this file. This projec
 
 - Updated dependencies (`rimraf` and `@types/node`)
 - Updated dependencies (`simple-plist`)
+- Updated dependencies (`typescript`)
 
 ## v0.12.1 (2024-05-11)
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -69,8 +69,8 @@
     "@types/jest": "^29.5.12",
     "@types/node": "^20.12.12",
     "@types/plist": "^3.0.5",
-    "@typescript-eslint/eslint-plugin": "^5.62.0",
-    "@typescript-eslint/parser": "^5.62.0",
+    "@typescript-eslint/eslint-plugin": "^7.9.0",
+    "@typescript-eslint/parser": "^7.9.0",
     "axios": "^1.6.8",
     "commander": "^12.1.0",
     "escape-html": "^1.0.3",
@@ -83,6 +83,6 @@
     "ts-jest": "^29.1.2",
     "ts-node": "^10.9.2",
     "typedoc": "^0.25.13",
-    "typescript": "^4.9.5"
+    "typescript": "^5.4.5"
   }
 }
diff --git a/src/internal-types.ts b/src/internal-types.ts
@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-duplicate-enum-values */
+
 import { CharacteristicValue, Nullable } from "./types";
 
 /**

diff --git a/src/lib/Accessory.ts b/src/lib/Accessory.ts
@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-duplicate-enum-values, @typescript-eslint/no-unsafe-declaration-merging */
+
 import assert from "assert";
 import { MulticastOptions } from "bonjour-hap";
 import crypto from "crypto";
@@ -623,8 +625,11 @@ export class Accessory extends EventEmitter {
     for (const service of this.services) {
       if (typeof name === "string" && (service.displayName === name || service.name === name || service.subtype === name)) {
         return service;
-      } else if (typeof name === "function" && ((service instanceof name) || (name.UUID === service.UUID))) {
-        return service;
+      } else {
+        // @ts-expect-error ('UUID' does not exist on type 'never')
+        if (typeof name === "function" && ((service instanceof name) || (name.UUID === service.UUID))) {
+          return service;
+        }
       }
     }
 
@@ -635,8 +640,11 @@ export class Accessory extends EventEmitter {
     for (const service of this.services) {
       if (typeof uuid === "string" && (service.displayName === uuid || service.name === uuid) && service.subtype === subType) {
         return service;
-      } else if (typeof uuid === "function" && ((service instanceof uuid) || (uuid.UUID === service.UUID)) && service.subtype === subType) {
-        return service;
+      } else {
+        // @ts-expect-error ('UUID' does not exist on type 'never')
+        if (typeof uuid === "function" && ((service instanceof uuid) || (uuid.UUID === service.UUID)) && service.subtype === subType) {
+          return service;
+        }
       }
     }
 

diff --git a/src/lib/Characteristic.spec.ts b/src/lib/Characteristic.spec.ts
@@ -1751,7 +1751,7 @@ describe("Characteristic", () => {
       mock.mockReset();
       characteristic.removeAllListeners("get");
       characteristic.on("get", (callback) => {
-        callback(234234234234);
+        callback(234234234234 as HAPStatus);
       });
       await expect(characteristic.handleGetRequest()).rejects.toEqual(HAPStatus.SERVICE_COMMUNICATION_FAILURE);
       expect(characteristic.statusCode).toEqual(HAPStatus.SERVICE_COMMUNICATION_FAILURE);
@@ -1878,7 +1878,7 @@ describe("Characteristic", () => {
       mock.mockReset();
       characteristic.removeAllListeners("set");
       characteristic.on("set", (value, callback) => {
-        callback(234234234234);
+        callback(234234234234 as HAPStatus);
       });
       await expect(characteristic.handleSetRequest("hello")).rejects.toEqual(HAPStatus.SERVICE_COMMUNICATION_FAILURE);
       expect(characteristic.statusCode).toEqual(HAPStatus.SERVICE_COMMUNICATION_FAILURE);

diff --git a/src/lib/Characteristic.ts b/src/lib/Characteristic.ts
@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-duplicate-enum-values, @typescript-eslint/no-unsafe-declaration-merging */
+
 import assert from "assert";
 import createDebug from "debug";
 import { EventEmitter } from "events";

diff --git a/src/lib/HAPServer.spec.ts b/src/lib/HAPServer.spec.ts
@@ -627,10 +627,10 @@ describe(IsKnownHAPStatusError, () => {
   });
 
   it("should reject non defined error codes", () => {
-    expect(IsKnownHAPStatusError(23)).toBe(false);
-    expect(IsKnownHAPStatusError(-3)).toBe(false);
-    expect(IsKnownHAPStatusError(-72037)).toBe(false);
-    expect(IsKnownHAPStatusError(HAPStatus.SUCCESS)).toBe(false);
+    expect(IsKnownHAPStatusError(23 as HAPStatus)).toBe(false);
+    expect(IsKnownHAPStatusError(-3 as HAPStatus)).toBe(false);
+    expect(IsKnownHAPStatusError(-72037 as HAPStatus)).toBe(false);
+    expect(IsKnownHAPStatusError(HAPStatus.SUCCESS as HAPStatus)).toBe(false);
   });
 
   it("should reject invalid user input", () => {

diff --git a/src/lib/HAPServer.ts b/src/lib/HAPServer.ts
@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-duplicate-enum-values, @typescript-eslint/no-unsafe-declaration-merging */
+
 import crypto from "crypto";
 import createDebug from "debug";
 import { EventEmitter } from "events";

diff --git a/src/lib/Service.ts b/src/lib/Service.ts
@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
+
 import assert from "assert";
 import createDebug from "debug";
 import { EventEmitter } from "events";
@@ -677,12 +679,16 @@ export class Service extends EventEmitter {
     for (const characteristic of this.characteristics) {
       if (typeof name === "string" && characteristic.displayName === name) {
         return characteristic;
-      } else if (typeof name === "function" && ((characteristic instanceof name) || (name.UUID === characteristic.UUID))) {
-        return characteristic;
+      } else {
+        // @ts-expect-error ('UUID' does not exist on type 'never')
+        if (typeof name === "function" && ((characteristic instanceof name) || (name.UUID === characteristic.UUID))) {
+          return characteristic;
+        }
       }
     }
     if (typeof name === "function") {
       for (const characteristic of this.optionalCharacteristics) {
+        // @ts-expect-error ('UUID' does not exist on type 'never')
         if ((characteristic instanceof name) || (name.UUID === characteristic.UUID)) {
           return this.addCharacteristic(name);
         }
@@ -704,8 +710,11 @@ export class Service extends EventEmitter {
     for (const characteristic of this.characteristics) {
       if (typeof name === "string" && characteristic.displayName === name) {
         return true;
-      } else if (typeof name === "function" && ((characteristic instanceof name) || (name.UUID === characteristic.UUID))) {
-        return true;
+      } else {
+        // @ts-expect-error ('UUID' does not exist on type 'never')
+        if (typeof name === "function" && ((characteristic instanceof name) || (name.UUID === characteristic.UUID))) {
+          return true;
+        }
       }
     }
     return false;

diff --git a/src/lib/camera/RecordingManagement.ts b/src/lib/camera/RecordingManagement.ts
@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
+
 import crypto from "crypto";
 import createDebug from "debug";
 import { EventEmitter } from "events";

diff --git a/src/lib/controller/AdaptiveLightingController.ts b/src/lib/controller/AdaptiveLightingController.ts
@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
+
 import assert from "assert";
 import { HAPStatus } from "../HAPServer";
 import { ColorUtils } from "../util/color-utils";

diff --git a/src/lib/controller/CameraController.ts b/src/lib/controller/CameraController.ts
@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
+
 import crypto from "crypto";
 import createDebug from "debug";
 import { EventEmitter } from "events";

diff --git a/src/lib/controller/RemoteController.ts b/src/lib/controller/RemoteController.ts
@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
+
 import assert from "assert";
 import createDebug from "debug";
 import { EventEmitter } from "events";

diff --git a/src/lib/datastream/DataStreamServer.ts b/src/lib/datastream/DataStreamServer.ts
@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
+
 import assert from "assert";
 import crypto from "crypto";
 import createDebug from "debug";

diff --git a/src/lib/tv/AccessControlManagement.ts b/src/lib/tv/AccessControlManagement.ts
@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
+
 import { EventEmitter } from "events";
 import { Characteristic } from "../Characteristic";
 import type { AccessControl } from "../definitions";

diff --git a/src/lib/util/eventedhttp.ts b/src/lib/util/eventedhttp.ts
@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
+
 import { getNetAddress } from "@homebridge/ciao/lib/util/domain-formatter";
 import assert from "assert";
 import createDebug from "debug";

diff --git a/src/lib/util/hapStatusError.spec.ts b/src/lib/util/hapStatusError.spec.ts
@@ -12,7 +12,7 @@ describe("HapStatusError", () => {
   });
 
   it("reverts to SERVICE_COMMUNICATION_FAILURE if an invalid code is passed in", async () => {
-    const error = new HapStatusError(234523323423423);
+    const error = new HapStatusError(234523323423423 as HAPStatus);
     expect(error.hapStatus).toEqual(HAPStatus.SERVICE_COMMUNICATION_FAILURE);
   });
 });