aes70 2.0.7 → 2.0.10

package/dist/AES70.es5.js

@@ -1835,7 +1835,11 @@
         const subscriptions = [];
 
         const cleanup = () => {
-          subscriptions.forEach((cb) => cb());
+          subscriptions.forEach((cb) => {
+            try {
+              cb();
+            } catch (e) {}
+          });
           subscriptions.length = 0;
         };
         subscriptions.push(
@@ -15658,14 +15662,14 @@
    */
 
   function OcaInterval(DT) {
-    return Struct(
+    return class extends Struct(
       {
         Min: DT,
         Max: DT,
         Bounds: OcaIntervalBounds$1,
       },
       OcaInterval$1
-    );
+    ) {};
   }
 
   /*
@@ -28387,7 +28391,7 @@
           }
           return 2;
         } catch (err) {
-          if (!RemoteError.check_status(err, OcaStatus$1.NotImplemented)) {
+          if (!(err instanceof RemoteError)) {
             throw err;
           }
           this._supportsEV2 = false;
@@ -28828,9 +28832,13 @@
         options.type
       );
 
-      await waitForKeepalive(socket, options);
-
-      return new this(socket, options);
+      try {
+        await waitForKeepalive(socket, options);
+        return new this(socket, options);
+      } catch (err) {
+        socket.close();
+        throw err;
+      }
     }
 
     write(buf) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aes70",
-  "version": "2.0.7",
+  "version": "2.0.10",
   "description": "A controller library for the AES70 protocol.",
   "type": "module",
   "main": "src/index.js",

package/src/OCP1/OcaInterval.js

@@ -6,12 +6,12 @@ import { Struct } from './Struct.js';
 import { OcaInterval as type } from '../types/OcaInterval.js';
 
 export function OcaInterval(DT) {
-  return Struct(
+  return class extends Struct(
     {
       Min: DT,
       Max: DT,
       Bounds: OcaIntervalBounds,
     },
     type
-  );
+  ) {};
 }

package/src/controller/abstract_udp_connection.js

@@ -103,9 +103,13 @@ export class AbstractUDPConnection extends ClientConnection {
       options.type
     );
 
-    await waitForKeepalive(socket, options);
-
-    return new this(socket, options);
+    try {
+      await waitForKeepalive(socket, options);
+      return new this(socket, options);
+    } catch (err) {
+      socket.close();
+      throw err;
+    }
   }
 
   write(buf) {

package/src/controller/client_connection.js

@@ -260,7 +260,11 @@ export class ClientConnection extends Connection {
       const subscriptions = [];
 
       const cleanup = () => {
-        subscriptions.forEach((cb) => cb());
+        subscriptions.forEach((cb) => {
+          try {
+            cb();
+          } catch (e) {}
+        });
         subscriptions.length = 0;
       };
       subscriptions.push(

package/src/controller/remote_device.js

@@ -242,7 +242,7 @@ export class RemoteDevice extends Events {
         }
         return 2;
       } catch (err) {
-        if (!RemoteError.check_status(err, OcaStatus.NotImplemented)) {
+        if (!(err instanceof RemoteError)) {
           throw err;
         }
         this._supportsEV2 = false;

package/bin/server.pike

@@ -1,179 +0,0 @@
-#if constant(Protocols.WebSocket)
-Protocols.WebSocket.Port http = Protocols.WebSocket.Port(http_cb, websocket_cb, 8080);
-
-mapping(Protocols.WebSocket.Connection:Stdio.File) websocket_to_socket = ([]);
-mapping(Protocols.WebSocket.Connection:Stdio.File) socket_to_websocket = ([]);
-
-string HTDOCS = combine_path(dirname(__DIR__));
-
-string file_to_mime(string name) {
-    name = (name/".")[-1];
-    switch (lower_case(name)) {
-    case "html":
-        return "text/html";
-    case "css":
-        return "text/css";
-    case "png":
-        return "image/png";
-    case "jpg":
-        return "image/jpeg";
-    case "svg":
-        return "image/svg+xml";
-    case "js":
-        return "application/x-javascript";
-    default:
-        return "application/octet-stream";
-    }
-}
-
-void http_cb(object r) {
-    string type = r->request_type;
-
-    if (type == "GET") {
-        string fname = r->not_query;
-
-        fname = Stdio.simplify_path("./" + fname);
-
-        fname = combine_path(HTDOCS, fname);
-
-        if (Stdio.is_dir(fname)) {
-            if (!has_suffix(r->not_query, "/")) {
-                r->response_and_finish(([
-                    "error" : 301,
-                    "extra_heads" : ([
-                        "location" : r->not_query + "/",
-                    ]),
-                ]));
-                return;
-            }
-            fname = combine_path(fname, "index.html");
-        }
-
-        if (Stdio.is_file(fname)) {
-            r->response_and_finish(([
-                "error" : 200,
-                "file" : Stdio.File(fname, "r"),
-                "type" : file_to_mime(fname)
-            ]));
-            return;
-        }
-    }
-
-    r->response_and_finish(([ "error" : 404, "data" : "No such file.", "type" : "text/plain" ]));
-}
-
-class WebSocketBridge {
-    Stdio.File socket;
-    Protocols.WebSocket.Connection websocket;
-
-    string out_buf = "";
-    int(0..1) will_write = 1;
-
-    void create(Stdio.File socket, Protocols.WebSocket.Connection websocket) {
-        this_program::socket = socket;
-        this_program::websocket = websocket;
-
-        websocket->onmessage = websocket_incoming;
-        websocket->onclose = websocket_close;
-
-        socket->set_nonblocking(socket_read, socket_write, socket_close);
-    }
-
-    void socket_send(string data) {
-        out_buf += data;
-
-        if (!will_write) socket_write();
-    }
-
-    void socket_write() {
-        if (!sizeof(out_buf)) {
-            will_write = 0;
-            return;
-        }
-
-        int len = socket->write(out_buf);
-
-        werror("Passed %d bytes of data from websocket to socket.\n", len);
-
-        out_buf = out_buf[len..];
-
-        will_write = 1;
-    }
-
-    void socket_read(mixed id, string data) {
-        werror("Passed %d bytes of data from socket to websocket.\n", sizeof(data));
-        websocket->send_binary(data);
-    }
-
-    void websocket_incoming(Protocols.WebSocket.Frame frame) {
-        switch (frame->opcode) {
-        case Protocols.WebSocket.FRAME_BINARY:
-            socket_send(frame->data);
-            break;
-        case Protocols.WebSocket.FRAME_TEXT:
-            socket_send(string_to_utf8(frame->text));
-            break;
-        case Protocols.WebSocket.FRAME_CLOSE:
-            // ignore
-            break;
-        default:
-            werror("Unhandled WebSocket frame %O\n", frame);
-        }
-    }
-
-    void websocket_close() {
-        werror("WebSocket %O closed.\n", websocket);
-        websocket->onmessage = 0;
-        websocket->onclose = 0;
-        socket->set_nonblocking(0,0,0);
-        socket->close();
-    }
-
-    void socket_close() {
-        werror("Socket %O closed.\n", socket);
-        socket->set_nonblocking(0,0,0);
-        websocket->close();
-        websocket->onmessage = 0;
-        websocket->onclose = 0;
-    }
-}
-
-string ip;
-int port;
-
-void connect_cb(int(0..1) success, object request, Stdio.File socket) {
-    if (!success) {
-        werror("Failed to connect to %s:%d: %d\n", ip, port, socket->errno());
-        request->websocket_accept()->close();
-    } else {
-        werror("Successfully connected to %O\n", socket);
-        WebSocketBridge(socket, request->websocket_accept());
-    }
-}
-
-void websocket_cb(array(string) protocols, object request) {
-    Stdio.File socket = Stdio.File();
-
-    werror("Connecting new WebSocket to %s:%d\n", ip, port);
-
-    socket->async_connect(ip, port, connect_cb, request, socket);
-}
-
-int main(int argc, array(string) argv) {
-    if (argc < 3) {
-        werror("%s <ip> <port>\n", argv[0]);
-        exit(1);
-    }
-
-    ip = argv[1];
-    port = (int)argv[2];
-
-    werror("Forwarding WebSockets to OCA device at %s:%d\n", ip, port);
-
-    werror("Go to http://localhost:8080/\n");
-
-    return -1;
-}
-#else
-#error This Program requires WebSocket support. Support for WebSockets was added in Pike version 8.
-#endif

package/src/OCP1/OcaClassAuthorityID.js

@@ -1,18 +0,0 @@
-/*
- * This file has been generated.
- */
-import { OcaBlobFixedLen } from './OcaBlobFixedLen.js';
-import { OcaUint16 } from './OcaUint16.js';
-import { OcaUint8 } from './OcaUint8.js';
-import { Struct } from './Struct.js';
-
-import { OcaClassAuthorityID as type } from '../types/OcaClassAuthorityID.js';
-
-export const OcaClassAuthorityID = Struct(
-  {
-    Sentinel: OcaUint16,
-    Reserved: OcaUint8,
-    OrganizationID: OcaBlobFixedLen(3),
-  },
-  type
-);

package/src/OCP1/OcaEnumItem.js

@@ -1,14 +0,0 @@
-/*
- * This file has been generated.
- */
-import { Struct } from './Struct.js';
-import { OcaUint8 } from './OcaUint8.js';
-
-import { OcaEnumItem as type } from '../types/OcaEnumItem.js';
-
-export const OcaEnumItem = Struct(
-  {
-    Value: OcaUint8,
-  },
-  type
-);

package/src/OCP1/OcaEnumItem16.js

@@ -1,14 +0,0 @@
-/*
- * This file has been generated.
- */
-import { Struct } from './Struct.js';
-import { OcaUint16 } from './OcaUint16.js';
-
-import { OcaEnumItem16 as type } from '../types/OcaEnumItem16.js';
-
-export const OcaEnumItem16 = Struct(
-  {
-    Value: OcaUint16,
-  },
-  type
-);

package/src/OCP1/OcaLibParamSetAssignment.js

@@ -1,16 +0,0 @@
-/*
- * This file has been generated.
- */
-import { OcaLibVolIdentifier } from './OcaLibVolIdentifier.js';
-import { OcaUint32 } from './OcaUint32.js';
-import { Struct } from './Struct.js';
-
-import { OcaLibParamSetAssignment as type } from '../types/OcaLibParamSetAssignment.js';
-
-export const OcaLibParamSetAssignment = Struct(
-  {
-    ParamSetIdentifier: OcaLibVolIdentifier,
-    TargetBlockONo: OcaUint32,
-  },
-  type
-);

package/src/OCP1/OcaLibVol.js

@@ -1,16 +0,0 @@
-/*
- * This file has been generated.
- */
-import { OcaBlob } from './OcaBlob.js';
-import { OcaLibVolMetadata } from './OcaLibVolMetadata.js';
-import { Struct } from './Struct.js';
-
-import { OcaLibVol as type } from '../types/OcaLibVol.js';
-
-export const OcaLibVol = Struct(
-  {
-    Metadata: OcaLibVolMetadata,
-    Data: OcaBlob,
-  },
-  type
-);

package/src/OCP1/OcaLibVolChangedEventData.js

@@ -1,16 +0,0 @@
-/*
- * This file has been generated.
- */
-import { OcaPropertyChangeType } from './OcaPropertyChangeType.js';
-import { OcaUint32 } from './OcaUint32.js';
-import { Struct } from './Struct.js';
-
-import { OcaLibVolChangedEventData as type } from '../types/OcaLibVolChangedEventData.js';
-
-export const OcaLibVolChangedEventData = Struct(
-  {
-    VolumeID: OcaUint32,
-    ChangeType: OcaPropertyChangeType,
-  },
-  type
-);

package/src/OCP1/OcaLibVolMetadata.js

@@ -1,23 +0,0 @@
-/*
- * This file has been generated.
- */
-import { OcaLibAccess } from './OcaLibAccess.js';
-import { OcaLibVolType } from './OcaLibVolType.js';
-import { OcaString } from './OcaString.js';
-import { OcaTimePTP } from './OcaTimePTP.js';
-import { OcaUint32 } from './OcaUint32.js';
-import { Struct } from './Struct.js';
-
-import { OcaLibVolMetadata as type } from '../types/OcaLibVolMetadata.js';
-
-export const OcaLibVolMetadata = Struct(
-  {
-    Name: OcaString,
-    VolType: OcaLibVolType,
-    Access: OcaLibAccess,
-    Version: OcaUint32,
-    Creator: OcaString,
-    UpDate: OcaTimePTP,
-  },
-  type
-);

package/src/OCP1/OcaMediaConnectorStatusChangedEventData.js

@@ -1,14 +0,0 @@
-/*
- * This file has been generated.
- */
-import { OcaMediaConnectorStatus } from './OcaMediaConnectorStatus.js';
-import { Struct } from './Struct.js';
-
-import { OcaMediaConnectorStatusChangedEventData as type } from '../types/OcaMediaConnectorStatusChangedEventData.js';
-
-export const OcaMediaConnectorStatusChangedEventData = Struct(
-  {
-    ConnectorStatus: OcaMediaConnectorStatus,
-  },
-  type
-);

package/src/OCP1/OcaNetworkSystemInterfaceDescriptor.js

@@ -1,15 +0,0 @@
-/*
- * This file has been generated.
- */
-import { OcaBlob } from './OcaBlob.js';
-import { Struct } from './Struct.js';
-
-import { OcaNetworkSystemInterfaceDescriptor as type } from '../types/OcaNetworkSystemInterfaceDescriptor.js';
-
-export const OcaNetworkSystemInterfaceDescriptor = Struct(
-  {
-    SystemInterfaceParameters: OcaBlob,
-    MyNetworkAddress: OcaBlob,
-  },
-  type
-);

package/src/OCP1/OcaPilotToneDetectorSpec.js

@@ -1,18 +0,0 @@
-/*
- * This file has been generated.
- */
-import { OcaDBr } from './OcaDBr.js';
-import { OcaFloat32 } from './OcaFloat32.js';
-import { OcaUint32 } from './OcaUint32.js';
-import { Struct } from './Struct.js';
-
-import { OcaPilotToneDetectorSpec as type } from '../types/OcaPilotToneDetectorSpec.js';
-
-export const OcaPilotToneDetectorSpec = Struct(
-  {
-    Threshold: OcaDBr,
-    Frequency: OcaFloat32,
-    PollInterval: OcaUint32,
-  },
-  type
-);

package/src/OCP1/OcaProtoPortID.js

@@ -1,16 +0,0 @@
-/*
- * This file has been generated.
- */
-import { OcaPortMode } from './OcaPortMode.js';
-import { OcaUint16 } from './OcaUint16.js';
-import { Struct } from './Struct.js';
-
-import { OcaProtoPortID as type } from '../types/OcaProtoPortID.js';
-
-export const OcaProtoPortID = Struct(
-  {
-    Mode: OcaPortMode,
-    Index: OcaUint16,
-  },
-  type
-);

package/src/OCP1/OcaTaskStateChangedEventData.js

@@ -1,18 +0,0 @@
-/*
- * This file has been generated.
- */
-import { OcaLibVolIdentifier } from './OcaLibVolIdentifier.js';
-import { OcaTaskStatus } from './OcaTaskStatus.js';
-import { OcaUint32 } from './OcaUint32.js';
-import { Struct } from './Struct.js';
-
-import { OcaTaskStateChangedEventData as type } from '../types/OcaTaskStateChangedEventData.js';
-
-export const OcaTaskStateChangedEventData = Struct(
-  {
-    TaskID: OcaUint32,
-    ProgramID: OcaLibVolIdentifier,
-    Status: OcaTaskStatus,
-  },
-  type
-);