update from private repo

Author: xinthose

INSTALL.md

@@ -0,0 +1,134 @@
+# Xinthose Installation
+
+## Angular 8
+
+### Installation
+
+- Angular / General
+ - `npm i -g @angular/cli @angular/core @angular/forms @angular/forms terser typescript`
+- Progress
+ - `npm i -g @progress/kendo-angular-inputs @progress/kendo-angular-notification @progress/kendo-angular-dropdowns`
+`
+- Fort/ Font Awesome
+ - `npm i -g @fortawesome/angular-fontawesome @fortawesome/free-solid-svg-icons @fortawesome/fontawesome-svg-core`
+- Keypress.js: <https://github.com/dmauro/Keypress>, NPM: <https://www.npmjs.com/package/keypress.js>
+ - `npm i -g keypress.js @types/keypress.js`
+- Websocket client
+ - `npm i -g socket.io-client @types/socket.io-client`
+ - Example Github project: <https://github.com/luixaviles/socket-io-typescript-chat>
+
+### Create App (client directory)
+
+- `ng new angular-cpp-websocket --style=scss --enableIvy=false --routing=true`
+
+#### Angular Generate Commands
+
+- `for i in home page-not-found enter-access-number enter-pin account-volume requested-volume product-type dispensing thank-you closed fault; do ng g c "${i}"; done`
+- `ng g service portalogic`
+- `ng g guard auth`
+
+## General
+
+- `npm i -g @angular/cli`
+- `npm i rxjs rxjs-compat @angular/http`
+
+## Kendo-UI (Progress)
+
+- `ng add @progress/kendo-angular-buttons @progress/kendo-angular-dropdowns @progress/kendo-data-query`
+- `npm i @progress/kendo-theme-material`
+
+## MDBootstrap Pro
+
+- tutorial: <https://mdbootstrap.com/angular/5min-quickstart/>
+ - click "PRO" underneath "NPM installation"
+- `npm i git+https://oauth2:XXXXXXXXXX_XXXXXXXXX@git.mdbootstrap.com/mdb/angular/ng-uikit-pro-standard.git --save`
+- `npm i chart.js@2.5.0 @types/chart.js easy-pie-chart@2.1.7 hammerjs@2.0.8 screenfull@3.3.0 @fortawesome/fontawesome-free animate.css`
+ - 3rd party libraries
+
+### Websocket/email server using socket.io (server directory)
+
+- Example Github project: <https://github.com/luixaviles/socket-io-typescript-chat>
+- `npm i express socket.io-client @types/socket.io-client gulp-cli cors @types/cors`
+- server:
+ - `cd server`
+ - `npm i`
+ - `gulp build`
+ - `npm start`
+
+# C++
+
+- C++ Websocket Library: <https://github.com/zaphoyd/websocketpp>
+
+## Commands -------------------------------------------------------------------------------------------------------------------------
+
+## Angular Commands (ng)
+
+- `ng --version` // show angular version
+- `ng update --all --force` // update all angular packages (ignore peer dependency errors)
+- `ng build --prod --aot` // build for production
+- `ng serve --host 0.0.0.0` // allow outside PC's access to the app
+
+## Kendo Node.js commands
+
+- `ncu -u -f /^@progress/` // check progress widget versions
+
+## Node Commands
+
+- `node -v` // show node version
+
+## NPM Commands (Node Package Manager)
+
+- `npm -v` // show npm version
+- `npm i -g npm` // update npm version
+- `npm update` # update all packages in the app
+- npm i [package]@[version] // install specific version of a package
+- `npm ls @progress/kendo-angular-scheduler` // show version of a package
+- `npm i --package-lock-only` // only create `package-lock.json` file
+
+### Install dependencies
+
+- `npm i -g npm-install-peers`
+- `npm-install-peers`
+- `npm i @angular/cli@latest` // install latest version of angular cli
+
+## Typescript Commands
+
+- `tsc -v` // show typescript version
+
+## Github
+
+- `git config --global user.email "your github login email address"` // set email address
+- `git config --global user.email` // check email address
+
+## pm2
+
+- Github: <https://github.com/Unitech/pm2>
+- `npm i pm2 pm2-logrotate -g`
+- `pm2 ls` // list all running applications
+- `pm2 stop EDS4WSserver`
+- `pm2 restart EDS4WSserver`
+- `pm2 delete EDS4WSserver`
+- `pm2 describe EDS4WSserver`
+- `pm2 monit` // monitor logs, custom metrics, & application information
+
+## link pm2 to <https://app.pm2.io/#/bucket/5beae26a3ca4a1db69a9056b/overview/servers>
+
+- `pm2 link 90n1bqb6mdqm111 mvp52pu0qi8k4v1 EDS`
+
+### Update pm2
+
+- `npm i pm2@latest -g`
+- `pm2 update`
+
+## Other
+
+- `http-server`
+
+## Notes
+
+- `[style.height.%]="100"` // full height grid (as long as content)
+
+## Troubleshooting
+
+- `ERROR in The Angular Compiler requires TypeScript >=3.4.0 and <3.5.0 but 3.5.1 was found instead.`
+ - `npm i typescript@">=3.4.0 <3.5.0"`

back_end/64_lib/libsioclient.a

@@ -40,6 +40,8 @@ endif
 LIBS = -lboost_system -lboost_thread -lboost_timer
 # Boost Logging
 LIBS += -DBOOST_LOG_DYN_LINK -lboost_log_setup -lboost_log -lpthread
+# socket.io-client-cpp
+LIBS += -lsioclient
 
 #################### define the C source files ####################
 SRCS = $(wildcard src/*.cpp)

back_end/Makefile

@@ -0,0 +1,82 @@
+# ATD	3-3-16
+
+#################### Architecture ####################
+arch := $(shell gcc -dumpmachine)
+ifeq ($(arch),x86_64-linux-gnu)
+32_BIT_CPU = 0
+else
+32_BIT_CPU = 1
+endif
+
+#################### Configuration ####################
+
+# .c: gcc; .cpp/.cc: g++
+CC = ccache g++
+
+#################### Compiler Flags ####################
+# -g: allows the use of gdb for finding seg faults: gdb ./main.out ; print [VALUE] ; list ; quit
+# -Wall turns on most, but not all, compiler warnings
+# -v verbose displays more compiler debugging information
+# -Wno-write-strings: gets rid of this warning: deprecated conversion from string constant to ‘char*’ [-Wwrite-strings]
+# -O#: optimizer, makes code faster by disabling debugging features; 3 is fastest
+# -j #: make # files at the same time (1 for each core)
+# -MMD = creates dependency files (.d) from user header files
+# -MT = target of dependency rule
+# -MF = file to write dependencies to
+CFLAGS = -Wall -std=c++14 -Wno-write-strings -O3
+CFLAGS += -DBOOST_LOG_DYN_LINK
+ifeq ($(32_BIT_CPU),1)
+CFLAGS += -m32
+else
+CFLAGS += -m64
+endif
+
+# if a header file changes, it will recompile
+#DEPS = $(wildcard src/*.d)
+
+#################### define library paths, start with -L ####################
+LFLAGS = -L/usr/local/lib -L/usr/lib
+ifeq ($(32_BIT_CPU),1)
+LFLAGS += -L32_lib -L/usr/lib/i386-linux-gnu -L/lib/i386-linux-gnu
+else
+LFLAGS += -L64_lib -L/usr/lib/x86_64-linux-gnu -L/lib/x86_64-linux-gnu
+endif
+
+#################### define libraries (.so, .a) to link into executable ####################
+# start with -l, don't put lib in the name or an extension
+# Boost
+LIBS = -lboost_system -lboost_thread -lboost_timer
+# Boost Logging
+LIBS += -DBOOST_LOG_DYN_LINK -lboost_log_setup -lboost_log -lpthread
+# OpenSSL
+LIBS += -lssl -lcrypto
+
+#################### define the C source files ####################
+SRCS = $(wildcard src/*.cpp)
+
+# define the C object files 
+OBJS = $(addprefix obj/, $(notdir $(SRCS:.cpp=.o)))
+
+# define the executable file 
+EXE = main
+
+# make depend, make clean
+.PHONY: depend clean
+
+#################### make ####################
+all: $(EXE)
+
+$(EXE): $(OBJS)
+$(CC) $(CFLAGS) -o $(EXE) $(OBJS) $(LFLAGS) $(LIBS)
+
+# this is a suffix replacement rule for building .o's from .c's
+# it uses automatic variables $<: the name of the prerequisite of
+# the rule(a .c file) and $@: the name of the target of the rule (a .o file) 
+# (see the gnu make manual section about automatic variables)
+obj/%.o: src/%.cpp
+$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
+
+clean:
+$(RM) obj/*.o *~ $(EXE)
+
+# this last blank line is needed for make to run

back_end/arc/simple-websocket-server/Makefile

@@ -0,0 +1,30 @@
+/*
+ * This file is subject to the terms and conditions defined in
+ * file 'LICENSE.txt', which is part of this source code bundle.
+ */
+
+#ifndef LOGGING_HPP
+#define LOGGING_HPP
+
+#include <boost/log/expressions.hpp>
+#include <boost/log/sources/global_logger_storage.hpp>
+#include <boost/log/support/date_time.hpp>
+#include <boost/log/trivial.hpp>
+#include <boost/log/utility/setup.hpp>
+
+#define TRACE BOOST_LOG_SEV(my_logger::get(), boost::log::trivial::trace) << __FILE__ << "(" << __FUNCTION__ << ":" << __LINE__ << ") >> "
+#define DEBUG BOOST_LOG_SEV(my_logger::get(), boost::log::trivial::debug) << __FILE__ << "(" << __FUNCTION__ << ":" << __LINE__ << ") >> "
+#define INFO BOOST_LOG_SEV(my_logger::get(), boost::log::trivial::info) << __FILE__ << "(" << __FUNCTION__ << ":" << __LINE__ << ") >> "
+#define WARNING BOOST_LOG_SEV(my_logger::get(), boost::log::trivial::warning) << __FILE__ << "(" << __FUNCTION__ << ":" << __LINE__ << ") >> "
+#define ERROR BOOST_LOG_SEV(my_logger::get(), boost::log::trivial::error) << __FILE__ << "(" << __FUNCTION__ << ":" << __LINE__ << ") >> "
+#define FATAL BOOST_LOG_SEV(my_logger::get(), boost::log::trivial::fatal) << __FILE__ << "(" << __FUNCTION__ << ":" << __LINE__ << ") >> "
+
+#define SYS_LOGFILE "log/test.log"
+
+//Narrow-char thread-safe logger.
+typedef boost::log::sources::severity_logger_mt<boost::log::trivial::severity_level> logger_t;
+
+//declares a global logger with a custom initialization
+BOOST_LOG_GLOBAL_LOGGER(my_logger, logger_t)
+
+#endif

back_end/arc/simple-websocket-server/include/logging.hpp

@@ -0,0 +1,34 @@
+/*
+ * This file is subject to the terms and conditions defined in
+ * file 'LICENSE.txt', which is part of this source code bundle.
+ */
+
+#ifndef __WEBSOCKET_HPP
+#define __WEBSOCKET_HPP
+
+#include <string>
+#include <vector>
+#include <sstream>
+#include <set>
+#include <future>
+#include <memory>
+
+#include <simple-websocket-server/client_wss.hpp>
+#include <simple-websocket-server/server_wss.hpp>
+
+#include "logging.hpp" // Boost logging
+
+// Example server: https://gitlab.com/eidheim/Simple-WebSocket-Server/blob/master/wss_examples.cpp 
+
+class websocket
+{
+public:
+// Functions
+websocket(); // class constructor
+~websocket(); // class destructor
+void initialize(std::string crt_path, std::string key_path, int port);
+
+private:
+};
+
+#endif // __websocket_HPP

back_end/arc/simple-websocket-server/include/websocket.hpp

@@ -0,0 +1,53 @@
+/*
+ * This file is subject to the terms and conditions defined in
+ * file 'LICENSE.txt', which is part of this source code bundle.
+ */
+
+#include "../include/logging.hpp"
+
+// CFLAGS += -DBOOST_LOG_DYN_LINK
+// LIBS += -lboost_log_setup -lboost_log -lpthread
+
+namespace logging = boost::log;
+namespace sinks = boost::log::sinks;
+namespace src = boost::log::sources;
+namespace expr = boost::log::expressions;
+namespace attrs = boost::log::attributes;
+namespace keywords = boost::log::keywords;
+
+//Defines a global logger initialization routine
+BOOST_LOG_GLOBAL_LOGGER_INIT(my_logger, logger_t)
+{
+ logger_t lg;
+
+ logging::add_common_attributes();
+
+ logging::add_file_log(
+ keywords::file_name = SYS_LOGFILE,
+keywords::rotation_size = 1024 * 1024 * 20,// megabytes
+keywords::time_based_rotation = boost::log::sinks::file::rotation_at_time_point (0, 0, 0),
+keywords::auto_flush = true,
+ keywords::format = (
+ expr::stream << expr::format_date_time <boost::posix_time::ptime> ("TimeStamp", "%y-%m-%d %H:%M:%S.%f")
+ << " [" << expr::attr <boost::log::trivial::severity_level> ("Severity") << "] "
+ << expr::smessage
+ )
+ );
+
+ logging::add_console_log(
+ std::cout,
+ keywords::format = (
+ expr::stream << expr::format_date_time <boost::posix_time::ptime> ("TimeStamp", "%y-%m-%d %H:%M:%S.%f")
+ << " [" << expr::attr <boost::log::trivial::severity_level> ("Severity") << "] "
+ << expr::smessage
+ )
+ );
+
+ logging::core::get()->set_filter
+ (
+ logging::trivial::severity >= logging::trivial::info
+ );
+ 
+ return lg;
+}
+

back_end/arc/simple-websocket-server/src/logging.cpp

@@ -0,0 +1,35 @@
+#include "../include/websocket.hpp"
+
+int main (void)
+{
+INFO << "program started";
+
+//bool debug = true;
+
+try
+{
+// config
+websocket _websocket;
+std::string crt_path = "/home/elemech/Documents/github/test/angular_cpp_websocket/back_end/simple-websocket-server/ssl/server.crt";
+std::string key_path = "/home/elemech/Documents/github/test/angular_cpp_websocket/back_end/simple-websocket-server/ssl/server.key";
+int port = 8090;
+
+INFO << "initialize websocket server";
+_websocket.initialize(crt_path, key_path, port);
+
+}
+catch (const std::exception &e)
+{
+ERROR << "e.what() = " << e.what();
+return -1;
+}
+catch (int error)
+{
+ERROR << "error >> " << error;
+return -2;
+}
+
+FATAL << "main ended";
+
+return 0;
+}