@vived/host 3.11.1 → 3.12.1

package/lib/Components/AppSandbox/Factories/setupAppSandbox.js

@@ -9,6 +9,8 @@ const Entities_3 = require("../Entities");
 const PMs_1 = require("../PMs");
 const UCs_2 = require("../UCs");
 const setupStandardHostHandlers_1 = require("../../Handler/setupStandardHostHandlers");
+const Handler_1 = require("../../Handler");
+const submitActivityAssetHandlerSandbox_1 = require("../UCs/submitActivityAssetHandlerSandbox");
 function setupAppSandbox(appID, appObjects) {
     const ao = appObjects.getOrCreate(appID);
     // Entities
@@ -27,6 +29,10 @@ function setupAppSandbox(appID, appObjects) {
     PMs_1.makeSandboxStatePM(ao);
     PMs_1.makeShowInspectorPM(ao);
     PMs_1.makeStartInZSpacePM(ao);
+    const submitActivityAssetUC = appObjects.getSingleton(Handler_1.SubmitActivityAssetHandler.type);
+    if (submitActivityAssetUC) {
+        submitActivityAssetUC.action = submitActivityAssetHandlerSandbox_1.makeSubmitActivityAssetHandlerSandbox(appObjects);
+    }
     return entity;
 }
 exports.setupAppSandbox = setupAppSandbox;

package/lib/Components/AppSandbox/UCs/submitActivityAssetHandlerSandbox.d.ts

@@ -0,0 +1,3 @@
+import { HostAppObjectRepo } from "../../../HostAppObject";
+import { SubmitActivityAssetAction } from "../../Handler/UCs/SubmitActivityAssetHandler";
+export declare function makeSubmitActivityAssetHandlerSandbox(appObjects: HostAppObjectRepo): SubmitActivityAssetAction;

package/lib/Components/AppSandbox/UCs/submitActivityAssetHandlerSandbox.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeSubmitActivityAssetHandlerSandbox = void 0;
+const __1 = require("..");
+const Assets_1 = require("../../Assets");
+function makeSubmitActivityAssetHandlerSandbox(appObjects) {
+    return function submitActivityAssetHandler(assetFile, callback) {
+        const sandbox = __1.AppSandboxEntity.get(appObjects);
+        if (!sandbox) {
+            appObjects.submitError("makeSubmitActivityAssetHandlerSandbox", "Unable to find AppSandboxEntity");
+            callback(undefined);
+            return;
+        }
+        if (!sandbox.mockActivityID) {
+            appObjects.submitError("makeSubmitActivityAssetHandlerSandbox", "No activity ID found");
+            callback(undefined);
+            return;
+        }
+        const ownerID = sandbox.mockActivityID;
+        const newAssetData = {
+            name: "Activity Asset",
+            description: "Asset for activity " + ownerID,
+            file: assetFile,
+            owner: ownerID
+        };
+        const newAssetUC = Assets_1.NewAssetUC.get(appObjects);
+        if (!newAssetUC) {
+            appObjects.submitError("makeSubmitActivityAssetHandlerSandbox", "Unable to find NewAssetUC");
+            callback(undefined);
+            return;
+        }
+        newAssetUC.create(newAssetData).then((assetID) => {
+            callback(assetID);
+        });
+    };
+}
+exports.makeSubmitActivityAssetHandlerSandbox = makeSubmitActivityAssetHandlerSandbox;

package/lib/Components/Assets/Factories/setupAssetsForSandbox.js

@@ -17,6 +17,7 @@ function setupAssetsForSandbox(appObjects) {
     UCs_1.makeGetAssetFileUC(assetRepoAO);
     UCs_1.makeGetAssetUC(assetRepoAO);
     UCs_1.makePrefetchAssets(assetRepoAO);
+    UCs_1.makeNewAssetUC(assetRepoAO);
     UCs_1.makeNewAppAssetUC(appAssetsAO);
     UCs_1.makeGetAppAssetUC(appAssetsAO);
     // PMs

package/lib/Components/Assets/Mocks/MockNewAssetUC.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="jest" />
+import { HostAppObject, HostAppObjectRepo } from "../../../HostAppObject";
+import { NewAssetUC } from "../UCs/NewAssetUC";
+export declare class MockNewAssetUC extends NewAssetUC {
+    create: jest.Mock<any, any>;
+    constructor(appObject: HostAppObject);
+}
+export declare function makeMockNewAssetUC(appObjects: HostAppObjectRepo): MockNewAssetUC;

package/lib/Components/Assets/Mocks/MockNewAssetUC.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeMockNewAssetUC = exports.MockNewAssetUC = void 0;
+const NewAssetUC_1 = require("../UCs/NewAssetUC");
+class MockNewAssetUC extends NewAssetUC_1.NewAssetUC {
+    constructor(appObject) {
+        super(appObject, NewAssetUC_1.NewAssetUC.type);
+        this.create = jest.fn().mockResolvedValue('newAssetID');
+    }
+}
+exports.MockNewAssetUC = MockNewAssetUC;
+function makeMockNewAssetUC(appObjects) {
+    return new MockNewAssetUC(appObjects.getOrCreate("MockNewAssetUC"));
+}
+exports.makeMockNewAssetUC = makeMockNewAssetUC;

package/lib/Components/Assets/Mocks/index.d.ts

@@ -10,6 +10,7 @@ export * from "./MockGetAssetBlobURLUC";
 export * from "./MockGetAssetFileUC";
 export * from "./MockGetAssetUC";
 export * from "./MockNewAppAsset";
+export * from "./MockNewAssetUC";
 export * from "./MockPrefetchAssets";
 export * from "./MockUpdateAssetFileUC";
 export * from "./MockUpdateAppAssetMetaUC";

package/lib/Components/Assets/Mocks/index.js

@@ -22,6 +22,7 @@ __exportStar(require("./MockGetAssetBlobURLUC"), exports);
 __exportStar(require("./MockGetAssetFileUC"), exports);
 __exportStar(require("./MockGetAssetUC"), exports);
 __exportStar(require("./MockNewAppAsset"), exports);
+__exportStar(require("./MockNewAssetUC"), exports);
 __exportStar(require("./MockPrefetchAssets"), exports);
 __exportStar(require("./MockUpdateAssetFileUC"), exports);
 __exportStar(require("./MockUpdateAppAssetMetaUC"), exports);

package/lib/Components/Assets/UCs/NewAssetUC.d.ts

@@ -0,0 +1,13 @@
+import { HostAppObject, HostAppObjectRepo, HostAppObjectUC } from "../../../HostAppObject";
+export interface NewAssetDto {
+    file: File;
+    name: string;
+    description: string;
+    owner: string;
+}
+export declare abstract class NewAssetUC extends HostAppObjectUC {
+    static type: string;
+    abstract create(data: NewAssetDto): Promise<string>;
+    static get(appObjects: HostAppObjectRepo): NewAssetUC | undefined;
+}
+export declare function makeNewAssetUC(appObject: HostAppObject): NewAssetUC;

package/lib/Components/Assets/UCs/NewAssetUC.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeNewAssetUC = exports.NewAssetUC = void 0;
+const HostAppObject_1 = require("../../../HostAppObject");
+const UCs_1 = require("../../VivedAPI/UCs");
+const Entities_1 = require("../Entities");
+class NewAssetUC extends HostAppObject_1.HostAppObjectUC {
+    static get(appObjects) {
+        return HostAppObject_1.getSingletonComponent(NewAssetUC.type, appObjects);
+    }
+}
+exports.NewAssetUC = NewAssetUC;
+NewAssetUC.type = "NewAssetUC";
+function makeNewAssetUC(appObject) {
+    return new NewAssetUCImp(appObject);
+}
+exports.makeNewAssetUC = makeNewAssetUC;
+class NewAssetUCImp extends NewAssetUC {
+    constructor(appObject) {
+        super(appObject, NewAssetUC.type);
+        this.create = (data) => {
+            const postNewAsset = this.postNewAsset;
+            const assetRepo = this.assetRepo;
+            if (!postNewAsset || !assetRepo) {
+                return Promise.reject(new Error("Missing dependencies"));
+            }
+            const { description, file, name, owner } = data;
+            const newAssetData = {
+                description,
+                name,
+                file,
+                ownerID: owner
+            };
+            return postNewAsset(newAssetData).then((resp) => {
+                const newAsset = assetRepo.assetFactory(resp.id);
+                newAsset.setFile(file);
+                newAsset.description = description;
+                newAsset.name = name;
+                newAsset.filename = resp.filename;
+                assetRepo.add(newAsset);
+                return resp.id;
+            });
+        };
+        this.appObjects.registerSingleton(this);
+    }
+    get postNewAsset() {
+        var _a;
+        return (_a = this.getCachedSingleton(UCs_1.PostNewAssetUC.type)) === null || _a === void 0 ? void 0 : _a.doPost;
+    }
+    get assetRepo() {
+        return this.getCachedSingleton(Entities_1.AssetRepo.type);
+    }
+}

package/lib/Components/Assets/UCs/index.d.ts

@@ -7,6 +7,7 @@ export * from "./GetAssetBlobURLUC";
 export * from "./GetAssetFileUC";
 export * from "./GetAssetUC";
 export * from "./NewAppAssetUC";
+export * from "./NewAssetUC";
 export * from "./PrefetchAssetsUC";
 export * from "./UpdateAppAssetMetaUC";
 export * from "./UpdateAssetFileUC";

package/lib/Components/Assets/UCs/index.js

@@ -19,6 +19,7 @@ __exportStar(require("./GetAssetBlobURLUC"), exports);
 __exportStar(require("./GetAssetFileUC"), exports);
 __exportStar(require("./GetAssetUC"), exports);
 __exportStar(require("./NewAppAssetUC"), exports);
+__exportStar(require("./NewAssetUC"), exports);
 __exportStar(require("./PrefetchAssetsUC"), exports);
 __exportStar(require("./UpdateAppAssetMetaUC"), exports);
 __exportStar(require("./UpdateAssetFileUC"), exports);

package/lib/Components/Dialog/Entities/Alert.d.ts

@@ -16,6 +16,7 @@ export declare class AlertDialogEntity extends Dialog {
     readonly message: string;
     readonly buttonLabel: string;
     readonly preventOutsideDismiss: boolean;
+    hasBeenClosed: boolean;
     private postClose?;
     close: () => void;
     private _isOpen;

package/lib/Components/Dialog/Entities/Alert.js

@@ -9,7 +9,9 @@ class AlertDialogEntity extends DialogQueue_1.Dialog {
         super(appObject, AlertDialogEntity.type);
         this.dialogType = exports.alertDialogType;
         this.preventOutsideDismiss = false;
+        this.hasBeenClosed = false;
         this.close = () => {
+            this.hasBeenClosed = true;
             this.isOpen = false;
             if (this.postClose) {
                 this.postClose();

package/lib/Components/Dialog/Entities/Confirm.d.ts

@@ -18,6 +18,7 @@ export declare class ConfirmDialogEntity extends Dialog {
     readonly confirmButtonLabel: string;
     readonly cancelButtonLabel: string;
     readonly preventOutsideDismiss = true;
+    hasBeenClosed: boolean;
     private postCancel?;
     cancel: () => void;
     private postConfirm?;

package/lib/Components/Dialog/Entities/Confirm.js

@@ -9,13 +9,16 @@ class ConfirmDialogEntity extends DialogQueue_1.Dialog {
         super(appObject, ConfirmDialogEntity.type);
         this.dialogType = exports.confirmDialogType;
         this.preventOutsideDismiss = true;
+        this.hasBeenClosed = false;
         this.cancel = () => {
+            this.hasBeenClosed = true;
             this.isOpen = false;
             if (this.postCancel) {
                 this.postCancel();
             }
         };
         this.confirm = () => {
+            this.hasBeenClosed = true;
             this.isOpen = false;
             if (this.postConfirm) {
                 this.postConfirm();

package/lib/Components/Dialog/Entities/DialogQueue.d.ts

@@ -3,6 +3,7 @@ export declare abstract class Dialog extends HostAppObjectEntity {
     abstract dialogType: string;
     abstract preventOutsideDismiss: boolean;
     abstract isOpen: boolean;
+    abstract hasBeenClosed: boolean;
 }
 export declare abstract class DialogQueue extends HostAppObjectEntity {
     static type: string;

package/lib/Components/Dialog/Entities/DialogQueue.js

@@ -29,17 +29,30 @@ class DialogRepoImp extends DialogQueue {
             this.notifyOnChange();
         };
         this.activeDialogHasClosed = () => {
-            const activeDialog = this.activeDialog;
-            if (activeDialog !== null) {
+            const currentActiveDialog = this.activeDialog;
+            if (currentActiveDialog !== null) {
+                currentActiveDialog.removeChangeObserver(this.notifyOnChange);
+                this.filterOutClosedDialogs();
                 this.dialogQueue.splice(0, 1);
                 const newActiveDialog = this.activeDialog;
                 if (newActiveDialog !== null) {
                     newActiveDialog.isOpen = true;
                 }
-                activeDialog.removeChangeObserver(this.notifyOnChange);
                 this.notifyOnChange();
             }
         };
+        this.filterOutClosedDialogs = () => {
+            const dialogsToKeep = [];
+            this.dialogQueue.forEach((dialog) => {
+                if (!dialog.hasBeenClosed) {
+                    dialogsToKeep.push(dialog);
+                }
+                else {
+                    dialog.removeChangeObserver(this.notifyOnChange);
+                }
+            });
+            this.dialogQueue = dialogsToKeep;
+        };
         this.appObjects.registerSingleton(this);
     }
     get activeDialog() {

package/lib/Components/Dialog/Entities/MarkDownEditor.d.ts

@@ -1,5 +1,5 @@
-import { HostAppObject, HostAppObjectRepo } from '../../../HostAppObject';
-import { Dialog } from './DialogQueue';
+import { HostAppObject, HostAppObjectRepo } from "../../../HostAppObject";
+import { Dialog } from "./DialogQueue";
 export interface DialogMarkDownEditorDTO {
     initialText: string;
     onConfirm: (text: string) => void;
@@ -11,6 +11,7 @@ export declare class MarkDownEditorDialogEntity extends Dialog {
     readonly dialogType = "MARKDOWN_EDITOR";
     readonly initialText: string;
     readonly preventOutsideDismiss = true;
+    hasBeenClosed: boolean;
     cancel: () => void;
     private postConfirm;
     confirm: (text: string) => void;

package/lib/Components/Dialog/Entities/MarkDownEditor.js

@@ -3,16 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MarkDownEditorDialogEntity = exports.markDownEditorDialogType = void 0;
 const Entities_1 = require("../../../Entities");
 const DialogQueue_1 = require("./DialogQueue");
-exports.markDownEditorDialogType = 'MARKDOWN_EDITOR';
+exports.markDownEditorDialogType = "MARKDOWN_EDITOR";
 class MarkDownEditorDialogEntity extends DialogQueue_1.Dialog {
     constructor(data, appObject) {
         super(appObject, MarkDownEditorDialogEntity.type);
         this.dialogType = exports.markDownEditorDialogType;
         this.preventOutsideDismiss = true;
+        this.hasBeenClosed = false;
         this.cancel = () => {
+            this.hasBeenClosed = true; // added setting hasBeenClosed
             this.isOpen = false;
         };
         this.confirm = (text) => {
+            this.hasBeenClosed = true; // added setting hasBeenClosed
             this.isOpen = false;
             this.postConfirm(text);
         };
@@ -23,12 +26,12 @@ class MarkDownEditorDialogEntity extends DialogQueue_1.Dialog {
     static get(assetID, appObjects) {
         const appObject = appObjects.get(assetID);
         if (!appObject) {
-            appObjects.submitWarning('MarkDownEditorDialogEntity.get', 'Unable to find app object');
+            appObjects.submitWarning("MarkDownEditorDialogEntity.get", "Unable to find app object");
             return undefined;
         }
         const uc = appObject.getComponent(MarkDownEditorDialogEntity.type);
         if (!uc) {
-            appObjects.submitWarning('MarkDownEditorDialogEntity.get', 'App Object does not have DialogAlertEntity');
+            appObjects.submitWarning("MarkDownEditorDialogEntity.get", "App Object does not have DialogAlertEntity");
             return undefined;
         }
         return uc;
@@ -41,4 +44,4 @@ class MarkDownEditorDialogEntity extends DialogQueue_1.Dialog {
     }
 }
 exports.MarkDownEditorDialogEntity = MarkDownEditorDialogEntity;
-MarkDownEditorDialogEntity.type = 'MarkDownEditorDialogEntity';
+MarkDownEditorDialogEntity.type = "MarkDownEditorDialogEntity";

package/lib/Components/Dialog/Entities/SelectModel.d.ts

@@ -6,6 +6,7 @@ export declare class SelectModelDialogEntity extends Dialog {
     static type: string;
     static get(assetID: string, appObjects: HostAppObjectRepo): SelectModelDialogEntity | undefined;
     readonly dialogType = "SELECT_CHANNEL_MODEL";
+    hasBeenClosed: boolean;
     private _isOpen;
     get isOpen(): boolean;
     set isOpen(val: boolean);

package/lib/Components/Dialog/Entities/SelectModel.js

@@ -8,6 +8,7 @@ class SelectModelDialogEntity extends DialogQueue_1.Dialog {
     constructor(appObject) {
         super(appObject, SelectModelDialogEntity.type);
         this.dialogType = exports.selectModelDialogType;
+        this.hasBeenClosed = false;
         this._isOpen = new Entities_1.MemoizedBoolean(false, this.notifyOnChange);
         this.preventOutsideDismiss = true;
         this.memoizedIsReady = new Entities_1.MemoizedBoolean(false, this.notifyOnChange);

package/lib/Components/Dialog/Entities/Spinner.d.ts

@@ -19,6 +19,7 @@ export declare class SpinnerDialogEntity extends Dialog {
     private _isOpen;
     set isOpen(open: boolean);
     get isOpen(): boolean;
+    hasBeenClosed: boolean;
     close: () => void;
     constructor(data: DialogSpinnerDTO, appObject: HostAppObject);
 }

package/lib/Components/Dialog/Entities/Spinner.js

@@ -11,7 +11,9 @@ class SpinnerDialogEntity extends DialogQueue_1.Dialog {
         this.mininumuLifespan = 2000;
         this.preventOutsideDismiss = true;
         this._isOpen = new Entities_1.MemoizedBoolean(false, this.notifyOnChange);
+        this.hasBeenClosed = false;
         this.close = () => {
+            this.hasBeenClosed = true;
             if (this.createdAt === undefined) {
                 this.isOpen = false;
                 return;

package/lib/Components/Handler/setupStandardHostHandlers.js

@@ -23,6 +23,7 @@ function setupStandardHostHandlers(appObject) {
     UCs_1.makeShowSpinnerHandler(appObject);
     UCs_1.makeStartZSpaceHandler(appObject);
     UCs_1.makeStopZSpaceHandler(appObject);
+    UCs_1.makeSubmitActivityAssetHandler(appObject);
     UCs_1.makeSubmitLogHandler(appObject);
     UCs_1.makeSubmitResultHandler(appObject);
 }

package/lib/Components/VivedAPI/Mocks/MockSignedAuthToken.d.ts

@@ -2,8 +2,7 @@
 import { HostAppObject, HostAppObjectRepo } from "../../../HostAppObject";
 import { SignedAuthTokenUC } from "../UCs/SignedAuthTokenUC";
 export declare class MockSignedAuthTokenUC extends SignedAuthTokenUC {
-    getPlayerAuthToken: jest.Mock<any, any>;
-    getUserAuthToken: jest.Mock<any, any>;
+    getAuthToken: jest.Mock<any, any>;
     constructor(appObject: HostAppObject);
 }
 export declare function makeMockSignedAuthTokenUC(appObjects: HostAppObjectRepo): MockSignedAuthTokenUC;

package/lib/Components/VivedAPI/Mocks/MockSignedAuthToken.js

@@ -5,8 +5,7 @@ const SignedAuthTokenUC_1 = require("../UCs/SignedAuthTokenUC");
 class MockSignedAuthTokenUC extends SignedAuthTokenUC_1.SignedAuthTokenUC {
     constructor(appObject) {
         super(appObject, SignedAuthTokenUC_1.SignedAuthTokenUC.type);
-        this.getPlayerAuthToken = jest.fn();
-        this.getUserAuthToken = jest.fn();
+        this.getAuthToken = jest.fn();
     }
 }
 exports.MockSignedAuthTokenUC = MockSignedAuthTokenUC;

package/lib/Components/VivedAPI/UCs/DeleteAssetOnAPIUC.d.ts

@@ -1,4 +1,4 @@
-import { HostAppObject, HostAppObjectRepo, HostAppObjectUC } from '../../../HostAppObject';
+import { HostAppObject, HostAppObjectRepo, HostAppObjectUC } from "../../../HostAppObject";
 export declare abstract class DeleteAssetOnAPIUC extends HostAppObjectUC {
     static type: string;
     abstract doDelete(assetID: string): Promise<void>;

package/lib/Components/VivedAPI/UCs/DeleteAssetOnAPIUC.js

@@ -11,7 +11,7 @@ class DeleteAssetOnAPIUC extends HostAppObject_1.HostAppObjectUC {
     }
 }
 exports.DeleteAssetOnAPIUC = DeleteAssetOnAPIUC;
-DeleteAssetOnAPIUC.type = 'DeleteAssetOnAPIUC';
+DeleteAssetOnAPIUC.type = "DeleteAssetOnAPIUC";
 function makeDeleteAssetOnAPIUC(appObject) {
     return new DeleteAssetUCImp(appObject);
 }
@@ -31,10 +31,10 @@ class DeleteAssetUCImp extends DeleteAssetOnAPIUC {
                     .then((token) => {
                     const postURL = vivedAPI.getEndpointURL(`assets/${assetID}`);
                     const options = {
-                        method: 'DELETE',
+                        method: "DELETE",
                         headers: {
-                            Authorization: 'Bearer ' + token,
-                        },
+                            Authorization: "Bearer " + token
+                        }
                     };
                     return jsonRequester(postURL, options);
                 })
@@ -55,7 +55,7 @@ class DeleteAssetUCImp extends DeleteAssetOnAPIUC {
     }
     get getAuthToken() {
         var _a;
-        return (_a = this.getCachedSingleton(SignedAuthTokenUC_1.SignedAuthTokenUC.type)) === null || _a === void 0 ? void 0 : _a.getUserAuthToken;
+        return (_a = this.getCachedSingleton(SignedAuthTokenUC_1.SignedAuthTokenUC.type)) === null || _a === void 0 ? void 0 : _a.getAuthToken;
     }
     get vivedAPI() {
         return this.getCachedSingleton(VivedAPIEntity_1.VivedAPIEntity.type);

package/lib/Components/VivedAPI/UCs/GetAppFromAPIUC.d.ts

@@ -1,4 +1,4 @@
-import { HostAppObject, HostAppObjectRepo, HostAppObjectUC } from '../../../HostAppObject';
+import { HostAppObject, HostAppObjectRepo, HostAppObjectUC } from "../../../HostAppObject";
 export interface GetAppResponseDTO {
     interfaceVersion: string;
     assetFolderURL: string;

package/lib/Components/VivedAPI/UCs/GetAppFromAPIUC.js

@@ -11,7 +11,7 @@ class GetAppFromAPIUC extends HostAppObject_1.HostAppObjectUC {
     }
 }
 exports.GetAppFromAPIUC = GetAppFromAPIUC;
-GetAppFromAPIUC.type = 'GetAppFromAPIUC';
+GetAppFromAPIUC.type = "GetAppFromAPIUC";
 function makeGetAppFromAPIUC(appObject) {
     return new GetAppUCImp(appObject);
 }
@@ -30,12 +30,12 @@ class GetAppUCImp extends GetAppFromAPIUC {
                 getAuthToken()
                     .then((token) => {
                     const endpointURL = vivedAPI.getEndpointURL(`apps/${appID}/${version}`);
-                    endpointURL.searchParams.set('function_version', '2');
+                    endpointURL.searchParams.set("function_version", "2");
                     const options = {
-                        method: 'GET',
+                        method: "GET",
                         headers: {
-                            Authorization: 'Bearer ' + token,
-                        },
+                            Authorization: "Bearer " + token
+                        }
                     };
                     return jsonRequester(endpointURL, options);
                 })
@@ -44,7 +44,7 @@ class GetAppUCImp extends GetAppFromAPIUC {
                     const appDTO = {
                         interfaceVersion: app.appInterfaceVersion,
                         assetFolderURL: app.baseAssetsUrl,
-                        entrypoints: [...app.files],
+                        entrypoints: [...app.files]
                     };
                     resolve(appDTO);
                 })
@@ -62,7 +62,7 @@ class GetAppUCImp extends GetAppFromAPIUC {
     }
     get getAuthToken() {
         var _a;
-        return (_a = this.getCachedSingleton(SignedAuthTokenUC_1.SignedAuthTokenUC.type)) === null || _a === void 0 ? void 0 : _a.getUserAuthToken;
+        return (_a = this.getCachedSingleton(SignedAuthTokenUC_1.SignedAuthTokenUC.type)) === null || _a === void 0 ? void 0 : _a.getAuthToken;
     }
     get vivedAPI() {
         return this.getCachedSingleton(VivedAPIEntity_1.VivedAPIEntity.type);

package/lib/Components/VivedAPI/UCs/GetAssetsForOwnerFromAPIUC.d.ts

@@ -1,5 +1,5 @@
-import { HostAppObject, HostAppObjectRepo, HostAppObjectUC } from '../../../HostAppObject';
-import { AssetDTO } from '../../Assets';
+import { HostAppObject, HostAppObjectRepo, HostAppObjectUC } from "../../../HostAppObject";
+import { AssetDTO } from "../../Assets";
 export declare abstract class GetAssetsForOwnerFromAPIUC extends HostAppObjectUC {
     static type: string;
     abstract getAssets(ownerID: string): Promise<AssetDTO[]>;

package/lib/Components/VivedAPI/UCs/GetAssetsForOwnerFromAPIUC.js

@@ -11,7 +11,7 @@ class GetAssetsForOwnerFromAPIUC extends HostAppObject_1.HostAppObjectUC {
     }
 }
 exports.GetAssetsForOwnerFromAPIUC = GetAssetsForOwnerFromAPIUC;
-GetAssetsForOwnerFromAPIUC.type = 'GetAssetsForOwnerFromAPIUC';
+GetAssetsForOwnerFromAPIUC.type = "GetAssetsForOwnerFromAPIUC";
 function makeGetAssetsForOwnerFromAPIUC(appObject) {
     return new GetAssetsForOwnerUCImp(appObject);
 }
@@ -32,10 +32,10 @@ class GetAssetsForOwnerUCImp extends GetAssetsForOwnerFromAPIUC {
                     const url = vivedAPI.getEndpointURL(`assets/group/${ownerID}`);
                     const page = 1;
                     const itemsPerPage = 100;
-                    url.searchParams.append('page', page.toString());
-                    url.searchParams.append('itemsPerPage', itemsPerPage.toString());
+                    url.searchParams.append("page", page.toString());
+                    url.searchParams.append("itemsPerPage", itemsPerPage.toString());
                     const options = {
-                        method: 'GET',
+                        method: "GET"
                     };
                     return jsonRequester(url, options);
                 })
@@ -59,7 +59,7 @@ class GetAssetsForOwnerUCImp extends GetAssetsForOwnerFromAPIUC {
     }
     get getAuthToken() {
         var _a;
-        return (_a = this.getCachedSingleton(SignedAuthTokenUC_1.SignedAuthTokenUC.type)) === null || _a === void 0 ? void 0 : _a.getUserAuthToken;
+        return (_a = this.getCachedSingleton(SignedAuthTokenUC_1.SignedAuthTokenUC.type)) === null || _a === void 0 ? void 0 : _a.getAuthToken;
     }
     get vivedAPI() {
         return this.getCachedSingleton(VivedAPIEntity_1.VivedAPIEntity.type);
@@ -68,7 +68,7 @@ class GetAssetsForOwnerUCImp extends GetAssetsForOwnerFromAPIUC {
         const linkedAssets = resp.linkedAssets.map((linkedAssetResp) => {
             return {
                 type: linkedAssetResp.type,
-                asset: this.responseToDTO(linkedAssetResp.asset),
+                asset: this.responseToDTO(linkedAssetResp.asset)
             };
         });
         const dto = {
@@ -79,7 +79,7 @@ class GetAssetsForOwnerUCImp extends GetAssetsForOwnerFromAPIUC {
             id: resp.id,
             name: resp.name,
             linkedAssets,
-            ownerId: resp.ownerId,
+            ownerId: resp.ownerId
         };
         return dto;
     }

package/lib/Components/VivedAPI/UCs/PatchAssetFileUC.js

@@ -72,7 +72,7 @@ class PatchAssetFileUCImp extends PatchAssetFileUC {
     }
     get getAuthToken() {
         var _a;
-        return (_a = this.getCachedSingleton(SignedAuthTokenUC_1.SignedAuthTokenUC.type)) === null || _a === void 0 ? void 0 : _a.getUserAuthToken;
+        return (_a = this.getCachedSingleton(SignedAuthTokenUC_1.SignedAuthTokenUC.type)) === null || _a === void 0 ? void 0 : _a.getAuthToken;
     }
     get fileUpload() {
         var _a;

package/lib/Components/VivedAPI/UCs/PatchAssetIsArchivedUC.js

@@ -59,7 +59,7 @@ class PatchAssetIsArchivedUCImp extends PatchAssetIsArchivedUC {
     }
     get getAuthToken() {
         var _a;
-        return (_a = this.getCachedSingleton(SignedAuthTokenUC_1.SignedAuthTokenUC.type)) === null || _a === void 0 ? void 0 : _a.getUserAuthToken;
+        return (_a = this.getCachedSingleton(SignedAuthTokenUC_1.SignedAuthTokenUC.type)) === null || _a === void 0 ? void 0 : _a.getAuthToken;
     }
     get vivedAPI() {
         return this.getCachedSingleton(VivedAPIEntity_1.VivedAPIEntity.type);

package/lib/Components/VivedAPI/UCs/PatchAssetMetaUC.js

@@ -62,7 +62,7 @@ class PatchAssetMetaUCImp extends PatchAssetMetaUC {
     }
     get getAuthToken() {
         var _a;
-        return (_a = this.getCachedSingleton(SignedAuthTokenUC_1.SignedAuthTokenUC.type)) === null || _a === void 0 ? void 0 : _a.getUserAuthToken;
+        return (_a = this.getCachedSingleton(SignedAuthTokenUC_1.SignedAuthTokenUC.type)) === null || _a === void 0 ? void 0 : _a.getAuthToken;
     }
     get vivedAPI() {
         return this.getCachedSingleton(VivedAPIEntity_1.VivedAPIEntity.type);

package/lib/Components/VivedAPI/UCs/PatchAssetUC.js

@@ -76,7 +76,7 @@ class PatchAssetUCImp extends PatchAssetUC {
     }
     get getAuthToken() {
         var _a;
-        return (_a = this.getCachedSingleton(SignedAuthTokenUC_1.SignedAuthTokenUC.type)) === null || _a === void 0 ? void 0 : _a.getUserAuthToken;
+        return (_a = this.getCachedSingleton(SignedAuthTokenUC_1.SignedAuthTokenUC.type)) === null || _a === void 0 ? void 0 : _a.getAuthToken;
     }
     get fileUpload() {
         var _a;

package/lib/Components/VivedAPI/UCs/PostNewAssetUC.d.ts

@@ -1,5 +1,5 @@
-import { HostAppObject, HostAppObjectRepo, HostAppObjectUC } from '../../../HostAppObject';
-export interface NewAssetDTO {
+import { HostAppObject, HostAppObjectRepo, HostAppObjectUC } from "../../../HostAppObject";
+export interface NewAssetApiDto {
     name: string;
     description: string;
     ownerID: string;
@@ -11,7 +11,7 @@ export interface NewAssetResponseDTO {
 }
 export declare abstract class PostNewAssetUC extends HostAppObjectUC {
     static type: string;
-    abstract doPost(data: NewAssetDTO): Promise<NewAssetResponseDTO>;
+    abstract doPost(data: NewAssetApiDto): Promise<NewAssetResponseDTO>;
     static get(appObjects: HostAppObjectRepo): PostNewAssetUC | undefined;
 }
 export declare function makePostNewAssetUC(appObject: HostAppObject): PostNewAssetUC;

package/lib/Components/VivedAPI/UCs/PostNewAssetUC.js

@@ -13,7 +13,7 @@ class PostNewAssetUC extends HostAppObject_1.HostAppObjectUC {
     }
 }
 exports.PostNewAssetUC = PostNewAssetUC;
-PostNewAssetUC.type = 'PostNewAssetUC';
+PostNewAssetUC.type = "PostNewAssetUC";
 function makePostNewAssetUC(appObject) {
     return new PostNewAssetUCImp(appObject);
 }
@@ -32,30 +32,30 @@ class PostNewAssetUCImp extends PostNewAssetUC {
             return new Promise((resolve, reject) => {
                 const { description, file, name, ownerID } = data;
                 let assetId;
-                const nameSplits = file.name.split('.');
+                const nameSplits = file.name.split(".");
                 const extension = nameSplits[nameSplits.length - 1];
                 const filename = `${Utilities_1.generateUniqueID()}.${extension}`;
                 const assetFile = new File([file], filename, {
-                    lastModified: Date.now(),
+                    lastModified: Date.now()
                 });
                 fileUploader(assetFile)
                     .then((_) => {
                     return getPlayerAuthToken();
                 })
                     .then((token) => {
-                    const postURL = vivedAPI.getEndpointURL('assets');
+                    const postURL = vivedAPI.getEndpointURL("assets");
                     const body = {
                         ownerId: ownerID,
                         name,
                         description,
-                        filename,
+                        filename
                     };
                     const options = {
-                        method: 'POST',
+                        method: "POST",
                         body: JSON.stringify(body),
                         headers: {
-                            Authorization: 'Bearer ' + token,
-                        },
+                            Authorization: "Bearer " + token
+                        }
                     };
                     return jsonRequester(postURL, options);
                 })
@@ -63,7 +63,7 @@ class PostNewAssetUCImp extends PostNewAssetUC {
                     assetId = result.assetId;
                     resolve({
                         id: assetId,
-                        filename,
+                        filename
                     });
                 })
                     .catch((e) => {
@@ -80,7 +80,7 @@ class PostNewAssetUCImp extends PostNewAssetUC {
     }
     get getPlayerAuthToken() {
         var _a;
-        return (_a = this.getCachedSingleton(SignedAuthTokenUC_1.SignedAuthTokenUC.type)) === null || _a === void 0 ? void 0 : _a.getUserAuthToken;
+        return (_a = this.getCachedSingleton(SignedAuthTokenUC_1.SignedAuthTokenUC.type)) === null || _a === void 0 ? void 0 : _a.getAuthToken;
     }
     get fileUploader() {
         var _a;

package/lib/Components/VivedAPI/UCs/SignedAuthTokenUC.d.ts

@@ -1,7 +1,6 @@
 import { HostAppObjectRepo, HostAppObjectUC } from "../../../HostAppObject";
 export declare abstract class SignedAuthTokenUC extends HostAppObjectUC {
     static type: string;
-    abstract getPlayerAuthToken(): Promise<string>;
-    abstract getUserAuthToken(): Promise<string>;
+    abstract getAuthToken(): Promise<string>;
     static get(appObjects: HostAppObjectRepo): SignedAuthTokenUC | undefined;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vived/host",
-  "version": "3.11.1",
+  "version": "3.12.1",
   "description": "Public Host package for the VIVED Learning App system",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/lib/Components/Apps/UCs/appIDWithVersion.d.ts

@@ -1,3 +0,0 @@
-import { Version } from "../../../ValueObjects";
-import { AppEntity } from "../Entities";
-export declare function appIDWithVersion(app: AppEntity, version: Version): string;

package/lib/Components/Apps/UCs/appIDWithVersion.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.appIDWithVersion = void 0;
-function appIDWithVersion(app, version) {
-    const versionString = version.baseVersionString.split(".").join("_");
-    return `${app.id}-${versionString}`;
-}
-exports.appIDWithVersion = appIDWithVersion;

package/lib/Components/StateMachine/Mocks/MockStateEntity.d.ts

@@ -1,16 +0,0 @@
-/// <reference types="jest" />
-import { HostAppObject, HostAppObjectRepo } from "../../../HostAppObject";
-import { ChallengeResponse, HostStateEntity } from "../Entities";
-export declare class MockHostStateEntity extends HostStateEntity {
-    get id(): string;
-    name: string;
-    assets: never[];
-    expectedResponse: ChallengeResponse;
-    appID: string;
-    getDTO: jest.Mock<any, any>;
-    setDTO: jest.Mock<any, any>;
-    get stateData(): object;
-    setStateData: jest.Mock<any, any>;
-    constructor(appObject: HostAppObject);
-}
-export declare function makeMockHostStateEntity(id: string, appObjects: HostAppObjectRepo): MockHostStateEntity;

package/lib/Components/StateMachine/Mocks/MockStateEntity.js

@@ -1,27 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeMockHostStateEntity = exports.MockHostStateEntity = void 0;
-const Entities_1 = require("../Entities");
-class MockHostStateEntity extends Entities_1.HostStateEntity {
-    constructor(appObject) {
-        super(appObject, Entities_1.HostStateEntity.type);
-        this.name = "State Name";
-        this.assets = [];
-        this.expectedResponse = Entities_1.ChallengeResponse.NONE;
-        this.appID = "AppID";
-        this.getDTO = jest.fn();
-        this.setDTO = jest.fn();
-        this.setStateData = jest.fn();
-    }
-    get id() {
-        return this.appObject.id;
-    }
-    get stateData() {
-        return { foo: "bar" };
-    }
-}
-exports.MockHostStateEntity = MockHostStateEntity;
-function makeMockHostStateEntity(id, appObjects) {
-    return new MockHostStateEntity(appObjects.getOrCreate(id));
-}
-exports.makeMockHostStateEntity = makeMockHostStateEntity;

package/lib/Components/StateMachine/UCs/setSandboxStatesFromStingData.d.ts

@@ -1,8 +0,0 @@
-import { HostAppObjectRepo } from "../../../HostAppObject";
-export interface SandboxStateStringData {
-    id: string;
-    name: string;
-    data: string;
-    assets: string[];
-}
-export declare function setSandboxStatesFromStingData(datas: SandboxStateStringData[], appObjects: HostAppObjectRepo): void;

package/lib/Components/StateMachine/UCs/setSandboxStatesFromStingData.js

@@ -1,29 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.setSandboxStatesFromStingData = void 0;
-const Entities_1 = require("../../AppSandbox/Entities");
-const Entities_2 = require("../Entities");
-function setSandboxStatesFromStingData(datas, appObjects) {
-    const stateMachine = Entities_2.HostStateMachine.get(appObjects);
-    if (!stateMachine) {
-        appObjects.submitError("setSandboxStatesFromData", "Unable to find StateMachineEntity");
-        return;
-    }
-    const sandbox = Entities_1.AppSandboxEntity.get(appObjects);
-    if (!sandbox) {
-        appObjects.submitWarning("setSandboxStatesFromData", "Could not find AppSandboxEntity");
-        return;
-    }
-    const states = [];
-    datas.forEach((stateData) => {
-        const { data, id, name, assets } = stateData;
-        const state = stateMachine.stateFactory(id);
-        state.setStateData(JSON.parse(data));
-        state.name = name;
-        state.appID = sandbox.appID;
-        state.assets = assets;
-        states.push(state);
-    });
-    stateMachine.setStates(states);
-}
-exports.setSandboxStatesFromStingData = setSandboxStatesFromStingData;

package/lib/Components/ZSpaceHost/UCs/StartSandboxZSpaceUC.d.ts

@@ -1,3 +0,0 @@
-import { HostAppObject } from "../../../HostAppObject";
-import { StartZSpaceUC } from "./StartZSpaceUC";
-export declare function makeStartSandboxZSpaceUC(appObject: HostAppObject): StartZSpaceUC;

package/lib/Components/ZSpaceHost/UCs/StartSandboxZSpaceUC.js

@@ -1,70 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeStartSandboxZSpaceUC = void 0;
-const AppSandbox_1 = require("../../AppSandbox");
-const Dispatcher_1 = require("../../Dispatcher");
-const Entities_1 = require("../Entities");
-const StartZSpaceUC_1 = require("./StartZSpaceUC");
-const StopZSpaceUC_1 = require("./StopZSpaceUC");
-function makeStartSandboxZSpaceUC(appObject) {
-    return new StartSandboxZSpaceUCImp(appObject);
-}
-exports.makeStartSandboxZSpaceUC = makeStartSandboxZSpaceUC;
-class StartSandboxZSpaceUCImp extends StartZSpaceUC_1.StartZSpaceUC {
-    constructor(appObject) {
-        super(appObject, StartZSpaceUC_1.StartZSpaceUC.type);
-        this.startZSpace = () => {
-            if (!this.zSpace || !this.sandbox || !this.stopUC) {
-                return Promise.reject("Missing Components");
-            }
-            const dispatcher = Dispatcher_1.DispatchStartZSpaceUC.getByID(this.sandbox.appID, this.appObjects);
-            if (!dispatcher) {
-                return Promise.reject("Missing Dispatcher");
-            }
-            if (this.zSpace.isActive) {
-                return Promise.resolve();
-            }
-            if (this.zSpace.emulate) {
-                if (this.sandbox.state === AppSandbox_1.SandboxState.PLAYING) {
-                    dispatcher.doDispatch({}, true);
-                }
-                this.zSpace.isActive = true;
-                return Promise.resolve();
-            }
-            if (!this.zSpace.isSupported) {
-                return Promise.reject(new Error("ZSpace is not supported"));
-            }
-            const zSpace = this.zSpace;
-            const sandbox = this.sandbox;
-            const stopUC = this.stopUC;
-            return new Promise((resolve, reject) => {
-                navigator.xr
-                    .requestSession("immersive-vr")
-                    .then((xrSession) => {
-                    xrSession.addEventListener("end", stopUC.stopZSpace, {
-                        once: true
-                    });
-                    zSpace.session = xrSession;
-                    if (sandbox.state === AppSandbox_1.SandboxState.PLAYING) {
-                        dispatcher.doDispatch(xrSession, false);
-                    }
-                    zSpace.isActive = true;
-                    resolve();
-                })
-                    .catch((e) => {
-                    reject(e);
-                });
-            });
-        };
-        this.appObjects.registerSingleton(this);
-    }
-    get zSpace() {
-        return this.getCachedSingleton(Entities_1.ZSpaceHostEntity.type);
-    }
-    get sandbox() {
-        return this.getCachedSingleton(AppSandbox_1.AppSandboxEntity.type);
-    }
-    get stopUC() {
-        return this.getCachedSingleton(StopZSpaceUC_1.StopZSpaceUC.type);
-    }
-}

package/lib/Components/ZSpaceHost/UCs/StartZSpaceUC.d.ts

@@ -1,6 +0,0 @@
-import { HostAppObjectRepo, HostAppObjectUC } from "../../../HostAppObject";
-export declare abstract class StartZSpaceUC extends HostAppObjectUC {
-    static type: string;
-    abstract startZSpace(): Promise<void>;
-    static get(appObjects: HostAppObjectRepo): StartZSpaceUC | undefined;
-}

package/lib/Components/ZSpaceHost/UCs/StartZSpaceUC.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.StartZSpaceUC = void 0;
-const HostAppObject_1 = require("../../../HostAppObject");
-class StartZSpaceUC extends HostAppObject_1.HostAppObjectUC {
-    static get(appObjects) {
-        return HostAppObject_1.getSingletonComponent(StartZSpaceUC.type, appObjects);
-    }
-}
-exports.StartZSpaceUC = StartZSpaceUC;
-StartZSpaceUC.type = "StartZSpaceUC";

package/lib/Components/ZSpaceHost/UCs/StopSandboxZSpaceUC.d.ts

@@ -1,3 +0,0 @@
-import { HostAppObject } from "../../../HostAppObject";
-import { StopZSpaceUC } from "./StopZSpaceUC";
-export declare function makeStopSandboxZSpaceUC(appObject: HostAppObject): StopZSpaceUC;

package/lib/Components/ZSpaceHost/UCs/StopSandboxZSpaceUC.js

@@ -1,40 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeStopSandboxZSpaceUC = void 0;
-const AppSandbox_1 = require("../../AppSandbox");
-const Dispatcher_1 = require("../../Dispatcher");
-const Entities_1 = require("../Entities");
-const StopZSpaceUC_1 = require("./StopZSpaceUC");
-function makeStopSandboxZSpaceUC(appObject) {
-    return new StopSandboxZSpaceUCImp(appObject);
-}
-exports.makeStopSandboxZSpaceUC = makeStopSandboxZSpaceUC;
-class StopSandboxZSpaceUCImp extends StopZSpaceUC_1.StopZSpaceUC {
-    constructor(appObject) {
-        super(appObject, StopZSpaceUC_1.StopZSpaceUC.type);
-        this.stopZSpace = () => {
-            var _a, _b;
-            if (!this.sandbox || !this.zSpace)
-                return;
-            const dispatcher = Dispatcher_1.DispatchStopZSpaceUC.getByID(this.sandbox.appID, this.appObjects);
-            if (!dispatcher) {
-                this.warn("Unable to find DispatchStopZSpaceUC");
-                return;
-            }
-            if (!this.zSpace.isActive)
-                return;
-            dispatcher.doDispatch();
-            (_a = this.zSpace.session) === null || _a === void 0 ? void 0 : _a.removeEventListener("end", this.stopZSpace);
-            (_b = this.zSpace.session) === null || _b === void 0 ? void 0 : _b.end();
-            this.zSpace.session = undefined;
-            this.zSpace.isActive = false;
-        };
-        this.appObjects.registerSingleton(this);
-    }
-    get zSpace() {
-        return this.getCachedSingleton(Entities_1.ZSpaceHostEntity.type);
-    }
-    get sandbox() {
-        return this.getCachedSingleton(AppSandbox_1.AppSandboxEntity.type);
-    }
-}

package/lib/Components/ZSpaceHost/UCs/StopZSpaceUC.d.ts

@@ -1,6 +0,0 @@
-import { HostAppObjectRepo, HostAppObjectUC } from "../../../HostAppObject";
-export declare abstract class StopZSpaceUC extends HostAppObjectUC {
-    static type: string;
-    abstract stopZSpace(): void;
-    static get(appObjects: HostAppObjectRepo): StopZSpaceUC | undefined;
-}

package/lib/Components/ZSpaceHost/UCs/StopZSpaceUC.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.StopZSpaceUC = void 0;
-const HostAppObject_1 = require("../../../HostAppObject");
-class StopZSpaceUC extends HostAppObject_1.HostAppObjectUC {
-    static get(appObjects) {
-        return HostAppObject_1.getSingletonComponent(StopZSpaceUC.type, appObjects);
-    }
-}
-exports.StopZSpaceUC = StopZSpaceUC;
-StopZSpaceUC.type = "StopZSpaceUC";