Merge pull request #11 from bobslavtriev/edge

Update
bobslavtriev · May 15, 2024 · 2be9905 · 2be9905
2 parents 1810144 + c723505
commit 2be9905
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 11 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -11,7 +11,7 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Install Node
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v4.0.2
       with:
         node-version: 18.x
 

diff --git a/.github/workflows/pr-comment.yml b/.github/workflows/pr-comment.yml
@@ -0,0 +1,29 @@
+name: PR Comment
+
+on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - unlocked
+
+jobs:
+  pr-comment:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    permissions: write-all
+    steps:
+      - uses: actions/checkout@v3
+      - uses: mshick/add-pr-comment@v2
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          message-id: pr-comment
+          message: |
+            Thanks for your contribution.
+
+            The next step is to wait for review and approval to merge it to main repository
+
+            The community can help reacting with a thumb up (:thumbsup:) for approval and rocket (:rocket:) for who has tested it.
+          message-failure: |
+            Your PR failed, please check it before continuing to the next step.
diff --git a/.github/workflows/update-nightly.yml b/.github/workflows/update-nightly.yml
@@ -13,23 +13,26 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4.1.4
         with:
           fetch-depth: 0
 
       - name: Fetching tags
         run: git fetch --tags -f || true
 
       - name: Setup Node
-        uses: actions/setup-node@v3.6.0
+        uses: actions/setup-node@v4.0.2
         with:
           node-version: 18.x
+          registry-url: "https://registry.npmjs.org"
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4.0.2
         id: yarn-cache
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -39,6 +42,13 @@ jobs:
 
       - name: Install Dependencies
         run: yarn
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+      - name: Publish in NPM
+        run: npm publish --access public
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 
       - name: Build NPM package
         run: yarn pack && mv mysql-baileys-*.tgz mysql-baileys-nightly.tgz
@@ -52,14 +62,14 @@ jobs:
           echo "EOF" >> $GITHUB_OUTPUT
 
       - name: Update Nightly TAG
-        uses: richardsimko/update-tag@v1
+        uses: richardsimko/update-tag@v1.0.11
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: nightly
 
       - name: Update Nightly Release
-        uses: meeDamian/github-release@2.0
+        uses: meeDamian/github-release@v2.0.3
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"author": "bobslavtriev",
 	"name": "mysql-baileys",
-	"version": "1.2.0",
+	"version": "1.2.1",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"description": "Implementation of MySQL in Baileys.",
@@ -12,7 +12,9 @@
 	],
 	"scripts": {
 		"lint": "eslint src --ext .ts",
+		"lint:fix": "eslint src --fix --ext .ts",
 		"build": "tsc",
+		"prepack": "tsc",
 		"prepare": "tsc"
 	},
 	"repository": {
@@ -24,11 +26,12 @@
 		"uuid": "^9.0.0"
 	},
 	"devDependencies": {
-		"@whiskeysockets/baileys": "github:whiskeysockets/baileys",
 		"@adiwajshing/eslint-config": "github:adiwajshing/eslint-config",
 		"@types/node": "^16.18.69",
+		"@types/uuid": "^9.0.8",
 		"@typescript-eslint/eslint-plugin": "^6.18.0",
 		"@typescript-eslint/parser": "^6.18.0",
+		"@whiskeysockets/baileys": "^6.7.0",
 		"eslint": "^8.56.0",
 		"ts-node": "^10.8.1",
 		"typescript": "^4.6.4"

diff --git a/src/Mysql/index.ts b/src/Mysql/index.ts
@@ -18,7 +18,7 @@ import { MySQLConfig, sqlData, sqlConnection, AuthenticationCreds } from '../Typ
  */
 
 let conn: sqlConnection
-let pending: boolean = true
+let pending: boolean | undefined
 let taskKeepAlive: NodeJS.Timeout | undefined
 const DEFAULT_TABLE_NAME = 'auth';
 
@@ -73,7 +73,7 @@ export const useMySQLAuthState = async(config: MySQLConfig): Promise<{ state: ob
 
 	taskKeepAlive = setInterval(async () => {
 		await conn.ping().catch(async () => await reconnect())
-		if (!!conn?.connection?._closing){
+		if (conn?.connection?._closing){
 			await reconnect()
 		}
 	}, keepAliveIntervalMs)

diff --git a/src/Types/index.ts b/src/Types/index.ts
@@ -1,5 +1,6 @@
 import { proto } from '@whiskeysockets/baileys'
 import { Connection } from 'mysql2/promise'
+import type { SslOptions } from 'mysql2/promise'
 
 export type MinimalMessage = Pick<proto.IWebMessageInfo, 'key' | 'messageTimestamp'>
 
@@ -26,7 +27,7 @@ export type MySQLConfig = {
 	keepAliveIntervalMs: number | undefined
 	retryRequestDelayMs: number | undefined
 	maxtRetries: number | undefined
-	ssl?: any
+	ssl?: string | SslOptions | undefined
 }
 
 export type valueReplacer = {