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

package/README.md

@@ -264,7 +264,7 @@ Content-Type: application/json
 
 {
   "mapId": "custom",
-  "receiverDeviceId": "kmx8sejfn..." // z32-encoded public key
+  "receiverDeviceId": "a1b2c3d4..." // hex-encoded public key
 }
 ```
 
@@ -326,7 +326,7 @@ POST /downloads
 Content-Type: application/json
 
 {
-  "senderDeviceId": "z32-encoded-public-key",
+  "senderDeviceId": "a1b2c3d4e5f6...",
   "shareId": "abc123...",
   "mapShareUrls": ["http://192.168.1.100:9090/mapShares/abc123..."],
   "estimatedSizeBytes": 12345678
@@ -370,7 +370,7 @@ POST /mapShares/{shareId}/decline
 Content-Type: application/json
 
 {
-  "senderDeviceId": "z32-encoded-public-key",
+  "senderDeviceId": "a1b2c3d4e5f6...",
   "mapShareUrls": ["http://192.168.1.100:9090/mapShares/abc123..."],
   "reason": "disk_full" | "user_rejected" | "other reason"
 }
@@ -385,7 +385,6 @@ Called on the receiver's local server. The server handles making the P2P request
 ```javascript
 import { createServer } from '@comapeo/map-server'
 import Hypercore from 'hypercore'
-import z32 from 'z32'
 
 const deviceAKeyPair = Hypercore.keyPair()
 const serverA = createServer({
@@ -398,7 +397,7 @@ const serverA = createServer({
 const { localPort } = await serverA.listen()
 
 // Device B's public key (exchanged via your discovery mechanism)
-const deviceBId = 'kmx8sejfn...' // z32-encoded
+const deviceBId = 'a1b2c3d4e5f6...' // hex-encoded
 
 // Create share
 const res = await fetch(`http://127.0.0.1:${localPort}/mapShares`, {
@@ -559,7 +558,7 @@ All error responses follow this format:
 | `DOWNLOAD_SHARE_DECLINED`    | 409    | Cannot download a share that was declined                  |
 | `DOWNLOAD_SHARE_NOT_PENDING` | 409    | Cannot download a share that is not pending                |
 | `ABORT_NOT_DOWNLOADING`      | 409    | Cannot abort a download that is not in progress            |
-| `INVALID_SENDER_DEVICE_ID`   | 400    | The sender device ID is not a valid z32-encoded public key |
+| `INVALID_SENDER_DEVICE_ID`   | 400    | The sender device ID is not a valid hex-encoded public key |
 
 ### Generic Errors
 

package/dist/context.d.ts

@@ -20,7 +20,7 @@ export declare class Context {
         maxzoom: number;
         minzoom: number;
         estimatedSizeBytes: number;
-        mapCreated: number;
+        mapCreatedAt: number;
     }>;
     getReader(mapId: string): Promise<Reader>;
     createMapReadableStream(mapId: string): ReadableStream<Uint8Array>;

package/dist/context.js

@@ -64,7 +64,7 @@ export class Context {
             maxzoom: getStyleMaxZoom(style),
             minzoom: getStyleMinZoom(style),
             estimatedSizeBytes: stats.size,
-            mapCreated: stats.ctimeMs,
+            mapCreatedAt: stats.ctimeMs,
         };
     }
     getReader(mapId) {

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+export { errors } from './lib/errors.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":"AAkBA,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;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"}

package/dist/index.js

@@ -4,10 +4,10 @@ import http from 'node:http';
 import { createServerAdapter } from '@whatwg-node/server';
 import pDefer from 'p-defer';
 import { Agent, createServer as createSecretStreamServer, } from 'secret-stream-http';
-import z32 from 'z32';
 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 function createServer(options) {
     validateOptions(options);
     if (!options.keyPair) {
@@ -34,7 +34,7 @@ export function createServer(options) {
         serverAdapter(req, res, {
             isLocalhost: false,
             // @ts-expect-error - the types for this are too hard and making them work would not add any type safety.
-            remoteDeviceId: z32.encode(req.socket.remotePublicKey),
+            remoteDeviceId: Buffer.from(req.socket.remotePublicKey).toString('hex'),
         });
     });
     const secretStreamServer = createSecretStreamServer(remoteHttpServer, {

package/dist/lib/download-request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"download-request.d.ts","sourceRoot":"","sources":["../../src/lib/download-request.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAClE,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,aAAa,CAAA;AAItD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAG1D,MAAM,MAAM,aAAa,GAAG,mBAAmB,GAC9C,IAAI,CAAC,oBAAoB,EAAE,cAAc,CAAC,GAAG;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,CAAA;AAEpE,qBAAa,eAAgB,SAAQ,gBAAgB,CACpD,YAAY,CAAC,OAAO,gBAAgB,CAAC,mBAAmB,CAAC,CAAC,CAC1D;;gBAkBC,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC,EAClC,EAAE,YAAY,EAAE,GAAG,IAAI,EAAE,EAAE,oBAAoB,EAC/C,OAAO,EAAE;QAAE,SAAS,EAAE,UAAU,CAAC;QAAC,SAAS,EAAE,UAAU,CAAA;KAAE;IA4F1D,IAAI,KAAK,kBAER;IAED,MAAM;CAQN"}
+{"version":3,"file":"download-request.d.ts","sourceRoot":"","sources":["../../src/lib/download-request.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAClE,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,aAAa,CAAA;AAItD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAG1D,MAAM,MAAM,aAAa,GAAG,mBAAmB,GAC9C,IAAI,CAAC,oBAAoB,EAAE,cAAc,CAAC,GAAG;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,CAAA;AAEpE,qBAAa,eAAgB,SAAQ,gBAAgB,CACpD,YAAY,CAAC,OAAO,gBAAgB,CAAC,mBAAmB,CAAC,CAAC,CAC1D;;gBAkBC,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC,EAClC,EAAE,YAAY,EAAE,GAAG,IAAI,EAAE,EAAE,oBAAoB,EAC/C,OAAO,EAAE;QAAE,SAAS,EAAE,UAAU,CAAC;QAAC,SAAS,EAAE,UAAU,CAAA;KAAE;IA4F1D,IAAI,KAAK,kBAER;IAED,MAAM;CAQN"}

package/dist/lib/download-request.js

@@ -1,5 +1,4 @@
 import { Agent as SecretStreamAgent } from 'secret-stream-http';
-import z32 from 'z32';
 import { TypedEventTarget } from '../lib/event-target.js';
 import { StatusError } from './errors.js';
 import { errors, jsonError } from './errors.js';
@@ -32,7 +31,7 @@ export class DownloadRequest extends TypedEventTarget {
         };
         let remotePublicKey;
         try {
-            remotePublicKey = z32.decode(this.#state.senderDeviceId);
+            remotePublicKey = Buffer.from(this.#state.senderDeviceId, 'hex');
         }
         catch {
             throw new errors.INVALID_SENDER_DEVICE_ID(`Invalid sender device ID: ${this.#state.senderDeviceId}`);
@@ -81,7 +80,7 @@ export class DownloadRequest extends TypedEventTarget {
         });
     }
     async #start({ mapShareUrls, stream, }) {
-        const downloadUrls = mapShareUrls.map((baseUrl) => new URL('download', addTrailingSlash(baseUrl)));
+        const downloadUrls = mapShareUrls.map((baseUrl) => new URL('download', addTrailingSlash(baseUrl))); // grrrr TS
         const response = await secretStreamFetch(downloadUrls, {
             dispatcher: this.#dispatcher,
         });

package/dist/lib/map-share.d.ts

@@ -7,7 +7,7 @@ export type MapShareOptions = MapInfo & {
      * are supported because the server might have multiple network interfaces
      * with different IP addresses
      */
-    baseUrls: string[];
+    baseUrls: readonly [string, ...string[]];
     /** The device ID of the receiver */
     receiverDeviceId: string;
 };

package/dist/lib/map-share.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"map-share.d.ts","sourceRoot":"","sources":["../../src/lib/map-share.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EACN,aAAa,EACb,KAAK,mBAAmB,EACxB,KAAK,mBAAmB,EACxB,KAAK,OAAO,EACZ,MAAM,aAAa,CAAA;AAEpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAG1D,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG;IACvC;;;;OAIG;IACH,QAAQ,EAAE,MAAM,EAAE,CAAA;IAClB,oCAAoC;IACpC,gBAAgB,EAAE,MAAM,CAAA;CACxB,CAAA;AAED;;GAEG;AACH,qBAAa,QAAS,SAAQ,gBAAgB,CAC7C,YAAY,CAAC,OAAO,gBAAgB,CAAC,CACrC;;gBAGY,EAAE,QAAQ,EAAE,gBAAgB,EAAE,GAAG,OAAO,EAAE,EAAE,eAAe;IAevE,IAAI,OAAO,WAEV;IAED,IAAI,KAAK,kBAER;IAED;;OAEG;IACH,gBAAgB,CAAC,QAAQ,EAAE,cAAc,GAAG,QAAQ;IAkBpD;;OAEG;IACH,OAAO,CACN,MAAM,EAAE,OAAO,CAAC,mBAAmB,EAAE;QAAE,MAAM,EAAE,UAAU,CAAA;KAAE,CAAC,CAAC,QAAQ,CAAC;IAUvE;;OAEG;IACH,MAAM;CAiBN;AAED;;;;;;;GAOG;AACH,qBAAa,gBAAiB,SAAQ,gBAAgB,CACrD,YAAY,CAAC,OAAO,gBAAgB,CAAC,mBAAmB,CAAC,CAAC,CAC1D;;gBAOY,QAAQ,EAAE,cAAc,CAAC,UAAU,CAAC;IAyChD,IAAI,QAAQ,aAEX;IAED,IAAI,KAAK,wBAER;IAED,MAAM;CAQN"}
+{"version":3,"file":"map-share.d.ts","sourceRoot":"","sources":["../../src/lib/map-share.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EACN,aAAa,EACb,KAAK,mBAAmB,EACxB,KAAK,mBAAmB,EACxB,KAAK,OAAO,EACZ,MAAM,aAAa,CAAA;AAEpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAG1D,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG;IACvC;;;;OAIG;IACH,QAAQ,EAAE,SAAS,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,CAAA;IACxC,oCAAoC;IACpC,gBAAgB,EAAE,MAAM,CAAA;CACxB,CAAA;AAED;;GAEG;AACH,qBAAa,QAAS,SAAQ,gBAAgB,CAC7C,YAAY,CAAC,OAAO,gBAAgB,CAAC,CACrC;;gBAGY,EAAE,QAAQ,EAAE,gBAAgB,EAAE,GAAG,OAAO,EAAE,EAAE,eAAe;IAevE,IAAI,OAAO,WAEV;IAED,IAAI,KAAK,kBAER;IAED;;OAEG;IACH,gBAAgB,CAAC,QAAQ,EAAE,cAAc,GAAG,QAAQ;IAkBpD;;OAEG;IACH,OAAO,CACN,MAAM,EAAE,OAAO,CAAC,mBAAmB,EAAE;QAAE,MAAM,EAAE,UAAU,CAAA;KAAE,CAAC,CAAC,QAAQ,CAAC;IAUvE;;OAEG;IACH,MAAM;CAiBN;AAED;;;;;;;GAOG;AACH,qBAAa,gBAAiB,SAAQ,gBAAgB,CACrD,YAAY,CAAC,OAAO,gBAAgB,CAAC,mBAAmB,CAAC,CAAC,CAC1D;;gBAOY,QAAQ,EAAE,cAAc,CAAC,UAAU,CAAC;IAyChD,IAAI,QAAQ,aAEX;IAED,IAAI,KAAK,wBAER;IAED,MAAM;CAQN"}

package/dist/lib/map-share.js

@@ -14,9 +14,9 @@ export class MapShare extends TypedEventTarget {
         this.#state = {
             ...mapInfo,
             shareId,
-            mapShareUrls: baseUrls.map((baseUrl) => new URL(`${shareId}`, addTrailingSlash(baseUrl)).href),
+            mapShareUrls: baseUrls.map((baseUrl) => new URL(`${shareId}`, addTrailingSlash(baseUrl)).href), // grrrr TS
             receiverDeviceId,
-            mapShareCreated: Date.now(),
+            mapShareCreatedAt: Date.now(),
             status: 'pending',
         };
     }

package/dist/lib/secret-stream-fetch.d.ts

@@ -3,5 +3,5 @@ import { fetch as secretStreamFetchOrig } from 'secret-stream-http';
  * A wrapper around secret-stream-http's fetch that tries multiple URLs until one works.
  * This is useful when the server has multiple IPs for different network interfaces.
  */
-export declare function secretStreamFetch(urls: string | URL | Array<string | URL>, options: Parameters<typeof secretStreamFetchOrig>[1]): Promise<Response>;
+export declare function secretStreamFetch(urls: string | URL | readonly [string | URL, ...Array<string | URL>], options: Parameters<typeof secretStreamFetchOrig>[1]): Promise<Response>;
 //# sourceMappingURL=secret-stream-fetch.d.ts.map

package/dist/lib/secret-stream-fetch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"secret-stream-fetch.d.ts","sourceRoot":"","sources":["../../src/lib/secret-stream-fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,qBAAqB,EAAE,MAAM,oBAAoB,CAAA;AAInE;;;GAGG;AACH,wBAAsB,iBAAiB,CACtC,IAAI,EAAE,MAAM,GAAG,GAAG,GAAG,KAAK,CAAC,MAAM,GAAG,GAAG,CAAC,EACxC,OAAO,EAAE,UAAU,CAAC,OAAO,qBAAqB,CAAC,CAAC,CAAC,CAAC,qBA+BpD"}
+{"version":3,"file":"secret-stream-fetch.d.ts","sourceRoot":"","sources":["../../src/lib/secret-stream-fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,qBAAqB,EAAE,MAAM,oBAAoB,CAAA;AAKnE;;;GAGG;AACH,wBAAsB,iBAAiB,CACtC,IAAI,EAAE,MAAM,GAAG,GAAG,GAAG,SAAS,CAAC,MAAM,GAAG,GAAG,EAAE,GAAG,KAAK,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,EACpE,OAAO,EAAE,UAAU,CAAC,OAAO,qBAAqB,CAAC,CAAC,CAAC,CAAC,qBA+BpD"}

package/dist/lib/secret-stream-fetch.js

@@ -1,11 +1,12 @@
 import { fetch as secretStreamFetchOrig } from 'secret-stream-http';
 import { errors } from './errors.js';
+import { isArrayReadonly } from './utils.js';
 /**
  * A wrapper around secret-stream-http's fetch that tries multiple URLs until one works.
  * This is useful when the server has multiple IPs for different network interfaces.
  */
 export async function secretStreamFetch(urls, options) {
-    if (!Array.isArray(urls)) {
+    if (!isArrayReadonly(urls)) {
         urls = [urls];
     }
     let response;

package/dist/lib/utils.d.ts

@@ -29,4 +29,5 @@ export declare function getStyleBbox(style: SMPStyle): BBox;
 export declare function getStyleMaxZoom(style: SMPStyle): number;
 export declare function getStyleMinZoom(style: SMPStyle): number;
 export declare function addTrailingSlash(url: string): string;
+export declare function isArrayReadonly<T, U>(value: U | readonly T[]): value is readonly T[];
 //# sourceMappingURL=utils.d.ts.map

package/dist/lib/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/lib/utils.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAGlD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAEvC;;;;;;;;;;;;GAYG;AACH,wBAAgB,YAAY,CAAC,UAAU,EAAE,OAAO,sBAS/C;AAED,wBAAgB,IAAI,SAAK;AAEzB,wBAAgB,UAAU,WAEzB;AAED,wBAAgB,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,CAMrE;AAED,wBAAgB,eAAe,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAO7D;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,GAAG,IAAI,EAAE,CAAC,GAAG,IAAI,CAUzD;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI,CAUlD;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,CAOvD;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,CAOvD;AAMD,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEpD"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/lib/utils.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAElD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAEvC;;;;;;;;;;;;GAYG;AACH,wBAAgB,YAAY,CAAC,UAAU,EAAE,OAAO,sBAS/C;AAED,wBAAgB,IAAI,SAAK;AAEzB,wBAAgB,UAAU,WAEzB;AAED,wBAAgB,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,CAMrE;AAED,wBAAgB,eAAe,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAO7D;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,GAAG,IAAI,EAAE,CAAC,GAAG,IAAI,CAUzD;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI,CAUlD;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,CAOvD;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,CAOvD;AAMD,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEpD;AAID,wBAAgB,eAAe,CAAC,CAAC,EAAE,CAAC,EACnC,KAAK,EAAE,CAAC,GAAG,SAAS,CAAC,EAAE,GACrB,KAAK,IAAI,SAAS,CAAC,EAAE,CAEvB"}

package/dist/lib/utils.js

@@ -1,6 +1,5 @@
 import crypto from 'node:crypto';
 import { randomBytes } from 'crypto';
-import z32 from 'z32';
 /**
  * If the argument is an `Error` instance, return its `code` property if it is a string.
  * Otherwise, returns `undefined`.
@@ -24,7 +23,7 @@ export function getErrorCode(maybeError) {
 }
 export function noop() { }
 export function generateId() {
-    return z32.encode(randomBytes(8));
+    return randomBytes(8).toString('hex');
 }
 export function getOrInsert(map, key, value) {
     if (map.has(key)) {
@@ -94,3 +93,8 @@ function isNonEmptyArray(arr) {
 export function addTrailingSlash(url) {
     return url.endsWith('/') ? url : url + '/';
 }
+// Typescript's Array.isArray definition does not work as a type guard for
+// readonly arrays, so we need to define our own type guard for that
+export function isArrayReadonly(value) {
+    return Array.isArray(value);
+}

package/dist/routes/downloads.d.ts

@@ -3,7 +3,7 @@ import type { Context } from '../context.js';
 import { type RouterExternal } from '../types.js';
 declare const DownloadCreateRequest: T.TObject<{
     senderDeviceId: T.TString;
-    mapShareUrls: T.TArray<T.TString>;
+    mapShareUrls: T.TUnsafe<readonly [string, ...string[]]>;
     shareId: T.TString;
     estimatedSizeBytes: T.TNumber;
 }>;

package/dist/routes/map-shares.d.ts

@@ -8,7 +8,7 @@ declare const MapShareCreateRequest: T.TObject<{
 export type MapShareCreateParams = Static<typeof MapShareCreateRequest>;
 declare const LocalMapShareDeclineRequest: T.TObject<{
     reason: T.TUnion<[T.TLiteral<"disk_full">, T.TLiteral<"user_rejected">, T.TString]>;
-    mapShareUrls: T.TArray<T.TString>;
+    mapShareUrls: T.TUnsafe<readonly [string, ...string[]]>;
     senderDeviceId: T.TString;
 }>;
 export type MapShareDeclineParams = Static<typeof LocalMapShareDeclineRequest>;

package/dist/routes/map-shares.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"map-shares.d.ts","sourceRoot":"","sources":["../../src/routes/map-shares.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,IAAI,IAAI,CAAC,EAAE,KAAK,MAAM,EAAE,MAAM,SAAS,CAAA;AAIhD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAQ5C,OAAO,EAKN,KAAK,cAAc,EACnB,MAAM,aAAa,CAAA;AAEpB,QAAA,MAAM,qBAAqB;;;EAGzB,CAAA;AAEF,MAAM,MAAM,oBAAoB,GAAG,MAAM,CAAC,OAAO,qBAAqB,CAAC,CAAA;AAEvE,QAAA,MAAM,2BAA2B;;;;EAO/B,CAAA;AAEF,MAAM,MAAM,qBAAqB,GAAG,MAAM,CAAC,OAAO,2BAA2B,CAAC,CAAA;AAW9E,wBAAgB,eAAe,CAC9B,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,EAC1B,GAAG,EAAE,OAAO,GACV,cAAc,CAuKhB"}
+{"version":3,"file":"map-shares.d.ts","sourceRoot":"","sources":["../../src/routes/map-shares.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,IAAI,IAAI,CAAC,EAAE,KAAK,MAAM,EAAE,MAAM,SAAS,CAAA;AAGhD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAQ5C,OAAO,EAKN,KAAK,cAAc,EACnB,MAAM,aAAa,CAAA;AAEpB,QAAA,MAAM,qBAAqB;;;EAGzB,CAAA;AAEF,MAAM,MAAM,oBAAoB,GAAG,MAAM,CAAC,OAAO,qBAAqB,CAAC,CAAA;AAEvE,QAAA,MAAM,2BAA2B;;;;EAO/B,CAAA;AAEF,MAAM,MAAM,qBAAqB,GAAG,MAAM,CAAC,OAAO,2BAA2B,CAAC,CAAA;AAW9E,wBAAgB,eAAe,CAC9B,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,EAC1B,GAAG,EAAE,OAAO,GACV,cAAc,CAuKhB"}

package/dist/routes/map-shares.js

@@ -3,7 +3,6 @@ import { IttyRouter } from 'itty-router';
 import { fetch as secretStreamFetch, Agent as SecretStreamAgent, } from 'secret-stream-http';
 import { Type as T } from 'typebox';
 import { Compile } from 'typebox/compile';
-import z32 from 'z32';
 import { errors, StatusError } from '../lib/errors.js';
 import { createEventStreamResponse } from '../lib/event-stream-response.js';
 import { MapShare } from '../lib/map-share.js';
@@ -100,7 +99,7 @@ export function MapSharesRouter({ base }, ctx) {
             throw new errors.INVALID_REQUEST();
         }
         const { senderDeviceId, mapShareUrls, reason } = parsedBody;
-        const remotePublicKey = z32.decode(senderDeviceId);
+        const remotePublicKey = Buffer.from(senderDeviceId, 'hex');
         const keyPair = ctx.getKeyPair();
         let response;
         // The sharer could have multiple IPs for different network interfaces, and
@@ -188,5 +187,11 @@ function getRemoteBaseUrls(requestUrl, remotePort) {
             }
         }
     }
+    if (!arrayAtLeastOne(baseUrls)) {
+        throw new Error('No non-internal IPv4 addresses found');
+    }
     return baseUrls;
 }
+function arrayAtLeastOne(arr) {
+    return arr.length >= 1;
+}

package/dist/routes/maps.js

@@ -14,7 +14,7 @@ export function MapsRouter({ base = '/' }, ctx) {
     router.get(`/:mapId/info`, async (request) => {
         const info = await ctx.getMapInfo(request.params.mapId);
         return {
-            created: info.mapCreated,
+            created: info.mapCreatedAt,
             size: info.estimatedSizeBytes,
             name: info.mapName,
         };

package/dist/types.d.ts

@@ -27,7 +27,7 @@ export type MapShareStatus = Static<typeof MapShareStateUpdate>['status'];
 export type DownloadStateUpdate = Extract<MapShareStateUpdate, {
     status: 'downloading' | 'completed' | 'error' | 'canceled' | 'aborted';
 }>;
-export declare const MapShareUrls: T.TArray<T.TString>;
+export declare const MapShareUrls: T.TUnsafe<readonly [string, ...string[]]>;
 export declare const ShareId: T.TString;
 export type ShareId = Static<typeof ShareId>;
 export declare const EstimatedSizeBytes: T.TNumber;
@@ -38,13 +38,13 @@ declare const MapInfo: T.TObject<{
     bounds: T.TImmutable<T.TTuple<[T.TNumber, T.TNumber, T.TNumber, T.TNumber]>>;
     minzoom: T.TNumber;
     maxzoom: T.TNumber;
-    mapCreated: T.TNumber;
+    mapCreatedAt: T.TNumber;
 }>;
 declare const MapShareBase: T.TIntersect<[T.TObject<{
     receiverDeviceId: T.TString;
     shareId: T.TString;
-    mapShareUrls: T.TArray<T.TString>;
-    mapShareCreated: T.TNumber;
+    mapShareUrls: T.TUnsafe<readonly [string, ...string[]]>;
+    mapShareCreatedAt: T.TNumber;
 }>, T.TObject<{
     mapId: T.TString;
     mapName: T.TString;
@@ -52,13 +52,13 @@ declare const MapShareBase: T.TIntersect<[T.TObject<{
     bounds: T.TImmutable<T.TTuple<[T.TNumber, T.TNumber, T.TNumber, T.TNumber]>>;
     minzoom: T.TNumber;
     maxzoom: T.TNumber;
-    mapCreated: T.TNumber;
+    mapCreatedAt: T.TNumber;
 }>]>;
 export declare const MapShareState: T.TIntersect<[T.TIntersect<[T.TObject<{
     receiverDeviceId: T.TString;
     shareId: T.TString;
-    mapShareUrls: T.TArray<T.TString>;
-    mapShareCreated: T.TNumber;
+    mapShareUrls: T.TUnsafe<readonly [string, ...string[]]>;
+    mapShareCreatedAt: T.TNumber;
 }>, T.TObject<{
     mapId: T.TString;
     mapName: T.TString;
@@ -66,7 +66,7 @@ export declare const MapShareState: T.TIntersect<[T.TIntersect<[T.TObject<{
     bounds: T.TImmutable<T.TTuple<[T.TNumber, T.TNumber, T.TNumber, T.TNumber]>>;
     minzoom: T.TNumber;
     maxzoom: T.TNumber;
-    mapCreated: T.TNumber;
+    mapCreatedAt: T.TNumber;
 }>]>, T.TUnion<[T.TObject<{
     status: T.TLiteral<"pending">;
 }>, T.TObject<{

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAC9C,OAAO,EAAE,IAAI,IAAI,CAAC,EAAE,KAAK,MAAM,EAAE,MAAM,SAAS,CAAA;AAEhD,eAAO,MAAM,qBAAqB,6EAYhC,CAAA;AAEF,QAAA,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;IAgDvB,CAAA;AAEF,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,OAAO,mBAAmB,CAAC,CAAA;AACpE,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,mBAAmB,CAAC,CAAC,QAAQ,CAAC,CAAA;AAEzE,MAAM,MAAM,mBAAmB,GAAG,OAAO,CACxC,mBAAmB,EACnB;IAAE,MAAM,EAAE,aAAa,GAAG,WAAW,GAAG,OAAO,GAAG,UAAU,GAAG,SAAS,CAAA;CAAE,CAC1E,CAAA;AAED,eAAO,MAAM,YAAY,qBAIvB,CAAA;AACF,eAAO,MAAM,OAAO,WAGlB,CAAA;AACF,MAAM,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,OAAO,CAAC,CAAA;AAC5C,eAAO,MAAM,kBAAkB,WAE7B,CAAA;AAEF,QAAA,MAAM,OAAO;;;;;;;;EAcX,CAAA;AAEF,QAAA,MAAM,YAAY;;;;;;;;;;;;;IAYhB,CAAA;AAEF,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAAmD,CAAA;AAE7E,MAAM,MAAM,aAAa,GAAG,wBAAwB,CACnD,MAAM,CAAC,OAAO,YAAY,CAAC,EAC3B,MAAM,CAAC,OAAO,mBAAmB,CAAC,CAClC,CAAA;AAED,MAAM,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,OAAO,CAAC,CAAA;AAE5C,MAAM,MAAM,YAAY,GAAG;IAC1B,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,cAAc,CAAC,EAAE,MAAM,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,wBAAwB,CAAC,IAAI,EAAE,KAAK,IAAI,KAAK,SAAS,OAAO,GACtE,IAAI,GAAG,KAAK,GACZ,KAAK,CAAA;AAER,MAAM,MAAM,kBAAkB,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,MAAM,CAAC,GACxE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GACb;KAAG,CAAC,IAAI,CAAC,GAAG,CAAC;CAAE,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAC5B,KAAK,GACN,KAAK,CAAA;AAER;;;GAGG;AACH,MAAM,MAAM,cAAc,GAAG;IAC5B,KAAK,EAAE,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,YAAY,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;CACpE,CAAA;AAED,MAAM,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAC9C,OAAO,EAAE,IAAI,IAAI,CAAC,EAAE,KAAK,MAAM,EAAE,MAAM,SAAS,CAAA;AAEhD,eAAO,MAAM,qBAAqB,6EAYhC,CAAA;AAEF,QAAA,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;IAgDvB,CAAA;AAEF,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,OAAO,mBAAmB,CAAC,CAAA;AACpE,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,mBAAmB,CAAC,CAAC,QAAQ,CAAC,CAAA;AAEzE,MAAM,MAAM,mBAAmB,GAAG,OAAO,CACxC,mBAAmB,EACnB;IAAE,MAAM,EAAE,aAAa,GAAG,WAAW,GAAG,OAAO,GAAG,UAAU,GAAG,SAAS,CAAA;CAAE,CAC1E,CAAA;AAED,eAAO,MAAM,YAAY,2CAMxB,CAAA;AACD,eAAO,MAAM,OAAO,WAGlB,CAAA;AACF,MAAM,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,OAAO,CAAC,CAAA;AAC5C,eAAO,MAAM,kBAAkB,WAE7B,CAAA;AAEF,QAAA,MAAM,OAAO;;;;;;;;EAcX,CAAA;AAEF,QAAA,MAAM,YAAY;;;;;;;;;;;;;IAYhB,CAAA;AAEF,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAAmD,CAAA;AAE7E,MAAM,MAAM,aAAa,GAAG,wBAAwB,CACnD,MAAM,CAAC,OAAO,YAAY,CAAC,EAC3B,MAAM,CAAC,OAAO,mBAAmB,CAAC,CAClC,CAAA;AAED,MAAM,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,OAAO,CAAC,CAAA;AAE5C,MAAM,MAAM,YAAY,GAAG;IAC1B,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,cAAc,CAAC,EAAE,MAAM,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,wBAAwB,CAAC,IAAI,EAAE,KAAK,IAAI,KAAK,SAAS,OAAO,GACtE,IAAI,GAAG,KAAK,GACZ,KAAK,CAAA;AAER,MAAM,MAAM,kBAAkB,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,MAAM,CAAC,GACxE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GACb;KAAG,CAAC,IAAI,CAAC,GAAG,CAAC;CAAE,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAC5B,KAAK,GACN,KAAK,CAAA;AAER;;;GAGG;AACH,MAAM,MAAM,cAAc,GAAG;IAC5B,KAAK,EAAE,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,YAAY,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;CACpE,CAAA;AAED,MAAM,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA"}

package/dist/types.js

@@ -56,10 +56,10 @@ const MapShareStateUpdate = T.Union([
         }),
     }),
 ]);
-export const MapShareUrls = T.Array(T.String({ format: 'uri' }), {
+export const MapShareUrls = T.Unsafe(T.Array(T.String({ format: 'uri' }), {
     minItems: 1,
     description: 'List of map share URLs (for each network interface of the sharer)',
-});
+}));
 export const ShareId = T.String({
     minLength: 1,
     description: 'The ID of the map share',
@@ -76,7 +76,7 @@ const MapInfo = T.Object({
     })),
     minzoom: T.Number({ description: 'The minimum zoom level of the map data' }),
     maxzoom: T.Number({ description: 'The maximum zoom level of the map data' }),
-    mapCreated: T.Number({
+    mapCreatedAt: T.Number({
         description: 'Timestamp (ms since epoch) when the map was created',
     }),
 });
@@ -87,7 +87,7 @@ const MapShareBase = T.Intersect([
         }),
         shareId: ShareId,
         mapShareUrls: MapShareUrls,
-        mapShareCreated: T.Number({
+        mapShareCreatedAt: T.Number({
             description: 'Timestamp (ms since epoch) when the map share was created',
         }),
     }),

package/node_modules/@fastify/busboy/LICENSE

@@ -0,0 +1,24 @@
+MIT License
+
+Copyright Brian White. All rights reserved.
+Copyright (c) 2021-present The Fastify team
+
+The Fastify team members are listed at https://github.com/fastify/fastify#team.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.