fix(server): support external logging

packages/server/src/api/routes/auth/callback.ts

@@ -10,8 +10,7 @@ const key = 'CALLBACK';
 export default async function route(request: Request, config: Config) {
   const { error } = Logger(
     { ...config, debug: config.debug } as Config,
-    '[ROUTES]',
-    `[${key}]`
+    `[ROUTES][${key}]`
   );
   const [provider] = new URL(request.url).pathname.split('/').reverse();
   const passThroughUrl = new URL(request.url);

packages/server/src/api/routes/me/index.ts

@@ -1,4 +1,3 @@
-import Logger from '../../../utils/Logger';
 import { Routes } from '../../types';
 import { apiRoutes } from '../../utils/routes/apiRoutes';
 import urlMatches from '../../utils/routes/urlMatches';
@@ -39,25 +38,18 @@ const key = 'ME';
 async function GET(
   url: string,
   init: RequestInit & { request: Request },
-  log: (...args: string[]) => void,
   config: Config
 ) {
-  log('[GET]', url);
   const res = await request(url, init, config);
   return res;
 }
 
 export default async function route(request: Request, config: Config) {
   const url = apiRoutes(config)[key];
-  const { info } = Logger(
-    { ...config, debug: config.debug } as Config,
-    '[ROUTES]',
-    `[${key}]`
-  );
 
   switch (request.method) {
     case 'GET':
-      return await GET(url, { request }, info, config);
+      return await GET(url, { request }, config);
 
     default:
       return new Response('method not allowed', { status: 405 });

packages/server/src/api/routes/tenants/GET.ts

@@ -34,14 +34,12 @@ import { apiRoutes } from '../../utils/routes/apiRoutes';
 export async function GET(
   config: Config,
   session: ActiveSession,
-  init: RequestInit & { request: Request },
-  log: (...args: string[]) => void
+  init: RequestInit & { request: Request }
 ) {
   let url = `${apiRoutes(config).USER_TENANTS(session.id)}`;
   if (typeof session === 'object' && 'user' in session && session.user) {
     url = `${apiRoutes(config).USER_TENANTS(session.user.id)}`;
   }
-  log('[GET]', url);
 
   const res = await request(url, init, config);
   return res;

packages/server/src/api/routes/tenants/POST.ts

@@ -45,13 +45,11 @@ import { apiRoutes } from '../../utils/routes/apiRoutes';
  */
 export async function POST(
   config: Config,
-  init: RequestInit & { request: Request },
-  log: (...args: string[]) => void
+  init: RequestInit & { request: Request }
 ) {
   init.body = init.request.body;
   init.method = 'POST';
   const url = `${apiRoutes(config).TENANTS}`;
-  log('[POST]', url);
 
   return await request(url, init, config);
 }

packages/server/src/api/routes/tenants/[tenantId]/DELETE.ts

@@ -34,8 +34,7 @@ import { apiRoutes } from '../../../utils/routes/apiRoutes';
  */
 export async function DELETE(
   config: Config,
-  init: RequestInit & { request: Request },
-  log: (...args: string[]) => void
+  init: RequestInit & { request: Request }
 ) {
   const yurl = new URL(init.request.url);
   const [tenantId] = yurl.pathname.split('/').reverse();
@@ -45,7 +44,6 @@ export async function DELETE(
 
   init.method = 'DELETE';
   const url = `${apiRoutes(config).TENANT(tenantId)}`;
-  log('[DELETE]', url);
 
   return await fetch(url, init, config);
 }

packages/server/src/api/routes/tenants/[tenantId]/GET.ts

@@ -1,5 +1,5 @@
 import { Config } from '../../../../utils/Config';
-import fetch from '../../../utils/request';
+import request from '../../../utils/request';
 import { apiRoutes } from '../../../utils/routes/apiRoutes';
 
 /**
@@ -38,17 +38,17 @@ import { apiRoutes } from '../../../utils/routes/apiRoutes';
 export async function GET(
   config: Config,
   init: RequestInit & { request: Request },
-  log: (...args: string[]) => void
+  log: (message: string | unknown, meta?: Record<string, unknown>) => void
 ) {
   const yurl = new URL(init.request.url);
   const [tenantId] = yurl.pathname.split('/').reverse();
   if (!tenantId) {
+    log('[GET] No tenant id provided.');
     return new Response(null, { status: 404 });
   }
 
   init.method = 'GET';
   const url = `${apiRoutes(config).TENANT(tenantId)}`;
-  log('[GET]', url);
 
-  return await fetch(url, init, config);
+  return await request(url, init, config);
 }

packages/server/src/api/routes/tenants/[tenantId]/PUT.ts

@@ -38,8 +38,7 @@ import { apiRoutes } from '../../../utils/routes/apiRoutes';
  */
 export async function PUT(
   config: Config,
-  init: RequestInit & { request: Request },
-  log: (...args: string[]) => void
+  init: RequestInit & { request: Request }
 ) {
   const yurl = new URL(init.request.url);
   const [tenantId] = yurl.pathname.split('/').reverse();
@@ -49,7 +48,6 @@ export async function PUT(
   init.body = init.request.body;
   init.method = 'PUT';
   const url = `${apiRoutes(config).TENANT(tenantId)}`;
-  log('[PUT]', url);
 
   return await fetch(url, init, config);
 }

packages/server/src/api/routes/tenants/[tenantId]/users/GET.ts

@@ -35,16 +35,11 @@ import request from '../../../../utils/request';
  */
 export async function GET(
   config: Config,
-  init: RequestInit & { request: Request },
-  log: (...args: string[]) => void
+  init: RequestInit & { request: Request }
 ) {
   const yurl = new URL(init.request.url);
   const [, tenantId] = yurl.pathname.split('/').reverse();
-  if (!tenantId) {
-    return new Response(null, { status: 404 });
-  }
 
   const url = `${apiRoutes(config).TENANT_USERS(tenantId)}`;
-  log('[GET]', '[TENANT_USERS]', url);
   return await request(url, init, config);
 }

packages/server/src/api/routes/tenants/[tenantId]/users/POST.ts

@@ -46,8 +46,7 @@ import { Config } from '../../../../../utils/Config';
 export async function POST(
   config: Config,
   session: ActiveSession,
-  init: RequestInit & { request: Request },
-  log: (...args: string[]) => void
+  init: RequestInit & { request: Request }
 ) {
   const yurl = new URL(init.request.url);
   const [, tenantId] = yurl.pathname.split('/').reverse();
@@ -56,7 +55,6 @@ export async function POST(
   init.body = JSON.stringify({ email: session.email });
   init.method = 'PUT';
   const url = apiRoutes(config).TENANT_USERS(tenantId);
-  log('[PUT]', url);
 
   return await fetch(url, init, config);
 }

packages/server/src/api/routes/tenants/[tenantId]/users/PUT.ts

@@ -29,18 +29,13 @@ import { Config } from '../../../../../utils/Config';
 
 export async function PUT(
   config: Config,
-  init: RequestInit & { request: Request },
-  log: (...args: string[]) => void
+  init: RequestInit & { request: Request }
 ) {
   const yurl = new URL(init.request.url);
   const [, tenantId] = yurl.pathname.split('/').reverse();
-  if (!tenantId) {
-    return new Response(null, { status: 404 });
-  }
 
   init.method = 'PUT';
   const url = `${apiRoutes(config).TENANT_USERS(tenantId)}`;
-  log('[PUT]', url);
 
   return await fetch(url, init, config);
 }

packages/server/src/api/routes/tenants/[tenantId]/users/[userId]/DELETE.ts

@@ -31,20 +31,15 @@ import { Config } from '../../../../../../utils/Config';
 
 export async function DELETE(
   config: Config,
-  init: RequestInit & { request: Request },
-  log: (...args: string[]) => void
+  init: RequestInit & { request: Request }
 ) {
   const yurl = new URL(init.request.url);
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const [userId, _, tenantId] = yurl.pathname.split('/').reverse();
-  if (!tenantId) {
-    return new Response(null, { status: 404 });
-  }
 
   init.method = 'DELETE';
   init.body = JSON.stringify({ email: userId });
   const url = `${apiRoutes(config).TENANT_USER(tenantId, userId)}`;
-  log('[DELETE]', url);
 
   return await fetch(url, init, config);
 }

packages/server/src/api/routes/tenants/[tenantId]/users/index.ts

@@ -14,25 +14,31 @@ const key = 'TENANT_USERS';
 export default async function route(request: Request, config: Config) {
   const { info } = Logger(
     { ...config, debug: config.debug } as Config,
-    '[ROUTES]',
-    `[${key}]`
+    `[ROUTES][${key}]`
   );
   const session = await auth(request, config);
 
   if (!session) {
     info('401');
     return new Response(null, { status: 401 });
   }
+  const yurl = new URL(request.url);
+  const [, tenantId] = yurl.pathname.split('/').reverse();
+
+  if (!tenantId) {
+    info('No tenant id found in path');
+    return new Response(null, { status: 404 });
+  }
 
   switch (request.method) {
     case 'GET':
-      return await GET(config, { request }, info);
+      return await GET(config, { request });
     case 'POST':
-      return await POST(config, session, { request }, info);
+      return await POST(config, session, { request });
     case 'PUT':
-      return await PUT(config, { request }, info);
+      return await PUT(config, { request });
     case 'DELETE':
-      return await DELETE(config, { request }, info);
+      return await DELETE(config, { request });
 
     default:
       return new Response('method not allowed', { status: 405 });

packages/server/src/api/routes/tenants/index.ts

@@ -26,8 +26,7 @@ const key = 'TENANTS';
 export default async function route(request: Request, config: Config) {
   const { info } = Logger(
     { ...config, debug: config.debug } as Config,
-    '[ROUTES]',
-    `[${key}]`
+    `[ROUTES][${key}]`
   );
   const session = await auth(request, config);
 
@@ -42,13 +41,13 @@ export default async function route(request: Request, config: Config) {
       if (isUUID(possibleTenantId)) {
         return await TENANT_GET(config, { request }, info);
       }
-      return await GET(config, session, { request }, info);
+      return await GET(config, session, { request });
     case 'POST':
-      return await POST(config, { request }, info);
+      return await POST(config, { request });
     case 'DELETE':
-      return await DELETE(config, { request }, info);
+      return await DELETE(config, { request });
     case 'PUT':
-      return await PUT(config, { request }, info);
+      return await PUT(config, { request });
 
     default:
       return new Response('method not allowed', { status: 405 });

packages/server/src/api/routes/users/GET.ts

@@ -37,18 +37,17 @@ import { Config } from '../../../utils/Config';
 export async function GET(
   config: Config,
   init: RequestInit & { request: Request },
-  log: (...args: string[]) => void
+  log: (message: string | unknown, meta?: Record<string, unknown>) => void
 ) {
   const yurl = new URL(init.request.url);
   const tenantId = yurl.searchParams.get('tenantId');
   const tenant = tenantId ?? getTenantFromHttp(init.request.headers);
 
   if (!tenant) {
-    log('[GET]', '[ERROR]', 'No tenant id provided.');
+    log('[GET] No tenant id provided.');
     return new Response(null, { status: 404 });
   }
   const url = apiRoutes(config).TENANT_USERS(tenant);
-  log('[GET]', url);
   init.method = 'GET';
   return await request(url, init, config);
 }

packages/server/src/api/routes/users/POST.ts

@@ -67,8 +67,7 @@ import { Config } from '../../../utils/Config';
 
 export async function POST(
   config: Config,
-  init: RequestInit & { request: Request },
-  log?: (...args: string[]) => void
+  init: RequestInit & { request: Request }
 ) {
   init.body = init.request.body;
   init.method = 'POST';
@@ -77,7 +76,6 @@ export async function POST(
   const tenant = tenantId ?? getTenantFromHttp(init.request.headers);
 
   const url = apiRoutes(config).USERS(tenant ? tenant : undefined);
-  log && log('[POST]', url);
 
   return await request(url, init, config);
 }

packages/server/src/api/routes/users/[userId]/PUT.ts

@@ -43,8 +43,7 @@ import { Config } from '../../../../utils/Config';
 export async function PUT(
   config: Config,
   session: void | ActiveSession,
-  init: RequestInit & { request: Request },
-  log: (...args: string[]) => void
+  init: RequestInit & { request: Request }
 ) {
   if (!session) {
     return new Response(null, { status: 401 });
@@ -58,7 +57,5 @@ export async function PUT(
 
   const url = apiRoutes(config).USER(userId);
 
-  log('[PUT]', url);
-
   return await fetch(url, init, config);
 }

packages/server/src/api/routes/users/index.ts

@@ -13,18 +13,17 @@ const key = 'USERS';
 export default async function route(request: Request, config: Config) {
   const { info } = Logger(
     { ...config, debug: config.debug } as Config,
-    '[ROUTES]',
-    `[${key}]`
+    `[ROUTES][${key}]`
   );
   const session = await auth(request, config);
 
   switch (request.method) {
     case 'GET':
       return await GET(config, { request }, info);
     case 'POST':
-      return await POST(config, { request }, info);
+      return await POST(config, { request });
     case 'PUT':
-      return await PUT(config, session, { request }, info);
+      return await PUT(config, session, { request });
 
     default:
       return new Response('method not allowed', { status: 405 });

packages/server/src/api/utils/auth.ts

@@ -23,7 +23,7 @@ export default async function auth(
   info('checking auth');
 
   const sessionUrl = `${config.api.basePath}/auth/session`;
-  info('using session', sessionUrl);
+  info(`using session${sessionUrl}`);
   // handle the pass through with posts
   req.headers.delete('content-length');
 

packages/server/src/api/utils/request.ts

@@ -20,15 +20,21 @@ export default async function request(
     params.duplex = 'half';
   }
 
-  info(`[${params.method ?? 'GET'}]`, url);
   const res = await fetch(url, { ...params }).catch((e) => {
-    error('An error has occurred in the fetch', e);
+    error('An error has occurred in the fetch', {
+      message: e.message,
+      stack: e.stack,
+    });
     return new Response(
       'An unexpected (most likely configuration) problem has occurred',
       { status: 500 }
     );
   });
   const loggingRes = typeof res?.clone === 'function' ? res?.clone() : null;
-  info('[Response]', res?.status, res?.statusText, await loggingRes?.text());
+  info(`[${params.method ?? 'GET'}] ${url}`, {
+    status: res?.status,
+    statusText: res?.statusText,
+    text: await loggingRes?.text(),
+  });
   return res;
 }