homebridge-gsh 4.0.2-beta.7 → 4.0.2

package/CHANGELOG.md

@@ -2,16 +2,11 @@
 
 All notable changes to `homebridge-gsh` will be documented in this file. This project tries to adhere to [Semantic Versioning](http://semver.org/).
 
-## v4.0.2 (2025-06-06)
+## v4.0.2 (2025-06-19)
 
 ### Changes
 
-- Implement channel/input selection of Television device #22, tks @banboobee
-- Implemented regular expression searching for accessoryFilter #23, tks @banboobee
-
-### Fixes
-
-- 
+- Launch of Subscription Model for existing users
 
 ## v4.0.1 (2025-06-06)
 

package/config.schema.json

@@ -151,7 +151,7 @@
         },
         {
           "type": "help",
-          "helpvalue": "<h5><B>Accessory Filter - by name</b></h5><em class='primary-text'>Enter the names (as displayed in the Google Home app) of the accessories you don't want to control from the Google Assistant. Also accepts regular expressions as a name.</em>"
+          "helpvalue": "<h5><B>Accessory Filter - by name</b></h5><em class='primary-text'>Enter the names (as displayed in the Google Home app) of the accessories you don't want to control from the Google Assistant.</em>"
         },
         {
           "nodescription": true,

package/dist/hap.d.ts

@@ -14,8 +14,6 @@ import { LockMechanism } from './types/lock-mechanism';
 import { SecuritySystem } from './types/security-system';
 import { Switch } from './types/switch';
 import { Television } from './types/television';
-import { ContactSensor } from './types/contact-sensor';
-import { OccupancySensor } from './types/occupancy-sensor';
 import { TemperatureSensor } from './types/temperature-sensor';
 import { Thermostat } from './types/thermostat';
 import { Window } from './types/window';
@@ -34,7 +32,6 @@ export declare class Hap {
     private configDiscoveryTimeout;
     private configDiscoveryWait;
     ready: boolean;
-    private dummy;
     types: {
         Door: Door;
         Fan: Fan;
@@ -52,10 +49,6 @@ export declare class Hap {
         Thermostat: Thermostat;
         Window: Window;
         WindowCovering: WindowCovering;
-        Speaker: () => void;
-        InputSource: () => void;
-        ContactSensor: ContactSensor;
-        OccupancySensor: OccupancySensor;
     };
     reportStateSubject: Subject<unknown>;
     pendingStateReport: any[];

package/dist/hap.js

@@ -50,8 +50,6 @@ const lock_mechanism_1 = require("./types/lock-mechanism");
 const security_system_1 = require("./types/security-system");
 const switch_1 = require("./types/switch");
 const television_1 = require("./types/television");
-const contact_sensor_1 = require("./types/contact-sensor");
-const occupancy_sensor_1 = require("./types/occupancy-sensor");
 const temperature_sensor_1 = require("./types/temperature-sensor");
 const thermostat_1 = require("./types/thermostat");
 const window_1 = require("./types/window");
@@ -59,7 +57,6 @@ const window_covering_1 = require("./types/window-covering");
 class Hap {
     constructor(socket, log, pin, config, api) {
         this.services = [];
-        this.dummy = () => { };
         this.types = {
             Door: new door_1.Door(),
             Fan: new fan_1.Fan(),
@@ -72,15 +69,11 @@ class Hap {
             Outlet: new switch_1.Switch('action.devices.types.OUTLET'),
             SecuritySystem: new security_system_1.SecuritySystem(),
             Switch: new switch_1.Switch('action.devices.types.SWITCH'),
-            Television: new television_1.Television(this),
+            Television: new television_1.Television(),
             TemperatureSensor: new temperature_sensor_1.TemperatureSensor(this),
             Thermostat: new thermostat_1.Thermostat(this),
             Window: new window_1.Window(),
             WindowCovering: new window_covering_1.WindowCovering(),
-            Speaker: this.dummy,
-            InputSource: this.dummy,
-            ContactSensor: new contact_sensor_1.ContactSensor(),
-            OccupancySensor: new occupancy_sensor_1.OccupancySensor(),
         };
         this.reportStateSubject = new rxjs_1.Subject();
         this.pendingStateReport = [];
@@ -104,10 +97,6 @@ class Hap {
             hap_types_1.Characteristic.CurrentRelativeHumidity,
             hap_types_1.Characteristic.SecuritySystemTargetState,
             hap_types_1.Characteristic.SecuritySystemCurrentState,
-            hap_types_1.Characteristic.ActiveIdentifier,
-            hap_types_1.Characteristic.Mute,
-            hap_types_1.Characteristic.ContactSensorState,
-            hap_types_1.Characteristic.OccupancyDetected,
         ];
         this.instanceBlacklist = [];
         this.accessoryFilter = [];
@@ -183,7 +172,10 @@ class Hap {
     }
     buildSyncResponse() {
         return __awaiter(this, void 0, void 0, function* () {
-            const devices = this.services.filter((service) => { var _a, _b; return (_b = (_a = this.types) === null || _a === void 0 ? void 0 : _a[service.type]) === null || _b === void 0 ? void 0 : _b.sync; }).map((service) => {
+            const devices = this.services.map((service) => {
+                if (!this.types[service.type]) {
+                    return;
+                }
                 return this.types[service.type].sync(service);
             });
             return devices;
@@ -224,7 +216,7 @@ class Hap {
             for (const command of commands) {
                 for (const device of command.devices) {
                     const service = this.services.find(x => x.uniqueId === device.id);
-                    this.log.debug(`Processing command ${command.execution[0].command} for ${device.id} and ${service.serviceName}`);
+                    this.log.debug(`Processing command ${command.execution[0].command} for ${device.id} and ${service}`);
                     if (service) {
                         if (this.config.twoFactorAuthPin && this.types[service.type].twoFactorRequired
                             && this.types[service.type].is2faRequired(command)
@@ -292,24 +284,11 @@ class Hap {
                 }
                 services = services.filter(x => this.types[x.type] !== undefined);
                 this.log.debug(`Loaded ${services.length} accessories from Homebridge - pre filter`);
-                services = services.filter(x => !this.instanceBlacklist.find(y => { var _a; return y === ((_a = x === null || x === void 0 ? void 0 : x.instance) === null || _a === void 0 ? void 0 : _a.username); }));
-                const compiledAccessoryFilter = this.accessoryFilter.map(filter => new RegExp(filter));
-                const searchList = (target, regexList) => {
-                    if (target) {
-                        for (const regex of regexList) {
-                            if (regex.test(target)) {
-                                this.log.debug(`${this.accessoryFilterInverse ? 'Including' : 'Skipping'} service '${target}' - matches accessoryFilter '${regex}'`);
-                                return true;
-                            }
-                        }
-                    }
-                    return false;
-                };
                 if (this.accessoryFilterInverse) {
-                    services = services.filter(x => searchList(x.serviceName, compiledAccessoryFilter));
+                    services = services.filter(x => this.accessoryFilter.includes(x.serviceName));
                 }
                 else {
-                    services = services.filter(x => !searchList(x.serviceName, compiledAccessoryFilter));
+                    services = services.filter(x => !this.accessoryFilter.includes(x.serviceName));
                 }
                 services = services.filter(x => !this.accessorySerialFilter.includes(x.accessoryInformation['Serial Number']));
                 services = services.filter(x => {
@@ -358,13 +337,9 @@ class Hap {
     }
     processPendingStateReports(pendingStateReport) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
             const states = {};
             for (const uniqueId of pendingStateReport) {
                 const service = this.services.find(x => x.uniqueId === uniqueId);
-                if (!((_b = (_a = this.types) === null || _a === void 0 ? void 0 : _a[service.type]) === null || _b === void 0 ? void 0 : _b.query)) {
-                    continue;
-                }
                 states[service.uniqueId] = this.types[service.type].query(service);
             }
             return yield this.sendStateReport(states);
@@ -376,7 +351,10 @@ class Hap {
             if (!this.services.length) {
                 return;
             }
-            this.services.filter((service) => { var _a, _b; return (_b = (_a = this.types) === null || _a === void 0 ? void 0 : _a[service.type]) === null || _b === void 0 ? void 0 : _b.query; }).map((service) => {
+            this.services.map((service) => {
+                if (!this.types[service.type]) {
+                    return;
+                }
                 return states[service.uniqueId] = this.types[service.type].query(service);
             });
             return yield this.sendStateReport(states);

package/dist/hap.js.map

@@ -1 +1 @@
-{"version":3,"file":"hap.js","sourceRoot":"","sources":["../src/hap.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"hap.js","sourceRoot":"","sources":["../src/hap.ts"],"names":[],"mappings":"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"}

package/dist/hap.spec.js

@@ -8,16 +8,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const globals_1 = require("@jest/globals");
-const fs_1 = __importDefault(require("fs"));
 const ts_expect_1 = require("ts-expect");
 const hap_1 = require("./hap");
 const logger_1 = require("./logger");
-const trace = false;
 class socketMock {
     on(event, callback) {
         if (event === 'websocket-status') {
@@ -31,196 +26,126 @@ class socketMock {
         console.log('sendJson', data);
     }
 }
+const config = {
+    name: 'Google Smart Home',
+    token: '1234567890',
+    notice: 'Keep your token a secret!',
+    debug: false,
+    platform: 'google-smarthome',
+    twoFactorAuthPin: '1234',
+    accessoryFilter: [
+        'West Bedroom',
+        'Wasaga',
+        'Garage Door',
+    ],
+    accessoryFilterInverse: true,
+};
+const log = new logger_1.Log(console, true);
+const hap = new hap_1.Hap(socketMock, log, '031-45-154', config, {});
 (0, globals_1.describe)('hap', () => {
-    (0, globals_1.describe)('name filter', () => {
-        const config = {
-            name: 'Google Smart Home',
-            token: '1234567890',
-            notice: 'Keep your token a secret!',
-            debug: false,
-            platform: 'google-smarthome',
-            twoFactorAuthPin: '1234',
-            accessoryFilter: [
-                'West Bedroom',
-                'Wasaga',
-                'Garage Door',
-            ],
-            accessoryFilterInverse: true,
-        };
-        const log = new logger_1.Log(console, true);
-        const hap = new hap_1.Hap(socketMock, log, '031-45-154', config, {});
-        (0, globals_1.describe)('process the QUERY intent', () => {
-            test('wait for HAP to be Ready', () => __awaiter(void 0, void 0, void 0, function* () {
-                while (!hap.ready) {
-                    yield sleep(500);
-                }
-            }), 30000);
-            (0, globals_1.describe)('QUERY message with delay to allow manual testing', () => {
-                test('lightbulb with On/Off only', () => __awaiter(void 0, void 0, void 0, function* () {
-                    const response = yield hap.query(query);
-                }));
-                test('sleeping', () => __awaiter(void 0, void 0, void 0, function* () {
-                    yield sleep(5000);
-                }), 30000);
-                test('lightbulb with On/Off only', () => __awaiter(void 0, void 0, void 0, function* () {
-                    const response = yield hap.query(query);
-                }));
-                test('sleeping', () => __awaiter(void 0, void 0, void 0, function* () {
-                    yield sleep(5000);
-                }), 30000);
-                test('lightbulb with On/Off only', () => __awaiter(void 0, void 0, void 0, function* () {
-                    const response = yield hap.query(query);
-                }));
-            });
-        });
-        (0, globals_1.describe)('process the SYNC intent', () => {
-            test('Wait for HAP to be Ready', () => __awaiter(void 0, void 0, void 0, function* () {
-                while (!hap.ready) {
-                    yield sleep(500);
-                }
-                console.log('hap ready, testing started');
+    (0, globals_1.describe)('process the QUERY intent', () => {
+        test('wait for HAP to be Ready', () => __awaiter(void 0, void 0, void 0, function* () {
+            while (!hap.ready) {
+                yield sleep(500);
+            }
+            console.log('hap ready, testing started', hap.services);
+        }), 30000);
+        (0, globals_1.describe)('QUERY message with delay to allow manual testing', () => {
+            test('lightbulb with On/Off only', () => __awaiter(void 0, void 0, void 0, function* () {
+                const response = yield hap.query(query);
+            }));
+            test('sleeping', () => __awaiter(void 0, void 0, void 0, function* () {
+                yield sleep(5000);
             }), 30000);
-            (0, globals_1.describe)('SYNC', () => {
-                test('Sync Response is proper and filtered', () => __awaiter(void 0, void 0, void 0, function* () {
-                    const response = yield hap.buildSyncResponse();
-                    (0, ts_expect_1.expectType)(response);
-                    (0, globals_1.expect)(response).toBeDefined();
-                    (0, globals_1.expect)(response).toBeInstanceOf(Array);
-                    (0, globals_1.expect)(response).toHaveLength(4);
-                    const expectedNames = [
-                        'East Bedroom',
-                        'East Bedroom Fan',
-                        'Garage Door',
-                        'Wasaga',
-                    ];
-                    const actualNames = response.map(device => device.name.name);
-                    (0, globals_1.expect)(actualNames).toEqual(expectedNames);
-                    if (trace) {
-                        fs_1.default.writeFileSync('buildSyncResponse.json', JSON.stringify(response, null, 2), 'utf8');
-                    }
-                }));
-            });
-        });
-        (0, globals_1.describe)('execute', () => {
-            test('Wait for HAP to be Ready', () => __awaiter(void 0, void 0, void 0, function* () {
-                while (!hap.ready) {
-                    yield sleep(500);
-                }
-                console.log('hap ready, testing started');
+            test('lightbulb with On/Off only', () => __awaiter(void 0, void 0, void 0, function* () {
+                const response = yield hap.query(query);
+            }));
+            test('sleeping', () => __awaiter(void 0, void 0, void 0, function* () {
+                yield sleep(5000);
             }), 30000);
-            test('Turn Off Light', () => __awaiter(void 0, void 0, void 0, function* () {
-                const response = yield hap.execute([executeLightOff]);
-                (0, globals_1.expect)(response).toBeDefined();
-                (0, globals_1.expect)(response).toBeInstanceOf(Array);
-                (0, globals_1.expect)(response).toHaveLength(1);
-                (0, globals_1.expect)(response[0].status).toBe('SUCCESS');
+            test('lightbulb with On/Off only', () => __awaiter(void 0, void 0, void 0, function* () {
+                const response = yield hap.query(query);
             }));
         });
-        (0, globals_1.describe)('Garage Door 2fa and PIN Code', () => {
-            test('Close - 2fa not Required', () => __awaiter(void 0, void 0, void 0, function* () {
-                const response = yield hap.execute([executeGarageClose]);
-                (0, globals_1.expect)(response).toBeDefined();
-                (0, globals_1.expect)(response).toBeInstanceOf(Array);
-                (0, globals_1.expect)(response).toHaveLength(1);
-                (0, globals_1.expect)(response[0].status).toBe('SUCCESS');
-            }));
-            test('Open - 2fa Required - No Pin', () => __awaiter(void 0, void 0, void 0, function* () {
-                const response = yield hap.execute([executeGarageOpen]);
-                (0, globals_1.expect)(response).toBeDefined();
-                (0, globals_1.expect)(response).toBeInstanceOf(Array);
-                (0, globals_1.expect)(response).toHaveLength(1);
-                (0, globals_1.expect)(response[0].status).toBe('ERROR');
-                (0, globals_1.expect)(response[0].errorCode).toBe('challengeNeeded');
-                (0, globals_1.expect)(response[0].challengeNeeded).toBeDefined();
-                (0, globals_1.expect)(response[0].challengeNeeded.type).toBeDefined();
-                (0, globals_1.expect)(response[0].challengeNeeded.type).toBe('pinNeeded');
-            }));
-            test('Open - 2fa Required - incorrect PIN', () => __awaiter(void 0, void 0, void 0, function* () {
-                const response = yield hap.execute([executeGarageDoorOpenWithIncorrectPin]);
-                (0, globals_1.expect)(response).toBeDefined();
-                (0, globals_1.expect)(response).toBeInstanceOf(Array);
-                (0, globals_1.expect)(response).toHaveLength(1);
-                (0, globals_1.expect)(response[0].status).toBe('ERROR');
-                (0, globals_1.expect)(response[0].errorCode).toBe('challengeNeeded');
-                (0, globals_1.expect)(response[0].challengeNeeded).toBeDefined();
-                (0, globals_1.expect)(response[0].challengeNeeded.type).toBeDefined();
-                (0, globals_1.expect)(response[0].challengeNeeded.type).toBe('pinNeeded');
-            }));
-            test.skip('Open - 2fa Required - correct PIN', () => __awaiter(void 0, void 0, void 0, function* () {
-                const response = yield hap.execute([executeGarageDoorOpenWithCorrectPin]);
-                (0, globals_1.expect)(response).toBeDefined();
-                (0, globals_1.expect)(response).toBeInstanceOf(Array);
-                (0, globals_1.expect)(response).toHaveLength(1);
-                (0, globals_1.expect)(response[0].status).toBe('SUCCESS');
+    });
+    (0, globals_1.describe)('process the SYNC intent', () => {
+        test('Wait for HAP to be Ready', () => __awaiter(void 0, void 0, void 0, function* () {
+            while (!hap.ready) {
+                yield sleep(500);
+            }
+            console.log('hap ready, testing started');
+        }), 30000);
+        (0, globals_1.describe)('SYNC message with delay to allow manual testing', () => {
+            test('lightbulb with On/Off only', () => __awaiter(void 0, void 0, void 0, function* () {
+                const response = yield hap.buildSyncResponse();
+                (0, ts_expect_1.expectType)(response);
             }));
-            test('Close - 2fa not Required', () => __awaiter(void 0, void 0, void 0, function* () {
-                const response = yield hap.execute([executeGarageClose]);
-                (0, globals_1.expect)(response).toBeDefined();
-                (0, globals_1.expect)(response).toBeInstanceOf(Array);
-                (0, globals_1.expect)(response).toHaveLength(1);
-                (0, globals_1.expect)(response[0].status).toBe('SUCCESS');
-            }), 10000);
         });
-        afterAll(() => __awaiter(void 0, void 0, void 0, function* () {
-            console.log('destroy');
-            yield hap.destroy();
+    });
+    (0, globals_1.describe)('execute', () => {
+        test('Wait for HAP to be Ready', () => __awaiter(void 0, void 0, void 0, function* () {
+            while (!hap.ready) {
+                yield sleep(500);
+            }
+            console.log('hap ready, testing started');
+        }), 30000);
+        test('Turn Off Light', () => __awaiter(void 0, void 0, void 0, function* () {
+            const response = yield hap.execute([executeLightOff]);
+            (0, globals_1.expect)(response).toBeDefined();
+            (0, globals_1.expect)(response).toBeInstanceOf(Array);
+            (0, globals_1.expect)(response).toHaveLength(1);
+            (0, globals_1.expect)(response[0].status).toBe('SUCCESS');
         }));
     });
-    (0, globals_1.describe)('reg exp filter', () => {
-        const config = {
-            name: 'Google Smart Home',
-            token: '1234567890',
-            notice: 'Keep your token a secret!',
-            debug: false,
-            platform: 'google-smarthome',
-            twoFactorAuthPin: '1234',
-            accessoryFilter: [
-                'Bedroom',
-            ],
-            accessoryFilterInverse: true,
-        };
-        const log = new logger_1.Log(console, true);
-        const hap = new hap_1.Hap(socketMock, log, '031-45-154', config, {});
-        (0, globals_1.describe)('process the QUERY intent', () => {
-            test('wait for HAP to be Ready', () => __awaiter(void 0, void 0, void 0, function* () {
-                while (!hap.ready) {
-                    yield sleep(500);
-                }
-            }), 30000);
-        });
-        (0, globals_1.describe)('process the SYNC intent', () => {
-            test('Wait for HAP to be Ready', () => __awaiter(void 0, void 0, void 0, function* () {
-                while (!hap.ready) {
-                    yield sleep(500);
-                }
-                console.log('hap ready, testing started');
-            }), 30000);
-            (0, globals_1.describe)('SYNC Response', () => {
-                test('Sync Response is proper and filtered', () => __awaiter(void 0, void 0, void 0, function* () {
-                    const response = yield hap.buildSyncResponse();
-                    (0, ts_expect_1.expectType)(response);
-                    (0, globals_1.expect)(response).toBeDefined();
-                    (0, globals_1.expect)(response).toBeInstanceOf(Array);
-                    (0, globals_1.expect)(response).toHaveLength(4);
-                    const expectedNames = [
-                        'East Bedroom',
-                        'East Bedroom Fan',
-                        'West Bedroom',
-                        'West Bedroom Fan',
-                    ];
-                    const actualNames = response.map(device => device.name.name);
-                    (0, globals_1.expect)(actualNames).toEqual(expectedNames);
-                    if (trace) {
-                        fs_1.default.writeFileSync('buildSyncResponse.json', JSON.stringify(response, null, 2), 'utf8');
-                    }
-                }));
-            });
-        });
-        afterAll(() => __awaiter(void 0, void 0, void 0, function* () {
-            console.log('destroy');
-            yield hap.destroy();
+    (0, globals_1.describe)('Garage Door 2fa and PIN Code', () => {
+        test('Close - 2fa not Required', () => __awaiter(void 0, void 0, void 0, function* () {
+            const response = yield hap.execute([executeGarageClose]);
+            (0, globals_1.expect)(response).toBeDefined();
+            (0, globals_1.expect)(response).toBeInstanceOf(Array);
+            (0, globals_1.expect)(response).toHaveLength(1);
+            (0, globals_1.expect)(response[0].status).toBe('SUCCESS');
+        }));
+        test('Open - 2fa Required - No Pin', () => __awaiter(void 0, void 0, void 0, function* () {
+            const response = yield hap.execute([executeGarageOpen]);
+            (0, globals_1.expect)(response).toBeDefined();
+            (0, globals_1.expect)(response).toBeInstanceOf(Array);
+            (0, globals_1.expect)(response).toHaveLength(1);
+            (0, globals_1.expect)(response[0].status).toBe('ERROR');
+            (0, globals_1.expect)(response[0].errorCode).toBe('challengeNeeded');
+            (0, globals_1.expect)(response[0].challengeNeeded).toBeDefined();
+            (0, globals_1.expect)(response[0].challengeNeeded.type).toBeDefined();
+            (0, globals_1.expect)(response[0].challengeNeeded.type).toBe('pinNeeded');
+        }));
+        test('Open - 2fa Required - incorrect PIN', () => __awaiter(void 0, void 0, void 0, function* () {
+            const response = yield hap.execute([executeGarageDoorOpenWithIncorrectPin]);
+            (0, globals_1.expect)(response).toBeDefined();
+            (0, globals_1.expect)(response).toBeInstanceOf(Array);
+            (0, globals_1.expect)(response).toHaveLength(1);
+            (0, globals_1.expect)(response[0].status).toBe('ERROR');
+            (0, globals_1.expect)(response[0].errorCode).toBe('challengeNeeded');
+            (0, globals_1.expect)(response[0].challengeNeeded).toBeDefined();
+            (0, globals_1.expect)(response[0].challengeNeeded.type).toBeDefined();
+            (0, globals_1.expect)(response[0].challengeNeeded.type).toBe('pinNeeded');
+        }));
+        test.skip('Open - 2fa Required - correct PIN', () => __awaiter(void 0, void 0, void 0, function* () {
+            const response = yield hap.execute([executeGarageDoorOpenWithCorrectPin]);
+            (0, globals_1.expect)(response).toBeDefined();
+            (0, globals_1.expect)(response).toBeInstanceOf(Array);
+            (0, globals_1.expect)(response).toHaveLength(1);
+            (0, globals_1.expect)(response[0].status).toBe('SUCCESS');
         }));
+        test('Close - 2fa not Required', () => __awaiter(void 0, void 0, void 0, function* () {
+            const response = yield hap.execute([executeGarageClose]);
+            (0, globals_1.expect)(response).toBeDefined();
+            (0, globals_1.expect)(response).toBeInstanceOf(Array);
+            (0, globals_1.expect)(response).toHaveLength(1);
+            (0, globals_1.expect)(response[0].status).toBe('SUCCESS');
+        }), 10000);
     });
+    afterAll(() => __awaiter(void 0, void 0, void 0, function* () {
+        console.log('destroy');
+        yield hap.destroy();
+    }));
 });
 function sleep(ms) {
     return __awaiter(this, void 0, void 0, function* () {