Changed Mysql Plugin to monorepo

tago-io · Oct 16, 2024 · bfffd70 · bfffd70
1 parent 367cd7a
commit bfffd70
Show file tree

Hide file tree

Showing 11 changed files with 122 additions and 48 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/plugins/mysql/package.json b/plugins/mysql/package.json
@@ -17,7 +17,7 @@
   },
   "dependencies": {
     "knex": "3.1.0",
-    "mysql": "^2.18.1"
+    "mysql2": "3.11.3"
   },
   "devDependencies": {
     "@types/mysql": "2.15.26"

diff --git a/plugins/mysql/src/Database/index.ts b/plugins/mysql/src/Database/index.ts
@@ -20,7 +20,7 @@ const deviceDB = {} as IDatabaseConnection;
 
 const migrationConfig: Knex.MigratorConfig = {
   tableName: "migrations",
-  directory: path.join(dirname__, "Migrations"),
+  directory: path.join(dirname__, "..", "Migrations"),
   // ! FIX Error: The migration directory is corrupt, the following files are missing:
   disableMigrationsListValidation: true,
 };
@@ -34,7 +34,7 @@ function createConnection(
   options?: IConnectionOptions,
 ): Knex {
   return knex({
-    client: "mysql",
+    client: "mysql2",
     connection: {
       charset: "utf8",
       timezone: "utc",

diff --git a/plugins/mysql/src/Helpers/DeviceDatabase.ts b/plugins/mysql/src/Helpers/DeviceDatabase.ts
@@ -32,6 +32,7 @@ export async function getDeviceConnection(id: TGenericID, type: TDeviceType) {
       table.index(["time"]);
       table.index(["group"]);
       table.index(["created_at"]);
+      table.string("serie", 100);
     });
   }
 

diff --git a/plugins/mysql/src/Providers/Action/getActionInfo.ts b/plugins/mysql/src/Providers/Action/getActionInfo.ts
@@ -16,7 +16,7 @@ async function getActionInfo(actionID: TGenericID): Promise<IAction | null> {
     response.active = Boolean(response.active);
     response.lock = Boolean(response.lock);
     response.created_at = new Date(response.created_at);
-    response.tags = JSON.parse(response.tags);
+    response.tags = JSON.parse(JSON.stringify(response.tags));
 
     if (response.action) {
       response.action = JSON.parse(response.action);

diff --git a/plugins/mysql/src/Providers/Action/getActionList.ts b/plugins/mysql/src/Providers/Action/getActionList.ts
@@ -52,7 +52,7 @@ async function getActionList(
       item.lock = Boolean(item.lock);
     }
     if (item.tags) {
-      item.tags = JSON.parse(item.tags);
+      item.tags = JSON.parse(JSON.stringify(item.tags));
     }
     if (item.action) {
       item.action = JSON.parse(item.action);

diff --git a/plugins/mysql/src/Providers/Analysis/getAnalysisInfo.ts b/plugins/mysql/src/Providers/Analysis/getAnalysisInfo.ts
@@ -17,7 +17,7 @@ async function getAnalysisInfo(
   if (response) {
     response.active = Boolean(response.active);
     response.created_at = new Date(response.created_at);
-    response.tags = JSON.parse(response.tags);
+    response.tags = JSON.parse(JSON.stringify(response.tags));
 
     if (response.variables) {
       response.variables = JSON.parse(response.variables);

diff --git a/plugins/mysql/src/Providers/Analysis/getAnalysisList.ts b/plugins/mysql/src/Providers/Analysis/getAnalysisList.ts
@@ -59,7 +59,7 @@ async function getAnalysisList(
       item.active = Boolean(item.active);
     }
     if (item.tags) {
-      item.tags = JSON.parse(item.tags);
+      item.tags = JSON.parse(JSON.stringify(item.tags));
     }
     if (item.variables) {
       item.variables = JSON.parse(item.variables);

diff --git a/plugins/mysql/src/Providers/Device/getDeviceInfo.ts b/plugins/mysql/src/Providers/Device/getDeviceInfo.ts
@@ -15,7 +15,7 @@ async function getDeviceInfo(deviceID: TGenericID): Promise<IDevice | null> {
   if (response) {
     response.active = Boolean(response.active);
     response.created_at = new Date(response.created_at);
-    response.tags = JSON.parse(response.tags);
+    response.tags = JSON.parse(JSON.stringify(response.tags));
 
     if (response.last_input) {
       response.last_input = new Date(response.last_input);

diff --git a/plugins/mysql/src/Providers/Device/getDeviceList.ts b/plugins/mysql/src/Providers/Device/getDeviceList.ts
@@ -58,7 +58,7 @@ async function getDeviceList(
       item.active = Boolean(item.active);
     }
     if (item.tags) {
-      item.tags = JSON.parse(item.tags);
+      item.tags = JSON.parse(JSON.stringify(item.tags));
     }
     if (item.encoder_stack) {
       item.encoder_stack = JSON.parse(item.encoder_stack);

diff --git a/plugins/mysql/src/Providers/Tag/getTagKeys.ts b/plugins/mysql/src/Providers/Tag/getTagKeys.ts
@@ -9,7 +9,7 @@ async function getTagKeys(type: TDatabaseGetTagKeysType): Promise<string[]> {
   const keys: string[] = [];
 
   for (const item of response) {
-    const tags = JSON.parse(item.tags) as ITag[];
+    const tags = JSON.parse(JSON.stringify(item.tags)) as ITag[];
     for (const tag of tags) {
       if (!keys.includes(tag.key)) {
         keys.push(tag.key);