diff --git a/engage-project-9d8d3-firebase-adminsdk-vpacj-2bc49d6a67.json b/engage-project-9d8d3-firebase-adminsdk-vpacj-2bc49d6a67.json new file mode 100644 index 0000000..7fd666e --- /dev/null +++ b/engage-project-9d8d3-firebase-adminsdk-vpacj-2bc49d6a67.json @@ -0,0 +1,12 @@ +{ + "type": "service_account", + "project_id": "engage-project-9d8d3", + "private_key_id": "2bc49d6a67f7f66bf495b27f64d7958d99dacc3b", + "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDb6eENa/za6Gev\n86YRd0bqwZF3OzR7+QH4S9qGJABWfqO/4tdJMTAjdsMdu917LZ7kmBpUZ+VzcdKP\njn2/Tkqhq+SQty1bhk7cLILAq4zYSV2l0m1fK9ykfx73VSIrpe0l47ImizSPgRjm\nQh9D4x2xbpLgKTr/IZBxSv69MfUfEtm7v1uD/en/fmUMliiOcz2kukhfMCJGOR5y\np9ILswn++WMUefmLnNci6oQHAZc8yWIbRiTVaUCxwlj/z5hzRqOIcyyfOjMj4pY8\nFrg+q+9ISyQjr3gIht+eYzP/LQzYmgo7hM30Sebq1LGTVCnR7VoW9Rjkltz/LoPp\nQ5mFU2XrAgMBAAECggEABIqwgK/1wWmiVpJwIBU4DDoiMHWzEEpkvYWHhlSxAxhL\ndnePXa4b4eeegPszyEr5aJwxkwOwS/GSWS+mrjBGP0+HAWwfDjBYaZirvKHuXzso\nqXeOlbQYsvcDIzWJZqBfJPSuZbhjRgFzC7Ja5fKHVvZDJ0kCtGkzi/tyBmNFPjaC\nI1CXmhNbQugZ7na0F+EWAdajsJJrqn66qvOCgHkRtHJWwIfchkmcCn+cAglbf5+a\n7vNXeOOA3ZLJpL1dQxjdDq4IS0l4GE499mDcqlok8IjCsmNutLGgICu5iDdvqSxk\nkKOSh/mFnFfaNW8xVQtTDGimgmXhH2xOWAWpF0QhwQKBgQD58CIB02qpgih3c8dd\neCvuhMc9xd6axz/t9XynxRtUP//5lJrreo8kgY82mPZEwfxuB6FEFRJZM3VV/jYA\n20P/r1Nts5lO7W4GbDJul3uMaD/ElMfNlu2deHai9Hg5SHZgsZWHpSGXf19fv8ZM\n7GE5NdjwgbrMASuKYmTL8ktiQQKBgQDhP1MIzQxtK9e1UNCUUMiDPzllWIR1EiTB\nVeN9gBPYo6Knd59N9674r5u0AqN6ZEX95sQZu7XN2bh/E5EUn0S3CZ8KnDwaQSwq\nUOr+bgKnZ4ZdWt4Aemzwen9lE/rs+0bMDPtxI+3ZnIwBq/K34AhgGjFDI+W1ZEE+\n4P6OmtalKwKBgHeX9r3G6u/HLxPRW6EXAnZ0JF4jkxueobF8WLRydVw/73z+JY7t\nqxa9w8hNMvG9nMsNbZYFOy1hmRCXvkF0qbnrq9D/Mil5JL+AADW42E5cB79Jrb1r\nLbG+1Y2tyuUmDjbAYptwYX17XiiTvBBMv0y/vll+yeIZ4TqrUC3idz3BAoGAURrq\nHSsoJE87FrCIyj7kVE35rsJWv4jO70ar6U6q1sDlGoP6OqrKuAUTfZfNoY5lnWzw\ng4uRhRO2WRuEi/ZlWbr/J2TmR1XcP0hvtTmLfxfJy+eiNG3guB6DrLOrEJXSAjtS\ndoTHainyR8/QT+E9Ys1Lm69bURtOWwPM5TBfxY0CgYEA1KKm2o+lKnjaW5yMWuBD\nbSVxkv9wyCySpe+76ChXWCbPiOIFsDSG/PztJO3GkgfRaWZyZyRTrK3uggnyngGY\ntP38MMYCH27u3Xcj/RA7gf3lIBeIPtYYrM+2HcRqyvi7p2kJw2zIBUf1yhe8dGBU\nnEQYMger0hExtCpbxEatND4=\n-----END PRIVATE KEY-----\n", + "client_email": "firebase-adminsdk-vpacj@engage-project-9d8d3.iam.gserviceaccount.com", + "client_id": "109484469408359912500", + "auth_uri": "https://accounts.google.com/o/oauth2/auth", + "token_uri": "https://oauth2.googleapis.com/token", + "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs", + "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/firebase-adminsdk-vpacj%40engage-project-9d8d3.iam.gserviceaccount.com" +} diff --git a/index.js b/index.js index 1901509..a3340f3 100644 --- a/index.js +++ b/index.js @@ -10,11 +10,25 @@ const { ExpressPeerServer } = require('peer'); const peerServer = ExpressPeerServer(server, { debug: true, }); +// server side realtime database +const admin = require('firebase-admin'); +var serviceAccount = require('./engage-project-9d8d3-firebase-adminsdk-vpacj-2bc49d6a67.json'); +admin.initializeApp({ + credential: admin.credential.cert(serviceAccount), + databaseURL: "https://engage-project-9d8d3-default-rtdb.firebaseio.com" +}); + + + +// app started app.set('view engine', 'ejs'); app.use(express.static('public')); app.use('/peerjs', peerServer); +app.get( '/home', (req, res) => { + res.render('homepage'); +}); app.get( '/teams-webrtc', (req, res) => { res.redirect(`/${uuidv4()}`); @@ -32,20 +46,61 @@ io.on('connection', (socket) => { socket.on('join-room', (roomId, userId ,userName,state) => { socket.join(roomId); socket.broadcast.to(roomId).emit('user-connected', userId , state); - + + var userRooms= admin.database().ref(`users/${userName}/rooms/${roomId}`); + if(roomId.toLowerCase()!=userName.toLowerCase()) + userRooms.push().set({ + "name": roomId + }); + socket.on('message', (message) => { io.to(roomId).emit('createMessage', message , userName, userId); }); if(state ==="in-meet") - { + { + // firebase code + var meetParticipantsRef =admin.database().ref(roomId).child("meetParticipants").child(userName); + var arrival_time = (new Date()).getTime(); + + + var currentParticipants= admin.database().ref(`${roomId}/currentParticipants/${userName}`); + currentParticipants.push().set({ + "name": userName + }); + //firebase code socket.on("disconnect", (reason)=>{ - socket.broadcast.emit("user-disconnected", userId ); + meetParticipantsRef.push().set({ + "tempo_id": userId, + "arrival_time": arrival_time, + "disconnected_time": (new Date()).getTime() + }); + socket.broadcast.emit("user-disconnected", userId , userName ); + admin.database().ref(`${roomId}/currentParticipants/${userName}`).remove(); + }); + + socket.on('waved', (myName) => { + io.to(roomId).emit('toggleWave', myName); }); - socket.on('waved', (userId) => { - io.to(roomId).emit('toggleWave', userId); + socket.on('change-filter', (videoId,filter) => { + io.to(roomId).emit('change-filter', videoId,filter); }); + + + /** + * Whiteboard actions for all user in the same room + */ + socket.on("wb", (config) => { + io.to(roomId).emit("wb", config); + }); + + + + socket.on('screen-closed', (screenId) => { + io.to(roomId).emit('remove-screen', screenId); + }); + } }); diff --git a/package-lock.json b/package-lock.json index 415d1c2..5252a02 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,6 +4,329 @@ "lockfileVersion": 1, "requires": true, "dependencies": { + "@firebase/app-types": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.6.2.tgz", + "integrity": "sha512-2VXvq/K+n8XMdM4L2xy5bYp2ZXMawJXluUIDzUBvMthVR+lhxK4pfFiqr1mmDbv9ydXvEAuFsD+6DpcZuJcSSw==" + }, + "@firebase/auth-interop-types": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.1.6.tgz", + "integrity": "sha512-etIi92fW3CctsmR9e3sYM3Uqnoq861M0Id9mdOPF6PWIg38BXL5k4upCNBggGUpLIS0H1grMOvy/wn1xymwe2g==" + }, + "@firebase/component": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.5.4.tgz", + "integrity": "sha512-KoLDPTsvxWr6FT9kn/snffJItaWXZLHLJlZVKiiw+flKE6MVA8Eec+ctvM2zcsMZzC2Z47gFnVqywfBlOevmpQ==", + "requires": { + "@firebase/util": "1.1.0", + "tslib": "^2.1.0" + } + }, + "@firebase/database": { + "version": "0.10.6", + "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.10.6.tgz", + "integrity": "sha512-AGxRnKaJQd4Pq7sblrWI39XM5N2u/pZOeopMxVRja38Cubxp6P5T7lzpp0xNSOQ/RszAoHskGIlCfIz+teaXSQ==", + "requires": { + "@firebase/auth-interop-types": "0.1.6", + "@firebase/component": "0.5.4", + "@firebase/database-types": "0.7.2", + "@firebase/logger": "0.2.6", + "@firebase/util": "1.1.0", + "faye-websocket": "0.11.3", + "tslib": "^2.1.0" + } + }, + "@firebase/database-types": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.7.2.tgz", + "integrity": "sha512-cdAd/dgwvC0r3oLEDUR+ULs1vBsEvy0b27nlzKhU6LQgm9fCDzgaH9nFGv8x+S9dly4B0egAXkONkVoWcOAisg==", + "requires": { + "@firebase/app-types": "0.6.2" + } + }, + "@firebase/logger": { + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.2.6.tgz", + "integrity": "sha512-KIxcUvW/cRGWlzK9Vd2KB864HlUnCfdTH0taHE0sXW5Xl7+W68suaeau1oKNEqmc3l45azkd4NzXTCWZRZdXrw==" + }, + "@firebase/util": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.1.0.tgz", + "integrity": "sha512-lfuSASuPKNdfebuFR8rjFamMQUPH9iiZHcKS755Rkm/5gRT0qC7BMhCh3ZkHf7NVbplzIc/GhmX2jM+igDRCag==", + "requires": { + "tslib": "^2.1.0" + } + }, + "@google-cloud/common": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-3.6.0.tgz", + "integrity": "sha512-aHIFTqJZmeTNO9md8XxV+ywuvXF3xBm5WNmgWeeCK+XN5X+kGW0WEX94wGwj+/MdOnrVf4dL2RvSIt9J5yJG6Q==", + "optional": true, + "requires": { + "@google-cloud/projectify": "^2.0.0", + "@google-cloud/promisify": "^2.0.0", + "arrify": "^2.0.1", + "duplexify": "^4.1.1", + "ent": "^2.2.0", + "extend": "^3.0.2", + "google-auth-library": "^7.0.2", + "retry-request": "^4.1.1", + "teeny-request": "^7.0.0" + } + }, + "@google-cloud/firestore": { + "version": "4.13.1", + "resolved": "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-4.13.1.tgz", + "integrity": "sha512-LtxboFZQ3MGwy1do8a0ykMJocM+TFgOpZoAihMwW498UDd641DJgJu0Kw0CD0bPpEaYUfhbeAUBq2ZO63DOz7g==", + "optional": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "functional-red-black-tree": "^1.0.1", + "google-gax": "^2.17.0", + "protobufjs": "^6.8.6" + } + }, + "@google-cloud/paginator": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-3.0.5.tgz", + "integrity": "sha512-N4Uk4BT1YuskfRhKXBs0n9Lg2YTROZc6IMpkO/8DIHODtm5s3xY8K5vVBo23v/2XulY3azwITQlYWgT4GdLsUw==", + "optional": true, + "requires": { + "arrify": "^2.0.0", + "extend": "^3.0.2" + } + }, + "@google-cloud/projectify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-2.1.0.tgz", + "integrity": "sha512-qbpidP/fOvQNz3nyabaVnZqcED1NNzf7qfeOlgtAZd9knTwY+KtsGRkYpiQzcATABy4gnGP2lousM3S0nuWVzA==", + "optional": true + }, + "@google-cloud/promisify": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-2.0.3.tgz", + "integrity": "sha512-d4VSA86eL/AFTe5xtyZX+ePUjE8dIFu2T8zmdeNBSa5/kNgXPCx/o/wbFNHAGLJdGnk1vddRuMESD9HbOC8irw==", + "optional": true + }, + "@google-cloud/storage": { + "version": "5.8.5", + "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-5.8.5.tgz", + "integrity": "sha512-i0gB9CRwQeOBYP7xuvn14M40LhHCwMjceBjxE4CTvsqL519sVY5yVKxLiAedHWGwUZHJNRa7Q2CmNfkdRwVNPg==", + "optional": true, + "requires": { + "@google-cloud/common": "^3.6.0", + "@google-cloud/paginator": "^3.0.0", + "@google-cloud/promisify": "^2.0.0", + "arrify": "^2.0.0", + "async-retry": "^1.3.1", + "compressible": "^2.0.12", + "date-and-time": "^1.0.0", + "duplexify": "^4.0.0", + "extend": "^3.0.2", + "gaxios": "^4.0.0", + "gcs-resumable-upload": "^3.1.4", + "get-stream": "^6.0.0", + "hash-stream-validation": "^0.2.2", + "mime": "^2.2.0", + "mime-types": "^2.0.8", + "onetime": "^5.1.0", + "p-limit": "^3.0.1", + "pumpify": "^2.0.0", + "snakeize": "^0.1.0", + "stream-events": "^1.0.1", + "xdg-basedir": "^4.0.0" + }, + "dependencies": { + "get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "optional": true + }, + "mime": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz", + "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==", + "optional": true + }, + "p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "optional": true, + "requires": { + "yocto-queue": "^0.1.0" + } + } + } + }, + "@grpc/grpc-js": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.3.4.tgz", + "integrity": "sha512-AxtZcm0mArQhY9z8T3TynCYVEaSKxNCa9mVhVwBCUnsuUEe8Zn94bPYYKVQSLt+hJJ1y0ukr3mUvtWfcATL/IQ==", + "optional": true, + "requires": { + "@types/node": ">=12.12.47" + } + }, + "@grpc/proto-loader": { + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.4.tgz", + "integrity": "sha512-7xvDvW/vJEcmLUltCUGOgWRPM8Oofv0eCFSVMuKqaqWJaXSzmB+m9hiyqe34QofAl4WAzIKUZZlinIF9FOHyTQ==", + "optional": true, + "requires": { + "@types/long": "^4.0.1", + "lodash.camelcase": "^4.3.0", + "long": "^4.0.0", + "protobufjs": "^6.10.0", + "yargs": "^16.1.1" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "optional": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "optional": true, + "requires": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "optional": true + }, + "wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "optional": true, + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } + }, + "y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "optional": true + }, + "yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "optional": true, + "requires": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + } + }, + "yargs-parser": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "optional": true + } + } + }, + "@panva/asn1.js": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@panva/asn1.js/-/asn1.js-1.0.0.tgz", + "integrity": "sha512-UdkG3mLEqXgnlKsWanWcgb6dOjUzJ+XC5f+aWw30qrtjxeNUSfKX1cd5FBzOaXQumoe9nIqeZUvrRJS03HCCtw==" + }, + "@protobufjs/aspromise": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", + "integrity": "sha1-m4sMxmPWaafY9vXQiToU00jzD78=", + "optional": true + }, + "@protobufjs/base64": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz", + "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==", + "optional": true + }, + "@protobufjs/codegen": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz", + "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==", + "optional": true + }, + "@protobufjs/eventemitter": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz", + "integrity": "sha1-NVy8mLr61ZePntCV85diHx0Ga3A=", + "optional": true + }, + "@protobufjs/fetch": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", + "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=", + "optional": true, + "requires": { + "@protobufjs/aspromise": "^1.1.1", + "@protobufjs/inquire": "^1.1.0" + } + }, + "@protobufjs/float": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz", + "integrity": "sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E=", + "optional": true + }, + "@protobufjs/inquire": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz", + "integrity": "sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik=", + "optional": true + }, + "@protobufjs/path": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz", + "integrity": "sha1-bMKyDFya1q0NzP0hynZz2Nf79o0=", + "optional": true + }, + "@protobufjs/pool": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz", + "integrity": "sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q=", + "optional": true + }, + "@protobufjs/utf8": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", + "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=", + "optional": true + }, "@sindresorhus/is": { "version": "0.14.0", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", @@ -17,6 +340,12 @@ "defer-to-connect": "^1.0.1" } }, + "@tootallnate/once": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", + "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", + "optional": true + }, "@types/body-parser": { "version": "1.19.0", "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz", @@ -60,6 +389,15 @@ "@types/serve-static": "*" } }, + "@types/express-jwt": { + "version": "0.0.42", + "resolved": "https://registry.npmjs.org/@types/express-jwt/-/express-jwt-0.0.42.tgz", + "integrity": "sha512-WszgUddvM1t5dPpJ3LhWNH8kfNN8GPIBrAGxgIYXVCEGx6Bx4A036aAuf/r5WH9DIEdlmp7gHOYvSM6U87B0ag==", + "requires": { + "@types/express": "*", + "@types/express-unless": "*" + } + }, "@types/express-serve-static-core": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.21.tgz", @@ -70,6 +408,20 @@ "@types/range-parser": "*" } }, + "@types/express-unless": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/@types/express-unless/-/express-unless-0.5.2.tgz", + "integrity": "sha512-Q74UyYRX/zIgl1HSp9tUX2PlG8glkVm+59r7aK4KGKzC5jqKIOX6rrVLRQrzpZUQ84VukHtRoeAuon2nIssHPQ==", + "requires": { + "@types/express": "*" + } + }, + "@types/long": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz", + "integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==", + "optional": true + }, "@types/mime": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz", @@ -112,6 +464,15 @@ "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" }, + "abort-controller": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", + "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", + "optional": true, + "requires": { + "event-target-shim": "^5.0.0" + } + }, "accepts": { "version": "1.3.7", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", @@ -121,6 +482,32 @@ "negotiator": "0.6.2" } }, + "agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "optional": true, + "requires": { + "debug": "4" + }, + "dependencies": { + "debug": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", + "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "optional": true, + "requires": { + "ms": "2.1.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "optional": true + } + } + }, "ansi-align": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz", @@ -204,11 +591,26 @@ "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=" }, + "arrify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", + "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==", + "optional": true + }, "async": { "version": "0.9.2", "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz", "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=" }, + "async-retry": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/async-retry/-/async-retry-1.3.1.tgz", + "integrity": "sha512-aiieFW/7h3hY0Bq5d+ktDBejxuwR78vRu9hDUdR8rNhSaQ29VzPL4AoIRG7D/c7tdenwOcKvgPM6tIxB3cB6HA==", + "optional": true, + "requires": { + "retry": "0.12.0" + } + }, "balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -219,11 +621,23 @@ "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz", "integrity": "sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=" }, + "base64-js": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "optional": true + }, "base64id": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz", "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==" }, + "bignumber.js": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.1.tgz", + "integrity": "sha512-IdZR9mh6ahOBv/hYGiXyVuyCetmGJhtYkqLBpTStdhEGjegpPlUawydyaF3pbIOFynJTpllEs+NP+CS9jKFLjA==", + "optional": true + }, "binary-extensions": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", @@ -323,6 +737,11 @@ "fill-range": "^7.0.1" } }, + "buffer-equal-constant-time": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", + "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=" + }, "bytes": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", @@ -443,6 +862,15 @@ "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==" }, + "compressible": { + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", + "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", + "optional": true, + "requires": { + "mime-db": ">= 1.43.0 < 2" + } + }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -498,6 +926,12 @@ "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz", "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==" }, + "date-and-time": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/date-and-time/-/date-and-time-1.0.1.tgz", + "integrity": "sha512-7u+uNfnjWkX+YFQfivvW24TjaJG6ahvTrfw1auq7KlC7osuGcZBIWGBvB9UcENjH6JnLVhMqlRripk1dSHjAUA==", + "optional": true + }, "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -539,6 +973,14 @@ "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" }, + "dicer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/dicer/-/dicer-0.3.0.tgz", + "integrity": "sha512-MdceRRWqltEG2dZqO769g27N/3PXfcKl04VhYnBlo2YhH7zPi88VebsjTKclaOyiuMaGU72hTfw3VkUitGcVCA==", + "requires": { + "streamsearch": "0.1.2" + } + }, "dot-prop": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", @@ -552,6 +994,26 @@ "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=" }, + "duplexify": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.1.tgz", + "integrity": "sha512-DY3xVEmVHTv1wSzKNbwoU6nVjzI369Y6sPoqfYr0/xlx3IdX2n94xIszTcjPO8W8ZIv0Wb0PXNcjuZyT4wiICA==", + "optional": true, + "requires": { + "end-of-stream": "^1.4.1", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1", + "stream-shift": "^1.0.0" + } + }, + "ecdsa-sig-formatter": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", + "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", + "requires": { + "safe-buffer": "^5.0.1" + } + }, "ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -630,6 +1092,18 @@ "base64-arraybuffer": "0.1.4" } }, + "ent": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz", + "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=", + "optional": true + }, + "escalade": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "optional": true + }, "escape-goat": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz", @@ -650,6 +1124,12 @@ "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" }, + "event-target-shim": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", + "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==", + "optional": true + }, "express": { "version": "4.17.1", "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", @@ -687,6 +1167,32 @@ "vary": "~1.1.2" } }, + "extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", + "optional": true + }, + "fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "optional": true + }, + "fast-text-encoding": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.3.tgz", + "integrity": "sha512-dtm4QZH9nZtcDt8qJiOH9fcQd1NAgi+K1O2DbE6GG1PPCK/BWfOH3idCTRQ4ImXRUOyopDEgDEnVEE7Y/2Wrig==", + "optional": true + }, + "faye-websocket": { + "version": "0.11.3", + "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz", + "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==", + "requires": { + "websocket-driver": ">=0.5.1" + } + }, "filelist": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.2.tgz", @@ -760,6 +1266,22 @@ "path-exists": "^4.0.0" } }, + "firebase-admin": { + "version": "9.10.0", + "resolved": "https://registry.npmjs.org/firebase-admin/-/firebase-admin-9.10.0.tgz", + "integrity": "sha512-4mB15zkzSpnLxpBrWJr7ad68ydYB/MMkS53N2XxfFwgz9QuFVCyHhznAno6FP7v+BtZkEJPdVd36nbH1yKS1UQ==", + "requires": { + "@firebase/database": "^0.10.0", + "@firebase/database-types": "^0.7.2", + "@google-cloud/firestore": "^4.5.0", + "@google-cloud/storage": "^5.3.0", + "@types/node": ">=12.12.47", + "dicer": "^0.3.0", + "jsonwebtoken": "^8.5.1", + "jwks-rsa": "^2.0.2", + "node-forge": "^0.10.0" + } + }, "forwarded": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", @@ -791,6 +1313,50 @@ "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", "optional": true }, + "functional-red-black-tree": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", + "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", + "optional": true + }, + "gaxios": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-4.3.0.tgz", + "integrity": "sha512-pHplNbslpwCLMyII/lHPWFQbJWOX0B3R1hwBEOvzYi1GmdKZruuEHK4N9V6f7tf1EaPYyF80mui1+344p6SmLg==", + "optional": true, + "requires": { + "abort-controller": "^3.0.0", + "extend": "^3.0.2", + "https-proxy-agent": "^5.0.0", + "is-stream": "^2.0.0", + "node-fetch": "^2.3.0" + } + }, + "gcp-metadata": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-4.3.0.tgz", + "integrity": "sha512-L9XQUpvKJCM76YRSmcxrR4mFPzPGsgZUH+GgHMxAET8qc6+BhRJq63RLhWakgEO2KKVgeSDVfyiNjkGSADwNTA==", + "optional": true, + "requires": { + "gaxios": "^4.0.0", + "json-bigint": "^1.0.0" + } + }, + "gcs-resumable-upload": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-3.2.1.tgz", + "integrity": "sha512-T7YPQVPFibgt6DmJVPGIgY8jHF9ycGJVDRCutwMBp/7Y2++QYEW8drL9XUdzS6ZvEiwTKvgvGMG77yb63XwSXA==", + "optional": true, + "requires": { + "abort-controller": "^3.0.0", + "configstore": "^5.0.0", + "extend": "^3.0.2", + "gaxios": "^4.0.0", + "google-auth-library": "^7.0.0", + "pumpify": "^2.0.0", + "stream-events": "^1.0.4" + } + }, "get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", @@ -869,6 +1435,52 @@ "pinkie-promise": "^2.0.0" } }, + "google-auth-library": { + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.3.0.tgz", + "integrity": "sha512-MPeeMlnsYnoiiVFMwX3hgaS684aiXrSqKoDP+xL4Ejg4Z0qLvIeg4XsaChemyFI8ZUO7ApwDAzNtgmhWSDNh5w==", + "optional": true, + "requires": { + "arrify": "^2.0.0", + "base64-js": "^1.3.0", + "ecdsa-sig-formatter": "^1.0.11", + "fast-text-encoding": "^1.0.0", + "gaxios": "^4.0.0", + "gcp-metadata": "^4.2.0", + "gtoken": "^5.0.4", + "jws": "^4.0.0", + "lru-cache": "^6.0.0" + } + }, + "google-gax": { + "version": "2.17.0", + "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-2.17.0.tgz", + "integrity": "sha512-Ze/Oq0atVNKyKvDzQFU8B82V9w36GELQruXGsiY1jnySbieZ9vS75v98V/Z10PktmSVqis4sQ+FwK2gkgwIiiw==", + "optional": true, + "requires": { + "@grpc/grpc-js": "~1.3.0", + "@grpc/proto-loader": "^0.6.1", + "@types/long": "^4.0.0", + "abort-controller": "^3.0.0", + "duplexify": "^4.0.0", + "fast-text-encoding": "^1.0.3", + "google-auth-library": "^7.0.2", + "is-stream-ended": "^0.1.4", + "node-fetch": "^2.6.1", + "object-hash": "^2.1.1", + "protobufjs": "^6.10.2", + "retry-request": "^4.0.0" + } + }, + "google-p12-pem": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.1.0.tgz", + "integrity": "sha512-JUtEHXL4DY/N+xhlm7TC3qL797RPAtk0ZGXNs3/gWyiDHYoA/8Rjes0pztkda+sZv4ej1EoO2KhWgW5V9KTrSQ==", + "optional": true, + "requires": { + "node-forge": "^0.10.0" + } + }, "got": { "version": "9.6.0", "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz", @@ -892,6 +1504,17 @@ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz", "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==" }, + "gtoken": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-5.3.0.tgz", + "integrity": "sha512-mCcISYiaRZrJpfqOs0QWa6lfEM/C1V9ASkzFmuz43XBb5s1Vynh+CZy1ECeeJXVGx2PRByjYzb4Y4/zr1byr0w==", + "optional": true, + "requires": { + "gaxios": "^4.0.0", + "google-p12-pem": "^3.0.3", + "jws": "^4.0.0" + } + }, "has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", @@ -902,6 +1525,12 @@ "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz", "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==" }, + "hash-stream-validation": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/hash-stream-validation/-/hash-stream-validation-0.2.4.tgz", + "integrity": "sha512-Gjzu0Xn7IagXVkSu9cSFuK1fqzwtLwFhNhVL8IFJijRNMgUttFbBSIAzKuSIrsFMO1+g1RlsoN49zPIbwPDMGQ==", + "optional": true + }, "http-cache-semantics": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", @@ -919,6 +1548,66 @@ "toidentifier": "1.0.0" } }, + "http-parser-js": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz", + "integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==" + }, + "http-proxy-agent": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", + "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", + "optional": true, + "requires": { + "@tootallnate/once": "1", + "agent-base": "6", + "debug": "4" + }, + "dependencies": { + "debug": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", + "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "optional": true, + "requires": { + "ms": "2.1.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "optional": true + } + } + }, + "https-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", + "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", + "optional": true, + "requires": { + "agent-base": "6", + "debug": "4" + }, + "dependencies": { + "debug": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", + "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "optional": true, + "requires": { + "ms": "2.1.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "optional": true + } + } + }, "humanize-url": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/humanize-url/-/humanize-url-1.0.1.tgz", @@ -1061,6 +1750,18 @@ "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=" }, + "is-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", + "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==", + "optional": true + }, + "is-stream-ended": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.4.tgz", + "integrity": "sha512-xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw==", + "optional": true + }, "is-typedarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", @@ -1082,6 +1783,23 @@ "minimatch": "^3.0.4" } }, + "jose": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/jose/-/jose-2.0.5.tgz", + "integrity": "sha512-BAiDNeDKTMgk4tvD0BbxJ8xHEHBZgpeRZ1zGPPsitSyMgjoMWiLGYAE7H7NpP5h0lPppQajQs871E8NHUrzVPA==", + "requires": { + "@panva/asn1.js": "^1.0.0" + } + }, + "json-bigint": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz", + "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==", + "optional": true, + "requires": { + "bignumber.js": "^9.0.0" + } + }, "json-buffer": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", @@ -1095,6 +1813,97 @@ "graceful-fs": "^4.1.6" } }, + "jsonwebtoken": { + "version": "8.5.1", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", + "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==", + "requires": { + "jws": "^3.2.2", + "lodash.includes": "^4.3.0", + "lodash.isboolean": "^3.0.3", + "lodash.isinteger": "^4.0.4", + "lodash.isnumber": "^3.0.3", + "lodash.isplainobject": "^4.0.6", + "lodash.isstring": "^4.0.1", + "lodash.once": "^4.0.0", + "ms": "^2.1.1", + "semver": "^5.6.0" + }, + "dependencies": { + "jwa": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", + "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==", + "requires": { + "buffer-equal-constant-time": "1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "jws": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", + "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==", + "requires": { + "jwa": "^1.4.1", + "safe-buffer": "^5.0.1" + } + }, + "ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + } + } + }, + "jwa": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz", + "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==", + "optional": true, + "requires": { + "buffer-equal-constant-time": "1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "jwks-rsa": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-2.0.3.tgz", + "integrity": "sha512-/rkjXRWAp0cS00tunsHResw68P5iTQru8+jHufLNv3JHc4nObFEndfEUSuPugh09N+V9XYxKUqi7QrkmCHSSSg==", + "requires": { + "@types/express-jwt": "0.0.42", + "debug": "^4.1.0", + "jose": "^2.0.5", + "limiter": "^1.1.5", + "lru-memoizer": "^2.1.2" + }, + "dependencies": { + "debug": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", + "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "requires": { + "ms": "2.1.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + } + } + }, + "jws": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz", + "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==", + "optional": true, + "requires": { + "jwa": "^2.0.0", + "safe-buffer": "^5.0.1" + } + }, "keyv": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz", @@ -1111,6 +1920,11 @@ "package-json": "^6.3.0" } }, + "limiter": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/limiter/-/limiter-1.1.5.tgz", + "integrity": "sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA==" + }, "locate-path": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", @@ -1124,11 +1938,97 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, + "lodash.camelcase": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", + "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=", + "optional": true + }, + "lodash.clonedeep": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", + "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=" + }, + "lodash.includes": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", + "integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8=" + }, + "lodash.isboolean": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", + "integrity": "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=" + }, + "lodash.isinteger": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", + "integrity": "sha1-YZwK89A/iwTDH1iChAt3sRzWg0M=" + }, + "lodash.isnumber": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", + "integrity": "sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w=" + }, + "lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=" + }, + "lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=" + }, + "lodash.once": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", + "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=" + }, + "long": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", + "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==", + "optional": true + }, "lowercase-keys": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==" }, + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "optional": true, + "requires": { + "yallist": "^4.0.0" + } + }, + "lru-memoizer": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/lru-memoizer/-/lru-memoizer-2.1.4.tgz", + "integrity": "sha512-IXAq50s4qwrOBrXJklY+KhgZF+5y98PDaNo0gi/v2KQBFLyWr+JyFvijZXkGKjQj/h9c0OwoE+JZbwUXce76hQ==", + "requires": { + "lodash.clonedeep": "^4.5.0", + "lru-cache": "~4.0.0" + }, + "dependencies": { + "lru-cache": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz", + "integrity": "sha1-HRdnnAac2l0ECZGgnbwsDbN35V4=", + "requires": { + "pseudomap": "^1.0.1", + "yallist": "^2.0.0" + } + }, + "yallist": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" + } + } + }, "make-dir": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", @@ -1177,6 +2077,12 @@ "mime-db": "1.48.0" } }, + "mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "optional": true + }, "mimic-response": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", @@ -1205,6 +2111,17 @@ "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==" }, + "node-fetch": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", + "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==", + "optional": true + }, + "node-forge": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz", + "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==" + }, "nodemon": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.7.tgz", @@ -1260,6 +2177,12 @@ "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" }, + "object-hash": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-2.2.0.tgz", + "integrity": "sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==", + "optional": true + }, "on-finished": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", @@ -1276,6 +2199,15 @@ "wrappy": "1" } }, + "onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "optional": true, + "requires": { + "mimic-fn": "^2.1.0" + } + }, "p-cancelable": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz", @@ -1399,6 +2331,27 @@ "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=" }, + "protobufjs": { + "version": "6.11.2", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.2.tgz", + "integrity": "sha512-4BQJoPooKJl2G9j3XftkIXjoC9C0Av2NOrWmbLWT1vH32GcSUHjM0Arra6UfTsVyfMAuFzaLucXn1sadxJydAw==", + "optional": true, + "requires": { + "@protobufjs/aspromise": "^1.1.2", + "@protobufjs/base64": "^1.1.2", + "@protobufjs/codegen": "^2.0.4", + "@protobufjs/eventemitter": "^1.1.0", + "@protobufjs/fetch": "^1.1.0", + "@protobufjs/float": "^1.0.2", + "@protobufjs/inquire": "^1.1.0", + "@protobufjs/path": "^1.1.2", + "@protobufjs/pool": "^1.1.0", + "@protobufjs/utf8": "^1.1.0", + "@types/long": "^4.0.1", + "@types/node": ">=13.7.0", + "long": "^4.0.0" + } + }, "proxy-addr": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", @@ -1408,6 +2361,11 @@ "ipaddr.js": "1.9.1" } }, + "pseudomap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", + "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" + }, "pstree.remy": { "version": "1.1.8", "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", @@ -1422,6 +2380,17 @@ "once": "^1.3.1" } }, + "pumpify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-2.0.1.tgz", + "integrity": "sha512-m7KOje7jZxrmutanlkS1daj1dS6z6BgslzOXmcSEpIlCxM3VJH7lG5QLeck/6hgF6F4crFf01UtQmNsJfweTAw==", + "optional": true, + "requires": { + "duplexify": "^4.1.1", + "inherits": "^2.0.3", + "pump": "^3.0.0" + } + }, "pupa": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz", @@ -1471,6 +2440,17 @@ "strip-json-comments": "~2.0.1" } }, + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "optional": true, + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + }, "readdirp": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", @@ -1513,6 +2493,38 @@ "lowercase-keys": "^1.0.0" } }, + "retry": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", + "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=", + "optional": true + }, + "retry-request": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-4.2.1.tgz", + "integrity": "sha512-afiCoZZ7D/AR2mf+9ajr75dwGFgWmPEshv3h+oKtf9P1AsHfHvcVXumdbAEq2qNy4UXFEXsEX5HpyGj4axvoaA==", + "optional": true, + "requires": { + "debug": "^4.1.1" + }, + "dependencies": { + "debug": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", + "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "optional": true, + "requires": { + "ms": "2.1.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "optional": true + } + } + }, "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -1596,6 +2608,12 @@ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==" }, + "snakeize": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/snakeize/-/snakeize-0.1.0.tgz", + "integrity": "sha1-EMCI2LWOsHazIpu1oE4jLOEmQi0=", + "optional": true + }, "socket.io": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.1.2.tgz", @@ -1670,6 +2688,26 @@ "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" }, + "stream-events": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.5.tgz", + "integrity": "sha512-E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg==", + "optional": true, + "requires": { + "stubs": "^3.0.0" + } + }, + "stream-shift": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz", + "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==", + "optional": true + }, + "streamsearch": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz", + "integrity": "sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo=" + }, "strict-uri-encode": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", @@ -1685,6 +2723,23 @@ "strip-ansi": "^6.0.0" } }, + "string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "optional": true, + "requires": { + "safe-buffer": "~5.2.0" + }, + "dependencies": { + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "optional": true + } + } + }, "strip-ansi": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", @@ -1711,6 +2766,12 @@ "resolved": "https://registry.npmjs.org/strip-url-auth/-/strip-url-auth-1.0.1.tgz", "integrity": "sha1-IrD6OkE4WzO+PzMVUbu4N/oM164=" }, + "stubs": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz", + "integrity": "sha1-6NK6H6nJBXAwPAMLaQD31fiavls=", + "optional": true + }, "supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", @@ -1719,6 +2780,19 @@ "has-flag": "^3.0.0" } }, + "teeny-request": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-7.1.1.tgz", + "integrity": "sha512-iwY6rkW5DDGq8hE2YgNQlKbptYpY5Nn2xecjQiNjOXWbKzPGUfmeUBCSQbbr306d7Z7U2N0TPl+/SwYRfua1Dg==", + "optional": true, + "requires": { + "http-proxy-agent": "^4.0.0", + "https-proxy-agent": "^5.0.0", + "node-fetch": "^2.6.1", + "stream-events": "^1.0.5", + "uuid": "^8.0.0" + } + }, "term-size": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz", @@ -1758,6 +2832,11 @@ "escape-string-regexp": "^1.0.2" } }, + "tslib": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz", + "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==" + }, "type-fest": { "version": "0.8.1", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", @@ -1879,6 +2958,12 @@ "prepend-http": "^2.0.0" } }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", + "optional": true + }, "utils-merge": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", @@ -1894,6 +2979,21 @@ "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" }, + "websocket-driver": { + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz", + "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==", + "requires": { + "http-parser-js": ">=0.5.1", + "safe-buffer": ">=5.1.0", + "websocket-extensions": ">=0.1.1" + } + }, + "websocket-extensions": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz", + "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==" + }, "which-module": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", @@ -1971,6 +3071,12 @@ "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==" }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "optional": true + }, "yargs": { "version": "15.4.1", "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", @@ -1997,6 +3103,12 @@ "camelcase": "^5.0.0", "decamelize": "^1.2.0" } + }, + "yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "optional": true } } } diff --git a/package.json b/package.json index 8c128cf..516bd61 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "dependencies": { "ejs": "^3.1.6", "express": "^4.17.1", + "firebase-admin": "^9.10.0", "gh-pages": "^3.2.2", "nodemon": "^2.0.7", "peer": "^0.6.1", diff --git a/public/audio/recStart.mp3 b/public/audio/recStart.mp3 new file mode 100644 index 0000000..aa9599f Binary files /dev/null and b/public/audio/recStart.mp3 differ diff --git a/public/audio/recStop.mp3 b/public/audio/recStop.mp3 new file mode 100644 index 0000000..198753f Binary files /dev/null and b/public/audio/recStop.mp3 differ diff --git a/public/homepage.css b/public/homepage.css new file mode 100644 index 0000000..5dfe968 --- /dev/null +++ b/public/homepage.css @@ -0,0 +1,101 @@ +/* ---- reset ---- */ + +body { + margin: 0; + font:normal 75% Arial, Helvetica, sans-serif; + } + + canvas { + display: block; + } + + /* ---- particles.js container ---- */ + + #particles-js { + position: absolute; + width: 100%; + height: 100%; + background: #3a7bd5; /* fallback for old browsers */ + background-image: url(""); + background-repeat: no-repeat; + background-size: cover; + background-position: 50% 50%; + } + + html { + width: 100%; + height: 100%; + } + + body { + min-height: 100%; + padding: 0; + margin: 0; + background: #E0E0E0; + font-family: sans-serif; + display: flex; + justify-content: center; + align-items: center; + color: rgba(0, 0, 0, 0.87); + } + + input { + border: none; + border-bottom: 1px rgba(0, 0, 0, 0.2) solid; + transition: all 200ms; + padding-bottom: 0.2rem; + } + + input:focus { + outline: none; + border-color: #FF4081; + } + + button { + padding: 0.6rem 0.8rem; + background: #FF4081; + border: none; + border-radius: 2px; + color: #fff; + font-weight: bold; + } + + .flex-vertical { + display: flex; + flex-direction: column; + } + + .flex-vertical > * { margin: 0.2rem 0; } + + .card { + background: #fff; + display: flex; + flex-direction: column; + max-width: max-content; + border-radius: 2px; + margin: 20px; + } + + .card-headers { + font-size: 1.8rem; + color: #fff; + background: #3F51B5; + padding: 1rem; + border-radius: 2px 2px 0 0; + } + + .card-content { + padding: 1rem; + display: flex; + flex-direction: column; + min-width: 200px; + } + + .card-content > * { margin: 0.5rem 0; } + + .form-title { font-weight: bold; } + + .shadow { + box-shadow: 0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12); + } + \ No newline at end of file diff --git a/public/homepage.js b/public/homepage.js new file mode 100644 index 0000000..c09b54d --- /dev/null +++ b/public/homepage.js @@ -0,0 +1,127 @@ + + // + const profile =()=>{ + window.location.href=`${window.location.origin}/main${document.getElementById("usernameInput").value} `; + + } + const newRoom =()=>{ + window.location.href=`${window.location.origin}/teams-webrtc`; + +} +const joinRoom =()=>{ + window.location.href=`${window.location.origin}/${document.getElementById("joinroomInput").value}`; +} + +/* ---- particles.js config ---- */ + +particlesJS("particles-js", { + "particles": { + "number": { + "value": 380, + "density": { + "enable": true, + "value_area": 1500 + } + }, + "color": { + "value": "#ffffff" + }, + "shape": { + "type": "circle", + "stroke": { + "width": 0, + "color": "#000000" + }, + "polygon": { + "nb_sides": 5 + }, + "image": { + "src": "img/github.svg", + "width": 100, + "height": 100 + } + }, + "opacity": { + "value": 0.5, + "random": false, + "anim": { + "enable": false, + "speed": 1, + "opacity_min": 0.1, + "sync": false + } + }, + "size": { + "value": 3, + "random": true, + "anim": { + "enable": false, + "speed": 40, + "size_min": 0.1, + "sync": false + } + }, + "line_linked": { + "enable": true, + "distance": 150, + "color": "#ffffff", + "opacity": 0.4, + "width": 1 + }, + "move": { + "enable": true, + "speed": 6, + "direction": "none", + "random": false, + "straight": false, + "out_mode": "out", + "bounce": false, + "attract": { + "enable": false, + "rotateX": 600, + "rotateY": 1200 + } + } + }, + "interactivity": { + "detect_on": "canvas", + "events": { + "onhover": { + "enable": true, + "mode": "grab" + }, + "onclick": { + "enable": true, + "mode": "push" + }, + "resize": true + }, + "modes": { + "grab": { + "distance": 140, + "line_linked": { + "opacity": 1 + } + }, + "bubble": { + "distance": 400, + "size": 40, + "duration": 2, + "opacity": 8, + "speed": 3 + }, + "repulse": { + "distance": 300, + "duration": 0.4 + }, + "push": { + "particles_nb": 4 + }, + "remove": { + "particles_nb": 2 + } + } + }, + "retina_detect": true + }); + diff --git a/public/main.css b/public/main.css new file mode 100644 index 0000000..36babf5 --- /dev/null +++ b/public/main.css @@ -0,0 +1,290 @@ +@import url("https://fonts.googleapis.com/css2?family=Roboto&display=swap"); +* { + margin: 0; + padding: 0; + box-sizing: border-box; +} +html, +body { + height: 100%; + font-family: "Segoe UI", system-ui, "Apple Color Emoji", "Segoe UI Emoji", + sans-serif; + font-size: 14px; + line-height: 1.4286; +} + +.main { + height: 100%; + display: flex; +} +.main__left { + height:100%; + display: flex; + background-color: white; + flex-direction: column; + align-items: center; +} +.main__right { + display: flex; + flex-direction: column; + background-color: #f5f5f5; + border-left: 1px solid #3d3d42; +} + +.main__controls { + display: flex; + height:100%; + bottom: 5rem; + background-color: #252423; + color: #d2d2d2; + justify-content: space-between; +} + +.main__controls_button { + display: flex; + cursor: pointer; + justify-content: center; + align-items: center; + height: 3.2rem; + vertical-align: top; + padding: 1rem; + transition: all 0.3s ease-in-out; +} +.main__controls_button span { + margin-top: 10px; + display: block; +} +.main__controls_button:hover { + background-color: #34383b; +} +.main__controls_button i { + font-size: 25px; +} +.leaveMeeting { + background-color: red; + color: #fff; +} +.main__header { + color: #242424; + font-weight: 700; + font-size: 1.8rem; + line-height: 1.33333; + text-align: center; + padding: 20px; + border-bottom: 2px solid #3d3d42; +} +.main__chat__window { + flex-grow: 1; + overflow: auto; + padding: 20px 20px 0 20px; + background-color: #fcfcfe; + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='260' height='260' viewBox='0 0 260 260'%3E%3Cg fill-rule='evenodd'%3E%3Cg fill='%23dddddd' fill-opacity='0.4'%3E%3Cpath d='M24.37 16c.2.65.39 1.32.54 2H21.17l1.17 2.34.45.9-.24.11V28a5 5 0 0 1-2.23 8.94l-.02.06a8 8 0 0 1-7.75 6h-20a8 8 0 0 1-7.74-6l-.02-.06A5 5 0 0 1-17.45 28v-6.76l-.79-1.58-.44-.9.9-.44.63-.32H-20a23.01 23.01 0 0 1 44.37-2zm-36.82 2a1 1 0 0 0-.44.1l-3.1 1.56.89 1.79 1.31-.66a3 3 0 0 1 2.69 0l2.2 1.1a1 1 0 0 0 .9 0l2.21-1.1a3 3 0 0 1 2.69 0l2.2 1.1a1 1 0 0 0 .9 0l2.21-1.1a3 3 0 0 1 2.69 0l2.2 1.1a1 1 0 0 0 .86.02l2.88-1.27a3 3 0 0 1 2.43 0l2.88 1.27a1 1 0 0 0 .85-.02l3.1-1.55-.89-1.79-1.42.71a3 3 0 0 1-2.56.06l-2.77-1.23a1 1 0 0 0-.4-.09h-.01a1 1 0 0 0-.4.09l-2.78 1.23a3 3 0 0 1-2.56-.06l-2.3-1.15a1 1 0 0 0-.45-.11h-.01a1 1 0 0 0-.44.1L.9 19.22a3 3 0 0 1-2.69 0l-2.2-1.1a1 1 0 0 0-.45-.11h-.01a1 1 0 0 0-.44.1l-2.21 1.11a3 3 0 0 1-2.69 0l-2.2-1.1a1 1 0 0 0-.45-.11h-.01zm0-2h-4.9a21.01 21.01 0 0 1 39.61 0h-2.09l-.06-.13-.26.13h-32.31zm30.35 7.68l1.36-.68h1.3v2h-36v-1.15l.34-.17 1.36-.68h2.59l1.36.68a3 3 0 0 0 2.69 0l1.36-.68h2.59l1.36.68a3 3 0 0 0 2.69 0L2.26 23h2.59l1.36.68a3 3 0 0 0 2.56.06l1.67-.74h3.23l1.67.74a3 3 0 0 0 2.56-.06zM-13.82 27l16.37 4.91L18.93 27h-32.75zm-.63 2h.34l16.66 5 16.67-5h.33a3 3 0 1 1 0 6h-34a3 3 0 1 1 0-6zm1.35 8a6 6 0 0 0 5.65 4h20a6 6 0 0 0 5.66-4H-13.1z'/%3E%3Cpath id='path6_fill-copy' d='M284.37 16c.2.65.39 1.32.54 2H281.17l1.17 2.34.45.9-.24.11V28a5 5 0 0 1-2.23 8.94l-.02.06a8 8 0 0 1-7.75 6h-20a8 8 0 0 1-7.74-6l-.02-.06a5 5 0 0 1-2.24-8.94v-6.76l-.79-1.58-.44-.9.9-.44.63-.32H240a23.01 23.01 0 0 1 44.37-2zm-36.82 2a1 1 0 0 0-.44.1l-3.1 1.56.89 1.79 1.31-.66a3 3 0 0 1 2.69 0l2.2 1.1a1 1 0 0 0 .9 0l2.21-1.1a3 3 0 0 1 2.69 0l2.2 1.1a1 1 0 0 0 .9 0l2.21-1.1a3 3 0 0 1 2.69 0l2.2 1.1a1 1 0 0 0 .86.02l2.88-1.27a3 3 0 0 1 2.43 0l2.88 1.27a1 1 0 0 0 .85-.02l3.1-1.55-.89-1.79-1.42.71a3 3 0 0 1-2.56.06l-2.77-1.23a1 1 0 0 0-.4-.09h-.01a1 1 0 0 0-.4.09l-2.78 1.23a3 3 0 0 1-2.56-.06l-2.3-1.15a1 1 0 0 0-.45-.11h-.01a1 1 0 0 0-.44.1l-2.21 1.11a3 3 0 0 1-2.69 0l-2.2-1.1a1 1 0 0 0-.45-.11h-.01a1 1 0 0 0-.44.1l-2.21 1.11a3 3 0 0 1-2.69 0l-2.2-1.1a1 1 0 0 0-.45-.11h-.01zm0-2h-4.9a21.01 21.01 0 0 1 39.61 0h-2.09l-.06-.13-.26.13h-32.31zm30.35 7.68l1.36-.68h1.3v2h-36v-1.15l.34-.17 1.36-.68h2.59l1.36.68a3 3 0 0 0 2.69 0l1.36-.68h2.59l1.36.68a3 3 0 0 0 2.69 0l1.36-.68h2.59l1.36.68a3 3 0 0 0 2.56.06l1.67-.74h3.23l1.67.74a3 3 0 0 0 2.56-.06zM246.18 27l16.37 4.91L278.93 27h-32.75zm-.63 2h.34l16.66 5 16.67-5h.33a3 3 0 1 1 0 6h-34a3 3 0 1 1 0-6zm1.35 8a6 6 0 0 0 5.65 4h20a6 6 0 0 0 5.66-4H246.9z'/%3E%3Cpath d='M159.5 21.02A9 9 0 0 0 151 15h-42a9 9 0 0 0-8.5 6.02 6 6 0 0 0 .02 11.96A8.99 8.99 0 0 0 109 45h42a9 9 0 0 0 8.48-12.02 6 6 0 0 0 .02-11.96zM151 17h-42a7 7 0 0 0-6.33 4h54.66a7 7 0 0 0-6.33-4zm-9.34 26a8.98 8.98 0 0 0 3.34-7h-2a7 7 0 0 1-7 7h-4.34a8.98 8.98 0 0 0 3.34-7h-2a7 7 0 0 1-7 7h-4.34a8.98 8.98 0 0 0 3.34-7h-2a7 7 0 0 1-7 7h-7a7 7 0 1 1 0-14h42a7 7 0 1 1 0 14h-9.34zM109 27a9 9 0 0 0-7.48 4H101a4 4 0 1 1 0-8h58a4 4 0 0 1 0 8h-.52a9 9 0 0 0-7.48-4h-42z'/%3E%3Cpath d='M39 115a8 8 0 1 0 0-16 8 8 0 0 0 0 16zm6-8a6 6 0 1 1-12 0 6 6 0 0 1 12 0zm-3-29v-2h8v-6H40a4 4 0 0 0-4 4v10H22l-1.33 4-.67 2h2.19L26 130h26l3.81-40H58l-.67-2L56 84H42v-6zm-4-4v10h2V74h8v-2h-8a2 2 0 0 0-2 2zm2 12h14.56l.67 2H22.77l.67-2H40zm13.8 4H24.2l3.62 38h22.36l3.62-38z'/%3E%3Cpath d='M129 92h-6v4h-6v4h-6v14h-3l.24 2 3.76 32h36l3.76-32 .24-2h-3v-14h-6v-4h-6v-4h-8zm18 22v-12h-4v4h3v8h1zm-3 0v-6h-4v6h4zm-6 6v-16h-4v19.17c1.6-.7 2.97-1.8 4-3.17zm-6 3.8V100h-4v23.8a10.04 10.04 0 0 0 4 0zm-6-.63V104h-4v16a10.04 10.04 0 0 0 4 3.17zm-6-9.17v-6h-4v6h4zm-6 0v-8h3v-4h-4v12h1zm27-12v-4h-4v4h3v4h1v-4zm-6 0v-8h-4v4h3v4h1zm-6-4v-4h-4v8h1v-4h3zm-6 4v-4h-4v8h1v-4h3zm7 24a12 12 0 0 0 11.83-10h7.92l-3.53 30h-32.44l-3.53-30h7.92A12 12 0 0 0 130 126z'/%3E%3Cpath d='M212 86v2h-4v-2h4zm4 0h-2v2h2v-2zm-20 0v.1a5 5 0 0 0-.56 9.65l.06.25 1.12 4.48a2 2 0 0 0 1.94 1.52h.01l7.02 24.55a2 2 0 0 0 1.92 1.45h4.98a2 2 0 0 0 1.92-1.45l7.02-24.55a2 2 0 0 0 1.95-1.52L224.5 96l.06-.25a5 5 0 0 0-.56-9.65V86a14 14 0 0 0-28 0zm4 0h6v2h-9a3 3 0 1 0 0 6H223a3 3 0 1 0 0-6H220v-2h2a12 12 0 1 0-24 0h2zm-1.44 14l-1-4h24.88l-1 4h-22.88zm8.95 26l-6.86-24h18.7l-6.86 24h-4.98zM150 242a22 22 0 1 0 0-44 22 22 0 0 0 0 44zm24-22a24 24 0 1 1-48 0 24 24 0 0 1 48 0zm-28.38 17.73l2.04-.87a6 6 0 0 1 4.68 0l2.04.87a2 2 0 0 0 2.5-.82l1.14-1.9a6 6 0 0 1 3.79-2.75l2.15-.5a2 2 0 0 0 1.54-2.12l-.19-2.2a6 6 0 0 1 1.45-4.46l1.45-1.67a2 2 0 0 0 0-2.62l-1.45-1.67a6 6 0 0 1-1.45-4.46l.2-2.2a2 2 0 0 0-1.55-2.13l-2.15-.5a6 6 0 0 1-3.8-2.75l-1.13-1.9a2 2 0 0 0-2.5-.8l-2.04.86a6 6 0 0 1-4.68 0l-2.04-.87a2 2 0 0 0-2.5.82l-1.14 1.9a6 6 0 0 1-3.79 2.75l-2.15.5a2 2 0 0 0-1.54 2.12l.19 2.2a6 6 0 0 1-1.45 4.46l-1.45 1.67a2 2 0 0 0 0 2.62l1.45 1.67a6 6 0 0 1 1.45 4.46l-.2 2.2a2 2 0 0 0 1.55 2.13l2.15.5a6 6 0 0 1 3.8 2.75l1.13 1.9a2 2 0 0 0 2.5.8zm2.82.97a4 4 0 0 1 3.12 0l2.04.87a4 4 0 0 0 4.99-1.62l1.14-1.9a4 4 0 0 1 2.53-1.84l2.15-.5a4 4 0 0 0 3.09-4.24l-.2-2.2a4 4 0 0 1 .97-2.98l1.45-1.67a4 4 0 0 0 0-5.24l-1.45-1.67a4 4 0 0 1-.97-2.97l.2-2.2a4 4 0 0 0-3.09-4.25l-2.15-.5a4 4 0 0 1-2.53-1.84l-1.14-1.9a4 4 0 0 0-5-1.62l-2.03.87a4 4 0 0 1-3.12 0l-2.04-.87a4 4 0 0 0-4.99 1.62l-1.14 1.9a4 4 0 0 1-2.53 1.84l-2.15.5a4 4 0 0 0-3.09 4.24l.2 2.2a4 4 0 0 1-.97 2.98l-1.45 1.67a4 4 0 0 0 0 5.24l1.45 1.67a4 4 0 0 1 .97 2.97l-.2 2.2a4 4 0 0 0 3.09 4.25l2.15.5a4 4 0 0 1 2.53 1.84l1.14 1.9a4 4 0 0 0 5 1.62l2.03-.87zM152 207a1 1 0 1 1 2 0 1 1 0 0 1-2 0zm6 2a1 1 0 1 1 2 0 1 1 0 0 1-2 0zm-11 1a1 1 0 1 1 2 0 1 1 0 0 1-2 0zm-6 0a1 1 0 1 1 2 0 1 1 0 0 1-2 0zm3-5a1 1 0 1 1 2 0 1 1 0 0 1-2 0zm-8 8a1 1 0 1 1 2 0 1 1 0 0 1-2 0zm3 6a1 1 0 1 1 2 0 1 1 0 0 1-2 0zm0 6a1 1 0 1 1 2 0 1 1 0 0 1-2 0zm4 7a1 1 0 1 1 2 0 1 1 0 0 1-2 0zm5-2a1 1 0 1 1 2 0 1 1 0 0 1-2 0zm5 4a1 1 0 1 1 2 0 1 1 0 0 1-2 0zm4-6a1 1 0 1 1 2 0 1 1 0 0 1-2 0zm6-4a1 1 0 1 1 2 0 1 1 0 0 1-2 0zm-4-3a1 1 0 1 1 2 0 1 1 0 0 1-2 0zm4-3a1 1 0 1 1 2 0 1 1 0 0 1-2 0zm-5-4a1 1 0 1 1 2 0 1 1 0 0 1-2 0zm-24 6a1 1 0 1 1 2 0 1 1 0 0 1-2 0zm16 5a5 5 0 1 0 0-10 5 5 0 0 0 0 10zm7-5a7 7 0 1 1-14 0 7 7 0 0 1 14 0zm86-29a1 1 0 0 0 0 2h2a1 1 0 0 0 0-2h-2zm19 9a1 1 0 0 1 1-1h2a1 1 0 0 1 0 2h-2a1 1 0 0 1-1-1zm-14 5a1 1 0 0 0 0 2h2a1 1 0 0 0 0-2h-2zm-25 1a1 1 0 0 0 0 2h2a1 1 0 0 0 0-2h-2zm5 4a1 1 0 0 0 0 2h2a1 1 0 0 0 0-2h-2zm9 0a1 1 0 0 1 1-1h2a1 1 0 0 1 0 2h-2a1 1 0 0 1-1-1zm15 1a1 1 0 0 1 1-1h2a1 1 0 0 1 0 2h-2a1 1 0 0 1-1-1zm12-2a1 1 0 0 0 0 2h2a1 1 0 0 0 0-2h-2zm-11-14a1 1 0 0 1 1-1h2a1 1 0 0 1 0 2h-2a1 1 0 0 1-1-1zm-19 0a1 1 0 0 0 0 2h2a1 1 0 0 0 0-2h-2zm6 5a1 1 0 0 1 1-1h2a1 1 0 0 1 0 2h-2a1 1 0 0 1-1-1zm-25 15c0-.47.01-.94.03-1.4a5 5 0 0 1-1.7-8 3.99 3.99 0 0 1 1.88-5.18 5 5 0 0 1 3.4-6.22 3 3 0 0 1 1.46-1.05 5 5 0 0 1 7.76-3.27A30.86 30.86 0 0 1 246 184c6.79 0 13.06 2.18 18.17 5.88a5 5 0 0 1 7.76 3.27 3 3 0 0 1 1.47 1.05 5 5 0 0 1 3.4 6.22 4 4 0 0 1 1.87 5.18 4.98 4.98 0 0 1-1.7 8c.02.46.03.93.03 1.4v1h-62v-1zm.83-7.17a30.9 30.9 0 0 0-.62 3.57 3 3 0 0 1-.61-4.2c.37.28.78.49 1.23.63zm1.49-4.61c-.36.87-.68 1.76-.96 2.68a2 2 0 0 1-.21-3.71c.33.4.73.75 1.17 1.03zm2.32-4.54c-.54.86-1.03 1.76-1.49 2.68a3 3 0 0 1-.07-4.67 3 3 0 0 0 1.56 1.99zm1.14-1.7c.35-.5.72-.98 1.1-1.46a1 1 0 1 0-1.1 1.45zm5.34-5.77c-1.03.86-2 1.79-2.9 2.77a3 3 0 0 0-1.11-.77 3 3 0 0 1 4-2zm42.66 2.77c-.9-.98-1.87-1.9-2.9-2.77a3 3 0 0 1 4.01 2 3 3 0 0 0-1.1.77zm1.34 1.54c.38.48.75.96 1.1 1.45a1 1 0 1 0-1.1-1.45zm3.73 5.84c-.46-.92-.95-1.82-1.5-2.68a3 3 0 0 0 1.57-1.99 3 3 0 0 1-.07 4.67zm1.8 4.53c-.29-.9-.6-1.8-.97-2.67.44-.28.84-.63 1.17-1.03a2 2 0 0 1-.2 3.7zm1.14 5.51c-.14-1.21-.35-2.4-.62-3.57.45-.14.86-.35 1.23-.63a2.99 2.99 0 0 1-.6 4.2zM275 214a29 29 0 0 0-57.97 0h57.96zM72.33 198.12c-.21-.32-.34-.7-.34-1.12v-12h-2v12a4.01 4.01 0 0 0 7.09 2.54c.57-.69.91-1.57.91-2.54v-12h-2v12a1.99 1.99 0 0 1-2 2 2 2 0 0 1-1.66-.88zM75 176c.38 0 .74-.04 1.1-.12a4 4 0 0 0 6.19 2.4A13.94 13.94 0 0 1 84 185v24a6 6 0 0 1-6 6h-3v9a5 5 0 1 1-10 0v-9h-3a6 6 0 0 1-6-6v-24a14 14 0 0 1 14-14 5 5 0 0 0 5 5zm-17 15v12a1.99 1.99 0 0 0 1.22 1.84 2 2 0 0 0 2.44-.72c.21-.32.34-.7.34-1.12v-12h2v12a3.98 3.98 0 0 1-5.35 3.77 3.98 3.98 0 0 1-.65-.3V209a4 4 0 0 0 4 4h16a4 4 0 0 0 4-4v-24c.01-1.53-.23-2.88-.72-4.17-.43.1-.87.16-1.28.17a6 6 0 0 1-5.2-3 7 7 0 0 1-6.47-4.88A12 12 0 0 0 58 185v6zm9 24v9a3 3 0 1 0 6 0v-9h-6z'/%3E%3Cpath d='M-17 191a1 1 0 0 0 0 2h2a1 1 0 0 0 0-2h-2zm19 9a1 1 0 0 1 1-1h2a1 1 0 0 1 0 2H3a1 1 0 0 1-1-1zm-14 5a1 1 0 0 0 0 2h2a1 1 0 0 0 0-2h-2zm-25 1a1 1 0 0 0 0 2h2a1 1 0 0 0 0-2h-2zm5 4a1 1 0 0 0 0 2h2a1 1 0 0 0 0-2h-2zm9 0a1 1 0 0 1 1-1h2a1 1 0 0 1 0 2h-2a1 1 0 0 1-1-1zm15 1a1 1 0 0 1 1-1h2a1 1 0 0 1 0 2h-2a1 1 0 0 1-1-1zm12-2a1 1 0 0 0 0 2h2a1 1 0 0 0 0-2H4zm-11-14a1 1 0 0 1 1-1h2a1 1 0 0 1 0 2h-2a1 1 0 0 1-1-1zm-19 0a1 1 0 0 0 0 2h2a1 1 0 0 0 0-2h-2zm6 5a1 1 0 0 1 1-1h2a1 1 0 0 1 0 2h-2a1 1 0 0 1-1-1zm-25 15c0-.47.01-.94.03-1.4a5 5 0 0 1-1.7-8 3.99 3.99 0 0 1 1.88-5.18 5 5 0 0 1 3.4-6.22 3 3 0 0 1 1.46-1.05 5 5 0 0 1 7.76-3.27A30.86 30.86 0 0 1-14 184c6.79 0 13.06 2.18 18.17 5.88a5 5 0 0 1 7.76 3.27 3 3 0 0 1 1.47 1.05 5 5 0 0 1 3.4 6.22 4 4 0 0 1 1.87 5.18 4.98 4.98 0 0 1-1.7 8c.02.46.03.93.03 1.4v1h-62v-1zm.83-7.17a30.9 30.9 0 0 0-.62 3.57 3 3 0 0 1-.61-4.2c.37.28.78.49 1.23.63zm1.49-4.61c-.36.87-.68 1.76-.96 2.68a2 2 0 0 1-.21-3.71c.33.4.73.75 1.17 1.03zm2.32-4.54c-.54.86-1.03 1.76-1.49 2.68a3 3 0 0 1-.07-4.67 3 3 0 0 0 1.56 1.99zm1.14-1.7c.35-.5.72-.98 1.1-1.46a1 1 0 1 0-1.1 1.45zm5.34-5.77c-1.03.86-2 1.79-2.9 2.77a3 3 0 0 0-1.11-.77 3 3 0 0 1 4-2zm42.66 2.77c-.9-.98-1.87-1.9-2.9-2.77a3 3 0 0 1 4.01 2 3 3 0 0 0-1.1.77zm1.34 1.54c.38.48.75.96 1.1 1.45a1 1 0 1 0-1.1-1.45zm3.73 5.84c-.46-.92-.95-1.82-1.5-2.68a3 3 0 0 0 1.57-1.99 3 3 0 0 1-.07 4.67zm1.8 4.53c-.29-.9-.6-1.8-.97-2.67.44-.28.84-.63 1.17-1.03a2 2 0 0 1-.2 3.7zm1.14 5.51c-.14-1.21-.35-2.4-.62-3.57.45-.14.86-.35 1.23-.63a2.99 2.99 0 0 1-.6 4.2zM15 214a29 29 0 0 0-57.97 0h57.96z'/%3E%3C/g%3E%3C/g%3E%3C/svg%3E"); + +} +.main__message_container { + padding: 22px 11px; + display: flex; + background: #fff; +} +.main__message_container input { + flex-grow: 1; + background-color: transparent; + border: none; + color: #252423; + user-select: none; + outline: none; +} +input#chat_message { + background: #f4f5f7; +} + + +.unmute { + color: red; +} + + +/* messenger */ +:root { + --body-bg: linear-gradient(135deg, #f5f7fa 0%, #c3cfe2 100%); + --msger-bg: #fff; + --border: 2px solid #ddd; + --left-msg-bg: #ececec; + --right-msg-bg: #579ffb; + /* whiteboard resize */ + --wb-width: 800px; + --wb-height: 600px; +} + +.msger { + height:100%; + width:70%; + display: flex; + justify-content: space-between; + border: var(--border); + background: var(--msger-bg); +} + +.msger-header { + display: flex; + justify-content: space-between; + padding: 10px; + border-bottom: var(--border); + background: #eee; + color: #666; +} +.chat_list{ + min-width:30%; + background-color:#f8f9fa; + +} + +.msger-chat { + flex: 1; + overflow-y: auto; + padding: 10px; +} +.msger-chat::-webkit-scrollbar { + width: 6px; +} +.msger-chat::-webkit-scrollbar-track { + background: #ddd; +} +.msger-chat::-webkit-scrollbar-thumb { + background: #bdbdbd; +} +.msg { + display: flex; + align-items: flex-end; + margin-bottom: 10px; +} +.msg:last-of-type { + margin: 0; +} +.msg-img { + width: 50px; + height: 50px; + margin-right: 10px; + background: #ddd; + background-repeat: no-repeat; + background-position: center; + background-size: cover; + border-radius: 50%; +} +.msg-bubble { + padding: 15px; + border-radius: 15px; + background: var(--left-msg-bg); +} +.msg-info { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 10px; +} +.msg-info-name { + margin-right: 10px; + font-weight: bold; +} +.msg-info-time { + font-size: 0.85em; +} + +.left-msg .msg-bubble { + border-bottom-left-radius: 0; + word-break: break-all; +} + +.right-msg { + flex-direction: row-reverse; +} +.right-msg .msg-bubble { + background: var(--right-msg-bg); + color: #fff; + border-bottom-right-radius: 0; + word-break: break-all; +} +.right-msg .msg-img { + margin: 0 0 0 10px; +} + + +.msger-input { + flex: 1; + background: #ddd; +} + + +/* chat bar code */ + + +#wrapper { + height:100%; + padding-right: 0; + -webkit-transition: all 0.5s ease; + -moz-transition: all 0.5s ease; + -o-transition: all 0.5s ease; + transition: all 0.5s ease; +} + +#wrapper.toggled { + padding-right: 250px; +} + +#participants-wrapper { + z-index: 1000; + display: none; + position: fixed; + right: 0px; + height: 100%; + overflow-y: auto; + -webkit-transition: all 0.5s ease; + -moz-transition: all 0.5s ease; + -o-transition: all 0.5s ease; + transition: all 0.5s ease; + background-color: white; + border: var(--border); + +} +#page-content-wrapper { + width: 100%; + position: absolute; + +} + +#wrapper.toggled #page-content-wrapper { + position: absolute; + margin-left: -350px; +} + + + #wrapper { + padding-right: 0; + } + #wrapper.toggled { + padding-right: 350px; + } + + #page-content-wrapper { + position: relative; + } + #wrapper.toggled #page-content-wrapper { + position: relative; + margin-left: 0; + } + + #participants-wrapper { + width: 0; + } + #wrapper.toggled #participants-wrapper { + min-width: 350px; + } + + .participants-main + { padding :20px; + display: flex; + flex-direction: column + } + .white{ +color:white; + } \ No newline at end of file diff --git a/public/main.js b/public/main.js index fcc793c..76ec6a7 100644 --- a/public/main.js +++ b/public/main.js @@ -4,8 +4,13 @@ const all_messages = document.getElementById('all_messages'); const main__chat__window = document.getElementById('main__chat__window'); const photoFilter = document.getElementById('photo-filter'); const msg_send_btn = document.getElementById('msg_send_btn'); - +const members = document.getElementById("participants_list"); +const reportGenerate = document.getElementById('generate_report'); +const userRooms = document.getElementsByClassName("chat_list")[0]; emojiPicker =document.getElementsByTagName("emoji-picker")[0]; +// join meeting +const join_meet = document.getElementById("join-meet"); + const state = "out-meet"; const peers = {} let myName; @@ -17,6 +22,7 @@ const msgerChat = get(".msger-chat"); //firebase references var messagesRef =firebase.database().ref(ROOM_ID).child("messages") +var meetParticipantsRef =firebase.database().ref(ROOM_ID).child("meetParticipants") // Icons made by Freepik from www.flaticon.com const PERSON_IMG = "https://image.flaticon.com/icons/svg/145/145867.svg"; @@ -173,7 +179,133 @@ function random(min, max) { return Math.floor(Math.random() * (max - min) + min); } -// messenger code ends +// all meeting participants code ends +meetParticipantsRef.on('value', (snapshot) => { + var inpart =""; + snapshot.forEach( (element )=>{ + if(!document.getElementById(`${element.key}member`)) + { inpart =`
${element.key}
` + members.insertAdjacentHTML("beforeend",inpart); + } + }) +}); +let counter=0; +// all meeting participants code ends +var userRoomsRef =firebase.database().ref("users") +userRoomsRef.on('value', (snapshot) => { + var inpart =""; + // if(snapshot.key === myName) + snapshot.forEach((snap)=>{ + if(snap.key===myName) + { + snap.child("rooms").forEach( (element )=>{ + if(!document.getElementById(`${element.key}room`)) + { counter++; + console.log(element.key); + inpart =`
Meeting ${counter}
${element.key}
` + userRooms.insertAdjacentHTML("beforeend",inpart); + } + }) + } + }) + +}); + +join_meet.addEventListener('click',(event)=>{ + event.preventDefault(); + if((ROOM_ID+"").toLowerCase!=myName.toLowerCase) + window.open(`${window.location.origin}/${ROOM_ID}`); + else{ + window.open(`${window.location.origin}/teams-webrtc`); + } +}) + +var dataJSON; +var jsonDL; + + + +reportGenerate.addEventListener('click', ()=>{ +// all meeting participants code ends +var recordHTML = start_template; +meetParticipantsRef.on('value', (snapshot) => { + var inpart =""; + snapshot.forEach((element)=>{ + recordHTML = recordHTML + `
+
+

+

+
+
+
+ + +`; + + var record = []; + element.forEach((el)=>{ + element.forEach((x)=>{ + + recordHTML = recordHTML + ` + + + ` + + }) + }) + recordHTML = recordHTML + `
Arrived at Departed at
${new Date(x.val().arrival_time).toLocaleString()}${ new Date(x.val().disconnected_time).toLocaleString()}
+
+
+ ` + + }) + +}); +recordHTML = recordHTML + ` + + + + + +`; +download( `${ROOM_ID}_${new Date().toLocaleString()}.html`,recordHTML); + +}) + + + + + + + +function download(filename, text) { + var element = document.createElement('a'); + element.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(text)); + element.setAttribute('download', filename); + + element.style.display = 'none'; + document.body.appendChild(element); + + element.click(); + + document.body.removeChild(element); +} +// boilerplates for download template + +var start_template = ` + + + + + + Meeting Record + + + +
+
List of partcipants
+ ` diff --git a/public/script.js b/public/script.js index f7ae21c..f3d66ad 100644 --- a/public/script.js +++ b/public/script.js @@ -4,18 +4,26 @@ const all_messages = document.getElementById('all_messages'); const main__chat__window = document.getElementById('main__chat__window'); const videoGrid = document.getElementById('video-grid'); const myVideo = document.createElement('video'); +const ScreenVideo = document.createElement("video"); const photoFilter = document.getElementById('photo-filter'); const msg_send_btn = document.getElementById('msg_send_btn'); const wave_btn = document.getElementById('wave_btn'); const end_btn = document.getElementById('leave-meeting') emojiPicker =document.getElementsByTagName("emoji-picker")[0]; +const participants = document.getElementById("participants_list"); +const recordStreamBtn = document.getElementById("recordStreamBtn"); + let filter = 'none'; myVideo.muted = true; -const peers = {} +var roomMates = new Set(); const state = "in-meet"; let myName; +let myScreenStream; + // sounds const wave_audio = new Audio('audio/wave.mp3'); +const screen_record_start = new Audio('audio/recStart.mp3'); +const screen_record_stop = new Audio('audio/recStop.mp3'); // messenger let messageStatus = 0; @@ -26,6 +34,7 @@ const msgerChat = get(".msger-chat"); //firebase references var messagesRef =firebase.database().ref(ROOM_ID).child("messages") +var currentParticipantsRef =firebase.database().ref(ROOM_ID).child("currentParticipants") // Icons made by Freepik from www.flaticon.com const PERSON_IMG = "https://image.flaticon.com/icons/svg/145/145867.svg"; @@ -54,11 +63,19 @@ navigator.mediaDevices .then((stream) => { myVideoStream = stream; myVideo.setAttribute("id", myId+"video"); + setVideoReversed(myVideo); addVideoStream(myVideo, stream); - peer.on('call', (call) => { call.answer(stream); const video = document.createElement('video'); + if(call.metadata){ + video.setAttribute("id", call.peer + 's'); + } + else { + video.setAttribute("id", call.peer+"video"); + setVideoReversed(video); + } + video.setAttribute("controls", "controls"); call.on('stream', (userVideoStream) => { addVideoStream(video, userVideoStream); @@ -68,7 +85,11 @@ navigator.mediaDevices //user connected socket.on('user-connected', (userId , state) => { - if(state === "in-meet") connectToNewUser(userId, stream); + if(state === "in-meet") { + connectToNewUser(userId, stream); + roomMates.add(userId); + console.log(roomMates); + } else (console.log(userId+"connected without meet")); }); @@ -103,8 +124,6 @@ navigator.mediaDevices //emoji picker emojiPicker.addEventListener("emoji-click", (e) => { - //console.log(e.detail); - //console.log(e.detail.emoji.unicode); messageInput.value += e.detail.emoji.unicode; }); @@ -122,10 +141,17 @@ peer.on('call', (call)=> { { video: true, audio: true }, (stream) => { call.answer(stream); // Answer the call with an A/V stream. const video = document.createElement('video'); - video.setAttribute("id", call.peer+"video"); - call.on('stream', (remoteStream)=> { + + if(call.metadata){ + video.setAttribute("id", call.peer + 's'); + } + else { + video.setAttribute("id", call.peer+"video"); + } + video.setAttribute("controls", "controls"); + call.on('stream', (remoteStream)=> { addVideoStream(video, remoteStream); - peers[call.peer]=call; + roomMates.add(call.peer); }); }, (err)=> { console.log('Failed to get local stream', err); @@ -189,13 +215,18 @@ function appendBeforeMessage(name, img, side, text, date) { const connectToNewUser = (userId, streams) => { var call = peer.call(userId, streams); var video = document.createElement('video'); - video.setAttribute("id", userId+"video"); - + video.setAttribute("controls", "controls"); + + if(call.metadata){ + video.setAttribute("id", userId + 's'); + } + else { + video.setAttribute("id", userId+"video"); + } call.on('stream', (userVideoStream) => { addVideoStream(video, userVideoStream); }); - peers[userId] = call }; const addVideoStream = (videoEl, stream) => { @@ -207,8 +238,8 @@ const addVideoStream = (videoEl, stream) => { let totalUsers = document.getElementsByTagName('video').length; if (totalUsers > 1) { for (let index = 0; index < totalUsers; index++) { - document.getElementsByTagName('video')[index].style.width = - 100 / totalUsers + '%'; + document.getElementsByTagName('video')[index].style.width = (window.innerWidth*0.8 / Math.sqrt(totalUsers))+"px" ; + document.getElementsByTagName('video')[index].style.height = (window.innerHeight*0.8 /Math.sqrt(totalUsers)) +"px" ; } } }; @@ -261,31 +292,53 @@ const setMuteButton = () => { }; const shareScreen =()=> { - navigator.mediaDevices.getDisplayMedia({ - video: { - cursor: 'always' - }, - audio: { - echoCancellation: true, - noiseSuppression: true - } - }).then(stream => { - const screenTrack = stream; - const myScreen = document.createElement('video'); - addVideoStream(myScreen, screenTrack ); + if(!myScreenStream){ + console.log('ajdfbjshdfbhjdsfbjhsfd'); + + navigator.mediaDevices.getDisplayMedia().then(stream => { + myScreenStream = stream; + ScreenVideo.setAttribute("controls", "controls"); + ScreenVideo.setAttribute("id", myId+ 's'); + addVideoStream(ScreenVideo, stream); + ScreenVideo.setAttribute("style", "display:normal"); + roomMates.forEach(users => { + peer.call(users, stream, { + metadata: { "type": "shareScreen" } + }); + }); + myScreenStream.getVideoTracks()[0].addEventListener('ended', () => + { socket.emit("screen-closed",myId+'s'); // isScreenshot should be added s + myScreenStream.getVideoTracks()[0].enabled = false; + ScreenVideo.setAttribute("style", "display:none"); + myScreenStream = undefined; + } +); + }) + } - screenTrack.onended = ()=> { - stopScreenShare(); - } - }, (err)=> { - console.log('Failed to get screen sharing', err); + else { + myScreenStream.getVideoTracks()[0].enabled = false; + ScreenVideo.setAttribute("style", "display:none"); + myScreenStream = undefined; + socket.emit("screen-closed",myId+'s'); // isScreenshot should be added s } - ) } -const stopScreenShare=()=>{ -} +// remove screen emission +socket.on('remove-screen',(screenId)=>{ + if(screenId && document.getElementById(screenId)) + document.getElementById(screenId).remove(); + let totalUsers = document.getElementsByTagName('video').length; + if (totalUsers > 1) { + for (let index = 0; index < totalUsers; index++) { + document.getElementsByTagName('video')[index].style.width = (window.innerWidth*0.8 / Math.sqrt(totalUsers))+"px" ; + document.getElementsByTagName('video')[index].style.height = (window.innerHeight*0.8 /Math.sqrt(totalUsers)) +"px" ; + } + } +}) + + //hand-wave wave_btn.addEventListener('click' , (e)=>{ @@ -297,12 +350,17 @@ wave_btn.addEventListener('click' , (e)=>{ else{ e.target.style.color = null; } - socket.emit('waved' , myId); + socket.emit('waved' , myName); }) -socket.on('toggleWave' , (userId)=>{ +socket.on('toggleWave' , (userName)=>{ wave_audio.play(); - console.log(userId+ " waved"); + console.log(userName); + if(userName &&document.getElementById(userName+"wave")&& (document.getElementById(userName+"wave").style.color===""||document.getElementById(userName+"wave").style.color==="white")) + document.getElementById(userName+"wave").style.color="black"; + else if(userName && document.getElementById(userName+"wave") && document.getElementById(userName+"wave").style.color==="black") + document.getElementById(userName+"wave").style.color="white"; + }) //photo filters photoFilter.addEventListener('change', (e)=> { @@ -310,9 +368,13 @@ photoFilter.addEventListener('change', (e)=> { filter = e.target.value; // Set filter to video myVideo.style.filter = filter; + socket.emit('change-filter', myId+"video",filter); e.preventDefault(); }); +socket.on('change-filter',(videoId,filter)=>{ + document.getElementById(videoId).style.filter = filter; +}) // messenger code starts @@ -356,12 +418,201 @@ function random(min, max) { // messenger code ends end_btn.addEventListener('click' , (e)=>{ - window.location.href = '../' + window.location.href=(`${window.location.origin}/main${ROOM_ID}`); }) + + //disconnected user -socket.on("user-disconnected", (userId)=>{ -if(document.getElementById(userId+"video"))document.getElementById(userId+"video").remove(); +socket.on("user-disconnected", (userId ,userName)=>{ +if(userId && document.getElementById(userId+"video")) +document.getElementById(userId+"video").remove(); // if (peers[userId]) peers[userId].close() + if(userName && document.getElementById(userName+"participant")) + document.getElementById(userName+"participant").remove(); +}); + +// to reverse video for lateral inversion +const setVideoReversed =(element)=> { + element.setAttribute("style", "transform: rotateY(180deg); -webkit-transform: rotateY(180deg); -moz-transform: rotateY(180deg);"); +} + + +//currentsparticpants + +currentParticipantsRef.on('value', (snapshot) => { + var inpart =""; + snapshot.forEach( (element )=>{ + if(!document.getElementById(`${element.key}participant`)) + { inpart =`
${element.key}
` + console.log(element.key); + participants.insertAdjacentHTML("beforeend",inpart); + } + }) }); + + +/** + * Start - Stop Stream recording + */ +let isStreamRecording = false; +desktopStream = myVideoStream; + recordStreamBtn.addEventListener("click", (e) => { + + if (isStreamRecording) { + screen_record_stop.play(); + stopStreamRecording(); + } else { + screen_record_stop.play(); + startStreamRecording(); + } + }); + +function startStreamRecording() { + recordedBlobs = []; + let options = { mimeType: "video/webm;codecs=vp9,opus" }; + if (!MediaRecorder.isTypeSupported(options.mimeType)) { + console.error(`${options.mimeType} is not supported`); + options = { mimeType: "video/webm;codecs=vp8,opus" }; + if (!MediaRecorder.isTypeSupported(options.mimeType)) { + console.error(`${options.mimeType} is not supported`); + options = { mimeType: "video/webm" }; + if (!MediaRecorder.isTypeSupported(options.mimeType)) { + console.error(`${options.mimeType} is not supported`); + options = { mimeType: "" }; + } + } + } + + try { + // record only my local Media Stream + mediaRecorder = new MediaRecorder(myVideoStream, options); + } catch (err) { + console.error("Exception while creating MediaRecorder:", err); + alert("error", "Can't start stream recording: " + err); + return; + } + + console.log("Created MediaRecorder", mediaRecorder, "with options", options); + mediaRecorder.onstop = (event) => { + console.log("MediaRecorder stopped: ", event); + console.log("MediaRecorder Blobs: ", recordedBlobs); + document.getElementById("info").innerHTML = ""; + downloadRecordedStream(); + }; + + mediaRecorder.ondataavailable = handleDataAvailable; + mediaRecorder.start(); + console.log("MediaRecorder started", mediaRecorder); + isStreamRecording = true; + recordStreamBtn.style.setProperty("background-color", "red"); + startRecordingTime(); +} + +/** + * Stop recording + */ +function stopStreamRecording() { + mediaRecorder.stop(); + isStreamRecording = false; + setRecordButtonUi(); +} + + +/** + * recordind stream data + * @param {*} event + */ +function handleDataAvailable(event) { + console.log("handleDataAvailable", event); + if (event.data && event.data.size > 0) { + recordedBlobs.push(event.data); + } +} + +/** + * Download recorded stream + */ +function downloadRecordedStream() { + try { + const blob = new Blob(recordedBlobs, { type: "video/webm" }); + const recFileName = getDataTimeString() + "-REC.webm"; + const blobFileSize = bytesToSize(blob.size); + + alert( + ` Recording Info + FILE: ${recFileName} + SIZE: ${blobFileSize} + Please wait to be processed, then will be downloaded to your device. + ` + ); + + // save the recorded file to device + const url = window.URL.createObjectURL(blob); + const a = document.createElement("a"); + a.style.display = "none"; + a.href = url; + a.download = recFileName; + document.body.appendChild(a); + a.click(); + setTimeout(() => { + document.body.removeChild(a); + window.URL.revokeObjectURL(url); + }, 100); + } catch (err) { + alert("Recording save failed: " + err); + } +} + + + + +/** + * Start recording time + */ + function startRecordingTime() { + recStartTime = Date.now(); + let rc = setInterval(function printTime() { + if (isStreamRecording) { + recElapsedTime = Date.now() - recStartTime; + document.getElementById("info").innerHTML = + myName + "   🔴 REC " + getTimeToString(recElapsedTime); + return; + } + clearInterval(rc); + }, 1000); +} + +function getTimeToString(time) { + let diffInHrs = time / 3600000; + let hh = Math.floor(diffInHrs); + let diffInMin = (diffInHrs - hh) * 60; + let mm = Math.floor(diffInMin); + let diffInSec = (diffInMin - mm) * 60; + let ss = Math.floor(diffInSec); + let formattedHH = hh.toString().padStart(2, "0"); + let formattedMM = mm.toString().padStart(2, "0"); + let formattedSS = ss.toString().padStart(2, "0"); + return `${formattedHH}:${formattedMM}:${formattedSS}`; +} + +function setRecordButtonUi() { + recordStreamBtn.style.setProperty("background-color", "transparent"); +} + +function getDataTimeString() { + const d = new Date(); + const date = d.toISOString().split("T")[0]; + const time = d.toTimeString().split(" ")[0]; + return `${date}-${time}`; +} + +function bytesToSize(bytes) { + let sizes = ["Bytes", "KB", "MB", "GB", "TB"]; + if (bytes == 0) return "0 Byte"; + let i = parseInt(Math.floor(Math.log(bytes) / Math.log(1024))); + return Math.round(bytes / Math.pow(1024, i), 2) + " " + sizes[i]; +} + + diff --git a/public/style.css b/public/style.css index d6ba77e..8789469 100644 --- a/public/style.css +++ b/public/style.css @@ -12,6 +12,13 @@ body { font-size: 14px; line-height: 1.4286; } +#info { + color:white; + position: absolute; + top:0; + right:0; + background-color: grey; +} #video-grid { display: flex; justify-content: center; @@ -135,6 +142,9 @@ input#chat_message { --border: 2px solid #ddd; --left-msg-bg: #ececec; --right-msg-bg: #579ffb; + /* whiteboard resize */ + --wb-width: 800px; + --wb-height: 600px; } .msger { @@ -208,6 +218,7 @@ input#chat_message { .left-msg .msg-bubble { border-bottom-left-radius: 0; + word-break: break-all; } .right-msg { @@ -217,6 +228,7 @@ input#chat_message { background: var(--right-msg-bg); color: #fff; border-bottom-right-radius: 0; + word-break: break-all; } .right-msg .msg-img { margin: 0 0 0 10px; @@ -314,4 +326,7 @@ input#chat_message { { padding :20px; display: flex; flex-direction: column + } + .white{ +color:white; } \ No newline at end of file diff --git a/public/whiteboard.css b/public/whiteboard.css new file mode 100644 index 0000000..9ef200d --- /dev/null +++ b/public/whiteboard.css @@ -0,0 +1,247 @@ + +/* messenger */ +:root { + /* whiteboard resize */ + --wb-width: 800px; + --wb-height: 600px; + --wb-bg: #000000; + --wb-hbg: #000000; + --box-shadow: 3px 3px 6px #c300ff59, -3px -3px 6px #db05f362; + --btns-hover-scale:scale(1.2); + + } +.whiteboard-cont { + z-index: 14; + display: none; + width: var(--wb-width); + height: var(--wb-height); + position: absolute; + /* center */ + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + /* fade in */ + -webkit-animation: fadeIn ease-in 1; + -moz-animation: fadeIn ease-in 1; + animation: fadeIn ease-in 1; + -webkit-animation-fill-mode: forwards; + -moz-animation-fill-mode: forwards; + animation-fill-mode: forwards; + -webkit-animation-duration: 1s; + -moz-animation-duration: 1s; + animation-duration: 1s; + overflow: none; + box-shadow: var(--box-shadow); + border-radius: 5px; + } + .whiteboard-cont #whiteboard { + z-index: 99; + background-color: var(--wb-bg); + border-radius: 5px; + } + .whiteboard-cont .colors-cont { + position: absolute; + display: flex; + left: 0px; + top: 0px; + width: 100%; + background: var(--wb-hbg); + cursor: move; + border-radius: 5px; + } + .whiteboard-cont .colors-cont .white { + height: 30px; + width: 30px; + border-radius: 50px; + background-color: #ffffff; + margin-top: 10px; + margin-left: 10px; + } + .whiteboard-cont .colors-cont .white:hover { + cursor: pointer; + transform: var(--btns-hover-scale); + transition: all 0.3s ease-in-out; + } + .whiteboard-cont .colors-cont .red { + height: 30px; + width: 30px; + border-radius: 50px; + background-color: #e74c3c; + margin-top: 10px; + margin-left: 10px; + } + .whiteboard-cont .colors-cont .red:hover { + cursor: pointer; + transform: var(--btns-hover-scale); + transition: all 0.3s ease-in-out; + } + .whiteboard-cont .colors-cont .yellow { + height: 30px; + width: 30px; + border-radius: 50px; + background-color: #f1c40f; + margin-top: 10px; + margin-left: 10px; + } + .whiteboard-cont .colors-cont .yellow:hover { + cursor: pointer; + transform: var(--btns-hover-scale); + transition: all 0.3s ease-in-out; + } + .whiteboard-cont .colors-cont .green { + height: 30px; + width: 30px; + border-radius: 50px; + background-color: #badc58; + margin-top: 10px; + margin-left: 10px; + } + .whiteboard-cont .colors-cont .green:hover { + cursor: pointer; + transform: var(--btns-hover-scale); + transition: all 0.3s ease-in-out; + } + .whiteboard-cont .colors-cont .orange { + height: 30px; + width: 30px; + border-radius: 50px; + background-color: #e67e22; + margin-top: 10px; + margin-left: 10px; + } + .whiteboard-cont .colors-cont .orange:hover { + cursor: pointer; + transform: var(--btns-hover-scale); + transition: all 0.3s ease-in-out; + } + .whiteboard-cont .colors-cont .purple { + height: 30px; + width: 30px; + border-radius: 50px; + background-color: #9b59b6; + margin-top: 10px; + margin-left: 10px; + } + .whiteboard-cont .colors-cont .purple:hover { + cursor: pointer; + transform: var(--btns-hover-scale); + transition: all 0.3s ease-in-out; + } + .whiteboard-cont .colors-cont .blue { + height: 30px; + width: 30px; + border-radius: 50px; + background-color: #3498db; + margin-top: 10px; + margin-left: 10px; + } + .whiteboard-cont .colors-cont .blue:hover { + cursor: pointer; + transform: var(--btns-hover-scale); + transition: all 0.3s ease-in-out; + } + .whiteboard-cont .colors-cont .pink { + height: 30px; + width: 30px; + border-radius: 50px; + background-color: #fd79a8; + margin-top: 10px; + margin-left: 10px; + } + .whiteboard-cont .colors-cont .pink:hover { + cursor: pointer; + transform: var(--btns-hover-scale); + transition: all 0.3s ease-in-out; + } + .whiteboard-cont .colors-cont .brown { + height: 30px; + width: 30px; + border-radius: 50px; + background-color: #834c32; + margin-top: 10px; + margin-left: 10px; + } + .whiteboard-cont .colors-cont .brown:hover { + cursor: pointer; + transform: var(--btns-hover-scale); + transition: all 0.3s ease-in-out; + } + .whiteboard-cont .colors-cont .grey { + height: 30px; + width: 30px; + border-radius: 50px; + background-color: #afadad; + margin-top: 10px; + margin-left: 10px; + } + .whiteboard-cont .colors-cont .grey:hover { + cursor: pointer; + transform: var(--btns-hover-scale); + transition: all 0.3s ease-in-out; + } + .whiteboard-cont button { + height: 30px; + width: 30px; + font-size: 1.2rem; + margin-top: 10px; + margin-left: 10px; + border: none; + color: white; + background: transparent; + } + .whiteboard-cont button:hover { + color: rgb(0, 180, 50); + transform: var(--btns-hover-scale); + transition: all 0.3s ease-in-out; + } + + #whiteboardColorPicker { + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; + padding: 0; + border: none; + width: 30px; + height: 30px; + margin-top: 10px; + margin-left: 10px; + margin-right: 15px; + border-radius: 50px; + border: solid 0.5px #afadad38; + } + #whiteboardColorPicker:hover { + transform: var(--btns-hover-scale); + transition: all 0.3s ease-in-out; + } + #whiteboardColorPicker::-webkit-color-swatch { + border: none; + border-radius: 50px; + padding: 0; + } + #whiteboardColorPicker::-webkit-color-swatch-wrapper { + border: none; + border-radius: 50px; + padding: 0; + } + #whiteboardColorPicker::-moz-color-swatch { + border: none; + border-radius: 50px; + padding: 0; + } + #whiteboardColorPicker::-moz-color-swatch-wrapper { + border: none; + border-radius: 50px; + padding: 0; + } + #whiteboardColorPicker::color-swatch { + border: none; + border-radius: 50px; + padding: 0; + } + #whiteboardColorPicker::color-swatch-wrapper { + border: none; + border-radius: 50px; + padding: 0; + } + \ No newline at end of file diff --git a/public/whiteboard.js b/public/whiteboard.js new file mode 100644 index 0000000..3cc0c3c --- /dev/null +++ b/public/whiteboard.js @@ -0,0 +1,302 @@ +// whiteboard init +let whiteboardCont; +let whiteboardHeader; +let whiteboardColorPicker; +let whiteboardCloseBtn; +let whiteboardFsBtn; +let whiteboardCleanBtn; +let whiteboardSaveBtn; +let whiteboardEraserBtn; +let isWhiteboardVisible = false; +let canvas; +let ctx; +let isWhiteboardFs = false; + +// whiteboard settings +let isDrawing = 0; +let x = 0; +let y = 0; +let color = "#000000"; +let drawsize = 3; + +whiteboardBtn = document.getElementById("whiteboardBtn"); + // my whiteboard + whiteboardCont = document.getElementsByClassName("whiteboard-cont")[0]; + whiteboardHeader = document.getElementsByClassName("colors-cont")[0]; + whiteboardCloseBtn = document.getElementById("whiteboardCloseBtn"); + whiteboardFsBtn = document.getElementById("whiteboardFsBtn"); + whiteboardColorPicker = document.getElementById("whiteboardColorPicker"); + whiteboardSaveBtn = document.getElementById("whiteboardSaveBtn"); + whiteboardEraserBtn = document.getElementById("whiteboardEraserBtn"); + whiteboardCleanBtn = document.getElementById("whiteboardCleanBtn"); + canvas = document.getElementById("whiteboard"); + ctx = canvas.getContext("2d"); + + setMyWhiteboardBtn(); + function setMyWhiteboardBtn() { + setupCanvas(); + + // open - close whiteboard + whiteboardBtn.addEventListener("click", (e) => { + if (isWhiteboardVisible) { + whiteboardClose(); + remoteWbAction("close"); + } else { + whiteboardOpen(); + remoteWbAction("open"); + } + }); + // close whiteboard + whiteboardCloseBtn.addEventListener("click", (e) => { + whiteboardClose(); + remoteWbAction("close"); + }); + // view full screen + whiteboardFsBtn.addEventListener("click", (e) => { + whiteboardResize(); + remoteWbAction("resize"); + }); + // erase whiteboard + whiteboardEraserBtn.addEventListener("click", (e) => { + setEraser(); + }); + // save whitebaord content as img + whiteboardSaveBtn.addEventListener("click", (e) => { + saveWbCanvas(); + }); + // clean whiteboard + whiteboardCleanBtn.addEventListener("click", (e) => { + whiteboardClean(); + remoteWbAction("clean"); + }); + } + + +/** + * Handle whiteboard events + * @param {*} config + */ +function handleWhiteboard(config) { + switch (config.act) { + case "draw": + drawRemote(config); + break; + case "clean": + document.getElementById("info").innerHTML=`${config.peer_name} has cleaned the board` + whiteboardClean(); + break; + case "open": + document.getElementById("info").innerHTML=`${config.peer_name} has opened the board` + whiteboardOpen(); + break; + case "close": + document.getElementById("info").innerHTML="" + break; + case "resize": + whiteboardResize(); + break; + } + } + + + + /** + * Whiteboard Open + */ + function whiteboardOpen() { + if (!isWhiteboardVisible) { + setColor("#ffffff"); // color picker + whiteboardCont.style.top = "50%"; + whiteboardCont.style.left = "50%"; + whiteboardCont.style.display = "block"; + isWhiteboardVisible = true; + drawsize = 3; + fitToContainer(canvas); + } + } + + /** + * Whiteboard close + */ + function whiteboardClose() { + if (isWhiteboardVisible) { + whiteboardCont.style.display = "none"; + isWhiteboardVisible = false; + + } + } + + /** + * Whiteboard resize + */ + function whiteboardResize() { + let content; + whiteboardCont.style.top = "50%"; + whiteboardCont.style.left = "50%"; + if (isWhiteboardFs) { + document.documentElement.style.setProperty("--wb-width", "800px"); + document.documentElement.style.setProperty("--wb-height", "600px"); + fitToContainer(canvas); + whiteboardFsBtn.className = "fas fa-expand-alt"; + content = "VIEW full screen"; + isWhiteboardFs = false; + } else { + document.documentElement.style.setProperty("--wb-width", "99%"); + document.documentElement.style.setProperty("--wb-height", "99%"); + fitToContainer(canvas); + whiteboardFsBtn.className = "fas fa-compress-alt"; + content = "EXIT full screen"; + isWhiteboardFs = true; + } + + } + + /** + * Whiteboard clean + */ + function whiteboardClean() { + if (isWhiteboardVisible) { + ctx.clearRect(0, 0, canvas.width, canvas.height); + } + } + + /** + * Set whiteboard color + * @param {*} newcolor + */ + function setColor(newcolor) { + color = newcolor; + drawsize = 3; + whiteboardColorPicker.value = color; + } + + /** + * Whiteboard eraser + */ + function setEraser() { + color = "#000000"; + drawsize = 25; + whiteboardColorPicker.value = color; + } + + + /** + * Draw on whiteboard + * @param {*} newx + * @param {*} newy + * @param {*} oldx + * @param {*} oldy + */ + function draw(newx, newy, oldx, oldy) { + ctx.strokeStyle = color; + ctx.lineWidth = drawsize; + ctx.beginPath(); + ctx.moveTo(oldx, oldy); + ctx.lineTo(newx, newy); + ctx.stroke(); + ctx.closePath(); + } + + /** + * Draw Remote whiteboard + * @param {*} config draw coordinates, color and size + */ + function drawRemote(config) { + // draw on whiteboard + if (isWhiteboardVisible) { + ctx.strokeStyle = config.color; + ctx.lineWidth = config.size; + ctx.beginPath(); + ctx.moveTo(config.prevx, config.prevy); + ctx.lineTo(config.newx, config.newy); + ctx.stroke(); + ctx.closePath(); + } + } + + /** + * Resize canvas + * @param {*} canvas + */ + function fitToContainer(canvas) { + canvas.style.width = "100%"; + canvas.style.height = "100%"; + canvas.width = canvas.offsetWidth; + canvas.height = canvas.offsetHeight; + } + + /** + * Handle whiteboard on windows resize + * here i lose drawing, Todo fix it + */ + function reportWindowSize() { + fitToContainer(canvas); + } + /** + * Whiteboard setup + */ + function setupCanvas() { + fitToContainer(canvas); + + canvas.addEventListener("mousedown", (e) => { + x = e.offsetX; + y = e.offsetY; + isDrawing = 1; + }); + canvas.addEventListener("mousemove", (e) => { + if (isDrawing) { + draw(e.offsetX, e.offsetY, x, y); + // send draw to other peers in the room + if (roomMates.size) { + socket.emit("wb", { + act: "draw", + newx: e.offsetX, + newy: e.offsetY, + prevx: x, + prevy: y, + color: color, + size: drawsize, + }); + } + x = e.offsetX; + y = e.offsetY; + } + }); + window.addEventListener("mouseup", (e) => { + if (isDrawing) { + isDrawing = 0; + } + }); + + window.onresize = reportWindowSize; + } + + /** + * Save whiteboard canvas to file as png + */ + function saveWbCanvas() { + // Improve it if erase something... + let link = document.createElement("a"); + link.download = getDataTimeString() + "WHITEBOARD.png"; + link.href = canvas.toDataURL(); + link.click(); + link.delete; + } + + /** + * Remote whiteboard actions + * @param {*} action + */ + function remoteWbAction(action) { + if (roomMates.size) { + socket.emit("wb", { + peer_name: myName, + act: action, + }); + } + } + + socket.on("wb",(config) =>{ + handleWhiteboard(config); + }) + diff --git a/views/homepage.ejs b/views/homepage.ejs new file mode 100644 index 0000000..c34b4a5 --- /dev/null +++ b/views/homepage.ejs @@ -0,0 +1,66 @@ + + + + + + Microsoft Teams + + + + + + + + + + + + + +
+ +
+
GET PROFILE !
+
+ + +
+ +
+
VIDEO CALL !
+
+ + + + + + +
+ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/views/main.ejs b/views/main.ejs index 028d095..57ad8cc 100644 --- a/views/main.ejs +++ b/views/main.ejs @@ -7,7 +7,7 @@ - + @@ -29,11 +29,13 @@
-
+
- +
+ +
@@ -44,15 +46,15 @@
- -
-
+
+ +
@@ -97,21 +99,18 @@
-
-
  Participants
+
  Participants(ALL)
Invite participants
-
- Hargun -
+
@@ -125,19 +124,7 @@ @@ -24,6 +25,36 @@
+
+ +
+
+ + +
+ +
+
+ +
+
+
+
+
+
+
+
+
+
+ + + + +
+ +
+ +
@@ -31,13 +62,13 @@
-
+
-
+
-
+