npm - @verdant-web/server - Versions diffs - 3.3.3 → 3.3.4-alpha.1 - Mend

@verdant-web/server 3.3.3 → 3.3.4-alpha.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (16) hide show

package/LICENSE +21 -650
package/dist/esm/ServerLibrary.d.ts +6 -0
package/dist/esm/ServerLibrary.js +48 -14
package/dist/esm/ServerLibrary.js.map +1 -1
package/dist/esm/storage/Storage.d.ts +1 -1
package/dist/esm/storage/sql/SqlOperations.d.ts +1 -1
package/dist/esm/storage/sql/SqlOperations.js +17 -5
package/dist/esm/storage/sql/SqlOperations.js.map +1 -1
package/dist/esm/storage/sqlShard/SqlOperations.d.ts +1 -1
package/dist/esm/storage/sqlShard/SqlOperations.js +23 -8
package/dist/esm/storage/sqlShard/SqlOperations.js.map +1 -1
package/package.json +2 -2
package/src/ServerLibrary.ts +93 -22
package/src/storage/Storage.ts +1 -1
package/src/storage/sql/SqlOperations.ts +17 -8
package/src/storage/sqlShard/SqlOperations.ts +31 -24

package/dist/esm/ServerLibrary.d.ts CHANGED Viewed

@@ -34,6 +34,12 @@ export declare class ServerLibrary extends EventSubscriber<ServerLibraryEvents>
     receive: (message: ClientMessage, clientKey: string, info: TokenInfo) => Promise<void>;
     remove: (libraryId: string, replicaId: string) => void;
     private handleOperation;
+    /**
+     * If a replica inserts operations when it's already
+     * up to date, we can preemptively update its ackedServerOrder
+     * to avoid a round trip.
+     */
+    private preemptiveUpdateServerOrder;
     private rebroadcastOperations;
     private handleSync;
     private createAckNonce;

package/dist/esm/ServerLibrary.js CHANGED Viewed

@@ -69,9 +69,14 @@ export class ServerLibrary extends EventSubscriber {
             }
             // rebroadcast to whole library except the sender
             this.rebroadcastOperations(info.libraryId, clientKey, message.replicaId, message.operations);
-            // TODO: can we defer this and rebroadcast in parallel?
             // insert patches into history
-            await this.storage.operations.insertAll(info.libraryId, message.replicaId, message.operations);
+            // first, record the replica's serverOrder before insertion.
+            const replicaInfo = await this.storage.replicas.getOrCreate(info.libraryId, message.replicaId, {
+                userId: info.userId,
+                type: info.type,
+            });
+            const newServerOrder = await this.storage.operations.insertAll(info.libraryId, message.replicaId, message.operations);
+            this.preemptiveUpdateServerOrder(replicaInfo.replicaInfo, newServerOrder, message.operations.length);
             this.enqueueRebase(info.libraryId);
             // tell sender we got and processed their operation
             this.sender.send(info.libraryId, clientKey, {
@@ -81,6 +86,18 @@ export class ServerLibrary extends EventSubscriber {
             await this.updateHighwater(message.replicaId, message.operations[message.operations.length - 1].timestamp, info);
             this.emit(`changes`, info, message.operations, []);
         };
+        /**
+         * If a replica inserts operations when it's already
+         * up to date, we can preemptively update its ackedServerOrder
+         * to avoid a round trip.
+         */
+        this.preemptiveUpdateServerOrder = async (replicaInfo, newServerOrder, insertedOperationsCount) => {
+            if (newServerOrder - replicaInfo.ackedServerOrder ===
+                insertedOperationsCount) {
+                await this.storage.replicas.updateAckedServerOrder(replicaInfo.libraryId, replicaInfo.id, newServerOrder);
+                this.log('debug', 'Preemptively updated ackedServerOrder for', replicaInfo.id, 'to', newServerOrder);
+            }
+        };
         this.rebroadcastOperations = async (libraryId, clientKey, replicaId, ops, baselines) => {
             var _a, _b;
             if (ops.length === 0 && !(baselines === null || baselines === void 0 ? void 0 : baselines.length))
@@ -112,14 +129,23 @@ export class ServerLibrary extends EventSubscriber {
                 await this.storage.replicas.delete(info.libraryId, replicaId);
             }
             const { status, replicaInfo: clientReplicaInfo } = await this.storage.replicas.getOrCreate(info.libraryId, replicaId, info);
-            const changesSince = status === 'existing' ? clientReplicaInfo.ackedLogicalTime : null;
-            this.log('info', `Sync from ${replicaId} (user: ${info.userId}) [ackedLogicalTime: ${changesSince}, ackedServerOrder: ${clientReplicaInfo.ackedServerOrder}, status: ${status}}]`);
+            this.log('info', `Sync from ${replicaId} (user: ${info.userId}) [ackedServerOrder: ${clientReplicaInfo.ackedServerOrder}, status: ${status}}]`);
+            // for truant replicas -- if their ackedServerOrder is up-to-date, that's fine,
+            // restore them.
+            let overrideTruant = false;
+            if (status === 'truant') {
+                const latestServerOrder = await this.storage.operations.getLatestServerOrder(info.libraryId);
+                if (clientReplicaInfo.ackedServerOrder >= latestServerOrder) {
+                    overrideTruant = true;
+                    this.log('debug', 'Overriding truant reset; truant replica has up-to-date server order');
+                }
+            }
             // lookup operations after the last ack the client gave us
             const ops = await this.storage.operations.getAfterServerOrder(info.libraryId, clientReplicaInfo.ackedServerOrder);
             // new, unseen replicas should reset their existing storage
             // to that of the server when joining a library.
             // truant replicas should also reset their storage.
-            const replicaShouldReset = !!message.resyncAll || status !== 'existing';
+            const replicaShouldReset = !!message.resyncAll || (!overrideTruant && status !== 'existing');
             // only new replicas need baselines. by definition, a rebase only
             // happens when all active replicas agree on history. every client
             // replica will generate the same baseline locally, so it
@@ -129,13 +155,15 @@ export class ServerLibrary extends EventSubscriber {
                 : [];
             // We detect that a library is new by checking if it has any history.
             // If there are no existing operations or baselines (and the requested
-            // history timerange was "everything", i.e. "from null"), then this is
+            // history timerange was "everything", i.e. "from server order 0"), then this is
             // a fresh library which should receive the first client's history as its
             // own. Otherwise, if the client requested a reset, we should send them
             // the full history of the library.
             // the definition of this field could be improved to be more explicit
             // and not rely on seemingly unrelated data.
-            const isEmptyLibrary = changesSince === null && ops.length === 0 && baselines.length === 0;
+            const isEmptyLibrary = clientReplicaInfo.ackedServerOrder === 0 &&
+                ops.length === 0 &&
+                baselines.length === 0;
             if (isEmptyLibrary) {
                 this.log('info', 'Received sync from new library', replicaId);
                 // when initializing a new library, rewrite authz subjects to
@@ -146,10 +174,12 @@ export class ServerLibrary extends EventSubscriber {
             }
             // don't reset replica if library is empty...
             let overwriteReplicaData = replicaShouldReset && !isEmptyLibrary;
+            // EARLY RETURN --
             // if the local library is empty and the replica is new to us,
             // but the replica is providing a "since" timestamp, this
             // suggests the local data is incomplete or gone. we request
-            // this replica should respond with a full history.
+            // this replica should respond with a full history. We will retry
+            // sync after replica has updated us with full history.
             if (isEmptyLibrary && status === 'new' && message.since !== null) {
                 this.log('info', 'Detected local data is incomplete, requesting full history from replica', replicaId);
                 this.sender.send(info.libraryId, clientKey, {
@@ -174,7 +204,8 @@ export class ServerLibrary extends EventSubscriber {
                 // store all incoming operations and baselines
                 await this.storage.baselines.insertAll(info.libraryId, message.baselines);
                 this.log('debug', 'Storing', message.baselines.length, 'baselines and', message.operations.length, 'operations');
-                await this.storage.operations.insertAll(info.libraryId, replicaId, message.operations);
+                const newServerOrder = await this.storage.operations.insertAll(info.libraryId, replicaId, message.operations);
+                this.preemptiveUpdateServerOrder(clientReplicaInfo, newServerOrder, message.operations.length);
                 await this.storage.replicas.updateAcknowledgedLogicalTime(info.libraryId, replicaId, message.timestamp);
                 // will include the new global ack
                 this.rebroadcastOperations(info.libraryId, clientKey, message.replicaId, message.operations,
@@ -191,7 +222,12 @@ export class ServerLibrary extends EventSubscriber {
                 this.log('info', 'A truant replica has reconnected', replicaId);
             }
             // create the nonce by encoding the server order of the last operation
-            const ackThisNonce = this.createAckNonce(ops);
+            const serverOrderToAck = ops.length
+                ? ops[ops.length - 1].serverOrder
+                : undefined;
+            const ackThisNonce = serverOrderToAck !== undefined
+                ? this.createAckNonce(serverOrderToAck)
+                : undefined;
             // respond to client
             this.log('info', 'Sending sync response with', ops.length, 'operations and', baselines.length, 'baselines');
             // mutating baselines/operations to remove extra data -
@@ -210,10 +246,8 @@ export class ServerLibrary extends EventSubscriber {
                 ackThisNonce,
             });
         };
-        this.createAckNonce = (ops) => {
-            return ops.length
-                ? Buffer.from(JSON.stringify(ops[ops.length - 1].serverOrder)).toString('base64')
-                : undefined;
+        this.createAckNonce = (serverOrder) => {
+            return Buffer.from(JSON.stringify(serverOrder)).toString('base64');
         };
         this.handleAck = async (message, clientKey, info) => {
             if (message.nonce) {

package/dist/esm/ServerLibrary.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ServerLibrary.js","sourceRoot":"","sources":["../../src/ServerLibrary.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"ServerLibrary.js","sourceRoot":"","sources":["../../src/ServerLibrary.ts"],"names":[],"mappings":"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"}

package/dist/esm/storage/Storage.d.ts CHANGED Viewed

@@ -30,7 +30,7 @@ export interface OperationStorage {
     getAfterServerOrder(libraryId: string, afterServerOrder: number): Promise<StoredOperation[]>;
     getLatestServerOrder(libraryId: string): Promise<number>;
     getCount(libraryId: string): Promise<number>;
-    insertAll(libraryId: string, replicaId: string, operations: Operation[]): Promise<void>;
+    insertAll(libraryId: string, replicaId: string, operations: Operation[]): Promise<number>;
     deleteAll(libraryId: string): Promise<void>;
     delete(libraryId: string, operations: Operation[]): Promise<void>;
 }

package/dist/esm/storage/sql/SqlOperations.d.ts CHANGED Viewed

@@ -13,7 +13,7 @@ export declare class SqlOperations implements OperationStorage {
     getAfterServerOrder: (libraryId: string, afterServerOrder: number) => Promise<StoredOperation[]>;
     getLatestServerOrder: (libraryId: string) => Promise<number>;
     getCount: (libraryId: string) => Promise<number>;
-    insertAll: (libraryId: string, replicaId: string, operations: Operation[]) => Promise<void>;
+    insertAll: (libraryId: string, replicaId: string, operations: Operation[]) => Promise<number>;
     deleteAll: (libraryId: string) => Promise<void>;
     delete: (libraryId: string, operations: Operation[]) => Promise<void>;
 }

package/dist/esm/storage/sql/SqlOperations.js CHANGED Viewed

@@ -60,16 +60,19 @@ export class SqlOperations {
         this.insertAll = async (libraryId, replicaId, operations) => {
             // inserts all operations and updates server order
             // FIXME: this whole thing is kinda sus
-            await this.db.transaction().execute(async (tx) => {
+            return await this.db.transaction().execute(async (tx) => {
                 var _a;
                 let orderResult = await tx
                     .selectFrom('OperationHistory')
-                    .select(({ fn, val }) => fn.coalesce(fn.max('serverOrder'), val(0)).as('serverOrder'))
+                    .select('serverOrder')
                     .where('libraryId', '=', libraryId)
+                    .orderBy('serverOrder', 'desc')
+                    .limit(1)
                     .executeTakeFirst();
                 let currentServerOrder = (_a = orderResult === null || orderResult === void 0 ? void 0 : orderResult.serverOrder) !== null && _a !== void 0 ? _a : 0;
                 for (const item of operations) {
-                    await tx
+                    // utilizing returned serverOrder accommodates for conflicts
+                    const result = await tx
                         .insertInto('OperationHistory')
                         .values({
                         libraryId,
@@ -77,14 +80,23 @@ export class SqlOperations {
                         data: JSON.stringify(item.data),
                         timestamp: item.timestamp,
                         replicaId,
-                        serverOrder: ++currentServerOrder,
+                        serverOrder: currentServerOrder + 1,
                         authz: item.authz,
                     })
                         .onConflict((cb) => cb
                         .columns(['libraryId', 'replicaId', 'oid', 'timestamp'])
                         .doNothing())
-                        .execute();
+                        .returning('serverOrder')
+                        .executeTakeFirst();
+                    if (result) {
+                        currentServerOrder = result.serverOrder;
+                    }
+                    else {
+                        // on conflict, nothing is returned.
+                        // this would mean an operation was synced twice
+                    }
                 }
+                return currentServerOrder;
             });
         };
         this.deleteAll = async (libraryId) => {

package/dist/esm/storage/sql/SqlOperations.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SqlOperations.js","sourceRoot":"","sources":["../../../../src/storage/sql/SqlOperations.ts"],"names":[],"mappings":"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~~EACP~~,EAAE;~~YAClB~~,kDAAkD;YAClD,uCAAuC;YACvC,MAAM,IAAI,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,~~EAAiB~~,EAAE;;~~gBAC/D~~,IAAI,WAAW,GAAG,MAAM,EAAE;qBACxB,UAAU,CAAC,kBAAkB,CAAC;qBAC9B,MAAM,CAAC,CAAC,~~EAAE~~,~~EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,CACvB,EAAE,~~CAAC,~~QAAQ~~,~~CAAC,~~EAAE,~~CAAC,~~GAAG,~~CAAS,aAAa,CAAC,~~EAAE,~~GAAG~~,CAAC,~~CAAC~~,CAAC,~~CAAC~~,~~CAAC,~~EAAE,~~CAAC~~,~~aAAa,~~CAAC~~,CACpE~~;~~qBACA~~,KAAK,CAAC,~~WAAW~~,~~EAAE,GAAG,EAAE,SAAS,~~CAAC;~~qBAClC~~,gBAAgB,EAAE,CAAC;gBACrB,IAAI,kBAAkB,GAAG,MAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,WAAW,mCAAI,CAAC,CAAC;gBACvD,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;oBAC/B,MAAM,EAAE;~~yBACN~~,UAAU,CAAC,kBAAkB,CAAC;yBAC9B,MAAM,CAAC;wBACP,SAAS;wBACT,GAAG,EAAE,IAAI,CAAC,GAAG;wBACb,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC;wBAC/B,SAAS,EAAE,IAAI,CAAC,SAAS;wBACzB,SAAS;wBACT,WAAW,EAAE,~~EAAE~~,~~kBAAkB~~;~~wBACjC~~,KAAK,EAAE,IAAI,CAAC,KAAK;qBACjB,CAAC;yBACD,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,CAClB,EAAE;yBACA,OAAO,CAAC,CAAC,WAAW,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;yBACvD,SAAS,EAAE,CACb;yBACA,~~OAAO~~,EAAE,CAAC;~~gBACb~~,CAAC;~~YACF~~,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC;QAEF,cAAS,GAAG,KAAK,EAAE,SAAiB,EAAiB,EAAE;YACtD,MAAM,IAAI,CAAC,EAAE;iBACX,UAAU,CAAC,kBAAkB,CAAC;iBAC9B,KAAK,CAAC,WAAW,EAAE,GAAG,EAAE,SAAS,CAAC;iBAClC,OAAO,EAAE,CAAC;QACb,CAAC,CAAC;QACF,WAAM,GAAG,KAAK,EACb,SAAiB,EACjB,UAAuB,EACP,EAAE;YAClB,MAAM,IAAI,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;gBAChD,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;oBAC/B,MAAM,EAAE;yBACN,UAAU,CAAC,kBAAkB,CAAC;yBAC9B,KAAK,CAAC,WAAW,EAAE,GAAG,EAAE,SAAS,CAAC;yBAClC,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC;yBAC3B,KAAK,CAAC,WAAW,EAAE,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC;yBACvC,OAAO,EAAE,CAAC;gBACb,CAAC;YACF,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC;~~IA3IC~~,CAAC;~~CA4IJ~~"}
1	+ {"version":3,"file":"SqlOperations.js","sourceRoot":"","sources":["../../../../src/storage/sql/SqlOperations.ts"],"names":[],"mappings":"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"}

package/dist/esm/storage/sqlShard/SqlOperations.d.ts CHANGED Viewed

@@ -12,7 +12,7 @@ export declare class SqlOperations implements OperationStorage {
     getAfterServerOrder: (libraryId: string, afterServerOrder: number) => Promise<StoredOperation[]>;
     getLatestServerOrder: (libraryId: string) => Promise<number>;
     getCount: (libraryId: string) => Promise<number>;
-    insertAll: (libraryId: string, replicaId: string, operations: Operation[]) => Promise<void>;
+    insertAll: (libraryId: string, replicaId: string, operations: Operation[]) => Promise<number>;
     deleteAll: (libraryId: string) => Promise<void>;
     delete: (libraryId: string, operations: Operation[]) => Promise<void>;
 }

package/dist/esm/storage/sqlShard/SqlOperations.js CHANGED Viewed

@@ -40,14 +40,17 @@ export class SqlOperations {
             return raw;
         };
         this.getLatestServerOrder = async (libraryId) => {
-            var _a, _b;
             const db = await this.dbs.get(libraryId);
-            return ((_b = (_a = (await db
+            const result = await db
                 .selectFrom('OperationHistory')
                 .orderBy('serverOrder', 'desc')
                 .select('serverOrder')
                 .limit(1)
-                .executeTakeFirst())) === null || _a === void 0 ? void 0 : _a.serverOrder) !== null && _b !== void 0 ? _b : 0);
+                .executeTakeFirst();
+            if (result) {
+                return result.serverOrder;
+            }
+            return 0;
         };
         this.getCount = async (libraryId) => {
             var _a, _b;
@@ -61,27 +64,39 @@ export class SqlOperations {
             const db = await this.dbs.get(libraryId);
             // inserts all operations and updates server order
             // FIXME: this whole thing is kinda sus
-            await db.transaction().execute(async (tx) => {
+            return await db.transaction().execute(async (tx) => {
                 var _a;
                 let orderResult = await tx
                     .selectFrom('OperationHistory')
-                    .select(({ fn, val }) => fn.coalesce(fn.max('serverOrder'), val(0)).as('serverOrder'))
+                    .select('serverOrder')
+                    .orderBy('serverOrder', 'desc')
+                    .limit(1)
                     .executeTakeFirst();
                 let currentServerOrder = (_a = orderResult === null || orderResult === void 0 ? void 0 : orderResult.serverOrder) !== null && _a !== void 0 ? _a : 0;
                 for (const item of operations) {
-                    await tx
+                    // utilizing returned serverOrder accommodates for conflicts
+                    const result = await tx
                         .insertInto('OperationHistory')
                         .values({
                         oid: item.oid,
                         data: JSON.stringify(item.data),
                         timestamp: item.timestamp,
                         replicaId,
-                        serverOrder: ++currentServerOrder,
+                        serverOrder: currentServerOrder + 1,
                         authz: item.authz,
                     })
                         .onConflict((cb) => cb.columns(['replicaId', 'oid', 'timestamp']).doNothing())
-                        .execute();
+                        .returning('serverOrder')
+                        .executeTakeFirst();
+                    if (result) {
+                        currentServerOrder = result.serverOrder;
+                    }
+                    else {
+                        // on conflict, nothing is returned.
+                        // this would mean an operation was synced twice.
+                    }
                 }
+                return currentServerOrder;
             });
         };
         this.deleteAll = async (libraryId) => {

package/dist/esm/storage/sqlShard/SqlOperations.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SqlOperations.js","sourceRoot":"","sources":["../../../../src/storage/sqlShard/SqlOperations.ts"],"names":[],"mappings":"~~AAOA~~,MAAM,OAAO,aAAa;IACzB,~~YACS~~,GAAc,~~EACd~~,OAA8B;~~QAD9B~~,QAAG,GAAH,GAAG,CAAW;~~QACd~~,YAAO,GAAP,OAAO,CAAuB;~~QAG/B~~,YAAO,GAAG,CAAC,GAAwB,EAAE,EAAE;YAC9C,6DAA6D;YAC7D,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACjC,CAAC,CAAC;QAEF,WAAM,GAAG,KAAK,EACb,SAAiB,EACjB,GAAW,EACkB,EAAE;YAC/B,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACzC,MAAM,GAAG,GAAG,MAAM,EAAE;iBAClB,UAAU,CAAC,kBAAkB,CAAC;iBAC9B,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC;iBACtB,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC;iBAC3B,SAAS,EAAE;iBACX,OAAO,EAAE,CAAC;YAEZ,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC1B,OAAO,GAAmC,CAAC;QAC5C,CAAC,CAAC;QAEF,yBAAoB,GAAG,KAAK,EAC3B,SAAiB,EACjB,iBAAyB,EACI,EAAE;YAC/B,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACzC,MAAM,GAAG,GAAG,MAAM,EAAE;iBAClB,UAAU,CAAC,kBAAkB,CAAC;iBAC9B,KAAK,CAAC,aAAa,EAAE,GAAG,EAAE,iBAAiB,CAAC;iBAC5C,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC;iBAC3B,SAAS,EAAE;iBACX,OAAO,EAAE,CAAC;YAEZ,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC1B,OAAO,GAAmC,CAAC;QAC5C,CAAC,CAAC;QAEF,wBAAmB,GAAG,KAAK,EAC1B,SAAiB,EACjB,gBAAwB,EACK,EAAE;YAC/B,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACzC,MAAM,GAAG,GAAG,MAAM,EAAE;iBAClB,UAAU,CAAC,kBAAkB,CAAC;iBAC9B,KAAK,CAAC,aAAa,EAAE,GAAG,EAAE,gBAAgB,CAAC;iBAC3C,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC;iBAC3B,SAAS,EAAE;iBACX,OAAO,EAAE,CAAC;YAEZ,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC1B,OAAO,GAAmC,CAAC;QAC5C,CAAC,CAAC;QAEF,yBAAoB,GAAG,KAAK,EAAE,SAAiB,EAAmB,EAAE;;YACnE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACzC,~~OAAO~~,~~CACN~~,~~MAAA~~,~~MAAA,CACC,~~MAAM,EAAE;~~iBACN~~,UAAU,CAAC,kBAAkB,CAAC;iBAC9B,OAAO,CAAC,aAAa,EAAE,MAAM,CAAC;iBAC9B,MAAM,CAAC,aAAa,CAAC;iBACrB,KAAK,CAAC,CAAC,CAAC;iBACR,gBAAgB,EAAE,~~CACpB~~,~~0CAAE~~,WAAW,~~mCAAI~~,CAAC,~~CACnB~~,CAAC;~~QACH~~,CAAC,CAAC;QAEF,aAAQ,GAAG,KAAK,EAAE,SAAiB,EAAmB,EAAE;;YACvD,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACzC,OAAO,CACN,MAAA,MAAA,CACC,MAAM,EAAE;iBACN,UAAU,CAAC,kBAAkB,CAAC;iBAC9B,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAU,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;iBACrD,gBAAgB,EAAE,CACpB,0CAAE,KAAK,mCAAI,CAAC,CACb,CAAC;QACH,CAAC,CAAC;QAEF,cAAS,GAAG,KAAK,EAChB,SAAiB,EACjB,SAAiB,EACjB,UAAuB,~~EACP~~,EAAE;~~YAClB~~,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACzC,kDAAkD;YAClD,uCAAuC;YACvC,MAAM,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,~~EAAiB~~,EAAE;;~~gBAC1D~~,IAAI,WAAW,GAAG,MAAM,EAAE;qBACxB,UAAU,CAAC,kBAAkB,CAAC;qBAC9B,MAAM,CAAC,~~CAAC~~,~~EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,CACvB,EAAE,~~CAAC,~~QAAQ~~,CAAC,~~EAAE,CAAC,GAAG,CAAS,~~aAAa,~~CAAC,~~EAAE,~~GAAG~~,CAAC,~~CAAC~~,CAAC,CAAC,CAAC~~,EAAE,CAAC,aAAa,CAAC,CACpE~~;~~qBACA~~,gBAAgB,EAAE,CAAC;gBACrB,IAAI,kBAAkB,GAAG,MAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,WAAW,mCAAI,CAAC,CAAC;gBACvD,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;oBAC/B,MAAM,EAAE;~~yBACN~~,UAAU,CAAC,kBAAkB,CAAC;yBAC9B,MAAM,CAAC;wBACP,GAAG,EAAE,IAAI,CAAC,GAAG;wBACb,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC;wBAC/B,SAAS,EAAE,IAAI,CAAC,SAAS;wBACzB,SAAS;wBACT,WAAW,EAAE,~~EAAE~~,~~kBAAkB~~;~~wBACjC~~,KAAK,EAAE,IAAI,CAAC,KAAK;qBACjB,CAAC;yBACD,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,CAClB,EAAE,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,SAAS,EAAE,CACzD;yBACA,~~OAAO~~,EAAE,CAAC;~~gBACb~~,CAAC;~~YACF~~,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC;QAEF,cAAS,GAAG,KAAK,EAAE,SAAiB,EAAiB,EAAE;YACtD,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACzC,MAAM,EAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,OAAO,EAAE,CAAC;QACnD,CAAC,CAAC;QACF,WAAM,GAAG,KAAK,EACb,SAAiB,EACjB,UAAuB,EACP,EAAE;YAClB,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACzC,MAAM,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;gBAC3C,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;oBAC/B,MAAM,EAAE;yBACN,UAAU,CAAC,kBAAkB,CAAC;yBAC9B,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC;yBAC3B,KAAK,CAAC,WAAW,EAAE,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC;yBACvC,OAAO,EAAE,CAAC;gBACb,CAAC;YACF,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC;~~IAtIC~~,CAAC;~~CAuIJ~~"}
1	+ {"version":3,"file":"SqlOperations.js","sourceRoot":"","sources":["../../../../src/storage/sqlShard/SqlOperations.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@verdant-web/server",
-  "version": "3.3.3",
+  "version": "3.3.4-alpha.1",
   "access": "public",
   "type": "module",
   "bin": {
@@ -34,7 +34,7 @@
     "kysely-plugin-serialize": "^0.5.7",
     "minimist": "^1.2.8",
     "ws": "^8.9.0",
-    "@verdant-web/common": "2.6.0"
+    "@verdant-web/common": "2.7.0-alpha.0"
   },
   "devDependencies": {
     "@types/async-lock": "^1.3.0",