Merge upstream (#28)

* refactor: update event-target-shim imports to remove '/index'

The '/index' suffix in the imports is unnecessary as the package resolves correctly without it. This change simplifies the import statements across multiple files.

* refactor: replace defineEventAttribute with getter/setter methods for event attributes

Updated MediaDevices, MediaStream, MediaStreamTrack, RTCDataChannel, and RTCPeerConnection classes to use getter and setter methods for event attributes instead of the defineEventAttribute function. This change enhances code readability and maintainability.

* refactor: update event-target-shim imports to use local vendor path

* chore: remove event-target-shim dependency from package-lock.json

* chore: ignore src/vendor in eslint

* style: make eslint happy

* build(deps-dev): bump flatted from 3.2.7 to 3.4.2

Bumps [flatted](https://github.com/WebReflection/flatted) from 3.2.7 to 3.4.2.
- [Commits](WebReflection/flatted@v3.2.7...v3.4.2)

---
updated-dependencies:
- dependency-name: flatted
  dependency-version: 3.4.2
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* build(deps-dev): bump picomatch from 2.3.1 to 2.3.2

Bumps [picomatch](https://github.com/micromatch/picomatch) from 2.3.1 to 2.3.2.
- [Release notes](https://github.com/micromatch/picomatch/releases)
- [Changelog](https://github.com/micromatch/picomatch/blob/master/CHANGELOG.md)
- [Commits](micromatch/picomatch@2.3.1...2.3.2)

---
updated-dependencies:
- dependency-name: picomatch
  dependency-version: 2.3.2
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* fix formatting

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: wuxinfei <wuxinfei@bytedance.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Author: 3 people

.eslintignore

@@ -1,5 +1,6 @@
 examples
 lib
+src/vendor
 tools
 
 metro.*.js

package-lock.json

@@ -21,8 +21,7 @@
     "module": "lib/module/index.js",
     "dependencies": {
         "base64-js": "1.5.1",
-        "debug": "4.3.4",
-        "event-target-shim": "6.0.2"
+        "debug": "4.3.4"
     },
     "peerDependencies": {
         "react-native": "*"

package.json

@@ -1,12 +1,13 @@
-import {
-    EventTarget,
-    Event,
-    defineEventAttribute,
-} from 'event-target-shim/index';
 import { NativeModules } from 'react-native';
 
 import getDisplayMedia from './getDisplayMedia';
 import getUserMedia, { Constraints } from './getUserMedia';
+import {
+    Event,
+    EventTarget,
+    getEventAttributeValue,
+    setEventAttributeValue,
+} from './vendor/event-target-shim';
 
 const { WebRTCModule } = NativeModules;
 
@@ -15,6 +16,14 @@ type MediaDevicesEventMap = {
 };
 
 class MediaDevices extends EventTarget<MediaDevicesEventMap> {
+    get ondevicechange() {
+        return getEventAttributeValue(this, 'devicechange');
+    }
+
+    set ondevicechange(value) {
+        setEventAttributeValue(this, 'devicechange', value);
+    }
+
     /**
      * W3C "Media Capture and Streams" compatible {@code enumerateDevices}
      * implementation.
@@ -46,11 +55,4 @@ class MediaDevices extends EventTarget<MediaDevicesEventMap> {
     }
 }
 
-/**
- * Define the `onxxx` event handlers.
- */
-const proto = MediaDevices.prototype;
-
-defineEventAttribute(proto, 'devicechange');
-
 export default new MediaDevices();

src/MediaDevices.ts

@@ -1,9 +1,13 @@
-import { EventTarget, defineEventAttribute } from 'event-target-shim/index';
 import { NativeModules } from 'react-native';
 
 import MediaStreamTrack, { MediaStreamTrackInfo } from './MediaStreamTrack';
 import MediaStreamTrackEvent from './MediaStreamTrackEvent';
 import { uniqueID } from './RTCUtil';
+import {
+    EventTarget,
+    getEventAttributeValue,
+    setEventAttributeValue,
+} from './vendor/event-target-shim';
 
 const { WebRTCModule } = NativeModules;
 
@@ -91,6 +95,22 @@ export default class MediaStream extends EventTarget<MediaStreamEventMap> {
         }
     }
 
+    get onaddtrack() {
+        return getEventAttributeValue(this, 'addtrack');
+    }
+
+    set onaddtrack(value) {
+        setEventAttributeValue(this, 'addtrack', value);
+    }
+
+    get onremovetrack() {
+        return getEventAttributeValue(this, 'removetrack');
+    }
+
+    set onremovetrack(value) {
+        setEventAttributeValue(this, 'removetrack', value);
+    }
+
     get id(): string {
         return this._id;
     }
@@ -169,11 +189,3 @@ export default class MediaStream extends EventTarget<MediaStreamEventMap> {
         WebRTCModule.mediaStreamRelease(this._reactTag);
     }
 }
-
-/**
- * Define the `onxxx` event handlers.
- */
-const proto = MediaStream.prototype;
-
-defineEventAttribute(proto, 'addtrack');
-defineEventAttribute(proto, 'removetrack');

src/MediaStream.ts

@@ -1,14 +1,15 @@
-import {
-    EventTarget,
-    Event,
-    defineEventAttribute,
-} from 'event-target-shim/index';
 import { NativeModules } from 'react-native';
 
 import { MediaTrackConstraints } from './Constraints';
 import { addListener, removeListener } from './EventEmitter';
 import Logger from './Logger';
 import { deepClone, normalizeConstraints } from './RTCUtil';
+import {
+    Event,
+    EventTarget,
+    getEventAttributeValue,
+    setEventAttributeValue,
+} from './vendor/event-target-shim';
 
 const log = new Logger('pc');
 const { WebRTCModule } = NativeModules;
@@ -73,6 +74,30 @@ export default class MediaStreamTrack extends EventTarget<MediaStreamTrackEventM
         }
     }
 
+    get onended() {
+        return getEventAttributeValue(this, 'ended');
+    }
+
+    set onended(value) {
+        setEventAttributeValue(this, 'ended', value);
+    }
+
+    get onmute() {
+        return getEventAttributeValue(this, 'mute');
+    }
+
+    set onmute(value) {
+        setEventAttributeValue(this, 'mute', value);
+    }
+
+    get onunmute() {
+        return getEventAttributeValue(this, 'unmute');
+    }
+
+    set onunmute(value) {
+        setEventAttributeValue(this, 'unmute', value);
+    }
+
     get enabled(): boolean {
         return this._enabled;
     }
@@ -245,12 +270,3 @@ export default class MediaStreamTrack extends EventTarget<MediaStreamTrackEventM
         WebRTCModule.mediaStreamTrackRelease(this.id);
     }
 }
-
-/**
- * Define the `onxxx` event handlers.
- */
-const proto = MediaStreamTrack.prototype;
-
-defineEventAttribute(proto, 'ended');
-defineEventAttribute(proto, 'mute');
-defineEventAttribute(proto, 'unmute');

src/MediaStreamTrack.ts

@@ -1,6 +1,5 @@
-import { Event } from 'event-target-shim/index';
-
 import type MediaStreamTrack from './MediaStreamTrack';
+import { Event } from './vendor/event-target-shim';
 
 type MEDIA_STREAM_EVENTS = 'addtrack' | 'removetrack';
 

src/MediaStreamTrackEvent.ts

@@ -1,4 +1,4 @@
-import { Event } from 'event-target-shim/index';
+import { Event } from './vendor/event-target-shim';
 
 export type MessageEventData = string | ArrayBuffer | Blob;
 

src/MessageEvent.ts

@@ -1,10 +1,14 @@
 import * as base64 from 'base64-js';
-import { EventTarget, defineEventAttribute } from 'event-target-shim/index';
 import { NativeModules } from 'react-native';
 
 import { addListener, removeListener } from './EventEmitter';
 import MessageEvent from './MessageEvent';
 import RTCDataChannelEvent from './RTCDataChannelEvent';
+import {
+    EventTarget,
+    getEventAttributeValue,
+    setEventAttributeValue,
+} from './vendor/event-target-shim';
 
 const { WebRTCModule } = NativeModules;
 
@@ -22,7 +26,6 @@ type DataChannelEventMap = {
 export default class RTCDataChannel extends EventTarget<DataChannelEventMap> {
     _peerConnectionId: number;
     _reactTag: string;
-
     _bufferedAmount: number;
     _id: number;
     _label: string;
@@ -55,6 +58,54 @@ export default class RTCDataChannel extends EventTarget<DataChannelEventMap> {
         this._registerEvents();
     }
 
+    get onbufferedamountlow() {
+        return getEventAttributeValue(this, 'bufferedamountlow');
+    }
+
+    set onbufferedamountlow(value) {
+        setEventAttributeValue(this, 'bufferedamountlow', value);
+    }
+
+    get onclose() {
+        return getEventAttributeValue(this, 'close');
+    }
+
+    set onclose(value) {
+        setEventAttributeValue(this, 'close', value);
+    }
+
+    get onclosing() {
+        return getEventAttributeValue(this, 'closing');
+    }
+
+    set onclosing(value) {
+        setEventAttributeValue(this, 'closing', value);
+    }
+
+    get onerror() {
+        return getEventAttributeValue(this, 'error');
+    }
+
+    set onerror(value) {
+        setEventAttributeValue(this, 'error', value);
+    }
+
+    get onmessage() {
+        return getEventAttributeValue(this, 'message');
+    }
+
+    set onmessage(value) {
+        setEventAttributeValue(this, 'message', value);
+    }
+
+    get onopen() {
+        return getEventAttributeValue(this, 'open');
+    }
+
+    set onopen(value) {
+        setEventAttributeValue(this, 'open', value);
+    }
+
     get bufferedAmount(): number {
         return this._bufferedAmount;
     }
@@ -205,15 +256,3 @@ export default class RTCDataChannel extends EventTarget<DataChannelEventMap> {
         });
     }
 }
-
-/**
- * Define the `onxxx` event handlers.
- */
-const proto = RTCDataChannel.prototype;
-
-defineEventAttribute(proto, 'bufferedamountlow');
-defineEventAttribute(proto, 'close');
-defineEventAttribute(proto, 'closing');
-defineEventAttribute(proto, 'error');
-defineEventAttribute(proto, 'message');
-defineEventAttribute(proto, 'open');

src/RTCDataChannel.ts

@@ -1,6 +1,5 @@
-import { Event } from 'event-target-shim/index';
-
 import type RTCDataChannel from './RTCDataChannel';
+import { Event } from './vendor/event-target-shim';
 
 type DATA_CHANNEL_EVENTS =
     | 'open'