prostgles-server 4.2.198 → 4.2.200
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/ViewHandler/ViewHandler.d.ts +1 -1
- package/dist/Logging.d.ts +31 -18
- package/dist/Logging.d.ts.map +1 -1
- package/dist/PubSubManager/PubSubManager.d.ts +15 -12
- package/dist/PubSubManager/PubSubManager.d.ts.map +1 -1
- package/dist/PubSubManager/PubSubManager.js +24 -8
- package/dist/PubSubManager/PubSubManager.js.map +1 -1
- package/dist/PubSubManager/addSub.d.ts.map +1 -1
- package/dist/PubSubManager/addSub.js +11 -0
- package/dist/PubSubManager/addSub.js.map +1 -1
- package/dist/PubSubManager/notifListener.d.ts.map +1 -1
- package/dist/PubSubManager/notifListener.js +20 -5
- package/dist/PubSubManager/notifListener.js.map +1 -1
- package/dist/PubSubManager/pushSubData.d.ts.map +1 -1
- package/dist/PubSubManager/pushSubData.js +20 -0
- package/dist/PubSubManager/pushSubData.js.map +1 -1
- package/lib/Logging.ts +51 -26
- package/lib/PubSubManager/PubSubManager.ts +29 -11
- package/lib/PubSubManager/addSub.ts +11 -0
- package/lib/PubSubManager/notifListener.ts +38 -31
- package/lib/PubSubManager/pushSubData.ts +24 -0
- package/package.json +1 -1
|
@@ -38,7 +38,7 @@ export declare class ViewHandler {
|
|
|
38
38
|
t: pgPromise.ITask<{}>;
|
|
39
39
|
dbTX: TableHandlers;
|
|
40
40
|
}, joinPaths?: JoinPaths);
|
|
41
|
-
_log: ({ command, data, localParams, duration, error, }: Pick<import("../../Logging").EventTypes.Table, "
|
|
41
|
+
_log: ({ command, data, localParams, duration, error, }: Pick<import("../../Logging").EventTypes.Table, "localParams" | "command" | "data"> & {
|
|
42
42
|
duration: number;
|
|
43
43
|
error?: any;
|
|
44
44
|
}) => Promise<void> | undefined;
|
package/dist/Logging.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { AnyObject, ClientSchema } from "prostgles-types";
|
|
1
|
+
import { AnyObject, ClientSchema, TableHandler } from "prostgles-types";
|
|
2
2
|
import { LocalParams } from "./DboBuilder/DboBuilder";
|
|
3
|
-
import {
|
|
3
|
+
import { NotifTypeName } from "./PubSubManager/PubSubManager";
|
|
4
4
|
type ClientInfo = {
|
|
5
5
|
socketId: string | undefined;
|
|
6
6
|
sid: string | undefined;
|
|
@@ -13,12 +13,12 @@ export declare namespace EventTypes {
|
|
|
13
13
|
export type Table = ClientInfo & DebugInfo & {
|
|
14
14
|
type: "table";
|
|
15
15
|
tableName: string;
|
|
16
|
-
command: keyof TableHandler;
|
|
16
|
+
command: keyof TableHandler | "sync";
|
|
17
17
|
txInfo: AnyObject | undefined;
|
|
18
18
|
data: AnyObject;
|
|
19
19
|
localParams: LocalParams | undefined;
|
|
20
20
|
};
|
|
21
|
-
type
|
|
21
|
+
export type Sync = ClientInfo & DebugInfo & {
|
|
22
22
|
type: "sync";
|
|
23
23
|
tableName: string;
|
|
24
24
|
localParams?: LocalParams;
|
|
@@ -26,18 +26,11 @@ export declare namespace EventTypes {
|
|
|
26
26
|
} & ({
|
|
27
27
|
command: "syncData";
|
|
28
28
|
source: "client" | "trigger";
|
|
29
|
-
connectedSocketIds: string[];
|
|
30
29
|
lr: string;
|
|
31
30
|
} | {
|
|
32
31
|
command: "upsertData" | "pushData";
|
|
33
32
|
rows: number;
|
|
34
33
|
socketId: string;
|
|
35
|
-
} | {
|
|
36
|
-
command: "addTrigger";
|
|
37
|
-
state: "ok" | "fail";
|
|
38
|
-
/** If no socket id then it's a local subscribe */
|
|
39
|
-
socketId: string | undefined;
|
|
40
|
-
condition: string;
|
|
41
34
|
} | {
|
|
42
35
|
command: "addSync" | "unsync";
|
|
43
36
|
socketId: string;
|
|
@@ -47,22 +40,42 @@ export declare namespace EventTypes {
|
|
|
47
40
|
socketId: string;
|
|
48
41
|
remainingSyncs: string;
|
|
49
42
|
remainingSubs: string;
|
|
50
|
-
connectedSocketIds: string[];
|
|
51
43
|
});
|
|
52
|
-
|
|
53
|
-
type: "sync";
|
|
44
|
+
type SyncOrSubWithClientInfo = ClientInfo & {
|
|
54
45
|
tableName: string;
|
|
55
46
|
localParams?: LocalParams;
|
|
47
|
+
};
|
|
48
|
+
export type SyncOrSub = DebugInfo & {
|
|
49
|
+
type: "syncOrSub";
|
|
56
50
|
connectedSocketIds: string[];
|
|
57
|
-
|
|
51
|
+
triggers: Record<string, string[]> | undefined;
|
|
52
|
+
} & ((SyncOrSubWithClientInfo & {
|
|
53
|
+
command: "addTrigger";
|
|
54
|
+
state: "ok" | "fail";
|
|
55
|
+
/** If no socket id then it's a local subscribe */
|
|
56
|
+
socketId: string | undefined;
|
|
57
|
+
condition: string;
|
|
58
|
+
}) | (SyncOrSubWithClientInfo & {
|
|
59
|
+
command: "unsubscribe";
|
|
60
|
+
channel_name: string;
|
|
61
|
+
}) | (SyncOrSubWithClientInfo & {
|
|
58
62
|
command: "notifListener";
|
|
63
|
+
notifType: NotifTypeName;
|
|
64
|
+
dataArr: any[];
|
|
65
|
+
}) | (SyncOrSubWithClientInfo & {
|
|
66
|
+
command: "notifListener.Finished";
|
|
59
67
|
op_name: string | undefined;
|
|
60
68
|
condition_ids_str: string | undefined;
|
|
61
69
|
tableTriggers: string[] | undefined;
|
|
62
70
|
tableSyncs: string;
|
|
63
71
|
state: "ok" | "error" | "no-triggers" | "invalid_condition_ids";
|
|
64
|
-
}
|
|
65
|
-
|
|
72
|
+
}) | {
|
|
73
|
+
command: "pushSubData";
|
|
74
|
+
channel_name: string;
|
|
75
|
+
state: "sub_not_found" | "error" | "Emiting to socket" | "pushed to local client" | "no client to push data to" | "fetch data error";
|
|
76
|
+
} | {
|
|
77
|
+
command: "postgresNotifListenManager.create" | "postgresNotifListenManager.destroy";
|
|
78
|
+
});
|
|
66
79
|
export type Connection = (ClientInfo & {
|
|
67
80
|
type: "connect" | "disconnect";
|
|
68
81
|
socketId: string;
|
|
@@ -97,7 +110,7 @@ export declare namespace EventTypes {
|
|
|
97
110
|
});
|
|
98
111
|
export {};
|
|
99
112
|
}
|
|
100
|
-
export type EventInfo = EventTypes.Auth | EventTypes.Table | EventTypes.Method | EventTypes.Sync | EventTypes.
|
|
113
|
+
export type EventInfo = EventTypes.Auth | EventTypes.Table | EventTypes.Method | EventTypes.Sync | EventTypes.SyncOrSub | EventTypes.Connection | EventTypes.Debug;
|
|
101
114
|
export type TableEvent = EventTypes.Table;
|
|
102
115
|
export {};
|
|
103
116
|
//# sourceMappingURL=Logging.d.ts.map
|
package/dist/Logging.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Logging.d.ts","sourceRoot":"","sources":["../lib/Logging.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"Logging.d.ts","sourceRoot":"","sources":["../lib/Logging.ts"],"names":[],"mappings":"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"}
|
|
@@ -96,7 +96,7 @@ export declare class PubSubManager {
|
|
|
96
96
|
get db(): DB;
|
|
97
97
|
get dbo(): DBHandlerServer;
|
|
98
98
|
dboBuilder: DboBuilder;
|
|
99
|
-
_triggers
|
|
99
|
+
_triggers: Record<string, string[]> | undefined;
|
|
100
100
|
sockets: AnyObject;
|
|
101
101
|
subs: Subscription[];
|
|
102
102
|
syncs: SyncParams[];
|
|
@@ -128,7 +128,7 @@ export declare class PubSubManager {
|
|
|
128
128
|
pushSubData: (sub: Subscription, err?: any) => Promise<unknown>;
|
|
129
129
|
upsertSocket(socket: PRGLIOSocket | undefined): void;
|
|
130
130
|
get connectedSocketIds(): string[];
|
|
131
|
-
_log: (params: EventTypes.Sync) => Promise<void> | undefined;
|
|
131
|
+
_log: (params: EventTypes.Sync | EventTypes.SyncOrSub) => Promise<void> | undefined;
|
|
132
132
|
syncTimeout?: ReturnType<typeof setTimeout>;
|
|
133
133
|
syncData: (sync: SyncParams, clientData: import("../SyncReplication").ClientExpressData | undefined, source: "client" | "trigger") => Promise<void>;
|
|
134
134
|
addSync: (syncParams: AddSyncParams) => Promise<{
|
|
@@ -169,25 +169,28 @@ export declare class PubSubManager {
|
|
|
169
169
|
addTrigger(params: {
|
|
170
170
|
table_name: string;
|
|
171
171
|
condition: string;
|
|
172
|
-
}, viewOptions: ViewSubscriptionOptions | undefined, socket: PRGLIOSocket | undefined): Promise<
|
|
173
|
-
|
|
174
|
-
cond: string;
|
|
175
|
-
condHash: string;
|
|
176
|
-
} & {
|
|
177
|
-
hasError?: false | undefined;
|
|
178
|
-
error?: undefined;
|
|
179
|
-
duration: number;
|
|
180
|
-
}) | (Partial<Record<"tbl" | "cond" | "condHash", undefined>> & {
|
|
172
|
+
}, viewOptions: ViewSubscriptionOptions | undefined, socket: PRGLIOSocket | undefined): Promise<{
|
|
173
|
+
data?: undefined;
|
|
181
174
|
hasError: true;
|
|
182
175
|
error: unknown;
|
|
183
176
|
duration: number;
|
|
184
|
-
}
|
|
177
|
+
} | {
|
|
178
|
+
data: {
|
|
179
|
+
tbl: string;
|
|
180
|
+
cond: string;
|
|
181
|
+
condHash: string;
|
|
182
|
+
};
|
|
183
|
+
hasError?: false | undefined;
|
|
184
|
+
error?: undefined;
|
|
185
|
+
duration: number;
|
|
186
|
+
}>;
|
|
185
187
|
}
|
|
186
188
|
export declare const NOTIF_TYPE: {
|
|
187
189
|
readonly data: "data_has_changed";
|
|
188
190
|
readonly data_trigger_change: "data_watch_triggers_have_changed";
|
|
189
191
|
readonly schema: "schema_has_changed";
|
|
190
192
|
};
|
|
193
|
+
export type NotifTypeName = (typeof NOTIF_TYPE)[keyof typeof NOTIF_TYPE];
|
|
191
194
|
export declare const NOTIF_CHANNEL: {
|
|
192
195
|
preffix: "prostgles_";
|
|
193
196
|
getFull: (appID: string | undefined) => string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PubSubManager.d.ts","sourceRoot":"","sources":["../../lib/PubSubManager/PubSubManager.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"PubSubManager.d.ts","sourceRoot":"","sources":["../../lib/PubSubManager/PubSubManager.ts"],"names":[],"mappings":";AAMA,OAAO,EACL,eAAe,EACf,UAAU,EACV,YAAY,EACZ,SAAS,EACT,eAAe,EAChB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AAC3E,OAAO,EAAE,EAAE,EAAkB,MAAM,cAAc,CAAC;AAOlD,OAAO,EACL,SAAS,EAET,WAAW,EACX,YAAY,EACZ,eAAe,EACf,GAAG,EACJ,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,UAAU,EAAoC,MAAM,qCAAqC,CAAC;AAEnG,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAU3D,eAAO,MAAM,OAAO,MAAO,GAAG,WAA6B,CAAC;AAC5D,eAAO,MAAM,uBAAuB,KAAK,CAAC;AAE1C,eAAO,MAAM,GAAG,YAAa,GAAG,EAAE,SAIjC,CAAC;AAEF,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,SAAS,CAAC;IACxB,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,SAAS,CAAC;IACvB,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,IAAI,CAAC,eAAe,EAAE,UAAU,GAAG,cAAc,CAAC,GAAG;IACpF,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,SAAS,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,YAAY,CAAC;IAErB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,MAAM,EAAE,YAAY,GAAG,SAAS,CAAC;IAEjC,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,IAAI,CAC7B,kBAAkB,EAChB,UAAU,GACV,eAAe,GACf,gBAAgB,GAChB,cAAc,GACd,cAAc,GACd,UAAU,GACV,YAAY,GACZ,QAAQ,GACR,WAAW,GACX,YAAY,GACZ,QAAQ,GACR,QAAQ,GACR,aAAa,CAChB,GAAG;IACF,QAAQ,EAAE;QACR,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,EAAE,OAAO,CAAC;KACrB,EAAE,CAAC;CACL,CAAC;AAEF;;GAEG;AACH,qBAAa,aAAa;IACxB,MAAM,CAAC,SAAS,gBAA0B;IAE1C,MAAM,CAAC,kCAAkC,wEACwC;IAEjF,OAAc,MAAM,eAAsB,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;IACvB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC;IAChD,OAAO,EAAE,SAAS,CAAM;IAExB,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,aAaL;IAEF,cAAc,gBAMZ;IAEF,WAAW,UAAS;IACpB,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAC;IAEpC,uBAAuB,yBAoFrB;IAEF,aAAa,CAAC,EACZ,YAAY,EACZ,UAAU,EACV,SAAS,GACV,EAAE,IAAI,CAAC,YAAY,EAAE,YAAY,GAAG,WAAW,GAAG,cAAc,CAAC,GAAG,YAAY,EAAE;IASnF,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,YAAY,EAAE;IAKrE,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU;IAc1D,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAM9C,aAAa;;wBAA4B;IAEzC,UAAU,QACH,YAAY,KAChB,QAAQ;QAAE,IAAI,EAAE,GAAG,EAAE,CAAC;QAAC,GAAG,CAAC,EAAE,SAAS,CAAA;KAAE,GAAG;QAAE,IAAI,CAAC,EAAE,SAAS,CAAC;QAAC,GAAG,EAAE,GAAG,CAAA;KAAE,CAAC,CAc3E;IAEF,WAAW,qDAA0B;IAErC,YAAY,CAAC,MAAM,EAAE,YAAY,GAAG,SAAS;IAsC7C,IAAI,kBAAkB,aAErB;IACD,IAAI,WAAY,WAAW,IAAI,GAAG,WAAW,SAAS,+BAKpD;IAEF,WAAW,CAAC,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;IAC5C,QAAQ,4IAAuB;IAE/B,OAAO;;OAAsB;IAE7B,MAAM;;;QAhUN;;aAEK;;;;;;;;;;;;;;;;OA8TsB;IAE3B,kBAAkB,QAAO;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,EAAE,CAkBlE;IAEF;;UAEM;IACN,eAAe,sBAsBb;IAEF,aAAa,EAAE,GAAG,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAa;IAChD,UAAU,CACd,MAAM,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,EACjD,WAAW,EAAE,uBAAuB,GAAG,SAAS,EAChD,MAAM,EAAE,YAAY,GAAG,SAAS;;;;;;;;;;;;;;;CAqFnC;AAgED,eAAO,MAAM,UAAU;;;;CAIb,CAAC;AAEX,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,UAAU,CAAC,CAAC,MAAM,OAAO,UAAU,CAAC,CAAC;AACzE,eAAO,MAAM,aAAa;;qBAEP,MAAM,GAAG,SAAS;CAIpC,CAAC;AAEF,eAAO,MAAM,cAAc,cAAe,MAAM,KAAG,MACQ,CAAC;AAE5D,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC"}
|
|
@@ -60,6 +60,13 @@ class PubSubManager {
|
|
|
60
60
|
postgresNotifListenManager;
|
|
61
61
|
constructor(dboBuilder) {
|
|
62
62
|
this.dboBuilder = dboBuilder;
|
|
63
|
+
this._log({
|
|
64
|
+
type: "syncOrSub",
|
|
65
|
+
command: "postgresNotifListenManager.create",
|
|
66
|
+
duration: 0,
|
|
67
|
+
connectedSocketIds: this.connectedSocketIds,
|
|
68
|
+
triggers: this._triggers,
|
|
69
|
+
});
|
|
63
70
|
(0, exports.log)("Created PubSubManager");
|
|
64
71
|
}
|
|
65
72
|
appCheckFrequencyMS = 10 * 1000;
|
|
@@ -70,9 +77,14 @@ class PubSubManager {
|
|
|
70
77
|
if (this.appCheck) {
|
|
71
78
|
clearInterval(this.appCheck);
|
|
72
79
|
}
|
|
73
|
-
this.subs = [];
|
|
74
|
-
this.syncs = [];
|
|
75
80
|
this.postgresNotifListenManager?.destroy();
|
|
81
|
+
this._log({
|
|
82
|
+
type: "syncOrSub",
|
|
83
|
+
command: "postgresNotifListenManager.destroy",
|
|
84
|
+
duration: 0,
|
|
85
|
+
connectedSocketIds: this.connectedSocketIds,
|
|
86
|
+
triggers: this._triggers,
|
|
87
|
+
});
|
|
76
88
|
};
|
|
77
89
|
getIsDestroyed = () => {
|
|
78
90
|
if (this.destroyed) {
|
|
@@ -233,7 +245,10 @@ class PubSubManager {
|
|
|
233
245
|
return this.dboBuilder.prostgles.connectedSockets.map((s) => s.id);
|
|
234
246
|
}
|
|
235
247
|
_log = (params) => {
|
|
236
|
-
return this.dboBuilder.prostgles.opts.onLog?.({
|
|
248
|
+
return this.dboBuilder.prostgles.opts.onLog?.({
|
|
249
|
+
...params,
|
|
250
|
+
connectedSocketIds: this.connectedSocketIds,
|
|
251
|
+
});
|
|
237
252
|
};
|
|
238
253
|
syncTimeout;
|
|
239
254
|
syncData = SyncReplication_1.syncData.bind(this);
|
|
@@ -278,7 +293,7 @@ class PubSubManager {
|
|
|
278
293
|
addingTrigger;
|
|
279
294
|
addTriggerPool = undefined;
|
|
280
295
|
async addTrigger(params, viewOptions, socket) {
|
|
281
|
-
const addedTrigger = await (0, util_1.
|
|
296
|
+
const addedTrigger = await (0, util_1.tryCatchV2)(async () => {
|
|
282
297
|
const { table_name } = { ...params };
|
|
283
298
|
let { condition } = { ...params };
|
|
284
299
|
if (!table_name)
|
|
@@ -335,17 +350,18 @@ class PubSubManager {
|
|
|
335
350
|
return trgVals;
|
|
336
351
|
});
|
|
337
352
|
await this._log({
|
|
338
|
-
type: "
|
|
353
|
+
type: "syncOrSub",
|
|
339
354
|
command: "addTrigger",
|
|
340
|
-
condition: addedTrigger.cond ?? params.condition,
|
|
355
|
+
condition: addedTrigger.data?.cond ?? params.condition,
|
|
341
356
|
duration: addedTrigger.duration,
|
|
342
357
|
socketId: socket?.id,
|
|
343
|
-
state: !addedTrigger.tbl ? "fail" : "ok",
|
|
358
|
+
state: !addedTrigger.data?.tbl ? "fail" : "ok",
|
|
344
359
|
error: addedTrigger.error,
|
|
345
360
|
sid: socket && this.dboBuilder.prostgles.authHandler?.getSIDNoError({ socket }),
|
|
346
|
-
tableName: addedTrigger.tbl ?? params.table_name,
|
|
361
|
+
tableName: addedTrigger.data?.tbl ?? params.table_name,
|
|
347
362
|
connectedSocketIds: this.dboBuilder.prostgles.connectedSockets.map((s) => s.id),
|
|
348
363
|
localParams: socket && { clientReq: { socket } },
|
|
364
|
+
triggers: this._triggers,
|
|
349
365
|
});
|
|
350
366
|
if (addedTrigger.error)
|
|
351
367
|
throw addedTrigger.error;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PubSubManager.js","sourceRoot":"","sources":["../../lib/PubSubManager/PubSubManager.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAEhG,iCAAiC;AASjC,4CAAkD;AAClD,uCAAoC;AACpC,2DAAwD;AAExD,wCAAwC;AAGxC,qDAOyB;AAEzB,oDAAqE;AACrE,mEAAmG;AACnG,8DAA2D;AAG3D,wDAA8C;AAC9C,qCAAkC;AAClC,2EAA2D;AAC3D,mDAAgD;AAChD,6DAAsE;AACtE,+CAA4C;AAG5C,MAAM,GAAG,GAAQ,SAAS,CAAC,EAAE,CAAC,CAAC;AACxB,MAAM,OAAO,GAAG,CAAC,CAAM,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;AAA/C,QAAA,OAAO,WAAwC;AAC/C,QAAA,uBAAuB,GAAG,EAAE,CAAC;AAEnC,MAAM,GAAG,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;IACpC,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;QAC1B,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;IACvB,CAAC;AACH,CAAC,CAAC;AAJW,QAAA,GAAG,OAId;AA2GF;;GAEG;AACH,MAAa,aAAa;IACxB,MAAM,CAAC,SAAS,GAAG,aAAsB,CAAC;IAE1C,MAAM,CAAC,kCAAkC,GACvC,qEAA8E,CAAC;IAE1E,MAAM,CAAC,MAAM,GAAG,KAAK,EAAE,UAAsB,EAAE,EAAE;QACtD,MAAM,QAAQ,GAAG,IAAI,aAAa,CAAC,UAAU,CAAC,CAAC;QAC/C,MAAM,MAAM,GAAG,MAAM,qCAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QACxD,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;IAEF,kBAAkB,GAAG,KAAK,CAAC;IAC3B,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC;IACzC,CAAC;IACD,IAAI,EAAE;QACJ,OAAO,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;IAC5B,CAAC;IACD,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;IAC7B,CAAC;IAED,UAAU,CAAa;IACvB,SAAS,CAA4B;IACrC,OAAO,GAAc,EAAE,CAAC;IAExB,IAAI,GAAmB,EAAE,CAAC;IAC1B,KAAK,GAAiB,EAAE,CAAC;IAChB,oBAAoB,GAAG,0BAAQ,CAAC,QAAQ,CAAC;IAClD,0BAA0B,CAA8B;IAExD,YAAoB,UAAsB;QACxC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAE7B,IAAA,WAAG,EAAC,uBAAuB,CAAC,CAAC;IAC/B,CAAC;IACD,mBAAmB,GAAG,EAAE,GAAG,IAAI,CAAC;IAChC,QAAQ,CAAkC;IAE1C,SAAS,GAAG,KAAK,CAAC;IAClB,OAAO,GAAG,GAAG,EAAE;QACb,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC/B,CAAC;QACD,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC;QACf,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QAChB,IAAI,CAAC,0BAA0B,EAAE,OAAO,EAAE,CAAC;IAC7C,CAAC,CAAC;IAEF,cAAc,GAAG,GAAG,EAAE;QACpB,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,OAAO,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;YACpD,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,WAAW,GAAG,KAAK,CAAC;IACpB,wBAAwB,CAAY;IAEpC,uBAAuB,GAAG,KAAK,IAAI,EAAE;QACnC,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC;QACvD,IAAI,WAAW,IAAI,CAAC,CAAC,MAAM,IAAA,0BAAc,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;YACpD,OAAO,CAAC,IAAI,CACV,uFAAuF,CACxF,CAAC;QACJ,CAAC;QAED,IAAI,CAAC;YACH,qEAAqE;YACrE,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC;YACxF,MAAM,gBAAgB,GACpB,aAAa,CAAC,MAAM,CAAC,CAAC;gBACpB,yBAAyB,aAAa,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAA,eAAO,EAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;gBACzF,CAAC,CAAC,EAAE,CAAC;YACP,MAAM,KAAK,GAAG,GAAG,CAAC,EAAE,CAAC,MAAM,CACzB;;;;aAIK,aAAa,CAAC,kCAAkC;;;;;;;;;;;;;;;cAe/C,mDAA8B;;;;cAI9B,gBAAgB;;;;;;;;;;;;;;;;;;;kBAmBZ,IAAA,eAAO,EAAC,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC;;;cAGrC,gCAAgC;;;;;;;OAOvC,EACC,EAAE,kBAAkB,EAAlB,uCAAkB,EAAE,CACvB,CAAC;YAEF,MAAM,IAAI,CAAC,EAAE;iBACV,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;iBACvB,KAAK,CAAC,CAAC,CAAM,EAAE,EAAE;gBAChB,OAAO,CAAC,KAAK,CAAC,0BAA0B,EAAE,CAAC,CAAC,CAAC;gBAC7C,MAAM,CAAC,CAAC;YACV,CAAC,CAAC,CAAC;YAEL,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,0BAA0B,EAAE,CAAC,CAAC,CAAC;YAC7C,MAAM,CAAC,CAAC;QACV,CAAC;IACH,CAAC,CAAC;IAEF,aAAa,CAAC,EACZ,YAAY,EACZ,UAAU,EACV,SAAS,GACuD;QAChE,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;YAC5B,OAAO,CACL,CAAC,CAAC,YAAY,KAAK,YAAY;gBAC/B,CAAC,IAAA,6BAAiB,EAAC,UAAU,EAAE,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAC1F,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,cAAc,CAAC,UAAkB,EAAE,SAAiB;QAClD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,WAAI,EAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;QAClF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,cAAc,CAAC,WAAmB,EAAE,UAAsB;QACxD,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,CACxC,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,YAAY,KAAK,WAAW,IAAI,IAAA,yBAAa,EAAC,UAAU,CAAC,KAAK,IAAA,yBAAa,EAAC,CAAC,CAAC,UAAU,CAAC,CAC9F,CAAC;QACF,IAAI,cAAc,GAAG,CAAC,CAAC,EAAE,CAAC;YACxB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QACtC,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,KAAK,CAAC,oEAAoE,EAAE;gBAClF,WAAW;aACZ,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,QAAQ,CAAC,UAAkB,EAAE,SAAiB;QAC5C,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CACtB,CAAC,CAAa,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,UAAU,IAAI,CAAC,CAAC,SAAS,KAAK,SAAS,CAC5E,CAAC;IACJ,CAAC;IAED,aAAa,GAAG,6BAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEzC,UAAU,GAAG,KAAK,EAChB,GAAiB,EAC2D,EAAE;QAC9E,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,GAAG,CAAC,CAAC,kBAAkB;QAC3E,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,UAAU,CAAC;QAExC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,CAAC;YAChC,MAAM,IAAI,KAAK,CAAC,YAAY,UAAU,iBAAiB,CAAC,CAAC;QAC3D,CAAC;QAED,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC,IAAK,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;YACvF,OAAO,EAAE,IAAI,EAAE,CAAC;QAClB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,EAAE,GAAG,EAAE,CAAC;QACjB,CAAC;IACH,CAAC,CAAC;IAEF,WAAW,GAAG,yBAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAErC,YAAY,CAAC,MAAgC;QAC3C,IAAI,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC;YACvC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC;YACjC,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,GAAG,EAAE;gBAC3B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;oBACjC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CAAC,CAAC;gBAClD,CAAC,CAAC,CAAC;gBAEH,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;oBACnC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,SAAS,KAAK,MAAM,CAAC,EAAE,CAAC,CAAC;gBACrD,CAAC,CAAC,CAAC;gBAEH,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBAE/B,IAAI,CAAC,IAAI,CAAC;oBACR,IAAI,EAAE,MAAM;oBACZ,OAAO,EAAE,yBAAyB;oBAClC,SAAS,EAAE,EAAE;oBACb,QAAQ,EAAE,CAAC;oBACX,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,WAAW,EAAE,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;oBACrE,QAAQ,EAAE,MAAM,CAAC,EAAE;oBACnB,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;oBAC3C,aAAa,EAAE,IAAI,CAAC,SAAS,CAC3B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;wBACpB,SAAS,EAAE,CAAC,CAAC,UAAU,CAAC,IAAI;wBAC5B,QAAQ,EAAE,CAAC,CAAC,QAAQ;qBACrB,CAAC,CAAC,CACJ;oBACD,cAAc,EAAE,IAAI,CAAC,SAAS,CAC5B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,eAAQ,EAAC,CAAC,EAAE,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC,CAChE;iBACF,CAAC,CAAC;gBAEH,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,IAAI,kBAAkB;QACpB,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACrE,CAAC;IACD,IAAI,GAAG,CAAC,MAAuB,EAAE,EAAE;QACjC,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC;IAC/D,CAAC,CAAC;IAEF,WAAW,CAAiC;IAC5C,QAAQ,GAAG,0BAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAE/B,OAAO,GAAG,iBAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAE7B,MAAM,GAAG,eAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAE3B,kBAAkB,GAAG,GAAgD,EAAE;QACrE,MAAM,eAAe,GAAgD,EAAE,CAAC;QACxE,MAAM,MAAM,GAAG,CAAC,CAAS,EAAE,CAAS,EAAE,EAAE;YACtC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,CAAC,IAAI,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,EAAE,CAAC;gBAC1E,eAAe,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC;YACxD,CAAC;QACH,CAAC,CAAC;QACF,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACnB,MAAM,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACtB,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBACzB,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;YACxC,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,eAAe,CAAC;IACzB,CAAC,CAAC;IAEF;;UAEM;IACN,eAAe,GAAG,KAAK,IAAI,EAAE;QAC3B,MAAM,QAAQ,GAGR,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CACrB;;;;;OAKC,EACD,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAClC,CAAC;QAEF,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;QACpB,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACjB,IAAI,CAAC,SAAS,KAAK,EAAE,CAAC;YACtB,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;YACpC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC;gBACzD,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;YAClD,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,aAAa,CAAM;IACnB,cAAc,GAA8B,SAAS,CAAC;IACtD,KAAK,CAAC,UAAU,CACd,MAAiD,EACjD,WAAgD,EAChD,MAAgC;QAEhC,MAAM,YAAY,GAAG,MAAM,IAAA,eAAQ,EAAC,KAAK,IAAI,EAAE;YAC7C,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC;YACrC,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC;YAClC,IAAI,CAAC,UAAU;gBAAE,MAAM,oBAAoB,CAAC;YAE5C,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;gBAC3C,SAAS,GAAG,MAAM,CAAC;YACrB,CAAC;YAED,IAAI,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,eAAe,EAAE,YAAY,EAAE,CAAC;gBACxD,MAAM,mHAAmH,CAAC;YAC5H,CAAC;YAED,MAAM,OAAO,GAAG;gBACd,GAAG,EAAE,IAAA,eAAO,EAAC,UAAU,CAAC;gBACxB,IAAI,EAAE,IAAA,eAAO,EAAC,SAAS,CAAC;gBACxB,QAAQ,EAAE,IAAA,eAAO,EAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;aAC5E,CAAC;YAEF,MAAM,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CACrB,CAAC,CAAC,GAAG,CAAC;;aAED,aAAa,CAAC,kCAAkC;;;;;;yBAMpC,IAAA,eAAO,EAAC,IAAI,CAAC,KAAK,CAAC;;;;;;;;;;;;;;;;;YAiBhC,OAAO,CAAC,GAAG;YACX,OAAO,CAAC,IAAI;YACZ,OAAO,CAAC,QAAQ;YAChB,IAAA,eAAO,EAAC,IAAI,CAAC,KAAK,CAAC;YACnB,IAAA,eAAO,EAAC,WAAW,EAAE,QAAQ,IAAI,IAAI,CAAC;YACtC,IAAA,eAAO,EAAC,WAAW,EAAE,UAAU,IAAI,IAAI,CAAC;;;;;OAK7C,CAAC,CACD,CAAC;YAEF,6DAA6D;YAC7D,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;YAE7B,OAAO,OAAO,CAAC;QACjB,CAAC,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,IAAI,CAAC;YACd,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,YAAY;YACrB,SAAS,EAAE,YAAY,CAAC,IAAI,IAAI,MAAM,CAAC,SAAS;YAChD,QAAQ,EAAE,YAAY,CAAC,QAAQ;YAC/B,QAAQ,EAAE,MAAM,EAAE,EAAE;YACpB,KAAK,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI;YACxC,KAAK,EAAE,YAAY,CAAC,KAAK;YACzB,GAAG,EAAE,MAAM,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,WAAW,EAAE,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;YAC/E,SAAS,EAAE,YAAY,CAAC,GAAG,IAAI,MAAM,CAAC,UAAU;YAChD,kBAAkB,EAAE,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC/E,WAAW,EAAE,MAAM,IAAI,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,EAAE;SACjD,CAAC,CAAC;QAEH,IAAI,YAAY,CAAC,KAAK;YAAE,MAAM,YAAY,CAAC,KAAK,CAAC;QAEjD,OAAO,YAAY,CAAC;IACtB,CAAC;;AA3YH,sCA4YC;AAED,MAAM,gCAAgC,GAAG;;;;;;;;;;;;;;;;;;;sBAmBnB,IAAA,eAAO,EAAC,wCAAY,CAAC,oBAAoB,CAAC;;;;;;;;;;;;;;;YAepD,IAAA,eAAO,EAAC,wCAAY,CAAC,oBAAoB,CAAC;YAC1C,IAAA,eAAO,EAAC,wCAAY,CAAC,yBAAyB,CAAC;;;;;;;;;;;;qCAYtB,wCAAY,CAAC,oBAAoB;6BACzC,wCAAY,CAAC,oBAAoB;;;0BAGpC,wCAAY,CAAC,iBAAiB;;qCAEnB,wCAAY,CAAC,yBAAyB;6BAC9C,wCAAY,CAAC,yBAAyB;;;0BAGzC,wCAAY,CAAC,iBAAiB;;;CAGvD,CAAC;AAEW,QAAA,UAAU,GAAG;IACxB,IAAI,EAAE,kBAAkB;IACxB,mBAAmB,EAAE,kCAAkC;IACvD,MAAM,EAAE,oBAAoB;CACpB,CAAC;AACE,QAAA,aAAa,GAAG;IAC3B,OAAO,EAAE,YAAqB;IAC9B,OAAO,EAAE,CAAC,KAAyB,EAAE,EAAE;QACrC,IAAI,CAAC,KAAK;YAAE,MAAM,UAAU,CAAC;QAC7B,OAAO,qBAAa,CAAC,OAAO,GAAG,KAAK,CAAC;IACvC,CAAC;CACF,CAAC;AAEK,MAAM,cAAc,GAAG,CAAC,SAAiB,EAAU,EAAE,CAC1D,SAAS,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC;AAD/C,QAAA,cAAc,kBACiC;AAE5D,mDAAqD;AAA5C,2GAAA,QAAQ,OAAA;AAAE,2GAAA,QAAQ,OAAA"}
|
|
1
|
+
{"version":3,"file":"PubSubManager.js","sourceRoot":"","sources":["../../lib/PubSubManager/PubSubManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addSub.d.ts","sourceRoot":"","sources":["../../lib/PubSubManager/addSub.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAGL,aAAa,EAEb,kBAAkB,EACnB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D,KAAK,qBAAqB,GAAG,kBAAkB,GAAG;IAChD,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,KAAK,YAAY,GAAG,oBAAoB,GAAG;IACzC,aAAa,EAAE,YAAY,GAAG,SAAS,CAAC;CACzC,CAAC;AAIF,wBAAsB,MAAM,CAC1B,IAAI,EAAE,aAAa,EACnB,kBAAkB,EAAE,IAAI,CAAC,qBAAqB,EAAE,cAAc,GAAG,iBAAiB,CAAC,GAClF,OAAO,CAAC,YAAY,CAAC,
|
|
1
|
+
{"version":3,"file":"addSub.d.ts","sourceRoot":"","sources":["../../lib/PubSubManager/addSub.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAGL,aAAa,EAEb,kBAAkB,EACnB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D,KAAK,qBAAqB,GAAG,kBAAkB,GAAG;IAChD,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,KAAK,YAAY,GAAG,oBAAoB,GAAG;IACzC,aAAa,EAAE,YAAY,GAAG,SAAS,CAAC;CACzC,CAAC;AAIF,wBAAsB,MAAM,CAC1B,IAAI,EAAE,aAAa,EACnB,kBAAkB,EAAE,IAAI,CAAC,qBAAqB,EAAE,cAAc,GAAG,iBAAiB,CAAC,GAClF,OAAO,CAAC,YAAY,CAAC,CAyIvB"}
|
|
@@ -92,6 +92,17 @@ async function addSub(subscriptionParams) {
|
|
|
92
92
|
const isMatch = s.socket?.id === socket.id && s.channel_name === channel_name;
|
|
93
93
|
return !isMatch;
|
|
94
94
|
});
|
|
95
|
+
this._log({
|
|
96
|
+
type: "syncOrSub",
|
|
97
|
+
command: "unsubscribe",
|
|
98
|
+
channel_name,
|
|
99
|
+
socketId: socket.id,
|
|
100
|
+
duration: 0,
|
|
101
|
+
triggers: this._triggers,
|
|
102
|
+
connectedSocketIds: this.connectedSocketIds,
|
|
103
|
+
sid: socket.id,
|
|
104
|
+
tableName: table_name,
|
|
105
|
+
});
|
|
95
106
|
removeListeners();
|
|
96
107
|
cb(null, { res });
|
|
97
108
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addSub.js","sourceRoot":"","sources":["../../lib/PubSubManager/addSub.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"addSub.js","sourceRoot":"","sources":["../../lib/PubSubManager/addSub.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notifListener.d.ts","sourceRoot":"","sources":["../../lib/PubSubManager/notifListener.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"notifListener.d.ts","sourceRoot":"","sources":["../../lib/PubSubManager/notifListener.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4C,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAG1F,wBAAsB,aAAa,CAAC,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,iBAkMjF"}
|
|
@@ -12,6 +12,21 @@ async function notifListener(data) {
|
|
|
12
12
|
const dataArr = str.split(PubSubManager_1.PubSubManager.DELIMITER);
|
|
13
13
|
const notifType = dataArr[0];
|
|
14
14
|
(0, PubSubManager_1.log)(str);
|
|
15
|
+
const commonLog = {
|
|
16
|
+
triggers: this._triggers,
|
|
17
|
+
sid: undefined,
|
|
18
|
+
connectedSocketIds: this.connectedSocketIds,
|
|
19
|
+
socketId: undefined,
|
|
20
|
+
duration: 0,
|
|
21
|
+
tableName: dataArr[1] ?? "",
|
|
22
|
+
dataArr,
|
|
23
|
+
notifType,
|
|
24
|
+
};
|
|
25
|
+
await this._log({
|
|
26
|
+
type: "syncOrSub",
|
|
27
|
+
command: "notifListener",
|
|
28
|
+
...commonLog,
|
|
29
|
+
});
|
|
15
30
|
if (notifType === PubSubManager_1.NOTIF_TYPE.schema) {
|
|
16
31
|
if (this.dboBuilder.prostgles.schemaWatch?.onSchemaChange) {
|
|
17
32
|
const [_, command, _event_type, query] = dataArr;
|
|
@@ -34,6 +49,7 @@ async function notifListener(data) {
|
|
|
34
49
|
await this.refreshTriggers();
|
|
35
50
|
return;
|
|
36
51
|
}
|
|
52
|
+
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
|
|
37
53
|
if (notifType !== PubSubManager_1.NOTIF_TYPE.data) {
|
|
38
54
|
console.error("Unexpected notif type: ", notifType);
|
|
39
55
|
return;
|
|
@@ -113,8 +129,7 @@ async function notifListener(data) {
|
|
|
113
129
|
((sub.socket_id && this.sockets[sub.socket_id]) || sub.localFuncs)));
|
|
114
130
|
activeAndReadySubs.forEach((sub) => {
|
|
115
131
|
const { throttle = 0, throttleOpts } = sub;
|
|
116
|
-
if (!throttleOpts?.skipFirst &&
|
|
117
|
-
sub.last_throttled <= Date.now() - throttle) {
|
|
132
|
+
if (!throttleOpts?.skipFirst && sub.last_throttled <= Date.now() - throttle) {
|
|
118
133
|
sub.last_throttled = Date.now();
|
|
119
134
|
/* It is assumed the policy was checked before this point */
|
|
120
135
|
this.pushSubData(sub);
|
|
@@ -136,10 +151,10 @@ async function notifListener(data) {
|
|
|
136
151
|
state = "invalid_condition_ids";
|
|
137
152
|
}
|
|
138
153
|
await this._log({
|
|
139
|
-
|
|
140
|
-
|
|
154
|
+
...commonLog,
|
|
155
|
+
type: "syncOrSub",
|
|
156
|
+
command: "notifListener.Finished",
|
|
141
157
|
state,
|
|
142
|
-
tableName: table_name,
|
|
143
158
|
op_name,
|
|
144
159
|
condition_ids_str,
|
|
145
160
|
tableTriggers: this._triggers?.[table_name],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notifListener.js","sourceRoot":"","sources":["../../lib/PubSubManager/notifListener.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"notifListener.js","sourceRoot":"","sources":["../../lib/PubSubManager/notifListener.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pushSubData.d.ts","sourceRoot":"","sources":["../../lib/PubSubManager/pushSubData.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"pushSubData.d.ts","sourceRoot":"","sources":["../../lib/PubSubManager/pushSubData.ts"],"names":[],"mappings":"AAEA,OAAO,EAAO,aAAa,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEnE,wBAAsB,WAAW,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,YAAY,EAAE,GAAG,CAAC,EAAE,GAAG,oBAsElF"}
|
|
@@ -5,12 +5,26 @@ const subscribe_1 = require("../DboBuilder/ViewHandler/subscribe");
|
|
|
5
5
|
const PubSubManager_1 = require("./PubSubManager");
|
|
6
6
|
async function pushSubData(sub, err) {
|
|
7
7
|
const { socket_id, channel_name } = sub;
|
|
8
|
+
const onLog = (state) => {
|
|
9
|
+
this._log({
|
|
10
|
+
type: "syncOrSub",
|
|
11
|
+
command: "pushSubData",
|
|
12
|
+
channel_name: sub.channel_name,
|
|
13
|
+
error: err,
|
|
14
|
+
state,
|
|
15
|
+
duration: 0,
|
|
16
|
+
connectedSocketIds: this.connectedSocketIds,
|
|
17
|
+
triggers: this._triggers,
|
|
18
|
+
});
|
|
19
|
+
};
|
|
8
20
|
if (!this.subs.some((s) => s.channel_name === channel_name)) {
|
|
9
21
|
// Might be throttling a sub that was removed
|
|
22
|
+
onLog("sub_not_found");
|
|
10
23
|
return;
|
|
11
24
|
}
|
|
12
25
|
const localFuncs = (0, subscribe_1.parseLocalFuncs)(sub.localFuncs);
|
|
13
26
|
if (err) {
|
|
27
|
+
onLog("error");
|
|
14
28
|
if (socket_id) {
|
|
15
29
|
this.sockets[socket_id].emit(channel_name, { err });
|
|
16
30
|
}
|
|
@@ -22,6 +36,7 @@ async function pushSubData(sub, err) {
|
|
|
22
36
|
if (data) {
|
|
23
37
|
if (socket_id && this.sockets[socket_id]) {
|
|
24
38
|
(0, PubSubManager_1.log)("Pushed " + data.length + " records to sub");
|
|
39
|
+
onLog("Emiting to socket");
|
|
25
40
|
this.sockets[socket_id].emit(channel_name, { data }, () => {
|
|
26
41
|
resolve(data);
|
|
27
42
|
});
|
|
@@ -30,12 +45,17 @@ async function pushSubData(sub, err) {
|
|
|
30
45
|
*/
|
|
31
46
|
}
|
|
32
47
|
else if (localFuncs) {
|
|
48
|
+
onLog("pushed to local client");
|
|
33
49
|
localFuncs.onData(data);
|
|
34
50
|
resolve(data);
|
|
35
51
|
}
|
|
52
|
+
else {
|
|
53
|
+
onLog("no client to push data to");
|
|
54
|
+
}
|
|
36
55
|
// sub.last_throttled = Date.now();
|
|
37
56
|
}
|
|
38
57
|
else {
|
|
58
|
+
onLog("fetch data error");
|
|
39
59
|
const errObj = { _err_msg: err.toString(), err };
|
|
40
60
|
if (socket_id && this.sockets[socket_id]) {
|
|
41
61
|
this.sockets[socket_id].emit(channel_name, { err: errObj });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pushSubData.js","sourceRoot":"","sources":["../../lib/PubSubManager/pushSubData.ts"],"names":[],"mappings":";;;AAAA,mEAAsE;
|
|
1
|
+
{"version":3,"file":"pushSubData.js","sourceRoot":"","sources":["../../lib/PubSubManager/pushSubData.ts"],"names":[],"mappings":"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"}
|
package/lib/Logging.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { AnyObject, ClientSchema } from "prostgles-types";
|
|
1
|
+
import { AnyObject, ClientSchema, TableHandler } from "prostgles-types";
|
|
2
2
|
import { LocalParams } from "./DboBuilder/DboBuilder";
|
|
3
|
-
import {
|
|
3
|
+
import { NotifTypeName } from "./PubSubManager/PubSubManager";
|
|
4
4
|
|
|
5
5
|
type ClientInfo = {
|
|
6
6
|
socketId: string | undefined;
|
|
@@ -17,13 +17,13 @@ export namespace EventTypes {
|
|
|
17
17
|
DebugInfo & {
|
|
18
18
|
type: "table";
|
|
19
19
|
tableName: string;
|
|
20
|
-
command: keyof TableHandler;
|
|
20
|
+
command: keyof TableHandler | "sync";
|
|
21
21
|
txInfo: AnyObject | undefined;
|
|
22
22
|
data: AnyObject;
|
|
23
23
|
localParams: LocalParams | undefined;
|
|
24
24
|
};
|
|
25
25
|
|
|
26
|
-
type
|
|
26
|
+
export type Sync = ClientInfo &
|
|
27
27
|
DebugInfo & {
|
|
28
28
|
type: "sync";
|
|
29
29
|
tableName: string;
|
|
@@ -33,7 +33,6 @@ export namespace EventTypes {
|
|
|
33
33
|
| {
|
|
34
34
|
command: "syncData";
|
|
35
35
|
source: "client" | "trigger";
|
|
36
|
-
connectedSocketIds: string[];
|
|
37
36
|
lr: string;
|
|
38
37
|
}
|
|
39
38
|
| {
|
|
@@ -41,13 +40,6 @@ export namespace EventTypes {
|
|
|
41
40
|
rows: number;
|
|
42
41
|
socketId: string;
|
|
43
42
|
}
|
|
44
|
-
| {
|
|
45
|
-
command: "addTrigger";
|
|
46
|
-
state: "ok" | "fail";
|
|
47
|
-
/** If no socket id then it's a local subscribe */
|
|
48
|
-
socketId: string | undefined;
|
|
49
|
-
condition: string;
|
|
50
|
-
}
|
|
51
43
|
| {
|
|
52
44
|
command: "addSync" | "unsync";
|
|
53
45
|
socketId: string;
|
|
@@ -58,24 +50,57 @@ export namespace EventTypes {
|
|
|
58
50
|
socketId: string;
|
|
59
51
|
remainingSyncs: string;
|
|
60
52
|
remainingSubs: string;
|
|
61
|
-
connectedSocketIds: string[];
|
|
62
53
|
}
|
|
63
54
|
);
|
|
64
|
-
|
|
65
|
-
|
|
55
|
+
|
|
56
|
+
type SyncOrSubWithClientInfo = ClientInfo & {
|
|
66
57
|
tableName: string;
|
|
67
58
|
localParams?: LocalParams;
|
|
68
|
-
connectedSocketIds: string[];
|
|
69
|
-
} & {
|
|
70
|
-
command: "notifListener";
|
|
71
|
-
op_name: string | undefined;
|
|
72
|
-
condition_ids_str: string | undefined;
|
|
73
|
-
tableTriggers: string[] | undefined;
|
|
74
|
-
tableSyncs: string;
|
|
75
|
-
state: "ok" | "error" | "no-triggers" | "invalid_condition_ids";
|
|
76
59
|
};
|
|
77
|
-
|
|
78
|
-
|
|
60
|
+
export type SyncOrSub = DebugInfo & {
|
|
61
|
+
type: "syncOrSub";
|
|
62
|
+
connectedSocketIds: string[];
|
|
63
|
+
triggers: Record<string, string[]> | undefined;
|
|
64
|
+
} & (
|
|
65
|
+
| (SyncOrSubWithClientInfo & {
|
|
66
|
+
command: "addTrigger";
|
|
67
|
+
state: "ok" | "fail";
|
|
68
|
+
/** If no socket id then it's a local subscribe */
|
|
69
|
+
socketId: string | undefined;
|
|
70
|
+
condition: string;
|
|
71
|
+
})
|
|
72
|
+
| (SyncOrSubWithClientInfo & {
|
|
73
|
+
command: "unsubscribe";
|
|
74
|
+
channel_name: string;
|
|
75
|
+
})
|
|
76
|
+
| (SyncOrSubWithClientInfo & {
|
|
77
|
+
command: "notifListener";
|
|
78
|
+
notifType: NotifTypeName;
|
|
79
|
+
dataArr: any[];
|
|
80
|
+
})
|
|
81
|
+
| (SyncOrSubWithClientInfo & {
|
|
82
|
+
command: "notifListener.Finished";
|
|
83
|
+
op_name: string | undefined;
|
|
84
|
+
condition_ids_str: string | undefined;
|
|
85
|
+
tableTriggers: string[] | undefined;
|
|
86
|
+
tableSyncs: string;
|
|
87
|
+
state: "ok" | "error" | "no-triggers" | "invalid_condition_ids";
|
|
88
|
+
})
|
|
89
|
+
| {
|
|
90
|
+
command: "pushSubData";
|
|
91
|
+
channel_name: string;
|
|
92
|
+
state:
|
|
93
|
+
| "sub_not_found"
|
|
94
|
+
| "error"
|
|
95
|
+
| "Emiting to socket"
|
|
96
|
+
| "pushed to local client"
|
|
97
|
+
| "no client to push data to"
|
|
98
|
+
| "fetch data error";
|
|
99
|
+
}
|
|
100
|
+
| {
|
|
101
|
+
command: "postgresNotifListenManager.create" | "postgresNotifListenManager.destroy";
|
|
102
|
+
}
|
|
103
|
+
);
|
|
79
104
|
|
|
80
105
|
export type Connection =
|
|
81
106
|
| (ClientInfo & {
|
|
@@ -134,7 +159,7 @@ export type EventInfo =
|
|
|
134
159
|
| EventTypes.Table
|
|
135
160
|
| EventTypes.Method
|
|
136
161
|
| EventTypes.Sync
|
|
137
|
-
| EventTypes.
|
|
162
|
+
| EventTypes.SyncOrSub
|
|
138
163
|
| EventTypes.Connection
|
|
139
164
|
| EventTypes.Debug;
|
|
140
165
|
|
|
@@ -28,7 +28,7 @@ import {
|
|
|
28
28
|
WAL,
|
|
29
29
|
} from "prostgles-types";
|
|
30
30
|
|
|
31
|
-
import { find, pickKeys, tryCatch } from "prostgles-types/dist/util";
|
|
31
|
+
import { find, pickKeys, tryCatch, tryCatchV2 } from "prostgles-types/dist/util";
|
|
32
32
|
import { LocalFuncs, getOnDataFunc, matchesLocalFuncs } from "../DboBuilder/ViewHandler/subscribe";
|
|
33
33
|
import { EVENT_TRIGGER_TAGS } from "../Event_Trigger_Tags";
|
|
34
34
|
import { EventTypes } from "../Logging";
|
|
@@ -183,7 +183,7 @@ export class PubSubManager {
|
|
|
183
183
|
}
|
|
184
184
|
|
|
185
185
|
dboBuilder: DboBuilder;
|
|
186
|
-
_triggers
|
|
186
|
+
_triggers: Record<string, string[]> | undefined;
|
|
187
187
|
sockets: AnyObject = {};
|
|
188
188
|
|
|
189
189
|
subs: Subscription[] = [];
|
|
@@ -194,6 +194,13 @@ export class PubSubManager {
|
|
|
194
194
|
private constructor(dboBuilder: DboBuilder) {
|
|
195
195
|
this.dboBuilder = dboBuilder;
|
|
196
196
|
|
|
197
|
+
this._log({
|
|
198
|
+
type: "syncOrSub",
|
|
199
|
+
command: "postgresNotifListenManager.create",
|
|
200
|
+
duration: 0,
|
|
201
|
+
connectedSocketIds: this.connectedSocketIds,
|
|
202
|
+
triggers: this._triggers,
|
|
203
|
+
});
|
|
197
204
|
log("Created PubSubManager");
|
|
198
205
|
}
|
|
199
206
|
appCheckFrequencyMS = 10 * 1000;
|
|
@@ -205,9 +212,14 @@ export class PubSubManager {
|
|
|
205
212
|
if (this.appCheck) {
|
|
206
213
|
clearInterval(this.appCheck);
|
|
207
214
|
}
|
|
208
|
-
this.subs = [];
|
|
209
|
-
this.syncs = [];
|
|
210
215
|
this.postgresNotifListenManager?.destroy();
|
|
216
|
+
this._log({
|
|
217
|
+
type: "syncOrSub",
|
|
218
|
+
command: "postgresNotifListenManager.destroy",
|
|
219
|
+
duration: 0,
|
|
220
|
+
connectedSocketIds: this.connectedSocketIds,
|
|
221
|
+
triggers: this._triggers,
|
|
222
|
+
});
|
|
211
223
|
};
|
|
212
224
|
|
|
213
225
|
getIsDestroyed = () => {
|
|
@@ -408,8 +420,11 @@ export class PubSubManager {
|
|
|
408
420
|
get connectedSocketIds() {
|
|
409
421
|
return this.dboBuilder.prostgles.connectedSockets.map((s) => s.id);
|
|
410
422
|
}
|
|
411
|
-
_log = (params: EventTypes.Sync) => {
|
|
412
|
-
return this.dboBuilder.prostgles.opts.onLog?.({
|
|
423
|
+
_log = (params: EventTypes.Sync | EventTypes.SyncOrSub) => {
|
|
424
|
+
return this.dboBuilder.prostgles.opts.onLog?.({
|
|
425
|
+
...params,
|
|
426
|
+
connectedSocketIds: this.connectedSocketIds,
|
|
427
|
+
});
|
|
413
428
|
};
|
|
414
429
|
|
|
415
430
|
syncTimeout?: ReturnType<typeof setTimeout>;
|
|
@@ -473,7 +488,7 @@ export class PubSubManager {
|
|
|
473
488
|
viewOptions: ViewSubscriptionOptions | undefined,
|
|
474
489
|
socket: PRGLIOSocket | undefined
|
|
475
490
|
) {
|
|
476
|
-
const addedTrigger = await
|
|
491
|
+
const addedTrigger = await tryCatchV2(async () => {
|
|
477
492
|
const { table_name } = { ...params };
|
|
478
493
|
let { condition } = { ...params };
|
|
479
494
|
if (!table_name) throw "MISSING table_name";
|
|
@@ -538,17 +553,18 @@ export class PubSubManager {
|
|
|
538
553
|
});
|
|
539
554
|
|
|
540
555
|
await this._log({
|
|
541
|
-
type: "
|
|
556
|
+
type: "syncOrSub",
|
|
542
557
|
command: "addTrigger",
|
|
543
|
-
condition: addedTrigger.cond ?? params.condition,
|
|
558
|
+
condition: addedTrigger.data?.cond ?? params.condition,
|
|
544
559
|
duration: addedTrigger.duration,
|
|
545
560
|
socketId: socket?.id,
|
|
546
|
-
state: !addedTrigger.tbl ? "fail" : "ok",
|
|
561
|
+
state: !addedTrigger.data?.tbl ? "fail" : "ok",
|
|
547
562
|
error: addedTrigger.error,
|
|
548
563
|
sid: socket && this.dboBuilder.prostgles.authHandler?.getSIDNoError({ socket }),
|
|
549
|
-
tableName: addedTrigger.tbl ?? params.table_name,
|
|
564
|
+
tableName: addedTrigger.data?.tbl ?? params.table_name,
|
|
550
565
|
connectedSocketIds: this.dboBuilder.prostgles.connectedSockets.map((s) => s.id),
|
|
551
566
|
localParams: socket && { clientReq: { socket } },
|
|
567
|
+
triggers: this._triggers,
|
|
552
568
|
});
|
|
553
569
|
|
|
554
570
|
if (addedTrigger.error) throw addedTrigger.error;
|
|
@@ -624,6 +640,8 @@ export const NOTIF_TYPE = {
|
|
|
624
640
|
data_trigger_change: "data_watch_triggers_have_changed",
|
|
625
641
|
schema: "schema_has_changed",
|
|
626
642
|
} as const;
|
|
643
|
+
|
|
644
|
+
export type NotifTypeName = (typeof NOTIF_TYPE)[keyof typeof NOTIF_TYPE];
|
|
627
645
|
export const NOTIF_CHANNEL = {
|
|
628
646
|
preffix: "prostgles_" as const,
|
|
629
647
|
getFull: (appID: string | undefined) => {
|
|
@@ -130,6 +130,17 @@ export async function addSub(
|
|
|
130
130
|
const isMatch = s.socket?.id === socket.id && s.channel_name === channel_name;
|
|
131
131
|
return !isMatch;
|
|
132
132
|
});
|
|
133
|
+
this._log({
|
|
134
|
+
type: "syncOrSub",
|
|
135
|
+
command: "unsubscribe",
|
|
136
|
+
channel_name,
|
|
137
|
+
socketId: socket.id,
|
|
138
|
+
duration: 0,
|
|
139
|
+
triggers: this._triggers,
|
|
140
|
+
connectedSocketIds: this.connectedSocketIds,
|
|
141
|
+
sid: socket.id,
|
|
142
|
+
tableName: table_name,
|
|
143
|
+
});
|
|
133
144
|
removeListeners();
|
|
134
145
|
cb(null, { res });
|
|
135
146
|
});
|
|
@@ -1,10 +1,7 @@
|
|
|
1
|
-
import { log, NOTIF_TYPE, pickKeys, PubSubManager } from "./PubSubManager";
|
|
1
|
+
import { log, NOTIF_TYPE, NotifTypeName, pickKeys, PubSubManager } from "./PubSubManager";
|
|
2
2
|
|
|
3
3
|
/* Relay relevant data to relevant subscriptions */
|
|
4
|
-
export async function notifListener(
|
|
5
|
-
this: PubSubManager,
|
|
6
|
-
data: { payload: string },
|
|
7
|
-
) {
|
|
4
|
+
export async function notifListener(this: PubSubManager, data: { payload: string }) {
|
|
8
5
|
const str = data.payload;
|
|
9
6
|
|
|
10
7
|
if (!str) {
|
|
@@ -13,10 +10,27 @@ export async function notifListener(
|
|
|
13
10
|
}
|
|
14
11
|
|
|
15
12
|
const dataArr = str.split(PubSubManager.DELIMITER);
|
|
16
|
-
const notifType = dataArr[0];
|
|
13
|
+
const notifType = dataArr[0] as NotifTypeName;
|
|
17
14
|
|
|
18
15
|
log(str);
|
|
19
16
|
|
|
17
|
+
const commonLog = {
|
|
18
|
+
triggers: this._triggers,
|
|
19
|
+
sid: undefined,
|
|
20
|
+
connectedSocketIds: this.connectedSocketIds,
|
|
21
|
+
socketId: undefined,
|
|
22
|
+
duration: 0,
|
|
23
|
+
tableName: dataArr[1] ?? "",
|
|
24
|
+
dataArr,
|
|
25
|
+
notifType,
|
|
26
|
+
};
|
|
27
|
+
|
|
28
|
+
await this._log({
|
|
29
|
+
type: "syncOrSub",
|
|
30
|
+
command: "notifListener",
|
|
31
|
+
...commonLog,
|
|
32
|
+
});
|
|
33
|
+
|
|
20
34
|
if (notifType === NOTIF_TYPE.schema) {
|
|
21
35
|
if (this.dboBuilder.prostgles.schemaWatch?.onSchemaChange) {
|
|
22
36
|
const [_, command, _event_type, query] = dataArr;
|
|
@@ -41,6 +55,7 @@ export async function notifListener(
|
|
|
41
55
|
return;
|
|
42
56
|
}
|
|
43
57
|
|
|
58
|
+
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
|
|
44
59
|
if (notifType !== NOTIF_TYPE.data) {
|
|
45
60
|
console.error("Unexpected notif type: ", notifType);
|
|
46
61
|
return;
|
|
@@ -57,14 +72,12 @@ export async function notifListener(
|
|
|
57
72
|
throw "table_name undef";
|
|
58
73
|
}
|
|
59
74
|
|
|
60
|
-
const tableTriggerConditions = this._triggers?.[table_name]?.map(
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
}),
|
|
67
|
-
);
|
|
75
|
+
const tableTriggerConditions = this._triggers?.[table_name]?.map((condition, idx) => ({
|
|
76
|
+
idx,
|
|
77
|
+
condition,
|
|
78
|
+
subs: this.getTriggerSubs(table_name, condition),
|
|
79
|
+
syncs: this.getSyncs(table_name, condition),
|
|
80
|
+
}));
|
|
68
81
|
let state: "error" | "no-triggers" | "ok" | "invalid_condition_ids" = "ok";
|
|
69
82
|
|
|
70
83
|
// const triggers = await this.db.any("SELECT * FROM prostgles.triggers WHERE table_name = $1 AND id IN ($2:csv)", [table_name, condition_ids_str.split(",").map(v => +v)]);
|
|
@@ -81,10 +94,7 @@ export async function notifListener(
|
|
|
81
94
|
tableTriggerConditions.map(({ condition }) => {
|
|
82
95
|
const subs = this.getTriggerSubs(table_name, condition);
|
|
83
96
|
subs.map((s) => {
|
|
84
|
-
this.pushSubData(
|
|
85
|
-
s,
|
|
86
|
-
pref + ". Check server logs. Schema might have changed",
|
|
87
|
-
);
|
|
97
|
+
this.pushSubData(s, pref + ". Check server logs. Schema might have changed");
|
|
88
98
|
});
|
|
89
99
|
});
|
|
90
100
|
|
|
@@ -92,7 +102,7 @@ export async function notifListener(
|
|
|
92
102
|
} else if (condition_ids?.every((id) => Number.isInteger(id))) {
|
|
93
103
|
state = "ok";
|
|
94
104
|
const firedTableConditions = tableTriggerConditions.filter(({ idx }) =>
|
|
95
|
-
condition_ids.includes(idx)
|
|
105
|
+
condition_ids.includes(idx)
|
|
96
106
|
);
|
|
97
107
|
const orphanedTableConditions = condition_ids.filter((condId) => {
|
|
98
108
|
const tc = tableTriggerConditions.at(condId);
|
|
@@ -116,7 +126,7 @@ export async function notifListener(
|
|
|
116
126
|
AND at.condition = t.condition
|
|
117
127
|
)
|
|
118
128
|
`,
|
|
119
|
-
[table_name, orphanedTableConditions, this.appId]
|
|
129
|
+
[table_name, orphanedTableConditions, this.appId]
|
|
120
130
|
)
|
|
121
131
|
.then(() => {
|
|
122
132
|
this.refreshTriggers();
|
|
@@ -130,7 +140,7 @@ export async function notifListener(
|
|
|
130
140
|
log(
|
|
131
141
|
"notifListener",
|
|
132
142
|
subs.map((s) => s.channel_name),
|
|
133
|
-
syncs.map((s) => s.channel_name)
|
|
143
|
+
syncs.map((s) => s.channel_name)
|
|
134
144
|
);
|
|
135
145
|
|
|
136
146
|
syncs.map((s) => {
|
|
@@ -143,15 +153,12 @@ export async function notifListener(
|
|
|
143
153
|
(trg) =>
|
|
144
154
|
this.dbo[trg.table_name] &&
|
|
145
155
|
sub.is_ready &&
|
|
146
|
-
((sub.socket_id && this.sockets[sub.socket_id]) || sub.localFuncs)
|
|
147
|
-
)
|
|
156
|
+
((sub.socket_id && this.sockets[sub.socket_id]) || sub.localFuncs)
|
|
157
|
+
)
|
|
148
158
|
);
|
|
149
159
|
activeAndReadySubs.forEach((sub) => {
|
|
150
160
|
const { throttle = 0, throttleOpts } = sub;
|
|
151
|
-
if (
|
|
152
|
-
!throttleOpts?.skipFirst &&
|
|
153
|
-
sub.last_throttled <= Date.now() - throttle
|
|
154
|
-
) {
|
|
161
|
+
if (!throttleOpts?.skipFirst && sub.last_throttled <= Date.now() - throttle) {
|
|
155
162
|
sub.last_throttled = Date.now();
|
|
156
163
|
|
|
157
164
|
/* It is assumed the policy was checked before this point */
|
|
@@ -174,17 +181,17 @@ export async function notifListener(
|
|
|
174
181
|
}
|
|
175
182
|
|
|
176
183
|
await this._log({
|
|
177
|
-
|
|
178
|
-
|
|
184
|
+
...commonLog,
|
|
185
|
+
type: "syncOrSub",
|
|
186
|
+
command: "notifListener.Finished",
|
|
179
187
|
state,
|
|
180
|
-
tableName: table_name,
|
|
181
188
|
op_name,
|
|
182
189
|
condition_ids_str,
|
|
183
190
|
tableTriggers: this._triggers?.[table_name],
|
|
184
191
|
tableSyncs: JSON.stringify(
|
|
185
192
|
this.syncs
|
|
186
193
|
.filter((s) => s.table_name === table_name)
|
|
187
|
-
.map((s) => pickKeys(s, ["condition", "socket_id"]))
|
|
194
|
+
.map((s) => pickKeys(s, ["condition", "socket_id"]))
|
|
188
195
|
),
|
|
189
196
|
connectedSocketIds: this.connectedSocketIds,
|
|
190
197
|
});
|
|
@@ -1,15 +1,34 @@
|
|
|
1
1
|
import { parseLocalFuncs } from "../DboBuilder/ViewHandler/subscribe";
|
|
2
|
+
import { EventTypes } from "../Logging";
|
|
2
3
|
import { log, PubSubManager, Subscription } from "./PubSubManager";
|
|
3
4
|
|
|
4
5
|
export async function pushSubData(this: PubSubManager, sub: Subscription, err?: any) {
|
|
5
6
|
const { socket_id, channel_name } = sub;
|
|
7
|
+
|
|
8
|
+
const onLog = (
|
|
9
|
+
state: Extract<EventTypes.SyncOrSub, { type: "syncOrSub"; command: "pushSubData" }>["state"]
|
|
10
|
+
) => {
|
|
11
|
+
this._log({
|
|
12
|
+
type: "syncOrSub",
|
|
13
|
+
command: "pushSubData",
|
|
14
|
+
channel_name: sub.channel_name,
|
|
15
|
+
error: err,
|
|
16
|
+
state,
|
|
17
|
+
duration: 0,
|
|
18
|
+
connectedSocketIds: this.connectedSocketIds,
|
|
19
|
+
triggers: this._triggers,
|
|
20
|
+
});
|
|
21
|
+
};
|
|
22
|
+
|
|
6
23
|
if (!this.subs.some((s) => s.channel_name === channel_name)) {
|
|
7
24
|
// Might be throttling a sub that was removed
|
|
25
|
+
onLog("sub_not_found");
|
|
8
26
|
return;
|
|
9
27
|
}
|
|
10
28
|
const localFuncs = parseLocalFuncs(sub.localFuncs);
|
|
11
29
|
|
|
12
30
|
if (err) {
|
|
31
|
+
onLog("error");
|
|
13
32
|
if (socket_id) {
|
|
14
33
|
this.sockets[socket_id].emit(channel_name, { err });
|
|
15
34
|
}
|
|
@@ -24,6 +43,7 @@ export async function pushSubData(this: PubSubManager, sub: Subscription, err?:
|
|
|
24
43
|
if (data) {
|
|
25
44
|
if (socket_id && this.sockets[socket_id]) {
|
|
26
45
|
log("Pushed " + data.length + " records to sub");
|
|
46
|
+
onLog("Emiting to socket");
|
|
27
47
|
this.sockets[socket_id].emit(channel_name, { data }, () => {
|
|
28
48
|
resolve(data);
|
|
29
49
|
});
|
|
@@ -31,11 +51,15 @@ export async function pushSubData(this: PubSubManager, sub: Subscription, err?:
|
|
|
31
51
|
{ data }, (cb)=> { console.log(cb) });
|
|
32
52
|
*/
|
|
33
53
|
} else if (localFuncs) {
|
|
54
|
+
onLog("pushed to local client");
|
|
34
55
|
localFuncs.onData(data);
|
|
35
56
|
resolve(data);
|
|
57
|
+
} else {
|
|
58
|
+
onLog("no client to push data to");
|
|
36
59
|
}
|
|
37
60
|
// sub.last_throttled = Date.now();
|
|
38
61
|
} else {
|
|
62
|
+
onLog("fetch data error");
|
|
39
63
|
const errObj = { _err_msg: err.toString(), err };
|
|
40
64
|
if (socket_id && this.sockets[socket_id]) {
|
|
41
65
|
this.sockets[socket_id].emit(channel_name, { err: errObj });
|