Merge pull request #12 from BLazzeD21/fix-bugs-and-refactor-code

Bug fixes and code refactorings

Author: BLazzeD21

.dockerignore

@@ -1,5 +1,31 @@
-README.md
+# Logs
+logs
+*.log
+
+# Git files
+.git
+
+# Markdown
+*.md
+
+# Dependency directory
 node_modules
+
+# Configuration files
 config/default.json
 config/config.md
-/img
+
+# File with instructions required to create a container image
+Dockerfile
+
+# File with a set of instructions for building and launching
+Makefile
+
+# License
+LICENSE
+
+# Linter configuration
+.eslintrc.cjs
+
+# Folder with images for the bot
+img

.gitignore

@@ -1,5 +1,135 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+.pnpm-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Snowpack dependency directory (https://snowpack.dev/)
+web_modules/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional stylelint cache
+.stylelintcache
+
+# Microbundle cache
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variable files
+.env
+.env.development.local
+.env.test.local
+.env.production.local
+.env.local
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+.parcel-cache
+
+# Next.js build output
+.next
+out
+
+# Nuxt.js build / generate output
+.nuxt
+dist
+
+# Gatsby files
+.cache/
+# Comment in the public line in if your project uses Gatsby and not Next.js
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# public
+
+# vuepress build output
+.vuepress/dist
+
+# vuepress v2.x temp and cache directory
+.temp
+.cache
+
+# Docusaurus cache and generated files
+.docusaurus
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# TernJS port file
+.tern-port
+
+# VSCode
+.vscode-test
 .vscode
-node_modules
+
+# yarn v2
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.yarn/install-state.gz
+.pnp.*
+
+# Configuration files
 config/default.json
-config/production.json
-voices/
+config/production.json

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "node.js-chatgpt-bot",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "\"\"",
   "main": "index.js",
   "type": "module",
@@ -14,7 +14,7 @@
   },
   "keywords": [],
   "author": "",
-  "license": "ISC",
+  "license": "MIT License",
   "bugs": {
     "url": "https://github.com/BLazzeD21/Node.js-ChatGPT-Bot/issues"
   },

package.json

@@ -42,7 +42,7 @@ class OggConverter {
 
   async create(url, filename) {
     try {
-      const oggPath = resolve(__dirname, '../voices', `${filename}.ogg`);
+      const oggPath = resolve(__dirname, 'voices', `${filename}.ogg`);
       const response = await axios.get(url, {
         responseType: 'stream',
       });

src/converter.js

@@ -4,10 +4,11 @@ import { menuKeyboard } from '../keyboards/keyboards.js';
 class ErrorHandler {
   responseError(ctx, handler) {
     return (error) => {
-      console.log(`${error.name} ${handler}: ${error.message}`,
+      console.log(`${ctx.from.id} - ${error.name} ${handler}: ${error.message}`,
           menuKeyboard);
       ctx.reply(
           `${LEXICON_EN['noResponce']}\n\n${error.name}: ${error.message}`,
+          { disable_web_page_preview: true },
       );
     };
   }

src/handlers/errorHandler.js

@@ -3,6 +3,7 @@ import { LEXICON_EN } from '../lexicon/lexicon_en.js';
 
 import { openai } from '../openai.js';
 import { converter } from '../converter.js';
+import { deleteFile } from '../utils/deleteFile.js';
 
 import { menuKeyboard } from '../keyboards/keyboards.js';
 import { createInitialSession } from '../utils/createSession.js';
@@ -65,8 +66,8 @@ class OpenAIHandlers {
       const sessionId = ctx.message.chat.id;
       sessions[sessionId] ??= createInitialSession();
 
-      const processing = await ctx.reply(
-          code(LEXICON_EN['processingVoice']),
+      const processingTranscription = await ctx.reply(
+          code(LEXICON_EN['processingTranscription']),
           menuKeyboard);
 
       ctx.sendChatAction('typing');
@@ -80,6 +81,10 @@ class OpenAIHandlers {
       openai
           .transcription(mp3Path)
           .then(async (text) => {
+            const processingVoice = await ctx.reply(
+                code(LEXICON_EN['processingVoice']),
+                menuKeyboard);
+
             sessions[sessionId].messages.push({
               role: openai.roles.USER,
               content: text,
@@ -88,11 +93,15 @@ class OpenAIHandlers {
             openai
                 .chat(sessions[sessionId].messages)
                 .then(this.sendResponse(ctx, sessions, sessionId))
-                .catch(ErrorHandler.responseError(ctx, 'transcription'));
+                .catch(ErrorHandler.responseError(ctx, 'transcription'))
+                .finally(async () => {
+                  await ctx.deleteMessage(processingVoice.message_id);
+                });
           })
           .catch(ErrorHandler.responseError(ctx, 'voiceHandler'))
           .finally(async () => {
-            await ctx.deleteMessage(processing.message_id);
+            await deleteFile(mp3Path);
+            await ctx.deleteMessage(processingTranscription.message_id);
           });
     };
   };
@@ -109,6 +118,7 @@ class OpenAIHandlers {
       const requestText = ctx.message.text.replace('/image', '').trim();
 
       if (!requestText) {
+        await ctx.deleteMessage(processing.message_id);
         await ctx.reply(LEXICON_EN['empty'], { parse_mode: 'HTML' });
         return;
       }

src/handlers/openaiHandlers.js

@@ -13,7 +13,10 @@ class UserHandlers {
     return async (ctx) => {
       const sessionId = ctx.message.chat.id;
       sessions[sessionId] = createInitialSession();
-      await ctx.reply(LEXICON_EN['start'], menuKeyboard);
+      await ctx.reply(LEXICON_EN['start'],
+          { parse_mode: 'Markdown' },
+          menuKeyboard,
+      );
     };
   };
 

src/handlers/userHandlers.js

@@ -55,7 +55,6 @@ bot.command('show', AdminHandlers.showHandler(config));
 
 bot.command('new', UserHandlers.newHandler(config, store));
 bot.command('help', UserHandlers.helpHandler(config));
-bot.command('chatid', UserHandlers.chatIDHandler());
 bot.command('password', UserHandlers.passwordHandler());
 bot.command('image', OpenAIHandlers.imageHandler(config));
 

src/index.js

@@ -3,10 +3,6 @@ export const commands = [
   { command: 'new', description: 'Open a new session' },
   { command: 'help', description: 'Find out the bot\'s capabilities' },
   { command: 'image', description: 'Creating an image based on a text query' },
-  { command: 'chatid', description: 'Find the chat ID and your ID' },
-  { command: 'add', description: 'Adding new users' },
-  { command: 'remove', description: 'Removing users' },
-  { command: 'show', description: 'List of all elevated users' },
 ];
 
 const date = new Date();
@@ -18,9 +14,11 @@ export const LEXICON_EN = {
   start:
   'Hello, welcome to an artificial intelligence chatbot ' +
   'that will help you with everything! 🤖\n\nYou can find ' +
-  'the source code of the bot here:\nhttps://github.com/BLazzeD21/Node.js-ChatGPT-Bot',
+  'the source code of the bot here: [click](https://github.com/BLazzeD21/Node.js-ChatGPT-Bot)\n' +
+  'Developer: @blazzed21\n',
   deniedAccess: 'This functionality is not available to you ⛔️',
   processingText: 'Text accepted for processing',
+  processingTranscription: 'Voice message accepted for translation into text',
   processingVoice: 'Voice message accepted for processing',
   processingImage: 'The request to generate an'+
   'image was accepted for processing',