@sockethub/server 5.0.0-alpha.3 → 5.0.0-alpha.4

package/dist/bootstrap/init.js

@@ -8,6 +8,7 @@ const config_1 = __importDefault(require("../config"));
 const platforms_1 = __importDefault(require("./platforms"));
 const log = (0, debug_1.default)('sockethub:server:bootstrap:init');
 log('running init routines');
+// eslint-disable-next-line @typescript-eslint/no-var-requires
 const packageJSON = require('./../../package.json');
 const platforms = (0, platforms_1.default)(config_1.default.get('platforms'));
 if (config_1.default.get('info')) {
@@ -37,7 +38,7 @@ if (config_1.default.get('info')) {
     // 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()) {
+        for (const platform of platforms.values()) {
             console.log();
             // eslint-disable-next-line security-node/detect-crlf
             console.log(platform.moduleName);

package/dist/bootstrap/init.js.map

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

package/dist/config.d.ts

@@ -1,6 +1,12 @@
+export declare type ActivityStreamConfigOptions = {
+    warnOnUnknownObjectProperties?: boolean;
+    failOnUnknownObjectProperties?: boolean;
+    specialObjs?: object;
+    customProps?: object;
+};
 export declare class Config {
     constructor();
-    get: (key: string) => any;
+    get: (key: string) => unknown;
 }
 declare const config: Config;
 export default config;

package/dist/config.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -79,6 +83,7 @@ class Config {
         // only override config file if explicitly mentioned in command-line params
         nconf_1.default.set('examples:enabled', (examples ? true : nconf_1.default.get('examples:enabled')));
         // load defaults
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
         const defaults = require(__dirname + '/defaults.json');
         nconf_1.default.defaults(defaults);
         nconf_1.default.required(['platforms']);

package/dist/config.js.map

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

package/dist/index.d.ts

@@ -1,2 +1 @@
-declare const Sockethub: any;
-declare const sockethub: any;
+export {};

package/dist/index.js

@@ -1,6 +1,10 @@
 "use strict";
-const Sockethub = require('./sockethub').default;
-const sockethub = new Sockethub();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const sockethub_1 = __importDefault(require("./sockethub"));
+const sockethub = new sockethub_1.default();
 module.exports = async () => {
     process.once('uncaughtException', function (err) {
         console.log('UNCAUGHT EXCEPTION');
@@ -18,7 +22,7 @@ module.exports = async () => {
     });
     process.once('exit', async function () {
         console.log('destroying all platform instances');
-        await sockethub.removeAllPlatformInstances();
+        await sockethub.shutdown();
     });
     sockethub.boot();
 };

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"/","sources":["index.ts"],"names":[],"mappings":";AAAA,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC;AACjD,MAAM,SAAS,GAAG,IAAI,SAAS,EAAE,CAAC;AAElC,MAAM,CAAC,OAAO,GAAG,KAAK,IAAI,EAAE;IAC1B,OAAO,CAAC,IAAI,CAAC,mBAAmB,EAAE,UAAU,GAAG;QAC7C,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;QAClC,qDAAqD;QACrD,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACvB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE;QACtB,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;QAC9C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE;QACrB,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;QAC7C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK;QACxB,OAAO,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;QACjD,MAAM,SAAS,CAAC,0BAA0B,EAAE,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,IAAI,EAAE,CAAC;AACnB,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"/","sources":["index.ts"],"names":[],"mappings":";;;;;AAAA,4DAAoC;AAEpC,MAAM,SAAS,GAAG,IAAI,mBAAS,EAAE,CAAC;AAElC,MAAM,CAAC,OAAO,GAAG,KAAK,IAAI,EAAE;IAC1B,OAAO,CAAC,IAAI,CAAC,mBAAmB,EAAE,UAAU,GAAG;QAC7C,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;QAClC,qDAAqD;QACrD,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACvB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE;QACtB,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;QAC9C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE;QACrB,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;QAC7C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK;QACxB,OAAO,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;QACjD,MAAM,SAAS,CAAC,QAAQ,EAAE,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,IAAI,EAAE,CAAC;AACnB,CAAC,CAAC"}

package/dist/janitor.d.ts

@@ -1,15 +1,30 @@
-/**
- * Every TICK the Janitor will compare existing platform instances with socket.ids (aka. sessionId)
- * If all of the sessionIds associated with a platformInstance have no corresponding socket.id
- * (from the http.io socket.io instance), then the platformInstance will first be flagged, if after
- * the next TICK the same state is determined, the platform will be destroyed (this allows for page
- * refreshes not destroying platform instances)
- */
-declare function janitorCycle(): void;
-declare const janitor: {
-    clean: typeof janitorCycle;
-    alreadyCalled: boolean;
+import { SocketInstance } from "./listener";
+declare class Janitor {
+    cycleInterval: number;
     cycleCount: number;
     reportCount: number;
-};
+    protected stopTriggered: boolean;
+    protected sockets: Array<SocketInstance>;
+    private cycleRunning;
+    /**
+     * Every TICK the `Janitor` will compare existing platform instances with `socket.ids`
+     * (aka. `sessionId`). If all of the `sessionIds` associated with a `platformInstance` have
+     * no corresponding `socket.id` (from the `http.io` `socket.io` instance), then the
+     * `platformInstance` will first be flagged, if after the next `cycleInterval` the same
+     * state is determined, the platform will be destroyed (this allows for page
+     * refreshes not destroying platform instances)
+     */
+    start(): void;
+    stop(): Promise<void>;
+    private removeSessionCallbacks;
+    private removeStaleSocketSessions;
+    private removeStaleSocketSession;
+    private removeStalePlatformInstance;
+    private socketExists;
+    private delay;
+    private getSockets;
+    private performStaleCheck;
+    private clean;
+}
+declare const janitor: Janitor;
 export default janitor;

package/dist/janitor.js

@@ -7,83 +7,114 @@ const debug_1 = __importDefault(require("debug"));
 const platform_instance_1 = require("./platform-instance");
 const listener_1 = __importDefault(require("./listener"));
 const rmLog = (0, debug_1.default)('sockethub:server:janitor');
-const TICK = 15000;
-let alreadyCalled = false;
-let cycleCount = 0; // a counter for each setInterval call
-let reportCount = 0; // number of times a report is printed
-/**
- * Every TICK the Janitor will compare existing platform instances with socket.ids (aka. sessionId)
- * If all of the sessionIds associated with a platformInstance have no corresponding socket.id
- * (from the http.io socket.io instance), then the platformInstance will first be flagged, if after
- * the next TICK the same state is determined, the platform will be destroyed (this allows for page
- * refreshes not destroying platform instances)
- */
-function janitorCycle() {
-    if (!alreadyCalled) {
-        alreadyCalled = true;
+class Janitor {
+    constructor() {
+        this.cycleInterval = 15000;
+        this.cycleCount = 0; // a counter for each cycleInterval
+        this.reportCount = 0; // number of times a report is printed
+        this.stopTriggered = false;
+        this.cycleRunning = false;
     }
-    else {
-        return;
+    /**
+     * Every TICK the `Janitor` will compare existing platform instances with `socket.ids`
+     * (aka. `sessionId`). If all of the `sessionIds` associated with a `platformInstance` have
+     * no corresponding `socket.id` (from the `http.io` `socket.io` instance), then the
+     * `platformInstance` will first be flagged, if after the next `cycleInterval` the same
+     * state is determined, the platform will be destroyed (this allows for page
+     * refreshes not destroying platform instances)
+     */
+    start() {
+        rmLog('initializing');
+        this.clean().then(() => {
+            rmLog('cleaning cycle started');
+        });
     }
-    rmLog('initializing resource manager');
-    setInterval(async () => {
-        cycleCount++;
-        const sockets = await listener_1.default.io.fetchSockets();
-        if (!(cycleCount % 4)) {
-            reportCount++;
-            rmLog(`socket sessions: ${sockets.length} platform instances: ${platform_instance_1.platformInstances.size}`);
+    async stop() {
+        this.stopTriggered = true;
+        rmLog('stopping, terminating all sessions');
+        for (const platformInstance of platform_instance_1.platformInstances.values()) {
+            this.removeStaleSocketSessions(platformInstance);
+            await this.removeStalePlatformInstance(platformInstance);
+            await platformInstance.shutdown();
         }
-        for (let platformInstance of platform_instance_1.platformInstances.values()) {
-            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);
-            }
-            else {
-                platformInstance.flaggedForTermination = false;
-            }
+    }
+    removeSessionCallbacks(platformInstance, sessionId) {
+        for (const key in platformInstance.sessionCallbacks) {
+            platformInstance.process.removeListener(key, platformInstance.sessionCallbacks[key].get(sessionId));
+            platformInstance.sessionCallbacks[key].delete(sessionId);
         }
-    }, TICK);
-}
-function socketExists(sessionId, sockets) {
-    for (let socket of sockets) {
-        if (socket.id === sessionId) {
-            return true;
+    }
+    removeStaleSocketSessions(platformInstance) {
+        for (const sessionId of platformInstance.sessions.values()) {
+            if ((this.stopTriggered) || (!this.socketExists(sessionId))) {
+                this.removeStaleSocketSession(platformInstance, sessionId);
+            }
         }
     }
-    return false;
-}
-function removeSessionCallbacks(platformInstance, sessionId) {
-    for (const key in platformInstance.sessionCallbacks) {
-        platformInstance.sessionCallbacks[key].delete(sessionId);
+    removeStaleSocketSession(platformInstance, sessionId) {
+        rmLog(`removing ${!this.stopTriggered ? 'stale ' : ''}socket session reference ${sessionId} 
+          in platform instance ${platformInstance.id}`);
+        platformInstance.sessions.delete(sessionId);
+        this.removeSessionCallbacks(platformInstance, sessionId);
     }
-}
-function removeStaleSocketSessions(platformInstance, sockets) {
-    for (const sessionId of platformInstance.sessions.values()) {
-        if (!socketExists(sessionId, sockets)) {
-            rmLog('removing stale socket session reference ' + sessionId + ' in platform instance '
-                + platformInstance.id);
-            platformInstance.sessions.delete(sessionId);
-            removeSessionCallbacks(platformInstance, sessionId);
+    async removeStalePlatformInstance(platformInstance) {
+        if ((platformInstance.flaggedForTermination) || (this.stopTriggered)) {
+            rmLog(`terminating platform instance ${platformInstance.id}`);
+            await platformInstance.shutdown(); // terminate
+        }
+        else {
+            rmLog(`flagging for termination platform instance ${platformInstance.id} ` +
+                `(no registered sessions found)`);
+            platformInstance.flaggedForTermination = true;
         }
     }
-}
-function removeStalePlatformInstance(platformInstance) {
-    if (platformInstance.flaggedForTermination) {
-        rmLog(`terminating platform instance ${platformInstance.id}`);
-        platformInstance.destroy(); // terminate
+    socketExists(sessionId) {
+        for (const socket of this.sockets) {
+            if (socket.id === sessionId) {
+                return true;
+            }
+        }
+        return false;
+    }
+    async delay(ms) {
+        return await new Promise(resolve => setTimeout(resolve, ms));
+    }
+    async getSockets() {
+        return await listener_1.default.io.fetchSockets();
     }
-    else {
-        rmLog(`flagging for termination platform instance ${platformInstance.id} ` +
-            `(no registered sessions found)`);
-        platformInstance.flaggedForTermination = true;
+    async performStaleCheck(platformInstance) {
+        this.removeStaleSocketSessions(platformInstance);
+        // Static platforms are for global use, not tied to a unique to session / eg. credentials)
+        if (!platformInstance.global) {
+            if ((!platformInstance.initialized) || (platformInstance.sessions.size === 0)) {
+                // either the platform failed to initialize, or there are no more sessions linked to it
+                await this.removeStalePlatformInstance(platformInstance);
+            }
+        }
+    }
+    async clean() {
+        if (this.stopTriggered) {
+            this.cycleRunning = false;
+            return;
+        }
+        else if (this.cycleRunning) {
+            throw new Error('janitor cleanup cycle called while already running');
+        }
+        this.cycleRunning = true;
+        this.cycleCount++;
+        this.sockets = await this.getSockets();
+        if (!(this.cycleCount % 4)) {
+            this.reportCount++;
+            rmLog(`socket sessions: ${this.sockets.length} platform instances: ${platform_instance_1.platformInstances.size}`);
+        }
+        for (const platformInstance of platform_instance_1.platformInstances.values()) {
+            await this.performStaleCheck(platformInstance);
+        }
+        this.cycleRunning = false;
+        await this.delay(this.cycleInterval);
+        return this.clean();
     }
 }
-const janitor = {
-    clean: janitorCycle,
-    alreadyCalled: alreadyCalled,
-    cycleCount: cycleCount,
-    reportCount: reportCount
-};
+const janitor = new Janitor();
 exports.default = janitor;
 //# sourceMappingURL=/janitor.js.map

package/dist/janitor.js.map

@@ -1 +1 @@
-{"version":3,"file":"janitor.js","sourceRoot":"/","sources":["janitor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"janitor.js","sourceRoot":"/","sources":["janitor.ts"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAE1B,2DAA0E;AAC1E,0DAAsD;AAEtD,MAAM,KAAK,GAAG,IAAA,eAAK,EAAC,0BAA0B,CAAC,CAAC;AAEhD,MAAM,OAAO;IAAb;QACE,kBAAa,GAAG,KAAK,CAAC;QACtB,eAAU,GAAG,CAAC,CAAC,CAAG,mCAAmC;QACrD,gBAAW,GAAG,CAAC,CAAC,CAAE,sCAAsC;QAC9C,kBAAa,GAAG,KAAK,CAAC;QAExB,iBAAY,GAAG,KAAK,CAAC;IAqH/B,CAAC;IAnHC;;;;;;;OAOG;IACH,KAAK;QACH,KAAK,CAAC,cAAc,CAAC,CAAC;QACtB,IAAI,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;YACrB,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,IAAI;QACR,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC1B,KAAK,CAAC,oCAAoC,CAAC,CAAC;QAC5C,KAAK,MAAM,gBAAgB,IAAI,qCAAiB,CAAC,MAAM,EAAE,EAAE;YACzD,IAAI,CAAC,yBAAyB,CAAC,gBAAgB,CAAC,CAAC;YACjD,MAAM,IAAI,CAAC,2BAA2B,CAAC,gBAAgB,CAAC,CAAC;YACzD,MAAM,gBAAgB,CAAC,QAAQ,EAAE,CAAC;SACnC;IACH,CAAC;IAEO,sBAAsB,CAAC,gBAAkC,EAAE,SAAiB;QAClF,KAAK,MAAM,GAAG,IAAI,gBAAgB,CAAC,gBAAgB,EAAE;YACnD,gBAAgB,CAAC,OAAO,CAAC,cAAc,CACrC,GAAG,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;YAC9D,gBAAgB,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;SAC1D;IACH,CAAC;IAEO,yBAAyB,CAC/B,gBAAkC;QAElC,KAAK,MAAM,SAAS,IAAI,gBAAgB,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE;YAC1D,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,EAAE;gBAC3D,IAAI,CAAC,wBAAwB,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;aAC5D;SACF;IACH,CAAC;IAEO,wBAAwB,CAAC,gBAAkC,EAAE,SAAiB;QACpF,KAAK,CACH,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,4BAA4B,SAAS;iCACzD,gBAAgB,CAAC,EAAE,EAAE,CACjD,CAAC;QACF,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC5C,IAAI,CAAC,sBAAsB,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;IAC3D,CAAC;IAEO,KAAK,CAAC,2BAA2B,CAAC,gBAAkC;QAC1E,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE;YACpE,KAAK,CAAC,iCAAiC,gBAAgB,CAAC,EAAE,EAAE,CAAC,CAAC;YAC9D,MAAM,gBAAgB,CAAC,QAAQ,EAAE,CAAC,CAAC,YAAY;SAChD;aAAM;YACL,KAAK,CAAC,8CAA8C,gBAAgB,CAAC,EAAE,GAAG;gBACxE,gCAAgC,CAAC,CAAC;YACpC,gBAAgB,CAAC,qBAAqB,GAAG,IAAI,CAAC;SAC/C;IACH,CAAC;IAEO,YAAY,CAAC,SAAiB;QACpC,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE;YACjC,IAAI,MAAM,CAAC,EAAE,KAAK,SAAS,EAAE;gBAC3B,OAAO,IAAI,CAAC;aACb;SACF;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,KAAK,CAAC,KAAK,CAAC,EAAE;QACpB,OAAO,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;IAC/D,CAAC;IAEO,KAAK,CAAC,UAAU;QACtB,OAAO,MAAM,kBAAQ,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC;IAC1C,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAC,gBAAkC;QAChE,IAAI,CAAC,yBAAyB,CAAC,gBAAgB,CAAC,CAAC;QACjD,0FAA0F;QAC1F,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE;YAC5B,IAAI,CAAC,CAAC,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,KAAK,CAAC,CAAC,EAAE;gBAC7E,uFAAuF;gBACvF,MAAM,IAAI,CAAC,2BAA2B,CAAC,gBAAgB,CAAC,CAAC;aAC1D;SACF;IACH,CAAC;IAEO,KAAK,CAAC,KAAK;QACjB,IAAI,IAAI,CAAC,aAAa,EAAE;YACtB,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;YAC1B,OAAO;SACR;aAAM,IAAI,IAAI,CAAC,YAAY,EAAE;YAC5B,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;SACvE;QACD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,IAAI,CAAC,UAAU,EAAE,CAAC;QAClB,IAAI,CAAC,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QAEvC,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC,EAAE;YAC1B,IAAI,CAAC,WAAW,EAAE,CAAC;YACnB,KAAK,CACH,oBAAoB,IAAI,CAAC,OAAO,CAAC,MAAM,wBAAwB,qCAAiB,CAAC,IAAI,EAAE,CAAC,CAAC;SAC5F;QAED,KAAK,MAAM,gBAAgB,IAAI,qCAAiB,CAAC,MAAM,EAAE,EAAE;YACzD,MAAM,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;SAChD;QACD,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;QAC1B,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACrC,OAAO,IAAI,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;CACF;AAED,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAC9B,kBAAe,OAAO,CAAC"}

package/dist/listener.d.ts

@@ -20,9 +20,12 @@ declare class Listener {
     private static initExpress;
 }
 declare const listener: Listener;
+interface EmitFunction {
+    (type: string, data: unknown): any;
+}
 export interface SocketInstance {
     id: string;
-    emit: Function;
+    emit: EmitFunction;
 }
 export declare function getSocket(sessionId: string): Promise<SocketInstance>;
 export default listener;

package/dist/listener.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -60,12 +64,11 @@ class Listener {
     startHttp() {
         this.http.listen(config_1.default.get('sockethub:port'), config_1.default.get('sockethub:host'), () => {
             log(`sockethub listening on ` +
-                `http://${config_1.default.get('sockethub:host')}:${config_1.default.get('sockethub:port')}`);
+                `${config_1.default.get('sockethub:host')}:${config_1.default.get('sockethub:port')}`);
         });
     }
-    ;
     static initExpress() {
-        let app = (0, express_1.default)();
+        const app = (0, express_1.default)();
         // templating engines
         app.set('view engine', 'ejs');
         // use bodyParser
@@ -78,7 +81,7 @@ const listener = new Listener();
 async function getSocket(sessionId) {
     const sockets = await listener.io.fetchSockets();
     return new Promise((resolve, reject) => {
-        for (let socket of sockets) {
+        for (const socket of sockets) {
             if (sessionId === socket.id) {
                 return resolve(socket);
             }

package/dist/listener.js.map

@@ -1 +1 @@
-{"version":3,"file":"listener.js","sourceRoot":"/","sources":["listener.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA0B;AAC1B,8DAAqC;AACrC,sDAA8B;AAC9B,2CAA6B;AAC7B,yCAAmC;AAEnC,sDAA8B;AAC9B,sDAA8B;AAE9B,MAAM,GAAG,GAAG,IAAA,eAAK,EAAC,2BAA2B,CAAC,CAAC;AAE/C;;;;;;GAMG;AACH,MAAM,QAAQ;IAIZ;;;OAGG;IACH,KAAK;QACH,2CAA2C;QAC3C,MAAM,GAAG,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;QACnC,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,gBAAgB,CAAC;YAClC,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,SAAS,EAAE,CAAC;IACnB,CAAC;IAEO,SAAS;QACf,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,gBAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,GAAG,EAAE;YAChF,GAAG,CAAC,yBAAyB;gBAC3B,UAAU,gBAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,IAAI,gBAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;QAC9E,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,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;AAOzB,KAAK,UAAU,SAAS,CAAC,SAAiB;IAC/C,MAAM,OAAO,GAA0B,MAAM,QAAQ,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC;IACxE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,KAAK,IAAI,MAAM,IAAI,OAAO,EAAE;YAC1B,IAAI,SAAS,KAAK,MAAM,CAAC,EAAE,EAAE;gBAC3B,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC;aACxB;SACF;QACD,OAAO,MAAM,CAAC,uCAAuC,SAAS,EAAE,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC;AACL,CAAC;AAVD,8BAUC;AAED,kBAAe,QAAQ,CAAC"}
+{"version":3,"file":"listener.js","sourceRoot":"/","sources":["listener.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA0B;AAC1B,8DAAqC;AACrC,sDAA8B;AAC9B,2CAA6B;AAC7B,yCAAmC;AAEnC,sDAA8B;AAC9B,sDAA8B;AAE9B,MAAM,GAAG,GAAG,IAAA,eAAK,EAAC,2BAA2B,CAAC,CAAC;AAE/C;;;;;;GAMG;AACH,MAAM,QAAQ;IAIZ;;;OAGG;IACH,KAAK;QACH,2CAA2C;QAC3C,MAAM,GAAG,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;QACnC,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,gBAAgB,CAAW;YAC5C,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,SAAS,EAAE,CAAC;IACnB,CAAC;IAEO,SAAS;QACf,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,gBAAM,CAAC,GAAG,CAAC,gBAAgB,CAAW,EAAE,GAAG,EAAE;YAC1F,GAAG,CAAC,yBAAyB;gBAC3B,GAAG,gBAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,IAAI,gBAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;QACvE,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,MAAM,CAAC,WAAW;QACxB,MAAM,GAAG,GAAG,IAAA,iBAAO,GAAE,CAAC;QACtB,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,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;AAWzB,KAAK,UAAU,SAAS,CAAC,SAAiB;IAC/C,MAAM,OAAO,GAA0B,MAAM,QAAQ,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC;IACxE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,IAAI,SAAS,KAAK,MAAM,CAAC,EAAE,EAAE;gBAC3B,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC;aACxB;SACF;QACD,OAAO,MAAM,CAAC,uCAAuC,SAAS,EAAE,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC;AACL,CAAC;AAVD,8BAUC;AAED,kBAAe,QAAQ,CAAC"}

package/dist/middleware/create-activity-object.d.ts

@@ -1,6 +1,8 @@
+import { IActivityStream } from "@sockethub/schemas";
+import { MiddlewareChainInterface } from "../middleware";
 /**
  * A simple middleware wrapper for the activity-streams Object.create method.
  * @param obj
  * @param done
  */
-export default function createActivityObject(obj: any, done: Function): void;
+export default function createActivityObject(obj: IActivityStream, done: MiddlewareChainInterface): void;

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

@@ -1 +1 @@
-{"version":3,"file":"create-activity-object.js","sourceRoot":"/","sources":["middleware/create-activity-object.ts"],"names":[],"mappings":";;;;;AAAA,mFAA0D;AAC1D,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"}
+{"version":3,"file":"create-activity-object.js","sourceRoot":"/","sources":["middleware/create-activity-object.ts"],"names":[],"mappings":";;;;;AAAA,mFAA0D;AAC1D,uDAA+B;AAG/B,MAAM,QAAQ,GAAG,IAAA,0BAAe,EAAC,gBAAM,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC,CAAC;AAEtE;;;;GAIG;AACH,SAAwB,oBAAoB,CAAC,GAAoB,EACpB,IAA8B;IACzE,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC,GAAG,CAAC,CAAC;AACZ,CAAC;AAJD,uCAIC"}

package/dist/middleware/expand-activity-stream.d.ts

@@ -1,2 +1,3 @@
 import { IActivityStream } from "@sockethub/schemas";
-export default function expandActivityStream(msg: IActivityStream, done: Function): void;
+import { MiddlewareChainInterface } from "../middleware";
+export default function expandActivityStream(msg: IActivityStream, done: MiddlewareChainInterface): void;

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

@@ -5,7 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const activity_streams_1 = __importDefault(require("@sockethub/activity-streams"));
 const config_1 = __importDefault(require("../config"));
-const activity = (0, activity_streams_1.default)(config_1.default.get('activity-streams:opts'));
+const asConfig = config_1.default.get('activity-streams:opts');
+asConfig.warnOnUnknownObjectProperties = false;
+asConfig.failOnUnknownObjectProperties = false;
+const activity = (0, activity_streams_1.default)(asConfig);
 function ensureObject(msg) {
     return !((typeof msg !== 'object') || (Array.isArray(msg)));
 }

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

@@ -1 +1 @@
-{"version":3,"file":"expand-activity-stream.js","sourceRoot":"/","sources":["middleware/expand-activity-stream.ts"],"names":[],"mappings":";;;;;AAAA,mFAA0D;AAG1D,uDAA+B;AAE/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,GAAoB,EAAE,IAAc;IAC/E,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"}
+{"version":3,"file":"expand-activity-stream.js","sourceRoot":"/","sources":["middleware/expand-activity-stream.ts"],"names":[],"mappings":";;;;;AAAA,mFAA0D;AAG1D,uDAA8D;AAG9D,MAAM,QAAQ,GAAG,gBAAM,CAAC,GAAG,CAAC,uBAAuB,CAAgC,CAAC;AACpF,QAAQ,CAAC,6BAA6B,GAAG,KAAK,CAAC;AAC/C,QAAQ,CAAC,6BAA6B,GAAG,KAAK,CAAC;AAC/C,MAAM,QAAQ,GAAG,IAAA,0BAAe,EAAC,QAAQ,CAAC,CAAC;AAE3C,SAAS,YAAY,CAAC,GAAY;IAChC,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,GAAoB,EACpB,IAA8B;IACzE,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;SAAM,IAAI,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE;QACvC,IAAI,CAAC,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC,CAAC;KAClE;SAAM;QACL,GAAG,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC3B,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE;YACd,IAAI,CAAC,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC,CAAC;SACpE;aAAM;YACL,IAAI,CAAC,GAAG,CAAC,CAAC;SACX;KACF;AACH,CAAC;AAhBD,uCAgBC"}

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

@@ -70,10 +70,10 @@ exports.default = [
                 "image": {
                     "height": 250,
                     "mediaType": "image/jpeg",
-                    "url": "http://example.org/image.jpg",
+                    "url": "https://example.org/image.jpg",
                     "width": 250
                 },
-                "url": "http://sockethub.org"
+                "url": "https://sockethub.org"
             },
             "object": {
                 "type": "credentials",
@@ -336,10 +336,10 @@ exports.default = [
                 "image": {
                     "height": 250,
                     "mediaType": "image/jpeg",
-                    "url": "http://example.org/image.jpg",
+                    "url": "https://example.org/image.jpg",
                     "width": 250
                 },
-                "url": "http://sockethub.org"
+                "url": "https://sockethub.org"
             },
             "target": {
                 "id": "blah3",

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

@@ -1 +1 @@
-{"version":3,"file":"expand-activity-stream.test.data.js","sourceRoot":"/","sources":["middleware/expand-activity-stream.test.data.ts"],"names":[],"mappings":";;AAAA,kBAAe;IACb;QACE,MAAM,EAAE,eAAe;QACvB,OAAO,EAAE,KAAK;QACd,MAAM,EAAE,SAAS;QACjB,OAAO,EAAE,aAAa;QACtB,OAAO,EAAE,2CAA2C;KACrD;IACD;QACE,MAAM,EAAE,oBAAoB;QAC5B,OAAO,EAAC,IAAI;QACZ,MAAM,EAAC,aAAa;QACpB,OAAO,EAAC;YACN,IAAI,EAAC,KAAK;YACV,MAAM,EAAC,MAAM;YACb,SAAS,EAAC,OAAO;YACjB,OAAO,EAAC;gBACN,IAAI,EAAC,uBAAuB;gBAC5B,MAAM,EAAC,QAAQ;gBACf,MAAM,EAAC,MAAM;aACd;YACD,QAAQ,EAAC;gBACP,IAAI,EAAC,0BAA0B;gBAC/B,MAAM,EAAC,QAAQ;gBACf,MAAM,EAAC,SAAS;aACjB;YACD,QAAQ,EAAC;gBACP,MAAM,EAAC,aAAa;aACrB;SACF;QACD,QAAQ,EAAE,MAAM;KACjB;IACD;QACE,MAAM,EAAE,kBAAkB;QAC1B,OAAO,EAAC,IAAI;QACZ,MAAM,EAAC,aAAa;QACpB,OAAO,EAAC;YACN,IAAI,EAAC,KAAK;YACV,MAAM,EAAC,aAAa;YACpB,SAAS,EAAC,OAAO;YACjB,OAAO,EAAC;gBACN,IAAI,EAAC,uBAAuB;gBAC5B,MAAM,EAAC,QAAQ;gBACf,MAAM,EAAC,MAAM;aACd;YACD,QAAQ,EAAC;gBACP,IAAI,EAAC,0BAA0B;gBAC/B,MAAM,EAAC,QAAQ;gBACf,MAAM,EAAC,SAAS;aACjB;YACD,QAAQ,EAAC;gBACP,MAAM,EAAC,aAAa;aACrB;SACF;QACD,QAAQ,EAAC,MAAM;KAChB;IACD;QACE,MAAM,EAAC,YAAY;QACnB,OAAO,EAAC,IAAI;QACZ,MAAM,EAAC,aAAa;QACpB,OAAO,EAAC;YACN,MAAM,EAAC,aAAa;YACpB,SAAS,EAAC,KAAK;YACf,OAAO,EAAC;gBACN,IAAI,EAAC,2BAA2B;gBAChC,MAAM,EAAC,QAAQ;gBACf,MAAM,EAAC,UAAU;gBACjB,OAAO,EAAC;oBACN,QAAQ,EAAC,GAAG;oBACZ,WAAW,EAAC,YAAY;oBACxB,KAAK,EAAC,8BAA8B;oBACpC,OAAO,EAAC,GAAG;iBACZ;gBACD,KAAK,EAAC,sBAAsB;aAC7B;YACD,QAAQ,EAAC;gBACP,MAAM,EAAC,aAAa;gBACpB,MAAM,EAAC,UAAU;gBACjB,MAAM,EAAC,IAAI;gBACX,QAAQ,EAAC,KAAK;gBACd,QAAQ,EAAC,kBAAkB;aAC5B;SACF;QACD,QAAQ,EAAC,MAAM;KAChB;IACD;QACE,MAAM,EAAC,mBAAmB;QAC1B,OAAO,EAAC,KAAK;QACb,MAAM,EAAC,aAAa;QACpB,OAAO,EAAC;YACN,OAAO,EAAC,qBAAqB;YAC7B,SAAS,EAAC,MAAM;YAChB,QAAQ,EAAC;gBACP,UAAU,EAAC,WAAW;gBACtB,UAAU,EAAC,KAAK;gBAChB,QAAQ,EAAC,WAAW;gBACpB,MAAM,EAAC,IAAI;gBACX,UAAU,EAAC,QAAQ;aACpB;SACF;QACD,OAAO,EAAE,sDAAsD;KAChE;IACD;QACE,MAAM,EAAE,sBAAsB;QAC9B,MAAM,EAAE,SAAS;QACjB,OAAO,EAAE,MAAM;QACf,OAAO,EAAE;YACP,SAAS,EAAE,KAAK;YAChB,MAAM,EAAE,KAAK;YACb,OAAO,EAAE,SAAS;YAClB,QAAQ,EAAE;gBACR,SAAS,EAAE,KAAK;aACjB;SACF;QACD,QAAQ,EAAE;YACR,SAAS,EAAE,KAAK;YAChB,MAAM,EAAE,KAAK;YACb,OAAO,EAAE;gBACP,IAAI,EAAE,SAAS;aAChB;YACD,QAAQ,EAAE;gBACR,SAAS,EAAE,KAAK;aACjB;SACF;KACF;IACD;QACE,MAAM,EAAE,wBAAwB;QAChC,MAAM,EAAE,SAAS;QACjB,OAAO,EAAE,MAAM;QACf,OAAO,EAAE;YACP,SAAS,EAAE,KAAK;YAChB,MAAM,EAAE,KAAK;YACb,OAAO,EAAE,8BAA8B;YACvC,QAAQ,EAAE;gBACR,SAAS,EAAE,KAAK;aACjB;SACF;QACD,QAAQ,EAAE;YACR,SAAS,EAAE,KAAK;YAChB,MAAM,EAAE,KAAK;YACb,OAAO,EAAE;gBACP,IAAI,EAAE,8BAA8B;aACrC;YACD,QAAQ,EAAE;gBACR,SAAS,EAAE,KAAK;aACjB;SACF;KACF;IACD;QACE,MAAM,EAAE,wBAAwB;QAChC,MAAM,EAAE,SAAS;QACjB,OAAO,EAAE,MAAM;QACf,OAAO,EAAE;YACP,SAAS,EAAE,KAAK;YAChB,MAAM,EAAE,KAAK;YACb,OAAO,EAAE,mCAAmC;YAC5C,QAAQ,EAAE;gBACR,SAAS,EAAE,KAAK;aACjB;SACF;QACD,QAAQ,EAAE;YACR,SAAS,EAAE,KAAK;YAChB,MAAM,EAAE,KAAK;YACb,OAAO,EAAE;gBACP,IAAI,EAAE,mCAAmC;aAC1C;YACD,QAAQ,EAAE;gBACR,SAAS,EAAE,KAAK;aACjB;SACF;KACF;IACD;QACE,MAAM,EAAC,QAAQ;QACf,MAAM,EAAC,SAAS;QAChB,OAAO,EAAC,IAAI;QACZ,OAAO,EAAC;YACN,SAAS,EAAE,cAAc;YACzB,MAAM,EAAE,WAAW;YACnB,OAAO,EAAE,MAAM;YACf,QAAQ,EAAE,EAAE;SACb;QACD,QAAQ,EAAE;YACR,SAAS,EAAE,cAAc;YACzB,MAAM,EAAE,WAAW;YACnB,OAAO,EAAE;gBACP,IAAI,EAAC,MAAM;gBACX,MAAM,EAAC,QAAQ;gBACf,MAAM,EAAC,MAAM;aACd;YACD,QAAQ,EAAE,EAAE;SACb;KACF;IACD;QACE,MAAM,EAAC,oBAAoB;QAC3B,OAAO,EAAC,IAAI;QACZ,MAAM,EAAC,SAAS;QAChB,OAAO,EAAE;YACP,SAAS,EAAE,cAAc;YACzB,MAAM,EAAE,WAAW;YACnB,OAAO,EAAE,OAAO;YAChB,QAAQ,EAAE,EAAE;SACb;QACD,QAAQ,EAAE;YACR,SAAS,EAAE,cAAc;YACzB,MAAM,EAAE,WAAW;YACnB,OAAO,EAAE;gBACP,IAAI,EAAC,OAAO;gBACZ,MAAM,EAAC,QAAQ;gBACf,MAAM,EAAC,KAAK;gBACZ,OAAO,EAAC,OAAO;gBACf,GAAG,EAAC;oBACF,IAAI;oBACJ,QAAQ;iBACT;aACF;YACD,QAAQ,EAAE,EAAE;SACb;KACF;IACD;QACE,MAAM,EAAC,mBAAmB;QAC1B,OAAO,EAAC,KAAK;QACb,MAAM,EAAC,SAAS;QAChB,OAAO,EAAC;YACN,QAAQ,EAAC,kBAAkB;YAC3B,OAAO,EAAC;gBACN,MAAM;gBACN,IAAI;gBACJ;oBACE,IAAI,EAAC,OAAO;iBACb;aACF;YACD,IAAI,EAAC;gBACH,IAAI,EAAC,MAAM;gBACX,MAAM,EAAC,MAAM;gBACb,SAAS,EAAC,OAAO;gBACjB,OAAO,EAAC;oBACN,MAAM,EAAC,MAAM;iBACd;gBACD,QAAQ,EAAC;oBACP,MAAM,EAAC,QAAQ;oBACf,MAAM,EAAC,KAAK;iBACb;gBACD,QAAQ,EAAC;oBACP,MAAM,EAAC,aAAa;iBACrB;aACF;YACD,MAAM,EAAC;gBACL,MAAM,EAAC,MAAM;aACd;YACD,OAAO,EAAC;gBACN,MAAM,EAAC,QAAQ;gBACf,MAAM,EAAC,KAAK;aACb;YACD,eAAe,EAAC;gBACd,IAAI,EAAC,MAAM;aACZ;SACF;QACD,OAAO,EAAE,wDAAwD;KAClE;IACD;QACE,MAAM,EAAC,oBAAoB;QAC3B,OAAO,EAAC,KAAK;QACb,MAAM,EAAC,SAAS;QAChB,OAAO,EAAC;YACN,MAAM,EAAE,WAAW;YACnB,SAAS,EAAC,MAAM;YAChB,QAAQ,EAAC;gBACP,MAAM,EAAE,OAAO;gBACf,SAAS,EAAE,eAAe;aAC3B;SACF;QACD,OAAO,EAAE,wDAAwD;KAClE;IACD;QACE,MAAM,EAAC,qCAAqC;QAC5C,OAAO,EAAC,IAAI;QACZ,MAAM,EAAC,SAAS;QAChB,OAAO,EAAC;YACN,OAAO,EAAC,qBAAqB;YAC7B,MAAM,EAAC,MAAM;YACb,SAAS,EAAC,KAAK;YACf,QAAQ,EAAC,6BAA6B;SACvC;QACD,QAAQ,EAAC;YACP,OAAO,EAAC;gBACN,IAAI,EAAC,qBAAqB;aAC3B;YACD,MAAM,EAAC,MAAM;YACb,SAAS,EAAC,KAAK;YACf,QAAQ,EAAC;gBACP,IAAI,EAAC,6BAA6B;aACnC;SACF;KACF;IACD;QACE,MAAM,EAAC,qCAAqC;QAC5C,OAAO,EAAC,IAAI;QACZ,MAAM,EAAC,SAAS;QAChB,OAAO,EAAC;YACN,OAAO,EAAC,qBAAqB;YAC7B,MAAM,EAAC,MAAM;YACb,SAAS,EAAC,MAAM;YAChB,QAAQ,EAAC,EAER;YACD,QAAQ,EAAC,QAAQ;SAClB;QACD,QAAQ,EAAC;YACP,OAAO,EAAC;gBACN,IAAI,EAAC,qBAAqB;aAC3B;YACD,MAAM,EAAC,MAAM;YACb,SAAS,EAAC,MAAM;YAChB,QAAQ,EAAC,EAER;YACD,QAAQ,EAAC;gBACP,IAAI,EAAC,QAAQ;aACd;SACF;KACF;IACD;QACE,MAAM,EAAC,qBAAqB;QAC5B,OAAO,EAAC,IAAI;QACZ,MAAM,EAAC,SAAS;QAChB,OAAO,EAAC;YACN,OAAO,EAAC,2BAA2B;YACnC,QAAQ,EAAC,OAAO;YAChB,MAAM,EAAC,MAAM;YACb,SAAS,EAAC,KAAK;YACf,QAAQ,EAAC,EAER;SACF;QACD,QAAQ,EAAC;YACP,OAAO,EAAC;gBACN,IAAI,EAAC,2BAA2B;gBAChC,MAAM,EAAC,QAAQ;gBACf,MAAM,EAAC,UAAU;gBACjB,OAAO,EAAC;oBACN,QAAQ,EAAC,GAAG;oBACZ,WAAW,EAAC,YAAY;oBACxB,KAAK,EAAC,8BAA8B;oBACpC,OAAO,EAAC,GAAG;iBACZ;gBACD,KAAK,EAAC,sBAAsB;aAC7B;YACD,QAAQ,EAAC;gBACP,IAAI,EAAC,OAAO;gBACZ,MAAM,EAAC,QAAQ;gBACf,MAAM,EAAC,KAAK;gBACZ,OAAO,EAAC,OAAO;gBACf,GAAG,EAAC;oBACF,IAAI;oBACJ,QAAQ;iBACT;aACF;YACD,MAAM,EAAC,MAAM;YACb,SAAS,EAAC,KAAK;YACf,QAAQ,EAAC,EAER;SACF;KACF;CACF,CAAC"}
+{"version":3,"file":"expand-activity-stream.test.data.js","sourceRoot":"/","sources":["middleware/expand-activity-stream.test.data.ts"],"names":[],"mappings":"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"}

package/dist/middleware/store-credentials.d.ts

@@ -1,3 +1,3 @@
-import { IActivityStream } from "@sockethub/schemas";
-import { ISecureStoreInstance } from "../store";
-export default function storeCredentials(store: ISecureStoreInstance, sessionLog: Function): (creds: IActivityStream, done: Function) => void;
+import { IActivityStream, CallbackInterface } from "@sockethub/schemas";
+import { CredentialsStore } from "@sockethub/data-layer";
+export default function storeCredentials(credentialsStore: CredentialsStore): (creds: IActivityStream, done: CallbackInterface) => void;

package/dist/middleware/store-credentials.js

@@ -1,19 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-function storeCredentials(store, sessionLog) {
+function storeCredentials(credentialsStore) {
     return (creds, done) => {
-        store.save(creds.actor.id, creds, (err) => {
-            if (err) {
-                sessionLog('error saving credentials to store ' + err);
-                done(err);
-            }
-            else {
-                sessionLog('credentials encrypted and saved');
-                done();
-            }
-        });
+        credentialsStore.save(creds.actor.id, creds, done);
     };
 }
 exports.default = storeCredentials;
-;
 //# sourceMappingURL=/middleware/store-credentials.js.map

package/dist/middleware/store-credentials.js.map

@@ -1 +1 @@
-{"version":3,"file":"store-credentials.js","sourceRoot":"/","sources":["middleware/store-credentials.ts"],"names":[],"mappings":";;AAGA,SAAwB,gBAAgB,CAAC,KAA2B,EAAE,UAAoB;IACxF,OAAO,CAAC,KAAsB,EAAE,IAAc,EAAE,EAAE;QAChD,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE;YACxC,IAAI,GAAG,EAAE;gBACP,UAAU,CAAC,oCAAoC,GAAG,GAAG,CAAC,CAAC;gBACvD,IAAI,CAAC,GAAG,CAAC,CAAC;aACX;iBAAM;gBACL,UAAU,CAAC,iCAAiC,CAAC,CAAC;gBAC9C,IAAI,EAAE,CAAC;aACR;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAZD,mCAYC;AAAA,CAAC"}
+{"version":3,"file":"store-credentials.js","sourceRoot":"/","sources":["middleware/store-credentials.ts"],"names":[],"mappings":";;AAGA,SAAwB,gBAAgB,CACtC,gBAAkC;IAElC,OAAO,CAAC,KAAsB,EAAE,IAAuB,EAAE,EAAE;QACzD,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IACrD,CAAC,CAAC;AACJ,CAAC;AAND,mCAMC"}

package/dist/middleware/validate.d.ts

@@ -1,2 +1,2 @@
-import { IActivityStream } from "@sockethub/schemas";
-export default function validate(type: string, sockethubId: string): (msg: IActivityStream, done: Function) => any;
+import { IActivityStream, CallbackActivityStreamInterface } from '@sockethub/schemas';
+export default function validate(type: string, sockethubId: string): (msg: IActivityStream, done: CallbackActivityStreamInterface) => void;

package/dist/middleware/validate.js

@@ -8,7 +8,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
  */
 const debug_1 = __importDefault(require("debug"));
 const schemas_1 = __importDefault(require("@sockethub/schemas"));
-// @ts-ignore
 const init_1 = __importDefault(require("../bootstrap/init"));
 init_1.default.platforms.forEach((platform) => {
     Object.keys(platform.schemas).forEach((key) => {
@@ -21,7 +20,7 @@ init_1.default.platforms.forEach((platform) => {
 // called when registered with the middleware function, define the type of validation
 // that will be called when the middleware eventually does.
 function validate(type, sockethubId) {
-    const sessionLog = (0, debug_1.default)(`sockethub:validate:${sockethubId}`);
+    const sessionLog = (0, debug_1.default)(`sockethub:server:validate:${sockethubId}`);
     return (msg, done) => {
         sessionLog('applying schema validation for ' + type);
         if (type === 'activity-object') {
@@ -54,5 +53,4 @@ function validate(type, sockethubId) {
     };
 }
 exports.default = validate;
-;
 //# sourceMappingURL=/middleware/validate.js.map

package/dist/middleware/validate.js.map

@@ -1 +1 @@
-{"version":3,"file":"validate.js","sourceRoot":"/","sources":["middleware/validate.ts"],"names":[],"mappings":";;;;;AAAA;;GAEG;AACH,kDAA0B;AAC1B,iEAAyC;AAGzC,aAAa;AACb,6DAAqC;AAErC,cAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;IAClC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAC5C,IAAI,CAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAAE,OAAO;SAAE;QACxC,iBAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,GAAG,QAAQ,CAAC,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,qFAAqF;AACrF,2DAA2D;AAC3D,SAAwB,QAAQ,CAAC,IAAY,EAAE,WAAmB;IAChE,MAAM,UAAU,GAAG,IAAA,eAAK,EAAC,sBAAsB,WAAW,EAAE,CAAC,CAAC;IAC9D,OAAO,CAAC,GAAoB,EAAE,IAAc,EAAE,EAAE;QAC9C,UAAU,CAAC,iCAAiC,GAAG,IAAI,CAAC,CAAC;QACrD,IAAI,IAAI,KAAK,iBAAiB,EAAE;YAC9B,MAAM,GAAG,GAAG,iBAAO,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;YAChD,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACxC;aAAM,IAAI,CAAE,cAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YAC5C,OAAO,IAAI,CACT,IAAI,KAAK,CAAC,oBAAoB,GAAG,CAAC,OAAO,+CAA+C,CAAC,CAC1F,CAAC;SACH;aAAM,IAAI,IAAI,KAAK,aAAa,EAAE;YACjC,MAAM,GAAG,GAAG,iBAAO,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;YAC7C,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACxC;aAAM;YACL,MAAM,GAAG,GAAG,iBAAO,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;YAChD,IAAI,GAAG,EAAE;gBACP,IAAI,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;aACtB;iBAAM;gBACL,MAAM,YAAY,GAAG,cAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBACrD,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;oBAC1C,OAAO,IAAI,CAAC,IAAI,KAAK,CAAC,iBAAiB,GAAG,CAAC,IAAI,qBAAqB,GAAG,CAAC,OAAO,GAAG;wBAChF,qBAAqB,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;iBAC3D;qBAAM;oBACL,IAAI,CAAC,GAAG,CAAC,CAAC;iBACX;aACF;SACF;IACH,CAAC,CAAC;AACJ,CAAC;AA7BD,2BA6BC;AAAA,CAAC"}
+{"version":3,"file":"validate.js","sourceRoot":"/","sources":["middleware/validate.ts"],"names":[],"mappings":";;;;;AAAA;;GAEG;AACH,kDAA0B;AAC1B,iEAA6F;AAE7F,6DAAqC;AAErC,cAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;IAClC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAC5C,IAAI,CAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAAE,OAAO;SAAE;QACxC,iBAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,GAAG,QAAQ,CAAC,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,qFAAqF;AACrF,2DAA2D;AAC3D,SAAwB,QAAQ,CAAC,IAAY,EAAE,WAAmB;IAChE,MAAM,UAAU,GAAG,IAAA,eAAK,EAAC,6BAA6B,WAAW,EAAE,CAAC,CAAC;IACrE,OAAO,CAAC,GAAoB,EAAE,IAAqC,EAAE,EAAE;QACrE,UAAU,CAAC,iCAAiC,GAAG,IAAI,CAAC,CAAC;QACrD,IAAI,IAAI,KAAK,iBAAiB,EAAE;YAC9B,MAAM,GAAG,GAAG,iBAAO,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;YAChD,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACxC;aAAM,IAAI,CAAE,cAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YAC5C,OAAO,IAAI,CACT,IAAI,KAAK,CAAC,oBAAoB,GAAG,CAAC,OAAO,+CAA+C,CAAC,CAC1F,CAAC;SACH;aAAM,IAAI,IAAI,KAAK,aAAa,EAAE;YACjC,MAAM,GAAG,GAAG,iBAAO,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;YAC7C,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACxC;aAAM;YACL,MAAM,GAAG,GAAG,iBAAO,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;YAChD,IAAI,GAAG,EAAE;gBACP,IAAI,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;aACtB;iBAAM;gBACL,MAAM,YAAY,GAAG,cAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBACrD,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;oBAC1C,OAAO,IAAI,CAAC,IAAI,KAAK,CAAC,iBAAiB,GAAG,CAAC,IAAI,qBAAqB,GAAG,CAAC,OAAO,GAAG;wBAChF,qBAAqB,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;iBAC3D;qBAAM;oBACL,IAAI,CAAC,GAAG,CAAC,CAAC;iBACX;aACF;SACF;IACH,CAAC,CAAC;AACJ,CAAC;AA7BD,2BA6BC"}