@cequrebackends/cequre-ts 0.12.1 → 0.13.0

package/dist/adapters/bun/bun-websocket.d.ts

@@ -65,11 +65,11 @@ export declare function createBunWebSocketRoute({ path, heartbeat, onJoinRoom, }
         timeout?: number;
     } | false;
     onJoinRoom?: (room: string, ws: CequreServerWebSocket) => MaybePromise<boolean>;
-}): (request: Request, server: any) => Promise<Response>;
+}): (request: Request, server?: any) => Promise<any>;
 export declare function createBunWebSocketHandlers(): Bun.WebSocketHandler<CequreWebSocketData>;
 export declare class CequreWebsocket {
     static get manager(): WebSocketManager;
-    static route(options?: Parameters<typeof createBunWebSocketRoute>[0]): (request: Request, server: any) => Promise<Response>;
+    static route(options?: Parameters<typeof createBunWebSocketRoute>[0]): (request: Request, server?: any) => Promise<any>;
     static handler(options?: Parameters<typeof createWebSocketHandler>[0]): CequreWebSocketHandler;
     static handlers(): Bun.WebSocketHandler<CequreWebSocketData>;
     static register(ws: CequreServerWebSocket): void;

package/dist/adapters/bun/index.js

@@ -19,7 +19,7 @@ import {
   init_bun_redis_cache,
   init_logger,
   logger
-} from "../../index-rf1kdn5b.js";
+} from "../../index-c3vh32en.js";
 import {
   CequreError,
   ulid
@@ -382,7 +382,7 @@ function createBunWebSocketRoute({
       }
     });
     if (didUpgrade) {
-      return;
+      return UPGRADED;
     }
     return new Response(JSON.stringify({ message: "WebSocket upgrade failed" }), { status: 400 });
   };

package/dist/adapters/node/index.js

@@ -4,7 +4,7 @@ import {
   exports_logger,
   init_logger,
   logger
-} from "../../index-rf1kdn5b.js";
+} from "../../index-c3vh32en.js";
 import {
   CequreError,
   __toCommonJS,

package/dist/{index-rf1kdn5b.js → index-c3vh32en.js}

@@ -556,6 +556,7 @@ var init_logger = __esm(() => {
 
 // shared/utils/queue-manager.ts
 import { Queue as BullQueue, Worker as BullWorker, QueueEvents as BullQueueEvents } from "bullmq";
+import { Effect } from "effect";
 init_logger();
 
 class BullMQQueueAdapter {
@@ -627,6 +628,11 @@ class CequreQueueManager {
       ...this.config.defaultQueueOptions ?? {},
       ...this.getBullMQBaseOptions()
     });
+    queue.on("error", (err) => {
+      if (err?.message?.includes("Connection is closed"))
+        return;
+      logger.error(err, `[ ${name.toUpperCase()} QUEUE ] Error`);
+    });
     const wrapped = new BullMQQueueAdapter(queue);
     this.queues.set(name, wrapped);
     return wrapped;
@@ -663,6 +669,8 @@ class CequreQueueManager {
       logger.error(err, `${queueNameForLogs} Job ${job?.id ?? "unknown"} failed`);
     });
     worker.on("error", (err) => {
+      if (err?.message?.includes("Connection is closed"))
+        return;
       logger.error(err, `${queueNameForLogs} Worker error`);
     });
     await worker.waitUntilReady();
@@ -685,6 +693,11 @@ class CequreQueueManager {
     const events = new BullQueueEvents(name, {
       ...this.getBullMQBaseOptions()
     });
+    events.on("error", (err) => {
+      if (err?.message?.includes("Connection is closed"))
+        return;
+      logger.error(err, `[ ${name.toUpperCase()} QUEUE EVENTS ] Error`);
+    });
     const wrapped = {
       disconnect: async () => {
         await events.close();
@@ -707,21 +720,26 @@ class CequreQueueManager {
     if (this.closing)
       return;
     this.closing = true;
-    const closeAll = async (items, label) => {
-      await Promise.all(items.map(async (item) => {
-        try {
-          if (item.close)
-            await item.close();
-          else if (item.disconnect)
-            await item.disconnect();
-        } catch (err) {
-          logger.error(err, `[QueueManager] Error closing ${label}`);
-        }
-      }));
-    };
-    await closeAll(Array.from(this.workers.values()), "worker");
-    await closeAll(Array.from(this.queueEvents.values()), "queue events");
-    await closeAll(Array.from(this.queues.values()), "queue");
+    const closeItemEffect = (item, label) => Effect.tryPromise({
+      try: async () => {
+        if (item.close)
+          await item.close();
+        else if (item.disconnect)
+          await item.disconnect();
+      },
+      catch: (err) => err
+    }).pipe(Effect.catchAll((err) => Effect.sync(() => {
+      logger.error(err, `[QueueManager] Error closing ${label}`);
+    })));
+    const closeGroupEffect = (items, label) => Effect.all(items.map((item) => closeItemEffect(item, label)), { concurrency: "unbounded" });
+    const workers = Array.from(this.workers.values());
+    const queueEvents = Array.from(this.queueEvents.values());
+    const queues = Array.from(this.queues.values());
+    await Effect.runPromise(Effect.gen(function* () {
+      yield* closeGroupEffect(workers, "worker");
+      yield* closeGroupEffect(queueEvents, "queue events");
+      yield* closeGroupEffect(queues, "queue");
+    }));
     this.workers.clear();
     this.queueEvents.clear();
     this.queues.clear();

package/dist/index.js

@@ -37,7 +37,7 @@ import {
   init_kv,
   init_logger,
   logger
-} from "./index-rf1kdn5b.js";
+} from "./index-c3vh32en.js";
 import {
   CequreError,
   __require,
@@ -1449,12 +1449,12 @@ async function populateDocuments(schema, collectionSlug, docs, adapter, depth) {
 // shared/main/runtime.ts
 init_openapi();
 init_kv();
-import { RateLimiter } from "@cequrebackends/cequre-plugin-security";
+import { RateLimiter } from "@cequrebackends/plugin-security";
 init_logger();
 import path from "path";
 import { AsyncLocalStorage } from "async_hooks";
-import { computeAuditHmac, verifyAuditChain } from "@cequrebackends/cequre-plugin-security";
-import { encryptField, decryptField, isEncrypted } from "@cequrebackends/cequre-plugin-security";
+import { computeAuditHmac, verifyAuditChain } from "@cequrebackends/plugin-security";
+import { encryptField, decryptField, isEncrypted } from "@cequrebackends/plugin-security";
 
 // shared/utils/crypto.ts
 async function sha256Hex(input) {
@@ -2532,8 +2532,13 @@ class CequreRuntime {
           result[f.name] = f.default;
         }
         const v = result[f.name];
-        if (v !== undefined && typeof v === "string" && !isEncrypted(v)) {
-          result[f.name] = await encryptField(key, v);
+        if (v !== undefined && v !== null) {
+          if (typeof v === "string" && !isEncrypted(v)) {
+            result[f.name] = await encryptField(key, v);
+          } else if (typeof v !== "string") {
+            const jsonStr = JSON.stringify(v);
+            result[f.name] = await encryptField(key, jsonStr);
+          }
         }
       }
     }
@@ -2553,8 +2558,13 @@ class CequreRuntime {
       for (const [k, v] of Object.entries(result)) {
         if (encFields.has(k) && typeof v === "string" && isEncrypted(v)) {
           const decrypted = await decryptField(key, v);
-          if (decrypted !== null)
-            result[k] = decrypted;
+          if (decrypted !== null) {
+            try {
+              result[k] = JSON.parse(decrypted);
+            } catch {
+              result[k] = decrypted;
+            }
+          }
         }
       }
       return result;
@@ -2881,6 +2891,7 @@ class CequreRuntime {
       },
       maxBodyBytes: this.schema.core?.api?.maxBodyBytes,
       idempotencyKV: this.idempotencyKV,
+      state: (server2) => server2,
       headers: {
         ...this.schema.security?.headers?.enabled ? {
           "X-Content-Type-Options": "nosniff",
@@ -2969,7 +2980,7 @@ class CequreRuntime {
               }
               let executionPromise = (async () => {
                 let r2 = await this.router.handle(req, srv, ctx.user, this);
-                return r2 || new Response("Not found", { status: 404 });
+                return r2;
               })();
               const timeoutMs = this.schema.core?.api?.requestTimeoutMs;
               let timeoutHandle;
@@ -2984,7 +2995,7 @@ class CequreRuntime {
               }
               let res = await executionPromise;
               for (const plugin of this.plugins) {
-                if (plugin.afterRequest)
+                if (plugin.afterRequest && res)
                   await plugin.afterRequest(ctx, res);
               }
               return res;

package/dist/shared/core/stream.d.ts

@@ -13,7 +13,7 @@ export interface DurableStreamStore {
  * In-memory implementation of DurableStreamStore.
  * [Development Only] This uses a local array ring buffer.
  * It does not scale across multiple servers and loses data on restart.
- * Use @cequrebackends/cequre-plugin-durable-streams for production.
+ * Use @cequrebackends/plugin-durable-streams for production.
  */
 export declare class MemoryStreamStore implements DurableStreamStore {
     private streams;

package/dist/shared/main/router.d.ts

@@ -2,7 +2,7 @@ import type { TSchema, Static } from "@sinclair/typebox";
 import type { CequreRuntime } from "./runtime";
 import type { CequreRouteContext, CequreParams, CequreQuery } from "../core/request";
 import { type BunRouteResult } from "../../adapters/bun/bun-response";
-import type { CequreMonitoringAPI } from "@cequrebackends/cequre-plugin-monitoring";
+import type { CequreMonitoringAPI } from "@cequrebackends/plugin-monitoring";
 export type CequreRouteHandler<TCollections extends Record<string, any> = any, TState = unknown, TParams extends TSchema | undefined = undefined, TQuery extends TSchema | undefined = undefined, TBody extends TSchema | undefined = undefined, TResponse extends TSchema | undefined = undefined> = (context: CequreRouteContext<TCollections, TState, TParams extends TSchema ? Static<TParams> : CequreParams, TQuery extends TSchema ? Static<TQuery> : CequreQuery, TBody extends TSchema ? Static<TBody> : unknown>) => TResponse extends TSchema ? BunRouteResult<Static<TResponse>> | Promise<BunRouteResult<Static<TResponse>>> : BunRouteResult | Promise<BunRouteResult>;
 export interface CequreRouteOptions<TParams extends TSchema | undefined = undefined, TQuery extends TSchema | undefined = undefined, TBody extends TSchema | undefined = undefined, TResponse extends TSchema | undefined = undefined> {
     body?: TBody;

package/dist/shared/main/runtime.d.ts

@@ -4,12 +4,12 @@ import { type DurableStreamStore } from "../core/stream";
 import type { AccessRules, AuthUser, CequreRequestContext } from "./access";
 import type { Hooks } from "./hooks";
 import { CequreRouter } from "./router";
-import { type CequreMonitoringAPI } from "@cequrebackends/cequre-plugin-monitoring";
-import { RateLimiter } from "@cequrebackends/cequre-plugin-security";
+import { type CequreMonitoringAPI } from "@cequrebackends/plugin-monitoring";
+import { RateLimiter } from "@cequrebackends/plugin-security";
 import { type CequreMailer } from "../core/email";
 import { AsyncLocalStorage } from "node:async_hooks";
-import { JWTAuthenticator } from "@cequrebackends/cequre-plugin-security";
-import { type CequreAuditEvent } from "@cequrebackends/cequre-plugin-security";
+import { JWTAuthenticator } from "@cequrebackends/plugin-security";
+import { type CequreAuditEvent } from "@cequrebackends/plugin-security";
 /**
  * AsyncLocalStorage for propagating the request ID from the router
  * to the runtime's audit calls without threading it through every

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cequrebackends/cequre-ts",
-  "version": "0.12.1",
+  "version": "0.13.0",
   "description": "The Cequre Universal Runtime Engine",
   "type": "module",
   "main": "./dist/index.js",