werift 0.19.0 → 0.19.2

package/src/transport/sctp.ts

@@ -1,5 +1,5 @@
+import { jspack } from "@shinyoshiaki/jspack";
 import debug from "debug";
-import { jspack } from "jspack";
 import { Event } from "rx.mini";
 import * as uuid from "uuid";
 
@@ -108,79 +108,73 @@ export class RTCSctpTransport {
     if (ppId === WEBRTC_DCEP && data.length > 0) {
       log("DCEP", streamId, ppId, data);
       switch (data[0]) {
-        case DATA_CHANNEL_OPEN:
-          {
-            if (data.length < 12) {
-              log("DATA_CHANNEL_OPEN data.length not enough");
-              return;
-            }
-
-            if (!Object.keys(this.dataChannels).includes(streamId.toString())) {
-              const [
-                ,
-                channelType,
-                ,
-                reliability,
-                labelLength,
-                protocolLength,
-              ] = jspack.Unpack("!BBHLHH", data);
-
-              let pos = 12;
-              const label = data.slice(pos, pos + labelLength).toString("utf8");
-              pos += labelLength;
-              const protocol = data
-                .slice(pos, pos + protocolLength)
-                .toString("utf8");
-
-              log("DATA_CHANNEL_OPEN", {
-                channelType,
-                reliability,
-                streamId,
-                label,
-                protocol,
-              });
-
-              const maxRetransmits =
-                (channelType & 0x03) === 1 ? reliability : undefined;
-              const maxPacketLifeTime =
-                (channelType & 0x03) === 2 ? reliability : undefined;
-
-              // # register channel
-              const parameters = new RTCDataChannelParameters({
-                label,
-                ordered: (channelType & 0x80) === 0,
-                maxPacketLifeTime,
-                maxRetransmits,
-                protocol,
-                id: streamId,
-              });
-              const channel = new RTCDataChannel(this, parameters, false);
-              channel.isCreatedByRemote = true;
-              this.dataChannels[streamId] = channel;
-
-              this.onDataChannel.execute(channel);
-              channel.setReadyState("open");
-            } else {
-              log("datachannel already opened", "retransmit ack");
-            }
+        case DATA_CHANNEL_OPEN: {
+          if (data.length < 12) {
+            log("DATA_CHANNEL_OPEN data.length not enough");
+            return;
+          }
 
-            const channel = this.dataChannels[streamId];
-            this.dataChannelQueue.push([
-              channel,
-              WEBRTC_DCEP,
-              Buffer.from(jspack.Pack("!B", [DATA_CHANNEL_ACK])),
-            ]);
-            await this.dataChannelFlush();
+          if (!Object.keys(this.dataChannels).includes(streamId.toString())) {
+            const [, channelType, , reliability, labelLength, protocolLength] =
+              jspack.Unpack("!BBHLHH", data);
+
+            let pos = 12;
+            const label = data.slice(pos, pos + labelLength).toString("utf8");
+            pos += labelLength;
+            const protocol = data
+              .slice(pos, pos + protocolLength)
+              .toString("utf8");
+
+            log("DATA_CHANNEL_OPEN", {
+              channelType,
+              reliability,
+              streamId,
+              label,
+              protocol,
+            });
+
+            const maxRetransmits =
+              (channelType & 0x03) === 1 ? reliability : undefined;
+            const maxPacketLifeTime =
+              (channelType & 0x03) === 2 ? reliability : undefined;
+
+            // # register channel
+            const parameters = new RTCDataChannelParameters({
+              label,
+              ordered: (channelType & 0x80) === 0,
+              maxPacketLifeTime,
+              maxRetransmits,
+              protocol,
+              id: streamId,
+            });
+            const channel = new RTCDataChannel(this, parameters, false);
+            channel.isCreatedByRemote = true;
+            this.dataChannels[streamId] = channel;
+
+            this.onDataChannel.execute(channel);
+            channel.setReadyState("open");
+          } else {
+            log("datachannel already opened", "retransmit ack");
           }
-          break;
-        case DATA_CHANNEL_ACK:
+
+          const channel = this.dataChannels[streamId];
+          this.dataChannelQueue.push([
+            channel,
+            WEBRTC_DCEP,
+            Buffer.from(jspack.Pack("!B", [DATA_CHANNEL_ACK])),
+          ]);
+          await this.dataChannelFlush();
+        }
+        break;
+        case DATA_CHANNEL_ACK: {
           log("DATA_CHANNEL_ACK", streamId, ppId);
           const channel = this.dataChannels[streamId];
           if (!channel) {
             throw new Error("channel not found");
           }
           channel.setReadyState("open");
-          break;
+        }
+        break;
       }
     } else {
       const channel = this.dataChannels[streamId];
@@ -200,7 +194,7 @@ export class RTCSctpTransport {
           }
         })();
 
-        channel.message.execute(msg);
+        channel.onMessage.execute(msg);
         channel.emit("message", { data: msg });
         if (channel.onmessage) {
           channel.onmessage({ data: msg });

package/src/utils.ts

@@ -1,7 +1,7 @@
 /* eslint-disable prefer-const */
 import { createHash } from "crypto";
+import { RemoteInfo, createSocket } from "dgram";
 import debug from "debug";
-import { createSocket, RemoteInfo } from "dgram";
 import mergeWith from "lodash/mergeWith";
 import { performance } from "perf_hooks";
 

package/src/typings/jspack.d.ts

@@ -1,8 +0,0 @@
-declare module "jspack" {
-  interface Jspack {
-    Pack(s: string, arr: any[]): number[];
-    Unpack(s: string, buf: Buffer): number[];
-  }
-  const jspack: Jspack;
-  export { jspack };
-}