discos 2.0.0 → 2.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/config/validateDotenv.d.ts +1 -1
- package/dist/config/validateDotenv.d.ts.map +1 -1
- package/dist/config/validateDotenv.js +3 -1
- package/dist/config/validateDotenv.js.map +1 -1
- package/dist/exec/backend.js +2 -2
- package/dist/exec/backend.js.map +1 -1
- package/dist/exec/terminal-manager.d.ts.map +1 -1
- package/dist/exec/terminal-manager.js +4 -5
- package/dist/exec/terminal-manager.js.map +1 -1
- package/dist/exec/username.d.ts +2 -1
- package/dist/exec/username.d.ts.map +1 -1
- package/dist/exec/username.js +14 -8
- package/dist/exec/username.js.map +1 -1
- package/dist/models/user.d.ts.map +1 -1
- package/dist/models/user.js +6 -4
- package/dist/models/user.js.map +1 -1
- package/dist/modules/admin.js +2 -2
- package/dist/modules/admin.js.map +1 -1
- package/dist/slash-commands.d.ts +1 -1
- package/dist/slash-commands.d.ts.map +1 -1
- package/dist/slash-commands.js +3 -3
- package/dist/slash-commands.js.map +1 -1
- package/dist/startup.d.ts.map +1 -1
- package/dist/startup.js +10 -10
- package/dist/startup.js.map +1 -1
- package/package.json +2 -2
- package/setup/install.sh +34 -91
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare function validateDotenv(): boolean
|
|
1
|
+
export declare function validateDotenv(): Promise<boolean>;
|
|
2
2
|
//# sourceMappingURL=validateDotenv.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateDotenv.d.ts","sourceRoot":"","sources":["../../src/config/validateDotenv.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"validateDotenv.d.ts","sourceRoot":"","sources":["../../src/config/validateDotenv.ts"],"names":[],"mappings":"AAQA,wBAAsB,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC,CAyGvD"}
|
|
@@ -2,8 +2,9 @@ import * as COMMON from '../common.js';
|
|
|
2
2
|
import dotenv from 'dotenv';
|
|
3
3
|
import { Config } from './config.js';
|
|
4
4
|
import logger from '../logging/logger.js';
|
|
5
|
+
import { refreshDbCache } from '../exec/username.js';
|
|
5
6
|
dotenv.config({ quiet: true });
|
|
6
|
-
export function validateDotenv() {
|
|
7
|
+
export async function validateDotenv() {
|
|
7
8
|
const requiredEnvVars = [
|
|
8
9
|
'BOT_TOKEN',
|
|
9
10
|
'APP_ID',
|
|
@@ -51,6 +52,7 @@ export function validateDotenv() {
|
|
|
51
52
|
return false;
|
|
52
53
|
}
|
|
53
54
|
Config.databasePath = process.env.DATABASE_PATH;
|
|
55
|
+
await refreshDbCache();
|
|
54
56
|
const fileMaxSize = Number.parseInt(process.env.FILE_MAX_SIZE, 10);
|
|
55
57
|
if (Number.isNaN(fileMaxSize) || fileMaxSize <= 0 || fileMaxSize > 1000) {
|
|
56
58
|
logger.error(COMMON.ENV_FILE_MAX);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateDotenv.js","sourceRoot":"","sources":["../../src/config/validateDotenv.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,cAAc,CAAC;AACvC,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,MAAM,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"validateDotenv.js","sourceRoot":"","sources":["../../src/config/validateDotenv.ts"],"names":[],"mappings":"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"}
|
package/dist/exec/backend.js
CHANGED
|
@@ -27,7 +27,7 @@ function internalAxiosResponse(data, status) {
|
|
|
27
27
|
}
|
|
28
28
|
async function fileWrite(url, _path, payload) {
|
|
29
29
|
const escapedPath = shellEscape([_path]);
|
|
30
|
-
const serverUser =
|
|
30
|
+
const serverUser = localUser(payload.user);
|
|
31
31
|
let stdout;
|
|
32
32
|
const dirName = path.dirname(_path);
|
|
33
33
|
if (!fs.existsSync(dirName) || !fs.lstatSync(dirName).isDirectory())
|
|
@@ -46,7 +46,7 @@ async function fileWrite(url, _path, payload) {
|
|
|
46
46
|
export async function post(payload, b64decode, silent) {
|
|
47
47
|
let res = internalAxiosResponse('', 500);
|
|
48
48
|
if (Config.standalone) {
|
|
49
|
-
const output = await execCommand(payload.user, payload.username,
|
|
49
|
+
const output = await execCommand(payload.user, payload.username, localUser(payload.user), payload.cmd, silent);
|
|
50
50
|
res = internalAxiosResponse(b64decode ? Buffer.from(output.toString(), 'base64') : output, 200);
|
|
51
51
|
}
|
|
52
52
|
else {
|
package/dist/exec/backend.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backend.js","sourceRoot":"","sources":["../../src/exec/backend.ts"],"names":[],"mappings":"AAAA,OAAO,KAA8D,MAAM,OAAO,CAAC;AAGnF,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAS7C,OAAO,KAAK,MAAM,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC7F,MAAM,gBAAgB,GAAG,EAAE,CAAC;AAI5B,OAAO,KAAK,UAAU,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,MAAM,MAAM,sBAAsB,CAAC;AAG1C,OAAO,WAAW,MAAM,cAAc,CAAC;AAGvC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AAGzB,MAAM,UAAU,UAAU;IACxB,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACjC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;AAGD,SAAS,qBAAqB,CAAC,IAAS,EAAE,MAAc;IACtD,OAAO;QAEL,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,MAAM;QACd,UAAU,EAAE,EAAE;QACd,OAAO,EAAE,EAAE;QACX,MAAM,EAAE;YACN,OAAO,EAAE,EAAE;SACkB;KAChC,CAAC;AACJ,CAAC;AAGD,KAAK,UAAU,SAAS,CAAC,GAAW,EAAE,KAAa,EAAE,OAA0B;IAE7E,MAAM,WAAW,GAAW,WAAW,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IAGjD,MAAM,UAAU,GAAW,
|
|
1
|
+
{"version":3,"file":"backend.js","sourceRoot":"","sources":["../../src/exec/backend.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-manager.d.ts","sourceRoot":"","sources":["../../src/exec/terminal-manager.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAc7D,eAAO,MAAM,YAAY,SAAqC,CAAC;
|
|
1
|
+
{"version":3,"file":"terminal-manager.d.ts","sourceRoot":"","sources":["../../src/exec/terminal-manager.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAc7D,eAAO,MAAM,YAAY,SAAqC,CAAC;AAc/D,wBAAsB,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAwCzI;AAGD,wBAAsB,uBAAuB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBlF;AAGD,wBAAsB,WAAW,CAAC,MAAM,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBnH;AAID,wBAAsB,uBAAuB,CAAC,cAAc,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAsB3G;AAGD,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,OAAc,GAAG,IAAI,CASnF;AAGD,wBAAgB,mBAAmB,IAAI,IAAI,CAK1C"}
|
|
@@ -12,7 +12,6 @@ import os from 'node:os';
|
|
|
12
12
|
export const IS_TEST_MODE = Boolean(process.env.PTY_TEST_MODE);
|
|
13
13
|
const hostname = os.hostname();
|
|
14
14
|
const users = new Map();
|
|
15
|
-
const internalPty = new User(INTERNAL_UID, INTERNAL_UNAME, ROOT_UNAME);
|
|
16
15
|
async function getUserPwd(dcUid) {
|
|
17
16
|
const user = users.get(dcUid);
|
|
18
17
|
const pwd = await execCommand(dcUid, user.dcUname, user.localUser, 'pwd', true);
|
|
@@ -45,15 +44,15 @@ export async function execCommand(dcUid, discosUser, localUser, command, silent)
|
|
|
45
44
|
}
|
|
46
45
|
export async function initTerminalsFromConfig(queues) {
|
|
47
46
|
if (Config.standalone) {
|
|
48
|
-
if (!users.has(
|
|
49
|
-
users.set(
|
|
47
|
+
if (!users.has(INTERNAL_UID))
|
|
48
|
+
users.set(INTERNAL_UID, new User(INTERNAL_UID, INTERNAL_UNAME, ROOT_UNAME));
|
|
50
49
|
if (!users.has(ROOT_UID))
|
|
51
50
|
users.set(ROOT_UID, new User(ROOT_UID, ROOT_UNAME, ROOT_UNAME));
|
|
52
51
|
for (const dcUid of Config.allowedUsers) {
|
|
53
52
|
try {
|
|
54
53
|
if (!users.has(dcUid)) {
|
|
55
|
-
users.set(dcUid, new User(dcUid, '',
|
|
56
|
-
logger.info(COMMON.terminalSpawnedMessage(dcUid,
|
|
54
|
+
users.set(dcUid, new User(dcUid, '', localUser(dcUid)));
|
|
55
|
+
logger.info(COMMON.terminalSpawnedMessage(dcUid, localUser(dcUid)));
|
|
57
56
|
}
|
|
58
57
|
}
|
|
59
58
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-manager.js","sourceRoot":"","sources":["../../src/exec/terminal-manager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,OAAO,KAAK,UAAU,MAAM,4BAA4B,CAAC;AAEzD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,MAAM,MAAM,sBAAsB,CAAC;AAG1C,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,YAAY,EAAE,cAAc,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAG1H,OAAO,SAAS,MAAM,YAAY,CAAC;AACnC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,MAAM,SAAS,CAAC;AAIzB,MAAM,CAAC,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AAE/D,MAAM,QAAQ,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC;AAG/B,MAAM,KAAK,GAAG,IAAI,GAAG,EAAgB,CAAC;AAGtC,
|
|
1
|
+
{"version":3,"file":"terminal-manager.js","sourceRoot":"","sources":["../../src/exec/terminal-manager.ts"],"names":[],"mappings":"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"}
|
package/dist/exec/username.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { ChatInputCommandInteraction, CacheType } from 'discord.js';
|
|
2
2
|
export declare function discordUsername(interaction: ChatInputCommandInteraction<CacheType>): string;
|
|
3
|
-
export declare function
|
|
3
|
+
export declare function refreshDbCache(): Promise<void>;
|
|
4
|
+
export declare function localUser(user: string): string;
|
|
4
5
|
//# sourceMappingURL=username.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"username.d.ts","sourceRoot":"","sources":["../../src/exec/username.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"username.d.ts","sourceRoot":"","sources":["../../src/exec/username.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAczE,wBAAgB,eAAe,CAAC,WAAW,EAAE,2BAA2B,CAAC,SAAS,CAAC,GAAG,MAAM,CAO3F;AAGD,wBAAsB,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC,CAYpD;AAGD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAI9C"}
|
package/dist/exec/username.js
CHANGED
|
@@ -1,25 +1,31 @@
|
|
|
1
|
-
import { Config } from '../config/config.js';
|
|
2
1
|
import { readFile } from 'node:fs/promises';
|
|
2
|
+
import { Config } from '../config/config.js';
|
|
3
3
|
import { ROOT_UID, ROOT_UNAME } from '../shared/consts.js';
|
|
4
|
+
import { DB_ERR } from '../common.js';
|
|
5
|
+
import logger from '../logging/logger.js';
|
|
4
6
|
import shellEscape from 'shell-escape';
|
|
7
|
+
let dbUserCache = {};
|
|
5
8
|
export function discordUsername(interaction) {
|
|
6
9
|
const username = interaction.member && 'nickname' in interaction.member
|
|
7
10
|
? (interaction.member.nickname ?? interaction.user.username)
|
|
8
11
|
: (interaction.user.displayName ?? interaction.user.username);
|
|
9
12
|
return username;
|
|
10
13
|
}
|
|
11
|
-
export async function
|
|
14
|
+
export async function refreshDbCache() {
|
|
12
15
|
try {
|
|
13
|
-
if (user === ROOT_UID) {
|
|
14
|
-
return ROOT_UNAME;
|
|
15
|
-
}
|
|
16
16
|
const dbContent = await readFile(Config.databasePath, 'utf-8');
|
|
17
17
|
const dbParsed = JSON.parse(dbContent);
|
|
18
|
-
|
|
19
|
-
return shellEscape([serverUser]);
|
|
18
|
+
dbUserCache = dbParsed.users;
|
|
20
19
|
}
|
|
21
20
|
catch {
|
|
22
|
-
|
|
21
|
+
dbUserCache = {};
|
|
22
|
+
logger.error(DB_ERR);
|
|
23
|
+
process.exit(1);
|
|
23
24
|
}
|
|
24
25
|
}
|
|
26
|
+
export function localUser(user) {
|
|
27
|
+
if (user === ROOT_UID)
|
|
28
|
+
return ROOT_UNAME;
|
|
29
|
+
return shellEscape([dbUserCache[user]]);
|
|
30
|
+
}
|
|
25
31
|
//# sourceMappingURL=username.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"username.js","sourceRoot":"","sources":["../../src/exec/username.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"username.js","sourceRoot":"","sources":["../../src/exec/username.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,MAAM,MAAM,sBAAsB,CAAC;AAE1C,OAAO,WAAW,MAAM,cAAc,CAAC;AAGvC,IAAI,WAAW,GAA2B,EAAE,CAAC;AAG7C,MAAM,UAAU,eAAe,CAAC,WAAmD;IACjF,MAAM,QAAQ,GACZ,WAAW,CAAC,MAAM,IAAI,UAAU,IAAI,WAAW,CAAC,MAAM;QACpD,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,IAAI,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC;QAC5D,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,IAAI,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAElE,OAAO,QAAQ,CAAC;AAClB,CAAC;AAGD,MAAM,CAAC,KAAK,UAAU,cAAc;IAClC,IAAI,CAAC;QACH,MAAM,SAAS,GAAW,MAAM,QAAQ,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QACvE,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAEpC,CAAC;QACF,WAAW,GAAG,QAAQ,CAAC,KAAK,CAAC;IAC/B,CAAC;IAAC,MAAM,CAAC;QACP,WAAW,GAAG,EAAE,CAAC;QACjB,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC;AAGD,MAAM,UAAU,SAAS,CAAC,IAAY;IAEpC,IAAI,IAAI,KAAK,QAAQ;QAAE,OAAO,UAAU,CAAC;IACzC,OAAO,WAAW,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAC1C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../src/models/user.ts"],"names":[],"mappings":"AAIA,OAAY,EAAE,KAAK,IAAI,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../src/models/user.ts"],"names":[],"mappings":"AAIA,OAAY,EAAE,KAAK,IAAI,EAAE,MAAM,UAAU,CAAC;AAG1C,qBAAa,IAAI;IAEf,KAAK,EAAE,MAAM,CAAC;IAGd,OAAO,EAAE,MAAM,CAAC;IAGhB,SAAS,EAAE,MAAM,CAAC;IAGlB,UAAU,EAAE,IAAI,CAAC;IAGjB,MAAM,EAAE,MAAM,CAAM;IAGpB,OAAO,EAAE,OAAO,CAAQ;gBAEZ,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAQ7D,QAAQ,IAAI,IAAI;IAgDhB,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAKxB,OAAO,IAAI,IAAI;CAIhB"}
|
package/dist/models/user.js
CHANGED
|
@@ -2,6 +2,7 @@ import { IS_TEST_MODE } from '../exec/terminal-manager.js';
|
|
|
2
2
|
import logger from '../logging/logger.js';
|
|
3
3
|
import * as COMMON from '../common.js';
|
|
4
4
|
import pty from 'node-pty';
|
|
5
|
+
import { ROOT_UNAME } from '../shared/consts.js';
|
|
5
6
|
export class User {
|
|
6
7
|
dcUid;
|
|
7
8
|
dcUname;
|
|
@@ -18,10 +19,11 @@ export class User {
|
|
|
18
19
|
spawnPty() {
|
|
19
20
|
let cwd = `/home/${this.localUser}`;
|
|
20
21
|
let home = `/home/${this.localUser}`;
|
|
21
|
-
if (IS_TEST_MODE)
|
|
22
|
-
this.localUser =
|
|
23
|
-
|
|
24
|
-
|
|
22
|
+
if (IS_TEST_MODE)
|
|
23
|
+
this.localUser = ROOT_UNAME;
|
|
24
|
+
if (this.localUser === ROOT_UNAME) {
|
|
25
|
+
cwd = `/${ROOT_UNAME}`;
|
|
26
|
+
home = `/${ROOT_UNAME}`;
|
|
25
27
|
}
|
|
26
28
|
const newPtyProcess = pty.spawn('sudo', ['-u', this.localUser, '-i', '/bin/bash'], {
|
|
27
29
|
name: `xterm`,
|
package/dist/models/user.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../src/models/user.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,MAAM,MAAM,sBAAsB,CAAC;AAC1C,OAAO,KAAK,MAAM,MAAM,cAAc,CAAC;AAEvC,OAAO,GAAkB,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../src/models/user.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,MAAM,MAAM,sBAAsB,CAAC;AAC1C,OAAO,KAAK,MAAM,MAAM,cAAc,CAAC;AAEvC,OAAO,GAAkB,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,MAAM,OAAO,IAAI;IAEf,KAAK,CAAS;IAGd,OAAO,CAAS;IAGhB,SAAS,CAAS;IAGlB,UAAU,CAAO;IAGjB,MAAM,GAAW,EAAE,CAAC;IAGpB,OAAO,GAAY,IAAI,CAAC;IAExB,YAAY,KAAa,EAAE,OAAe,EAAE,SAAiB;QAC3D,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;IACpC,CAAC;IAGD,QAAQ;QACN,IAAI,GAAG,GAAG,SAAS,IAAI,CAAC,SAAS,EAAE,CAAC;QACpC,IAAI,IAAI,GAAG,SAAS,IAAI,CAAC,SAAS,EAAE,CAAC;QAIrC,IAAI,YAAY;YAAE,IAAI,CAAC,SAAS,GAAG,UAAU,CAAC;QAK9C,IAAI,IAAI,CAAC,SAAS,KAAK,UAAU,EAAE,CAAC;YAClC,GAAG,GAAG,IAAI,UAAU,EAAE,CAAC;YACvB,IAAI,GAAG,IAAI,UAAU,EAAE,CAAC;QAC1B,CAAC;QAED,MAAM,aAAa,GAAS,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,WAAW,CAAC,EAAE;YACvF,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,EAAE;YACR,IAAI,EAAE,EAAE;YACR,GAAG,EAAE,GAAG;YACR,GAAG,EAAE;gBACH,IAAI,EAAE,IAAI;gBACV,IAAI,EAAE,IAAI,CAAC,SAAS;gBACpB,OAAO,EAAE,IAAI,CAAC,SAAS;gBACvB,KAAK,EAAE,WAAW;gBAClB,IAAI,EAAE,8BAA8B;gBACpC,IAAI,EAAE,SAAS;aAChB;SACF,CAAC,CAAC;QAGH,aAAa,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;YAC5B,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC;QACtB,CAAC,CAAC,CAAC;QAGH,aAAa,CAAC,MAAM,CAAC,GAAG,EAAE;YACxB,IAAI,CAAC,IAAI,CAAC,OAAO;gBAAE,OAAO;YAC1B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;YAElC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;QAC3E,CAAC,CAAC,CAAC;QAEH,OAAO,aAAa,CAAC;IACvB,CAAC;IAGD,KAAK,CAAC,GAAW;QACf,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC;IACpC,CAAC;IAGD,OAAO;QACL,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACrB,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;IACzB,CAAC;CACF"}
|
package/dist/modules/admin.js
CHANGED
|
@@ -7,7 +7,7 @@ import { destroyTerminalForUser, syncTerminalsWithConfig } from '../exec/termina
|
|
|
7
7
|
import logger from '../logging/logger.js';
|
|
8
8
|
import shellEscape from 'shell-escape';
|
|
9
9
|
import * as COMMON from '../common.js';
|
|
10
|
-
import { ROOT_UID, INTERNAL_UID, INTERNAL_UNAME } from '../shared/consts.js';
|
|
10
|
+
import { ROOT_UID, INTERNAL_UID, INTERNAL_UNAME, ROOT_UNAME } from '../shared/consts.js';
|
|
11
11
|
import { Config } from '../config/config.js';
|
|
12
12
|
import fs from 'node:fs';
|
|
13
13
|
import { validateDb } from '../config/validateDb.js';
|
|
@@ -392,7 +392,7 @@ export async function handleAdmin(interaction, subcommand, username, queues, cli
|
|
|
392
392
|
let command = interaction.options.getString(COMMON.CMD, false);
|
|
393
393
|
if (!command || command.trim().length === 0)
|
|
394
394
|
command = '';
|
|
395
|
-
const payload = { user: ROOT_UID, username:
|
|
395
|
+
const payload = { user: ROOT_UID, username: ROOT_UNAME, cmd: command };
|
|
396
396
|
queueUtils.addToAll(queues, payload);
|
|
397
397
|
await execCommand(payload, interaction, command, username, 0, queues);
|
|
398
398
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admin.js","sourceRoot":"","sources":["../../src/modules/admin.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"admin.js","sourceRoot":"","sources":["../../src/modules/admin.ts"],"names":[],"mappings":"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"}
|
package/dist/slash-commands.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare function registerSlashCommands(): void
|
|
1
|
+
export declare function registerSlashCommands(): Promise<void>;
|
|
2
2
|
//# sourceMappingURL=slash-commands.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slash-commands.d.ts","sourceRoot":"","sources":["../src/slash-commands.ts"],"names":[],"mappings":"AAYA,
|
|
1
|
+
{"version":3,"file":"slash-commands.d.ts","sourceRoot":"","sources":["../src/slash-commands.ts"],"names":[],"mappings":"AAYA,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC,CAiU3D"}
|
package/dist/slash-commands.js
CHANGED
|
@@ -3,8 +3,8 @@ import { validateDotenv } from './config/validateDotenv.js';
|
|
|
3
3
|
import logger from './logging/logger.js';
|
|
4
4
|
import * as COMMON from './common.js';
|
|
5
5
|
import { fileURLToPath } from 'node:url';
|
|
6
|
-
export function registerSlashCommands() {
|
|
7
|
-
if (!validateDotenv()) {
|
|
6
|
+
export async function registerSlashCommands() {
|
|
7
|
+
if (!(await validateDotenv())) {
|
|
8
8
|
process.exit(1);
|
|
9
9
|
}
|
|
10
10
|
const command = new SlashCommandBuilder()
|
|
@@ -226,6 +226,6 @@ export function registerSlashCommands() {
|
|
|
226
226
|
});
|
|
227
227
|
}
|
|
228
228
|
if (process.argv[1] === fileURLToPath(import.meta.url)) {
|
|
229
|
-
registerSlashCommands();
|
|
229
|
+
await registerSlashCommands();
|
|
230
230
|
}
|
|
231
231
|
//# sourceMappingURL=slash-commands.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slash-commands.js","sourceRoot":"","sources":["../src/slash-commands.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAG/D,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,MAAM,MAAM,qBAAqB,CAAC;AAGzC,OAAO,KAAK,MAAM,MAAM,aAAa,CAAC;AAGtC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,MAAM,UAAU,qBAAqB;
|
|
1
|
+
{"version":3,"file":"slash-commands.js","sourceRoot":"","sources":["../src/slash-commands.ts"],"names":[],"mappings":"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"}
|
package/dist/startup.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"startup.d.ts","sourceRoot":"","sources":["../src/startup.ts"],"names":[],"mappings":"AAmCA,wBAAsB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"startup.d.ts","sourceRoot":"","sources":["../src/startup.ts"],"names":[],"mappings":"AAmCA,wBAAsB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CA+OjD"}
|
package/dist/startup.js
CHANGED
|
@@ -25,7 +25,7 @@ export async function startDiscOS() {
|
|
|
25
25
|
logger.error(COMMON.PLATFORM_ERR);
|
|
26
26
|
process.exit(1);
|
|
27
27
|
}
|
|
28
|
-
if (!validateDotenv()) {
|
|
28
|
+
if (!(await validateDotenv())) {
|
|
29
29
|
process.exit(1);
|
|
30
30
|
}
|
|
31
31
|
const queues = {
|
|
@@ -70,14 +70,6 @@ export async function startDiscOS() {
|
|
|
70
70
|
await interaction.reply({ content: COMMON.USER_ERR, flags: 64 });
|
|
71
71
|
return;
|
|
72
72
|
}
|
|
73
|
-
if (queueUtils.countUserCommandsInQueue(queues.duplicateQueue, interaction.user.id) >= Config.userRateLimit) {
|
|
74
|
-
await interaction.reply({ content: COMMON.USER_RATE_LIMIT, flags: 64 });
|
|
75
|
-
return;
|
|
76
|
-
}
|
|
77
|
-
if (queues.duplicateQueue.length >= Number(Config.cmdQueueMaxSize)) {
|
|
78
|
-
await interaction.reply({ content: COMMON.DISCOS_OVERLOADED, flags: 64 });
|
|
79
|
-
return;
|
|
80
|
-
}
|
|
81
73
|
const subcommand = interaction.options.getSubcommand();
|
|
82
74
|
const userId = interaction.user.id;
|
|
83
75
|
const username = discordUsername(interaction);
|
|
@@ -94,6 +86,14 @@ export async function startDiscOS() {
|
|
|
94
86
|
await handleAdmin(interaction, subcommand, username, queues, client);
|
|
95
87
|
return;
|
|
96
88
|
}
|
|
89
|
+
if (queueUtils.countUserCommandsInQueue(queues.duplicateQueue, interaction.user.id) >= Config.userRateLimit) {
|
|
90
|
+
await interaction.reply({ content: COMMON.USER_RATE_LIMIT, flags: 64 });
|
|
91
|
+
return;
|
|
92
|
+
}
|
|
93
|
+
if (queues.duplicateQueue.length >= Number(Config.cmdQueueMaxSize)) {
|
|
94
|
+
await interaction.reply({ content: COMMON.DISCOS_OVERLOADED, flags: 64 });
|
|
95
|
+
return;
|
|
96
|
+
}
|
|
97
97
|
let queuedCmd = '';
|
|
98
98
|
const hideReply = interaction.options.getBoolean(COMMON.HIDE, false) ?? COMMON.DEFAULT_HIDDEN;
|
|
99
99
|
let lookback = COMMON.DEFAULT_LOOKBACK;
|
|
@@ -203,7 +203,7 @@ export async function startDiscOS() {
|
|
|
203
203
|
});
|
|
204
204
|
}
|
|
205
205
|
if (process.argv[1] === fileURLToPath(import.meta.url)) {
|
|
206
|
-
registerSlashCommands();
|
|
206
|
+
await registerSlashCommands();
|
|
207
207
|
startDiscOS().catch(() => {
|
|
208
208
|
logger.error(COMMON.DISCOS_STARTUP_ERR);
|
|
209
209
|
process.exit(1);
|
package/dist/startup.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"startup.js","sourceRoot":"","sources":["../src/startup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,EAAmB,MAAM,YAAY,CAAC;AAGhF,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,KAAK,UAAU,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAC7F,OAAO,MAAM,MAAM,qBAAqB,CAAC;AAGzC,OAAO,KAAK,MAAM,MAAM,aAAa,CAAC;AAKtC,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACpF,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAExE,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,GAAG,MAAM,UAAU,CAAC;AAG3B,GAAG,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC;AACvC,GAAG,CAAC,UAAU,CAAC,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;AAG7D,MAAM,CAAC,KAAK,UAAU,WAAW;IAE/B,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAClC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAGD,IAAI,CAAC,cAAc,EAAE,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"startup.js","sourceRoot":"","sources":["../src/startup.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "discos",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.1",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"types": "dist/index.d.ts",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"scripts": {
|
|
8
|
-
"build": "rm -f tsconfig.tsbuildinfo && npx tsc -b",
|
|
8
|
+
"build": "npm run lint && rm -f tsconfig.tsbuildinfo && npx tsc -b",
|
|
9
9
|
"setup": "node dist/slash-commands.js",
|
|
10
10
|
"start": "node dist/startup.js",
|
|
11
11
|
"docker:build": "docker build -t discos:latest .",
|
package/setup/install.sh
CHANGED
|
@@ -89,7 +89,7 @@ echo -e "All dependencies installed."
|
|
|
89
89
|
echo -e "\nCloning DiscOS repository into a temporary directory..."
|
|
90
90
|
|
|
91
91
|
TEMP_DIR=$(mktemp -d)
|
|
92
|
-
chmod
|
|
92
|
+
chmod 770 "$TEMP_DIR" # only root should access the temp dir
|
|
93
93
|
|
|
94
94
|
if ! git clone --branch main --single-branch --depth 1 https://github.com/BrNi05/DiscOS.git "$TEMP_DIR" &>/dev/null; then
|
|
95
95
|
echo "Failed to clone DiscOS repository."
|
|
@@ -103,7 +103,7 @@ cd "$TEMP_DIR" || (echo "Failed to enter temp directory." && exit 1)
|
|
|
103
103
|
setup_dotenv() {
|
|
104
104
|
local OPERATOR="$1"
|
|
105
105
|
|
|
106
|
-
echo -e "\nSetting up .env file..."
|
|
106
|
+
echo -e "\n\nSetting up .env file..."
|
|
107
107
|
|
|
108
108
|
read -rp "If not already, set up your bot. Refer to the docs: https://github.com/BrNi05/DiscOS/wiki/03.-Creating-your-bot. Press any key to continue..."
|
|
109
109
|
|
|
@@ -132,9 +132,9 @@ setup_dotenv() {
|
|
|
132
132
|
|
|
133
133
|
if [ "$OPERATOR" = "write" ]; then
|
|
134
134
|
# Copy .env from CWD to discos home
|
|
135
|
-
cp "$DOTENV" "$
|
|
136
|
-
chown
|
|
137
|
-
chmod 660 "$
|
|
135
|
+
cp "$DOTENV" "$DISCOS_DIR/.env"
|
|
136
|
+
chown root:root "$DISCOS_DIR/.env"
|
|
137
|
+
chmod 660 "$DISCOS_DIR/.env"
|
|
138
138
|
elif [ "$OPERATOR" = "disp" ]; then
|
|
139
139
|
echo -e "\nGenerated .env content:\n"
|
|
140
140
|
cat "$DOTENV"
|
|
@@ -157,7 +157,7 @@ setup_dotenv() {
|
|
|
157
157
|
setup_db() {
|
|
158
158
|
local OPERATOR="$1"
|
|
159
159
|
|
|
160
|
-
echo -e "\nCreating the initial database..."
|
|
160
|
+
echo -e "\n\nCreating the initial database..."
|
|
161
161
|
|
|
162
162
|
echo -e "You will be added as a DiscOS admin.\n"
|
|
163
163
|
|
|
@@ -177,9 +177,9 @@ setup_db() {
|
|
|
177
177
|
|
|
178
178
|
if [ "$OPERATOR" = "write" ]; then
|
|
179
179
|
# Copy db.json from CWD to discos home
|
|
180
|
-
cp "$DB" "$
|
|
181
|
-
chown
|
|
182
|
-
chmod 660 "$
|
|
180
|
+
cp "$DB" "$DISCOS_DIR/db.json"
|
|
181
|
+
chown root:root "$DISCOS_DIR/db.json"
|
|
182
|
+
chmod 660 "$DISCOS_DIR/db.json"
|
|
183
183
|
elif [ "$OPERATOR" = "disp" ]; then
|
|
184
184
|
echo -e "\nManually create the db.json file where needed."
|
|
185
185
|
echo -e "Generated db.json content:\n"
|
|
@@ -210,50 +210,6 @@ setup_db() {
|
|
|
210
210
|
}
|
|
211
211
|
|
|
212
212
|
|
|
213
|
-
############### Node.js LTS updater ###############
|
|
214
|
-
setup_node_updater() {
|
|
215
|
-
echo -e "\nAn updater script will be installed and a Systemd service will be created to keep Node.js up to date."
|
|
216
|
-
echo "NOTE: old Node.js versions will NOTE be removed automatically."
|
|
217
|
-
|
|
218
|
-
SCRIPT_PATH='/usr/local/bin/update-node.sh'
|
|
219
|
-
printf '%s\n' '#!/bin/bash' \
|
|
220
|
-
'export NVM_DIR="$HOME/.nvm"' \
|
|
221
|
-
'[ -s "$NVM_DIR/nvm.sh" ] && source "$NVM_DIR/nvm.sh"' \
|
|
222
|
-
'' \
|
|
223
|
-
'nvm install --lts' > "$SCRIPT_PATH"
|
|
224
|
-
|
|
225
|
-
chown discos:discos "$SCRIPT_PATH"
|
|
226
|
-
chmod 770 "$SCRIPT_PATH"
|
|
227
|
-
|
|
228
|
-
printf '%s\n' \
|
|
229
|
-
'[Unit]' \
|
|
230
|
-
'Description=Update Node.js LTS for discos user' \
|
|
231
|
-
'' \
|
|
232
|
-
'[Service]' \
|
|
233
|
-
'Type=oneshot' \
|
|
234
|
-
'User=discos' \
|
|
235
|
-
"ExecStart=$SCRIPT_PATH" \
|
|
236
|
-
> /etc/systemd/system/discos-node-updater.service
|
|
237
|
-
|
|
238
|
-
printf '%s\n' \
|
|
239
|
-
'[Unit]' \
|
|
240
|
-
'Description=Run Node.js LTS update daily' \
|
|
241
|
-
'' \
|
|
242
|
-
'[Timer]' \
|
|
243
|
-
'OnCalendar=daily' \
|
|
244
|
-
'Persistent=true' \
|
|
245
|
-
'' \
|
|
246
|
-
'[Install]' \
|
|
247
|
-
'WantedBy=timers.target' \
|
|
248
|
-
> /etc/systemd/system/discos-node-updater.timer
|
|
249
|
-
|
|
250
|
-
systemctl daemon-reload
|
|
251
|
-
systemctl enable --now discos-node-updater.timer
|
|
252
|
-
|
|
253
|
-
echo -e "Node.js updater script and service installed."
|
|
254
|
-
}
|
|
255
|
-
|
|
256
|
-
|
|
257
213
|
############### Compose setup ###############
|
|
258
214
|
setup_compose() {
|
|
259
215
|
echo -e "\nSetting up compose file...\n"
|
|
@@ -278,39 +234,31 @@ setup_compose() {
|
|
|
278
234
|
install_systemd() {
|
|
279
235
|
echo -e "\nStarting Systemd release installation..."
|
|
280
236
|
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
fi
|
|
285
|
-
|
|
286
|
-
DISCOS_HOME=$(getent passwd discos | cut -d: -f6)
|
|
287
|
-
|
|
288
|
-
DISCOS_DIR="$DISCOS_HOME/DiscOS"
|
|
237
|
+
DISCOS_DIR="/opt/DiscOS"
|
|
238
|
+
echo "DiscOS will be installed to: $DISCOS_DIR"
|
|
239
|
+
mkdir -p "$DISCOS_DIR"
|
|
289
240
|
|
|
290
241
|
if [[ "$1" != "update" ]]; then
|
|
291
242
|
echo -e "\nSetting up Node.js..."
|
|
292
243
|
read -rp "Do you have a global / user-scoped Node.js install (y/n)? " NODE_ANSWER
|
|
293
244
|
if [[ "$NODE_ANSWER" = "y" || "$NODE_ANSWER" = "Y" ]]; then
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
' >/dev/null 2>&1; then
|
|
245
|
+
export NVM_DIR="$HOME/.nvm"
|
|
246
|
+
[ -s "$NVM_DIR/nvm.sh" ] && source "$NVM_DIR/nvm.sh"
|
|
247
|
+
|
|
248
|
+
if ! command -v node >/dev/null 2>&1; then
|
|
299
249
|
echo "ERROR: Node.js not found."
|
|
300
250
|
exit 1
|
|
301
251
|
fi
|
|
302
252
|
else
|
|
303
253
|
echo -e "\nInstalling Node.js via nvm..."
|
|
304
|
-
|
|
254
|
+
|
|
305
255
|
export NVM_DIR="$HOME/.nvm"
|
|
306
256
|
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash
|
|
307
257
|
[ -s "$NVM_DIR/nvm.sh" ] && source "$NVM_DIR/nvm.sh"
|
|
308
258
|
nvm install --lts
|
|
309
259
|
nvm use --lts
|
|
310
|
-
'
|
|
311
260
|
|
|
312
|
-
echo -e "Node.js installed."
|
|
313
|
-
setup_node_updater
|
|
261
|
+
echo -e "Node.js installed. Version: $(node -v). Make sure to update it regularly for security and performance improvements!"
|
|
314
262
|
fi
|
|
315
263
|
|
|
316
264
|
# .env setup
|
|
@@ -320,48 +268,43 @@ install_systemd() {
|
|
|
320
268
|
setup_db "write"
|
|
321
269
|
|
|
322
270
|
# Set up ownership and permissions
|
|
323
|
-
chown -R root:
|
|
271
|
+
chown -R root:root "$DISCOS_DIR"
|
|
324
272
|
chmod -R 770 "$DISCOS_DIR"
|
|
273
|
+
|
|
274
|
+
read -rp "Press any key to continue with DiscOS installation..."
|
|
325
275
|
else
|
|
326
276
|
# Stop the service for before the update process
|
|
327
|
-
systemctl stop discos.service || echo "DiscOS service could not be stopped."
|
|
277
|
+
(systemctl stop discos.service && echo "DiscOS service stopped.") || echo "DiscOS service could not be stopped."
|
|
328
278
|
fi
|
|
329
279
|
|
|
330
280
|
# Compile DiscOS
|
|
331
281
|
echo -e "\nCompiling DiscOS..."
|
|
332
|
-
DISCOS_DIR="$DISCOS_HOME"
|
|
333
|
-
|
|
334
|
-
sudo -u discos bash -euo pipefail -c "
|
|
335
|
-
TEMP_DIR=\"$TEMP_DIR\"
|
|
336
|
-
DISCOS_DIR=\"$DISCOS_DIR\"
|
|
337
282
|
|
|
338
283
|
# Source nvm
|
|
339
|
-
export NVM_DIR
|
|
340
|
-
[ -s
|
|
284
|
+
export NVM_DIR="$HOME/.nvm"
|
|
285
|
+
[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
|
|
341
286
|
|
|
342
287
|
# Build in the temp dir
|
|
343
|
-
cd
|
|
344
|
-
echo
|
|
288
|
+
cd "$TEMP_DIR" || { echo 'Failed to enter temp download directory.'; exit 1; }
|
|
289
|
+
echo "CWD: $TEMP_DIR"
|
|
345
290
|
echo 'Installing dependencies...'
|
|
346
291
|
npm ci --omit=optional --silent
|
|
347
292
|
npm run build
|
|
348
293
|
|
|
349
294
|
# Copy dist and install only prod deps
|
|
350
|
-
mkdir -p
|
|
351
|
-
rm -rf
|
|
352
|
-
cp -r
|
|
353
|
-
cp
|
|
354
|
-
cp
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
cd \"\$DISCOS_DIR\" || { echo 'Failed to enter DiscOS directory.'; exit 1; }
|
|
295
|
+
mkdir -p "$DISCOS_DIR"
|
|
296
|
+
rm -rf "$DISCOS_DIR/dist"
|
|
297
|
+
cp -r "$TEMP_DIR/dist" "$DISCOS_DIR"
|
|
298
|
+
cp "$TEMP_DIR/package.json" "$DISCOS_DIR"
|
|
299
|
+
cp "$TEMP_DIR/package-lock.json" "$DISCOS_DIR"
|
|
300
|
+
|
|
301
|
+
cd "$DISCOS_DIR" || { echo 'Failed to enter DiscOS directory.'; exit 1; }
|
|
358
302
|
npm ci --silent --omit=dev --omit=optional
|
|
359
303
|
|
|
360
304
|
# Remove package.json and package-lock.json
|
|
361
305
|
rm -f package*.json
|
|
362
|
-
"
|
|
363
306
|
|
|
364
|
-
echo -e "
|
|
307
|
+
echo -e "DiscOS compiled successfully."
|
|
365
308
|
|
|
366
309
|
if [[ "$1" != "update" ]]; then
|
|
367
310
|
# Systemd service and timer setup
|