prostgles-client 4.0.420 → 4.0.421

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.
Files changed (11) hide show
  1. package/dist/getDbHandler.d.ts.map +1 -1
  2. package/dist/getDbHandler.js +20 -28
  3. package/dist/getMethods.d.ts.map +1 -1
  4. package/dist/getMethods.js +2 -8
  5. package/dist/getSqlHandler.d.ts.map +1 -1
  6. package/dist/getSqlHandler.js +83 -86
  7. package/dist/index.umd.js +1 -1
  8. package/dist/sendSocketRequest.d.ts +3 -0
  9. package/dist/sendSocketRequest.d.ts.map +1 -0
  10. package/dist/sendSocketRequest.js +29 -0
  11. package/package.json +1 -1
package/dist/getDbHandler.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getDbHandler.d.ts","sourceRoot":"","sources":["../lib/getDbHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,aAAa,EAKnB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AACvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAI3D,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,WAAW,EAEjB,MAAM,aAAa,CAAC;AAWrB,KAAK,IAAI,GAAG;IACV,WAAW,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC;IACzC,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAChC,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC9B,aAAa,EAAE,UAAU,CAAC,OAAO,gBAAgB,CAAC,CAAC;IACnD,mBAAmB,EAAE,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC;CAChE,CAAC;AAIF,eAAO,MAAM,KAAK,GAAI,QAAQ,GAAG,IAAI,EAAE,uEAMpC,IAAI;QAkMc,OAAO,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;CACtD,CAAC"}
1
+ {"version":3,"file":"getDbHandler.d.ts","sourceRoot":"","sources":["../lib/getDbHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,aAAa,EAKnB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AACvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAK3D,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,WAAW,EAEjB,MAAM,aAAa,CAAC;AAWrB,KAAK,IAAI,GAAG;IACV,WAAW,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC;IACzC,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAChC,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC9B,aAAa,EAAE,UAAU,CAAC,OAAO,gBAAgB,CAAC,CAAC;IACnD,mBAAmB,EAAE,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC;CAChE,CAAC;AAIF,eAAO,MAAM,KAAK,GAAI,QAAQ,GAAG,IAAI,EAAE,uEAMpC,IAAI;QAuLc,OAAO,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;CACtD,CAAC"}
package/dist/getDbHandler.js CHANGED
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getDB = void 0;
4
4
  const prostgles_types_1 = require("prostgles-types");
5
+ const sendSocketRequest_1 = require("./sendSocketRequest");
5
6
  const useFetch_1 = require("./hooks/useFetch");
6
7
  const useSubscribe_1 = require("./hooks/useSubscribe");
7
8
  const useSync_1 = require("./hooks/useSync");
@@ -113,34 +114,25 @@ const getDB = ({ tableSchema, onDebug, syncHandlerV2, subscriptionHandler, socke
113
114
  tableName,
114
115
  data: { param1, param2, param3 },
115
116
  });
116
- return new Promise((resolve, reject) => {
117
- const { abortSignal, ...restOfParam2 } = (0, prostgles_types_1.includes)(prostgles_types_1.ABORTABLE_METHODS, command) ? (param2 ?? {}) : {};
118
- let abortSignalId;
119
- if (abortSignal && abortSignal instanceof AbortSignal) {
120
- abortSignalId = crypto.randomUUID();
121
- const abortHandler = () => {
122
- socket.emit(prefix, {
123
- tableName,
124
- command: "abort",
125
- param1: { command, abortSignalId },
126
- });
127
- };
128
- abortSignal.addEventListener("abort", abortHandler, { once: true });
129
- }
130
- socket.emit(prefix, {
131
- tableName,
132
- command,
133
- param1,
134
- param2: abortSignal ? restOfParam2 : param2,
135
- param3: { ...param3, abortSignalId },
136
- },
137
- /* Get col definition and re-cast data types?! */
138
- (err, res) => {
139
- if (err)
140
- reject(err);
141
- else
142
- resolve(res);
143
- });
117
+ const { abortSignal, ...restOfParam2 } = (0, prostgles_types_1.includes)(prostgles_types_1.ABORTABLE_METHODS, command) ? (param2 ?? {}) : {};
118
+ let abortSignalId;
119
+ if (abortSignal && abortSignal instanceof AbortSignal) {
120
+ abortSignalId = crypto.randomUUID();
121
+ const abortHandler = () => {
122
+ socket.emit(prefix, {
123
+ tableName,
124
+ command: "abort",
125
+ param1: { command, abortSignalId },
126
+ });
127
+ };
128
+ abortSignal.addEventListener("abort", abortHandler, { once: true });
129
+ }
130
+ return (0, sendSocketRequest_1.sendSocketRequest)(socket, prefix, {
131
+ tableName,
132
+ command,
133
+ param1,
134
+ param2: abortSignal ? restOfParam2 : param2,
135
+ param3: { ...param3, abortSignalId },
144
136
  });
145
137
  };
146
138
  dboTable[command] = method;
package/dist/getMethods.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getMethods.d.ts","sourceRoot":"","sources":["../lib/getMethods.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,qBAAqB,EAAsB,MAAM,iBAAiB,CAAC;AAE/F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG/C,MAAM,MAAM,cAAc,CAAC,IAAI,GAAG,GAAG,EAAE,GAAG,GAAG,OAAO,IAAI,CACtD,GAAG,IAAI,EAAE,SAAS,SAAS,IAAI,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,KAC3D,OAAO,CAAC,GAAG,CAAC,CAAC;AAClB,MAAM,MAAM,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;AAE1F,eAAO,MAAM,UAAU,GAAI,+BAIxB,IAAI,CAAC,WAAW,EAAE,SAAS,GAAG,QAAQ,CAAC,GAAG,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC;;;CAuBzE,CAAC"}
1
+ {"version":3,"file":"getMethods.d.ts","sourceRoot":"","sources":["../lib/getMethods.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,qBAAqB,EAAsB,MAAM,iBAAiB,CAAC;AAE/F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAI/C,MAAM,MAAM,cAAc,CAAC,IAAI,GAAG,GAAG,EAAE,GAAG,GAAG,OAAO,IAAI,CACtD,GAAG,IAAI,EAAE,SAAS,SAAS,IAAI,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,KAC3D,OAAO,CAAC,GAAG,CAAC,CAAC;AAClB,MAAM,MAAM,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;AAE1F,eAAO,MAAM,UAAU,GAAI,+BAIxB,IAAI,CAAC,WAAW,EAAE,SAAS,GAAG,QAAQ,CAAC,GAAG,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC;;;CAkBzE,CAAC"}
package/dist/getMethods.js CHANGED
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getMethods = void 0;
4
4
  const prostgles_types_1 = require("prostgles-types");
5
+ const sendSocketRequest_1 = require("./sendSocketRequest");
5
6
  const getMethods = ({ onDebug, methods, socket, }) => {
6
7
  let methodSchema = {};
7
8
  const methodHandlers = {};
@@ -9,14 +10,7 @@ const getMethods = ({ onDebug, methods, socket, }) => {
9
10
  _methods.map(({ name, ...metadata }) => {
10
11
  const onRun = async function (input) {
11
12
  await onDebug?.({ type: "method", command: name, data: { params: input } });
12
- return new Promise((resolve, reject) => {
13
- socket.emit(prostgles_types_1.CHANNELS.METHOD, { name, input }, (err, res) => {
14
- if (err)
15
- reject(err);
16
- else
17
- resolve(res);
18
- });
19
- });
13
+ return (0, sendSocketRequest_1.sendSocketRequest)(socket, prostgles_types_1.CHANNELS.METHOD, { name, input });
20
14
  };
21
15
  methodSchema[name] = {
22
16
  ...metadata,
package/dist/getSqlHandler.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getSqlHandler.d.ts","sourceRoot":"","sources":["../lib/getSqlHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,UAAU,EAAwH,MAAM,iBAAiB,CAAC;AAClL,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE/C,eAAO,MAAM,aAAa,GAAI,YAAY,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC;;CA0KpE,CAAA"}
1
+ {"version":3,"file":"getSqlHandler.d.ts","sourceRoot":"","sources":["../lib/getSqlHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,UAAU,EAAwH,MAAM,iBAAiB,CAAC;AAClL,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG/C,eAAO,MAAM,aAAa,GAAI,YAAY,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC;;CAsKpE,CAAA"}
package/dist/getSqlHandler.js CHANGED
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getSqlHandler = void 0;
4
4
  const prostgles_types_1 = require("prostgles-types");
5
+ const sendSocketRequest_1 = require("./sendSocketRequest");
5
6
  const getSqlHandler = ({ socket }) => {
6
7
  let noticeSubs;
7
8
  const notifSubs = {};
@@ -66,98 +67,94 @@ const getSqlHandler = ({ socket }) => {
66
67
  }
67
68
  noticeSubs.listeners.push(listener);
68
69
  };
69
- const sql = function (query, params, options) {
70
- return new Promise((resolve, reject) => {
71
- socket.emit(prostgles_types_1.CHANNELS.SQL, { query, params, options }, (err, res) => {
72
- if (err) {
73
- return reject(err);
74
- }
75
- if (options?.returnType === "stream") {
76
- const { channel, unsubChannel } = res;
77
- const start = (listener) => new Promise((resolveStart, rejectStart) => {
78
- socket.on(channel, listener);
79
- socket.emit(channel, {}, (pid, err) => {
80
- if (err) {
81
- rejectStart(err);
82
- socket.removeAllListeners(channel);
83
- }
84
- else {
85
- resolveStart({
86
- pid,
87
- run: (query, params) => {
88
- return new Promise((resolveRun, rejectRun) => {
89
- socket.emit(channel, { query, params }, (data, _err) => {
90
- if (_err) {
91
- rejectRun(_err);
92
- }
93
- else {
94
- resolveRun(data);
95
- }
96
- });
70
+ const sql = async function (query, params, options) {
71
+ const res = await (0, sendSocketRequest_1.sendSocketRequest)(socket, prostgles_types_1.CHANNELS.SQL, { query, params, options });
72
+ return new Promise((resolve) => {
73
+ if (options?.returnType === "stream") {
74
+ const { channel, unsubChannel } = res;
75
+ const start = (listener) => new Promise((resolveStart, rejectStart) => {
76
+ socket.on(channel, listener);
77
+ socket.emit(channel, {}, (pid, err) => {
78
+ if (err) {
79
+ rejectStart(err);
80
+ socket.removeAllListeners(channel);
81
+ }
82
+ else {
83
+ resolveStart({
84
+ pid,
85
+ run: (query, params) => {
86
+ return new Promise((resolveRun, rejectRun) => {
87
+ socket.emit(channel, { query, params }, (data, _err) => {
88
+ if (_err) {
89
+ rejectRun(_err);
90
+ }
91
+ else {
92
+ resolveRun(data);
93
+ }
97
94
  });
98
- },
99
- stop: (terminate) => {
100
- return new Promise((resolveStop, rejectStop) => {
101
- socket.emit(unsubChannel, { terminate }, (data, _err) => {
102
- if (_err) {
103
- rejectStop(_err);
104
- }
105
- else {
106
- resolveStop(data);
107
- }
108
- });
95
+ });
96
+ },
97
+ stop: (terminate) => {
98
+ return new Promise((resolveStop, rejectStop) => {
99
+ socket.emit(unsubChannel, { terminate }, (data, _err) => {
100
+ if (_err) {
101
+ rejectStop(_err);
102
+ }
103
+ else {
104
+ resolveStop(data);
105
+ }
109
106
  });
110
- }
111
- });
112
- }
113
- });
107
+ });
108
+ }
109
+ });
110
+ }
114
111
  });
115
- const streamHandlers = {
116
- channel,
117
- unsubChannel,
118
- start,
119
- };
120
- return resolve(streamHandlers);
121
- }
122
- else if (options &&
123
- (options.returnType === "noticeSubscription") &&
124
- res &&
125
- Object.keys(res).sort().join() === ["socketChannel", "socketUnsubChannel"].sort().join() &&
126
- !Object.values(res).find(v => typeof v !== "string")) {
127
- const sockInfo = res;
128
- const addListener = (listener) => {
129
- addNoticeListener(listener, sockInfo, socket);
130
- return {
131
- ...sockInfo,
132
- removeListener: () => removeNoticeListener(listener, socket)
133
- };
134
- };
135
- const handle = {
112
+ });
113
+ const streamHandlers = {
114
+ channel,
115
+ unsubChannel,
116
+ start,
117
+ };
118
+ return resolve(streamHandlers);
119
+ }
120
+ else if (options &&
121
+ (options.returnType === "noticeSubscription") &&
122
+ res &&
123
+ Object.keys(res).sort().join() === ["socketChannel", "socketUnsubChannel"].sort().join() &&
124
+ !Object.values(res).find(v => typeof v !== "string")) {
125
+ const sockInfo = res;
126
+ const addListener = (listener) => {
127
+ addNoticeListener(listener, sockInfo, socket);
128
+ return {
136
129
  ...sockInfo,
137
- addListener
130
+ removeListener: () => removeNoticeListener(listener, socket)
138
131
  };
139
- // @ts-ignore
140
- resolve(handle);
141
- }
142
- else if ((!options || !options.returnType || options.returnType !== "statement") &&
143
- res &&
144
- Object.keys(res).sort().join() === ["socketChannel", "socketUnsubChannel", "notifChannel"].sort().join() &&
145
- !Object.values(res).find(v => typeof v !== "string")) {
146
- const sockInfo = res;
147
- const addListener = (listener) => {
148
- addNotifListener(listener, sockInfo, socket);
149
- return {
150
- ...res,
151
- removeListener: () => removeNotifListener(listener, sockInfo, socket)
152
- };
132
+ };
133
+ const handle = {
134
+ ...sockInfo,
135
+ addListener
136
+ };
137
+ // @ts-ignore
138
+ resolve(handle);
139
+ }
140
+ else if ((!options || !options.returnType || options.returnType !== "statement") &&
141
+ res &&
142
+ Object.keys(res).sort().join() === ["socketChannel", "socketUnsubChannel", "notifChannel"].sort().join() &&
143
+ !Object.values(res).find(v => typeof v !== "string")) {
144
+ const sockInfo = res;
145
+ const addListener = (listener) => {
146
+ addNotifListener(listener, sockInfo, socket);
147
+ return {
148
+ ...res,
149
+ removeListener: () => removeNotifListener(listener, sockInfo, socket)
153
150
  };
154
- const handle = { ...res, addListener };
155
- resolve(handle);
156
- }
157
- else {
158
- resolve(res);
159
- }
160
- });
151
+ };
152
+ const handle = { ...res, addListener };
153
+ resolve(handle);
154
+ }
155
+ else {
156
+ resolve(res);
157
+ }
161
158
  });
162
159
  };
163
160
  return { sql };