FS API encoding support

packages/server/express_server.ts

@@ -491,13 +491,16 @@ export class ExpressServer {
         }
         console.log("Getting", attachmentName);
         try {
-          let attachmentData = await this.space.readAttachment(attachmentName);
+          let attachmentData = await this.space.readAttachment(
+            attachmentName,
+            "arraybuffer"
+          );
           res.status(200);
           res.header("Last-Modified", "" + attachmentData.meta.lastModified);
           res.header("X-Permission", attachmentData.meta.perm);
           res.header("Content-Type", attachmentData.meta.contentType);
           // res.header("X-Content-Length", "" + attachmentData.meta.size);
-          res.send(Buffer.from(attachmentData.buffer));
+          res.send(Buffer.from(attachmentData.data as ArrayBuffer));
         } catch (e) {
           // CORS
           res.status(200);

packages/server/hooks/plug_space_primitives.ts

@@ -1,5 +1,9 @@
 import { Plug } from "@plugos/plugos/plug";
-import { SpacePrimitives } from "@silverbulletmd/common/spaces/space_primitives";
+import {
+  AttachmentData,
+  AttachmentEncoding,
+  SpacePrimitives,
+} from "@silverbulletmd/common/spaces/space_primitives";
 import { AttachmentMeta, PageMeta } from "@silverbulletmd/common/types";
 import { PageNamespaceHook, PageNamespaceOperation } from "./page_namespace";
 
@@ -99,9 +103,10 @@ export class PlugSpacePrimitives implements SpacePrimitives {
     return this.wrapped.fetchAttachmentList();
   }
   readAttachment(
-    name: string
-  ): Promise<{ buffer: ArrayBuffer; meta: AttachmentMeta }> {
-    return this.wrapped.readAttachment(name);
+    name: string,
+    encoding: AttachmentEncoding
+  ): Promise<{ data: AttachmentData; meta: AttachmentMeta }> {
+    return this.wrapped.readAttachment(name, encoding);
   }
   getAttachmentMeta(name: string): Promise<AttachmentMeta> {
     return this.wrapped.getAttachmentMeta(name);

packages/server/syscalls/space.ts

@@ -1,6 +1,7 @@
 import { AttachmentMeta, PageMeta } from "@silverbulletmd/common/types";
 import { SysCallMapping } from "@plugos/plugos/system";
 import { Space } from "@silverbulletmd/common/spaces/space";
+import { AttachmentData } from "@silverbulletmd/common/spaces/space_primitives";
 
 export default (space: Space): SysCallMapping => {
   return {
@@ -32,8 +33,8 @@ export default (space: Space): SysCallMapping => {
     "space.readAttachment": async (
       ctx,
       name: string
-    ): Promise<{ buffer: ArrayBuffer; meta: AttachmentMeta }> => {
-      return await space.readAttachment(name);
+    ): Promise<{ data: AttachmentData; meta: AttachmentMeta }> => {
+      return await space.readAttachment(name, "dataurl");
     },
     "space.getAttachmentMeta": async (
       ctx,
@@ -44,9 +45,9 @@ export default (space: Space): SysCallMapping => {
     "space.writeAttachment": async (
       ctx,
       name: string,
-      buffer: ArrayBuffer
+      data: string
     ): Promise<AttachmentMeta> => {
-      return await space.writeAttachment(name, buffer);
+      return await space.writeAttachment(name, data);
     },
     "space.deleteAttachment": async (ctx, name: string) => {
       await space.deleteAttachment(name);