pyre-cli 9.5.1 → 10.0.0

package/src/monitors/dns_cache.ts

@@ -0,0 +1,48 @@
+import dns from 'node:dns';
+
+const cache = new Map<string, string>();
+const pending = new Set<string>();
+
+export function resolveIp(ip: string): string {
+  // Extract IP if it has port (e.g., 17.242.13.5:5223 or [2606:4700...]:443)
+  let cleanIp = ip;
+  if (cleanIp.includes(']:')) {
+    cleanIp = cleanIp.substring(1, cleanIp.indexOf(']'));
+  } else if (cleanIp.includes(':') && cleanIp.split(':').length === 2) {
+    cleanIp = cleanIp.split(':')[0];
+  } else if (cleanIp.includes(':') && !cleanIp.includes(']')) {
+      // ipv6 without port or brackets? 
+      // If there's more than one colon, it's ipv6.
+      const lastColon = cleanIp.lastIndexOf(':');
+      const isPort = !cleanIp.includes(':', cleanIp.indexOf(':') + 1); // Only 1 colon means it's a port. Wait, ipv6 has many colons.
+      // E.g., 2606:4700:103::2.443 -> nettop uses `.` for port in ipv6!
+  }
+
+  // Handle nettop's IPv6 port format: 2606:4700:103::2.443 (the last dot separates the port)
+  if (cleanIp.includes(':') && cleanIp.includes('.')) {
+      const lastDot = cleanIp.lastIndexOf('.');
+      if (lastDot > cleanIp.lastIndexOf(':')) {
+          cleanIp = cleanIp.substring(0, lastDot);
+      }
+  }
+
+  if (cache.has(cleanIp)) return cache.get(cleanIp)!;
+  if (pending.has(cleanIp)) return ip;
+  
+  // Don't resolve local/multicast/broadcast
+  if (cleanIp.startsWith('127.') || cleanIp.startsWith('192.168.') || cleanIp.startsWith('10.') || cleanIp.startsWith('172.16.') || cleanIp.startsWith('ff02:') || cleanIp === '*:*' || cleanIp === '*' || cleanIp.startsWith('fe80:')) {
+    return ip;
+  }
+
+  pending.add(cleanIp);
+  dns.reverse(cleanIp, (err, hostnames) => {
+    if (!err && hostnames && hostnames.length > 0) {
+      cache.set(cleanIp, hostnames[0]);
+    } else {
+      cache.set(cleanIp, cleanIp); // don't try again
+    }
+    pending.delete(cleanIp);
+  });
+  
+  return ip;
+}

package/src/monitors/index.ts

@@ -10,5 +10,6 @@
  * - `collectors.ts` — individual metric collectors and the orchestrator
  * - `run.ts`   — shared shell-execution helper
  */
-export { collectAll, collectPower, collectPackets, collectTasks } from './collectors.js';
-export type { StatsData, CpuData, MemoryData, ThermalData, BatteryData, PowerData, DiskData, NetworkData, ProcessData, GpuData, PacketData, NetworkProcess, TaskData } from './types.js';
+export { collectAll, collectPower, collectPackets, collectTasks, collectContainers } from './collectors.js';
+export { collectBlenderRenders } from './blender.js';
+export type { StatsData, CpuData, MemoryData, ThermalData, BatteryData, PowerData, DiskData, NetworkData, ProcessData, GpuData, PacketData, NetworkProcess, TaskData, ContainerData, BlenderRenderData } from './types.js';

package/src/monitors/ioreport.py

@@ -0,0 +1,72 @@
+import ctypes, ctypes.util, json, time, sys
+
+try:
+    libIOReport = ctypes.cdll.LoadLibrary('/usr/lib/libIOReport.dylib')
+    CF = ctypes.cdll.LoadLibrary(ctypes.util.find_library('CoreFoundation'))
+    CFStringRef = ctypes.c_void_p
+    CFDictionaryRef = ctypes.c_void_p
+    CFArrayRef = ctypes.c_void_p
+    CFIndex = ctypes.c_long
+
+    CF.CFStringCreateWithCString.restype = CFStringRef
+    CF.CFStringCreateWithCString.argtypes = [ctypes.c_void_p, ctypes.c_char_p, ctypes.c_uint32]
+    CF.CFStringGetCString.restype = ctypes.c_bool
+    CF.CFStringGetCString.argtypes = [CFStringRef, ctypes.c_char_p, CFIndex, ctypes.c_uint32]
+    CF.CFDictionaryGetValue.restype = ctypes.c_void_p
+    CF.CFDictionaryGetValue.argtypes = [CFDictionaryRef, ctypes.c_void_p]
+    CF.CFArrayGetCount.restype = CFIndex
+    CF.CFArrayGetCount.argtypes = [CFArrayRef]
+    CF.CFArrayGetValueAtIndex.restype = ctypes.c_void_p
+    CF.CFArrayGetValueAtIndex.argtypes = [CFArrayRef, CFIndex]
+
+    def cf_str(t):
+        return CF.CFStringCreateWithCString(None, t.encode('utf-8'), 0x08000100)
+
+    def cf_to_str(c):
+        if not c: return ''
+        b = ctypes.create_string_buffer(128)
+        return b.value.decode('utf-8') if CF.CFStringGetCString(c, b, 128, 0x08000100) else ''
+
+    libIOReport.IOReportCopyChannelsInGroup.restype = CFDictionaryRef
+    libIOReport.IOReportCopyChannelsInGroup.argtypes = [CFStringRef, CFStringRef, ctypes.c_uint64, ctypes.c_uint64, ctypes.c_uint64]
+    libIOReport.IOReportCreateSubscription.restype = ctypes.c_void_p
+    libIOReport.IOReportCreateSubscription.argtypes = [ctypes.c_void_p, CFDictionaryRef, ctypes.POINTER(CFDictionaryRef), ctypes.c_uint64, ctypes.c_void_p]
+    libIOReport.IOReportCreateSamples.restype = CFDictionaryRef
+    libIOReport.IOReportCreateSamples.argtypes = [ctypes.c_void_p, CFDictionaryRef, ctypes.c_void_p]
+    libIOReport.IOReportCreateSamplesDelta.restype = CFDictionaryRef
+    libIOReport.IOReportCreateSamplesDelta.argtypes = [CFDictionaryRef, CFDictionaryRef, ctypes.c_void_p]
+    libIOReport.IOReportChannelGetChannelName.restype = CFStringRef
+    libIOReport.IOReportChannelGetChannelName.argtypes = [CFDictionaryRef]
+    libIOReport.IOReportChannelGetUnitLabel.restype = CFStringRef
+    libIOReport.IOReportChannelGetUnitLabel.argtypes = [CFDictionaryRef]
+    libIOReport.IOReportSimpleGetIntegerValue.restype = ctypes.c_int64
+    libIOReport.IOReportSimpleGetIntegerValue.argtypes = [CFDictionaryRef, ctypes.c_int32]
+
+    ch = libIOReport.IOReportCopyChannelsInGroup(cf_str('Energy Model'), None, 0, 0, 0)
+    sub_ch = CFDictionaryRef()
+    sub = libIOReport.IOReportCreateSubscription(None, ch, ctypes.byref(sub_ch), 0, None)
+    s1 = libIOReport.IOReportCreateSamples(sub, sub_ch, None)
+    dt = 0.08
+    time.sleep(dt)
+    s2 = libIOReport.IOReportCreateSamples(sub, sub_ch, None)
+    delta = libIOReport.IOReportCreateSamplesDelta(s1, s2, None)
+    arr = CF.CFDictionaryGetValue(delta, cf_str('IOReportChannels'))
+    cnt = CF.CFArrayGetCount(arr)
+    cpu_w = 0.0
+    gpu_w = 0.0
+    ane_w = 0.0
+    for i in range(cnt):
+        item = CF.CFArrayGetValueAtIndex(arr, i)
+        n = cf_to_str(libIOReport.IOReportChannelGetChannelName(item))
+        if n in ('GPU Energy', 'CPU Energy', 'ANE'):
+            u = cf_to_str(libIOReport.IOReportChannelGetUnitLabel(item))
+            v = libIOReport.IOReportSimpleGetIntegerValue(item, 0)
+            sc = 1e9 if u == 'nJ' else (1e6 if u == 'uJ' else 1e3)
+            w = round((v / sc) / dt, 2)
+            if n == 'CPU Energy': cpu_w = w
+            elif n == 'GPU Energy': gpu_w = w
+            elif n == 'ANE': ane_w = w
+    combined_w = round(cpu_w + gpu_w + ane_w, 2)
+    print(json.dumps({'cpuWatts': cpu_w, 'gpuWatts': gpu_w, 'aneWatts': ane_w, 'combinedWatts': combined_w}))
+except Exception:
+    print('{}')