lukechilds
/
sphinx-relay
mirror of https://github.com/lukechilds/sphinx-relay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

build typescript

master
Evan Feenstra 4 years ago
parent
e2abe69de5
commit
a6936d95e2
6 changed files with 14 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      dist/src/utils/cert.js
  2. 2
      dist/src/utils/cert.js.map
  3. 1
      dist/src/utils/config.js
  4. 2
      dist/src/utils/config.js.map
  5. 8
      dist/src/utils/setup.js
  6. 2
      dist/src/utils/setup.js.map

4
dist/src/utils/cert.js
View File

@ -123,7 +123,7 @@ function downloadCert(id, apiKey) {
return res.data; return res.data;
}); });
} }
function getCertificate(endpoint, port, save_ssl) { function getCertificate(domain, port, save_ssl) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
if (fs_1.existsSync(__dirname + "/zerossl/tls.cert") && fs_1.existsSync(__dirname + "/zerossl/tls.key")) { if (fs_1.existsSync(__dirname + "/zerossl/tls.cert") && fs_1.existsSync(__dirname + "/zerossl/tls.key")) {
var certificate = fs_1.readFileSync(__dirname + '/zerossl/tls.cert', 'utf-8').toString(); var certificate = fs_1.readFileSync(__dirname + '/zerossl/tls.cert', 'utf-8').toString();
@ -139,6 +139,8 @@ function getCertificate(endpoint, port, save_ssl) {
if (!apiKey) { if (!apiKey) {
throw new Error("=> [ssl] ZEROSSL_API_KEY is not set"); throw new Error("=> [ssl] ZEROSSL_API_KEY is not set");
} }
var endpoint_tmp = domain.replace('https://', '');
var endpoint = endpoint_tmp.replace(':3001', '');
var keys = forge.pki.rsa.generateKeyPair(2048); var keys = forge.pki.rsa.generateKeyPair(2048);
var csr = generateCsr(keys, endpoint); var csr = generateCsr(keys, endpoint);
console.log("=> [ssl] Generated CSR"); console.log("=> [ssl] Generated CSR");

2
dist/src/utils/cert.js.map
View File

File diff suppressed because one or more lines are too long

1
dist/src/utils/config.js
View File

@ -22,6 +22,7 @@ function loadConfig() {
media_host: ENV.MEDIA_HOST || config.media_host, media_host: ENV.MEDIA_HOST || config.media_host,
tribes_host: ENV.TRIBES_HOST || config.tribes_host, tribes_host: ENV.TRIBES_HOST || config.tribes_host,
public_url: ENV.PUBLIC_URL || config.public_url, public_url: ENV.PUBLIC_URL || config.public_url,
connection_string_path: ENV.CONNECTION_STRING_PATH || config.connection_string_path,
ssl: { ssl: {
enabled: (ENV.SSL_ENABLED || (config.ssl && config.ssl.enabled)) ? true : false, enabled: (ENV.SSL_ENABLED || (config.ssl && config.ssl.enabled)) ? true : false,
save: (ENV.SSL_SAVE || (config.ssl && config.ssl.save)) ? true : false, save: (ENV.SSL_SAVE || (config.ssl && config.ssl.save)) ? true : false,

2
dist/src/utils/config.js.map
View File

@ -1 +1 @@
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/utils/config.ts"],"names":[],"mappings":";;AAAA,6BAA4B;AAE5B,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,aAAa,CAAC;AAClD,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,uBAAuB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;AAC1E,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAA;AAEvB,SAAgB,UAAU;IACxB,OAAO;QACL,SAAS,EAAE,GAAG,CAAC,SAAS,IAAI,MAAM,CAAC,SAAS;QAC5C,iBAAiB,EAAE,GAAG,CAAC,iBAAiB,IAAI,MAAM,CAAC,iBAAiB;QACpE,YAAY,EAAE,GAAG,CAAC,YAAY,IAAI,MAAM,CAAC,YAAY;QACrD,gBAAgB,EAAE,GAAG,CAAC,gBAAgB,IAAI,MAAM,CAAC,gBAAgB;QACjE,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO;QACtC,MAAM,EAAE,GAAG,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM;QACnC,kBAAkB,EAAE,GAAG,CAAC,kBAAkB,IAAI,MAAM,CAAC,kBAAkB;QACvE,cAAc,EAAE,GAAG,CAAC,cAAc,IAAI,MAAM,CAAC,cAAc;QAC3D,QAAQ,EAAE,GAAG,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ;QACzC,WAAW,EAAE,GAAG,CAAC,WAAW,IAAI,MAAM,CAAC,WAAW;QAClD,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO;QACtC,cAAc,EAAE,GAAG,CAAC,cAAc,IAAI,MAAM,CAAC,cAAc;QAC3D,oBAAoB,EAAE,GAAG,CAAC,oBAAoB,IAAI,MAAM,CAAC,oBAAoB;QAC7E,UAAU,EAAE,GAAG,CAAC,UAAU,IAAI,MAAM,CAAC,UAAU;QAC/C,WAAW,EAAE,GAAG,CAAC,WAAW,IAAI,MAAM,CAAC,WAAW;QAClD,UAAU,EAAE,GAAG,CAAC,UAAU,IAAI,MAAM,CAAC,UAAU;QAC/C,GAAG,EAAE;YACH,OAAO,EAAE,CAAC,GAAG,CAAC,WAAW,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;YAC/E,IAAI,EAAE,CAAC,GAAG,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;YACtE,IAAI,EAAE,GAAG,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC;SACtD;QACD,uBAAuB,EAAE,GAAG,CAAC,uBAAuB,IAAI,MAAM,CAAC,uBAAuB;QACtF,sBAAsB,EAAE,GAAG,CAAC,sBAAsB,IAAI,MAAM,CAAC,sBAAsB;QACnF,QAAQ,EAAE,GAAG,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ;QACzC,MAAM,EAAE,CAAC,GAAG,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;QACpD,YAAY,EAAE,GAAG,CAAC,YAAY,IAAI,MAAM,CAAC,YAAY;QACrD,UAAU,EAAE,GAAG,CAAC,UAAU,IAAI,MAAM,CAAC,UAAU;KAChD,CAAA;AACH,CAAC;AA9BD,gCA8BC"} {"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/utils/config.ts"],"names":[],"mappings":";;AAAA,6BAA4B;AAE5B,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,aAAa,CAAC;AAClD,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,uBAAuB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;AAC1E,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAA;AAEvB,SAAgB,UAAU;IACxB,OAAO;QACL,SAAS,EAAE,GAAG,CAAC,SAAS,IAAI,MAAM,CAAC,SAAS;QAC5C,iBAAiB,EAAE,GAAG,CAAC,iBAAiB,IAAI,MAAM,CAAC,iBAAiB;QACpE,YAAY,EAAE,GAAG,CAAC,YAAY,IAAI,MAAM,CAAC,YAAY;QACrD,gBAAgB,EAAE,GAAG,CAAC,gBAAgB,IAAI,MAAM,CAAC,gBAAgB;QACjE,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO;QACtC,MAAM,EAAE,GAAG,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM;QACnC,kBAAkB,EAAE,GAAG,CAAC,kBAAkB,IAAI,MAAM,CAAC,kBAAkB;QACvE,cAAc,EAAE,GAAG,CAAC,cAAc,IAAI,MAAM,CAAC,cAAc;QAC3D,QAAQ,EAAE,GAAG,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ;QACzC,WAAW,EAAE,GAAG,CAAC,WAAW,IAAI,MAAM,CAAC,WAAW;QAClD,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO;QACtC,cAAc,EAAE,GAAG,CAAC,cAAc,IAAI,MAAM,CAAC,cAAc;QAC3D,oBAAoB,EAAE,GAAG,CAAC,oBAAoB,IAAI,MAAM,CAAC,oBAAoB;QAC7E,UAAU,EAAE,GAAG,CAAC,UAAU,IAAI,MAAM,CAAC,UAAU;QAC/C,WAAW,EAAE,GAAG,CAAC,WAAW,IAAI,MAAM,CAAC,WAAW;QAClD,UAAU,EAAE,GAAG,CAAC,UAAU,IAAI,MAAM,CAAC,UAAU;QAC/C,sBAAsB,EAAE,GAAG,CAAC,sBAAsB,IAAI,MAAM,CAAC,sBAAsB;QACnF,GAAG,EAAE;YACH,OAAO,EAAE,CAAC,GAAG,CAAC,WAAW,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;YAC/E,IAAI,EAAE,CAAC,GAAG,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;YACtE,IAAI,EAAE,GAAG,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC;SACtD;QACD,uBAAuB,EAAE,GAAG,CAAC,uBAAuB,IAAI,MAAM,CAAC,uBAAuB;QACtF,sBAAsB,EAAE,GAAG,CAAC,sBAAsB,IAAI,MAAM,CAAC,sBAAsB;QACnF,QAAQ,EAAE,GAAG,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ;QACzC,MAAM,EAAE,CAAC,GAAG,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;QACpD,YAAY,EAAE,GAAG,CAAC,YAAY,IAAI,MAAM,CAAC,YAAY;QACrD,UAAU,EAAE,GAAG,CAAC,UAAU,IAAI,MAAM,CAAC,UAAU;KAChD,CAAA;AACH,CAAC;AA/BD,gCA+BC"}

8
dist/src/utils/setup.js
View File

@ -17,7 +17,9 @@ const gitinfo_1 = require("../utils/gitinfo");
const fs = require("fs"); const fs = require("fs");
const nodeinfo_1 = require("./nodeinfo"); const nodeinfo_1 = require("./nodeinfo");
const connect_1 = require("./connect"); const connect_1 = require("./connect");
const config_1 = require("./config");
const USER_VERSION = 7; const USER_VERSION = 7;
const config = config_1.loadConfig();
const setupDatabase = () => __awaiter(void 0, void 0, void 0, function* () { const setupDatabase = () => __awaiter(void 0, void 0, void 0, function* () {
console.log('=> [db] starting setup...'); console.log('=> [db] starting setup...');
yield setVersion(); yield setVersion();
@ -221,7 +223,11 @@ function printQR() {
}); });
} }
function connectionStringFile(str) { function connectionStringFile(str) {
fs.writeFile('connection_string.txt', str, function (err) { let connectStringPath = 'connection_string.txt';
if ('connection_string_path' in config) {
connectStringPath = config.connection_string_path;
}
fs.writeFile(connectStringPath, str, function (err) {
if (err) if (err)
console.log('ERROR SAVING connection_string.txt.', err); console.log('ERROR SAVING connection_string.txt.', err);
}); });

2
dist/src/utils/setup.js.map
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save