From d179b6fba9c52294aa631fb3ede63653fae176f8 Mon Sep 17 00:00:00 2001 From: lizhizhou Date: Sat, 3 Feb 2018 23:03:36 +0800 Subject: [PATCH 1/9] Add gun package --- package.json | 59 ++++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/package.json b/package.json index dd85045..b1eed27 100644 --- a/package.json +++ b/package.json @@ -16,46 +16,47 @@ "jslint" ], "dependencies": { + "assert": "*", "bluebird": "*", - "optimist": "*", - "express": "~4.0.0", - "express-session": "*", - "express-http-proxy": "*", - "passport": ">= 0.0.0", - "socket.io": "*", - "deasync": "*", - "data.io": "*", - "tingodb": "0.3.5", - "swagger-tools": "*", "body-parser": "*", - "log4js": "*", - "assert": "*", - "multer": "0.1.6", - "collections": "*", - "ffi": "*", - "shelljs": "*", - "figlet": "*", - "mqtt": "^1.14.1", - "mocha": "*", - "node-uuid": "*", - "mosca": "1.1.0", "chai": "*", - "request": "*", - "tcp-port-used": "*", - "tty.js": "*", + "coap": "0.17.0", + "collections": "*", "cron": "*", + "data.io": "*", + "deasync": "*", + "deep-equal": "^1.0.1", "diffsync": "*", - "node-zookeeper-client": "*", + "express": "~4.0.0", + "express-http-proxy": "*", + "express-session": "*", + "ffi": "*", + "figlet": "*", + "gun": "^0.9.93", + "helmet": "^3.6.0", "kafka-rest": "*", "localtunnel": "*", - "tingyun": "*", + "log4js": "*", "mathjs": "*", "microtime": "^2.1.2", - "coap": "0.17.0", - "helmet": "^3.6.0", + "mocha": "*", + "mosca": "1.1.0", + "mqtt": "^1.14.1", + "multer": "0.1.6", + "node-uuid": "*", + "node-zookeeper-client": "*", "numeric": "*", + "optimist": "*", + "passport": ">= 0.0.0", "plotly": "0.2.13", - "deep-equal": "^1.0.1" + "request": "*", + "shelljs": "*", + "socket.io": "*", + "swagger-tools": "*", + "tcp-port-used": "*", + "tingodb": "0.3.5", + "tingyun": "*", + "tty.js": "*" }, "author": "Zhizhou Li", "license": "GPL", From 62f679829c7ab77380f0a88d6508a34b91c86f7b Mon Sep 17 00:00:00 2001 From: lizhizhou Date: Tue, 13 Feb 2018 23:45:29 +0800 Subject: [PATCH 2/9] Add gun --- page/index.html | 7 ++++++- server.js | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/page/index.html b/page/index.html index 1c30cf9..f83d12c 100644 --- a/page/index.html +++ b/page/index.html @@ -45,7 +45,12 @@ document.getElementById("url").innerHTML = json.url } - +

Hello openfpgaduino

cide diff --git a/server.js b/server.js index 665ade8..d1511b2 100644 --- a/server.js +++ b/server.js @@ -39,6 +39,7 @@ var multer = require('multer'); var sockectio = require('socket.io'); var diffsync = require('diffsync'); var tingodb = require('tingodb')(); +var Gun = require('gun'); var optimist = require('optimist'); var figlet = require('figlet'); var node_uuid = require('node-uuid'); @@ -95,6 +96,7 @@ app.use(express.static(__dirname + '/page')); app.use(multer({ dest: './uploads/' })); +app.use(Gun.serve).use(express.static(__dirname)); function parser_parameter(fun_str) { return fun_str.toString() @@ -112,6 +114,7 @@ var messages = data.resource('messages'); var request = require('request').defaults({ baseUrl: "http://localhost:" + port + "/" }); +Gun({file: 'gundata.json', web: server}); function loadmodule(module) { for (m in module) { // load all modules in apps From 94bc68916f6435f5004caad1a36cbb665c43eb6a Mon Sep 17 00:00:00 2001 From: lizhizhou Date: Tue, 13 Feb 2018 23:45:42 +0800 Subject: [PATCH 3/9] Add bower gun --- page/bower.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/page/bower.json b/page/bower.json index 0350658..3beb9c6 100644 --- a/page/bower.json +++ b/page/bower.json @@ -7,7 +7,8 @@ "requirejs": "2.1.14", "swagger-ui": "2.1.4", "underscore": "*", - "collections": "*" + "collections": "*", + "gun": "*" }, "devDependencies": {} } From e9c8e56ed70b52257a72f16337c949a9f3aeb141 Mon Sep 17 00:00:00 2001 From: lizhizhou Date: Wed, 20 Jun 2018 17:31:46 +0800 Subject: [PATCH 4/9] Use pouchdb to do the diffsync --- package.json | 24 ++++++++++++------------ server.js | 19 +++++++++++++++---- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index b1eed27..380c18f 100644 --- a/package.json +++ b/package.json @@ -18,22 +18,28 @@ "dependencies": { "assert": "*", "bluebird": "*", + "optimist": "*", + "express": "~4.0.0", + "express-session": "*", + "express-http-proxy": "*", + "passport": ">= 0.0.0", + "socket.io": "*", + "deasync": "*", + "data.io": "*", + "tingodb": "0.3.5", + "pouchdb": "3.1.0", + "swagger-tools": "*", "body-parser": "*", "chai": "*", "coap": "0.17.0", "collections": "*", "cron": "*", - "data.io": "*", - "deasync": "*", "deep-equal": "^1.0.1", - "diffsync": "*", - "express": "~4.0.0", - "express-http-proxy": "*", - "express-session": "*", "ffi": "*", "figlet": "*", "gun": "^0.9.93", "helmet": "^3.6.0", + "node-zookeeper-client": "*", "kafka-rest": "*", "localtunnel": "*", "log4js": "*", @@ -44,17 +50,11 @@ "mqtt": "^1.14.1", "multer": "0.1.6", "node-uuid": "*", - "node-zookeeper-client": "*", "numeric": "*", - "optimist": "*", - "passport": ">= 0.0.0", "plotly": "0.2.13", "request": "*", "shelljs": "*", - "socket.io": "*", - "swagger-tools": "*", "tcp-port-used": "*", - "tingodb": "0.3.5", "tingyun": "*", "tty.js": "*" }, diff --git a/server.js b/server.js index d1511b2..7c37327 100644 --- a/server.js +++ b/server.js @@ -37,7 +37,8 @@ var loadDir = require('./loaddir'); var module = loadDir(config.app_path); var multer = require('multer'); var sockectio = require('socket.io'); -var diffsync = require('diffsync'); +var PouchDB = require('pouchdb'); +var pouchdb = new PouchDB('dbname'); var tingodb = require('tingodb')(); var Gun = require('gun'); var optimist = require('optimist'); @@ -107,8 +108,6 @@ function parser_parameter(fun_str) { var port = argv.port || process.env.PORT || config.port; // set our port var server = http.createServer(app); var io = sockectio.listen(server); -var dataAdapter = new diffsync.InMemoryDataAdapter(); -var diffSyncServer = new diffsync.Server(dataAdapter, io); var data = require('data.io')(io); var messages = data.resource('messages'); var request = require('request').defaults({ @@ -158,7 +157,19 @@ function dynamicloadmodule(filename) { event.addListener('load', dynamicloadmodule); -//console.log(numeric.add([1,2],[3,4],[5,6],[7,8])) +pouchdb.put({ + _id: 'dave@gmail.com', + name: 'David', + age: 69 +}); + +pouchdb.changes().on('change', function() { + logger.info('Ch-Ch-Changes'); +}); + + +// pouchdb.replicate.to('http://example.com/mydb'); +// console.log(numeric.add([1,2],[3,4],[5,6],[7,8])) server.listen(port); logger.info("Restful API server run on port", port) From 179832768d78ce245c9d4bea273bc09fb54a6d40 Mon Sep 17 00:00:00 2001 From: lizhizhou Date: Sat, 14 Jul 2018 16:41:40 +0800 Subject: [PATCH 5/9] Add ssh support beta --- keys/cet.sh | 10 ++++++++++ keys/openssl.cnf | 25 +++++++++++++++++++++++++ server.js | 7 ++++++- 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100755 keys/cet.sh create mode 100644 keys/openssl.cnf diff --git a/keys/cet.sh b/keys/cet.sh new file mode 100755 index 0000000..24974a0 --- /dev/null +++ b/keys/cet.sh @@ -0,0 +1,10 @@ +openssl genrsa -out ca-key.pem -des 1024 +openssl req -new -key ca-key.pem -out ca-csr.pem +openssl x509 -req -in ca-csr.pem -signkey ca-key.pem -out ca-cert.pem +openssl genrsa -out server-key.pem 1024 +openssl req -new -key server-key.pem -config openssl.cnf -out server-csr.pem +openssl x509 -req -CA ca-cert.pem -CAkey ca-key.pem -CAcreateserial -in server-csr.pem -out server-cert.pem -extensions v3_req -extfile openssl.cnf +openssl genrsa -out client-key.pem +openssl req -new -key client-key.pem -out client-csr.pem +openssl x509 -req -CA ca-cert.pem -CAkey ca-key.pem -CAcreateserial -in client-csr.pem -out client-cert.pem + diff --git a/keys/openssl.cnf b/keys/openssl.cnf new file mode 100644 index 0000000..be3715e --- /dev/null +++ b/keys/openssl.cnf @@ -0,0 +1,25 @@ +[req] + distinguished_name = req_distinguished_name + req_extensions = v3_req + + [req_distinguished_name] + countryName = Country Name (2 letter code) + countryName_default = CN + stateOrProvinceName = State or Province Name (full name) + stateOrProvinceName_default = BeiJing + localityName = Locality Name (eg, city) + localityName_default = YaYunCun + organizationalUnitName = Organizational Unit Name (eg, section) + organizationalUnitName_default = Domain Control Validated + commonName = Internet Widgits Ltd + commonName_max = 64 + + [ v3_req ] + # Extensions to add to a certificate request + basicConstraints = CA:FALSE + keyUsage = nonRepudiation, digitalSignature, keyEncipherment + subjectAltName = @alt_names + + [alt_names] + #注意这个IP.1的设置，IP地址需要和你的服务器的监听地址一样 + IP.1 = 127.0.0.1 diff --git a/server.js b/server.js index 7c37327..0726cff 100644 --- a/server.js +++ b/server.js @@ -52,6 +52,10 @@ var numeric = require('numeric'); var equal = require('deep-equal'); var KafkaRest = require('kafka-rest'); var kafka = new KafkaRest({ 'url': config.kafka }); +var https = require('https'); +var privateKey = fs.readFileSync('server-key.pem', 'utf8'); +var certificate = fs.readFileSync('server-cert.pem', 'utf8'); +var credentials = {key: privateKey, cert: certificate}; require('tingyun'); @@ -104,7 +108,7 @@ function parser_parameter(fun_str) { .replace(/((\/\/.*$)|(\/\*[\s\S]*?\*\/)|(\s))/mg, '') // remove spaces and comments .match(/^function\s*[^$]*\(\s*([^$]*)\)/m)[1] // get parameter } - +var httpsServer = https.createServer(credentials, app); var port = argv.port || process.env.PORT || config.port; // set our port var server = http.createServer(app); var io = sockectio.listen(server); @@ -172,4 +176,5 @@ pouchdb.changes().on('change', function() { // console.log(numeric.add([1,2],[3,4],[5,6],[7,8])) server.listen(port); +httpsServer.listen(8443); logger.info("Restful API server run on port", port) From d4fd10ce962f222a4618f15b3b358c5e8b97e59e Mon Sep 17 00:00:00 2001 From: lizhizhou Date: Sat, 14 Jul 2018 22:14:19 +0800 Subject: [PATCH 6/9] Fix version Add ssh support --- config.json | 1 + package.json | 8 ++++---- page/bower.json | 3 +-- server.js | 34 ++++++++++++++++++---------------- 4 files changed, 24 insertions(+), 22 deletions(-) diff --git a/config.json b/config.json index b78151e..9476ad3 100644 --- a/config.json +++ b/config.json @@ -10,6 +10,7 @@ "server": "INFO" }, "port" : "8080", + "sshport" : "8443", "telnet" : "8022", "app_path":"./apps/", "unittest_path":"./ut/", diff --git a/package.json b/package.json index 380c18f..a3be224 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "express-session": "*", "express-http-proxy": "*", "passport": ">= 0.0.0", - "socket.io": "*", + "socket.io": "1.7.4", "deasync": "*", "data.io": "*", "tingodb": "0.3.5", @@ -37,12 +37,12 @@ "deep-equal": "^1.0.1", "ffi": "*", "figlet": "*", - "gun": "^0.9.93", + "gun": "0.7.0", "helmet": "^3.6.0", "node-zookeeper-client": "*", "kafka-rest": "*", "localtunnel": "*", - "log4js": "*", + "log4js": "1.1.1", "mathjs": "*", "microtime": "^2.1.2", "mocha": "*", @@ -53,7 +53,7 @@ "numeric": "*", "plotly": "0.2.13", "request": "*", - "shelljs": "*", + "shelljs": "0.7.1", "tcp-port-used": "*", "tingyun": "*", "tty.js": "*" diff --git a/page/bower.json b/page/bower.json index 3beb9c6..0350658 100644 --- a/page/bower.json +++ b/page/bower.json @@ -7,8 +7,7 @@ "requirejs": "2.1.14", "swagger-ui": "2.1.4", "underscore": "*", - "collections": "*", - "gun": "*" + "collections": "*" }, "devDependencies": {} } diff --git a/server.js b/server.js index 0726cff..0b31ea2 100644 --- a/server.js +++ b/server.js @@ -37,10 +37,10 @@ var loadDir = require('./loaddir'); var module = loadDir(config.app_path); var multer = require('multer'); var sockectio = require('socket.io'); -var PouchDB = require('pouchdb'); -var pouchdb = new PouchDB('dbname'); +//var PouchDB = require('pouchdb'); +//var pouchdb = new PouchDB('dbname'); var tingodb = require('tingodb')(); -var Gun = require('gun'); +//var Gun = require('gun'); var optimist = require('optimist'); var figlet = require('figlet'); var node_uuid = require('node-uuid'); @@ -53,8 +53,8 @@ var equal = require('deep-equal'); var KafkaRest = require('kafka-rest'); var kafka = new KafkaRest({ 'url': config.kafka }); var https = require('https'); -var privateKey = fs.readFileSync('server-key.pem', 'utf8'); -var certificate = fs.readFileSync('server-cert.pem', 'utf8'); +var privateKey = fs.readFileSync('keys/server-key.pem', 'utf8'); +var certificate = fs.readFileSync('keys/server-cert.pem', 'utf8'); var credentials = {key: privateKey, cert: certificate}; require('tingyun'); @@ -101,7 +101,7 @@ app.use(express.static(__dirname + '/page')); app.use(multer({ dest: './uploads/' })); -app.use(Gun.serve).use(express.static(__dirname)); +//app.use(Gun.serve).use(express.static(__dirname)); function parser_parameter(fun_str) { return fun_str.toString() @@ -110,6 +110,7 @@ function parser_parameter(fun_str) { } var httpsServer = https.createServer(credentials, app); var port = argv.port || process.env.PORT || config.port; // set our port +var sshport = argv.sshport || process.env.SSHPORT || config.sshport; // set our port var server = http.createServer(app); var io = sockectio.listen(server); var data = require('data.io')(io); @@ -117,7 +118,7 @@ var messages = data.resource('messages'); var request = require('request').defaults({ baseUrl: "http://localhost:" + port + "/" }); -Gun({file: 'gundata.json', web: server}); +//Gun({file: 'gundata.json', web: server}); function loadmodule(module) { for (m in module) { // load all modules in apps @@ -161,20 +162,21 @@ function dynamicloadmodule(filename) { event.addListener('load', dynamicloadmodule); -pouchdb.put({ - _id: 'dave@gmail.com', - name: 'David', - age: 69 -}); +// pouchdb.put({ +// _id: 'dave@gmail.com', +// name: 'David', +// age: 69 +// }); -pouchdb.changes().on('change', function() { - logger.info('Ch-Ch-Changes'); -}); +// pouchdb.changes().on('change', function() { +// logger.info('Ch-Ch-Changes'); +// }); // pouchdb.replicate.to('http://example.com/mydb'); // console.log(numeric.add([1,2],[3,4],[5,6],[7,8])) server.listen(port); -httpsServer.listen(8443); +httpsServer.listen(sshport); logger.info("Restful API server run on port", port) +logger.info("Restful SSH API server run on port", sshport) From 3de5dcccccde1c4e806d1995abb073a52da2bb19 Mon Sep 17 00:00:00 2001 From: lizhizhou Date: Sat, 14 Jul 2018 23:17:45 +0800 Subject: [PATCH 7/9] bug fix --- apps/fpga.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/fpga.js b/apps/fpga.js index 3511ecd..5fea07d 100644 --- a/apps/fpga.js +++ b/apps/fpga.js @@ -1,4 +1,4 @@ -module.exports = function(app, logger, db, fs) { +module.exports = function(app, logger, db, fs, io) { var p = require('child_process'); var fpga = require('.././build/Release/openfpgaduino'); var express = require('express'); From 759e83d030f1e51ffc3aaf550843ec8fd31b23ac Mon Sep 17 00:00:00 2001 From: lizhizhou Date: Sat, 18 Aug 2018 16:07:07 +0800 Subject: [PATCH 8/9] Add deeplearning --- page/index.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/page/index.html b/page/index.html index f83d12c..160356b 100644 --- a/page/index.html +++ b/page/index.html @@ -64,6 +64,7 @@

Socketio

tunnel

deeplearning

- \ No newline at end of file + From efda79987c105b749b2dc5f220ac9ac183bd266b Mon Sep 17 00:00:00 2001 From: lizhizhou Date: Thu, 30 Aug 2018 10:57:24 +0800 Subject: [PATCH 9/9] update ignore file --- keys/.gitignore | 4 ++++ page/.gitignore | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 keys/.gitignore create mode 100644 page/.gitignore diff --git a/keys/.gitignore b/keys/.gitignore new file mode 100644 index 0000000..f7c9a7b --- /dev/null +++ b/keys/.gitignore @@ -0,0 +1,4 @@ +*~ +*.pem +*.srl + diff --git a/page/.gitignore b/page/.gitignore new file mode 100644 index 0000000..13dfadc --- /dev/null +++ b/page/.gitignore @@ -0,0 +1,4 @@ +blocklyide +bower_components +dl +