discos 1.0.0 → 1.1.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/README.md +2 -2
- package/dist/common.d.ts +28 -4
- package/dist/common.d.ts.map +1 -1
- package/dist/common.js +57 -11
- package/dist/common.js.map +1 -1
- package/dist/modules/admin.d.ts +3 -2
- package/dist/modules/admin.d.ts.map +1 -1
- package/dist/modules/admin.js +158 -24
- package/dist/modules/admin.js.map +1 -1
- package/dist/modules/command.d.ts.map +1 -1
- package/dist/modules/command.js +2 -2
- package/dist/modules/command.js.map +1 -1
- package/dist/modules/file.d.ts +3 -1
- package/dist/modules/file.d.ts.map +1 -1
- package/dist/modules/file.js +69 -8
- package/dist/modules/file.js.map +1 -1
- package/dist/modules/watch.d.ts.map +1 -1
- package/dist/modules/watch.js +2 -4
- package/dist/modules/watch.js.map +1 -1
- package/dist/shared/consts.d.ts +2 -0
- package/dist/shared/consts.d.ts.map +1 -1
- package/dist/shared/consts.js +3 -1
- package/dist/shared/consts.js.map +1 -1
- package/dist/shared/index.d.ts +1 -0
- package/dist/shared/index.d.ts.map +1 -1
- package/dist/shared/index.js +1 -0
- package/dist/shared/index.js.map +1 -1
- package/dist/{types/db.d.ts → shared/types.d.ts} +1 -1
- package/dist/shared/types.d.ts.map +1 -0
- package/dist/{types/db.js → shared/types.js} +1 -1
- package/dist/shared/types.js.map +1 -0
- package/dist/slash-commands.d.ts.map +1 -1
- package/dist/slash-commands.js +23 -6
- package/dist/slash-commands.js.map +1 -1
- package/dist/startup.d.ts.map +1 -1
- package/dist/startup.js +32 -5
- package/dist/startup.js.map +1 -1
- package/dist/tools/backend.d.ts +4 -0
- package/dist/tools/backend.d.ts.map +1 -1
- package/dist/tools/backend.js +46 -3
- package/dist/tools/backend.js.map +1 -1
- package/dist/tools/queue-utils.d.ts +1 -1
- package/dist/tools/queue-utils.d.ts.map +1 -1
- package/dist/tools/queue-utils.js +4 -2
- package/dist/tools/queue-utils.js.map +1 -1
- package/dist/tools/validateDb.d.ts +2 -1
- package/dist/tools/validateDb.d.ts.map +1 -1
- package/dist/tools/validateDb.js +4 -1
- package/dist/tools/validateDb.js.map +1 -1
- package/package.json +17 -4
- package/setup/install.sh +14 -1
- package/dist/types/db.d.ts.map +0 -1
- package/dist/types/db.js.map +0 -1
package/dist/startup.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"startup.js","sourceRoot":"","sources":["../src/startup.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"startup.js","sourceRoot":"","sources":["../src/startup.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/backend.d.ts
CHANGED
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
import type { AxiosResponse } from 'axios';
|
|
2
2
|
import type { ICommandQueueItem, IFileWritePayload } from '../shared/interfaces';
|
|
3
|
+
import type { DB } from '../shared/types';
|
|
4
|
+
import type { CommandQueues } from 'src/types/queues';
|
|
3
5
|
export declare function post(payload: ICommandQueueItem, b64decode: boolean): Promise<AxiosResponse<any, any>>;
|
|
4
6
|
export declare function put(req: IFileWritePayload): Promise<AxiosResponse<any, any>>;
|
|
7
|
+
export declare function ping(): Promise<string>;
|
|
8
|
+
export declare function updateExternalBackendDatabase(database: DB, queues: CommandQueues): Promise<void>;
|
|
5
9
|
//# sourceMappingURL=backend.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backend.d.ts","sourceRoot":"","sources":["../../src/tools/backend.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAM3C,OAAO,KAAK,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"backend.d.ts","sourceRoot":"","sources":["../../src/tools/backend.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAM3C,OAAO,KAAK,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAGjF,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,iBAAiB,CAAC;AAS1C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAgHtD,wBAAsB,IAAI,CAAC,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAe3G;AAED,wBAAsB,GAAG,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAgBlF;AAGD,wBAAsB,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC,CA4B5C;AAGD,wBAAsB,6BAA6B,CAAC,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAYtG"}
|
package/dist/tools/backend.js
CHANGED
|
@@ -38,18 +38,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
39
|
exports.post = post;
|
|
40
40
|
exports.put = put;
|
|
41
|
+
exports.ping = ping;
|
|
42
|
+
exports.updateExternalBackendDatabase = updateExternalBackendDatabase;
|
|
41
43
|
const axios_1 = __importDefault(require("axios"));
|
|
42
44
|
const config_1 = require("../config");
|
|
43
|
-
const COMMON = __importStar(require("../common"));
|
|
44
45
|
const consts_1 = require("../shared/consts");
|
|
46
|
+
const COMMON = __importStar(require("../common"));
|
|
47
|
+
const consts_2 = require("../shared/consts");
|
|
45
48
|
const WRITE_OP_SUCCESS = '';
|
|
49
|
+
const queueUtils = __importStar(require("../tools/queue-utils"));
|
|
46
50
|
const shell_escape_1 = __importDefault(require("shell-escape"));
|
|
47
51
|
const child_process_1 = require("child_process");
|
|
48
52
|
const util_1 = require("util");
|
|
49
53
|
const promises_1 = require("fs/promises");
|
|
50
54
|
const execAsync = (0, util_1.promisify)(child_process_1.exec);
|
|
51
55
|
async function localUser(user) {
|
|
52
|
-
if (user ===
|
|
56
|
+
if (user === consts_2.ROOT_UID) {
|
|
53
57
|
return 'root';
|
|
54
58
|
}
|
|
55
59
|
const dbContent = await (0, promises_1.readFile)(config_1.Config.databasePath, 'utf-8');
|
|
@@ -113,7 +117,7 @@ async function fileWrite(url, path, payload) {
|
|
|
113
117
|
const getHomeCmd = (0, shell_escape_1.default)(['echo $HOME']);
|
|
114
118
|
({ stdout } = await execAsync(`sudo /usr/local/bin/cmdex ${serverUser} ${getHomeCmd}`));
|
|
115
119
|
const userHomeDir = stdout.trim();
|
|
116
|
-
const permCmd = (0, shell_escape_1.default)([`cd ${userHomeDir} && chown ${serverUser}:${serverUser} ${escapedPath} && chmod
|
|
120
|
+
const permCmd = (0, shell_escape_1.default)([`cd ${userHomeDir} && chown ${serverUser}:${serverUser} ${escapedPath} && chmod 644 ${escapedPath}`]);
|
|
117
121
|
({ stdout } = await execAsync(`sudo /usr/local/bin/cmdex root ${permCmd}`));
|
|
118
122
|
if (stdout.trim() !== '') {
|
|
119
123
|
return COMMON.SET_PERM_ERR;
|
|
@@ -152,4 +156,43 @@ async function put(req) {
|
|
|
152
156
|
}
|
|
153
157
|
return res;
|
|
154
158
|
}
|
|
159
|
+
async function ping() {
|
|
160
|
+
const controller = new AbortController();
|
|
161
|
+
const timeout = setTimeout(() => controller.abort(), 5000);
|
|
162
|
+
try {
|
|
163
|
+
const res = await axios_1.default.get(config_1.Config.backend, {
|
|
164
|
+
responseType: 'text',
|
|
165
|
+
validateStatus: (status) => status >= 200 && status < 300,
|
|
166
|
+
signal: controller.signal,
|
|
167
|
+
});
|
|
168
|
+
if (res.data.trim() !== consts_2.PING_RESPONSE) {
|
|
169
|
+
throw new Error(COMMON.EXTERNAL_NORESPONSE);
|
|
170
|
+
}
|
|
171
|
+
console.log(COMMON.EXTERNAL_OK);
|
|
172
|
+
return COMMON.EXTERNAL_OK;
|
|
173
|
+
}
|
|
174
|
+
catch (err) {
|
|
175
|
+
if (err instanceof Error) {
|
|
176
|
+
console.warn(err.message);
|
|
177
|
+
}
|
|
178
|
+
else {
|
|
179
|
+
console.warn(String(err));
|
|
180
|
+
}
|
|
181
|
+
return COMMON.EXTERNAL_NORESPONSE;
|
|
182
|
+
}
|
|
183
|
+
finally {
|
|
184
|
+
clearTimeout(timeout);
|
|
185
|
+
}
|
|
186
|
+
}
|
|
187
|
+
async function updateExternalBackendDatabase(database, queues) {
|
|
188
|
+
const validationPayload = { user: consts_2.ROOT_UID, cmd: consts_1.DB_UPDATE };
|
|
189
|
+
queueUtils.addToAll(queues, validationPayload);
|
|
190
|
+
await axios_1.default.put(config_1.Config.backend + '/' + consts_1.DB_UPDATE, database, {
|
|
191
|
+
headers: {
|
|
192
|
+
'Content-Type': 'application/json',
|
|
193
|
+
},
|
|
194
|
+
validateStatus: (status) => status <= 500,
|
|
195
|
+
});
|
|
196
|
+
queueUtils.tryRemoveInQueue(queues.validationQueue, validationPayload);
|
|
197
|
+
}
|
|
155
198
|
//# sourceMappingURL=backend.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backend.js","sourceRoot":"","sources":["../../src/tools/backend.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"backend.js","sourceRoot":"","sources":["../../src/tools/backend.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,5 +5,5 @@ export declare function addToAll(queues: CommandQueues, req: ICommandQueueItem):
|
|
|
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
|
-
export declare function handleDuplicate(interaction: ChatInputCommandInteraction<CacheType>, username: string, queue: ICommandQueueItem[], translated: ICommandQueueItem): Promise<boolean>;
|
|
8
|
+
export declare function handleDuplicate(interaction: ChatInputCommandInteraction<CacheType>, username: string, queue: ICommandQueueItem[], translated: ICommandQueueItem, inverseUserIdMatch?: boolean): Promise<boolean>;
|
|
9
9
|
//# sourceMappingURL=queue-utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue-utils.d.ts","sourceRoot":"","sources":["../../src/tools/queue-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEzE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAErD,wBAAgB,QAAQ,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,EAAE,iBAAiB,GAAG,IAAI,CAG5E;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,EAAE,iBAAiB,GAAG,IAAI,CAGjF;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,iBAAiB,EAAE,EAAE,GAAG,EAAE,iBAAiB,GAAG,IAAI,CAKzF;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,iBAAiB,EAAE,EAAE,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAErF;AAED,wBAAsB,eAAe,CACnC,WAAW,EAAE,2BAA2B,CAAC,SAAS,CAAC,EACnD,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,iBAAiB,EAAE,EAC1B,UAAU,EAAE,iBAAiB,
|
|
1
|
+
{"version":3,"file":"queue-utils.d.ts","sourceRoot":"","sources":["../../src/tools/queue-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEzE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAErD,wBAAgB,QAAQ,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,EAAE,iBAAiB,GAAG,IAAI,CAG5E;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,EAAE,iBAAiB,GAAG,IAAI,CAGjF;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,iBAAiB,EAAE,EAAE,GAAG,EAAE,iBAAiB,GAAG,IAAI,CAKzF;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,iBAAiB,EAAE,EAAE,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAErF;AAED,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"}
|
|
@@ -56,8 +56,10 @@ function tryRemoveInQueue(queue, req) {
|
|
|
56
56
|
function isInQueue(queue, req) {
|
|
57
57
|
return queue.findIndex((item) => item.user === req.user && item.cmd === req.cmd) !== -1;
|
|
58
58
|
}
|
|
59
|
-
async function handleDuplicate(interaction, username, queue, translated) {
|
|
60
|
-
const index =
|
|
59
|
+
async function handleDuplicate(interaction, username, queue, translated, inverseUserIdMatch = false) {
|
|
60
|
+
const index = inverseUserIdMatch
|
|
61
|
+
? queue.findIndex((item) => item.user !== translated.user && item.cmd === translated.cmd)
|
|
62
|
+
: queue.findIndex((item) => item.user === translated.user && item.cmd === translated.cmd);
|
|
61
63
|
if (index !== -1) {
|
|
62
64
|
await interaction.reply({
|
|
63
65
|
content: COMMON.DUPLICATE_ERR + username + '.',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue-utils.js","sourceRoot":"","sources":["../../src/tools/queue-utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKA,4BAGC;AAED,sCAGC;AAED,4CAKC;AAED,8BAEC;AAED,
|
|
1
|
+
{"version":3,"file":"queue-utils.js","sourceRoot":"","sources":["../../src/tools/queue-utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKA,4BAGC;AAED,sCAGC;AAED,4CAKC;AAED,8BAEC;AAED,0CAkBC;AA3CD,kDAAoC;AAIpC,SAAgB,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;AAED,SAAgB,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;AAED,SAAgB,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;AAED,SAAgB,SAAS,CAAC,KAA0B,EAAE,GAAsB;IAC1E,OAAO,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,KAAK,CAAC,CAAC,CAAC;AAC1F,CAAC;AAEM,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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateDb.d.ts","sourceRoot":"","sources":["../../src/tools/validateDb.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"validateDb.d.ts","sourceRoot":"","sources":["../../src/tools/validateDb.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAKtD,wBAAgB,UAAU,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAsFzD"}
|
package/dist/tools/validateDb.js
CHANGED
|
@@ -40,8 +40,9 @@ exports.validateDb = validateDb;
|
|
|
40
40
|
const fs_1 = __importDefault(require("fs"));
|
|
41
41
|
const COMMON = __importStar(require("../common"));
|
|
42
42
|
const config_1 = require("../config");
|
|
43
|
+
const backend_1 = require("./backend");
|
|
43
44
|
const isValidId = (id) => /^\d{17,}$/.test(id);
|
|
44
|
-
function validateDb() {
|
|
45
|
+
function validateDb(queues) {
|
|
45
46
|
let db;
|
|
46
47
|
try {
|
|
47
48
|
const rawData = fs_1.default.readFileSync(process.env.DATABASE_PATH, 'utf-8');
|
|
@@ -106,6 +107,8 @@ function validateDb() {
|
|
|
106
107
|
config_1.Config.standalone = db.standalone;
|
|
107
108
|
config_1.Config.safemode = db.safemode;
|
|
108
109
|
config_1.Config.lockdown = db.lockdown;
|
|
110
|
+
if (!config_1.Config.standalone)
|
|
111
|
+
void (0, backend_1.updateExternalBackendDatabase)(db, queues);
|
|
109
112
|
return true;
|
|
110
113
|
}
|
|
111
114
|
//# sourceMappingURL=validateDb.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateDb.js","sourceRoot":"","sources":["../../src/tools/validateDb.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"validateDb.js","sourceRoot":"","sources":["../../src/tools/validateDb.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "discos",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.1.1",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"types": "dist/index.d.ts",
|
|
6
6
|
"scripts": {
|
|
7
7
|
"build": "rm -f tsconfig.tsbuildinfo && npx tsc -b",
|
|
8
8
|
"setup": "node dist/slash-commands.js",
|
|
9
9
|
"start": "node dist/startup.js",
|
|
10
|
-
"dev": "
|
|
10
|
+
"dev": "npm run build && node dist/startup.js",
|
|
11
11
|
"docker:build": "docker build -t discos:latest .",
|
|
12
12
|
"docker:up": "docker compose up -d",
|
|
13
13
|
"docker:down": "docker compose down",
|
|
@@ -16,9 +16,11 @@
|
|
|
16
16
|
"release:npm": "rm -rf dist && rm -f tsconfig.tsbuildinfo && npm run build && npm publish --access public",
|
|
17
17
|
"release:all": "npm run release:npm && npm run release:docker",
|
|
18
18
|
"release:login": "docker login && npm login",
|
|
19
|
+
"pack": "rm -rf dist && rm -f tsconfig.tsbuildinfo && npm run build && npm pack",
|
|
19
20
|
"format": "prettier --write \"**/*.{ts,json,md}\" --log-level silent",
|
|
20
21
|
"lint": "eslint . --ext .ts --cache",
|
|
21
|
-
"postinstall": "node -e \"if (process.env.NODE_ENV !== 'production') require('child_process').execSync('git config core.hooksPath .husky')\""
|
|
22
|
+
"postinstall": "node -e \"if (process.env.NODE_ENV !== 'production') require('child_process').execSync('git config core.hooksPath .husky')\"",
|
|
23
|
+
"test": "echo \"No tests specified.\" && exit 0"
|
|
22
24
|
},
|
|
23
25
|
"keywords": [
|
|
24
26
|
"discord",
|
|
@@ -36,9 +38,20 @@
|
|
|
36
38
|
"file",
|
|
37
39
|
"transfer"
|
|
38
40
|
],
|
|
39
|
-
"author": "https://github.com/BrNi05",
|
|
41
|
+
"author": "Barni <szocsbarnabas8@gmail.com> (https://github.com/BrNi05)",
|
|
40
42
|
"license": "Apache-2.0",
|
|
41
43
|
"description": "DiscOS is a secure interaction bridge between Discord and Linux servers",
|
|
44
|
+
"repository": {
|
|
45
|
+
"type": "git",
|
|
46
|
+
"url": "git+https://github.com/BrNi05/DiscOS.git"
|
|
47
|
+
},
|
|
48
|
+
"homepage": "https://github.com/BrNi05/DiscOS/wiki/01.-Home",
|
|
49
|
+
"bugs": {
|
|
50
|
+
"url": "https://github.com/BrNi05/DiscOS/issues"
|
|
51
|
+
},
|
|
52
|
+
"engines": {
|
|
53
|
+
"node": ">=20.0.0"
|
|
54
|
+
},
|
|
42
55
|
"dependencies": {
|
|
43
56
|
"axios": "^1.11.0",
|
|
44
57
|
"discord.js": "^14.22.1",
|
package/setup/install.sh
CHANGED
|
@@ -79,6 +79,9 @@ need tail
|
|
|
79
79
|
need cat
|
|
80
80
|
need base64
|
|
81
81
|
need dos2unix
|
|
82
|
+
need realpath
|
|
83
|
+
need head
|
|
84
|
+
need grep # installed as script deps as well
|
|
82
85
|
|
|
83
86
|
echo -e "All dependencies installed."
|
|
84
87
|
|
|
@@ -273,8 +276,13 @@ setup_compose() {
|
|
|
273
276
|
setup_cmdex() {
|
|
274
277
|
echo -e "\nSetting up command executor..."
|
|
275
278
|
|
|
279
|
+
echo -e "\nYou can specify one user that is allowed to use command executor. This is the user as which your external backend (if used) or parent process (if npm install) will run."
|
|
280
|
+
read -rp "Enter the local username (default: root): " CMD_USER
|
|
281
|
+
CMD_USER=${CMD_USER:-root}
|
|
282
|
+
echo
|
|
283
|
+
|
|
276
284
|
cp "$TEMP_DIR/src/.sh/cmd-executor.sh" "/usr/local/bin/cmdex.sh"
|
|
277
|
-
chown discos:
|
|
285
|
+
chown discos:"$CMD_USER" "/usr/local/bin/cmdex.sh" || chown discos:discos "/usr/local/bin/cmdex.sh" || chown root:root "/usr/local/bin/cmdex.sh"
|
|
278
286
|
chmod 770 "/usr/local/bin/cmdex.sh"
|
|
279
287
|
ln -s "/usr/local/bin/cmdex.sh" "/usr/local/bin/cmdex" >/dev/null 2>&1 || echo "Symlink for cmdex already exists."
|
|
280
288
|
|
|
@@ -282,6 +290,11 @@ setup_cmdex() {
|
|
|
282
290
|
echo "discos ALL=(ALL) NOPASSWD: /usr/local/bin/cmdex.sh, /usr/local/bin/cmdex" | tee /etc/sudoers.d/cmdex >/dev/null
|
|
283
291
|
chmod 440 /etc/sudoers.d/cmdex
|
|
284
292
|
|
|
293
|
+
if [[ "$CMD_USER" != "root" && $(id -u "$CMD_USER" >/dev/null 2>&1; echo $?) -eq 0 ]]; then
|
|
294
|
+
echo "$CMD_USER ALL=(ALL) NOPASSWD: /usr/local/bin/cmdex.sh, /usr/local/bin/cmdex" | tee /etc/sudoers.d/cmdex-user-"$CMD_USER" >/dev/null
|
|
295
|
+
chmod 440 /etc/sudoers.d/cmdex-user-"$CMD_USER"
|
|
296
|
+
fi
|
|
297
|
+
|
|
285
298
|
echo -e "Command executor setup completed."
|
|
286
299
|
}
|
|
287
300
|
|
package/dist/types/db.d.ts.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../../src/types/db.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,EAAE,GAAG;IACf,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC"}
|
package/dist/types/db.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../src/types/db.ts"],"names":[],"mappings":""}
|