aes70 1.3.3 → 1.3.7

package/src/OCP1/message_generator.js

@@ -1,14 +1,10 @@
-import {
-  encodeMessageTo,
-  messageHeaderSize,
-} from './encode_message.js';
+import { encodeMessageTo, messageHeaderSize } from './encode_message.js';
 
 const pduTypeKeepAlive = 4;
 
 export class MessageGenerator {
   constructor(batchSize, resultCallback) {
-    if (!(batchSize <= 0xffffffff))
-      throw new TypeError('Invalid batch size.');
+    if (!(batchSize <= 0xffffffff)) throw new TypeError('Invalid batch size.');
     this._pdus = [];
     this._batchSize = batchSize;
     this._resultCallback = resultCallback;
@@ -19,7 +15,7 @@ export class MessageGenerator {
     this._flushCb = () => {
       this._flushScheduled = false;
       if (this._pdus === null) return;
-      this.flush(); 
+      this.flush();
     };
   }
 
@@ -29,13 +25,13 @@ export class MessageGenerator {
     const messageType = pdu.messageType;
 
     // Can we add to the current message?
-    let combine = this._lastMessageType === messageType &&
-        messageType !== pduTypeKeepAlive &&
-        this._currentCount < 0xffff;
+    const combine =
+      this._lastMessageType === messageType &&
+      messageType !== pduTypeKeepAlive &&
+      this._currentCount < 0xffff;
     let additionalSize = encodedLength;
 
-    if (!combine)
-      additionalSize += messageHeaderSize;
+    if (!combine) additionalSize += messageHeaderSize;
 
     // The resulting buffer would become too large, we flush now.
     if (currentSize && currentSize + additionalSize > this._batchSize) {
@@ -47,7 +43,7 @@ export class MessageGenerator {
     this._currentSize += additionalSize;
 
     if (combine) {
-      this._currentCount ++;
+      this._currentCount++;
     } else {
       this._currentCount = 1;
     }
@@ -65,14 +61,15 @@ export class MessageGenerator {
   scheduleFlush() {
     if (this._flushScheduled) return;
     this._flushScheduled = true;
-    Promise.resolve().then(this._flushCb).catch((err) => {
-      console.error(err);
-    });
+    Promise.resolve()
+      .then(this._flushCb)
+      .catch((err) => {
+        console.error(err);
+      });
   }
 
   flush() {
-    if (!this._currentSize)
-      return;
+    if (!this._currentSize) return;
 
     const pdus = this._pdus;
 
@@ -85,9 +82,12 @@ export class MessageGenerator {
       const pdu = pdus[i];
       const messageType = pdu.messageType;
 
-      if (i === (length - 1) || (i + 1 - from) === 0xffff ||
-          messageType === pduTypeKeepAlive ||
-          messageType !== pdus[i+1].messageType) {
+      if (
+        i === length - 1 ||
+        i + 1 - from === 0xffff ||
+        messageType === pduTypeKeepAlive ||
+        messageType !== pdus[i + 1].messageType
+      ) {
         pos = encodeMessageTo(dst, pos, pdus, from, i + 1);
         from = i + 1;
       }

package/src/OCP1.js

@@ -0,0 +1,162 @@
+export { Bitset16 } from './OCP1/Bitset16.js'
+export { Bitset8 } from './OCP1/Bitset8.js'
+export { Enum } from './OCP1/Enum.js'
+export { Enum16 } from './OCP1/Enum16.js'
+export { Enum8 } from './OCP1/Enum8.js'
+export { OcaApplicationNetworkCommand } from './OCP1/OcaApplicationNetworkCommand.js'
+export { OcaApplicationNetworkState } from './OCP1/OcaApplicationNetworkState.js'
+export { OcaBaseDataType } from './OCP1/OcaBaseDataType.js'
+export { OcaBitSet16 } from './OCP1/OcaBitSet16.js'
+export { OcaBitstring } from './OCP1/OcaBitstring.js'
+export { OcaBlob } from './OCP1/OcaBlob.js'
+export { OcaBlobFixedLen } from './OCP1/OcaBlobFixedLen.js'
+export { OcaBlockMember } from './OCP1/OcaBlockMember.js'
+export { OcaBoolean } from './OCP1/OcaBoolean.js'
+export { OcaClassAuthorityID } from './OCP1/OcaClassAuthorityID.js'
+export { OcaClassIdentification } from './OCP1/OcaClassIdentification.js'
+export { OcaClassicalFilterShape } from './OCP1/OcaClassicalFilterShape.js'
+export { OcaComponent } from './OCP1/OcaComponent.js'
+export { OcaDBr } from './OCP1/OcaDBr.js'
+export { OcaDelayUnit } from './OCP1/OcaDelayUnit.js'
+export { OcaDelayValue } from './OCP1/OcaDelayValue.js'
+export { OcaDeviceState } from './OCP1/OcaDeviceState.js'
+export { OcaDynamicsFunction } from './OCP1/OcaDynamicsFunction.js'
+export { OcaEnumItem } from './OCP1/OcaEnumItem.js'
+export { OcaEnumItem16 } from './OCP1/OcaEnumItem16.js'
+export { OcaEvent } from './OCP1/OcaEvent.js'
+export { OcaEventID } from './OCP1/OcaEventID.js'
+export { OcaFilterPassband } from './OCP1/OcaFilterPassband.js'
+export { OcaFloat32 } from './OCP1/OcaFloat32.js'
+export { OcaFloat64 } from './OCP1/OcaFloat64.js'
+export { OcaGlobalTypeIdentifier } from './OCP1/OcaGlobalTypeIdentifier.js'
+export { OcaGrouperCitizen } from './OCP1/OcaGrouperCitizen.js'
+export { OcaGrouperEnrollment } from './OCP1/OcaGrouperEnrollment.js'
+export { OcaGrouperGroup } from './OCP1/OcaGrouperGroup.js'
+export { OcaGrouperMode } from './OCP1/OcaGrouperMode.js'
+export { OcaGrouperStatusChangeEventData } from './OCP1/OcaGrouperStatusChangeEventData.js'
+export { OcaGrouperStatusChangeType } from './OCP1/OcaGrouperStatusChangeType.js'
+export { OcaImpedance } from './OCP1/OcaImpedance.js'
+export { OcaInt16 } from './OCP1/OcaInt16.js'
+export { OcaInt32 } from './OCP1/OcaInt32.js'
+export { OcaInt64 } from './OCP1/OcaInt64.js'
+export { OcaInt8 } from './OCP1/OcaInt8.js'
+export { OcaLevelDetectionLaw } from './OCP1/OcaLevelDetectionLaw.js'
+export { OcaLevelMeterLaw } from './OCP1/OcaLevelMeterLaw.js'
+export { OcaLibAccess } from './OCP1/OcaLibAccess.js'
+export { OcaLibParamSetAssignment } from './OCP1/OcaLibParamSetAssignment.js'
+export { OcaLibVol } from './OCP1/OcaLibVol.js'
+export { OcaLibVolChangedEventData } from './OCP1/OcaLibVolChangedEventData.js'
+export { OcaLibVolData_ParamSet } from './OCP1/OcaLibVolData_ParamSet.js'
+export { OcaLibVolIdentifier } from './OCP1/OcaLibVolIdentifier.js'
+export { OcaLibVolMetadata } from './OCP1/OcaLibVolMetadata.js'
+export { OcaLibVolStandardTypeID } from './OCP1/OcaLibVolStandardTypeID.js'
+export { OcaLibVolType } from './OCP1/OcaLibVolType.js'
+export { OcaLibraryIdentifier } from './OCP1/OcaLibraryIdentifier.js'
+export { OcaList } from './OCP1/OcaList.js'
+export { OcaList2D } from './OCP1/OcaList2D.js'
+export { OcaManagerDescriptor } from './OCP1/OcaManagerDescriptor.js'
+export { OcaMap } from './OCP1/OcaMap.js'
+export { OcaMediaClockAvailability } from './OCP1/OcaMediaClockAvailability.js'
+export { OcaMediaClockLockState } from './OCP1/OcaMediaClockLockState.js'
+export { OcaMediaClockRate } from './OCP1/OcaMediaClockRate.js'
+export { OcaMediaClockType } from './OCP1/OcaMediaClockType.js'
+export { OcaMediaCoding } from './OCP1/OcaMediaCoding.js'
+export { OcaMediaConnection } from './OCP1/OcaMediaConnection.js'
+export { OcaMediaConnectorCommand } from './OCP1/OcaMediaConnectorCommand.js'
+export { OcaMediaConnectorElement } from './OCP1/OcaMediaConnectorElement.js'
+export { OcaMediaConnectorState } from './OCP1/OcaMediaConnectorState.js'
+export { OcaMediaConnectorStatus } from './OCP1/OcaMediaConnectorStatus.js'
+export { OcaMediaConnectorStatusChangedEventData } from './OCP1/OcaMediaConnectorStatusChangedEventData.js'
+export { OcaMediaSinkConnector } from './OCP1/OcaMediaSinkConnector.js'
+export { OcaMediaSinkConnectorChangedEventData } from './OCP1/OcaMediaSinkConnectorChangedEventData.js'
+export { OcaMediaSourceConnector } from './OCP1/OcaMediaSourceConnector.js'
+export { OcaMediaSourceConnectorChangedEventData } from './OCP1/OcaMediaSourceConnectorChangedEventData.js'
+export { OcaMediaStreamCastMode } from './OCP1/OcaMediaStreamCastMode.js'
+export { OcaMethod } from './OCP1/OcaMethod.js'
+export { OcaMethodID } from './OCP1/OcaMethodID.js'
+export { OcaModelDescription } from './OCP1/OcaModelDescription.js'
+export { OcaModelGUID } from './OCP1/OcaModelGUID.js'
+export { OcaMultiMap } from './OCP1/OcaMultiMap.js'
+export { OcaMuteState } from './OCP1/OcaMuteState.js'
+export { OcaNetworkControlProtocol } from './OCP1/OcaNetworkControlProtocol.js'
+export { OcaNetworkLinkType } from './OCP1/OcaNetworkLinkType.js'
+export { OcaNetworkMediaProtocol } from './OCP1/OcaNetworkMediaProtocol.js'
+export { OcaNetworkMediaSourceOrSink } from './OCP1/OcaNetworkMediaSourceOrSink.js'
+export { OcaNetworkSignalChannelStatus } from './OCP1/OcaNetworkSignalChannelStatus.js'
+export { OcaNetworkStatistics } from './OCP1/OcaNetworkStatistics.js'
+export { OcaNetworkStatus } from './OCP1/OcaNetworkStatus.js'
+export { OcaNetworkSystemInterfaceDescriptor } from './OCP1/OcaNetworkSystemInterfaceDescriptor.js'
+export { OcaNetworkSystemInterfaceID } from './OCP1/OcaNetworkSystemInterfaceID.js'
+export { OcaNotificationDeliveryMode } from './OCP1/OcaNotificationDeliveryMode.js'
+export { OcaOPath } from './OCP1/OcaOPath.js'
+export { OcaObjectIdentification } from './OCP1/OcaObjectIdentification.js'
+export { OcaObjectListEventData } from './OCP1/OcaObjectListEventData.js'
+export { OcaObjectSearchResult } from './OCP1/OcaObjectSearchResult.js'
+export { OcaObjectSearchResultFlags } from './OCP1/OcaObjectSearchResultFlags.js'
+export { OcaObservationEventData } from './OCP1/OcaObservationEventData.js'
+export { OcaObservationListEventData } from './OCP1/OcaObservationListEventData.js'
+export { OcaObserverState } from './OCP1/OcaObserverState.js'
+export { OcaParametricEQShape } from './OCP1/OcaParametricEQShape.js'
+export { OcaPilotToneDetectorSpec } from './OCP1/OcaPilotToneDetectorSpec.js'
+export { OcaPolarityState } from './OCP1/OcaPolarityState.js'
+export { OcaPort } from './OCP1/OcaPort.js'
+export { OcaPortID } from './OCP1/OcaPortID.js'
+export { OcaPortMode } from './OCP1/OcaPortMode.js'
+export { OcaPositionCoordinateSystem } from './OCP1/OcaPositionCoordinateSystem.js'
+export { OcaPositionDescriptor } from './OCP1/OcaPositionDescriptor.js'
+export { OcaPowerState } from './OCP1/OcaPowerState.js'
+export { OcaPowerSupplyLocation } from './OCP1/OcaPowerSupplyLocation.js'
+export { OcaPowerSupplyState } from './OCP1/OcaPowerSupplyState.js'
+export { OcaPowerSupplyType } from './OCP1/OcaPowerSupplyType.js'
+export { OcaPresentationUnit } from './OCP1/OcaPresentationUnit.js'
+export { OcaProperty } from './OCP1/OcaProperty.js'
+export { OcaPropertyChangeType } from './OCP1/OcaPropertyChangeType.js'
+export { OcaPropertyChangedEventData } from './OCP1/OcaPropertyChangedEventData.js'
+export { OcaPropertyDescriptor } from './OCP1/OcaPropertyDescriptor.js'
+export { OcaPropertyID } from './OCP1/OcaPropertyID.js'
+export { OcaProtoObjectIdentification } from './OCP1/OcaProtoObjectIdentification.js'
+export { OcaProtoPort } from './OCP1/OcaProtoPort.js'
+export { OcaProtoPortID } from './OCP1/OcaProtoPortID.js'
+export { OcaProtoSignalPath } from './OCP1/OcaProtoSignalPath.js'
+export { OcaRamperCommand } from './OCP1/OcaRamperCommand.js'
+export { OcaRamperInterpolationLaw } from './OCP1/OcaRamperInterpolationLaw.js'
+export { OcaRamperState } from './OCP1/OcaRamperState.js'
+export { OcaRelationalOperator } from './OCP1/OcaRelationalOperator.js'
+export { OcaResetCause } from './OCP1/OcaResetCause.js'
+export { OcaSensorReadingState } from './OCP1/OcaSensorReadingState.js'
+export { OcaSignalPath } from './OCP1/OcaSignalPath.js'
+export { OcaStatus } from './OCP1/OcaStatus.js'
+export { OcaStream } from './OCP1/OcaStream.js'
+export { OcaStreamConnectorIdentification } from './OCP1/OcaStreamConnectorIdentification.js'
+export { OcaStreamConnectorStatus } from './OCP1/OcaStreamConnectorStatus.js'
+export { OcaStreamStatus } from './OCP1/OcaStreamStatus.js'
+export { OcaStreamType } from './OCP1/OcaStreamType.js'
+export { OcaString } from './OCP1/OcaString.js'
+export { OcaStringComparisonType } from './OCP1/OcaStringComparisonType.js'
+export { OcaSubscriptionManagerState } from './OCP1/OcaSubscriptionManagerState.js'
+export { OcaSweepType } from './OCP1/OcaSweepType.js'
+export { OcaTask } from './OCP1/OcaTask.js'
+export { OcaTaskCommand } from './OCP1/OcaTaskCommand.js'
+export { OcaTaskManagerState } from './OCP1/OcaTaskManagerState.js'
+export { OcaTaskState } from './OCP1/OcaTaskState.js'
+export { OcaTaskStateChangedEventData } from './OCP1/OcaTaskStateChangedEventData.js'
+export { OcaTaskStatus } from './OCP1/OcaTaskStatus.js'
+export { OcaTimeMode } from './OCP1/OcaTimeMode.js'
+export { OcaTimePTP } from './OCP1/OcaTimePTP.js'
+export { OcaTimeProtocol } from './OCP1/OcaTimeProtocol.js'
+export { OcaTimeReferenceType } from './OCP1/OcaTimeReferenceType.js'
+export { OcaTimeSourceAvailability } from './OCP1/OcaTimeSourceAvailability.js'
+export { OcaTimeSourceSyncStatus } from './OCP1/OcaTimeSourceSyncStatus.js'
+export { OcaTransferFunction } from './OCP1/OcaTransferFunction.js'
+export { OcaUint16 } from './OCP1/OcaUint16.js'
+export { OcaUint32 } from './OCP1/OcaUint32.js'
+export { OcaUint64 } from './OCP1/OcaUint64.js'
+export { OcaUint8 } from './OCP1/OcaUint8.js'
+export { OcaUnitOfMeasure } from './OCP1/OcaUnitOfMeasure.js'
+export { OcaVersion } from './OCP1/OcaVersion.js'
+export { OcaWaveformType } from './OCP1/OcaWaveformType.js'
+export { Rest } from './OCP1/Rest.js'
+export { RestWithOffset } from './OCP1/RestWithOffset.js'
+export { String16 } from './OCP1/String16.js'
+export { Struct } from './OCP1/Struct.js'
+export { Tuple } from './OCP1/Tuple.js'

package/src/controller/ControlClasses/OcaFilterFIR.d.ts

@@ -10,6 +10,11 @@ import { PropertyEvent } from '../property_event';
  * @class OcaFilterFIR
  */
 export declare class OcaFilterFIR extends OcaActuator {
+  /**
+   * This event is emitted whenever Length changes.
+   */
+  OnLengthChanged: PropertyEvent<number>;
+
   /**
    * This event is emitted whenever Coefficients changes.
    */

package/src/controller/ControlClasses/OcaFilterFIR.js

@@ -23,7 +23,7 @@ export const OcaFilterFIR = make_control_class(
     ['SetSampleRate', 4, 5, [OcaFloat32], []],
   ],
   [
-    ['Length', [OcaUint32], 4, 1, true, false, null],
+    ['Length', [OcaUint32], 4, 1, false, false, null],
     ['Coefficients', [OcaList(OcaFloat32)], 4, 2, false, false, null],
     ['SampleRate', [OcaFloat32], 4, 3, false, false, null],
   ],
@@ -75,6 +75,14 @@ export const OcaFilterFIR = make_control_class(
  *
  * @returns {Promise<void>}
  */
+/**
+ * This event is emitted when the property Length changes in the remote object.
+ * The property ``Length`` is described in the AES70 standard as follows.
+ * Length of the filter, in samples. Readonly. Value is set when
+ * SetCoefficients(...) method executes.
+ *
+ * @member {PropertyEvent<number>} OcaFilterFIR#OnLengthChanged
+ */
 /**
  * This event is emitted when the property Coefficients changes in the remote object.
  * The property ``Coefficients`` is described in the AES70 standard as follows.

package/src/controller/ControlClasses/OcaLibrary.d.ts

@@ -77,10 +77,12 @@ export declare class OcaLibrary extends OcaAgent {
    * Retrieves a library volume. The return value indicates whether the volume was successfully retrieved. Changed in version 2 because the definition of OcaLibVolMetaData, which is part of OcaLibVol, has changed.
    *
    * @method OcaLibrary#GetVolume
+   * @param {number} ID
+   *
    * @returns {Promise<OcaLibVol>}
    *   A promise which resolves to a single value of type :class:`OcaLibVol`.
    */
-  GetVolume(): Promise<OcaLibVol>;
+  GetVolume(ID: number): Promise<OcaLibVol>;
 
   /**
    * Gets the count of volumes in this library. The return value indicates whether the count was successfully retrieved.

package/src/controller/ControlClasses/OcaLibrary.js

@@ -23,7 +23,7 @@ export const OcaLibrary = make_control_class(
     ['AddVolume', 3, 1, [OcaLibVol], [OcaUint32]],
     ['ReplaceVolume', 3, 2, [OcaUint32, OcaLibVol], []],
     ['DeleteVolume', 3, 3, [OcaUint32], []],
-    ['GetVolume', 3, 4, [], [OcaLibVol]],
+    ['GetVolume', 3, 4, [OcaUint32], [OcaLibVol]],
     ['GetVolumeCount', 3, 5, [], [OcaUint16]],
     ['GetVolumes', 3, 6, [], [OcaMap(OcaUint32, OcaLibVol)]],
     ['GetAccess', 3, 7, [], [OcaLibAccess]],
@@ -68,6 +68,8 @@ export const OcaLibrary = make_control_class(
  * Retrieves a library volume. The return value indicates whether the volume was successfully retrieved. Changed in version 2 because the definition of OcaLibVolMetaData, which is part of OcaLibVol, has changed.
  *
  * @method OcaLibrary#GetVolume
+ * @param {number} ID
+ *
  * @returns {Promise<OcaLibVol>}
  *   A promise which resolves to a single value of type :class:`OcaLibVol`.
  */

package/src/controller/ControlClasses/OcaPowerManager.d.ts

@@ -37,6 +37,11 @@ export declare class OcaPowerManager extends OcaManager {
    */
   OnAutoStateChanged: PropertyEvent<boolean>;
 
+  /**
+   * This event is emitted whenever TargetState changes.
+   */
+  OnTargetStateChanged: PropertyEvent<OcaPowerState>;
+
   constructor(objectNumber: number, device: RemoteDevice);
 
   /**

package/src/controller/ControlClasses/OcaPowerManager.js

@@ -35,7 +35,7 @@ export const OcaPowerManager = make_control_class(
     ['PowerSupplies', [OcaList(OcaUint32)], 3, 2, false, false, null],
     ['ActivePowerSupplies', [OcaList(OcaUint32)], 3, 3, false, false, null],
     ['AutoState', [OcaBoolean], 3, 4, false, false, null],
-    ['TargetState', [OcaPowerState], 3, 5, true, false, null],
+    ['TargetState', [OcaPowerState], 3, 5, false, false, null],
   ],
   []
 );
@@ -117,3 +117,11 @@ export const OcaPowerManager = make_control_class(
  *
  * @member {PropertyEvent<boolean>} OcaPowerManager#OnAutoStateChanged
  */
+/**
+ * This event is emitted when the property TargetState changes in the remote object.
+ * The property ``TargetState`` is described in the AES70 standard as follows.
+ * Power state to which the device is transitioning. If no transition is
+ * in progress, has value None. Readonly.
+ *
+ * @member {PropertyEvent<OcaPowerState>} OcaPowerManager#OnTargetStateChanged
+ */

package/src/controller/ControlClasses/OcaPowerSupply.d.ts

@@ -33,6 +33,16 @@ export declare class OcaPowerSupply extends OcaAgent {
    */
   OnChargingChanged: PropertyEvent<boolean>;
 
+  /**
+   * This event is emitted whenever LoadFractionAvailable changes.
+   */
+  OnLoadFractionAvailableChanged: PropertyEvent<number>;
+
+  /**
+   * This event is emitted whenever StorageFractionAvailable changes.
+   */
+  OnStorageFractionAvailableChanged: PropertyEvent<number>;
+
   constructor(objectNumber: number, device: RemoteDevice);
 
   /**

package/src/controller/ControlClasses/OcaPowerSupply.js

@@ -33,8 +33,8 @@ export const OcaPowerSupply = make_control_class(
     ['ModelInfo', [OcaString], 3, 2, false, false, null],
     ['State', [OcaPowerSupplyState], 3, 3, false, false, null],
     ['Charging', [OcaBoolean], 3, 4, false, false, null],
-    ['LoadFractionAvailable', [OcaFloat32], 3, 5, true, false, null],
-    ['StorageFractionAvailable', [OcaFloat32], 3, 6, true, false, null],
+    ['LoadFractionAvailable', [OcaFloat32], 3, 5, false, false, null],
+    ['StorageFractionAvailable', [OcaFloat32], 3, 6, false, false, null],
     ['Location', [OcaPowerSupplyLocation], 3, 7, true, false, null],
   ],
   []
@@ -126,3 +126,21 @@ export const OcaPowerSupply = make_control_class(
  *
  * @member {PropertyEvent<boolean>} OcaPowerSupply#OnChargingChanged
  */
+/**
+ * This event is emitted when the property LoadFractionAvailable changes in the remote object.
+ * The property ``LoadFractionAvailable`` is described in the AES70 standard as follows.
+ * Fraction of power supply's load capacity that is currently not being
+ * used. Readonly. Normal value range 0...1. A negative value indicates
+ * this data is not available.
+ *
+ * @member {PropertyEvent<number>} OcaPowerSupply#OnLoadFractionAvailableChanged
+ */
+/**
+ * This event is emitted when the property StorageFractionAvailable changes in the remote object.
+ * The property ``StorageFractionAvailable`` is described in the AES70 standard as follows.
+ * Fraction of power supply's energy storage that remains available. For
+ * battery supplies. Readonly. Normal value range 0...1. A negative value
+ * indicates this data is not available.
+ *
+ * @member {PropertyEvent<number>} OcaPowerSupply#OnStorageFractionAvailableChanged
+ */

package/src/controller/ControlClasses/OcaSensor.d.ts

@@ -10,6 +10,11 @@ import { OcaSensorReadingState } from '../../types/OcaSensorReadingState';
  * @class OcaSensor
  */
 export declare class OcaSensor extends OcaWorker {
+  /**
+   * This event is emitted whenever ReadingState changes.
+   */
+  OnReadingStateChanged: PropertyEvent<OcaSensorReadingState>;
+
   constructor(objectNumber: number, device: RemoteDevice);
 
   /**

package/src/controller/ControlClasses/OcaSensor.js

@@ -14,7 +14,7 @@ export const OcaSensor = make_control_class(
   2,
   OcaWorker,
   [['GetReadingState', 3, 1, [], [OcaSensorReadingState]]],
-  [['ReadingState', [OcaSensorReadingState], 3, 1, false, true, null]],
+  [['ReadingState', [OcaSensorReadingState], 3, 1, false, false, null]],
   []
 );
 
@@ -25,3 +25,11 @@ export const OcaSensor = make_control_class(
  * @returns {Promise<OcaSensorReadingState>}
  *   A promise which resolves to a single value of type :class:`OcaSensorReadingState`.
  */
+/**
+ * This event is emitted when the property ReadingState changes in the remote object.
+ * The property ``ReadingState`` is described in the AES70 standard as follows.
+ * Enum that describes whether current reading value is valid and if not,
+ * why not. Readonly.
+ *
+ * @member {PropertyEvent<OcaSensorReadingState>} OcaSensor#OnReadingStateChanged
+ */

package/src/controller/ControlClasses.d.ts

@@ -4,7 +4,6 @@
  * AES70-2018.
  */
 
-import { ObjectBase } from './object_base';
 import { OcaRoot } from './ControlClasses/OcaRoot';
 import { OcaWorker } from './ControlClasses/OcaWorker';
 import { OcaActuator } from './ControlClasses/OcaActuator';

package/src/controller/arguments.d.ts

@@ -7,11 +7,10 @@ export declare class Arguments<ArgumentTypes extends unknown[]> {
    */
   readonly values: ArgumentTypes;
 
-  constructor(values: ArgumentTypes)
+  constructor(values: ArgumentTypes);
 
   /**
    * The number of elements.
    */
   get length(): number;
-
 }

package/src/controller/client_connection.d.ts

@@ -1,6 +1,6 @@
 import { IConnectionOptions, Connection } from '../connection';
 
-export interface IClientConnectionOptions extends IConnectionOptions {}
+export type IClientConnectionOptions = IConnectionOptions
 
 /**
  * A generic base class for all client connections.

package/src/controller/client_connection.js

@@ -1,7 +1,6 @@
 import { RemoteError } from './remote_error.js';
 import { Connection } from '../connection.js';
 import { Response } from '../OCP1/response.js';
-import { encodeMessage } from '../OCP1/encode_message.js';
 import { KeepAlive } from '../OCP1/keepalive.js';
 import { Notification } from '../OCP1/notification.js';
 import { Arguments } from './arguments.js';
@@ -52,6 +51,13 @@ class PendingCommand {
   }
 }
 
+function eventToKey(event) {
+  const ono = event.EmitterONo;
+  const id = event.EventID;
+
+  return [ono, id.DefLevel, id.EventIndex].join(',');
+}
+
 /**
  * Connection base class for clients (aka controllers).
  *
@@ -63,12 +69,12 @@ export class ClientConnection extends Connection {
     super(options);
     this._pendingCommands = new Map();
     this._nextCommandHandle = 0;
-    this.subscribers = new Map();
+    this._subscribers = new Map();
   }
 
   cleanup() {
     super.cleanup();
-    this.subscribers = null;
+    this._subscribers = null;
 
     const pendingCommands = this._pendingCommands;
     this._pendingCommands = null;
@@ -78,23 +84,22 @@ export class ClientConnection extends Connection {
     });
   }
 
-  get_new_subscriber(callback) {
-    let id;
-    while (this.subscribers.has((id = (1 + Math.random() * 0xffff) | 0)));
-    this.subscribers.set(id, callback);
-    return {
-      ONo: id,
-      MethodID: {
-        DefLevel: 1,
-        MethodIndex: 1,
-      },
-    };
+  _addSubscriber(event, callback) {
+    const key = eventToKey(event);
+    const subscribers = this._subscribers;
+
+    if (subscribers.has(key)) throw new Error('Subscriber already exists.');
+
+    subscribers.set(key, callback);
   }
 
-  remove_subscriber(method) {
-    const S = this.subscribers;
-    if (S == null) return;
-    S.delete(method.ONo);
+  _removeSubscriber(event) {
+    const key = eventToKey(event);
+    const subscribers = this._subscribers;
+
+    if (!subscribers.has(key)) throw new Error('Unknown subscriber.');
+
+    subscribers.delete(key);
   }
 
   _getNextCommandHandle() {
@@ -107,34 +112,50 @@ export class ClientConnection extends Connection {
 
     do {
       handle = this._nextCommandHandle;
-      this._nextCommandHandle = (handle + 1)|0;
+      this._nextCommandHandle = (handle + 1) | 0;
     } while (pendingCommands.has(handle));
 
     return handle;
   }
 
-  send_command(command, returnTypes) {
-    return new Promise((resolve, reject) => {
+  _estimate_next_tx_time() {
+    return this._now();
+  }
+
+  send_command(command, returnTypes, callback) {
+    const executor = (resolve, reject) => {
       const handle = this._getNextCommandHandle();
 
-      command.handle = handle
+      command.handle = handle;
 
       const pendingCommand = new PendingCommand(
-        resolve, reject, returnTypes, command);
+        resolve,
+        reject,
+        returnTypes,
+        command
+      );
 
       this._pendingCommands.set(handle, pendingCommand);
 
-      pendingCommand.lastSent = this._now();
+      pendingCommand.lastSent = this._estimate_next_tx_time();
       this.send(command);
-    });
+    };
+
+    if (callback) {
+      executor(
+        (result) => callback(true, result),
+        (error) => callback(false, error)
+      );
+    } else {
+      return new Promise(executor);
+    }
   }
 
   _removePendingCommand(handle) {
     const pendingCommands = this._pendingCommands;
     const pendingCommand = pendingCommands.get(handle);
 
-    if (!pendingCommand)
-        return null;
+    if (!pendingCommand) return null;
 
     pendingCommands.delete(handle);
 
@@ -144,8 +165,7 @@ export class ClientConnection extends Connection {
   incoming(pdus) {
     for (let i = 0; i < pdus.length; i++) {
       // Connection may have been closed while receiving a command
-      if (this._pendingCommands === null)
-      {
+      if (this._pendingCommands === null) {
         return;
       }
 
@@ -165,12 +185,16 @@ export class ClientConnection extends Connection {
 
         pendingCommand.response(o);
       } else if (o instanceof Notification) {
-        const subscribers = this.subscribers;
-        if (!subscribers.has(o.target)) {
+        const subscribers = this._subscribers;
+        const key = eventToKey(o.event);
+
+        const cb = subscribers.get(key);
+
+        if (!cb) {
           // NOTE: this is legal
           continue;
         }
-        subscribers.get(o.target)(o);
+        cb(o);
       } else if (o instanceof KeepAlive) {
         if (!(o.time > 0)) {
           throw new Error('Bad keepalive timeout.');

package/src/controller/event.js

@@ -1,6 +1,8 @@
 import { BaseEvent } from './base_event.js';
 import { error } from '../log.js';
 
+const emptyBuffer = new ArrayBuffer();
+
 /**
  * Class used to represent all events specified by the OCA standard.
  *
@@ -13,7 +15,8 @@ export class Event extends BaseEvent {
       if (!this.handlers.size) return;
 
       const args = new Array(argumentTypes.length);
-      const data = new DataView(notification.parameters);
+      // Events without arguments have parameters = null
+      const data = new DataView(notification.parameters || emptyBuffer);
 
       for (let pos = 0, i = 0; i < argumentTypes.length; i++) {
         let tmp;