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

package/dist/platform.js

@@ -1,13 +1,34 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = 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];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const debug_1 = __importDefault(require("debug"));
-const object_hash_1 = __importDefault(require("object-hash"));
-const bull_1 = __importDefault(require("bull"));
-const common_1 = require("./common");
-const store_1 = require("./store");
+const crypto_1 = __importStar(require("@sockethub/crypto"));
+const data_layer_1 = require("@sockethub/data-layer");
 // command-line params
 const parentId = process.argv[2];
 const platformName = process.argv[3];
@@ -16,8 +37,10 @@ const loggerPrefix = `sockethub:platform:${platformName}:${identifier}`;
 let logger = (0, debug_1.default)(loggerPrefix);
 const redisConfig = process.env.REDIS_URL ? process.env.REDIS_URL
     : { host: process.env.REDIS_HOST, port: process.env.REDIS_PORT };
+// eslint-disable-next-line @typescript-eslint/no-var-requires
 const PlatformModule = require(`@sockethub/platform-${platformName}`);
-let queueStarted = false;
+let jobQueue;
+let jobQueueStarted = false;
 let parentSecret1, parentSecret2;
 logger(`platform handler initialized for ${platformName} ${identifier}`);
 /**
@@ -34,11 +57,15 @@ process.on('uncaughtException', (err) => {
  * Incoming messages from the worker to this platform. Data is an array, the first property is the
  * method to call, the rest are params.
  */
-process.on('message', (data) => {
+process.on('message', async (data) => {
     if (data[0] === 'secrets') {
-        parentSecret1 = data[1].parentSecret1;
-        parentSecret2 = data[1].parentSecret2;
-        startQueueListener();
+        const { parentSecret2: parentSecret3, parentSecret1: parentSecret } = data[1];
+        parentSecret1 = parentSecret;
+        parentSecret2 = parentSecret3;
+        await startQueueListener();
+    }
+    else {
+        throw new Error('received unknown command from parent thread');
     }
 });
 /**
@@ -50,98 +77,56 @@ const platformSession = {
     updateActor: updateActor
 };
 const platform = new PlatformModule(platformSession);
-/**
- * Get the credentials stored for this user in this sessions store, if given the correct
- * sessionSecret.
- * @param actorId
- * @param sessionId
- * @param sessionSecret
- * @param cb
- */
-function getCredentials(actorId, sessionId, sessionSecret, cb) {
-    if (platform.config.noCredentials) {
-        return cb();
-    }
-    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
-            if (err) {
-                return cb(err);
-            }
-        }
-        else if (!credentials) {
-            // also skip if this is a non-persist platform with no credentials
-            return cb();
-        }
-        if (platform.credentialsHash) {
-            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);
-            }
-        }
-        else {
-            platform.credentialsHash = (0, object_hash_1.default)(credentials.object);
-        }
-        cb(undefined, credentials);
-    });
-}
 /**
  * Returns a function used to handle completed jobs from the platform code (the `done` callback).
- * @param secret the secret used to decrypt credentials
  */
-function getJobHandler(secret) {
+function getJobHandler() {
     return (job, done) => {
-        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));
+        const jobLog = (0, debug_1.default)(`${loggerPrefix}:${job.sessionId}`);
+        jobLog(`received ${job.title} ${job.msg.type}`);
+        const credentialStore = new data_layer_1.CredentialsStore(parentId, job.sessionId, parentSecret1 + job.msg.sessionSecret, redisConfig);
+        delete job.msg.sessionSecret;
+        let jobCallbackCalled = false;
+        const doneCallback = (err, result) => {
+            if (jobCallbackCalled) {
+                return;
             }
-            let jobCallbackCalled = false;
-            const doneCallback = (err, result) => {
-                if (jobCallbackCalled) {
-                    return;
-                }
-                jobCallbackCalled = true;
-                if (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(jobData.msg.type))) {
-                // add the credentials object if this method requires it
-                platform[jobData.msg.type](jobData.msg, credentials, doneCallback);
-            }
-            else if (platform.config.persist) {
-                if (platform.initialized) {
-                    platform[jobData.msg.type](jobData.msg, doneCallback);
+            jobCallbackCalled = true;
+            if (err) {
+                jobLog(`failed ${job.title} ${job.msg.type}`);
+                let errMsg;
+                // some error objects (eg. TimeoutError) don't interpolate correctly to human-readable
+                // so we have to do this little dance
+                try {
+                    errMsg = err.toString();
                 }
-                else {
-                    done(new Error(`${jobData.msg.type} called on uninitialized platform`));
+                catch (e) {
+                    errMsg = err;
                 }
+                done(new Error(errMsg));
             }
             else {
-                platform[jobData.msg.type](jobData.msg, doneCallback);
+                jobLog(`completed ${job.title} ${job.msg.type}`);
+                done(null, result);
             }
-        });
+        };
+        platform.config.requireCredentials ? platform.config.requireCredentials : [];
+        if (platform.config.requireCredentials.includes(job.msg.type)) {
+            // this method requires credentials and should be called even if the platform is not
+            // yet initialized, because they need to authenticate before they are initialized.
+            credentialStore.get(job.msg.actor.id, platform.credentialsHash).then((credentials) => {
+                platform[job.msg.type](job.msg, credentials, doneCallback);
+            }).catch((err) => {
+                jobLog('error ' + err.toString());
+                return done(new Error(err.toString()));
+            });
+        }
+        else if ((platform.config.persist) && (!platform.initialized)) {
+            done(new Error(`${job.msg.type} called on uninitialized platform`));
+        }
+        else {
+            platform[job.msg.type](job.msg, doneCallback);
+        }
     };
 }
 /**
@@ -159,29 +144,33 @@ function getSendFunction(command) {
  * both the queue thread (listening on the channel for jobs) and the logging object are updated.
  * @param credentials
  */
-function updateActor(credentials) {
-    identifier = (0, common_1.getPlatformId)(platformName, credentials.actor.id);
+async function updateActor(credentials) {
+    identifier = (0, crypto_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.credentialsHash = crypto_1.default.objectHash(credentials.object);
     platform.debug = (0, debug_1.default)(`sockethub:platform:${platformName}:${identifier}`);
     process.send(['updateActor', undefined, identifier]);
-    startQueueListener(true);
+    await startQueueListener(true);
 }
 /**
- * starts listening on the queue for incoming jobs
+ * Starts listening on the queue for incoming jobs
  * @param refresh boolean if the param is true, we re-init the queue.process
  * (used when identifier changes)
  */
-function startQueueListener(refresh = false) {
-    const secret = parentSecret1 + parentSecret2;
-    if ((queueStarted) && (!refresh)) {
-        logger('start queue called multiple times, skipping');
-        return;
+async function startQueueListener(refresh = false) {
+    if (jobQueueStarted) {
+        if (refresh) {
+            await jobQueue.shutdown();
+        }
+        else {
+            logger('start queue called multiple times, skipping');
+            return;
+        }
     }
-    const queue = new bull_1.default(parentId + identifier, { redis: redisConfig });
-    queueStarted = true;
+    jobQueue = new data_layer_1.JobQueue(parentId, identifier, parentSecret1 + parentSecret2, redisConfig);
     logger('listening on the queue for incoming jobs');
-    queue.process(getJobHandler(secret));
+    jobQueue.onJob(getJobHandler());
+    jobQueueStarted = true;
 }
 //# sourceMappingURL=/platform.js.map

package/dist/platform.js.map

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

package/dist/process-manager.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];
@@ -24,7 +28,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const init_1 = __importDefault(require("./bootstrap/init"));
 const platform_instance_1 = __importStar(require("./platform-instance"));
-const common_1 = require("./common");
+const crypto_1 = require("@sockethub/crypto");
 class ProcessManager {
     constructor(parentId, parentSecret1, parentSecret2) {
         this.parentId = parentId;
@@ -64,7 +68,7 @@ class ProcessManager {
         return platformInstance;
     }
     ensureProcess(platform, sessionId, actor) {
-        const identifier = (0, common_1.getPlatformId)(platform, actor);
+        const identifier = (0, crypto_1.getPlatformId)(platform, actor);
         const platformInstance = platform_instance_1.platformInstances.get(identifier) ||
             this.createPlatformInstance(identifier, platform, actor);
         if (sessionId) {

package/dist/process-manager.js.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"process-manager.js","sourceRoot":"/","sources":["process-manager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAAoC;AACpC,yEAC4F;AAC5F,8CAAgD;AAEhD,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.d.ts

@@ -8,6 +8,6 @@ export declare const examplePages: IRoutePaths;
  * Setup
  */
 declare const routes: {
-    setup: (app: any, examplesEnabled?: boolean) => void;
+    setup: (app: unknown, examplesEnabled?: boolean) => void;
 };
 export default routes;

package/dist/routes.js

@@ -30,7 +30,7 @@ exports.examplePages = {
     '/examples/xmpp': path_1.default.resolve(`${__dirname}/../views/examples/xmpp.ejs`)
 };
 function prepFileRoutes(pathMap) {
-    let _routes = [];
+    const _routes = [];
     Object.keys(pathMap).forEach((key) => {
         _routes.push({
             meta: {

package/dist/routes.js.map

@@ -1 +1 @@
-{"version":3,"file":"routes.js","sourceRoot":"/","sources":["routes.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,sDAA8B;AAC9B,kDAA0B;AAE1B,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,EACrC,MAAM,GAAQ,IAAA,eAAK,EAAC,yBAAyB,CAAC,EAC9C,OAAO,GAAO,gBAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC,GAAG,KAAK;IACrC,gBAAM,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,GAAG;IAC/B,gBAAM,CAAC,GAAG,CAAC,aAAa,CAAC;IACzB,gBAAM,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AAMjC,QAAA,SAAS,GAAgB;IACpC,sBAAsB,EACpB,cAAI,CAAC,OAAO,CAAC,GAAG,SAAS,6DAA6D,CAAC;IACzF,0BAA0B,EACxB,cAAI,CAAC,OAAO,CAAC,GAAG,SAAS,iEAAiE,CAAC;IAC7F,0BAA0B,EACxB,cAAI,CAAC,OAAO,CAAC,GAAG,SAAS,iEAAiE,CAAC;IAC7F,eAAe,EAAE,cAAI,CAAC,OAAO,CAAC,GAAG,SAAS,qDAAqD,CAAC;CACjG,CAAC;AAEW,QAAA,YAAY,GAAgB;IACvC,YAAY,EAAE,cAAI,CAAC,OAAO,CAAC,GAAG,SAAS,4CAA4C,CAAC;IACpF,iBAAiB,EAAE,cAAI,CAAC,OAAO,CAAC,GAAG,SAAS,6CAA6C,CAAC;IAC1F,qBAAqB,EAAE,cAAI,CAAC,OAAO,CAAC,GAAG,SAAS,8BAA8B,CAAC;CAChF,CAAC;AAEW,QAAA,YAAY,GAAgB;IACvC,GAAG,EAAE,cAAI,CAAC,OAAO,CAAC,GAAG,SAAS,qBAAqB,CAAC;IACpD,iBAAiB,EAAE,cAAI,CAAC,OAAO,CAAC,GAAG,SAAS,8BAA8B,CAAC;IAC3E,iBAAiB,EAAE,cAAI,CAAC,OAAO,CAAC,GAAG,SAAS,8BAA8B,CAAC;IAC3E,eAAe,EAAE,cAAI,CAAC,OAAO,CAAC,GAAG,SAAS,4BAA4B,CAAC;IACvE,gBAAgB,EAAE,cAAI,CAAC,OAAO,CAAC,GAAG,SAAS,6BAA6B,CAAC;CAC1E,CAAC;AAGF,SAAS,cAAc,CAAC,OAAO;IAC7B,IAAI,OAAO,GAAG,EAAE,CAAC;IACjB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACnC,OAAO,CAAC,IAAI,CAAC;YACX,IAAI,EAAE;gBACJ,MAAM,EAAE,KAAK;gBACb,IAAI,EAAE,GAAG;aACV;YACD,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;gBAClB,MAAM,CAAC,oBAAoB,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;gBACtC,GAAG,CAAC,SAAS,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAC;gBAClD,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;YACjC,CAAC;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,OAAO,OAAO,CAAC;AACjB,CAAC;AACD,MAAM,UAAU,GAAG,cAAc,CAAC,iBAAS,CAAC,CAAC;AAC7C,MAAM,aAAa,GAAG,cAAc,CAAC,oBAAY,CAAC,CAAC;AAGnD,MAAM,CAAC,IAAI,CAAC,oBAAY,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;IACxC,aAAa,CAAC,IAAI,CAAC;QACjB,IAAI,EAAE;YACJ,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,GAAG;SACV;QACD,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAClB,MAAM,CAAC,gBAAgB,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;YAClC,GAAG,CAAC,MAAM,CAAC,oBAAY,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;gBAChC,WAAW,EAAE,WAAW;gBACxB,OAAO,EAAE,OAAO;aACjB,CAAC,CAAC;QACL,CAAC;KACF,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,SAAS,QAAQ,CAAC,GAAG;IACnB,OAAO,CAAC,KAAK,EAAE,EAAE;QACf,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAClC,KAAK,CAAC,IAAI,CAAC,IAAI,EACf,KAAK,CAAC,KAAK,CACZ,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,MAAM,GAAG;IACb,KAAK,EAAE,UAAU,GAAQ,EAAE,kBAA2B,gBAAM,CAAC,GAAG,CAAC,kBAAkB,CAAC;QAClF,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;QAClC,IAAI,eAAe,EAAE;YACnB,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;SACtC;IACH,CAAC;CACF,CAAC;AACF,kBAAe,MAAM,CAAC"}
+{"version":3,"file":"routes.js","sourceRoot":"/","sources":["routes.ts"],"names":[],"mappings":"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"}

package/dist/sockethub.d.ts

@@ -1,23 +1,4 @@
-import { IActivityStream } from "@sockethub/schemas";
 import ProcessManager from "./process-manager";
-export interface JobDataDecrypted {
-    title?: string;
-    msg: IActivityStream;
-    sessionId: string;
-}
-export interface JobDataEncrypted {
-    title?: string;
-    msg: string;
-    sessionId: string;
-}
-export interface JobDecrypted {
-    data: JobDataDecrypted;
-    remove?: Function;
-}
-export interface JobEncrypted {
-    data: JobDataEncrypted;
-    remove?: Function;
-}
 declare class Sockethub {
     private readonly parentId;
     private readonly parentSecret1;
@@ -25,15 +6,13 @@ declare class Sockethub {
     counter: number;
     platforms: Map<string, object>;
     status: boolean;
-    queue: any;
     processManager: ProcessManager;
     constructor();
     /**
      * initialization of Sockethub starts here
      */
     boot(): void;
-    removeAllPlatformInstances(): Promise<void>;
-    private createJob;
+    shutdown(): Promise<void>;
     private handleIncomingConnection;
 }
 export default Sockethub;

package/dist/sockethub.js

@@ -4,7 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const debug_1 = __importDefault(require("debug"));
-const crypto_1 = __importDefault(require("./crypto"));
+const crypto_1 = __importDefault(require("@sockethub/crypto"));
+const data_layer_1 = require("@sockethub/data-layer");
 const init_1 = __importDefault(require("./bootstrap/init"));
 const middleware_1 = __importDefault(require("./middleware"));
 const create_activity_object_1 = __importDefault(require("./middleware/create-activity-object"));
@@ -14,8 +15,7 @@ const validate_1 = __importDefault(require("./middleware/validate"));
 const janitor_1 = __importDefault(require("./janitor"));
 const listener_1 = __importDefault(require("./listener"));
 const process_manager_1 = __importDefault(require("./process-manager"));
-const platform_instance_1 = require("./platform-instance");
-const store_1 = require("./store");
+const nconf_1 = __importDefault(require("nconf"));
 const log = (0, debug_1.default)('sockethub:server:core');
 function attachError(err, msg) {
     if (typeof msg !== 'object') {
@@ -27,7 +27,6 @@ function attachError(err, msg) {
 }
 class Sockethub {
     constructor() {
-        this.counter = 0;
         this.platforms = init_1.default.platforms;
         this.status = false;
         this.parentId = crypto_1.default.randToken(16);
@@ -47,31 +46,20 @@ class Sockethub {
             this.status = true;
         }
         log('active platforms: ', [...init_1.default.platforms.keys()]);
-        janitor_1.default.clean(); // start cleanup cycle
         listener_1.default.start(); // start external services
+        janitor_1.default.start(); // start cleanup cycle
         log('registering handlers');
         listener_1.default.io.on('connection', this.handleIncomingConnection.bind(this));
     }
-    async removeAllPlatformInstances() {
-        for (let platform of platform_instance_1.platformInstances) {
-            await platform[1].destroy();
-        }
-    }
-    createJob(socketId, platformInstance, msg) {
-        const title = `${msg.context}-${(msg.id) ? msg.id : this.counter++}`;
-        const job = {
-            title: title,
-            sessionId: socketId,
-            msg: crypto_1.default.encrypt(msg, this.parentSecret1 + this.parentSecret2)
-        };
-        return job;
+    async shutdown() {
+        await janitor_1.default.stop();
     }
-    ;
     handleIncomingConnection(socket) {
         // session-specific debug messages
         const sessionLog = (0, debug_1.default)('sockethub:server:core:' + socket.id), sessionSecret = crypto_1.default.randToken(16), 
         // store instance is session-specific
-        store = (0, store_1.getSessionStore)(this.parentId, this.parentSecret1, socket.id, sessionSecret);
+        // store = getSessionStore(this.parentId, this.parentSecret1, socket.id, sessionSecret);
+        credentialsStore = new data_layer_1.CredentialsStore(this.parentId, socket.id, this.parentSecret1 + sessionSecret, nconf_1.default.get('redis'));
         sessionLog(`socket.io connection`);
         socket.on('disconnect', () => {
             sessionLog('disconnect received from client');
@@ -79,7 +67,7 @@ class Sockethub {
         socket.on('credentials', (0, middleware_1.default)('credentials')
             .use(expand_activity_stream_1.default)
             .use((0, validate_1.default)('credentials', socket.id))
-            .use((0, store_credentials_1.default)(store, sessionLog))
+            .use((0, store_credentials_1.default)(credentialsStore))
             .use((err, data, next) => {
             // error handler
             next(attachError(err, data));
@@ -105,13 +93,18 @@ class Sockethub {
             next(msg);
         }).use((err, data, next) => {
             next(attachError(err, data));
-        }).use((msg, next) => {
+        }).use(async (msg, next) => {
             const platformInstance = this.processManager.get(msg.context, msg.actor.id, socket.id);
-            sessionLog(`queued to channel ${platformInstance.id}`);
-            const job = this.createJob(socket.id, platformInstance, msg);
             // job validated and queued, store socket.io callback for when job is completed
-            platformInstance.completedJobHandlers.set(job.title, next);
-            platformInstance.queue.add(job);
+            const job = await platformInstance.jobQueue.add(socket.id, msg);
+            if (job) {
+                platformInstance.completedJobHandlers.set(job.title, next);
+            }
+            else {
+                // failed to add job to queue, reject handler immediately
+                msg.error = 'failed to add job to queue';
+                next(msg);
+            }
         }).done());
     }
 }

package/dist/sockethub.js.map

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sockethub/server",
   "description": "A polyglot messaging service, server libraries",
-  "version": "5.0.0-alpha.3",
+  "version": "5.0.0-alpha.4",
   "private": false,
   "author": "Nick Jennings <nick@silverbucket.net>",
   "license": "LGPL-3.0+",
@@ -34,29 +34,26 @@
   },
   "homepage": "https://sockethub.org",
   "dependencies": {
-    "@sockethub/activity-streams": "^4.4.0-alpha.3",
-    "@sockethub/client": "^5.0.0-alpha.3",
-    "@sockethub/schemas": "^3.0.0-alpha.3",
+    "@sockethub/activity-streams": "^4.4.0-alpha.4",
+    "@sockethub/client": "^5.0.0-alpha.4",
+    "@sockethub/crypto": "^1.0.0-alpha.4",
+    "@sockethub/data-layer": "^1.0.0-alpha.4",
+    "@sockethub/schemas": "^3.0.0-alpha.4",
     "body-parser": "^1.19.0",
-    "bull": "^4.0.0",
     "debug": "^4.3.1",
     "ejs": "^3.0.1",
     "express": "^4.17.1",
-    "findup-sync": "^5.0.0",
     "jquery": "^3.4.1",
-    "nconf": "^0.11.2",
-    "npm": "8.5.4",
-    "object-hash": "^3.0.0",
-    "secure-store-redis": "^1.4.7",
-    "socket.io": "^4.0.1",
-    "urijs": "^1.19.2"
+    "nconf": "^0.12.0",
+    "npm": "8.19.2",
+    "socket.io": "^4.0.1"
   },
   "scripts": {
     "clean": "npx rimraf dist coverage",
     "clean:deps": "npx rimraf node_modules",
     "compliance": "yarn run lint && yarn run test && yarn run coverage",
     "test": "c8 -x src/bootstrap -x \"src/**/*.test.*\" mocha -r ts-node/register src/*.test.ts src/**/*.test.ts",
-    "coverage": "c8 check-coverage --statements 90 --branches 80 --functions 90 --lines 90",
+    "coverage": "c8 check-coverage --statements 90 --branches 80 --functions 82 --lines 90",
     "start": "DEBUG=sockethub* ./bin/sockethub",
     "dev": "yarn run build && DEBUG=sockethub* ./bin/sockethub --examples",
     "lint": "eslint \"**/*.ts\" ./bin/sockethub",
@@ -64,40 +61,37 @@
     "build": "npx rimraf dist && tsc && cp ./src/defaults.json ./dist/defaults.json && cp src/bootstrap/platforms.js dist/bootstrap/"
   },
   "engines": {
-    "node": ">= 12.4.0"
+    "node": ">= 14"
   },
   "devDependencies": {
     "@types/body-parser": "1.19.2",
-    "@types/chai": "4.3.0",
+    "@types/chai": "4.3.3",
     "@types/debug": "4.1.7",
-    "@types/ejs": "3.1.0",
-    "@types/eslint": "8.4.1",
-    "@types/express": "4.17.13",
-    "@types/jquery": "3.5.13",
-    "@types/mocha": "9.1.0",
-    "@types/nconf": "0.10.1",
+    "@types/eslint": "8.4.6",
+    "@types/express": "4.17.14",
+    "@types/jquery": "3.5.14",
+    "@types/mocha": "9.1.1",
+    "@types/nconf": "0.10.3",
     "@types/node": "17.0.13",
-    "@types/object-hash": "2.2.1",
     "@types/proxyquire": "1.3.28",
-    "@types/sinon": "10.0.11",
-    "@types/urijs": "1.19.18",
-    "@typescript-eslint/parser": "5.12.1",
-    "c8": "7.11.0",
+    "@types/sinon": "10.0.13",
+    "@typescript-eslint/parser": "5.37.0",
+    "c8": "7.12.0",
     "chai": "4.3.6",
-    "eslint": "8.9.0",
+    "eslint": "8.23.1",
     "eslint-cli": "1.1.1",
     "jaribu": "2.2.3",
-    "mocha": "9.2.1",
+    "mocha": "10.0.0",
     "proxyquire": "2.1.3",
-    "sinon": "13.0.1",
-    "ts-node": "10.5.0",
-    "typescript": "4.5.5"
+    "sinon": "14.0.0",
+    "ts-node": "10.9.1",
+    "typescript": "4.8.3"
   },
   "optionalDependencies": {
-    "@sockethub/platform-dummy": "^3.0.0-alpha.3",
-    "@sockethub/platform-feeds": "^3.0.0-alpha.3",
-    "@sockethub/platform-irc": "^4.0.0-alpha.3",
-    "@sockethub/platform-xmpp": "^5.0.0-alpha.3"
+    "@sockethub/platform-dummy": "^3.0.0-alpha.4",
+    "@sockethub/platform-feeds": "^3.0.0-alpha.4",
+    "@sockethub/platform-irc": "^4.0.0-alpha.4",
+    "@sockethub/platform-xmpp": "^5.0.0-alpha.4"
   },
-  "gitHead": "f02238a478b7ffd3f31d8deea292eb67e630a86b"
+  "gitHead": "c6d34ff44d2be479e4ea42c46da649612342a680"
 }