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

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 export { errors } from './lib/errors.js';
+export { CUSTOM_MAP_ID, DEFAULT_MAP_ID } from './lib/constants.js';
 export type { MapInfo, MapShareState, MapShareStateUpdate, DownloadStateUpdate, } from './types.js';
 export type { DownloadState } from './lib/download-request.js';
 export type { MapShareCreateParams, MapShareDeclineParams, } from './routes/map-shares.js';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAExC,YAAY,EACX,OAAO,EACP,aAAa,EACb,mBAAmB,EACnB,mBAAmB,GACnB,MAAM,YAAY,CAAA;AACnB,YAAY,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAC9D,YAAY,EACX,oBAAoB,EACpB,qBAAqB,GACrB,MAAM,wBAAwB,CAAA;AAC/B,YAAY,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AAEjE,MAAM,MAAM,aAAa,GAAG;IAC3B,qBAAqB,EAAE,MAAM,GAAG,GAAG,CAAA;IACnC,aAAa,EAAE,MAAM,GAAG,GAAG,CAAA;IAC3B,eAAe,EAAE,MAAM,GAAG,GAAG,CAAA;IAC7B,OAAO,CAAC,EAAE;QACT,SAAS,EAAE,UAAU,CAAA;QACrB,SAAS,EAAE,UAAU,CAAA;KACrB,CAAA;CACD,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAOD,wBAAgB,YAAY,CAAC,OAAO,EAAE,aAAa;kBA+C9B,aAAa;;;;;EA6BjC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AACxC,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAElE,YAAY,EACX,OAAO,EACP,aAAa,EACb,mBAAmB,EACnB,mBAAmB,GACnB,MAAM,YAAY,CAAA;AACnB,YAAY,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAC9D,YAAY,EACX,oBAAoB,EACpB,qBAAqB,GACrB,MAAM,wBAAwB,CAAA;AAC/B,YAAY,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AAEjE,MAAM,MAAM,aAAa,GAAG;IAC3B,qBAAqB,EAAE,MAAM,GAAG,GAAG,CAAA;IACnC,aAAa,EAAE,MAAM,GAAG,GAAG,CAAA;IAC3B,eAAe,EAAE,MAAM,GAAG,GAAG,CAAA;IAC7B,OAAO,CAAC,EAAE;QACT,SAAS,EAAE,UAAU,CAAA;QACrB,SAAS,EAAE,UAAU,CAAA;KACrB,CAAA;CACD,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAOD,wBAAgB,YAAY,CAAC,OAAO,EAAE,aAAa;kBA+C9B,aAAa;;;;;EA+BjC"}

package/dist/index.js

@@ -8,12 +8,13 @@ import { Context } from './context.js';
 import { fetchAPI } from './lib/fetch-api.js';
 import { RootRouter } from './routes/root.js';
 export { errors } from './lib/errors.js';
+export { CUSTOM_MAP_ID, DEFAULT_MAP_ID } from './lib/constants.js';
 export function createServer(options) {
     validateOptions(options);
     if (!options.keyPair) {
         options.keyPair = Agent.keyPair();
     }
-    const deferredListen = pDefer();
+    let deferredListen = pDefer();
     const context = new Context({
         ...options,
         keyPair: options.keyPair,
@@ -78,6 +79,8 @@ export function createServer(options) {
                 once(localHttpServer, 'close'),
                 once(secretStreamServer, 'close'),
             ]);
+            // Reset deferred listen for potential restart with different ports
+            deferredListen = pDefer();
         },
     };
 }

package/dist/lib/download-request.js

@@ -51,7 +51,7 @@ export class DownloadRequest extends TypedEventTarget {
             }
             else if (getErrorCode(error)) {
                 // Specific known error from the server
-                this.#updateState({ status: 'error', error });
+                this.#updateState({ status: 'error', error: jsonError(error) });
             }
             else {
                 // Once the download has started, the sender can only close the

package/dist/lib/map-share.js

@@ -1,5 +1,5 @@
 import { TypedEventTarget } from '../lib/event-target.js';
-import { errors } from './errors.js';
+import { errors, jsonError } from './errors.js';
 import { StateUpdateEvent } from './state-update-event.js';
 import { addTrailingSlash, generateId, getErrorCode } from './utils.js';
 /**
@@ -117,7 +117,7 @@ export class DownloadResponse extends TypedEventTarget {
                 this.#updateState({ status: 'aborted' });
             }
             else {
-                this.#updateState({ status: 'error', error });
+                this.#updateState({ status: 'error', error: jsonError(error) });
             }
         });
         this.#response = new Response(this.#stream.readable, {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@comapeo/map-server",
-	"version": "1.0.0-pre.3",
+	"version": "1.0.0-pre.4",
 	"type": "module",
 	"exports": {
 		".": {

package/src/index.ts

@@ -1,7 +1,7 @@
 import assert from 'node:assert'
 import { once } from 'node:events'
 import http from 'node:http'
-import { type AddressInfo } from 'node:net'
+import { type AddressInfo, type Socket } from 'node:net'
 
 import { createServerAdapter } from '@whatwg-node/server'
 import pDefer from 'p-defer'
@@ -16,6 +16,7 @@ import { RootRouter } from './routes/root.js'
 import type { FetchContext } from './types.js'
 
 export { errors } from './lib/errors.js'
+export { CUSTOM_MAP_ID, DEFAULT_MAP_ID } from './lib/constants.js'
 
 export type {
 	MapInfo,
@@ -56,7 +57,7 @@ export function createServer(options: ServerOptions) {
 		options.keyPair = Agent.keyPair()
 	}
 
-	const deferredListen = pDefer<ListenResult>()
+	let deferredListen = pDefer<ListenResult>()
 	const context = new Context({
 		...options,
 		keyPair: options.keyPair,
@@ -86,8 +87,8 @@ export function createServer(options: ServerOptions) {
 	})
 
 	// Track connections for proper cleanup
-	const connections = new Set<any>()
-	const onConnection = (socket: any) => {
+	const connections = new Set<Socket>()
+	const onConnection = (socket: Socket) => {
 		connections.add(socket)
 		socket.once('close', () => {
 			connections.delete(socket)
@@ -124,6 +125,8 @@ export function createServer(options: ServerOptions) {
 				once(localHttpServer, 'close'),
 				once(secretStreamServer, 'close'),
 			])
+			// Reset deferred listen for potential restart with different ports
+			deferredListen = pDefer<ListenResult>()
 		},
 	}
 }

package/src/lib/download-request.ts

@@ -67,7 +67,7 @@ export class DownloadRequest extends TypedEventTarget<
 					this.#updateState({ status: 'canceled' })
 				} else if (getErrorCode(error)) {
 					// Specific known error from the server
-					this.#updateState({ status: 'error', error })
+					this.#updateState({ status: 'error', error: jsonError(error) })
 				} else {
 					// Once the download has started, the sender can only close the
 					// connection to cancel the download, which we only see as an

package/src/lib/map-share.ts

@@ -5,7 +5,7 @@ import {
 	type DownloadStateUpdate,
 	type MapInfo,
 } from '../types.js'
-import { errors } from './errors.js'
+import { errors, jsonError } from './errors.js'
 import { StateUpdateEvent } from './state-update-event.js'
 import { addTrailingSlash, generateId, getErrorCode } from './utils.js'
 
@@ -155,7 +155,7 @@ export class DownloadResponse extends TypedEventTarget<
 				} else if (getErrorCode(error) === 'ECONNRESET') {
 					this.#updateState({ status: 'aborted' })
 				} else {
-					this.#updateState({ status: 'error', error })
+					this.#updateState({ status: 'error', error: jsonError(error) })
 				}
 			})