@dra2020/baseclient 1.0.121 → 1.0.123

package/dist/ot-js/otarray.d.ts

@@ -91,8 +91,10 @@ export declare class OTArrayLikeResource extends OT.OTResourceBase {
     alignEdges(rhs: OTArrayLikeResource, st: OTalignEdgesType): void;
     getCursorCache(): any;
     compose(rhs: OTArrayLikeResource): void;
+    tryCompose(rhs: OTArrayLikeResource): boolean;
     performTransformReorder(bForceRetainBeforeInsert: boolean, newA: OTEdits, iBegin: number, iEnd: number): void;
     normalizeNewRetainsAfterTransform(bForceRetainBeforeInsert: boolean): void;
+    tryTransform(prior: OTArrayLikeResource, bPriorIsService: boolean): boolean;
     transform(prior: OTArrayLikeResource, bPriorIsService: boolean): void;
     generateRandom(nInitial: number, clientID: string): void;
 }

package/dist/ot-js/otcomposite.d.ts

@@ -26,7 +26,9 @@ export declare class OTCompositeResource extends OT.OTResourceBase {
     copy(): OTCompositeResource;
     effectivelyEqual(rhs: OTCompositeResource): boolean;
     transform(rhs: OTCompositeResource, bPriorIsService: boolean): void;
+    tryTransform(rhs: OTCompositeResource, bPriorIsService: boolean): boolean;
     compose(rhs: OTCompositeResource): void;
+    tryCompose(rhs: OTCompositeResource): boolean;
     apply(runningValue: any): any;
     toPartialValue(resourceName: string): any;
     toValue(): any;

package/dist/ot-js/otsession.d.ts

@@ -87,6 +87,7 @@ export interface SessionProps {
     requestCount: number;
     deleted: boolean;
     published?: string;
+    locked?: boolean;
     official: boolean;
     loadFailed: boolean;
     accessMap: AccessMap;
@@ -110,6 +111,7 @@ export interface SessionUpdateProps {
     deleted?: boolean;
     published?: boolean;
     official?: boolean;
+    locked?: boolean;
     name?: string;
     description?: string;
     labelupdate?: LabelUpdate;

package/dist/ot-js/ottypes.d.ts

@@ -8,7 +8,9 @@ export interface IOTResource {
     copy(): IOTResource;
     effectivelyEqual(rhs: IOTResource): boolean;
     transform(rhs: IOTResource, bPriorIsService: boolean): void;
+    tryTransform(rhs: IOTResource, bPriorIsService: boolean): boolean;
     compose(rhs: IOTResource): void;
+    tryCompose(rhs: IOTResource): boolean;
     apply(startValue: any): any;
     minimize(): void;
 }
@@ -23,7 +25,9 @@ export declare class OTResourceBase implements IOTResource {
     copy(): OTResourceBase;
     effectivelyEqual(rhs: OTResourceBase): boolean;
     transform(rhs: OTResourceBase, bPriorIsService: boolean): void;
+    tryTransform(rhs: OTResourceBase, bPriorIsServer: boolean): boolean;
     compose(rhs: OTResourceBase): void;
+    tryCompose(rhs: OTResourceBase): boolean;
     apply(startValue: any): any;
     minimize(): void;
 }

package/lib/ot-js/otarray.ts

@@ -770,6 +770,16 @@ export class OTArrayLikeResource extends OT.OTResourceBase
 			this.coalesce();
 		}
 
+	tryCompose(rhs: OTArrayLikeResource): boolean
+		{
+			if (this.length == 0)
+        return true;
+			else if (rhs.edits.length == 0)
+				return true;
+
+			return this.finalLength() == rhs.originalLength();
+    }
+
 	performTransformReorder(bForceRetainBeforeInsert: boolean, newA: OTEdits, iBegin: number, iEnd: number): void
 		{
 			if (iBegin < 0 || iBegin > iEnd) return;
@@ -835,6 +845,14 @@ export class OTArrayLikeResource extends OT.OTResourceBase
 			this.edits = newA;
 		}
 
+  tryTransform(prior: OTArrayLikeResource, bPriorIsService: boolean): boolean
+    {
+			if (this.length == 0 || prior.length == 0)
+				return true;
+
+			return this.originalLength() == prior.originalLength();
+    }
+
 	transform(prior: OTArrayLikeResource, bPriorIsService: boolean): void
 		{
 			if (this.length == 0 || prior.length == 0)

package/lib/ot-js/otcomposite.ts

@@ -133,6 +133,21 @@ export class OTCompositeResource extends OT.OTResourceBase
 			}
 		}
 
+	tryTransform(rhs: OTCompositeResource, bPriorIsService: boolean): boolean
+		{
+      let bSucceed = true;
+
+			for (let i: number = 0; bSucceed && i < rhs.length; i++)
+			{
+				let rhsEdit: OT.IOTResource = rhs.edits[i];
+				let lhsEdit: OT.IOTResource = this.findResource(rhsEdit.resourceName, rhsEdit.underlyingType, false);
+				if (lhsEdit)
+					bSucceed = lhsEdit.tryTransform(rhsEdit, bPriorIsService);
+			}
+
+      return bSucceed;
+		}
+
 	// compose two edit actions
 	compose(rhs: OTCompositeResource): void 			// throws on error
 		{
@@ -149,6 +164,21 @@ export class OTCompositeResource extends OT.OTResourceBase
 			this.clientSequenceNo = rhs.clientSequenceNo;
 		}
 
+	tryCompose(rhs: OTCompositeResource): boolean
+		{
+      let bSucceed = true;
+			for (let i: number = 0; bSucceed && i < rhs.length; i++)
+			{
+				let rhsEdit: OT.IOTResource = rhs.edits[i];
+
+				let lhsEdit: OT.IOTResource = this.findResource(rhsEdit.resourceName, rhsEdit.underlyingType, !rhsEdit.isEmpty());
+				if (lhsEdit)
+					bSucceed = lhsEdit.tryCompose(rhsEdit);
+			}
+
+      return bSucceed;
+		}
+
 	// apply this edit to an existing value, returning new value (if underlying type is mutable, may modify input)
 	// For composite, takes array of values, returns array of results, one for each underlying resource.
 	apply(runningValue: any): any

package/lib/ot-js/otserverengine.ts

@@ -245,11 +245,47 @@ export class OTServerEngine extends OTE.OTEngine
           for (i++; i < this.logServer.length; i++)
             aPrior.compose(this.logServer[i]);
 
+          if (! a.tryTransform(aPrior, true))
+          {
+            console.log('otserverengine: rejecting event on transform failure');
+            this.forgetEvents(orig);
+            return OTS.EClockReset;
+          }
+
           a.transform(aPrior, true);
         }
 
+        let bFail = ! this.stateServer.tryCompose(a);
+        if (bFail)
+        {
+          console.log('otserverengine: rejecting event on compose failure');
+          if (this.logServer.length)
+          {
+            let newState = this.logServer[0].copy();
+            for (let i = 1; i < this.logServer.length; i++)
+              newState.compose(this.logServer[i]);
+            if (newState.tryCompose(a))
+            {
+              console.log('otserverengine: actually... rejected event would succeed on composed log, so patching');
+              this.stateServer = newState;
+              bFail = false;
+            }
+            else
+              console.log('otserverengine: and... rejected event also fails on composed log');
+          }
+          else
+            console.log('otserverengine: and... no log to try to patch state with');
+
+          if (bFail)
+          {
+            this.forgetEvents(orig);
+            return OTS.EClockReset;
+          }
+        }
+
         a.clock = this.stateServer.clock + 1;
         this.stateServer.compose(a);
+
         this.resetCaches();
         this.emit('state');
         this.logServer.push(a.copy());

package/lib/ot-js/otsession.ts

@@ -115,6 +115,7 @@ export interface SessionProps
   requestCount: number;
   deleted: boolean;
   published?: string;
+  locked?: boolean;
   official: boolean;
 	loadFailed: boolean;
   accessMap: AccessMap;
@@ -138,6 +139,7 @@ export interface SessionUpdateProps
 	deleted?: boolean;
 	published?: boolean;
 	official?: boolean;
+  locked?: boolean;
   name?: string;
   description?: string;
   labelupdate?: LabelUpdate;

package/lib/ot-js/ottypes.ts

@@ -20,9 +20,14 @@ export interface IOTResource
 	// Core OT algorithm for this type
 	transform(rhs: IOTResource, bPriorIsService: boolean): void;			// throws on error
 
+  tryTransform(rhs: IOTResource, bPriorIsService: boolean): boolean;
+
 	// compose two edit actions
 	compose(rhs: IOTResource): void; 			// throws on error
 
+  // tests if compose would succeed, false on failure to prevent throwing during compose and leaving in partial state
+  tryCompose(rhs: IOTResource): boolean
+
 	// apply this edit to an existing value, returning new value (if underlying type is mutable, may modify input)
 	apply(startValue: any): any;
 
@@ -79,12 +84,24 @@ export class OTResourceBase implements IOTResource
 			throw "OTResourceBase.transform must be overridden in subclass";
 		}
 
+  // Test if transform would succeed, false on failure
+  tryTransform(rhs: OTResourceBase, bPriorIsServer: boolean): boolean
+    {
+      return true;
+    }
+
 	// compose two edit actions
 	compose(rhs: OTResourceBase): void
 		{
 			throw "OTResourceBase.compose must be overridden in subclass";
 		}
 
+  // test compose
+  tryCompose(rhs: OTResourceBase): boolean
+    {
+      return true;
+    }
+
 	// apply this edit to an existing value, returning new value (if underlying type is mutable, may modify input)
 	apply(startValue: any): any
 		{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dra2020/baseclient",
-  "version": "1.0.121",
+  "version": "1.0.123",
   "description": "Utility functions for Javascript projects.",
   "main": "dist/baseclient.js",
   "types": "./dist/all/all.d.ts",