summaryrefslogtreecommitdiff
path: root/packages/backend/src/boot
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2022-02-27 11:07:39 +0900
committerGitHub <noreply@github.com>2022-02-27 11:07:39 +0900
commitd071d18dd7a394298d454d4ef6c5ca885164dd47 (patch)
tree1de916def26c5e6a672e2e8efe5c842bd410fd0e /packages/backend/src/boot
parentfix: better language settings (diff)
downloadmisskey-d071d18dd7a394298d454d4ef6c5ca885164dd47.tar.gz
misskey-d071d18dd7a394298d454d4ef6c5ca885164dd47.tar.bz2
misskey-d071d18dd7a394298d454d4ef6c5ca885164dd47.zip
refactor: Use ESM (#8358)
* wip * wip * fix * clean up * Update tsconfig.json * Update activitypub.ts * wip
Diffstat (limited to 'packages/backend/src/boot')
-rw-r--r--packages/backend/src/boot/index.ts16
-rw-r--r--packages/backend/src/boot/master.ts52
-rw-r--r--packages/backend/src/boot/worker.ts8
3 files changed, 39 insertions, 37 deletions
diff --git a/packages/backend/src/boot/index.ts b/packages/backend/src/boot/index.ts
index 1723c32dd0..5bb20a729f 100644
--- a/packages/backend/src/boot/index.ts
+++ b/packages/backend/src/boot/index.ts
@@ -1,18 +1,18 @@
-import * as cluster from 'cluster';
-import * as chalk from 'chalk';
-import Xev from 'xev';
+import cluster from 'node:cluster';
+import chalk from 'chalk';
+import { default as Xev } from 'xev';
-import Logger from '@/services/logger';
-import { envOption } from '../env';
+import Logger from '@/services/logger.js';
+import { envOption } from '../env.js';
// for typeorm
import 'reflect-metadata';
-import { masterMain } from './master';
-import { workerMain } from './worker';
+import { masterMain } from './master.js';
+import { workerMain } from './worker.js';
const logger = new Logger('core', 'cyan');
const clusterLogger = logger.createSubLogger('cluster', 'orange', false);
-const ev = new Xev();
+const ev = new Xev.default();
/**
* Init process
diff --git a/packages/backend/src/boot/master.ts b/packages/backend/src/boot/master.ts
index eeb7017cb0..1c909dff13 100644
--- a/packages/backend/src/boot/master.ts
+++ b/packages/backend/src/boot/master.ts
@@ -1,22 +1,22 @@
-import * as fs from 'fs';
-import { fileURLToPath } from 'url';
-import { dirname } from 'path';
-import * as os from 'os';
-import * as cluster from 'cluster';
-import * as chalk from 'chalk';
+import * as fs from 'node:fs';
+import { fileURLToPath } from 'node:url';
+import { dirname } from 'node:path';
+import * as os from 'node:os';
+import cluster from 'node:cluster';
+import chalk from 'chalk';
+import chalkTemplate from 'chalk-template';
import * as portscanner from 'portscanner';
import { getConnection } from 'typeorm';
-import Logger from '@/services/logger';
-import loadConfig from '@/config/load';
-import { Config } from '@/config/types';
-import { lessThan } from '@/prelude/array';
-import { envOption } from '../env';
-import { showMachineInfo } from '@/misc/show-machine-info';
-import { initDb } from '../db/postgre';
+import Logger from '@/services/logger.js';
+import loadConfig from '@/config/load.js';
+import { Config } from '@/config/types.js';
+import { lessThan } from '@/prelude/array.js';
+import { envOption } from '../env.js';
+import { showMachineInfo } from '@/misc/show-machine-info.js';
+import { initDb } from '../db/postgre.js';
-//const _filename = fileURLToPath(import.meta.url);
-const _filename = __filename;
+const _filename = fileURLToPath(import.meta.url);
const _dirname = dirname(_filename);
const meta = JSON.parse(fs.readFileSync(`${_dirname}/../../../../built/meta.json`, 'utf-8'));
@@ -24,22 +24,24 @@ const meta = JSON.parse(fs.readFileSync(`${_dirname}/../../../../built/meta.json
const logger = new Logger('core', 'cyan');
const bootLogger = logger.createSubLogger('boot', 'magenta', false);
+const themeColor = chalk.hex('#86b300');
+
function greet() {
if (!envOption.quiet) {
//#region Misskey logo
const v = `v${meta.version}`;
- console.log(' _____ _ _ ');
- console.log(' | |_|___ ___| |_ ___ _ _ ');
- console.log(' | | | | |_ -|_ -| \'_| -_| | |');
- console.log(' |_|_|_|_|___|___|_,_|___|_ |');
- console.log(' ' + chalk.gray(v) + (' |___|\n'.substr(v.length)));
+ console.log(themeColor(' _____ _ _ '));
+ console.log(themeColor(' | |_|___ ___| |_ ___ _ _ '));
+ console.log(themeColor(' | | | | |_ -|_ -| \'_| -_| | |'));
+ console.log(themeColor(' |_|_|_|_|___|___|_,_|___|_ |'));
+ console.log(' ' + chalk.gray(v) + themeColor(' |___|\n'.substr(v.length)));
//#endregion
console.log(' Misskey is an open-source decentralized microblogging platform.');
- console.log(chalk.keyword('orange')(' If you like Misskey, please donate to support development. https://www.patreon.com/syuilo'));
+ console.log(chalk.rgb(255, 136, 0)(' If you like Misskey, please donate to support development. https://www.patreon.com/syuilo'));
console.log('');
- console.log(chalk`--- ${os.hostname()} {gray (PID: ${process.pid.toString()})} ---`);
+ console.log(chalkTemplate`--- ${os.hostname()} {gray (PID: ${process.pid.toString()})} ---`);
}
bootLogger.info('Welcome to Misskey!');
@@ -80,9 +82,9 @@ export async function masterMain() {
bootLogger.succ(`Now listening on port ${config.port} on ${config.url}`, null, true);
if (!envOption.noDaemons) {
- require('../daemons/server-stats').default();
- require('../daemons/queue-stats').default();
- require('../daemons/janitor').default();
+ import('../daemons/server-stats.js').then(x => x.default());
+ import('../daemons/queue-stats.js').then(x => x.default());
+ import('../daemons/janitor.js').then(x => x.default());
}
}
diff --git a/packages/backend/src/boot/worker.ts b/packages/backend/src/boot/worker.ts
index 362fa3f26b..8038e25631 100644
--- a/packages/backend/src/boot/worker.ts
+++ b/packages/backend/src/boot/worker.ts
@@ -1,5 +1,5 @@
-import * as cluster from 'cluster';
-import { initDb } from '../db/postgre';
+import cluster from 'node:cluster';
+import { initDb } from '../db/postgre.js';
/**
* Init worker process
@@ -8,10 +8,10 @@ export async function workerMain() {
await initDb();
// start server
- await require('../server').default();
+ await import('../server/index.js').then(x => x.default());
// start job queue
- require('../queue').default();
+ import('../queue/index.js').then(x => x.default());
if (cluster.isWorker) {
// Send a 'ready' message to parent process