sockethub 4.1.0 → 5.0.0-alpha.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/sockethub +23 -20
- package/dist/bootstrap/init.js +1 -1
- package/dist/bootstrap/init.js.map +1 -1
- package/dist/bootstrap/platforms.js +14 -18
- package/dist/janitor.js +11 -5
- package/dist/janitor.js.map +1 -1
- package/dist/middleware/create-activity-object.js.map +1 -1
- package/dist/middleware/expand-activity-stream.js +33 -0
- package/dist/middleware/expand-activity-stream.js.map +1 -0
- package/dist/middleware/expand-activity-stream.test.data.js +360 -0
- package/dist/middleware/expand-activity-stream.test.data.js.map +1 -0
- package/dist/middleware/store-credentials.js +1 -1
- package/dist/middleware/store-credentials.js.map +1 -1
- package/dist/middleware/validate.js +30 -104
- package/dist/middleware/validate.js.map +1 -1
- package/dist/middleware/validate.test.data.js +151 -111
- package/dist/middleware/validate.test.data.js.map +1 -1
- package/dist/middleware.js +47 -77
- package/dist/middleware.js.map +1 -1
- package/dist/platform-instance.js +47 -54
- package/dist/platform-instance.js.map +1 -1
- package/dist/platform.js +29 -10
- package/dist/platform.js.map +1 -1
- package/dist/process-manager.js +5 -2
- package/dist/process-manager.js.map +1 -1
- package/dist/routes.js +3 -5
- package/dist/routes.js.map +1 -1
- package/dist/sockethub-client.js +2604 -0
- package/dist/sockethub-client.js.map +1 -0
- package/dist/sockethub-client.min.js +2 -0
- package/dist/sockethub-client.min.js.LICENSE.txt +24 -0
- package/dist/sockethub.js +67 -36
- package/dist/sockethub.js.map +1 -1
- package/package.json +40 -36
- package/src/bootstrap/init.ts +6 -2
- package/src/bootstrap/platforms.js +14 -18
- package/src/crypto.ts +3 -3
- package/src/janitor.ts +18 -10
- package/src/middleware/create-activity-object.ts +1 -2
- package/src/middleware/expand-activity-stream.test.data.ts +365 -0
- package/src/middleware/expand-activity-stream.test.ts +78 -0
- package/src/middleware/expand-activity-stream.ts +27 -0
- package/src/middleware/store-credentials.test.ts +12 -12
- package/src/middleware/store-credentials.ts +4 -4
- package/src/middleware/validate.test.data.ts +154 -120
- package/src/middleware/validate.test.ts +7 -10
- package/src/middleware/validate.ts +30 -123
- package/src/middleware.test.ts +59 -26
- package/src/middleware.ts +44 -76
- package/src/platform-instance.test.ts +8 -10
- package/src/platform-instance.ts +58 -57
- package/src/platform.ts +30 -14
- package/src/process-manager.ts +7 -4
- package/src/routes.ts +3 -6
- package/src/serve.ts +1 -1
- package/src/sockethub-client.test.ts +235 -0
- package/src/sockethub-client.ts +164 -0
- package/src/sockethub.ts +75 -68
- package/views/examples/dummy.ejs +6 -6
- package/views/examples/feeds.ejs +8 -8
- package/views/examples/irc.ejs +64 -58
- package/views/examples/shared.js +31 -29
- package/views/examples/xmpp.ejs +48 -57
- package/webpack.minified.config.js +14 -0
- package/webpack.normal.config.js +14 -0
- package/coverage/tmp/coverage-24546-1630615250805-0.json +0 -1
- package/dist/client/sockethub-client.js +0 -171
- package/dist/client/sockethub-client.js.map +0 -1
- package/src/client/sockethub-client.js +0 -178
- package/test/middleware-suite.js +0 -101
package/dist/middleware.js
CHANGED
|
@@ -1,84 +1,54 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
* @return {function} chains a series of functions to be called in sequence
|
|
8
|
-
*/
|
|
9
|
-
function createMiddleware(errorHandler) {
|
|
10
|
-
return function chain(...chain) {
|
|
11
|
-
for (let func of chain) {
|
|
12
|
-
if (typeof func !== 'function') {
|
|
13
|
-
throw new Error('middleware chain can only take other functions as arguments.');
|
|
14
|
-
}
|
|
15
|
-
}
|
|
16
|
-
return getMiddlewareInstance(chain, errorHandler);
|
|
17
|
-
};
|
|
3
|
+
exports.MiddlewareChain = void 0;
|
|
4
|
+
const debug_1 = require("debug");
|
|
5
|
+
function middleware(name) {
|
|
6
|
+
return new MiddlewareChain(name);
|
|
18
7
|
}
|
|
19
|
-
exports.default =
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
8
|
+
exports.default = middleware;
|
|
9
|
+
class MiddlewareChain {
|
|
10
|
+
constructor(name) {
|
|
11
|
+
this.chain = [];
|
|
12
|
+
this.errHandler = (err) => { throw err; };
|
|
13
|
+
this.name = name;
|
|
14
|
+
this.logger = (0, debug_1.debug)(`sockethub:middleware:${name}`);
|
|
15
|
+
}
|
|
16
|
+
use(func) {
|
|
17
|
+
if (typeof func !== 'function') {
|
|
18
|
+
throw new Error('middleware use() can only take a function as an argument');
|
|
28
19
|
}
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
else if (typeof chain[position] === 'function') {
|
|
35
|
-
params.push(callFunc);
|
|
36
|
-
chain[position++](...params);
|
|
37
|
-
}
|
|
38
|
-
else {
|
|
39
|
-
callback(null);
|
|
40
|
-
}
|
|
20
|
+
if (func.length === 3) {
|
|
21
|
+
this.errHandler = func;
|
|
22
|
+
}
|
|
23
|
+
else if (func.length === 2) {
|
|
24
|
+
this.chain.push(func);
|
|
41
25
|
}
|
|
42
|
-
|
|
43
|
-
|
|
26
|
+
else {
|
|
27
|
+
throw new Error('middleware function provided with incorrect number of params: ' + func.length);
|
|
28
|
+
}
|
|
29
|
+
return this;
|
|
30
|
+
}
|
|
31
|
+
done() {
|
|
32
|
+
return (data, callback) => {
|
|
33
|
+
let position = 0;
|
|
34
|
+
if (typeof callback !== 'function') {
|
|
35
|
+
callback = () => { };
|
|
36
|
+
}
|
|
37
|
+
const next = (_data) => {
|
|
38
|
+
if (_data instanceof Error) {
|
|
39
|
+
this.logger(_data);
|
|
40
|
+
this.errHandler(_data, data, callback);
|
|
41
|
+
}
|
|
42
|
+
else if (typeof this.chain[position] === 'function') {
|
|
43
|
+
this.chain[position++](_data, next);
|
|
44
|
+
}
|
|
45
|
+
else {
|
|
46
|
+
callback(_data);
|
|
47
|
+
}
|
|
48
|
+
};
|
|
49
|
+
next(data);
|
|
50
|
+
};
|
|
51
|
+
}
|
|
44
52
|
}
|
|
45
|
-
|
|
46
|
-
* When calling the middleware instance function, pass in a list of functions to call in order.
|
|
47
|
-
* Each function can expect any number of params, but the final param should expect a callback.
|
|
48
|
-
*
|
|
49
|
-
* After all functions are completed, it will call the callback function. If any middleware calls
|
|
50
|
-
* the callback with the first parameter an instance of Error, then the call stack will be aborted,
|
|
51
|
-
* and the final callback (callback of first input) will be called with the Error as the first i
|
|
52
|
-
* parameter.
|
|
53
|
-
* Additionally, if provided during the `createMiddleware` call, the errorHandler will be called,
|
|
54
|
-
* with the error object as the first parameter along with the remaining parameters.
|
|
55
|
-
*
|
|
56
|
-
* @param {function} middleware Any number of functions, each expecting a callback as the final
|
|
57
|
-
* parameter.
|
|
58
|
-
* @return {function} entry The entry function, which will start calling functions defined in the
|
|
59
|
-
* chain.
|
|
60
|
-
*
|
|
61
|
-
* @example
|
|
62
|
-
*
|
|
63
|
-
* const entry = middleware.chain(
|
|
64
|
-
* (data, cb) => {
|
|
65
|
-
* //... do something with data
|
|
66
|
-
* cb(data);
|
|
67
|
-
* },
|
|
68
|
-
* (data, cb) => {
|
|
69
|
-
* //... do more with data
|
|
70
|
-
* cb(data);
|
|
71
|
-
* },
|
|
72
|
-
* (data, cb) => {
|
|
73
|
-
* //... do last stuff with data
|
|
74
|
-
* cb();
|
|
75
|
-
* }
|
|
76
|
-
* );
|
|
77
|
-
*
|
|
78
|
-
* entry(initialData, (err) => {
|
|
79
|
-
* // this function is called when complete or an error occurs anywhere on the chain
|
|
80
|
-
* // in which case execution is aborted.
|
|
81
|
-
* });
|
|
82
|
-
*
|
|
83
|
-
*/
|
|
53
|
+
exports.MiddlewareChain = MiddlewareChain;
|
|
84
54
|
//# sourceMappingURL=/middleware.js.map
|
package/dist/middleware.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.js","sourceRoot":"/","sources":["middleware.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"middleware.js","sourceRoot":"/","sources":["middleware.ts"],"names":[],"mappings":";;;AAAA,iCAA8B;AAE9B,SAAwB,UAAU,CAAC,IAAY;IAC7C,OAAO,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC;AACnC,CAAC;AAFD,6BAEC;AAED,MAAa,eAAe;IAM1B,YAAY,IAAY;QAJhB,UAAK,GAAoB,EAAE,CAAC;QAC5B,eAAU,GAAa,CAAC,GAAU,EAAE,EAAE,GAAG,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;QAI5D,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG,IAAA,aAAK,EAAC,wBAAwB,IAAI,EAAE,CAAC,CAAC;IACtD,CAAC;IAED,GAAG,CAAC,IAAc;QAChB,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE;YAC9B,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;SAC7E;QACD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YACrB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;SACxB;aAAM,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YAC5B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACvB;aAAM;YACL,MAAM,IAAI,KAAK,CACb,gEAAgE,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;SACnF;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI;QACF,OAAO,CAAC,IAAS,EAAE,QAAkB,EAAE,EAAE;YACvC,IAAI,QAAQ,GAAG,CAAC,CAAC;YACjB,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE;gBAClC,QAAQ,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;aACrB;YACD,MAAM,IAAI,GAAG,CAAC,KAAU,EAAE,EAAE;gBAC1B,IAAI,KAAK,YAAY,KAAK,EAAE;oBAC1B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;oBACnB,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;iBACxC;qBAAM,IAAI,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,UAAU,EAAE;oBACrD,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;iBACrC;qBAAM;oBACL,QAAQ,CAAC,KAAK,CAAC,CAAC;iBACjB;YACH,CAAC,CAAC;YACF,IAAI,CAAC,IAAI,CAAC,CAAC;QACb,CAAC,CAAC;IACJ,CAAC;CACF;AA7CD,0CA6CC"}
|
|
@@ -25,12 +25,14 @@ exports.platformInstances = new Map();
|
|
|
25
25
|
class PlatformInstance {
|
|
26
26
|
constructor(params) {
|
|
27
27
|
this.flaggedForTermination = false;
|
|
28
|
+
this.completedJobHandlers = new Map();
|
|
29
|
+
this.config = {};
|
|
28
30
|
this.sessions = new Set();
|
|
29
|
-
this.global = false;
|
|
30
31
|
this.sessionCallbacks = {
|
|
31
32
|
'close': (() => new Map())(),
|
|
32
|
-
'message': (() => new Map())()
|
|
33
|
+
'message': (() => new Map())()
|
|
33
34
|
};
|
|
35
|
+
this.global = false;
|
|
34
36
|
this.id = params.identifier;
|
|
35
37
|
this.name = params.platform;
|
|
36
38
|
this.parentId = params.parentId;
|
|
@@ -49,22 +51,10 @@ class PlatformInstance {
|
|
|
49
51
|
*/
|
|
50
52
|
destroy() {
|
|
51
53
|
return __awaiter(this, void 0, void 0, function* () {
|
|
54
|
+
this.debug(`cleaning up`);
|
|
52
55
|
this.flaggedForTermination = true;
|
|
53
|
-
exports.platformInstances.delete(this.id);
|
|
54
|
-
try {
|
|
55
|
-
yield this.queue.empty();
|
|
56
|
-
}
|
|
57
|
-
catch (e) { }
|
|
58
56
|
try {
|
|
59
|
-
yield this.queue.
|
|
60
|
-
}
|
|
61
|
-
catch (e) { }
|
|
62
|
-
try {
|
|
63
|
-
yield this.queue.close();
|
|
64
|
-
}
|
|
65
|
-
catch (e) { }
|
|
66
|
-
try {
|
|
67
|
-
this.queue.removeAllListeners();
|
|
57
|
+
yield this.queue.removeAllListeners();
|
|
68
58
|
}
|
|
69
59
|
catch (e) { }
|
|
70
60
|
try {
|
|
@@ -73,11 +63,12 @@ class PlatformInstance {
|
|
|
73
63
|
catch (e) { }
|
|
74
64
|
try {
|
|
75
65
|
delete this.queue;
|
|
76
|
-
this.process.removeAllListeners('close');
|
|
77
|
-
this.process.unref();
|
|
78
|
-
this.process.kill();
|
|
66
|
+
yield this.process.removeAllListeners('close');
|
|
67
|
+
yield this.process.unref();
|
|
68
|
+
yield this.process.kill();
|
|
79
69
|
}
|
|
80
70
|
catch (e) { }
|
|
71
|
+
exports.platformInstances.delete(this.id);
|
|
81
72
|
});
|
|
82
73
|
}
|
|
83
74
|
/**
|
|
@@ -89,7 +80,7 @@ class PlatformInstance {
|
|
|
89
80
|
const result = resultString ? JSON.parse(resultString) : "";
|
|
90
81
|
this.queue.getJob(jobId).then((job) => __awaiter(this, void 0, void 0, function* () {
|
|
91
82
|
yield this.handleJobResult('completed', (0, common_1.decryptJobData)(job, secret), result);
|
|
92
|
-
job.remove();
|
|
83
|
+
yield job.remove();
|
|
93
84
|
}));
|
|
94
85
|
});
|
|
95
86
|
this.queue.on('global:error', (jobId, result) => {
|
|
@@ -98,7 +89,7 @@ class PlatformInstance {
|
|
|
98
89
|
this.queue.on('global:failed', (jobId, result) => {
|
|
99
90
|
this.queue.getJob(jobId).then((job) => __awaiter(this, void 0, void 0, function* () {
|
|
100
91
|
yield this.handleJobResult('failed', (0, common_1.decryptJobData)(job, secret), result);
|
|
101
|
-
job.remove();
|
|
92
|
+
yield job.remove();
|
|
102
93
|
}));
|
|
103
94
|
});
|
|
104
95
|
}
|
|
@@ -120,10 +111,9 @@ class PlatformInstance {
|
|
|
120
111
|
* Sends a message to client (user), can be registered with an event emitted from the platform
|
|
121
112
|
* process.
|
|
122
113
|
* @param sessionId ID of the socket connection to send the message to
|
|
123
|
-
* @param type type of message to emit. 'message', 'completed', 'failed'
|
|
124
114
|
* @param msg ActivityStream object to send to client
|
|
125
115
|
*/
|
|
126
|
-
sendToClient(sessionId,
|
|
116
|
+
sendToClient(sessionId, msg) {
|
|
127
117
|
(0, serve_1.getSocket)(sessionId).then((socket) => {
|
|
128
118
|
try {
|
|
129
119
|
// this property should never be exposed externally
|
|
@@ -131,11 +121,11 @@ class PlatformInstance {
|
|
|
131
121
|
}
|
|
132
122
|
catch (e) { }
|
|
133
123
|
msg.context = this.name;
|
|
134
|
-
if ((msg
|
|
124
|
+
if ((msg.type === 'error') && (typeof msg.actor === 'undefined') && (this.actor)) {
|
|
135
125
|
// ensure an actor is present if not otherwise defined
|
|
136
|
-
msg.actor = this.actor;
|
|
126
|
+
msg.actor = { id: this.actor };
|
|
137
127
|
}
|
|
138
|
-
socket.emit(
|
|
128
|
+
socket.emit('message', msg);
|
|
139
129
|
}, (err) => this.debug(`sendToClient ${err}`));
|
|
140
130
|
}
|
|
141
131
|
// send message to every connected socket associated with this platform instance.
|
|
@@ -144,7 +134,7 @@ class PlatformInstance {
|
|
|
144
134
|
for (let sid of this.sessions.values()) {
|
|
145
135
|
if (sid !== sessionId) {
|
|
146
136
|
this.debug(`broadcasting message to ${sid}`);
|
|
147
|
-
yield this.sendToClient(sid,
|
|
137
|
+
yield this.sendToClient(sid, msg);
|
|
148
138
|
}
|
|
149
139
|
}
|
|
150
140
|
});
|
|
@@ -152,24 +142,28 @@ class PlatformInstance {
|
|
|
152
142
|
// handle job results coming in on the queue from platform instances
|
|
153
143
|
handleJobResult(type, jobData, result) {
|
|
154
144
|
return __awaiter(this, void 0, void 0, function* () {
|
|
155
|
-
this.debug(
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
145
|
+
this.debug(`${type} job ${jobData.title}`);
|
|
146
|
+
delete jobData.msg.sessionSecret;
|
|
147
|
+
let msg = jobData.msg;
|
|
148
|
+
if (type === 'failed') {
|
|
149
|
+
msg.error = result ? result : "job failed for unknown reason";
|
|
150
|
+
if ((this.config.persist) && (this.config.requireCredentials.includes(jobData.msg.type))) {
|
|
151
|
+
this.debug(`critical job type ${jobData.msg.type} failed, terminating platform instance`);
|
|
152
|
+
yield this.destroy();
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
// send result to client
|
|
156
|
+
const callback = this.completedJobHandlers.get(jobData.title);
|
|
157
|
+
if (callback) {
|
|
158
|
+
callback(msg);
|
|
159
|
+
this.completedJobHandlers.delete(jobData.title);
|
|
161
160
|
}
|
|
162
|
-
else
|
|
163
|
-
jobData.msg
|
|
164
|
-
'@type': 'error',
|
|
165
|
-
content: result ? result : "job failed for unknown reason"
|
|
166
|
-
};
|
|
161
|
+
else {
|
|
162
|
+
yield this.sendToClient(jobData.sessionId, msg);
|
|
167
163
|
}
|
|
168
|
-
// send message to client as completed for failed job
|
|
169
|
-
yield this.sendToClient(jobData.sessionId, type, jobData.msg);
|
|
170
164
|
// let all related peers know of result as an independent message
|
|
171
165
|
// (not as part of a job completion, or failure)
|
|
172
|
-
yield this.broadcastToSharedPeers(jobData.sessionId,
|
|
166
|
+
yield this.broadcastToSharedPeers(jobData.sessionId, msg);
|
|
173
167
|
});
|
|
174
168
|
}
|
|
175
169
|
/**
|
|
@@ -178,18 +172,17 @@ class PlatformInstance {
|
|
|
178
172
|
* @param errorMessage
|
|
179
173
|
*/
|
|
180
174
|
reportError(sessionId, errorMessage) {
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
this.destroy();
|
|
175
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
176
|
+
const errorObject = {
|
|
177
|
+
context: this.name,
|
|
178
|
+
type: 'error',
|
|
179
|
+
actor: { id: this.actor },
|
|
180
|
+
error: errorMessage
|
|
181
|
+
};
|
|
182
|
+
this.sendToClient(sessionId, errorObject);
|
|
183
|
+
this.sessions.clear();
|
|
184
|
+
yield this.destroy();
|
|
185
|
+
});
|
|
193
186
|
}
|
|
194
187
|
/**
|
|
195
188
|
* Updates the instance with a new identifier, updating the platformInstances mapping as well.
|
|
@@ -222,7 +215,7 @@ class PlatformInstance {
|
|
|
222
215
|
}
|
|
223
216
|
else {
|
|
224
217
|
// treat like a message to clients
|
|
225
|
-
this.sendToClient(sessionId,
|
|
218
|
+
this.sendToClient(sessionId, data[1]);
|
|
226
219
|
}
|
|
227
220
|
}
|
|
228
221
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platform-instance.js","sourceRoot":"/","sources":["platform-instance.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,iDAAmD;AACnD,+BAA4B;AAC5B,iCAAwC;AACxC,gDAAyB;AAEzB,sDAA8B;AAE9B,mCAAoC;AACpC,
|
|
1
|
+
{"version":3,"file":"platform-instance.js","sourceRoot":"/","sources":["platform-instance.ts"],"names":[],"mappings":"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"}
|
package/dist/platform.js
CHANGED
|
@@ -23,7 +23,7 @@ logger(`platform handler initialized for ${platformName} ${identifier}`);
|
|
|
23
23
|
* Handle any uncaught errors from the platform by alerting the worker and shutting down.
|
|
24
24
|
*/
|
|
25
25
|
process.on('uncaughtException', (err) => {
|
|
26
|
-
console.log('
|
|
26
|
+
console.log('EXCEPTION IN PLATFORM');
|
|
27
27
|
// eslint-disable-next-line security-node/detect-crlf
|
|
28
28
|
console.log(err.stack);
|
|
29
29
|
process.send(['error', err.toString()]);
|
|
@@ -76,7 +76,7 @@ function getCredentials(actorId, sessionId, sessionSecret, cb) {
|
|
|
76
76
|
if (platform.credentialsHash) {
|
|
77
77
|
if (platform.credentialsHash !== (0, object_hash_1.default)(credentials.object)) {
|
|
78
78
|
return cb('provided credentials do not match existing platform instance for actor '
|
|
79
|
-
+ platform.actor
|
|
79
|
+
+ platform.actor.id);
|
|
80
80
|
}
|
|
81
81
|
}
|
|
82
82
|
else {
|
|
@@ -93,10 +93,10 @@ function getJobHandler(secret) {
|
|
|
93
93
|
return (job, done) => {
|
|
94
94
|
const jobData = (0, common_1.decryptJobData)(job, secret);
|
|
95
95
|
const jobLog = (0, debug_1.default)(`${loggerPrefix}:${jobData.sessionId}`);
|
|
96
|
-
jobLog(`
|
|
96
|
+
jobLog(`received ${jobData.title} ${jobData.msg.type}`);
|
|
97
97
|
const sessionSecret = jobData.msg.sessionSecret;
|
|
98
98
|
delete jobData.msg.sessionSecret;
|
|
99
|
-
return getCredentials(jobData.msg.actor
|
|
99
|
+
return getCredentials(jobData.msg.actor.id, jobData.sessionId, sessionSecret, (err, credentials) => {
|
|
100
100
|
if (err) {
|
|
101
101
|
return done(new Error(err));
|
|
102
102
|
}
|
|
@@ -107,19 +107,38 @@ function getJobHandler(secret) {
|
|
|
107
107
|
}
|
|
108
108
|
jobCallbackCalled = true;
|
|
109
109
|
if (err) {
|
|
110
|
-
|
|
110
|
+
jobLog(`errored ${jobData.title} ${jobData.msg.type}`);
|
|
111
|
+
let errMsg;
|
|
112
|
+
// some error objects (eg. TimeoutError) don't interoplate correctly to human-readable
|
|
113
|
+
// so we have to do this little dance
|
|
114
|
+
try {
|
|
115
|
+
errMsg = err.toString();
|
|
116
|
+
}
|
|
117
|
+
catch (e) {
|
|
118
|
+
errMsg = err;
|
|
119
|
+
}
|
|
120
|
+
done(new Error(errMsg));
|
|
111
121
|
}
|
|
112
122
|
else {
|
|
123
|
+
jobLog(`completed ${jobData.title} ${jobData.msg.type}`);
|
|
113
124
|
done(null, result);
|
|
114
125
|
}
|
|
115
126
|
};
|
|
116
127
|
if ((Array.isArray(platform.config.requireCredentials)) &&
|
|
117
|
-
(platform.config.requireCredentials.includes(jobData.msg
|
|
128
|
+
(platform.config.requireCredentials.includes(jobData.msg.type))) {
|
|
118
129
|
// add the credentials object if this method requires it
|
|
119
|
-
platform[jobData.msg
|
|
130
|
+
platform[jobData.msg.type](jobData.msg, credentials, doneCallback);
|
|
131
|
+
}
|
|
132
|
+
else if (platform.config.persist) {
|
|
133
|
+
if (platform.initialized) {
|
|
134
|
+
platform[jobData.msg.type](jobData.msg, doneCallback);
|
|
135
|
+
}
|
|
136
|
+
else {
|
|
137
|
+
done(new Error(`${jobData.msg.type} called on uninitialized platform`));
|
|
138
|
+
}
|
|
120
139
|
}
|
|
121
140
|
else {
|
|
122
|
-
platform[jobData.msg
|
|
141
|
+
platform[jobData.msg.type](jobData.msg, doneCallback);
|
|
123
142
|
}
|
|
124
143
|
});
|
|
125
144
|
};
|
|
@@ -140,8 +159,8 @@ function getSendFunction(command) {
|
|
|
140
159
|
* @param credentials
|
|
141
160
|
*/
|
|
142
161
|
function updateActor(credentials) {
|
|
143
|
-
identifier = (0, common_1.getPlatformId)(platformName, credentials.actor
|
|
144
|
-
logger(`platform actor updated to ${credentials.actor
|
|
162
|
+
identifier = (0, common_1.getPlatformId)(platformName, credentials.actor.id);
|
|
163
|
+
logger(`platform actor updated to ${credentials.actor.id} identifier ${identifier}`);
|
|
145
164
|
logger = (0, debug_1.default)(`sockethub:platform:${identifier}`);
|
|
146
165
|
platform.credentialsHash = (0, object_hash_1.default)(credentials.object);
|
|
147
166
|
platform.debug = (0, debug_1.default)(`sockethub:platform:${platformName}:${identifier}`);
|
package/dist/platform.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platform.js","sourceRoot":"/","sources":["platform.ts"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAC1B,8DAA+B;AAC/B,sDAA8B;AAC9B,gDAAyB;AACzB,qCAAyD;AAGzD,
|
|
1
|
+
{"version":3,"file":"platform.js","sourceRoot":"/","sources":["platform.ts"],"names":[],"mappings":"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"}
|
package/dist/process-manager.js
CHANGED
|
@@ -33,14 +33,17 @@ class ProcessManager {
|
|
|
33
33
|
}
|
|
34
34
|
get(platform, actorId, sessionId) {
|
|
35
35
|
const platformDetails = init_1.default.platforms.get(platform);
|
|
36
|
+
let pi;
|
|
36
37
|
if (platformDetails.config.persist) {
|
|
37
38
|
// ensure process is started - one for each actor
|
|
38
|
-
|
|
39
|
+
pi = this.ensureProcess(platform, sessionId, actorId);
|
|
39
40
|
}
|
|
40
41
|
else {
|
|
41
42
|
// ensure process is started - one for all jobs
|
|
42
|
-
|
|
43
|
+
pi = this.ensureProcess(platform);
|
|
43
44
|
}
|
|
45
|
+
pi.config = platformDetails.config;
|
|
46
|
+
return pi;
|
|
44
47
|
}
|
|
45
48
|
createPlatformInstance(identifier, platform, actor) {
|
|
46
49
|
const secrets = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-manager.js","sourceRoot":"/","sources":["process-manager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAAoC;AACpC,
|
|
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"}
|
package/dist/routes.js
CHANGED
|
@@ -12,13 +12,11 @@ const debug_scope = process.env.DEBUG || '', logger = (0, debug_1.default)('sock
|
|
|
12
12
|
config_1.default.get('public:port') +
|
|
13
13
|
config_1.default.get('public:path');
|
|
14
14
|
exports.basePaths = {
|
|
15
|
-
'/sockethub-client.js': path_1.default.resolve(`${__dirname}/../dist/
|
|
16
|
-
'/sockethub-client.js
|
|
15
|
+
'/sockethub-client.js': path_1.default.resolve(`${__dirname}/../dist/sockethub-client.js`),
|
|
16
|
+
'/sockethub-client.min.js': path_1.default.resolve(`${__dirname}/../dist/sockethub-client.min.js`),
|
|
17
|
+
'/sockethub-client.js.map': path_1.default.resolve(`${__dirname}/../dist/sockethub-client.js.map`),
|
|
17
18
|
'/socket.io.js': path_1.default.resolve(`${__dirname}/../node_modules/socket.io/client-dist/socket.io.js`),
|
|
18
19
|
'/socket.io.js.map': path_1.default.resolve(`${__dirname}/../node_modules/socket.io/client-dist/socket.io.js.map`),
|
|
19
|
-
// '/activity-streams.js':
|
|
20
|
-
// path.resolve(`${__dirname}/../node_modules/activity-streams/browser/activity-streams.js`),
|
|
21
|
-
'/activity-streams.min.js': path_1.default.resolve(`${__dirname}/../node_modules/activity-streams/browser/activity-streams.min.js`),
|
|
22
20
|
};
|
|
23
21
|
exports.examplePaths = {
|
|
24
22
|
'/jquery.js': path_1.default.resolve(`${__dirname}/../node_modules/jquery/dist/jquery.min.js`),
|
package/dist/routes.js.map
CHANGED
|
@@ -1 +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,kBAAkB,CAAC,EACvC,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;AAEjC,QAAA,SAAS,GAAG;IACvB,sBAAsB,EAAE,cAAI,CAAC,OAAO,CAAC,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"routes.js","sourceRoot":"/","sources":["routes.ts"],"names":[],"mappings":"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"}
|