@tumbaland/backend-core 1.53.0 → 1.54.0
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/dist/auth/session.d.ts.map +1 -1
- package/dist/auth/session.js +22 -3
- package/dist/auth/session.js.map +1 -1
- package/dist/database/connection.d.ts +28 -0
- package/dist/database/connection.d.ts.map +1 -1
- package/dist/database/connection.js +59 -1
- package/dist/database/connection.js.map +1 -1
- package/dist/tracing/index.d.ts.map +1 -1
- package/dist/tracing/index.js +12 -5
- package/dist/tracing/index.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/auth/session.ts"],"names":[],"mappings":"AAEA;;;;;;;;GAQG;AACH,eAAO,MAAM,wBAAwB,kBAAkB,CAAC;AAIxD,KAAK,YAAY,GAAG,CAAC,MAAM,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/auth/session.ts"],"names":[],"mappings":"AAEA;;;;;;;;GAQG;AACH,eAAO,MAAM,wBAAwB,kBAAkB,CAAC;AAIxD,KAAK,YAAY,GAAG,CAAC,MAAM,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;AAmD1D,eAAO,MAAM,gBAAgB,GAAI,QAAQ,OAAO,KAAG,OAAO,CAAC,OAAO,CAAyB,CAAC;AAE5F;;;;GAIG;AACH,wBAAgB,4BAA4B,CAAC,KAAK,CAAC,EAAE,YAAY,GAAG,IAAI,CAEvE"}
|
package/dist/auth/session.js
CHANGED
|
@@ -17,6 +17,16 @@ const mongoose_1 = __importDefault(require("mongoose"));
|
|
|
17
17
|
*/
|
|
18
18
|
exports.USER_SESSIONS_COLLECTION = 'user_sessions';
|
|
19
19
|
const OBJECT_ID = /^[a-f\d]{24}$/i;
|
|
20
|
+
/**
|
|
21
|
+
* Checks running right now, by session. Opening a thread sends several requests
|
|
22
|
+
* at once, each of which authenticates, and each would ask the database the same
|
|
23
|
+
* question across the internet. They share one answer instead.
|
|
24
|
+
*
|
|
25
|
+
* Only while the question is being asked: nothing is kept once it has been
|
|
26
|
+
* answered, so a session revoked a moment later is refused on the very next
|
|
27
|
+
* request, exactly as before.
|
|
28
|
+
*/
|
|
29
|
+
const inFlight = new Map();
|
|
20
30
|
/**
|
|
21
31
|
* Whether a verified session token still stands: for a token with a `sid`,
|
|
22
32
|
* its session belongs to the token's user and has neither been revoked nor
|
|
@@ -36,12 +46,21 @@ const checkSessionInDatabase = async (claims) => {
|
|
|
36
46
|
// Refuse rather than queue an authentication query while the database is down.
|
|
37
47
|
if (mongoose_1.default.connection.readyState !== 1)
|
|
38
48
|
return false;
|
|
39
|
-
const
|
|
49
|
+
const key = `${id}:${sid}`;
|
|
50
|
+
const running = inFlight.get(key);
|
|
51
|
+
if (running)
|
|
52
|
+
return running;
|
|
53
|
+
const lookup = mongoose_1.default.connection
|
|
54
|
+
.collection(exports.USER_SESSIONS_COLLECTION)
|
|
55
|
+
.findOne({
|
|
40
56
|
_id: new mongoose_1.default.Types.ObjectId(sid),
|
|
41
57
|
userId: new mongoose_1.default.Types.ObjectId(id),
|
|
42
58
|
expiresAt: { $gt: new Date() }
|
|
43
|
-
}, { projection: { _id: 1 }, readPreference: 'primary', maxTimeMS: 3000 })
|
|
44
|
-
|
|
59
|
+
}, { projection: { _id: 1 }, readPreference: 'primary', maxTimeMS: 3000 })
|
|
60
|
+
.then((session) => session !== null)
|
|
61
|
+
.finally(() => inFlight.delete(key));
|
|
62
|
+
inFlight.set(key, lookup);
|
|
63
|
+
return lookup;
|
|
45
64
|
};
|
|
46
65
|
let sessionCheck = checkSessionInDatabase;
|
|
47
66
|
const isCurrentSession = (claims) => sessionCheck(claims);
|
package/dist/auth/session.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/auth/session.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/auth/session.ts"],"names":[],"mappings":";;;;;;AAyEA,oEAEC;AA3ED,wDAAgC;AAEhC;;;;;;;;GAQG;AACU,QAAA,wBAAwB,GAAG,eAAe,CAAC;AAExD,MAAM,SAAS,GAAG,gBAAgB,CAAC;AAInC;;;;;;;;GAQG;AACH,MAAM,QAAQ,GAAG,IAAI,GAAG,EAA4B,CAAC;AAErD;;;;;GAKG;AACH,MAAM,sBAAsB,GAAiB,KAAK,EAAE,MAAM,EAAE,EAAE;IAC5D,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IACxD,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,MAAyC,CAAC;IAC9D,4EAA4E;IAC5E,uDAAuD;IACvD,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC;QAAE,OAAO,KAAK,CAAC;IAClE,IAAI,OAAO,EAAE,KAAK,QAAQ,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;QAAE,OAAO,KAAK,CAAC;IAChE,+EAA+E;IAC/E,IAAI,kBAAQ,CAAC,UAAU,CAAC,UAAU,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAEvD,MAAM,GAAG,GAAG,GAAG,EAAE,IAAI,GAAG,EAAE,CAAC;IAC3B,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAClC,IAAI,OAAO;QAAE,OAAO,OAAO,CAAC;IAE5B,MAAM,MAAM,GAAG,kBAAQ,CAAC,UAAU;SAC/B,UAAU,CAAC,gCAAwB,CAAC;SACpC,OAAO,CACN;QACE,GAAG,EAAE,IAAI,kBAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC;QACrC,MAAM,EAAE,IAAI,kBAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;QACvC,SAAS,EAAE,EAAE,GAAG,EAAE,IAAI,IAAI,EAAE,EAAE;KAC/B,EACD,EAAE,UAAU,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,cAAc,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,CACvE;SACA,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,KAAK,IAAI,CAAC;SACnC,OAAO,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IACvC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC1B,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,IAAI,YAAY,GAAiB,sBAAsB,CAAC;AAEjD,MAAM,gBAAgB,GAAG,CAAC,MAAe,EAAoB,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;AAA/E,QAAA,gBAAgB,oBAA+D;AAE5F;;;;GAIG;AACH,SAAgB,4BAA4B,CAAC,KAAoB;IAC/D,YAAY,GAAG,KAAK,IAAI,sBAAsB,CAAC;AACjD,CAAC"}
|
|
@@ -1,3 +1,31 @@
|
|
|
1
|
+
import { ConnectOptions } from 'mongoose';
|
|
2
|
+
/**
|
|
3
|
+
* How the pool behaves toward a database that is across the internet.
|
|
4
|
+
*
|
|
5
|
+
* Measured, not assumed: on the Pi a database lookup took about 17 ms on a warm
|
|
6
|
+
* connection and 850 to 1,370 ms on a cold one, so the distance to Atlas is not
|
|
7
|
+
* the cost. Opening a connection is. It is a TCP and TLS handshake and an
|
|
8
|
+
* authentication, from a small machine, and the driver defaults make a burst of
|
|
9
|
+
* requests pay for it badly:
|
|
10
|
+
*
|
|
11
|
+
* - It keeps no connections open, and an idle one is eventually dropped by
|
|
12
|
+
* something between here and Atlas, so the first request after a quiet spell
|
|
13
|
+
* starts from nothing.
|
|
14
|
+
* - It opens at most two connections at a time. Opening a thread sends five or
|
|
15
|
+
* six requests at once, so they queued behind each other, a second or so per
|
|
16
|
+
* pair, and the thread took three to seven seconds.
|
|
17
|
+
*
|
|
18
|
+
* So:
|
|
19
|
+
* - `minPoolSize` keeps enough connections open to cover that burst.
|
|
20
|
+
* - `maxConnecting` lets the pool open several at once when it does need more.
|
|
21
|
+
* - `maxIdleTimeMS` retires a connection that has sat idle for a few minutes,
|
|
22
|
+
* before something else kills it, and the pool opens a fresh one in its place.
|
|
23
|
+
* - `family: 4` skips the IPv6 half of every hostname lookup. Atlas is IPv4, and
|
|
24
|
+
* a resolver that is slow to answer for AAAA delays every new connection.
|
|
25
|
+
*
|
|
26
|
+
* Each can be set per deployment, for a database that is somewhere else.
|
|
27
|
+
*/
|
|
28
|
+
export declare function poolOptions(env?: NodeJS.ProcessEnv): ConnectOptions;
|
|
1
29
|
/**
|
|
2
30
|
* Connects once and throws on failure. There is deliberately no retry loop here.
|
|
3
31
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../src/database/connection.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../src/database/connection.ts"],"names":[],"mappings":"AAAA,OAAiB,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAWpD;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,WAAW,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,cAAc,CAWhF;AAED;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,SAAS,GAAU,cAAc,MAAM,EAAE,MAAM,MAAM,KAAG,OAAO,CAAC,IAAI,CAchF,CAAC;AA4DF,eAAO,MAAM,YAAY,GAAU,cAAc,MAAM,KAAG,OAAO,CAAC,IAAI,CASrE,CAAC"}
|
|
@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.disconnectDB = exports.connectDB = void 0;
|
|
7
|
+
exports.poolOptions = poolOptions;
|
|
7
8
|
const mongoose_1 = __importDefault(require("mongoose"));
|
|
8
9
|
const logger_1 = __importDefault(require("../logging/logger"));
|
|
9
10
|
let connected = false;
|
|
@@ -13,6 +14,42 @@ let connected = false;
|
|
|
13
14
|
*/
|
|
14
15
|
let pending = null;
|
|
15
16
|
let listenersRegistered = false;
|
|
17
|
+
/**
|
|
18
|
+
* How the pool behaves toward a database that is across the internet.
|
|
19
|
+
*
|
|
20
|
+
* Measured, not assumed: on the Pi a database lookup took about 17 ms on a warm
|
|
21
|
+
* connection and 850 to 1,370 ms on a cold one, so the distance to Atlas is not
|
|
22
|
+
* the cost. Opening a connection is. It is a TCP and TLS handshake and an
|
|
23
|
+
* authentication, from a small machine, and the driver defaults make a burst of
|
|
24
|
+
* requests pay for it badly:
|
|
25
|
+
*
|
|
26
|
+
* - It keeps no connections open, and an idle one is eventually dropped by
|
|
27
|
+
* something between here and Atlas, so the first request after a quiet spell
|
|
28
|
+
* starts from nothing.
|
|
29
|
+
* - It opens at most two connections at a time. Opening a thread sends five or
|
|
30
|
+
* six requests at once, so they queued behind each other, a second or so per
|
|
31
|
+
* pair, and the thread took three to seven seconds.
|
|
32
|
+
*
|
|
33
|
+
* So:
|
|
34
|
+
* - `minPoolSize` keeps enough connections open to cover that burst.
|
|
35
|
+
* - `maxConnecting` lets the pool open several at once when it does need more.
|
|
36
|
+
* - `maxIdleTimeMS` retires a connection that has sat idle for a few minutes,
|
|
37
|
+
* before something else kills it, and the pool opens a fresh one in its place.
|
|
38
|
+
* - `family: 4` skips the IPv6 half of every hostname lookup. Atlas is IPv4, and
|
|
39
|
+
* a resolver that is slow to answer for AAAA delays every new connection.
|
|
40
|
+
*
|
|
41
|
+
* Each can be set per deployment, for a database that is somewhere else.
|
|
42
|
+
*/
|
|
43
|
+
function poolOptions(env = process.env) {
|
|
44
|
+
const number = (value, fallback) => value !== undefined && value.trim() !== '' && Number.isFinite(Number(value)) ? Number(value) : fallback;
|
|
45
|
+
const family = number(env.MONGODB_IP_FAMILY, 4);
|
|
46
|
+
return {
|
|
47
|
+
minPoolSize: number(env.MONGODB_MIN_POOL_SIZE, 5),
|
|
48
|
+
maxConnecting: number(env.MONGODB_MAX_CONNECTING, 5),
|
|
49
|
+
maxIdleTimeMS: number(env.MONGODB_MAX_IDLE_MS, 180_000),
|
|
50
|
+
family: family === 6 ? 6 : family === 0 ? 0 : 4
|
|
51
|
+
};
|
|
52
|
+
}
|
|
16
53
|
/**
|
|
17
54
|
* Connects once and throws on failure. There is deliberately no retry loop here.
|
|
18
55
|
*
|
|
@@ -45,10 +82,11 @@ const connectDB = async (serviceName, uri) => {
|
|
|
45
82
|
exports.connectDB = connectDB;
|
|
46
83
|
async function connectOnce(mongoUri, serviceName) {
|
|
47
84
|
try {
|
|
48
|
-
await mongoose_1.default.connect(mongoUri);
|
|
85
|
+
await mongoose_1.default.connect(mongoUri, poolOptions());
|
|
49
86
|
connected = true;
|
|
50
87
|
registerConnectionListeners(serviceName);
|
|
51
88
|
logger_1.default.info('MongoDB connected', { service: serviceName });
|
|
89
|
+
await logRoundTrip(serviceName);
|
|
52
90
|
}
|
|
53
91
|
catch (error) {
|
|
54
92
|
logger_1.default.error('Failed to connect to MongoDB', {
|
|
@@ -58,6 +96,26 @@ async function connectOnce(mongoUri, serviceName) {
|
|
|
58
96
|
throw error;
|
|
59
97
|
}
|
|
60
98
|
}
|
|
99
|
+
/**
|
|
100
|
+
* How long one round trip to the database takes from here, once, at start.
|
|
101
|
+
*
|
|
102
|
+
* Every query is at least one of these, and a request makes several, so it is the
|
|
103
|
+
* number that explains whether a slow request was slow because of the database's
|
|
104
|
+
* distance or because of something else. Best effort: it never fails a start.
|
|
105
|
+
*/
|
|
106
|
+
async function logRoundTrip(serviceName) {
|
|
107
|
+
try {
|
|
108
|
+
const db = mongoose_1.default.connection.db;
|
|
109
|
+
if (!db)
|
|
110
|
+
return;
|
|
111
|
+
const started = performance.now();
|
|
112
|
+
await db.admin().ping();
|
|
113
|
+
logger_1.default.info('MongoDB round trip', { service: serviceName, ms: Math.round(performance.now() - started) });
|
|
114
|
+
}
|
|
115
|
+
catch {
|
|
116
|
+
// A start is not worth failing for a measurement.
|
|
117
|
+
}
|
|
118
|
+
}
|
|
61
119
|
/**
|
|
62
120
|
* Mongoose reconnects on its own once an initial connection has succeeded, so
|
|
63
121
|
* these only report state — but without them a drop is silent and the only
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../src/database/connection.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../src/database/connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tracing/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,MAAM,EACN,IAAI,EACJ,OAAO,EACP,UAAU,EACV,cAAc,EACf,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tracing/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,MAAM,EACN,IAAI,EACJ,OAAO,EACP,UAAU,EACV,cAAc,EACf,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAiB1D,eAAO,MAAM,UAAU,GAAI,aAAa,MAAM,KAAG,MAchD,CAAC;AAKF,eAAO,MAAM,SAAS,QAAO,MAK5B,CAAC;AAGF,eAAO,MAAM,SAAS,GAAI,eAAe,MAAM,EAAE,SAAS,IAAI,GAAG,OAAO,SASvE,CAAC;AAGF,eAAO,MAAM,iBAAiB,GAAI,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,SAmBhF,CAAC;AAGF,eAAO,MAAM,eAAe,GAAI,eAAe,MAAM,EAAE,QAAQ,IAAI,GAAG,OAAO,SAE5E,CAAC;AAGF,eAAO,MAAM,SAAS,GAAI,MAAM,IAAI,EAAE,OAAO,MAAM,EAAE,OAAO,UAAU,SAErE,CAAC;AAGF,eAAO,MAAM,UAAU,GAAI,MAAM,IAAI,EAAE,KAAK,MAAM,EAAE,OAAO,cAAc,SAExE,CAAC;AAGF,eAAO,MAAM,aAAa,GAAI,MAAM,IAAI;;CAIvC,CAAC;AAGF,eAAO,MAAM,kBAAkB,GAC7B,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC,KACrD,OAEF,CAAC"}
|
package/dist/tracing/index.js
CHANGED
|
@@ -7,18 +7,25 @@ const exporter_trace_otlp_http_1 = require("@opentelemetry/exporter-trace-otlp-h
|
|
|
7
7
|
const resources_1 = require("@opentelemetry/resources");
|
|
8
8
|
const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
|
|
9
9
|
// Initialize OpenTelemetry tracer provider, exporting via OTLP/HTTP.
|
|
10
|
-
// Endpoint resolution: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT > JAEGER_ENDPOINT
|
|
10
|
+
// Endpoint resolution: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT > JAEGER_ENDPOINT.
|
|
11
|
+
//
|
|
12
|
+
// With neither set there is no exporter at all. This used to fall back to an
|
|
13
|
+
// in-cluster `jaeger-collector` host, which is only a good default where one is
|
|
14
|
+
// running. Where it is not, every service tried to send its spans to a name that
|
|
15
|
+
// does not exist every few seconds, resolving it again each time. A failed
|
|
16
|
+
// lookup holds one of Node's few shared worker threads (the same ones that
|
|
17
|
+
// resolve every other hostname the service calls) until the resolver gives up.
|
|
18
|
+
// Spans are still created and passed along in a trace context; they simply have
|
|
19
|
+
// nowhere to be sent until an endpoint is named.
|
|
11
20
|
const initTracer = (serviceName) => {
|
|
12
|
-
const url = process.env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT ||
|
|
13
|
-
process.env.JAEGER_ENDPOINT ||
|
|
14
|
-
'http://jaeger-collector:4318/v1/traces';
|
|
21
|
+
const url = process.env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT || process.env.JAEGER_ENDPOINT;
|
|
15
22
|
const provider = new sdk_trace_node_1.NodeTracerProvider({
|
|
16
23
|
resource: (0, resources_1.resourceFromAttributes)({
|
|
17
24
|
[semantic_conventions_1.ATTR_SERVICE_NAME]: serviceName,
|
|
18
25
|
[semantic_conventions_1.ATTR_SERVICE_VERSION]: process.env.npm_package_version || '1.0.0',
|
|
19
26
|
'deployment.environment': process.env.NODE_ENV || 'development',
|
|
20
27
|
}),
|
|
21
|
-
spanProcessors: [new sdk_trace_node_1.BatchSpanProcessor(new exporter_trace_otlp_http_1.OTLPTraceExporter({ url }))],
|
|
28
|
+
spanProcessors: url ? [new sdk_trace_node_1.BatchSpanProcessor(new exporter_trace_otlp_http_1.OTLPTraceExporter({ url }))] : [],
|
|
22
29
|
});
|
|
23
30
|
provider.register();
|
|
24
31
|
return provider.getTracer(serviceName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tracing/index.ts"],"names":[],"mappings":";;;AAAA,4CAU4B;AAE5B,kEAAuF;AACvF,sFAA4E;AAC5E,wDAAkE;AAClE,8EAA8F;AAE9F,qEAAqE;AACrE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tracing/index.ts"],"names":[],"mappings":"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"}
|