@clickhouse/client-web 1.0.1 → 1.1.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/config.js +0 -1
- package/dist/config.js.map +1 -1
- package/dist/connection/web_connection.d.ts +3 -1
- package/dist/connection/web_connection.js +35 -16
- package/dist/connection/web_connection.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +2 -2
package/dist/config.js
CHANGED
|
@@ -8,6 +8,5 @@ exports.WebImpl = {
|
|
|
8
8
|
make_connection: (_, params) => new connection_1.WebConnection(params),
|
|
9
9
|
make_result_set: ((stream, format, query_id) => new result_set_1.ResultSet(stream, format, query_id)),
|
|
10
10
|
values_encoder: new utils_1.WebValuesEncoder(),
|
|
11
|
-
close_stream: (stream) => stream.cancel(),
|
|
12
11
|
};
|
|
13
12
|
//# sourceMappingURL=config.js.map
|
package/dist/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../packages/client-web/src/config.ts"],"names":[],"mappings":";;;AAMA,6CAA4C;AAC5C,6CAAwC;AACxC,mCAA0C;AAI7B,QAAA,OAAO,GAAkD;IACpE,eAAe,EAAE,CAAC,CAAC,EAAE,MAAwB,EAAE,EAAE,CAAC,IAAI,0BAAa,CAAC,MAAM,CAAC;IAC3E,eAAe,EAAE,CAAC,CAChB,MAAsB,EACtB,MAAkB,EAClB,QAAgB,EAChB,EAAE,CAAC,IAAI,sBAAS,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAQ;IACpD,cAAc,EAAE,IAAI,wBAAgB,EAAE;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../packages/client-web/src/config.ts"],"names":[],"mappings":";;;AAMA,6CAA4C;AAC5C,6CAAwC;AACxC,mCAA0C;AAI7B,QAAA,OAAO,GAAkD;IACpE,eAAe,EAAE,CAAC,CAAC,EAAE,MAAwB,EAAE,EAAE,CAAC,IAAI,0BAAa,CAAC,MAAM,CAAC;IAC3E,eAAe,EAAE,CAAC,CAChB,MAAsB,EACtB,MAAkB,EAClB,QAAgB,EAChB,EAAE,CAAC,IAAI,sBAAS,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAQ;IACpD,cAAc,EAAE,IAAI,wBAAgB,EAAE;CACvC,CAAA"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { ConnBaseQueryParams, Connection, ConnectionParams, ConnInsertParams, ConnInsertResult, ConnPingResult, ConnQueryResult } from '@clickhouse/client-common';
|
|
1
|
+
import type { ConnBaseQueryParams, ConnCommandResult, Connection, ConnectionParams, ConnInsertParams, ConnInsertResult, ConnPingResult, ConnQueryResult } from '@clickhouse/client-common';
|
|
2
2
|
type WebInsertParams<T> = Omit<ConnInsertParams<ReadableStream<T>>, 'values'> & {
|
|
3
3
|
values: string;
|
|
4
4
|
};
|
|
@@ -9,9 +9,11 @@ export declare class WebConnection implements Connection<ReadableStream> {
|
|
|
9
9
|
constructor(params: WebConnectionParams);
|
|
10
10
|
query(params: ConnBaseQueryParams): Promise<ConnQueryResult<ReadableStream<Uint8Array>>>;
|
|
11
11
|
exec(params: ConnBaseQueryParams): Promise<ConnQueryResult<ReadableStream<Uint8Array>>>;
|
|
12
|
+
command(params: ConnBaseQueryParams): Promise<ConnCommandResult>;
|
|
12
13
|
insert<T = unknown>(params: WebInsertParams<T>): Promise<ConnInsertResult>;
|
|
13
14
|
ping(): Promise<ConnPingResult>;
|
|
14
15
|
close(): Promise<void>;
|
|
15
16
|
private request;
|
|
17
|
+
private runExec;
|
|
16
18
|
}
|
|
17
19
|
export {};
|
|
@@ -43,24 +43,19 @@ class WebConnection {
|
|
|
43
43
|
};
|
|
44
44
|
}
|
|
45
45
|
async exec(params) {
|
|
46
|
-
const
|
|
47
|
-
const searchParams = (0, client_common_1.toSearchParams)({
|
|
48
|
-
database: this.params.database,
|
|
49
|
-
clickhouse_settings: params.clickhouse_settings,
|
|
50
|
-
query_params: params.query_params,
|
|
51
|
-
session_id: params.session_id,
|
|
52
|
-
query_id,
|
|
53
|
-
});
|
|
54
|
-
const response = await this.request({
|
|
55
|
-
values: params.query,
|
|
56
|
-
params,
|
|
57
|
-
searchParams,
|
|
58
|
-
});
|
|
46
|
+
const result = await this.runExec(params);
|
|
59
47
|
return {
|
|
60
|
-
|
|
61
|
-
|
|
48
|
+
query_id: result.query_id,
|
|
49
|
+
stream: result.stream || new ReadableStream(),
|
|
62
50
|
};
|
|
63
51
|
}
|
|
52
|
+
async command(params) {
|
|
53
|
+
const { stream, query_id } = await this.runExec(params);
|
|
54
|
+
if (stream !== null) {
|
|
55
|
+
await stream.cancel();
|
|
56
|
+
}
|
|
57
|
+
return { query_id };
|
|
58
|
+
}
|
|
64
59
|
async insert(params) {
|
|
65
60
|
const query_id = getQueryId(params.query_id);
|
|
66
61
|
const searchParams = (0, client_common_1.toSearchParams)({
|
|
@@ -129,7 +124,12 @@ class WebConnection {
|
|
|
129
124
|
}
|
|
130
125
|
try {
|
|
131
126
|
const headers = (0, client_common_1.withCompressionHeaders)({
|
|
132
|
-
headers:
|
|
127
|
+
headers: params?.auth !== undefined
|
|
128
|
+
? {
|
|
129
|
+
...this.defaultHeaders,
|
|
130
|
+
Authorization: `Basic ${btoa(`${params.auth.username}:${params.auth.password}`)}`,
|
|
131
|
+
}
|
|
132
|
+
: this.defaultHeaders,
|
|
133
133
|
compress_request: false,
|
|
134
134
|
decompress_response: this.params.compression.decompress_response,
|
|
135
135
|
});
|
|
@@ -164,6 +164,25 @@ class WebConnection {
|
|
|
164
164
|
throw err;
|
|
165
165
|
}
|
|
166
166
|
}
|
|
167
|
+
async runExec(params) {
|
|
168
|
+
const query_id = getQueryId(params.query_id);
|
|
169
|
+
const searchParams = (0, client_common_1.toSearchParams)({
|
|
170
|
+
database: this.params.database,
|
|
171
|
+
clickhouse_settings: params.clickhouse_settings,
|
|
172
|
+
query_params: params.query_params,
|
|
173
|
+
session_id: params.session_id,
|
|
174
|
+
query_id,
|
|
175
|
+
});
|
|
176
|
+
const response = await this.request({
|
|
177
|
+
values: params.query,
|
|
178
|
+
params,
|
|
179
|
+
searchParams,
|
|
180
|
+
});
|
|
181
|
+
return {
|
|
182
|
+
stream: response.body,
|
|
183
|
+
query_id,
|
|
184
|
+
};
|
|
185
|
+
}
|
|
167
186
|
}
|
|
168
187
|
exports.WebConnection = WebConnection;
|
|
169
188
|
function getQueryId(query_id) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web_connection.js","sourceRoot":"","sources":["../../../../packages/client-web/src/connection/web_connection.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"web_connection.js","sourceRoot":"","sources":["../../../../packages/client-web/src/connection/web_connection.ts"],"names":[],"mappings":"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"}
|
package/dist/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: "1.0
|
|
1
|
+
declare const _default: "1.1.0";
|
|
2
2
|
export default _default;
|
package/dist/version.js
CHANGED
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@clickhouse/client-web",
|
|
3
3
|
"description": "Official JS client for ClickHouse DB - Web API implementation",
|
|
4
4
|
"homepage": "https://clickhouse.com",
|
|
5
|
-
"version": "1.0
|
|
5
|
+
"version": "1.1.0",
|
|
6
6
|
"license": "Apache-2.0",
|
|
7
7
|
"keywords": [
|
|
8
8
|
"clickhouse",
|
|
@@ -20,6 +20,6 @@
|
|
|
20
20
|
"dist"
|
|
21
21
|
],
|
|
22
22
|
"dependencies": {
|
|
23
|
-
"@clickhouse/client-common": "1.0
|
|
23
|
+
"@clickhouse/client-common": "1.1.0"
|
|
24
24
|
}
|
|
25
25
|
}
|