Reformat and clean project, due to project in project bug/error.

This commit is contained in:
Andrés Uribe Stengel 2020-07-02 18:18:37 +02:00
parent ee686fdc0e
commit 0858409848
19 changed files with 592 additions and 1270 deletions

View File

@ -4,4 +4,4 @@
# - ensuring you don't accidentally deploy one app on top of another
# - providing package authors with aggregated statistics
ihu31ec3qsrr.y6fwoj8zicxf
z43imxy4iekt.ysbqqexn8hym

View File

@ -1,5 +0,0 @@
# Quickstart
## MQTT Server
Public Test Server:

View File

@ -1,5 +1,5 @@
<head>
<title>server</title>
<title>smart_garden_server</title>
</head>
<body>

View File

@ -1,41 +0,0 @@
version: '2' // '3.7'
services:
# MongoDB
mongodb:
image: mongo:latest
environment:
MONGO_INITDB_ROOT_USERNAME: root
MONGO_INITDB_ROOT_PASSWORD: devtest
ports:
- 27017:27017
volumes:
- mongodb_data:/data/db
networks:
- mongodb_net
restart: always
# MQTT
mosquitto:
image: eclipse-mosquitto:latest
ports:
- 1883:1883
- 9001:9001
volumes:
- mosquitto_data:/mqtt
networks:
- mongodb_net
restart: always
# Backend Meteor
# Frontend
volumes:
mongodb_data:
mosquitto_data:
# custom
networks:
mongodb_net:

586
package-lock.json generated Normal file
View File

@ -0,0 +1,586 @@
{
"name": "smart_garden_server",
"requires": true,
"lockfileVersion": 1,
"dependencies": {
"@babel/runtime": {
"version": "7.10.4",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.4.tgz",
"integrity": "sha512-UpTN5yUJr9b4EX2CnGNWIvER7Ab83ibv0pcvvHc4UOdrBI5jb8bj+32cCwPX6xu0mt2daFNjYhoi+X7beH0RSw==",
"requires": {
"regenerator-runtime": "^0.13.4"
}
},
"jquery": {
"version": "3.5.1",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
"integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="
},
"meteor-node-stubs": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-1.0.0.tgz",
"integrity": "sha512-QJwyv23wyXD3uEMzk5Xr/y5ezoVlCbHvBbrgdkVadn84dmifLRbs0PtD6EeNw5NLIk+SQSfxld7IMdEsneGz5w==",
"requires": {
"assert": "^1.4.1",
"browserify-zlib": "^0.2.0",
"buffer": "^5.2.1",
"console-browserify": "^1.1.0",
"constants-browserify": "^1.0.0",
"crypto-browserify": "^3.12.0",
"domain-browser": "^1.2.0",
"events": "^3.0.0",
"https-browserify": "^1.0.0",
"os-browserify": "^0.3.0",
"path-browserify": "^1.0.0",
"process": "^0.11.10",
"punycode": "^2.1.1",
"querystring-es3": "^0.2.1",
"readable-stream": "^3.3.0",
"stream-browserify": "^2.0.2",
"stream-http": "^3.0.0",
"string_decoder": "^1.2.0",
"timers-browserify": "^2.0.10",
"tty-browserify": "0.0.1",
"url": "^0.11.0",
"util": "^0.11.1",
"vm-browserify": "^1.1.0"
},
"dependencies": {
"asn1.js": {
"version": "4.10.1",
"bundled": true,
"requires": {
"bn.js": "^4.0.0",
"inherits": "^2.0.1",
"minimalistic-assert": "^1.0.0"
}
},
"assert": {
"version": "1.4.1",
"bundled": true,
"requires": {
"util": "0.10.3"
},
"dependencies": {
"util": {
"version": "0.10.3",
"bundled": true,
"requires": {
"inherits": "2.0.1"
}
}
}
},
"base64-js": {
"version": "1.3.0",
"bundled": true
},
"bn.js": {
"version": "4.11.8",
"bundled": true
},
"brorand": {
"version": "1.1.0",
"bundled": true
},
"browserify-aes": {
"version": "1.2.0",
"bundled": true,
"requires": {
"buffer-xor": "^1.0.3",
"cipher-base": "^1.0.0",
"create-hash": "^1.1.0",
"evp_bytestokey": "^1.0.3",
"inherits": "^2.0.1",
"safe-buffer": "^5.0.1"
}
},
"browserify-cipher": {
"version": "1.0.1",
"bundled": true,
"requires": {
"browserify-aes": "^1.0.4",
"browserify-des": "^1.0.0",
"evp_bytestokey": "^1.0.0"
}
},
"browserify-des": {
"version": "1.0.2",
"bundled": true,
"requires": {
"cipher-base": "^1.0.1",
"des.js": "^1.0.0",
"inherits": "^2.0.1",
"safe-buffer": "^5.1.2"
}
},
"browserify-rsa": {
"version": "4.0.1",
"bundled": true,
"requires": {
"bn.js": "^4.1.0",
"randombytes": "^2.0.1"
}
},
"browserify-sign": {
"version": "4.0.4",
"bundled": true,
"requires": {
"bn.js": "^4.1.1",
"browserify-rsa": "^4.0.0",
"create-hash": "^1.1.0",
"create-hmac": "^1.1.2",
"elliptic": "^6.0.0",
"inherits": "^2.0.1",
"parse-asn1": "^5.0.0"
}
},
"browserify-zlib": {
"version": "0.2.0",
"bundled": true,
"requires": {
"pako": "~1.0.5"
}
},
"buffer": {
"version": "5.2.1",
"bundled": true,
"requires": {
"base64-js": "^1.0.2",
"ieee754": "^1.1.4"
}
},
"buffer-xor": {
"version": "1.0.3",
"bundled": true
},
"builtin-status-codes": {
"version": "3.0.0",
"bundled": true
},
"cipher-base": {
"version": "1.0.4",
"bundled": true,
"requires": {
"inherits": "^2.0.1",
"safe-buffer": "^5.0.1"
}
},
"console-browserify": {
"version": "1.1.0",
"bundled": true,
"requires": {
"date-now": "^0.1.4"
}
},
"constants-browserify": {
"version": "1.0.0",
"bundled": true
},
"core-util-is": {
"version": "1.0.2",
"bundled": true
},
"create-ecdh": {
"version": "4.0.3",
"bundled": true,
"requires": {
"bn.js": "^4.1.0",
"elliptic": "^6.0.0"
}
},
"create-hash": {
"version": "1.2.0",
"bundled": true,
"requires": {
"cipher-base": "^1.0.1",
"inherits": "^2.0.1",
"md5.js": "^1.3.4",
"ripemd160": "^2.0.1",
"sha.js": "^2.4.0"
}
},
"create-hmac": {
"version": "1.1.7",
"bundled": true,
"requires": {
"cipher-base": "^1.0.3",
"create-hash": "^1.1.0",
"inherits": "^2.0.1",
"ripemd160": "^2.0.0",
"safe-buffer": "^5.0.1",
"sha.js": "^2.4.8"
}
},
"crypto-browserify": {
"version": "3.12.0",
"bundled": true,
"requires": {
"browserify-cipher": "^1.0.0",
"browserify-sign": "^4.0.0",
"create-ecdh": "^4.0.0",
"create-hash": "^1.1.0",
"create-hmac": "^1.1.0",
"diffie-hellman": "^5.0.0",
"inherits": "^2.0.1",
"pbkdf2": "^3.0.3",
"public-encrypt": "^4.0.0",
"randombytes": "^2.0.0",
"randomfill": "^1.0.3"
}
},
"date-now": {
"version": "0.1.4",
"bundled": true
},
"des.js": {
"version": "1.0.0",
"bundled": true,
"requires": {
"inherits": "^2.0.1",
"minimalistic-assert": "^1.0.0"
}
},
"diffie-hellman": {
"version": "5.0.3",
"bundled": true,
"requires": {
"bn.js": "^4.1.0",
"miller-rabin": "^4.0.0",
"randombytes": "^2.0.0"
}
},
"domain-browser": {
"version": "1.2.0",
"bundled": true
},
"elliptic": {
"version": "6.4.1",
"bundled": true,
"requires": {
"bn.js": "^4.4.0",
"brorand": "^1.0.1",
"hash.js": "^1.0.0",
"hmac-drbg": "^1.0.0",
"inherits": "^2.0.1",
"minimalistic-assert": "^1.0.0",
"minimalistic-crypto-utils": "^1.0.0"
}
},
"events": {
"version": "3.0.0",
"bundled": true
},
"evp_bytestokey": {
"version": "1.0.3",
"bundled": true,
"requires": {
"md5.js": "^1.3.4",
"safe-buffer": "^5.1.1"
}
},
"hash-base": {
"version": "3.0.4",
"bundled": true,
"requires": {
"inherits": "^2.0.1",
"safe-buffer": "^5.0.1"
}
},
"hash.js": {
"version": "1.1.7",
"bundled": true,
"requires": {
"inherits": "^2.0.3",
"minimalistic-assert": "^1.0.1"
},
"dependencies": {
"inherits": {
"version": "2.0.3",
"bundled": true
}
}
},
"hmac-drbg": {
"version": "1.0.1",
"bundled": true,
"requires": {
"hash.js": "^1.0.3",
"minimalistic-assert": "^1.0.0",
"minimalistic-crypto-utils": "^1.0.1"
}
},
"https-browserify": {
"version": "1.0.0",
"bundled": true
},
"ieee754": {
"version": "1.1.13",
"bundled": true
},
"inherits": {
"version": "2.0.1",
"bundled": true
},
"isarray": {
"version": "1.0.0",
"bundled": true
},
"md5.js": {
"version": "1.3.5",
"bundled": true,
"requires": {
"hash-base": "^3.0.0",
"inherits": "^2.0.1",
"safe-buffer": "^5.1.2"
}
},
"miller-rabin": {
"version": "4.0.1",
"bundled": true,
"requires": {
"bn.js": "^4.0.0",
"brorand": "^1.0.1"
}
},
"minimalistic-assert": {
"version": "1.0.1",
"bundled": true
},
"minimalistic-crypto-utils": {
"version": "1.0.1",
"bundled": true
},
"os-browserify": {
"version": "0.3.0",
"bundled": true
},
"pako": {
"version": "1.0.10",
"bundled": true
},
"parse-asn1": {
"version": "5.1.4",
"bundled": true,
"requires": {
"asn1.js": "^4.0.0",
"browserify-aes": "^1.0.0",
"create-hash": "^1.1.0",
"evp_bytestokey": "^1.0.0",
"pbkdf2": "^3.0.3",
"safe-buffer": "^5.1.1"
}
},
"path-browserify": {
"version": "1.0.0",
"bundled": true
},
"pbkdf2": {
"version": "3.0.17",
"bundled": true,
"requires": {
"create-hash": "^1.1.2",
"create-hmac": "^1.1.4",
"ripemd160": "^2.0.1",
"safe-buffer": "^5.0.1",
"sha.js": "^2.4.8"
}
},
"process": {
"version": "0.11.10",
"bundled": true
},
"process-nextick-args": {
"version": "2.0.0",
"bundled": true
},
"public-encrypt": {
"version": "4.0.3",
"bundled": true,
"requires": {
"bn.js": "^4.1.0",
"browserify-rsa": "^4.0.0",
"create-hash": "^1.1.0",
"parse-asn1": "^5.0.0",
"randombytes": "^2.0.1",
"safe-buffer": "^5.1.2"
}
},
"punycode": {
"version": "2.1.1",
"bundled": true
},
"querystring": {
"version": "0.2.0",
"bundled": true
},
"querystring-es3": {
"version": "0.2.1",
"bundled": true
},
"randombytes": {
"version": "2.1.0",
"bundled": true,
"requires": {
"safe-buffer": "^5.1.0"
}
},
"randomfill": {
"version": "1.0.4",
"bundled": true,
"requires": {
"randombytes": "^2.0.5",
"safe-buffer": "^5.1.0"
}
},
"readable-stream": {
"version": "3.3.0",
"bundled": true,
"requires": {
"inherits": "^2.0.3",
"string_decoder": "^1.1.1",
"util-deprecate": "^1.0.1"
},
"dependencies": {
"inherits": {
"version": "2.0.3",
"bundled": true
}
}
},
"ripemd160": {
"version": "2.0.2",
"bundled": true,
"requires": {
"hash-base": "^3.0.0",
"inherits": "^2.0.1"
}
},
"safe-buffer": {
"version": "5.1.2",
"bundled": true
},
"setimmediate": {
"version": "1.0.5",
"bundled": true
},
"sha.js": {
"version": "2.4.11",
"bundled": true,
"requires": {
"inherits": "^2.0.1",
"safe-buffer": "^5.0.1"
}
},
"stream-browserify": {
"version": "2.0.2",
"bundled": true,
"requires": {
"inherits": "~2.0.1",
"readable-stream": "^2.0.2"
},
"dependencies": {
"readable-stream": {
"version": "2.3.6",
"bundled": true,
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
"isarray": "~1.0.0",
"process-nextick-args": "~2.0.0",
"safe-buffer": "~5.1.1",
"string_decoder": "~1.1.1",
"util-deprecate": "~1.0.1"
},
"dependencies": {
"inherits": {
"version": "2.0.3",
"bundled": true
}
}
},
"string_decoder": {
"version": "1.1.1",
"bundled": true,
"requires": {
"safe-buffer": "~5.1.0"
}
}
}
},
"stream-http": {
"version": "3.0.0",
"bundled": true,
"requires": {
"builtin-status-codes": "^3.0.0",
"inherits": "^2.0.1",
"readable-stream": "^3.0.6",
"xtend": "^4.0.0"
}
},
"string_decoder": {
"version": "1.2.0",
"bundled": true,
"requires": {
"safe-buffer": "~5.1.0"
}
},
"timers-browserify": {
"version": "2.0.10",
"bundled": true,
"requires": {
"setimmediate": "^1.0.4"
}
},
"tty-browserify": {
"version": "0.0.1",
"bundled": true
},
"url": {
"version": "0.11.0",
"bundled": true,
"requires": {
"punycode": "1.3.2",
"querystring": "0.2.0"
},
"dependencies": {
"punycode": {
"version": "1.3.2",
"bundled": true
}
}
},
"util": {
"version": "0.11.1",
"bundled": true,
"requires": {
"inherits": "2.0.3"
},
"dependencies": {
"inherits": {
"version": "2.0.3",
"bundled": true
}
}
},
"util-deprecate": {
"version": "1.0.2",
"bundled": true
},
"vm-browserify": {
"version": "1.1.0",
"bundled": true
},
"xtend": {
"version": "4.0.1",
"bundled": true
}
}
},
"regenerator-runtime": {
"version": "0.13.5",
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz",
"integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA=="
}
}
}

View File

@ -1,5 +1,5 @@
{
"name": "server",
"name": "smart_garden_server",
"private": true,
"scripts": {
"start": "meteor run",
@ -10,8 +10,7 @@
"dependencies": {
"@babel/runtime": "^7.8.3",
"jquery": "^3.4.1",
"meteor-node-stubs": "^1.0.0",
"mqtt": "^4.1.0"
"meteor-node-stubs": "^1.0.0"
},
"meteor": {
"mainModule": {

1
server/.gitignore vendored
View File

@ -1 +0,0 @@
node_modules/

View File

@ -1,16 +0,0 @@
const mqtt = require('mqtt')
const client = mqtt.connect('mqtt://mqtt.timovolkmann.de')
client.on('connect', function () {
client.subscribe('smartgarden/updates', function (err) {
if (!err) {
client.publish('smartgarden/updates', 'Hello mqtt')
}
})
})
client.on('message', function (topic, message) {
// message is Buffer
console.log('topic:', topic.toString(), 'message:', message.toString())
//client.end()
})

1200
server/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,9 +1,9 @@
import assert from "assert";
describe("server", function () {
describe("smart_garden_server", function () {
it("package.json has correct name", async function () {
const { name } = await import("../package.json");
assert.strictEqual(name, "server");
assert.strictEqual(name, "smart_garden_server");
});
if (Meteor.isClient) {