@exulu/backend 0.1.8 → 0.2.0

package/dist/index.cjs

@@ -58,19 +58,26 @@ var redisServer = {
 // src/redis/client.ts
 var client = {};
 async function redisClient() {
-  if (!redisServer.host || !redisServer.port) {
+  console.log("[EXULU] redisClient", redisServer);
+  if (!redisServer.host?.length || !redisServer.port?.length) {
+    console.error(`[EXULU] no redis server configured.`);
     return {
       client: null
     };
   }
   if (!client["exulu"]) {
-    const url = `redis://${redisServer.host}:${redisServer.port}`;
-    console.log(`[EXULU] connecting to redis.`);
-    client["exulu"] = (0, import_redis.createClient)({
-      // todo add password
-      url
-    });
-    await client["exulu"].connect();
+    try {
+      const url = `redis://${redisServer.host}:${redisServer.port}`;
+      console.log(`[EXULU] connecting to redis.`);
+      client["exulu"] = (0, import_redis.createClient)({
+        // todo add password
+        url
+      });
+      await client["exulu"].connect();
+    } catch (error) {
+      console.error(`[EXULU] error connecting to redis.`, error);
+      throw error;
+    }
   }
   return {
     client: client["exulu"]
@@ -113,25 +120,30 @@ var import_knex3 = require("pgvector/knex");
 var db = {};
 async function postgresClient() {
   if (!db["exulu"]) {
-    console.log("[EXULU] Initializing exulu database.");
-    console.log(process.env.POSTGRES_DB_HOST);
-    console.log(process.env.POSTGRES_DB_PORT);
-    console.log(process.env.POSTGRES_DB_USER);
-    console.log(process.env.POSTGRES_DB_PASSWORD);
-    console.log(process.env.POSTGRES_DB_SSL);
-    const knex = (0, import_knex.default)({
-      client: "pg",
-      connection: {
-        host: process.env.POSTGRES_DB_HOST,
-        port: parseInt(process.env.POSTGRES_DB_PORT || "5432"),
-        user: process.env.POSTGRES_DB_USER,
-        database: "exulu",
-        password: process.env.POSTGRES_DB_PASSWORD,
-        ssl: process.env.POSTGRES_DB_SSL === "true" ? { rejectUnauthorized: false } : false
-      }
-    });
-    await knex.schema.createExtensionIfNotExists("vector");
-    db["exulu"] = knex;
+    try {
+      console.log("[EXULU] Initializing exulu database.");
+      console.log(process.env.POSTGRES_DB_HOST);
+      console.log(process.env.POSTGRES_DB_PORT);
+      console.log(process.env.POSTGRES_DB_USER);
+      console.log(process.env.POSTGRES_DB_PASSWORD);
+      console.log(process.env.POSTGRES_DB_SSL);
+      const knex = (0, import_knex.default)({
+        client: "pg",
+        connection: {
+          host: process.env.POSTGRES_DB_HOST,
+          port: parseInt(process.env.POSTGRES_DB_PORT || "5432"),
+          user: process.env.POSTGRES_DB_USER,
+          database: "exulu",
+          password: process.env.POSTGRES_DB_PASSWORD,
+          ssl: process.env.POSTGRES_DB_SSL === "true" ? { rejectUnauthorized: false } : false
+        }
+      });
+      await knex.schema.createExtensionIfNotExists("vector");
+      db["exulu"] = knex;
+    } catch (error) {
+      console.error("[EXULU] Error initializing exulu database.", error);
+      throw error;
+    }
   }
   return {
     db: db["exulu"]
@@ -398,6 +410,7 @@ var sanitizeName = (name) => {
 };
 
 // src/postgres/init-db.ts
+var import_bcryptjs = __toESM(require("bcryptjs"), 1);
 var up = async function(knex) {
   if (!await knex.schema.hasTable("roles")) {
     await knex.schema.createTable("roles", (table) => {
@@ -545,6 +558,11 @@ var up = async function(knex) {
     });
   }
 };
+var SALT_ROUNDS = 12;
+async function encryptApiKey(apikey) {
+  const hash = await import_bcryptjs.default.hash(apikey, SALT_ROUNDS);
+  return hash;
+}
 var execute = async () => {
   console.log("[EXULU] Initializing database.");
   const { db: db2 } = await postgresClient();
@@ -563,6 +581,10 @@ var execute = async () => {
   } else {
     roleId = existingRole.id;
   }
+  const newKeyName = "exulu_default_key";
+  const plainKey = `sk_${Math.random().toString(36).substring(2, 15)}_${Math.random().toString(36).substring(2, 15)}`;
+  const postFix = `/${newKeyName.toLowerCase().trim().replaceAll(" ", "_")}`;
+  const encryptedKey = await encryptApiKey(plainKey);
   const existingUser = await db2.from("users").where({ email: "admin@exulu.com" }).first();
   if (!existingUser) {
     console.log("[EXULU] Creating default admin user.");
@@ -572,11 +594,28 @@ var execute = async () => {
       super_admin: true,
       createdAt: /* @__PURE__ */ new Date(),
       updatedAt: /* @__PURE__ */ new Date(),
+      type: "user",
+      // password: "admin", todo add this again when we implement password auth / encryption as alternative to OTP
+      role: roleId
+    });
+  }
+  const existingApiUser = await db2.from("users").where({ email: "api@exulu.com" }).first();
+  if (!existingApiUser) {
+    console.log("[EXULU] Creating default api user.");
+    await db2.from("users").insert({
+      name: "exulu",
+      email: "admin@exulu.com",
+      super_admin: true,
+      createdAt: /* @__PURE__ */ new Date(),
+      updatedAt: /* @__PURE__ */ new Date(),
+      type: "api",
+      apikey: `${encryptedKey}${postFix}`,
       // password: "admin", todo add this again when we implement password auth / encryption as alternative to OTP
       role: roleId
     });
   }
   console.log("[EXULU] Database initialized.");
+  console.log("[EXULU] Default api key: ", `${encryptedKey}${postFix}`);
   return;
 };
 
@@ -1428,7 +1467,7 @@ var import_express = require("express");
 var import_jwt = require("next-auth/jwt");
 
 // src/auth/auth.ts
-var import_bcryptjs = __toESM(require("bcryptjs"), 1);
+var import_bcryptjs2 = __toESM(require("bcryptjs"), 1);
 var authentication = async ({
   apikey,
   authtoken,
@@ -1519,11 +1558,11 @@ var authentication = async ({
         code: 401
       };
     }
-    const filtered = users.filter(({ apiKey, id }) => apiKey.includes(keyName));
+    const filtered = users.filter(({ apikey: apikey2, id }) => apikey2.includes(keyName));
     for (const user of filtered) {
-      const lastSlashIndex = user.apiKey.lastIndexOf("/");
-      const compareValue = lastSlashIndex !== -1 ? user.apiKey.substring(0, lastSlashIndex) : user.apiKey;
-      const isMatch = await import_bcryptjs.default.compare(keyValue, compareValue);
+      const lastSlashIndex = user.apikey.lastIndexOf("/");
+      const compareValue = lastSlashIndex !== -1 ? user.apikey.substring(0, lastSlashIndex) : user.apikey;
+      const isMatch = await import_bcryptjs2.default.compare(keyValue, compareValue);
       if (isMatch) {
         await db2.from("users").where({ id: user.id }).update({
           lastUsed: /* @__PURE__ */ new Date()
@@ -1714,6 +1753,10 @@ var ExuluQueues = class {
     if (existing) {
       return existing;
     }
+    if (!redisServer.host?.length || !redisServer.port?.length) {
+      console.error(`[EXULU] no redis server configured, but you are trying to use a queue ( ${name}), likely in an agent or workflow (look for ExuluQueues.use() ).`);
+      throw new Error(`[EXULU] no redis server configured.`);
+    }
     const newQueue = new import_bullmq5.Queue(`${name}`, { connection: redisServer });
     this.queues.push(newQueue);
     return newQueue;
@@ -2133,9 +2176,6 @@ var createUppyRoutes = async (app) => {
     return stsClient;
   }
   app.use(bodyParser.urlencoded({ extended: true }), bodyParser.json());
-  app.get("/", (req, res) => {
-    res.json("Exulu upload server.");
-  });
   app.get("/s3/list", async (req, res, next) => {
     const apikey = req.headers["exulu-api-key"] || null;
     let authtoken = null;
@@ -2562,7 +2602,11 @@ var createExpressRoutes = async (app, agents, embedders, tools, workflows, conte
     { route: "/items/export/:context", method: "GET", note: "Export items from context" },
     { route: "/graphql", method: "POST", note: "GraphQL endpoint" }
   );
-  await createRecurringJobs();
+  if (redisServer.host?.length && redisServer.port?.length) {
+    await createRecurringJobs();
+  } else {
+    console.log("===========================", "[EXULU] no redis server configured, not setting up recurring jobs.", "===========================");
+  }
   const schema = createSDL([usersSchema, rolesSchema, agentsSchema, jobsSchema]);
   const server = new import_server3.ApolloServer({ schema, introspection: true });
   await server.start();
@@ -2622,7 +2666,6 @@ var createExpressRoutes = async (app, agents, embedders, tools, workflows, conte
       }
     });
   });
-  console.log("tools", tools);
   app.get("/tools", async (req, res) => {
     res.status(200).json(tools.map((tool) => ({
       id: tool.id,
@@ -3283,6 +3326,7 @@ var createExpressRoutes = async (app, agents, embedders, tools, workflows, conte
         return;
       }
       if (agent.rateLimit) {
+        console.log("[EXULU] rate limiting agent.", agent.rateLimit);
         const limit = await rateLimiter(
           agent.rateLimit.name || agent.id,
           agent.rateLimit.rate_limit.time,

package/dist/index.js

@@ -17,19 +17,26 @@ var redisServer = {
 // src/redis/client.ts
 var client = {};
 async function redisClient() {
-  if (!redisServer.host || !redisServer.port) {
+  console.log("[EXULU] redisClient", redisServer);
+  if (!redisServer.host?.length || !redisServer.port?.length) {
+    console.error(`[EXULU] no redis server configured.`);
     return {
       client: null
     };
   }
   if (!client["exulu"]) {
-    const url = `redis://${redisServer.host}:${redisServer.port}`;
-    console.log(`[EXULU] connecting to redis.`);
-    client["exulu"] = createClient({
-      // todo add password
-      url
-    });
-    await client["exulu"].connect();
+    try {
+      const url = `redis://${redisServer.host}:${redisServer.port}`;
+      console.log(`[EXULU] connecting to redis.`);
+      client["exulu"] = createClient({
+        // todo add password
+        url
+      });
+      await client["exulu"].connect();
+    } catch (error) {
+      console.error(`[EXULU] error connecting to redis.`, error);
+      throw error;
+    }
   }
   return {
     client: client["exulu"]
@@ -72,25 +79,30 @@ import "pgvector/knex";
 var db = {};
 async function postgresClient() {
   if (!db["exulu"]) {
-    console.log("[EXULU] Initializing exulu database.");
-    console.log(process.env.POSTGRES_DB_HOST);
-    console.log(process.env.POSTGRES_DB_PORT);
-    console.log(process.env.POSTGRES_DB_USER);
-    console.log(process.env.POSTGRES_DB_PASSWORD);
-    console.log(process.env.POSTGRES_DB_SSL);
-    const knex = Knex({
-      client: "pg",
-      connection: {
-        host: process.env.POSTGRES_DB_HOST,
-        port: parseInt(process.env.POSTGRES_DB_PORT || "5432"),
-        user: process.env.POSTGRES_DB_USER,
-        database: "exulu",
-        password: process.env.POSTGRES_DB_PASSWORD,
-        ssl: process.env.POSTGRES_DB_SSL === "true" ? { rejectUnauthorized: false } : false
-      }
-    });
-    await knex.schema.createExtensionIfNotExists("vector");
-    db["exulu"] = knex;
+    try {
+      console.log("[EXULU] Initializing exulu database.");
+      console.log(process.env.POSTGRES_DB_HOST);
+      console.log(process.env.POSTGRES_DB_PORT);
+      console.log(process.env.POSTGRES_DB_USER);
+      console.log(process.env.POSTGRES_DB_PASSWORD);
+      console.log(process.env.POSTGRES_DB_SSL);
+      const knex = Knex({
+        client: "pg",
+        connection: {
+          host: process.env.POSTGRES_DB_HOST,
+          port: parseInt(process.env.POSTGRES_DB_PORT || "5432"),
+          user: process.env.POSTGRES_DB_USER,
+          database: "exulu",
+          password: process.env.POSTGRES_DB_PASSWORD,
+          ssl: process.env.POSTGRES_DB_SSL === "true" ? { rejectUnauthorized: false } : false
+        }
+      });
+      await knex.schema.createExtensionIfNotExists("vector");
+      db["exulu"] = knex;
+    } catch (error) {
+      console.error("[EXULU] Error initializing exulu database.", error);
+      throw error;
+    }
   }
   return {
     db: db["exulu"]
@@ -357,6 +369,7 @@ var sanitizeName = (name) => {
 };
 
 // src/postgres/init-db.ts
+import bcrypt from "bcryptjs";
 var up = async function(knex) {
   if (!await knex.schema.hasTable("roles")) {
     await knex.schema.createTable("roles", (table) => {
@@ -504,6 +517,11 @@ var up = async function(knex) {
     });
   }
 };
+var SALT_ROUNDS = 12;
+async function encryptApiKey(apikey) {
+  const hash = await bcrypt.hash(apikey, SALT_ROUNDS);
+  return hash;
+}
 var execute = async () => {
   console.log("[EXULU] Initializing database.");
   const { db: db2 } = await postgresClient();
@@ -522,6 +540,10 @@ var execute = async () => {
   } else {
     roleId = existingRole.id;
   }
+  const newKeyName = "exulu_default_key";
+  const plainKey = `sk_${Math.random().toString(36).substring(2, 15)}_${Math.random().toString(36).substring(2, 15)}`;
+  const postFix = `/${newKeyName.toLowerCase().trim().replaceAll(" ", "_")}`;
+  const encryptedKey = await encryptApiKey(plainKey);
   const existingUser = await db2.from("users").where({ email: "admin@exulu.com" }).first();
   if (!existingUser) {
     console.log("[EXULU] Creating default admin user.");
@@ -531,11 +553,28 @@ var execute = async () => {
       super_admin: true,
       createdAt: /* @__PURE__ */ new Date(),
       updatedAt: /* @__PURE__ */ new Date(),
+      type: "user",
+      // password: "admin", todo add this again when we implement password auth / encryption as alternative to OTP
+      role: roleId
+    });
+  }
+  const existingApiUser = await db2.from("users").where({ email: "api@exulu.com" }).first();
+  if (!existingApiUser) {
+    console.log("[EXULU] Creating default api user.");
+    await db2.from("users").insert({
+      name: "exulu",
+      email: "admin@exulu.com",
+      super_admin: true,
+      createdAt: /* @__PURE__ */ new Date(),
+      updatedAt: /* @__PURE__ */ new Date(),
+      type: "api",
+      apikey: `${encryptedKey}${postFix}`,
       // password: "admin", todo add this again when we implement password auth / encryption as alternative to OTP
       role: roleId
     });
   }
   console.log("[EXULU] Database initialized.");
+  console.log("[EXULU] Default api key: ", `${encryptedKey}${postFix}`);
   return;
 };
 
@@ -1387,7 +1426,7 @@ import "express";
 import { getToken } from "next-auth/jwt";
 
 // src/auth/auth.ts
-import bcrypt from "bcryptjs";
+import bcrypt2 from "bcryptjs";
 var authentication = async ({
   apikey,
   authtoken,
@@ -1478,11 +1517,11 @@ var authentication = async ({
         code: 401
       };
     }
-    const filtered = users.filter(({ apiKey, id }) => apiKey.includes(keyName));
+    const filtered = users.filter(({ apikey: apikey2, id }) => apikey2.includes(keyName));
     for (const user of filtered) {
-      const lastSlashIndex = user.apiKey.lastIndexOf("/");
-      const compareValue = lastSlashIndex !== -1 ? user.apiKey.substring(0, lastSlashIndex) : user.apiKey;
-      const isMatch = await bcrypt.compare(keyValue, compareValue);
+      const lastSlashIndex = user.apikey.lastIndexOf("/");
+      const compareValue = lastSlashIndex !== -1 ? user.apikey.substring(0, lastSlashIndex) : user.apikey;
+      const isMatch = await bcrypt2.compare(keyValue, compareValue);
       if (isMatch) {
         await db2.from("users").where({ id: user.id }).update({
           lastUsed: /* @__PURE__ */ new Date()
@@ -1673,6 +1712,10 @@ var ExuluQueues = class {
     if (existing) {
       return existing;
     }
+    if (!redisServer.host?.length || !redisServer.port?.length) {
+      console.error(`[EXULU] no redis server configured, but you are trying to use a queue ( ${name}), likely in an agent or workflow (look for ExuluQueues.use() ).`);
+      throw new Error(`[EXULU] no redis server configured.`);
+    }
     const newQueue = new Queue3(`${name}`, { connection: redisServer });
     this.queues.push(newQueue);
     return newQueue;
@@ -2092,9 +2135,6 @@ var createUppyRoutes = async (app) => {
     return stsClient;
   }
   app.use(bodyParser.urlencoded({ extended: true }), bodyParser.json());
-  app.get("/", (req, res) => {
-    res.json("Exulu upload server.");
-  });
   app.get("/s3/list", async (req, res, next) => {
     const apikey = req.headers["exulu-api-key"] || null;
     let authtoken = null;
@@ -2521,7 +2561,11 @@ var createExpressRoutes = async (app, agents, embedders, tools, workflows, conte
     { route: "/items/export/:context", method: "GET", note: "Export items from context" },
     { route: "/graphql", method: "POST", note: "GraphQL endpoint" }
   );
-  await createRecurringJobs();
+  if (redisServer.host?.length && redisServer.port?.length) {
+    await createRecurringJobs();
+  } else {
+    console.log("===========================", "[EXULU] no redis server configured, not setting up recurring jobs.", "===========================");
+  }
   const schema = createSDL([usersSchema, rolesSchema, agentsSchema, jobsSchema]);
   const server = new ApolloServer({ schema, introspection: true });
   await server.start();
@@ -2581,7 +2625,6 @@ var createExpressRoutes = async (app, agents, embedders, tools, workflows, conte
       }
     });
   });
-  console.log("tools", tools);
   app.get("/tools", async (req, res) => {
     res.status(200).json(tools.map((tool) => ({
       id: tool.id,
@@ -3242,6 +3285,7 @@ var createExpressRoutes = async (app, agents, embedders, tools, workflows, conte
         return;
       }
       if (agent.rateLimit) {
+        console.log("[EXULU] rate limiting agent.", agent.rateLimit);
         const limit = await rateLimiter(
           agent.rateLimit.name || agent.id,
           agent.rateLimit.rate_limit.time,

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@exulu/backend",
     "author": "Qventu Bv.",
-    "version": "0.1.8",
+    "version": "0.2.0",
     "main": "./dist/index.js",
     "private": false,
     "publishConfig": {