sockethub 4.0.1 → 5.0.0-alpha.1

package/README.md

@@ -29,9 +29,9 @@ Below is a list of platform contexts we're currently working on and their types,
 
 ## Platforms
 
-* [Feeds](packages/sockethub-platform-feeds) *(RSS, Atom)*
-* [IRC](packages/sockethub-platform-irc) 
-* [XMPP](packages/sockethub-platform-xmpp) 
+* [Feeds](../sockethub-platform-feeds) *(RSS, Atom)*
+* [IRC](../sockethub-platform-irc) 
+* [XMPP](../sockethub-platform-xmpp) 
 
 ## Install
 

package/bin/sockethub

@@ -1,26 +1,30 @@
 #!/usr/bin/env node
 const baseDir = process.env.DEV ? 'src' : 'dist';
+const Sockethub = require(`./../${baseDir}/sockethub`).default;
+const sockethub = new Sockethub();
 
-process.once('uncaughtException', function (err) {
-  console.log(`\nUNCAUGHT EXCEPTION\n`);
-  console.log(err.stack);
-  process.exit(1);
-});
+(async () => {
+  process.once('uncaughtException', function (err) {
+    console.log('UNCAUGHT EXCEPTION');
+    // eslint-disable-next-line security-node/detect-crlf
+    console.log(err.stack);
+    process.exit(1);
+  });
 
-process.once('SIGTERM', function () {
-  console.log('Received TERM signal. Exiting.');
-  process.exit(0);
-});
+  process.once('SIGTERM', function () {
+    console.log('Received TERM signal. Exiting.');
+    process.exit(0);
+  });
 
-process.once('SIGINT', function () {
-  console.log('Received INT signal. Exiting.');
-  process.exit(0);
-});
+  process.once('SIGINT', function () {
+    console.log('Received INT signal. Exiting.');
+    process.exit(0);
+  });
 
-const Sockethub = require(`./../${baseDir}/sockethub`).default;
-const sockethub = new Sockethub();
+  process.once('exit', async function () {
+    console.log('destroying all platform instances');
+    await sockethub.removeAllPlatformInstances();
+  });
 
-process.once('exit', function () {
-  sockethub.removeAllPlatformInstances();
-});
-sockethub.boot();
+  sockethub.boot();
+})();

package/dist/bootstrap/init.js

@@ -6,12 +6,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const debug_1 = __importDefault(require("debug"));
 const config_1 = __importDefault(require("../config"));
 const platforms_1 = __importDefault(require("./platforms"));
-const log = debug_1.default('sockethub:bootstrap:init');
+const log = (0, debug_1.default)('sockethub:bootstrap:init');
 log('running init routines');
 const packageJSON = require('./../../package.json');
-const platforms = platforms_1.default(Object.keys(packageJSON.dependencies));
+const platforms = (0, platforms_1.default)(Object.keys(packageJSON.dependencies));
 log('loaded platforms');
 if (config_1.default.get('help')) {
+    // eslint-disable-next-line security-node/detect-crlf
     console.log(packageJSON.name + ' ' + packageJSON.version);
     console.log('command line args: ');
     console.log();
@@ -26,26 +27,35 @@ if (config_1.default.get('help')) {
     process.exit();
 }
 else if (config_1.default.get('info')) {
+    // eslint-disable-next-line security-node/detect-crlf
     console.log(packageJSON.name + ' ' + packageJSON.version);
     console.log();
+    // eslint-disable-next-line security-node/detect-crlf
     console.log('examples enabled: ' + config_1.default.get('examples:enabled'));
+    // eslint-disable-next-line security-node/detect-crlf
     console.log('sockethub: ' + config_1.default.get('service:host') + ':' + config_1.default.get('service:port')
         + config_1.default.get('service:path'));
     if (config_1.default.get('redis:url')) {
+        // eslint-disable-next-line security-node/detect-crlf
         console.log('redis URL: ' + config_1.default.get('redis:url'));
     }
     else {
+        // eslint-disable-next-line security-node/detect-crlf
         console.log('redis: ' + config_1.default.get('redis:host') + ':' + config_1.default.get('redis:port'));
     }
+    // eslint-disable-next-line security-node/detect-crlf
     console.log('public url: ' + config_1.default.get('public:host') + ':' + config_1.default.get('public:port')
         + config_1.default.get('public:path'));
     console.log();
+    // eslint-disable-next-line security-node/detect-crlf
     console.log('platforms: ' + Array.from(platforms.keys()).join(', '));
     if (platforms.size > 0) {
         for (let platform of platforms.values()) {
             console.log();
+            // eslint-disable-next-line security-node/detect-crlf
             console.log('  ' + platform.id + ' v' + platform.version);
-            console.log('    AS @types: ' + platform['@types']);
+            // eslint-disable-next-line security-node/detect-crlf
+            console.log('    AS types: ' + platform.types.join(', '));
         }
         console.log();
         process.exit();
@@ -61,4 +71,4 @@ const init = {
     platforms: platforms
 };
 exports.default = init;
-//# sourceMappingURL=init.js.map
+//# sourceMappingURL=/bootstrap/init.js.map

package/dist/bootstrap/init.js.map

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/bootstrap/init.ts"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAE1B,uDAA+B;AAC/B,4DAAuC;AAEvC,MAAM,GAAG,GAAG,eAAK,CAAC,0BAA0B,CAAC,CAAC;AAC9C,GAAG,CAAC,uBAAuB,CAAC,CAAC;AAE7B,MAAM,WAAW,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;AACpD,MAAM,SAAS,GAAG,mBAAY,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC;AACtE,GAAG,CAAC,kBAAkB,CAAC,CAAC;AAExB,IAAI,gBAAM,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;IACtB,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,GAAG,GAAG,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IAC1D,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;IACnC,OAAO,CAAC,GAAG,EAAE,CAAC;IACd,OAAO,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC;IAC/C,OAAO,CAAC,GAAG,CAAC,iDAAiD,CAAC,CAAC;IAC/D,OAAO,CAAC,GAAG,EAAE,CAAC;IACd,OAAO,CAAC,GAAG,CAAC,0EAA0E,CAAC,CAAC;IACxF,OAAO,CAAC,GAAG,EAAE,CAAC;IACd,OAAO,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;IAClD,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;IAC9C,OAAO,CAAC,GAAG,EAAE,CAAC;IACd,OAAO,CAAC,IAAI,EAAE,CAAC;CAChB;KAAM,IAAI,gBAAM,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;IAC7B,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,GAAG,GAAG,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IAC1D,OAAO,CAAC,GAAG,EAAE,CAAC;IACd,OAAO,CAAC,GAAG,CAAC,oBAAoB,GAAG,gBAAM,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,CAAC;IACnE,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,gBAAM,CAAC,GAAG,CAAC,cAAc,CAAC,GAAG,GAAG,GAAG,gBAAM,CAAC,GAAG,CAAC,cAAc,CAAC;UAC3E,gBAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC;IAE1C,IAAI,gBAAM,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;QAC3B,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,gBAAM,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC;KACtD;SAAM;QACL,OAAO,CAAC,GAAG,CAAC,SAAS,GAAG,gBAAM,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,GAAG,GAAG,gBAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;KACpF;IACD,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,gBAAM,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,GAAG,GAAG,gBAAM,CAAC,GAAG,CAAC,aAAa,CAAC;UAC1E,gBAAM,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC;IAEzC,OAAO,CAAC,GAAG,EAAE,CAAC;IACd,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAErE,IAAI,SAAS,CAAC,IAAI,GAAG,CAAC,EAAE;QACtB,KAAK,IAAI,QAAQ,IAAI,SAAS,CAAC,MAAM,EAAE,EAAE;YACvC,OAAO,CAAC,GAAG,EAAE,CAAC;YACd,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,QAAQ,CAAC,EAAE,GAAG,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;YAC1D,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;SACrD;QACD,OAAO,CAAC,GAAG,EAAE,CAAC;QACd,OAAO,CAAC,IAAI,EAAE,CAAC;KAChB;SAAM;QACL,OAAO,CAAC,GAAG,EAAE,CAAC;QACd,OAAO,CAAC,IAAI,EAAE,CAAC;KAChB;CACF;AAED,GAAG,CAAC,wBAAwB,CAAC,CAAC;AAe9B,MAAM,IAAI,GAAgB;IACxB,OAAO,EAAE,WAAW,CAAC,OAAO;IAC5B,SAAS,EAAE,SAAS;CACrB,CAAC;AACF,kBAAe,IAAI,CAAC"}
+{"version":3,"file":"init.js","sourceRoot":"/","sources":["bootstrap/init.ts"],"names":[],"mappings":"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"}

package/dist/bootstrap/platforms.js

@@ -5,87 +5,99 @@
  * platforms, and whitelisting or blacklisting (or neither) based on the
  * config.
  */
-const tv4 = require('tv4'), debug = require('debug'), schemas = require('sockethub-schemas'), findup = require('findup-sync');
+const debug   = require('debug'),
+      schemas = require('sockethub-schemas'),
+      findup  = require('findup-sync');
+
 const config = require('../config').default;
 const log = debug('sockethub:bootstrap:platforms');
-const whitelist = config.get('platforms:whitelist'), blacklist = config.get('platforms:blacklist');
+
+const whitelist = config.get('platforms:whitelist'),
+      blacklist = config.get('platforms:blacklist');
+
 log('loading platforms');
+
 // checks platform against black and whitelist.
 function platformIsAccepted(platformName) {
-    let willLoad = false;
-    if (whitelist.length > 0) {
-        if (whitelist.indexOf(platformName) >= 0) {
-            willLoad = true;
-        }
-    }
-    else if (blacklist.length > 0) {
-        if (blacklist.indexOf(platformName) < 0) {
-            willLoad = true;
-        }
+  let willLoad = false;
+  if (whitelist.length > 0) {
+    if (whitelist.indexOf(platformName) >= 0) {
+      willLoad = true;
     }
-    else {
-        willLoad = true;
+  } else if (blacklist.length > 0) {
+    if (blacklist.indexOf(platformName) < 0) {
+      willLoad = true;
     }
-    return willLoad;
+  } else {
+    willLoad = true;
+  }
+  return willLoad;
 }
+
 // if the platform schema lists valid types it implements (essentially methods/verbs for
-// sockethub to call) the add it to the supported types list.
+// sockethub to call) then add it to the supported types list.
 function platformListsSupportedTypes(p) {
-    return ((p.schema.messages.properties) && (p.schema.messages.properties['@type']) &&
-        (p.schema.messages.properties['@type'].enum) &&
-        (p.schema.messages.properties['@type'].enum.length > 0));
+  return ((p.schema.messages.properties) && (p.schema.messages.properties.type) &&
+    (p.schema.messages.properties.type.enum) &&
+    (p.schema.messages.properties.type.enum.length > 0));
 }
+
 module.exports = function platformLoad(moduleList) {
-    // load platforms from package.json
-    const rx = new RegExp('^sockethub-platform-', 'i');
-    const platforms = new Map();
-    log('finding and registering platforms from package list');
-    for (let moduleName of moduleList) {
-        if (rx.test(moduleName)) {
-            // found a sockethub platform
-            const platformName = moduleName.replace(rx, '');
-            log(`registering ${platformName} platform`);
-            if (platformIsAccepted(platformName)) {
-                // try to load platform
-                const P = require(moduleName);
-                const p = new P();
-                let path = findup(moduleName, { cwd: __dirname + '/../../node_modules' });
-                if (!path) {
-                    path = findup(moduleName, { cwd: 'node_modules' });
-                }
-                const packageJson = require(path + '/package.json');
-                let types = [];
-                // validate schema property
-                if (!tv4.validate(p.schema, schemas.platform)) {
-                    throw new Error(`${platformName} platform schema failed to validate: ${tv4.error.message}`);
-                }
-                else if (typeof p.config !== 'object') {
-                    throw new Error(`${platformName} platform must have a config property that is an object.`);
-                }
-                else {
-                    if (p.schema.credentials) {
-                        // register the platforms credentials schema
-                        types.push('credentials');
-                        tv4.addSchema(`http://sockethub.org/schemas/v0/context/${platformName}/credentials`, p.schema.credentials);
-                    }
-                    else {
-                        p.config.noCredentials = true;
-                    }
-                }
-                tv4.addSchema(`http://sockethub.org/schemas/v0/context/${platformName}/messages`, p.schema.messages);
-                if (platformListsSupportedTypes(p)) {
-                    types = [...types, ...p.schema.messages.properties['@type'].enum];
-                }
-                platforms.set(platformName, {
-                    id: platformName,
-                    moduleName: moduleName,
-                    config: p.config,
-                    version: packageJson.version,
-                    '@types': types.join(', ')
-                });
-            }
+  // load platforms from package.json
+  const rx = new RegExp('^sockethub-platform-', 'i');
+  const platforms = new Map();
+  log('finding and registering platforms from package list');
+
+  for (let moduleName of moduleList) {
+    if (rx.test(moduleName)) {
+      // found a sockethub platform
+      const platformName = moduleName.replace(rx, '');
+      log(`registering ${platformName} platform`);
+
+      if (platformIsAccepted(platformName)) {
+        // try to load platform
+        const P = require(moduleName);
+        const p = new P();
+        let path = findup(moduleName, { cwd: __dirname + '/../../node_modules' });
+        if (! path) {
+          path = findup(moduleName, { cwd: 'node_modules' });
+        }
+        const packageJson = require(path + '/package.json');
+        let types = [];
+
+        const err = schemas.validator.validatePlatformSchema(p.schema);
+        if (err) {
+          throw new Error(`${platformName} ${err}`);
+        } else if (typeof p.config !== 'object') {
+          throw new Error(
+            `${platformName} platform must have a config property that is an object.`);
+        } else {
+          if (p.schema.credentials) {
+            // register the platforms credentials schema
+            types.push('credentials');
+          } else {
+            p.config.noCredentials = true;
+          }
+        }
+
+        if (platformListsSupportedTypes(p)) {
+          types = [...types, ...p.schema.messages.properties.type.enum];
         }
+
+        platforms.set(platformName, {
+          id: platformName,
+          moduleName: moduleName,
+          config: p.config,
+          schemas: {
+            credentials: p.schema.credentials || {},
+            messages: p.schema.messages || {}
+          },
+          version: packageJson.version,
+          types: types
+        });
+      }
     }
-    return platforms;
+  }
+
+  return platforms;
 };
-//# sourceMappingURL=platforms.js.map

package/dist/common.js

@@ -3,20 +3,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPlatformId = exports.getSessionStore = void 0;
-const secure_store_redis_1 = __importDefault(require("secure-store-redis"));
-const config_1 = __importDefault(require("./config"));
+exports.decryptJobData = exports.getPlatformId = void 0;
 const crypto_1 = __importDefault(require("./crypto"));
-function getSessionStore(parentId, parentSecret, sessionId, sessionSecret) {
-    return new secure_store_redis_1.default({
-        namespace: 'sockethub:' + parentId + ':session:' + sessionId + ':store',
-        secret: parentSecret + sessionSecret,
-        redis: config_1.default.get('redis')
-    });
-}
-exports.getSessionStore = getSessionStore;
 function getPlatformId(platform, actor) {
     return actor ? crypto_1.default.hash(platform + actor) : crypto_1.default.hash(platform);
 }
 exports.getPlatformId = getPlatformId;
-//# sourceMappingURL=common.js.map
+function decryptJobData(job, secret) {
+    return {
+        title: job.data.title,
+        msg: crypto_1.default.decrypt(job.data.msg, secret),
+        sessionId: job.data.sessionId
+    };
+}
+exports.decryptJobData = decryptJobData;
+//# sourceMappingURL=/common.js.map

package/dist/common.js.map

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../src/common.ts"],"names":[],"mappings":";;;;;;AAAA,4EAAuC;AAEvC,sDAA8B;AAC9B,sDAA8B;AAO9B,SAAgB,eAAe,CAAC,QAAgB,EAAE,YAAoB,EACtC,SAAiB,EAAE,aAAqB;IACtE,OAAO,IAAI,4BAAK,CAAC;QACf,SAAS,EAAE,YAAY,GAAG,QAAQ,GAAG,WAAW,GAAG,SAAS,GAAG,QAAQ;QACvE,MAAM,EAAE,YAAY,GAAG,aAAa;QACpC,KAAK,EAAE,gBAAM,CAAC,GAAG,CAAC,OAAO,CAAC;KAC3B,CAAC,CAAC;AACL,CAAC;AAPD,0CAOC;AAED,SAAgB,aAAa,CAAC,QAAgB,EAAE,KAAc;IAC5D,OAAO,KAAK,CAAC,CAAC,CAAC,gBAAM,CAAC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,gBAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AACvE,CAAC;AAFD,sCAEC"}
+{"version":3,"file":"common.js","sourceRoot":"/","sources":["common.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA8B;AAG9B,SAAgB,aAAa,CAAC,QAAgB,EAAE,KAAc;IAC5D,OAAO,KAAK,CAAC,CAAC,CAAC,gBAAM,CAAC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,gBAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AACvE,CAAC;AAFD,sCAEC;AAED,SAAgB,cAAc,CAAC,GAAiB,EAAE,MAAc;IAC9D,OAAO;QACL,KAAK,EAAE,GAAG,CAAC,IAAI,CAAC,KAAK;QACrB,GAAG,EAAE,gBAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC;QACzC,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC,SAAS;KAC9B,CAAC;AACJ,CAAC;AAND,wCAMC"}

package/dist/config.js

@@ -3,11 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.redisConfig = void 0;
+exports.Config = void 0;
 const nconf_1 = __importDefault(require("nconf"));
 const debug_1 = require("debug");
-const ioredis_1 = __importDefault(require("ioredis"));
-const log = debug_1.debug('sockethub:bootstrap:config');
+const log = (0, debug_1.debug)('sockethub:bootstrap:config');
 class Config {
     constructor() {
         this.get = (key) => nconf_1.default.get(key);
@@ -55,24 +54,7 @@ class Config {
         }
     }
 }
+exports.Config = Config;
 const config = new Config();
-/**
- * config object that can be passed in to ioredis to make use of existing connections
- * https://github.com/OptimalBits/bull/blob/master/PATTERNS.md#reusing-redis-connections
- */
-const client = new ioredis_1.default(config.get('redis'));
-const subscriber = new ioredis_1.default(config.get('redis'));
-exports.redisConfig = {
-    createClient: function (type) {
-        switch (type) {
-            case 'client':
-                return client;
-            case 'subscriber':
-                return subscriber;
-            default:
-                return new ioredis_1.default(config.get('redis'));
-        }
-    }
-};
 exports.default = config;
-//# sourceMappingURL=config.js.map
+//# sourceMappingURL=/config.js.map

package/dist/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"config.js","sourceRoot":"/","sources":["config.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,iCAA8B;AAE9B,MAAM,GAAG,GAAG,IAAA,aAAK,EAAC,4BAA4B,CAAC,CAAC;AAEhD,MAAa,MAAM;IACjB;QA6DA,QAAG,GAAG,CAAC,GAAW,EAAO,EAAE,CAAC,eAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QA5DzC,GAAG,CAAC,qBAAqB,CAAC,CAAC;QAC3B,8EAA8E;QAC9E,eAAK,CAAC,IAAI,CAAC;YACT,MAAM,EAAE;gBACN,KAAK,EAAE,cAAc;aACtB;YACD,MAAM,EAAE;gBACN,KAAK,EAAE,cAAc;aACtB;YACD,YAAY,EAAE;gBACZ,KAAK,EAAE,YAAY;aACpB;YACD,YAAY,EAAE;gBACZ,KAAK,EAAE,YAAY;aACpB;YACD,WAAW,EAAE;gBACX,KAAK,EAAE,WAAW;aACnB;SACF,CAAC,CAAC;QACH,eAAK,CAAC,GAAG,EAAE,CAAC;QAEZ,wDAAwD;QACxD,MAAM,QAAQ,GAAG,eAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAEvC,uBAAuB;QACvB,eAAK,CAAC,IAAI,CAAC,SAAS,GAAG,iBAAiB,CAAC,CAAC;QAE1C,2EAA2E;QAC3E,eAAK,CAAC,GAAG,CAAC,kBAAkB,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,eAAK,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;QAEjF,gBAAgB;QAChB,MAAM,QAAQ,GAAW,OAAO,CAAC,SAAS,GAAG,gBAAgB,CAAC,CAAC;QAC/D,eAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAEzB,eAAK,CAAC,QAAQ,CAAC,CAAC,qBAAqB,EAAE,qBAAqB,CAAC,CAAC,CAAC;QAE/D,SAAS,gBAAgB,CAAC,IAAY,EAAE,IAAqB,EAAE,IAAY;YACzE,eAAK,CAAC,GAAG,CAAC,IAAI,GAAG,OAAO,EAAE,IAAI,CAAC,CAAC;YAChC,eAAK,CAAC,GAAG,CAAC,IAAI,GAAG,OAAO,EAAE,IAAI,CAAC,CAAC;QAClC,CAAC;QAED,gBAAgB,CACd,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,eAAK,CAAC,GAAG,CAAC,cAAc,CAAC,EAC7C,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,eAAK,CAAC,GAAG,CAAC,cAAc,CAAC,EAC7C,SAAS,CACV,CAAC;QAEF,gBAAgB,CACd,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,eAAK,CAAC,GAAG,CAAC,YAAY,CAAC,EACjD,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,eAAK,CAAC,GAAG,CAAC,YAAY,CAAC,EACjD,OAAO,CACR,CAAC;QAEF,uDAAuD;QACvD,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE;YACzB,eAAK,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAC9C,eAAK,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAC1B,eAAK,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SAC3B;IACH,CAAC;CAEF;AA/DD,wBA+DC;AAED,MAAM,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;AAC5B,kBAAe,MAAM,CAAC"}

package/dist/crypto.js

@@ -2,12 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const crypto_1 = require("crypto");
 const ALGORITHM = 'aes-256-cbc', IV_LENGTH = 16; // For AES, this is always 16
-let crypto;
 class Crypto {
     constructor() { }
     encrypt(json, secret) {
-        const iv = crypto_1.randomBytes(IV_LENGTH);
-        const cipher = crypto_1.createCipheriv(ALGORITHM, Buffer.from(secret), iv);
+        const iv = (0, crypto_1.randomBytes)(IV_LENGTH);
+        const cipher = (0, crypto_1.createCipheriv)(ALGORITHM, Buffer.from(secret), iv);
         let encrypted = cipher.update(JSON.stringify(json));
         encrypted = Buffer.concat([encrypted, cipher.final()]);
         return iv.toString('hex') + ':' + encrypted.toString('hex');
@@ -16,13 +15,13 @@ class Crypto {
         let parts = text.split(':');
         const iv = Buffer.from(parts.shift(), 'hex');
         const encryptedText = Buffer.from(parts.join(':'), 'hex');
-        const decipher = crypto_1.createDecipheriv(ALGORITHM, Buffer.from(secret), iv);
+        const decipher = (0, crypto_1.createDecipheriv)(ALGORITHM, Buffer.from(secret), iv);
         let decrypted = decipher.update(encryptedText);
         decrypted = Buffer.concat([decrypted, decipher.final()]);
         return JSON.parse(decrypted.toString());
     }
     hash(text) {
-        const shasum = crypto_1.createHash('sha1');
+        const shasum = (0, crypto_1.createHash)('sha1');
         shasum.update(text);
         return shasum.digest('hex').substring(0, 7);
     }
@@ -30,10 +29,10 @@ class Crypto {
         if (len > 32) {
             throw new Error(`crypto.randToken supports a length param of up to 32, ${len} given`);
         }
-        const buf = crypto_1.randomBytes(len);
+        const buf = (0, crypto_1.randomBytes)(len);
         return buf.toString('hex').substring(0, len);
     }
 }
-crypto = new Crypto();
+const crypto = new Crypto();
 exports.default = crypto;
-//# sourceMappingURL=crypto.js.map
+//# sourceMappingURL=/crypto.js.map

package/dist/crypto.js.map

@@ -1 +1 @@
-{"version":3,"file":"crypto.js","sourceRoot":"","sources":["../src/crypto.ts"],"names":[],"mappings":";;AAAA,mCAAmF;AAEnF,MAAM,SAAS,GAAG,aAAa,EACzB,SAAS,GAAG,EAAE,CAAC,CAAC,6BAA6B;AAEnD,IAAI,MAAM,CAAC;AAEX,MAAM,MAAM;IACV,gBAAe,CAAC;IAChB,OAAO,CAAC,IAAY,EAAE,MAAc;QAClC,MAAM,EAAE,GAAG,oBAAW,CAAC,SAAS,CAAC,CAAC;QAClC,MAAM,MAAM,GAAG,uBAAc,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;QAClE,IAAI,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;QAEpD,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QACvD,OAAO,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,GAAG,GAAG,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC9D,CAAC;IACD,OAAO,CAAC,IAAY,EAAE,MAAc;QAClC,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC5B,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,KAAK,CAAC,CAAC;QAC7C,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC;QAC1D,MAAM,QAAQ,GAAG,yBAAgB,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;QACtE,IAAI,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QAC/C,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QACzD,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC1C,CAAC;IACD,IAAI,CAAC,IAAY;QACf,MAAM,MAAM,GAAG,mBAAU,CAAC,MAAM,CAAC,CAAC;QAClC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACpB,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC9C,CAAC;IACD,SAAS,CAAC,GAAW;QACnB,IAAI,GAAG,GAAG,EAAE,EAAE;YACZ,MAAM,IAAI,KAAK,CAAC,yDAAyD,GAAG,QAAQ,CAAC,CAAC;SACvF;QACD,MAAM,GAAG,GAAG,oBAAW,CAAC,GAAG,CAAC,CAAC;QAC7B,OAAO,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAC/C,CAAC;CACF;AAED,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;AACtB,kBAAe,MAAM,CAAC"}
+{"version":3,"file":"crypto.js","sourceRoot":"/","sources":["crypto.ts"],"names":[],"mappings":";;AAAA,mCAAmF;AAGnF,MAAM,SAAS,GAAG,aAAa,EACzB,SAAS,GAAG,EAAE,CAAC,CAAC,6BAA6B;AAEnD,MAAM,MAAM;IACV,gBAAe,CAAC;IAChB,OAAO,CAAC,IAAoB,EAAE,MAAc;QAC1C,MAAM,EAAE,GAAG,IAAA,oBAAW,EAAC,SAAS,CAAC,CAAC;QAClC,MAAM,MAAM,GAAG,IAAA,uBAAc,EAAC,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;QAClE,IAAI,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;QAEpD,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QACvD,OAAO,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,GAAG,GAAG,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC9D,CAAC;IACD,OAAO,CAAC,IAAY,EAAE,MAAc;QAClC,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC5B,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,KAAK,CAAC,CAAC;QAC7C,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC;QAC1D,MAAM,QAAQ,GAAG,IAAA,yBAAgB,EAAC,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;QACtE,IAAI,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QAC/C,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QACzD,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC1C,CAAC;IACD,IAAI,CAAC,IAAY;QACf,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,MAAM,CAAC,CAAC;QAClC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACpB,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC9C,CAAC;IACD,SAAS,CAAC,GAAW;QACnB,IAAI,GAAG,GAAG,EAAE,EAAE;YACZ,MAAM,IAAI,KAAK,CAAC,yDAAyD,GAAG,QAAQ,CAAC,CAAC;SACvF;QACD,MAAM,GAAG,GAAG,IAAA,oBAAW,EAAC,GAAG,CAAC,CAAC;QAC7B,OAAO,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAC/C,CAAC;CACF;AAED,MAAM,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;AAC5B,kBAAe,MAAM,CAAC"}

package/dist/janitor.js

@@ -15,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const debug_1 = __importDefault(require("debug"));
 const platform_instance_1 = require("./platform-instance");
 const serve_1 = __importDefault(require("./serve"));
-const rmLog = debug_1.default('sockethub:janitor');
+const rmLog = (0, debug_1.default)('sockethub:janitor');
 const TICK = 15000;
 let alreadyCalled = false;
 let cycleCount = 0; // a counter for each setInterval call
@@ -40,10 +40,10 @@ function janitorCycle() {
         const sockets = yield serve_1.default.io.fetchSockets();
         if (!(cycleCount % 4)) {
             reportCount++;
-            rmLog(`sessions: ${sockets.length} instances: ${platform_instance_1.platformInstances.size}`);
+            rmLog(`socket sessions: ${sockets.length} platform instances: ${platform_instance_1.platformInstances.size}`);
         }
         for (let platformInstance of platform_instance_1.platformInstances.values()) {
-            removeStaleSessions(platformInstance, sockets);
+            removeStaleSocketSessions(platformInstance, sockets);
             // Static platforms are for global use, not tied to a unique to session / eg. credentials)
             if ((!platformInstance.global) && (platformInstance.sessions.size === 0)) {
                 removeStalePlatformInstance(platformInstance);
@@ -62,19 +62,24 @@ function socketExists(sessionId, sockets) {
     }
     return false;
 }
-function removeStaleSessions(platformInstance, sockets) {
-    for (let sessionId of platformInstance.sessions.values()) {
+function removeSessionCallbacks(platformInstance, sessionId) {
+    for (const key in platformInstance.sessionCallbacks) {
+        platformInstance.sessionCallbacks[key].delete(sessionId);
+    }
+}
+function removeStaleSocketSessions(platformInstance, sockets) {
+    for (const sessionId of platformInstance.sessions.values()) {
         if (!socketExists(sessionId, sockets)) {
-            rmLog('removing stale session reference ' + sessionId + ' in platform instance '
+            rmLog('removing stale socket session reference ' + sessionId + ' in platform instance '
                 + platformInstance.id);
             platformInstance.sessions.delete(sessionId);
+            removeSessionCallbacks(platformInstance, sessionId);
         }
     }
 }
 function removeStalePlatformInstance(platformInstance) {
     if (platformInstance.flaggedForTermination) {
-        rmLog(`terminating platform instance ${platformInstance.id} ` +
-            `(flagged for termination: no registered sessions found)`);
+        rmLog(`terminating platform instance ${platformInstance.id}`);
         platformInstance.destroy(); // terminate
     }
     else {
@@ -90,4 +95,4 @@ const janitor = {
     reportCount: reportCount
 };
 exports.default = janitor;
-//# sourceMappingURL=janitor.js.map
+//# sourceMappingURL=/janitor.js.map

package/dist/janitor.js.map

@@ -1 +1 @@
-{"version":3,"file":"janitor.js","sourceRoot":"","sources":["../src/janitor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,kDAA0B;AAE1B,2DAAwD;AACxD,oDAA4B;AAE5B,MAAM,KAAK,GAAG,eAAK,CAAC,mBAAmB,CAAC,CAAC;AAEzC,MAAM,IAAI,GAAG,KAAK,CAAC;AACnB,IAAI,aAAa,GAAY,KAAK,CAAC;AACnC,IAAI,UAAU,GAAW,CAAC,CAAC,CAAG,sCAAsC;AACpE,IAAI,WAAW,GAAW,CAAC,CAAC,CAAE,sCAAsC;AAEpE;;;;;;GAMG;AACH,SAAS,YAAY;IACnB,IAAI,CAAE,aAAa,EAAE;QAAE,aAAa,GAAG,IAAI,CAAC;KAAE;SACzC;QAAE,OAAO;KAAE;IAChB,KAAK,CAAC,+BAA+B,CAAC,CAAC;IACvC,WAAW,CAAC,GAAS,EAAE;QACrB,UAAU,EAAE,CAAC;QACb,MAAM,OAAO,GAAG,MAAM,eAAK,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC;QAE9C,IAAI,CAAE,CAAC,UAAU,GAAG,CAAC,CAAC,EAAE;YACtB,WAAW,EAAE,CAAC;YACd,KAAK,CAAC,aAAa,OAAO,CAAC,MAAM,eAAe,qCAAiB,CAAC,IAAI,EAAE,CAAC,CAAC;SAC3E;QAED,KAAK,IAAI,gBAAgB,IAAI,qCAAiB,CAAC,MAAM,EAAE,EAAE;YACvD,mBAAmB,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;YAC/C,0FAA0F;YAC1F,IAAI,CAAC,CAAE,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,KAAK,CAAC,CAAC,EAAE;gBACzE,2BAA2B,CAAC,gBAAgB,CAAC,CAAC;aAC/C;iBAAM;gBACL,gBAAgB,CAAC,qBAAqB,GAAG,KAAK,CAAC;aAChD;SACF;IACH,CAAC,CAAA,EAAE,IAAI,CAAC,CAAC;AACX,CAAC;AAED,SAAS,YAAY,CAAC,SAAS,EAAE,OAAO;IACtC,KAAK,IAAI,MAAM,IAAI,OAAO,EAAE;QAC1B,IAAI,MAAM,CAAC,EAAE,KAAK,SAAS,EAAE;YAC3B,OAAO,IAAI,CAAC;SACb;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,mBAAmB,CAAC,gBAAgB,EAAE,OAAO;IACpD,KAAK,IAAI,SAAS,IAAI,gBAAgB,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE;QACxD,IAAI,CAAE,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE;YACtC,KAAK,CAAC,mCAAmC,GAAG,SAAS,GAAG,wBAAwB;kBAC5E,gBAAgB,CAAC,EAAE,CAAC,CAAC;YACzB,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;SAC7C;KACF;AACH,CAAC;AAED,SAAS,2BAA2B,CAAC,gBAAgB;IACnD,IAAI,gBAAgB,CAAC,qBAAqB,EAAE;QAC1C,KAAK,CAAC,iCAAiC,gBAAgB,CAAC,EAAE,GAAG;YAC3D,yDAAyD,CAAC,CAAC;QAC7D,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAC,YAAY;KACzC;SAAM;QACL,KAAK,CAAC,8CAA8C,gBAAgB,CAAC,EAAE,GAAG;YACxE,gCAAgC,CAAC,CAAC;QACpC,gBAAgB,CAAC,qBAAqB,GAAG,IAAI,CAAC;KAC/C;AACH,CAAC;AAED,MAAM,OAAO,GAAG;IACd,KAAK,EAAE,YAAY;IACnB,aAAa,EAAE,aAAa;IAC5B,UAAU,EAAE,UAAU;IACtB,WAAW,EAAE,WAAW;CACzB,CAAC;AACF,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"janitor.js","sourceRoot":"/","sources":["janitor.ts"],"names":[],"mappings":"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"}

package/dist/middleware/create-activity-object.js

@@ -0,0 +1,19 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const activity_streams_1 = __importDefault(require("activity-streams"));
+const config_1 = __importDefault(require("../config"));
+const activity = (0, activity_streams_1.default)(config_1.default.get('activity-streams:opts'));
+/**
+ * A simple middleware wrapper for the activity-streams Object.create method.
+ * @param obj
+ * @param done
+ */
+function createActivityObject(obj, done) {
+    activity.Object.create(obj);
+    done(obj);
+}
+exports.default = createActivityObject;
+//# sourceMappingURL=/middleware/create-activity-object.js.map

package/dist/middleware/create-activity-object.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-activity-object.js","sourceRoot":"/","sources":["middleware/create-activity-object.ts"],"names":[],"mappings":";;;;;AAAA,wEAA+C;AAC/C,uDAA+B;AAC/B,MAAM,QAAQ,GAAG,IAAA,0BAAe,EAAC,gBAAM,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC,CAAC;AAEtE;;;;GAIG;AACH,SAAwB,oBAAoB,CAAC,GAAQ,EAAE,IAAc;IACnE,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC,GAAG,CAAC,CAAC;AACZ,CAAC;AAHD,uCAGC"}

package/dist/middleware/expand-activity-stream.js

@@ -0,0 +1,33 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const activity_streams_1 = __importDefault(require("activity-streams"));
+const config_1 = __importDefault(require("../config"));
+const activity = (0, activity_streams_1.default)(config_1.default.get('activity-streams:opts'));
+function ensureObject(msg) {
+    return !((typeof msg !== 'object') || (Array.isArray(msg)));
+}
+function expandActivityStream(msg, done) {
+    if (!ensureObject(msg)) {
+        done(new Error(`message received is not an object.`));
+    }
+    else if (typeof msg.context !== 'string') {
+        done(new Error('activity stream must contain a context property'));
+    }
+    else if (typeof msg.type !== 'string') {
+        done(new Error('activity stream must contain a type property.'));
+    }
+    else {
+        msg = activity.Stream(msg);
+        if (!msg.actor) {
+            done(new Error('activity stream must contain an actor property.'));
+        }
+        else {
+            done(msg);
+        }
+    }
+}
+exports.default = expandActivityStream;
+//# sourceMappingURL=/middleware/expand-activity-stream.js.map

package/dist/middleware/expand-activity-stream.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"expand-activity-stream.js","sourceRoot":"/","sources":["middleware/expand-activity-stream.ts"],"names":[],"mappings":";;;;;AAAA,wEAA+C;AAE/C,uDAA+B;AAG/B,MAAM,QAAQ,GAAG,IAAA,0BAAe,EAAC,gBAAM,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC,CAAC;AAEtE,SAAS,YAAY,CAAC,GAAQ;IAC5B,OAAO,CAAC,CAAC,CAAC,OAAO,GAAG,KAAK,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AAC9D,CAAC;AAED,SAAwB,oBAAoB,CAAC,GAAmB,EAAE,IAAc;IAC9E,IAAI,CAAE,YAAY,CAAC,GAAG,CAAC,EAAE;QACvB,IAAI,CAAC,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC,CAAC;KACvD;SAAM,IAAI,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ,EAAE;QAC1C,IAAI,CAAC,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC,CAAC;KACpE;SAAO,IAAI,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE;QACxC,IAAI,CAAC,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC,CAAC;KAClE;SAAM;QACL,GAAG,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC3B,IAAI,CAAE,GAAG,CAAC,KAAK,EAAE;YACf,IAAI,CAAC,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC,CAAC;SACpE;aAAM;YACL,IAAI,CAAC,GAAG,CAAC,CAAC;SACX;KACF;AACH,CAAC;AAfD,uCAeC"}