refactor: simplify library entry storage handlers

package.json

@@ -21,6 +21,7 @@
     "typescript": "^5.0.4"
   },
   "dependencies": {
+    "@flowforge/node-red-function-gpt": "^0.2.1",
     "dotenv": "^16.0.3",
     "express": "^4.18.2",
     "mongodb": "^5.5.0",

src/storage.ts

@@ -1,12 +1,12 @@
 //@ts-nocheck
 import type { StorageModule } from "@node-red/runtime";
 import { createStorage, prefixStorage, Storage } from "unstorage";
-import Library from "./models/library.js";
 import fsDriver from "unstorage/drivers/fs";
 
 var appname: string;
 
-export var appStorage: Storage;
+var appStorage: Storage;
+var libraryStorage: Storage;
 
 export const storageModule: StorageModule = {
   init: () => {
@@ -17,6 +17,8 @@ export const storageModule: StorageModule = {
     });
 
     appStorage = prefixStorage(unstorage, appname);
+
+    libraryStorage = prefixStorage(appStorage, "library");
   },
 
   getFlows: () => appStorage.getItem("flows").then((flows) => flows || []),
@@ -26,90 +28,69 @@ export const storageModule: StorageModule = {
   getCredentials: () =>
     appStorage.getItem("credentials").then((creds) => creds || {}),
 
-  saveCredentials: () => appStorage.setItem("credentials", credentials),
+  saveCredentials: (credentials) =>
+    appStorage.setItem("credentials", credentials),
 
   getSettings: () =>
     appStorage.getItem("settings").then((settings) => settings || {}),
 
-  saveSettings: () => appStorage.setItem("settings", settings),
+  saveSettings: (settings) => appStorage.setItem("settings", settings),
 
   getSessions: () =>
     appStorage.getItem("sessions").then((sessions) => sessions || {}),
 
-  saveSessions: () => appStorage.setItem("sessions", sessions),
-
-  getLibraryEntry: function (type, name) {
-    console.log("********* getLibraryEntry *********");
+  saveSessions: (sessions) => appStorage.setItem("sessions", sessions),
 
+  getLibraryEntry: async function (type, name) {
     if (name == "") {
       name = "/";
     } else if (name.substr(0, 1) != "/") {
       name = "/" + name;
     }
 
-    return new Promise(function (resolve, reject) {
-      Library.findOne(
-        { appname: appname, type: type, name: name },
-        function (err, file) {
-          if (err) {
-            reject(err);
-          } else if (file) {
-            resolve(file.body);
-          } else {
-            var reg = new RegExp("^" + name, "");
-            Library.find(
-              { appname: appname, type: type, name: reg },
-              function (err, fileList) {
-                if (err) {
-                  reject(err);
-                } else {
-                  var dirs = [];
-                  var files = [];
-
-                  for (var i = 0; i < fileList.length; i++) {
-                    var n = fileList[i].name;
-                    n = n.replace(name, "");
-                    if (n.indexOf("/") == -1) {
-                      var f = fileList[i].meta;
-                      f.fn = n;
-                      files.push(f);
-                    } else {
-                      n = n.substr(0, n.indexOf("/"));
-                      dirs.push(n);
-                    }
-                  }
-                  dirs = dirs.concat(files);
-                  resolve(dirs);
-                }
-              }
-            );
-          }
-        }
-      );
-    });
+    const library = await libraryStorage.getItem(name);
+
+    if (library) {
+      const parsedLibrary = JSON.parse(library);
+
+      return parsedLibrary.body;
+    }
+
+    const libraryKeys = await libraryStorage.getKeys(name);
+
+    var dirs = [];
+    var files = [];
+
+    for (var i = 0; i < libraryKeys.length; i++) {
+      const library = await libraryStorage.getItem(libraryKeys[i]);
+
+      const parsedLibrary = JSON.parse(library);
+
+      var n = parsedLibrary.name;
+      n = n.replace(name, "");
+      if (n.indexOf("/") == -1) {
+        var f = parsedLibrary.meta;
+        f.fn = n;
+        files.push(f);
+      } else {
+        n = n.substr(0, n.indexOf("/"));
+        dirs.push(n);
+      }
+    }
+
+    dirs = dirs.concat(files);
+
+    return dirs;
   },
 
   saveLibraryEntry: function (type, name, meta, body) {
-    console.log("********* saveLibraryEntry *********");
-
-    return new Promise(function (resolve, reject) {
-      var p = name.split("/"); // strip multiple slash
-      p = p.filter(Boolean);
-      name = p.slice(0, p.length).join("/");
-      if (name != "" && name.substr(0, 1) != "/") {
-        name = "/" + name;
-      }
-      Library.findOneAndUpdate(
-        { appname: appname, name: name },
-        { name: name, meta: meta, body: body, type: type },
-        function (err, library) {
-          if (err) {
-            reject(err);
-          } else {
-            resolve();
-          }
-        }
-      );
-    });
+    var p = name.split("/"); // strip multiple slash
+    p = p.filter(Boolean);
+    name = p.slice(0, p.length).join("/");
+    if (name != "" && name.substr(0, 1) != "/") {
+      name = "/" + name;
+    }
+
+    return libraryStorage.setItem(name, { name, meta, body, type });
   },
 };

tmp/app0/credentials

@@ -0,0 +1 @@
+{"$":"c3f3fc0cd07bf3764d2d5c14f2efdbf84NqhiiYAqHK7bfamGJ83TsD54PDaY8yvflR4vivvPGOHd2ccWbcCz9U9OQ=="}

tmp/app0/flows

@@ -1,55 +1 @@
-[
-  {
-    "id": "ca62c5c8d2804cf1",
-    "type": "tab",
-    "label": "Flow 1",
-    "disabled": false,
-    "info": "",
-    "env": []
-  },
-  {
-    "id": "2e0dc21189ec9b7c",
-    "type": "inject",
-    "z": "ca62c5c8d2804cf1",
-    "name": "",
-    "props": [
-      {
-        "p": "payload"
-      },
-      {
-        "p": "topic",
-        "vt": "str"
-      }
-    ],
-    "repeat": "",
-    "crontab": "",
-    "once": false,
-    "onceDelay": 0.1,
-    "topic": "",
-    "payload": "",
-    "payloadType": "date",
-    "x": 340,
-    "y": 120,
-    "wires": [
-      [
-        "09c1ee47d041fe6f"
-      ]
-    ]
-  },
-  {
-    "id": "09c1ee47d041fe6f",
-    "type": "debug",
-    "z": "ca62c5c8d2804cf1",
-    "name": "debug 1",
-    "active": true,
-    "tosidebar": true,
-    "console": false,
-    "tostatus": false,
-    "complete": "false",
-    "statusVal": "",
-    "statusType": "auto",
-    "x": 640,
-    "y": 100,
-    "wires": []
-  }
-]
+[{"id":"49cf684aba9b5fea","type":"tab","label":"Flow 1","disabled":false,"info":"","env":[]},{"id":"7bf94e3d4d29f9cd","type":"inject","z":"49cf684aba9b5fea","name":"","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"","payload":"","payloadType":"date","x":340,"y":160,"wires":[["7f77d938f70bfd8a","38ce956c0ede275d"]]},{"id":"7f77d938f70bfd8a","type":"debug","z":"49cf684aba9b5fea","name":"debug 1","active":true,"tosidebar":true,"console":false,"tostatus":false,"complete":"false","statusVal":"","statusType":"auto","x":600,"y":160,"wires":[]},{"id":"38ce956c0ede275d","type":"sendgrid","z":"49cf684aba9b5fea","from":"qsdgqsfgdsfg","multiple":false,"to":"dsfgdfgsdfgsdfg","name":"","content":"text","templateId":"","templateData":"","x":620,"y":260,"wires":[]}]