vintasend-medplum 0.4.12 → 0.4.14

package/dist/medplum-attachment-manager.d.ts

@@ -40,7 +40,7 @@ export declare class MedplumAttachmentManager extends BaseAttachmentManager {
     /**
      * Reconstruct an AttachmentFile from storage metadata.
      *
-     * @param storageMetadata - Metadata containing either 'url' (Binary URL) or 'binaryId'
+     * @param storageMetadata - Metadata containing 'binaryId' or 'url'
      * @returns AttachmentFile instance for accessing the file
      */
     reconstructAttachmentFile(storageMetadata: Record<string, unknown>): AttachmentFile;
@@ -53,9 +53,13 @@ export declare class MedplumAttachmentManager extends BaseAttachmentManager {
 export declare class MedplumAttachmentFile implements AttachmentFile {
     private medplum;
     private binaryId;
-    constructor(medplum: MedplumClient, binaryUrl: string);
+    constructor(medplum: MedplumClient, binaryId: string);
     /**
      * Read the entire file into memory as a Buffer.
+     *
+     * Works with Binary resources that have either:
+     * - Inline data (base64 encoded)
+     * - A presigned URL to download from
      */
     read(): Promise<Buffer>;
     /**
@@ -68,16 +72,12 @@ export declare class MedplumAttachmentFile implements AttachmentFile {
     /**
      * Generate a URL for accessing the file.
      *
-     * For Medplum, this returns the Binary resource URL.
-     * In production, you might want to generate a presigned URL.
+     * For Medplum, this returns a presigned URL from the Binary resource.
      *
      * @param expiresIn - Seconds until the URL expires (not used for Medplum)
-     * @returns URL for file access
+     * @returns Presigned URL for file access
      */
     url(expiresIn?: number): Promise<string>;
-    /**
-     * Delete this file from storage.
-     */
     delete(): Promise<void>;
 }
 //# sourceMappingURL=medplum-attachment-manager.d.ts.map

package/dist/medplum-attachment-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"medplum-attachment-manager.d.ts","sourceRoot":"","sources":["../src/medplum-attachment-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,oEAAoE,CAAC;AAC3G,OAAO,KAAK,EACV,oBAAoB,EACpB,cAAc,EACd,cAAc,EACf,MAAM,iCAAiC,CAAC;AAEzC;;;;;;;;GAQG;AACH,qBAAa,wBAAyB,SAAQ,qBAAqB;IACrD,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,aAAa;IAI1C;;;;;;;OAOG;IACG,UAAU,CACd,IAAI,EAAE,cAAc,EACpB,QAAQ,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,oBAAoB,CAAC;IAkEhC;;;;;OAKG;IACG,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;IA0BnE;;;;;;OAMG;IACG,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB/C;;;;;OAKG;IACH,yBAAyB,CAAC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,cAAc;CAgBpF;AAED;;;;GAIG;AACH,qBAAa,qBAAsB,YAAW,cAAc;IAIxD,OAAO,CAAC,OAAO;IAHjB,OAAO,CAAC,QAAQ,CAAS;gBAGf,OAAO,EAAE,aAAa,EAC9B,SAAS,EAAE,MAAM;IA2BnB;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC;IAkB7B;;;;;OAKG;IACG,MAAM,IAAI,OAAO,CAAC,cAAc,CAAC;IAUvC;;;;;;;;OAQG;IACG,GAAG,CAAC,SAAS,SAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAO5C;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;CAG9B"}
+{"version":3,"file":"medplum-attachment-manager.d.ts","sourceRoot":"","sources":["../src/medplum-attachment-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,oEAAoE,CAAC;AAC3G,OAAO,KAAK,EACV,oBAAoB,EACpB,cAAc,EACd,cAAc,EACf,MAAM,iCAAiC,CAAC;AAEzC;;;;;;;;GAQG;AACH,qBAAa,wBAAyB,SAAQ,qBAAqB;IACrD,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,aAAa;IAI1C;;;;;;;OAOG;IACG,UAAU,CACd,IAAI,EAAE,cAAc,EACpB,QAAQ,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,oBAAoB,CAAC;IAkEhC;;;;;OAKG;IACG,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;IA+CnE;;;;;;OAMG;IACG,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB/C;;;;;OAKG;IACH,yBAAyB,CAAC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,cAAc;CAiBpF;AAED;;;;GAIG;AACH,qBAAa,qBAAsB,YAAW,cAAc;IAExD,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,QAAQ;gBADR,OAAO,EAAE,aAAa,EACtB,QAAQ,EAAE,MAAM;IAG1B;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC;IAsB7B;;;;;OAKG;IACG,MAAM,IAAI,OAAO,CAAC,cAAc,CAAC;IAUvC;;;;;;;OAOG;IACG,GAAG,CAAC,SAAS,SAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAWtC,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;CAG9B"}

package/dist/medplum-attachment-manager.js

@@ -91,14 +91,28 @@ export class MedplumAttachmentManager extends BaseAttachmentManager {
             if (!media.content || !media.id) {
                 return null;
             }
+            // Extract Binary ID from identifier
+            const binaryIdIdentifier = media.identifier?.find((id) => id.system === 'http://vintasend.com/fhir/binary-id');
+            let binaryId = binaryIdIdentifier?.value;
+            // If binaryId not found in identifier, try to extract from content.url
+            if (!binaryId && media.content.url) {
+                const match = media.content.url.match(/Binary\/([^/]+)/);
+                if (match) {
+                    binaryId = match[1];
+                }
+            }
+            // Extract checksum from identifier
+            const checksumIdentifier = media.identifier?.find((id) => id.system === 'http://vintasend.com/fhir/attachment-checksum');
+            const checksum = checksumIdentifier?.value || '';
             return {
                 id: media.id,
                 filename: media.content.title || 'untitled',
                 contentType: media.content.contentType || 'application/octet-stream',
                 size: media.content.size || 0,
-                checksum: media.identifier?.[0]?.value || '',
+                checksum,
                 storageMetadata: {
                     url: media.content.url,
+                    binaryId: binaryId,
                     creation: media.content.creation,
                 },
                 createdAt: media.meta?.lastUpdated ? new Date(media.meta.lastUpdated) : new Date(),
@@ -141,24 +155,22 @@ export class MedplumAttachmentManager extends BaseAttachmentManager {
     /**
      * Reconstruct an AttachmentFile from storage metadata.
      *
-     * @param storageMetadata - Metadata containing either 'url' (Binary URL) or 'binaryId'
+     * @param storageMetadata - Metadata containing 'binaryId' or 'url'
      * @returns AttachmentFile instance for accessing the file
      */
     reconstructAttachmentFile(storageMetadata) {
-        // Support both 'url' (from upload) and 'binaryId' (direct ID)
-        let binaryUrl;
-        if (storageMetadata.binaryId && typeof storageMetadata.binaryId === 'string') {
-            // Direct Binary ID format
-            binaryUrl = `Binary/${storageMetadata.binaryId}`;
-        }
-        else if (storageMetadata.url && typeof storageMetadata.url === 'string') {
-            // Binary URL format (from uploadFile)
-            binaryUrl = storageMetadata.url;
+        let binaryId = storageMetadata.binaryId;
+        // If binaryId not provided directly, try to extract from url
+        if (!binaryId && storageMetadata.url && typeof storageMetadata.url === 'string') {
+            const match = storageMetadata.url.match(/Binary\/([^/]+)/);
+            if (match) {
+                binaryId = match[1];
+            }
         }
-        else {
-            throw new Error('Storage metadata must contain binaryId for Medplum files');
+        if (!binaryId) {
+            throw new Error('Storage metadata must contain binaryId or a url with Binary reference');
         }
-        return new MedplumAttachmentFile(this.medplum, binaryUrl);
+        return new MedplumAttachmentFile(this.medplum, binaryId);
     }
 }
 /**
@@ -167,49 +179,34 @@ export class MedplumAttachmentManager extends BaseAttachmentManager {
  * Provides access to files stored in Medplum Binary resources.
  */
 export class MedplumAttachmentFile {
-    constructor(medplum, binaryUrl) {
+    constructor(medplum, binaryId) {
         this.medplum = medplum;
-        // Extract Binary ID from URL
-        // Supports two formats:
-        // 1. Simple reference: "Binary/{id}"
-        // 2. Full Medplum storage URL: "https://storage.medplum.com/binary/{projectId}/{binaryId}?..."
-        console.log(`[MedplumAttachmentFile] Constructing with binaryUrl: ${binaryUrl}`);
-        // Try to extract from full URL first
-        const fullUrlMatch = binaryUrl.match(/\/binary\/[^/]+\/([^/?]+)/);
-        if (fullUrlMatch) {
-            this.binaryId = fullUrlMatch[1];
-            console.log(`[MedplumAttachmentFile] Extracted binaryId from full URL: ${this.binaryId}`);
-            return;
-        }
-        // Fall back to simple Binary reference
-        const simpleMatch = binaryUrl.match(/Binary\/([^/]+)/);
-        if (simpleMatch) {
-            this.binaryId = simpleMatch[1];
-            console.log(`[MedplumAttachmentFile] Extracted binaryId from simple reference: ${this.binaryId}`);
-            return;
-        }
-        throw new Error(`Invalid Binary URL format: ${binaryUrl}`);
+        this.binaryId = binaryId;
     }
     /**
      * Read the entire file into memory as a Buffer.
+     *
+     * Works with Binary resources that have either:
+     * - Inline data (base64 encoded)
+     * - A presigned URL to download from
      */
     async read() {
-        try {
-            console.log(`[MedplumAttachmentFile.read] Reading Binary resource with ID: ${this.binaryId}`);
-            const binary = await this.medplum.readResource('Binary', this.binaryId);
-            console.log(`[MedplumAttachmentFile.read] Successfully fetched Binary resource: ${this.binaryId}`);
-            if (!binary.data) {
-                throw new Error('Binary resource has no data');
-            }
-            const buffer = Buffer.from(binary.data, 'base64');
-            console.log(`[MedplumAttachmentFile.read] Successfully converted to buffer, size: ${buffer.length} bytes`);
-            return buffer;
+        const binary = await this.medplum.readResource('Binary', this.binaryId);
+        // If data is embedded in the Binary resource, use it directly
+        if (binary.data) {
+            return Buffer.from(binary.data, 'base64');
         }
-        catch (error) {
-            console.error(`[MedplumAttachmentFile.read] Error reading Binary ${this.binaryId}:`, error);
-            console.error(`[MedplumAttachmentFile.read] Error details:`, JSON.stringify(error, null, 2));
-            throw error;
+        // If data is not embedded but a URL is available, download it
+        if (binary.url) {
+            const response = await fetch(binary.url);
+            if (!response.ok) {
+                throw new Error(`Failed to download binary from URL: ${response.statusText}`);
+            }
+            const arrayBuffer = await response.arrayBuffer();
+            return Buffer.from(arrayBuffer);
         }
+        // Neither data nor URL available
+        throw new Error('Binary resource has neither data nor url');
     }
     /**
      * Get a readable stream for the file.
@@ -229,21 +226,19 @@ export class MedplumAttachmentFile {
     /**
      * Generate a URL for accessing the file.
      *
-     * For Medplum, this returns the Binary resource URL.
-     * In production, you might want to generate a presigned URL.
+     * For Medplum, this returns a presigned URL from the Binary resource.
      *
      * @param expiresIn - Seconds until the URL expires (not used for Medplum)
-     * @returns URL for file access
+     * @returns Presigned URL for file access
      */
     async url(expiresIn = 3600) {
-        // For Medplum, we can use the Binary resource URL
-        // In a production setup, you might want to use Medplum's authentication
-        // or generate a time-limited access token
-        return `Binary/${this.binaryId}`;
+        // Fetch the Binary resource to get the presigned URL
+        const binary = await this.medplum.readResource('Binary', this.binaryId);
+        if (!binary.url) {
+            throw new Error(`Binary resource ${this.binaryId} does not have a presigned URL`);
+        }
+        return binary.url;
     }
-    /**
-     * Delete this file from storage.
-     */
     async delete() {
         await this.medplum.deleteResource('Binary', this.binaryId);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vintasend-medplum",
-  "version": "0.4.12",
+  "version": "0.4.14",
   "description": "",
   "main": "dist/index.js",
   "scripts": {