diff --git a/discord_embed/dev.mjs b/discord_embed/dev.mjs deleted file mode 100644 index 0d7f32f..0000000 --- a/discord_embed/dev.mjs +++ /dev/null @@ -1,24 +0,0 @@ -import fs from 'fs' -import { ServiceCore } from 'service-core' -import * as index from './index.mjs' - -const port = 4120 - -var core = new ServiceCore('nfp_moe', import.meta.url, port, '') - -let config = { - frontend: { - url: 'http://localhost:' + port - } -} - -try { - config = JSON.parse(fs.readFileSync('./config.json')) -} catch {} - -config.port = port - -core.setConfig(config) -core.init(index).then(function() { - return core.run() -}) \ No newline at end of file diff --git a/discord_embed/index.mjs b/discord_embed/index.mjs index 6a42b60..7e959b8 100644 --- a/discord_embed/index.mjs +++ b/discord_embed/index.mjs @@ -1,3 +1,5 @@ +import fs from 'fs' +import { pathToFileURL } from 'url' import config from './base/config.mjs' export function start(http, port, ctx) { @@ -9,3 +11,28 @@ export function start(http, port, ctx) { return server.run() }) } + +if (import.meta.url === pathToFileURL(process.argv[1]).href) { + import('service-core').then(core => { + const port = 4120 + + var core = new core.ServiceCore('nfp_moe', import.meta.url, port, '') + + let config = { + frontend: { + url: 'http://localhost:' + port + } + } + + try { + config = JSON.parse(fs.readFileSync('./config.json')) + } catch {} + + config.port = port + + core.setConfig(config) + core.init({ start }).then(function() { + return core.run() + }) + }) +} diff --git a/discord_embed/package.json b/discord_embed/package.json index 1559c79..b2a9673 100644 --- a/discord_embed/package.json +++ b/discord_embed/package.json @@ -8,8 +8,8 @@ "test": "test" }, "scripts": { - "start": "node --experimental-modules index.mjs", - "dev:server": "node dev.mjs | bunyan", + "start": "node index.mjs", + "dev:server": "node index.mjs | bunyan", "dev": "npm-watch dev:server" }, "watch": { diff --git a/nfp_moe/dev.mjs b/nfp_moe/dev.mjs deleted file mode 100644 index 141c7d5..0000000 --- a/nfp_moe/dev.mjs +++ /dev/null @@ -1,22 +0,0 @@ -import fs from 'fs' -import { ServiceCore } from 'service-core' -import * as index from './index.mjs' - -var core = new ServiceCore('nfp_moe', import.meta.url, 4030, '') - -let config = { - frontend: { - url: 'http://localhost:4030' - } -} - -try { - config = JSON.parse(fs.readFileSync('./config.json')) -} catch {} - -config.port = 4030 - -core.setConfig(config) -core.init(index).then(function() { - return core.run() -}) \ No newline at end of file diff --git a/nfp_moe/index.mjs b/nfp_moe/index.mjs index 6a42b60..6ed0325 100644 --- a/nfp_moe/index.mjs +++ b/nfp_moe/index.mjs @@ -1,3 +1,5 @@ +import fs from 'fs' +import { pathToFileURL } from 'url' import config from './base/config.mjs' export function start(http, port, ctx) { @@ -9,3 +11,28 @@ export function start(http, port, ctx) { return server.run() }) } + +if (import.meta.url === pathToFileURL(process.argv[1]).href) { + import('service-core').then(core => { + const port = 4030 + + var core = new core.ServiceCore('nfp_moe', import.meta.url, port, '') + + let config = { + frontend: { + url: 'http://localhost:' + port + } + } + + try { + config = JSON.parse(fs.readFileSync('./config.json')) + } catch {} + + config.port = port + + core.setConfig(config) + core.init({ start }).then(function() { + return core.run() + }) + }) +} diff --git a/nfp_moe/package.json b/nfp_moe/package.json index ecccf03..123fed6 100644 --- a/nfp_moe/package.json +++ b/nfp_moe/package.json @@ -13,7 +13,7 @@ "build:prod": "asbundle app/index.js public/assets/app.js && asbundle app/admin/admin.js public/assets/admin.js", "build": "asbundle app/index.js public/assets/app.js && asbundle app/admin/admin.js public/assets/admin.js", "dev:build": "npm-watch build", - "dev:server": "node dev.mjs | bunyan", + "dev:server": "node index.mjs | bunyan", "dev": "npm-watch dev:server", "watch:sass:public": "sass --watch app/app.scss public/assets/app.css", "watch:sass:admin": "sass --watch app/admin.scss public/assets/admin.css", diff --git a/saproxy/dev.mjs b/saproxy/dev.mjs deleted file mode 100644 index 0d7f32f..0000000 --- a/saproxy/dev.mjs +++ /dev/null @@ -1,24 +0,0 @@ -import fs from 'fs' -import { ServiceCore } from 'service-core' -import * as index from './index.mjs' - -const port = 4120 - -var core = new ServiceCore('nfp_moe', import.meta.url, port, '') - -let config = { - frontend: { - url: 'http://localhost:' + port - } -} - -try { - config = JSON.parse(fs.readFileSync('./config.json')) -} catch {} - -config.port = port - -core.setConfig(config) -core.init(index).then(function() { - return core.run() -}) \ No newline at end of file diff --git a/saproxy/index.mjs b/saproxy/index.mjs index 4a8dd8e..819fd1b 100644 --- a/saproxy/index.mjs +++ b/saproxy/index.mjs @@ -1,3 +1,5 @@ +import fs from 'fs' +import { pathToFileURL } from 'url' import config from './api/config.mjs' export function start(http, port, ctx) { @@ -9,3 +11,28 @@ export function start(http, port, ctx) { return server.run() }) } + +if (import.meta.url === pathToFileURL(process.argv[1]).href) { + import('service-core').then(core => { + const port = 4120 + + var core = new core.ServiceCore('saproxy', import.meta.url, port, '') + + let config = { + frontend: { + url: 'http://localhost:' + port + } + } + + try { + config = JSON.parse(fs.readFileSync('./config.json')) + } catch {} + + config.port = port + + core.setConfig(config) + core.init({ start }).then(function() { + return core.run() + }) + }) +} diff --git a/saproxy/package.json b/saproxy/package.json index c488d52..6cc4d75 100644 --- a/saproxy/package.json +++ b/saproxy/package.json @@ -9,7 +9,7 @@ }, "scripts": { "start": "node --experimental-modules index.mjs", - "dev:server": "node dev.mjs | bunyan", + "dev:server": "node index.mjs | bunyan", "dev": "npm-watch dev:server" }, "watch": {