document-drive 1.0.0-alpha.51 → 1.0.0-alpha.52

package/package.json

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

package/src/server/index.ts

@@ -43,7 +43,7 @@ import {
 } from '../utils/document-helpers';
 import { requestPublicDrive } from '../utils/graphql';
 import { logger } from '../utils/logger';
-import { OperationError } from './error';
+import { ConflictOperationError, OperationError } from './error';
 import { ListenerManager } from './listener/manager';
 import {
     CancelPullLoop,
@@ -113,13 +113,8 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
 
     private async saveStrand(strand: StrandUpdate) {
         const operations: Operation[] = strand.operations.map(
-            ({ index, type, hash, input, skip, timestamp }) => ({
-                index,
-                type,
-                hash,
-                input,
-                skip,
-                timestamp,
+            (op) => ({
+                ...op,
                 scope: strand.scope,
                 branch: strand.branch
             })
@@ -411,7 +406,8 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
             timestamp: operation.timestamp,
             type: operation.type,
             input: operation.input as object,
-            skip: operation.skip
+            skip: operation.skip,
+            context: operation.context
         }));
     }
 
@@ -771,10 +767,9 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
             appliedOperation[0]!.hash !== operation.hash &&
             !skipHashValidation
         ) {
-            throw new OperationError(
-                'CONFLICT',
+            throw new ConflictOperationError(
                 operation,
-                `Operation with index ${operation.index}:${operation.skip} has unexpected result hash`
+                appliedOperation[0]!
             );
         }
 

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

@@ -159,6 +159,20 @@ export class PullResponderTransmitter implements IPullResponderTransmitter {
                                     input
                                     hash
                                     index
+                                    context {
+                                        signer {
+                                            user {
+                                                address
+                                                networkId
+                                                chainId
+                                            }
+                                            app {
+                                                name
+                                                key
+                                            }
+                                            signature
+                                        }
+                                    }
                                 }
                             }
                         }
@@ -224,13 +238,8 @@ export class PullResponderTransmitter implements IPullResponderTransmitter {
 
             for (const strand of strands) {
                 const operations: Operation[] = strand.operations.map(
-                    ({ index, type, hash, input, skip, timestamp }) => ({
-                        index,
-                        type,
-                        hash,
-                        input,
-                        skip,
-                        timestamp,
+                    (op) => ({
+                        ...op,
                         scope: strand.scope,
                         branch: strand.branch
                     })

package/src/server/types.ts

@@ -8,6 +8,7 @@ import type {
 } from 'document-model-libs/document-drive';
 import type {
     Action,
+    ActionContext,
     BaseAction,
     CreateChildDocumentInput,
     Document,
@@ -114,6 +115,7 @@ export type OperationUpdate = {
     type: string;
     input: object;
     hash: string;
+    context?: ActionContext;
 };
 
 export type StrandUpdate = {

package/src/storage/prisma.ts

@@ -7,6 +7,7 @@ import {
     DocumentDriveState
 } from 'document-model-libs/document-drive';
 import type {
+    ActionContext,
     BaseAction,
     DocumentHeader,
     ExtendedState,
@@ -33,7 +34,8 @@ function storageToOperation(
         timestamp: new Date(op.timestamp).toISOString(),
         input: op.input,
         type: op.type,
-        scope: op.scope as OperationScope
+        scope: op.scope as OperationScope,
+        context: op.context ? op.context as ActionContext : undefined,
         // attachments: fileRegistry
     };
 }
@@ -151,7 +153,8 @@ export class PrismaStorage implements IDriveStorage {
                     type: op.type,
                     scope: op.scope,
                     branch: 'main',
-                    skip: op.skip
+                    skip: op.skip,
+                    context: op.context
                 }))
             });
 
@@ -177,7 +180,8 @@ export class PrismaStorage implements IDriveStorage {
                             type: op.type,
                             scope: op.scope,
                             branch: 'main',
-                            skip: op.skip
+                            skip: op.skip,
+                            context: op.context
                         }
                     })
                 )