@photon-os/sdk 0.5.0-beta0 → 0.5.0-beta1

package/lib/CoreServices/Apps/PhotonApp.js

@@ -20,13 +20,11 @@ class PhotonApp {
         return __awaiter(this, void 0, void 0, function* () {
             PhotonApp.appId = appId;
             const messageBroker = new __1.MessageBroker();
-            const key = appMode === PhotonAppMode_1.default.Host
-                ? SecondLifeIdentity_1.default.getKeyFromQueryString()
-                : yield SecondLifeIdentity_1.default.getKey();
+            __1.MessageBroker.setDefault(messageBroker);
+            messageBroker.registerTarget(new __1.BrowserMessagingTarget("os", appMode === PhotonAppMode_1.default.App ? window.parent : window));
+            const key = SecondLifeIdentity_1.default.getKey();
             messageBroker.registerListener(new __1.SecondLifeMessagingListener(`${appId}__${key}`, SecondLifeProxy_1.default.socket));
             messageBroker.registerListener(new BrowserMessageListener_1.default());
-            messageBroker.registerTarget(new __1.BrowserMessagingTarget("os", appMode === PhotonAppMode_1.default.App ? window.parent : window));
-            __1.MessageBroker.setDefault(messageBroker);
             const eventManager = new EventManager_1.default();
             EventManager_1.default.setDefault(eventManager);
         });

package/lib/SecondLife/SecondLifeIdentity.d.ts

@@ -1,5 +1,4 @@
 declare class SecondLifeIdentity {
-    static getKeyFromQueryString(): string | null;
-    static getKey(): Promise<string | null>;
+    static getKey(): string | null;
 }
 export default SecondLifeIdentity;

package/lib/SecondLife/SecondLifeIdentity.js

@@ -1,30 +1,9 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const __1 = require("..");
 class SecondLifeIdentity {
-    static getKeyFromQueryString() {
-        if (window.parent !== window) {
-            throw new Error("Unable to fetch key from query string within an app frame. Did you mean to call SecondLifeIdentity.getKey() instead?");
-        }
+    static getKey() {
         const urlParams = new URLSearchParams(window.location.search);
         return urlParams.get("key");
     }
-    static getKey() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (window.parent === window) {
-                throw new Error("To fetch the user's key outside of an app frame, use SecondLifeIdentity.getKeyFromQueryString() instead.");
-            }
-            return yield __1.MessageBroker.defaultMessageBroker.invoke(__1.MessageBroker.defaultMessageBroker.getTargetById("os"), "os_SecondLifeIdentity", "getKey");
-        });
-    }
 }
 exports.default = SecondLifeIdentity;

package/lib/SecondLife/SecondLifeRegistry.d.ts

@@ -1,4 +1,4 @@
-import SecondLifeDevice from './SecondLifeDevice';
+import SecondLifeDevice from "./SecondLifeDevice";
 declare class SecondLifeRegistry {
     static getDevices(): Promise<SecondLifeDevice[]>;
 }

package/lib/SecondLife/SecondLifeRegistry.js

@@ -14,8 +14,8 @@ const __1 = require("..");
 class SecondLifeRegistry {
     static getDevices() {
         return __awaiter(this, void 0, void 0, function* () {
-            const returnedDevices = yield __1.MessageBroker.defaultMessageBroker.invoke(__1.MessageBroker.defaultMessageBroker.getTargetById('os'), 'os_SecondLifeRegistry', 'getDevices');
-            return returnedDevices.map((device) => (new SecondLifeDevice_1.default(device.id, device.name, device.lastSeen)));
+            const returnedDevices = yield __1.MessageBroker.defaultMessageBroker.invoke(__1.MessageBroker.defaultMessageBroker.getTargetById("os"), "os_SecondLifeRegistry", "getDevices");
+            return returnedDevices.map((device) => new SecondLifeDevice_1.default(device.id, device.name, device.lastSeen));
         });
     }
 }

package/lib/SystemMessaging/BrowserMessageListener.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
-import IMessageListener from './IMessageListener';
-import MessageBroker from './MessageBroker';
-import { EventEmitter } from 'events';
+import IMessageListener from "./IMessageListener";
+import MessageBroker from "./MessageBroker";
+import { EventEmitter } from "events";
 declare class BrowserMessageListener extends EventEmitter implements IMessageListener {
     id: string;
     subscribe(broker: MessageBroker): void;

package/lib/SystemMessaging/BrowserMessageListener.js

@@ -8,14 +8,14 @@ class BrowserMessageListener extends events_1.EventEmitter {
         this.id = "browser";
     }
     subscribe(broker) {
-        window.addEventListener('message', this.messageEventHandler.bind(this));
+        window.addEventListener("message", this.messageEventHandler.bind(this));
     }
     unsubscribe(broker) {
-        window.removeEventListener('message', this.messageEventHandler.bind(this));
+        window.removeEventListener("message", this.messageEventHandler.bind(this));
     }
     messageEventHandler(e) {
-        const source = new BrowserMessagingTarget_1.default('randomid', e.source);
-        this.emit('message', { source, data: e.data });
+        const source = new BrowserMessagingTarget_1.default("randomid", e.source);
+        this.emit("message", { source, data: e.data });
     }
 }
 exports.default = BrowserMessageListener;

package/lib/SystemMessaging/MessageBroker.js

@@ -29,17 +29,17 @@ class MessageBroker {
         this.targets.push(target);
     }
     unregisterTarget(targetId) {
-        this.targets = this.targets.filter(t => t.id !== targetId);
+        this.targets = this.targets.filter((t) => t.id !== targetId);
     }
     getTargetById(targetId) {
-        const matchingTarget = this.targets.find(t => t.id === targetId);
+        const matchingTarget = this.targets.find((t) => t.id === targetId);
         return matchingTarget || new VoidMessagingTarget_1.default(targetId);
     }
     hasTarget(targetId) {
-        return this.targets.find(t => t.id === targetId) !== undefined;
+        return this.targets.find((t) => t.id === targetId) !== undefined;
     }
     invoke(target, serviceId, methodName, methodArgs) {
-        return new Promise(resolve => {
+        return new Promise((resolve) => {
             const returnId = `${methodName}_${uuid_1.v4()}`;
             this.registerReturnHandler(returnId, resolve);
             target.postMessage({
@@ -47,12 +47,12 @@ class MessageBroker {
                 serviceId,
                 methodName,
                 methodArgs,
-                returnId
+                returnId,
             });
         });
     }
     invokeEverywhere(serviceId, methodName, methodArgs) {
-        this.targets.forEach(target => this.invoke(target, serviceId, methodName, methodArgs));
+        this.targets.forEach((target) => this.invoke(target, serviceId, methodName, methodArgs));
     }
     registerReturnHandler(returnId, callback) {
         this.returnHandlers[returnId] = callback;
@@ -79,10 +79,10 @@ class MessageBroker {
         this.services.push({ id: serviceId, methods: service });
     }
     unregisterService(serviceId) {
-        this.services = this.services.filter(s => s.id !== serviceId);
+        this.services = this.services.filter((s) => s.id !== serviceId);
     }
     getServiceById(serviceId) {
-        return this.services.find(s => s.id === serviceId);
+        return this.services.find((s) => s.id === serviceId);
     }
     registerListener(listener) {
         const existingListener = this.getListenerByid(listener.id);
@@ -96,14 +96,14 @@ class MessageBroker {
     }
     unregisterListener(listenerId) {
         const existingListener = this.getListenerByid(listenerId);
-        this.listeners = this.listeners.filter(l => l.id !== listenerId);
+        this.listeners = this.listeners.filter((l) => l.id !== listenerId);
         if (existingListener !== undefined) {
             existingListener.off("message", this.handleMessageEvent.bind(this));
             existingListener.unsubscribe(this);
         }
     }
     getListenerByid(listenerId) {
-        return this.listeners.find(l => l.id === listenerId);
+        return this.listeners.find((l) => l.id === listenerId);
     }
     handleMessageEvent(message) {
         if (message.data.__type === undefined)
@@ -140,7 +140,7 @@ class MessageBroker {
         target.postMessage({
             __type: "return",
             returnId,
-            returnValue
+            returnValue,
         });
     }
 }

package/lib/SystemMessaging/SecondLIfeMessagingListener.js

@@ -13,7 +13,7 @@ class SecondLifeMessagingListener extends events_1.EventEmitter {
     subscribe(broker) {
         this.socket.emit("ident", {
             id: this.senderId,
-            owner: SecondLifeIdentity_1.default.getKeyFromQueryString(),
+            owner: SecondLifeIdentity_1.default.getKey(),
         });
         this.socket.on("invoke", this.messageEventHandler.bind(this));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@photon-os/sdk",
-  "version": "0.5.0-beta0",
+  "version": "0.5.0-beta1",
   "license": "MIT",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "socket.io-client": "^2.3.0",
-    "uuid": "^8.1.0"
+    "uuid": "^8.3.2"
   },
   "peerDependencies": {}
 }