@comapeo/map-server 1.0.0-pre.4 → 1.0.0-pre.6

package/dist/routes/root.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"root.d.ts","sourceRoot":"","sources":["../../src/routes/root.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAG5C,OAAO,KAAK,EAAgB,cAAc,EAAE,MAAM,aAAa,CAAA;AAS/D,wBAAgB,UAAU,CAAC,EAAE,IAAU,EAAE;;CAAA,EAAE,GAAG,EAAE,OAAO,GAAG,cAAc,CAsBvE"}
+{"version":3,"file":"root.d.ts","sourceRoot":"","sources":["../../src/routes/root.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAG5C,OAAO,KAAK,EAAgB,cAAc,EAAE,MAAM,aAAa,CAAA;AAoC/D,wBAAgB,UAAU,CAAC,EAAE,IAAU,EAAE;;CAAA,EAAE,GAAG,EAAE,OAAO,GAAG,cAAc,CAyBvE"}

package/dist/routes/root.js

@@ -1,4 +1,4 @@
-import { json, Router } from 'itty-router';
+import { cors, json, Router } from 'itty-router';
 import { error } from '../lib/errors.js';
 import { localhostOnly } from '../middlewares/localhost-only.js';
 import { DownloadsRouter } from './downloads.js';
@@ -7,15 +7,43 @@ import { MapsRouter } from './maps.js';
 const MAPS_BASE = '/maps/';
 const MAP_SHARES_BASE = '/mapShares/';
 const DOWNLOADS_BASE = '/downloads/';
+const { preflight } = cors({
+    origin: '*',
+    allowMethods: ['GET', 'POST', 'DELETE', 'OPTIONS'],
+    allowHeaders: ['Content-Type'],
+});
+/**
+ * Custom corsify that doesn't clone the response body.
+ * The built-in itty-router corsify uses response.clone() which breaks
+ * streaming response error handling (abort signals don't propagate correctly).
+ */
+function corsify(response) {
+    // Skip if CORS headers already present or if it's a WebSocket upgrade
+    if (response.headers.get('access-control-allow-origin') || response.status === 101) {
+        return response;
+    }
+    // Create new headers with CORS header added
+    const headers = new Headers(response.headers);
+    headers.set('access-control-allow-origin', '*');
+    // Return new Response with same body (not cloned) and updated headers
+    return new Response(response.body, {
+        status: response.status,
+        statusText: response.statusText,
+        headers,
+    });
+}
 export function RootRouter({ base = '/' }, ctx) {
     const router = Router({
         base,
+        // Handle CORS preflight OPTIONS requests
+        before: [preflight],
         // The `error` handler will send a response with the status code from any
         // thrown StatusError, or a 500 for any other errors.
         catch: (err) => error(err),
         // Sends a 404 response for any requests that don't match a route, and for
         // any request handlers that return JSON will send a JSON response.
-        finally: [(response) => response ?? error(404), json],
+        // corsify adds CORS headers to all responses.
+        finally: [(response) => response ?? error(404), json, corsify],
     });
     const mapsRouter = MapsRouter({ base: MAPS_BASE }, ctx);
     const downloadsRouter = DownloadsRouter({ base: DOWNLOADS_BASE }, ctx);

package/package.json

@@ -1,11 +1,19 @@
 {
 	"name": "@comapeo/map-server",
-	"version": "1.0.0-pre.4",
+	"version": "1.0.0-pre.6",
 	"type": "module",
 	"exports": {
 		".": {
 			"types": "./dist/index.d.ts",
 			"default": "./dist/index.js"
+		},
+		"./errors.js": {
+			"types": "./dist/lib/errors.d.ts",
+			"default": "./dist/lib/errors.js"
+		},
+		"./constants.js": {
+			"types": "./dist/lib/constants.d.ts",
+			"default": "./dist/lib/constants.js"
 		}
 	},
 	"scripts": {

package/src/routes/root.ts

@@ -1,4 +1,4 @@
-import { json, Router, type IRequestStrict } from 'itty-router'
+import { cors, json, Router, type IRequestStrict } from 'itty-router'
 
 import type { Context } from '../context.js'
 import { error } from '../lib/errors.js'
@@ -12,15 +12,45 @@ const MAPS_BASE = '/maps/'
 const MAP_SHARES_BASE = '/mapShares/'
 const DOWNLOADS_BASE = '/downloads/'
 
+const { preflight } = cors({
+	origin: '*',
+	allowMethods: ['GET', 'POST', 'DELETE', 'OPTIONS'],
+	allowHeaders: ['Content-Type'],
+})
+
+/**
+ * Custom corsify that doesn't clone the response body.
+ * The built-in itty-router corsify uses response.clone() which breaks
+ * streaming response error handling (abort signals don't propagate correctly).
+ */
+function corsify(response: Response): Response {
+	// Skip if CORS headers already present or if it's a WebSocket upgrade
+	if (response.headers.get('access-control-allow-origin') || response.status === 101) {
+		return response
+	}
+	// Create new headers with CORS header added
+	const headers = new Headers(response.headers)
+	headers.set('access-control-allow-origin', '*')
+	// Return new Response with same body (not cloned) and updated headers
+	return new Response(response.body, {
+		status: response.status,
+		statusText: response.statusText,
+		headers,
+	})
+}
+
 export function RootRouter({ base = '/' }, ctx: Context): RouterExternal {
 	const router = Router<IRequestStrict, [FetchContext]>({
 		base,
+		// Handle CORS preflight OPTIONS requests
+		before: [preflight],
 		// The `error` handler will send a response with the status code from any
 		// thrown StatusError, or a 500 for any other errors.
 		catch: (err) => error(err),
 		// Sends a 404 response for any requests that don't match a route, and for
 		// any request handlers that return JSON will send a JSON response.
-		finally: [(response) => response ?? error(404), json],
+		// corsify adds CORS headers to all responses.
+		finally: [(response) => response ?? error(404), json, corsify],
 	})
 
 	const mapsRouter = MapsRouter({ base: MAPS_BASE }, ctx)