arcway 0.4.11 → 0.4.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arcway",
-  "version": "0.4.11",
+  "version": "0.4.13",
   "description": "A convention-based framework for building modular monoliths with strict domain boundaries.",
   "license": "MIT",
   "type": "module",

package/server/files/drivers/s3.js

@@ -11,17 +11,53 @@ import {
   AbortMultipartUploadCommand,
 } from '@aws-sdk/client-s3';
 import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
+
+function publicEndpoint(endpoint) {
+  if (typeof endpoint !== 'string') {
+    throw new Error('files.s3.publicEndpoint must be an HTTPS origin');
+  }
+
+  let url;
+  try {
+    url = new URL(endpoint);
+  } catch {
+    throw new Error('files.s3.publicEndpoint must be an HTTPS origin');
+  }
+
+  if (
+    url.protocol !== 'https:' ||
+    url.username ||
+    url.password ||
+    url.pathname !== '/' ||
+    url.search ||
+    url.hash
+  ) {
+    throw new Error('files.s3.publicEndpoint must be an HTTPS origin');
+  }
+
+  return url.origin;
+}
+
 class S3FileDriver {
   client;
+  signingClient;
   bucket;
   constructor(config) {
     this.bucket = config.bucket;
-    this.client = new S3Client({
+    const clientConfig = {
       region: config.region ?? 'us-east-1',
       ...(config.endpoint ? { endpoint: config.endpoint } : {}),
       ...(config.forcePathStyle ? { forcePathStyle: true } : {}),
       ...(config.credentials ? { credentials: config.credentials } : {}),
-    });
+    };
+    this.client = new S3Client(clientConfig);
+    this.signingClient =
+      config.publicEndpoint === undefined
+        ? this.client
+        : new S3Client({
+            ...clientConfig,
+            endpoint: publicEndpoint(config.publicEndpoint),
+          });
   }
   async init() {}
 
@@ -158,7 +194,7 @@ class S3FileDriver {
     });
     return {
       method: 'PUT',
-      url: await getSignedUrl(this.client, command, {
+      url: await getSignedUrl(this.signingClient, command, {
         expiresIn,
         signableHeaders: new Set([
           'content-type',
@@ -188,7 +224,7 @@ class S3FileDriver {
           bytes: part.bytes,
           method: 'PUT',
           url: await getSignedUrl(
-            this.client,
+            this.signingClient,
             new UploadPartCommand({
               Bucket: this.bucket,
               Key: key,

package/server/pages/vite-dev.js

@@ -5,6 +5,7 @@ import reactPlugin from '@vitejs/plugin-react';
 import tailwindcss from '@tailwindcss/vite';
 import { createServer as createViteServer } from 'vite';
 import { patternToFileName } from './build-server.js';
+import { closeServer, createHttpServer, listen } from '../server.js';
 
 function toPosixPath(value) {
   return value.replace(/\\/g, '/');
@@ -203,44 +204,60 @@ function resolveAppAliases(rootDir) {
   return aliases;
 }
 
-function getViteServerOptions(config) {
+function getViteServerOptions(config, hmrServer) {
   const hmr = config?.pages?.vite?.hmr;
   return {
     middlewareMode: true,
-    ...(hmr ? { hmr } : {}),
+    ...(hmr ? { hmr: { ...hmr, ...(hmrServer ? { server: hmrServer } : {}) } } : {}),
   };
 }
 
+async function createViteHmrServer(log, { host = '0.0.0.0', port = 24678 } = {}) {
+  const server = createHttpServer((_req, res) => {
+    res.writeHead(426, { 'Content-Type': 'text/plain' });
+    res.end('Upgrade Required');
+  }, log);
+  await listen(server, port, host);
+  return server;
+}
+
 async function createViteDevRouter({ rootDir, log, config }) {
   const appAliases = resolveAppAliases(rootDir);
-  const vite = await createViteServer({
-    root: rootDir,
-    appType: 'custom',
-    server: getViteServerOptions(config),
-    resolve: {
-      alias: appAliases,
-      dedupe: ['react', 'react-dom', 'swr'],
-    },
-    css: {
-      devSourcemap: true,
-    },
-    esbuild: {
-      keepNames: true,
-    },
-    optimizeDeps: {
-      include: [
-        'react',
-        'react-dom',
-        'react/jsx-runtime',
-        'react/jsx-dev-runtime',
-        'swr',
-        'use-sync-external-store/shim',
-        '@radix-ui/react-use-is-hydrated',
-      ],
-    },
-    plugins: [reactPlugin(), tailwindcss()],
-    clearScreen: false,
-  });
+  const hmrServer = config?.pages?.vite?.hmr ? await createViteHmrServer(log) : null;
+  let vite;
+  try {
+    vite = await createViteServer({
+      root: rootDir,
+      appType: 'custom',
+      server: getViteServerOptions(config, hmrServer),
+      resolve: {
+        alias: appAliases,
+        dedupe: ['react', 'react-dom', 'swr'],
+      },
+      css: {
+        devSourcemap: true,
+      },
+      esbuild: {
+        keepNames: true,
+      },
+      optimizeDeps: {
+        include: [
+          'react',
+          'react-dom',
+          'react/jsx-runtime',
+          'react/jsx-dev-runtime',
+          'swr',
+          'use-sync-external-store/shim',
+          '@radix-ui/react-use-is-hydrated',
+        ],
+      },
+      plugins: [reactPlugin(), tailwindcss()],
+      clearScreen: false,
+    });
+  } catch (error) {
+    if (hmrServer) await closeServer(hmrServer);
+    throw error;
+  }
 
   const internalPrefixes = ['/@vite/', '/@id/', '/@react-refresh', '/@fs/', '/node_modules/.vite/'];
   const sourceExt = /\.(?:[cm]?[jt]sx?|css|pcss|postcss|json|svg)$/i;
@@ -270,7 +287,11 @@ async function createViteDevRouter({ rootDir, log, config }) {
     vite,
     handle,
     async close() {
-      await vite.close();
+      try {
+        await vite.close();
+      } finally {
+        if (hmrServer) await closeServer(hmrServer);
+      }
       log?.info?.('Vite dev server closed');
     },
   };
@@ -280,6 +301,7 @@ export {
   buildViteClientManifestJson,
   buildViteRoute,
   createViteDevRouter,
+  createViteHmrServer,
   getViteServerOptions,
   getViteEntryPath,
   getViteFontsPath,