@common-stack/server-stack 7.0.4-alpha.6 → 7.0.4-alpha.9
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/lib/interfaces/graphql-request-context.d.ts +14 -0
- package/lib/interfaces/index.d.ts +1 -0
- package/lib/plugins/invalidateCachePlugin.cjs +13 -3
- package/lib/plugins/invalidateCachePlugin.cjs.map +1 -1
- package/lib/plugins/invalidateCachePlugin.mjs +13 -3
- package/lib/plugins/invalidateCachePlugin.mjs.map +1 -1
- package/lib/servers/GraphqlServer.cjs +18 -3
- package/lib/servers/GraphqlServer.cjs.map +1 -1
- package/lib/servers/GraphqlServer.mjs +19 -4
- package/lib/servers/GraphqlServer.mjs.map +1 -1
- package/lib/utils/index.d.ts +1 -0
- package/package.json +4 -4
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
'use strict';var envConfig=require('../config/env-config.cjs');const invalidateCachePlugin = ({ cache: redisClient, invalidateCacheKeyGenerator, }) => ({
|
|
1
|
+
'use strict';var envConfig=require('../config/env-config.cjs'),serverCore=require('@common-stack/server-core');const invalidateCachePlugin = ({ cache: redisClient, invalidateCacheKeyGenerator, }) => ({
|
|
2
2
|
requestDidStart(requestContext) {
|
|
3
3
|
return {
|
|
4
4
|
willSendResponse: async (responseContext) => {
|
|
@@ -8,7 +8,8 @@
|
|
|
8
8
|
}
|
|
9
9
|
try {
|
|
10
10
|
const hasErrors = !!requestContext.errors?.length;
|
|
11
|
-
const { queriesToInvalidate } = requestContext.contextValue;
|
|
11
|
+
const { queriesToInvalidate, user, req } = requestContext.contextValue;
|
|
12
|
+
const tenantId = serverCore.extractTenantId(req?.currentPageUriSegments?.authority);
|
|
12
13
|
const [{ operation }] = responseContext.document.definitions;
|
|
13
14
|
const isMutation = operation === 'mutation';
|
|
14
15
|
if (hasErrors || !queriesToInvalidate?.length || !isMutation) {
|
|
@@ -16,13 +17,22 @@
|
|
|
16
17
|
}
|
|
17
18
|
// this to get the
|
|
18
19
|
const nestedKeys = await Promise.all(queriesToInvalidate.map(async (query) => {
|
|
19
|
-
|
|
20
|
+
const prefix = `${tenantId ? `${tenantId}:` : ''}${user?.sub ? `${user.sub}:` : ''}`;
|
|
21
|
+
let defaultKey = `${envConfig.config.APP_NAME}:${prefix}${query}:*`;
|
|
22
|
+
const defaultTenantKey = tenantId ? `${envConfig.config.APP_NAME}:${tenantId}:${query}:*` : null;
|
|
23
|
+
const defaultPrivateKey = user.sub ? `${envConfig.config.APP_NAME}:${prefix}${query}:*` : null;
|
|
20
24
|
if (typeof invalidateCacheKeyGenerator === 'function') {
|
|
21
25
|
const generatedKey = invalidateCacheKeyGenerator(requestContext, responseContext, defaultKey);
|
|
22
26
|
if (generatedKey) {
|
|
23
27
|
defaultKey = generatedKey;
|
|
24
28
|
}
|
|
25
29
|
}
|
|
30
|
+
const privateKeys = await redisClient.keys(defaultPrivateKey);
|
|
31
|
+
if (privateKeys.length)
|
|
32
|
+
return privateKeys;
|
|
33
|
+
const tenantKeys = await redisClient.keys(defaultTenantKey);
|
|
34
|
+
if (tenantKeys.length)
|
|
35
|
+
return tenantKeys;
|
|
26
36
|
return redisClient.keys(defaultKey);
|
|
27
37
|
}));
|
|
28
38
|
const keys = nestedKeys.flat();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invalidateCachePlugin.cjs","sources":["../../src/plugins/invalidateCachePlugin.ts"],"sourcesContent":[null],"names":["config"],"mappings":"+
|
|
1
|
+
{"version":3,"file":"invalidateCachePlugin.cjs","sources":["../../src/plugins/invalidateCachePlugin.ts"],"sourcesContent":[null],"names":["extractTenantId","config"],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {config}from'../config/env-config.mjs';const invalidateCachePlugin = ({ cache: redisClient, invalidateCacheKeyGenerator, }) => ({
|
|
1
|
+
import {config}from'../config/env-config.mjs';import {extractTenantId}from'@common-stack/server-core';const invalidateCachePlugin = ({ cache: redisClient, invalidateCacheKeyGenerator, }) => ({
|
|
2
2
|
requestDidStart(requestContext) {
|
|
3
3
|
return {
|
|
4
4
|
willSendResponse: async (responseContext) => {
|
|
@@ -8,7 +8,8 @@ import {config}from'../config/env-config.mjs';const invalidateCachePlugin = ({ c
|
|
|
8
8
|
}
|
|
9
9
|
try {
|
|
10
10
|
const hasErrors = !!requestContext.errors?.length;
|
|
11
|
-
const { queriesToInvalidate } = requestContext.contextValue;
|
|
11
|
+
const { queriesToInvalidate, user, req } = requestContext.contextValue;
|
|
12
|
+
const tenantId = extractTenantId(req?.currentPageUriSegments?.authority);
|
|
12
13
|
const [{ operation }] = responseContext.document.definitions;
|
|
13
14
|
const isMutation = operation === 'mutation';
|
|
14
15
|
if (hasErrors || !queriesToInvalidate?.length || !isMutation) {
|
|
@@ -16,13 +17,22 @@ import {config}from'../config/env-config.mjs';const invalidateCachePlugin = ({ c
|
|
|
16
17
|
}
|
|
17
18
|
// this to get the
|
|
18
19
|
const nestedKeys = await Promise.all(queriesToInvalidate.map(async (query) => {
|
|
19
|
-
|
|
20
|
+
const prefix = `${tenantId ? `${tenantId}:` : ''}${user?.sub ? `${user.sub}:` : ''}`;
|
|
21
|
+
let defaultKey = `${config.APP_NAME}:${prefix}${query}:*`;
|
|
22
|
+
const defaultTenantKey = tenantId ? `${config.APP_NAME}:${tenantId}:${query}:*` : null;
|
|
23
|
+
const defaultPrivateKey = user.sub ? `${config.APP_NAME}:${prefix}${query}:*` : null;
|
|
20
24
|
if (typeof invalidateCacheKeyGenerator === 'function') {
|
|
21
25
|
const generatedKey = invalidateCacheKeyGenerator(requestContext, responseContext, defaultKey);
|
|
22
26
|
if (generatedKey) {
|
|
23
27
|
defaultKey = generatedKey;
|
|
24
28
|
}
|
|
25
29
|
}
|
|
30
|
+
const privateKeys = await redisClient.keys(defaultPrivateKey);
|
|
31
|
+
if (privateKeys.length)
|
|
32
|
+
return privateKeys;
|
|
33
|
+
const tenantKeys = await redisClient.keys(defaultTenantKey);
|
|
34
|
+
if (tenantKeys.length)
|
|
35
|
+
return tenantKeys;
|
|
26
36
|
return redisClient.keys(defaultKey);
|
|
27
37
|
}));
|
|
28
38
|
const keys = nestedKeys.flat();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invalidateCachePlugin.mjs","sources":["../../src/plugins/invalidateCachePlugin.ts"],"sourcesContent":[null],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"invalidateCachePlugin.mjs","sources":["../../src/plugins/invalidateCachePlugin.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
@@ -121,7 +121,7 @@ class GraphqlServer {
|
|
|
121
121
|
cacheAdapter.get = (key) => cacheGet(key.replaceAll('fqc:', ''));
|
|
122
122
|
const cacheSet = cacheAdapter.set.bind(cacheAdapter);
|
|
123
123
|
cacheAdapter.set = (key, value, opts) => cacheSet(key.replaceAll('fqc:', ''), value, opts);
|
|
124
|
-
const { cacheKeyGenerator, invalidateCacheKeyGenerator } = this;
|
|
124
|
+
const { cacheKeyGenerator, invalidateCacheKeyGenerator, logger } = this;
|
|
125
125
|
const serverConfig = {
|
|
126
126
|
schema: this.moduleService.schema,
|
|
127
127
|
allowBatchedHttpRequests: true,
|
|
@@ -132,9 +132,24 @@ class GraphqlServer {
|
|
|
132
132
|
responseCachePlugin({
|
|
133
133
|
sessionId: ({ contextValue }) => Promise.resolve(contextValue?.user?.sub ?? null),
|
|
134
134
|
generateCacheKey(requestContext) {
|
|
135
|
-
const { request } = requestContext;
|
|
135
|
+
const { request, contextValue, document, schema } = requestContext;
|
|
136
|
+
const { user, req } = contextValue;
|
|
136
137
|
const { query, variables } = request;
|
|
137
|
-
const
|
|
138
|
+
const cacheControlDirective = serverCore.getDirectiveArgsFromSchema({
|
|
139
|
+
schema,
|
|
140
|
+
document,
|
|
141
|
+
directiveName: serverCore.CACHE_CONTROL_DIRECTIVE,
|
|
142
|
+
});
|
|
143
|
+
const { scope } = cacheControlDirective ?? {};
|
|
144
|
+
const isPrivate = scope?.toLowerCase() === 'private';
|
|
145
|
+
const tenantId = serverCore.extractTenantId(req?.currentPageUriSegments?.authority);
|
|
146
|
+
const cacheKey = serverCore.generateQueryCacheKey({
|
|
147
|
+
query,
|
|
148
|
+
variables,
|
|
149
|
+
logger,
|
|
150
|
+
userId: isPrivate ? user.sub : null,
|
|
151
|
+
tenantId,
|
|
152
|
+
});
|
|
138
153
|
try {
|
|
139
154
|
if (typeof cacheKeyGenerator === 'function') {
|
|
140
155
|
const generatedKey = cacheKeyGenerator(requestContext, cacheKey);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GraphqlServer.cjs","sources":["../../src/servers/GraphqlServer.ts"],"sourcesContent":[null],"names":["WebSocketServer","config","GraphqlWs","expressMiddleware","KeyvAdapter","ApolloServerPluginDrainHttpServer","ApolloServerPluginCacheControl","generateQueryCacheKey","isEmpty","invalidateCachePlugin","ApolloServer"],"mappings":"
|
|
1
|
+
{"version":3,"file":"GraphqlServer.cjs","sources":["../../src/servers/GraphqlServer.ts"],"sourcesContent":[null],"names":["WebSocketServer","config","GraphqlWs","expressMiddleware","KeyvAdapter","ApolloServerPluginDrainHttpServer","ApolloServerPluginCacheControl","getDirectiveArgsFromSchema","CACHE_CONTROL_DIRECTIVE","extractTenantId","generateQueryCacheKey","isEmpty","invalidateCachePlugin","ApolloServer"],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {ApolloServer}from'@apollo/server';import {expressMiddleware}from'@apollo/server/express4';import {ApolloServerPluginCacheControl}from'@apollo/server/plugin/cacheControl';import {ApolloServerPluginDrainHttpServer}from'@apollo/server/plugin/drainHttpServer';import cachePlugin from'@apollo/server-plugin-response-cache';import'isomorphic-fetch';import express from'express';import cors from'cors';import Keyv from'keyv';import KeyvRedis from'@keyv/redis';import {KeyvAdapter}from'@apollo/utils.keyvadapter';import {WebSocketServer}from'ws';import {isEmpty}from'lodash-es';import {generateQueryCacheKey}from'@common-stack/server-core';import {invalidateCachePlugin}from'../plugins/invalidateCachePlugin.mjs';import {GraphqlWs}from'./GraphqlWs.mjs';import {config}from'../config/env-config.mjs';const responseCachePlugin = cachePlugin.default ?? cachePlugin;
|
|
1
|
+
import {ApolloServer}from'@apollo/server';import {expressMiddleware}from'@apollo/server/express4';import {ApolloServerPluginCacheControl}from'@apollo/server/plugin/cacheControl';import {ApolloServerPluginDrainHttpServer}from'@apollo/server/plugin/drainHttpServer';import cachePlugin from'@apollo/server-plugin-response-cache';import'isomorphic-fetch';import express from'express';import cors from'cors';import Keyv from'keyv';import KeyvRedis from'@keyv/redis';import {KeyvAdapter}from'@apollo/utils.keyvadapter';import {WebSocketServer}from'ws';import {isEmpty}from'lodash-es';import {getDirectiveArgsFromSchema,CACHE_CONTROL_DIRECTIVE,extractTenantId,generateQueryCacheKey}from'@common-stack/server-core';import {invalidateCachePlugin}from'../plugins/invalidateCachePlugin.mjs';import {GraphqlWs}from'./GraphqlWs.mjs';import {config}from'../config/env-config.mjs';const responseCachePlugin = cachePlugin.default ?? cachePlugin;
|
|
2
2
|
if ((process.env.LOG_LEVEL && process.env.LOG_LEVEL === 'trace') || process.env.LOG_LEVEL === 'debug') ;
|
|
3
3
|
// @workaround as the `dataSources` not available in Subscription (websocket) Context.
|
|
4
4
|
// https://github.com/apollographql/apollo-server/issues/1526 need to revisit in Apollo-Server v3.
|
|
@@ -121,7 +121,7 @@ class GraphqlServer {
|
|
|
121
121
|
cacheAdapter.get = (key) => cacheGet(key.replaceAll('fqc:', ''));
|
|
122
122
|
const cacheSet = cacheAdapter.set.bind(cacheAdapter);
|
|
123
123
|
cacheAdapter.set = (key, value, opts) => cacheSet(key.replaceAll('fqc:', ''), value, opts);
|
|
124
|
-
const { cacheKeyGenerator, invalidateCacheKeyGenerator } = this;
|
|
124
|
+
const { cacheKeyGenerator, invalidateCacheKeyGenerator, logger } = this;
|
|
125
125
|
const serverConfig = {
|
|
126
126
|
schema: this.moduleService.schema,
|
|
127
127
|
allowBatchedHttpRequests: true,
|
|
@@ -132,9 +132,24 @@ class GraphqlServer {
|
|
|
132
132
|
responseCachePlugin({
|
|
133
133
|
sessionId: ({ contextValue }) => Promise.resolve(contextValue?.user?.sub ?? null),
|
|
134
134
|
generateCacheKey(requestContext) {
|
|
135
|
-
const { request } = requestContext;
|
|
135
|
+
const { request, contextValue, document, schema } = requestContext;
|
|
136
|
+
const { user, req } = contextValue;
|
|
136
137
|
const { query, variables } = request;
|
|
137
|
-
const
|
|
138
|
+
const cacheControlDirective = getDirectiveArgsFromSchema({
|
|
139
|
+
schema,
|
|
140
|
+
document,
|
|
141
|
+
directiveName: CACHE_CONTROL_DIRECTIVE,
|
|
142
|
+
});
|
|
143
|
+
const { scope } = cacheControlDirective ?? {};
|
|
144
|
+
const isPrivate = scope?.toLowerCase() === 'private';
|
|
145
|
+
const tenantId = extractTenantId(req?.currentPageUriSegments?.authority);
|
|
146
|
+
const cacheKey = generateQueryCacheKey({
|
|
147
|
+
query,
|
|
148
|
+
variables,
|
|
149
|
+
logger,
|
|
150
|
+
userId: isPrivate ? user.sub : null,
|
|
151
|
+
tenantId,
|
|
152
|
+
});
|
|
138
153
|
try {
|
|
139
154
|
if (typeof cacheKeyGenerator === 'function') {
|
|
140
155
|
const generatedKey = cacheKeyGenerator(requestContext, cacheKey);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GraphqlServer.mjs","sources":["../../src/servers/GraphqlServer.ts"],"sourcesContent":[null],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"GraphqlServer.mjs","sources":["../../src/servers/GraphqlServer.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from './migrations';
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@common-stack/server-stack",
|
|
3
|
-
"version": "7.0.4-alpha.
|
|
3
|
+
"version": "7.0.4-alpha.9",
|
|
4
4
|
"description": "common core for higher packages to depend on",
|
|
5
5
|
"license": "ISC",
|
|
6
6
|
"author": "CDMBase LLC",
|
|
@@ -31,10 +31,10 @@
|
|
|
31
31
|
"@cdm-logger/client": "^9.0.3",
|
|
32
32
|
"@cdm-logger/server": "^9.0.3",
|
|
33
33
|
"@cdmbase/graphql-type-uri": "^4.0.0",
|
|
34
|
-
"@common-stack/cache-api-server": "7.0.4-alpha.
|
|
34
|
+
"@common-stack/cache-api-server": "7.0.4-alpha.9",
|
|
35
35
|
"@common-stack/client-core": "7.0.4-alpha.6",
|
|
36
36
|
"@common-stack/core": "7.0.4-alpha.6",
|
|
37
|
-
"@common-stack/server-core": "7.0.4-alpha.
|
|
37
|
+
"@common-stack/server-core": "7.0.4-alpha.9",
|
|
38
38
|
"@common-stack/store-mongo": "7.0.4-alpha.6",
|
|
39
39
|
"@graphql-tools/links": "~9.0.1",
|
|
40
40
|
"@graphql-tools/schema": "~10.0.6",
|
|
@@ -88,7 +88,7 @@
|
|
|
88
88
|
"publishConfig": {
|
|
89
89
|
"access": "public"
|
|
90
90
|
},
|
|
91
|
-
"gitHead": "
|
|
91
|
+
"gitHead": "84a0d19ce739995bb9b7073086c89768b0bccc56",
|
|
92
92
|
"typescript": {
|
|
93
93
|
"definition": "lib/index.d.ts"
|
|
94
94
|
}
|