prostgles-server 4.2.439 → 4.2.441
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/DboBuilder/QueryStreamer.js +1 -1
- package/dist/DboBuilder/QueryStreamer.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts +6 -6
- package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/ViewHandler.js +6 -8
- package/dist/DboBuilder/ViewHandler/ViewHandler.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/subscribe.d.ts +4 -12
- package/dist/DboBuilder/ViewHandler/subscribe.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/subscribe.js +11 -25
- package/dist/DboBuilder/ViewHandler/subscribe.js.map +1 -1
- package/dist/Logging.d.ts +2 -1
- package/dist/Logging.d.ts.map +1 -1
- package/dist/PubSubManager/PubSubManager.d.ts +19 -11
- package/dist/PubSubManager/PubSubManager.d.ts.map +1 -1
- package/dist/PubSubManager/PubSubManager.js +35 -25
- package/dist/PubSubManager/PubSubManager.js.map +1 -1
- package/dist/PubSubManager/addSub.d.ts.map +1 -1
- package/dist/PubSubManager/addSub.js +6 -6
- package/dist/PubSubManager/addSub.js.map +1 -1
- package/dist/PubSubManager/addSync.js +1 -1
- package/dist/PubSubManager/addSync.js.map +1 -1
- package/dist/PubSubManager/init/getDataWatchFunctionQuery.d.ts.map +1 -1
- package/dist/PubSubManager/init/getDataWatchFunctionQuery.js +22 -1
- package/dist/PubSubManager/init/getDataWatchFunctionQuery.js.map +1 -1
- package/dist/PubSubManager/notifListener.js +3 -3
- package/dist/PubSubManager/notifListener.js.map +1 -1
- package/dist/PubSubManager/pushSubData.d.ts +1 -1
- package/dist/PubSubManager/pushSubData.d.ts.map +1 -1
- package/dist/PubSubManager/pushSubData.js +21 -42
- package/dist/PubSubManager/pushSubData.js.map +1 -1
- package/dist/PubSubManager/refreshTriggers.d.ts.map +1 -1
- package/dist/PubSubManager/refreshTriggers.js +6 -5
- package/dist/PubSubManager/refreshTriggers.js.map +1 -1
- package/dist/PublishParser/PublishParser.d.ts +3 -6
- package/dist/PublishParser/PublishParser.d.ts.map +1 -1
- package/dist/PublishParser/PublishParser.js +32 -42
- package/dist/PublishParser/PublishParser.js.map +1 -1
- package/dist/PublishParser/getSchemaFromPublish.js +11 -11
- package/dist/PublishParser/getSchemaFromPublish.js.map +1 -1
- package/dist/PublishParser/getTableRulesWithoutFileTable.d.ts.map +1 -1
- package/dist/PublishParser/getTableRulesWithoutFileTable.js +2 -2
- package/dist/PublishParser/getTableRulesWithoutFileTable.js.map +1 -1
- package/dist/PublishParser/publishTypesAndUtils.d.ts +1 -0
- package/dist/PublishParser/publishTypesAndUtils.d.ts.map +1 -1
- package/dist/SyncReplication.d.ts.map +1 -1
- package/dist/SyncReplication.js +1 -1
- package/dist/SyncReplication.js.map +1 -1
- package/dist/initProstgles.d.ts +2 -2
- package/dist/initProstgles.d.ts.map +1 -1
- package/dist/initProstgles.js +14 -1
- package/dist/initProstgles.js.map +1 -1
- package/dist/runClientRequest.d.ts.map +1 -1
- package/dist/runClientRequest.js +4 -3
- package/dist/runClientRequest.js.map +1 -1
- package/lib/DboBuilder/QueryStreamer.ts +1 -1
- package/lib/DboBuilder/ViewHandler/ViewHandler.ts +32 -30
- package/lib/DboBuilder/ViewHandler/subscribe.ts +22 -48
- package/lib/Logging.ts +3 -1
- package/lib/PubSubManager/PubSubManager.ts +50 -42
- package/lib/PubSubManager/addSub.ts +13 -8
- package/lib/PubSubManager/addSync.ts +1 -1
- package/lib/PubSubManager/init/getDataWatchFunctionQuery.ts +28 -1
- package/lib/PubSubManager/notifListener.ts +8 -8
- package/lib/PubSubManager/pushSubData.ts +20 -35
- package/lib/PubSubManager/refreshTriggers.ts +9 -8
- package/lib/PublishParser/PublishParser.ts +40 -52
- package/lib/PublishParser/getSchemaFromPublish.ts +21 -21
- package/lib/PublishParser/getTableRulesWithoutFileTable.ts +5 -6
- package/lib/PublishParser/publishTypesAndUtils.ts +1 -0
- package/lib/SyncReplication.ts +1 -0
- package/lib/initProstgles.ts +21 -3
- package/lib/runClientRequest.ts +6 -5
- package/package.json +3 -3
|
@@ -46,7 +46,7 @@ class QueryStreamer {
|
|
|
46
46
|
const socketQueries = this.socketQueries.get(socketId);
|
|
47
47
|
if (!socketQueries)
|
|
48
48
|
return;
|
|
49
|
-
|
|
49
|
+
Array.from(socketQueries.values()).forEach(({ client, stop }) => {
|
|
50
50
|
stop?.();
|
|
51
51
|
/** end does not stop active query?! */
|
|
52
52
|
void client?.end();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryStreamer.js","sourceRoot":"","sources":["../../lib/DboBuilder/QueryStreamer.ts"],"names":[],"mappings":";;;AAAA,yBAAyB;AAGzB,qDAA+D;AAM/D,uDAA0F;AAC1F,qCAAgD;AAChD,MAAM,MAAM,GAAG,OAAO,CAAC,WAAW,CAAsB,CAAC;AAsBzD,MAAM,qBAAqB,GAAwB,IAAI,GAAG,EAAE,CAAC;AAC7D,MAAM,mBAAmB,GAAG,CAAC,QAAgB,EAAE,EAAE;IAC/C,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACrC,MAAM,MAAM,GAAG,qBAAqB,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACvD,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,CAAC;IACzB,qBAAqB,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC1C,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,MAAa,aAAa;IACxB,EAAE,CAAK;IACP,UAAU,CAAa;IACvB,aAAa,GAA4C,IAAI,GAAG,EAAE,CAAC;IACnE,WAAW,CAAY;IACvB,YAAY,UAAsB;QAChC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,EAAE,GAAG,UAAU,CAAC,EAAE,CAAC;QACxB,MAAM,cAAc,GAAG,GAAG,EAAE;YAC1B,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACtE,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;QACpC,CAAC,CAAC;QACF,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,aAAa,CACnC,CAAC,KAAK,EAAE,EAAE;YACR,IAAI,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,gBAAgB,CAAC;gBAClF,OAAO;YACT,OAAO,CAAC,GAAG,CAAC,qCAAqC,EAAE,KAAK,CAAC,CAAC;YAC1D,KAAK,cAAc,EAAE,CAAC;QACxB,CAAC,EACD,EAAE,SAAS,EAAE,IAAI,EAAE,CACpB,CAAC;QACF,KAAK,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;IAClC,CAAC;IAED,aAAa,GAAG,CAAC,OAAyC,EAAE,YAA8B,EAAE,EAAE;QAC5F,MAAM,cAAc,GAClB,OAAO,IAAI,CAAC,EAAE,CAAC,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,CAAE,IAAI,CAAC,EAAE,CAAC,GAAW,CAAC;QAC7F,MAAM,MAAM,GAAG,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE,GAAG,cAAc,EAAE,GAAG,YAAY,EAAE,CAAC,CAAC;QACrE,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YACzB,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC;QACjB,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;IACF,YAAY,GAAG,CAAC,QAAgB,EAAE,EAAE;QAClC,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACvD,IAAI,CAAC,aAAa;YAAE,OAAO;QAC3B,
|
|
1
|
+
{"version":3,"file":"QueryStreamer.js","sourceRoot":"","sources":["../../lib/DboBuilder/QueryStreamer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type * as pgPromise from "pg-promise";
|
|
2
|
-
import type { AnyObject, ColumnInfo, FieldFilter, SelectParams, SubscribeParams } from "prostgles-types";
|
|
2
|
+
import type { AnyObject, ColumnInfo, FieldFilter, SelectParams, SubscribeParams, SubscriptionChannels } from "prostgles-types";
|
|
3
3
|
import type { TableEvent } from "../../Logging";
|
|
4
4
|
import type { DB } from "../../Prostgles";
|
|
5
5
|
import type { Join } from "../../ProstglesTypes";
|
|
@@ -7,7 +7,7 @@ import type { ParsedTableRule } from "../../PublishParser/PublishParser";
|
|
|
7
7
|
import type { Graph } from "../../shortestPath";
|
|
8
8
|
import type { DboBuilder, Filter, LocalParams, TableHandlers } from "../DboBuilder";
|
|
9
9
|
import type { TableSchema } from "../DboBuilderTypes";
|
|
10
|
-
import type {
|
|
10
|
+
import type { OnData } from "./subscribe";
|
|
11
11
|
export type JoinPaths = {
|
|
12
12
|
t1: string;
|
|
13
13
|
t2: string;
|
|
@@ -60,14 +60,14 @@ export declare class ViewHandler {
|
|
|
60
60
|
getValidatedRules: (tableRules?: ParsedTableRule | undefined, localParams?: LocalParams | undefined) => import("../DboBuilderTypes").ValidatedTableRules;
|
|
61
61
|
find: (filter?: Filter | undefined, selectParams?: SelectParams | undefined, _?: undefined, tableRules?: ParsedTableRule | undefined, localParams?: LocalParams | undefined) => Promise<any[]>;
|
|
62
62
|
findOne(filter?: Filter, selectParams?: SelectParams, _param3_unused?: undefined, table_rules?: ParsedTableRule, localParams?: LocalParams): Promise<any>;
|
|
63
|
-
subscribe(filter: Filter, params: SubscribeParams,
|
|
63
|
+
subscribe(filter: Filter, params: SubscribeParams, onData: OnData): Promise<{
|
|
64
64
|
unsubscribe: () => any;
|
|
65
65
|
}>;
|
|
66
|
-
subscribe(filter: Filter, params: SubscribeParams,
|
|
67
|
-
subscribeOne(filter: Filter, params: SubscribeParams,
|
|
66
|
+
subscribe(filter: Filter, params: SubscribeParams, onData?: OnData, table_rules?: ParsedTableRule, localParams?: LocalParams): Promise<SubscriptionChannels>;
|
|
67
|
+
subscribeOne(filter: Filter, params: SubscribeParams, onData: (item: AnyObject | undefined, error?: unknown) => any): Promise<{
|
|
68
68
|
unsubscribe: () => any;
|
|
69
69
|
}>;
|
|
70
|
-
subscribeOne(filter: Filter, params: SubscribeParams,
|
|
70
|
+
subscribeOne(filter: Filter, params: SubscribeParams, onData: undefined, table_rules: ParsedTableRule, localParams: LocalParams): Promise<SubscriptionChannels>;
|
|
71
71
|
count: (_filter?: Filter | undefined, selectParams?: SelectParams | undefined, _param3_unused?: undefined, table_rules?: ParsedTableRule | undefined, localParams?: LocalParams | undefined) => Promise<number>;
|
|
72
72
|
size: (_filter?: Filter | undefined, selectParams?: SelectParams | undefined, param3_unused?: undefined, table_rules?: ParsedTableRule | undefined, localParams?: LocalParams | undefined) => Promise<string>;
|
|
73
73
|
getAllowedSelectFields(selectParams: FieldFilter | undefined, allowed_cols: FieldFilter, allow_empty?: boolean): string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ViewHandler.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/ViewHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,SAAS,MAAM,YAAY,CAAC;AAC7C,OAAO,KAAK,EACV,SAAS,EACT,UAAU,EACV,WAAW,EACX,YAAY,EACZ,eAAe,
|
|
1
|
+
{"version":3,"file":"ViewHandler.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/ViewHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,SAAS,MAAM,YAAY,CAAC;AAC7C,OAAO,KAAK,EACV,SAAS,EACT,UAAU,EACV,WAAW,EACX,YAAY,EACZ,eAAe,EACf,oBAAoB,EACrB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAEpF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAStD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAK1C,MAAM,MAAM,SAAS,GAAG;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB,EAAE,CAAC;AAEJ,qBAAa,WAAW;IACtB,EAAE,EAAE,EAAE,CAAC;IACP,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAChC,eAAe,EAAE,UAAU,EAAE,CAAC;IAC9B,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,eAAe,EAAE,WAAW,CAAC;IAC7B,YAAY,EAAE,MAAM,EAAE,CAAM;IAC5B,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,SAAS,CAAC,EAAE,KAAK,CAAC;IAClB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,UAAU,EAAE,UAAU,CAAC;IAEvB,EAAE,CAAC,EAAE;QACH,CAAC,EAAE,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACvB,IAAI,EAAE,aAAa,CAAC;KACrB,CAAC;IACF,IAAI,SAAS,6BAEZ;IAED,OAAO,UAAQ;IACf,SAAS,SAAM;IACf,QAAQ,UAAS;gBAEf,EAAE,EAAE,EAAE,EACN,eAAe,EAAE,WAAW,EAC5B,UAAU,EAAE,UAAU,EACtB,EAAE,CAAC,EAAE;QAAE,CAAC,EAAE,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAAC,IAAI,EAAE,aAAa,CAAA;KAAE,EACpD,SAAS,CAAC,EAAE,SAAS;IAyBvB,IAAI,GAAI,kDAML,IAAI,CAAC,UAAU,EAAE,SAAS,GAAG,MAAM,GAAG,aAAa,CAAC,GAAG;QACxD,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE,GAAG,CAAC;KACb,0BAoBC;IAEF,gBAAgB,CAAC,aAAa,EAAE,WAAW,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM;IAiBzF,iBAAiB;;;;;;;2BAAgC;IAqCjD,WAAW,CAAC,MAAM,EAAE,GAAG;IAKvB,OAAO,2LAAsB;IAE7B,UAAU;;;qLAAyB;IAEnC,iBAAiB,wIAAgC;IAEjD,IAAI,2LAAmB;IAEjB,OAAO,CACX,MAAM,CAAC,EAAE,MAAM,EACf,YAAY,CAAC,EAAE,YAAY,EAC3B,cAAc,CAAC,EAAE,SAAS,EAC1B,WAAW,CAAC,EAAE,eAAe,EAC7B,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,GAAG,CAAC;IA8BT,SAAS,CACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;QAAE,WAAW,EAAE,MAAM,GAAG,CAAA;KAAE,CAAC;IAEhC,SAAS,CACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,eAAe,EACvB,MAAM,CAAC,EAAE,MAAM,EACf,WAAW,CAAC,EAAE,eAAe,EAC7B,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,oBAAoB,CAAC;IAqBhC,YAAY,CACV,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,CAAC,IAAI,EAAE,SAAS,GAAG,SAAS,EAAE,KAAK,CAAC,EAAE,OAAO,KAAK,GAAG,GAC5D,OAAO,CAAC;QAAE,WAAW,EAAE,MAAM,GAAG,CAAA;KAAE,CAAC;IACtC,YAAY,CACV,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,eAAe,EAC5B,WAAW,EAAE,WAAW,GACvB,OAAO,CAAC,oBAAoB,CAAC;IAehC,KAAK,2MAAoB;IACzB,IAAI,0MAAmB;IAEvB,sBAAsB,CACpB,YAAY,EAAE,WAAW,YAAM,EAC/B,YAAY,EAAE,WAAW,EACzB,WAAW,UAAO,GACjB,MAAM,EAAE;IAqBX;;OAEG;IACH,YAAY;;;;;OAA2B;IAEvC,gBAAgB,CACd,aAAa,EAAE,WAAW,EAC1B,iBAAiB,EAAE,WAAW,EAC9B,sBAAsB,UAAQ,GAC7B,MAAM,EAAE;IAiBX,gBAAgB,CACd,WAAW,GAAE,WAAiB,EAC9B,WAAW,UAAO,EAClB,YAAY,CAAC,EAAE,MAAM,EAAE,GACtB,MAAM,EAAE;CAGZ;AAED;;GAEG;AACH,eAAO,MAAM,WAAW,GAAI,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK,CAAC,EAAE,aAAa,MAAM,EAAE,KAAG,CAS1F,CAAC"}
|
|
@@ -155,16 +155,14 @@ class ViewHandler {
|
|
|
155
155
|
});
|
|
156
156
|
}
|
|
157
157
|
}
|
|
158
|
-
async subscribe(filter, params,
|
|
158
|
+
async subscribe(filter, params, onData, table_rules, localParams) {
|
|
159
|
+
const result = await subscribe_1.subscribe.bind(this)(filter, params,
|
|
159
160
|
//@ts-ignore
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
localFuncs, table_rules, localParams);
|
|
161
|
+
onData, table_rules, localParams);
|
|
162
|
+
return result;
|
|
163
163
|
}
|
|
164
|
-
subscribeOne(filter, params = {},
|
|
165
|
-
|
|
166
|
-
const func = localParams ? undefined : (rows) => localFunc(rows[0]);
|
|
167
|
-
//@ts-ignore
|
|
164
|
+
subscribeOne(filter, params = {}, onData, table_rules, localParams) {
|
|
165
|
+
const func = localParams || !onData ? undefined : ((rows, error) => onData(rows[0], error));
|
|
168
166
|
return this.subscribe(filter, { ...params, limit: 2 }, func, table_rules, localParams);
|
|
169
167
|
}
|
|
170
168
|
count = count_1.count.bind(this);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ViewHandler.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/ViewHandler.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"ViewHandler.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/ViewHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,19 +2,11 @@ import type { AnyObject, SubscribeParams, SubscriptionChannels } from "prostgles
|
|
|
2
2
|
import type { ParsedTableRule } from "../../PublishParser/PublishParser";
|
|
3
3
|
import type { Filter, LocalParams } from "../DboBuilder";
|
|
4
4
|
import type { ViewHandler } from "./ViewHandler";
|
|
5
|
-
type OnData = (items: AnyObject[]) => any;
|
|
6
|
-
export
|
|
7
|
-
|
|
8
|
-
onError?: (error: any) => void;
|
|
9
|
-
} | OnData;
|
|
10
|
-
export declare const getOnDataFunc: (localFuncs: LocalFuncs | undefined) => OnData | undefined;
|
|
11
|
-
export declare const matchesLocalFuncs: (localFuncs1: LocalFuncs | undefined, localFuncs2: LocalFuncs | undefined) => boolean | undefined;
|
|
12
|
-
export declare const parseLocalFuncs: (localFuncs1: LocalFuncs | undefined) => Extract<LocalFuncs, {
|
|
13
|
-
onData: OnData;
|
|
14
|
-
}> | undefined;
|
|
15
|
-
declare function subscribe(this: ViewHandler, filter: Filter, params: SubscribeParams, localFuncs: LocalFuncs): Promise<{
|
|
5
|
+
export type OnData = (items: AnyObject[], error?: unknown) => any;
|
|
6
|
+
export declare const matchesLocalFuncs: (localFuncs1: OnData | undefined, localFuncs2: OnData | undefined) => boolean | undefined;
|
|
7
|
+
declare function subscribe(this: ViewHandler, filter: Filter, params: SubscribeParams, onData: OnData): Promise<{
|
|
16
8
|
unsubscribe: () => any;
|
|
17
9
|
}>;
|
|
18
|
-
declare function subscribe(this: ViewHandler, filter: Filter, params: SubscribeParams,
|
|
10
|
+
declare function subscribe(this: ViewHandler, filter: Filter, params: SubscribeParams, onData: undefined, table_rules: ParsedTableRule | undefined, localParams: LocalParams): Promise<SubscriptionChannels>;
|
|
19
11
|
export { subscribe };
|
|
20
12
|
//# sourceMappingURL=subscribe.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subscribe.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/subscribe.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACxF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"subscribe.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/subscribe.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACxF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAIzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAGjD,MAAM,MAAM,MAAM,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,KAAK,CAAC,EAAE,OAAO,KAAK,GAAG,CAAC;AAElE,eAAO,MAAM,iBAAiB,GAC5B,aAAa,MAAM,GAAG,SAAS,EAC/B,aAAa,MAAM,GAAG,SAAS,wBAGhC,CAAC;AAEF,iBAAe,SAAS,CACtB,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,WAAW,EAAE,MAAM,GAAG,CAAA;CAAE,CAAC,CAAC;AACvC,iBAAe,SAAS,CACtB,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,eAAe,GAAG,SAAS,EACxC,WAAW,EAAE,WAAW,GACvB,OAAO,CAAC,oBAAoB,CAAC,CAAC;AA2HjC,OAAO,EAAE,SAAS,EAAE,CAAC"}
|
|
@@ -1,28 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.matchesLocalFuncs = void 0;
|
|
4
4
|
exports.subscribe = subscribe;
|
|
5
5
|
const DboBuilder_1 = require("../DboBuilder");
|
|
6
6
|
const getSubscribeRelatedTables_1 = require("../getSubscribeRelatedTables");
|
|
7
7
|
const getValidatedSubscribeOptions_1 = require("./getValidatedSubscribeOptions");
|
|
8
|
-
const getOnDataFunc = (localFuncs) => {
|
|
9
|
-
return typeof localFuncs === "function" ? localFuncs : localFuncs?.onData;
|
|
10
|
-
};
|
|
11
|
-
exports.getOnDataFunc = getOnDataFunc;
|
|
12
8
|
const matchesLocalFuncs = (localFuncs1, localFuncs2) => {
|
|
13
|
-
return localFuncs1 && localFuncs2 &&
|
|
9
|
+
return localFuncs1 && localFuncs2 && localFuncs1 === localFuncs2;
|
|
14
10
|
};
|
|
15
11
|
exports.matchesLocalFuncs = matchesLocalFuncs;
|
|
16
|
-
|
|
17
|
-
return (!localFuncs1 ? undefined
|
|
18
|
-
: typeof localFuncs1 === "function" ?
|
|
19
|
-
{
|
|
20
|
-
onData: localFuncs1,
|
|
21
|
-
}
|
|
22
|
-
: localFuncs1);
|
|
23
|
-
};
|
|
24
|
-
exports.parseLocalFuncs = parseLocalFuncs;
|
|
25
|
-
async function subscribe(filter, params, localFuncs, table_rules, localParams) {
|
|
12
|
+
async function subscribe(filter, params, onData, table_rules, localParams) {
|
|
26
13
|
const start = Date.now();
|
|
27
14
|
try {
|
|
28
15
|
if (!this.dboBuilder.canSubscribe) {
|
|
@@ -32,12 +19,11 @@ async function subscribe(filter, params, localFuncs, table_rules, localParams) {
|
|
|
32
19
|
throw "subscribe not allowed within transactions";
|
|
33
20
|
}
|
|
34
21
|
const clientReq = localParams?.clientReq;
|
|
35
|
-
if (!clientReq && !
|
|
36
|
-
throw " missing data.
|
|
22
|
+
if (!clientReq && !onData) {
|
|
23
|
+
throw " missing data. expecting onData | localParams { socket } ";
|
|
37
24
|
}
|
|
38
|
-
if (clientReq?.socket &&
|
|
39
|
-
|
|
40
|
-
throw " Cannot have localFunc AND socket ";
|
|
25
|
+
if (clientReq?.socket && onData) {
|
|
26
|
+
throw " Cannot have onData and socket ";
|
|
41
27
|
}
|
|
42
28
|
const { throttle, throttleOpts, skipFirst, actions, skipChangedColumnsCheck, ...selectParams } = params;
|
|
43
29
|
/** Ensure request is valid */
|
|
@@ -64,12 +50,12 @@ async function subscribe(filter, params, localFuncs, table_rules, localParams) {
|
|
|
64
50
|
tracked_columns,
|
|
65
51
|
};
|
|
66
52
|
const pubSubManager = await this.dboBuilder.getPubSubManager();
|
|
67
|
-
if (!
|
|
53
|
+
if (!onData) {
|
|
68
54
|
const { socket } = clientReq ?? {};
|
|
69
55
|
const result = await pubSubManager.addSub({
|
|
70
56
|
...commonSubOpts,
|
|
71
57
|
socket,
|
|
72
|
-
|
|
58
|
+
onData: undefined,
|
|
73
59
|
socket_id: socket?.id,
|
|
74
60
|
});
|
|
75
61
|
await this._log({
|
|
@@ -84,12 +70,12 @@ async function subscribe(filter, params, localFuncs, table_rules, localParams) {
|
|
|
84
70
|
const { channelName, sendFirstData } = await pubSubManager.addSub({
|
|
85
71
|
...commonSubOpts,
|
|
86
72
|
socket: undefined,
|
|
87
|
-
|
|
73
|
+
onData,
|
|
88
74
|
socket_id: undefined,
|
|
89
75
|
});
|
|
90
76
|
const unsubscribe = async () => {
|
|
91
77
|
const pubSubManager = await this.dboBuilder.getPubSubManager();
|
|
92
|
-
pubSubManager.removeSubscription(channelName, { type: "local",
|
|
78
|
+
pubSubManager.removeSubscription(channelName, { type: "local", onData });
|
|
93
79
|
};
|
|
94
80
|
await this._log({
|
|
95
81
|
command: "subscribe",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subscribe.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/subscribe.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"subscribe.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/subscribe.ts"],"names":[],"mappings":"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"}
|
package/dist/Logging.d.ts
CHANGED
|
@@ -46,6 +46,7 @@ export declare namespace EventTypes {
|
|
|
46
46
|
tableName: string;
|
|
47
47
|
localParams?: LocalParams;
|
|
48
48
|
};
|
|
49
|
+
type MapValue<M> = M extends Map<any, infer V> ? V : never;
|
|
49
50
|
export type SyncOrSub = DebugInfo & {
|
|
50
51
|
type: "syncOrSub";
|
|
51
52
|
connectedSocketIds: string[];
|
|
@@ -67,7 +68,7 @@ export declare namespace EventTypes {
|
|
|
67
68
|
command: "notifListener.Finished";
|
|
68
69
|
op_name: string | undefined;
|
|
69
70
|
condition_ids_str: string | undefined;
|
|
70
|
-
tableTriggers: PubSubManagerTriggers
|
|
71
|
+
tableTriggers: MapValue<PubSubManagerTriggers> | undefined;
|
|
71
72
|
tableSyncs: string;
|
|
72
73
|
state: "ok" | "error" | "no-triggers" | "invalid_condition_ids";
|
|
73
74
|
}) | {
|
package/dist/Logging.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Logging.d.ts","sourceRoot":"","sources":["../lib/Logging.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Logging.d.ts","sourceRoot":"","sources":["../lib/Logging.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import type { DB } from "../Prostgles";
|
|
|
4
4
|
import { type AddTriggerParams } from "./addTrigger";
|
|
5
5
|
import type { AnyObject, FieldFilter, SelectParams, WAL } from "prostgles-types";
|
|
6
6
|
import { type SubscribeOptions } from "prostgles-types";
|
|
7
|
-
import type {
|
|
7
|
+
import type { OnData } from "../DboBuilder/ViewHandler/subscribe";
|
|
8
8
|
import type { EventTypes } from "../Logging";
|
|
9
9
|
import type { ParsedTableRule } from "../PublishParser/PublishParser";
|
|
10
10
|
export type BasicCallback = (err?: any, res?: any) => void;
|
|
@@ -71,16 +71,16 @@ export type SubscriptionParams = {
|
|
|
71
71
|
selectParams: SelectParams;
|
|
72
72
|
subscribeOptions: SubscribeOptions;
|
|
73
73
|
tracked_columns: string[] | undefined;
|
|
74
|
-
|
|
74
|
+
onData?: OnData;
|
|
75
75
|
socket: PRGLIOSocket | undefined;
|
|
76
76
|
lastPushed: number;
|
|
77
77
|
is_throttling?: any;
|
|
78
78
|
is_ready?: boolean;
|
|
79
79
|
};
|
|
80
|
-
export type Subscription = Pick<SubscriptionParams, "selectParams" | "subscribeOptions" | "is_throttling" | "lastPushed" | "channel_name" | "is_ready" | "
|
|
80
|
+
export type Subscription = Pick<SubscriptionParams, "selectParams" | "subscribeOptions" | "is_throttling" | "lastPushed" | "channel_name" | "is_ready" | "onData" | "socket" | "socket_id" | "table_info" | "filter" | "table_rules" | "tracked_columns"> & {
|
|
81
81
|
triggers: AddTriggerParams[];
|
|
82
82
|
};
|
|
83
|
-
export type PubSubManagerTriggers =
|
|
83
|
+
export type PubSubManagerTriggers = Map<string, {
|
|
84
84
|
condition: string;
|
|
85
85
|
hash: string;
|
|
86
86
|
}[]>;
|
|
@@ -113,11 +113,11 @@ export declare class PubSubManager {
|
|
|
113
113
|
appChecking: boolean;
|
|
114
114
|
checkedListenerTableCond?: string[];
|
|
115
115
|
initialiseEventTriggers: () => Promise<boolean>;
|
|
116
|
-
getClientSubs({ channel_name,
|
|
116
|
+
getClientSubs({ channel_name, onData, socket_id, }: Pick<Subscription, "onData" | "socket_id" | "channel_name">): Subscription[];
|
|
117
117
|
getTriggerSubs(table_name: string, condition: string): Subscription[];
|
|
118
118
|
removeSubscription: (channelName: string, subInfo: {
|
|
119
119
|
type: "local";
|
|
120
|
-
|
|
120
|
+
onData: OnData;
|
|
121
121
|
} | {
|
|
122
122
|
type: "ws";
|
|
123
123
|
socket: PRGLIOSocket;
|
|
@@ -140,14 +140,22 @@ export declare class PubSubManager {
|
|
|
140
140
|
hash: string;
|
|
141
141
|
idx: number;
|
|
142
142
|
}[];
|
|
143
|
+
getAllActiveTriggers: () => {
|
|
144
|
+
tableName: string;
|
|
145
|
+
subs: Subscription[];
|
|
146
|
+
syncs: SyncParams[];
|
|
147
|
+
condition: string;
|
|
148
|
+
hash: string;
|
|
149
|
+
idx: number;
|
|
150
|
+
}[];
|
|
143
151
|
getSubData: (sub: Subscription) => Promise<{
|
|
144
|
-
data:
|
|
152
|
+
data: AnyObject[];
|
|
145
153
|
err?: undefined;
|
|
146
154
|
} | {
|
|
155
|
+
err: string | any[] | AnyObject;
|
|
147
156
|
data?: undefined;
|
|
148
|
-
err: unknown;
|
|
149
157
|
}>;
|
|
150
|
-
pushSubData: (sub: Subscription, err?: any) => Promise<
|
|
158
|
+
pushSubData: (sub: Subscription, err?: any) => Promise<true | undefined>;
|
|
151
159
|
upsertSocket(socket: PRGLIOSocket | undefined): void;
|
|
152
160
|
get connectedSocketIds(): string[];
|
|
153
161
|
_log: (params: EventTypes.Sync | EventTypes.SyncOrSub) => void | Promise<void> | undefined;
|
|
@@ -171,10 +179,10 @@ export declare class PubSubManager {
|
|
|
171
179
|
refreshTriggers: () => Promise<void>;
|
|
172
180
|
/** Throttle trigger deletes */
|
|
173
181
|
deletingOrphanedTriggers: {
|
|
174
|
-
tableNames: string
|
|
182
|
+
tableNames: Set<string>;
|
|
175
183
|
timeout: NodeJS.Timeout;
|
|
176
184
|
} | undefined;
|
|
177
|
-
deleteOrphanedTriggers: (
|
|
185
|
+
deleteOrphanedTriggers: (latestTableNames: Set<string>) => void;
|
|
178
186
|
addingTrigger: any;
|
|
179
187
|
addTriggerPool?: Record<string, string[]>;
|
|
180
188
|
addTrigger: (params: AddTriggerParams, viewOptions: ViewSubscriptionOptions | undefined, socket: PRGLIOSocket | undefined) => Promise<import("prostgles-types").TryCatchResult<{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PubSubManager.d.ts","sourceRoot":"","sources":["../../lib/PubSubManager/PubSubManager.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,eAAe,EACf,UAAU,EACV,YAAY,EACZ,SAAS,EACT,eAAe,EAChB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AAChF,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAEvC,OAAO,EAAc,KAAK,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAMjE,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACjF,OAAO,
|
|
1
|
+
{"version":3,"file":"PubSubManager.d.ts","sourceRoot":"","sources":["../../lib/PubSubManager/PubSubManager.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,eAAe,EACf,UAAU,EACV,YAAY,EACZ,SAAS,EACT,eAAe,EAChB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AAChF,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAEvC,OAAO,EAAc,KAAK,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAMjE,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACjF,OAAO,EAAkC,KAAK,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAGxF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qCAAqC,CAAC;AAElE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAOtE,MAAM,MAAM,aAAa,GAAG,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;AAE3D,MAAM,MAAM,UAAU,GAAG;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,eAAe,CAAC;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE;QACN,MAAM,EAAE,WAAW,CAAC;KACrB,CAAC;IACF,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,EAAE,CAAC,EAAE,SAAS,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,YAAY,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,WAAW,EAAE,eAAe,CAAC;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE;QACN,MAAM,EAAE,WAAW,CAAC;KACrB,CAAC;IACF,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG,CAClC;IACE,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB,GACD;IACE,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,UAAU,CAAC,EAAE,SAAS,CAAC;CACxB,CACJ,GAAG;IACF,aAAa,EAAE;QACb,SAAS,EAAE,MAAM,CAAC;QAClB,gBAAgB,EAAE,MAAM,CAAC;QACzB,SAAS,EAAE,MAAM,CAAC;KACnB,EAAE,CAAC;CACL,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IAErB;;SAEK;IACL,WAAW,CAAC,EAAE,uBAAuB,CAAC;IACtC,eAAe,EAAE,IAAI,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,GAAG,SAAS,CAAC;IAEzE,UAAU,EAAE,eAAe,CAAC;IAG5B,WAAW,CAAC,EAAE,eAAe,CAAC;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,YAAY,CAAC;IAC3B,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,eAAe,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAEtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,YAAY,GAAG,SAAS,CAAC;IAEjC,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,IAAI,CAC7B,kBAAkB,EAChB,cAAc,GACd,kBAAkB,GAClB,eAAe,GACf,YAAY,GACZ,cAAc,GACd,UAAU,GACV,QAAQ,GACR,QAAQ,GACR,WAAW,GACX,YAAY,GACZ,QAAQ,GACR,aAAa,GACb,iBAAiB,CACpB,GAAG;IACF,QAAQ,EAAE,gBAAgB,EAAE,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,GAAG,CAAC,MAAM,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAAE,CAAC,CAAC;AAEvF;;GAEG;AACH,qBAAa,aAAa;IACxB,OAAc,MAAM,GAAU,YAAY,UAAU,wCAIlD;IAEF,kBAAkB,UAAS;IAC3B,IAAI,KAAK,wDAER;IACD,IAAI,EAAE,IAAI,EAAE,CAEX;IACD,IAAI,GAAG,IAAI,eAAe,CAEzB;IAED,UAAU,EAAE,UAAU,CAAC;IAEvB;;;OAGG;IACH,SAAS,EAAE,qBAAqB,CAAa;IAC7C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAM;IAE3C,IAAI,EAAE,YAAY,EAAE,CAAM;IAC1B,KAAK,EAAE,UAAU,EAAE,CAAM;IACzB,QAAQ,CAAC,oBAAoB,SAAqB;IAClD,0BAA0B,CAAC,EAAE,0BAA0B,CAAC;IAExD,OAAO;IAYP,mBAAmB,SAAa;IAChC,QAAQ,CAAC,EAAE,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC;IAE1C,SAAS,UAAS;IAClB,OAAO,sBAaL;IAEF,cAAc,gBAMZ;IAEF,WAAW,UAAS;IACpB,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAC;IACpC,uBAAuB,yBAAsC;IAE7D,aAAa,CAAC,EACZ,YAAY,EACZ,MAAM,EACN,SAAS,GACV,EAAE,IAAI,CAAC,YAAY,EAAE,QAAQ,GAAG,WAAW,GAAG,cAAc,CAAC,GAAG,YAAY,EAAE;IAS/E,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,YAAY,EAAE;IAKrE,kBAAkB,GAChB,aAAa,MAAM,EACnB,SAAS;QAAE,IAAI,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,IAAI,EAAE,IAAI,CAAC;QAAC,MAAM,EAAE,YAAY,CAAA;KAAE,UA0BjF;IAEF,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAM9C,aAAa;;wBAA4B;IAEzC,cAAc,GAAI,WAAW,MAAM;;;mBAxIwB,MAAM;cAAQ,MAAM;;oBAgJ7E;IACF,iBAAiB,GAAI,WAAW,MAAM;;;mBAjJqB,MAAM;cAAQ,MAAM;;QAsJ7E;IAEF,oBAAoB;;;;mBAxJuC,MAAM;cAAQ,MAAM;;QA+J7E;IAEF,UAAU,GAAU,KAAK,YAAY;;;;;;OAyBnC;IAEF,WAAW,8DAA0B;IAErC,YAAY,CAAC,MAAM,EAAE,YAAY,GAAG,SAAS;IAsC7C,IAAI,kBAAkB,aAErB;IACD,IAAI,GAAI,QAAQ,UAAU,CAAC,IAAI,GAAG,UAAU,CAAC,SAAS,sCAKpD;IAEF,WAAW,CAAC,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;IAC5C,QAAQ,4IAAuB;IAE/B,OAAO;;OAAsB;IAE7B,MAAM;;;;OAAqB;IAE3B,kBAAkB,QAAO;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,EAAE,CAkBlE;IAEF;;UAEM;IACN,eAAe,sBAA8B;IAE7C,+BAA+B;IAC/B,wBAAwB,EACpB;QACE,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;QACxB,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC;KACzB,GACD,SAAS,CAAC;IACd,sBAAsB,GAAI,kBAAkB,GAAG,CAAC,MAAM,CAAC,UAarD;IAEF,aAAa,EAAE,GAAG,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAa;IACtD,UAAU;;;;QAAyB;CACpC"}
|
|
@@ -43,7 +43,7 @@ class PubSubManager {
|
|
|
43
43
|
* Triggers used for sync/sub that reflect prostgles.app_triggers.
|
|
44
44
|
* Updated through refreshTriggers()
|
|
45
45
|
*/
|
|
46
|
-
_triggers =
|
|
46
|
+
_triggers = new Map();
|
|
47
47
|
sockets = {};
|
|
48
48
|
subs = [];
|
|
49
49
|
syncs = [];
|
|
@@ -87,10 +87,10 @@ class PubSubManager {
|
|
|
87
87
|
appChecking = false;
|
|
88
88
|
checkedListenerTableCond;
|
|
89
89
|
initialiseEventTriggers = initialiseEventTriggers_1.initialiseEventTriggers.bind(this);
|
|
90
|
-
getClientSubs({ channel_name,
|
|
90
|
+
getClientSubs({ channel_name, onData, socket_id, }) {
|
|
91
91
|
return this.subs.filter((s) => {
|
|
92
92
|
return (s.channel_name === channel_name &&
|
|
93
|
-
((0, subscribe_1.matchesLocalFuncs)(
|
|
93
|
+
((0, subscribe_1.matchesLocalFuncs)(onData, s.onData) || (socket_id && s.socket_id === socket_id)));
|
|
94
94
|
});
|
|
95
95
|
}
|
|
96
96
|
getTriggerSubs(table_name, condition) {
|
|
@@ -100,19 +100,21 @@ class PubSubManager {
|
|
|
100
100
|
removeSubscription = (channelName, subInfo) => {
|
|
101
101
|
const matchingSubIdx = this.subs.findIndex((s) => s.channel_name === channelName &&
|
|
102
102
|
(subInfo.type === "local" ?
|
|
103
|
-
|
|
103
|
+
subInfo.onData === s.onData
|
|
104
104
|
: subInfo.socket.id === s.socket?.id));
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
105
|
+
const matchingSub = this.subs[matchingSubIdx];
|
|
106
|
+
if (matchingSub) {
|
|
107
|
+
/** Ensure we check and refresh related table/view triggers as well */
|
|
108
|
+
const oldActiveTriggers = this.getAllActiveTriggers();
|
|
108
109
|
this.subs.splice(matchingSubIdx, 1);
|
|
109
|
-
const newActiveTriggers = this.
|
|
110
|
+
const newActiveTriggers = this.getAllActiveTriggers();
|
|
111
|
+
const tableNames = new Set([...oldActiveTriggers, ...newActiveTriggers].map((t) => t.tableName));
|
|
110
112
|
if (newActiveTriggers.length < oldActiveTriggers.length) {
|
|
111
|
-
this.deleteOrphanedTriggers(
|
|
113
|
+
this.deleteOrphanedTriggers(tableNames);
|
|
112
114
|
}
|
|
113
115
|
}
|
|
114
116
|
else {
|
|
115
|
-
console.error("Could not unsubscribe
|
|
117
|
+
console.error("Could not unsubscribe. Subscription might not have initialised yet", {
|
|
116
118
|
channelName,
|
|
117
119
|
});
|
|
118
120
|
}
|
|
@@ -122,11 +124,11 @@ class PubSubManager {
|
|
|
122
124
|
}
|
|
123
125
|
notifListener = notifListener_1.notifListener.bind(this);
|
|
124
126
|
getTriggerInfo = (tableName) => {
|
|
125
|
-
const tableTriggerConditions = this._triggers
|
|
127
|
+
const tableTriggerConditions = this._triggers.get(tableName)?.map((triggerInfo, idx) => ({
|
|
126
128
|
idx,
|
|
127
|
-
...
|
|
128
|
-
subs: this.getTriggerSubs(tableName,
|
|
129
|
-
syncs: this.getSyncs(tableName,
|
|
129
|
+
...triggerInfo,
|
|
130
|
+
subs: this.getTriggerSubs(tableName, triggerInfo.condition),
|
|
131
|
+
syncs: this.getSyncs(tableName, triggerInfo.condition),
|
|
130
132
|
}));
|
|
131
133
|
return tableTriggerConditions;
|
|
132
134
|
};
|
|
@@ -134,24 +136,32 @@ class PubSubManager {
|
|
|
134
136
|
const activeTriggers = (this.getTriggerInfo(tableName) ?? []).filter((c) => c.subs.length || c.syncs.length);
|
|
135
137
|
return activeTriggers;
|
|
136
138
|
};
|
|
139
|
+
getAllActiveTriggers = () => {
|
|
140
|
+
return Array.from(this._triggers.keys()).flatMap((tableName) => {
|
|
141
|
+
return this.getActiveTriggers(tableName).map((triggerInfo) => ({
|
|
142
|
+
...triggerInfo,
|
|
143
|
+
tableName,
|
|
144
|
+
}));
|
|
145
|
+
});
|
|
146
|
+
};
|
|
137
147
|
getSubData = async (sub) => {
|
|
138
|
-
const { table_info, filter, selectParams: params, table_rules, socket,
|
|
148
|
+
const { table_info, filter, selectParams: params, table_rules, socket, onData } = sub; //, subOne = false
|
|
139
149
|
const { name: table_name } = table_info;
|
|
140
150
|
const tableHandler = this.dbo[table_name];
|
|
141
|
-
if (!
|
|
151
|
+
if (!onData && !socket) {
|
|
142
152
|
throw new Error("Subscription must have either localFuncs or socket");
|
|
143
153
|
}
|
|
144
154
|
if (!tableHandler?.find) {
|
|
145
155
|
throw new Error(`this.dbo.${table_name}.find undefined`);
|
|
146
156
|
}
|
|
147
157
|
try {
|
|
148
|
-
const data = await tableHandler.find(filter, params, undefined, table_rules, socket && {
|
|
158
|
+
const data = (await tableHandler.find(filter, params, undefined, table_rules, socket && {
|
|
149
159
|
clientReq: { socket },
|
|
150
|
-
});
|
|
160
|
+
}));
|
|
151
161
|
return { data };
|
|
152
162
|
}
|
|
153
163
|
catch (err) {
|
|
154
|
-
return { err };
|
|
164
|
+
return { err: (0, prostgles_types_1.getSerialisableError)(err) || "Unknown error fetching subscription data" };
|
|
155
165
|
}
|
|
156
166
|
};
|
|
157
167
|
pushSubData = pushSubData_1.pushSubData.bind(this);
|
|
@@ -220,18 +230,18 @@ class PubSubManager {
|
|
|
220
230
|
refreshTriggers = refreshTriggers_1.refreshTriggers.bind(this);
|
|
221
231
|
/** Throttle trigger deletes */
|
|
222
232
|
deletingOrphanedTriggers;
|
|
223
|
-
deleteOrphanedTriggers = (
|
|
233
|
+
deleteOrphanedTriggers = (latestTableNames) => {
|
|
224
234
|
this.deletingOrphanedTriggers ??= {
|
|
225
|
-
tableNames:
|
|
235
|
+
tableNames: latestTableNames,
|
|
226
236
|
timeout: setTimeout(() => {
|
|
227
237
|
const tableNames = this.deletingOrphanedTriggers.tableNames;
|
|
228
238
|
this.deletingOrphanedTriggers = undefined;
|
|
229
|
-
void deleteOrphanedTriggers_1.deleteOrphanedTriggers.bind(this)(tableNames);
|
|
239
|
+
void deleteOrphanedTriggers_1.deleteOrphanedTriggers.bind(this)(Array.from(tableNames));
|
|
230
240
|
}, 1000),
|
|
231
241
|
};
|
|
232
|
-
|
|
233
|
-
this.deletingOrphanedTriggers
|
|
234
|
-
}
|
|
242
|
+
latestTableNames.forEach((latestTableName) => {
|
|
243
|
+
this.deletingOrphanedTriggers?.tableNames.add(latestTableName);
|
|
244
|
+
});
|
|
235
245
|
};
|
|
236
246
|
addingTrigger;
|
|
237
247
|
addTriggerPool = undefined;
|