prostgles-server 4.2.514 → 4.2.516

package/dist/WebsocketAPI/getClientHandlers.js

@@ -5,10 +5,11 @@ const prostgles_types_1 = require("prostgles-types");
 const runClientRequest_1 = require("../runClientRequest");
 const getClientSchema_1 = require("./getClientSchema");
 const getClientHandlers = async (prostgles, clientReq, scope) => {
-    const clientSchema = clientReq.socket?.prostgles ?? (await getClientSchema_1.getClientSchema.bind(prostgles)(clientReq, scope));
+    const clientSchema = clientReq.socket?.prostgles?.get(prostgles.appId) ??
+        (await getClientSchema_1.getClientSchema.bind(prostgles)(clientReq, scope));
     const sqlHandler = ((query, params, options) => runClientRequest_1.runClientSqlRequest.bind(prostgles)({ query, params, options }, clientReq));
     const tableHandlers = Object.fromEntries(prostgles.dboBuilder.tablesOrViews.map((table) => {
-        const methods = table.is_view ? viewMethods : [...viewMethods, ...tableMethods];
+        const methods = [...viewMethods, ...tableMethods];
         const handlers = Object.fromEntries(methods.map((command) => {
             const method = (param1, param2, param3) => runClientRequest_1.runClientRequest.bind(prostgles)({ command, tableName: table.name, param1, param2, param3 }, clientReq, scope);
             return [command, method];
@@ -21,7 +22,7 @@ const getClientHandlers = async (prostgles, clientReq, scope) => {
         },
     };
     const clientSql = ((query, params, options) => {
-        if (!scope?.allowSql) {
+        if (scope && !scope.allowSql) {
             throw new Error("SQL is dissallowed by PermissionScope");
         }
         return sqlHandler(query, params, options);

package/dist/WebsocketAPI/getClientHandlers.js.map

@@ -1 +1 @@
-{"version":3,"file":"getClientHandlers.js","sourceRoot":"","sources":["../../lib/WebsocketAPI/getClientHandlers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getClientHandlers.js","sourceRoot":"","sources":["../../lib/WebsocketAPI/getClientHandlers.ts"],"names":[],"mappings":"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"}

package/dist/WebsocketAPI/getClientSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getClientSchema.d.ts","sourceRoot":"","sources":["../../lib/WebsocketAPI/getClientSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkC,KAAK,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACpF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,eAAe,EAAiB,MAAM,gCAAgC,CAAC;AAIrF,wBAAsB,eAAe,CACnC,IAAI,EAAE,SAAS,EACf,SAAS,EAAE,iBAAiB,EAC5B,KAAK,EAAE,eAAe,GAAG,SAAS,yBAuGnC"}
+{"version":3,"file":"getClientSchema.d.ts","sourceRoot":"","sources":["../../lib/WebsocketAPI/getClientSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkC,KAAK,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEpF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,eAAe,EAAiB,MAAM,gCAAgC,CAAC;AAGrF,wBAAsB,eAAe,CACnC,IAAI,EAAE,SAAS,EACf,SAAS,EAAE,iBAAiB,EAC5B,KAAK,EAAE,eAAe,GAAG,SAAS,yBAmGnC"}

package/dist/WebsocketAPI/getClientSchema.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getClientSchema = getClientSchema;
 const prostgles_types_1 = require("prostgles-types");
-const runClientRequest_1 = require("../runClientRequest");
 const package_json_1 = require("../../package.json");
+const runClientRequest_1 = require("../runClientRequest");
 async function getClientSchema(clientReq, scope) {
     const result = await (0, prostgles_types_1.tryCatchV2)(async () => {
         const clientInfo = clientReq.socket ?
@@ -30,11 +30,7 @@ async function getClientSchema(clientReq, scope) {
         }
         const { allowed: rawSQL } = await runClientRequest_1.clientCanRunSqlRequest.bind(this)(clientInfo);
         const tablesWithSelectRules = new Set(fullSchema?.tables.filter((t) => t.publishInfo.select).map((t) => t.name) ?? []);
-        const { tables, tableSchemaErrors } = fullSchema ?? {
-            schema: {},
-            tables: [],
-            tableSchemaErrors: {},
-        };
+        const { tables = [], tableSchemaErrors = {} } = fullSchema ?? {};
         const joinTables2 = [];
         if (this.opts.joins) {
             const _joinTables2 = this.dboBuilder

package/dist/WebsocketAPI/getClientSchema.js.map

@@ -1 +1 @@
-{"version":3,"file":"getClientSchema.js","sourceRoot":"","sources":["../../lib/WebsocketAPI/getClientSchema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getClientSchema.js","sourceRoot":"","sources":["../../lib/WebsocketAPI/getClientSchema.ts"],"names":[],"mappings":"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"}

package/dist/WebsocketAPI/pushSocketSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pushSocketSchema.d.ts","sourceRoot":"","sources":["../../lib/WebsocketAPI/pushSocketSchema.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAG9C,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,YAAY,iBAmC3E"}
+{"version":3,"file":"pushSocketSchema.d.ts","sourceRoot":"","sources":["../../lib/WebsocketAPI/pushSocketSchema.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAG9C,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,YAAY,iBAoC3E"}

package/dist/WebsocketAPI/pushSocketSchema.js

@@ -7,7 +7,8 @@ const onSocketConnected_1 = require("./onSocketConnected");
 async function pushSocketSchema(socket) {
     try {
         const clientSchema = await this.getClientSchema({ socket }, undefined);
-        socket.prostgles = clientSchema;
+        socket.prostgles ??= new Map();
+        socket.prostgles.set(this.appId, clientSchema);
         if (clientSchema.rawSQL) {
             socket.removeAllListeners(prostgles_types_1.CHANNELS.SQL);
             socket.on(prostgles_types_1.CHANNELS.SQL, (sqlRequestData, cb = (..._callback) => {

package/dist/WebsocketAPI/pushSocketSchema.js.map

@@ -1 +1 @@
-{"version":3,"file":"pushSocketSchema.js","sourceRoot":"","sources":["../../lib/WebsocketAPI/pushSocketSchema.ts"],"names":[],"mappings":";;AAKA,4CAmCC;AAxCD,qDAAkF;AAGlF,0DAA0D;AAC1D,2DAAsD;AAC/C,KAAK,UAAU,gBAAgB,CAAkB,MAAoB;IAC1E,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,EAAE,SAAS,CAAC,CAAC;QACvE,MAAM,CAAC,SAAS,GAAG,YAAY,CAAC;QAChC,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;YACxB,MAAM,CAAC,kBAAkB,CAAC,0BAAQ,CAAC,GAAG,CAAC,CAAC;YACxC,MAAM,CAAC,EAAE,CACP,0BAAQ,CAAC,GAAG,EACZ,CACE,cAA0B,EAC1B,KAAK,CAAC,GAAG,SAAc,EAAE,EAAE;gBACzB,WAAW;YACb,CAAC,EACD,EAAE;gBACF,sCAAmB;qBAChB,IAAI,CAAC,IAAI,CAAC,CAAC,cAAc,EAAE,EAAE,MAAM,EAAE,CAAC;qBACtC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;oBACZ,EAAE,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;gBAChB,CAAC,CAAC;qBACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;oBACb,IAAA,mCAAe,EAAC,EAAE,EAAE,GAAG,CAAC,CAAC;gBAC3B,CAAC,CAAC,CAAC;YACP,CAAC,CACF,CAAC;QACJ,CAAC;QACD,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAC3C,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,kBAAkB;YAC3B,QAAQ,EAAE,CAAC,CAAC;YACZ,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,YAAY,EAAE;SAC5C,CAAC,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,0BAAQ,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAC7C,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAClB,MAAM,CAAC,IAAI,CAAC,0BAAQ,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,IAAA,sCAAoB,EAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACnE,CAAC;AACH,CAAC"}
+{"version":3,"file":"pushSocketSchema.js","sourceRoot":"","sources":["../../lib/WebsocketAPI/pushSocketSchema.ts"],"names":[],"mappings":";;AAKA,4CAoCC;AAzCD,qDAAkF;AAGlF,0DAA0D;AAC1D,2DAAsD;AAC/C,KAAK,UAAU,gBAAgB,CAAkB,MAAoB;IAC1E,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,EAAE,SAAS,CAAC,CAAC;QACvE,MAAM,CAAC,SAAS,KAAK,IAAI,GAAG,EAAE,CAAC;QAC/B,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;QAC/C,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;YACxB,MAAM,CAAC,kBAAkB,CAAC,0BAAQ,CAAC,GAAG,CAAC,CAAC;YACxC,MAAM,CAAC,EAAE,CACP,0BAAQ,CAAC,GAAG,EACZ,CACE,cAA0B,EAC1B,KAAK,CAAC,GAAG,SAAc,EAAE,EAAE;gBACzB,WAAW;YACb,CAAC,EACD,EAAE;gBACF,sCAAmB;qBAChB,IAAI,CAAC,IAAI,CAAC,CAAC,cAAc,EAAE,EAAE,MAAM,EAAE,CAAC;qBACtC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;oBACZ,EAAE,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;gBAChB,CAAC,CAAC;qBACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;oBACb,IAAA,mCAAe,EAAC,EAAE,EAAE,GAAG,CAAC,CAAC;gBAC3B,CAAC,CAAC,CAAC;YACP,CAAC,CACF,CAAC;QACJ,CAAC;QACD,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAC3C,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,kBAAkB;YAC3B,QAAQ,EAAE,CAAC,CAAC;YACZ,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,YAAY,EAAE;SAC5C,CAAC,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,0BAAQ,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAC7C,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAClB,MAAM,CAAC,IAAI,CAAC,0BAAQ,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,IAAA,sCAAoB,EAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACnE,CAAC;AACH,CAAC"}

package/lib/Auth/utils/handleGetUser.ts

@@ -14,13 +14,15 @@ export type GetUserOrRedirected = AuthResultWithSID | "new-session-redirect";
  */
 export async function handleGetUserThrottled(
   this: AuthHandler,
-  clientReq: AuthClientRequest
+  clientReq: AuthClientRequest,
 ): Promise<GetUserOrRedirected> {
   const getSessionForCaching = this.opts.cacheSession?.getSession;
 
   /** Get cached session if available */
   const __prglCache =
-    !this.opts.cacheSession ? undefined : (clientReq.httpReq ?? clientReq.socket).__prglCache;
+    !this.opts.cacheSession ?
+      undefined
+    : (clientReq.httpReq ?? clientReq.socket).__prglCache?.get(this.prostgles.appId);
   if (clientReq.socket && __prglCache) {
     const { userData, session } = __prglCache;
     const isValid = this.isNonExpiredSocketSession(clientReq.socket, session);
@@ -47,7 +49,7 @@ export async function handleGetUserThrottled(
       dbo,
       db,
       getClientRequestIPsInfo(clientReq),
-      clientReq
+      clientReq,
     );
     if (isAuthError(clientInfoOrErr)) {
       return {
@@ -81,9 +83,11 @@ export async function handleGetUserThrottled(
           session,
         };
         if (clientReq.socket) {
-          clientReq.socket.__prglCache = __prglCache;
+          clientReq.socket.__prglCache ??= new Map();
+          clientReq.socket.__prglCache.set(this.prostgles.appId, __prglCache);
         } else {
-          clientReq.httpReq.__prglCache = __prglCache;
+          clientReq.httpReq.__prglCache ??= new Map();
+          clientReq.httpReq.__prglCache.set(this.prostgles.appId, __prglCache);
         }
       }
     }
@@ -98,7 +102,7 @@ export async function handleGetUserThrottled(
 }
 
 export const isAuthError = (
-  dataOrError: AuthResultOrError
+  dataOrError: AuthResultOrError,
 ): dataOrError is AuthResponse.AuthFailure["code"] | AuthResponse.AuthFailure => {
   return Boolean(typeof dataOrError === "string" || (dataOrError && "success" in dataOrError));
 };

package/lib/DboBuilder/DboBuilder.ts

@@ -196,6 +196,7 @@ export class DboBuilder {
           getSerializedClientErrorFromPGError(error, {
             type: "sql",
             localParams,
+            prostgles: this.prostgles,
           }),
         ),
       );

package/lib/DboBuilder/DboBuilderTypes.ts

@@ -16,7 +16,6 @@ import type {
   DeleteRule,
   InsertRule,
   PermissionScope,
-  PublishAllOrNothing,
   SelectRule,
   UpdateRule,
 } from "../PublishParser/PublishParser";
@@ -157,7 +156,7 @@ export type CachedSessionData = {
 };
 
 export type CachedSession = {
-  __prglCache?: CachedSessionData;
+  __prglCache?: Map<string, CachedSessionData>;
 };
 
 export type PRGLIOSocket = {
@@ -191,7 +190,7 @@ export type PRGLIOSocket = {
   _user?: AnyObject;
 
   /** Used for publish error caching */
-  prostgles?: ClientSchema;
+  prostgles?: Map<string, ClientSchema>;
 } & CachedSession;
 
 export type LocalParams = {

package/lib/DboBuilder/QueryStreamer.ts

@@ -107,6 +107,7 @@ export class QueryStreamer {
         const errorWithoutQuery = getSerializedClientErrorFromPGError(rawError, {
           type: "sql",
           localParams: { clientReq: { socket } },
+          prostgles: this.dboBuilder.prostgles,
         });
         // For some reason query is not present on the error object from sql stream mode
         const error = { ...errorWithoutQuery, query: query.query };

package/lib/DboBuilder/TableHandler/TableHandler.ts

@@ -303,6 +303,7 @@ export class TableHandler extends ViewHandler {
         type: "tableMethod",
         localParams,
         view: this,
+        prostgles: this.dboBuilder.prostgles,
       });
     }
 

package/lib/DboBuilder/TableHandler/delete.ts

@@ -147,6 +147,7 @@ export async function _delete(
       type: "tableMethod",
       localParams,
       view: this,
+      prostgles: this.dboBuilder.prostgles,
     });
   }
 }

package/lib/DboBuilder/TableHandler/insert/insert.ts

@@ -264,6 +264,7 @@ export async function insert(
       type: "tableMethod",
       localParams,
       view: this,
+      prostgles: this.dboBuilder.prostgles,
     });
   }
 }

package/lib/DboBuilder/TableHandler/runInsertUpdateQuery.ts

@@ -117,6 +117,7 @@ export const runInsertUpdateQuery = async (args: RunInsertUpdateQueryArgs) => {
         localParams,
         view: tableHandler,
         allowedKeys: allowedFieldKeys,
+        prostgles: tableHandler.dboBuilder.prostgles,
       }),
     );
   } else {
@@ -128,6 +129,7 @@ export const runInsertUpdateQuery = async (args: RunInsertUpdateQueryArgs) => {
           localParams,
           view: tableHandler,
           allowedKeys: allowedFieldKeys,
+          prostgles: tableHandler.dboBuilder.prostgles,
         }),
       );
   }

package/lib/DboBuilder/TableHandler/update.ts

@@ -203,6 +203,7 @@ export async function update(
       type: "tableMethod",
       localParams,
       view: this,
+      prostgles: this.dboBuilder.prostgles,
     });
   }
 }

package/lib/DboBuilder/TableHandler/updateBatch.ts

@@ -1,8 +1,6 @@
 import type { AnyObject, UpdateParams } from "prostgles-types";
 import type { ParsedTableRule } from "../../PublishParser/PublishParser";
-import type {
-  Filter,
-  LocalParams} from "../DboBuilder";
+import type { Filter, LocalParams } from "../DboBuilder";
 import {
   getClientErrorFromPGError,
   getErrorAsObject,
@@ -17,7 +15,7 @@ export async function updateBatch(
   params?: UpdateParams,
   _?: undefined,
   tableRules?: ParsedTableRule,
-  localParams?: LocalParams
+  localParams?: LocalParams,
 ): Promise<any> {
   const start = Date.now();
   try {
@@ -32,11 +30,11 @@ export async function updateBatch(
           data,
           { ...(params ?? {}), returning: undefined },
           tableRules,
-          { ...(localParams ?? {}), returnQuery: "noRLS" }
+          { ...(localParams ?? {}), returnQuery: "noRLS" },
         )) as unknown as string;
 
         return query;
-      })
+      }),
     );
     const queries = [withUserRLS(localParams, ""), ...updateQueries];
 
@@ -61,7 +59,8 @@ export async function updateBatch(
           localParams,
           view: this,
           allowedKeys: [],
-        })
+          prostgles: this.dboBuilder.prostgles,
+        }),
       );
 
     await this._log({
@@ -83,6 +82,7 @@ export async function updateBatch(
       type: "tableMethod",
       localParams,
       view: this,
+      prostgles: this.dboBuilder.prostgles,
     });
   }
 }

package/lib/DboBuilder/TableHandler/upsert.ts

@@ -10,7 +10,7 @@ export const upsert = async function (
   newData: AnyObject,
   params?: UpdateParams,
   table_rules?: ParsedTableRule,
-  localParams?: LocalParams
+  localParams?: LocalParams,
 ): Promise<any> {
   const start = Date.now();
   try {
@@ -26,7 +26,7 @@ export const upsert = async function (
               params,
               undefined,
               table_rules,
-              localParams
+              localParams,
             );
           }
         });
@@ -56,6 +56,7 @@ export const upsert = async function (
       type: "tableMethod",
       localParams,
       view: this,
+      prostgles: this.dboBuilder.prostgles,
     });
   }
 };

package/lib/DboBuilder/ViewHandler/ViewHandler.ts

@@ -197,6 +197,7 @@ export class ViewHandler {
         type: "tableMethod",
         localParams,
         view: this,
+        prostgles: this.dboBuilder.prostgles,
       });
     }
   }

package/lib/DboBuilder/ViewHandler/count.ts

@@ -14,7 +14,7 @@ export async function count(
   selectParams?: SelectParams,
   _param3_unused?: undefined,
   table_rules?: ParsedTableRule,
-  localParams?: LocalParams
+  localParams?: LocalParams,
 ): Promise<number> {
   const filter = _filter || {};
   const { limit: _limit, ...selectParamsWithoutLimit } = selectParams ?? {};
@@ -25,7 +25,7 @@ export async function count(
       { select: selectParamsWithoutLimit.select ?? "", limit: 0 },
       undefined,
       table_rules,
-      localParams
+      localParams,
     ).then(async (_allowed) => {
       const findQuery = (await this.find(filter, selectParamsWithoutLimit, undefined, table_rules, {
         ...localParams,
@@ -62,6 +62,7 @@ export async function count(
       type: "tableMethod",
       localParams,
       view: this,
+      prostgles: this.dboBuilder.prostgles,
     });
   }
 }

package/lib/DboBuilder/ViewHandler/find.ts

@@ -161,6 +161,7 @@ export const find = async function (
       type: "tableMethod",
       localParams,
       view: this,
+      prostgles: this.dboBuilder.prostgles,
     });
   }
 };
@@ -198,6 +199,7 @@ export const runQueryReturnType = async ({
           type: "tableMethod",
           localParams,
           view: handler,
+          prostgles: handler.dboBuilder.prostgles,
         }),
       );
   } else if (sqlTypes.some((v) => v === returnType)) {
@@ -223,6 +225,7 @@ export const runQueryReturnType = async ({
           type: "tableMethod",
           localParams,
           view: handler,
+          prostgles: handler.dboBuilder.prostgles,
         }),
       );
   }

package/lib/DboBuilder/ViewHandler/size.ts

@@ -13,7 +13,7 @@ export async function size(
   selectParams?: SelectParams,
   param3_unused?: undefined,
   table_rules?: ParsedTableRule,
-  localParams?: LocalParams
+  localParams?: LocalParams,
 ): Promise<string> {
   const filter = _filter || {};
   const start = Date.now();
@@ -23,7 +23,7 @@ export async function size(
       { ...selectParams, limit: 2 },
       undefined,
       table_rules,
-      localParams
+      localParams,
     ).then(async (_allowed) => {
       const q: string = (await this.find(
         filter,
@@ -33,7 +33,7 @@ export async function size(
         },
         undefined,
         table_rules,
-        { ...localParams, returnQuery: "noRLS", bypassLimit: true }
+        { ...localParams, returnQuery: "noRLS", bypassLimit: true },
       )) as any;
       const query = withUserRLS(
         localParams,
@@ -42,7 +42,7 @@ export async function size(
             FROM (
               ${q}
             ) prgl_size_query
-          `
+          `,
       );
 
       return (this.tx?.t || this.db).one(query).then(({ size }) => size || "0");
@@ -66,6 +66,7 @@ export async function size(
       type: "tableMethod",
       localParams,
       view: this,
+      prostgles: this.dboBuilder.prostgles,
     });
   }
 }

package/lib/DboBuilder/ViewHandler/subscribe.ts

@@ -152,6 +152,7 @@ async function subscribe(
       type: "tableMethod",
       localParams,
       view: this,
+      prostgles: this.dboBuilder.prostgles,
     });
   }
 }

package/lib/DboBuilder/ViewRelatedTables/getViewRelatedTables.ts

@@ -26,6 +26,7 @@ export const getViewRelatedTables = async (
       type: "tableMethod",
       localParams,
       view: this,
+      prostgles: viewHandler.dboBuilder.prostgles,
     });
   }
   const { fields } = await dboBuilder.runSQL(

package/lib/DboBuilder/dboBuilderUtils.ts

@@ -1,6 +1,6 @@
 import type { AnyObject } from "prostgles-types";
 import { getSerialisableError, isObject, omitKeys, pickKeys } from "prostgles-types";
-import type { DB } from "../Prostgles";
+import type { DB, Prostgles } from "../Prostgles";
 import { asNameAlias } from "../utils/asNameAlias";
 import type { LocalParams, SortItem } from "./DboBuilderTypes";
 import { pgp } from "./DboBuilderTypes";
@@ -19,20 +19,17 @@ export const getErrorAsObject = (rawError: any) => {
   return { message: serializedError };
 };
 
-const circularError = new Error("Circular error data");
-//@ts-ignore
-circularError.someProp = circularError;
-getErrorAsObject(circularError);
-
 type GetSerializedClientErrorFromPGErrorArgs =
   | {
       type: "sql";
       localParams: LocalParams | undefined;
+      prostgles: Prostgles;
     }
   | {
       type: "tableMethod";
       localParams: LocalParams | undefined;
       view: ViewHandler | Partial<TableHandler> | undefined;
+      prostgles: Prostgles;
       allowedKeys?: string[];
     }
   | {
@@ -40,9 +37,9 @@ type GetSerializedClientErrorFromPGErrorArgs =
       localParams: LocalParams | undefined;
       allowedKeys?: string[];
       view?: undefined;
+      prostgles: Prostgles;
     };
 
-const sensitiveErrorKeys = ["hint", "detail", "context"] as const;
 const otherKeys = [
   "column",
   "code",
@@ -71,7 +68,7 @@ export function getSerializedClientErrorFromPGError(
   const showFullError =
     isServerSideRequest ||
     args.type === "sql" ||
-    args.localParams?.clientReq?.socket?.prostgles?.rawSQL;
+    args.localParams?.clientReq?.socket?.prostgles?.get(args.prostgles.appId)?.rawSQL;
   if (showFullError) {
     return err;
   }

package/lib/DboBuilder/getColumns.ts

@@ -129,6 +129,7 @@ export async function getColumns(
       type: "tableMethod",
       localParams,
       view: this,
+      prostgles: this.dboBuilder.prostgles,
     });
   }
 }

package/lib/DboBuilder/runSql/runSQL.ts

@@ -7,6 +7,7 @@ import type { DB, Prostgles } from "../../Prostgles";
 import type { DboBuilder, LocalParams } from "../DboBuilder";
 import { pgp } from "../DboBuilder";
 import { getDbTypes, getDetailedFieldInfo } from "./runSqlUtils";
+
 export async function runSQL(
   this: DboBuilder,
   queryWithoutRLS: string,

package/lib/PublishParser/PublishParser.ts

@@ -136,7 +136,9 @@ export class PublishParser {
     /* Must be from socket. Must have a publish */
     if (!this.publish) throw "publish is missing";
 
-    const tableErrors = clientReq.socket?.prostgles?.tableSchemaErrors[tableName];
+    const tableErrors = clientReq.socket?.prostgles?.get(this.prostgles.appId)?.tableSchemaErrors[
+      tableName
+    ];
     /* Get any publish errors for socket */
     Object.values(tableErrors ?? {}).forEach((errorInfo) => {
       throw errorInfo.error;

package/lib/PublishParser/getSchemaFromPublish.ts

@@ -1,7 +1,6 @@
 import type { DBSchemaTable, TableSchemaErrors } from "prostgles-types";
 import { isEmpty, isObject } from "prostgles-types";
 import type { AuthClientRequest, AuthResultWithSID } from "../Auth/AuthTypes";
-import type { TableHandler } from "../DboBuilder/TableHandler/TableHandler";
 import type { PublishParser } from "./PublishParser";
 import { type PermissionScope, type PublishObject } from "./PublishParser";
 import { getDBSchemaTable } from "./getDBSchemaTable";
@@ -9,8 +8,6 @@ import { getDBSchemaTable } from "./getDBSchemaTable";
 type Args = AuthClientRequest & {
   userData: AuthResultWithSID | undefined;
 };
-const SUBSCRIBE_METHODS = ["subscribe", "subscribeOne", "sync", "unsubscribe", "unsync"] as const;
-
 export async function getSchemaFromPublish(
   this: PublishParser,
   { userData, ...clientReq }: Args,

package/lib/RestApi.ts

@@ -92,13 +92,14 @@ export class RestApi {
         {
           res,
           httpReq: req,
-        }
+        },
       );
       res.json(data);
     } catch (rawError) {
       const error = getSerializedClientErrorFromPGError(rawError, {
         type: "method",
         localParams: { clientReq: { httpReq: req, res } },
+        prostgles: this.prostgles,
       });
       res.status(400).json({ error });
     }
@@ -111,6 +112,7 @@ export class RestApi {
       const error = getSerializedClientErrorFromPGError(rawError, {
         type: "method",
         localParams: { clientReq: { httpReq: req, res } },
+        prostgles: this.prostgles,
       });
       res.status(400).json({ error });
     }
@@ -127,13 +129,14 @@ export class RestApi {
         {
           res,
           httpReq: req,
-        }
+        },
       );
       res.json(data);
     } catch (rawError) {
       const error = getSerializedClientErrorFromPGError(rawError, {
         type: "sql",
         localParams: { clientReq: { httpReq: req, res } },
+        prostgles: this.prostgles,
       });
       res.status(400).json({ error });
     }
@@ -165,14 +168,15 @@ export class RestApi {
           httpReq: req,
           res,
         },
-        undefined
+        undefined,
       );
       res.json(data);
     } catch (rawError) {
       const error = getSerializedClientErrorFromPGError(rawError, {
         type: "tableMethod",
         localParams: { clientReq: { httpReq: req, res } },
-        view: this.prostgles.dboBuilder.dbo[tableName],
+        view: this.prostgles.dboBuilder.dboMap.get(tableName),
+        prostgles: this.prostgles,
       });
       res.status(400).json({ error });
     }

package/lib/WebsocketAPI/getClientHandlers.ts

@@ -27,7 +27,8 @@ export const getClientHandlers = async <S = void>(
   scope: PermissionScope | undefined,
 ): Promise<ClientHandlers> => {
   const clientSchema =
-    clientReq.socket?.prostgles ?? (await getClientSchema.bind(prostgles)(clientReq, scope));
+    clientReq.socket?.prostgles?.get(prostgles.appId) ??
+    (await getClientSchema.bind(prostgles)(clientReq, scope));
   const sqlHandler: SQLHandler | undefined = ((
     query: string,
     params?: unknown,
@@ -35,7 +36,7 @@ export const getClientHandlers = async <S = void>(
   ) => runClientSqlRequest.bind(prostgles)({ query, params, options }, clientReq)) as SQLHandler;
   const tableHandlers = Object.fromEntries(
     prostgles.dboBuilder.tablesOrViews!.map((table) => {
-      const methods = table.is_view ? viewMethods : [...viewMethods, ...tableMethods];
+      const methods = [...viewMethods, ...tableMethods];
       const handlers = Object.fromEntries(
         methods.map((command) => {
           const method = (param1: unknown, param2: unknown, param3: unknown) =>
@@ -57,7 +58,7 @@ export const getClientHandlers = async <S = void>(
     },
   };
   const clientSql = ((query: string, params?: AnyObject, options?: SQLOptions) => {
-    if (!scope?.allowSql) {
+    if (scope && !scope.allowSql) {
       throw new Error("SQL is dissallowed by PermissionScope");
     }