@based/server 2.8.10 → 2.9.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/.turbo/turbo-build.log +5 -5
- package/dist/Client.d.ts +2 -1
- package/dist/Client.js +6 -2
- package/dist/Client.js.map +1 -1
- package/dist/handlers/configuration/observable/index.js.map +1 -1
- package/dist/handlers/functions/observable/SharedObservable.d.ts +3 -1
- package/dist/handlers/functions/observable/SharedObservable.js +59 -78
- package/dist/handlers/functions/observable/SharedObservable.js.map +1 -1
- package/dist/handlers/functions/observable/index.d.ts +2 -1
- package/dist/handlers/functions/observable/index.js.map +1 -1
- package/dist/handlers/rest/parseResponse.d.ts +1 -1
- package/dist/handlers/rest/parseResponse.js +85 -49
- package/dist/handlers/rest/parseResponse.js.map +1 -1
- package/dist/handlers/subscription/index.d.ts +3 -5
- package/dist/handlers/subscription/index.js +47 -30
- package/dist/handlers/subscription/index.js.map +1 -1
- package/package.json +3 -3
package/.turbo/turbo-build.log
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
[
|
|
2
|
-
[
|
|
3
|
-
[
|
|
4
|
-
[
|
|
5
|
-
[
|
|
1
|
+
[33m@based/server:build: [0mcache hit, replaying output [2m9313571cdf866a36[0m
|
|
2
|
+
[33m@based/server:build: [0m
|
|
3
|
+
[33m@based/server:build: [0m> @based/server@2.8.10 build
|
|
4
|
+
[33m@based/server:build: [0m> npx tsc
|
|
5
|
+
[33m@based/server:build: [0m
|
package/dist/Client.d.ts
CHANGED
|
@@ -4,6 +4,7 @@ import { FunctionObservable, SharedFunctionObservable } from './handlers/functio
|
|
|
4
4
|
import { GenericObject, SendTokenOptions } from '@based/client';
|
|
5
5
|
import { BasedServer } from '.';
|
|
6
6
|
import { Geo } from './types';
|
|
7
|
+
import { SharedConfigurationObservable } from './handlers/configuration/observable';
|
|
7
8
|
declare type Ua = {
|
|
8
9
|
ua: string;
|
|
9
10
|
browser: {
|
|
@@ -42,7 +43,7 @@ export declare class Client {
|
|
|
42
43
|
private _params;
|
|
43
44
|
private _ua;
|
|
44
45
|
subscriptions: {
|
|
45
|
-
[id: string]: Subscription | SharedFunctionObservable | FunctionObservable;
|
|
46
|
+
[id: string]: Subscription | SharedFunctionObservable | FunctionObservable | SharedConfigurationObservable;
|
|
46
47
|
};
|
|
47
48
|
bpTimestamp: number;
|
|
48
49
|
closed: boolean;
|
package/dist/Client.js
CHANGED
|
@@ -235,8 +235,12 @@ class Client {
|
|
|
235
235
|
console.info('add to bp queue', this.backpressureQueue.length, this.socket.getBufferedAmount());
|
|
236
236
|
}
|
|
237
237
|
else {
|
|
238
|
-
|
|
239
|
-
|
|
238
|
+
// buffer directly?
|
|
239
|
+
if (typeof payload === 'string') {
|
|
240
|
+
this.socket.send(payload);
|
|
241
|
+
}
|
|
242
|
+
else {
|
|
243
|
+
this.socket.send(JSON.stringify(payload));
|
|
240
244
|
}
|
|
241
245
|
}
|
|
242
246
|
}
|
package/dist/Client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Client.js","sourceRoot":"","sources":["../src/Client.ts"],"names":[],"mappings":";;;;;;AAOA,uCAA4D;AAE5D,wCAAwC;AACxC,kFAAyD;AAGzD,gEAAmC;
|
|
1
|
+
{"version":3,"file":"Client.js","sourceRoot":"","sources":["../src/Client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/handlers/configuration/observable/index.ts"],"names":[],"mappings":";;;AAEA,0CAKsB;AAEtB,sCAAyC;AAIzC,sCAAsD;AAItD,MAAa,6BAA6B;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/handlers/configuration/observable/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,9 @@ declare type GenericObject = {
|
|
|
8
8
|
[key: string]: any;
|
|
9
9
|
};
|
|
10
10
|
export declare class SharedFunctionObservable {
|
|
11
|
-
lastDiff:
|
|
11
|
+
lastDiff: number;
|
|
12
|
+
jsonDiffCache: string;
|
|
13
|
+
jsonCache: string;
|
|
12
14
|
server: BasedServer;
|
|
13
15
|
removeTimer: NodeJS.Timeout;
|
|
14
16
|
id: number;
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.SharedFunctionObservable = void 0;
|
|
4
4
|
const client_1 = require("@based/client");
|
|
5
|
+
const utils_1 = require("@saulx/utils");
|
|
5
6
|
const diff_1 = require("@saulx/diff");
|
|
6
7
|
const Params_1 = require("../../../Params");
|
|
7
8
|
const getFromConfig_1 = require("../../../getFromConfig");
|
|
@@ -40,7 +41,7 @@ class SharedFunctionObservable {
|
|
|
40
41
|
payload,
|
|
41
42
|
auth: err.name === 'AuthorizationError',
|
|
42
43
|
};
|
|
43
|
-
console.error('Make observable error', this.name, err)
|
|
44
|
+
// console.error('Make observable error', this.name, err)
|
|
44
45
|
if (fn) {
|
|
45
46
|
fn(null, 0, errObject);
|
|
46
47
|
}
|
|
@@ -90,64 +91,64 @@ class SharedFunctionObservable {
|
|
|
90
91
|
if (!version) {
|
|
91
92
|
version = !data ? 0 : (0, hash_1.hashObjectIgnoreKeyOrder)(data);
|
|
92
93
|
}
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
94
|
+
if (version && version !== this.checksum) {
|
|
95
|
+
let payload;
|
|
96
|
+
if (this.state) {
|
|
97
|
+
const s = this.state;
|
|
98
|
+
const checksum = this.checksum;
|
|
99
|
+
try {
|
|
100
|
+
const diff = (0, diff_1.createPatch)(s, data);
|
|
101
|
+
this.lastDiff = checksum;
|
|
102
|
+
payload = this.jsonDiffCache = `[2,${this.id},${JSON.stringify(diff)},[${checksum},${version}]]`;
|
|
103
|
+
}
|
|
104
|
+
catch (err) {
|
|
105
|
+
// cannot create patch
|
|
106
|
+
console.error('cannot create patch', err);
|
|
107
|
+
}
|
|
106
108
|
}
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
109
|
+
this.checksum = version;
|
|
110
|
+
if (!payload) {
|
|
111
|
+
if (this.lastDiff) {
|
|
112
|
+
delete this.lastDiff;
|
|
113
|
+
delete this.jsonDiffCache;
|
|
114
|
+
}
|
|
115
|
+
payload = `[1,${this.id},${JSON.stringify(data)},${version}]`;
|
|
116
|
+
this.jsonCache = payload;
|
|
110
117
|
}
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
if (this.lastDiff) {
|
|
114
|
-
delete this.lastDiff;
|
|
118
|
+
else {
|
|
119
|
+
this.jsonCache = `[1,${this.id},${JSON.stringify(data)},${version}]`;
|
|
115
120
|
}
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
// only do this is you see that it is the same data object (so first diff will not be a diff)
|
|
119
|
-
// remove deep copy here -- way too heavy...
|
|
120
|
-
// lets see...
|
|
121
|
-
// deepCopy
|
|
122
|
-
// this is such a big waste...
|
|
123
|
-
// find something for this...
|
|
124
|
-
if (!data) {
|
|
125
|
-
console.warn('No data supplied - default to empty object', this.name, this.payload);
|
|
126
|
-
}
|
|
127
|
-
this.state = data || {};
|
|
128
|
-
this.checksum = version;
|
|
129
|
-
if (this.dataListeners) {
|
|
130
|
-
for (const id in this.dataListeners) {
|
|
131
|
-
this.dataListeners[id].forEach((fn) => {
|
|
132
|
-
fn(this.state, this.checksum);
|
|
133
|
-
});
|
|
121
|
+
if (!data) {
|
|
122
|
+
console.warn('No data supplied - default to empty object', this.name, this.payload);
|
|
134
123
|
}
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
if (c[2] === 1) {
|
|
142
|
-
// have to make it different if it converts to a subscription
|
|
143
|
-
this.unsubscribe(c[0]);
|
|
124
|
+
this.state = (0, utils_1.deepCopy)(data) || {};
|
|
125
|
+
if (this.dataListeners) {
|
|
126
|
+
for (const id in this.dataListeners) {
|
|
127
|
+
this.dataListeners[id].forEach((fn) => {
|
|
128
|
+
fn(this.state, this.checksum);
|
|
129
|
+
});
|
|
144
130
|
}
|
|
145
131
|
}
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
c
|
|
149
|
-
if (c[
|
|
150
|
-
|
|
132
|
+
let sameVersion;
|
|
133
|
+
for (const id in this.clients) {
|
|
134
|
+
const c = this.clients[id];
|
|
135
|
+
if (version !== c[1]) {
|
|
136
|
+
c[1] = version;
|
|
137
|
+
c[0].send(payload);
|
|
138
|
+
if (c[2] === 1) {
|
|
139
|
+
// have to make it different if it converts to a subscription
|
|
140
|
+
this.unsubscribe(c[0]);
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
else if (c[2]) {
|
|
144
|
+
if (!sameVersion) {
|
|
145
|
+
sameVersion = `[1,${this.id},null,${version}]`;
|
|
146
|
+
}
|
|
147
|
+
c[1] = version;
|
|
148
|
+
c[0].send(sameVersion);
|
|
149
|
+
if (c[2] === 1) {
|
|
150
|
+
this.unsubscribe(c[0]);
|
|
151
|
+
}
|
|
151
152
|
}
|
|
152
153
|
}
|
|
153
154
|
}
|
|
@@ -237,8 +238,7 @@ class SharedFunctionObservable {
|
|
|
237
238
|
client.send(payload);
|
|
238
239
|
}
|
|
239
240
|
else if (this.state) {
|
|
240
|
-
if (checksum === this.checksum) {
|
|
241
|
-
// console.info('got version dont re-send')
|
|
241
|
+
if (checksum && checksum === this.checksum) {
|
|
242
242
|
if (get) {
|
|
243
243
|
const payload = [
|
|
244
244
|
client_1.RequestTypes.Subscription,
|
|
@@ -256,25 +256,13 @@ class SharedFunctionObservable {
|
|
|
256
256
|
this.clients[client.id][1] = this.checksum;
|
|
257
257
|
}
|
|
258
258
|
// this send has to be checked dont want to resend if it immediatly updates from the sub
|
|
259
|
-
if (
|
|
260
|
-
const payload = [
|
|
261
|
-
client_1.RequestTypes.SubscriptionDiff,
|
|
262
|
-
this.id,
|
|
263
|
-
this.lastDiff[0],
|
|
264
|
-
[this.lastDiff[1], checksum],
|
|
265
|
-
];
|
|
259
|
+
if (checksum && this.lastDiff === checksum) {
|
|
266
260
|
isSend = true;
|
|
267
|
-
client.send(
|
|
261
|
+
client.send(this.jsonDiffCache);
|
|
268
262
|
}
|
|
269
263
|
else {
|
|
270
|
-
const payload = [
|
|
271
|
-
client_1.RequestTypes.Subscription,
|
|
272
|
-
this.id,
|
|
273
|
-
this.state,
|
|
274
|
-
this.checksum,
|
|
275
|
-
];
|
|
276
264
|
isSend = true;
|
|
277
|
-
client.send(
|
|
265
|
+
client.send(this.jsonCache);
|
|
278
266
|
}
|
|
279
267
|
}
|
|
280
268
|
}
|
|
@@ -290,18 +278,11 @@ class SharedFunctionObservable {
|
|
|
290
278
|
}
|
|
291
279
|
}
|
|
292
280
|
sendData(client) {
|
|
293
|
-
// this is easy to emulate
|
|
294
281
|
if (this.checksum && !this.errorState) {
|
|
295
282
|
const store = this.clients[client.id];
|
|
296
283
|
if (store) {
|
|
297
284
|
store[1] = this.checksum;
|
|
298
|
-
|
|
299
|
-
client_1.RequestTypes.Subscription,
|
|
300
|
-
this.id,
|
|
301
|
-
this.state,
|
|
302
|
-
this.checksum,
|
|
303
|
-
];
|
|
304
|
-
client.send(payload);
|
|
285
|
+
client.send(this.jsonCache);
|
|
305
286
|
}
|
|
306
287
|
}
|
|
307
288
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SharedObservable.js","sourceRoot":"","sources":["../../../../src/handlers/functions/observable/SharedObservable.ts"],"names":[],"mappings":";;;AAEA,0CAKsB;AAEtB,sCAAyC;AAEzC,4CAAwC;AACxC,0DAAoD;AAEpD,sCAAsD;AAItD,MAAa,wBAAwB;
|
|
1
|
+
{"version":3,"file":"SharedObservable.js","sourceRoot":"","sources":["../../../../src/handlers/functions/observable/SharedObservable.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,8 +6,9 @@ import { SendSubscriptionGetDataMessage, SubscribeMessage } from '@based/client'
|
|
|
6
6
|
import { DataListener } from '../../../types';
|
|
7
7
|
import { Params } from '../../../Params';
|
|
8
8
|
import { Subscription } from '../../subscription';
|
|
9
|
+
import { SharedConfigurationObservable } from '../../configuration/observable';
|
|
9
10
|
export { SharedFunctionObservable } from './SharedObservable';
|
|
10
11
|
export { FunctionObservable } from './Observable';
|
|
11
12
|
export declare const getObservable: (server: BasedServer, client: Client, [, id, payload, checksum, name]: SendSubscriptionGetDataMessage) => Promise<void>;
|
|
12
|
-
export declare const subscribeFunction: (params: Params, name: string, payload: any, dataListener: DataListener) => Promise<SharedFunctionObservable | FunctionObservable | Subscription | void>;
|
|
13
|
+
export declare const subscribeFunction: (params: Params, name: string, payload: any, dataListener: DataListener) => Promise<SharedFunctionObservable | FunctionObservable | Subscription | void | SharedConfigurationObservable>;
|
|
13
14
|
export declare const subscribeObservable: (server: BasedServer, client: Client, [, id, payload, checksum, allwaysSend, name]: SubscribeMessage) => Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/handlers/functions/observable/index.ts"],"names":[],"mappings":";;;AAAA,yDAA6D;AAC7D,6CAAiD;AAGjD,0CAKsB;AAEtB,0DAAoD;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/handlers/functions/observable/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import uws from '@based/uws';
|
|
2
2
|
import { ResponseData } from '@based/client';
|
|
3
|
-
declare const _default: (res: uws.HttpResponse, payload: ResponseData, type: 0 | 1) => void;
|
|
3
|
+
declare const _default: (res: uws.HttpResponse, payload: ResponseData | string, type: 0 | 1, version?: number) => void;
|
|
4
4
|
export default _default;
|
|
@@ -20,66 +20,102 @@ const ok = (res) => {
|
|
|
20
20
|
res.writeHeader('Access-Control-Allow-Origin', '*');
|
|
21
21
|
res.writeHeader('Access-Control-Allow-Headers', 'content-type');
|
|
22
22
|
};
|
|
23
|
-
exports.default = (res, payload, type) => {
|
|
23
|
+
exports.default = (res, payload, type, version) => {
|
|
24
24
|
if (res.aborted) {
|
|
25
25
|
return;
|
|
26
26
|
}
|
|
27
27
|
let result;
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
const
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
28
|
+
let reqType;
|
|
29
|
+
let isParsed = false;
|
|
30
|
+
if (typeof payload === 'string') {
|
|
31
|
+
let secondIndex = 0;
|
|
32
|
+
let lastIndex = 0;
|
|
33
|
+
const len = payload.length - 1;
|
|
34
|
+
for (let i = 4; i < 20; i++) {
|
|
35
|
+
const s = payload[i];
|
|
36
|
+
if (!secondIndex && s === ',') {
|
|
37
|
+
secondIndex = i;
|
|
38
|
+
if (lastIndex) {
|
|
39
|
+
break;
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
if (!lastIndex) {
|
|
43
|
+
if (payload[len - i] === ',') {
|
|
44
|
+
lastIndex = len - i;
|
|
45
|
+
if (secondIndex) {
|
|
46
|
+
break;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
}
|
|
41
50
|
}
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
reqType === client_1.RequestTypes.Copy ||
|
|
45
|
-
reqType === client_1.RequestTypes.Configuration ||
|
|
46
|
-
reqType === client_1.RequestTypes.Digest ||
|
|
47
|
-
reqType === client_1.RequestTypes.GetConfiguration ||
|
|
48
|
-
reqType === client_1.RequestTypes.Delete) {
|
|
49
|
-
if (payload[3]) {
|
|
50
|
-
invalid(res, payload[3]);
|
|
51
|
+
if (!secondIndex && !lastIndex) {
|
|
52
|
+
invalid(res, 'Invalid Request');
|
|
51
53
|
return;
|
|
52
54
|
}
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
55
|
+
result = payload.slice(secondIndex + 1, lastIndex);
|
|
56
|
+
const checksum = version || (0, hash_1.hash)(result);
|
|
57
|
+
ok(res);
|
|
58
|
+
res.writeHeader('ETag', String(checksum));
|
|
59
|
+
res.writeHeader('Cache-Control', 'max-age=0, must-revalidate');
|
|
60
|
+
isParsed = true;
|
|
57
61
|
}
|
|
58
|
-
else
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
+
else {
|
|
63
|
+
reqType = payload[0];
|
|
64
|
+
if (reqType === client_1.RequestTypes.Get) {
|
|
65
|
+
if (payload[3]) {
|
|
66
|
+
invalid(res, payload[3], 'Invalid Query');
|
|
67
|
+
return;
|
|
68
|
+
}
|
|
69
|
+
else {
|
|
70
|
+
const r = payload[2];
|
|
71
|
+
const checksum = (0, hash_1.hashObjectIgnoreKeyOrder)(r);
|
|
72
|
+
ok(res);
|
|
73
|
+
res.writeHeader('ETag', String(checksum));
|
|
74
|
+
res.writeHeader('Cache-Control', 'max-age=0, must-revalidate');
|
|
75
|
+
result = r;
|
|
76
|
+
}
|
|
62
77
|
}
|
|
63
|
-
else
|
|
64
|
-
|
|
65
|
-
|
|
78
|
+
else if (reqType === client_1.RequestTypes.Set ||
|
|
79
|
+
reqType === client_1.RequestTypes.Copy ||
|
|
80
|
+
reqType === client_1.RequestTypes.Configuration ||
|
|
81
|
+
reqType === client_1.RequestTypes.Digest ||
|
|
82
|
+
reqType === client_1.RequestTypes.GetConfiguration ||
|
|
83
|
+
reqType === client_1.RequestTypes.Delete) {
|
|
84
|
+
if (payload[3]) {
|
|
85
|
+
invalid(res, payload[3]);
|
|
86
|
+
return;
|
|
87
|
+
}
|
|
88
|
+
else {
|
|
89
|
+
ok(res);
|
|
90
|
+
result = payload[2];
|
|
91
|
+
}
|
|
66
92
|
}
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
93
|
+
else if (reqType === client_1.RequestTypes.Call) {
|
|
94
|
+
if (payload[3]) {
|
|
95
|
+
invalid(res, payload[3]);
|
|
96
|
+
return;
|
|
97
|
+
}
|
|
98
|
+
else {
|
|
99
|
+
ok(res);
|
|
100
|
+
result = payload[2];
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
else if (reqType === client_1.RequestTypes.Subscription) {
|
|
104
|
+
if (payload[4]) {
|
|
105
|
+
invalid(res, payload[4]);
|
|
106
|
+
return;
|
|
107
|
+
}
|
|
108
|
+
else {
|
|
109
|
+
ok(res);
|
|
110
|
+
res.writeHeader('ETag', String(payload[3]));
|
|
111
|
+
res.writeHeader('Cache-Control', 'max-age=0, must-revalidate');
|
|
112
|
+
result = payload[2];
|
|
113
|
+
}
|
|
72
114
|
}
|
|
73
115
|
else {
|
|
74
|
-
|
|
75
|
-
res.writeHeader('ETag', String(payload[3]));
|
|
76
|
-
res.writeHeader('Cache-Control', 'max-age=0, must-revalidate');
|
|
77
|
-
result = payload[2];
|
|
116
|
+
invalid(res, 'Invalid Request');
|
|
78
117
|
}
|
|
79
118
|
}
|
|
80
|
-
else {
|
|
81
|
-
invalid(res, 'Invalid Request');
|
|
82
|
-
}
|
|
83
119
|
if (reqType === client_1.RequestTypes.Digest) {
|
|
84
120
|
res.writeHeader('Content-Type', 'text/plain');
|
|
85
121
|
}
|
|
@@ -95,7 +131,7 @@ exports.default = (res, payload, type) => {
|
|
|
95
131
|
let parsed;
|
|
96
132
|
let csvParser;
|
|
97
133
|
if (type === 0) {
|
|
98
|
-
parsed = JSON.stringify(result);
|
|
134
|
+
parsed = isParsed ? result : JSON.stringify(result);
|
|
99
135
|
}
|
|
100
136
|
else {
|
|
101
137
|
csvParser = (0, jsonexport_1.default)();
|
|
@@ -129,7 +165,7 @@ exports.default = (res, payload, type) => {
|
|
|
129
165
|
if (csvParser) {
|
|
130
166
|
if (!res.aborted) {
|
|
131
167
|
csvParser.pipe(compressor);
|
|
132
|
-
csvParser.write(Buffer.from(JSON.stringify(result)));
|
|
168
|
+
csvParser.write(Buffer.from(isParsed ? result : JSON.stringify(result)));
|
|
133
169
|
csvParser.end();
|
|
134
170
|
}
|
|
135
171
|
}
|
|
@@ -155,7 +191,7 @@ exports.default = (res, payload, type) => {
|
|
|
155
191
|
}
|
|
156
192
|
});
|
|
157
193
|
if (!res.aborted) {
|
|
158
|
-
csvParser.write(Buffer.from(JSON.stringify(result)));
|
|
194
|
+
csvParser.write(Buffer.from(isParsed ? result : JSON.stringify(result)));
|
|
159
195
|
csvParser.end();
|
|
160
196
|
}
|
|
161
197
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseResponse.js","sourceRoot":"","sources":["../../../src/handlers/rest/parseResponse.ts"],"names":[],"mappings":";;;;;AACA,0CAA0D;AAC1D,
|
|
1
|
+
{"version":3,"file":"parseResponse.js","sourceRoot":"","sources":["../../../src/handlers/rest/parseResponse.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,11 +4,10 @@ import { Observable } from '@saulx/selva';
|
|
|
4
4
|
import Client from '../../Client';
|
|
5
5
|
import { SendSubscriptionDataMessage, SubscribeMessage, UnsubscribeMessage, ErrorObject } from '@based/client';
|
|
6
6
|
import { DataListener } from '../../types';
|
|
7
|
-
declare type GenericObject = {
|
|
8
|
-
[key: string]: any;
|
|
9
|
-
};
|
|
10
7
|
export declare class Subscription {
|
|
11
|
-
lastDiff:
|
|
8
|
+
lastDiff: number;
|
|
9
|
+
jsonDiffCache: string;
|
|
10
|
+
jsonCache: string;
|
|
12
11
|
checksum: number;
|
|
13
12
|
server: BasedServer;
|
|
14
13
|
removeTimer: NodeJS.Timeout;
|
|
@@ -31,4 +30,3 @@ export declare class Subscription {
|
|
|
31
30
|
export declare const subscribe: (server: BasedServer, client: Client, [, id, query, checksum]: SubscribeMessage) => void;
|
|
32
31
|
export declare const sendSubscriptionData: (server: BasedServer, client: Client, [, subscriptionId]: SendSubscriptionDataMessage) => void;
|
|
33
32
|
export declare const unsubscribe: (server: BasedServer, client: Client, [, subscriptionId]: UnsubscribeMessage) => void;
|
|
34
|
-
export {};
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.unsubscribe = exports.sendSubscriptionData = exports.subscribe = exports.Subscription = void 0;
|
|
4
4
|
const client_1 = require("@based/client");
|
|
5
|
+
// type GenericObject = { [key: string]: any }
|
|
5
6
|
class Subscription {
|
|
6
7
|
constructor(server, id, query) {
|
|
7
8
|
this.clients = {};
|
|
@@ -32,19 +33,31 @@ class Subscription {
|
|
|
32
33
|
}
|
|
33
34
|
let payload;
|
|
34
35
|
if (diff) {
|
|
35
|
-
this.lastDiff =
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
[this.
|
|
41
|
-
|
|
36
|
+
this.lastDiff = this.checksum;
|
|
37
|
+
if (isSchemaSubscription) {
|
|
38
|
+
payload = this.jsonDiffCache = `[2,${this.id},${JSON.stringify(diff)},["${this.checksum}","${checksum}"]]`;
|
|
39
|
+
}
|
|
40
|
+
else {
|
|
41
|
+
payload = this.jsonDiffCache = `[2,${this.id},${JSON.stringify(diff)},[${this.checksum},${checksum}]]`;
|
|
42
|
+
}
|
|
43
|
+
if (isSchemaSubscription) {
|
|
44
|
+
this.jsonCache = `[1,${this.id},${JSON.stringify(data)},"${checksum}"]`;
|
|
45
|
+
}
|
|
46
|
+
else {
|
|
47
|
+
this.jsonCache = `[1,${this.id},${JSON.stringify(data)},${checksum}]`;
|
|
48
|
+
}
|
|
42
49
|
}
|
|
43
50
|
else {
|
|
44
51
|
if (this.lastDiff) {
|
|
45
52
|
delete this.lastDiff;
|
|
53
|
+
delete this.jsonDiffCache;
|
|
54
|
+
}
|
|
55
|
+
if (isSchemaSubscription) {
|
|
56
|
+
payload = this.jsonCache = `[1,${this.id},${JSON.stringify(data)},"${checksum}"]`;
|
|
57
|
+
}
|
|
58
|
+
else {
|
|
59
|
+
payload = this.jsonCache = `[1,${this.id},${JSON.stringify(data)},${checksum}]`;
|
|
46
60
|
}
|
|
47
|
-
payload = [client_1.RequestTypes.Subscription, this.id, data, checksum];
|
|
48
61
|
}
|
|
49
62
|
for (const id in this.clients) {
|
|
50
63
|
const c = this.clients[id];
|
|
@@ -52,6 +65,8 @@ class Subscription {
|
|
|
52
65
|
c[1] = checksum;
|
|
53
66
|
c[0].send(payload);
|
|
54
67
|
}
|
|
68
|
+
// else if waiting for initial get... ?
|
|
69
|
+
// TODO: may need fix
|
|
55
70
|
}
|
|
56
71
|
this.checksum = checksum;
|
|
57
72
|
}, (err) => {
|
|
@@ -88,7 +103,9 @@ class Subscription {
|
|
|
88
103
|
}
|
|
89
104
|
});
|
|
90
105
|
}
|
|
106
|
+
// eslint-disable-next-line
|
|
91
107
|
unsubscribeDataListener(client, fn, id) { }
|
|
108
|
+
// eslint-disable-next-line
|
|
92
109
|
subscribeDataListener(client, fn, id) { }
|
|
93
110
|
unsubscribe(client) {
|
|
94
111
|
if (this.clients[client.id]) {
|
|
@@ -137,23 +154,23 @@ class Subscription {
|
|
|
137
154
|
else {
|
|
138
155
|
this.clients[client.id][1] = this.observable.version;
|
|
139
156
|
// this send has to be checked dont want to resend if it immediatly updates from the sub
|
|
140
|
-
if (this.lastDiff && this.lastDiff
|
|
141
|
-
const payload = [
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
]
|
|
147
|
-
client.send(
|
|
157
|
+
if (this.lastDiff && this.lastDiff === checksum) {
|
|
158
|
+
// const payload: SubscriptionDiffData = [
|
|
159
|
+
// RequestTypes.SubscriptionDiff,
|
|
160
|
+
// this.id,
|
|
161
|
+
// this.lastDiff[0],
|
|
162
|
+
// [this.lastDiff[1], this.observable.version],
|
|
163
|
+
// ]
|
|
164
|
+
client.send(this.jsonDiffCache);
|
|
148
165
|
}
|
|
149
166
|
else {
|
|
150
|
-
const payload = [
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
]
|
|
156
|
-
client.send(
|
|
167
|
+
// const payload: SubscriptionData = [
|
|
168
|
+
// RequestTypes.Subscription,
|
|
169
|
+
// this.id,
|
|
170
|
+
// this.observable.cache,
|
|
171
|
+
// this.observable.version,
|
|
172
|
+
// ]
|
|
173
|
+
client.send(this.jsonCache);
|
|
157
174
|
}
|
|
158
175
|
}
|
|
159
176
|
}
|
|
@@ -166,13 +183,13 @@ class Subscription {
|
|
|
166
183
|
const store = this.clients[client.id];
|
|
167
184
|
if (store) {
|
|
168
185
|
store[1] = this.observable.version;
|
|
169
|
-
const payload = [
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
]
|
|
175
|
-
client.send(
|
|
186
|
+
// const payload: SubscriptionData = [
|
|
187
|
+
// RequestTypes.Subscription,
|
|
188
|
+
// this.id,
|
|
189
|
+
// this.observable.cache,
|
|
190
|
+
// this.observable.version,
|
|
191
|
+
// ]
|
|
192
|
+
client.send(this.jsonCache);
|
|
176
193
|
}
|
|
177
194
|
}
|
|
178
195
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/handlers/subscription/index.ts"],"names":[],"mappings":";;;AAGA,0CAQsB;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/handlers/subscription/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@based/server",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.9.0",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"module": "src/index.ts",
|
|
@@ -10,10 +10,10 @@
|
|
|
10
10
|
"clean": "rimraf {.turbo,dist,node_modules}"
|
|
11
11
|
},
|
|
12
12
|
"peerDependencies": {
|
|
13
|
-
"@saulx/selva": "10||11||12||13"
|
|
13
|
+
"@saulx/selva": "10||11||12||13||14"
|
|
14
14
|
},
|
|
15
15
|
"dependencies": {
|
|
16
|
-
"@based/client": "2.
|
|
16
|
+
"@based/client": "2.8.0",
|
|
17
17
|
"@based/graphql": "2.4.2",
|
|
18
18
|
"@based/uws": "2.4.0",
|
|
19
19
|
"@saulx/diff": "^1.1.3",
|