equipped 5.0.0 → 5.0.1
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/CHANGELOG.md +2 -0
- package/lib/cache/base.js +1 -5
- package/lib/cache/base.js.map +1 -1
- package/lib/cache/index.js +3 -19
- package/lib/cache/index.js.map +1 -1
- package/lib/cache/pipes.js +8 -11
- package/lib/cache/pipes.js.map +1 -1
- package/lib/cache/types/redis.js +17 -20
- package/lib/cache/types/redis.js.map +1 -1
- package/lib/dbs/base/_instance.js +18 -37
- package/lib/dbs/base/_instance.js.map +1 -1
- package/lib/dbs/base/core.js +1 -2
- package/lib/dbs/base/types.js +1 -2
- package/lib/dbs/index.js +6 -22
- package/lib/dbs/index.js.map +1 -1
- package/lib/dbs/mongo/api.js +10 -13
- package/lib/dbs/mongo/api.js.map +1 -1
- package/lib/dbs/mongo/changes.js +17 -34
- package/lib/dbs/mongo/changes.js.map +1 -1
- package/lib/dbs/mongo/index.js +23 -39
- package/lib/dbs/mongo/index.js.map +1 -1
- package/lib/dbs/mongo/query.js +4 -8
- package/lib/dbs/mongo/query.js.map +1 -1
- package/lib/dbs/pipes.js +42 -48
- package/lib/dbs/pipes.js.map +1 -1
- package/lib/errors/equippedError.js +4 -5
- package/lib/errors/equippedError.js.map +1 -1
- package/lib/errors/index.js +9 -25
- package/lib/errors/index.js.map +1 -1
- package/lib/errors/requestError.js +4 -6
- package/lib/errors/requestError.js.map +1 -1
- package/lib/errors/types/authorizationExpired.js +4 -8
- package/lib/errors/types/authorizationExpired.js.map +1 -1
- package/lib/errors/types/badRequestError.js +4 -8
- package/lib/errors/types/badRequestError.js.map +1 -1
- package/lib/errors/types/notAuthenticatedError.js +4 -8
- package/lib/errors/types/notAuthenticatedError.js.map +1 -1
- package/lib/errors/types/notAuthorizedError.js +4 -8
- package/lib/errors/types/notAuthorizedError.js.map +1 -1
- package/lib/errors/types/notFoundError.js +4 -8
- package/lib/errors/types/notFoundError.js.map +1 -1
- package/lib/errors/types/refreshTokenMisusedError.js +4 -8
- package/lib/errors/types/refreshTokenMisusedError.js.map +1 -1
- package/lib/errors/types/validationError.js +4 -8
- package/lib/errors/types/validationError.js.map +1 -1
- package/lib/events/base.js +2 -6
- package/lib/events/base.js.map +1 -1
- package/lib/events/index.js +4 -20
- package/lib/events/index.js.map +1 -1
- package/lib/events/pipes.js +13 -16
- package/lib/events/pipes.js.map +1 -1
- package/lib/events/types/kafka.js +41 -59
- package/lib/events/types/kafka.js.map +1 -1
- package/lib/events/types/rabbitmq.js +21 -38
- package/lib/events/types/rabbitmq.js.map +1 -1
- package/lib/index.js +1 -17
- package/lib/index.js.map +1 -1
- package/lib/instance/hooks.js +1 -4
- package/lib/instance/hooks.js.map +1 -1
- package/lib/instance/index.js +40 -54
- package/lib/instance/index.js.map +1 -1
- package/lib/instance/settings.js +66 -74
- package/lib/instance/settings.js.map +1 -1
- package/lib/jobs/index.js +2 -18
- package/lib/jobs/index.js.map +1 -1
- package/lib/jobs/pipes.js +5 -8
- package/lib/jobs/pipes.js.map +1 -1
- package/lib/jobs/types/redis.js +43 -61
- package/lib/jobs/types/redis.js.map +1 -1
- package/lib/server/impls/base.js +136 -152
- package/lib/server/impls/base.js.map +1 -1
- package/lib/server/impls/express.js +35 -55
- package/lib/server/impls/express.js.map +1 -1
- package/lib/server/impls/fastify.js +29 -36
- package/lib/server/impls/fastify.js.map +1 -1
- package/lib/server/index.js +9 -25
- package/lib/server/index.js.map +1 -1
- package/lib/server/middlewares/index.js +1 -17
- package/lib/server/middlewares/index.js.map +1 -1
- package/lib/server/middlewares/parseAuthUser.js +6 -9
- package/lib/server/middlewares/parseAuthUser.js.map +1 -1
- package/lib/server/middlewares/requireAuthUser.js +13 -16
- package/lib/server/middlewares/requireAuthUser.js.map +1 -1
- package/lib/server/openapi.js +118 -130
- package/lib/server/openapi.js.map +1 -1
- package/lib/server/pipes.js +27 -30
- package/lib/server/pipes.js.map +1 -1
- package/lib/server/requests-auth/apiKeys.js +1 -5
- package/lib/server/requests-auth/apiKeys.js.map +1 -1
- package/lib/server/requests-auth/index.js +2 -18
- package/lib/server/requests-auth/index.js.map +1 -1
- package/lib/server/requests-auth/tokens.js +31 -51
- package/lib/server/requests-auth/tokens.js.map +1 -1
- package/lib/server/requests.js +25 -15
- package/lib/server/requests.js.map +1 -1
- package/lib/server/routes.js +24 -41
- package/lib/server/routes.js.map +1 -1
- package/lib/server/sockets.js +96 -111
- package/lib/server/sockets.js.map +1 -1
- package/lib/server/types.js +4 -9
- package/lib/server/types.js.map +1 -1
- package/lib/types/index.js +2 -18
- package/lib/types/index.js.map +1 -1
- package/lib/types/overrides.js +1 -2
- package/lib/utilities/authProviders.js +19 -28
- package/lib/utilities/authProviders.js.map +1 -1
- package/lib/utilities/hash.js +5 -43
- package/lib/utilities/hash.js.map +1 -1
- package/lib/utilities/index.js +6 -45
- package/lib/utilities/index.js.map +1 -1
- package/lib/utilities/json.js +3 -8
- package/lib/utilities/json.js.map +1 -1
- package/lib/utilities/media.js +3 -7
- package/lib/utilities/media.js.map +1 -1
- package/lib/utilities/random.js +5 -12
- package/lib/utilities/random.js.map +1 -1
- package/lib/utilities/retry.js +6 -11
- package/lib/utilities/retry.js.map +1 -1
- package/lib/validations/index.js +6 -47
- package/lib/validations/index.js.map +1 -1
- package/lib/validations/valleyed.js +18 -39
- package/lib/validations/valleyed.js.map +1 -1
- package/package.json +6 -5
package/lib/server/sockets.js
CHANGED
|
@@ -1,21 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
5
|
-
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
6
|
-
};
|
|
7
|
-
var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
|
|
8
|
-
if (kind === "m") throw new TypeError("Private method is not writable");
|
|
9
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
|
|
10
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
|
|
11
|
-
return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
|
|
12
|
-
};
|
|
13
|
-
var _SocketEmitter_instances, _SocketEmitter_connectionCallbacks, _SocketEmitter_routes, _SocketEmitter_publish, _SocketEmitter_emit, _SocketEmitter_getConfig, _SocketEmitter_setupSocketConnection;
|
|
14
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.SocketEmitter = void 0;
|
|
16
|
-
const path_to_regexp_1 = require("path-to-regexp");
|
|
17
|
-
const instance_1 = require("../instance");
|
|
18
|
-
const types_1 = require("./types");
|
|
1
|
+
import { match as Match } from 'path-to-regexp';
|
|
2
|
+
import { Instance } from '../instance';
|
|
3
|
+
import { StatusCodes } from './types';
|
|
19
4
|
var EmitTypes;
|
|
20
5
|
(function (EmitTypes) {
|
|
21
6
|
EmitTypes["created"] = "created";
|
|
@@ -24,119 +9,119 @@ var EmitTypes;
|
|
|
24
9
|
})(EmitTypes || (EmitTypes = {}));
|
|
25
10
|
const EmitterEvent = '__listener_emitter';
|
|
26
11
|
const defaultTo = '*';
|
|
27
|
-
class SocketEmitter {
|
|
12
|
+
export class SocketEmitter {
|
|
13
|
+
socketInstance;
|
|
14
|
+
#connectionCallbacks = { onConnect: async () => { }, onDisconnect: async () => { } };
|
|
15
|
+
#routes = {};
|
|
16
|
+
#publish = async () => { };
|
|
28
17
|
constructor(socket, eventBus) {
|
|
29
|
-
_SocketEmitter_instances.add(this);
|
|
30
|
-
_SocketEmitter_connectionCallbacks.set(this, { onConnect: async () => { }, onDisconnect: async () => { } });
|
|
31
|
-
_SocketEmitter_routes.set(this, {});
|
|
32
|
-
_SocketEmitter_publish.set(this, async () => { });
|
|
33
|
-
_SocketEmitter_setupSocketConnection.set(this, () => {
|
|
34
|
-
this.socketInstance.removeAllListeners('connection');
|
|
35
|
-
this.socketInstance.on('connection', async (socket) => {
|
|
36
|
-
const socketId = socket.id;
|
|
37
|
-
let user = null;
|
|
38
|
-
const tokensUtil = instance_1.Instance.get().settings.server?.requestsAuth.tokens;
|
|
39
|
-
if (socket.handshake.auth.authorization && tokensUtil)
|
|
40
|
-
user = await tokensUtil.verifyAccessToken(socket.handshake.auth.authorization ?? '').catch(() => null);
|
|
41
|
-
socket.on('leave', async (data, callback) => {
|
|
42
|
-
if (!data.channel)
|
|
43
|
-
return (typeof callback === 'function' &&
|
|
44
|
-
callback({
|
|
45
|
-
code: types_1.StatusCodes.ValidationError,
|
|
46
|
-
message: 'channel is required',
|
|
47
|
-
channel: '',
|
|
48
|
-
}));
|
|
49
|
-
socket.leave(data.channel);
|
|
50
|
-
return (typeof callback === 'function' &&
|
|
51
|
-
callback({
|
|
52
|
-
code: types_1.StatusCodes.Ok,
|
|
53
|
-
message: '',
|
|
54
|
-
channel: data.channel,
|
|
55
|
-
}));
|
|
56
|
-
});
|
|
57
|
-
socket.on('join', async (data, callback) => {
|
|
58
|
-
if (!data.channel)
|
|
59
|
-
return (typeof callback === 'function' &&
|
|
60
|
-
callback({
|
|
61
|
-
code: types_1.StatusCodes.ValidationError,
|
|
62
|
-
message: 'channel is required',
|
|
63
|
-
channel: '',
|
|
64
|
-
}));
|
|
65
|
-
const channel = data.channel;
|
|
66
|
-
const route = __classPrivateFieldGet(this, _SocketEmitter_instances, "m", _SocketEmitter_getConfig).call(this, channel) ?? null;
|
|
67
|
-
if (!route)
|
|
68
|
-
return (typeof callback === 'function' &&
|
|
69
|
-
callback({
|
|
70
|
-
code: types_1.StatusCodes.BadRequest,
|
|
71
|
-
message: 'unknown channel',
|
|
72
|
-
channel,
|
|
73
|
-
}));
|
|
74
|
-
const to = await route.config({ channel, user }, route.params, data.query ?? {});
|
|
75
|
-
const newChannel = `${to ?? defaultTo}:${channel}`;
|
|
76
|
-
socket.join(newChannel);
|
|
77
|
-
return (typeof callback === 'function' &&
|
|
78
|
-
callback({
|
|
79
|
-
code: types_1.StatusCodes.Ok,
|
|
80
|
-
message: '',
|
|
81
|
-
channel: newChannel,
|
|
82
|
-
}));
|
|
83
|
-
});
|
|
84
|
-
if (user)
|
|
85
|
-
await __classPrivateFieldGet(this, _SocketEmitter_connectionCallbacks, "f").onConnect(user.id, socketId);
|
|
86
|
-
socket.on('disconnect', async () => {
|
|
87
|
-
if (user)
|
|
88
|
-
await __classPrivateFieldGet(this, _SocketEmitter_connectionCallbacks, "f").onDisconnect(user.id, socketId);
|
|
89
|
-
});
|
|
90
|
-
});
|
|
91
|
-
});
|
|
92
18
|
this.socketInstance = socket;
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
19
|
+
this.#setupSocketConnection();
|
|
20
|
+
Instance.on('setup', () => {
|
|
21
|
+
this.#publish = eventBus
|
|
96
22
|
? eventBus.createPublisher(EmitterEvent)
|
|
97
23
|
: async (data) => {
|
|
98
24
|
socket.to(data.channel).emit(data.channel, data);
|
|
99
|
-
}
|
|
25
|
+
};
|
|
100
26
|
eventBus?.createSubscriber(EmitterEvent, async (data) => {
|
|
101
27
|
socket.to(data.channel).emit(data.channel, data);
|
|
102
28
|
}, { fanout: true });
|
|
103
29
|
}, 1);
|
|
104
30
|
}
|
|
105
31
|
async created(channels, data, to) {
|
|
106
|
-
await
|
|
32
|
+
await this.#emit(channels, EmitTypes.created, { after: data.toJSON(), before: null }, to);
|
|
107
33
|
}
|
|
108
34
|
async updated(channels, { after, before }, to) {
|
|
109
|
-
await
|
|
35
|
+
await this.#emit(channels, EmitTypes.updated, { after: after.toJSON(), before: before.toJSON() }, to);
|
|
110
36
|
}
|
|
111
37
|
async deleted(channels, data, to) {
|
|
112
|
-
await
|
|
38
|
+
await this.#emit(channels, EmitTypes.deleted, { before: data.toJSON(), after: null }, to);
|
|
39
|
+
}
|
|
40
|
+
async #emit(channels, type, { before, after }, to) {
|
|
41
|
+
const toArray = Array.isArray(to) ? to : [to ?? defaultTo];
|
|
42
|
+
const channelMap = channels.flatMap((c) => toArray.map((to) => `${to}:${c}`));
|
|
43
|
+
await Promise.all(channelMap.map(async (channel) => this.#publish({ channel, type, before, after })));
|
|
113
44
|
}
|
|
114
45
|
set connectionCallbacks(callbacks) {
|
|
115
|
-
|
|
116
|
-
|
|
46
|
+
this.#connectionCallbacks = callbacks;
|
|
47
|
+
this.#setupSocketConnection();
|
|
117
48
|
}
|
|
118
49
|
register(channel, onJoin) {
|
|
119
|
-
|
|
120
|
-
|
|
50
|
+
this.#routes[channel] = onJoin;
|
|
51
|
+
this.#routes[channel + '/:id'] = onJoin;
|
|
121
52
|
return this;
|
|
122
53
|
}
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
54
|
+
#getConfig(channel) {
|
|
55
|
+
const matcher = (key) => Match(key)(channel);
|
|
56
|
+
const matchedChannel = Object.keys(this.#routes).find(matcher) ?? null;
|
|
57
|
+
if (!matchedChannel)
|
|
58
|
+
return null;
|
|
59
|
+
const match = matcher(matchedChannel);
|
|
60
|
+
if (!match)
|
|
61
|
+
return null;
|
|
62
|
+
return {
|
|
63
|
+
config: this.#routes[matchedChannel],
|
|
64
|
+
params: match.params,
|
|
65
|
+
};
|
|
66
|
+
}
|
|
67
|
+
#setupSocketConnection = () => {
|
|
68
|
+
this.socketInstance.removeAllListeners('connection');
|
|
69
|
+
this.socketInstance.on('connection', async (socket) => {
|
|
70
|
+
const socketId = socket.id;
|
|
71
|
+
let user = null;
|
|
72
|
+
const tokensUtil = Instance.get().settings.server?.requestsAuth.tokens;
|
|
73
|
+
if (socket.handshake.auth.authorization && tokensUtil)
|
|
74
|
+
user = await tokensUtil.verifyAccessToken(socket.handshake.auth.authorization ?? '').catch(() => null);
|
|
75
|
+
socket.on('leave', async (data, callback) => {
|
|
76
|
+
if (!data.channel)
|
|
77
|
+
return (typeof callback === 'function' &&
|
|
78
|
+
callback({
|
|
79
|
+
code: StatusCodes.ValidationError,
|
|
80
|
+
message: 'channel is required',
|
|
81
|
+
channel: '',
|
|
82
|
+
}));
|
|
83
|
+
socket.leave(data.channel);
|
|
84
|
+
return (typeof callback === 'function' &&
|
|
85
|
+
callback({
|
|
86
|
+
code: StatusCodes.Ok,
|
|
87
|
+
message: '',
|
|
88
|
+
channel: data.channel,
|
|
89
|
+
}));
|
|
90
|
+
});
|
|
91
|
+
socket.on('join', async (data, callback) => {
|
|
92
|
+
if (!data.channel)
|
|
93
|
+
return (typeof callback === 'function' &&
|
|
94
|
+
callback({
|
|
95
|
+
code: StatusCodes.ValidationError,
|
|
96
|
+
message: 'channel is required',
|
|
97
|
+
channel: '',
|
|
98
|
+
}));
|
|
99
|
+
const channel = data.channel;
|
|
100
|
+
const route = this.#getConfig(channel) ?? null;
|
|
101
|
+
if (!route)
|
|
102
|
+
return (typeof callback === 'function' &&
|
|
103
|
+
callback({
|
|
104
|
+
code: StatusCodes.BadRequest,
|
|
105
|
+
message: 'unknown channel',
|
|
106
|
+
channel,
|
|
107
|
+
}));
|
|
108
|
+
const to = await route.config({ channel, user }, route.params, data.query ?? {});
|
|
109
|
+
const newChannel = `${to ?? defaultTo}:${channel}`;
|
|
110
|
+
socket.join(newChannel);
|
|
111
|
+
return (typeof callback === 'function' &&
|
|
112
|
+
callback({
|
|
113
|
+
code: StatusCodes.Ok,
|
|
114
|
+
message: '',
|
|
115
|
+
channel: newChannel,
|
|
116
|
+
}));
|
|
117
|
+
});
|
|
118
|
+
if (user)
|
|
119
|
+
await this.#connectionCallbacks.onConnect(user.id, socketId);
|
|
120
|
+
socket.on('disconnect', async () => {
|
|
121
|
+
if (user)
|
|
122
|
+
await this.#connectionCallbacks.onDisconnect(user.id, socketId);
|
|
123
|
+
});
|
|
124
|
+
});
|
|
140
125
|
};
|
|
141
|
-
}
|
|
126
|
+
}
|
|
142
127
|
//# sourceMappingURL=sockets.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sockets.js","sourceRoot":"","sources":["../../src/server/sockets.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sockets.js","sourceRoot":"","sources":["../../src/server/sockets.ts"],"names":[],"mappings":"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"}
|
package/lib/server/types.js
CHANGED
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.makeErrorMiddleware = exports.makeMiddleware = exports.StatusCodes = exports.Methods = void 0;
|
|
4
|
-
exports.Methods = {
|
|
1
|
+
export const Methods = {
|
|
5
2
|
head: 'head',
|
|
6
3
|
get: 'get',
|
|
7
4
|
post: 'post',
|
|
@@ -10,7 +7,7 @@ exports.Methods = {
|
|
|
10
7
|
delete: 'delete',
|
|
11
8
|
options: 'options',
|
|
12
9
|
};
|
|
13
|
-
|
|
10
|
+
export const StatusCodes = {
|
|
14
11
|
Ok: 200,
|
|
15
12
|
Found: 302,
|
|
16
13
|
BadRequest: 400,
|
|
@@ -24,8 +21,6 @@ exports.StatusCodes = {
|
|
|
24
21
|
function makeMiddlewareHandler(cb, onSetup) {
|
|
25
22
|
return { cb, onSetup };
|
|
26
23
|
}
|
|
27
|
-
const makeMiddleware = (...args) => makeMiddlewareHandler(...args);
|
|
28
|
-
|
|
29
|
-
const makeErrorMiddleware = (...args) => makeMiddlewareHandler(...args);
|
|
30
|
-
exports.makeErrorMiddleware = makeErrorMiddleware;
|
|
24
|
+
export const makeMiddleware = (...args) => makeMiddlewareHandler(...args);
|
|
25
|
+
export const makeErrorMiddleware = (...args) => makeMiddlewareHandler(...args);
|
|
31
26
|
//# sourceMappingURL=types.js.map
|
package/lib/server/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/server/types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/server/types.ts"],"names":[],"mappings":"AAMA,MAAM,CAAC,MAAM,OAAO,GAAG;IACtB,IAAI,EAAE,MAAM;IACZ,GAAG,EAAE,KAAK;IACV,IAAI,EAAE,MAAM;IACZ,GAAG,EAAE,KAAK;IACV,KAAK,EAAE,OAAO;IACd,MAAM,EAAE,QAAQ;IAChB,OAAO,EAAE,SAAS;CACT,CAAA;AAEV,MAAM,CAAC,MAAM,WAAW,GAAG;IAC1B,EAAE,EAAE,GAAG;IACP,KAAK,EAAE,GAAG;IACV,UAAU,EAAE,GAAG;IACf,gBAAgB,EAAE,GAAG;IACrB,aAAa,EAAE,GAAG;IAClB,QAAQ,EAAE,GAAG;IACb,eAAe,EAAE,GAAG;IACpB,eAAe,EAAE,GAAG;IACpB,oBAAoB,EAAE,GAAG;CAChB,CAAA;AAsGV,SAAS,qBAAqB,CAA0C,EAAM,EAAE,OAAyB;IACxG,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,CAAA;AACvB,CAAC;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,CAAuB,GAAG,IAAgF,EAAE,EAAE,CAC3I,qBAAqB,CAAC,GAAG,IAAI,CAAC,CAAA;AAC/B,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAuB,GAAG,IAAsE,EAAE,EAAE,CACtI,qBAAqB,CAAC,GAAG,IAAI,CAAC,CAAA"}
|
package/lib/types/index.js
CHANGED
|
@@ -1,19 +1,3 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
-
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
-
};
|
|
16
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
__exportStar(require("valleyed/lib/utils/types"), exports);
|
|
18
|
-
__exportStar(require("./overrides"), exports);
|
|
1
|
+
export * from 'valleyed/lib/utils/types';
|
|
2
|
+
export * from './overrides';
|
|
19
3
|
//# sourceMappingURL=index.js.map
|
package/lib/types/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAA;AACxC,cAAc,aAAa,CAAA"}
|
package/lib/types/overrides.js
CHANGED
|
@@ -1,53 +1,45 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
};
|
|
5
|
-
|
|
6
|
-
exports.signinWithFacebook = exports.signinWithApple = exports.signinWithGoogle = void 0;
|
|
7
|
-
const axios_1 = __importDefault(require("axios"));
|
|
8
|
-
const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
|
|
9
|
-
const jwks_rsa_1 = __importDefault(require("jwks-rsa"));
|
|
10
|
-
const errors_1 = require("../errors");
|
|
11
|
-
const signinWithGoogle = async (idToken) => {
|
|
1
|
+
import axios from 'axios';
|
|
2
|
+
import jwt from 'jsonwebtoken';
|
|
3
|
+
import jwksClient from 'jwks-rsa';
|
|
4
|
+
import { EquippedError } from '../errors';
|
|
5
|
+
export const signinWithGoogle = async (idToken) => {
|
|
12
6
|
const authUrl = `https://oauth2.googleapis.com/tokeninfo?id_token=${idToken}`;
|
|
13
|
-
const { data } = await
|
|
14
|
-
throw new
|
|
7
|
+
const { data } = await axios.get(authUrl).catch((err) => {
|
|
8
|
+
throw new EquippedError('Failed to sign in with google', { idToken }, err);
|
|
15
9
|
});
|
|
16
10
|
data.first_name = data.given_name;
|
|
17
11
|
data.last_name = data.family_name;
|
|
18
12
|
return data;
|
|
19
13
|
};
|
|
20
|
-
|
|
21
|
-
const signinWithApple = async (idToken) => {
|
|
14
|
+
export const signinWithApple = async (idToken) => {
|
|
22
15
|
try {
|
|
23
16
|
const APPLE_BASE = 'https://appleid.apple.com';
|
|
24
|
-
const json =
|
|
17
|
+
const json = jwt.decode(idToken, { complete: true });
|
|
25
18
|
if (!json?.header)
|
|
26
19
|
throw new Error('');
|
|
27
20
|
const { kid, alg } = json.header;
|
|
28
|
-
const publicKey = await (
|
|
21
|
+
const publicKey = await jwksClient({ jwksUri: `${APPLE_BASE}/auth/keys`, cache: true })
|
|
29
22
|
.getSigningKey(kid)
|
|
30
23
|
.then((key) => key.getPublicKey())
|
|
31
24
|
.catch(() => null);
|
|
32
25
|
if (!publicKey)
|
|
33
|
-
throw new
|
|
34
|
-
const data =
|
|
26
|
+
throw new EquippedError('no publicKey', { idToken, publicKey, json });
|
|
27
|
+
const data = jwt.verify(idToken, publicKey, { algorithms: [alg] });
|
|
35
28
|
if (!data)
|
|
36
|
-
throw new
|
|
29
|
+
throw new EquippedError('no data', { idToken, data });
|
|
37
30
|
if (data.iss !== APPLE_BASE)
|
|
38
|
-
throw new
|
|
31
|
+
throw new EquippedError('iss doesnt match', { idToken, data });
|
|
39
32
|
if (data.exp * 1000 < Date.now())
|
|
40
|
-
throw new
|
|
33
|
+
throw new EquippedError('expired idToken', { idToken, data });
|
|
41
34
|
return data;
|
|
42
35
|
}
|
|
43
36
|
catch (err) {
|
|
44
|
-
throw new
|
|
37
|
+
throw new EquippedError('Failed to sign in with apple', { idToken }, err);
|
|
45
38
|
}
|
|
46
39
|
};
|
|
47
|
-
|
|
48
|
-
const signinWithFacebook = async (accessToken, fields = []) => {
|
|
40
|
+
export const signinWithFacebook = async (accessToken, fields = []) => {
|
|
49
41
|
fields = [...new Set([...fields, 'name', 'picture', 'email'])];
|
|
50
|
-
const { data } = await
|
|
42
|
+
const { data } = await axios
|
|
51
43
|
.request({
|
|
52
44
|
method: 'get',
|
|
53
45
|
url: 'https://graph.facebook.com/v15.0/me',
|
|
@@ -57,7 +49,7 @@ const signinWithFacebook = async (accessToken, fields = []) => {
|
|
|
57
49
|
},
|
|
58
50
|
})
|
|
59
51
|
.catch((err) => {
|
|
60
|
-
throw new
|
|
52
|
+
throw new EquippedError('Failed to sign in with facebook', { accessToken, fields }, err);
|
|
61
53
|
});
|
|
62
54
|
const isValidData = fields.every((key) => key in data);
|
|
63
55
|
if (!isValidData)
|
|
@@ -65,5 +57,4 @@ const signinWithFacebook = async (accessToken, fields = []) => {
|
|
|
65
57
|
data.email_verified = 'true';
|
|
66
58
|
return data;
|
|
67
59
|
};
|
|
68
|
-
exports.signinWithFacebook = signinWithFacebook;
|
|
69
60
|
//# sourceMappingURL=authProviders.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authProviders.js","sourceRoot":"","sources":["../../src/utilities/authProviders.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"authProviders.js","sourceRoot":"","sources":["../../src/utilities/authProviders.ts"],"names":[],"mappings":"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"}
|
package/lib/utilities/hash.js
CHANGED
|
@@ -1,53 +1,15 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
-
var ownKeys = function(o) {
|
|
20
|
-
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
-
var ar = [];
|
|
22
|
-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
-
return ar;
|
|
24
|
-
};
|
|
25
|
-
return ownKeys(o);
|
|
26
|
-
};
|
|
27
|
-
return function (mod) {
|
|
28
|
-
if (mod && mod.__esModule) return mod;
|
|
29
|
-
var result = {};
|
|
30
|
-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
-
__setModuleDefault(result, mod);
|
|
32
|
-
return result;
|
|
33
|
-
};
|
|
34
|
-
})();
|
|
35
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
-
exports.compare = exports.hash = void 0;
|
|
37
|
-
const bcrypt = __importStar(require("bcryptjs"));
|
|
38
|
-
const instance_1 = require("../instance");
|
|
39
|
-
const hash = async (password) => {
|
|
1
|
+
import * as bcrypt from 'bcryptjs';
|
|
2
|
+
import { Instance } from '../instance';
|
|
3
|
+
export const hash = async (password) => {
|
|
40
4
|
password = password.trim();
|
|
41
5
|
if (!password)
|
|
42
6
|
return '';
|
|
43
|
-
return await bcrypt.hash(password,
|
|
7
|
+
return await bcrypt.hash(password, Instance.get().settings.utils.hashSaltRounds);
|
|
44
8
|
};
|
|
45
|
-
|
|
46
|
-
const compare = async (plainPassword, hashed) => {
|
|
9
|
+
export const compare = async (plainPassword, hashed) => {
|
|
47
10
|
plainPassword = plainPassword.trim();
|
|
48
11
|
if (!plainPassword && plainPassword === hashed)
|
|
49
12
|
return true;
|
|
50
13
|
return await bcrypt.compare(plainPassword, hashed);
|
|
51
14
|
};
|
|
52
|
-
exports.compare = compare;
|
|
53
15
|
//# sourceMappingURL=hash.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hash.js","sourceRoot":"","sources":["../../src/utilities/hash.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"hash.js","sourceRoot":"","sources":["../../src/utilities/hash.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,UAAU,CAAA;AAElC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAEtC,MAAM,CAAC,MAAM,IAAI,GAAG,KAAK,EAAE,QAAgB,EAAE,EAAE;IAC9C,QAAQ,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAA;IAC1B,IAAI,CAAC,QAAQ;QAAE,OAAO,EAAE,CAAA;IACxB,OAAO,MAAM,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;AACjF,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,OAAO,GAAG,KAAK,EAAE,aAAqB,EAAE,MAAc,EAAE,EAAE;IACtE,aAAa,GAAG,aAAa,CAAC,IAAI,EAAE,CAAA;IACpC,IAAI,CAAC,aAAa,IAAI,aAAa,KAAK,MAAM;QAAE,OAAO,IAAI,CAAA;IAC3D,OAAO,MAAM,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,MAAM,CAAC,CAAA;AACnD,CAAC,CAAA"}
|
package/lib/utilities/index.js
CHANGED
|
@@ -1,46 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
-
var ownKeys = function(o) {
|
|
20
|
-
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
-
var ar = [];
|
|
22
|
-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
-
return ar;
|
|
24
|
-
};
|
|
25
|
-
return ownKeys(o);
|
|
26
|
-
};
|
|
27
|
-
return function (mod) {
|
|
28
|
-
if (mod && mod.__esModule) return mod;
|
|
29
|
-
var result = {};
|
|
30
|
-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
-
__setModuleDefault(result, mod);
|
|
32
|
-
return result;
|
|
33
|
-
};
|
|
34
|
-
})();
|
|
35
|
-
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
36
|
-
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
37
|
-
};
|
|
38
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
-
exports.Random = exports.Hash = exports.AuthProviders = void 0;
|
|
40
|
-
exports.AuthProviders = __importStar(require("./authProviders"));
|
|
41
|
-
exports.Hash = __importStar(require("./hash"));
|
|
42
|
-
__exportStar(require("./json"), exports);
|
|
43
|
-
__exportStar(require("./media"), exports);
|
|
44
|
-
__exportStar(require("./retry"), exports);
|
|
45
|
-
exports.Random = __importStar(require("./random"));
|
|
1
|
+
export * as AuthProviders from './authProviders';
|
|
2
|
+
export * as Hash from './hash';
|
|
3
|
+
export * from './json';
|
|
4
|
+
export * from './media';
|
|
5
|
+
export * from './retry';
|
|
6
|
+
export * as Random from './random';
|
|
46
7
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utilities/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utilities/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,aAAa,MAAM,iBAAiB,CAAA;AAChD,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAA;AAC9B,cAAc,QAAQ,CAAA;AACtB,cAAc,SAAS,CAAA;AACvB,cAAc,SAAS,CAAA;AACvB,OAAO,KAAK,MAAM,MAAM,UAAU,CAAA"}
|
package/lib/utilities/json.js
CHANGED
|
@@ -1,8 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.parseJSONValue = void 0;
|
|
4
|
-
exports.parseJSONObject = parseJSONObject;
|
|
5
|
-
const parseJSONValue = (data) => {
|
|
1
|
+
export const parseJSONValue = (data) => {
|
|
6
2
|
try {
|
|
7
3
|
if (data?.constructor?.name !== 'String')
|
|
8
4
|
return data;
|
|
@@ -12,8 +8,7 @@ const parseJSONValue = (data) => {
|
|
|
12
8
|
return data;
|
|
13
9
|
}
|
|
14
10
|
};
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
return Object.fromEntries(Object.entries(data).map(([key, value]) => [key, (0, exports.parseJSONValue)(value)]));
|
|
11
|
+
export function parseJSONObject(data) {
|
|
12
|
+
return Object.fromEntries(Object.entries(data).map(([key, value]) => [key, parseJSONValue(value)]));
|
|
18
13
|
}
|
|
19
14
|
//# sourceMappingURL=json.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json.js","sourceRoot":"","sources":["../../src/utilities/json.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"json.js","sourceRoot":"","sources":["../../src/utilities/json.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,IAAS,EAAE,EAAE;IAC3C,IAAI,CAAC;QACJ,IAAI,IAAI,EAAE,WAAW,EAAE,IAAI,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAA;QACrD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACxB,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,IAAI,CAAA;IACZ,CAAC;AACF,CAAC,CAAA;AAED,MAAM,UAAU,eAAe,CAAmB,IAAO;IACxD,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAM,CAAA;AACzG,CAAC"}
|