discos 1.1.6 → 2.0.0
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/.github/PRIVACY_POLICY.md +3 -1
- package/.github/TERMS_OF_SERVICE.md +1 -0
- package/README.md +2 -2
- package/dist/common.d.ts +57 -36
- package/dist/common.d.ts.map +1 -1
- package/dist/common.js +88 -39
- package/dist/common.js.map +1 -1
- package/dist/{config.d.ts → config/config.d.ts} +2 -1
- package/dist/config/config.d.ts.map +1 -0
- package/dist/{config.js → config/config.js} +1 -0
- package/dist/config/config.js.map +1 -0
- package/dist/config/validateDb.d.ts +3 -0
- package/dist/config/validateDb.d.ts.map +1 -0
- package/dist/{tools → config}/validateDb.js +16 -15
- package/dist/config/validateDb.js.map +1 -0
- package/dist/config/validateDotenv.d.ts.map +1 -0
- package/dist/{tools → config}/validateDotenv.js +27 -19
- package/dist/config/validateDotenv.js.map +1 -0
- package/dist/{tools → exec}/backend.d.ts +4 -3
- package/dist/exec/backend.d.ts.map +1 -0
- package/dist/exec/backend.js +131 -0
- package/dist/exec/backend.js.map +1 -0
- package/dist/exec/terminal-manager.d.ts +9 -0
- package/dist/exec/terminal-manager.d.ts.map +1 -0
- package/dist/exec/terminal-manager.js +113 -0
- package/dist/exec/terminal-manager.js.map +1 -0
- package/dist/exec/username.d.ts +4 -0
- package/dist/exec/username.d.ts.map +1 -0
- package/dist/exec/username.js +25 -0
- package/dist/exec/username.js.map +1 -0
- package/dist/interfaces/queues.d.ts.map +1 -0
- package/dist/{types → interfaces}/queues.js.map +1 -1
- package/dist/logging/logger.d.ts +4 -0
- package/dist/logging/logger.d.ts.map +1 -0
- package/dist/logging/logger.js +22 -0
- package/dist/logging/logger.js.map +1 -0
- package/dist/models/user.d.ts +14 -0
- package/dist/models/user.d.ts.map +1 -0
- package/dist/models/user.js +59 -0
- package/dist/models/user.js.map +1 -0
- package/dist/modules/admin.d.ts +1 -1
- package/dist/modules/admin.d.ts.map +1 -1
- package/dist/modules/admin.js +56 -31
- package/dist/modules/admin.js.map +1 -1
- package/dist/modules/clear.d.ts.map +1 -1
- package/dist/modules/clear.js +7 -8
- package/dist/modules/clear.js.map +1 -1
- package/dist/modules/command.d.ts +1 -1
- package/dist/modules/command.d.ts.map +1 -1
- package/dist/modules/command.js +5 -5
- package/dist/modules/command.js.map +1 -1
- package/dist/modules/debug.d.ts +1 -1
- package/dist/modules/debug.d.ts.map +1 -1
- package/dist/modules/debug.js +3 -2
- package/dist/modules/debug.js.map +1 -1
- package/dist/modules/file.d.ts +3 -2
- package/dist/modules/file.d.ts.map +1 -1
- package/dist/modules/file.js +36 -13
- package/dist/modules/file.js.map +1 -1
- package/dist/modules/watch.d.ts +1 -1
- package/dist/modules/watch.d.ts.map +1 -1
- package/dist/modules/watch.js +4 -3
- package/dist/modules/watch.js.map +1 -1
- package/dist/security/ipcServer.d.ts +4 -0
- package/dist/security/ipcServer.d.ts.map +1 -0
- package/dist/{tools → security}/ipcServer.js +6 -5
- package/dist/security/ipcServer.js.map +1 -0
- package/dist/{tools → security}/queue-utils.d.ts +2 -1
- package/dist/security/queue-utils.d.ts.map +1 -0
- package/dist/{tools → security}/queue-utils.js +4 -1
- package/dist/security/queue-utils.js.map +1 -0
- package/dist/shared/consts.d.ts +6 -0
- package/dist/shared/consts.d.ts.map +1 -1
- package/dist/shared/consts.js +7 -1
- package/dist/shared/consts.js.map +1 -1
- package/dist/shared/interfaces.d.ts +1 -0
- package/dist/shared/interfaces.d.ts.map +1 -1
- package/dist/shared/types.d.ts.map +1 -1
- package/dist/slash-commands.d.ts.map +1 -1
- package/dist/slash-commands.js +14 -7
- package/dist/slash-commands.js.map +1 -1
- package/dist/startup.d.ts +1 -1
- package/dist/startup.d.ts.map +1 -1
- package/dist/startup.js +51 -31
- package/dist/startup.js.map +1 -1
- package/package.json +18 -15
- package/setup/install.sh +13 -43
- package/dist/config.d.ts.map +0 -1
- package/dist/config.js.map +0 -1
- package/dist/tools/backend.d.ts.map +0 -1
- package/dist/tools/backend.js +0 -166
- package/dist/tools/backend.js.map +0 -1
- package/dist/tools/ipcServer.d.ts +0 -4
- package/dist/tools/ipcServer.d.ts.map +0 -1
- package/dist/tools/ipcServer.js.map +0 -1
- package/dist/tools/queue-utils.d.ts.map +0 -1
- package/dist/tools/queue-utils.js.map +0 -1
- package/dist/tools/validateDb.d.ts +0 -3
- package/dist/tools/validateDb.d.ts.map +0 -1
- package/dist/tools/validateDb.js.map +0 -1
- package/dist/tools/validateDotenv.d.ts.map +0 -1
- package/dist/tools/validateDotenv.js.map +0 -1
- package/dist/types/queues.d.ts.map +0 -1
- /package/dist/{tools → config}/validateDotenv.d.ts +0 -0
- /package/dist/{types → interfaces}/queues.d.ts +0 -0
- /package/dist/{types → interfaces}/queues.js +0 -0
package/dist/modules/file.js
CHANGED
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
import { AttachmentBuilder } from 'discord.js';
|
|
2
|
-
import PATH from 'path';
|
|
2
|
+
import PATH from 'node:path';
|
|
3
3
|
import { fileTypeFromBuffer } from 'file-type';
|
|
4
4
|
import * as COMMON from '../common.js';
|
|
5
5
|
const UNKNOWN_LANG = '?';
|
|
6
|
-
import { Config } from '../config.js';
|
|
6
|
+
import { Config } from '../config/config.js';
|
|
7
7
|
import { languageMap } from '../ext/langMap.js';
|
|
8
|
-
import { post, put } from '../
|
|
8
|
+
import { post, put } from '../exec/backend.js';
|
|
9
|
+
import { discordUsername } from '../exec/username.js';
|
|
9
10
|
import { execCommand } from './command.js';
|
|
10
|
-
import * as queueUtils from '../
|
|
11
|
+
import * as queueUtils from '../security/queue-utils.js';
|
|
11
12
|
import shellEscape from 'shell-escape';
|
|
12
13
|
export function checkSize(bytes) {
|
|
13
14
|
if (bytes > Config.fileMaxSize * 1000 * 1000) {
|
|
@@ -16,7 +17,7 @@ export function checkSize(bytes) {
|
|
|
16
17
|
return true;
|
|
17
18
|
}
|
|
18
19
|
export async function read(interaction, username, path, payload) {
|
|
19
|
-
const res = await post(payload, true);
|
|
20
|
+
const res = await post(payload, true, true);
|
|
20
21
|
const buffer = res.data;
|
|
21
22
|
if (!checkSize(buffer.length)) {
|
|
22
23
|
await interaction.editReply({
|
|
@@ -34,7 +35,6 @@ export async function read(interaction, username, path, payload) {
|
|
|
34
35
|
isUtf8Decodable = true;
|
|
35
36
|
}
|
|
36
37
|
catch {
|
|
37
|
-
isUtf8Decodable = false;
|
|
38
38
|
await interaction.editReply({
|
|
39
39
|
content: COMMON.OS_ERR_MSG(username),
|
|
40
40
|
});
|
|
@@ -81,6 +81,7 @@ export async function write(interaction, username, file, path, payload, queues)
|
|
|
81
81
|
path += fileExt;
|
|
82
82
|
if (await queueUtils.handleDuplicate(interaction, username, queues.duplicateQueue, {
|
|
83
83
|
user: interaction.user.id,
|
|
84
|
+
username: discordUsername(interaction),
|
|
84
85
|
cmd: `dcos write to ${path}`,
|
|
85
86
|
}, true)) {
|
|
86
87
|
return;
|
|
@@ -95,25 +96,35 @@ export async function write(interaction, username, file, path, payload, queues)
|
|
|
95
96
|
return;
|
|
96
97
|
}
|
|
97
98
|
if (languageMap[fileExt] || Config.quickView.includes(fileExt)) {
|
|
98
|
-
const normalizePayload = { user: payload.user, cmd: `dos2unix ${path}` };
|
|
99
|
+
const normalizePayload = { user: payload.user, username: payload.username, cmd: `dos2unix ${path}` };
|
|
99
100
|
await execCommand(normalizePayload, interaction, normalizePayload.cmd, username, 1, queues, true);
|
|
100
101
|
}
|
|
101
102
|
await interaction.editReply({
|
|
102
103
|
content: COMMON.WRITE_FILE(path, username),
|
|
103
104
|
});
|
|
104
105
|
}
|
|
105
|
-
export async function absPath(path, user, queues) {
|
|
106
|
-
const payload = { user: user, cmd: `realpath ${path}` };
|
|
106
|
+
export async function absPath(fileName, path, user, queues) {
|
|
107
|
+
const payload = { user: user, username: '', cmd: `realpath ${path}` };
|
|
107
108
|
queueUtils.addToAll(queues, payload);
|
|
108
|
-
const res = await post(payload, false);
|
|
109
|
+
const res = await post(payload, false, true);
|
|
109
110
|
queueUtils.removeFromAll(queues, payload);
|
|
110
111
|
let newPath = res.data.toString('utf-8').trim();
|
|
111
112
|
if (path.endsWith('/') && !newPath.endsWith('/'))
|
|
112
113
|
newPath += '/';
|
|
113
114
|
if (newPath.includes('realpath: '))
|
|
114
|
-
return
|
|
115
|
+
return await cwdPath(fileName, user, queues);
|
|
115
116
|
return newPath;
|
|
116
117
|
}
|
|
118
|
+
export async function cwdPath(fileName, user, queues) {
|
|
119
|
+
const payload = { user: user, username: '', cmd: 'pwd' };
|
|
120
|
+
queueUtils.addToAll(queues, payload);
|
|
121
|
+
const res = await post(payload, false, true);
|
|
122
|
+
queueUtils.removeFromAll(queues, payload);
|
|
123
|
+
const cwd = res.data.toString('utf-8').trim();
|
|
124
|
+
if (cwd === '/')
|
|
125
|
+
return `/${fileName}`;
|
|
126
|
+
return `${cwd}/${fileName}`;
|
|
127
|
+
}
|
|
117
128
|
export async function pathAutocomplete(interaction, queues) {
|
|
118
129
|
if (!interaction.guild || !Config.allowedChannels.includes(interaction.channelId) || !Config.allowedUsers.includes(interaction.user.id)) {
|
|
119
130
|
return;
|
|
@@ -126,19 +137,31 @@ export async function pathAutocomplete(interaction, queues) {
|
|
|
126
137
|
currentDir = focusedValue.substring(0, lastSlashIndex);
|
|
127
138
|
filter = focusedValue.substring(lastSlashIndex + 1);
|
|
128
139
|
}
|
|
140
|
+
else {
|
|
141
|
+
const payload = {
|
|
142
|
+
user: interaction.user.id,
|
|
143
|
+
username: '',
|
|
144
|
+
cmd: 'pwd',
|
|
145
|
+
};
|
|
146
|
+
queueUtils.addToAll(queues, payload);
|
|
147
|
+
const res = await post(payload, false, true);
|
|
148
|
+
queueUtils.removeFromAll(queues, payload);
|
|
149
|
+
currentDir = res.data.toString('utf-8').trim();
|
|
150
|
+
}
|
|
129
151
|
if (currentDir === '')
|
|
130
152
|
currentDir = '/';
|
|
131
153
|
const payload = {
|
|
132
154
|
user: interaction.user.id,
|
|
155
|
+
username: '',
|
|
133
156
|
cmd: `(cd ${shellEscape([currentDir])} >/dev/null 2>&1 && LC_ALL=C ls -A --group-directories-first${focusedValue ? ` | grep -F -- "${shellEscape([filter])}"` : ''} | head -n 10) || echo ''`,
|
|
134
157
|
};
|
|
135
158
|
queueUtils.addToAll(queues, payload);
|
|
136
|
-
const res = await post(payload, false);
|
|
159
|
+
const res = await post(payload, false, true);
|
|
137
160
|
queueUtils.removeFromAll(queues, payload);
|
|
138
161
|
const items = res.data
|
|
139
162
|
.toString('utf-8')
|
|
140
163
|
.split('\n')
|
|
141
|
-
.filter((item) => item.trim());
|
|
164
|
+
.filter((item) => item.trim() !== '');
|
|
142
165
|
if (items.length === 0) {
|
|
143
166
|
items.push(focusedValue);
|
|
144
167
|
}
|
package/dist/modules/file.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/modules/file.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,IAAI,MAAM,
|
|
1
|
+
{"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/modules/file.ts"],"names":[],"mappings":"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"}
|
package/dist/modules/watch.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { ChatInputCommandInteraction, CacheType } from 'discord.js';
|
|
2
|
-
import type { CommandQueues } from '../
|
|
2
|
+
import type { CommandQueues } from '../interfaces/queues.js';
|
|
3
3
|
export declare function watch(interaction: ChatInputCommandInteraction<CacheType>, username: string, userId: string, target: string, interval: number, repeat: number, queues: CommandQueues): Promise<void>;
|
|
4
4
|
//# sourceMappingURL=watch.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../src/modules/watch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../src/modules/watch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAQzE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAE7D,wBAAsB,KAAK,CACzB,WAAW,EAAE,2BAA2B,CAAC,SAAS,CAAC,EACnD,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,IAAI,CAAC,CA8Bf"}
|
package/dist/modules/watch.js
CHANGED
|
@@ -1,14 +1,15 @@
|
|
|
1
1
|
import { execCommand } from './command.js';
|
|
2
2
|
import * as COMMON from '../common.js';
|
|
3
|
+
import { discordUsername } from '../exec/username.js';
|
|
3
4
|
export async function watch(interaction, username, userId, target, interval, repeat, queues) {
|
|
4
5
|
let execOutput;
|
|
5
6
|
let lastGoodReply = '';
|
|
6
7
|
for (let i = 0; i < repeat; i++) {
|
|
7
|
-
const cmd = COMMON.WATCH_CMD_BUILD(target, interval, i, repeat);
|
|
8
|
-
const payload = { user: userId, cmd: cmd };
|
|
8
|
+
const cmd = COMMON.WATCH_CMD_BUILD(target, interval, i, repeat, username);
|
|
9
|
+
const payload = { user: userId, username: discordUsername(interaction), cmd: cmd };
|
|
9
10
|
if (i === 0)
|
|
10
11
|
lastGoodReply = cmd;
|
|
11
|
-
execOutput = await execCommand(payload, interaction, cmd, username, 1, queues);
|
|
12
|
+
execOutput = await execCommand(payload, interaction, cmd, username, 1, queues, false);
|
|
12
13
|
const prevReplyContent = execOutput;
|
|
13
14
|
if (prevReplyContent.includes(COMMON.TOO_MANY_REQ) || prevReplyContent.includes(COMMON.DISCOS_GENERIC_ERR)) {
|
|
14
15
|
const replyContent = `${lastGoodReply}\n\n${prevReplyContent}\n${COMMON.WATCH_TERM}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watch.js","sourceRoot":"","sources":["../../src/modules/watch.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,OAAO,KAAK,MAAM,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"watch.js","sourceRoot":"","sources":["../../src/modules/watch.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,OAAO,KAAK,MAAM,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAMtD,MAAM,CAAC,KAAK,UAAU,KAAK,CACzB,WAAmD,EACnD,QAAgB,EAChB,MAAc,EACd,MAAc,EACd,QAAgB,EAChB,MAAc,EACd,MAAqB;IAErB,IAAI,UAAkB,CAAC;IACvB,IAAI,aAAa,GAAW,EAAE,CAAC;IAG/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAEhC,MAAM,GAAG,GAAG,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC1E,MAAM,OAAO,GAAsB,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,eAAe,CAAC,WAAW,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;QAGtG,IAAI,CAAC,KAAK,CAAC;YAAE,aAAa,GAAG,GAAG,CAAC;QAIjC,UAAU,GAAG,MAAM,WAAW,CAAC,OAAO,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QAGtF,MAAM,gBAAgB,GAAG,UAAU,CAAC;QACpC,IAAI,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAAE,CAAC;YAC3G,MAAM,YAAY,GAAG,GAAG,aAAa,OAAO,gBAAgB,KAAK,MAAM,CAAC,UAAU,EAAE,CAAC;YACrF,MAAM,WAAW,CAAC,SAAS,CAAC;gBAC1B,OAAO,EAAE,gBAAgB,GAAG,YAAY,GAAG,OAAO;aACnD,CAAC,CAAC;YACH,MAAM;QACR,CAAC;;YAAM,aAAa,GAAG,gBAAgB,CAAC;QAGxC,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;IAChE,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ipcServer.d.ts","sourceRoot":"","sources":["../../src/security/ipcServer.ts"],"names":[],"mappings":"AAEA,OAAO,GAAG,MAAM,UAAU,CAAC;AAM3B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAM7D,wBAAgB,cAAc,CAAC,SAAS,EAAE,aAAa,GAAG,GAAG,CAAC,MAAM,CA+CnE"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import * as queueUtils from '../
|
|
2
|
-
import net from 'net';
|
|
3
|
-
import fs from 'fs';
|
|
1
|
+
import * as queueUtils from '../security/queue-utils.js';
|
|
2
|
+
import net from 'node:net';
|
|
3
|
+
import fs from 'node:fs';
|
|
4
4
|
import * as COMMON from '../common.js';
|
|
5
5
|
import { SOCKET_PATH } from '../shared/consts.js';
|
|
6
|
-
import
|
|
6
|
+
import logger from '../logging/logger.js';
|
|
7
|
+
import { Config } from '../config/config.js';
|
|
7
8
|
export function startIPCServer(cmdQueues) {
|
|
8
9
|
try {
|
|
9
10
|
fs.unlinkSync(SOCKET_PATH);
|
|
@@ -37,7 +38,7 @@ export function startIPCServer(cmdQueues) {
|
|
|
37
38
|
});
|
|
38
39
|
server.listen(SOCKET_PATH, () => {
|
|
39
40
|
fs.chmodSync(SOCKET_PATH, 0o600);
|
|
40
|
-
|
|
41
|
+
logger.info(COMMON.LISTENING + SOCKET_PATH);
|
|
41
42
|
});
|
|
42
43
|
return server;
|
|
43
44
|
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ipcServer.js","sourceRoot":"","sources":["../../src/security/ipcServer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,4BAA4B,CAAC;AAEzD,OAAO,GAAG,MAAM,UAAU,CAAC;AAC3B,OAAO,EAAE,MAAM,SAAS,CAAC;AAEzB,OAAO,KAAK,MAAM,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAGlD,OAAO,MAAM,MAAM,sBAAsB,CAAC;AAG1C,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAE7C,MAAM,UAAU,cAAc,CAAC,SAAwB;IAErD,IAAI,CAAC;QACH,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAC7B,CAAC;IAAC,MAAM,CAAC;IAET,CAAC;IAED,MAAM,MAAM,GAAG,GAAG,CAAC,YAAY,CAAC,CAAC,MAAM,EAAE,EAAE;QACzC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YAEzB,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACrB,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;gBAC9C,MAAM,CAAC,GAAG,EAAE,CAAC;YACf,CAAC;YAGD,IAAI,GAAsB,CAAC;YAC3B,IAAI,CAAC;gBACH,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAsB,CAAC;YACzD,CAAC;YAAC,MAAM,CAAC;gBACP,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;gBAC/C,MAAM,CAAC,GAAG,EAAE,CAAC;gBACb,OAAO;YACT,CAAC;YAGD,IAAI,UAAU,CAAC,SAAS,CAAC,SAAS,CAAC,eAAe,EAAE,GAAG,CAAC,EAAE,CAAC;gBACzD,UAAU,CAAC,gBAAgB,CAAC,SAAS,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;gBAE5D,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;YAChD,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YACjD,CAAC;YACD,MAAM,CAAC,GAAG,EAAE,CAAC;QACf,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,GAAG,EAAE;QAI9B,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QACjC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,GAAG,WAAW,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import type { ChatInputCommandInteraction, CacheType } from 'discord.js';
|
|
2
2
|
import type { ICommandQueueItem } from '../shared/interfaces.js';
|
|
3
|
-
import type { CommandQueues } from '../
|
|
3
|
+
import type { CommandQueues } from '../interfaces/queues.js';
|
|
4
4
|
export declare function addToAll(queues: CommandQueues, req: ICommandQueueItem): void;
|
|
5
5
|
export declare function removeFromAll(queues: CommandQueues, req: ICommandQueueItem): void;
|
|
6
6
|
export declare function tryRemoveInQueue(queue: ICommandQueueItem[], req: ICommandQueueItem): void;
|
|
7
7
|
export declare function isInQueue(queue: ICommandQueueItem[], req: ICommandQueueItem): boolean;
|
|
8
8
|
export declare function handleDuplicate(interaction: ChatInputCommandInteraction<CacheType>, username: string, queue: ICommandQueueItem[], translated: ICommandQueueItem, inverseUserIdMatch?: boolean): Promise<boolean>;
|
|
9
|
+
export declare function countUserCommandsInQueue(queue: ICommandQueueItem[], userId: string): number;
|
|
9
10
|
//# sourceMappingURL=queue-utils.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"queue-utils.d.ts","sourceRoot":"","sources":["../../src/security/queue-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEzE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAG7D,wBAAgB,QAAQ,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,EAAE,iBAAiB,GAAG,IAAI,CAG5E;AAGD,wBAAgB,aAAa,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,EAAE,iBAAiB,GAAG,IAAI,CAGjF;AAGD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,iBAAiB,EAAE,EAAE,GAAG,EAAE,iBAAiB,GAAG,IAAI,CAKzF;AAGD,wBAAgB,SAAS,CAAC,KAAK,EAAE,iBAAiB,EAAE,EAAE,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAErF;AAGD,wBAAsB,eAAe,CACnC,WAAW,EAAE,2BAA2B,CAAC,SAAS,CAAC,EACnD,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,iBAAiB,EAAE,EAC1B,UAAU,EAAE,iBAAiB,EAC7B,kBAAkB,UAAQ,GACzB,OAAO,CAAC,OAAO,CAAC,CAYlB;AAGD,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,iBAAiB,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAE3F"}
|
|
@@ -14,7 +14,7 @@ export function tryRemoveInQueue(queue, req) {
|
|
|
14
14
|
}
|
|
15
15
|
}
|
|
16
16
|
export function isInQueue(queue, req) {
|
|
17
|
-
return queue.
|
|
17
|
+
return queue.some((item) => item.user === req.user && item.cmd === req.cmd);
|
|
18
18
|
}
|
|
19
19
|
export async function handleDuplicate(interaction, username, queue, translated, inverseUserIdMatch = false) {
|
|
20
20
|
const index = inverseUserIdMatch
|
|
@@ -29,4 +29,7 @@ export async function handleDuplicate(interaction, username, queue, translated,
|
|
|
29
29
|
}
|
|
30
30
|
return false;
|
|
31
31
|
}
|
|
32
|
+
export function countUserCommandsInQueue(queue, userId) {
|
|
33
|
+
return queue.reduce((count, item) => (item.user === userId ? count + 1 : count), 0);
|
|
34
|
+
}
|
|
32
35
|
//# sourceMappingURL=queue-utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"queue-utils.js","sourceRoot":"","sources":["../../src/security/queue-utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,cAAc,CAAC;AAKvC,MAAM,UAAU,QAAQ,CAAC,MAAqB,EAAE,GAAsB;IACpE,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACjC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClC,CAAC;AAGD,MAAM,UAAU,aAAa,CAAC,MAAqB,EAAE,GAAsB;IACzE,gBAAgB,CAAC,MAAM,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;IAC9C,gBAAgB,CAAC,MAAM,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;AAC/C,CAAC;AAGD,MAAM,UAAU,gBAAgB,CAAC,KAA0B,EAAE,GAAsB;IACjF,MAAM,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,GAAG,KAAK,GAAG,CAAC,GAAG,CAAC,CAAC;IACxF,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;QACjB,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IACzB,CAAC;AACH,CAAC;AAGD,MAAM,UAAU,SAAS,CAAC,KAA0B,EAAE,GAAsB;IAC1E,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,GAAG,KAAK,GAAG,CAAC,GAAG,CAAC,CAAC;AAC9E,CAAC;AAGD,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,WAAmD,EACnD,QAAgB,EAChB,KAA0B,EAC1B,UAA6B,EAC7B,kBAAkB,GAAG,KAAK;IAE1B,MAAM,KAAK,GAAG,kBAAkB;QAC9B,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,IAAI,IAAI,IAAI,CAAC,GAAG,KAAK,UAAU,CAAC,GAAG,CAAC;QACzF,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,IAAI,IAAI,IAAI,CAAC,GAAG,KAAK,UAAU,CAAC,GAAG,CAAC,CAAC;IAC5F,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;QACjB,MAAM,WAAW,CAAC,KAAK,CAAC;YACtB,OAAO,EAAE,MAAM,CAAC,aAAa,GAAG,QAAQ,GAAG,GAAG;YAC9C,KAAK,EAAE,EAAE;SACV,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAGD,MAAM,UAAU,wBAAwB,CAAC,KAA0B,EAAE,MAAc;IACjF,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;AACtF,CAAC"}
|
package/dist/shared/consts.d.ts
CHANGED
|
@@ -1,6 +1,12 @@
|
|
|
1
1
|
export declare const SOCKET_PATH: string;
|
|
2
2
|
export declare const ROOT_UID: string;
|
|
3
|
+
export declare const ROOT_UNAME: string;
|
|
4
|
+
export declare const INTERNAL_UID = "000000000000000000";
|
|
5
|
+
export declare const INTERNAL_UNAME = "DiscOS-Internal";
|
|
3
6
|
export declare const PING_RESPONSE: string;
|
|
4
7
|
export declare const DB_UPDATE: string;
|
|
8
|
+
export declare const CLEAR_TERMINALS: string;
|
|
9
|
+
export declare const INIT_TERMINALS: string;
|
|
5
10
|
export { EB_DB_ERR, EB_PAYLOAD_INVALID, EB_GENERIC_ERR, EB_DIR_ERR, EB_PERM_ERR, EB_DOWNLOAD_ERR, EB_SET_PERM_ERR } from '../common.js';
|
|
11
|
+
export { TERMINAL_OUTPUT, terminalSpawnedMessage, terminalRespawnMessage, terminalSpawnFailedMessage, terminalDestroyedMessage, terminalSyncCompleteMessage, } from '../common.js';
|
|
6
12
|
//# sourceMappingURL=consts.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"consts.d.ts","sourceRoot":"","sources":["../../src/shared/consts.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,WAAW,EAAE,MAA2B,CAAC;AAGtD,eAAO,MAAM,QAAQ,EAAE,MAA6B,CAAC;AAGrD,eAAO,MAAM,aAAa,EAAE,MAAiB,CAAC;AAI9C,eAAO,MAAM,SAAS,EAAE,MAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"consts.d.ts","sourceRoot":"","sources":["../../src/shared/consts.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,WAAW,EAAE,MAA2B,CAAC;AAGtD,eAAO,MAAM,QAAQ,EAAE,MAA6B,CAAC;AAGrD,eAAO,MAAM,UAAU,EAAE,MAAe,CAAC;AAGzC,eAAO,MAAM,YAAY,uBAAuB,CAAC;AAGjD,eAAO,MAAM,cAAc,oBAAoB,CAAC;AAGhD,eAAO,MAAM,aAAa,EAAE,MAAiB,CAAC;AAI9C,eAAO,MAAM,SAAS,EAAE,MAAmB,CAAC;AAI5C,eAAO,MAAM,eAAe,EAAE,MAAgB,CAAC;AAI/C,eAAO,MAAM,cAAc,EAAE,MAAe,CAAC;AAG7C,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,cAAc,EAAE,UAAU,EAAE,WAAW,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAGxI,OAAO,EACL,eAAe,EACf,sBAAsB,EACtB,sBAAsB,EACtB,0BAA0B,EAC1B,wBAAwB,EACxB,2BAA2B,GAC5B,MAAM,cAAc,CAAC"}
|
package/dist/shared/consts.js
CHANGED
|
@@ -1,6 +1,12 @@
|
|
|
1
1
|
export const SOCKET_PATH = '/tmp/discos.sock';
|
|
2
|
-
export const ROOT_UID = '
|
|
2
|
+
export const ROOT_UID = '000000000000000001';
|
|
3
|
+
export const ROOT_UNAME = 'root';
|
|
4
|
+
export const INTERNAL_UID = '000000000000000000';
|
|
5
|
+
export const INTERNAL_UNAME = 'DiscOS-Internal';
|
|
3
6
|
export const PING_RESPONSE = 'DISCOS';
|
|
4
7
|
export const DB_UPDATE = 'dbupdate';
|
|
8
|
+
export const CLEAR_TERMINALS = 'clear';
|
|
9
|
+
export const INIT_TERMINALS = 'init';
|
|
5
10
|
export { EB_DB_ERR, EB_PAYLOAD_INVALID, EB_GENERIC_ERR, EB_DIR_ERR, EB_PERM_ERR, EB_DOWNLOAD_ERR, EB_SET_PERM_ERR } from '../common.js';
|
|
11
|
+
export { TERMINAL_OUTPUT, terminalSpawnedMessage, terminalRespawnMessage, terminalSpawnFailedMessage, terminalDestroyedMessage, terminalSyncCompleteMessage, } from '../common.js';
|
|
6
12
|
//# sourceMappingURL=consts.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"consts.js","sourceRoot":"","sources":["../../src/shared/consts.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,MAAM,WAAW,GAAW,kBAAkB,CAAC;AAGtD,MAAM,CAAC,MAAM,QAAQ,GAAW,oBAAoB,CAAC;AAGrD,MAAM,CAAC,MAAM,aAAa,GAAW,QAAQ,CAAC;AAI9C,MAAM,CAAC,MAAM,SAAS,GAAW,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"consts.js","sourceRoot":"","sources":["../../src/shared/consts.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,MAAM,WAAW,GAAW,kBAAkB,CAAC;AAGtD,MAAM,CAAC,MAAM,QAAQ,GAAW,oBAAoB,CAAC;AAGrD,MAAM,CAAC,MAAM,UAAU,GAAW,MAAM,CAAC;AAGzC,MAAM,CAAC,MAAM,YAAY,GAAG,oBAAoB,CAAC;AAGjD,MAAM,CAAC,MAAM,cAAc,GAAG,iBAAiB,CAAC;AAGhD,MAAM,CAAC,MAAM,aAAa,GAAW,QAAQ,CAAC;AAI9C,MAAM,CAAC,MAAM,SAAS,GAAW,UAAU,CAAC;AAI5C,MAAM,CAAC,MAAM,eAAe,GAAW,OAAO,CAAC;AAI/C,MAAM,CAAC,MAAM,cAAc,GAAW,MAAM,CAAC;AAG7C,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,cAAc,EAAE,UAAU,EAAE,WAAW,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAGxI,OAAO,EACL,eAAe,EACf,sBAAsB,EACtB,sBAAsB,EACtB,0BAA0B,EAC1B,wBAAwB,EACxB,2BAA2B,GAC5B,MAAM,cAAc,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../src/shared/interfaces.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,iBAAiB;
|
|
1
|
+
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../src/shared/interfaces.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,iBAAiB;IAEhC,IAAI,EAAE,MAAM,CAAC;IAKb,QAAQ,EAAE,MAAM,CAAC;IAGjB,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,WAAW;IAE1B,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,iBAAiB;IAEhC,GAAG,EAAE,MAAM,CAAC;IAGZ,IAAI,EAAE,MAAM,CAAC;IAGb,OAAO,EAAE,iBAAiB,CAAC;CAC5B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/shared/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,EAAE,GAAG;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/shared/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,EAAE,GAAG;IAEf,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAG9B,UAAU,EAAE,MAAM,EAAE,CAAC;IAGrB,eAAe,EAAE,MAAM,EAAE,CAAC;IAG1B,UAAU,EAAE,OAAO,CAAC;IAGpB,QAAQ,EAAE,OAAO,CAAC;IAGlB,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slash-commands.d.ts","sourceRoot":"","sources":["../src/slash-commands.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"slash-commands.d.ts","sourceRoot":"","sources":["../src/slash-commands.ts"],"names":[],"mappings":"AAYA,wBAAgB,qBAAqB,IAAI,IAAI,CAiU5C"}
|
package/dist/slash-commands.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { REST, Routes, SlashCommandBuilder } from 'discord.js';
|
|
2
|
-
import { validateDotenv } from './
|
|
2
|
+
import { validateDotenv } from './config/validateDotenv.js';
|
|
3
|
+
import logger from './logging/logger.js';
|
|
3
4
|
import * as COMMON from './common.js';
|
|
4
|
-
import { fileURLToPath } from 'url';
|
|
5
|
+
import { fileURLToPath } from 'node:url';
|
|
5
6
|
export function registerSlashCommands() {
|
|
6
7
|
if (!validateDotenv()) {
|
|
7
8
|
process.exit(1);
|
|
@@ -15,7 +16,7 @@ export function registerSlashCommands() {
|
|
|
15
16
|
.addStringOption((option) => option
|
|
16
17
|
.setName(COMMON.CMD)
|
|
17
18
|
.setDescription(COMMON.CMD_DESC)
|
|
18
|
-
.setRequired(
|
|
19
|
+
.setRequired(false))
|
|
19
20
|
.addBooleanOption((option) => option
|
|
20
21
|
.setName(COMMON.HIDE)
|
|
21
22
|
.setDescription(COMMON.HIDE_REPLY)
|
|
@@ -95,6 +96,9 @@ export function registerSlashCommands() {
|
|
|
95
96
|
.setDescription(COMMON.HIDE_REPLY)
|
|
96
97
|
.setRequired(false)))
|
|
97
98
|
.addSubcommand((sub) => sub
|
|
99
|
+
.setName(COMMON.RESET)
|
|
100
|
+
.setDescription(COMMON.RESET_DESC))
|
|
101
|
+
.addSubcommand((sub) => sub
|
|
98
102
|
.setName(COMMON.HELP)
|
|
99
103
|
.setDescription(COMMON.HELP_USER_DESC));
|
|
100
104
|
const adminCommand = new SlashCommandBuilder()
|
|
@@ -198,7 +202,10 @@ export function registerSlashCommands() {
|
|
|
198
202
|
.addStringOption((option) => option
|
|
199
203
|
.setName(COMMON.CMD)
|
|
200
204
|
.setDescription(COMMON.CMD_DESC)
|
|
201
|
-
.setRequired(
|
|
205
|
+
.setRequired(false)))
|
|
206
|
+
.addSubcommand((sub) => sub
|
|
207
|
+
.setName(COMMON.RESET)
|
|
208
|
+
.setDescription(COMMON.RESET_DESC))
|
|
202
209
|
.addSubcommand((sub) => sub
|
|
203
210
|
.setName(COMMON.HELP)
|
|
204
211
|
.setDescription(COMMON.HELP_ADMIN_DESC));
|
|
@@ -208,14 +215,14 @@ export function registerSlashCommands() {
|
|
|
208
215
|
for (const guildId of guildIds) {
|
|
209
216
|
try {
|
|
210
217
|
await rest.put(Routes.applicationGuildCommands(process.env.APP_ID, guildId), { body: [command.toJSON(), adminCommand.toJSON()] });
|
|
211
|
-
|
|
218
|
+
logger.info(`${COMMON.CMD_REG_1} ${guildId}`);
|
|
212
219
|
}
|
|
213
220
|
catch (err) {
|
|
214
|
-
|
|
221
|
+
logger.error(`${COMMON.CMD_REG_2} ${guildId}`, err);
|
|
215
222
|
}
|
|
216
223
|
}
|
|
217
224
|
})().catch((err) => {
|
|
218
|
-
|
|
225
|
+
logger.error(COMMON.CMD_REG_ERR, err);
|
|
219
226
|
});
|
|
220
227
|
}
|
|
221
228
|
if (process.argv[1] === fileURLToPath(import.meta.url)) {
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"slash-commands.js","sourceRoot":"","sources":["../src/slash-commands.ts"],"names":[],"mappings":"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"}
|
package/dist/startup.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare function startDiscOS(): void
|
|
1
|
+
export declare function startDiscOS(): Promise<void>;
|
|
2
2
|
//# sourceMappingURL=startup.d.ts.map
|
package/dist/startup.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"startup.d.ts","sourceRoot":"","sources":["../src/startup.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"startup.d.ts","sourceRoot":"","sources":["../src/startup.ts"],"names":[],"mappings":"AAmCA,wBAAsB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CA8OjD"}
|