nexushub-commands 2.0.0 → 2.0.2

package/lib/shared-commands/ParserSharedCommands.service.d.ts

@@ -57,5 +57,6 @@ export declare class ParserSharedCommandsService {
         filePath: string;
         transformedCode: string;
         className: string | null;
+        object: any;
     }>;
 }

package/lib/shared-commands/ParserSharedCommands.service.js

@@ -89,7 +89,7 @@ class ParserSharedCommandsService {
                 processedArgs = `{ value: ${processedArgs} }`;
             }
         }
-        return `this.API.post(\`/commands/\${this.constructor.name}/${methodName}\`, ${processedArgs})`;
+        return `this.API.post(\`/commands/\${this.constructor.name}/${methodName}\`, ${processedArgs}).then((res) => res.data)`;
     }
     /**
      * Преобразует команду и возвращает объект с кодом и названием класса
@@ -168,6 +168,7 @@ class ParserSharedCommandsService {
                             filePath: fullPath,
                             transformedCode,
                             className,
+                            object: require(fullPath.replace('.ts', '.js').replace('src', 'dist'))[className],
                         });
                         console.log(`Команда преобразована: ${fullPath} (Класс: ${className || 'не найден'})`);
                     }

package/lib/shared-commands/SharedCommands.server.js

@@ -13,9 +13,11 @@ class SharedCommandsServer {
                 var _a;
                 const { name, method } = req.params;
                 //@ts-ignore
-                const execute = (_a = SharedCommands_service_1.SharedCommandsService.commands.find((c) => c.className === name)) === null || _a === void 0 ? void 0 : _a[method];
+                const execute = (_a = SharedCommands_service_1.SharedCommandsService.commands.find((c) => c.className === name)) === null || _a === void 0 ? void 0 : _a.object[method];
                 if (execute)
-                    res.send(yield execute(req.body));
+                    res.send(yield execute(req.body).catch(console.error));
+                else
+                    res.send(null);
             }));
         });
     }

package/lib/shared-commands/SharedCommands.service.d.ts

@@ -3,6 +3,7 @@ export declare class SharedCommandsService {
         filePath: string;
         transformedCode: string;
         className: string | null;
+        object: any;
     }[];
     static init(projectName: string): Promise<void>;
 }

package/lib/shared-commands/SharedCommands.service.js

@@ -7,7 +7,7 @@ const ParserSharedCommands_service_1 = require("./ParserSharedCommands.service")
 class SharedCommandsService {
     static init(projectName) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            this.commands = ParserSharedCommands_service_1.ParserSharedCommandsService.transformAllCommands();
+            this.commands = ParserSharedCommands_service_1.ParserSharedCommandsService.transformAllCommands(process.cwd() + '/src');
             yield __1.Client.API.delete(`/projects/${projectName}/commands`).catch(console.error);
             for (const command of this.commands)
                 yield __1.Client.API.post(`/projects/${projectName}/commands`, {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "nexushub-commands",
-	"version": "2.0.0",
+	"version": "2.0.2",
 	"main": "./lib/index.js",
 	"license": "MIT",
 	"dependencies": {

package/src/shared-commands/ParserSharedCommands.service.ts

@@ -98,7 +98,7 @@ export class ParserSharedCommandsService {
 			}
 		}
 
-		return `this.API.post(\`/commands/\${this.constructor.name}/${methodName}\`, ${processedArgs})`
+		return `this.API.post(\`/commands/\${this.constructor.name}/${methodName}\`, ${processedArgs}).then((res) => res.data)`
 	}
 
 	/**
@@ -158,12 +158,12 @@ export class ParserSharedCommandsService {
 	 * @param srcDir - директория src для поиска команд
 	 * @returns массив объектов с путем к файлу, преобразованным кодом и названием класса
 	 */
-	static transformAllCommands(srcDir: string = './src'): Array<{ filePath: string; transformedCode: string; className: string | null }> {
+	static transformAllCommands(srcDir: string = './src'): Array<{ filePath: string; transformedCode: string; className: string | null; object: any }> {
 		if (!fs.existsSync(srcDir)) {
 			throw new Error(`Директория src не существует: ${srcDir}`)
 		}
 
-		const results: Array<{ filePath: string; transformedCode: string; className: string | null }> = []
+		const results: Array<{ filePath: string; transformedCode: string; className: string | null; object: any }> = []
 
 		// Рекурсивно проходим по всем файлам в src
 		const processDirectory = (dir: string) => {
@@ -184,6 +184,7 @@ export class ParserSharedCommandsService {
 							filePath: fullPath,
 							transformedCode,
 							className,
+							object: require(fullPath.replace('.ts', '.js').replace('src', 'dist'))[className as any],
 						})
 						console.log(`Команда преобразована: ${fullPath} (Класс: ${className || 'не найден'})`)
 					} catch (error) {

package/src/shared-commands/SharedCommands.server.ts

@@ -9,8 +9,10 @@ export class SharedCommandsServer {
 			const { name, method } = req.params
 
 			//@ts-ignore
-			const execute = SharedCommandsService.commands.find((c) => c.className === name)?.[method]
-			if (execute) res.send(await execute(req.body))
+			const execute = SharedCommandsService.commands.find((c) => c.className === name)?.object[method]
+
+			if (execute) res.send(await execute(req.body).catch(console.error))
+			else res.send(null)
 		})
 	}
 }

package/src/shared-commands/SharedCommands.service.ts

@@ -2,10 +2,10 @@ import { Client } from '..'
 import { ParserSharedCommandsService } from './ParserSharedCommands.service'
 
 export class SharedCommandsService {
-	public static commands: { filePath: string; transformedCode: string; className: string | null }[] = []
+	public static commands: { filePath: string; transformedCode: string; className: string | null; object: any }[] = []
 
 	public static async init(projectName: string) {
-		this.commands = ParserSharedCommandsService.transformAllCommands()
+		this.commands = ParserSharedCommandsService.transformAllCommands(process.cwd() + '/src')
 
 		await Client.API.delete(`/projects/${projectName}/commands`).catch(console.error)
 		for (const command of this.commands)