sockethub 4.0.1 → 5.0.0-alpha.1

package/dist/platform-instance.js

@@ -18,19 +18,21 @@ const path_1 = require("path");
 const debug_1 = require("debug");
 const bull_1 = __importDefault(require("bull"));
 const config_1 = __importDefault(require("./config"));
-const crypto_1 = __importDefault(require("./crypto"));
 const serve_1 = require("./serve");
+const common_1 = require("./common");
 // collection of platform instances, stored by `id`
 exports.platformInstances = new Map();
 class PlatformInstance {
     constructor(params) {
         this.flaggedForTermination = false;
+        this.completedJobHandlers = new Map();
+        this.config = {};
         this.sessions = new Set();
-        this.global = false;
         this.sessionCallbacks = {
             'close': (() => new Map())(),
-            'message': (() => new Map())(),
+            'message': (() => new Map())()
         };
+        this.global = false;
         this.id = params.identifier;
         this.name = params.platform;
         this.parentId = params.parentId;
@@ -40,46 +42,55 @@ class PlatformInstance {
         else {
             this.global = true;
         }
-        this.debug = debug_1.debug(`sockethub:platform-instance:${this.id}`);
+        this.debug = (0, debug_1.debug)(`sockethub:platform-instance:${this.id}`);
         // spin off a process
-        this.process = child_process_1.fork(path_1.join(__dirname, 'platform.js'), [this.parentId, this.name, this.id]);
+        this.process = (0, child_process_1.fork)((0, path_1.join)(__dirname, 'platform.js'), [this.parentId, this.name, this.id]);
     }
     /**
      * Destroys all references to this platform instance, internal listeners and controlled processes
      */
     destroy() {
-        this.flaggedForTermination = true;
-        exports.platformInstances.delete(this.id);
-        try {
-            this.queue.clean(0);
-        }
-        catch (e) { }
-        try {
-            this.process.removeAllListeners('close');
-            this.process.unref();
-            this.process.kill();
-        }
-        catch (e) { }
+        return __awaiter(this, void 0, void 0, function* () {
+            this.debug(`cleaning up`);
+            this.flaggedForTermination = true;
+            try {
+                yield this.queue.removeAllListeners();
+            }
+            catch (e) { }
+            try {
+                yield this.queue.obliterate({ force: true });
+            }
+            catch (e) { }
+            try {
+                delete this.queue;
+                yield this.process.removeAllListeners('close');
+                yield this.process.unref();
+                yield this.process.kill();
+            }
+            catch (e) { }
+            exports.platformInstances.delete(this.id);
+        });
     }
     /**
      * When jobs are completed or failed, we prepare the results and send them to the client socket
      */
     initQueue(secret) {
-        this.queue = new bull_1.default(this.parentId + this.id, config_1.default);
-        this.queue.on('global:completed', (jobId, result) => {
-            this.queue.getJob(jobId).then((job) => {
-                job.data.msg = crypto_1.default.decrypt(job.data.msg, secret);
-                this.handleJobResult('completed', job, result);
-            });
+        this.queue = new bull_1.default(this.parentId + this.id, { redis: config_1.default.get('redis') });
+        this.queue.on('global:completed', (jobId, resultString) => {
+            const result = resultString ? JSON.parse(resultString) : "";
+            this.queue.getJob(jobId).then((job) => __awaiter(this, void 0, void 0, function* () {
+                yield this.handleJobResult('completed', (0, common_1.decryptJobData)(job, secret), result);
+                yield job.remove();
+            }));
         });
         this.queue.on('global:error', (jobId, result) => {
             this.debug("unknown queue error", jobId, result);
         });
         this.queue.on('global:failed', (jobId, result) => {
-            this.queue.getJob(jobId).then((job) => {
-                job.data.msg = crypto_1.default.decrypt(job.data.msg, secret);
-                this.handleJobResult('failed', job, result);
-            });
+            this.queue.getJob(jobId).then((job) => __awaiter(this, void 0, void 0, function* () {
+                yield this.handleJobResult('failed', (0, common_1.decryptJobData)(job, secret), result);
+                yield job.remove();
+            }));
         });
     }
     /**
@@ -100,18 +111,21 @@ class PlatformInstance {
      * Sends a message to client (user), can be registered with an event emitted from the platform
      * process.
      * @param sessionId ID of the socket connection to send the message to
-     * @param type type of message to emit. 'message', 'completed', 'failed'
      * @param msg ActivityStream object to send to client
      */
-    sendToClient(sessionId, type, msg) {
-        serve_1.getSocket(sessionId).then((socket) => {
+    sendToClient(sessionId, msg) {
+        (0, serve_1.getSocket)(sessionId).then((socket) => {
             try {
                 // this property should never be exposed externally
                 delete msg.sessionSecret;
             }
             catch (e) { }
             msg.context = this.name;
-            socket.emit(type, msg);
+            if ((msg.type === 'error') && (typeof msg.actor === 'undefined') && (this.actor)) {
+                // ensure an actor is present if not otherwise defined
+                msg.actor = { id: this.actor };
+            }
+            socket.emit('message', msg);
         }, (err) => this.debug(`sendToClient ${err}`));
     }
     // send message to every connected socket associated with this platform instance.
@@ -120,32 +134,37 @@ class PlatformInstance {
             for (let sid of this.sessions.values()) {
                 if (sid !== sessionId) {
                     this.debug(`broadcasting message to ${sid}`);
-                    this.sendToClient(sid, 'message', msg);
+                    yield this.sendToClient(sid, msg);
                 }
             }
         });
     }
     // handle job results coming in on the queue from platform instances
-    handleJobResult(type, job, result) {
-        this.debug(`job ${job.data.title}: ${type}`);
-        if ((type === 'completed') && (result)) {
-            job.data.msg.object = {
-                '@type': 'result',
-                content: result
-            };
-        }
-        else if (type === 'failed') {
-            job.data.msg.object = {
-                '@type': 'error',
-                content: result ? result : "job failed for unknown reason"
-            };
-        }
-        // send message to client as completed for failed job
-        this.sendToClient(job.data.sessionId, type, job.data.msg);
-        // let all related peers know of result as an independent message
-        // (not as part of a job completion, or failure)
-        this.broadcastToSharedPeers(job.data.sessionId, job.data.msg);
-        job.remove();
+    handleJobResult(type, jobData, result) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.debug(`${type} job ${jobData.title}`);
+            delete jobData.msg.sessionSecret;
+            let msg = jobData.msg;
+            if (type === 'failed') {
+                msg.error = result ? result : "job failed for unknown reason";
+                if ((this.config.persist) && (this.config.requireCredentials.includes(jobData.msg.type))) {
+                    this.debug(`critical job type ${jobData.msg.type} failed, terminating platform instance`);
+                    yield this.destroy();
+                }
+            }
+            // send result to client
+            const callback = this.completedJobHandlers.get(jobData.title);
+            if (callback) {
+                callback(msg);
+                this.completedJobHandlers.delete(jobData.title);
+            }
+            else {
+                yield this.sendToClient(jobData.sessionId, msg);
+            }
+            // let all related peers know of result as an independent message
+            // (not as part of a job completion, or failure)
+            yield this.broadcastToSharedPeers(jobData.sessionId, msg);
+        });
     }
     /**
      * Sends error message to client and clears all references to this class.
@@ -153,18 +172,17 @@ class PlatformInstance {
      * @param errorMessage
      */
     reportError(sessionId, errorMessage) {
-        const errorObject = {
-            context: this.name,
-            '@type': 'error',
-            target: this.actor,
-            object: {
-                '@type': 'error',
-                content: errorMessage
-            }
-        };
-        this.sendToClient(sessionId, 'message', errorObject);
-        this.sessions.clear();
-        this.destroy();
+        return __awaiter(this, void 0, void 0, function* () {
+            const errorObject = {
+                context: this.name,
+                type: 'error',
+                actor: { id: this.actor },
+                error: errorMessage
+            };
+            this.sendToClient(sessionId, errorObject);
+            this.sessions.clear();
+            yield this.destroy();
+        });
     }
     /**
      * Updates the instance with a new identifier, updating the platformInstances mapping as well.
@@ -197,7 +215,7 @@ class PlatformInstance {
                 }
                 else {
                     // treat like a message to clients
-                    this.sendToClient(sessionId, 'message', data[1]);
+                    this.sendToClient(sessionId, data[1]);
                 }
             }
         };
@@ -205,4 +223,4 @@ class PlatformInstance {
     }
 }
 exports.default = PlatformInstance;
-//# sourceMappingURL=platform-instance.js.map
+//# sourceMappingURL=/platform-instance.js.map

package/dist/platform-instance.js.map

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

package/dist/platform.js

@@ -6,15 +6,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const debug_1 = __importDefault(require("debug"));
 const object_hash_1 = __importDefault(require("object-hash"));
 const config_1 = __importDefault(require("./config"));
-const crypto_1 = __importDefault(require("./crypto"));
 const bull_1 = __importDefault(require("bull"));
 const common_1 = require("./common");
+const store_1 = require("./store");
 // command-line params
 const parentId = process.argv[2];
 const platformName = process.argv[3];
 let identifier = process.argv[4];
 const loggerPrefix = `sockethub:platform:${platformName}:${identifier}`;
-let logger = debug_1.default(loggerPrefix);
+let logger = (0, debug_1.default)(loggerPrefix);
 const PlatformModule = require(`sockethub-platform-${platformName}`);
 let queueStarted = false;
 let parentSecret1, parentSecret2;
@@ -23,7 +23,8 @@ logger(`platform handler initialized for ${platformName} ${identifier}`);
  * Handle any uncaught errors from the platform by alerting the worker and shutting down.
  */
 process.on('uncaughtException', (err) => {
-    console.log(`\nUNCAUGHT EXCEPTION IN PLATFORM\n`);
+    console.log('EXCEPTION IN PLATFORM');
+    // eslint-disable-next-line security-node/detect-crlf
     console.log(err.stack);
     process.send(['error', err.toString()]);
     process.exit(1);
@@ -43,7 +44,7 @@ process.on('message', (data) => {
  * Initialize platform module
  */
 const platformSession = {
-    debug: debug_1.default(`sockethub:platform:${platformName}:${identifier}`),
+    debug: (0, debug_1.default)(`sockethub:platform:${platformName}:${identifier}`),
     sendToClient: getSendFunction('message'),
     updateActor: updateActor
 };
@@ -60,7 +61,7 @@ function getCredentials(actorId, sessionId, sessionSecret, cb) {
     if (platform.config.noCredentials) {
         return cb();
     }
-    const store = common_1.getSessionStore(parentId, parentSecret1, sessionId, sessionSecret);
+    const store = (0, store_1.getSessionStore)(parentId, parentSecret1, sessionId, sessionSecret);
     store.get(actorId, (err, credentials) => {
         if (platform.config.persist) {
             // don't continue if we don't get credentials
@@ -73,13 +74,13 @@ function getCredentials(actorId, sessionId, sessionSecret, cb) {
             return cb();
         }
         if (platform.credentialsHash) {
-            if (platform.credentialsHash !== object_hash_1.default(credentials.object)) {
+            if (platform.credentialsHash !== (0, object_hash_1.default)(credentials.object)) {
                 return cb('provided credentials do not match existing platform instance for actor '
-                    + platform.actor['@id']);
+                    + platform.actor.id);
             }
         }
         else {
-            platform.credentialsHash = object_hash_1.default(credentials.object);
+            platform.credentialsHash = (0, object_hash_1.default)(credentials.object);
         }
         cb(undefined, credentials);
     });
@@ -90,30 +91,54 @@ function getCredentials(actorId, sessionId, sessionSecret, cb) {
  */
 function getJobHandler(secret) {
     return (job, done) => {
-        job.data.msg = crypto_1.default.decrypt(job.data.msg, secret);
-        const jobLog = debug_1.default(`${loggerPrefix}:${job.data.sessionId}`);
-        jobLog(`job ${job.data.title}: ${job.data.msg['@type']}`);
-        const sessionSecret = job.data.msg.sessionSecret;
-        delete job.data.msg.sessionSecret;
-        return getCredentials(job.data.msg.actor['@id'], job.data.sessionId, sessionSecret, (err, credentials) => {
+        const jobData = (0, common_1.decryptJobData)(job, secret);
+        const jobLog = (0, debug_1.default)(`${loggerPrefix}:${jobData.sessionId}`);
+        jobLog(`received ${jobData.title} ${jobData.msg.type}`);
+        const sessionSecret = jobData.msg.sessionSecret;
+        delete jobData.msg.sessionSecret;
+        return getCredentials(jobData.msg.actor.id, jobData.sessionId, sessionSecret, (err, credentials) => {
             if (err) {
                 return done(new Error(err));
             }
+            let jobCallbackCalled = false;
             const doneCallback = (err, result) => {
+                if (jobCallbackCalled) {
+                    return;
+                }
+                jobCallbackCalled = true;
                 if (err) {
-                    done(new Error(err));
+                    jobLog(`errored ${jobData.title} ${jobData.msg.type}`);
+                    let errMsg;
+                    // some error objects (eg. TimeoutError) don't interoplate correctly to human-readable
+                    // so we have to do this little dance
+                    try {
+                        errMsg = err.toString();
+                    }
+                    catch (e) {
+                        errMsg = err;
+                    }
+                    done(new Error(errMsg));
                 }
                 else {
+                    jobLog(`completed ${jobData.title} ${jobData.msg.type}`);
                     done(null, result);
                 }
             };
             if ((Array.isArray(platform.config.requireCredentials)) &&
-                (platform.config.requireCredentials.includes(job.data.msg['@type']))) {
+                (platform.config.requireCredentials.includes(jobData.msg.type))) {
                 // add the credentials object if this method requires it
-                platform[job.data.msg['@type']](job.data.msg, credentials, doneCallback);
+                platform[jobData.msg.type](jobData.msg, credentials, doneCallback);
+            }
+            else if (platform.config.persist) {
+                if (platform.initialized) {
+                    platform[jobData.msg.type](jobData.msg, doneCallback);
+                }
+                else {
+                    done(new Error(`${jobData.msg.type} called on uninitialized platform`));
+                }
             }
             else {
-                platform[job.data.msg['@type']](job.data.msg, doneCallback);
+                platform[jobData.msg.type](jobData.msg, doneCallback);
             }
         });
     };
@@ -134,11 +159,11 @@ function getSendFunction(command) {
  * @param credentials
  */
 function updateActor(credentials) {
-    identifier = common_1.getPlatformId(platformName, credentials.actor['@id']);
-    logger(`platform actor updated to ${credentials.actor['@id']} identifier ${identifier}`);
-    logger = debug_1.default(`sockethub:platform:${identifier}`);
-    platform.credentialsHash = object_hash_1.default(credentials.object);
-    platform.debug = debug_1.default(`sockethub:platform:${platformName}:${identifier}`);
+    identifier = (0, common_1.getPlatformId)(platformName, credentials.actor.id);
+    logger(`platform actor updated to ${credentials.actor.id} identifier ${identifier}`);
+    logger = (0, debug_1.default)(`sockethub:platform:${identifier}`);
+    platform.credentialsHash = (0, object_hash_1.default)(credentials.object);
+    platform.debug = (0, debug_1.default)(`sockethub:platform:${platformName}:${identifier}`);
     process.send(['updateActor', undefined, identifier]);
     startQueueListener(true);
 }
@@ -153,9 +178,9 @@ function startQueueListener(refresh = false) {
         logger('start queue called multiple times, skipping');
         return;
     }
-    const queue = new bull_1.default(parentId + identifier, config_1.default);
+    const queue = new bull_1.default(parentId + identifier, { redis: config_1.default.get('redis') });
     queueStarted = true;
     logger('listening on the queue for incoming jobs');
     queue.process(getJobHandler(secret));
 }
-//# sourceMappingURL=platform.js.map
+//# sourceMappingURL=/platform.js.map

package/dist/platform.js.map

@@ -1 +1 @@
-{"version":3,"file":"platform.js","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"platform.js","sourceRoot":"/","sources":["platform.ts"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAC1B,8DAA+B;AAC/B,sDAA8B;AAC9B,gDAAyB;AACzB,qCAAyD;AAGzD,mCAA0C;AAE1C,sBAAsB;AACtB,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACjC,MAAM,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACrC,IAAI,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACjC,MAAM,YAAY,GAAG,sBAAsB,YAAY,IAAI,UAAU,EAAE,CAAC;AACxE,IAAI,MAAM,GAAG,IAAA,eAAK,EAAC,YAAY,CAAC,CAAC;AAEjC,MAAM,cAAc,GAAG,OAAO,CAAC,sBAAsB,YAAY,EAAE,CAAC,CAAC;AAErE,IAAI,YAAY,GAAG,KAAK,CAAC;AACzB,IAAI,aAAqB,EAAE,aAAqB,CAAC;AAEjD,MAAM,CAAC,oCAAoC,YAAY,IAAI,UAAU,EAAE,CAAC,CAAC;AAQzE;;GAEG;AACH,OAAO,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC,GAAG,EAAE,EAAE;IACtC,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;IACrC,qDAAqD;IACrD,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACvB,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;IACxC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC;AAEH;;;GAGG;AACH,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,IAAuB,EAAE,EAAE;IAChD,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE;QACzB,aAAa,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;QACtC,aAAa,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;QACtC,kBAAkB,EAAE,CAAC;KACtB;AACH,CAAC,CAAC,CAAC;AAGH;;GAEG;AACH,MAAM,eAAe,GAAoB;IACvC,KAAK,EAAE,IAAA,eAAK,EAAC,sBAAsB,YAAY,IAAI,UAAU,EAAE,CAAC;IAChE,YAAY,EAAE,eAAe,CAAC,SAAS,CAAC;IACxC,WAAW,EAAE,WAAW;CACzB,CAAC;AACF,MAAM,QAAQ,GAAG,IAAI,cAAc,CAAC,eAAe,CAAC,CAAC;AAErD;;;;;;;GAOG;AACH,SAAS,cAAc,CAAC,OAAe,EAAE,SAAiB,EAAE,aAAqB,EAAE,EAAY;IAC7F,IAAI,QAAQ,CAAC,MAAM,CAAC,aAAa,EAAE;QAAE,OAAO,EAAE,EAAE,CAAC;KAAE;IACnD,MAAM,KAAK,GAAG,IAAA,uBAAe,EAAC,QAAQ,EAAE,aAAa,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;IACjF,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,WAAW,EAAE,EAAE;QACtC,IAAI,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE;YAC3B,6CAA6C;YAC7C,IAAI,GAAG,EAAE;gBAAE,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC;aAAE;SAC7B;aAAM,IAAI,CAAE,WAAW,EAAE;YACxB,kEAAkE;YAClE,OAAO,EAAE,EAAE,CAAC;SACb;QAED,IAAI,QAAQ,CAAC,eAAe,EAAE;YAC5B,IAAI,QAAQ,CAAC,eAAe,KAAK,IAAA,qBAAI,EAAC,WAAW,CAAC,MAAM,CAAC,EAAE;gBACzD,OAAO,EAAE,CAAC,yEAAyE;sBAC7E,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;aAC1B;SACF;aAAM;YACL,QAAQ,CAAC,eAAe,GAAG,IAAA,qBAAI,EAAC,WAAW,CAAC,MAAM,CAAC,CAAC;SACrD;QACD,EAAE,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;GAGG;AACH,SAAS,aAAa,CAAC,MAAc;IACnC,OAAO,CAAC,GAAiB,EAAE,IAAc,EAAE,EAAE;QAC3C,MAAM,OAAO,GAAqB,IAAA,uBAAc,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAC9D,MAAM,MAAM,GAAG,IAAA,eAAK,EAAC,GAAG,YAAY,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;QAC7D,MAAM,CAAC,YAAY,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;QACxD,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;QAChD,OAAO,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;QAEjC,OAAO,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,OAAO,CAAC,SAAS,EAAE,aAAa,EAC1E,CAAC,GAAG,EAAE,WAAW,EAAE,EAAE;YACnB,IAAI,GAAG,EAAE;gBAAE,OAAO,IAAI,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;aAAE;YACzC,IAAI,iBAAiB,GAAG,KAAK,CAAC;YAC9B,MAAM,YAAY,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;gBACnC,IAAI,iBAAiB,EAAE;oBAAE,OAAO;iBAAE;gBAClC,iBAAiB,GAAG,IAAI,CAAC;gBACzB,IAAI,GAAG,EAAE;oBACP,MAAM,CAAC,WAAW,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;oBACvD,IAAI,MAAM,CAAC;oBACX,sFAAsF;oBACtF,qCAAqC;oBACrC,IAAI;wBACF,MAAM,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;qBACzB;oBAAC,OAAO,CAAC,EAAE;wBACV,MAAM,GAAG,GAAG,CAAC;qBACd;oBACD,IAAI,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;iBACzB;qBAAM;oBACL,MAAM,CAAC,aAAa,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;oBACzD,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;iBACpB;YACH,CAAC,CAAC;YACF,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;gBACrD,CAAC,QAAQ,CAAC,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,EAAE;gBACjE,wDAAwD;gBACxD,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC;aACpE;iBAAM,IAAI,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE;gBAClC,IAAI,QAAQ,CAAC,WAAW,EAAE;oBACxB,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;iBACvD;qBAAM;oBACL,IAAI,CAAC,IAAI,KAAK,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,mCAAmC,CAAC,CAAC,CAAC;iBACzE;aACF;iBAAM;gBACL,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;aACvD;QACH,CAAC,CAAC,CAAC;IACP,CAAC,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAS,eAAe,CAAC,OAAe;IACtC,OAAO,UAAU,GAAmB,EAAE,OAAgB;QACpD,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;IACxC,CAAC,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAS,WAAW,CAAC,WAAW;IAC9B,UAAU,GAAG,IAAA,sBAAa,EAAC,YAAY,EAAE,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC/D,MAAM,CAAC,6BAA6B,WAAW,CAAC,KAAK,CAAC,EAAE,eAAe,UAAU,EAAE,CAAC,CAAC;IACrF,MAAM,GAAG,IAAA,eAAK,EAAC,sBAAsB,UAAU,EAAE,CAAC,CAAC;IACnD,QAAQ,CAAC,eAAe,GAAG,IAAA,qBAAI,EAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IACpD,QAAQ,CAAC,KAAK,GAAG,IAAA,eAAK,EAAC,sBAAsB,YAAY,IAAI,UAAU,EAAE,CAAC,CAAC;IAC3E,OAAO,CAAC,IAAI,CAAC,CAAC,aAAa,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC;IACrD,kBAAkB,CAAC,IAAI,CAAC,CAAC;AAC3B,CAAC;AAED;;;;GAIG;AACH,SAAS,kBAAkB,CAAC,UAAmB,KAAK;IAClD,MAAM,MAAM,GAAG,aAAa,GAAG,aAAa,CAAC;IAC7C,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,EAAE;QAChC,MAAM,CAAC,6CAA6C,CAAC,CAAC;QACtD,OAAO;KACR;IACD,MAAM,KAAK,GAAG,IAAI,cAAK,CAAC,QAAQ,GAAG,UAAU,EAAE,EAAE,KAAK,EAAE,gBAAM,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC/E,YAAY,GAAG,IAAI,CAAC;IACpB,MAAM,CAAC,0CAA0C,CAAC,CAAC;IACnD,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC;AACvC,CAAC"}

package/dist/process-manager.js

@@ -33,14 +33,17 @@ class ProcessManager {
     }
     get(platform, actorId, sessionId) {
         const platformDetails = init_1.default.platforms.get(platform);
+        let pi;
         if (platformDetails.config.persist) {
             // ensure process is started - one for each actor
-            return this.ensureProcess(platform, sessionId, actorId);
+            pi = this.ensureProcess(platform, sessionId, actorId);
         }
         else {
             // ensure process is started - one for all jobs
-            return this.ensureProcess(platform);
+            pi = this.ensureProcess(platform);
         }
+        pi.config = platformDetails.config;
+        return pi;
     }
     createPlatformInstance(identifier, platform, actor) {
         const secrets = [
@@ -61,7 +64,7 @@ class ProcessManager {
         return platformInstance;
     }
     ensureProcess(platform, sessionId, actor) {
-        const identifier = common_1.getPlatformId(platform, actor);
+        const identifier = (0, common_1.getPlatformId)(platform, actor);
         const platformInstance = platform_instance_1.platformInstances.get(identifier) ||
             this.createPlatformInstance(identifier, platform, actor);
         if (sessionId) {
@@ -72,4 +75,4 @@ class ProcessManager {
     }
 }
 exports.default = ProcessManager;
-//# sourceMappingURL=process-manager.js.map
+//# sourceMappingURL=/process-manager.js.map

package/dist/process-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"process-manager.js","sourceRoot":"","sources":["../src/process-manager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAAoC;AACpC,yEAAkG;AAClG,qCAAyC;AAGzC,MAAM,cAAc;IAKlB,YAAY,QAAgB,EAAE,aAAqB,EAAE,aAAqB;QACxE,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACrC,CAAC;IAED,GAAG,CAAC,QAAgB,EAAE,OAAe,EAAE,SAAkB;QACvD,MAAM,eAAe,GAAG,cAAI,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAErD,IAAI,eAAe,CAAC,MAAM,CAAC,OAAO,EAAE;YAClC,iDAAiD;YACjD,OAAO,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;SACzD;aAAM;YACL,+CAA+C;YAC/C,OAAO,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;SACrC;IACH,CAAC;IAEO,sBAAsB,CAAC,UAAkB,EAAE,QAAgB,EACpC,KAAc;QAC3C,MAAM,OAAO,GAAsB;YACjC,SAAS,EAAE;gBACT,aAAa,EAAE,IAAI,CAAC,aAAa;gBACjC,aAAa,EAAE,IAAI,CAAC,aAAa;aAClC;SACF,CAAC;QACF,MAAM,sBAAsB,GAA2B;YACrD,UAAU,EAAE,UAAU;YACtB,QAAQ,EAAE,QAAQ;YAClB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,KAAK,EAAE,KAAK;SACb,CAAC;QACF,MAAM,gBAAgB,GAAG,IAAI,2BAAgB,CAAC,sBAAsB,CAAC,CAAC;QACtE,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC;QACpE,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACvC,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IAEO,aAAa,CAAC,QAAgB,EAAE,SAAkB,EAAE,KAAc;QACxE,MAAM,UAAU,GAAG,sBAAa,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QAClD,MAAM,gBAAgB,GAAG,qCAAiB,CAAC,GAAG,CAAC,UAAU,CAAC;YAChD,IAAI,CAAC,sBAAsB,CAAC,UAAU,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;QACnE,IAAI,SAAS,EAAE;YACb,gBAAgB,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;SAC7C;QACD,qCAAiB,CAAC,GAAG,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;QACpD,OAAO,gBAAgB,CAAC;IAC1B,CAAC;CACF;AAED,kBAAe,cAAc,CAAC"}
+{"version":3,"file":"process-manager.js","sourceRoot":"/","sources":["process-manager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAAoC;AACpC,yEAC4F;AAC5F,qCAAyC;AAEzC,MAAM,cAAc;IAKlB,YAAY,QAAgB,EAAE,aAAqB,EAAE,aAAqB;QACxE,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACrC,CAAC;IAED,GAAG,CAAC,QAAgB,EAAE,OAAe,EAAE,SAAkB;QACvD,MAAM,eAAe,GAAG,cAAI,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACrD,IAAI,EAAE,CAAC;QAEP,IAAI,eAAe,CAAC,MAAM,CAAC,OAAO,EAAE;YAClC,iDAAiD;YACjD,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;SACvD;aAAM;YACL,+CAA+C;YAC/C,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;SACnC;QACD,EAAE,CAAC,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC;QACnC,OAAO,EAAE,CAAC;IACZ,CAAC;IAEO,sBAAsB,CAAC,UAAkB,EAAE,QAAgB,EACpC,KAAc;QAC3C,MAAM,OAAO,GAAsB;YACjC,SAAS,EAAE;gBACT,aAAa,EAAE,IAAI,CAAC,aAAa;gBACjC,aAAa,EAAE,IAAI,CAAC,aAAa;aAClC;SACF,CAAC;QACF,MAAM,sBAAsB,GAA2B;YACrD,UAAU,EAAE,UAAU;YACtB,QAAQ,EAAE,QAAQ;YAClB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,KAAK,EAAE,KAAK;SACb,CAAC;QACF,MAAM,gBAAgB,GAAG,IAAI,2BAAgB,CAAC,sBAAsB,CAAC,CAAC;QACtE,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC;QACpE,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACvC,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IAEO,aAAa,CAAC,QAAgB,EAAE,SAAkB,EAAE,KAAc;QACxE,MAAM,UAAU,GAAG,IAAA,sBAAa,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QAClD,MAAM,gBAAgB,GAAG,qCAAiB,CAAC,GAAG,CAAC,UAAU,CAAC;YAChD,IAAI,CAAC,sBAAsB,CAAC,UAAU,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;QACnE,IAAI,SAAS,EAAE;YACb,gBAAgB,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;SAC7C;QACD,qCAAiB,CAAC,GAAG,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;QACpD,OAAO,gBAAgB,CAAC;IAC1B,CAAC;CACF;AAED,kBAAe,cAAc,CAAC"}

package/dist/routes.js

@@ -6,17 +6,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.examplePages = exports.examplePaths = exports.basePaths = void 0;
 const path_1 = __importDefault(require("path"));
 const config_1 = __importDefault(require("./config"));
-const debug_scope = process.env.DEBUG || '', address = config_1.default.get('public:protocol') + '://' +
+const debug_1 = __importDefault(require("debug"));
+const debug_scope = process.env.DEBUG || '', logger = (0, debug_1.default)('sockethub:routes'), address = config_1.default.get('public:protocol') + '://' +
     config_1.default.get('public:host') + ':' +
     config_1.default.get('public:port') +
     config_1.default.get('public:path');
 exports.basePaths = {
-    '/sockethub-client.js': path_1.default.resolve(`${__dirname}/js/client.js`),
+    '/sockethub-client.js': path_1.default.resolve(`${__dirname}/../dist/sockethub-client.js`),
+    '/sockethub-client.min.js': path_1.default.resolve(`${__dirname}/../dist/sockethub-client.min.js`),
+    '/sockethub-client.js.map': path_1.default.resolve(`${__dirname}/../dist/sockethub-client.js.map`),
     '/socket.io.js': path_1.default.resolve(`${__dirname}/../node_modules/socket.io/client-dist/socket.io.js`),
     '/socket.io.js.map': path_1.default.resolve(`${__dirname}/../node_modules/socket.io/client-dist/socket.io.js.map`),
-    // '/activity-streams.js':
-    // path.resolve(`${__dirname}/../node_modules/activity-streams/browser/activity-streams.js`),
-    '/activity-streams.min.js': path_1.default.resolve(`${__dirname}/../node_modules/activity-streams/browser/activity-streams.min.js`),
 };
 exports.examplePaths = {
     '/jquery.js': path_1.default.resolve(`${__dirname}/../node_modules/jquery/dist/jquery.min.js`),
@@ -39,6 +39,7 @@ function prepFileRoutes(pathMap) {
                 path: key
             },
             route: (req, res) => {
+                logger(`serving resource ${req.url}`);
                 res.setHeader('Access-Control-Allow-Origin', '*');
                 res.sendFile(pathMap[req.url]);
             }
@@ -55,6 +56,7 @@ Object.keys(exports.examplePages).forEach((key) => {
             path: key
         },
         route: (req, res) => {
+            logger(`serving page ${req.url}`);
             res.render(exports.examplePages[req.url], {
                 debug_scope: debug_scope,
                 address: address,
@@ -79,4 +81,4 @@ const routes = {
     }
 };
 exports.default = routes;
-//# sourceMappingURL=routes.js.map
+//# sourceMappingURL=/routes.js.map

package/dist/routes.js.map

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

package/dist/serve.js

@@ -39,7 +39,7 @@ const HTTP = __importStar(require("http"));
 const socket_io_1 = require("socket.io");
 const config_1 = __importDefault(require("./config"));
 const routes_1 = __importDefault(require("./routes"));
-const log = debug_1.default('sockethub:services:http');
+const log = (0, debug_1.default)('sockethub:services:http');
 /**
  * Handles the initialization and access of service objects.
  *
@@ -74,7 +74,7 @@ class Serve {
     }
     ;
     static initExpress() {
-        let app = express_1.default();
+        let app = (0, express_1.default)();
         // templating engines
         app.set('view engine', 'ejs');
         // use bodyParser
@@ -99,4 +99,4 @@ function getSocket(sessionId) {
 }
 exports.getSocket = getSocket;
 exports.default = serve;
-//# sourceMappingURL=serve.js.map
+//# sourceMappingURL=/serve.js.map

package/dist/serve.js.map

@@ -1 +1 @@
-{"version":3,"file":"serve.js","sourceRoot":"","sources":["../src/serve.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA0B;AAC1B,8DAAqC;AACrC,sDAA8B;AAC9B,2CAA6B;AAC7B,yCAAmC;AAEnC,sDAA8B;AAC9B,sDAA8B;AAE9B,MAAM,GAAG,GAAG,eAAK,CAAC,yBAAyB,CAAC,CAAC;AAE7C;;;;;;GAMG;AACH,MAAM,KAAK;IAIT;;;OAGG;IACH,KAAK;QACH,2CAA2C;QAC3C,MAAM,GAAG,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;QAChC,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjC,IAAI,CAAC,EAAE,GAAG,IAAI,kBAAM,CAAC,IAAI,CAAC,IAAI,EAAE;YAC9B,IAAI,EAAE,gBAAM,CAAC,GAAG,CAAC,cAAc,CAAC;YAChC,IAAI,EAAE;gBACJ,MAAM,EAAE,GAAG;gBACX,OAAO,EAAE,CAAE,KAAK,EAAE,MAAM,CAAE;aAC3B;SACF,CAAC,CAAC;QACH,gBAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAClB,IAAI,CAAC,aAAa,EAAE,CAAC;IACvB,CAAC;IAEO,aAAa;QACnB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAM,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,gBAAM,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,GAAG,EAAE;YAC5E,GAAG,CAAC,yBAAyB;gBAC3B,UAAU,gBAAM,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,gBAAM,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;QAC1E,CAAC,CAAC,CAAC;IACL,CAAC;IAAA,CAAC;IAEM,MAAM,CAAC,WAAW;QACxB,IAAI,GAAG,GAAG,iBAAO,EAAE,CAAC;QACpB,qBAAqB;QACrB,GAAG,CAAC,GAAG,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;QAC9B,iBAAiB;QACjB,GAAG,CAAC,GAAG,CAAC,qBAAU,CAAC,UAAU,CAAC,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC,CAAC,CAAC;QACjD,GAAG,CAAC,GAAG,CAAC,qBAAU,CAAC,IAAI,EAAE,CAAC,CAAC;QAC3B,OAAO,GAAG,CAAC;IACb,CAAC;CACF;AAED,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;AAO1B,SAAsB,SAAS,CAAC,SAAiB;;QAC/C,MAAM,OAAO,GAA0B,MAAM,KAAK,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC;QACrE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,KAAK,IAAI,MAAM,IAAI,OAAO,EAAE;gBAC1B,IAAI,SAAS,KAAK,MAAM,CAAC,EAAE,EAAE;oBAC3B,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC;iBACxB;aACF;YACD,OAAO,MAAM,CAAC,uCAAuC,SAAS,EAAE,CAAC,CAAC;QACpE,CAAC,CAAC,CAAC;IACL,CAAC;CAAA;AAVD,8BAUC;AAED,kBAAe,KAAK,CAAC"}
+{"version":3,"file":"serve.js","sourceRoot":"/","sources":["serve.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA0B;AAC1B,8DAAqC;AACrC,sDAA8B;AAC9B,2CAA6B;AAC7B,yCAAmC;AAEnC,sDAA8B;AAC9B,sDAA8B;AAE9B,MAAM,GAAG,GAAG,IAAA,eAAK,EAAC,yBAAyB,CAAC,CAAC;AAE7C;;;;;;GAMG;AACH,MAAM,KAAK;IAIT;;;OAGG;IACH,KAAK;QACH,2CAA2C;QAC3C,MAAM,GAAG,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;QAChC,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjC,IAAI,CAAC,EAAE,GAAG,IAAI,kBAAM,CAAC,IAAI,CAAC,IAAI,EAAE;YAC9B,IAAI,EAAE,gBAAM,CAAC,GAAG,CAAC,cAAc,CAAC;YAChC,IAAI,EAAE;gBACJ,MAAM,EAAE,GAAG;gBACX,OAAO,EAAE,CAAE,KAAK,EAAE,MAAM,CAAE;aAC3B;SACF,CAAC,CAAC;QACH,gBAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAClB,IAAI,CAAC,aAAa,EAAE,CAAC;IACvB,CAAC;IAEO,aAAa;QACnB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAM,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,gBAAM,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,GAAG,EAAE;YAC5E,GAAG,CAAC,yBAAyB;gBAC3B,UAAU,gBAAM,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,gBAAM,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;QAC1E,CAAC,CAAC,CAAC;IACL,CAAC;IAAA,CAAC;IAEM,MAAM,CAAC,WAAW;QACxB,IAAI,GAAG,GAAG,IAAA,iBAAO,GAAE,CAAC;QACpB,qBAAqB;QACrB,GAAG,CAAC,GAAG,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;QAC9B,iBAAiB;QACjB,GAAG,CAAC,GAAG,CAAC,qBAAU,CAAC,UAAU,CAAC,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC,CAAC,CAAC;QACjD,GAAG,CAAC,GAAG,CAAC,qBAAU,CAAC,IAAI,EAAE,CAAC,CAAC;QAC3B,OAAO,GAAG,CAAC;IACb,CAAC;CACF;AAED,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;AAO1B,SAAsB,SAAS,CAAC,SAAiB;;QAC/C,MAAM,OAAO,GAA0B,MAAM,KAAK,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC;QACrE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,KAAK,IAAI,MAAM,IAAI,OAAO,EAAE;gBAC1B,IAAI,SAAS,KAAK,MAAM,CAAC,EAAE,EAAE;oBAC3B,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC;iBACxB;aACF;YACD,OAAO,MAAM,CAAC,uCAAuC,SAAS,EAAE,CAAC,CAAC;QACpE,CAAC,CAAC,CAAC;IACL,CAAC;CAAA;AAVD,8BAUC;AAED,kBAAe,KAAK,CAAC"}