@comapeo/core-react 6.1.0 → 6.1.1

package/dist/commonjs/hooks/projects.d.ts

@@ -626,13 +626,7 @@ export declare function useExportGeoJSON({ projectId }: {
     mutate: import("@tanstack/react-query").UseMutateFunction<string, Error, {
         path: string;
         exportOptions: {
-            observations
-            /**
-             * Update the settings of a project.
-             *
-             * @param opts.projectId Public ID of the project to apply changes to.
-             */
-            ?: boolean;
+            observations?: boolean;
             tracks?: boolean;
             lang?: string;
         };
@@ -640,13 +634,7 @@ export declare function useExportGeoJSON({ projectId }: {
     mutateAsync: import("@tanstack/react-query").UseMutateAsyncFunction<string, Error, {
         path: string;
         exportOptions: {
-            observations
-            /**
-             * Update the settings of a project.
-             *
-             * @param opts.projectId Public ID of the project to apply changes to.
-             */
-            ?: boolean;
+            observations?: boolean;
             tracks?: boolean;
             lang?: string;
         };
@@ -658,13 +646,7 @@ export declare function useExportGeoJSON({ projectId }: {
     mutate: import("@tanstack/react-query").UseMutateFunction<string, Error, {
         path: string;
         exportOptions: {
-            observations
-            /**
-             * Update the settings of a project.
-             *
-             * @param opts.projectId Public ID of the project to apply changes to.
-             */
-            ?: boolean;
+            observations?: boolean;
             tracks?: boolean;
             lang?: string;
         };
@@ -672,13 +654,7 @@ export declare function useExportGeoJSON({ projectId }: {
     mutateAsync: import("@tanstack/react-query").UseMutateAsyncFunction<string, Error, {
         path: string;
         exportOptions: {
-            observations
-            /**
-             * Update the settings of a project.
-             *
-             * @param opts.projectId Public ID of the project to apply changes to.
-             */
-            ?: boolean;
+            observations?: boolean;
             tracks?: boolean;
             lang?: string;
         };

package/dist/commonjs/hooks/projects.js

@@ -186,9 +186,13 @@ function useManyMembers({ projectId }) {
  */
 function useIconUrl({ projectId, iconId, ...mimeBasedOpts }) {
     const { data: projectApi } = useSingleProject({ projectId });
-    const { data: port, error, isRefetching } = useMediaServerPort({ projectApi });
-    const baseUrl = `http://127.0.0.1:${port}`;
-    const iconUrl = (0, urls_js_1.getIconUrl)(baseUrl, iconId, mimeBasedOpts);
+    const { data: serverOrigin, error, isRefetching, } = useMediaServerOrigin({ projectApi });
+    const iconUrl = (0, urls_js_1.getIconUrl)({
+        serverOrigin,
+        iconId,
+        projectId,
+        mimeBasedOpts,
+    });
     return { data: iconUrl, error, isRefetching };
 }
 /**
@@ -244,17 +248,16 @@ function useIconUrl({ projectId, iconId, ...mimeBasedOpts }) {
  */
 function useAttachmentUrl({ projectId, blobId, }) {
     const { data: projectApi } = useSingleProject({ projectId });
-    const { data: port, error, isRefetching } = useMediaServerPort({ projectApi });
-    const baseUrl = `http://127.0.0.1:${port}`;
-    const blobUrl = (0, urls_js_1.getBlobUrl)(baseUrl, blobId);
+    const { data: serverOrigin, error, isRefetching, } = useMediaServerOrigin({ projectApi });
+    const blobUrl = (0, urls_js_1.getBlobUrl)({ serverOrigin, projectId, blobId });
     return { data: blobUrl, error, isRefetching };
 }
 /**
  * @internal
- * Hack to retrieve the media server port.
+ * Hack to retrieve the media server origin (protocol + host).
  */
-function useMediaServerPort({ projectApi }) {
-    const { data, error, isRefetching } = (0, react_query_1.useSuspenseQuery)((0, projects_js_1.mediaServerPortQueryOptions)({
+function useMediaServerOrigin({ projectApi }) {
+    const { data, error, isRefetching } = (0, react_query_1.useSuspenseQuery)((0, projects_js_1.mediaServerOriginQueryOptions)({
         projectApi,
     }));
     return { data, error, isRefetching };

package/dist/commonjs/lib/react-query/projects.d.ts

@@ -28,7 +28,7 @@ export declare function getDocumentCreatedByQueryKey({ projectId, originalVersio
  * exposed right now, but it is the same for all projects, so no need for
  * scoping the query key to the project
  */
-export declare function getMediaServerPortQueryKey(): readonly ["@comapeo/core-react", "media_server_port"];
+export declare function getMediaServerOriginQueryKey(): readonly ["@comapeo/core-react", "media_server_origin"];
 export declare function projectsQueryOptions({ clientApi, }: {
     clientApi: MapeoClientApi;
 }): import("@tanstack/react-query").OmitKeyof<import("@tanstack/react-query").UseQueryOptions<import("@comapeo/core/dist/mapeo-manager.js", { with: { "resolution-mode": "import" } }).ListedProject[], Error, import("@comapeo/core/dist/mapeo-manager.js", { with: { "resolution-mode": "import" } }).ListedProject[], readonly ["@comapeo/core-react", "projects"]>, "queryFn"> & {
@@ -100,12 +100,12 @@ export declare function documentCreatedByQueryOptions({ projectApi, projectId, o
         [dataTagErrorSymbol]: Error;
     };
 };
-export declare function mediaServerPortQueryOptions({ projectApi, }: {
+export declare function mediaServerOriginQueryOptions({ projectApi, }: {
     projectApi: MapeoProjectApi;
-}): import("@tanstack/react-query").OmitKeyof<import("@tanstack/react-query").UseQueryOptions<string, Error, string, readonly ["@comapeo/core-react", "media_server_port"]>, "queryFn"> & {
-    queryFn?: import("@tanstack/react-query").QueryFunction<string, readonly ["@comapeo/core-react", "media_server_port"], never> | undefined;
+}): import("@tanstack/react-query").OmitKeyof<import("@tanstack/react-query").UseQueryOptions<string, Error, string, readonly ["@comapeo/core-react", "media_server_origin"]>, "queryFn"> & {
+    queryFn?: import("@tanstack/react-query").QueryFunction<string, readonly ["@comapeo/core-react", "media_server_origin"], never> | undefined;
 } & {
-    queryKey: readonly ["@comapeo/core-react", "media_server_port"] & {
+    queryKey: readonly ["@comapeo/core-react", "media_server_origin"] & {
         [dataTagSymbol]: string;
         [dataTagErrorSymbol]: Error;
     };

package/dist/commonjs/lib/react-query/projects.js

@@ -7,7 +7,7 @@ exports.getProjectRoleQueryKey = getProjectRoleQueryKey;
 exports.getMembersQueryKey = getMembersQueryKey;
 exports.getMemberByIdQueryKey = getMemberByIdQueryKey;
 exports.getDocumentCreatedByQueryKey = getDocumentCreatedByQueryKey;
-exports.getMediaServerPortQueryKey = getMediaServerPortQueryKey;
+exports.getMediaServerOriginQueryKey = getMediaServerOriginQueryKey;
 exports.projectsQueryOptions = projectsQueryOptions;
 exports.projectByIdQueryOptions = projectByIdQueryOptions;
 exports.projectSettingsQueryOptions = projectSettingsQueryOptions;
@@ -15,7 +15,7 @@ exports.projectMembersQueryOptions = projectMembersQueryOptions;
 exports.projectMemberByIdQueryOptions = projectMemberByIdQueryOptions;
 exports.projectOwnRoleQueryOptions = projectOwnRoleQueryOptions;
 exports.documentCreatedByQueryOptions = documentCreatedByQueryOptions;
-exports.mediaServerPortQueryOptions = mediaServerPortQueryOptions;
+exports.mediaServerOriginQueryOptions = mediaServerOriginQueryOptions;
 exports.addServerPeerMutationOptions = addServerPeerMutationOptions;
 exports.removeServerPeerMutationOptions = removeServerPeerMutationOptions;
 exports.createProjectMutationOptions = createProjectMutationOptions;
@@ -64,8 +64,8 @@ function getDocumentCreatedByQueryKey({ projectId, originalVersionId, }) {
  * exposed right now, but it is the same for all projects, so no need for
  * scoping the query key to the project
  */
-function getMediaServerPortQueryKey() {
-    return [shared_js_1.ROOT_QUERY_KEY, 'media_server_port'];
+function getMediaServerOriginQueryKey() {
+    return [shared_js_1.ROOT_QUERY_KEY, 'media_server_origin'];
 }
 function projectsQueryOptions({ clientApi, }) {
     return (0, react_query_1.queryOptions)({
@@ -142,17 +142,17 @@ const FAKE_BLOB_ID = {
     name: 'name',
     driveId: 'drive-id',
 };
-function mediaServerPortQueryOptions({ projectApi, }) {
+function mediaServerOriginQueryOptions({ projectApi, }) {
     return (0, react_query_1.queryOptions)({
         ...(0, shared_js_1.baseQueryOptions)(),
-        // HACK: The server doesn't yet expose a method to get its port, so we use
-        // the existing $blobs.getUrl() to get the port with a fake BlobId. The port
+        // HACK: The server doesn't yet expose a method to get its origin, so we use
+        // the existing $blobs.getUrl() to get the origin with a fake BlobId. The origin
         // is the same regardless of the blobId, so it's not necessary to include it
         // as a dep for the query key.
-        queryKey: getMediaServerPortQueryKey(),
+        queryKey: getMediaServerOriginQueryKey(),
         queryFn: async () => {
             const url = await projectApi.$blobs.getUrl(FAKE_BLOB_ID);
-            return new URL(url).port;
+            return new URL(url).origin;
         },
         staleTime: 'static',
         gcTime: Infinity,

package/dist/commonjs/lib/urls.d.ts

@@ -2,11 +2,14 @@ import type { BlobApi, IconApi } from '@comapeo/core';
 /**
  * Get a url for a blob based on its BlobId
  */
-export declare function getBlobUrl(baseUrl: string, blobId: BlobApi.BlobId): string;
-/**
- * @param {string} iconId
- * @param {BitmapOpts | SvgOpts} opts
- *
- * @returns {Promise<string>}
- */
-export declare function getIconUrl(baseUrl: string, iconId: string, opts: IconApi.BitmapOpts | IconApi.SvgOpts): string;
+export declare function getBlobUrl({ serverOrigin, projectId, blobId, }: {
+    serverOrigin: string;
+    projectId: string;
+    blobId: BlobApi.BlobId;
+}): string;
+export declare function getIconUrl({ serverOrigin, iconId, projectId, mimeBasedOpts, }: {
+    serverOrigin: string;
+    iconId: string;
+    projectId: string;
+    mimeBasedOpts: IconApi.BitmapOpts | IconApi.SvgOpts;
+}): string;

package/dist/commonjs/lib/urls.js

@@ -1,6 +1,12 @@
 "use strict";
 // TODO: Move these into a separate "@comapeo/asset-server" module which can
 // export them to be imported directly in a client.
+//
+// NB: The URL construction is fragile right now - it must match the
+// implementation in the @comapeo/core fastify plugins
+// [blobServerPlugin](https://github.com/digidem/comapeo-core/blob/main/src/fastify-plugins/blobs.js)
+// and
+// [iconServerPlugin](https://github.com/digidem/comapeo-core/blob/main/src/fastify-plugins/icons.js)
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBlobUrl = getBlobUrl;
 exports.getIconUrl = getIconUrl;
@@ -11,34 +17,22 @@ const MIME_TO_EXTENSION = {
 /**
  * Get a url for a blob based on its BlobId
  */
-function getBlobUrl(baseUrl, blobId) {
+function getBlobUrl({ serverOrigin, projectId, blobId, }) {
     const { driveId, type, variant, name } = blobId;
-    if (!baseUrl.endsWith('/')) {
-        baseUrl += '/';
-    }
-    return baseUrl + `${driveId}/${type}/${variant}/${name}`;
+    return `${serverOrigin}/blobs/${projectId}/${driveId}/${type}/${variant}/${name}`;
 }
-/**
- * @param {string} iconId
- * @param {BitmapOpts | SvgOpts} opts
- *
- * @returns {Promise<string>}
- */
-function getIconUrl(baseUrl, iconId, opts) {
-    if (!baseUrl.endsWith('/')) {
-        baseUrl += '/';
-    }
-    const mimeExtension = MIME_TO_EXTENSION[opts.mimeType];
-    const pixelDensity = opts.mimeType === 'image/svg+xml' ||
+function getIconUrl({ serverOrigin, iconId, projectId, mimeBasedOpts, }) {
+    const mimeExtension = MIME_TO_EXTENSION[mimeBasedOpts.mimeType];
+    const pixelDensity = mimeBasedOpts.mimeType === 'image/svg+xml' ||
         // if the pixel density is 1, we can omit the density suffix in the resulting url
         // and assume the pixel density is 1 for applicable mime types when using the url
-        opts.pixelDensity === 1
+        mimeBasedOpts.pixelDensity === 1
         ? undefined
-        : opts.pixelDensity;
-    return (baseUrl +
+        : mimeBasedOpts.pixelDensity;
+    return (`${serverOrigin}/icons/${projectId}/` +
         constructIconPath({
             pixelDensity,
-            size: opts.size,
+            size: mimeBasedOpts.size,
             extension: mimeExtension,
             iconId,
         }));

package/dist/esm/hooks/projects.d.ts

@@ -626,13 +626,7 @@ export declare function useExportGeoJSON({ projectId }: {
     mutate: import("@tanstack/react-query").UseMutateFunction<string, Error, {
         path: string;
         exportOptions: {
-            observations
-            /**
-             * Update the settings of a project.
-             *
-             * @param opts.projectId Public ID of the project to apply changes to.
-             */
-            ?: boolean;
+            observations?: boolean;
             tracks?: boolean;
             lang?: string;
         };
@@ -640,13 +634,7 @@ export declare function useExportGeoJSON({ projectId }: {
     mutateAsync: import("@tanstack/react-query").UseMutateAsyncFunction<string, Error, {
         path: string;
         exportOptions: {
-            observations
-            /**
-             * Update the settings of a project.
-             *
-             * @param opts.projectId Public ID of the project to apply changes to.
-             */
-            ?: boolean;
+            observations?: boolean;
             tracks?: boolean;
             lang?: string;
         };
@@ -658,13 +646,7 @@ export declare function useExportGeoJSON({ projectId }: {
     mutate: import("@tanstack/react-query").UseMutateFunction<string, Error, {
         path: string;
         exportOptions: {
-            observations
-            /**
-             * Update the settings of a project.
-             *
-             * @param opts.projectId Public ID of the project to apply changes to.
-             */
-            ?: boolean;
+            observations?: boolean;
             tracks?: boolean;
             lang?: string;
         };
@@ -672,13 +654,7 @@ export declare function useExportGeoJSON({ projectId }: {
     mutateAsync: import("@tanstack/react-query").UseMutateAsyncFunction<string, Error, {
         path: string;
         exportOptions: {
-            observations
-            /**
-             * Update the settings of a project.
-             *
-             * @param opts.projectId Public ID of the project to apply changes to.
-             */
-            ?: boolean;
+            observations?: boolean;
             tracks?: boolean;
             lang?: string;
         };

package/dist/esm/hooks/projects.js

@@ -1,6 +1,6 @@
 import { useMutation, useQueryClient, useSuspenseQuery, } from '@tanstack/react-query';
 import { useSyncExternalStore } from 'react';
-import { addServerPeerMutationOptions, connectSyncServersMutationOptions, createBlobMutationOptions, createProjectMutationOptions, disconnectSyncServersMutationOptions, documentCreatedByQueryOptions, exportGeoJSONMutationOptions, exportZipFileMutationOptions, importProjectConfigMutationOptions, leaveProjectMutationOptions, mediaServerPortQueryOptions, projectByIdQueryOptions, projectMemberByIdQueryOptions, projectMembersQueryOptions, projectOwnRoleQueryOptions, projectSettingsQueryOptions, projectsQueryOptions, removeServerPeerMutationOptions, setAutostopDataSyncTimeoutMutationOptions, startSyncMutationOptions, stopSyncMutationOptions, updateProjectSettingsMutationOptions, } from '../lib/react-query/projects.js';
+import { addServerPeerMutationOptions, connectSyncServersMutationOptions, createBlobMutationOptions, createProjectMutationOptions, disconnectSyncServersMutationOptions, documentCreatedByQueryOptions, exportGeoJSONMutationOptions, exportZipFileMutationOptions, importProjectConfigMutationOptions, leaveProjectMutationOptions, mediaServerOriginQueryOptions, projectByIdQueryOptions, projectMemberByIdQueryOptions, projectMembersQueryOptions, projectOwnRoleQueryOptions, projectSettingsQueryOptions, projectsQueryOptions, removeServerPeerMutationOptions, setAutostopDataSyncTimeoutMutationOptions, startSyncMutationOptions, stopSyncMutationOptions, updateProjectSettingsMutationOptions, } from '../lib/react-query/projects.js';
 import { SyncStore } from '../lib/sync.js';
 import { getBlobUrl, getIconUrl } from '../lib/urls.js';
 import { useClientApi } from './client.js';
@@ -159,9 +159,13 @@ export function useManyMembers({ projectId }) {
  */
 export function useIconUrl({ projectId, iconId, ...mimeBasedOpts }) {
     const { data: projectApi } = useSingleProject({ projectId });
-    const { data: port, error, isRefetching } = useMediaServerPort({ projectApi });
-    const baseUrl = `http://127.0.0.1:${port}`;
-    const iconUrl = getIconUrl(baseUrl, iconId, mimeBasedOpts);
+    const { data: serverOrigin, error, isRefetching, } = useMediaServerOrigin({ projectApi });
+    const iconUrl = getIconUrl({
+        serverOrigin,
+        iconId,
+        projectId,
+        mimeBasedOpts,
+    });
     return { data: iconUrl, error, isRefetching };
 }
 /**
@@ -217,17 +221,16 @@ export function useIconUrl({ projectId, iconId, ...mimeBasedOpts }) {
  */
 export function useAttachmentUrl({ projectId, blobId, }) {
     const { data: projectApi } = useSingleProject({ projectId });
-    const { data: port, error, isRefetching } = useMediaServerPort({ projectApi });
-    const baseUrl = `http://127.0.0.1:${port}`;
-    const blobUrl = getBlobUrl(baseUrl, blobId);
+    const { data: serverOrigin, error, isRefetching, } = useMediaServerOrigin({ projectApi });
+    const blobUrl = getBlobUrl({ serverOrigin, projectId, blobId });
     return { data: blobUrl, error, isRefetching };
 }
 /**
  * @internal
- * Hack to retrieve the media server port.
+ * Hack to retrieve the media server origin (protocol + host).
  */
-function useMediaServerPort({ projectApi }) {
-    const { data, error, isRefetching } = useSuspenseQuery(mediaServerPortQueryOptions({
+function useMediaServerOrigin({ projectApi }) {
+    const { data, error, isRefetching } = useSuspenseQuery(mediaServerOriginQueryOptions({
         projectApi,
     }));
     return { data, error, isRefetching };

package/dist/esm/lib/react-query/projects.d.ts

@@ -28,7 +28,7 @@ export declare function getDocumentCreatedByQueryKey({ projectId, originalVersio
  * exposed right now, but it is the same for all projects, so no need for
  * scoping the query key to the project
  */
-export declare function getMediaServerPortQueryKey(): readonly ["@comapeo/core-react", "media_server_port"];
+export declare function getMediaServerOriginQueryKey(): readonly ["@comapeo/core-react", "media_server_origin"];
 export declare function projectsQueryOptions({ clientApi, }: {
     clientApi: MapeoClientApi;
 }): import("@tanstack/react-query").OmitKeyof<import("@tanstack/react-query").UseQueryOptions<import("@comapeo/core/dist/mapeo-manager.js").ListedProject[], Error, import("@comapeo/core/dist/mapeo-manager.js").ListedProject[], readonly ["@comapeo/core-react", "projects"]>, "queryFn"> & {
@@ -100,12 +100,12 @@ export declare function documentCreatedByQueryOptions({ projectApi, projectId, o
         [dataTagErrorSymbol]: Error;
     };
 };
-export declare function mediaServerPortQueryOptions({ projectApi, }: {
+export declare function mediaServerOriginQueryOptions({ projectApi, }: {
     projectApi: MapeoProjectApi;
-}): import("@tanstack/react-query").OmitKeyof<import("@tanstack/react-query").UseQueryOptions<string, Error, string, readonly ["@comapeo/core-react", "media_server_port"]>, "queryFn"> & {
-    queryFn?: import("@tanstack/react-query").QueryFunction<string, readonly ["@comapeo/core-react", "media_server_port"], never> | undefined;
+}): import("@tanstack/react-query").OmitKeyof<import("@tanstack/react-query").UseQueryOptions<string, Error, string, readonly ["@comapeo/core-react", "media_server_origin"]>, "queryFn"> & {
+    queryFn?: import("@tanstack/react-query").QueryFunction<string, readonly ["@comapeo/core-react", "media_server_origin"], never> | undefined;
 } & {
-    queryKey: readonly ["@comapeo/core-react", "media_server_port"] & {
+    queryKey: readonly ["@comapeo/core-react", "media_server_origin"] & {
         [dataTagSymbol]: string;
         [dataTagErrorSymbol]: Error;
     };

package/dist/esm/lib/react-query/projects.js

@@ -32,8 +32,8 @@ export function getDocumentCreatedByQueryKey({ projectId, originalVersionId, })
  * exposed right now, but it is the same for all projects, so no need for
  * scoping the query key to the project
  */
-export function getMediaServerPortQueryKey() {
-    return [ROOT_QUERY_KEY, 'media_server_port'];
+export function getMediaServerOriginQueryKey() {
+    return [ROOT_QUERY_KEY, 'media_server_origin'];
 }
 export function projectsQueryOptions({ clientApi, }) {
     return queryOptions({
@@ -110,17 +110,17 @@ const FAKE_BLOB_ID = {
     name: 'name',
     driveId: 'drive-id',
 };
-export function mediaServerPortQueryOptions({ projectApi, }) {
+export function mediaServerOriginQueryOptions({ projectApi, }) {
     return queryOptions({
         ...baseQueryOptions(),
-        // HACK: The server doesn't yet expose a method to get its port, so we use
-        // the existing $blobs.getUrl() to get the port with a fake BlobId. The port
+        // HACK: The server doesn't yet expose a method to get its origin, so we use
+        // the existing $blobs.getUrl() to get the origin with a fake BlobId. The origin
         // is the same regardless of the blobId, so it's not necessary to include it
         // as a dep for the query key.
-        queryKey: getMediaServerPortQueryKey(),
+        queryKey: getMediaServerOriginQueryKey(),
         queryFn: async () => {
             const url = await projectApi.$blobs.getUrl(FAKE_BLOB_ID);
-            return new URL(url).port;
+            return new URL(url).origin;
         },
         staleTime: 'static',
         gcTime: Infinity,

package/dist/esm/lib/urls.d.ts

@@ -2,11 +2,14 @@ import type { BlobApi, IconApi } from '@comapeo/core';
 /**
  * Get a url for a blob based on its BlobId
  */
-export declare function getBlobUrl(baseUrl: string, blobId: BlobApi.BlobId): string;
-/**
- * @param {string} iconId
- * @param {BitmapOpts | SvgOpts} opts
- *
- * @returns {Promise<string>}
- */
-export declare function getIconUrl(baseUrl: string, iconId: string, opts: IconApi.BitmapOpts | IconApi.SvgOpts): string;
+export declare function getBlobUrl({ serverOrigin, projectId, blobId, }: {
+    serverOrigin: string;
+    projectId: string;
+    blobId: BlobApi.BlobId;
+}): string;
+export declare function getIconUrl({ serverOrigin, iconId, projectId, mimeBasedOpts, }: {
+    serverOrigin: string;
+    iconId: string;
+    projectId: string;
+    mimeBasedOpts: IconApi.BitmapOpts | IconApi.SvgOpts;
+}): string;

package/dist/esm/lib/urls.js

@@ -1,5 +1,11 @@
 // TODO: Move these into a separate "@comapeo/asset-server" module which can
 // export them to be imported directly in a client.
+//
+// NB: The URL construction is fragile right now - it must match the
+// implementation in the @comapeo/core fastify plugins
+// [blobServerPlugin](https://github.com/digidem/comapeo-core/blob/main/src/fastify-plugins/blobs.js)
+// and
+// [iconServerPlugin](https://github.com/digidem/comapeo-core/blob/main/src/fastify-plugins/icons.js)
 const MIME_TO_EXTENSION = {
     'image/png': '.png',
     'image/svg+xml': '.svg',
@@ -7,34 +13,22 @@ const MIME_TO_EXTENSION = {
 /**
  * Get a url for a blob based on its BlobId
  */
-export function getBlobUrl(baseUrl, blobId) {
+export function getBlobUrl({ serverOrigin, projectId, blobId, }) {
     const { driveId, type, variant, name } = blobId;
-    if (!baseUrl.endsWith('/')) {
-        baseUrl += '/';
-    }
-    return baseUrl + `${driveId}/${type}/${variant}/${name}`;
+    return `${serverOrigin}/blobs/${projectId}/${driveId}/${type}/${variant}/${name}`;
 }
-/**
- * @param {string} iconId
- * @param {BitmapOpts | SvgOpts} opts
- *
- * @returns {Promise<string>}
- */
-export function getIconUrl(baseUrl, iconId, opts) {
-    if (!baseUrl.endsWith('/')) {
-        baseUrl += '/';
-    }
-    const mimeExtension = MIME_TO_EXTENSION[opts.mimeType];
-    const pixelDensity = opts.mimeType === 'image/svg+xml' ||
+export function getIconUrl({ serverOrigin, iconId, projectId, mimeBasedOpts, }) {
+    const mimeExtension = MIME_TO_EXTENSION[mimeBasedOpts.mimeType];
+    const pixelDensity = mimeBasedOpts.mimeType === 'image/svg+xml' ||
         // if the pixel density is 1, we can omit the density suffix in the resulting url
         // and assume the pixel density is 1 for applicable mime types when using the url
-        opts.pixelDensity === 1
+        mimeBasedOpts.pixelDensity === 1
         ? undefined
-        : opts.pixelDensity;
-    return (baseUrl +
+        : mimeBasedOpts.pixelDensity;
+    return (`${serverOrigin}/icons/${projectId}/` +
         constructIconPath({
             pixelDensity,
-            size: opts.size,
+            size: mimeBasedOpts.size,
             extension: mimeExtension,
             iconId,
         }));

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@comapeo/core-react",
-	"version": "6.1.0",
+	"version": "6.1.1",
 	"description": "React wrapper for working with @comapeo/core",
 	"repository": {
 		"type": "git",