@zauru-sdk/utils 6.28.0 → 6.30.0

package/dist/esm/zauru/auth.loaders.js

@@ -1,5 +1,5 @@
 import { redirect } from "@remix-run/node";
-import { isOauthUserinfoUnauthorizedError } from "@zauru-sdk/common";
+import { ZAURU_OAUTH_REAUTH_COOKIE, hasZauruOauthReauthCookie, isOauthUserinfoUnauthorizedError, } from "@zauru-sdk/common";
 import { config } from "@zauru-sdk/config";
 import { commitSession, destroySession, getHeaders, getRefreshSession, getSession, loginWebApp, } from "@zauru-sdk/services";
 const loginErrorPayload = (description, title) => ({
@@ -27,16 +27,12 @@ const evaluateLoginAccess = async (extras, session, headers) => {
         return Response.json(loginErrorPayload(description));
     }
 };
-const OAUTH_REAUTH_COOKIE = "zauru_oauth_reauth";
 const authorizeUrl = (request) => {
     const url = new URL(request.url);
     const hostname = `${url.port ? "http://" : "https://"}${url.hostname}${url.port ? `:${url.port}` : ""}`;
     return `${config.oauthBaseURL}/dialog/authorize?client_id=${config.oauthClientID}&response_type=code&redirect_uri=${hostname}/login`;
 };
-const hasOauthReauthCookie = (request) => (request.headers.get("Cookie") ?? "")
-    .split(";")
-    .some((part) => part.trim() === `${OAUTH_REAUTH_COOKIE}=1`);
-const oauthReauthSetCookie = () => `${OAUTH_REAUTH_COOKIE}=1; Path=/; Max-Age=120; SameSite=Lax`;
+const oauthReauthSetCookie = () => `${ZAURU_OAUTH_REAUTH_COOKIE}=1; Path=/; Max-Age=120; SameSite=Lax`;
 const redirectOauthReauth = async (session) => {
     const headers = new Headers();
     headers.append("Set-Cookie", await destroySession(session));
@@ -92,7 +88,7 @@ export function createLoginAction(extras) {
         if (loginResponse.error || !loginResponse.data) {
             const userMsg = loginResponse.userMsg?.toString() ?? "";
             if (isOauthUserinfoUnauthorizedError(userMsg) &&
-                !hasOauthReauthCookie(request)) {
+                !hasZauruOauthReauthCookie(request.headers.get("Cookie"))) {
                 return redirectOauthReauth(session);
             }
             return Response.json(loginErrorPayload(userMsg));
@@ -139,11 +135,10 @@ export function createLogoutLoader(extras) {
         const url = new URL(args.request.url);
         if (url.searchParams.get("reauth") === "1") {
             const session = await getSession(args.request.headers.get("Cookie"));
-            return redirect("/login", {
-                headers: {
-                    "Set-Cookie": await destroySession(session),
-                },
-            });
+            const headers = new Headers();
+            headers.append("Set-Cookie", await destroySession(session));
+            headers.append("Set-Cookie", oauthReauthSetCookie());
+            return redirect("/login", { headers });
         }
         return guard(args);
     };

package/dist/esm/zauru/cloudwatch-logger.server.js

@@ -51,12 +51,65 @@ let clientKey = null;
 const sequenceTokens = {};
 /** Serializes PutLogEvents so sequence tokens are not overwritten. */
 let putChain = Promise.resolve();
+let processHandlersInstalled = false;
+let loggedConfigOnce = false;
 function envTrim(name) {
     const v = process.env[name];
     if (!v || v.trim() === "")
         return undefined;
     return v.trim();
 }
+/**
+ * Netlify streaming functions freeze the isolate when the response ends.
+ * `waitUntil` keeps the Lambda awake until PutLogEvents finishes.
+ */
+function keepIsolateAlive(work) {
+    const g = globalThis;
+    try {
+        g.waitUntil?.(work);
+        g.Netlify?.waitUntil?.(work);
+    }
+    catch {
+        // Hosts without waitUntil still await in the request path.
+    }
+}
+function logConfigOnce() {
+    if (loggedConfigOnce)
+        return;
+    loggedConfigOnce = true;
+    const cfg = resolveCloudWatchConfig();
+    if (cfg.enabled) {
+        console.log(`[observability] CloudWatch enabled group=${cfg.logGroup} env=${cfg.appEnv} creds=${cfg.prefixLabel} region=${cfg.region}`);
+        return;
+    }
+    console.log(`[observability] CloudWatch disabled: ${cfg.skipReason}`);
+}
+/**
+ * Catch throws that happen after Remix already returned 200 (fire-and-forget
+ * async work). Remix `handleError` does not see those.
+ */
+export function installProcessErrorHandlers() {
+    if (processHandlersInstalled)
+        return;
+    if (typeof process === "undefined" || typeof process.on !== "function") {
+        return;
+    }
+    processHandlersInstalled = true;
+    const report = (source, reason) => {
+        const err = reason instanceof Error ? reason : new Error(String(reason));
+        void logError("server", {
+            message: err.message,
+            stack: err.stack,
+            source,
+        });
+    };
+    process.on("unhandledRejection", (reason) => {
+        report("unhandledRejection", reason);
+    });
+    process.on("uncaughtException", (err) => {
+        report("uncaughtException", err);
+    });
+}
 function resolveAwsCreds() {
     for (const c of AWS_CANDIDATES) {
         const region = envTrim(c.region);
@@ -201,9 +254,9 @@ async function fetchSequenceToken(cw, logGroup, stream) {
         const res = await cw.send(new DescribeLogStreamsCommand({
             logGroupName: logGroup,
             logStreamNamePrefix: stream,
-            limit: 1,
         }));
-        return res.logStreams?.[0]?.uploadSequenceToken;
+        const match = res.logStreams?.find((s) => s.logStreamName === stream);
+        return match?.uploadSequenceToken;
     }
     catch {
         return undefined;
@@ -350,6 +403,7 @@ async function emitToCloudWatch(origin, lines) {
  * For client/server also prints with `console.error` (Netlify fallback).
  */
 export async function logEvent(origin, payload) {
+    logConfigOnce();
     const line = buildLogLine(origin, {
         ...payload,
         appVersion: payload.appVersion ?? getDefaultAppVersion(),
@@ -360,7 +414,9 @@ export async function logEvent(origin, payload) {
     else {
         console.log(`[observability] ${line}`);
     }
-    return emitToCloudWatch(origin, [line]);
+    const pending = emitToCloudWatch(origin, [line]);
+    keepIsolateAlive(pending);
+    return pending;
 }
 /**
  * Sends an error event to CloudWatch (and console.error as fallback).

package/dist/esm/zauru/cloudwatch.server.js

@@ -4,5 +4,7 @@
  * Import from `@zauru-sdk/utils/cloudwatch.server` (not the main barrel) so
  * the AWS SDK stays out of the client bundle.
  */
-export { isCloudWatchEnabled, logError, logEvent, resolveCloudWatchConfig, withBackgroundLogs, } from "./cloudwatch-logger.server.js";
+import { installProcessErrorHandlers } from "./cloudwatch-logger.server.js";
+installProcessErrorHandlers();
+export { installProcessErrorHandlers, isCloudWatchEnabled, logError, logEvent, resolveCloudWatchConfig, withBackgroundLogs, } from "./cloudwatch-logger.server.js";
 export { createClientErrorsAction, handleError, } from "./cloudwatch-remix.server.js";

package/dist/esm/zauru/remix-entry.server.js

@@ -5,4 +5,6 @@
  * export { handleRequest as default, handleError } from "@zauru-sdk/utils/remix-entry.server";
  * ```
  */
+import { installProcessErrorHandlers } from "./cloudwatch-logger.server.js";
+installProcessErrorHandlers();
 export { handleRequest, handleError } from "./remix-handle-request.server.js";

package/dist/esm/zauru/remix-handle-request.server.js

@@ -3,6 +3,7 @@ import { PassThrough } from "node:stream";
 import { createReadableStreamFromReadable } from "@remix-run/node";
 import { RemixServer } from "@remix-run/react";
 import { renderToPipeableStream } from "react-dom/server";
+import { logError } from "./cloudwatch-logger.server.js";
 import { handleError } from "./cloudwatch-remix.server.js";
 const ABORT_DELAY = 5_000;
 const RemixServerComponent = RemixServer;
@@ -53,6 +54,14 @@ function handleBotRequest(request, responseStatusCode, responseHeaders, remixCon
                 responseStatusCode = 500;
                 if (shellRendered) {
                     console.error(error);
+                    const err = error instanceof Error ? error : new Error(String(error));
+                    void logError("server", {
+                        message: err.message,
+                        stack: err.stack,
+                        url: request.url,
+                        method: request.method,
+                        source: "ssr",
+                    });
                 }
             },
         });
@@ -85,6 +94,14 @@ function handleBrowserRequest(request, responseStatusCode, responseHeaders, remi
                 responseStatusCode = 500;
                 if (shellRendered) {
                     console.error(error);
+                    const err = error instanceof Error ? error : new Error(String(error));
+                    void logError("server", {
+                        message: err.message,
+                        stack: err.stack,
+                        url: request.url,
+                        method: request.method,
+                        source: "ssr",
+                    });
                 }
             },
         });

package/dist/zauru/cloudwatch-logger.server.d.ts

@@ -1,5 +1,10 @@
 export type LogOrigin = "client" | "server" | "background";
 export type LogLevel = "error" | "info" | "warn";
+/**
+ * Catch throws that happen after Remix already returned 200 (fire-and-forget
+ * async work). Remix `handleError` does not see those.
+ */
+export declare function installProcessErrorHandlers(): void;
 export type CloudWatchConfigInfo = {
     enabled: boolean;
     logGroup?: string;

package/dist/zauru/cloudwatch.server.d.ts

@@ -1,8 +1,2 @@
-/**
- * Server-only CloudWatch observability for Remix webapps.
- *
- * Import from `@zauru-sdk/utils/cloudwatch.server` (not the main barrel) so
- * the AWS SDK stays out of the client bundle.
- */
-export { isCloudWatchEnabled, logError, logEvent, resolveCloudWatchConfig, withBackgroundLogs, type CloudWatchConfigInfo, type LogErrorResult, type LogLevel, type LogOrigin, type LogPayload, } from "./cloudwatch-logger.server.js";
+export { installProcessErrorHandlers, isCloudWatchEnabled, logError, logEvent, resolveCloudWatchConfig, withBackgroundLogs, type CloudWatchConfigInfo, type LogErrorResult, type LogLevel, type LogOrigin, type LogPayload, } from "./cloudwatch-logger.server.js";
 export { createClientErrorsAction, handleError, } from "./cloudwatch-remix.server.js";

package/dist/zauru/remix-entry.server.d.ts

@@ -1,8 +1 @@
-/**
- * Remix 2 SSR entry + CloudWatch `handleError`.
- *
- * ```ts
- * export { handleRequest as default, handleError } from "@zauru-sdk/utils/remix-entry.server";
- * ```
- */
 export { handleRequest, handleError } from "./remix-handle-request.server.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zauru-sdk/utils",
-  "version": "6.28.0",
+  "version": "6.30.0",
   "description": "Utilidades, parseo de request y demás para desarrollo de webapps de Zauru",
   "main": "./dist/esm/index.js",
   "module": "./dist/esm/index.js",
@@ -71,12 +71,12 @@
   "dependencies": {
     "@aws-sdk/client-cloudwatch-logs": "^3.1123.0",
     "@remix-run/node": "^2.8.1",
-    "@zauru-sdk/common": "^6.13.0",
+    "@zauru-sdk/common": "^6.14.0",
     "@zauru-sdk/config": "^6.0.0",
     "@zauru-sdk/graphql": "^6.9.1",
-    "@zauru-sdk/services": "^6.16.0",
+    "@zauru-sdk/services": "^6.17.0",
     "@zauru-sdk/types": "^6.29.0",
     "moment": "^2.30.1"
   },
-  "gitHead": "671859beecfce09a1ccf138055a4de26a8c1f059"
+  "gitHead": "8e5cb991b0da7d1a5d70cd6275d7bfdc52ee1102"
 }