update to mysql

Author: jrCleber

.eslintrc.js

@@ -18,7 +18,7 @@ module.exports = {
      node: true,
      jest: true,
   },
-  ignorePatterns: ['.eslintrc.js'],
+  ignorePatterns: ['.eslintrc.js', 'test/test.ts'],
   rules: {
      '@typescript-eslint/interface-name-prefix': 'off',
      '@typescript-eslint/explicit-function-return-type': 'off',

Dockerfile

@@ -1,19 +1,22 @@
 ### BASE IMAGE
-FROM node:20-bullseye-slim AS base
+FROM node:24-bullseye-slim AS base
+
+# Opcional: timezone/locale mínimos, se precisar.
+# RUN apt-get update && apt-get install -y tzdata && rm -rf /var/lib/apt/lists/*
 
 ### BUILD IMAGE
 FROM base AS builder
-
 WORKDIR /codechat
 
-# Instalar dependências de construção primeiro
+# Dependências de SO necessárias no build (git/ffmpeg se usados em build)
 RUN apt-get update && apt-get install -y git ffmpeg && rm -rf /var/lib/apt/lists/*
 
-# Copiar arquivos package.json e instalar dependências
+# Instalar TODAS as deps (inclui dev) para conseguir rodar tsc
 COPY package*.json ./
-RUN npm install --force
+# Use npm ci para builds reprodutíveis
+RUN npm i --force
 
-# Copiar os demais arquivos necessários para o build
+# Copiar código
 COPY tsconfig.json .
 COPY ./src ./src
 COPY ./public ./public
@@ -22,37 +25,42 @@ COPY ./prisma ./prisma
 COPY ./views ./views
 COPY .env.dev .env
 
-# Definir variável de ambiente para a construção
-ENV DATABASE_URL=mysql://mysql:pass@localhost/db_test
-RUN npx prisma generate
+# Variável para gerar Prisma Client (não precisa apontar p/ DB real)
+ENV DATABASE_URL="mysql://mysql:pass@localhost/db_test"
 
+# Gerar prisma e compilar TS -> JS
+RUN npx prisma generate
 RUN npm run build
 
+# Remover devDependencies para preparar node_modules "de produção"
+# RUN npm prune --omit=dev
+
 ### PRODUCTION IMAGE
 FROM base AS production
-
 WORKDIR /codechat
 
-LABEL com.api.version="1.3.3"
-LABEL com.api.mantainer="https://github.com/code-chat-br"
-LABEL com.api.repository="https://github.com/code-chat-br/whatsapp-api"
-LABEL com.api.issues="https://github.com/code-chat-br/whatsapp-api/issues"
+# Instale apenas o que o app precisa em runtime (ex.: ffmpeg)
+RUN apt-get update && apt-get install -y ffmpeg && rm -rf /var/lib/apt/lists/*
 
-# Copiar arquivos construídos do estágio builder
+LABEL com.api.version="1.3.3" \
+      com.api.mantainer="https://github.com/code-chat-br" \
+      com.api.repository="https://github.com/code-chat-br/whatsapp-api" \
+      com.api.issues="https://github.com/code-chat-br/whatsapp-api/issues"
+
+# Copiar artefatos já prontos e node_modules podado
 COPY --from=builder /codechat/dist ./dist
 COPY --from=builder /codechat/docs ./docs
 COPY --from=builder /codechat/prisma ./prisma
 COPY --from=builder /codechat/views ./views
-COPY --from=builder /codechat/node_modules ./node_modules
+COPY --from=builder /codechat/public ./public
 COPY --from=builder /codechat/package*.json ./
 COPY --from=builder /codechat/.env ./
-COPY --from=builder /codechat/public ./public
+COPY --from=builder /codechat/node_modules ./node_modules
 COPY ./deploy_db.sh ./
 
-RUN chmod +x ./deploy_db.sh
-
-RUN mkdir instances
+RUN chmod +x ./deploy_db.sh && mkdir -p instances
 
 ENV DOCKER_ENV=true
 
-ENTRYPOINT [ "/bin/bash", "-c", ". ./deploy_db.sh && node ./dist/src/main" ]
+# Se seu deploy_db.sh precisa do shell, mantenha o bash -c
+ENTRYPOINT ["/bin/bash", "-c", ". ./deploy_db.sh && node ./dist/src/main"]

PROJECT_STRUCTURE.md

@@ -8,7 +8,7 @@
     "start": "ts-node --files --transpile-only ./src/main.ts",
     "start:prod": "bash start.sh",
     "start:dev": "tsnd --files --transpile-only --respawn --ignore-watch node_modules ./src/main.ts",
-    "test": "clear && tsnd --files --transpile-only --respawn --ignore-watch node_modules ./test/all.test.ts"
+    "test": "clear && tsnd --files --transpile-only --respawn --ignore-watch node_modules ./test/test.ts"
   },
   "repository": {
     "type": "git",
@@ -44,7 +44,7 @@
     "@adiwajshing/keyed-db": "^0.2.4",
     "@hapi/boom": "^10.0.1",
     "@prisma/client": "^5.19.1",
-    "@whiskeysockets/baileys": "^6.7.16",
+    "@whiskeysockets/baileys": "7.0.0-rc.8",
     "axios": "^1.7.7",
     "class-validator": "^0.14.0",
     "cross-env": "^7.0.3",

package.json

@@ -0,0 +1,12 @@
+// import { defineConfig, env } from 'prisma/config';
+
+// export default defineConfig({
+//   schema: 'prisma/schema.prisma',
+//   migrations: {
+//     path: 'prisma/migrations',
+//   },
+//   engine: 'classic',
+//   datasource: {
+//     url: env('DATABASE_URL'),
+//   },
+// });

prisma.config.ts

@@ -88,23 +88,25 @@ enum DeviceMessage {
 }
 
 model Message {
-  id               Int             @id @default(autoincrement())
-  keyId            String          @db.VarChar(100)
-  keyRemoteJid     String          @db.VarChar(100)
-  keyFromMe        Boolean         @db.TinyInt
-  keyParticipant   String?         @db.VarChar(100)
-  pushName         String?         @db.VarChar(100)
-  messageType      String          @db.VarChar(100)
-  content          Json            @db.Json
-  messageTimestamp Int             @db.Int
-  device           DeviceMessage
-  isGroup          Boolean?        @db.TinyInt
-  Instance         Instance        @relation(fields: [instanceId], references: [id], onDelete: Cascade)
-  instanceId       Int
-  MessageUpdate    MessageUpdate[]
-  Media            Media?
-
-  @@index([keyId], name: "keyId")
+  id                Int             @id @default(autoincrement())
+  keyId             String?         @db.VarChar(100)
+  keyLid            String?         @db.VarChar(100)
+  keyRemoteJid      String?         @db.VarChar(100)
+  keyFromMe         Boolean         @db.TinyInt
+  keyParticipant    String?         @db.VarChar(100)
+  keyParticipantLid String?         @db.VarChar(100)
+  pushName          String?         @db.VarChar(100)
+  messageType       String          @db.VarChar(100)
+  content           Json            @db.Json
+  messageTimestamp  Int             @db.Int
+  device            DeviceMessage
+  isGroup           Boolean?        @db.TinyInt
+  Instance          Instance        @relation(fields: [instanceId], references: [id], onDelete: Cascade)
+  instanceId        Int
+  MessageUpdate     MessageUpdate[]
+  Media             Media?
+
+  @@index([instanceId, keyRemoteJid, id(sort: Desc)], name: "idx_message_instance_jid_id")
 }
 
 model Media {

prisma/schema.prisma

@@ -0,0 +1,43 @@
+import { WAVersion } from '@whiskeysockets/baileys';
+import axios from 'axios';
+
+export const fetchLatestBaileysVersionV2 = async () => {
+  try {
+    const resp = await axios.get<string>('https://web.whatsapp.com/sw.js');
+    const re = /JSON\.parse\(\s*(?:\/\*[^]*?\*\/\s*)?("(?:(?:\\.|[^"\\])*)")\s*\)/;
+    const m = re.exec(resp.data);
+    if (!m) {
+      return {
+        version: [2, 3000, 1030436551.257521] as WAVersion,
+        isLatest: false,
+        error: new Error('regexp-filed'),
+      };
+    }
+
+    const escaped = m[1];
+    const jsonText = JSON.parse(escaped) as string;
+    const obj = JSON.parse(jsonText) as Record<string, unknown>;
+
+    const v = obj?.dynamic_data?.['dynamic_modules']?.SiteData?.client_revision as number;
+    if (v) {
+      return {
+        version: [2, 3000, v] as WAVersion,
+        isLatest: true,
+        error: null as unknown,
+      };
+    } else {
+      return {
+        version: [2, 3000, 1030436551.257521] as WAVersion,
+        isLatest: false,
+        error: new Error('version not-found'),
+      };
+    }
+  } catch (error) {
+    const waVersion = JSON.parse(process.env?.WA_VERSION || '[]') as number[];
+    return {
+      version: [2, 3000, waVersion?.[2] ?? 1029707447] as WAVersion,
+      isLatest: false,
+      error: error as unknown,
+    };
+  }
+};