@juit/pgproxy-client 1.0.16 → 1.0.18
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/assert.cjs +1 -2
- package/dist/assert.cjs.map +1 -1
- package/dist/assert.mjs +1 -2
- package/dist/assert.mjs.map +1 -1
- package/dist/client.cjs +4 -8
- package/dist/client.cjs.map +1 -1
- package/dist/client.mjs +4 -8
- package/dist/client.mjs.map +1 -1
- package/dist/websocket.cjs +9 -18
- package/dist/websocket.cjs.map +1 -1
- package/dist/websocket.mjs +9 -18
- package/dist/websocket.mjs.map +1 -1
- package/package.json +2 -2
package/dist/assert.cjs
CHANGED
|
@@ -24,8 +24,7 @@ __export(assert_exports, {
|
|
|
24
24
|
});
|
|
25
25
|
module.exports = __toCommonJS(assert_exports);
|
|
26
26
|
function assert(what, message) {
|
|
27
|
-
if (!what)
|
|
28
|
-
throw new Error(message);
|
|
27
|
+
if (!what) throw new Error(message);
|
|
29
28
|
}
|
|
30
29
|
// Annotate the CommonJS export names for ESM import in node:
|
|
31
30
|
0 && (module.exports = {
|
package/dist/assert.cjs.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../src/assert.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACO,SAAS,OAAO,MAAe,SAA+B;AACnE,MAAI,CAAE
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACO,SAAS,OAAO,MAAe,SAA+B;AACnE,MAAI,CAAE,KAAM,OAAM,IAAI,MAAM,OAAO;AACrC;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/dist/assert.mjs
CHANGED
package/dist/assert.mjs.map
CHANGED
package/dist/client.cjs
CHANGED
|
@@ -28,8 +28,7 @@ var import_assert = require("./assert.cjs");
|
|
|
28
28
|
var import_provider = require("./provider.cjs");
|
|
29
29
|
var import_result = require("./result.cjs");
|
|
30
30
|
function serializeParams(params) {
|
|
31
|
-
if (params.length == 0)
|
|
32
|
-
return [];
|
|
31
|
+
if (params.length == 0) return [];
|
|
33
32
|
const result = new Array(params.length);
|
|
34
33
|
for (let i = 0; i < params.length; i++) {
|
|
35
34
|
result[i] = params[i] === void 0 ? null : params[i] === null ? null : (0, import_pgproxy_types.serialize)(params[i]);
|
|
@@ -42,8 +41,7 @@ var PGClient = class PGClientImpl {
|
|
|
42
41
|
constructor(urlOrProvider) {
|
|
43
42
|
urlOrProvider = urlOrProvider || globalThis?.process?.env?.PGURL;
|
|
44
43
|
(0, import_assert.assert)(urlOrProvider, "No URL to connect to (PGURL environment variable missing?)");
|
|
45
|
-
if (typeof urlOrProvider === "string")
|
|
46
|
-
urlOrProvider = new URL(urlOrProvider, "psql:///");
|
|
44
|
+
if (typeof urlOrProvider === "string") urlOrProvider = new URL(urlOrProvider, "psql:///");
|
|
47
45
|
(0, import_assert.assert)(urlOrProvider, "Missing URL or provider for client");
|
|
48
46
|
if (urlOrProvider instanceof URL) {
|
|
49
47
|
if (!(urlOrProvider.username || urlOrProvider.password)) {
|
|
@@ -70,8 +68,7 @@ var PGClient = class PGClientImpl {
|
|
|
70
68
|
return new import_result.PGResult(result, registry);
|
|
71
69
|
},
|
|
72
70
|
async begin() {
|
|
73
|
-
if (transaction)
|
|
74
|
-
return false;
|
|
71
|
+
if (transaction) return false;
|
|
75
72
|
await connection.query("BEGIN");
|
|
76
73
|
return transaction = true;
|
|
77
74
|
},
|
|
@@ -86,8 +83,7 @@ var PGClient = class PGClientImpl {
|
|
|
86
83
|
};
|
|
87
84
|
return await consumer(consumable);
|
|
88
85
|
} finally {
|
|
89
|
-
if (transaction)
|
|
90
|
-
await connection.query("ROLLBACK");
|
|
86
|
+
if (transaction) await connection.query("ROLLBACK");
|
|
91
87
|
await this._provider.release(connection);
|
|
92
88
|
}
|
|
93
89
|
}
|
package/dist/client.cjs.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../src/client.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,2BAAoC;AAEpC,oBAAuB;AACvB,sBAA+B;AAC/B,oBAAyB;AAIzB,SAAS,gBAAgB,QAAkC;AACzD,MAAI,OAAO,UAAU
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,2BAAoC;AAEpC,oBAAuB;AACvB,sBAA+B;AAC/B,oBAAyB;AAIzB,SAAS,gBAAgB,QAAkC;AACzD,MAAI,OAAO,UAAU,EAAG,QAAO,CAAC;AAEhC,QAAM,SAA4B,IAAI,MAAM,OAAO,MAAM;AACzD,WAAS,IAAI,GAAG,IAAI,OAAO,QAAQ,KAAM;AACvC,WAAO,CAAC,IACN,OAAO,CAAC,MAAM,SAAY,OAC1B,OAAO,CAAC,MAAM,OAAO,WACrB,gCAAU,OAAO,CAAC,CAAC;AAAA,EACvB;AAEA,SAAO;AACT;AAoFO,IAAM,WAAgC,MAAM,aAAiC;AAAA,EACzE,WAAqB,IAAI,8BAAS;AAAA,EAEnC;AAAA,EAIR,YAAY,eAAyD;AACnE,oBAAgB,iBAAiB,YAAY,SAAS,KAAK;AAC3D,8BAAO,eAAe,4DAA4D;AAClF,QAAI,OAAO,kBAAkB,SAAU,iBAAgB,IAAI,IAAI,eAAe,UAAU;AACxF,8BAAO,eAAe,oCAAoC;AAE1D,QAAI,yBAAyB,KAAK;AAChC,UAAI,EAAE,cAAc,YAAY,cAAc,WAAW;AACvD,cAAM,WAAW,YAAY,SAAS,KAAK,UAAU;AACrD,cAAM,WAAW,YAAY,SAAS,KAAK,cAAc;AACzD,sBAAc,WAAW,mBAAmB,QAAQ;AACpD,sBAAc,WAAW,mBAAmB,QAAQ;AAAA,MACtD;AAAA,IACF;AAEA,SAAK,YAAY,yBAAyB,UACtC,gCAAe,aAAa,IAC5B;AAAA,EACN;AAAA,EAEA,MAAM,MAGJ,MAAc,SAAgB,CAAC,GAAkC;AACjE,UAAM,SAAS,MAAM,KAAK,UAAU,MAAM,MAAM,gBAAgB,MAAM,CAAC;AACvE,WAAO,IAAI,uBAAqB,QAAQ,KAAK,QAAQ;AAAA,EACvD;AAAA,EAEA,MAAM,QAAW,UAAqC;AACpD,UAAM,aAAa,MAAM,KAAK,UAAU,QAAQ;AAChD,QAAI,cAAc;AAElB,QAAI;AACF,YAAM,WAAW,KAAK;AAEtB,YAAM,aAAgC;AAAA,QACpC,MAAM,MAGJ,MAAc,SAAgB,CAAC,GAAkC;AACjE,gBAAM,SAAS,MAAM,WAAW,MAAM,MAAM,gBAAgB,MAAM,CAAC;AACnE,iBAAO,IAAI,uBAAS,QAAQ,QAAQ;AAAA,QACtC;AAAA,QACA,MAAM,QAA0B;AAC9B,cAAI,YAAa,QAAO;AACxB,gBAAM,WAAW,MAAM,OAAO;AAC9B,iBAAO,cAAc;AAAA,QACvB;AAAA,QACA,MAAM,SAAwB;AAC5B,gBAAM,WAAW,MAAM,QAAQ;AAC/B,wBAAc;AAAA,QAChB;AAAA,QACA,MAAM,WAA0B;AAC9B,gBAAM,WAAW,MAAM,UAAU;AACjC,wBAAc;AAAA,QAChB;AAAA,MACF;AAEA,aAAO,MAAM,SAAS,UAAU;AAAA,IAClC,UAAE;AACA,UAAI,YAAa,OAAM,WAAW,MAAM,UAAU;AAClD,YAAM,KAAK,UAAU,QAAQ,UAAU;AAAA,IACzC;AAAA,EACF;AAAA,EAEA,MAAM,UAAyB;AAC7B,WAAO,MAAM,KAAK,UAAU,QAAQ;AAAA,EACtC;AACF;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/dist/client.mjs
CHANGED
|
@@ -4,8 +4,7 @@ import { assert } from "./assert.mjs";
|
|
|
4
4
|
import { createProvider } from "./provider.mjs";
|
|
5
5
|
import { PGResult } from "./result.mjs";
|
|
6
6
|
function serializeParams(params) {
|
|
7
|
-
if (params.length == 0)
|
|
8
|
-
return [];
|
|
7
|
+
if (params.length == 0) return [];
|
|
9
8
|
const result = new Array(params.length);
|
|
10
9
|
for (let i = 0; i < params.length; i++) {
|
|
11
10
|
result[i] = params[i] === void 0 ? null : params[i] === null ? null : serialize(params[i]);
|
|
@@ -18,8 +17,7 @@ var PGClient = class PGClientImpl {
|
|
|
18
17
|
constructor(urlOrProvider) {
|
|
19
18
|
urlOrProvider = urlOrProvider || globalThis?.process?.env?.PGURL;
|
|
20
19
|
assert(urlOrProvider, "No URL to connect to (PGURL environment variable missing?)");
|
|
21
|
-
if (typeof urlOrProvider === "string")
|
|
22
|
-
urlOrProvider = new URL(urlOrProvider, "psql:///");
|
|
20
|
+
if (typeof urlOrProvider === "string") urlOrProvider = new URL(urlOrProvider, "psql:///");
|
|
23
21
|
assert(urlOrProvider, "Missing URL or provider for client");
|
|
24
22
|
if (urlOrProvider instanceof URL) {
|
|
25
23
|
if (!(urlOrProvider.username || urlOrProvider.password)) {
|
|
@@ -46,8 +44,7 @@ var PGClient = class PGClientImpl {
|
|
|
46
44
|
return new PGResult(result, registry);
|
|
47
45
|
},
|
|
48
46
|
async begin() {
|
|
49
|
-
if (transaction)
|
|
50
|
-
return false;
|
|
47
|
+
if (transaction) return false;
|
|
51
48
|
await connection.query("BEGIN");
|
|
52
49
|
return transaction = true;
|
|
53
50
|
},
|
|
@@ -62,8 +59,7 @@ var PGClient = class PGClientImpl {
|
|
|
62
59
|
};
|
|
63
60
|
return await consumer(consumable);
|
|
64
61
|
} finally {
|
|
65
|
-
if (transaction)
|
|
66
|
-
await connection.query("ROLLBACK");
|
|
62
|
+
if (transaction) await connection.query("ROLLBACK");
|
|
67
63
|
await this._provider.release(connection);
|
|
68
64
|
}
|
|
69
65
|
}
|
package/dist/client.mjs.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../src/client.ts"],
|
|
4
|
-
"mappings": ";AAAA,SAAS,UAAU,iBAAiB;AAEpC,SAAS,cAAc;AACvB,SAAS,sBAAsB;AAC/B,SAAS,gBAAgB;AAIzB,SAAS,gBAAgB,QAAkC;AACzD,MAAI,OAAO,UAAU
|
|
4
|
+
"mappings": ";AAAA,SAAS,UAAU,iBAAiB;AAEpC,SAAS,cAAc;AACvB,SAAS,sBAAsB;AAC/B,SAAS,gBAAgB;AAIzB,SAAS,gBAAgB,QAAkC;AACzD,MAAI,OAAO,UAAU,EAAG,QAAO,CAAC;AAEhC,QAAM,SAA4B,IAAI,MAAM,OAAO,MAAM;AACzD,WAAS,IAAI,GAAG,IAAI,OAAO,QAAQ,KAAM;AACvC,WAAO,CAAC,IACN,OAAO,CAAC,MAAM,SAAY,OAC1B,OAAO,CAAC,MAAM,OAAO,OACrB,UAAU,OAAO,CAAC,CAAC;AAAA,EACvB;AAEA,SAAO;AACT;AAoFO,IAAM,WAAgC,MAAM,aAAiC;AAAA,EACzE,WAAqB,IAAI,SAAS;AAAA,EAEnC;AAAA,EAIR,YAAY,eAAyD;AACnE,oBAAgB,iBAAiB,YAAY,SAAS,KAAK;AAC3D,WAAO,eAAe,4DAA4D;AAClF,QAAI,OAAO,kBAAkB,SAAU,iBAAgB,IAAI,IAAI,eAAe,UAAU;AACxF,WAAO,eAAe,oCAAoC;AAE1D,QAAI,yBAAyB,KAAK;AAChC,UAAI,EAAE,cAAc,YAAY,cAAc,WAAW;AACvD,cAAM,WAAW,YAAY,SAAS,KAAK,UAAU;AACrD,cAAM,WAAW,YAAY,SAAS,KAAK,cAAc;AACzD,sBAAc,WAAW,mBAAmB,QAAQ;AACpD,sBAAc,WAAW,mBAAmB,QAAQ;AAAA,MACtD;AAAA,IACF;AAEA,SAAK,YAAY,yBAAyB,MACtC,eAAe,aAAa,IAC5B;AAAA,EACN;AAAA,EAEA,MAAM,MAGJ,MAAc,SAAgB,CAAC,GAAkC;AACjE,UAAM,SAAS,MAAM,KAAK,UAAU,MAAM,MAAM,gBAAgB,MAAM,CAAC;AACvE,WAAO,IAAI,SAAqB,QAAQ,KAAK,QAAQ;AAAA,EACvD;AAAA,EAEA,MAAM,QAAW,UAAqC;AACpD,UAAM,aAAa,MAAM,KAAK,UAAU,QAAQ;AAChD,QAAI,cAAc;AAElB,QAAI;AACF,YAAM,WAAW,KAAK;AAEtB,YAAM,aAAgC;AAAA,QACpC,MAAM,MAGJ,MAAc,SAAgB,CAAC,GAAkC;AACjE,gBAAM,SAAS,MAAM,WAAW,MAAM,MAAM,gBAAgB,MAAM,CAAC;AACnE,iBAAO,IAAI,SAAS,QAAQ,QAAQ;AAAA,QACtC;AAAA,QACA,MAAM,QAA0B;AAC9B,cAAI,YAAa,QAAO;AACxB,gBAAM,WAAW,MAAM,OAAO;AAC9B,iBAAO,cAAc;AAAA,QACvB;AAAA,QACA,MAAM,SAAwB;AAC5B,gBAAM,WAAW,MAAM,QAAQ;AAC/B,wBAAc;AAAA,QAChB;AAAA,QACA,MAAM,WAA0B;AAC9B,gBAAM,WAAW,MAAM,UAAU;AACjC,wBAAc;AAAA,QAChB;AAAA,MACF;AAEA,aAAO,MAAM,SAAS,UAAU;AAAA,IAClC,UAAE;AACA,UAAI,YAAa,OAAM,WAAW,MAAM,UAAU;AAClD,YAAM,KAAK,UAAU,QAAQ,UAAU;AAAA,IACzC;AAAA,EACF;AAAA,EAEA,MAAM,UAAyB;AAC7B,WAAO,MAAM,KAAK,UAAU,QAAQ;AAAA,EACtC;AACF;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/dist/websocket.cjs
CHANGED
|
@@ -55,17 +55,13 @@ var WebSocketConnectionImpl = class {
|
|
|
55
55
|
const message = `WebSocket Closed (${event.code}): ${reason}`;
|
|
56
56
|
this._error = new Error(message);
|
|
57
57
|
}
|
|
58
|
-
for (const req of this._requests.values())
|
|
59
|
-
req.reject(this._error);
|
|
58
|
+
for (const req of this._requests.values()) req.reject(this._error);
|
|
60
59
|
this._requests.clear();
|
|
61
60
|
});
|
|
62
61
|
_socket.addEventListener("error", (event) => {
|
|
63
|
-
if (event.error)
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
this._error = new Error("Unknown WebSocket Error");
|
|
67
|
-
for (const req of this._requests.values())
|
|
68
|
-
req.reject(this._error);
|
|
62
|
+
if (event.error) this._error = event.error;
|
|
63
|
+
else this._error = new Error("Unknown WebSocket Error");
|
|
64
|
+
for (const req of this._requests.values()) req.reject(this._error);
|
|
69
65
|
this._requests.clear();
|
|
70
66
|
this.close();
|
|
71
67
|
});
|
|
@@ -101,15 +97,12 @@ var WebSocketConnectionImpl = class {
|
|
|
101
97
|
/** Our error, set also when the websocket is closed */
|
|
102
98
|
_error;
|
|
103
99
|
close() {
|
|
104
|
-
if (this._socket.readyState === pgWebSocketReadyState.CLOSED)
|
|
105
|
-
|
|
106
|
-
if (this._socket.readyState === pgWebSocketReadyState.CLOSING)
|
|
107
|
-
return;
|
|
100
|
+
if (this._socket.readyState === pgWebSocketReadyState.CLOSED) return;
|
|
101
|
+
if (this._socket.readyState === pgWebSocketReadyState.CLOSING) return;
|
|
108
102
|
this._socket.close(1e3, "Normal termination");
|
|
109
103
|
}
|
|
110
104
|
query(query, params = []) {
|
|
111
|
-
if (this._error)
|
|
112
|
-
return Promise.reject(this._error);
|
|
105
|
+
if (this._error) return Promise.reject(this._error);
|
|
113
106
|
return new Promise((resolve, reject) => {
|
|
114
107
|
const id = this._getRequestId();
|
|
115
108
|
const request = new WebSocketRequest(id);
|
|
@@ -133,8 +126,7 @@ var WebSocketProvider = class {
|
|
|
133
126
|
*/
|
|
134
127
|
_connectWebSocket(socket) {
|
|
135
128
|
return new Promise((resolve, reject) => {
|
|
136
|
-
if (socket.readyState === pgWebSocketReadyState.OPEN)
|
|
137
|
-
return resolve(socket);
|
|
129
|
+
if (socket.readyState === pgWebSocketReadyState.OPEN) return resolve(socket);
|
|
138
130
|
if (socket.readyState !== pgWebSocketReadyState.CONNECTING) {
|
|
139
131
|
return reject(new Error(`Invalid WebSocket ready state ${socket.readyState}`));
|
|
140
132
|
}
|
|
@@ -144,8 +136,7 @@ var WebSocketProvider = class {
|
|
|
144
136
|
};
|
|
145
137
|
const onerror = (event) => {
|
|
146
138
|
removeEventListeners();
|
|
147
|
-
if ("error" in event)
|
|
148
|
-
return reject(event.error);
|
|
139
|
+
if ("error" in event) return reject(event.error);
|
|
149
140
|
reject(new Error("Uknown error opening WebSocket"));
|
|
150
141
|
};
|
|
151
142
|
const onclose = (event) => {
|
package/dist/websocket.cjs.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../src/websocket.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAAuB;AAWvB,IAAM,wBAAwB;AAAA,EAC5B,YAAY;AAAA,EACZ,MAAM;AAAA,EACN,SAAS;AAAA,EACT,QAAQ;AACV;AAoCA,SAAS,IAAI,SAAoC,gBAAgC;AAC/E,SAAO,WAAW;AACpB;AAGA,IAAM,mBAAN,MAAuB;AAAA,EAKrB,YAAmB,IAAY;AAAZ;AACjB,SAAK,UAAU,IAAI,QAAQ,CAAC,SAAS,WAAW,OAAO,iBAAiB,MAAM;AAAA,MAC5E,SAAS,EAAE,OAAO,QAAQ;AAAA,MAC1B,QAAQ,EAAE,OAAO,OAAO;AAAA,IAC1B,CAAC,CAAC;AAAA,EACJ;AAAA,EATS;AAAA,EACA;AAAA,EACA;AAQX;AAGA,IAAM,0BAAN,MAA6D;AAAA,EAM3D,YAAoB,SAA8B,eAA6B;AAA3D;AAA8B;AAEhD,YAAQ,iBAAiB,SAAS,CAAC,UAAU;AAE3C,UAAI,CAAE,KAAK,QAAQ;AACjB,cAAM,SAAS,IAAI,MAAM,QAAQ,gBAAgB;AACjD,cAAM,UAAU,qBAAqB,MAAM,IAAI,MAAM,MAAM;AAC3D,aAAK,SAAS,IAAI,MAAM,OAAO;AAAA,MACjC;AAGA,iBAAW,OAAO,KAAK,UAAU,OAAO
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/dist/websocket.mjs
CHANGED
|
@@ -31,17 +31,13 @@ var WebSocketConnectionImpl = class {
|
|
|
31
31
|
const message = `WebSocket Closed (${event.code}): ${reason}`;
|
|
32
32
|
this._error = new Error(message);
|
|
33
33
|
}
|
|
34
|
-
for (const req of this._requests.values())
|
|
35
|
-
req.reject(this._error);
|
|
34
|
+
for (const req of this._requests.values()) req.reject(this._error);
|
|
36
35
|
this._requests.clear();
|
|
37
36
|
});
|
|
38
37
|
_socket.addEventListener("error", (event) => {
|
|
39
|
-
if (event.error)
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
this._error = new Error("Unknown WebSocket Error");
|
|
43
|
-
for (const req of this._requests.values())
|
|
44
|
-
req.reject(this._error);
|
|
38
|
+
if (event.error) this._error = event.error;
|
|
39
|
+
else this._error = new Error("Unknown WebSocket Error");
|
|
40
|
+
for (const req of this._requests.values()) req.reject(this._error);
|
|
45
41
|
this._requests.clear();
|
|
46
42
|
this.close();
|
|
47
43
|
});
|
|
@@ -77,15 +73,12 @@ var WebSocketConnectionImpl = class {
|
|
|
77
73
|
/** Our error, set also when the websocket is closed */
|
|
78
74
|
_error;
|
|
79
75
|
close() {
|
|
80
|
-
if (this._socket.readyState === pgWebSocketReadyState.CLOSED)
|
|
81
|
-
|
|
82
|
-
if (this._socket.readyState === pgWebSocketReadyState.CLOSING)
|
|
83
|
-
return;
|
|
76
|
+
if (this._socket.readyState === pgWebSocketReadyState.CLOSED) return;
|
|
77
|
+
if (this._socket.readyState === pgWebSocketReadyState.CLOSING) return;
|
|
84
78
|
this._socket.close(1e3, "Normal termination");
|
|
85
79
|
}
|
|
86
80
|
query(query, params = []) {
|
|
87
|
-
if (this._error)
|
|
88
|
-
return Promise.reject(this._error);
|
|
81
|
+
if (this._error) return Promise.reject(this._error);
|
|
89
82
|
return new Promise((resolve, reject) => {
|
|
90
83
|
const id = this._getRequestId();
|
|
91
84
|
const request = new WebSocketRequest(id);
|
|
@@ -109,8 +102,7 @@ var WebSocketProvider = class {
|
|
|
109
102
|
*/
|
|
110
103
|
_connectWebSocket(socket) {
|
|
111
104
|
return new Promise((resolve, reject) => {
|
|
112
|
-
if (socket.readyState === pgWebSocketReadyState.OPEN)
|
|
113
|
-
return resolve(socket);
|
|
105
|
+
if (socket.readyState === pgWebSocketReadyState.OPEN) return resolve(socket);
|
|
114
106
|
if (socket.readyState !== pgWebSocketReadyState.CONNECTING) {
|
|
115
107
|
return reject(new Error(`Invalid WebSocket ready state ${socket.readyState}`));
|
|
116
108
|
}
|
|
@@ -120,8 +112,7 @@ var WebSocketProvider = class {
|
|
|
120
112
|
};
|
|
121
113
|
const onerror = (event) => {
|
|
122
114
|
removeEventListeners();
|
|
123
|
-
if ("error" in event)
|
|
124
|
-
return reject(event.error);
|
|
115
|
+
if ("error" in event) return reject(event.error);
|
|
125
116
|
reject(new Error("Uknown error opening WebSocket"));
|
|
126
117
|
};
|
|
127
118
|
const onclose = (event) => {
|
package/dist/websocket.mjs.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../src/websocket.ts"],
|
|
4
|
-
"mappings": ";AAAA,SAAS,cAAc;AAWvB,IAAM,wBAAwB;AAAA,EAC5B,YAAY;AAAA,EACZ,MAAM;AAAA,EACN,SAAS;AAAA,EACT,QAAQ;AACV;AAoCA,SAAS,IAAI,SAAoC,gBAAgC;AAC/E,SAAO,WAAW;AACpB;AAGA,IAAM,mBAAN,MAAuB;AAAA,EAKrB,YAAmB,IAAY;AAAZ;AACjB,SAAK,UAAU,IAAI,QAAQ,CAAC,SAAS,WAAW,OAAO,iBAAiB,MAAM;AAAA,MAC5E,SAAS,EAAE,OAAO,QAAQ;AAAA,MAC1B,QAAQ,EAAE,OAAO,OAAO;AAAA,IAC1B,CAAC,CAAC;AAAA,EACJ;AAAA,EATS;AAAA,EACA;AAAA,EACA;AAQX;AAGA,IAAM,0BAAN,MAA6D;AAAA,EAM3D,YAAoB,SAA8B,eAA6B;AAA3D;AAA8B;AAEhD,YAAQ,iBAAiB,SAAS,CAAC,UAAU;AAE3C,UAAI,CAAE,KAAK,QAAQ;AACjB,cAAM,SAAS,IAAI,MAAM,QAAQ,gBAAgB;AACjD,cAAM,UAAU,qBAAqB,MAAM,IAAI,MAAM,MAAM;AAC3D,aAAK,SAAS,IAAI,MAAM,OAAO;AAAA,MACjC;AAGA,iBAAW,OAAO,KAAK,UAAU,OAAO
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@juit/pgproxy-client",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.18",
|
|
4
4
|
"main": "./dist/index.cjs",
|
|
5
5
|
"module": "./dist/index.mjs",
|
|
6
6
|
"types": "./dist/index.d.ts",
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
},
|
|
36
36
|
"homepage": "https://github.com/juitnow/juit-pgproxy#readme",
|
|
37
37
|
"dependencies": {
|
|
38
|
-
"@juit/pgproxy-types": "1.0.
|
|
38
|
+
"@juit/pgproxy-types": "1.0.18"
|
|
39
39
|
},
|
|
40
40
|
"directories": {
|
|
41
41
|
"test": "test"
|