@casual-simulation/aux-records 3.8.1 → 3.10.2

package/websockets/WebsocketController.js

@@ -5,13 +5,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { action, createInitializationUpdate, hasValue, ON_WEBHOOK_ACTION_NAME, } from '@casual-simulation/aux-common/bots';
-import { constructInitializationUpdate, YjsPartitionImpl, } from '@casual-simulation/aux-common/partitions';
+import { constructInitializationUpdate, updateToNewStateUpdate, YjsPartitionImpl, } from '@casual-simulation/aux-common/partitions';
 import { device, deviceError, deviceResult, } from '@casual-simulation/aux-common/common/RemoteActions';
 import { fromByteArray, toByteArray } from 'base64-js';
 import { applyUpdate, Doc, encodeStateAsUpdate } from 'yjs';
 import { WebsocketEventTypes } from '@casual-simulation/aux-common/websockets/WebsocketEvents';
 import { sumBy } from 'es-toolkit/compat';
-import { PRIVATE_MARKER, DEFAULT_BRANCH_NAME, tryParseJson, parseRecordKey, PUBLIC_READ_MARKER, } from '@casual-simulation/aux-common';
+import { PRIVATE_MARKER, DEFAULT_BRANCH_NAME, tryParseJson, parseRecordKey, PUBLIC_READ_MARKER, failure, isFailure, genericResult, success, compareVersions, } from '@casual-simulation/aux-common';
 import { getMarkerResourcesForCreation } from '../PolicyController';
 import { SplitInstRecordsStore } from './SplitInstRecordsStore';
 import { v4 as uuid, v7 as uuidv7 } from 'uuid';
@@ -127,7 +127,6 @@ export class WebsocketController {
         }
     }
     async disconnect(connectionId) {
-        var _a;
         const loadedConnections = await this._connectionStore.getConnections(connectionId);
         await this._connectionStore.clearConnection(connectionId);
         for (let connection of loadedConnections) {
@@ -135,8 +134,9 @@ export class WebsocketController {
                 if (connection.temporary) {
                     const count = await this._connectionStore.countConnectionsByBranch(connection.mode, connection.recordName, connection.inst, connection.branch);
                     if (count <= 0) {
-                        const branch = (_a = (await this._instStore.getBranchByName(connection.recordName, connection.inst, connection.branch))) !== null && _a !== void 0 ? _a : (await this._temporaryStore.getBranchByName(connection.recordName, connection.inst, connection.branch));
-                        if (branch === null || branch === void 0 ? void 0 : branch.temporary) {
+                        const branch = (await this._instStore.getBranchByName(connection.recordName, connection.inst, connection.branch)) ??
+                            (await this._temporaryStore.getBranchByName(connection.recordName, connection.inst, connection.branch));
+                        if (branch?.temporary) {
                             console.log('[WebsocketController] Deleting temporary branch', connection.recordName, connection.inst, connection.branch);
                             await this._temporaryStore.deleteBranch(connection.recordName, connection.inst, connection.branch);
                             await this._instStore.deleteBranch(connection.recordName, connection.inst, connection.branch);
@@ -156,7 +156,6 @@ export class WebsocketController {
         }
     }
     async watchBranch(connectionId, event) {
-        var _a, _b, _c, _d;
         if (!event) {
             console.warn('[CasualRepoServer] Trying to watch branch with a null event!');
             return;
@@ -201,7 +200,7 @@ export class WebsocketController {
         }
         const config = await this._config.getSubscriptionConfiguration();
         if (!recordName) {
-            if (((_b = (_a = config === null || config === void 0 ? void 0 : config.defaultFeatures) === null || _a === void 0 ? void 0 : _a.publicInsts) === null || _b === void 0 ? void 0 : _b.allowed) === false) {
+            if (config?.defaultFeatures?.publicInsts?.allowed === false) {
                 await this.messenger.sendMessage([connectionId], {
                     type: 'repo/watch_branch_result',
                     success: false,
@@ -233,7 +232,8 @@ export class WebsocketController {
             maxConnections = features.insts.maxActiveConnectionsPerInst;
         }
         else if (!recordName &&
-            typeof ((_d = (_c = config === null || config === void 0 ? void 0 : config.defaultFeatures) === null || _c === void 0 ? void 0 : _c.publicInsts) === null || _d === void 0 ? void 0 : _d.maxActiveConnectionsPerInst) === 'number') {
+            typeof config?.defaultFeatures?.publicInsts
+                ?.maxActiveConnectionsPerInst === 'number') {
             maxConnections =
                 config.defaultFeatures.publicInsts.maxActiveConnectionsPerInst;
         }
@@ -309,7 +309,6 @@ export class WebsocketController {
         await Promise.all(promises);
     }
     async unwatchBranch(connectionId, recordName, inst, branch) {
-        var _a;
         if (!branch) {
             console.warn('[CasualRepoServer] Trying to unwatch branch with a null event!');
             return;
@@ -321,8 +320,9 @@ export class WebsocketController {
             if (connection.temporary) {
                 const count = await this._connectionStore.countConnectionsByBranch('branch', recordName, inst, branch);
                 if (count <= 0) {
-                    const branch = (_a = (await this._instStore.getBranchByName(connection.recordName, connection.inst, connection.branch))) !== null && _a !== void 0 ? _a : (await this._temporaryStore.getBranchByName(connection.recordName, connection.inst, connection.branch));
-                    if (branch === null || branch === void 0 ? void 0 : branch.temporary) {
+                    const branch = (await this._instStore.getBranchByName(connection.recordName, connection.inst, connection.branch)) ??
+                        (await this._temporaryStore.getBranchByName(connection.recordName, connection.inst, connection.branch));
+                    if (branch?.temporary) {
                         await this._temporaryStore.deleteBranch(connection.recordName, connection.inst, connection.branch);
                         // Delete the branch from the permentent store even if it is temporary
                         // because it is possible that the branch was created before temporary branches were only stored in the temporary store.
@@ -342,7 +342,6 @@ export class WebsocketController {
         }
     }
     async addUpdates(connectionId, event) {
-        var _a, _b, _c, _d, _e;
         if (!event) {
             console.warn('[CasualRepoServer] Trying to add atoms with a null event!');
             return;
@@ -380,12 +379,13 @@ export class WebsocketController {
             }
         }
         if (event.updates) {
-            let branch = (_a = (await this._instStore.getBranchByName(event.recordName, event.inst, event.branch))) !== null && _a !== void 0 ? _a : (await this._temporaryStore.getBranchByName(event.recordName, event.inst, event.branch));
+            let branch = (await this._instStore.getBranchByName(event.recordName, event.inst, event.branch)) ??
+                (await this._temporaryStore.getBranchByName(event.recordName, event.inst, event.branch));
             const updateSize = sumBy(event.updates, (u) => Buffer.byteLength(u, 'utf8'));
             const config = await this._config.getSubscriptionConfiguration();
             let features = null;
             if (!event.recordName) {
-                if (((_c = (_b = config === null || config === void 0 ? void 0 : config.defaultFeatures) === null || _b === void 0 ? void 0 : _b.publicInsts) === null || _c === void 0 ? void 0 : _c.allowed) === false) {
+                if (config?.defaultFeatures?.publicInsts?.allowed === false) {
                     await this.sendError(connectionId, -1, {
                         success: false,
                         errorCode: 'not_authorized',
@@ -545,7 +545,7 @@ export class WebsocketController {
                 maxInstSize = features.insts.maxBytesPerInst;
             }
             else if (!event.recordName &&
-                typeof ((_e = (_d = config === null || config === void 0 ? void 0 : config.defaultFeatures) === null || _d === void 0 ? void 0 : _d.publicInsts) === null || _e === void 0 ? void 0 : _e.maxBytesPerInst) ===
+                typeof config?.defaultFeatures?.publicInsts?.maxBytesPerInst ===
                     'number') {
                 maxInstSize =
                     config.defaultFeatures.publicInsts.maxBytesPerInst;
@@ -630,15 +630,15 @@ export class WebsocketController {
         }
     }
     async addUserUpdates(request) {
-        var _a, _b, _c, _d, _e;
-        console.log(`[CausalRepoServer] [namespace: ${request.recordName}/${request.inst}/${request.branch}, userId: ${request.userId}] Add Updates`);
+        console.log(`[WebsocketController] [namespace: ${request.recordName}/${request.inst}/${request.branch}, userId: ${request.userId}] Add Updates`);
         if (request.updates) {
-            let branch = (_a = (await this._instStore.getBranchByName(request.recordName, request.inst, request.branch))) !== null && _a !== void 0 ? _a : (await this._temporaryStore.getBranchByName(request.recordName, request.inst, request.branch));
+            let branch = (await this._instStore.getBranchByName(request.recordName, request.inst, request.branch)) ??
+                (await this._temporaryStore.getBranchByName(request.recordName, request.inst, request.branch));
             const updateSize = sumBy(request.updates, (u) => Buffer.byteLength(u, 'utf8'));
             const config = await this._config.getSubscriptionConfiguration();
             let features = null;
             if (!request.recordName) {
-                if (((_c = (_b = config === null || config === void 0 ? void 0 : config.defaultFeatures) === null || _b === void 0 ? void 0 : _b.publicInsts) === null || _c === void 0 ? void 0 : _c.allowed) === false) {
+                if (config?.defaultFeatures?.publicInsts?.allowed === false) {
                     return {
                         success: false,
                         errorCode: 'not_authorized',
@@ -647,7 +647,7 @@ export class WebsocketController {
                 }
             }
             if (!branch) {
-                console.log(`[CausalRepoServer] [namespace: ${request.recordName}/${request.inst}/${request.branch}, userId: ${request.userId}]  Branch not found!`);
+                console.log(`[WebsocketController] [namespace: ${request.recordName}/${request.inst}/${request.branch}, userId: ${request.userId}]  Branch not found!`);
                 const instResult = await this._getOrCreateInst(request.recordName, request.inst, request.userId, config, null, undefined);
                 if (instResult.success === false) {
                     return instResult;
@@ -716,7 +716,7 @@ export class WebsocketController {
                 maxInstSize = features.insts.maxBytesPerInst;
             }
             else if (!request.recordName &&
-                typeof ((_e = (_d = config === null || config === void 0 ? void 0 : config.defaultFeatures) === null || _d === void 0 ? void 0 : _d.publicInsts) === null || _e === void 0 ? void 0 : _e.maxBytesPerInst) ===
+                typeof config?.defaultFeatures?.publicInsts?.maxBytesPerInst ===
                     'number') {
                 maxInstSize =
                     config.defaultFeatures.publicInsts.maxBytesPerInst;
@@ -742,7 +742,7 @@ export class WebsocketController {
             else {
                 const result = await this._instStore.addUpdates(request.recordName, request.inst, request.branch, request.updates, updateSize);
                 if (result.success === false) {
-                    console.log(`[CausalRepoServer] [namespace: ${request.recordName}/${request.inst}/${request.branch}, userId: ${request.userId}]  Failed to add updates`, result);
+                    console.log(`[WebsocketController] [namespace: ${request.recordName}/${request.inst}/${request.branch}, userId: ${request.userId}]  Failed to add updates`, result);
                     if (result.errorCode === 'max_size_reached') {
                         if (result.success === false) {
                             return {
@@ -947,7 +947,7 @@ export class WebsocketController {
             ? await this._connectionStore.countConnectionsByBranch('branch', recordName, inst, branch)
             : await this._connectionStore.countConnections();
         const currentConnection = await this._connectionStore.getConnection(connectionId);
-        if (recordName && (currentConnection === null || currentConnection === void 0 ? void 0 : currentConnection.token)) {
+        if (recordName && currentConnection?.token) {
             const authorized = await this._connectionStore.isAuthorizedInst(connectionId, recordName, inst, 'token');
             if (!authorized) {
                 await this.sendError(connectionId, -1, {
@@ -966,7 +966,7 @@ export class WebsocketController {
         }
         if (recordName) {
             const config = await this._config.getSubscriptionConfiguration();
-            const instResult = await this._getInst(recordName, inst, currentConnection === null || currentConnection === void 0 ? void 0 : currentConnection.userId, config);
+            const instResult = await this._getInst(recordName, inst, currentConnection?.userId, config);
             if (instResult.success === false) {
                 await this.sendError(connectionId, -1, instResult);
                 return;
@@ -997,7 +997,6 @@ export class WebsocketController {
      * @param auxVersion The AUX version to return.
      */
     async getBranchData(userId, recordName, inst, branch, auxVersion = 1) {
-        var _a;
         console.log(`[WebsocketController] [namespace: ${recordName}/${inst}/${branch}] Get Data`);
         if (recordName) {
             const config = await this._config.getSubscriptionConfiguration();
@@ -1013,7 +1012,7 @@ export class WebsocketController {
                 };
             }
         }
-        const updates = (_a = (await this._instStore.getCurrentUpdates(recordName, inst, branch))) !== null && _a !== void 0 ? _a : {
+        const updates = (await this._instStore.getCurrentUpdates(recordName, inst, branch)) ?? {
             updates: [],
             timestamps: [],
             instSizeInBytes: 0,
@@ -1111,7 +1110,6 @@ export class WebsocketController {
         }
     }
     async getUpdates(connectionId, recordName, inst, branch) {
-        var _a;
         if (!branch) {
             console.warn('[CasualRepoServer] Trying to get branch with a null branch!');
             return;
@@ -1171,7 +1169,7 @@ export class WebsocketController {
             });
             return;
         }
-        const updates = (_a = (await this._instStore.getAllUpdates(recordName, inst, branch))) !== null && _a !== void 0 ? _a : {
+        const updates = (await this._instStore.getAllUpdates(recordName, inst, branch)) ?? {
             updates: [],
             timestamps: [],
         };
@@ -1411,7 +1409,6 @@ export class WebsocketController {
      * @param request The request to load the package.
      */
     async installPackage(request) {
-        var _a, _b;
         if (!this._packageVersions) {
             return {
                 success: false,
@@ -1420,8 +1417,8 @@ export class WebsocketController {
             };
         }
         const userId = request.userId;
-        const key = (_a = request.package.key) !== null && _a !== void 0 ? _a : {};
-        console.log(`[CausalRepoServer] [namespace: ${request.recordName}/${request.inst}, ${userId}, package: ${request.package.recordName}/${request.package.address}@${formatVersionSpecifier(key)}] Install Package`);
+        const key = request.package.key ?? {};
+        console.log(`[WebsocketController] [namespace: ${request.recordName}/${request.inst}, ${userId}, package: ${request.package.recordName}/${request.package.address}@${formatVersionSpecifier(key)}] Install Package`);
         const p = await this._packageVersions.getItem({
             recordName: request.package.recordName,
             address: request.package.address,
@@ -1430,23 +1427,26 @@ export class WebsocketController {
             instances: request.instances,
         });
         if (p.success === false) {
-            console.error(`[CausalRepoServer] [userId: ${userId}] Unable to load package.`, p);
+            console.error(`[WebsocketController] [userId: ${userId}] Unable to load package.`, p);
             return p;
         }
         if (p.auxFile.success === false) {
-            console.error(`[CausalRepoServer] [userId: ${userId}] Unable to load package file.`, p.auxFile);
+            console.error(`[WebsocketController] [userId: ${userId}] Unable to load package file.`, p.auxFile);
             return p.auxFile;
         }
         const loadedPackageStore = this._instStore;
         const loadedPackage = await loadedPackageStore.isPackageLoaded(request.recordName, request.inst, p.item.packageId);
         if (loadedPackage) {
-            // Already loaded
-            console.log(`[CausalRepoServer] [userId: ${userId}] Package already loaded.`);
-            return {
-                success: true,
-                packageLoadId: loadedPackage.id,
-                package: p.item,
-            };
+            if (loadedPackage.packageVersionId === p.item.id) {
+                // Already loaded
+                console.log(`[WebsocketController] [userId: ${userId}] Package already loaded.`);
+                return {
+                    success: true,
+                    packageLoadId: loadedPackage.id,
+                    package: p.item,
+                };
+            }
+            // try to install a different version
         }
         // check that the user and target inst has the ability to run the package
         const context = await this._policies.constructAuthorizationContext({
@@ -1467,61 +1467,65 @@ export class WebsocketController {
         if (authorization.success === false) {
             return authorization;
         }
-        const fileResponse = await fetch(p.auxFile.requestUrl, {
-            method: p.auxFile.requestMethod,
-            headers: new Headers(p.auxFile.requestHeaders),
-        });
-        if (fileResponse.status >= 300) {
-            console.error(`[CausalRepoServer] [userId: ${userId}] Unable to load package file.`);
-            // Failed
-            return {
-                success: false,
-                errorCode: 'invalid_file_data',
-                errorMessage: 'The package file could not be loaded.',
-            };
+        const packageData = await this._loadPackageVersion(userId, p);
+        if (isFailure(packageData)) {
+            return genericResult(packageData);
         }
-        const json = await fileResponse.text();
-        const packageData = tryParseJson(json);
-        if (packageData.success === false) {
-            console.error(`[CausalRepoServer] [userId: ${userId}] Unable to parse package file.`, packageData);
-            return {
-                success: false,
-                errorCode: 'invalid_file_data',
-                errorMessage: 'The package file could not be parsed. It must be valid JSON.',
-            };
-        }
-        const parsed = STORED_AUX_SCHEMA.safeParse(packageData.value);
-        if (parsed.success === false) {
-            console.error(`[CausalRepoServer] [userId: ${userId}] Unable to parse package file.`, packageData);
-            return {
-                success: false,
-                errorCode: 'invalid_file_data',
-                errorMessage: 'The package file could not be parsed.',
-                issues: parsed.error.issues,
-            };
-        }
-        const updates = parsed.data.version === 2
-            ? parsed.data.updates.map((u) => u.update)
+        let updates = packageData.value.version === 2
+            ? packageData.value.updates
             : [
-                constructInitializationUpdate(createInitializationUpdate(Object.values(parsed.data.state))).update,
+                constructInitializationUpdate(createInitializationUpdate(Object.values(packageData.value.state))),
             ];
-        const timestamps = parsed.data.version === 2
-            ? parsed.data.updates.map((u) => u.timestamp)
-            : [0];
-        const branch = (_b = request.branch) !== null && _b !== void 0 ? _b : DEFAULT_BRANCH_NAME;
+        const branch = request.branch ?? DEFAULT_BRANCH_NAME;
+        if (loadedPackage) {
+            // Different version
+            const existingPackageVersion = await this._packageVersions.getItemById({
+                packageVersionId: loadedPackage.packageVersionId,
+                userId: userId,
+                instances: request.instances,
+            });
+            if (existingPackageVersion.success === false) {
+                console.error(`[WebsocketController] [userId: ${userId}] Unable to get existing package version.`, existingPackageVersion);
+                return existingPackageVersion;
+            }
+            else {
+                if (compareVersions(p.item.key, existingPackageVersion.item.key) <= 0) {
+                    if (!request.downgrade) {
+                        return {
+                            success: false,
+                            errorCode: 'invalid_request',
+                            errorMessage: `Cannot install version ${formatVersionSpecifier(p.item.key)} because a newer version (${formatVersionSpecifier(existingPackageVersion.item.key)}) of this package is already installed. If you want to downgrade the package, you must set the downgrade option to true.`,
+                        };
+                    }
+                    else {
+                        console.log(`[WebsocketController] [userId: ${userId}] Downgrading package from version ${loadedPackage.packageVersionId} to ${p.item.id}.`);
+                    }
+                }
+                const existingUpdates = await this._instStore.getCurrentUpdates(request.recordName, request.inst, branch);
+                updates = [
+                    updateToNewStateUpdate(existingUpdates.updates.map((u, i) => ({
+                        id: i,
+                        update: u,
+                        timestamp: 0,
+                    })), updates),
+                ];
+            }
+        }
+        const updateBase64 = updates.map((u) => u.update);
+        const timestamps = updates.map((u) => u.timestamp);
         const result = await this.addUserUpdates({
             userId: request.userId,
             userRole: request.userRole,
             recordName: request.recordName,
             inst: request.inst,
             branch,
-            updates: updates,
+            updates: updateBase64,
             timestamps: timestamps,
         });
         if (result.success === false) {
             return result;
         }
-        const loadedPackageId = uuidv7();
+        const loadedPackageId = loadedPackage?.id ?? uuidv7();
         await loadedPackageStore.saveLoadedPackage({
             id: loadedPackageId,
             recordName: request.recordName,
@@ -1537,6 +1541,42 @@ export class WebsocketController {
             package: p.item,
         };
     }
+    async _loadPackageVersion(userId, p) {
+        if (p.auxFile.success === false) {
+            return failure(p.auxFile);
+        }
+        const fileResponse = await fetch(p.auxFile.requestUrl, {
+            method: p.auxFile.requestMethod,
+            headers: new Headers(p.auxFile.requestHeaders),
+        });
+        if (fileResponse.status >= 300) {
+            console.error(`[WebsocketController] [userId: ${userId}] Unable to load package file.`);
+            // Failed
+            return failure({
+                errorCode: 'invalid_file_data',
+                errorMessage: 'The package file could not be loaded.',
+            });
+        }
+        const json = await fileResponse.text();
+        const packageData = tryParseJson(json);
+        if (packageData.success === false) {
+            console.error(`[WebsocketController] [userId: ${userId}] Unable to parse package file.`, packageData);
+            return failure({
+                errorCode: 'invalid_file_data',
+                errorMessage: 'The package file could not be parsed. It must be valid JSON.',
+            });
+        }
+        const parsed = STORED_AUX_SCHEMA.safeParse(packageData.value);
+        if (parsed.success === false) {
+            console.error(`[WebsocketController] [userId: ${userId}] Unable to parse package file.`, packageData);
+            return failure({
+                errorCode: 'invalid_file_data',
+                errorMessage: 'The package file could not be parsed.',
+                issues: parsed.error.issues,
+            });
+        }
+        return success(parsed.data);
+    }
     async listInstalledPackages(request) {
         if (!this._packageVersions) {
             return {
@@ -1606,8 +1646,7 @@ export class WebsocketController {
      * @param timeMs The current time in unix time in miliseconds.
      */
     async rateLimitExceeded(connectionId, retryAfter, totalHits, timeMs) {
-        var _a;
-        const lastHit = (_a = (await this._connectionStore.getConnectionRateLimitExceededTime(connectionId))) !== null && _a !== void 0 ? _a : -Infinity;
+        const lastHit = (await this._connectionStore.getConnectionRateLimitExceededTime(connectionId)) ?? -Infinity;
         const difference = timeMs - lastHit;
         await this._connectionStore.setConnectionRateLimitExceededTime(connectionId, timeMs);
         if (difference >= 1000) {