@carbonorm/carbonnode 6.0.18 → 6.0.19
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/index.cjs.js +21 -6
- package/dist/index.cjs.js.map +1 -1
- package/dist/index.esm.js +21 -6
- package/dist/index.esm.js.map +1 -1
- package/dist/utils/cacheManager.d.ts +1 -1
- package/dist/utils/logSql.d.ts +1 -1
- package/package.json +1 -1
- package/src/__tests__/cacheManager.test.ts +27 -1
- package/src/__tests__/logSql.test.ts +16 -0
- package/src/__tests__/sakila-db/C6.js +1 -1
- package/src/__tests__/sakila-db/C6.mysqldump.json +1 -1
- package/src/__tests__/sakila-db/C6.mysqldump.sql +1 -1
- package/src/__tests__/sakila-db/C6.ts +1 -1
- package/src/__tests__/sakila-db/sqlResponses/C6.actor.post.json +3 -3
- package/src/__tests__/sakila-db/sqlResponses/C6.actor.post.latest.json +3 -3
- package/src/__tests__/sakila-db/sqlResponses/C6.actor.put.json +1 -1
- package/src/__tests__/sakila-db/sqlResponses/C6.actor.put.lookup.json +3 -3
- package/src/__tests__/sakila-db/sqlResponses/C6.address.post.json +5 -5
- package/src/__tests__/sakila-db/sqlResponses/C6.address.post.latest.json +5 -5
- package/src/__tests__/sakila-db/sqlResponses/C6.address.put.json +1 -1
- package/src/__tests__/sakila-db/sqlResponses/C6.address.put.lookup.json +5 -5
- package/src/__tests__/sakila-db/sqlResponses/C6.category.post.json +2 -2
- package/src/__tests__/sakila-db/sqlResponses/C6.category.post.latest.json +2 -2
- package/src/__tests__/sakila-db/sqlResponses/C6.category.put.json +1 -1
- package/src/__tests__/sakila-db/sqlResponses/C6.category.put.lookup.json +2 -2
- package/src/__tests__/sakila-db/sqlResponses/C6.city.post.json +2 -2
- package/src/__tests__/sakila-db/sqlResponses/C6.city.post.latest.json +2 -2
- package/src/__tests__/sakila-db/sqlResponses/C6.city.put.json +1 -1
- package/src/__tests__/sakila-db/sqlResponses/C6.city.put.lookup.json +2 -2
- package/src/__tests__/sakila-db/sqlResponses/C6.country.post.json +2 -2
- package/src/__tests__/sakila-db/sqlResponses/C6.country.post.latest.json +2 -2
- package/src/__tests__/sakila-db/sqlResponses/C6.country.put.json +1 -1
- package/src/__tests__/sakila-db/sqlResponses/C6.country.put.lookup.json +2 -2
- package/src/__tests__/sakila-db/sqlResponses/C6.customer.post.json +5 -5
- package/src/__tests__/sakila-db/sqlResponses/C6.customer.post.latest.json +5 -5
- package/src/__tests__/sakila-db/sqlResponses/C6.customer.put.json +1 -1
- package/src/__tests__/sakila-db/sqlResponses/C6.customer.put.lookup.json +5 -5
- package/src/__tests__/sakila-db/sqlResponses/C6.film.post.json +2 -2
- package/src/__tests__/sakila-db/sqlResponses/C6.film.post.latest.json +2 -2
- package/src/__tests__/sakila-db/sqlResponses/C6.film.put.json +1 -1
- package/src/__tests__/sakila-db/sqlResponses/C6.film.put.lookup.json +2 -2
- package/src/__tests__/sakila-db/sqlResponses/C6.inventory.post.json +1 -1
- package/src/__tests__/sakila-db/sqlResponses/C6.inventory.post.latest.json +1 -1
- package/src/__tests__/sakila-db/sqlResponses/C6.inventory.put.json +1 -1
- package/src/__tests__/sakila-db/sqlResponses/C6.inventory.put.lookup.json +1 -1
- package/src/__tests__/sakila-db/sqlResponses/C6.language.post.json +2 -2
- package/src/__tests__/sakila-db/sqlResponses/C6.language.post.latest.json +2 -2
- package/src/__tests__/sakila-db/sqlResponses/C6.language.put.json +1 -1
- package/src/__tests__/sakila-db/sqlResponses/C6.language.put.lookup.json +2 -2
- package/src/__tests__/sakila-db/sqlResponses/C6.payment.post.json +2 -2
- package/src/__tests__/sakila-db/sqlResponses/C6.payment.post.latest.json +2 -2
- package/src/__tests__/sakila-db/sqlResponses/C6.payment.put.lookup.json +2 -2
- package/src/__tests__/sakila-db/sqlResponses/C6.rental.post.json +3 -3
- package/src/__tests__/sakila-db/sqlResponses/C6.rental.post.latest.json +3 -3
- package/src/__tests__/sakila-db/sqlResponses/C6.rental.put.json +1 -1
- package/src/__tests__/sakila-db/sqlResponses/C6.rental.put.lookup.json +3 -3
- package/src/executors/HttpExecutor.ts +1 -1
- package/src/executors/SqlExecutor.ts +1 -1
- package/src/utils/cacheManager.ts +17 -2
- package/src/utils/logSql.ts +3 -1
|
@@ -67,7 +67,6 @@ export function checkCache<ResponseDataType = any>(
|
|
|
67
67
|
const cached = apiRequestCache.get(key);
|
|
68
68
|
|
|
69
69
|
if (!cached) {
|
|
70
|
-
console.log('apiRequestCache.size', apiRequestCache.size)
|
|
71
70
|
return false;
|
|
72
71
|
}
|
|
73
72
|
|
|
@@ -103,7 +102,23 @@ export function evictCacheEntry(
|
|
|
103
102
|
method: string,
|
|
104
103
|
tableName: string | string[],
|
|
105
104
|
requestData: any,
|
|
105
|
+
logContext?: LogContext,
|
|
106
106
|
): boolean {
|
|
107
107
|
const key = makeCacheKey(method, tableName, requestData);
|
|
108
|
-
|
|
108
|
+
const cached = apiRequestCache.get(key);
|
|
109
|
+
const deleted = apiRequestCache.delete(key);
|
|
110
|
+
|
|
111
|
+
if (deleted && shouldLog(LogLevel.INFO, logContext)) {
|
|
112
|
+
const sql = cached?.response?.data?.sql?.sql ?? "";
|
|
113
|
+
const sqlMethod = sql.trim().split(/\s+/, 1)[0]?.toUpperCase() || method;
|
|
114
|
+
logSql({
|
|
115
|
+
allowListStatus: "not verified",
|
|
116
|
+
cacheStatus: "evicted",
|
|
117
|
+
context: logContext,
|
|
118
|
+
method: sqlMethod,
|
|
119
|
+
sql,
|
|
120
|
+
});
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
return deleted;
|
|
109
124
|
}
|
package/src/utils/logSql.ts
CHANGED
|
@@ -6,7 +6,7 @@ import type { LogContext } from "./logLevel";
|
|
|
6
6
|
import { LogLevel, shouldLog } from "./logLevel";
|
|
7
7
|
|
|
8
8
|
export type SqlAllowListStatus = "allowed" | "denied" | "not verified";
|
|
9
|
-
export type SqlCacheStatus = "hit" | "miss" | "ignored";
|
|
9
|
+
export type SqlCacheStatus = "hit" | "miss" | "ignored" | "evicted";
|
|
10
10
|
|
|
11
11
|
export type LogSqlContextOptions = {
|
|
12
12
|
cacheStatus: SqlCacheStatus;
|
|
@@ -66,6 +66,8 @@ const cacheLabel = (cacheStatus: SqlCacheStatus): string => {
|
|
|
66
66
|
switch (cacheStatus) {
|
|
67
67
|
case "hit":
|
|
68
68
|
return `${C.METHOD_COLORS.SELECT}[CACHE HIT]${C.RESET}`;
|
|
69
|
+
case "evicted":
|
|
70
|
+
return `${C.WARN}[CACHE EVICTED]${C.RESET}`;
|
|
69
71
|
case "ignored":
|
|
70
72
|
return `${C.WARN}[CACHE IGNORED]${C.RESET}`;
|
|
71
73
|
default:
|