prostgles-server 4.2.187 → 4.2.188

package/lib/PubSubManager/PubSubManager.ts

@@ -29,11 +29,7 @@ import {
 } from "prostgles-types";
 
 import { find, pickKeys, tryCatch } from "prostgles-types/dist/util";
-import {
-  LocalFuncs,
-  getOnDataFunc,
-  matchesLocalFuncs,
-} from "../DboBuilder/ViewHandler/subscribe";
+import { LocalFuncs, getOnDataFunc, matchesLocalFuncs } from "../DboBuilder/ViewHandler/subscribe";
 import { EVENT_TRIGGER_TAGS } from "../Event_Trigger_Tags";
 import { EventTypes } from "../Logging";
 import { TableRule } from "../PublishParser/PublishParser";
@@ -113,10 +109,7 @@ export type ViewSubscriptionOptions = (
   }[];
 };
 
-export type SubscriptionParams = Pick<
-  SubscribeParams,
-  "throttle" | "throttleOpts"
-> & {
+export type SubscriptionParams = Pick<SubscribeParams, "throttle" | "throttleOpts"> & {
   socket_id?: string;
   channel_name: string;
 
@@ -200,10 +193,6 @@ export class PubSubManager {
   postgresNotifListenManager?: PostgresNotifListenManager;
 
   private constructor(dboBuilder: DboBuilder) {
-    if (!dboBuilder.db || !dboBuilder.dbo) {
-      throw "MISSING: db_pg, db";
-    }
-
     this.dboBuilder = dboBuilder;
 
     log("Created PubSubManager");
@@ -237,17 +226,16 @@ export class PubSubManager {
     const { watchSchema } = this.dboBuilder.prostgles.opts;
     if (watchSchema && !(await getIsSuperUser(this.db))) {
       console.warn(
-        "prostgles watchSchema requires superuser db user. Will not watch using event triggers",
+        "prostgles watchSchema requires superuser db user. Will not watch using event triggers"
       );
     }
 
     try {
       /** We use these names because they include schema where necessary */
-      const allTableNames = Object.keys(this.dbo).filter(
-        (k) => this.dbo[k]?.tableOrViewInfo,
-      );
-      const tableFilterQuery = allTableNames.length
-        ? `OR table_name NOT IN (${allTableNames.map((tblName) => asValue(tblName)).join(", ")})`
+      const allTableNames = Object.keys(this.dbo).filter((k) => this.dbo[k]?.tableOrViewInfo);
+      const tableFilterQuery =
+        allTableNames.length ?
+          `OR table_name NOT IN (${allTableNames.map((tblName) => asValue(tblName)).join(", ")})`
         : "";
       const query = pgp.as.format(
         `
@@ -303,7 +291,7 @@ export class PubSubManager {
 
         COMMIT;
       `,
-        { EVENT_TRIGGER_TAGS },
+        { EVENT_TRIGGER_TAGS }
       );
 
       await this.db
@@ -324,72 +312,54 @@ export class PubSubManager {
     channel_name,
     localFuncs,
     socket_id,
-  }: Pick<
-    Subscription,
-    "localFuncs" | "socket_id" | "channel_name"
-  >): Subscription[] {
+  }: Pick<Subscription, "localFuncs" | "socket_id" | "channel_name">): Subscription[] {
     return this.subs.filter((s) => {
       return (
         s.channel_name === channel_name &&
-        (matchesLocalFuncs(localFuncs, s.localFuncs) ||
-          (socket_id && s.socket_id === socket_id))
+        (matchesLocalFuncs(localFuncs, s.localFuncs) || (socket_id && s.socket_id === socket_id))
       );
     });
   }
 
   getTriggerSubs(table_name: string, condition: string): Subscription[] {
-    const subs = this.subs.filter((s) =>
-      find(s.triggers, { table_name, condition }),
-    );
+    const subs = this.subs.filter((s) => find(s.triggers, { table_name, condition }));
     return subs;
   }
 
   removeLocalSub(channelName: string, localFuncs: LocalFuncs) {
     const matchingSubIdx = this.subs.findIndex(
       (s) =>
-        s.channel_name === channelName &&
-        getOnDataFunc(localFuncs) === getOnDataFunc(s.localFuncs),
+        s.channel_name === channelName && getOnDataFunc(localFuncs) === getOnDataFunc(s.localFuncs)
     );
     if (matchingSubIdx > -1) {
       this.subs.splice(matchingSubIdx, 1);
     } else {
-      console.error(
-        "Could not unsubscribe. Subscription might not have initialised yet",
-        {
-          channelName,
-        },
-      );
+      console.error("Could not unsubscribe. Subscription might not have initialised yet", {
+        channelName,
+      });
     }
   }
 
   getSyncs(table_name: string, condition: string) {
-    return (this.syncs || []).filter(
-      (s: SyncParams) =>
-        s.table_name === table_name && s.condition === condition,
+    return this.syncs.filter(
+      (s: SyncParams) => s.table_name === table_name && s.condition === condition
     );
   }
 
   notifListener = notifListener.bind(this);
 
   getSubData = async (
-    sub: Subscription,
-  ): Promise<
-    { data: any[]; err?: undefined } | { data?: undefined; err: any }
-  > => {
+    sub: Subscription
+  ): Promise<{ data: any[]; err?: undefined } | { data?: undefined; err: any }> => {
     const { table_info, filter, params, table_rules } = sub; //, subOne = false
     const { name: table_name } = table_info;
 
-    if (!this.dbo?.[table_name]?.find) {
+    if (!this.dbo[table_name]?.find) {
       throw new Error(`this.dbo.${table_name}.find undefined`);
     }
 
     try {
-      const data = await this.dbo?.[table_name]!.find!(
-        filter,
-        params,
-        undefined,
-        table_rules,
-      );
+      const data = await this.dbo[table_name]!.find!(filter, params, undefined, table_rules);
       return { data };
     } catch (err) {
       return { err };
@@ -424,10 +394,10 @@ export class PubSubManager {
             this.subs.map((s) => ({
               tableName: s.table_info.name,
               triggers: s.triggers,
-            })),
+            }))
           ),
           remainingSyncs: JSON.stringify(
-            this.syncs.map((s) => pickKeys(s, ["table_name", "condition"])),
+            this.syncs.map((s) => pickKeys(s, ["table_name", "condition"]))
           ),
         });
 
@@ -453,13 +423,11 @@ export class PubSubManager {
   getActiveListeners = (): { table_name: string; condition: string }[] => {
     const activeListeners: { table_name: string; condition: string }[] = [];
     const upsert = (t: string, c: string) => {
-      if (
-        !activeListeners.find((r) => r.table_name === t && r.condition === c)
-      ) {
+      if (!activeListeners.find((r) => r.table_name === t && r.condition === c)) {
         activeListeners.push({ table_name: t, condition: c });
       }
     };
-    (this.syncs ?? []).map((s) => {
+    this.syncs.map((s) => {
       upsert(s.table_name, s.condition);
     });
 
@@ -486,7 +454,7 @@ export class PubSubManager {
         WHERE app_id = $1
         ORDER BY table_name, condition
       `,
-      [this.dboBuilder.prostgles.appId],
+      [this.dboBuilder.prostgles.appId]
     );
 
     this._triggers = {};
@@ -504,7 +472,7 @@ export class PubSubManager {
   async addTrigger(
     params: { table_name: string; condition: string },
     viewOptions: ViewSubscriptionOptions | undefined,
-    socket: PRGLIOSocket | undefined,
+    socket: PRGLIOSocket | undefined
   ) {
     const addedTrigger = await tryCatch(async () => {
       const { table_name } = { ...params };
@@ -522,9 +490,7 @@ export class PubSubManager {
       const trgVals = {
         tbl: asValue(table_name),
         cond: asValue(condition),
-        condHash: asValue(
-          crypto.createHash("md5").update(condition).digest("hex"),
-        ),
+        condHash: asValue(crypto.createHash("md5").update(condition).digest("hex")),
       };
 
       await this.db.tx((t) =>
@@ -563,7 +529,7 @@ export class PubSubManager {
         ON CONFLICT DO NOTHING;
 
         COMMIT WORK;
-      `),
+      `)
       );
 
       /** This might be redundant due to trigger on app_triggers */
@@ -582,9 +548,7 @@ export class PubSubManager {
       error: addedTrigger.error,
       sid: this.dboBuilder.prostgles.authHandler?.getSIDNoError({ socket }),
       tableName: addedTrigger.tbl ?? params.table_name,
-      connectedSocketIds: this.dboBuilder.prostgles.connectedSockets.map(
-        (s) => s.id,
-      ),
+      connectedSocketIds: this.dboBuilder.prostgles.connectedSockets.map((s) => s.id),
       localParams: { socket },
     });
 

package/lib/PubSubManager/addSub.ts

@@ -20,10 +20,7 @@ type AddSubResult = SubscriptionChannels & {
 /* The distinct list of {table_name, condition} must have a corresponding trigger in the database */
 export async function addSub(
   this: PubSubManager,
-  subscriptionParams: Omit<
-    AddSubscriptionParams,
-    "channel_name" | "parentSubParams"
-  >,
+  subscriptionParams: Omit<AddSubscriptionParams, "channel_name" | "parentSubParams">
 ): Promise<AddSubResult> {
   const {
     socket,
@@ -36,7 +33,7 @@ export async function addSub(
     viewOptions,
     table_info,
     throttleOpts,
-  } = subscriptionParams || {};
+  } = subscriptionParams;
   const table_name = table_info.name;
 
   if (!socket && !localFuncs) {
@@ -127,19 +124,15 @@ export async function addSub(
     socket.once(result.channelNameReady, () => {
       this.pushSubData(newSub);
     });
-    socket.once(
-      result.channelNameUnsubscribe,
-      (_data: any, cb: BasicCallback) => {
-        const res = "ok";
-        this.subs = this.subs.filter((s) => {
-          const isMatch =
-            s.socket?.id === socket.id && s.channel_name === channel_name;
-          return !isMatch;
-        });
-        removeListeners();
-        cb(null, { res });
-      },
-    );
+    socket.once(result.channelNameUnsubscribe, (_data: any, cb: BasicCallback) => {
+      const res = "ok";
+      this.subs = this.subs.filter((s) => {
+        const isMatch = s.socket?.id === socket.id && s.channel_name === channel_name;
+        return !isMatch;
+      });
+      removeListeners();
+      cb(null, { res });
+    });
   }
 
   this.subs.push(newSub);

package/lib/PubSubManager/addSync.ts

@@ -27,7 +27,7 @@ export async function addSync(this: PubSubManager, syncParams: AddSyncParams) {
       params,
       condition = "",
       throttle = 0,
-    } = syncParams || ({} as AddSyncParams);
+    } = syncParams;
     const conditionParsed = parseCondition(condition);
     if (!socket || !table_info) throw "socket or table_info missing";
 
@@ -49,8 +49,8 @@ export async function addSync(this: PubSubManager, syncParams: AddSyncParams) {
         id_fields,
         allow_delete,
         table_rules,
-        throttle: Math.max(throttle || 0, table_rules?.sync?.throttle || 0),
-        batch_size: table_rules?.sync?.batch_size || DEFAULT_SYNC_BATCH_SIZE,
+        throttle: Math.max(throttle || 0, table_rules.sync?.throttle || 0),
+        batch_size: table_rules.sync?.batch_size || DEFAULT_SYNC_BATCH_SIZE,
         socket_id: socket.id,
         is_sync: true,
         last_synced: 0,
@@ -63,7 +63,6 @@ export async function addSync(this: PubSubManager, syncParams: AddSyncParams) {
       };
 
       /* Only a sync per socket per table per condition allowed */
-      this.syncs ??= [];
       const existing = find(this.syncs, { socket_id: socket.id, channel_name });
       if (!existing) {
         this.syncs.push(newSync);
@@ -85,9 +84,7 @@ export async function addSync(this: PubSubManager, syncParams: AddSyncParams) {
           socket.removeAllListeners(unsyncChn);
           this.syncs = this.syncs.filter((s) => {
             const isMatch =
-              s.socket_id &&
-              s.socket_id === socket.id &&
-              s.channel_name === channel_name;
+              s.socket_id && s.socket_id === socket.id && s.channel_name === channel_name;
             return !isMatch;
           });
           cb(null, { res: "ok" });
@@ -131,11 +128,7 @@ export async function addSync(this: PubSubManager, syncParams: AddSyncParams) {
 
     upsertSync();
 
-    await this.addTrigger(
-      { table_name, condition: conditionParsed },
-      undefined,
-      socket,
-    );
+    await this.addTrigger({ table_name, condition: conditionParsed }, undefined, socket);
 
     return { result: channel_name };
   });

package/lib/PubSubManager/getCreatePubSubManagerError.ts

@@ -1,10 +1,10 @@
-import { tryCatch } from "prostgles-types";
+import { tryCatch, tryCatchV2 } from "prostgles-types";
 import { getPubSubManagerInitQuery } from "./getPubSubManagerInitQuery";
 import { getCanExecute } from "../DboBuilder/dboBuilderUtils";
 import { DboBuilder } from "../DboBuilder/DboBuilder";
 
 export const getCreatePubSubManagerError = async (
-  dboBuilder: DboBuilder,
+  dboBuilder: DboBuilder
 ): Promise<string | undefined> => {
   const db = dboBuilder.db;
 
@@ -19,7 +19,7 @@ export const getCreatePubSubManagerError = async (
   `);
 
   const checkIfCanCreateProstglesSchema = () =>
-    tryCatch(async () => {
+    tryCatchV2(async () => {
       const allGood = await db.task(async (t) => {
         try {
           await t.none(`
@@ -40,7 +40,7 @@ export const getCreatePubSubManagerError = async (
     });
 
   if (!prglSchema.length) {
-    const canCreate = await checkIfCanCreateProstglesSchema();
+    const { data: canCreate } = await checkIfCanCreateProstglesSchema();
     if (!canCreate) {
       const dbName = await db.one(`SELECT current_database()`);
       const user = await db.one(`SELECT current_user`);
@@ -48,23 +48,23 @@ export const getCreatePubSubManagerError = async (
     }
     return undefined;
   } else {
-    const canCheckVersion = await tryCatch(async () => {
+    const canCheckVersion = await tryCatchV2(async () => {
       await db.any(`
         SELECT * FROM prostgles.versions
       `);
       return { ok: true };
     });
 
-    if (!canCheckVersion.ok) {
+    if (!canCheckVersion.data?.ok) {
       console.error(
         "prostgles schema exists but cannot check version. Check logs",
-        canCheckVersion.error,
+        canCheckVersion.error
       );
       return "prostgles schema exists but cannot check version. Check logs";
     }
   }
 
-  const initQuery = await tryCatch(async () => ({
+  const initQuery = await tryCatchV2(async () => ({
     query: await getPubSubManagerInitQuery.bind(dboBuilder)(),
   }));
   if (initQuery.hasError) {
@@ -72,7 +72,7 @@ export const getCreatePubSubManagerError = async (
     return "Could not get initQuery. Check logs";
   }
 
-  if (!initQuery.query) {
+  if (!initQuery.data.query) {
     return undefined;
   }
 

package/lib/PubSubManager/initPubSubManager.ts

@@ -8,9 +8,7 @@ export const REALTIME_TRIGGER_CHECK_QUERY =
 
 export const tout = (ms: number) => new Promise((res) => setTimeout(res, ms));
 
-export async function initPubSubManager(
-  this: PubSubManager,
-): Promise<PubSubManager | undefined> {
+export async function initPubSubManager(this: PubSubManager): Promise<PubSubManager | undefined> {
   if (!this.getIsDestroyed()) return undefined;
 
   const initQuery = await getPubSubManagerInitQuery.bind(this.dboBuilder)();
@@ -27,7 +25,6 @@ export async function initPubSubManager(
       /** Try to reduce race condition deadlocks due to multiple clients connecting at the same time */
       await tout(Math.random());
 
-      // await this.dboBuilder.runClientTransactionStatement(initQuery);// this.db.tx(t => t.any(initQuery));
       await this.db.tx((t) => t.any(initQuery));
       error = undefined;
       tries = 0;
@@ -52,20 +49,17 @@ export async function initPubSubManager(
     this.appInfoWasInserted = true;
     const check_frequency_ms = this.appCheckFrequencyMS;
     const watching_schema_tag_names =
-      this.dboBuilder.prostgles.schemaWatch?.type.watchType !== "NONE"
-        ? getWatchSchemaTagList(this.dboBuilder.prostgles.opts.watchSchema)
-        : null;
+      this.dboBuilder.prostgles.schemaWatch?.type.watchType !== "NONE" ?
+        getWatchSchemaTagList(this.dboBuilder.prostgles.opts.watchSchema)
+      : null;
     await this.db.one(
       "INSERT INTO prostgles.apps (id, check_frequency_ms, watching_schema_tag_names, application_name) \
       VALUES($1, $2, $3, current_setting('application_name')) \
       RETURNING *; ",
-      [this.appId, check_frequency_ms, watching_schema_tag_names],
+      [this.appId, check_frequency_ms, watching_schema_tag_names]
     );
 
-    const appRecord = await this.db.one(
-      "SELECT * FROM prostgles.apps WHERE id = $1",
-      [this.appId],
-    );
+    const appRecord = await this.db.one("SELECT * FROM prostgles.apps WHERE id = $1", [this.appId]);
     if (!appRecord || !appRecord.application_name?.includes(this.appId)) {
       throw `initPubSubManager error: App record with application_name containing appId (${this.appId}) not found`;
     }
@@ -79,7 +73,7 @@ export async function initPubSubManager(
   this.postgresNotifListenManager = new PostgresNotifListenManager(
     this.db,
     this.notifListener,
-    NOTIF_CHANNEL.getFull(this.appId),
+    NOTIF_CHANNEL.getFull(this.appId)
   );
 
   await this.initialiseEventTriggers();

package/lib/PubSubManager/pushSubData.ts

@@ -1,13 +1,7 @@
 import { parseLocalFuncs } from "../DboBuilder/ViewHandler/subscribe";
 import { log, PubSubManager, Subscription } from "./PubSubManager";
 
-export async function pushSubData(
-  this: PubSubManager,
-  sub: Subscription,
-  err?: any,
-) {
-  if (!sub) throw "pushSubData: invalid sub";
-
+export async function pushSubData(this: PubSubManager, sub: Subscription, err?: any) {
   const { socket_id, channel_name } = sub;
   if (!this.subs.some((s) => s.channel_name === channel_name)) {
     // Might be throttling a sub that was removed

package/lib/PublishParser/PublishParser.ts

@@ -40,14 +40,13 @@ export class PublishParser {
     this.db = db;
     this.prostgles = prostgles;
 
-    if (!this.dbo || !this.publish) throw "INTERNAL ERROR: dbo and/or publish missing";
+    if (!this.publish) throw "INTERNAL ERROR: dbo and/or publish missing";
   }
 
   async getPublishParams(
     localParams: LocalParams,
     clientInfo?: AuthResult
   ): Promise<PublishParams> {
-    if (!this.dbo) throw "dbo missing";
     return {
       ...(clientInfo || (await this.prostgles.authHandler?.getClientInfo(localParams))),
       dbo: this.dbo as any,
@@ -69,12 +68,11 @@ export class PublishParser {
     if (_methods && Object.keys(_methods).length) {
       getObjectEntries(_methods).map(([key, method]) => {
         const isFuncLike = (maybeFunc: VoidFunction | Promise<void> | Promise<any>) =>
-          typeof maybeFunc === "function" || (maybeFunc && typeof maybeFunc.then === "function");
+          typeof maybeFunc === "function" || typeof maybeFunc.then === "function";
         if (
-          method &&
-          (isFuncLike(method as Extract<Method, Promise<any>>) ||
-            // @ts-ignore
-            (isObject(method) && isFuncLike(method.run)))
+          isFuncLike(method as Extract<Method, Promise<any>>) ||
+          // @ts-ignore
+          (isObject(method) && isFuncLike(method.run))
         ) {
           methods[key] = _methods[key]!;
         } else {
@@ -122,8 +120,6 @@ export class PublishParser {
     { tableName, command, localParams }: DboTableCommand,
     clientInfo?: AuthResult
   ): Promise<TableRule> {
-    if (!this.dbo) throw "INTERNAL ERROR: dbo is missing";
-
     if (!command || !tableName) throw "command OR tableName are missing";
 
     const rtm = RULE_TO_METHODS.find((rtms) => (rtms.methods as any).includes(command));
@@ -132,7 +128,7 @@ export class PublishParser {
     }
 
     /* Must be local request -> allow everything */
-    if (!localParams || (!localParams.socket && !localParams.httpReq)) {
+    if (!localParams.socket && !localParams.httpReq) {
       return RULE_TO_METHODS.reduce(
         (a, v) => ({
           ...a,
@@ -146,7 +142,7 @@ export class PublishParser {
     if (!this.publish) throw "publish is missing";
 
     /* Get any publish errors for socket */
-    const errorInfo = localParams?.socket?.prostgles?.tableSchemaErrors?.[tableName]?.[command];
+    const errorInfo = localParams.socket?.prostgles?.tableSchemaErrors[tableName]?.[command];
 
     if (errorInfo) throw errorInfo.error;
 
@@ -166,7 +162,7 @@ export class PublishParser {
       }
     }
 
-    if (rtm && table_rule && table_rule[rtm.rule]) {
+    if (table_rule[rtm.rule]) {
       return table_rule;
     } else
       throw {

package/lib/PublishParser/getFileTableRules.ts

@@ -120,7 +120,7 @@ export async function getFileTableRules(
       : {
           forcedFilter: {
             $or: forcedFilters.concat(
-              rule?.forcedFilter ? [rule?.forcedFilter] : [],
+              rule?.forcedFilter ? [rule.forcedFilter] : [],
             ),
           },
         };