FIX submit error msg

Author: tacxou

Makefile

@@ -38,12 +38,16 @@ generate:
 	@docker exec -it $(APPNAME) yarn generate
 
 dbs:
-	@docker volume create $(APPNAME)-redis
-	@docker run -d --rm \
-		--name $(APPNAME)-redis \
-		--network dev \
-		-p 6379:6379 \
-		redis
+	@docker run --rm -d \
+		-p 1080:1080 \
+		-p 1025:1025 \
+		maildev/maildev
+#	@docker volume create $(APPNAME)-redis
+#	@docker run -d --rm \
+#		--name $(APPNAME)-redis \
+#		--network dev \
+#		-p 6379:6379 \
+#		redis
 
 stop:
 	@docker stop $(APPNAME) || true

package.json

@@ -57,6 +57,7 @@
     "axios": "^1.5.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.0",
+    "default-gateway": "^6.0.3",
     "form-data": "^4.0.0",
     "handlebars": "^4.7.8",
     "imapflow": "^1.0.136",
@@ -81,6 +82,7 @@
     "@nestjs/testing": "^10.1.3",
     "@swc/cli": "^0.1.62",
     "@swc/core": "^1.3.93",
+    "@types/default-gateway": "^3.0.1",
     "@types/express": "^4.17.17",
     "@types/form-data": "^2.5.0",
     "@types/imapflow": "^1.0.13",
@@ -89,7 +91,7 @@
     "@types/lru-cache": "^7.10.10",
     "@types/mailparser": "^3.4.0",
     "@types/multer": "^1.4.8",
-    "@types/node": "^18.0.0",
+    "@types/node": "^18.18.0",
     "@types/nodemailer": "^6.4.11",
     "@types/passport-jwt": "^3.0.9",
     "@typescript-eslint/eslint-plugin": "^6.4.0",

src/accounts/_dto/account-submit.dto.ts

@@ -74,8 +74,8 @@ export class AccountSubmitDto {
     [name: string]: any
   }
 
-  @IsString()
   @IsOptional()
+  @IsObject()
   @ApiProperty()
   public context?: {
     [name: string]: any

src/accounts/_dto/account-submited.dto.ts

@@ -0,0 +1,54 @@
+import { ApiProperty } from '@nestjs/swagger'
+import { IsArray, IsNumber, IsObject, IsOptional, IsString } from 'class-validator'
+
+export class AccountSubmitedDto {
+  @IsOptional()
+  @IsArray()
+  @IsString({ each: true })
+  @ApiProperty()
+  public accepted?: string[]
+
+  @IsOptional()
+  @IsArray()
+  @IsString({ each: true })
+  @ApiProperty()
+  public rejected?: string[]
+
+  @IsOptional()
+  @IsArray()
+  @IsString({ each: true })
+  @ApiProperty()
+  public ehlo?: string[]
+
+  @IsOptional()
+  @IsNumber()
+  @ApiProperty()
+  public envelopeTime?: number
+
+  @IsOptional()
+  @IsNumber()
+  @ApiProperty()
+  public messageTime?: number
+
+  @IsOptional()
+  @IsNumber()
+  @ApiProperty()
+  public messageSize?: number
+
+  @IsOptional()
+  @IsString()
+  @ApiProperty()
+  public response?: string
+
+  @IsOptional()
+  @IsObject()
+  @ApiProperty()
+  public envelope?: {
+    [name: string]: any
+  }
+
+  @IsOptional()
+  @IsString()
+  @ApiProperty()
+  public messageId?: string
+}

src/accounts/accounts.controller.ts

@@ -5,11 +5,13 @@ import {
   Get,
   HttpStatus,
   Logger,
-  Param, ParseFilePipe,
+  Param,
+  ParseFilePipe,
   Patch,
   Post,
   Res,
-  Sse, UploadedFiles,
+  Sse,
+  UploadedFiles,
   UseInterceptors,
 } from '@nestjs/common'
 import { ModuleRef } from '@nestjs/core'
@@ -28,7 +30,7 @@ import { ApiReadResponseDecorator } from '~/_common/decorators/api-read-response
 import { ApiUpdateDecorator } from '~/_common/decorators/api-update.decorator'
 import { ApiDeletedResponseDecorator } from '~/_common/decorators/api-deleted-response.decorator'
 import { ApiTags } from '@nestjs/swagger'
-import { FileInterceptor } from '@nestjs/platform-express'
+import { FilesInterceptor } from '@nestjs/platform-express'
 import { AccountSubmitDto } from '~/accounts/_dto/account-submit.dto'
 
 @ApiTags('accounts')
@@ -112,7 +114,7 @@ export class AccountsController extends AbstractController {
   }
 
   @Post(':account([\\w-.]+)/submit')
-  @UseInterceptors(FileInterceptor('file'))
+  @UseInterceptors(FilesInterceptor('files'))
   @UseRoles({
     resource: ScopesEnum.Accounts,
     action: ActionEnum.Create,
@@ -121,9 +123,7 @@ export class AccountsController extends AbstractController {
     @Res() res: Response,
     @Param('account') id: string,
     @Body() body: AccountSubmitDto,
-    @UploadedFiles(
-      new ParseFilePipe({ fileIsRequired: false }),
-    ) files?: Array<Express.Multer.File>,
+    @UploadedFiles(new ParseFilePipe({ fileIsRequired: false })) files?: Array<Express.Multer.File>,
   ): Promise<Response> {
     const data = await this.service.submit(id, body, files)
     return res.status(HttpStatus.OK).json({

src/accounts/accounts.service.ts

@@ -1,4 +1,13 @@
-import { Injectable, Logger, NotFoundException } from '@nestjs/common'
+import {
+  BadGatewayException,
+  BadRequestException,
+  ConflictException,
+  Injectable,
+  InternalServerErrorException,
+  Logger,
+  NotFoundException,
+  ServiceUnavailableException,
+} from '@nestjs/common'
 import { ModuleRef } from '@nestjs/core'
 import { ImapFlow } from 'imapflow'
 import { LRUCache } from 'lru-cache'
@@ -8,9 +17,11 @@ import { AccountsFileV1, AccountsMetadataV1, readAccountsFile, writeAccountsFile
 import { PartialType } from '@nestjs/swagger'
 import { MailerService } from '@nestjs-modules/mailer'
 import { AccountSubmitDto } from '~/accounts/_dto/account-submit.dto'
+import { AccountSubmitedDto } from '~/accounts/_dto/account-submited.dto'
+import os from 'os'
+import gateway from 'default-gateway'
 
-class InternalAccountMetadataV1 extends PartialType(AccountsMetadataV1) {
-}
+class InternalAccountMetadataV1 extends PartialType(AccountsMetadataV1) {}
 
 @Injectable()
 export class AccountsService extends AbstractService {
@@ -77,15 +88,38 @@ export class AccountsService extends AbstractService {
     return account
   }
 
-  public async submit(id: string, body: AccountSubmitDto, files?: Express.Multer.File[]) {
+  public async submit(id: string, body: AccountSubmitDto, files?: Express.Multer.File[]): Promise<AccountSubmitedDto> {
     const accounts = await readAccountsFile(this.cache)
     const account = accounts.accounts.find((a) => a.id === id)
     if (!account) throw new NotFoundException(`Account not found: ${id}`)
-    return this.mailerService.sendMail({
-      ...body,
-      attachments: files,
-      from: account.smtp.from || account.smtp.auth.user,
-      transporterName: id,
-    })
+    if (!body.template && (!body.text || !body.html)) {
+      throw new BadRequestException(`Template, text or html is required !`)
+    }
+    try {
+      return await this.mailerService.sendMail({
+        ...body,
+        attachments: files.map((file) => ({
+          filename: file.originalname,
+          content: file.buffer,
+        })),
+        from:
+          account.smtp.from ||
+          account.smtp?.auth?.user ||
+          (await (async () => {
+            return `${os.hostname()}@${(await gateway.v4()).gateway}`
+          })()),
+        transporterName: id,
+      })
+    } catch (e) {
+      if (!e.code) throw new BadRequestException(`Failed to post message with <${e.message}>`, e.stack)
+      switch (e.code) {
+        case 'EDNS':
+          throw new BadGatewayException(`[${e.code}] SMTP server connexion failed with <${e.message}>`, e.stack)
+        case 'ESOCKET':
+          throw new ServiceUnavailableException(`[${e.code}] SMTP server connexion failed with <${e.message}>`, e.stack)
+        default:
+          throw new InternalServerErrorException(`[${e.code}] SMTP connection attempt internal server error with <${e.message}>`, e.stack)
+      }
+    }
   }
 }

src/config.ts

@@ -74,7 +74,7 @@ export default async (): Promise<ConfigInstance> => {
           from: '"nest-modules" <[email protected]>',
         },
         template: {
-          dir: __dirname + '/../../templates',
+          dir: __dirname + '/../templates',
           adapter: new HandlebarsAdapter(),
           options: {
             strict: true,