4.1.0

.gitignore

@@ -1,4 +1,3 @@
 node_modules/*
-**/node_modules/*
-.DS_Store
-npm-debug.log
+npm-debug.log
+.vscode

app.js

@@ -1,15 +1,61 @@
-var http = require("http"),
-	url = require("url"),
-	fs = require("fs");
-http.createServer(function(req,res){
-	console.log(pathname);
-	var pathname = url.parse(req.url).pathname;
-	console.log(pathname);
- 	fs.readFile("."+pathname, function readData(err, data) {
-        res.writeHead(200);
-        res.end(data);
-    });
-}).listen(8888);
-console.log('Server running at http://localhost:8888/');
-console.log('please visit:');
-console.log('http://localhost:8888/webdemo/index.html');
+var express = require('express');
+var https = require('https');
+var http = require('http');
+var fs = require('fs');
+var prettyjson = require('prettyjson');
+var multer = require('multer');
+
+var app = express();
+
+app.use(express.static('./'));
+app.use(express.static('node_modules'));
+
+app.use(function (req, res, next) {
+    res.header('Access-Control-Allow-Origin', '*');
+    res.header('Access-Control-Allow-Methods', 'GET, HEAD, POST, PUT, DELETE, OPTIONS');
+    res.header('Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept, AppKey, Nonce, CurTime, CheckSum');
+    // res.header('Access-Control-Max-Age', 604800);
+    res.header('Access-Control-Allow-Credentials', true);
+    next();
+});
+
+// app.use(function (req, res, next) {
+//     res.status(404).send('404')
+// })
+
+app.get('timeout', function (req, res) {
+    console.log('timeout');
+});
+
+var options = {
+    key: fs.readFileSync('./ssh/key.pem'),
+    cert: fs.readFileSync('./ssh/cert.pem')
+};
+
+var httpServer = http.createServer(app);
+httpServer.listen(8182, function () {
+    logAddress(httpServer, 'http');
+});
+var httpsServer = https.createServer(options, app);
+httpsServer.listen(7182, function () {
+    logAddress(httpsServer, 'https');
+});
+
+function logAddress(server, type) {
+    var address = server.address();
+    address = type + '://localhost:' + address.port;
+    // console.log('vcloud');
+    // console.log(address + '/webdemo/vcloud/room.html?type=edu&roomid=36168');
+    log();
+}
+
+function log(obj) {
+    if (!obj) return
+    if (typeof obj === 'string') {
+        if (obj.length > 100) {
+            return;
+        }
+        obj = [obj];
+    }
+    console.log(prettyjson.render(obj));
+}

package.json

@@ -1,11 +1,20 @@
 {
   "name": "NIM_Web_Demo",
-  "version": "1.5.0",
-  "description": "",
-  "main": "app.js",
-  "author": "",
-  "license": "ISC",
+  "scripts": {
+    "start": "node app.js",
+    "https-server": "http-server --ssl --key ./ssh/key.pem --cert ./ssh/cert.pem --p 9091",
+    "build": "node deploy.js"
+  },
   "dependencies": {
-    "url": "~0.11.0"
+    "babel-polyfill": "^6.23.0",
+    "blurify": "^1.0.7",
+    "multer": "^1.1.0",
+    "platform": "^1.3.3",
+    "prettyjson": "^1.1.3",
+    "prompt": "^1.0.0",
+    "rangeslider.js": "^2.3.0"
+  },
+  "devDependencies": {
+    "express": "^4.13.4"
   }
 }

webdemo/3rd/rtcSupport.js

@@ -0,0 +1,51 @@
+// 验证当前浏览器是否支持webrtc
+// created by @HenrikJoreteg
+(function () {
+
+    var prefix;
+    var version;
+
+    if (window.mozRTCPeerConnection || navigator.mozGetUserMedia) {
+        prefix = 'moz';
+        version = parseInt(navigator.userAgent.match(/Firefox\/([0-9]+)\./)[1], 10);
+    } else if (window.webkitRTCPeerConnection || navigator.webkitGetUserMedia) {
+        prefix = 'webkit';
+        version = navigator.userAgent.match(/Chrom(e|ium)/) && parseInt(navigator.userAgent.match(/Chrom(e|ium)\/([0-9]+)\./)[2], 10);
+    }
+
+    var PC = window.RTCPeerConnection || window.mozRTCPeerConnection || window.webkitRTCPeerConnection;
+    var IceCandidate = window.mozRTCIceCandidate || window.RTCIceCandidate;
+    var SessionDescription = window.mozRTCSessionDescription || window.RTCSessionDescription;
+    var MediaStream = window.webkitMediaStream || window.MediaStream;
+    var screenSharing = window.location.protocol === 'https:' &&
+        ((prefix === 'webkit' && version >= 26) ||
+            (prefix === 'moz' && version >= 33))
+    var AudioContext = window.AudioContext || window.webkitAudioContext;
+    var AudioDestination = AudioContext && new AudioContext().createMediaStreamSource && new AudioContext().createMediaStreamDestination
+    var videoEl = document.createElement('video');
+    var supportVp8 = videoEl && videoEl.canPlayType && videoEl.canPlayType('video/webm; codecs="vp8", vorbis') === "probably";
+    var getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.msGetUserMedia || navigator.mozGetUserMedia;
+
+    // export support flags and constructors.prototype && PC
+    window.rtcSupport = {
+        prefix: prefix,
+        browserVersion: version,
+        support: !!PC && !!getUserMedia,
+        // new support style
+        supportRTCPeerConnection: !!PC,
+        supportVp8: supportVp8,
+        supportGetUserMedia: !!getUserMedia,
+        supportDataChannel: !!(PC && PC.prototype && PC.prototype.createDataChannel),
+        supportWebAudio: !!(AudioContext && AudioContext.prototype.createMediaStreamSource && AudioDestination),
+        supportMediaStream: !!(MediaStream && MediaStream.prototype.removeTrack),
+        supportScreenSharing: !!screenSharing,
+        // constructors
+        AudioContext: AudioContext,
+        PeerConnection: PC,
+        SessionDescription: SessionDescription,
+        IceCandidate: IceCandidate,
+        MediaStream: MediaStream,
+        getUserMedia: getUserMedia
+    };
+
+})()

webdemo/im/chatroom/room.html

@@ -78,7 +78,8 @@
 	<script src="../js/config.js"></script>
 	<script src="./dist/js/title.js"></script>
 	<script src="../../3rd/jquery-1.11.3.min.js"></script>
-	<script src="../../3rd/NIM_Web_SDK_v4.0.0.js"></script>
+	<script src="../../3rd/NIM_Web_SDK_v4.1.0.js"></script>
+
 	<script src="./dist/js/util.js"></script>
 	<script src="./dist/js/emoji.js"></script>
 	<script src="./dist/js/link.js"></script>