aes70 1.6.0 → 1.6.2

package/src/controller/ControlClasses/OcaStreamConnector.js

@@ -47,45 +47,44 @@ export const OcaStreamConnector = make_control_class(
   2,
   OcaAgent,
   [
+    ['GetOwnerNetwork', 3, 1, [], [OcaUint32]],
+    ['SetOwnerNetwork', 3, 2, [OcaUint32], []],
+    ['GetIDAdvertised', 3, 3, [], [OcaBlob]],
+    ['SetIDAdvertised', 3, 4, [OcaBlob], []],
+    ['GetSourceOrSink', 3, 5, [], [OcaNetworkMediaSourceOrSink]],
+    ['SetSourceOrSink', 3, 6, [OcaNetworkMediaSourceOrSink], []],
     ['ConnectStream', 3, 7, [OcaStream], [OcaUint16]],
     ['DisconnectStream', 3, 8, [OcaUint16], []],
-    ['GetIDAdvertised', 3, 3, [], [OcaBlob]],
-    ['GetOwnerNetwork', 3, 1, [], [OcaUint32]],
+    ['GetStreams', 3, 9, [], [OcaMap(OcaUint16, OcaStream)]],
     ['GetPins', 3, 10, [], [OcaMap(OcaUint16, OcaUint32)]],
-    ['GetSourceOrSink', 3, 5, [], [OcaNetworkMediaSourceOrSink]],
     ['GetStatus', 3, 11, [], [OcaStreamConnectorStatus]],
-    ['GetStreams', 3, 9, [], [OcaMap(OcaUint16, OcaStream)]],
-    ['SetIDAdvertised', 3, 4, [OcaBlob], []],
-    ['SetOwnerNetwork', 3, 2, [OcaUint32], []],
-    ['SetSourceOrSink', 3, 6, [OcaNetworkMediaSourceOrSink], []],
   ],
   [
-    ['IDAdvertised', [OcaBlob], 3, 2, false, false, null],
     ['OwnerNetwork', [OcaUint32], 3, 1, false, false, null],
-    ['Pins', [OcaMap(OcaUint16, OcaUint32)], 3, 5, false, false, null],
+    ['IDAdvertised', [OcaBlob], 3, 2, false, false, null],
     ['SourceOrSink', [OcaNetworkMediaSourceOrSink], 3, 3, false, false, null],
-    ['Status', [OcaStreamConnectorStatus], 3, 6, false, false, null],
     ['Streams', [OcaMap(OcaUint16, OcaStream)], 3, 4, false, false, null],
+    ['Pins', [OcaMap(OcaUint16, OcaUint32)], 3, 5, false, false, null],
+    ['Status', [OcaStreamConnectorStatus], 3, 6, false, false, null],
   ],
   []
 );
 
 /**
- * Connects a stream to this connector. Return status indicates success of
- * operation.
- *
- * @method OcaStreamConnector#ConnectStream
- * @param {IOcaStream} Stream
+ * Gets the object number of the **OcaStreamNetwork** object to which this
+ * connector belongs. Return status indicates success of operation.
  *
+ * @method OcaStreamConnector#GetOwnerNetwork
  * @returns {Promise<number>}
  *   A promise which resolves to a single value of type ``number``.
  */
 /**
- * Disconnects a stream from this connector. Return status indicates success of
- * operation.
+ * Sets the object number of the **OcaStreamNetwork** object to which this
+ * connector belongs. Return status indicates success of operation. Only
+ * implemented for reconfigurable devices.
  *
- * @method OcaStreamConnector#DisconnectStream
- * @param {number} StreamID
+ * @method OcaStreamConnector#SetOwnerNetwork
+ * @param {number} Network
  *
  * @returns {Promise<void>}
  */
@@ -98,20 +97,13 @@ export const OcaStreamConnector = make_control_class(
  *   A promise which resolves to a single value of type ``Uint8Array``.
  */
 /**
- * Gets the object number of the **OcaStreamNetwork** object to which this
- * connector belongs. Return status indicates success of operation.
+ * Sets the value of the IDAdvertised property. Return status indicates success
+ * of operation.
  *
- * @method OcaStreamConnector#GetOwnerNetwork
- * @returns {Promise<number>}
- *   A promise which resolves to a single value of type ``number``.
- */
-/**
- * Gets the list of object numbers of **OcaNetworkSignalChannel** objects
- * connected to this connector. Return status indicates success of operation.
+ * @method OcaStreamConnector#SetIDAdvertised
+ * @param {Uint8Array} IDAdvertised
  *
- * @method OcaStreamConnector#GetPins
- * @returns {Promise<Map<number, number>>}
- *   A promise which resolves to a single value of type ``Map<number, number>``.
+ * @returns {Promise<void>}
  */
 /**
  * Gets the value of the SourceOrSink property. Return status indicates success
@@ -122,58 +114,58 @@ export const OcaStreamConnector = make_control_class(
  *   A promise which resolves to a single value of type :class:`OcaNetworkMediaSourceOrSink`.
  */
 /**
- * Gets the value of the Status property. Return status indicates success of
- * operation.
+ * Sets the value of the SourceOrSink property. Return status indicates success
+ * of operation. Only implemented for reconfigurable devices. Note that this
+ * method can only be called when the SignalChannels property is empty, i.e.
+ * does not contain any actual channels.
  *
- * @method OcaStreamConnector#GetStatus
- * @returns {Promise<OcaStreamConnectorStatus>}
- *   A promise which resolves to a single value of type :class:`OcaStreamConnectorStatus`.
- */
-/**
- * Gets the map of OcaStream items connected to this connector. Return status
- * indicates success of operation.
+ * @method OcaStreamConnector#SetSourceOrSink
+ * @param {IOcaNetworkMediaSourceOrSink} SourceOrSink
  *
- * @method OcaStreamConnector#GetStreams
- * @returns {Promise<Map<number, OcaStream>>}
- *   A promise which resolves to a single value of type ``Map<number, OcaStream>``.
+ * @returns {Promise<void>}
  */
 /**
- * Sets the value of the IDAdvertised property. Return status indicates success
- * of operation.
+ * Connects a stream to this connector. Return status indicates success of
+ * operation.
  *
- * @method OcaStreamConnector#SetIDAdvertised
- * @param {Uint8Array} IDAdvertised
+ * @method OcaStreamConnector#ConnectStream
+ * @param {IOcaStream} Stream
  *
- * @returns {Promise<void>}
+ * @returns {Promise<number>}
+ *   A promise which resolves to a single value of type ``number``.
  */
 /**
- * Sets the object number of the **OcaStreamNetwork** object to which this
- * connector belongs. Return status indicates success of operation. Only
- * implemented for reconfigurable devices.
+ * Disconnects a stream from this connector. Return status indicates success of
+ * operation.
  *
- * @method OcaStreamConnector#SetOwnerNetwork
- * @param {number} Network
+ * @method OcaStreamConnector#DisconnectStream
+ * @param {number} StreamID
  *
  * @returns {Promise<void>}
  */
 /**
- * Sets the value of the SourceOrSink property. Return status indicates success
- * of operation. Only implemented for reconfigurable devices. Note that this
- * method can only be called when the SignalChannels property is empty, i.e.
- * does not contain any actual channels.
+ * Gets the map of OcaStream items connected to this connector. Return status
+ * indicates success of operation.
  *
- * @method OcaStreamConnector#SetSourceOrSink
- * @param {IOcaNetworkMediaSourceOrSink} SourceOrSink
+ * @method OcaStreamConnector#GetStreams
+ * @returns {Promise<Map<number, OcaStream>>}
+ *   A promise which resolves to a single value of type ``Map<number, OcaStream>``.
+ */
+/**
+ * Gets the list of object numbers of **OcaNetworkSignalChannel** objects
+ * connected to this connector. Return status indicates success of operation.
  *
- * @returns {Promise<void>}
+ * @method OcaStreamConnector#GetPins
+ * @returns {Promise<Map<number, number>>}
+ *   A promise which resolves to a single value of type ``Map<number, number>``.
  */
 /**
- * This event is emitted when the property ``IDAdvertised`` changes in the remote object.
- * The property ``IDAdvertised`` is described in the AES70 standard as follows.
- * Character name or binary identifier of this connector. This ID is advertised
- * on the network to be found by other devices' discovery processes.
+ * Gets the value of the Status property. Return status indicates success of
+ * operation.
  *
- * @member {PropertyEvent<Uint8Array>} OcaStreamConnector#OnIDAdvertisedChanged
+ * @method OcaStreamConnector#GetStatus
+ * @returns {Promise<OcaStreamConnectorStatus>}
+ *   A promise which resolves to a single value of type :class:`OcaStreamConnectorStatus`.
  */
 /**
  * This event is emitted when the property ``OwnerNetwork`` changes in the remote object.
@@ -188,15 +180,12 @@ export const OcaStreamConnector = make_control_class(
  * @member {PropertyEvent<number>} OcaStreamConnector#OnOwnerNetworkChanged
  */
 /**
- * This event is emitted when the property ``Pins`` changes in the remote object.
- * The property ``Pins`` is described in the AES70 standard as follows.
- * The map of connector pin indexes to **OcaNetworkSignalChannel[Source|Sink]**
- * objects collected by this connector. The pin indexes are fixed indexes 1 to
- * n, where n is the number of channels the connector accommodates (determined
- * when the connector is created). If a certain pin in the connector is
- * currently not attached the OcaONo of that index is 0.
+ * This event is emitted when the property ``IDAdvertised`` changes in the remote object.
+ * The property ``IDAdvertised`` is described in the AES70 standard as follows.
+ * Character name or binary identifier of this connector. This ID is advertised
+ * on the network to be found by other devices' discovery processes.
  *
- * @member {PropertyEvent<Map<number, number>>} OcaStreamConnector#OnPinsChanged
+ * @member {PropertyEvent<Uint8Array>} OcaStreamConnector#OnIDAdvertisedChanged
  */
 /**
  * This event is emitted when the property ``SourceOrSink`` changes in the remote object.
@@ -206,13 +195,6 @@ export const OcaStreamConnector = make_control_class(
  *
  * @member {PropertyEvent<OcaNetworkMediaSourceOrSink>} OcaStreamConnector#OnSourceOrSinkChanged
  */
-/**
- * This event is emitted when the property ``Status`` changes in the remote object.
- * The property ``Status`` is described in the AES70 standard as follows.
- * Status of this terminus.
- *
- * @member {PropertyEvent<OcaStreamConnectorStatus>} OcaStreamConnector#OnStatusChanged
- */
 /**
  * This event is emitted when the property ``Streams`` changes in the remote object.
  * The property ``Streams`` is described in the AES70 standard as follows.
@@ -221,3 +203,21 @@ export const OcaStreamConnector = make_control_class(
  *
  * @member {PropertyEvent<Map<number, OcaStream>>} OcaStreamConnector#OnStreamsChanged
  */
+/**
+ * This event is emitted when the property ``Pins`` changes in the remote object.
+ * The property ``Pins`` is described in the AES70 standard as follows.
+ * The map of connector pin indexes to **OcaNetworkSignalChannel[Source|Sink]**
+ * objects collected by this connector. The pin indexes are fixed indexes 1 to
+ * n, where n is the number of channels the connector accommodates (determined
+ * when the connector is created). If a certain pin in the connector is
+ * currently not attached the OcaONo of that index is 0.
+ *
+ * @member {PropertyEvent<Map<number, number>>} OcaStreamConnector#OnPinsChanged
+ */
+/**
+ * This event is emitted when the property ``Status`` changes in the remote object.
+ * The property ``Status`` is described in the AES70 standard as follows.
+ * Status of this terminus.
+ *
+ * @member {PropertyEvent<OcaStreamConnectorStatus>} OcaStreamConnector#OnStatusChanged
+ */

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

@@ -23,14 +23,14 @@ import { OcaAgent } from './OcaAgent';
  */
 export declare class OcaStreamNetwork extends OcaAgent {
   /**
-   * This event is emitted whenever ControlProtocol changes.
+   * This event is emitted whenever IDAdvertised changes.
    */
-  OnControlProtocolChanged: PropertyEvent<OcaNetworkControlProtocol>;
+  OnIDAdvertisedChanged: PropertyEvent<Uint8Array>;
 
   /**
-   * This event is emitted whenever IDAdvertised changes.
+   * This event is emitted whenever ControlProtocol changes.
    */
-  OnIDAdvertisedChanged: PropertyEvent<Uint8Array>;
+  OnControlProtocolChanged: PropertyEvent<OcaNetworkControlProtocol>;
 
   /**
    * This event is emitted whenever MediaProtocol changes.
@@ -38,39 +38,39 @@ export declare class OcaStreamNetwork extends OcaAgent {
   OnMediaProtocolChanged: PropertyEvent<OcaNetworkMediaProtocol>;
 
   /**
-   * This event is emitted whenever SignalChannelsSink changes.
+   * This event is emitted whenever Status changes.
    */
-  OnSignalChannelsSinkChanged: PropertyEvent<number[]>;
+  OnStatusChanged: PropertyEvent<OcaNetworkStatus>;
 
   /**
-   * This event is emitted whenever SignalChannelsSource changes.
+   * This event is emitted whenever SystemInterfaces changes.
    */
-  OnSignalChannelsSourceChanged: PropertyEvent<number[]>;
+  OnSystemInterfacesChanged: PropertyEvent<OcaNetworkSystemInterfaceID[]>;
 
   /**
-   * This event is emitted whenever Statistics changes.
+   * This event is emitted whenever StreamConnectorsSource changes.
    */
-  OnStatisticsChanged: PropertyEvent<OcaNetworkStatistics>;
+  OnStreamConnectorsSourceChanged: PropertyEvent<number[]>;
 
   /**
-   * This event is emitted whenever Status changes.
+   * This event is emitted whenever StreamConnectorsSink changes.
    */
-  OnStatusChanged: PropertyEvent<OcaNetworkStatus>;
+  OnStreamConnectorsSinkChanged: PropertyEvent<number[]>;
 
   /**
-   * This event is emitted whenever StreamConnectorsSink changes.
+   * This event is emitted whenever SignalChannelsSource changes.
    */
-  OnStreamConnectorsSinkChanged: PropertyEvent<number[]>;
+  OnSignalChannelsSourceChanged: PropertyEvent<number[]>;
 
   /**
-   * This event is emitted whenever StreamConnectorsSource changes.
+   * This event is emitted whenever SignalChannelsSink changes.
    */
-  OnStreamConnectorsSourceChanged: PropertyEvent<number[]>;
+  OnSignalChannelsSinkChanged: PropertyEvent<number[]>;
 
   /**
-   * This event is emitted whenever SystemInterfaces changes.
+   * This event is emitted whenever Statistics changes.
    */
-  OnSystemInterfacesChanged: PropertyEvent<OcaNetworkSystemInterfaceID[]>;
+  OnStatisticsChanged: PropertyEvent<OcaNetworkStatistics>;
 
   constructor(objectNumber: number, device: RemoteDevice);
 

package/src/controller/ControlClasses/OcaStreamNetwork.js

@@ -49,16 +49,11 @@ export const OcaStreamNetwork = make_control_class(
     ['Shutdown', 3, 20, [], []],
   ],
   [
-    ['ControlProtocol', [OcaNetworkControlProtocol], 3, 3, false, false, null],
-    ['IDAdvertised', [OcaBlob], 3, 2, false, false, null],
     ['LinkType', [OcaNetworkLinkType], 3, 1, true, false, null],
+    ['IDAdvertised', [OcaBlob], 3, 2, false, false, null],
+    ['ControlProtocol', [OcaNetworkControlProtocol], 3, 3, false, false, null],
     ['MediaProtocol', [OcaNetworkMediaProtocol], 3, 4, false, false, null],
-    ['SignalChannelsSink', [OcaList(OcaUint32)], 3, 10, false, false, null],
-    ['SignalChannelsSource', [OcaList(OcaUint32)], 3, 9, false, false, null],
-    ['Statistics', [OcaNetworkStatistics], 3, 11, false, false, null],
     ['Status', [OcaNetworkStatus], 3, 5, false, false, null],
-    ['StreamConnectorsSink', [OcaList(OcaUint32)], 3, 8, false, false, null],
-    ['StreamConnectorsSource', [OcaList(OcaUint32)], 3, 7, false, false, null],
     [
       'SystemInterfaces',
       [OcaList(OcaNetworkSystemInterfaceID)],
@@ -68,6 +63,11 @@ export const OcaStreamNetwork = make_control_class(
       false,
       null,
     ],
+    ['StreamConnectorsSource', [OcaList(OcaUint32)], 3, 7, false, false, null],
+    ['StreamConnectorsSink', [OcaList(OcaUint32)], 3, 8, false, false, null],
+    ['SignalChannelsSource', [OcaList(OcaUint32)], 3, 9, false, false, null],
+    ['SignalChannelsSink', [OcaList(OcaUint32)], 3, 10, false, false, null],
+    ['Statistics', [OcaNetworkStatistics], 3, 11, false, false, null],
   ],
   []
 );
@@ -282,14 +282,6 @@ export const OcaStreamNetwork = make_control_class(
  * @method OcaStreamNetwork#Shutdown
  * @returns {Promise<void>}
  */
-/**
- * This event is emitted when the property ``ControlProtocol`` changes in the remote object.
- * The property ``ControlProtocol`` is described in the AES70 standard as follows.
- * Type of control protocol used by the network (OCAnn) or NONE if this network
- * is not used for control.
- *
- * @member {PropertyEvent<OcaNetworkControlProtocol>} OcaStreamNetwork#OnControlProtocolChanged
- */
 /**
  * This event is emitted when the property ``IDAdvertised`` changes in the remote object.
  * The property ``IDAdvertised`` is described in the AES70 standard as follows.
@@ -298,6 +290,14 @@ export const OcaStreamNetwork = make_control_class(
  *
  * @member {PropertyEvent<Uint8Array>} OcaStreamNetwork#OnIDAdvertisedChanged
  */
+/**
+ * This event is emitted when the property ``ControlProtocol`` changes in the remote object.
+ * The property ``ControlProtocol`` is described in the AES70 standard as follows.
+ * Type of control protocol used by the network (OCAnn) or NONE if this network
+ * is not used for control.
+ *
+ * @member {PropertyEvent<OcaNetworkControlProtocol>} OcaStreamNetwork#OnControlProtocolChanged
+ */
 /**
  * This event is emitted when the property ``MediaProtocol`` changes in the remote object.
  * The property ``MediaProtocol`` is described in the AES70 standard as follows.
@@ -307,34 +307,30 @@ export const OcaStreamNetwork = make_control_class(
  * @member {PropertyEvent<OcaNetworkMediaProtocol>} OcaStreamNetwork#OnMediaProtocolChanged
  */
 /**
- * This event is emitted when the property ``SignalChannelsSink`` changes in the remote object.
- * The property ``SignalChannelsSink`` is described in the AES70 standard as follows.
- * List of object numbers of sink **OcaNetworkSignalChannel** objects collected
- * by this network.
- *
- * @member {PropertyEvent<number[]>} OcaStreamNetwork#OnSignalChannelsSinkChanged
- */
-/**
- * This event is emitted when the property ``SignalChannelsSource`` changes in the remote object.
- * The property ``SignalChannelsSource`` is described in the AES70 standard as follows.
- * List of object numbers of source **OcaNetworkSignalChannel** objects
- * collected by this network.
+ * This event is emitted when the property ``Status`` changes in the remote object.
+ * The property ``Status`` is described in the AES70 standard as follows.
+ * Operational status of the network.
  *
- * @member {PropertyEvent<number[]>} OcaStreamNetwork#OnSignalChannelsSourceChanged
+ * @member {PropertyEvent<OcaNetworkStatus>} OcaStreamNetwork#OnStatusChanged
  */
 /**
- * This event is emitted when the property ``Statistics`` changes in the remote object.
- * The property ``Statistics`` is described in the AES70 standard as follows.
- * Error statistics for this network
+ * This event is emitted when the property ``SystemInterfaces`` changes in the remote object.
+ * The property ``SystemInterfaces`` is described in the AES70 standard as follows.
+ * Collection of identifiers of system interface(s) used by the network. A
+ * "system interface" is the system service through which network traffic passes
+ * into and out of the device -- e.g. a socket. The identifier format is system
+ * and network dependent; for OCA purposes, it is maintained as a
+ * variable-length blob which the protocol does not inspect.
  *
- * @member {PropertyEvent<OcaNetworkStatistics>} OcaStreamNetwork#OnStatisticsChanged
+ * @member {PropertyEvent<OcaNetworkSystemInterfaceID[]>} OcaStreamNetwork#OnSystemInterfacesChanged
  */
 /**
- * This event is emitted when the property ``Status`` changes in the remote object.
- * The property ``Status`` is described in the AES70 standard as follows.
- * Operational status of the network.
+ * This event is emitted when the property ``StreamConnectorsSource`` changes in the remote object.
+ * The property ``StreamConnectorsSource`` is described in the AES70 standard as follows.
+ * List of object numbers of source **OcaStreamConnector** objects collected by
+ * this network.
  *
- * @member {PropertyEvent<OcaNetworkStatus>} OcaStreamNetwork#OnStatusChanged
+ * @member {PropertyEvent<number[]>} OcaStreamNetwork#OnStreamConnectorsSourceChanged
  */
 /**
  * This event is emitted when the property ``StreamConnectorsSink`` changes in the remote object.
@@ -345,21 +341,25 @@ export const OcaStreamNetwork = make_control_class(
  * @member {PropertyEvent<number[]>} OcaStreamNetwork#OnStreamConnectorsSinkChanged
  */
 /**
- * This event is emitted when the property ``StreamConnectorsSource`` changes in the remote object.
- * The property ``StreamConnectorsSource`` is described in the AES70 standard as follows.
- * List of object numbers of source **OcaStreamConnector** objects collected by
- * this network.
+ * This event is emitted when the property ``SignalChannelsSource`` changes in the remote object.
+ * The property ``SignalChannelsSource`` is described in the AES70 standard as follows.
+ * List of object numbers of source **OcaNetworkSignalChannel** objects
+ * collected by this network.
  *
- * @member {PropertyEvent<number[]>} OcaStreamNetwork#OnStreamConnectorsSourceChanged
+ * @member {PropertyEvent<number[]>} OcaStreamNetwork#OnSignalChannelsSourceChanged
  */
 /**
- * This event is emitted when the property ``SystemInterfaces`` changes in the remote object.
- * The property ``SystemInterfaces`` is described in the AES70 standard as follows.
- * Collection of identifiers of system interface(s) used by the network. A
- * "system interface" is the system service through which network traffic passes
- * into and out of the device -- e.g. a socket. The identifier format is system
- * and network dependent; for OCA purposes, it is maintained as a
- * variable-length blob which the protocol does not inspect.
+ * This event is emitted when the property ``SignalChannelsSink`` changes in the remote object.
+ * The property ``SignalChannelsSink`` is described in the AES70 standard as follows.
+ * List of object numbers of sink **OcaNetworkSignalChannel** objects collected
+ * by this network.
  *
- * @member {PropertyEvent<OcaNetworkSystemInterfaceID[]>} OcaStreamNetwork#OnSystemInterfacesChanged
+ * @member {PropertyEvent<number[]>} OcaStreamNetwork#OnSignalChannelsSinkChanged
+ */
+/**
+ * This event is emitted when the property ``Statistics`` changes in the remote object.
+ * The property ``Statistics`` is described in the AES70 standard as follows.
+ * Error statistics for this network
+ *
+ * @member {PropertyEvent<OcaNetworkStatistics>} OcaStreamNetwork#OnStatisticsChanged
  */

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

@@ -45,19 +45,6 @@ export declare class OcaSubscriptionManager extends OcaManager {
 
   constructor(objectNumber: number, device: RemoteDevice);
 
-  /**
-   * Removes all subscriptions to the given event with the given **OcaMethod**.
-   * The return value indicates whether the subscription(s) was (were)
-   * successfully removed.
-   *
-   * @method OcaSubscriptionManager#RemoveSubscription
-   * @param {IOcaEvent} Event
-   * @param {IOcaMethod} Subscriber
-   *
-   * @returns {Promise<void>}
-   */
-  RemoveSubscription(Event: IOcaEvent, Subscriber: IOcaMethod): Promise<void>;
-
   /**
    * Adds a subscription to an event. The subscription is added for the session
    * on which the command came in. If a subscription identical to the one being
@@ -84,6 +71,19 @@ export declare class OcaSubscriptionManager extends OcaManager {
     DestinationInformation: Uint8Array
   ): Promise<void>;
 
+  /**
+   * Removes all subscriptions to the given event with the given **OcaMethod**.
+   * The return value indicates whether the subscription(s) was (were)
+   * successfully removed.
+   *
+   * @method OcaSubscriptionManager#RemoveSubscription
+   * @param {IOcaEvent} Event
+   * @param {IOcaMethod} Subscriber
+   *
+   * @returns {Promise<void>}
+   */
+  RemoveSubscription(Event: IOcaEvent, Subscriber: IOcaMethod): Promise<void>;
+
   /**
    * Temporarily disables emitting of event notifications (to all subscribers,
    * not just to the subscriber calling this method). Events from the

package/src/controller/ControlClasses/OcaSubscriptionManager.js

@@ -32,7 +32,6 @@ export const OcaSubscriptionManager = make_control_class(
   2,
   OcaManager,
   [
-    ['RemoveSubscription', 3, 2, [OcaEvent, OcaMethod], []],
     [
       'AddSubscription',
       3,
@@ -40,6 +39,7 @@ export const OcaSubscriptionManager = make_control_class(
       [OcaEvent, OcaMethod, OcaBlob, OcaNotificationDeliveryMode, OcaBlob],
       [],
     ],
+    ['RemoveSubscription', 3, 2, [OcaEvent, OcaMethod], []],
     ['DisableNotifications', 3, 3, [], []],
     ['ReEnableNotifications', 3, 4, [], []],
     [
@@ -72,17 +72,6 @@ export const OcaSubscriptionManager = make_control_class(
   ]
 );
 
-/**
- * Removes all subscriptions to the given event with the given **OcaMethod**.
- * The return value indicates whether the subscription(s) was (were)
- * successfully removed.
- *
- * @method OcaSubscriptionManager#RemoveSubscription
- * @param {IOcaEvent} Event
- * @param {IOcaMethod} Subscriber
- *
- * @returns {Promise<void>}
- */
 /**
  * Adds a subscription to an event. The subscription is added for the session on
  * which the command came in. If a subscription identical to the one being
@@ -100,6 +89,17 @@ export const OcaSubscriptionManager = make_control_class(
  *
  * @returns {Promise<void>}
  */
+/**
+ * Removes all subscriptions to the given event with the given **OcaMethod**.
+ * The return value indicates whether the subscription(s) was (were)
+ * successfully removed.
+ *
+ * @method OcaSubscriptionManager#RemoveSubscription
+ * @param {IOcaEvent} Event
+ * @param {IOcaMethod} Subscriber
+ *
+ * @returns {Promise<void>}
+ */
 /**
  * Temporarily disables emitting of event notifications (to all subscribers, not
  * just to the subscriber calling this method). Events from the Subscription

package/src/controller/base_event.js

@@ -53,8 +53,8 @@ export class BaseEvent {
    * Unsubscribe all event handlers.
    */
   Dipose() {
-    this.handlers.clear();
-
     if (this.handlers.size) this.do_unsubscribe().catch(function () {});
+
+    this.handlers.clear();
   }
 }

package/src/controller/client_connection.js

@@ -21,13 +21,17 @@ class PendingCommand {
     this.retries = 0;
   }
 
+  handleError(error) {
+    if (this.stack && error instanceof Error) error.stack = this.stack;
+    this.reject(error);
+  }
+
   response(o) {
     const { resolve, reject, returnTypes, command } = this;
 
     if (o.status_code !== 0) {
       const error = new RemoteError(new OcaStatus(o.status_code), command);
-      if (this.stack) error.stack = this.stack;
-      reject(error);
+      this.handleError(error);
     } else if (!returnTypes) {
       resolve(o);
     } else {
@@ -84,7 +88,7 @@ export class ClientConnection extends Connection {
     this._pendingCommands = null;
     const e = new Error('closed');
     pendingCommands.forEach((pendingCommand, id) => {
-      pendingCommand.reject(e);
+      pendingCommand.handleError(structuredClone(e));
     });
   }
 

package/src/controller/fetch_device_content.js

@@ -34,8 +34,8 @@ function formatReturnValue(name, value) {
     if (value instanceof Arguments) {
       return {
         [name]: value.item(0),
-        ['min' + name]: value.item(1),
-        ['max' + name]: value.item(2),
+        ['Min' + name]: value.item(1),
+        ['Max' + name]: value.item(2),
       };
     } else {
       value = formatValue(value);
@@ -60,7 +60,12 @@ async function fetchObjectInfo(o) {
   await Promise.all(
     o.get_properties().forEach(async (p) => {
       const { name } = p;
-      if (name === 'ClassID' || name === 'ClassVersion' || name === 'Owner')
+      if (
+        name === 'ClassID' ||
+        name === 'ClassVersion' ||
+        name === 'Owner' ||
+        name === 'ObjectNumber'
+      )
         return;
       if (o instanceof OcaBlock && name === 'Members') return;
       const getter = p.getter(o);