@quillsql/node 0.9.18 → 0.9.20
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/cjs/db/CachedConnection.d.ts +5 -1
- package/dist/cjs/db/CachedConnection.js +55 -20
- package/dist/cjs/db/CachedConnection.js.map +1 -1
- package/dist/cjs/index.d.ts +3 -17
- package/dist/cjs/index.js +136 -188
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/models/Cache.d.ts +14 -4
- package/dist/esm/db/CachedConnection.d.ts +5 -1
- package/dist/esm/db/CachedConnection.js +55 -20
- package/dist/esm/db/CachedConnection.js.map +1 -1
- package/dist/esm/index.d.ts +3 -17
- package/dist/esm/index.js +136 -188
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/models/Cache.d.ts +14 -4
- package/package.json +1 -1
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { Mappable, CacheCredentials } from "../models/Cache";
|
|
2
2
|
import { DatabaseConnection, DatabaseConnectionConfig, DatabaseConnectionType } from "./DatabaseHelper";
|
|
3
3
|
export declare class CachedConnection {
|
|
4
|
+
private static sharedRedisClients;
|
|
4
5
|
databaseType: DatabaseConnectionType;
|
|
5
6
|
readonly pool: DatabaseConnection;
|
|
7
|
+
tenantIds: (string | number)[] | null;
|
|
6
8
|
ttl: number;
|
|
7
9
|
cache: Mappable | null;
|
|
8
|
-
isCacheJobRunning: boolean;
|
|
9
10
|
private _isClosed;
|
|
10
11
|
get isClosed(): boolean;
|
|
11
12
|
/** Private constructor; use CachedConnection.create(...) */
|
|
@@ -13,6 +14,9 @@ export declare class CachedConnection {
|
|
|
13
14
|
/** Async factory initializer */
|
|
14
15
|
static create(databaseType: DatabaseConnectionType, config: DatabaseConnectionConfig, cacheConfig?: Partial<CacheCredentials>): Promise<CachedConnection>;
|
|
15
16
|
query(text: string, overwriteCache?: boolean): Promise<any>;
|
|
17
|
+
getCachedValue(key: string): Promise<string | null>;
|
|
18
|
+
setCachedValue(key: string, value: string): Promise<void>;
|
|
19
|
+
deleteCachedValue(key: string): Promise<void>;
|
|
16
20
|
/**
|
|
17
21
|
* Configures and returns a cache instance or null if none could be created.
|
|
18
22
|
*/
|
|
@@ -22,7 +22,7 @@ class CachedConnection {
|
|
|
22
22
|
/** Private constructor; use CachedConnection.create(...) */
|
|
23
23
|
constructor(databaseType, config, cacheConfig = {}) {
|
|
24
24
|
var _a;
|
|
25
|
-
this.
|
|
25
|
+
this.tenantIds = null;
|
|
26
26
|
this._isClosed = false;
|
|
27
27
|
this.databaseType = databaseType;
|
|
28
28
|
this.pool = (0, DatabaseHelper_1.connectToDatabase)(databaseType, config);
|
|
@@ -46,27 +46,27 @@ class CachedConnection {
|
|
|
46
46
|
if (!this.cache) {
|
|
47
47
|
return yield (0, DatabaseHelper_1.runQueryByDatabase)(this.databaseType, this.pool, text);
|
|
48
48
|
}
|
|
49
|
-
// `text` must be a tenant-scoped SQL query.
|
|
50
|
-
// Since runQueryByDatabase doesn't receive tenant information from any
|
|
51
|
-
// of its other parameters
|
|
52
|
-
const key = text;
|
|
53
49
|
if (!overwriteCache) {
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
50
|
+
try {
|
|
51
|
+
const cached = yield this.cache.get(text);
|
|
52
|
+
if (cached)
|
|
53
|
+
return JSON.parse(cached);
|
|
54
|
+
}
|
|
55
|
+
catch (_a) {
|
|
56
|
+
// cache read fail. corrupted
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
const newResult = yield (0, DatabaseHelper_1.runQueryByDatabase)(this.databaseType, this.pool, text);
|
|
60
|
+
if (!newResult) {
|
|
61
|
+
return newResult;
|
|
57
62
|
}
|
|
58
|
-
const result = yield (0, DatabaseHelper_1.runQueryByDatabase)(this.databaseType, this.pool, text);
|
|
59
63
|
try {
|
|
60
|
-
yield this.cache.set(
|
|
64
|
+
yield this.cache.set(text, JSON.stringify(newResult));
|
|
61
65
|
}
|
|
62
66
|
catch (error) {
|
|
63
|
-
|
|
64
|
-
if (this.isCacheJobRunning) {
|
|
65
|
-
throw new Error(message);
|
|
66
|
-
}
|
|
67
|
-
console.warn(message); // This runs for general data fetching by customers
|
|
67
|
+
console.warn("Redis Cache Set Failed: ", error);
|
|
68
68
|
}
|
|
69
|
-
return
|
|
69
|
+
return newResult;
|
|
70
70
|
}
|
|
71
71
|
catch (err) {
|
|
72
72
|
if ((0, Error_1.isSuperset)(err, Error_1.PgError)) {
|
|
@@ -78,22 +78,56 @@ class CachedConnection {
|
|
|
78
78
|
}
|
|
79
79
|
});
|
|
80
80
|
}
|
|
81
|
+
getCachedValue(key) {
|
|
82
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
83
|
+
if (!this.cache || this.isClosed)
|
|
84
|
+
return null;
|
|
85
|
+
return yield this.cache.get(key);
|
|
86
|
+
});
|
|
87
|
+
}
|
|
88
|
+
setCachedValue(key, value) {
|
|
89
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
90
|
+
if (!this.cache || this.isClosed)
|
|
91
|
+
return;
|
|
92
|
+
yield this.cache.set(key, value, "EX", this.ttl);
|
|
93
|
+
});
|
|
94
|
+
}
|
|
95
|
+
deleteCachedValue(key) {
|
|
96
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
97
|
+
if (!this.cache || this.isClosed)
|
|
98
|
+
return;
|
|
99
|
+
yield this.cache.del(key);
|
|
100
|
+
});
|
|
101
|
+
}
|
|
81
102
|
/**
|
|
82
103
|
* Configures and returns a cache instance or null if none could be created.
|
|
83
104
|
*/
|
|
84
105
|
getCache(_a) {
|
|
85
106
|
return __awaiter(this, arguments, void 0, function* ({ username, password, host, port, cacheType, }) {
|
|
86
107
|
if (cacheType === "redis" || cacheType === "rediss") {
|
|
108
|
+
const sharedKey = JSON.stringify({
|
|
109
|
+
cacheType,
|
|
110
|
+
username: username || "",
|
|
111
|
+
password: password || "",
|
|
112
|
+
host: host || "",
|
|
113
|
+
port: port || "",
|
|
114
|
+
});
|
|
115
|
+
const existingClient = CachedConnection.sharedRedisClients.get(sharedKey);
|
|
116
|
+
if (existingClient) {
|
|
117
|
+
return existingClient;
|
|
118
|
+
}
|
|
87
119
|
const client = (0, redis_1.createClient)({
|
|
88
|
-
username: username ||
|
|
89
|
-
password: password ||
|
|
120
|
+
username: username || "",
|
|
121
|
+
password: password || "",
|
|
90
122
|
socket: {
|
|
91
|
-
host: host ||
|
|
92
|
-
port: port ? parseInt(port) : 0
|
|
123
|
+
host: host || "",
|
|
124
|
+
port: port ? parseInt(port) : 0,
|
|
93
125
|
},
|
|
94
126
|
});
|
|
95
127
|
client.on("error", (err) => console.log("Redis Client Error", err));
|
|
96
128
|
yield client.connect();
|
|
129
|
+
console.log("Redis connected to host:", host);
|
|
130
|
+
CachedConnection.sharedRedisClients.set(sharedKey, client);
|
|
97
131
|
return client;
|
|
98
132
|
}
|
|
99
133
|
return null;
|
|
@@ -110,4 +144,5 @@ class CachedConnection {
|
|
|
110
144
|
}
|
|
111
145
|
}
|
|
112
146
|
exports.CachedConnection = CachedConnection;
|
|
147
|
+
CachedConnection.sharedRedisClients = new Map();
|
|
113
148
|
//# sourceMappingURL=CachedConnection.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CachedConnection.js","sourceRoot":"","sources":["../../../src/db/CachedConnection.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,iCAAqC;AACrC,0CAAqD;AACrD,qDAO0B;AAE1B,mDAAmD;AACnD,MAAM,iBAAiB,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;AAEvC,MAAa,gBAAgB;
|
|
1
|
+
{"version":3,"file":"CachedConnection.js","sourceRoot":"","sources":["../../../src/db/CachedConnection.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/index.d.ts
CHANGED
|
@@ -19,21 +19,6 @@ export interface QuillQueryResult {
|
|
|
19
19
|
fields: any[];
|
|
20
20
|
};
|
|
21
21
|
}
|
|
22
|
-
export type QuillCacheResult = {
|
|
23
|
-
status: "failed";
|
|
24
|
-
error: string;
|
|
25
|
-
} | {
|
|
26
|
-
status: "complete";
|
|
27
|
-
cachedDashboards: string[];
|
|
28
|
-
failedDashboards: string[];
|
|
29
|
-
};
|
|
30
|
-
export interface QuillCacheParams {
|
|
31
|
-
tenants: QuillQueryParams["tenants"];
|
|
32
|
-
dashboards?: string[];
|
|
33
|
-
signal?: AbortSignal;
|
|
34
|
-
parallelQueries?: number;
|
|
35
|
-
maxRowsPerReport?: number;
|
|
36
|
-
}
|
|
37
22
|
export type QuillStreamEvent = {
|
|
38
23
|
type: "start";
|
|
39
24
|
} | {
|
|
@@ -89,7 +74,6 @@ export declare class Quill implements AsyncDisposable {
|
|
|
89
74
|
private baseUrl;
|
|
90
75
|
private config;
|
|
91
76
|
private initPromise;
|
|
92
|
-
private lock;
|
|
93
77
|
constructor(data: {
|
|
94
78
|
privateKey: string;
|
|
95
79
|
databaseType: "snowflake";
|
|
@@ -123,7 +107,9 @@ export declare class Quill implements AsyncDisposable {
|
|
|
123
107
|
metadataServerURL?: string;
|
|
124
108
|
});
|
|
125
109
|
private ensureReady;
|
|
126
|
-
|
|
110
|
+
private getTenantMappedFlagsCacheKey;
|
|
111
|
+
private getTenantMappedFlagsFromCache;
|
|
112
|
+
private setTenantMappedFlagsCache;
|
|
127
113
|
query({ tenants, flags, metadata, filters, adminEnabled, }: QuillQueryParams): Promise<QuillQueryResult>;
|
|
128
114
|
stream({ tenants, flags, metadata, filters, adminEnabled, signal, }: QuillStreamOptions): Promise<AsyncIterable<QuillStreamEvent>>;
|
|
129
115
|
private applyLimit;
|