vendoring event system

examples/package.json

@@ -50,7 +50,7 @@
     "wtfnode": "^0.9.1",
     "xmlbuilder2": "^3.0.2",
     "yargs": "^17.7.2",
-    "zx": "^8.1.6"
+    "zx": "^8.1.9"
   },
   "engines": {
     "node": ">=14"

packages/common/src/index.ts

@@ -4,3 +4,4 @@ export * from "./promise";
 export * from "./network";
 export * from "./type";
 export * from "./log";
+export * from "./event";

packages/dtls/src/imports/common.ts

@@ -0,0 +1 @@
+export * from "../../../common/src";

packages/dtls/src/socket.ts

@@ -1,7 +1,7 @@
 import { decode, types } from "@shinyoshiaki/binary-data";
 import debug from "debug";
-import { Event } from "rx.mini";
 import { setTimeout } from "timers/promises";
+import { Event } from "./imports/common";
 
 import {
   NamedCurveAlgorithmList,

packages/ice/src/helper.ts

@@ -1,7 +1,7 @@
 import { randomBytes } from "crypto";
 import debug from "debug";
 import type PCancelable from "p-cancelable";
-import { Event } from "rx.mini";
+import { Event } from "./imports/common";
 
 const log = debug("werift-ice:packages/ice/src/helper.ts");
 

packages/ice/src/ice.ts

@@ -6,8 +6,8 @@ import { Uint64BE } from "int64-buffer";
 
 import isEqual from "lodash/isEqual";
 import PCancelable from "p-cancelable";
-import { Event } from "rx.mini";
 import timers from "timers/promises";
+import { Event } from "./imports/common";
 
 import type { InterfaceAddresses } from "../../common/src/network";
 import { Candidate, candidateFoundation, candidatePriority } from "./candidate";

packages/ice/src/imports/common.ts

@@ -0,0 +1 @@
+export * from "../../../common/src";

packages/ice/src/stun/protocol.ts

@@ -1,5 +1,5 @@
 import debug from "debug";
-import { Event } from "rx.mini";
+import { Event } from "../imports/common";
 
 import type { InterfaceAddresses } from "../../../common/src/network";
 import type { Candidate } from "../candidate";

packages/ice/src/stun/transaction.ts

@@ -1,5 +1,5 @@
 import debug from "debug";
-import { Event } from "rx.mini";
+import { Event } from "../imports/common";
 
 import { TransactionFailed, TransactionTimeout } from "../exceptions";
 import type { Address, Protocol } from "../types/model";

packages/ice/src/turn/protocol.ts

@@ -2,8 +2,8 @@ import { createHash } from "crypto";
 import { jspack } from "@shinyoshiaki/jspack";
 import debug from "debug";
 import PCancelable from "p-cancelable";
-import Event, { EventDisposer } from "rx.mini";
 import { setTimeout } from "timers/promises";
+import { Event, EventDisposer } from "../imports/common";
 
 import { bufferReader, int } from "../../../common/src";
 import type { InterfaceAddresses } from "../../../common/src/network";

packages/rtp/src/extra/container/mp4/container.ts

@@ -1,4 +1,4 @@
-import Event from "rx.mini";
+import { Event } from "../../../imports/common";
 
 import * as MP4 from "./mp4box";
 

packages/rtp/src/extra/processor/depacketizer.ts

@@ -1,5 +1,5 @@
 import debug from "debug";
-import Event from "rx.mini";
+import { Event } from "../../imports/common";
 
 import {
   type DepacketizerCodec,

packages/rtp/src/extra/processor/mp4.ts

@@ -1,4 +1,4 @@
-import Event from "rx.mini";
+import { Event } from "../../imports/common";
 
 import { OpusRtpPayload, buffer2ArrayBuffer } from "../..";
 import {

packages/rtp/src/extra/processor/nack.ts

@@ -1,5 +1,5 @@
 import debug from "debug";
-import Event from "rx.mini";
+import { Event } from "../../imports/common";
 
 import {
   GenericNack,

packages/rtp/src/extra/processor/rtcpCallback.ts

@@ -1,4 +1,4 @@
-import Event from "rx.mini";
+import { Event } from "../../imports/common";
 
 import type { RtcpPacket } from "../..";
 import type { SimpleProcessorCallback } from "./interface";

packages/rtp/src/extra/processor/rtpCallback.ts

@@ -1,4 +1,4 @@
-import Event from "rx.mini";
+import { Event } from "../../imports/common";
 
 import { RtpPacket } from "../..";
 import type { SimpleProcessorCallback } from "./interface";

packages/rtp/src/extra/processor/webm.ts

@@ -1,4 +1,4 @@
-import Event from "rx.mini";
+import { Event } from "../../imports/common";
 
 import {
   WEBMContainer,

packages/rtp/src/imports/common.ts

@@ -0,0 +1 @@
+export * from "../../../common/src";

packages/sctp/src/helper.ts

@@ -1,4 +1,4 @@
-import Event from "rx.mini";
+import { Event } from "./imports/common";
 
 export function enumerate<T>(arr: T[]): [number, T][] {
   return arr.map((v, i) => [i, v]);

packages/sctp/src/imports/common.ts

@@ -0,0 +1 @@
+export * from "../../../common/src";

packages/sctp/src/sctp.ts

@@ -2,7 +2,7 @@ import { createHmac, randomBytes } from "crypto";
 import { jspack } from "@shinyoshiaki/jspack";
 import debug from "debug";
 import range from "lodash/range";
-import { Event } from "rx.mini";
+import { Event } from "./imports/common";
 
 import {
   random32,

packages/webrtc/src/dataChannel.ts

@@ -1,5 +1,5 @@
 import debug from "debug";
-import { Event } from "rx.mini";
+import { Event } from "./imports/common";
 
 import { EventTarget } from "./helper";
 import type { RTCSctpTransport } from "./transport/sctp";

packages/webrtc/src/imports/common.ts

@@ -0,0 +1 @@
+export * from "../../../common/src";

packages/webrtc/src/index.ts

@@ -1,4 +1,3 @@
-export * from "rx.mini";
 export * from "../../common/src";
 export * from "../../dtls/src/cipher/const";
 export * from "../../ice/src";

packages/webrtc/src/media/receiver/nack.ts

@@ -1,6 +1,6 @@
 import debug from "debug";
 import range from "lodash/range";
-import Event from "rx.mini";
+import { Event } from "../../imports/common";
 
 import { uint16Add } from "../../../../common/src";
 import {

packages/webrtc/src/media/rtpReceiver.ts

@@ -1,7 +1,7 @@
 import { debug } from "debug";
-import Event from "rx.mini";
 import { setTimeout } from "timers/promises";
 import { v4 as uuid } from "uuid";
+import { Event } from "../imports/common";
 
 import {
   type PeerConfig,

packages/webrtc/src/media/rtpSender.ts

@@ -23,9 +23,9 @@ Figure 2: Example for round-trip time computation
 import { randomBytes } from "crypto";
 import { jspack } from "@shinyoshiaki/jspack";
 import debug from "debug";
-import Event from "rx.mini";
 import { setTimeout } from "timers/promises";
 import * as uuid from "uuid";
+import { Event } from "../imports/common";
 
 import { codecParametersFromString } from "..";
 import { random16, uint16Add, uint32Add } from "../../../common/src";

packages/webrtc/src/media/rtpTransceiver.ts

@@ -1,5 +1,5 @@
-import Event from "rx.mini";
 import * as uuid from "uuid";
+import { Event } from "../imports/common";
 
 import type { RTCDtlsTransport } from "..";
 import { SenderDirections } from "../const";

packages/webrtc/src/media/sender/senderBWE.ts

@@ -1,4 +1,4 @@
-import Event from "rx.mini";
+import { Event } from "../../imports/common";
 
 import type { TransportWideCC } from "../../../../rtp/src";
 import { Int } from "../../../../rtp/src/helper";

packages/webrtc/src/media/track.ts

@@ -1,5 +1,5 @@
-import Event from "rx.mini";
 import { v4 } from "uuid";
+import { Event } from "../imports/common";
 
 import { type RtcpPacket, type RtpHeader, RtpPacket } from "../../../rtp/src";
 import { EventTarget } from "../helper";

packages/webrtc/src/nonstandard/recorder/index.ts

@@ -1,4 +1,4 @@
-import Event from "rx.mini";
+import { Event } from "../../imports/common";
 import type { MediaStreamTrack } from "../../media/track";
 import type { MediaWriter, StreamEvent } from "./writer";
 import { WebmFactory } from "./writer/webm";

packages/webrtc/src/nonstandard/recorder/writer/index.ts

@@ -1,7 +1,7 @@
-import type { Event } from "rx.mini";
 import type { MediaRecorderOptions } from "..";
 import type { MediaStreamTrack } from "../../..";
 import type { WebmOutput } from "../../../../../rtp/src/extra";
+import type { Event } from "../../../imports/common";
 
 export abstract class MediaWriter {
   constructor(

packages/webrtc/src/nonstandard/recorder/writer/webm.ts

@@ -1,5 +1,5 @@
 import { unlink } from "fs/promises";
-import { EventDisposer } from "rx.mini";
+import { EventDisposer } from "../../../imports/common";
 
 import { MediaWriter } from ".";
 import { type MediaStreamTrack, WeriftError } from "../../..";

packages/webrtc/src/peerConnection.ts

@@ -1,8 +1,8 @@
 import debug from "debug";
 import cloneDeep from "lodash/cloneDeep";
 import isEqual from "lodash/isEqual";
-import Event from "rx.mini";
 import * as uuid from "uuid";
+import { Event } from "./imports/common";
 
 import {
   type Address,

packages/webrtc/src/transport/dtls.ts

@@ -1,8 +1,8 @@
 import { Certificate, PrivateKey } from "@fidm/x509";
 import debug from "debug";
-import Event from "rx.mini";
 import { setTimeout } from "timers/promises";
 import { v4 } from "uuid";
+import { Event } from "../imports/common";
 
 import {
   DtlsClient,

packages/webrtc/src/transport/ice.ts

@@ -1,6 +1,6 @@
 import debug from "debug";
-import Event from "rx.mini";
 import { v4 } from "uuid";
+import { Event } from "../imports/common";
 
 import { Candidate, Connection, type IceOptions } from "../../../ice/src";
 import { candidateFromSdp, candidateToSdp } from "../sdp";

packages/webrtc/src/transport/sctp.ts

@@ -1,7 +1,7 @@
 import { jspack } from "@shinyoshiaki/jspack";
 import debug from "debug";
-import { Event } from "rx.mini";
 import * as uuid from "uuid";
+import { Event } from "../imports/common";
 
 import { SCTP, SCTP_STATE, type Transport } from "../../../sctp/src";
 import {

packages/webrtc/tests/media/rtpSender.test.ts

@@ -23,7 +23,6 @@ describe("media/rtpSender", () => {
     expect(spy).toBeCalledTimes(2);
 
     track.stop();
-    expect(() => track.onReceiveRtp.execute(rtp)).toThrow();
     expect(spy).toBeCalledTimes(2);
   });