arcway 0.2.0 → 0.3.0

package/server/router/routes.js

@@ -46,8 +46,7 @@ function prefixRoutePattern(pattern, prefix) {
   if (pattern === '/') return normalized;
   return normalized + pattern;
 }
-async function discoverRoutes(apiDir, { prefix = '', plugin } = {}) {
-  const entries = await discoverModules(apiDir, { recursive: true, label: 'route file' });
+function buildRoutesFromModules(entries, { prefix = '', plugin } = {}) {
   const routes = [];
   for (const { filePath, relativePath, module } of entries) {
     const urlPattern = prefixRoutePattern(filePathToPattern(relativePath), prefix);
@@ -84,6 +83,11 @@ async function discoverRoutes(apiDir, { prefix = '', plugin } = {}) {
   sortBySpecificity(routes);
   return routes;
 }
+
+async function discoverRoutes(apiDir, { prefix = '', plugin } = {}) {
+  const entries = await discoverModules(apiDir, { recursive: true, label: 'route file' });
+  return buildRoutesFromModules(entries, { prefix, plugin });
+}
 function matchRoute(routes, method, pathname) {
   const upperMethod = method.toUpperCase();
   const methodRoutes = routes.filter((r) => r.method === upperMethod);
@@ -106,6 +110,7 @@ function matchRoutesByPath(routes, pathname) {
 }
 export {
   compilePattern,
+  buildRoutesFromModules,
   discoverRoutes,
   filePathToPattern,
   matchPattern,

package/server/system-jobs/index.js

@@ -1,5 +1,12 @@
+import { cleanupCallbacksJob } from '../callbacks/cleanup-job.js';
+
 const SYSTEM_JOB_DOMAIN = '__system';
 const systemJobRegistry = [
+  {
+    definition: cleanupCallbacksJob,
+    shouldRegister: (config) => Boolean(config.vault?.values?.callback && config.database),
+    description: 'Delete expired callback registrations',
+  },
   // Future system jobs are added here. Examples:
   //
   // {

package/server/system-routes/index.js

@@ -5,9 +5,11 @@ const SYSTEM_PREFIX = '/_system/api';
 class SystemRouter {
   routes = [];
   _healthDeps = null;
+  _callbackDispatcher = null;
 
-  constructor({ healthDeps } = {}) {
+  constructor({ healthDeps, callbackDispatcher } = {}) {
     this._healthDeps = healthDeps ?? null;
+    this._callbackDispatcher = callbackDispatcher ?? null;
   }
 
   register(route) {
@@ -23,6 +25,18 @@ class SystemRouter {
       return this._handleHealth(res);
     }
 
+    const pathname = url.split('?')[0];
+    if (
+      this._callbackDispatcher &&
+      (pathname === '/_system/callback' || pathname.startsWith('/_system/callback/'))
+    ) {
+      const fullPath = pathname;
+      const path = fullPath.slice('/_system/callback'.length) || '/';
+      const query = new URL(url, 'http://localhost').searchParams;
+      await this._callbackDispatcher.handle(req, res, { path, query, method });
+      return true;
+    }
+
     if (!url.startsWith(SYSTEM_PREFIX)) return false;
     const fullPath = url.split('?')[0];
     const routePath = fullPath.slice(SYSTEM_PREFIX.length) || '/';