document-drive 1.0.0-alpha.95 → 1.0.0-alpha.97

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "document-drive",
-    "version": "1.0.0-alpha.95",
+    "version": "1.0.0-alpha.97",
     "license": "AGPL-3.0-only",
     "type": "module",
     "module": "./src/index.ts",

package/src/server/listener/transmitter/pull-responder.ts

@@ -117,7 +117,7 @@ export class PullResponderTransmitter implements IPullResponderTransmitter {
         filter: ListenerFilter
     ): Promise<Listener['listenerId']> {
         // graphql request to switchboard
-        const { registerPullResponderListener } = await requestGraphql<{
+        const result = await requestGraphql<{
             registerPullResponderListener: {
                 listenerId: Listener['listenerId'];
             };
@@ -134,7 +134,17 @@ export class PullResponderTransmitter implements IPullResponderTransmitter {
             `,
             { filter }
         );
-        return registerPullResponderListener.listenerId;
+
+        const error = result.errors?.at(0);
+        if (error) {
+            throw error;
+        }
+
+        if (!result.registerPullResponderListener) {
+            throw new Error('Error registering listener');
+        }
+
+        return result.registerPullResponderListener.listenerId;
     }
 
     static async pullStrands(
@@ -143,11 +153,7 @@ export class PullResponderTransmitter implements IPullResponderTransmitter {
         listenerId: string,
         options?: GetStrandsOptions // TODO add support for since
     ): Promise<StrandUpdate[]> {
-        const {
-            system: {
-                sync: { strands }
-            }
-        } = await requestGraphql<PullStrandsGraphQL>(
+        const result = await requestGraphql<PullStrandsGraphQL>(
             url,
             gql`
                 query strands($listenerId: ID!) {
@@ -188,7 +194,17 @@ export class PullResponderTransmitter implements IPullResponderTransmitter {
             `,
             { listenerId }
         );
-        return strands.map(s => ({
+
+        const error = result.errors?.at(0);
+        if (error) {
+            throw error;
+        }
+
+        if (!result.system) {
+            return [];
+        }
+
+        return result.system.sync.strands.map(s => ({
             ...s,
             operations: s.operations.map(o => ({
                 ...o,
@@ -215,6 +231,14 @@ export class PullResponderTransmitter implements IPullResponderTransmitter {
             `,
             { listenerId, revisions }
         );
+        const error = result.errors?.at(0);
+        if (error) {
+            throw error;
+        }
+
+        if (result.acknowledge === null) {
+            throw new Error('Error acknowledging strands');
+        }
         return result.acknowledge;
     }
 

package/src/storage/browser.ts

@@ -38,7 +38,7 @@ export class BrowserStorage implements IDriveStorage {
         const document = await (
             await this.db
         ).getItem<Document>(this.buildKey(drive, id));
-        return !document;
+        return !!document;
     }
 
     async getDocuments(drive: string) {

package/src/storage/memory.ts

@@ -44,7 +44,7 @@ export class MemoryStorage implements IDriveStorage {
 
     async saveDocument(drive: string, id: string, document: Document) {
         this.documents[drive] = this.documents[drive] ?? {};
-        this.documents[drive]![id] = document;
+        this.documents[drive][id] = document;
     }
 
     async clearStorage(): Promise<void> {
@@ -65,7 +65,7 @@ export class MemoryStorage implements IDriveStorage {
             clipboard,
             state
         } = document;
-        this.documents[drive]![id] = {
+        this.documents[drive][id] = {
             operations,
             initialState,
             name,
@@ -105,7 +105,7 @@ export class MemoryStorage implements IDriveStorage {
         if (!this.documents[drive]) {
             throw new DriveNotFoundError(drive);
         }
-        delete this.documents[drive]![id];
+        delete this.documents[drive][id];
     }
 
     async getDrives() {

package/src/utils/graphql.ts

@@ -171,6 +171,27 @@ export type DriveState = DriveInfo &
         nodes: Array<FolderNode | Omit<FileNode, 'synchronizationUnits'>>;
     };
 
+export type DocumentGraphQLResult<D extends Document> = Pick<
+    D,
+    'name' | 'created' | 'documentType' | 'lastModified'
+> & {
+    id: string;
+    revision: number;
+    state: InferDocumentState<D>;
+    initialState: InferDocumentState<D>;
+    operations: (Pick<
+        Operation,
+        | 'id'
+        | 'hash'
+        | 'index'
+        | 'skip'
+        | 'timestamp'
+        | 'type'
+        | 'error'
+        | 'context'
+    > & { inputText: string })[];
+};
+
 export async function fetchDocument<D extends Document>(
     url: string,
     documentId: string,
@@ -192,25 +213,7 @@ export async function fetchDocument<D extends Document>(
     const stateFields = generateDocumentStateQueryFields(documentModel);
     const name = pascalCase(documentModel.name);
     const result = await requestGraphql<{
-        document: Pick<
-            D,
-            'name' | 'created' | 'documentType' | 'lastModified'
-        > & {
-            id: string;
-            revision: number;
-            state: InferDocumentState<D>;
-            initialState: InferDocumentState<D>;
-            operations: (Pick<
-                Operation,
-                | 'id'
-                | 'hash'
-                | 'index'
-                | 'skip'
-                | 'timestamp'
-                | 'type'
-                | 'error'
-            > & { inputText: string })[];
-        };
+        document: DocumentGraphQLResult<D>;
     }>(
         url,
         gql`