Converted web example to WebSocket signaling

.clang-format

@@ -10,5 +10,12 @@ AccessModifierOffset: -4
 ColumnLimit: 100
 ---
 Language: JavaScript
-ColumnLimit: 80
+IndentWidth: 2
+UseTab: Never
+ColumnLimit: 100
+---
+Language: Python
+IndentWidth: 4
+UseTab: Never
+ColumnLimit: 79
 ...

.editorconfig

@@ -9,3 +9,13 @@ insert_final_newline = true
 indent_style = tab
 indent_size = 4
 
+[*.js]
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+
+[*.py]
+insert_final_newline = false
+indent_style = space
+indent_size = 4
+

.gitignore

@@ -1,4 +1,5 @@
 build/
+node_modules/
 *.d
 *.o
 *.a
@@ -6,3 +7,4 @@ build/
 compile_commands.json
 tests
 .DS_Store
+

examples/client/CMakeLists.txt

@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.7)
 cmake_policy(SET CMP0079 NEW)
 
 add_executable(datachannel-client main.cpp)
-set_target_properties(datachannel-client PROPERTIES CXX_STANDARD 17)
+set_target_properties(datachannel-client PROPERTIES
+	CXX_STANDARD 17
+	OUTPUT_NAME client)
 target_link_libraries(datachannel-client datachannel nlohmann_json)
 

examples/client/main.cpp

@@ -52,7 +52,7 @@ int main(int argc, char **argv) {
 	rtc::InitLogger(LogLevel::Warning);
 
 	Configuration config;
-	config.iceServers.emplace_back("stun.l.google.com:19302"); // change to your STUN server
+	config.iceServers.emplace_back("stun:stun.l.google.com:19302"); // change to your STUN server
 
 	localId = randomId(8);
 	cout << "The local ID is: " << localId << endl;
@@ -92,12 +92,12 @@ int main(int argc, char **argv) {
 		}
 
 		if (type == "offer" || type == "answer") {
-			auto str = message["description"].get<string>();
-			pc->setRemoteDescription(Description(str, type));
+			auto sdp = message["description"].get<string>();
+			pc->setRemoteDescription(Description(sdp, type));
 		} else if (type == "candidate") {
-			auto str = message["candidate"].get<string>();
+			auto sdp = message["candidate"].get<string>();
 			auto mid = message["mid"].get<string>();
-			pc->addRemoteCandidate(Candidate(str, mid));
+			pc->addRemoteCandidate(Candidate(sdp, mid));
 		}
 	});
 
@@ -188,8 +188,6 @@ shared_ptr<PeerConnection> createPeerConnection(const Configuration &config,
 		cout << "DataChannel from " << id << " received with label \"" << dc->label() << "\""
 		     << endl;
 
-		dc->send("Hello from " + localId);
-
 		dc->onClosed([id]() { cout << "DataChannel from " << id << " closed" << endl; });
 
 		dc->onMessage([id](const variant<binary, string> &message) {
@@ -199,6 +197,8 @@ shared_ptr<PeerConnection> createPeerConnection(const Configuration &config,
 			cout << "Message from " << id << " received: " << get<string>(message) << endl;
 		});
 
+		dc->send("Hello from " + localId);
+
 		dataChannelMap.emplace(id, dc);
 	});
 

examples/web/LICENSE

@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

examples/web/answerScript.js

@@ -1,111 +0,0 @@
-function el(type, style, content) {
-  const element = document.createElement(type);
-  element.setAttribute('class', style);
-  element.append(content);
-  return element;
-}
-
-const UI = {
-  createMessageElement: function(style, message) {
-    const conversation =  document.getElementById('messages');
-    const messageElement = el('p', style + ' message', message);
-    conversation.append(messageElement);
-
-    const d = new Date();
-    const time = el('span', 'time', [
-      d.getHours().toString().padStart(2, '0'),
-      d.getMinutes().toString().padStart(2, '0'),
-      d.getSeconds().toString().padStart(2, '0')
-    ].join(':'));
-    messageElement.append(time);
-  },
-  messageTextBoxValue: function() {
-    return document.getElementById('message-text-box').value;
-  },
-  sendMessageButton: function() {
-    return document.getElementById('send-message-button');
-  },
-  setConnectionState: function(state) {
-    const stateEl = document.getElementById('connection-state');
-    stateEl.innerHTML = state;
-  }
-};
-(function (){
-  const connectionParam = getQueryParameter('connection');
-  const parsedConnection = atob(connectionParam).split(',');
-  const connectionMetadata = {
-    description: parsedConnection[0],
-    candidate: parsedConnection[1]
-  };
-  createRemoteConnection(connectionMetadata);
-})();
-
-function createRemoteConnection(connectionMetadata) {
-  console.log(connectionMetadata);
-  const connection = new RTCPeerConnection();
-
-  const remoteDesc = {
-    type: 'offer',
-    sdp: connectionMetadata.description
-  };
-  connection.setRemoteDescription(remoteDesc)
-    .then(() => UI.setConnectionState('set remote description'));
-  let connectionDescription = '';
-
-  const remoteCandidate = {
-    candidate: connectionMetadata.candidate,
-    sdpMid: '0', // Media stream ID for audio
-    sdpMLineIndex: 0 // Something to do with media
-  };
-  connection.addIceCandidate(remoteCandidate).then(
-    () => UI.setConnectionState('candidate added')
-  );
-
-  connection.createAnswer().then((desc) => {
-    connection.setLocalDescription(desc);
-    connectionDescription = desc.sdp;
-  });
-
-  connection.onicecandidate = e => {
-    if (e.candidate) {
-      const body = connectionDescription;
-      fetch(
-        'http://localhost:8000/state/json',
-        {
-          method: 'post',
-          headers: {'Content-Type': 'text/plain'},
-          body
-        }
-      ).then(response => {
-        if (response.status !== 200) {
-          throw new Error('bad status ' + response.status);
-        }
-      });
-    }
-  };
-  connection.ondatachannel = (e) => {
-    UI.setConnectionState('received channel: ' + JSON.stringify(e));
-    const channel = e.channel;
-    console.log(channel);
-    const sendButton = UI.sendMessageButton();
-    sendButton.addEventListener('click', sendMessage.bind(null, channel), false);
-    channel.onopen = () => {
-      console.log('open');
-      UI.setConnectionState('channel open');
-    };
-    channel.onmessage = (msg) => {
-      UI.createMessageElement('from-them', msg.data);
-    };
-  };
-}
-
-function sendMessage(channel) {
-  const message = UI.messageTextBoxValue();
-  UI.createMessageElement('from-me', message);
-  channel.send(message);
-}
-
-function getQueryParameter(name) {
-  const urlParams = new URLSearchParams(window.location.search);
-  return urlParams.get(name);
-}

examples/web/answerer.html

@@ -1,22 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <title>Web Rtc Answerer</title>
-        <link rel="stylesheet" href="/style.css" />
-    </head>
-    <body>
-        <div id="message-container">
-            <h1>Web Rtc</h1>
-            <div id="messages"></div>
-        </div>
-        <div id="message-input">
-            <p id="connection-state">Pending</p>
-            <textarea id="message-text-box"
-                placeholder="Send a message"
-            ></textarea>
-            <br/>
-            <button id="send-message-button">Send</button>
-        </div>
-        <script src="/answerScript.js"></script>
-    </body>
-</html>

examples/web/index.html

@@ -1,15 +1,23 @@
 <!doctype html>
 <html>
     <head>
-        <title>Web Rtc Example</title>
+		<meta charset="UTF-8">
+        <title>WebRTC Example</title>
+		<link rel="stylesheet" href="style.css">
+        <script src="script.js"></script>
     </head>
     <body>
-        <h1>Web Rtc</h1>
-        <button id="createConnectionBtn">Create Connection</button>
-        <br/>
-        <textarea id="sendData" placeholder="Send a message" style="width: 500px; height: 50px"></textarea>
-        <br/>
-        <button id="sendDataBtn">Send Data</button>
-        <script src="/script.js"></script>
+        <h1>WebRTC Example</h1>
+        <h2>Local ID</h2>
+        <p id="localId"></p>
+        <h2>Send an offer through signaling</h2>
+		<input type="text" id="offerId" placeholder="remote ID" disabled>
+		<input type="button" id="offerBtn" value="Offer" disabled>
+		<br>
+        <h2>Send a message through DataChannel</h2>
+        <input type="text" id="sendMsg" placeholder="message" disabled>
+        <input type="button" id="sendBtn" value="Send" disabled>
+        <br>
     </body>
-</html>
+</html>
+

examples/web/package-lock.json

@@ -0,0 +1,119 @@
+{
+  "name": "libdatachannel-example-web",
+  "version": "0.0.1",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "d": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
+      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
+      "requires": {
+        "es5-ext": "^0.10.50",
+        "type": "^1.0.1"
+      }
+    },
+    "debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "requires": {
+        "ms": "2.0.0"
+      }
+    },
+    "es5-ext": {
+      "version": "0.10.53",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
+      "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
+      "requires": {
+        "es6-iterator": "~2.0.3",
+        "es6-symbol": "~3.1.3",
+        "next-tick": "~1.0.0"
+      }
+    },
+    "es6-iterator": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
+      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
+      "requires": {
+        "d": "1",
+        "es5-ext": "^0.10.35",
+        "es6-symbol": "^3.1.1"
+      }
+    },
+    "es6-symbol": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
+      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
+      "requires": {
+        "d": "^1.0.1",
+        "ext": "^1.1.2"
+      }
+    },
+    "ext": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz",
+      "integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==",
+      "requires": {
+        "type": "^2.0.0"
+      },
+      "dependencies": {
+        "type": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/type/-/type-2.0.0.tgz",
+          "integrity": "sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow=="
+        }
+      }
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+    },
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+    },
+    "nan": {
+      "version": "2.14.1",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz",
+      "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw=="
+    },
+    "next-tick": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
+      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw="
+    },
+    "type": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
+      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="
+    },
+    "typedarray-to-buffer": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+      "requires": {
+        "is-typedarray": "^1.0.0"
+      }
+    },
+    "websocket": {
+      "version": "1.0.31",
+      "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.31.tgz",
+      "integrity": "sha512-VAouplvGKPiKFDTeCCO65vYHsyay8DqoBSlzIO3fayrfOgU94lQN5a1uWVnFrMLceTJw/+fQXR5PGbUVRaHshQ==",
+      "requires": {
+        "debug": "^2.2.0",
+        "es5-ext": "^0.10.50",
+        "nan": "^2.14.0",
+        "typedarray-to-buffer": "^3.1.5",
+        "yaeti": "^0.0.6"
+      }
+    },
+    "yaeti": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz",
+      "integrity": "sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc="
+    }
+  }
+}

examples/web/package.json

@@ -0,0 +1,23 @@
+{
+  "name": "libdatachannel-example-web",
+  "version": "0.0.1",
+  "description": "Example for libdatachannel",
+  "main": "server.js",
+  "scripts": {
+    "start": "node server.js",
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/paullouisageneau/libdatachannel.git"
+  },
+  "author": "Paul-Louis Ageneau",
+  "license": "GPL-2.0",
+  "bugs": {
+    "url": "https://github.com/paullouisageneau/libdatachannel/issues"
+  },
+  "homepage": "https://github.com/paullouisageneau/libdatachannel#readme",
+  "dependencies": {
+    "websocket": "^1.0.31"
+  }
+}

examples/web/script.js

@@ -1,69 +1,194 @@
-(function (){
-  console.log('Hello');
-  const connectButton = document.getElementById('createConnectionBtn');
-  connectButton.addEventListener('click', createConnection, false);
-})();
-
-function createConnection() {
-  const localConnection = new RTCPeerConnection();
-  const sendChannel = localConnection.createDataChannel('channel');
-  const connectionInfo = {};
-  localConnection.onicecandidate = e => {
-    if (e.candidate) {
-      const candidate = e.candidate.candidate;
-      connectionInfo.candidate = candidate;
-      const answererUrl = 'http://localhost:8080/answerer.html?connection=' + btoa(JSON.stringify(connectionInfo));
-      const createLink = document.createElement('a');
-      createLink.setAttribute('href', answererUrl);
-      createLink.setAttribute('target', 'new');
-      createLink.append('Open me ;)');
-      document.body.append(createLink);
-      const pollForConnection = setInterval(() => {
-        fetch(
-          'http://localhost:8000/state/json'
-        ).then(response => {
-          if (response.status !== 200) {
-            throw new Error('bad status ' + response.status);
-          }
-          return response.json();
-        }).then(data => {
-          if (data.description) {
-            console.log('yes');
-            clearInterval(pollForConnection);
-            createRemoteConnection(data.description);
-          }
-          else {
-            console.log('no');
+/*
+ * libdatachannel example web client
+ * Copyright (C) 2020 Lara Mackey
+ * Copyright (C) 2020 Paul-Louis Ageneau
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; If not, see <http://www.gnu.org/licenses/>.
+ */
+
+window.addEventListener('load', () => {
+
+const config = {
+  iceServers: [{
+    urls: 'stun:stun.l.google.com:19302', // change to your STUN server
+  }],
+};
+
+const localId = randomId(8);
+
+const url = `ws://localhost:8000/${localId}`;
+
+const peerConnectionMap = {};
+const dataChannelMap = {};
+
+const offerId = document.getElementById('offerId');
+const offerBtn = document.getElementById('offerBtn');
+const sendMsg = document.getElementById('sendMsg');
+const sendBtn = document.getElementById('sendBtn');
+const _localId = document.getElementById('localId');
+_localId.textContent = localId;
+
+console.log('Connecting to signaling...');
+openSignaling(url)
+  .then((ws) => {
+    console.log('WebSocket connected, signaling ready');
+    offerId.disabled = false;
+    offerBtn.disabled = false;
+    offerBtn.onclick = () => offerPeerConnection(ws, offerId.value);
+  })
+  .catch((err) => console.error(err));
+
+
+function openSignaling(url) {
+  return new Promise((resolve, reject) => {
+    const ws = new WebSocket(url);
+    ws.onopen = () => resolve(ws);
+    ws.onerror = () => reject(new Error('WebSocket error'));
+    ws.onclosed = () => console.error('WebSocket disconnected');
+    ws.onmessage = (e) => {
+      if(typeof(e.data) != 'string') return;
+      const message = JSON.parse(e.data);
+      const { id, type } = message;
+
+      let pc = peerConnectionMap[id];
+      if(!pc) {
+		    if(type != 'offer') return;
+
+			  // Create PeerConnection for answer
+			  console.log(`Answering to ${id}`);
+			  pc = createPeerConnection(ws, id);
+		  }
+
+      switch(type) {
+      case 'offer':
+      case 'answer':
+			  pc.setRemoteDescription({
+			    sdp: message.description,
+			    type: message.type,
+			  })
+			  .then(() => {
+          if(type == 'offer') {
+			      // Send answer
+            sendLocalDescription(ws, id, pc, 'answer');
           }
-        });
-      }, 5000);
+			  });
+			  break;
+
+			case 'candidate':
+		    pc.addIceCandidate({
+          candidate: message.candidate,
+          sdpMid: message.mid,
+		    });
+		    break;
+		  }
+    }
+  });
+}
+
+function offerPeerConnection(ws, id) {
+	// Create PeerConnection
+	console.log(`Offering to ${id}`);
+	pc = createPeerConnection(ws, id);
+
+  // Create DataChannel
+  const label = "test";
+  console.log(`Creating DataChannel with label "${label}"`);
+  const dc = pc.createDataChannel(label);
+  setupDataChannel(dc, id);
+
+  // Send offer
+  sendLocalDescription(ws, id, pc, 'offer');
+}
+
+// Create and setup a PeerConnection
+function createPeerConnection(ws, id) {
+  const pc = new RTCPeerConnection(config);
+  pc.onconnectionstatechange = () => console.log(`Connection state: ${pc.connectionState}`);
+  pc.onicegatheringstatechange = () => console.log(`Gathering state: ${pc.iceGatheringState}`);
+  pc.onicecandidate = (e) => {
+    if (e.candidate) {
+      // Send candidate
+      sendLocalCandidate(ws, id, e.candidate);
     }
   };
+  pc.ondatachannel = (e) => {
+    const dc = e.channel;
+    console.log(`"DataChannel from ${id} received with label "${dc.label}"`);
+    setupDataChannel(dc, id);
 
-  localConnection.createOffer().then((desc) => {
-    connectionInfo.description = desc.sdp;
-    localConnection.setLocalDescription(desc);
-  });
+		dc.send(`Hello from ${localId}`);
 
-  function createRemoteConnection(desc) {
-    const remoteDesc = {
-      type: 'answer',
-      sdp: desc
-    };
-    localConnection.setRemoteDescription(remoteDesc).then((e) => {
-      console.log(e);
-    });
-  }
-
-  const sendButton = document.getElementById('sendDataBtn');
-  sendButton.addEventListener('click', sendMessage, false);
-  function sendMessage() {
-    const messageText = document.getElementById('sendData').value;
-    sendChannel.send(messageText);   
-  }
-  sendChannel.onmessage = (msg) => {
-    document.body.append(msg.data);
+    sendMsg.disabled = false;
+    sendBtn.disabled = false;
+    sendBtn.onclick = () => dc.send(sendMsg.value);
+  };
+
+  peerConnectionMap[id] = pc;
+  return pc;
+}
+
+// Setup a DataChannel
+function setupDataChannel(dc, id) {
+  dc.onopen = () => {
+    console.log(`DataChannel from ${id} open`);
+
+    sendMsg.disabled = false;
+    sendBtn.disabled = false;
+    sendBtn.onclick = () => dc.send(sendMsg.value);
+  };
+  dc.onclose = () => {
+    console.log(`DataChannel from ${id} closed`);
   };
+	dc.onmessage = (e) => {
+    if(typeof(e.data) != 'string') return;
+		console.log(`Message from ${id} received: ${e.data}`);
+    document.body.appendChild(document.createTextNode(e.data));
+	};
+
+  dataChannelMap[id] = dc;
+  return dc;
+}
+
+function sendLocalDescription(ws, id, pc, type) {
+  (type == 'offer' ? pc.createOffer() : pc.createAnswer())
+    .then((desc) => pc.setLocalDescription(desc))
+    .then(() => {
+      const { sdp, type } = pc.localDescription;
+      ws.send(JSON.stringify({
+        id,
+        type,
+        description: sdp,
+      }));
+    });
+}
+
+function sendLocalCandidate(ws, id, cand) {
+  const {candidate, sdpMid} = cand;
+  ws.send(JSON.stringify({
+    id,
+    type: 'candidate',
+    candidate,
+    mid: sdpMid,
+  }));
+}
+
+// Helper function to generate a random ID
+function randomId(length) {
+  const characters = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
+  const pickRandom = () => characters.charAt(Math.floor(Math.random() * characters.length));
+  return [...Array(length)].map(pickRandom).join('');
 }
 
+});
 

examples/web/server.js

@@ -1,29 +1,102 @@
+/*
+ * libdatachannel example web server
+ * Copyright (C) 2020 Lara Mackey
+ * Copyright (C) 2020 Paul-Louis Ageneau
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; If not, see <http://www.gnu.org/licenses/>.
+ */
+
+const fs = require('fs');
 const http = require('http');
+const websocket = require('websocket');
+
+const staticFiles = {
+  '/index.html': 'text/html',
+  '/style.css': 'text/css',
+  '/script.js': 'text/javascript',
+};
+
+const clients = {};
 
-let connectionMetadata;
-http.createServer(function(req, res) {
-  console.log(req.method.toUpperCase(), req.url);
-  if (req.method === 'POST') {
-    let body = '';
-    req.on('data', chunk => body += chunk);
-    req.on('end', () => {
-      connectionMetadata = body;
-      res.writeHead(200);
-      res.end();
+const httpServer = http.createServer((req, res) => {
+  console.log(`${req.method.toUpperCase()} ${req.url}`);
+
+  const respond = (code, data, contentType = 'text/plain') => {
+    res.writeHead(code, {
+      'Content-Type': contentType,
+      'Access-Control-Allow-Origin': '*',
     });
+    res.end(data);
+  };
+
+  if(req.method != 'GET') {
+    respond(405, 'Method not allowed');
     return;
   }
-  if (req.method === 'GET') {
-    res.writeHead(200, {'Content-Type': 'text/plain'});
-    res.end(connectionMetadata);
-    return;
-  }
-  if (req.method === 'OPTIONS') {
-    res.writeHead(200, {
-      'Access-Control-Allow-Origin': '*',
-    });
-    res.end(connectionMetadata);
+
+  const url = req.url == '/' ? '/index.html' : req.url;
+  const contentType = staticFiles[url];
+  if(!contentType) {
+    respond(404, 'Not found');
     return;
   }
-  console.error('unknown method: ' + req.method);
-}).listen(8000);
+
+  fs.readFile(__dirname + url, (err, data) => {
+    if(err) {
+      respond(500, 'Missing file');
+      return;
+    }
+
+    respond(200, data, contentType);
+  });
+});
+
+const wsServer = new websocket.server({ httpServer });
+wsServer.on('request', (req) => {
+  console.log(`WS  ${req.resource}`);
+
+  const { path } = req.resourceURL;
+  const splitted = path.split('/');
+  splitted.shift();
+  const id = splitted[0];
+
+  const conn = req.accept(null, req.origin);
+  conn.on('message', (data) => {
+    if(data.type === 'utf8') {
+      console.log(`Client ${id} << ${data.utf8Data}`);
+
+      const message = JSON.parse(data.utf8Data);
+      const destId = message.id;
+      const dest = clients[destId];
+      if(dest) {
+        message.id = id;
+        const data = JSON.stringify(message);
+        console.log(`Client ${destId} >> ${data}`);
+        dest.send(data);
+      }
+      else {
+        console.error(`Client ${destId} not found`);
+      }
+    }
+  });
+  conn.on('close', () => {
+    delete clients[id];
+    console.error(`Client ${id} disconnected`);
+  });
+
+  clients[id] = conn;
+});
+
+httpServer.listen(8000);
+

examples/web/style.css

@@ -1,79 +1,20 @@
 body {
-  background-color: #fff5e3;
-  font-family: sans-serif;
-  display: flex;
-  flex-wrap: wrap;
-  margin: 0;
+	font-family: arial, verdana, sans-serif;
+	font-size: 12pt;
+	background-color: #FFFFFF;
+	color: #000000;
+	margin: 0;
+	padding: 0.5em;
 }
 
-#message-container {
-  padding: 0 5%;
-  width: 100%;
+input {
+	font-size: 100%;
+	vertical-align: middle;
 }
 
-h1 {
-  width: 100%;
+input[type="text"] {
+	width: 8em;
+	max-width: 75%;
+	padding: 0.4em;
 }
 
-#message-input {
-  width: 100%;
-  position: fixed;
-  top: 90%;
-  height: 10%;
-  display: flex;
-  background-color: #a0a0a0f7;
-}
-
-#message-text-box {
-  width: 90%;
-  border: none;
-  border-radius: 20px 0 0 20px;
-  padding: 5px;
-  vertical-align: middle;
-  font-size: medium;
-  resize: none;
-  vertical-align: middle;
-}
-
-#message-text-box:focus {
-  outline: none;
-}
-
-#messages {
-  display: flex;
-  flex-direction:column;
-  width: 100%;
-  margin: auto;
-}
-
-#send-message-button {
-  width: 10%;
-  font-size: medium;
-}
-#send-message-button:hover {
-  opacity: 10%;
-}
-
-.message {
-  width: 40%;
-  flex-basis: 100%;
-  border: 1px solid;
-  padding: 1%;
-  border-radius: 8px;
-  box-shadow: 2px 2px #a0a0a0f7;
-}
-
-.message .time {
-  font-size: x-small;
-  display: flex;
-  align-self:flex-end;
-}
-
-.from-me {
-  background-color: #dcf8c6;
-}
-
-.from-them {
-  background-color: #fff;
-  align-self:flex-end;
-}

src/candidate.cpp

@@ -60,12 +60,19 @@ bool Candidate::resolve(ResolveMode mode) {
 	if (mIsResolved)
 		return true;
 
+	PLOG_VERBOSE << "Resolving candidate (mode="
+				 << (mode == ResolveMode::Simple ? "simple" : "lookup")
+				 << "): " << mCandidate;
+
 	// See RFC 8445 for format
-	std::stringstream ss(mCandidate);
+	std::istringstream iss(mCandidate);
 	int component{0}, priority{0};
 	string foundation, transport, node, service, typ_, type;
-	if (ss >> foundation >> component >> transport >> priority &&
-	    ss >> node >> service >> typ_ >> type && typ_ == "typ") {
+	if (iss >> foundation >> component >> transport >> priority &&
+	    iss >> node >> service >> typ_ >> type && typ_ == "typ") {
+
+		string left;
+		std::getline(iss, left);
 
 		// Try to resolve the node
 		struct addrinfo hints = {};
@@ -94,15 +101,13 @@ bool Candidate::resolve(ResolveMode mode) {
 					if (getnameinfo(p->ai_addr, p->ai_addrlen, nodebuffer, MAX_NUMERICNODE_LEN,
 					                servbuffer, MAX_NUMERICSERV_LEN,
 					                NI_NUMERICHOST | NI_NUMERICSERV) == 0) {
-						string left;
-						std::getline(ss, left);
 						const char sp{' '};
-						ss.clear();
-						ss << foundation << sp << component << sp << transport << sp << priority;
-						ss << sp << nodebuffer << sp << servbuffer << sp << "typ" << sp << type;
-						if (!left.empty())
-							ss << left;
-						mCandidate = ss.str();
+						std::ostringstream oss;
+						oss << foundation << sp << component << sp << transport << sp << priority;
+						oss << sp << nodebuffer << sp << servbuffer << sp << "typ" << sp << type;
+						oss << left;
+						mCandidate = oss.str();
+						PLOG_VERBOSE << "Resolved candidate: " << mCandidate;
 						return mIsResolved = true;
 					}
 				}

src/tlstransport.cpp

@@ -205,7 +205,7 @@ ssize_t TlsTransport::ReadCallback(gnutls_transport_ptr_t ptr, void *data, size_
 			return len;
 		}
 
-		recv(message); // Pass zero-sized messages through
+		t->recv(message); // Pass zero-sized messages through
 	}
 	// Closed
 	gnutls_transport_set_errno(t->mSession, 0);