More email service stuff

Author: Podginator

packages/api/src/services/newsletters.ts

@@ -113,7 +113,7 @@ const createRandomEmailAddress = (userName: string, length: number): string => {
   when rand is sdfsdf-: [email protected]
   when rand is abcdef: [email protected]
    */
-  return `${userName}-${nanoid(length)}e@${inbox}.omnivore.app`
+  return `${userName}-${nanoid(length)}e@${env.email.domain}`
 }
 
 export const findNewsletterEmailById = async (

packages/api/src/util.ts

@@ -98,6 +98,9 @@ export interface BackendEnv {
     useLocalStorage: boolean
     localMinioUrl: string
   }
+  email: {
+    domain: string
+  }
   sender: {
     message: string
     feedback: string
@@ -206,6 +209,7 @@ const nullableEnvVars = [
   'INTERCOM_ANDROID_SECRET',
   'EXPORT_TASK_HANDLER_URL',
   'LOCAL_MINIO_URL',
+  'LOCAL_EMAIL_DOMAIN',
 ] // Allow some vars to be null/empty
 
 const envParser =
@@ -245,6 +249,7 @@ export function getEnv(): BackendEnv {
     pool: {
       max: parseInt(parse('PG_POOL_MAX'), 10),
     },
+
     replication: parse('PG_REPLICATION') === 'true',
     replica: {
       host: parse('PG_REPLICA_HOST'),
@@ -254,6 +259,9 @@ export function getEnv(): BackendEnv {
       dbName: parse('PG_REPLICA_DB'),
     },
   }
+  const email = {
+    domain: parse('LOCAL_EMAIL_DOMAIN'),
+  }
   const server = {
     jwtSecret: parse('JWT_SECRET'),
     ssoJwtSecret: parse('SSO_JWT_SECRET'),
@@ -382,6 +390,7 @@ export function getEnv(): BackendEnv {
   return {
     pg,
     client,
+    email,
     server,
     google,
     posthog,

packages/local-mail-watcher/src/env.ts

@@ -17,7 +17,7 @@ interface WatcherEnv {
 
 const envParser =
   (env: { [key: string]: string | undefined }) =>
-  (varName: string, throwOnUndefined = true): string | undefined => {
+  (varName: string, throwOnUndefined = false): string | undefined => {
     const value = env[varName]
     if (typeof value === 'string' && value) {
       return value

packages/local-mail-watcher/src/watcher.ts

@@ -5,7 +5,7 @@ import { sendToEmailApi } from './lib/emailApi'
 import { env } from './env'
 
 chokidar.watch(env.filesystem.filePath).on('add', (path, _event) => {
-  // console.log(event, path)
+  console.log(path)
   const contents = fs.readFileSync(path).toString()
   simpleParser(contents)
     .then((it) => ({
@@ -16,6 +16,12 @@ chokidar.watch(env.filesystem.filePath).on('add', (path, _event) => {
       text: it.text || '',
       headers: it.headers,
     }))
-    .then((emailData) => sendToEmailApi(emailData))
-    .then(() => fs.unlinkSync(path))
+    .then(async (emailData) => {
+      await sendToEmailApi(emailData)
+      console.log('Sent to email API')
+    })
+    .then(() => {
+      fs.unlinkSync(path)
+      console.log('Deleted File')
+    })
 })

self-hosting/docker-compose/.env.example

@@ -37,6 +37,7 @@ REDIS_URL=redis://redis:6379/0
 
 #MAIL
 WATCHER_API_KEY=mail-api-key
+LOCAL_EMAIL_DOMAIN=domain.tld
 
 # Web
 APP_ENV=prod

self-hosting/docker-compose/docker-compose.yml

@@ -144,7 +144,7 @@ services:
     depends_on:
       - minio
     entrypoint: >
-      /bin/sh -c "
+      /bin/bash -c "
       sleep 5;
       until (/usr/bin/mc config host add myminio http://minio:9000 minio miniominio) do echo '...waiting...' && sleep 1; done;
       /usr/bin/mc mb myminio/omnivore;

self-hosting/docker-compose/mail/.env.mail

@@ -1,4 +1,4 @@
 #MAIL
 WATCHER_API_KEY=mail-api-key
 MAIL_FILE_PATH=/var/mail/domain.tld/user/new
-WATCHER_API_ENDPOINT=https://omnivore-watch.domain.com
+WATCHER_API_ENDPOINT=https://omnivore-watch.domain.tld

self-hosting/docker-compose/mail/docker-compose-mail.yml

@@ -3,7 +3,7 @@ services:
     image: ghcr.io/docker-mailserver/docker-mailserver:latest
     container_name: mailserver
     # Provide the FQDN of your mail server here (Your DNS MX record should point to this value)
-    hostname: mail.podginator.com
+    hostname: mail.domain.tld
     env_file: mailserver.env
     # More information about the mail-server ports:
     # https://docker-mailserver.github.io/docker-mailserver/latest/config/security/understanding-the-ports/
@@ -14,10 +14,11 @@ services:
       - "587:587"  # ESMTP (explicit TLS => STARTTLS)
       - "993:993"  # IMAP4 (implicit TLS)
     volumes:
-      - mailserver:/var/mail/
-      - mailserver:/var/mail-state/
-      - mailserver:/var/log/mail/
-      - mailserver:/tmp/docker-mailserver/
+      - ./docker-data/dms/mail-data/:/var/mail/
+      - ./docker-data/dms/mail-state/:/var/mail-state/
+      - ./docker-data/dms/mail-logs/:/var/log/mail/
+      - ./docker-data/dms/config/:/tmp/docker-mailserver/
+      - /etc/localtime:/etc/localtime:ro
     restart: always
     stop_grace_period: 1m
     # Uncomment if using `ENABLE_FAIL2BAN=1`:
@@ -27,17 +28,35 @@ services:
       test: "ss --listening --tcp | grep -P 'LISTEN.+:smtp' || exit 1"
       timeout: 3s
       retries: 0
-  api:
+  docker:
+    image: docker:latest
+    container_name: setup-email
+    environment:
+      - DOMAIN="domain.tld"
+    volumes:
+      - ./docker-data/dms/mail-data/:/var/mail/
+      - /var/run/docker.sock:/var/run/docker.sock
+      - ./docker-data/dms/config/:/tmp/docker-mailserver/
+    depends_on:
+      mailserver:
+        condition: service_started
+    tty: true
+    entrypoint: >
+      /bin/sh -c "
+      sleep 5; 
+      docker exec -ti mailserver setup email add [email protected] pass123;
+      echo '@domain.tld [email protected]' > /tmp/docker-mailserver/config/postfix-virtual.cf
+      exit 0
+      "
+  watcher:
     build:
       context: ../../../
       dockerfile: ./packages/local-mail-watcher/Dockerfile-watcher
     container_name: "omnivore-mail-watch"
     volumes:
-      - mailserver:/var/mail/
+      - ./docker-data/dms/mail-data/:/var/mail/
     env_file:
       - .env.mail
     depends_on:
-      mailserver:
-        condition: service_started
-volumes:
-  mailserver:
+      docker:
+        condition: service_completed_successfully