Skip to content

Commit

Permalink
Merge branch 'master' into rc
Browse files Browse the repository at this point in the history
  • Loading branch information
jonasgloning committed Apr 27, 2024
2 parents f77c102 + 9b7cf22 commit 48bb36d
Show file tree
Hide file tree
Showing 10 changed files with 1,818 additions and 2,057 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/browserstack.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
name: "BrowserStack Test"
on: [push, pull_request]

concurrency:
group: browserstack
jobs:
ubuntu-job:
name: "BrowserStack Test on Ubuntu"
Expand All @@ -21,7 +24,7 @@ jobs:
# The next 3 steps are for building the web application to be tested and starting the web server on the runner environment

- name: "Checkout the repository"
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: "Building web application to be tested"
run: npm install && npm run build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/prettier.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out repo
uses: actions/checkout@v3
- uses: actions/setup-node@v3
uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 16
cache: "npm"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Setup Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: "lts/*"
- name: Install dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: "npm"
Expand Down
6 changes: 2 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
## [1.5.2-rc.1](https://github.com/peers/peerjs/compare/v1.5.1...v1.5.2-rc.1) (2023-12-03)
## [1.5.2](https://github.com/peers/peerjs/compare/v1.5.1...v1.5.2) (2023-12-05)


### Bug Fixes

* `close` event was not triggered reliably ([#860](https://github.com/peers/peerjs/issues/860)) ([ec1d5ae](https://github.com/peers/peerjs/commit/ec1d5ae8436b5265a59ef277e3fa05608f19f1ae)), closes [#636](https://github.com/peers/peerjs/issues/636)
* **datachannel:** sending order is now preserved correctly ([18d491a](https://github.com/peers/peerjs/commit/18d491a83df759f26c08d1bb10d6011891eb2efc)), closes [#746](https://github.com/peers/peerjs/issues/746)
* support Blobs nested in objects ([7956dd6](https://github.com/peers/peerjs/commit/7956dd640388fce62c83453d56e1a20aec2212b2)), closes [#1163](https://github.com/peers/peerjs/issues/1163)

## [1.5.1](https://github.com/peers/peerjs/compare/v1.5.0...v1.5.1) (2023-09-23)
Expand Down Expand Up @@ -157,7 +155,7 @@

- added: TURN server to default config

- fixed: emit error message, then destory/disconnect when error occured
- fixed: emit error message, then destroy/disconnect when error occurred
- fixed: use `peerjs-js-binarypack` instead of `js-binarypack`
- fixed: sending large files via DataConnection #121

Expand Down
21 changes: 18 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,31 @@
# PeerJS: Simple peer-to-peer with WebRTC

### https://t.me/joinchat/VWI0UBxnG7f7_DV7

[![Backers on Open Collective](https://opencollective.com/peer/backers/badge.svg)](#backers)
[![Sponsors on Open Collective](https://opencollective.com/peer/sponsors/badge.svg)](#sponsors)
[![Discord](https://img.shields.io/discord/1016419835455996076?color=5865F2&label=Discord&logo=discord&logoColor=white)](https://discord.gg/Ud2PvAtK37)

PeerJS provides a complete, configurable, and easy-to-use peer-to-peer API built on top of WebRTC, supporting both data channels and media streams.

## Live Example

Here's an example application that uses both media and data connections: https://glitch.com/~peerjs-video. The example also uses its own [PeerServer](https://github.com/peers/peerjs-server).

---

<p align="center">
<sup>Special Announcement:</sup>
<br>
<a href="https://discord.gg/Ud2PvAtK37">
<img width="70px" src="https://assets-global.website-files.com/6257adef93867e50d84d30e2/625e5fcef7ab80b8c1fe559e_Discord-Logo-Color.png" />
</a>
<br>
<sub><b>We now have a Discord Channel</b></sub>
<br>
<sub>There we plan to discuss roadmaps, feature requests, and more<br><a href="https://discord.gg/Ud2PvAtK37">Join us today</a></sub>
</p>

---

## Setup

**Include the library**
Expand Down Expand Up @@ -112,7 +127,7 @@ We test PeerJS against these versions of Chrome, Edge, Firefox, and Safari with
It may work in other and older browsers, but we don't officially support them.
Changes to browser support will be a breaking change going forward.

> [!NOTE]
> [!NOTE]
> Firefox 102+ is required for CBOR / MessagePack support.
## FAQ
Expand Down
5 changes: 1 addition & 4 deletions e2e/wdio.bstack.conf.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@ import { config as sharedConfig } from "./wdio.shared.conf.js";
export const config: WebdriverIO.Config = {
...sharedConfig,
...{
/**
* Only allow one instance. We are limited to 5 parallel tests on BrowserStack.
*/
maxInstances: 1,
maxInstances: 5,
user: process.env.BROWSERSTACK_USERNAME,
key: process.env.BROWSERSTACK_ACCESS_KEY,
hostname: "hub.browserstack.com",
Expand Down
Loading

0 comments on commit 48bb36d

Please sign in to comment.