Compare commits

..

No commits in common. "master" and "1.2.3" have entirely different histories.

17 changed files with 4022 additions and 3755 deletions

1
.github/FUNDING.yml vendored
View file

@ -1,2 +1 @@
github: [hexagon] github: [hexagon]
ko_fi: hexagon_56k

View file

@ -1,6 +0,0 @@
version: 2
updates:
- package-ecosystem: "npm" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "daily"

View file

@ -27,4 +27,4 @@ jobs:
node-version: ${{ matrix.node-version }} node-version: ${{ matrix.node-version }}
cache: 'npm' cache: 'npm'
- run: npm ci - run: npm ci
- run: npm run build:ci - run: npm run build

View file

@ -1,6 +1,7 @@
FROM keymetrics/pm2:16-alpine FROM node:16-alpine
COPY . /usr/src/app COPY . /usr/src/app
WORKDIR /usr/src/app WORKDIR /usr/src/app
RUN npm install --no-cache --production RUN npm install --no-cache
EXPOSE 8080 EXPOSE 8080
CMD [ "pm2-runtime", "start", "pm2.json" ] RUN chmod +x /usr/src/app/docker-entrypoint.sh
ENTRYPOINT ["/usr/src/app/docker-entrypoint.sh", "npm", "start"]

View file

@ -1,15 +1,15 @@
![cryptalk](https://i.imgur.com/1sH36n5.png) ![cryptalk](/screenshot.png)
![Node.js CI](https://github.com/Hexagon/cryptalk/workflows/Node.js%20CI/badge.svg?branch=master) ![Node.js CI](https://github.com/Hexagon/cryptalk/workflows/Node.js%20CI/badge.svg?branch=master)
[![npm version](https://badge.fury.io/js/cryptalk.svg)](https://badge.fury.io/js/cryptalk) [![npm version](https://badge.fury.io/js/cryptalk.svg)](https://badge.fury.io/js/cryptalk)
[![License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE.md) [![License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE.md)
[![Codacy Badge](https://app.codacy.com/project/badge/Grade/753ef40cec1747c2b5025f834635375b)](https://www.codacy.com/gh/Hexagon/cryptalk/dashboard?utm_source=github.com&utm_medium=referral&utm_content=Hexagon/cryptalk&utm_campaign=Badge_Grade) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/753ef40cec1747c2b5025f834635375b)](https://www.codacy.com/gh/Hexagon/cryptalk/dashboard?utm_source=github.com&utm_medium=referral&utm_content=Hexagon/cryptalk&utm_campaign=Badge_Grade)
# Cryptalk
Cyptalk is a HTML5/Node.js based, client side (E2EE) encrypted instant chat Cyptalk is a HTML5/Node.js based, client side (E2EE) encrypted instant chat
## Features
Features
========
* Client side AES-256-CBC encryption/decryption (the server is just a messenger) * Client side AES-256-CBC encryption/decryption (the server is just a messenger)
* 256 bit key derived from your passphrase using PBKDF2 * 256 bit key derived from your passphrase using PBKDF2
@ -21,9 +21,9 @@ Cyptalk is a HTML5/Node.js based, client side (E2EE) encrypted instant chat
* Nicknames, optional. * Nicknames, optional.
* Quick-links using http://server/#Room:Passphrase, optional and insecure * Quick-links using http://server/#Room:Passphrase, optional and insecure
## Installing
### Docker setup Docker setup
========
To run latest cryptalk with docker, exposed on host port 80, simply run the following command to pull it from docker hub To run latest cryptalk with docker, exposed on host port 80, simply run the following command to pull it from docker hub
@ -31,13 +31,18 @@ To run latest cryptalk with docker, exposed on host port 80, simply run the foll
sudo docker run -d --restart=always -p 80:8080 hexagon/cryptalk sudo docker run -d --restart=always -p 80:8080 hexagon/cryptalk
``` ```
### Heroku setup
Heroku setup
========
Click the button below Click the button below
[![Deploy](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy?template=https://github.com/hexagon/cryptalk) [![Deploy](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy?template=https://github.com/hexagon/cryptalk)
### Docker setup without using docker hub
Docker setup without using docker hub
========
Clone this repo, enter the new directory. Clone this repo, enter the new directory.
@ -55,7 +60,10 @@ Browse to ```http://<ip-of-server>/```
Done! Done!
### npm setup
npm setup
========
Install node.js, exact procedure is dependant on platform and distribution. Install node.js, exact procedure is dependant on platform and distribution.
@ -74,7 +82,36 @@ Browse to ```http://localhost:8080```
Done! Done!
## Usage
Developer setup
========
Install node.js (development require >=12.0), exact procedure is dependant on platform and distribution.
Clone this repo
```bash
git clone https://github.com/Hexagon/cryptalk.git
cd cryptalk
```
Pull dependencies from npm
```bash
npm install
```
Start server
```bash
npn run start
```
Browse to ```http://localhost:8080```
To work on the JavaScript, edit the code in ```client/source/```. To test the changes, first run ```npm run build``` to lint, build and minify the code. Then restart the server.
Usage
========
``` ```
@ -111,27 +148,3 @@ to prevent browsers from keeping history or cache.
``` ```
## Development
Install node.js (development require >=12.0), exact procedure is dependant on platform and distribution.
Clone this repo
```bash
git clone https://github.com/Hexagon/cryptalk.git
cd cryptalk
```
Pull dependencies from npm
```bash
npm install
```
Start server
```bash
npm run start
```
Browse to ```http://localhost:8080```
To work on the JavaScript, edit the code in ```client/source/```. To test the changes, first run ```npm run build``` to lint, build and minify the code. Then restart the server.

View file

@ -1,31 +1,32 @@
/*------------------------------------*\
GENERIC
\*------------------------------------*/
html { html {
-webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */ -webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */
-moz-box-sizing: border-box; /* Firefox, other Gecko */ -moz-box-sizing: border-box; /* Firefox, other Gecko */
box-sizing: border-box; /* Opera/IE 8+ */ box-sizing: border-box; /* Opera/IE 8+ */
} }
*, *, *:before, *:after {
*:before,
*:after {
box-sizing: inherit; box-sizing: inherit;
font-family: monospace, 'Courier New'; font-family: monospace, 'Courier New';
font-size: 12px; font-size: 12px;
} }
body, body, html {
html {
min-height: 100%; min-height: 100%;
min-width: 600px; min-width: 600px;
background-color: #181a1d; background-color: #181A1D;
overflow: hidden; overflow: hidden;
padding: 0px; padding: 0px;
margin:0px; margin:0px;
color: #00dd00; color: #00DD00;
} }
.good { color: #99ff99; } .good { color: #99FF99; }
.bad { color: #ff7777; } .bad { color: #ff7777; }
.info { color: #99ffff; } .info { color: #99FFFF; }
.neutral { color: #eeeeee; } .neutral { color: #eeeeee; }
/*------------------------------------*\ /*------------------------------------*\
@ -49,7 +50,7 @@ html {
} }
#chat li .timestamp { #chat li .timestamp {
color: #a0a00a; color: #A0A00A;
} }
/* Message types */ /* Message types */
@ -57,16 +58,12 @@ html {
#chat i { #chat i {
font-style: normal; font-style: normal;
} }
#chat i.motd { #chat i.motd { color: #99FF99; display:inline-block; line-height: 12px !important; }
color: #99ff99;
display:inline-block;
line-height: 12px !important;
}
#chat i.info { color: #999999; } #chat i.info { color: #999999; }
#chat i.server { color: #99ffff; } #chat i.server { color: #99FFFF; }
#chat i.error { color: #ff7777; } #chat i.error { color: #ff7777; }
#chat i.message { color: #eeeeee; } #chat i.message { color: #eeeeee; }
#chat i.nick { color: #99ff99; } #chat i.nick { color: #99FF99; }
#chat i.fatal { color: #ff7777; } #chat i.fatal { color: #ff7777; }
/*------------------------------------*\ /*------------------------------------*\
@ -77,6 +74,7 @@ html {
bottom:0; bottom:0;
left:0; left:0;
position: absolute; position: absolute;
height:30px; height:30px;
} }
@ -92,29 +90,20 @@ html {
padding: 5px 5px 5px 15px; padding: 5px 5px 5px 15px;
color: #ffffff; color: #FFFFFF;
background-color:#272a2e; background-color:#272A2E;
height:30px; height:30px;
border-top: 2px solid #153315; border-top: 2px solid #153315;
} }
#input { #input { z-index: 1; }
z-index: 1; #loader { z-index: 0; line-height: 20px; font-size: 14px; font-weight: 100; font-family: tahoma;}
}
#loader {
z-index: 0;
line-height: 20px;
font-size: 14px;
font-weight: 100;
font-family: tahoma;
}
.loading #loader {
z-index: 2;
}
/*------------------------------------*\
SPINNER
\*------------------------------------*/
.loading #loader { z-index: 2; }
.loading #loader span { .loading #loader span {
margin-left:-2px; margin-left:-2px;
-webkit-animation: rotation 1s infinite linear; -webkit-animation: rotation 1s infinite linear;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -9,7 +9,8 @@ for(var k in proto) ElementArray.prototype[k] = proto[k];
// Create to actual dollar function // Create to actual dollar function
function Dollar (selector) { function Dollar (selector) {
let matches = new ElementArray(); var match,
matches = new ElementArray();
if (selector !== undefined) { if (selector !== undefined) {
if (selector === document) { if (selector === document) {
@ -17,8 +18,7 @@ function Dollar (selector) {
} else if (selector === window) { } else if (selector === window) {
matches.push(window); matches.push(window);
} else { } else {
let match = document.querySelectorAll(selector); if ((match = document.querySelectorAll(selector))) {
if (match) {
for( var i=0; i < match.length; i++) { for( var i=0; i < match.length; i++) {
matches.push(match[i]); matches.push(match[i]);
} }

View file

@ -128,6 +128,20 @@ export default function(mediator,settings,templates, sounds) {
components.input[0].removeAttribute('disabled'); components.input[0].removeAttribute('disabled');
components.inputWrapper[0].className = ''; components.inputWrapper[0].className = '';
components.input.focus(); components.input.focus();
},
_require: function (filepath, done) {
commands.lockInput();
commands.post('info', 'Requiring ' + filepath + '...');
require([filepath], function () {
commands.post('info', 'Successfully required ' + filepath + '.');
commands.unlockInput();
done();
}, function (e) {
commands.post('error', 'An error occurred while trying to load "' + filepath + '":\n' + e);
commands.unlockInput();
done();
});
} }
}, },
@ -142,8 +156,7 @@ export default function(mediator,settings,templates, sounds) {
// If the active element is not the input, focus on it and exit the function. // If the active element is not the input, focus on it and exit the function.
// Ignore this when ctrl and/or alt is pressed! // Ignore this when ctrl and/or alt is pressed!
if (!e.ctrlKey && !e.altKey && components.input[0] !== $.activeElement()) { if (!e.ctrlKey && !e.altKey && components.input[0] !== $.activeElement()) {
components.input.focus(); return components.input.focus();
return;
} }
// Return immediatly if the buffer is empty or if the hit key was not <enter> // Return immediatly if the buffer is empty or if the hit key was not <enter>
@ -163,8 +176,7 @@ export default function(mediator,settings,templates, sounds) {
payload, payload,
function(retvals, recipients) { function(retvals, recipients) {
if(!recipients) { if(!recipients) {
commands.post('error', $.template(templates.messages.unrecognized_command, { commandName: command })); return commands.post('error', $.template(templates.messages.unrecognized_command, { commandName: command }));
return;
} else { } else {
commands.clearInput(); commands.clearInput();
} }
@ -205,11 +217,13 @@ export default function(mediator,settings,templates, sounds) {
// Connect events // Connect events
for (var commandName in commands) { for (var commandName in commands) {
if (commandName !== 'post') { if (commandName !== '_require' && commandName !== 'post') {
mediator.on('console:' + commandName, commands[commandName]); mediator.on('console:' + commandName, commands[commandName]);
} }
} }
mediator.on('console:require', commands._require);
mediator.on('console:post', function (data) { mediator.on('console:post', function (data) {
commands.post(data.type, data.data, data.nick); commands.post(data.type, data.data, data.nick);
}); });

View file

@ -1,15 +1,23 @@
export default { export default {
title: 'Claytonia Chat', title: 'Cryptalk - Online',
ttl: 600000, ttl: 600000,
motd: '<pre>\n\n' + motd: '<pre>\n\n' +
' Welcome to Claytonia Chat \n' + '▄████▄ ██▀███ ▓██ ██▓ ██▓███ ▄▄▄█████▓ ▄▄▄ ██▓ ██ ▄█▀ \n' +
'▒██▀ ▀█ ▓██ ▒ ██▒▒██ ██▒▓██░ ██▒▓ ██▒ ▓▒▒████▄ ▓██▒ ██▄█▒ \n' +
'▒▓█ ▄ ▓██ ░▄█ ▒ ▒██ ██░▓██░ ██▓▒▒ ▓██░ ▒░▒██ ▀█▄ ▒██░ ▓███▄░ \n' +
'▒▓▓▄ ▄██▒▒██▀▀█▄ ░ ▐██▓░▒██▄█▓▒ ▒░ ▓██▓ ░ ░██▄▄▄▄██ ▒██░ ▓██ █▄ \n' +
'▒ ▓███▀ ░░██▓ ▒██▒ ░ ██▒▓░▒██▒ ░ ░ ▒██▒ ░ ▓█ ▓██▒░██████▒▒██▒ █▄ \n' +
'░ ░▒ ▒ ░░ ▒▓ ░▒▓░ ██▒▒▒ ▒▓▒░ ░ ░ ▒ ░░ ▒▒ ▓▒█░░ ▒░▓ ░▒ ▒▒ ▓▒ \n' +
' ░ ▒ ░▒ ░ ▒░▓██ ░▒░ ░▒ ░ ░ ▒ ▒▒ ░░ ░ ▒ ░░ ░▒ ▒░ \n' +
'░ ░░ ░ ▒ ▒ ░░ ░░ ░ ░ ▒ ░ ░ ░ ░░ ░ \n' +
'░ ░ ░ ░ ░ ░ ░ ░ ░░ ░ \n' +
'░ ░ ░ \n' +
' https://github.com/hexagon/cryptalk \n' +
' \n' +
' Tip of the day: /help \n' + ' Tip of the day: /help \n' +
' Public Room: /join Claytonia \n' +
' Public Key: /key Claytonia \n' +
' Everyone in the room must have the same key to decrypt messages. \n' +
'----------------------------------------------------------------------' + '----------------------------------------------------------------------' +
'</pre>', '</pre>',

View file

@ -1,17 +0,0 @@
[Unit]
Description=Cryptalk Node.js App
Documentation=https://github.com/Hexagon/cryptalk
After=network.target
[Service]
ExecStart=/usr/bin/npm run start
WorkingDirectory=/home/cryptochat/cryptalk
Restart=always
RestartSec=10
Environment=NODE_ENV=production
Environment=PATH=/usr/bin
User=cryptochat
Group=cryptochat
[Install]
WantedBy=multi-user.target

11
docker-entrypoint.sh Normal file
View file

@ -0,0 +1,11 @@
#!/bin/sh
set -e
# /usr/src/app/external-public kan be mounted as a volume on host to expose
# statics to be hosted by host nginx
if [ -d /usr/src/app/external-public ]; then
cp -R /usr/src/app/client/public/* /usr/src/app/external-public/
fi
exec "$@"

1995
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -1,14 +1,13 @@
{ {
"name": "cryptalk", "name": "cryptalk",
"version": "1.2.9", "version": "1.2.3",
"description": "Encrypted HTML5/Node.JS instant chat", "description": "Encrypted HTML5/Node.JS instant chat",
"main": "server/server.js", "main": "server/server.js",
"preferGlobal": true, "preferGlobal": true,
"private": false, "private": false,
"scripts": { "scripts": {
"test": "echo \"No tests written yet\" && exit 0", "test": "echo \"No tests written yet\" && exit 0",
"build": "npm update && npm outdated && npm run test:lint && npx rollup -c rollup.config.js && npm run build:minify && npm run build:cleanup", "build": "npm run test:lint && npx rollup -c rollup.config.js && npm run build:minify && npm run build:cleanup",
"build:ci": "npm run test:lint && npx rollup -c rollup.config.js && npm run build:minify && npm run build:cleanup",
"build:minify": "uglifyjs client/public/js/cryptalk.js --source-map -o client/public/js/cryptalk.min.js", "build:minify": "uglifyjs client/public/js/cryptalk.js --source-map -o client/public/js/cryptalk.min.js",
"build:cleanup": "(rm client/public/js/cryptalk.js || del client\\public\\js\\cryptalk.js)", "build:cleanup": "(rm client/public/js/cryptalk.js || del client\\public\\js\\cryptalk.js)",
"test:lint": "eslint ./client/source/**/*.js ./server/*.js", "test:lint": "eslint ./client/source/**/*.js ./server/*.js",
@ -39,7 +38,7 @@
}, },
"bin": "./server/server.js", "bin": "./server/server.js",
"dependencies": { "dependencies": {
"serve": "^13.0.2", "serve": "^12.0.1",
"socket.io": "^4.3.1" "socket.io": "^4.3.1"
}, },
"os": [ "os": [

View file

@ -1,11 +0,0 @@
{
"name": "cryptalk",
"script": "server/server.js",
"instances": "1",
"env": {
"NODE_ENV": "development"
},
"env_production" : {
"NODE_ENV": "production"
}
}