@phystack/device-phyos 6.15.1 → 6.15.3

package/dist/index.js

@@ -71,7 +71,7 @@ function getSystemdJournalGid() {
     try {
         const groupFile = fs_1.default.readFileSync('/etc/group', 'utf8');
         const groups = groupFile.split('\n');
-        const journalGroup = groups.find(line => line.startsWith('systemd-journal:'));
+        const journalGroup = groups.find((line) => line.startsWith('systemd-journal:'));
         if (!journalGroup) {
             throw new Error('systemd-journal group not found');
         }
@@ -166,6 +166,7 @@ class DevicePhyos {
     GRID_ENV;
     PHYOS_VERSION;
     firstConnect;
+    orphanSweepInFlight = false;
     phyHubInterval;
     logger;
     scheduler = new scheduler_service_1.Scheduler();
@@ -187,12 +188,12 @@ class DevicePhyos {
         await this.initializeTimeSync();
         this.logger.info(`Starting device phyos service 🟢-⚪-⚪-⚪-⚪`, {
             GRID_ENV: this.GRID_ENV,
-            PHYOS_VERSION: this.PHYOS_VERSION
+            PHYOS_VERSION: this.PHYOS_VERSION,
         });
     }
     async initializeEnvironment() {
         try {
-            this.GRID_ENV = await fs_1.default.promises.readFile(phyosEnvPath, 'utf8').then(data => data.trim() || 'LOCAL');
+            this.GRID_ENV = await fs_1.default.promises.readFile(phyosEnvPath, 'utf8').then((data) => data.trim() || 'LOCAL');
             this.logger.info('initializeEnvironment(): Setting grid environment', {
                 GRID_ENV: this.GRID_ENV,
             });
@@ -202,9 +203,9 @@ class DevicePhyos {
             this.GRID_ENV = 'PROD';
         }
         try {
-            this.PHYOS_VERSION = await fs_1.default.promises.readFile(phyosVersionPath, 'utf8').then(data => data.trim());
+            this.PHYOS_VERSION = await fs_1.default.promises.readFile(phyosVersionPath, 'utf8').then((data) => data.trim());
             this.logger.info('initializeEnvironment(): Setting PhyOS version', {
-                PHYOS_VERSION: this.PHYOS_VERSION
+                PHYOS_VERSION: this.PHYOS_VERSION,
             });
         }
         catch (error) {
@@ -247,6 +248,21 @@ class DevicePhyos {
             this.logger.info('initializeCachedInstances(): No valid twins to initialize');
         }
     }
+    async sweepOrphanedContainers() {
+        if (this.orphanSweepInFlight) {
+            return;
+        }
+        this.orphanSweepInFlight = true;
+        try {
+            await instances_1.dockerManager.sweepOrphanedContainers(async () => {
+                const twinsByType = (await this.twinManager.getCachedTwins());
+                return Object.values(twinsByType).flat();
+            });
+        }
+        finally {
+            this.orphanSweepInFlight = false;
+        }
+    }
     async connectPhyHub(hubDevice) {
         this.twinManager = await (0, twin_manager_1.getTwinManagerInstance)();
         this.twinManager.setHubDevice(hubDevice);
@@ -256,10 +272,14 @@ class DevicePhyos {
             this.logger.info('connectPhyHub(): Device authenticated, resubscribing twins...');
             await edge_hub_1.EdgeHubServer.getInstance().resubscribeAllTwins();
             try {
-                const cachedTwinsInfo = await this.twinManager.getCachedTwins();
-                if (cachedTwinsInfo && typeof cachedTwinsInfo === 'object' && 'Device' in cachedTwinsInfo && Array.isArray(cachedTwinsInfo.Device) && cachedTwinsInfo.Device.length > 0) {
+                const cachedTwinsInfo = (await this.twinManager.getCachedTwins());
+                if (cachedTwinsInfo &&
+                    typeof cachedTwinsInfo === 'object' &&
+                    'Device' in cachedTwinsInfo &&
+                    Array.isArray(cachedTwinsInfo.Device) &&
+                    cachedTwinsInfo.Device.length > 0) {
                     const deviceTwinId = cachedTwinsInfo.Device[0];
-                    const deviceTwin = await this.twinManager.getCachedTwins(deviceTwinId);
+                    const deviceTwin = (await this.twinManager.getCachedTwins(deviceTwinId));
                     if (deviceTwin && deviceTwin.type === 'Device' && 'properties' in deviceTwin && deviceTwin.properties) {
                         const deviceProps = deviceTwin.properties;
                         const jobs = deviceProps.reported?.jobs || [];
@@ -275,6 +295,33 @@ class DevicePhyos {
         });
         await hubDevice.connect();
         this.logger.info('connectPhyHub(): Connected to PhyHub');
+        hubDevice.setTwinUpdateHandler(async (twin) => {
+            this.logger.info('connectPhyHub() on setTwinUpdateHandler(): Twin update received, updating instance...');
+            await this.twinManager.cacheHubTwin(twin);
+            instances_1.dockerManager.markTwinAlive(twin.id);
+            if (twin.type === 'Device' && twin.properties?.desired?.timezone) {
+                try {
+                    const region = JSON.parse(fs_1.default.readFileSync(regionFilePath, 'utf8'));
+                    const proxyConfig = {
+                        region,
+                        port: 443,
+                        username: twin.deviceId,
+                        password: 'device',
+                        timezone: twin.properties.desired.timezone,
+                    };
+                    this.logger.info('connectPhyHub(): Updating environment with:', proxyConfig);
+                    await (0, environment_1.setTZinEnvFile)(twin.properties.desired.timezone);
+                }
+                catch (error) {
+                    this.logger.error('connectPhyHub(): Failed to update environment with new timezone:', error);
+                }
+            }
+            await (0, instances_1.updateInstances)(this.twinManager, [(await this.twinManager.getCachedTwins(twin.id))]);
+        });
+        hubDevice.setTwinRemoveHandler(async (twin) => {
+            this.logger.info('connectPhyHub() on setTwinRemoveHandler(): Twin remove event received, removing instance twin...', twin);
+            await (0, instances_1.removeInstances)(this.twinManager, [twin]);
+        });
         hubDevice.connectDevice(async (response) => {
             const { twins } = response;
             console.log('connectPhyHub(): response', response);
@@ -307,7 +354,7 @@ class DevicePhyos {
                             port: 443,
                             username: deviceId,
                             password: 'device',
-                            timezone: deviceTwin?.properties?.desired?.timezone || 'Etc/UTC'
+                            timezone: deviceTwin?.properties?.desired?.timezone || 'Etc/UTC',
                         };
                         this.logger.info('connectPhyHub(): Environment contains unprovisioned username, configuring with device credentials:', proxyConfig);
                         await (0, environment_1.setEnvironmentConfiguration)(proxyConfig);
@@ -327,45 +374,23 @@ class DevicePhyos {
             if (twins?.length) {
                 this.logger.info('connectPhyHub(): Caching twins from server response...');
                 await Promise.all(twins.map((twin) => this.twinManager.cacheHubTwin(twin)));
+                for (const twin of twins) {
+                    instances_1.dockerManager.markTwinAlive(twin.id);
+                }
                 this.logger.info(`connectPhyHub(): Cached ${twins.length} twins from hub`);
-                const twinsByType = await this.twinManager.getCachedTwins();
+                const twinsByType = (await this.twinManager.getCachedTwins());
                 const allTwinIds = Object.values(twinsByType).flat();
                 this.logger.info(`connectPhyHub(): Found ${allTwinIds.length} total twins after caching`);
-                const allTwins = await Promise.all(allTwinIds.map(id => this.twinManager.getCachedTwins(id)));
+                const allTwins = await Promise.all(allTwinIds.map((id) => this.twinManager.getCachedTwins(id)));
                 console.log(`connectPhyHub(): allTwins ${allTwins.length}`);
                 await (0, instances_1.initInstances)(this.twinManager, allTwins);
                 await (0, methods_1.initMethods)(hubDevice);
+                this.sweepOrphanedContainers().catch((error) => {
+                    this.logger.error('connectPhyHub(): Failed to sweep orphaned containers', error);
+                });
             }
         });
         await this.initializeCachedInstances(this.twinManager);
-        hubDevice.setTwinUpdateHandler(async (twin) => {
-            this.logger.info('connectPhyHub() on setTwinUpdateHandler(): Twin update received, updating instance...');
-            await this.twinManager.cacheHubTwin(twin);
-            if (twin.type === 'Device' && twin.properties?.desired?.timezone) {
-                try {
-                    const region = JSON.parse(fs_1.default.readFileSync(regionFilePath, 'utf8'));
-                    const proxyConfig = {
-                        region,
-                        port: 443,
-                        username: twin.deviceId,
-                        password: 'device',
-                        timezone: twin.properties.desired.timezone
-                    };
-                    this.logger.info('connectPhyHub(): Updating environment with:', proxyConfig);
-                    await (0, environment_1.setTZinEnvFile)(twin.properties.desired.timezone);
-                }
-                catch (error) {
-                    this.logger.error('connectPhyHub(): Failed to update environment with new timezone:', error);
-                }
-            }
-            await (0, instances_1.updateInstances)(this.twinManager, [
-                (await this.twinManager.getCachedTwins(twin.id)),
-            ]);
-        });
-        hubDevice.setTwinRemoveHandler(async (twin) => {
-            this.logger.info('connectPhyHub() on setTwinRemoveHandler(): Twin remove event received, removing instance twin...', twin);
-            await (0, instances_1.removeInstances)(this.twinManager, [twin]);
-        });
         hubDevice.on('setCACertificate', async (payload, callback) => {
             try {
                 const config = payload.data;
@@ -444,7 +469,7 @@ class DevicePhyos {
                 this.scheduler = new scheduler_service_1.Scheduler();
                 this.logger.info('start(): Created new scheduler instance');
             }
-            (0, edge_hub_1.startEdgeHub)().catch(error => {
+            (0, edge_hub_1.startEdgeHub)().catch((error) => {
                 this.logger.error('start(): Error starting edgeHub messaging', error);
             });
             this.phyHubInterval = setInterval(() => this.getPhyHub(), 30000);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phystack/device-phyos",
-  "version": "6.15.1",
+  "version": "6.15.3",
   "description": "PhyOS device agent",
   "main": "dist/index.js",
   "license": "UNLICENSED",
@@ -25,9 +25,9 @@
     "format": "prettier --write \"src/**/*.{ts,js,json,md}\""
   },
   "optionalDependencies": {
-    "@phystack/phydevice-darwin-arm64": "6.15.1",
-    "@phystack/phydevice-darwin-x64": "6.15.1",
-    "@phystack/phydevice-linux-arm64": "6.15.1",
-    "@phystack/phydevice-linux-x64": "6.15.1"
+    "@phystack/phydevice-darwin-arm64": "6.15.3",
+    "@phystack/phydevice-darwin-x64": "6.15.3",
+    "@phystack/phydevice-linux-arm64": "6.15.3",
+    "@phystack/phydevice-linux-x64": "6.15.3"
   }
 }