This commit is contained in:
tiago.kayaya
2021-05-18 09:37:23 +01:00
parent e00a8ebeab
commit e47920cdfc
3 changed files with 97 additions and 24 deletions
+47 -23
View File
@@ -165,6 +165,25 @@
"debug": "4" "debug": "4"
} }
}, },
"postcss": {
"version": "8.2.4",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.4.tgz",
"integrity": "sha512-kRFftRoExRVXZlwUuay9iC824qmXPcQQVzAjbCCgjpXnkdMCJYBu2gTwAaFBzv8ewND6O8xFb3aELmEkh9zTzg==",
"dev": true,
"requires": {
"colorette": "^1.2.1",
"nanoid": "^3.1.20",
"source-map": "^0.6.1"
},
"dependencies": {
"source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"dev": true
}
}
},
"rxjs": { "rxjs": {
"version": "6.6.3", "version": "6.6.3",
"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
@@ -8585,9 +8604,9 @@
} }
}, },
"engine.io-client": { "engine.io-client": {
"version": "3.5.0", "version": "3.5.2",
"resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.5.0.tgz", "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.5.2.tgz",
"integrity": "sha512-12wPRfMrugVw/DNyJk34GQ5vIVArEcVMXWugQGGuw2XxUSztFNmJggZmv8IZlLyEdnpO1QB9LkcjeWewO2vxtA==", "integrity": "sha512-QEqIp+gJ/kMHeUun7f5Vv3bteRHppHH/FMBQX/esFj/fuYfjyUKWGMo3VCvIP/V8bE9KcjHmRZrhIz2Z9oNsDA==",
"requires": { "requires": {
"component-emitter": "~1.3.0", "component-emitter": "~1.3.0",
"component-inherit": "0.0.3", "component-inherit": "0.0.3",
@@ -8598,7 +8617,7 @@
"parseqs": "0.0.6", "parseqs": "0.0.6",
"parseuri": "0.0.6", "parseuri": "0.0.6",
"ws": "~7.4.2", "ws": "~7.4.2",
"xmlhttprequest-ssl": "~1.5.4", "xmlhttprequest-ssl": "~1.6.2",
"yeast": "0.1.2" "yeast": "0.1.2"
}, },
"dependencies": { "dependencies": {
@@ -12288,9 +12307,9 @@
"optional": true "optional": true
}, },
"nanoid": { "nanoid": {
"version": "3.1.20", "version": "3.1.23",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz",
"integrity": "sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==", "integrity": "sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==",
"dev": true "dev": true
}, },
"nanomatch": { "nanomatch": {
@@ -13430,16 +13449,22 @@
"dev": true "dev": true
}, },
"postcss": { "postcss": {
"version": "8.2.4", "version": "8.2.15",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.4.tgz", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.15.tgz",
"integrity": "sha512-kRFftRoExRVXZlwUuay9iC824qmXPcQQVzAjbCCgjpXnkdMCJYBu2gTwAaFBzv8ewND6O8xFb3aELmEkh9zTzg==", "integrity": "sha512-2zO3b26eJD/8rb106Qu2o7Qgg52ND5HPjcyQiK2B98O388h43A448LCslC0dI2P97wCAQRJsFvwTRcXxTKds+Q==",
"dev": true, "dev": true,
"requires": { "requires": {
"colorette": "^1.2.1", "colorette": "^1.2.2",
"nanoid": "^3.1.20", "nanoid": "^3.1.23",
"source-map": "^0.6.1" "source-map": "^0.6.1"
}, },
"dependencies": { "dependencies": {
"colorette": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
"integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
"dev": true
},
"source-map": { "source-map": {
"version": "0.6.1", "version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -17948,9 +17973,9 @@
"dev": true "dev": true
}, },
"underscore": { "underscore": {
"version": "1.12.0", "version": "1.13.1",
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.12.0.tgz", "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
"integrity": "sha512-21rQzss/XPMjolTiIezSu3JAjgagXKROtNrYFEOWK109qY1Uv2tVjPTZ1ci2HgvQDA16gHYSthQIJfB+XId/rQ==", "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==",
"dev": true "dev": true
}, },
"unicode-canonical-property-names-ecmascript": { "unicode-canonical-property-names-ecmascript": {
@@ -18802,8 +18827,7 @@
}, },
"ssri": { "ssri": {
"version": "6.0.1", "version": "6.0.1",
"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz", "resolved": "",
"integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
"dev": true, "dev": true,
"requires": { "requires": {
"figgy-pudding": "^3.5.1" "figgy-pudding": "^3.5.1"
@@ -19429,9 +19453,9 @@
} }
}, },
"ws": { "ws": {
"version": "7.4.3", "version": "7.4.5",
"resolved": "https://registry.npmjs.org/ws/-/ws-7.4.3.tgz", "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.5.tgz",
"integrity": "sha512-hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA==" "integrity": "sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g=="
}, },
"xcode": { "xcode": {
"version": "3.0.1", "version": "3.0.1",
@@ -19480,9 +19504,9 @@
"dev": true "dev": true
}, },
"xmlhttprequest-ssl": { "xmlhttprequest-ssl": {
"version": "1.5.5", "version": "1.6.3",
"resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz", "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.3.tgz",
"integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=" "integrity": "sha512-3XfeQE/wNkvrIktn2Kf0869fC0BN6UpydVasGIeSm2B1Llihf7/0UfZM+eCkOw3P7bP4+qPgqhm7ZoxuJtFU0Q=="
}, },
"xtend": { "xtend": {
"version": "4.0.2", "version": "4.0.2",
+2 -1
View File
@@ -62,6 +62,7 @@
"socket.io-client": "^2.3.0", "socket.io-client": "^2.3.0",
"tslib": "^2.0.0", "tslib": "^2.0.0",
"wordcloud": "^1.1.2", "wordcloud": "^1.1.2",
"ws": "^7.4.5",
"zone.js": "~0.10.2" "zone.js": "~0.10.2"
}, },
"devDependencies": { "devDependencies": {
@@ -144,4 +145,4 @@
"url": "git+https://Kayaya@bitbucket.org/equilibriumito/gabinete-digital.git" "url": "git+https://Kayaya@bitbucket.org/equilibriumito/gabinete-digital.git"
}, },
"license": "ISC" "license": "ISC"
} }
+48
View File
@@ -72,6 +72,16 @@ export class ChatPage implements OnInit {
@Output() getRoomInfo; @Output() getRoomInfo;
/*
Websockets variables
*/
SERVER_URL = 'wss://www.tabularium.pt/websocket';
ws:any;
/* Fim websockets variables*/
constructor( constructor(
private http:HttpClient, private http:HttpClient,
private chatService: ChatService, private chatService: ChatService,
@@ -100,9 +110,47 @@ export class ChatPage implements OnInit {
}) })
console.log(this.roomId); console.log(this.roomId);
this.connect();
} }
/* websocket functions */
connect() {
this.ws = new WebSocket(this.SERVER_URL, []);
console.log(this.ws);
/* this.ws.onmessage = handleMessageReceived;
this.ws.onerror = handleError; */
}
handleMessageReceived(data) {
// Simply call logMessage(), passing the received data.
/* logMessage(data.data); */
}
handleConnected(data) {
// Create a log message which explains what has happened and includes
// the url we have connected too.
var logMsg = 'Connected to server: ' + data.target.url;
// Add the message to the log.
/* logMessage(logMsg) */
}
handleError(err) {
// Print the error to the console so we can debug it.
console.log("Error: ", err);
}
logMessage(msg) {
// $apply() ensures that the elements on the page are updated
// with the new message.
/* $scope.$apply(function() { */
//Append out new message to our message log. The \n means new line.
/* $scope.messageLog = $scope.messageLog + msg + "\n"; */
// Update the scrolling (defined below).
/*updateScrolling();*/
/* S */
}
/* Fim websockets functions */
closeAllDesktopComponents() { closeAllDesktopComponents() {
this.showMessages=false; this.showMessages=false;
this.showContacts=false; this.showContacts=false;