Bridged core and core cleanup (#1048)

* Update pr-labeler.yml * AdaptiveLightingController fix & improvement (#1038) * AdaptiveLightingController on update should provide some data without the need to build it yourself * Fix TypeError * Fixed linting and test issues * Typedoc fixes * Updated examples * Eslint fixes --------- Co-authored-by: Donavan Becker <[email protected]> * BridgedCore.ts and Core.ts cleanup (updated deprecation date from year 2022 to 2024). * Removed not allowed char from Sprinkler accessory example * Code review remarks --------- Co-authored-by: Donavan Becker <[email protected]>
homebridge · Jun 28, 2024 · e5383f8 · e5383f8
1 parent feb82d8
commit e5383f8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 17 deletions.
diff --git a/src/BridgedCore.ts b/src/BridgedCore.ts
@@ -6,8 +6,8 @@ import { Accessory, AccessoryEventTypes, AccessoryLoader, Bridge, Categories, HA
 
 console.log(`HAP-NodeJS v${HAPLibraryVersion()} starting...`);
 
-console.warn("DEPRECATION NOTICE: The use of Core and BridgeCore are deprecated and are scheduled to be remove in October 2020. " +
-  "For more information and some guidance on how to migrate, have a look at https://github.com/homebridge/HAP-NodeJS/wiki/Deprecation-of-Core-and-BridgeCore");
+console.warn("DEPRECATION NOTICE: The use of Core and BridgeCore is deprecated and is scheduled to be removed in a future version.");
+console.warn("For more information and some guidance on how to migrate, have a look at https://github.com/homebridge/HAP-NodeJS/wiki/Deprecation-of-Core-and-BridgeCore");
 
 // Initialize our storage system
 storage.initSync();
@@ -42,9 +42,7 @@ const signals = { "SIGINT": 2, "SIGTERM": 15 } as Record<string, number>;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 Object.keys(signals).forEach((signal: any) => {
   process.on(signal, () => {
-    bridge.unpublish();
-    setTimeout(()=> {
-      process.exit(128 + signals[signal]);
-    }, 1000);
+    bridge.unpublish()
+      .then(() => setTimeout(() => process.exit(128 + signals[signal]), 1000));
   });
 });
diff --git a/src/Core.ts b/src/Core.ts
@@ -6,8 +6,8 @@ import { AccessoryLoader, HAPLibraryVersion } from "./";
 
 console.log(`HAP-NodeJS v${HAPLibraryVersion()} starting...`);
 
-console.warn("DEPRECATION NOTICE: The use of Core and BridgeCore are deprecated and are scheduled to be remove in October 2020. " +
-  "For more information and some guidance on how to migrate, have a look at https://github.com/homebridge/HAP-NodeJS/wiki/Deprecation-of-Core-and-BridgeCore");
+console.warn("DEPRECATION NOTICE: The use of Core and BridgeCore is deprecated and is scheduled to be removed in a future version.");
+console.warn("For more information and some guidance on how to migrate, have a look at https://github.com/homebridge/HAP-NodeJS/wiki/Deprecation-of-Core-and-BridgeCore");
 
 // Initialize our storage system
 storage.initSync();
@@ -50,12 +50,7 @@ const signals = { "SIGINT": 2, "SIGTERM": 15 } as Record<string, number>;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 Object.keys(signals).forEach((signal: any) => {
   process.on(signal, () => {
-    for (let i = 0; i < accessories.length; i++) {
-      accessories[i].unpublish();
-    }
-
-    setTimeout(() => {
-      process.exit(128 + signals[signal]);
-    }, 1000);
+    Promise.all(accessories.map(a => a.unpublish()))
+      .then(() => setTimeout(() => process.exit(128 + signals[signal]), 1000));
   });
 });
diff --git a/src/accessories/Sprinkler_accessory.ts b/src/accessories/Sprinkler_accessory.ts
@@ -34,7 +34,7 @@ const SPRINKLER = {
 const sprinklerUUID = uuid.generate("hap-nodejs:accessories:sprinkler");
 
 // This is the Accessory that we'll return to HAP-NodeJS that represents our fake motionSensor.
-const sprinkler = exports.accessory = new Accessory("💦 Sprinkler", sprinklerUUID);
+const sprinkler = exports.accessory = new Accessory("Sprinkler", sprinklerUUID);
 
 // Add properties for publishing (in case we're using Core.js and not BridgedCore.js)
 // @ts-expect-error: Core/BridgeCore API
@@ -44,7 +44,7 @@ sprinkler.pincode = "123-44-567";
 sprinkler.category = Categories.SPRINKLER;
 
 // Add the actual Valve Service and listen for change events from iOS.
-const sprinklerService = sprinkler.addService(Service.Valve, "💦 Sprinkler");
+const sprinklerService = sprinkler.addService(Service.Valve, "Sprinkler");
 
 // Sprinkler Controll
 function openVentile() {