@sqrzro/server 2.0.0-bz.23 → 2.0.0-bz.25

package/dist/cache/CacheService.js

@@ -1,5 +1,8 @@
 import { createClient } from 'redis';
 let client = null;
+function isLocalhost(url) {
+    return url.includes('localhost') || url.includes('127.0.0.1');
+}
 async function getClient() {
     if (!process.env.REDIS_URL) {
         throw new Error('REDIS_URL is not defined. Access to the cache is not possible.');
@@ -9,7 +12,7 @@ async function getClient() {
     }
     client = createClient({
         socket: {
-            tls: true,
+            tls: !isLocalhost(process.env.REDIS_URL),
         },
         url: process.env.REDIS_URL,
     });

package/dist/database/DatabaseService.d.ts

@@ -1,6 +1,6 @@
 import type { PostgresJsDatabase } from 'drizzle-orm/postgres-js';
 declare global {
-    var db: ReturnType<typeof createSingleton> | undefined;
+    var szdb: ReturnType<typeof createSingleton> | undefined;
 }
 declare function createSingleton(): PostgresJsDatabase;
 export declare const db: PostgresJsDatabase;

package/dist/database/DatabaseService.js

@@ -6,7 +6,7 @@ function createSingleton() {
     }
     return drizzle(postgres(process.env.DATABASE_URL, { prepare: false }));
 }
-export const db = globalThis.db ?? createSingleton();
+export const db = globalThis.szdb ?? createSingleton();
 if (!process.env.VERCEL_ENV) {
-    globalThis.db = db;
+    globalThis.szdb = db;
 }

package/dist/forms/FormService.d.ts

@@ -1,5 +1,6 @@
-import type { Errorable } from '@sqrzro/interfaces';
+import type { SerializedErrorable } from '@sqrzro/interfaces';
 import type Joi from 'joi';
+import { NextResponse } from 'next/server';
 import ValidationError from './ValidationError';
 interface SubmitFormArgs<F extends object> {
     formData: F;
@@ -11,6 +12,7 @@ interface SubmitFormArgsWithFn<F extends object, M> extends Omit<SubmitFormArgs<
     fn: (data: F) => Promise<M | null>;
     onSuccess?: (model: M) => Promise<void> | void;
 }
-export declare function submitForm<F extends object>(args: SubmitFormArgs<F>): Promise<Errorable<F>>;
-export declare function submitForm<F extends object, M>(args: SubmitFormArgsWithFn<F, M>): Promise<Errorable<M>>;
+export declare function submitForm<F extends object>(args: SubmitFormArgs<F>): Promise<SerializedErrorable<F>>;
+export declare function submitForm<F extends object, M>(args: SubmitFormArgsWithFn<F, M>): Promise<SerializedErrorable<M>>;
+export declare function submitAPIRequest<F extends object, M>(args: SubmitFormArgsWithFn<F, M>): Promise<[M, null] | [null, NextResponse]>;
 export {};

package/dist/forms/FormService.js

@@ -1,4 +1,5 @@
 /* eslint-disable max-statements */
+import { NextResponse } from 'next/server';
 import ValidationError from './ValidationError';
 import { validateSchema } from './ValidationService';
 function serializeError(err) {
@@ -76,3 +77,22 @@ export async function submitForm(args) {
     }
     return [model, null];
 }
+export async function submitAPIRequest(args) {
+    const [response, error] = await submitForm(args);
+    if (error !== null) {
+        if (error.name === 'ValidationError') {
+            try {
+                const errors = JSON.parse(error.message);
+                return [null, NextResponse.json(errors, { status: 422 })];
+            }
+            catch (err) {
+                return [
+                    null,
+                    NextResponse.json({ message: 'An unknown error occured' }, { status: 500 }),
+                ];
+            }
+        }
+        return [null, NextResponse.json({ message: error.message }, { status: 500 })];
+    }
+    return [response, null];
+}

package/dist/middleware.js

@@ -2,6 +2,7 @@ import { NextResponse } from 'next/server';
 const DEFAULT_REDIRECT = '/auth/login';
 function applyHeaders(request, response) {
     response.headers.set('x-origin', request.nextUrl.origin);
+    response.headers.set('x-pathname', request.nextUrl.pathname);
     response.headers.set('x-search-params', request.nextUrl.searchParams.toString());
     return response;
 }
@@ -14,6 +15,10 @@ function redirect(request, pathname = DEFAULT_REDIRECT) {
     }
     return applyHeaders(request, NextResponse.redirect(`${request.nextUrl.origin}${pathname}?r=${encodeURIComponent(getRelativeUrl(request.nextUrl))}`));
 }
+/*
+ * When deployed to Vercel in a preview environment, we need to bypass the protection when fetching
+ * the session from the API.
+ */
 function bypassProtection() {
     const headers = new Headers();
     if (process.env.VERCEL_PROTECTION_BYPASS) {
@@ -22,26 +27,20 @@ function bypassProtection() {
     return { headers };
 }
 export async function handleMiddleware(request, nextFn) {
-    console.log('middleware', request.nextUrl.pathname);
     // If the URL is /api/session, we should just return the response, otherwise we end up in a loop
     if (request.nextUrl.pathname === '/api/session') {
-        console.log('URL is /api/session, returning');
         return applyHeaders(request, nextFn ? nextFn() : NextResponse.next());
     }
-    console.log('URL is not /api/session, continuing');
     const sessionID = request.cookies.get(process.env.AUTH_COOKIE_NAME || 'auth_session')?.value || '';
-    console.log(sessionID);
     try {
         const session = await fetch(`${request.nextUrl.origin}/api/session?id=${sessionID}&pathname=${request.nextUrl.pathname}`, bypassProtection());
         const json = (await session.json());
-        console.log('json', json);
         if (json.redirect === null) {
             return applyHeaders(request, nextFn ? nextFn() : NextResponse.next());
         }
         return redirect(request, json.redirect);
     }
     catch (err) {
-        console.log('error', err);
         return redirect(request);
     }
 }

package/dist/url/URLService.d.ts

@@ -15,6 +15,7 @@
  * @returns The origin of the current request.
  */
 export declare function getOrigin(): string;
+export declare function getPathname(): string;
 /**
  * Builds a URL from the current origin and a given pathname. For more information on how the origin
  * is determined, see the `getOrigin` function. This function then just concatenates the origin and
@@ -23,4 +24,8 @@ export declare function getOrigin(): string;
  * @param pathname
  * @returns The URL, with the origin and pathname combined.
  */
+export declare function makeURL(pathname?: string): string;
+/**
+ * @deprecated Use `makeURL` instead.
+ */
 export declare function getURL(pathname?: string): string;

package/dist/url/URLService.js

@@ -27,6 +27,13 @@ export function getOrigin() {
     }
     throw new Error('No origin could be determined');
 }
+export function getPathname() {
+    const pathname = headers().get('x-pathname');
+    if (pathname) {
+        return pathname;
+    }
+    throw new Error('No pathname could be determined. Please make sure middleware is being applied to the current request.');
+}
 /**
  * Builds a URL from the current origin and a given pathname. For more information on how the origin
  * is determined, see the `getOrigin` function. This function then just concatenates the origin and
@@ -35,7 +42,7 @@ export function getOrigin() {
  * @param pathname
  * @returns The URL, with the origin and pathname combined.
  */
-export function getURL(pathname) {
+export function makeURL(pathname) {
     const origin = getOrigin();
     if (!pathname) {
         return origin;
@@ -46,3 +53,9 @@ export function getURL(pathname) {
     const cleanURL = `${originWithoutProtocol}/${pathname}`.replace(/\/+/gu, '/');
     return `${protocol}${cleanURL}`;
 }
+/**
+ * @deprecated Use `makeURL` instead.
+ */
+export function getURL(pathname) {
+    return makeURL(pathname);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sqrzro/server",
-  "version": "2.0.0-bz.23",
+  "version": "2.0.0-bz.25",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "license": "ISC",