werift 0.20.1 → 0.21.0

package/lib/ice/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../ice/src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,wCAA8C;AAArC,iGAAA,UAAU,OAAA;AACnB,8CAA4B;AAC5B,+CAA6B;AAC7B,iDAA+B;AAC/B,kDAAgC;AAChC,kDAAgC;AAChC,8CAA4B;AAC5B,wCAAsB;AACtB,gDAA8B;AAC9B,0CAAwB","sourcesContent":["export { randomPort } from \"../../common/src\";\nexport * from \"./transport\";\nexport * from \"./stun/const\";\nexport * from \"./stun/message\";\nexport * from \"./stun/protocol\";\nexport * from \"./turn/protocol\";\nexport * from \"./candidate\";\nexport * from \"./ice\";\nexport * from \"./types/model\";\nexport * from \"./utils\";\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../ice/src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,wCAA8C;AAArC,iGAAA,UAAU,OAAA;AACnB,8CAA4B;AAC5B,+CAA6B;AAC7B,iDAA+B;AAC/B,kDAAgC;AAChC,kDAAgC;AAChC,8CAA4B;AAC5B,wCAAsB;AACtB,gDAA8B;AAC9B,0CAAwB;AACxB,4CAA0B","sourcesContent":["export { randomPort } from \"../../common/src\";\nexport * from \"./transport\";\nexport * from \"./stun/const\";\nexport * from \"./stun/message\";\nexport * from \"./stun/protocol\";\nexport * from \"./turn/protocol\";\nexport * from \"./candidate\";\nexport * from \"./ice\";\nexport * from \"./types/model\";\nexport * from \"./utils\";\nexport * from \"./iceBase\";\n"]}

package/lib/ice/src/stun/message.d.ts

@@ -9,6 +9,12 @@ export declare class Message extends AttributeRepository {
     toJSON(): {
         messageMethod: string;
         messageClass: string;
+        attributes: AttributePair[];
+    };
+    get json(): {
+        messageMethod: string;
+        messageClass: string;
+        attributes: AttributePair[];
     };
     get transactionIdHex(): string;
     get bytes(): Buffer;

package/lib/ice/src/stun/message.js

@@ -81,9 +81,13 @@ class Message extends attributes_1.AttributeRepository {
         });
     }
     toJSON() {
+        return this.json;
+    }
+    get json() {
         return {
             messageMethod: const_1.methods[this.messageMethod],
             messageClass: const_1.classes[this.messageClass],
+            attributes: this.attributes,
         };
     }
     get transactionIdHex() {

package/lib/ice/src/stun/message.js.map

@@ -1 +1 @@
-{"version":3,"file":"message.js","sourceRoot":"","sources":["../../../../../ice/src/stun/message.ts"],"names":[],"mappings":"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","sourcesContent":["import { createHmac } from \"crypto\";\nimport { jspack } from \"@shinyoshiaki/jspack\";\nimport crc32 from \"buffer-crc32\";\n\nimport { bufferXor, randomTransactionId } from \"../helper\";\nimport {\n  ATTRIBUTES_BY_NAME,\n  ATTRIBUTES_BY_TYPE,\n  type AttributeKey,\n  type AttributePair,\n  AttributeRepository,\n  packXorAddress,\n  unpackXorAddress,\n} from \"./attributes\";\nimport {\n  COOKIE,\n  FINGERPRINT_LENGTH,\n  FINGERPRINT_XOR,\n  HEADER_LENGTH,\n  INTEGRITY_LENGTH,\n  classes,\n  methods,\n} from \"./const\";\n\nexport function parseMessage(\n  data: Buffer,\n  integrityKey?: Buffer,\n): Message | undefined {\n  if (data.length < HEADER_LENGTH) {\n    return undefined;\n  }\n  const [messageType, length] = jspack.Unpack(\n    \"!HHI\",\n    data.subarray(0, HEADER_LENGTH),\n  );\n\n  const transactionId = Buffer.from(\n    data.subarray(HEADER_LENGTH - 12, HEADER_LENGTH),\n  );\n\n  if (data.length !== HEADER_LENGTH + length) {\n    return undefined;\n  }\n\n  const attributeRepository = new AttributeRepository();\n\n  for (let pos = HEADER_LENGTH; pos <= data.length - 4; ) {\n    const [attrType, attrLen] = jspack.Unpack(\n      \"!HH\",\n      data.subarray(pos, pos + 4),\n    );\n    const payload = data.subarray(pos + 4, pos + 4 + attrLen);\n    const padLen = paddingLength(attrLen);\n    const attributesTypes = Object.keys(ATTRIBUTES_BY_TYPE);\n    if (attributesTypes.includes(attrType.toString())) {\n      const [, attrName, , attrUnpack] = ATTRIBUTES_BY_TYPE[attrType];\n      if (attrUnpack.name === unpackXorAddress.name) {\n        attributeRepository.setAttribute(\n          attrName as AttributeKey,\n          attrUnpack(payload, transactionId),\n        );\n      } else {\n        attributeRepository.setAttribute(\n          attrName as AttributeKey,\n          attrUnpack(payload),\n        );\n      }\n\n      if (attrName === \"FINGERPRINT\") {\n        const fingerprint = messageFingerprint(data.slice(0, pos));\n        const expect = attributeRepository.getAttributeValue(\"FINGERPRINT\");\n        if (expect !== fingerprint) {\n          return undefined;\n        }\n      } else if (attrName === \"MESSAGE-INTEGRITY\") {\n        if (integrityKey) {\n          const integrity = messageIntegrity(data.slice(0, pos), integrityKey);\n          const expect =\n            attributeRepository.getAttributeValue(\"MESSAGE-INTEGRITY\");\n          if (!integrity.equals(expect)) {\n            return undefined;\n          }\n        }\n      }\n    }\n    pos += 4 + attrLen + padLen;\n  }\n\n  const attributes = attributeRepository.getAttributes();\n  attributeRepository.clear();\n\n  return new Message(\n    messageType & 0x3eef,\n    messageType & 0x0110,\n    transactionId,\n    attributes,\n  );\n}\n\nexport class Message extends AttributeRepository {\n  constructor(\n    public messageMethod: methods,\n    public messageClass: classes,\n    public transactionId: Buffer = randomTransactionId(),\n    attributes: AttributePair[] = [],\n  ) {\n    super(attributes);\n  }\n\n  toJSON() {\n    return {\n      messageMethod: methods[this.messageMethod],\n      messageClass: classes[this.messageClass],\n    };\n  }\n\n  get transactionIdHex() {\n    return this.transactionId.toString(\"hex\");\n  }\n\n  get bytes() {\n    let data = Buffer.from([]);\n    for (const attrName of this.attributesKeys) {\n      const attrValue = this.getAttributeValue(attrName);\n      const [attrType, , attrPack] = ATTRIBUTES_BY_NAME[attrName];\n      const v =\n        attrPack.name === packXorAddress.name\n          ? attrPack(attrValue, this.transactionId)\n          : attrPack(attrValue);\n      const attrLen = v.length;\n      const padLen = paddingLength(attrLen);\n      data = Buffer.concat([\n        data,\n        Buffer.from(jspack.Pack(\"!HH\", [attrType, attrLen])),\n        v,\n        ...[...Array(padLen)].map(() => Buffer.from(\"\\x00\")),\n      ]);\n    }\n    const buf = Buffer.from(\n      jspack.Pack(\"!HHI\", [\n        this.messageMethod | this.messageClass,\n        data.length,\n        COOKIE,\n      ]),\n    );\n\n    return Buffer.concat([buf, this.transactionId, data]);\n  }\n\n  addMessageIntegrity(key: Buffer) {\n    this.setAttribute(\"MESSAGE-INTEGRITY\", this.messageIntegrity(key));\n    return this;\n  }\n\n  messageIntegrity(key: Buffer) {\n    const checkData = setBodyLength(\n      this.bytes,\n      this.bytes.length - HEADER_LENGTH + INTEGRITY_LENGTH,\n    );\n    return Buffer.from(\n      createHmac(\"sha1\", key).update(checkData).digest(\"hex\"),\n      \"hex\",\n    );\n  }\n\n  addFingerprint() {\n    this.setAttribute(\"FINGERPRINT\", messageFingerprint(this.bytes));\n  }\n}\n\nconst setBodyLength = (data: Buffer, length: number) => {\n  return Buffer.concat([\n    data.slice(0, 2),\n    Buffer.from(jspack.Pack(\"!H\", [length])),\n    data.slice(4),\n  ]);\n};\n\nfunction messageFingerprint(data: Buffer) {\n  const checkData = setBodyLength(\n    data,\n    data.length - HEADER_LENGTH + FINGERPRINT_LENGTH,\n  );\n  const crc32Buf = crc32(checkData);\n  const xorBuf = Buffer.alloc(4);\n  xorBuf.writeInt32BE(FINGERPRINT_XOR, 0);\n  const fingerprint = bufferXor(crc32Buf, xorBuf);\n  return fingerprint.readUInt32BE(0);\n}\n\nfunction messageIntegrity(data: Buffer, key: Buffer) {\n  const checkData = setBodyLength(\n    data,\n    data.length - HEADER_LENGTH + INTEGRITY_LENGTH,\n  );\n  return Buffer.from(\n    createHmac(\"sha1\", key).update(checkData).digest(\"hex\"),\n    \"hex\",\n  );\n}\n\nexport function paddingLength(length: number) {\n  const rest = length % 4;\n  if (rest === 0) {\n    return 0;\n  } else {\n    return 4 - rest;\n  }\n}\n"]}
+{"version":3,"file":"message.js","sourceRoot":"","sources":["../../../../../ice/src/stun/message.ts"],"names":[],"mappings":"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","sourcesContent":["import { createHmac } from \"crypto\";\nimport { jspack } from \"@shinyoshiaki/jspack\";\nimport crc32 from \"buffer-crc32\";\n\nimport { bufferXor, randomTransactionId } from \"../helper\";\nimport {\n  ATTRIBUTES_BY_NAME,\n  ATTRIBUTES_BY_TYPE,\n  type AttributeKey,\n  type AttributePair,\n  AttributeRepository,\n  packXorAddress,\n  unpackXorAddress,\n} from \"./attributes\";\nimport {\n  COOKIE,\n  FINGERPRINT_LENGTH,\n  FINGERPRINT_XOR,\n  HEADER_LENGTH,\n  INTEGRITY_LENGTH,\n  classes,\n  methods,\n} from \"./const\";\n\nexport function parseMessage(\n  data: Buffer,\n  integrityKey?: Buffer,\n): Message | undefined {\n  if (data.length < HEADER_LENGTH) {\n    return undefined;\n  }\n  const [messageType, length] = jspack.Unpack(\n    \"!HHI\",\n    data.subarray(0, HEADER_LENGTH),\n  );\n\n  const transactionId = Buffer.from(\n    data.subarray(HEADER_LENGTH - 12, HEADER_LENGTH),\n  );\n\n  if (data.length !== HEADER_LENGTH + length) {\n    return undefined;\n  }\n\n  const attributeRepository = new AttributeRepository();\n\n  for (let pos = HEADER_LENGTH; pos <= data.length - 4; ) {\n    const [attrType, attrLen] = jspack.Unpack(\n      \"!HH\",\n      data.subarray(pos, pos + 4),\n    );\n    const payload = data.subarray(pos + 4, pos + 4 + attrLen);\n    const padLen = paddingLength(attrLen);\n    const attributesTypes = Object.keys(ATTRIBUTES_BY_TYPE);\n    if (attributesTypes.includes(attrType.toString())) {\n      const [, attrName, , attrUnpack] = ATTRIBUTES_BY_TYPE[attrType];\n      if (attrUnpack.name === unpackXorAddress.name) {\n        attributeRepository.setAttribute(\n          attrName as AttributeKey,\n          attrUnpack(payload, transactionId),\n        );\n      } else {\n        attributeRepository.setAttribute(\n          attrName as AttributeKey,\n          attrUnpack(payload),\n        );\n      }\n\n      if (attrName === \"FINGERPRINT\") {\n        const fingerprint = messageFingerprint(data.slice(0, pos));\n        const expect = attributeRepository.getAttributeValue(\"FINGERPRINT\");\n        if (expect !== fingerprint) {\n          return undefined;\n        }\n      } else if (attrName === \"MESSAGE-INTEGRITY\") {\n        if (integrityKey) {\n          const integrity = messageIntegrity(data.slice(0, pos), integrityKey);\n          const expect =\n            attributeRepository.getAttributeValue(\"MESSAGE-INTEGRITY\");\n          if (!integrity.equals(expect)) {\n            return undefined;\n          }\n        }\n      }\n    }\n    pos += 4 + attrLen + padLen;\n  }\n\n  const attributes = attributeRepository.getAttributes();\n  attributeRepository.clear();\n\n  return new Message(\n    messageType & 0x3eef,\n    messageType & 0x0110,\n    transactionId,\n    attributes,\n  );\n}\n\nexport class Message extends AttributeRepository {\n  constructor(\n    public messageMethod: methods,\n    public messageClass: classes,\n    public transactionId: Buffer = randomTransactionId(),\n    attributes: AttributePair[] = [],\n  ) {\n    super(attributes);\n  }\n\n  toJSON() {\n    return this.json;\n  }\n\n  get json() {\n    return {\n      messageMethod: methods[this.messageMethod],\n      messageClass: classes[this.messageClass],\n      attributes: this.attributes,\n    };\n  }\n\n  get transactionIdHex() {\n    return this.transactionId.toString(\"hex\");\n  }\n\n  get bytes() {\n    let data = Buffer.from([]);\n    for (const attrName of this.attributesKeys) {\n      const attrValue = this.getAttributeValue(attrName);\n      const [attrType, , attrPack] = ATTRIBUTES_BY_NAME[attrName];\n      const v =\n        attrPack.name === packXorAddress.name\n          ? attrPack(attrValue, this.transactionId)\n          : attrPack(attrValue);\n      const attrLen = v.length;\n      const padLen = paddingLength(attrLen);\n      data = Buffer.concat([\n        data,\n        Buffer.from(jspack.Pack(\"!HH\", [attrType, attrLen])),\n        v,\n        ...[...Array(padLen)].map(() => Buffer.from(\"\\x00\")),\n      ]);\n    }\n    const buf = Buffer.from(\n      jspack.Pack(\"!HHI\", [\n        this.messageMethod | this.messageClass,\n        data.length,\n        COOKIE,\n      ]),\n    );\n\n    return Buffer.concat([buf, this.transactionId, data]);\n  }\n\n  addMessageIntegrity(key: Buffer) {\n    this.setAttribute(\"MESSAGE-INTEGRITY\", this.messageIntegrity(key));\n    return this;\n  }\n\n  messageIntegrity(key: Buffer) {\n    const checkData = setBodyLength(\n      this.bytes,\n      this.bytes.length - HEADER_LENGTH + INTEGRITY_LENGTH,\n    );\n    return Buffer.from(\n      createHmac(\"sha1\", key).update(checkData).digest(\"hex\"),\n      \"hex\",\n    );\n  }\n\n  addFingerprint() {\n    this.setAttribute(\"FINGERPRINT\", messageFingerprint(this.bytes));\n  }\n}\n\nconst setBodyLength = (data: Buffer, length: number) => {\n  return Buffer.concat([\n    data.slice(0, 2),\n    Buffer.from(jspack.Pack(\"!H\", [length])),\n    data.slice(4),\n  ]);\n};\n\nfunction messageFingerprint(data: Buffer) {\n  const checkData = setBodyLength(\n    data,\n    data.length - HEADER_LENGTH + FINGERPRINT_LENGTH,\n  );\n  const crc32Buf = crc32(checkData);\n  const xorBuf = Buffer.alloc(4);\n  xorBuf.writeInt32BE(FINGERPRINT_XOR, 0);\n  const fingerprint = bufferXor(crc32Buf, xorBuf);\n  return fingerprint.readUInt32BE(0);\n}\n\nfunction messageIntegrity(data: Buffer, key: Buffer) {\n  const checkData = setBodyLength(\n    data,\n    data.length - HEADER_LENGTH + INTEGRITY_LENGTH,\n  );\n  return Buffer.from(\n    createHmac(\"sha1\", key).update(checkData).digest(\"hex\"),\n    \"hex\",\n  );\n}\n\nexport function paddingLength(length: number) {\n  const rest = length % 4;\n  if (rest === 0) {\n    return 0;\n  } else {\n    return 4 - rest;\n  }\n}\n"]}

package/lib/ice/src/stun/protocol.d.ts

@@ -1,12 +1,11 @@
+import { Event } from "../imports/common";
 import type { InterfaceAddresses } from "../../../common/src/network";
 import type { Candidate } from "../candidate";
-import type { Connection } from "../ice";
 import { UdpTransport } from "../transport";
 import type { Address, Protocol } from "../types/model";
 import { type Message } from "./message";
 import { Transaction } from "./transaction";
 export declare class StunProtocol implements Protocol {
-    receiver?: Connection | undefined;
     static readonly type = "stun";
     readonly type = "stun";
     transport: UdpTransport;
@@ -16,10 +15,10 @@ export declare class StunProtocol implements Protocol {
     get transactionsKeys(): string[];
     localCandidate?: Candidate;
     sentMessage?: Message;
-    localAddress?: string;
-    private readonly closed;
-    constructor(receiver?: Connection | undefined);
-    connectionLost(): void;
+    localIp?: string;
+    readonly onRequestReceived: Event<[Message, readonly [string, number], Buffer]>;
+    readonly onDataReceived: Event<[Buffer]>;
+    constructor();
     connectionMade: (useIpv4: boolean, portRange?: [number, number], interfaceAddresses?: InterfaceAddresses) => Promise<void>;
     private datagramReceived;
     getExtraInfo(): Address;

package/lib/ice/src/stun/protocol.js

@@ -10,18 +10,12 @@ const transport_1 = require("../transport");
 const const_1 = require("./const");
 const message_1 = require("./message");
 const transaction_1 = require("./transaction");
-const log = (0, debug_1.default)("packages/ice/src/stun/protocol.ts");
+const log = (0, debug_1.default)("werift-ice : packages/ice/src/stun/protocol.ts");
 class StunProtocol {
     get transactionsKeys() {
         return Object.keys(this.transactions);
     }
-    constructor(receiver) {
-        Object.defineProperty(this, "receiver", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: receiver
-        });
+    constructor() {
         Object.defineProperty(this, "type", {
             enumerable: true,
             configurable: true,
@@ -52,13 +46,19 @@ class StunProtocol {
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "localAddress", {
+        Object.defineProperty(this, "localIp", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "closed", {
+        Object.defineProperty(this, "onRequestReceived", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new common_1.Event()
+        });
+        Object.defineProperty(this, "onDataReceived", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -75,24 +75,22 @@ class StunProtocol {
                 else {
                     this.transport = await transport_1.UdpTransport.init("udp6", portRange, interfaceAddresses);
                 }
-                this.transport.onData = (data, addr) => this.datagramReceived(data, addr);
+                this.transport.onData = (data, addr) => {
+                    this.datagramReceived(data, addr);
+                };
             }
         });
     }
-    connectionLost() {
-        this.closed.execute();
-        this.closed.complete();
-    }
     datagramReceived(data, addr) {
         try {
             const message = (0, message_1.parseMessage)(data);
             if (!message) {
                 if (this.localCandidate) {
-                    this.receiver?.dataReceived?.(data, this.localCandidate.component);
+                    this.onDataReceived.execute(data);
                 }
                 return;
             }
-            // log("parseMessage", addr, message);
+            // log("parseMessage", addr, message.toJSON());
             if ((message.messageClass === const_1.classes.RESPONSE ||
                 message.messageClass === const_1.classes.ERROR) &&
                 this.transactionsKeys.includes(message.transactionIdHex)) {
@@ -100,7 +98,7 @@ class StunProtocol {
                 transaction.responseReceived(message, addr);
             }
             else if (message.messageClass === const_1.classes.REQUEST) {
-                this.receiver?.requestReceived?.(message, addr, this, data);
+                this.onRequestReceived.execute(message, addr, data);
             }
         }
         catch (error) {
@@ -147,6 +145,8 @@ class StunProtocol {
             transaction.cancel();
         });
         await this.transport.close();
+        this.onRequestReceived.complete();
+        this.onDataReceived.complete();
     }
 }
 exports.StunProtocol = StunProtocol;

package/lib/ice/src/stun/protocol.js.map

@@ -1 +1 @@
-{"version":3,"file":"protocol.js","sourceRoot":"","sources":["../../../../../ice/src/stun/protocol.ts"],"names":[],"mappings":"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","sourcesContent":["import debug from \"debug\";\nimport { Event } from \"../imports/common\";\n\nimport type { InterfaceAddresses } from \"../../../common/src/network\";\nimport type { Candidate } from \"../candidate\";\nimport type { Connection } from \"../ice\";\nimport { UdpTransport } from \"../transport\";\nimport type { Address, Protocol } from \"../types/model\";\nimport { classes } from \"./const\";\nimport { type Message, parseMessage } from \"./message\";\nimport { Transaction } from \"./transaction\";\n\nconst log = debug(\"packages/ice/src/stun/protocol.ts\");\n\nexport class StunProtocol implements Protocol {\n  static readonly type = \"stun\";\n  readonly type = StunProtocol.type;\n  transport!: UdpTransport;\n  transactions: { [key: string]: Transaction } = {};\n  get transactionsKeys() {\n    return Object.keys(this.transactions);\n  }\n  localCandidate?: Candidate;\n  sentMessage?: Message;\n  localAddress?: string;\n\n  private readonly closed = new Event();\n\n  constructor(public receiver?: Connection) {}\n\n  connectionLost() {\n    this.closed.execute();\n    this.closed.complete();\n  }\n\n  connectionMade = async (\n    useIpv4: boolean,\n    portRange?: [number, number],\n    interfaceAddresses?: InterfaceAddresses,\n  ) => {\n    if (useIpv4) {\n      this.transport = await UdpTransport.init(\n        \"udp4\",\n        portRange,\n        interfaceAddresses,\n      );\n    } else {\n      this.transport = await UdpTransport.init(\n        \"udp6\",\n        portRange,\n        interfaceAddresses,\n      );\n    }\n\n    this.transport.onData = (data, addr) => this.datagramReceived(data, addr);\n  };\n\n  private datagramReceived(data: Buffer, addr: Address) {\n    try {\n      const message = parseMessage(data);\n      if (!message) {\n        if (this.localCandidate) {\n          this.receiver?.dataReceived?.(data, this.localCandidate.component);\n        }\n        return;\n      }\n      // log(\"parseMessage\", addr, message);\n      if (\n        (message.messageClass === classes.RESPONSE ||\n          message.messageClass === classes.ERROR) &&\n        this.transactionsKeys.includes(message.transactionIdHex)\n      ) {\n        const transaction = this.transactions[message.transactionIdHex];\n        transaction.responseReceived(message, addr);\n      } else if (message.messageClass === classes.REQUEST) {\n        this.receiver?.requestReceived?.(message, addr, this, data);\n      }\n    } catch (error) {\n      log(\"datagramReceived error\", error);\n    }\n  }\n\n  getExtraInfo(): Address {\n    const { address: host, port } = this.transport.address();\n    return [host, port];\n  }\n\n  async sendStun(message: Message, addr: Address) {\n    const data = message.bytes;\n    await this.transport.send(data, addr).catch(() => {\n      log(\"sendStun failed\", addr, message);\n    });\n  }\n\n  async sendData(data: Buffer, addr: Address) {\n    await this.transport.send(data, addr);\n  }\n\n  async request(\n    request: Message,\n    addr: Address,\n    integrityKey?: Buffer,\n    retransmissions?: number,\n  ) {\n    // \"\"\"\n    // Execute a STUN transaction and return the response.\n    // \"\"\"\n    if (this.transactionsKeys.includes(request.transactionIdHex))\n      throw new Error(\"already request ed\");\n\n    if (integrityKey) {\n      request.addMessageIntegrity(integrityKey);\n      request.addFingerprint();\n    }\n\n    const transaction: Transaction = new Transaction(\n      request,\n      addr,\n      this,\n      retransmissions,\n    );\n    this.transactions[request.transactionIdHex] = transaction;\n\n    try {\n      return await transaction.run();\n    } catch (e) {\n      throw e;\n    } finally {\n      delete this.transactions[request.transactionIdHex];\n    }\n  }\n\n  async close() {\n    Object.values(this.transactions).forEach((transaction) => {\n      transaction.cancel();\n    });\n    await this.transport.close();\n  }\n}\n"]}
+{"version":3,"file":"protocol.js","sourceRoot":"","sources":["../../../../../ice/src/stun/protocol.ts"],"names":[],"mappings":"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","sourcesContent":["import debug from \"debug\";\nimport { Event } from \"../imports/common\";\n\nimport type { InterfaceAddresses } from \"../../../common/src/network\";\nimport type { Candidate } from \"../candidate\";\nimport { UdpTransport } from \"../transport\";\nimport type { Address, Protocol } from \"../types/model\";\nimport { classes } from \"./const\";\nimport { type Message, parseMessage } from \"./message\";\nimport { Transaction } from \"./transaction\";\n\nconst log = debug(\"werift-ice : packages/ice/src/stun/protocol.ts\");\n\nexport class StunProtocol implements Protocol {\n  static readonly type = \"stun\";\n  readonly type = StunProtocol.type;\n  transport!: UdpTransport;\n  transactions: { [key: string]: Transaction } = {};\n  get transactionsKeys() {\n    return Object.keys(this.transactions);\n  }\n  localCandidate?: Candidate;\n  sentMessage?: Message;\n  localIp?: string;\n\n  readonly onRequestReceived = new Event<[Message, Address, Buffer]>();\n  readonly onDataReceived = new Event<[Buffer]>();\n\n  constructor() {}\n\n  connectionMade = async (\n    useIpv4: boolean,\n    portRange?: [number, number],\n    interfaceAddresses?: InterfaceAddresses,\n  ) => {\n    if (useIpv4) {\n      this.transport = await UdpTransport.init(\n        \"udp4\",\n        portRange,\n        interfaceAddresses,\n      );\n    } else {\n      this.transport = await UdpTransport.init(\n        \"udp6\",\n        portRange,\n        interfaceAddresses,\n      );\n    }\n\n    this.transport.onData = (data, addr) => {\n      this.datagramReceived(data, addr);\n    };\n  };\n\n  private datagramReceived(data: Buffer, addr: Address) {\n    try {\n      const message = parseMessage(data);\n      if (!message) {\n        if (this.localCandidate) {\n          this.onDataReceived.execute(data);\n        }\n        return;\n      }\n      // log(\"parseMessage\", addr, message.toJSON());\n      if (\n        (message.messageClass === classes.RESPONSE ||\n          message.messageClass === classes.ERROR) &&\n        this.transactionsKeys.includes(message.transactionIdHex)\n      ) {\n        const transaction = this.transactions[message.transactionIdHex];\n        transaction.responseReceived(message, addr);\n      } else if (message.messageClass === classes.REQUEST) {\n        this.onRequestReceived.execute(message, addr, data);\n      }\n    } catch (error) {\n      log(\"datagramReceived error\", error);\n    }\n  }\n\n  getExtraInfo(): Address {\n    const { address: host, port } = this.transport.address();\n    return [host, port];\n  }\n\n  async sendStun(message: Message, addr: Address) {\n    const data = message.bytes;\n    await this.transport.send(data, addr).catch(() => {\n      log(\"sendStun failed\", addr, message);\n    });\n  }\n\n  async sendData(data: Buffer, addr: Address) {\n    await this.transport.send(data, addr);\n  }\n\n  async request(\n    request: Message,\n    addr: Address,\n    integrityKey?: Buffer,\n    retransmissions?: number,\n  ) {\n    // \"\"\"\n    // Execute a STUN transaction and return the response.\n    // \"\"\"\n    if (this.transactionsKeys.includes(request.transactionIdHex))\n      throw new Error(\"already request ed\");\n\n    if (integrityKey) {\n      request.addMessageIntegrity(integrityKey);\n      request.addFingerprint();\n    }\n\n    const transaction: Transaction = new Transaction(\n      request,\n      addr,\n      this,\n      retransmissions,\n    );\n    this.transactions[request.transactionIdHex] = transaction;\n\n    try {\n      return await transaction.run();\n    } catch (e) {\n      throw e;\n    } finally {\n      delete this.transactions[request.transactionIdHex];\n    }\n  }\n\n  async close() {\n    Object.values(this.transactions).forEach((transaction) => {\n      transaction.cancel();\n    });\n    await this.transport.close();\n    this.onRequestReceived.complete();\n    this.onDataReceived.complete();\n  }\n}\n"]}

package/lib/ice/src/stun/transaction.js

@@ -92,7 +92,12 @@ class Transaction {
                     return res;
                 }
                 catch (error) {
-                    log("transaction run failed", error, this.protocol.type, this.request.toJSON());
+                    // log(
+                    //   "transaction run failed",
+                    //   error,
+                    //   this.protocol.type,
+                    //   this.request.toJSON(),
+                    // );
                     throw error;
                 }
                 finally {

package/lib/ice/src/stun/transaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../../../../ice/src/stun/transaction.ts"],"names":[],"mappings":"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","sourcesContent":["import debug from \"debug\";\nimport { Event } from \"../imports/common\";\n\nimport { TransactionFailed, TransactionTimeout } from \"../exceptions\";\nimport type { Address, Protocol } from \"../types/model\";\nimport { RETRY_MAX, RETRY_RTO, classes } from \"./const\";\nimport type { Message } from \"./message\";\n\nconst log = debug(\"werift-ice:packages/ice/src/stun/transaction.ts\");\n\nexport class Transaction {\n  private timeoutDelay = RETRY_RTO;\n  private timeoutHandle?: any;\n  private tries = 0;\n  private readonly triesMax: number;\n  private readonly onResponse = new Event<[Message, Address]>();\n\n  constructor(\n    private request: Message,\n    private addr: Address,\n    private protocol: Protocol,\n    private retransmissions?: number,\n  ) {\n    this.triesMax =\n      1 + (this.retransmissions ? this.retransmissions : RETRY_MAX);\n  }\n\n  responseReceived = (message: Message, addr: Address) => {\n    if (this.onResponse.length > 0) {\n      if (message.messageClass === classes.RESPONSE) {\n        this.onResponse.execute(message, addr);\n        this.onResponse.complete();\n      } else {\n        this.onResponse.error(new TransactionFailed(message, addr));\n      }\n    }\n  };\n\n  run = async () => {\n    try {\n      this.retry();\n      const res = await this.onResponse.asPromise();\n      return res;\n    } catch (error) {\n      log(\n        \"transaction run failed\",\n        error,\n        this.protocol.type,\n        this.request.toJSON(),\n      );\n\n      throw error;\n    } finally {\n      if (this.timeoutHandle) {\n        clearTimeout(this.timeoutHandle);\n      }\n    }\n  };\n\n  private retry = () => {\n    if (this.tries >= this.triesMax) {\n      log(`retry failed times:${this.tries} maxLimit:${this.triesMax}`);\n      this.onResponse.error(new TransactionTimeout());\n      return;\n    }\n    this.protocol.sendStun(this.request, this.addr).catch((e) => {\n      log(\"send stun failed\", e);\n    });\n    this.timeoutHandle = setTimeout(this.retry, this.timeoutDelay);\n    this.timeoutDelay *= 2;\n    this.tries++;\n  };\n\n  cancel() {\n    if (this.timeoutHandle) clearTimeout(this.timeoutHandle);\n  }\n}\n"]}
+{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../../../../ice/src/stun/transaction.ts"],"names":[],"mappings":"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","sourcesContent":["import debug from \"debug\";\nimport { Event } from \"../imports/common\";\n\nimport { TransactionFailed, TransactionTimeout } from \"../exceptions\";\nimport type { Address, Protocol } from \"../types/model\";\nimport { RETRY_MAX, RETRY_RTO, classes } from \"./const\";\nimport type { Message } from \"./message\";\n\nconst log = debug(\"werift-ice:packages/ice/src/stun/transaction.ts\");\n\nexport class Transaction {\n  private timeoutDelay = RETRY_RTO;\n  private timeoutHandle?: any;\n  private tries = 0;\n  private readonly triesMax: number;\n  private readonly onResponse = new Event<[Message, Address]>();\n\n  constructor(\n    private request: Message,\n    private addr: Address,\n    private protocol: Protocol,\n    private retransmissions?: number,\n  ) {\n    this.triesMax =\n      1 + (this.retransmissions ? this.retransmissions : RETRY_MAX);\n  }\n\n  responseReceived = (message: Message, addr: Address) => {\n    if (this.onResponse.length > 0) {\n      if (message.messageClass === classes.RESPONSE) {\n        this.onResponse.execute(message, addr);\n        this.onResponse.complete();\n      } else {\n        this.onResponse.error(new TransactionFailed(message, addr));\n      }\n    }\n  };\n\n  run = async () => {\n    try {\n      this.retry();\n      const res = await this.onResponse.asPromise();\n      return res;\n    } catch (error) {\n      // log(\n      //   \"transaction run failed\",\n      //   error,\n      //   this.protocol.type,\n      //   this.request.toJSON(),\n      // );\n\n      throw error;\n    } finally {\n      if (this.timeoutHandle) {\n        clearTimeout(this.timeoutHandle);\n      }\n    }\n  };\n\n  private retry = () => {\n    if (this.tries >= this.triesMax) {\n      log(`retry failed times:${this.tries} maxLimit:${this.triesMax}`);\n      this.onResponse.error(new TransactionTimeout());\n      return;\n    }\n    this.protocol.sendStun(this.request, this.addr).catch((e) => {\n      log(\"send stun failed\", e);\n    });\n    this.timeoutHandle = setTimeout(this.retry, this.timeoutDelay);\n    this.timeoutDelay *= 2;\n    this.tries++;\n  };\n\n  cancel() {\n    if (this.timeoutHandle) clearTimeout(this.timeoutHandle);\n  }\n}\n"]}

package/lib/ice/src/turn/protocol.d.ts

@@ -1,19 +1,19 @@
 import { Event } from "../imports/common";
 import type { InterfaceAddresses } from "../../../common/src/network";
 import type { Candidate } from "../candidate";
-import type { Connection } from "../ice";
 import { Message } from "../stun/message";
 import { Transaction } from "../stun/transaction";
 import { type Transport } from "../transport";
 import type { Address, Protocol } from "../types/model";
 export declare class StunOverTurnProtocol implements Protocol {
     turn: TurnProtocol;
-    private ice;
     static type: string;
     readonly type: string;
     localCandidate: Candidate;
     private disposer;
-    constructor(turn: TurnProtocol, ice: Connection);
+    onRequestReceived: Event<[Message, Address, Buffer]>;
+    onDataReceived: Event<[Buffer]>;
+    constructor(turn: TurnProtocol);
     private handleStunMessage;
     request(request: Message, addr: Address, integrityKey?: Buffer): Promise<[Message, readonly [string, number]]>;
     connectionMade(): Promise<void>;
@@ -34,6 +34,8 @@ export declare class TurnProtocol implements Protocol {
     static type: string;
     readonly type: string;
     readonly onData: Event<[Buffer, readonly [string, number]]>;
+    onRequestReceived: Event<[Message, Address, Buffer]>;
+    onDataReceived: Event<[Buffer]>;
     integrityKey?: Buffer;
     nonce?: Buffer;
     realm?: string;
@@ -90,11 +92,10 @@ export interface TurnClientOptions {
     interfaceAddresses?: InterfaceAddresses;
 }
 export declare function createTurnClient({ address, username, password }: TurnClientConfig, { lifetime, portRange, interfaceAddresses, transport: transportType, }?: TurnClientOptions): Promise<TurnProtocol>;
-export declare function createStunOverTurnClient({ address, username, password, ice, }: {
+export declare function createStunOverTurnClient({ address, username, password, }: {
     address: Address;
     username: string;
     password: string;
-    ice: Connection;
 }, { lifetime, portRange, interfaceAddresses, transport: transportType, }?: {
     lifetime?: number;
     ssl?: boolean;

package/lib/ice/src/turn/protocol.js

@@ -10,7 +10,6 @@ exports.makeIntegrityKey = makeIntegrityKey;
 const crypto_1 = require("crypto");
 const jspack_1 = require("@shinyoshiaki/jspack");
 const debug_1 = __importDefault(require("debug"));
-const p_cancelable_1 = __importDefault(require("p-cancelable"));
 const promises_1 = require("timers/promises");
 const common_1 = require("../imports/common");
 const src_1 = require("../../../common/src");
@@ -25,19 +24,13 @@ const DEFAULT_CHANNEL_REFRESH_TIME = 500;
 const DEFAULT_ALLOCATION_LIFETIME = 600;
 const UDP_TRANSPORT = 0x11000000;
 class StunOverTurnProtocol {
-    constructor(turn, ice) {
+    constructor(turn) {
         Object.defineProperty(this, "turn", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: turn
         });
-        Object.defineProperty(this, "ice", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: ice
-        });
         Object.defineProperty(this, "type", {
             enumerable: true,
             configurable: true,
@@ -56,6 +49,18 @@ class StunOverTurnProtocol {
             writable: true,
             value: new common_1.EventDisposer()
         });
+        Object.defineProperty(this, "onRequestReceived", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new common_1.Event()
+        });
+        Object.defineProperty(this, "onDataReceived", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new common_1.Event()
+        });
         Object.defineProperty(this, "handleStunMessage", {
             enumerable: true,
             configurable: true,
@@ -64,7 +69,7 @@ class StunOverTurnProtocol {
                 try {
                     const message = (0, message_1.parseMessage)(data);
                     if (!message) {
-                        this.ice.dataReceived(data, this.localCandidate.component);
+                        this.onDataReceived.execute(data);
                         return;
                     }
                     if (message.messageClass === const_1.classes.RESPONSE ||
@@ -75,7 +80,7 @@ class StunOverTurnProtocol {
                         }
                     }
                     else if (message.messageClass === const_1.classes.REQUEST) {
-                        this.ice.requestReceived(message, addr, this, data);
+                        this.onRequestReceived.execute(message, addr, data);
                     }
                 }
                 catch (error) {
@@ -178,6 +183,18 @@ class TurnProtocol {
             writable: true,
             value: new common_1.Event()
         });
+        Object.defineProperty(this, "onRequestReceived", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new common_1.Event()
+        });
+        Object.defineProperty(this, "onDataReceived", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new common_1.Event()
+        });
         Object.defineProperty(this, "integrityKey", {
             enumerable: true,
             configurable: true,
@@ -285,29 +302,30 @@ class TurnProtocol {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: (exp) => new p_cancelable_1.default(async (_, f, onCancel) => {
-                let run = true;
-                onCancel(() => {
-                    run = false;
-                    f("cancel");
-                });
-                while (run) {
-                    // refresh before expire
-                    const delay = (5 / 6) * exp * 1000;
-                    log("refresh delay", delay, { exp });
-                    await (0, promises_1.setTimeout)(delay);
-                    const request = new message_1.Message(const_1.methods.REFRESH, const_1.classes.REQUEST);
-                    request.setAttribute("LIFETIME", exp);
-                    try {
-                        const [message] = await this.requestWithRetry(request, this.server);
-                        exp = message.getAttributeValue("LIFETIME");
-                        log("refresh", { exp });
-                    }
-                    catch (error) {
-                        log("refresh error", error);
+            value: (exp) => {
+                this.refreshHandle = (0, helper_1.cancelable)(async (_, __, onCancel) => {
+                    let run = true;
+                    onCancel.once(() => {
+                        run = false;
+                    });
+                    while (run) {
+                        // refresh before expire
+                        const delay = (5 / 6) * exp * 1000;
+                        log("refresh delay", delay, { exp });
+                        await (0, promises_1.setTimeout)(delay);
+                        const request = new message_1.Message(const_1.methods.REFRESH, const_1.classes.REQUEST);
+                        request.setAttribute("LIFETIME", exp);
+                        try {
+                            const [message] = await this.requestWithRetry(request, this.server);
+                            exp = message.getAttributeValue("LIFETIME");
+                            log("refresh", { exp });
+                        }
+                        catch (error) {
+                            log("refresh error", error);
+                        }
                     }
-                }
-            })
+                });
+            }
         });
         this.channelRefreshTime =
             this.options.channelRefreshTime ?? DEFAULT_CHANNEL_REFRESH_TIME;
@@ -328,7 +346,7 @@ class TurnProtocol {
         this.mappedAddress = response.getAttributeValue("XOR-MAPPED-ADDRESS");
         const exp = response.getAttributeValue("LIFETIME");
         log("connect", this.relayedAddress, this.mappedAddress, { exp });
-        this.refreshHandle = (0, helper_1.future)(this.refresh(exp));
+        this.refresh(exp);
     }
     handleChannelData(data) {
         const [channel, length] = jspack_1.jspack.Unpack("!HH", data.slice(0, 4));
@@ -542,7 +560,7 @@ class TurnProtocol {
         await this.send(message.bytes, addr);
     }
     async close() {
-        this.refreshHandle?.cancel();
+        this.refreshHandle?.resolve?.();
         await this.transport.close();
     }
 }
@@ -563,7 +581,7 @@ async function createTurnClient({ address, username, password }, { lifetime, por
     await turn.connectionMade();
     return turn;
 }
-async function createStunOverTurnClient({ address, username, password, ice, }, { lifetime, portRange, interfaceAddresses, transport: transportType, } = {}) {
+async function createStunOverTurnClient({ address, username, password, }, { lifetime, portRange, interfaceAddresses, transport: transportType, } = {}) {
     const turn = await createTurnClient({
         address,
         username,
@@ -574,7 +592,7 @@ async function createStunOverTurnClient({ address, username, password, ice, }, {
         interfaceAddresses,
         transport: transportType,
     });
-    const turnTransport = new StunOverTurnProtocol(turn, ice);
+    const turnTransport = new StunOverTurnProtocol(turn);
     return turnTransport;
 }
 function makeIntegrityKey(username, realm, password) {