prostgles-server 4.2.270 → 4.2.272

package/lib/PublishParser/getSchemaFromPublish.ts

@@ -1,20 +1,26 @@
 import {
   DBSchemaTable,
   getKeys,
+  includes,
+  isEmpty,
+  isObject,
   MethodKey,
   pickKeys,
   TableInfo,
   TableSchemaErrors,
   TableSchemaForClient,
+  type AnyObject,
 } from "prostgles-types";
 import { AuthClientRequest, AuthResultWithSID } from "../Auth/AuthTypes";
 import { getErrorAsObject } from "../DboBuilder/DboBuilder";
+import type { TableHandler } from "../DboBuilder/TableHandler/TableHandler";
 import { TABLE_METHODS } from "../Prostgles";
 import { type PublishObject, PublishParser } from "./PublishParser";
 
 type Args = AuthClientRequest & {
   userData: AuthResultWithSID | undefined;
 };
+const SUBSCRIBE_METHODS = ["subscribe", "subscribeOne", "sync", "unsubscribe", "unsync"] as const;
 
 export async function getSchemaFromPublish(
   this: PublishParser,
@@ -32,7 +38,9 @@ export async function getSchemaFromPublish(
     /* Publish tables and views based on socket */
     const clientInfo =
       userData ?? (await this.prostgles.authHandler?.getSidAndUserFromRequest(clientReq));
-
+    if (clientInfo === "new-session-redirect") {
+      throw "new-session-redirect";
+    }
     let _publish: PublishObject | undefined;
     try {
       _publish = await this.getPublishAsObject(clientReq, clientInfo);
@@ -64,115 +72,110 @@ export async function getSchemaFromPublish(
       }
       await Promise.all(
         tableNames.map(async (tableName) => {
+          const { canSubscribe, tablesOrViews } = this.prostgles.dboBuilder;
           if (!this.dbo[tableName]) {
             const errMsg = [
               `Table ${tableName} does not exist`,
-              `Expecting one of: ${JSON.stringify(this.prostgles.dboBuilder.tablesOrViews?.map((tov) => tov.name))}`,
-              `DBO tables: ${JSON.stringify(Object.keys(this.dbo).filter((k) => (this.dbo[k] as any).find))}`,
+              `Expecting one of: ${JSON.stringify(tablesOrViews?.map((tov) => tov.name))}`,
             ].join("\n");
             throw errMsg;
           }
 
-          const table_rules = await this.getTableRules({ clientReq, tableName }, clientInfo);
-
-          if (table_rules && Object.keys(table_rules).length) {
-            schema[tableName] = {};
-            const tableSchema = schema[tableName]!;
-            let methods: MethodKey[] = [];
-            let tableInfo: TableInfo | undefined;
-            let tableColumns: DBSchemaTable["columns"] | undefined;
-
-            if (typeof table_rules === "object") {
-              methods = getKeys(table_rules) as any;
-            }
+          const tableRules = await this.getTableRules({ clientReq, tableName }, clientInfo);
 
-            if (!this.prostgles.dboBuilder.canSubscribe) {
-              methods = methods.filter(
-                (m) => !["subscribe", "subscribeOne", "sync", "unsubscribe", "unsync"].includes(m)
-              );
-            }
-
-            await Promise.all(
-              methods
-                .filter((m) => m !== ("select" as any))
-                .map(async (method) => {
-                  if (method === "sync" && table_rules[method]) {
-                    /* Pass sync info */
-                    tableSchema[method] = table_rules[method];
-                  } else if ((table_rules as any)[method]) {
-                    tableSchema[method] =
-                      method === "insert" ?
-                        pickKeys(table_rules.insert!, ["allowedNestedInserts"])
-                      : {};
+          if (!tableRules || isEmpty(tableRules)) return;
+          if (!isObject(tableRules)) {
+            throw `Invalid tableRules for table ${tableName}. Expecting an object`;
+          }
 
-                    /* Test for issues with the common table CRUD methods () */
-                    if (TABLE_METHODS.some((tm) => tm === method)) {
-                      try {
-                        const valid_table_command_rules = await this.getValidatedRequestRule(
+          schema[tableName] = {};
+          const tableSchema = schema[tableName]!;
+          const methods = getKeys(tableRules).filter(
+            (m) => canSubscribe || !includes(SUBSCRIBE_METHODS, m)
+          );
+          let tableInfo: TableInfo | undefined;
+          let tableColumns: DBSchemaTable["columns"] | undefined;
+
+          await Promise.all(
+            methods
+              .filter((m) => m !== "select")
+              .map(async (method) => {
+                if (method === "sync") {
+                  /* Pass sync info */
+                  tableSchema[method] = tableRules[method];
+                } else if (includes(getKeys(tableRules), method) && tableRules[method]) {
+                  //@ts-ignore
+                  tableSchema[method] =
+                    method === "insert" ?
+                      pickKeys(tableRules[method]!, ["allowedNestedInserts"])
+                    : ({} as AnyObject);
+
+                  /* Test for issues with the common table CRUD methods () */
+                  if (includes(TABLE_METHODS, method)) {
+                    try {
+                      const parsedTableRule = await this.getValidatedRequestRule(
+                        {
+                          tableName,
+                          command: method,
+                          clientReq,
+                        },
+                        clientInfo
+                      );
+                      if (this.prostgles.opts.testRulesOnConnect) {
+                        await (this.dbo[tableName] as TableHandler)[method](
+                          {},
+                          {},
+                          undefined,
+                          parsedTableRule,
                           {
-                            tableName,
-                            command: method,
-                            clientReq,
-                          },
-                          clientInfo
+                            ...clientReq,
+                            isRemoteRequest: {},
+                            testRule: true,
+                          }
                         );
-                        if (this.prostgles.opts.testRulesOnConnect) {
-                          await (this.dbo[tableName] as any)[method](
-                            {},
-                            {},
-                            {},
-                            valid_table_command_rules,
-                            {
-                              ...clientReq,
-                              isRemoteRequest: true,
-                              testRule: true,
-                            }
-                          );
-                        }
-                      } catch (e) {
-                        console.error(`${tableName}.${method}`, e);
-                        tableSchemaErrors[tableName] ??= {};
-                        tableSchemaErrors[tableName]![method] = {
-                          error: "Internal publish error. Check server logs",
-                        };
-
-                        throw {
-                          ...getErrorAsObject(e),
-                          publish_path: `publish.${tableName}.${method}: \n   -> ${e}`,
-                        };
                       }
+                    } catch (e) {
+                      console.error(`${tableName}.${method}`, e);
+                      tableSchemaErrors[tableName] ??= {};
+                      tableSchemaErrors[tableName]![method] = {
+                        error: "Internal publish error. Check server logs",
+                      };
+
+                      throw {
+                        ...getErrorAsObject(e),
+                        publish_path: `publish.${tableName}.${method}: \n   -> ${e}`,
+                      };
                     }
+                  }
 
-                    if (method === "getInfo" || method === "getColumns") {
-                      const tableRules = await this.getValidatedRequestRule(
-                        { tableName, command: method, clientReq },
-                        clientInfo
-                      );
-                      const res = await (this.dbo[tableName] as any)[method](
-                        undefined,
-                        undefined,
-                        undefined,
-                        tableRules,
-                        { ...clientReq, isRemoteRequest: true }
-                      );
-                      if (method === "getInfo") {
-                        tableInfo = res;
-                        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-                      } else if (method === "getColumns") {
-                        tableColumns = res;
-                      }
+                  if (method === "getInfo" || method === "getColumns") {
+                    const tableRules = await this.getValidatedRequestRule(
+                      { tableName, command: method, clientReq },
+                      clientInfo
+                    );
+                    const res = await (this.dbo[tableName] as TableHandler)[method](
+                      undefined,
+                      undefined,
+                      undefined,
+                      tableRules,
+                      { ...clientReq, isRemoteRequest: {} }
+                    );
+                    if (method === "getInfo") {
+                      tableInfo = res as TableInfo;
+                    } else {
+                      tableColumns = res as DBSchemaTable["columns"];
                     }
                   }
-                })
-            );
-
-            if (tableInfo && tableColumns) {
-              tables.push({
-                name: tableName,
-                info: tableInfo,
-                columns: tableColumns,
-              });
-            }
+                }
+              })
+          );
+
+          if (tableInfo && tableColumns) {
+            tables.push({
+              name: tableName,
+              info: tableInfo,
+              columns: tableColumns,
+            });
           }
         })
       );

package/lib/onSocketConnected.ts

@@ -15,9 +15,18 @@ export async function onSocketConnected(this: Prostgles, socket: PRGLIOSocket) {
   this.connectedSockets.push(socket);
 
   try {
+    const getUser = async () => {
+      if (!this.authHandler) throw "authHandler missing";
+      const res = await this.authHandler.getSidAndUserFromRequest({ socket });
+      if (res === "new-session-redirect") {
+        throw "new-session-redirect";
+      }
+      return res;
+    };
+
     await this.opts.onLog?.({
       type: "connect",
-      sid: this.authHandler?.getSID({ socket }),
+      sid: this.authHandler?.getValidatedSid({ socket }),
       socketId: socket.id,
       connectedSocketIds: this.connectedSockets.map((s) => s.id),
     });
@@ -30,22 +39,20 @@ export async function onSocketConnected(this: Prostgles, socket: PRGLIOSocket) {
     if (onUseOrSocketConnected) {
       if (!authHandler) throw "authHandler missing";
       const errorInfo = await onUseOrSocketConnected(
-        authHandler.getSID({ socket }),
+        authHandler.getValidatedSid({ socket }),
         getClientRequestIPsInfo({ socket }),
         { socket }
       );
       if (errorInfo) {
-        socket.emit(CHANNELS.CONNECTION, { error: errorInfo.error });
+        socket.emit(CHANNELS.CONNECTION, {
+          error: "error" in errorInfo ? errorInfo.error : "New session setup",
+        });
         socket.disconnect();
         return;
       }
     }
     if (this.opts.onSocketConnect) {
       try {
-        const getUser = async () => {
-          if (!this.authHandler) throw "authHandler missing";
-          return await this.authHandler.getSidAndUserFromRequest({ socket });
-        };
         await this.opts.onSocketConnect({
           socket,
           dbo: dbo as DBOFullyTyped,
@@ -91,16 +98,12 @@ export async function onSocketConnected(this: Prostgles, socket: PRGLIOSocket) {
       this.dboBuilder.queryStreamer.onDisconnect(socket.id);
       void this.opts.onLog?.({
         type: "disconnect",
-        sid: this.authHandler?.getSID({ socket }),
+        sid: this.authHandler?.getValidatedSid({ socket }),
         socketId: socket.id,
         connectedSocketIds: this.connectedSockets.map((s) => s.id),
       });
 
       if (this.opts.onSocketDisconnect) {
-        const getUser = async () => {
-          if (!this.authHandler) throw "authHandler missing";
-          return await this.authHandler.getSidAndUserFromRequest({ socket });
-        };
         void this.opts.onSocketDisconnect({ socket, dbo: dbo as DBOFullyTyped, db, getUser });
       }
     });

package/lib/runClientRequest.ts

@@ -77,6 +77,9 @@ export const runClientRequest = async function (
   }
 
   const clientInfo = await this.authHandler?.getSidAndUserFromRequest(clientReq);
+  if (clientInfo === "new-session-redirect") {
+    throw clientInfo;
+  }
   const validRules = await this.publishParser.getValidatedRequestRule(
     { tableName, command, clientReq },
     clientInfo

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "4.2.270",
+  "version": "4.2.272",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -57,7 +57,7 @@
     "pg": "^8.11.5",
     "pg-cursor": "^2.11.0",
     "pg-promise": "^11.9.1",
-    "prostgles-types": "^4.0.164"
+    "prostgles-types": "^4.0.166"
   },
   "devDependencies": {
     "@eslint/js": "^9.22.0",