@exulu/backend 0.1.6 → 0.1.7

package/dist/index.cjs

@@ -56,18 +56,26 @@ var redisServer = {
 };
 
 // src/redis/client.ts
-var redisClient = null;
-(async () => {
-  if (!redisClient) {
+var client = {};
+async function redisClient() {
+  if (!redisServer.host || !redisServer.port) {
+    return {
+      client: null
+    };
+  }
+  if (!client["exulu"]) {
     const url = `redis://${redisServer.host}:${redisServer.port}`;
     console.log(`[EXULU] connecting to redis.`);
-    redisClient = (0, import_redis.createClient)({
+    client["exulu"] = (0, import_redis.createClient)({
       // todo add password
       url
     });
-    await redisClient.connect();
+    await client["exulu"].connect();
   }
-})();
+  return {
+    client: client["exulu"]
+  };
+}
 
 // src/bullmq/validators.ts
 var validateJob = (job) => {
@@ -1382,7 +1390,8 @@ var import_express3 = require("express");
 
 // src/registry/rate-limiter.ts
 var rateLimiter = async (key, windowSeconds, limit, points) => {
-  if (!redisClient) {
+  const { client: client2 } = await redisClient();
+  if (!client2) {
     return {
       status: false,
       retryAfter: 10
@@ -1390,12 +1399,12 @@ var rateLimiter = async (key, windowSeconds, limit, points) => {
     };
   }
   const redisKey = `exulu/${key}`;
-  const current = await redisClient.incrBy(redisKey, points);
+  const current = await client2.incrBy(redisKey, points);
   if (current === points) {
-    await redisClient.expire(redisKey, windowSeconds);
+    await client2.expire(redisKey, windowSeconds);
   }
   if (current > limit) {
-    const ttl = await redisClient.ttl(redisKey);
+    const ttl = await client2.ttl(redisKey);
     return {
       status: false,
       retryAfter: ttl
@@ -2310,7 +2319,7 @@ var createUppyRoutes = async (app) => {
       res.status(authenticationResult.code || 500).json({ detail: `${authenticationResult.message}` });
       return;
     }
-    const client = getS3Client();
+    const client2 = getS3Client();
     const { type, metadata, filename } = req.body;
     if (typeof filename !== "string") {
       return res.status(400).json({ error: "s3: content filename must be a string" });
@@ -2332,7 +2341,7 @@ var createUppyRoutes = async (app) => {
       Metadata: metadata
     };
     const command = new CreateMultipartUploadCommand(params);
-    return client.send(command, (err, data) => {
+    return client2.send(command, (err, data) => {
       if (err) {
         next(err);
         return;
@@ -2369,7 +2378,7 @@ var createUppyRoutes = async (app) => {
     }, next);
   });
   app.get("/s3/multipart/:uploadId", (req, res, next) => {
-    const client = getS3Client();
+    const client2 = getS3Client();
     const { uploadId } = req.params;
     const { key } = req.query;
     if (typeof key !== "string") {
@@ -2378,7 +2387,7 @@ var createUppyRoutes = async (app) => {
     }
     const parts = [];
     function listPartsPage(startAt) {
-      client.send(new ListPartsCommand({
+      client2.send(new ListPartsCommand({
         Bucket: process.env.COMPANION_S3_BUCKET,
         Key: key,
         UploadId: uploadId,
@@ -2402,7 +2411,7 @@ var createUppyRoutes = async (app) => {
     return part && typeof part === "object" && Number(part.PartNumber) && typeof part.ETag === "string";
   }
   app.post("/s3/multipart/:uploadId/complete", (req, res, next) => {
-    const client = getS3Client();
+    const client2 = getS3Client();
     const { uploadId } = req.params;
     const { key } = req.query;
     const { parts } = req.body;
@@ -2412,7 +2421,7 @@ var createUppyRoutes = async (app) => {
     if (!Array.isArray(parts) || !parts.every(isValidPart)) {
       return res.status(400).json({ error: "s3: `parts` must be an array of {ETag, PartNumber} objects." });
     }
-    return client.send(new CompleteMultipartUploadCommand({
+    return client2.send(new CompleteMultipartUploadCommand({
       Bucket: process.env.COMPANION_S3_BUCKET,
       Key: key,
       UploadId: uploadId,
@@ -2431,13 +2440,13 @@ var createUppyRoutes = async (app) => {
     });
   });
   app.delete("/s3/multipart/:uploadId", (req, res, next) => {
-    const client = getS3Client();
+    const client2 = getS3Client();
     const { uploadId } = req.params;
     const { key } = req.query;
     if (typeof key !== "string") {
       return res.status(400).json({ error: 's3: the object key must be passed as a query parameter. For example: "?key=abc.jpg"' });
     }
-    return client.send(new AbortMultipartUploadCommand({
+    return client2.send(new AbortMultipartUploadCommand({
       Bucket: process.env.COMPANION_S3_BUCKET,
       Key: key,
       UploadId: uploadId

package/dist/index.d.cts

@@ -1,6 +1,6 @@
 import * as bullmq from 'bullmq';
 import { Queue } from 'bullmq';
-import * as redis from 'redis';
+import { RedisClientType } from 'redis';
 import * as _mastra_core from '@mastra/core';
 import { ToolAction, Workflow, Agent } from '@mastra/core';
 import { ZodSchema, z } from 'zod';
@@ -8,6 +8,10 @@ import { LanguageModelV1 } from 'ai';
 import { Express } from 'express';
 import { Knex } from 'knex';
 
+declare function redisClient(): Promise<{
+    client: RedisClientType | null;
+}>;
+
 type STATISTICS_TYPE = "context.retrieve" | "source.update" | "embedder.upsert" | "embedder.delete" | "workflow.run" | "context.upsert" | "tool.call" | "agent.run";
 declare const STATISTICS_TYPE_ENUM: {
     CONTEXT_RETRIEVE: string;
@@ -437,7 +441,7 @@ declare class ExuluQueues {
 declare const queues: ExuluQueues;
 
 declare const ExuluJobs: {
-    redis: redis.RedisClientType | null;
+    redis: typeof redisClient;
     jobs: {
         validate: (job: bullmq.Job) => bullmq.Job<any, any, string>;
     };

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import * as bullmq from 'bullmq';
 import { Queue } from 'bullmq';
-import * as redis from 'redis';
+import { RedisClientType } from 'redis';
 import * as _mastra_core from '@mastra/core';
 import { ToolAction, Workflow, Agent } from '@mastra/core';
 import { ZodSchema, z } from 'zod';
@@ -8,6 +8,10 @@ import { LanguageModelV1 } from 'ai';
 import { Express } from 'express';
 import { Knex } from 'knex';
 
+declare function redisClient(): Promise<{
+    client: RedisClientType | null;
+}>;
+
 type STATISTICS_TYPE = "context.retrieve" | "source.update" | "embedder.upsert" | "embedder.delete" | "workflow.run" | "context.upsert" | "tool.call" | "agent.run";
 declare const STATISTICS_TYPE_ENUM: {
     CONTEXT_RETRIEVE: string;
@@ -437,7 +441,7 @@ declare class ExuluQueues {
 declare const queues: ExuluQueues;
 
 declare const ExuluJobs: {
-    redis: redis.RedisClientType | null;
+    redis: typeof redisClient;
     jobs: {
         validate: (job: bullmq.Job) => bullmq.Job<any, any, string>;
     };

package/dist/index.js

@@ -15,18 +15,26 @@ var redisServer = {
 };
 
 // src/redis/client.ts
-var redisClient = null;
-(async () => {
-  if (!redisClient) {
+var client = {};
+async function redisClient() {
+  if (!redisServer.host || !redisServer.port) {
+    return {
+      client: null
+    };
+  }
+  if (!client["exulu"]) {
     const url = `redis://${redisServer.host}:${redisServer.port}`;
     console.log(`[EXULU] connecting to redis.`);
-    redisClient = createClient({
+    client["exulu"] = createClient({
       // todo add password
       url
     });
-    await redisClient.connect();
+    await client["exulu"].connect();
   }
-})();
+  return {
+    client: client["exulu"]
+  };
+}
 
 // src/bullmq/validators.ts
 var validateJob = (job) => {
@@ -1341,7 +1349,8 @@ import "express";
 
 // src/registry/rate-limiter.ts
 var rateLimiter = async (key, windowSeconds, limit, points) => {
-  if (!redisClient) {
+  const { client: client2 } = await redisClient();
+  if (!client2) {
     return {
       status: false,
       retryAfter: 10
@@ -1349,12 +1358,12 @@ var rateLimiter = async (key, windowSeconds, limit, points) => {
     };
   }
   const redisKey = `exulu/${key}`;
-  const current = await redisClient.incrBy(redisKey, points);
+  const current = await client2.incrBy(redisKey, points);
   if (current === points) {
-    await redisClient.expire(redisKey, windowSeconds);
+    await client2.expire(redisKey, windowSeconds);
   }
   if (current > limit) {
-    const ttl = await redisClient.ttl(redisKey);
+    const ttl = await client2.ttl(redisKey);
     return {
       status: false,
       retryAfter: ttl
@@ -2269,7 +2278,7 @@ var createUppyRoutes = async (app) => {
       res.status(authenticationResult.code || 500).json({ detail: `${authenticationResult.message}` });
       return;
     }
-    const client = getS3Client();
+    const client2 = getS3Client();
     const { type, metadata, filename } = req.body;
     if (typeof filename !== "string") {
       return res.status(400).json({ error: "s3: content filename must be a string" });
@@ -2291,7 +2300,7 @@ var createUppyRoutes = async (app) => {
       Metadata: metadata
     };
     const command = new CreateMultipartUploadCommand(params);
-    return client.send(command, (err, data) => {
+    return client2.send(command, (err, data) => {
       if (err) {
         next(err);
         return;
@@ -2328,7 +2337,7 @@ var createUppyRoutes = async (app) => {
     }, next);
   });
   app.get("/s3/multipart/:uploadId", (req, res, next) => {
-    const client = getS3Client();
+    const client2 = getS3Client();
     const { uploadId } = req.params;
     const { key } = req.query;
     if (typeof key !== "string") {
@@ -2337,7 +2346,7 @@ var createUppyRoutes = async (app) => {
     }
     const parts = [];
     function listPartsPage(startAt) {
-      client.send(new ListPartsCommand({
+      client2.send(new ListPartsCommand({
         Bucket: process.env.COMPANION_S3_BUCKET,
         Key: key,
         UploadId: uploadId,
@@ -2361,7 +2370,7 @@ var createUppyRoutes = async (app) => {
     return part && typeof part === "object" && Number(part.PartNumber) && typeof part.ETag === "string";
   }
   app.post("/s3/multipart/:uploadId/complete", (req, res, next) => {
-    const client = getS3Client();
+    const client2 = getS3Client();
     const { uploadId } = req.params;
     const { key } = req.query;
     const { parts } = req.body;
@@ -2371,7 +2380,7 @@ var createUppyRoutes = async (app) => {
     if (!Array.isArray(parts) || !parts.every(isValidPart)) {
       return res.status(400).json({ error: "s3: `parts` must be an array of {ETag, PartNumber} objects." });
     }
-    return client.send(new CompleteMultipartUploadCommand({
+    return client2.send(new CompleteMultipartUploadCommand({
       Bucket: process.env.COMPANION_S3_BUCKET,
       Key: key,
       UploadId: uploadId,
@@ -2390,13 +2399,13 @@ var createUppyRoutes = async (app) => {
     });
   });
   app.delete("/s3/multipart/:uploadId", (req, res, next) => {
-    const client = getS3Client();
+    const client2 = getS3Client();
     const { uploadId } = req.params;
     const { key } = req.query;
     if (typeof key !== "string") {
       return res.status(400).json({ error: 's3: the object key must be passed as a query parameter. For example: "?key=abc.jpg"' });
     }
-    return client.send(new AbortMultipartUploadCommand({
+    return client2.send(new AbortMultipartUploadCommand({
       Bucket: process.env.COMPANION_S3_BUCKET,
       Key: key,
       UploadId: uploadId

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@exulu/backend",
     "author": "Qventu Bv.",
-    "version": "0.1.6",
+    "version": "0.1.7",
     "main": "./dist/index.js",
     "private": false,
     "publishConfig": {
@@ -15,7 +15,7 @@
     },
     "repository": {
         "type": "git",
-        "url": "https://github.com/Qventu/exulu-core"
+        "url": "https://github.com/Qventu/exulu-backend"
     },
     "scripts": {
         "build": "tsup",