v2c-any 0.4.1 → 0.4.2

package/dist/adapter/adapter-factory.js

@@ -0,0 +1 @@
+export {};

package/dist/application-context.js

@@ -7,12 +7,12 @@ import { logger } from './utils/logger.js';
  * Registry of device provider factories keyed by device identifier.
  * Each factory produces an `EM1Status` provider for a specific device.
  */
-export const devicesProviderRegistry = new Registry();
+export const devicesProviderFactoryRegistry = new Registry();
 /**
  * Registry of device adapters keyed by device identifier.
  * Each adapter transforms raw device messages into `EnergyInformation`.
  */
-export const devicesAdapterRegistry = new Registry();
+export const devicesAdapterFactoryRegistry = new Registry();
 /**
  * Dynamically loads all device modules discovered under devices.
  * Imports each module to allow self-registration into application registries.

package/dist/device/shelly-pro-em/energy-information-em1-notify-status-adapter.js

@@ -1,10 +1,20 @@
-export class EnergyInformationEM1NotifyStatusAdapter {
+import { energyTypeToId } from '../../utils/mappers.js';
+class EnergyInformationEM1NotifyStatusAdapter {
+    constructor(energyType) {
+        this.id = energyTypeToId(energyType);
+    }
     adapt(input) {
-        const em1Status = input.params['em1:1'];
+        const key = `em1:${this.id}`;
+        const em1Status = input.params[key];
         if (em1Status !== undefined) {
             return Promise.resolve({ power: em1Status.act_power });
         }
         return Promise.resolve(undefined);
     }
 }
-export const energyInformationEM1NotifyStatusAdapter = new EnergyInformationEM1NotifyStatusAdapter();
+class EnergyInformationEM1NotifyStatusAdapterFactory {
+    create(options) {
+        return new EnergyInformationEM1NotifyStatusAdapter(options.energyType);
+    }
+}
+export const energyInformationEM1NotifyStatusAdapterFactory = new EnergyInformationEM1NotifyStatusAdapterFactory();

package/dist/device/shelly-pro-em/energy-information-em1-status-adapter.js

@@ -21,4 +21,9 @@ class EnergyInformationEM1StatusAdapter {
  * Singleton adapter instance for converting `EM1Status` to `EnergyInformation`.
  * Use this ready-to-use instance where an adapter object is required.
  */
-export const energyInformationEM1StatusAdapter = new EnergyInformationEM1StatusAdapter();
+const energyInformationEM1StatusAdapter = new EnergyInformationEM1StatusAdapter();
+export const energyInformationEM1StatusAdapterFactory = {
+    create() {
+        return energyInformationEM1StatusAdapter;
+    },
+};

package/dist/device/shelly-pro-em/index.js

@@ -1,10 +1,10 @@
-import { devicesAdapterRegistry, devicesProviderRegistry, } from '../../application-context.js';
+import { devicesAdapterFactoryRegistry, devicesProviderFactoryRegistry, } from '../../application-context.js';
 import { logger } from '../../utils/logger.js';
-import { energyInformationEM1StatusAdapter } from './energy-information-em1-status-adapter.js';
+import { energyInformationEM1StatusAdapterFactory } from './energy-information-em1-status-adapter.js';
 import { em1StatusProviderFactory } from './em1-status-provider.js';
-import { energyInformationEM1NotifyStatusAdapter } from './energy-information-em1-notify-status-adapter.js';
+import { energyInformationEM1NotifyStatusAdapterFactory } from './energy-information-em1-notify-status-adapter.js';
 const DEVICE_NAME = 'shelly-pro-em';
-devicesProviderRegistry.register(DEVICE_NAME, em1StatusProviderFactory);
-devicesAdapterRegistry.register(DEVICE_NAME, energyInformationEM1StatusAdapter);
-devicesAdapterRegistry.register(`${DEVICE_NAME}-notification`, energyInformationEM1NotifyStatusAdapter);
+devicesProviderFactoryRegistry.register(DEVICE_NAME, em1StatusProviderFactory);
+devicesAdapterFactoryRegistry.register(DEVICE_NAME, energyInformationEM1StatusAdapterFactory);
+devicesAdapterFactoryRegistry.register(`${DEVICE_NAME}-notification`, energyInformationEM1NotifyStatusAdapterFactory);
 logger.info('Shelly Pro EM registered');

package/dist/factory/mqtt-pull-executable-service-factory.js

@@ -33,10 +33,13 @@ export class MqttPullExecutableServiceFactory {
                 if (!providerFactory) {
                     throw new Error(`No provider registered for device: ${device}`);
                 }
-                const adapter = this.adapterRegistry.get(device);
-                if (!adapter) {
+                const adapterFactory = this.adapterRegistry.get(device);
+                if (!adapterFactory) {
                     throw new Error(`No adapter registered for device: ${device}`);
                 }
+                const adapter = adapterFactory.create({
+                    energyType: options.energyType,
+                });
                 return {
                     providerFactory: new AdapterProviderFactory(providerFactory, adapter),
                     interval: options.configuration.properties.interval,

package/dist/factory/mqtt-push-executable-service-factory.js

@@ -28,7 +28,7 @@ export class MqttPushExecutableServiceFactory {
                 if (!adapter) {
                     throw new Error(`No adapter registered for device: ${device}`);
                 }
-                return new MqttBridgeService(options.configuration.properties, options.callbackProperties, adapter);
+                return new MqttBridgeService(options.configuration.properties, options.callbackProperties, adapter.create({ energyType: options.energyType }));
             }
             case 'off':
                 return noOpExecutableService;

package/dist/index.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { devicesAdapterRegistry, devicesProviderRegistry, loadDeviceModules, } from './application-context.js';
+import { devicesAdapterFactoryRegistry as devicesAdapterFactoryRegistry, devicesProviderFactoryRegistry as devicesProviderFactoryRegistry, loadDeviceModules, } from './application-context.js';
 import { ConfigurationLoader } from './configuration/configuration-loader.js';
 import { ConfigurationValidator } from './configuration/configuration-validator.js';
 import { logger } from './utils/logger.js';
@@ -17,11 +17,11 @@ async function main() {
     let executableServiceFactory;
     switch (configuration.provider) {
         case 'rest': {
-            executableServiceFactory = new RestServiceFactory(new EM1StatusProviderFactory(devicesProviderRegistry));
+            executableServiceFactory = new RestServiceFactory(new EM1StatusProviderFactory(devicesProviderFactoryRegistry));
             break;
         }
         case 'mqtt': {
-            const mqttFeedExecutableServiceFactory = new MqttFeedExecutableServiceFactory(new MqttPullExecutableServiceFactory(devicesProviderRegistry, devicesAdapterRegistry), new MqttPushExecutableServiceFactory(devicesAdapterRegistry));
+            const mqttFeedExecutableServiceFactory = new MqttFeedExecutableServiceFactory(new MqttPullExecutableServiceFactory(devicesProviderFactoryRegistry, devicesAdapterFactoryRegistry), new MqttPushExecutableServiceFactory(devicesAdapterFactoryRegistry));
             executableServiceFactory = new MqttServiceFactory(mqttFeedExecutableServiceFactory);
             break;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "v2c-any",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "type": "module",
   "description": "Turn any device into V2C Dynamic Power Control",
   "main": "dist/index.js",