@camera.ui/server 2.0.22 → 2.0.24

package/dist/server/src/plugins/runtime/node/proxy/sensor.d.ts

@@ -9,25 +9,36 @@ export declare class SensorProxy implements SensorLike {
         timestamp: number;
     }>;
     readonly onCapabilitiesChanged: Observable<string[]>;
+    readonly onConnectedChanged: Observable<boolean>;
+    readonly onAssignmentChanged: Observable<readonly string[]>;
     private _id;
     private _type;
     private _name;
     private _displayName;
+    private _nativeId?;
     private _ownerId;
-    private _cameraId;
+    private _assignedCameraIds;
+    private _assignmentLocked;
+    private _exposed;
+    private _connected;
     private _proxy;
     private _properties;
     private _capabilities;
     private _rpcProxy;
     private _eventSubscription?;
-    constructor(data: StoredSensorData, proxy: RPCClient, ownerNamespace: string, cameraId: string);
+    constructor(data: StoredSensorData, proxy: RPCClient, ownerNamespace: string);
     get id(): string;
     get type(): SensorType;
     get name(): string;
     get displayName(): string;
-    setDisplayName(value: string): void;
     get pluginId(): string | undefined;
+    get nativeId(): string | undefined;
+    get assignedCameraIds(): readonly string[];
+    get assignmentLocked(): boolean;
+    get connected(): boolean;
+    get exposed(): boolean;
     get capabilities(): string[];
+    setDisplayName(value: string): void;
     hasCapability(capability: string): boolean;
     getValue(property: string): unknown;
     getValues(): Readonly<Record<string, unknown>>;
@@ -36,6 +47,9 @@ export declare class SensorProxy implements SensorLike {
     _applyRefreshedState(state: SensorRefreshedState): void;
     _setDisplayName(displayName: string): void;
     _updateCapabilities(capabilities: string[]): void;
+    _setConnected(connected: boolean): void;
+    _setAssignedCameras(cameraIds: string[]): void;
+    _setExposed(exposed: boolean): void;
     _subscribeToEvents(): void;
     _unsubscribeFromEvents(): void;
     private _handleSensorEvent;

package/dist/server/src/plugins/runtime/node/proxy/sensor.js

@@ -1,34 +1,47 @@
+import { isEqual } from '@camera.ui/common/utils';
 import { Subject } from '@camera.ui/sdk';
-import { computeSensorGlobalId, computeSensorStableId } from '../../../../camera/sensors/stable-id.js';
 import { NamespaceManager } from '../../../../rpc/namespaces.js';
-// Cross-process consumer proxy: caches sensor state from broadcasts, forwards Control writes via RPC.
 export class SensorProxy {
     onPropertyChanged;
     onCapabilitiesChanged;
+    onConnectedChanged;
+    onAssignmentChanged;
     #propertyChangedSubject = new Subject();
     #capabilitiesChangedSubject = new Subject();
+    #connectedChangedSubject = new Subject();
+    #assignmentChangedSubject = new Subject();
     _id;
     _type;
     _name;
     _displayName;
+    _nativeId;
     _ownerId;
-    _cameraId;
+    _assignedCameraIds;
+    _assignmentLocked;
+    _exposed;
+    _connected;
     _proxy;
     _properties = new Map();
     _capabilities = [];
     _rpcProxy;
     _eventSubscription;
-    constructor(data, proxy, ownerNamespace, cameraId) {
+    constructor(data, proxy, ownerNamespace) {
         this._id = data.id;
         this._type = data.type;
         this._name = data.name;
         this._displayName = data.displayName ?? data.name;
+        this._nativeId = data.nativeId;
         this._ownerId = data.pluginId;
-        this._cameraId = cameraId;
+        this._assignedCameraIds = [...data.assignedCameraIds];
+        this._assignmentLocked = data.boundCameraId !== undefined;
+        this._exposed = data.exposed;
+        this._connected = data.connected;
         this._proxy = proxy;
         this._capabilities = data.capabilities ?? [];
         this.onPropertyChanged = this.#propertyChangedSubject.asObservable();
         this.onCapabilitiesChanged = this.#capabilitiesChangedSubject.asObservable();
+        this.onConnectedChanged = this.#connectedChangedSubject.asObservable();
+        this.onAssignmentChanged = this.#assignmentChangedSubject.asObservable();
         // RPC directly to owner - for Control sensors
         this._rpcProxy = proxy.createProxy(ownerNamespace);
         for (const [key, value] of Object.entries(data.properties)) {
@@ -47,15 +60,30 @@ export class SensorProxy {
     get displayName() {
         return this._displayName;
     }
-    setDisplayName(value) {
-        this._displayName = value;
-    }
     get pluginId() {
         return this._ownerId;
     }
+    get nativeId() {
+        return this._nativeId;
+    }
+    get assignedCameraIds() {
+        return this._assignedCameraIds;
+    }
+    get assignmentLocked() {
+        return this._assignmentLocked;
+    }
+    get connected() {
+        return this._connected;
+    }
+    get exposed() {
+        return this._exposed;
+    }
     get capabilities() {
         return this._capabilities;
     }
+    setDisplayName(value) {
+        this._displayName = value;
+    }
     hasCapability(capability) {
         return this._capabilities.includes(capability);
     }
@@ -65,25 +93,24 @@ export class SensorProxy {
     getValues() {
         return Object.fromEntries(this._properties);
     }
-    // Forwards to the owning sensor's `updateValue` via RPC. On the owning side
-    // the dispatch lands on the sensor instance — for control sensors that override
-    // `updateValue` (Light, Switch, Siren, Lock, Garage, SecuritySystem, PTZ), the
-    // call routes through the appropriate semantic method (`setOn`, `setActive`, etc.)
-    // so plugin overrides drive hardware and state stays consistent.
     async updateValue(property, value) {
         await this._rpcProxy.updateValue(property, value);
     }
     _updateCachedValue(property, value, timestamp) {
+        if (isEqual(this._properties.get(property), value, true))
+            return;
         this._properties.set(property, value);
         this.#propertyChangedSubject.next({ property, value, timestamp: timestamp ?? Date.now() });
     }
     _applyRefreshedState(state) {
-        this._capabilities = state.capabilities;
         if (state.displayName) {
             this.setDisplayName(state.displayName);
         }
-        for (const [key, value] of Object.entries(state.properties)) {
-            this._updateCachedValue(key, value);
+        if (!isEqual(this._capabilities, state.capabilities, true)) {
+            this._updateCapabilities(state.capabilities);
+        }
+        for (const [property, value] of Object.entries(state.properties)) {
+            this._updateCachedValue(property, value);
         }
     }
     _setDisplayName(displayName) {
@@ -93,10 +120,23 @@ export class SensorProxy {
         this._capabilities = capabilities;
         this.#capabilitiesChangedSubject.next(capabilities);
     }
+    _setConnected(connected) {
+        if (this._connected === connected)
+            return;
+        this._connected = connected;
+        this.#connectedChangedSubject.next(connected);
+    }
+    _setAssignedCameras(cameraIds) {
+        this._assignedCameraIds = [...cameraIds];
+        this.#assignmentChangedSubject.next(this._assignedCameraIds);
+    }
+    _setExposed(exposed) {
+        this._exposed = exposed;
+    }
     _subscribeToEvents() {
         if (this._eventSubscription)
             return;
-        const namespace = NamespaceManager.sensorEventNamespaces(this._cameraId, this.id);
+        const namespace = NamespaceManager.sensorEventNamespaces(this.id);
         this._proxy
             .subscribe(namespace.sensorSubject, (event) => {
             this._handleSensorEvent(event);
@@ -131,15 +171,16 @@ export class SensorProxy {
         }
     }
     toStoredData() {
-        const stableId = computeSensorStableId(this._ownerId, this.type, this.name);
         return {
             id: this.id,
-            stableId,
-            globalId: computeSensorGlobalId(this._cameraId, stableId),
             type: this.type,
             name: this.name,
             displayName: this.displayName,
+            nativeId: this._nativeId,
             pluginId: this._ownerId,
+            assignedCameraIds: [...this._assignedCameraIds],
+            exposed: this._exposed,
+            connected: this._connected,
             properties: this.getValues(),
             capabilities: this._capabilities,
         };

package/dist/server/src/plugins/runtime/node/proxy/sensor.js.map

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

package/dist/server/src/plugins/runtime/node/proxy/sensorManager.d.ts

@@ -0,0 +1,18 @@
+import type { Logger } from '@camera.ui/common';
+import type { RPCClient } from '@camera.ui/rpc';
+import type { BasePlugin, PluginInfo, Sensor, SensorManager } from '@camera.ui/sdk';
+import type { StorageController } from '../storageController.js';
+export declare class SensorManagerProxy implements SensorManager {
+    #private;
+    constructor(proxy: RPCClient, storageController: StorageController, plugin: PluginInfo, logger: Logger);
+    setPlugin(plugin: BasePlugin): void;
+    init(): Promise<void>;
+    addSensor(sensor: Sensor<any, any, any>): Promise<void>;
+    removeSensor(sensor: Sensor<any, any, any>): Promise<void>;
+    getSensors(): Sensor<any, any, any>[];
+    /** @internal Keeps a camera-registered sensor's assignedCameraIds in sync with the global stream. */
+    _trackCameraSensor(sensor: Sensor<any, any, any>): Promise<void>;
+    /** @internal */
+    _untrackCameraSensor(sensorId: string): void;
+    close(): Promise<void>;
+}

package/dist/server/src/plugins/runtime/node/proxy/sensorManager.js

@@ -0,0 +1,269 @@
+import { NamespaceManager } from '../../../../rpc/namespaces.js';
+import { getDetectionTypes } from '../../../../sensors/types.js';
+import { watchReconnect } from './reconnect.js';
+import { SensorProxy } from './sensor.js';
+const DETECTION_SENSOR_TYPES = new Set(getDetectionTypes());
+export class SensorManagerProxy {
+    #proxy;
+    #storageController;
+    #plugin;
+    #logger;
+    #pluginInstance;
+    #owned = new Map();
+    #cleanups = new Map();
+    #external = new Map();
+    #consumed = new Map();
+    #globalUnsubscribe;
+    #stopReconnectWatch;
+    constructor(proxy, storageController, plugin, logger) {
+        this.#proxy = proxy;
+        this.#storageController = storageController;
+        this.#plugin = plugin;
+        this.#logger = logger;
+    }
+    setPlugin(plugin) {
+        this.#pluginInstance = plugin;
+    }
+    get #registryProxy() {
+        const ns = NamespaceManager.sensorRegistryNamespaces();
+        return this.#proxy.createProxy(ns.sensorsRpc);
+    }
+    get #consumesSomething() {
+        return (this.#plugin.contract.consumes?.length ?? 0) > 0;
+    }
+    async init() {
+        if (!this.#consumesSomething)
+            return;
+        await this.#ensureGlobalSubscription();
+        try {
+            const sensors = await this.#registryProxy.getSensors(this.#plugin.id);
+            for (const data of sensors) {
+                if (!this.#isConsumable(data))
+                    continue;
+                this.#addConsumed(data);
+            }
+        }
+        catch {
+            // registry not reachable yet, sensors arrive via events
+        }
+        await this.#pluginInstance?.configureSensors?.(Array.from(this.#consumed.values()));
+    }
+    async addSensor(sensor) {
+        // pre-standalone SDK: its toJSON reads the removed cameraId getter and throws, drop the guard with the stub window
+        if (typeof sensor._setId !== 'function') {
+            this.#logger.warn(`Plugin "${this.#plugin.id}" uses a pre-standalone SDK, sensor "${sensor.name}" stays unavailable. Update the plugin.`);
+            return;
+        }
+        // producers need the global stream too: assignment changes must reach
+        // owned sensors, their detection fan-out reads assignedCameraIds
+        await this.#ensureGlobalSubscription();
+        sensor._setPluginId(this.#plugin.id);
+        const sensorJSON = sensor.toJSON();
+        sensorJSON.requiresFrames = sensor._requiresFrames === true;
+        // resolve the durable id first and wire storage with it, so registration
+        // data (modelSpec) can read sensor storage
+        const sensorId = await this.#registryProxy.resolveSensor(sensorJSON, this.#plugin.id);
+        sensor._setId(sensorId);
+        sensorJSON.id = sensorId;
+        const storage = this.#storageController.createSensorStorage(this.#plugin.id, sensor.id, sensor.storageSchema ?? []);
+        await storage.registerStorage();
+        sensor._setStorage(storage);
+        const modelSpec = sensor.modelSpec;
+        if (modelSpec) {
+            sensorJSON.modelSpec = modelSpec;
+        }
+        const registration = await this.#registryProxy.registerSensor(sensorJSON, this.#plugin.id);
+        sensor._setAssignedCameras(registration.assignedCameraIds);
+        const sensorNamespace = NamespaceManager.sensorProviderNamespaces(this.#plugin.id, sensor.id).sensorRpc;
+        sensor._init(async (properties) => {
+            if (DETECTION_SENSOR_TYPES.has(sensor.type)) {
+                // external detection provider: fan the write into every assigned camera's coordinator
+                for (const cameraId of sensor.assignedCameraIds) {
+                    const detectionNs = NamespaceManager.frameWorkerDetectionNamespaces(cameraId);
+                    const coordinator = this.#proxy.createProxy(detectionNs.detectionRpc);
+                    coordinator.reportSensorWrite(sensor.id, sensor.type, properties).catch(() => { });
+                }
+                return;
+            }
+            await this.#registryProxy.updatePropertyValues(sensor.id, properties);
+        });
+        sensor._initCapabilities(async (capabilities) => {
+            await this.#registryProxy.updateCapabilities(sensor.id, capabilities);
+        });
+        const rpcCleanup = await this.#proxy.registerHandler(sensorNamespace, sensor, { withoutDecorators: true });
+        const eventNs = NamespaceManager.sensorEventNamespaces(sensor.id);
+        const unsubscribeEvents = await this.#proxy.subscribe(eventNs.sensorSubject, (event) => {
+            if (event.type === 'property:changed') {
+                const changeEvent = event.data;
+                sensor._onBackendPropertyChanged(changeEvent.property, changeEvent.value, changeEvent.timestamp);
+            }
+        });
+        this.#owned.set(sensor.id, sensor);
+        this.#cleanups.set(sensor.id, async () => {
+            unsubscribeEvents();
+            await rpcCleanup();
+        });
+        sensor._setActive(true);
+    }
+    async removeSensor(sensor) {
+        try {
+            await this.#registryProxy.unregisterSensor(sensor.id);
+        }
+        catch (error) {
+            this.#logger.warn(`Failed to unregister sensor ${sensor.id}:`, error);
+        }
+        await this.#cleanups.get(sensor.id)?.();
+        this.#cleanups.delete(sensor.id);
+        this.#owned.delete(sensor.id);
+        sensor._cleanup();
+    }
+    getSensors() {
+        return Array.from(this.#owned.values());
+    }
+    /** @internal Keeps a camera-registered sensor's assignedCameraIds in sync with the global stream. */
+    async _trackCameraSensor(sensor) {
+        await this.#ensureGlobalSubscription();
+        this.#external.set(sensor.id, sensor);
+    }
+    /** @internal */
+    _untrackCameraSensor(sensorId) {
+        this.#external.delete(sensorId);
+    }
+    async close() {
+        this.#globalUnsubscribe?.();
+        this.#globalUnsubscribe = undefined;
+        this.#stopReconnectWatch?.();
+        this.#stopReconnectWatch = undefined;
+        for (const proxySensor of this.#consumed.values()) {
+            proxySensor._unsubscribeFromEvents();
+        }
+        this.#consumed.clear();
+        this.#external.clear();
+        for (const cleanup of this.#cleanups.values()) {
+            await cleanup();
+        }
+        this.#cleanups.clear();
+        for (const sensor of this.#owned.values()) {
+            sensor._cleanup();
+        }
+        this.#owned.clear();
+    }
+    async #ensureGlobalSubscription() {
+        if (this.#globalUnsubscribe)
+            return;
+        this.#stopReconnectWatch ??= watchReconnect(this.#proxy, () => this.#resyncAllConsumed(), (error) => this.#logger.debug('Sensor reconnect watch ended:', error));
+        const ns = NamespaceManager.sensorRegistryNamespaces();
+        this.#globalUnsubscribe = await this.#proxy.subscribe(ns.sensorsSubject, (message) => {
+            this.#onGlobalSensorEvent(message).catch((error) => {
+                this.#logger.warn('Sensor event handling failed:', error);
+            });
+        });
+    }
+    async #resyncAllConsumed() {
+        for (const sensorId of [...this.#consumed.keys()]) {
+            await this.#resyncConsumed(sensorId);
+        }
+    }
+    async #resyncConsumed(sensorId) {
+        const proxySensor = this.#consumed.get(sensorId);
+        if (!proxySensor)
+            return;
+        try {
+            const state = await this.#registryProxy.getSensorState(sensorId);
+            if (state)
+                proxySensor._applyRefreshedState(state);
+        }
+        catch {
+            // owner or registry unreachable, the next re-announce carries the state
+        }
+    }
+    #isConsumable(data) {
+        if (this.#owned.has(data.id) || data.pluginId === this.#plugin.id)
+            return false;
+        if (!data.exposed)
+            return false;
+        return this.#plugin.contract.consumes.includes(data.type);
+    }
+    #addConsumed(data) {
+        const ownerNamespace = NamespaceManager.sensorProviderNamespaces(data.pluginId, data.id).sensorRpc;
+        const proxySensor = new SensorProxy(data, this.#proxy, ownerNamespace);
+        proxySensor._subscribeToEvents();
+        this.#consumed.set(data.id, proxySensor);
+        return proxySensor;
+    }
+    #releaseConsumed(sensorId) {
+        const proxySensor = this.#consumed.get(sensorId);
+        if (!proxySensor)
+            return;
+        proxySensor._unsubscribeFromEvents();
+        this.#consumed.delete(sensorId);
+        this.#pluginInstance?.onSensorReleased?.(sensorId).catch(() => { });
+    }
+    async #onGlobalSensorEvent(message) {
+        switch (message.type) {
+            case 'sensor:added': {
+                const event = message.data;
+                this.#owned.get(event.sensor.id)?._setAssignedCameras(event.sensor.assignedCameraIds);
+                this.#external.get(event.sensor.id)?._setAssignedCameras(event.sensor.assignedCameraIds);
+                const consumed = this.#consumed.get(event.sensor.id);
+                if (consumed) {
+                    // re-announced while we already hold it: the payload is authoritative, our cache may be stale
+                    consumed._applyRefreshedState(event.state);
+                    return;
+                }
+                if (!this.#isConsumable(event.sensor))
+                    return;
+                const proxySensor = this.#addConsumed(event.sensor);
+                await this.#pluginInstance?.onSensorAdded?.(proxySensor);
+                break;
+            }
+            case 'sensor:deleted': {
+                const event = message.data;
+                this.#releaseConsumed(event.sensorId);
+                break;
+            }
+            case 'sensor:connected:changed': {
+                const event = message.data;
+                const proxySensor = this.#consumed.get(event.sensorId);
+                if (!proxySensor)
+                    break;
+                proxySensor._setConnected(event.connected);
+                if (event.connected) {
+                    // the owner was away, whatever it published in the meantime never reached us
+                    void this.#resyncConsumed(event.sensorId);
+                }
+                break;
+            }
+            case 'sensor:exposed:changed': {
+                const event = message.data;
+                if (!event.exposed) {
+                    this.#releaseConsumed(event.sensorId);
+                    return;
+                }
+                if (this.#consumed.has(event.sensorId))
+                    return;
+                const data = await this.#registryProxy.getSensorRpc(event.sensorId, this.#plugin.id);
+                if (!data || !this.#isConsumable(data))
+                    return;
+                const proxySensor = this.#addConsumed(data);
+                await this.#pluginInstance?.onSensorAdded?.(proxySensor);
+                break;
+            }
+            case 'sensor:assignment:changed': {
+                const event = message.data;
+                for (const target of [this.#owned.get(event.sensorId), this.#external.get(event.sensorId), this.#consumed.get(event.sensorId)]) {
+                    if (!target)
+                        continue;
+                    const cameras = new Set(target.assignedCameraIds);
+                    if (event.assigned)
+                        cameras.add(event.cameraId);
+                    else
+                        cameras.delete(event.cameraId);
+                    target._setAssignedCameras([...cameras]);
+                }
+                break;
+            }
+        }
+    }
+}
+//# sourceMappingURL=sensorManager.js.map

package/dist/server/src/plugins/runtime/node/proxy/sensorManager.js.map

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

package/dist/server/src/plugins/runtime/node/storage.d.ts

@@ -8,7 +8,7 @@ export declare class DeviceStorage<T extends Record<string, any> = Record<string
     schemas: JsonSchema[];
     values: T;
     constructor(api: PluginAPI, proxy: RPCClient, plugin: PluginInfo, pluginDb: PluginConfigDb, location: StoreLocation, schemas?: JsonSchema[], sensorId?: string);
-    getValue<T = string>(key: string): Promise<T> | undefined;
+    getValue<T = string>(key: string): Promise<T | undefined>;
     getValue<T = string>(key: string, defaultValue: T): Promise<T>;
     setValue<T = string>(key: string, newValue: T): Promise<void>;
     submitValue(key: string, newValue: any): Promise<FormSubmitResponse | void>;

package/dist/server/src/plugins/runtime/node/storage.js

@@ -34,7 +34,7 @@ export class DeviceStorage {
         this.#location = location;
         this.#sensorId = sensorId;
         if (location.kind === 'sensor' && this.#sensorId) {
-            const sensorNs = NamespaceManager.pluginSensorNamespaces(this.#plugin.id, location.cameraId, this.#sensorId);
+            const sensorNs = NamespaceManager.pluginSensorNamespaces(this.#plugin.id, this.#sensorId);
             this.#storageNamespace = sensorNs.sensorStorageRpc;
         }
         else if (location.kind === 'plugin') {
@@ -48,6 +48,7 @@ export class DeviceStorage {
         else {
             throw new Error(`sensor storage for ${this.#plugin.id} requires a sensorId`);
         }
+        this.#initializeStorage();
     }
     getValue(key, defaultValue) {
         const schema = this.schemas.find((schema) => schema.key === key);
@@ -59,17 +60,19 @@ export class DeviceStorage {
         if (schema) {
             validateStoreValue(key, newValue);
             const oldValue = getValueByKey(this.values, key);
-            const unchanged = newValue === null || newValue === undefined ? oldValue === undefined : isEqual(oldValue, newValue);
-            if (newValue === null || newValue === undefined) {
+            const fallback = schema.defaultValue;
+            const effectiveValue = (newValue ?? fallback);
+            const unchanged = effectiveValue === undefined ? oldValue === undefined : isEqual(oldValue, effectiveValue);
+            if (effectiveValue === undefined) {
                 deleteValueByKey(this.values, key);
             }
             else {
-                setValueByKey(this.values, key, typeof newValue === 'object' ? structuredClone(newValue) : newValue);
+                setValueByKey(this.values, key, typeof effectiveValue === 'object' ? structuredClone(effectiveValue) : effectiveValue);
             }
             if (this.#containsStorableSchema(schema) && (!unchanged || this.#dirty)) {
                 await this.save();
             }
-            this.#runOnSetDetached(schema.onSet, key, newValue, oldValue);
+            this.#runOnSetDetached(schema.onSet, key, effectiveValue, oldValue);
         }
     }
     async submitValue(key, newValue) {
@@ -265,7 +268,7 @@ export class DeviceStorage {
         }
         return false;
     }
-    async #initializeStorage() {
+    #initializeStorage() {
         const config = this.#pluginDb.get('config') ?? {};
         const deviceConfig = readLocation(config, this.#location) ?? {};
         const schemaConfig = generateConfigFromSchemas(this.schemas);
@@ -283,7 +286,7 @@ __decorate([
     RPCMethod,
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String, Object]),
-    __metadata("design:returntype", Object)
+    __metadata("design:returntype", Promise)
 ], DeviceStorage.prototype, "getValue", null);
 __decorate([
     RPCMethod,