@subsquid/openreader 4.4.2 → 4.5.1

package/lib/context.d.ts

@@ -1,14 +1,17 @@
-import { Dialect } from './dialect';
-import { Query } from './sql/query';
-import { Limit } from './util/limit';
+import type { Logger } from '@subsquid/logger';
+import type { Dialect } from './dialect';
+import type { Query } from './sql/query';
+import type { Limit } from './util/limit';
 export interface Context {
     openreader: OpenreaderContext;
 }
 export interface OpenreaderContext {
+    id: number;
     dialect: Dialect;
     executeQuery<T>(query: Query<T>): Promise<T>;
     subscription<T>(query: Query<T>): AsyncIterable<T>;
     responseSizeLimit?: Limit;
     subscriptionResponseSizeLimit?: Limit;
+    log?: Logger;
 }
 //# sourceMappingURL=context.d.ts.map

package/lib/context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAA;AACjC,OAAO,EAAC,KAAK,EAAC,MAAM,aAAa,CAAA;AACjC,OAAO,EAAC,KAAK,EAAC,MAAM,cAAc,CAAA;AAGlC,MAAM,WAAW,OAAO;IACpB,UAAU,EAAE,iBAAiB,CAAA;CAChC;AAGD,MAAM,WAAW,iBAAiB;IAC9B,OAAO,EAAE,OAAO,CAAA;IAChB,YAAY,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;IAC5C,YAAY,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAAA;IAClD,iBAAiB,CAAC,EAAE,KAAK,CAAA;IACzB,6BAA6B,CAAC,EAAE,KAAK,CAAA;CACxC"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,kBAAkB,CAAA;AAC5C,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,WAAW,CAAA;AACtC,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,aAAa,CAAA;AACtC,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,cAAc,CAAA;AAGvC,MAAM,WAAW,OAAO;IACpB,UAAU,EAAE,iBAAiB,CAAA;CAChC;AAGD,MAAM,WAAW,iBAAiB;IAC9B,EAAE,EAAE,MAAM,CAAA;IACV,OAAO,EAAE,OAAO,CAAA;IAChB,YAAY,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;IAC5C,YAAY,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAAA;IAClD,iBAAiB,CAAC,EAAE,KAAK,CAAA;IACzB,6BAA6B,CAAC,EAAE,KAAK,CAAA;IACrC,GAAG,CAAC,EAAE,MAAM,CAAA;CACf"}

package/lib/db.d.ts

@@ -1,23 +1,21 @@
-import type { ClientBase, Pool } from "pg";
-import { OpenreaderContext } from "./context";
-import { Dialect } from "./dialect";
-import { Query } from "./sql/query";
-export interface Database {
-    query(sql: string, parameters?: any[]): Promise<any[][]>;
-}
-export declare class PgDatabase implements Database {
-    private client;
-    constructor(client: ClientBase);
-    query(sql: string, parameters?: any[]): Promise<any[][]>;
-}
+import type { Logger } from '@subsquid/logger';
+import type { Pool } from 'pg';
+import { OpenreaderContext } from './context';
+import { Dialect } from './dialect';
+import { Query } from './sql/query';
 export declare class PoolOpenreaderContext implements OpenreaderContext {
     readonly dialect: Dialect;
     private subscriptionPollInterval;
+    id: number;
+    log?: Logger;
     private tx;
     private subscriptionPool;
-    constructor(dialect: Dialect, pool: Pool, subscriptionPool?: Pool, subscriptionPollInterval?: number);
+    private queryCounter;
+    constructor(dialect: Dialect, pool: Pool, subscriptionPool?: Pool, subscriptionPollInterval?: number, log?: Logger);
     close(): Promise<void>;
     executeQuery<T>(query: Query<T>): Promise<T>;
     subscription<T>(query: Query<T>): AsyncIterable<T>;
+    private transact;
+    private query;
 }
 //# sourceMappingURL=db.d.ts.map

package/lib/db.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../src/db.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAE,IAAI,EAAC,MAAM,IAAI,CAAA;AACxC,OAAO,EAAC,iBAAiB,EAAC,MAAM,WAAW,CAAA;AAC3C,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAA;AACjC,OAAO,EAAC,KAAK,EAAC,MAAM,aAAa,CAAA;AAMjC,MAAM,WAAW,QAAQ;IACrB,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;CAC3D;AAGD,qBAAa,UAAW,YAAW,QAAQ;IAC3B,OAAO,CAAC,MAAM;gBAAN,MAAM,EAAE,UAAU;IAEtC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;CAK3D;AAGD,qBAAa,qBAAsB,YAAW,iBAAiB;aAKvC,OAAO,EAAE,OAAO;IAGhC,OAAO,CAAC,wBAAwB;IAPpC,OAAO,CAAC,EAAE,CAA2B;IACrC,OAAO,CAAC,gBAAgB,CAAM;gBAGV,OAAO,EAAE,OAAO,EAChC,IAAI,EAAE,IAAI,EACV,gBAAgB,CAAC,EAAE,IAAI,EACf,wBAAwB,GAAE,MAAa;IAMnD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAIhB,YAAY,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAMlD,YAAY,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC;CAMrD"}
+{"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../src/db.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,kBAAkB,CAAA;AAE5C,OAAO,KAAK,EAAa,IAAI,EAAC,MAAM,IAAI,CAAA;AAExC,OAAO,EAAC,iBAAiB,EAAC,MAAM,WAAW,CAAA;AAC3C,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAA;AACjC,OAAO,EAAC,KAAK,EAAC,MAAM,aAAa,CAAA;AAQjC,qBAAa,qBAAsB,YAAW,iBAAiB;aAQvC,OAAO,EAAE,OAAO;IAGhC,OAAO,CAAC,wBAAwB;IAV7B,EAAE,SAA8D;IAChE,GAAG,CAAC,EAAE,MAAM,CAAA;IACnB,OAAO,CAAC,EAAE,CAA2B;IACrC,OAAO,CAAC,gBAAgB,CAAM;IAC9B,OAAO,CAAC,YAAY,CAAI;gBAGJ,OAAO,EAAE,OAAO,EAChC,IAAI,EAAE,IAAI,EACV,gBAAgB,CAAC,EAAE,IAAI,EACf,wBAAwB,GAAE,MAAa,EAC/C,GAAG,CAAC,EAAE,MAAM;IAOhB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAIhB,YAAY,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAMlD,YAAY,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC;YAOpC,QAAQ;YAiBR,KAAK;CA8BtB"}

package/lib/db.js

@@ -1,25 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PoolOpenreaderContext = exports.PgDatabase = void 0;
+exports.PoolOpenreaderContext = void 0;
+const util_internal_1 = require("@subsquid/util-internal");
 const subscription_1 = require("./subscription");
-const error_handling_1 = require("./util/error-handling");
 const lazy_transaction_1 = require("./util/lazy-transaction");
-class PgDatabase {
-    constructor(client) {
-        this.client = client;
-    }
-    query(sql, parameters) {
-        return this.client.query({ text: sql, rowMode: 'array' }, parameters)
-            .then(result => result.rows)
-            .catch((0, error_handling_1.withErrorContext)({ sql, parameters }));
-    }
-}
-exports.PgDatabase = PgDatabase;
+let CTX_COUNTER = 0;
 class PoolOpenreaderContext {
-    constructor(dialect, pool, subscriptionPool, subscriptionPollInterval = 1000) {
+    constructor(dialect, pool, subscriptionPool, subscriptionPollInterval = 1000, log) {
         this.dialect = dialect;
         this.subscriptionPollInterval = subscriptionPollInterval;
-        this.tx = new lazy_transaction_1.LazyTransaction(cb => transact(pool, cb));
+        this.id = (CTX_COUNTER = (CTX_COUNTER + 1) % Number.MAX_SAFE_INTEGER);
+        this.queryCounter = 0;
+        this.log = log?.child({ graphqlCtx: this.id });
+        this.tx = new lazy_transaction_1.LazyTransaction(cb => this.transact(pool, cb));
         this.subscriptionPool = subscriptionPool || pool;
     }
     close() {
@@ -27,31 +20,60 @@ class PoolOpenreaderContext {
     }
     async executeQuery(query) {
         let db = await this.tx.get();
-        let result = await db.query(query.sql, query.params);
+        let result = await db(query.sql, query.params);
         return query.map(result);
     }
     subscription(query) {
-        return new subscription_1.Subscription(this.subscriptionPollInterval, () => transact(this.subscriptionPool, async (db) => {
-            let result = await db.query(query.sql, query.params);
+        return new subscription_1.Subscription(this.subscriptionPollInterval, () => this.transact(this.subscriptionPool, async (db) => {
+            let result = await db(query.sql, query.params);
             return query.map(result);
         }));
     }
-}
-exports.PoolOpenreaderContext = PoolOpenreaderContext;
-async function transact(pool, cb) {
-    let client = await pool.connect();
-    try {
-        await client.query('START TRANSACTION ISOLATION LEVEL SERIALIZABLE READ ONLY');
+    async transact(pool, cb) {
+        let client = await pool.connect();
         try {
-            let db = new PgDatabase(client);
-            return await cb(db);
+            await this.query(client, 'START TRANSACTION ISOLATION LEVEL SERIALIZABLE READ ONLY');
+            try {
+                return await cb(async (sql, parameters) => {
+                    let result = await this.query(client, sql, parameters);
+                    return result.rows;
+                });
+            }
+            finally {
+                await this.query(client, 'COMMIT').catch(() => { });
+            }
         }
         finally {
-            await client.query('COMMIT').catch(() => { });
+            client.release();
         }
     }
-    finally {
-        client.release();
+    async query(client, sql, parameters) {
+        let queryId = this.queryCounter = (this.queryCounter + 1) % Number.MAX_SAFE_INTEGER;
+        let ctx = {
+            graphqlCtx: this.id,
+            graphqlSqlQuery: queryId,
+        };
+        let log = this.log?.child('sql', ctx);
+        log?.debug({
+            sql,
+            parameters
+        }, 'sql query');
+        try {
+            let result = await client.query({ text: sql, rowMode: 'array' }, parameters);
+            log?.debug({
+                rowCount: result.rowCount || 0,
+                rows: log.isTrace() ? result.rows : undefined
+            }, 'sql result');
+            return result;
+        }
+        catch (err) {
+            throw (0, util_internal_1.addErrorContext)(err, {
+                ...ctx,
+                sql,
+                parameters
+            });
+        }
     }
 }
+exports.PoolOpenreaderContext = PoolOpenreaderContext;
 //# sourceMappingURL=db.js.map

package/lib/db.js.map

@@ -1 +1 @@
-{"version":3,"file":"db.js","sourceRoot":"","sources":["../src/db.ts"],"names":[],"mappings":";;;AAIA,iDAA2C;AAC3C,0DAAsD;AACtD,8DAAuD;AAQvD,MAAa,UAAU;IACnB,YAAoB,MAAkB;QAAlB,WAAM,GAAN,MAAM,CAAY;IAAG,CAAC;IAE1C,KAAK,CAAC,GAAW,EAAE,UAAkB;QACjC,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,EAAC,EAAE,UAAU,CAAC;aAC9D,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC;aAC3B,KAAK,CAAC,IAAA,iCAAgB,EAAC,EAAC,GAAG,EAAE,UAAU,EAAC,CAAC,CAAC,CAAA;IACnD,CAAC;CACJ;AARD,gCAQC;AAGD,MAAa,qBAAqB;IAI9B,YACoB,OAAgB,EAChC,IAAU,EACV,gBAAuB,EACf,2BAAmC,IAAI;QAH/B,YAAO,GAAP,OAAO,CAAS;QAGxB,6BAAwB,GAAxB,wBAAwB,CAAe;QAE/C,IAAI,CAAC,EAAE,GAAG,IAAI,kCAAe,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAA;QACvD,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,IAAI,IAAI,CAAA;IACpD,CAAC;IAED,KAAK;QACD,OAAO,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,CAAA;IAC1B,CAAC;IAED,KAAK,CAAC,YAAY,CAAI,KAAe;QACjC,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,CAAA;QAC5B,IAAI,MAAM,GAAG,MAAM,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;QACpD,OAAO,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IAC5B,CAAC;IAED,YAAY,CAAI,KAAe;QAC3B,OAAO,IAAI,2BAAY,CAAC,IAAI,CAAC,wBAAwB,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,gBAAgB,EAAE,KAAK,EAAC,EAAE,EAAC,EAAE;YACpG,IAAI,MAAM,GAAG,MAAM,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;YACpD,OAAO,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QAC5B,CAAC,CAAC,CAAC,CAAA;IACP,CAAC;CACJ;AA9BD,sDA8BC;AAGD,KAAK,UAAU,QAAQ,CAAI,IAAU,EAAE,EAAgC;IACnE,IAAI,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;IACjC,IAAI,CAAC;QACD,MAAM,MAAM,CAAC,KAAK,CAAC,0DAA0D,CAAC,CAAA;QAC9E,IAAI,CAAC;YACD,IAAI,EAAE,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC,CAAA;YAC/B,OAAO,MAAM,EAAE,CAAC,EAAE,CAAC,CAAA;QACvB,CAAC;gBAAS,CAAC;YACP,MAAM,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA;QAChD,CAAC;IACL,CAAC;YAAS,CAAC;QACP,MAAM,CAAC,OAAO,EAAE,CAAA;IACpB,CAAC;AACL,CAAC"}
+{"version":3,"file":"db.js","sourceRoot":"","sources":["../src/db.ts"],"names":[],"mappings":";;;AACA,2DAAuD;AAMvD,iDAA2C;AAC3C,8DAAuD;AAGvD,IAAI,WAAW,GAAG,CAAC,CAAA;AAGnB,MAAa,qBAAqB;IAO9B,YACoB,OAAgB,EAChC,IAAU,EACV,gBAAuB,EACf,2BAAmC,IAAI,EAC/C,GAAY;QAJI,YAAO,GAAP,OAAO,CAAS;QAGxB,6BAAwB,GAAxB,wBAAwB,CAAe;QAV5C,OAAE,GAAG,CAAC,WAAW,GAAG,CAAC,WAAW,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAA;QAI/D,iBAAY,GAAG,CAAC,CAAA;QASpB,IAAI,CAAC,GAAG,GAAG,GAAG,EAAE,KAAK,CAAC,EAAC,UAAU,EAAE,IAAI,CAAC,EAAE,EAAC,CAAC,CAAA;QAC5C,IAAI,CAAC,EAAE,GAAG,IAAI,kCAAe,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAA;QAC5D,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,IAAI,IAAI,CAAA;IACpD,CAAC;IAED,KAAK;QACD,OAAO,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,CAAA;IAC1B,CAAC;IAED,KAAK,CAAC,YAAY,CAAI,KAAe;QACjC,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,CAAA;QAC5B,IAAI,MAAM,GAAG,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;QAC9C,OAAO,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IAC5B,CAAC;IAED,YAAY,CAAI,KAAe;QAC3B,OAAO,IAAI,2BAAY,CAAC,IAAI,CAAC,wBAAwB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,gBAAgB,EAAE,KAAK,EAAC,EAAE,EAAC,EAAE;YACzG,IAAI,MAAM,GAAG,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;YAC9C,OAAO,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QAC5B,CAAC,CAAC,CAAC,CAAA;IACP,CAAC;IAEO,KAAK,CAAC,QAAQ,CAAI,IAAU,EAAE,EAAgC;QAClE,IAAI,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;QACjC,IAAI,CAAC;YACD,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,0DAA0D,CAAC,CAAA;YACpF,IAAI,CAAC;gBACD,OAAO,MAAM,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE;oBACtC,IAAI,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,EAAE,UAAU,CAAC,CAAA;oBACtD,OAAO,MAAM,CAAC,IAAI,CAAA;gBACtB,CAAC,CAAC,CAAA;YACN,CAAC;oBAAS,CAAC;gBACP,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA;YACtD,CAAC;QACL,CAAC;gBAAS,CAAC;YACP,MAAM,CAAC,OAAO,EAAE,CAAA;QACpB,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,KAAK,CAAC,MAAkB,EAAE,GAAW,EAAE,UAAkB;QACnE,IAAI,OAAO,GAAG,IAAI,CAAC,YAAY,GAAG,CAAC,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,gBAAgB,CAAA;QAEnF,IAAI,GAAG,GAAG;YACN,UAAU,EAAE,IAAI,CAAC,EAAE;YACnB,eAAe,EAAE,OAAO;SAC3B,CAAA;QAED,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;QAErC,GAAG,EAAE,KAAK,CAAC;YACP,GAAG;YACH,UAAU;SACb,EAAE,WAAW,CAAC,CAAA;QAEf,IAAI,CAAC;YACD,IAAI,MAAM,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,EAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,EAAC,EAAE,UAAU,CAAC,CAAA;YAC1E,GAAG,EAAE,KAAK,CAAC;gBACP,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,CAAC;gBAC9B,IAAI,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;aAChD,EAAE,YAAY,CAAC,CAAA;YAChB,OAAO,MAAM,CAAA;QACjB,CAAC;QAAC,OAAM,GAAQ,EAAE,CAAC;YACf,MAAM,IAAA,+BAAe,EAAC,GAAG,EAAE;gBACvB,GAAG,GAAG;gBACN,GAAG;gBACH,UAAU;aACb,CAAC,CAAA;QACN,CAAC;IACL,CAAC;CACJ;AAnFD,sDAmFC"}

package/lib/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,kBAAkB,CAAA;AACvC,OAAO,EAAS,eAAe,EAAC,MAAM,qCAAqC,CAAA;AAC3E,OAAO,EAAC,aAAa,EAAE,gBAAgB,EAAC,MAAM,oBAAoB,CAAA;AAElE,OAAO,OAAO,MAAM,SAAS,CAAA;AAE7B,OAAO,EAAgB,aAAa,EAAC,MAAM,SAAS,CAAA;AAIpD,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,IAAI,CAAA;AAE5B,OAAO,EAAC,OAAO,EAAoB,MAAM,WAAW,CAAA;AAEpD,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,WAAW,CAAA;AACtC,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,SAAS,CAAA;AAOlC,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;IACrB,KAAK,EAAE,KAAK,CAAA;IACZ,UAAU,EAAE,IAAI,CAAA;IAChB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,wBAAwB,CAAC,EAAE,MAAM,CAAA;IACjC,sBAAsB,CAAC,EAAE,IAAI,CAAA;IAC7B,4BAA4B,CAAC,EAAE,MAAM,CAAC;IACtC,KAAK,CAAC,EAAE,aAAa,CAAA;CACxB;AAED,wBAAsB,KAAK,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC,CA0C5E;AAGD,MAAM,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;AAGzC,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;IACrB,SAAS,EAAE,OAAO,EAAE,CAAA;IACpB,OAAO,EAAE,MAAM,OAAO,CAAA;IACtB,MAAM,EAAE,aAAa,CAAA;IACrB,OAAO,CAAC,EAAE,gBAAgB,EAAE,CAAA;IAC5B,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,KAAK,CAAC,EAAE,aAAa,CAAA;CACxB;AAGD,wBAAsB,SAAS,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC,CA6FhF;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAmB/H;AAGD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,OAAO,CAAC,WAAW,GAAG,IAAI,CAsBnE"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,kBAAkB,CAAA;AACvC,OAAO,EAAS,eAAe,EAAC,MAAM,qCAAqC,CAAA;AAC3E,OAAO,EAAC,aAAa,EAAE,gBAAgB,EAAC,MAAM,oBAAoB,CAAA;AAElE,OAAO,OAAO,MAAM,SAAS,CAAA;AAE7B,OAAO,EAAgB,aAAa,EAAC,MAAM,SAAS,CAAA;AAIpD,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,IAAI,CAAA;AAE5B,OAAO,EAAC,OAAO,EAAoB,MAAM,WAAW,CAAA;AAEpD,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,WAAW,CAAA;AACtC,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,SAAS,CAAA;AAMlC,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;IACrB,KAAK,EAAE,KAAK,CAAA;IACZ,UAAU,EAAE,IAAI,CAAA;IAChB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,wBAAwB,CAAC,EAAE,MAAM,CAAA;IACjC,sBAAsB,CAAC,EAAE,IAAI,CAAA;IAC7B,4BAA4B,CAAC,EAAE,MAAM,CAAC;IACtC,KAAK,CAAC,EAAE,aAAa,CAAA;CACxB;AAED,wBAAsB,KAAK,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC,CAmD5E;AAGD,MAAM,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;AAGzC,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;IACrB,SAAS,EAAE,OAAO,EAAE,CAAA;IACpB,OAAO,EAAE,MAAM,OAAO,CAAA;IACtB,MAAM,EAAE,aAAa,CAAA;IACrB,OAAO,CAAC,EAAE,gBAAgB,EAAE,CAAA;IAC5B,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,KAAK,CAAC,EAAE,aAAa,CAAA;CACxB;AAGD,wBAAsB,SAAS,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC,CA+EhF;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAmB/H;AAGD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,OAAO,CAAC,WAAW,GAAG,IAAI,CAsBnE"}

package/lib/server.js

@@ -14,15 +14,14 @@ const path_1 = __importDefault(require("path"));
 const ws_2 = require("ws");
 const db_1 = require("./db");
 const schema_1 = require("./opencrud/schema");
-const error_handling_1 = require("./util/error-handling");
 const execute_1 = require("./util/execute");
 const limit_1 = require("./util/limit");
 async function serve(options) {
-    let { connection, subscriptionConnection, subscriptionPollInterval, maxResponseNodes, subscriptionMaxResponseNodes } = options;
+    let { connection, subscriptionConnection, subscriptionPollInterval, maxResponseNodes, subscriptionMaxResponseNodes, log } = options;
     let dialect = options.dialect ?? 'postgres';
     let schema = new schema_1.SchemaBuilder(options).build();
     let context = () => {
-        let openreader = new db_1.PoolOpenreaderContext(dialect, connection, subscriptionConnection, subscriptionPollInterval);
+        let openreader = new db_1.PoolOpenreaderContext(dialect, connection, subscriptionConnection, subscriptionPollInterval, log);
         if (maxResponseNodes) {
             openreader.responseSizeLimit = new limit_1.ResponseSizeLimit(maxResponseNodes);
             openreader.subscriptionResponseSizeLimit = new limit_1.ResponseSizeLimit(maxResponseNodes);
@@ -54,9 +53,9 @@ async function runApollo(options) {
     let maxRequestSizeBytes = options.maxRequestSizeBytes ?? 256 * 1024;
     let app = (0, express_1.default)();
     let server = http_1.default.createServer(app);
-    const execute = maxRootFields
-        ? (args) => (0, execute_1.executeWithLimit)(maxRootFields, args)
-        : undefined;
+    let execute = (args) => (0, execute_1.openreaderExecute)(args, {
+        maxRootFields: maxRootFields
+    });
     if (options.subscriptions) {
         let wsServer = new ws_2.WebSocketServer({
             server,
@@ -67,14 +66,7 @@ async function runApollo(options) {
             schema,
             context,
             execute,
-            onError(ctx, message, errors) {
-                if (log) {
-                    // FIXME: we don't want to log client errors
-                    for (let err of errors) {
-                        (0, error_handling_1.logGraphQLError)(log, err);
-                    }
-                }
-            },
+            subscribe: execute_1.openreaderSubscribe,
             onNext(_ctx, _message, args, result) {
                 args.contextValue.openreader.close();
                 return result;
@@ -88,7 +80,7 @@ async function runApollo(options) {
         cache: options.cache,
         stopOnTerminationSignals: false,
         allowBatchedHttpRequests: false,
-        executor: execute && (async (req) => {
+        executor: async (req) => {
             return execute({
                 schema,
                 document: req.document,
@@ -97,7 +89,7 @@ async function runApollo(options) {
                 variableValues: req.request.variables,
                 operationName: req.operationName
             });
-        }),
+        },
         plugins: [
             ...options.plugins || [],
             {
@@ -105,13 +97,6 @@ async function runApollo(options) {
                     return {
                         willSendResponse(req) {
                             return req.context.openreader.close();
-                        },
-                        async didEncounterErrors(req) {
-                            if (req.operation && log) {
-                                for (let err of req.errors) {
-                                    (0, error_handling_1.logGraphQLError)(log, err);
-                                }
-                            }
                         }
                     };
                 }
@@ -124,7 +109,7 @@ async function runApollo(options) {
     await apollo.start();
     disposals.push(() => apollo.stop());
     apollo.applyMiddleware({
-        app,
+        app: app, // @types/express version mismatch. We don't want to pin it just because of this line.
         bodyParserConfig: {
             limit: maxRequestSizeBytes
         }

package/lib/server.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":";;;;;;AACA,mFAA2E;AAE3E,iEAAkD;AAClD,sDAA6B;AAC7B,4CAAmB;AAEnB,8CAA8D;AAC9D,gDAAuB;AACvB,gDAAuB;AAEvB,2BAAkC;AAElC,6BAA0C;AAG1C,8CAA+C;AAC/C,4CAAqE;AACrE,wCAA8C;AAoBvC,KAAK,UAAU,KAAK,CAAC,OAAsB;IAC9C,IAAI,EACA,UAAU,EACV,sBAAsB,EACtB,wBAAwB,EACxB,gBAAgB,EAChB,4BAA4B,EAC5B,GAAG,EACN,GAAG,OAAO,CAAA;IAEX,IAAI,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,UAAU,CAAA;IAE3C,IAAI,MAAM,GAAG,IAAI,sBAAa,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAA;IAE/C,IAAI,OAAO,GAAG,GAAG,EAAE;QACf,IAAI,UAAU,GAAsB,IAAI,0BAAqB,CACzD,OAAO,EACP,UAAU,EACV,sBAAsB,EACtB,wBAAwB,EACxB,GAAG,CACN,CAAA;QAED,IAAI,gBAAgB,EAAE,CAAC;YACnB,UAAU,CAAC,iBAAiB,GAAG,IAAI,yBAAiB,CAAC,gBAAgB,CAAC,CAAA;YACtE,UAAU,CAAC,6BAA6B,GAAG,IAAI,yBAAiB,CAAC,gBAAgB,CAAC,CAAA;QACtF,CAAC;QAED,IAAI,4BAA4B,EAAE,CAAC;YAC/B,UAAU,CAAC,6BAA6B,GAAG,IAAI,yBAAiB,CAAC,4BAA4B,CAAC,CAAA;QAClG,CAAC;QAED,OAAO;YACH,UAAU;SACb,CAAA;IACL,CAAC,CAAA;IAED,IAAI,SAAS,GAAc,EAAE,CAAA;IAE7B,OAAO,gBAAgB,CAAC,SAAS,EAAE,SAAS,CAAC;QACzC,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,MAAM;QACN,OAAO;QACP,SAAS;QACT,aAAa,EAAE,OAAO,CAAC,aAAa;QACpC,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,eAAe,EAAE,OAAO,CAAC,eAAe;QACxC,mBAAmB,EAAE,OAAO,CAAC,mBAAmB;QAChD,aAAa,EAAE,OAAO,CAAC,aAAa;QACpC,KAAK,EAAE,OAAO,CAAC,KAAK;KACvB,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,CAAA;AACpB,CAAC;AAnDD,sBAmDC;AAqBM,KAAK,UAAU,SAAS,CAAC,OAAsB;IAClD,MAAM,EAAC,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,EAAC,GAAG,OAAO,CAAA;IAEhE,IAAI,mBAAmB,GAAG,OAAO,CAAC,mBAAmB,IAAI,GAAG,GAAG,IAAI,CAAA;IACnE,IAAI,GAAG,GAAwB,IAAA,iBAAO,GAAE,CAAA;IACxC,IAAI,MAAM,GAAG,cAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;IAEnC,IAAI,OAAO,GAAG,CAAC,IAAmB,EAAE,EAAE,CAAC,IAAA,2BAAiB,EAAC,IAAI,EAAE;QAC3D,aAAa,EAAE,aAAa;KAC/B,CAAC,CAAA;IAEF,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;QACxB,IAAI,QAAQ,GAAG,IAAI,oBAAe,CAAC;YAC/B,MAAM;YACN,IAAI,EAAE,UAAU;YAChB,UAAU,EAAE,mBAAmB;SAClC,CAAC,CAAA;QACF,IAAI,eAAe,GAAG,IAAA,cAAW,EAC7B;YACI,MAAM;YACN,OAAO;YACP,OAAO;YACP,SAAS,EAAE,6BAAmB;YAC9B,MAAM,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM;gBAC/B,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,KAAK,EAAE,CAAA;gBACpC,OAAO,MAAM,CAAA;YACjB,CAAC;SACJ,EACD,QAAQ,CACX,CAAA;QACD,SAAS,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC,CAAA;IACzD,CAAC;IAGD,IAAI,MAAM,GAAG,IAAI,oCAAY,CAAC;QAC1B,MAAM;QACN,OAAO;QACP,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,wBAAwB,EAAE,KAAK;QAC/B,wBAAwB,EAAE,KAAK;QAC/B,QAAQ,EAAE,KAAK,EAAC,GAAG,EAAC,EAAE;YAClB,OAAO,OAAO,CAAC;gBACX,MAAM;gBACN,QAAQ,EAAE,GAAG,CAAC,QAAQ;gBACtB,SAAS,EAAE,EAAE;gBACb,YAAY,EAAE,GAAG,CAAC,OAAO;gBACzB,cAAc,EAAE,GAAG,CAAC,OAAO,CAAC,SAAS;gBACrC,aAAa,EAAE,GAAG,CAAC,aAAa;aACnC,CAAC,CAAA;QACN,CAAC;QACD,OAAO,EAAE;YACL,GAAG,OAAO,CAAC,OAAO,IAAI,EAAE;YACxB;gBACI,KAAK,CAAC,eAAe;oBACjB,OAAO;wBACH,gBAAgB,CAAC,GAAQ;4BACrB,OAAO,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,EAAE,CAAA;wBACzC,CAAC;qBACJ,CAAA;gBACL,CAAC;aACJ;SACJ;KACJ,CAAC,CAAA;IAEF,IAAI,OAAO,CAAC,eAAe,KAAK,KAAK,EAAE,CAAC;QACpC,oBAAoB,CAAC,GAAG,CAAC,CAAA;IAC7B,CAAC;IAED,MAAM,MAAM,CAAC,KAAK,EAAE,CAAA;IACpB,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;IAEnC,MAAM,CAAC,eAAe,CAAC;QACnB,GAAG,EAAE,GAAU,EAAE,sFAAsF;QACvG,gBAAgB,EAAE;YACd,KAAK,EAAE,mBAAmB;SAC7B;KACJ,CAAC,CAAA;IAEF,OAAO,IAAA,kCAAM,EAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;AACvC,CAAC;AA/ED,8BA+EC;AAED,SAAgB,gBAAgB,CAAC,SAAoB,EAAE,MAAgC,EAAE,GAAY;IACjG,KAAK,UAAU,OAAO;QAClB,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAC7C,MAAM,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA;QACtD,CAAC;IACL,CAAC;IAED,OAAO,MAAM,CAAC,IAAI,CACd,CAAC,CAAC,EAAE;QACA,OAAO;YACH,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC;SAC1C,CAAA;IACL,CAAC,EACD,KAAK,EAAC,GAAG,EAAC,EAAE;QACR,MAAM,OAAO,EAAE,CAAA;QACf,MAAM,GAAG,CAAA;IACb,CAAC,CACJ,CAAA;AACL,CAAC;AAnBD,4CAmBC;AAGD,SAAgB,oBAAoB,CAAC,GAAwB;IACzD,IAAI,MAAM,GAAG,cAAI,CAAC,IAAI,CAClB,OAAO,CAAC,OAAO,CAAC,yCAAyC,CAAC,EAC1D,UAAU,CACb,CAAA;IAED,IAAI,SAAS,GAAG,YAAE,CAAC,YAAY,CAAC,cAAI,CAAC,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO,CAAC;SACpE,OAAO,CAAC,aAAa,EAAE,iBAAiB,CAAC;SACzC,OAAO,CAAC,gBAAgB,EAAE,uBAAuB,CAAC;SAClD,OAAO,CAAC,gBAAgB,EAAE,SAAS,CAAC;SACpC,OAAO,CAAC,cAAc,EAAE,uBAAuB,CAAC,CAAA;IAErD,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE,iBAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAA;IAE3C,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACnC,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG;YAAE,OAAO,IAAI,EAAE,CAAA;QAClC,IAAI,GAAG,CAAC,MAAM,IAAI,KAAK,IAAI,GAAG,CAAC,MAAM,IAAI,MAAM;YAAE,OAAO,IAAI,EAAE,CAAA;QAC9D,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC;YAAE,OAAO,IAAI,EAAE,CAAA;QACrC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAClB,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC;YAAE,OAAO,IAAI,EAAE,CAAA;QACvC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IACpC,CAAC,CAAC,CAAA;AACN,CAAC;AAtBD,oDAsBC"}

package/lib/test/limits.test.js

@@ -150,7 +150,7 @@ describe('response size limits', function () {
         `, {
             errors: [
                 expect_1.default.objectContaining({
-                    message: 'only 3 root query fields allowed, but got 4'
+                    message: 'only 3 root fields allowed, but got 4'
                 })
             ]
         });

package/lib/test/limits.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"limits.test.js","sourceRoot":"","sources":["../../src/test/limits.test.ts"],"names":[],"mappings":";;;;;AAAA,oDAA2B;AAC3B,mCAA8C;AAG9C,QAAQ,CAAC,sBAAsB,EAAE;IAC7B,IAAA,mBAAW,EAAC;QACR,6CAA6C;QAC7C,oEAAoE;QACpE,6CAA6C;QAC7C,oEAAoE;QACpE,6CAA6C;QAC7C,oEAAoE;KACvE,CAAC,CAAA;IAEF,MAAM,MAAM,GAAG,IAAA,iBAAS,EAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAiCxB,EAAE;QACC,gBAAgB,EAAE,EAAE;QACpB,aAAa,EAAE,CAAC;KACnB,CAAC,CAAA;IAEF,EAAE,CAAC,yBAAyB,EAAE,KAAK;QAC/B,IAAI,MAAM,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC;;;;;;SAM/B,CAAC,CAAA;QACF,IAAA,gBAAM,EAAC,MAAM,CAAC,CAAC,aAAa,CAAC;YACzB,IAAI,EAAE,IAAI;YACV,MAAM,EAAE;gBACJ,gBAAM,CAAC,gBAAgB,CAAC,EAAC,OAAO,EAAE,sCAAsC,EAAE,IAAI,EAAE,CAAC,SAAS,CAAC,EAAC,CAAC;aAChG;SACJ,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,uBAAuB,EAAE;QACxB,OAAO,MAAM,CAAC,IAAI,CAAC;;;;;;;;SAQlB,EAAE;YACC,OAAO,EAAE,EAAE;SACd,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,0CAA0C,EAAE;QAC3C,OAAO,MAAM,CAAC,IAAI,CAAC;;;;;;SAMlB,EAAE;YACC,OAAO,EAAE,EAAE;SACd,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,kCAAkC,EAAE;QACnC,OAAO,MAAM,CAAC,IAAI,CAAC;;;;;;SAMlB,EAAE;YACC,OAAO,EAAE,EAAE;SACd,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,uCAAuC,EAAE,KAAK;QAC7C,IAAI,MAAM,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC;;;;;;SAM/B,CAAC,CAAA;QACF,IAAA,gBAAM,EAAC,MAAM,CAAC,CAAC,OAAO,CAAC;YACnB,IAAI,EAAE,IAAI;YACV,MAAM,EAAE;gBACJ,gBAAM,CAAC,gBAAgB,CAAC;oBACpB,OAAO,EAAE,sCAAsC;oBAC/C,IAAI,EAAE,CAAC,SAAS,CAAC;iBACpB,CAAC;aACL;SACJ,CAAC,CAAA;QACF,MAAM,MAAM,CAAC,IAAI,CAAC;;;;;;SAMjB,EAAE;YACC,OAAO,EAAE,EAAE;SACd,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,iCAAiC,EAAE;QAClC,OAAO,MAAM,CAAC,IAAI,CAAC;;;;;;SAMlB,EAAE;YACC,OAAO,EAAE,EAAE;SACd,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,yBAAyB,EAAE,KAAK;QAC/B,OAAO,MAAM,CAAC,aAAa,CAAC;;;;;;;SAO3B,EAAE;YACC,MAAM,EAAE;gBACJ,gBAAM,CAAC,gBAAgB,CAAC;oBACpB,OAAO,EAAE,6CAA6C;iBACzD,CAAC;aACL;SACJ,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA"}
+{"version":3,"file":"limits.test.js","sourceRoot":"","sources":["../../src/test/limits.test.ts"],"names":[],"mappings":";;;;;AAAA,oDAA2B;AAC3B,mCAA8C;AAG9C,QAAQ,CAAC,sBAAsB,EAAE;IAC7B,IAAA,mBAAW,EAAC;QACR,6CAA6C;QAC7C,oEAAoE;QACpE,6CAA6C;QAC7C,oEAAoE;QACpE,6CAA6C;QAC7C,oEAAoE;KACvE,CAAC,CAAA;IAEF,MAAM,MAAM,GAAG,IAAA,iBAAS,EAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAiCxB,EAAE;QACC,gBAAgB,EAAE,EAAE;QACpB,aAAa,EAAE,CAAC;KACnB,CAAC,CAAA;IAEF,EAAE,CAAC,yBAAyB,EAAE,KAAK;QAC/B,IAAI,MAAM,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC;;;;;;SAM/B,CAAC,CAAA;QACF,IAAA,gBAAM,EAAC,MAAM,CAAC,CAAC,aAAa,CAAC;YACzB,IAAI,EAAE,IAAI;YACV,MAAM,EAAE;gBACJ,gBAAM,CAAC,gBAAgB,CAAC,EAAC,OAAO,EAAE,sCAAsC,EAAE,IAAI,EAAE,CAAC,SAAS,CAAC,EAAC,CAAC;aAChG;SACJ,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,uBAAuB,EAAE;QACxB,OAAO,MAAM,CAAC,IAAI,CAAC;;;;;;;;SAQlB,EAAE;YACC,OAAO,EAAE,EAAE;SACd,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,0CAA0C,EAAE;QAC3C,OAAO,MAAM,CAAC,IAAI,CAAC;;;;;;SAMlB,EAAE;YACC,OAAO,EAAE,EAAE;SACd,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,kCAAkC,EAAE;QACnC,OAAO,MAAM,CAAC,IAAI,CAAC;;;;;;SAMlB,EAAE;YACC,OAAO,EAAE,EAAE;SACd,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,uCAAuC,EAAE,KAAK;QAC7C,IAAI,MAAM,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC;;;;;;SAM/B,CAAC,CAAA;QACF,IAAA,gBAAM,EAAC,MAAM,CAAC,CAAC,OAAO,CAAC;YACnB,IAAI,EAAE,IAAI;YACV,MAAM,EAAE;gBACJ,gBAAM,CAAC,gBAAgB,CAAC;oBACpB,OAAO,EAAE,sCAAsC;oBAC/C,IAAI,EAAE,CAAC,SAAS,CAAC;iBACpB,CAAC;aACL;SACJ,CAAC,CAAA;QACF,MAAM,MAAM,CAAC,IAAI,CAAC;;;;;;SAMjB,EAAE;YACC,OAAO,EAAE,EAAE;SACd,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,iCAAiC,EAAE;QAClC,OAAO,MAAM,CAAC,IAAI,CAAC;;;;;;SAMlB,EAAE;YACC,OAAO,EAAE,EAAE;SACd,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,yBAAyB,EAAE,KAAK;QAC/B,OAAO,MAAM,CAAC,aAAa,CAAC;;;;;;;SAO3B,EAAE;YACC,MAAM,EAAE;gBACJ,gBAAM,CAAC,gBAAgB,CAAC;oBACpB,OAAO,EAAE,uCAAuC;iBACnD,CAAC;aACL;SACJ,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA"}

package/lib/test/setup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../src/test/setup.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,MAAM,EAAC,MAAM,iBAAiB,CAAA;AAEtC,OAAO,EAAqB,UAAU,EAAO,MAAM,IAAI,CAAA;AAEvD,OAAO,EAAQ,aAAa,EAAC,MAAM,WAAW,CAAA;AAG9C,wBAAgB,WAAW,IAAI,OAAO,CAErC;AAGD,eAAO,MAAM,SAAS;;;;;;CAQrB,CAAA;AAGD,wBAAsB,YAAY,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAQ9F;AAGD,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAM5D;AAGD,wBAAgB,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC,CAK9C;AAGD,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,CAK/C;AAGD,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,MAAM,CAoBlF"}
+{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../src/test/setup.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,MAAM,EAAC,MAAM,iBAAiB,CAAA;AAEtC,OAAO,EAAqB,UAAU,EAAO,MAAM,IAAI,CAAA;AAEvD,OAAO,EAAQ,aAAa,EAAC,MAAM,WAAW,CAAA;AAG9C,wBAAgB,WAAW,IAAI,OAAO,CAErC;AAGD,eAAO,MAAM,SAAS;;;;;;CAQrB,CAAA;AAGD,wBAAsB,YAAY,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAQ9F;AAGD,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAM5D;AAGD,wBAAgB,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC,CAK9C;AAGD,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,CAK/C;AAGD,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,MAAM,CAqBlF"}

package/lib/test/setup.js

@@ -64,6 +64,7 @@ function useServer(schema, options) {
             subscriptions: true,
             subscriptionPollInterval: 500,
             maxRootFields: 10,
+            // log: createLogger('sqd:openreader'),
             ...options
         });
         client.endpoint = `http://localhost:${info.port}/graphql`;

package/lib/test/setup.js.map

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

package/lib/util/error-handling.d.ts

@@ -1,11 +1,10 @@
-import { Logger, LogLevel } from "@subsquid/logger";
-import { GraphQLError } from "graphql";
-export declare function logGraphQLError(log: Logger, err: GraphQLError, level?: LogLevel): void;
-export declare function withErrorContext(ctx: object): (err: unknown) => never;
-export declare function addErrorContext(error: unknown, ctx: object): Error;
-export declare function ensureError(err: unknown): Error;
-export declare class NonErrorThrown extends Error {
-    readonly value: unknown;
-    constructor(value: unknown);
+import { Logger } from '@subsquid/logger';
+import { ExecutionArgs, GraphQLError } from 'graphql';
+export interface DocumentCtx {
+    graphqlOperationName?: string;
+    graphqlDocument: string;
+    graphqlVariables: any;
 }
+export declare const getDocumentCtx: (obj: ExecutionArgs) => DocumentCtx;
+export declare function logGraphQLErrors(log: Logger, args: ExecutionArgs, errors: readonly GraphQLError[] | undefined): void;
 //# sourceMappingURL=error-handling.d.ts.map

package/lib/util/error-handling.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"error-handling.d.ts","sourceRoot":"","sources":["../../src/util/error-handling.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,QAAQ,EAAC,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAC,YAAY,EAAa,MAAM,SAAS,CAAA;AAGhD,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,YAAY,EAAE,KAAK,GAAE,QAAyB,GAAG,IAAI,CAQtG;AAGD,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,GAAG,EAAE,OAAO,KAAK,KAAK,CAIrE;AAGD,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,KAAK,CAIlE;AAGD,wBAAgB,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,KAAK,CAG/C;AAGD,qBAAa,cAAe,SAAQ,KAAK;aACT,KAAK,EAAE,OAAO;gBAAd,KAAK,EAAE,OAAO;CAG7C"}
+{"version":3,"file":"error-handling.d.ts","sourceRoot":"","sources":["../../src/util/error-handling.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAW,MAAM,kBAAkB,CAAA;AAEjD,OAAO,EAAC,aAAa,EAAE,YAAY,EAAQ,MAAM,SAAS,CAAA;AAG1D,MAAM,WAAW,WAAW;IACxB,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAC7B,eAAe,EAAE,MAAM,CAAA;IACvB,gBAAgB,EAAE,GAAG,CAAA;CACxB;AAGD,eAAO,MAAM,cAAc,qCAMzB,CAAA;AAGF,wBAAgB,gBAAgB,CAC5B,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,aAAa,EACnB,MAAM,EAAE,SAAS,YAAY,EAAE,GAAG,SAAS,GAC5C,IAAI,CAiBN"}

package/lib/util/error-handling.js

@@ -1,42 +1,42 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NonErrorThrown = exports.ensureError = exports.addErrorContext = exports.withErrorContext = exports.logGraphQLError = void 0;
+exports.logGraphQLErrors = exports.getDocumentCtx = void 0;
 const logger_1 = require("@subsquid/logger");
+const util_internal_1 = require("@subsquid/util-internal");
 const graphql_1 = require("graphql");
-function logGraphQLError(log, err, level = logger_1.LogLevel.ERROR) {
+exports.getDocumentCtx = (0, util_internal_1.weakMemo)((args) => {
+    return {
+        graphqlOperationName: args.operationName || undefined,
+        graphqlDocument: (0, graphql_1.print)(args.document),
+        graphqlVariables: args.variableValues
+    };
+});
+function logGraphQLErrors(log, args, errors) {
+    if (!errors?.length)
+        return;
+    let level = 0;
+    let graphqlErrors = errors.map(err => {
+        level = Math.max(level, getErrorLevel(err));
+        return {
+            message: err.message,
+            path: err.path?.join('.'),
+            extensions: err.extensions,
+            originalError: err.originalError
+        };
+    });
     if (log.level > level)
         return;
-    let msg = (0, graphql_1.printError)(err) + '\n';
     log.write(level, {
-        graphqlOriginalError: err.originalError,
-        graphqlPath: err.path?.join('.'),
-        graphqlQuery: err.source?.body,
-    }, msg);
-}
-exports.logGraphQLError = logGraphQLError;
-function withErrorContext(ctx) {
-    return function (err) {
-        throw addErrorContext(err, ctx);
-    };
-}
-exports.withErrorContext = withErrorContext;
-function addErrorContext(error, ctx) {
-    let e = ensureError(error);
-    Object.assign(e, ctx);
-    return e;
-}
-exports.addErrorContext = addErrorContext;
-function ensureError(err) {
-    if (err instanceof Error)
-        return err;
-    return new NonErrorThrown(err);
+        graphqlErrors,
+        ...(0, exports.getDocumentCtx)(args)
+    }, 'graphql query ended with errors');
 }
-exports.ensureError = ensureError;
-class NonErrorThrown extends Error {
-    constructor(value) {
-        super('Non error object thrown');
-        this.value = value;
-    }
+exports.logGraphQLErrors = logGraphQLErrors;
+function getErrorLevel(err) {
+    if (err.__openreaderLogLevel)
+        return err.__openreaderLogLevel;
+    if (err.extensions?.code === 'BAD_USER_INPUT')
+        return logger_1.LogLevel.WARN;
+    return logger_1.LogLevel.ERROR;
 }
-exports.NonErrorThrown = NonErrorThrown;
 //# sourceMappingURL=error-handling.js.map

package/lib/util/error-handling.js.map

@@ -1 +1 @@
-{"version":3,"file":"error-handling.js","sourceRoot":"","sources":["../../src/util/error-handling.ts"],"names":[],"mappings":";;;AAAA,6CAAiD;AACjD,qCAAgD;AAGhD,SAAgB,eAAe,CAAC,GAAW,EAAE,GAAiB,EAAE,QAAkB,iBAAQ,CAAC,KAAK;IAC5F,IAAI,GAAG,CAAC,KAAK,GAAG,KAAK;QAAE,OAAM;IAC7B,IAAI,GAAG,GAAG,IAAA,oBAAU,EAAC,GAAG,CAAC,GAAG,IAAI,CAAA;IAChC,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE;QACb,oBAAoB,EAAE,GAAG,CAAC,aAAa;QACvC,WAAW,EAAE,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC;QAChC,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI;KACjC,EAAE,GAAG,CAAC,CAAA;AACX,CAAC;AARD,0CAQC;AAGD,SAAgB,gBAAgB,CAAC,GAAW;IACxC,OAAO,UAAS,GAAG;QACf,MAAM,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IACnC,CAAC,CAAA;AACL,CAAC;AAJD,4CAIC;AAGD,SAAgB,eAAe,CAAC,KAAc,EAAE,GAAW;IACvD,IAAI,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,CAAA;IAC1B,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;IACrB,OAAO,CAAC,CAAA;AACZ,CAAC;AAJD,0CAIC;AAGD,SAAgB,WAAW,CAAC,GAAY;IACpC,IAAI,GAAG,YAAY,KAAK;QAAE,OAAO,GAAG,CAAA;IACpC,OAAO,IAAI,cAAc,CAAC,GAAG,CAAC,CAAA;AAClC,CAAC;AAHD,kCAGC;AAGD,MAAa,cAAe,SAAQ,KAAK;IACrC,YAA4B,KAAc;QACtC,KAAK,CAAC,yBAAyB,CAAC,CAAA;QADR,UAAK,GAAL,KAAK,CAAS;IAE1C,CAAC;CACJ;AAJD,wCAIC"}
+{"version":3,"file":"error-handling.js","sourceRoot":"","sources":["../../src/util/error-handling.ts"],"names":[],"mappings":";;;AAAA,6CAAiD;AACjD,2DAAgD;AAChD,qCAA0D;AAU7C,QAAA,cAAc,GAAG,IAAA,wBAAQ,EAAC,CAAC,IAAmB,EAAe,EAAE;IACxE,OAAO;QACH,oBAAoB,EAAE,IAAI,CAAC,aAAa,IAAI,SAAS;QACrD,eAAe,EAAE,IAAA,eAAK,EAAC,IAAI,CAAC,QAAQ,CAAC;QACrC,gBAAgB,EAAE,IAAI,CAAC,cAAc;KACxC,CAAA;AACL,CAAC,CAAC,CAAA;AAGF,SAAgB,gBAAgB,CAC5B,GAAW,EACX,IAAmB,EACnB,MAA2C;IAE3C,IAAI,CAAC,MAAM,EAAE,MAAM;QAAE,OAAM;IAC3B,IAAI,KAAK,GAAG,CAAC,CAAA;IACb,IAAI,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QACjC,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC,CAAA;QAC3C,OAAO;YACH,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC;YACzB,UAAU,EAAE,GAAG,CAAC,UAAU;YAC1B,aAAa,EAAE,GAAG,CAAC,aAAa;SACnC,CAAA;IACL,CAAC,CAAC,CAAA;IACF,IAAI,GAAG,CAAC,KAAK,GAAG,KAAK;QAAE,OAAM;IAC7B,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE;QACb,aAAa;QACb,GAAG,IAAA,sBAAc,EAAC,IAAI,CAAC;KAC1B,EAAE,iCAAiC,CAAC,CAAA;AACzC,CAAC;AArBD,4CAqBC;AAGD,SAAS,aAAa,CAAC,GAAiB;IACpC,IAAK,GAAW,CAAC,oBAAoB;QAAE,OAAQ,GAAW,CAAC,oBAAoB,CAAA;IAC/E,IAAI,GAAG,CAAC,UAAU,EAAE,IAAI,KAAK,gBAAgB;QAAE,OAAO,iBAAQ,CAAC,IAAI,CAAA;IACnE,OAAO,iBAAQ,CAAC,KAAK,CAAA;AACzB,CAAC"}

package/lib/util/execute.d.ts

@@ -1,5 +1,10 @@
 import { ExecutionResult } from 'graphql-ws';
 import { ExecutionArgs } from 'graphql/execution/execute';
-import { PromiseOrValue } from 'graphql/jsutils/PromiseOrValue';
-export declare function executeWithLimit(maxQueries: number, args: ExecutionArgs): PromiseOrValue<ExecutionResult>;
+export interface ExecuteOptions {
+    maxRootFields?: number;
+}
+export declare function openreaderExecute(args: ExecutionArgs, options: ExecuteOptions): Promise<ExecutionResult>;
+type SubscriptionResult = AsyncIterableIterator<ExecutionResult> | ExecutionResult;
+export declare function openreaderSubscribe(args: ExecutionArgs): Promise<SubscriptionResult>;
+export {};
 //# sourceMappingURL=execute.d.ts.map

package/lib/util/execute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../src/util/execute.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,eAAe,EAAC,MAAM,YAAY,CAAA;AAC1C,OAAO,EAKH,aAAa,EAEhB,MAAM,2BAA2B,CAAA;AAClC,OAAO,EAAC,cAAc,EAAC,MAAM,gCAAgC,CAAA;AAG7D,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,GAAG,cAAc,CAAC,eAAe,CAAC,CAuCzG"}
+{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../src/util/execute.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,eAAe,EAAC,MAAM,YAAY,CAAA;AAC1C,OAAO,EAKH,aAAa,EAEhB,MAAM,2BAA2B,CAAA;AAIlC,MAAM,WAAW,cAAc;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAA;CACzB;AAGD,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,eAAe,CAAC,CAiB9G;AAGD,KAAK,kBAAkB,GAAG,qBAAqB,CAAC,eAAe,CAAC,GAAG,eAAe,CAAA;AAGlF,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA0B1F"}

package/lib/util/execute.js

@@ -1,28 +1,88 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.executeWithLimit = void 0;
+exports.openreaderSubscribe = exports.openreaderExecute = void 0;
+const logger_1 = require("@subsquid/logger");
+const util_internal_1 = require("@subsquid/util-internal");
+const apollo_server_core_1 = require("apollo-server-core");
 const graphql_1 = require("graphql");
 const execute_1 = require("graphql/execution/execute");
-function executeWithLimit(maxQueries, args) {
+const error_handling_1 = require("./error-handling");
+async function openreaderExecute(args, options) {
+    let log = args.contextValue.openreader.log?.child('gql');
+    if (log?.isDebug()) {
+        log.debug((0, error_handling_1.getDocumentCtx)(args), 'graphql query');
+    }
+    let result;
+    let errors = validate(args, options);
+    if (errors.length > 0) {
+        result = { errors };
+    }
+    else {
+        result = await (0, execute_1.execute)(args);
+    }
+    logResult('graphql result', log, args, result);
+    return result;
+}
+exports.openreaderExecute = openreaderExecute;
+async function openreaderSubscribe(args) {
+    let log = args.contextValue.openreader.log?.child('gql');
+    if (log?.isDebug()) {
+        log.debug((0, error_handling_1.getDocumentCtx)(args), 'graphql subscription');
+    }
+    let result;
+    let errors = validate(args, {});
+    if (errors.length > 0) {
+        result = { errors };
+    }
+    else {
+        result = await (0, graphql_1.subscribe)(args);
+    }
+    if (result[Symbol.asyncIterator]) {
+        log?.debug('graphql subscription initiated');
+        if (log)
+            return logSubscriptionResults(log, args, result);
+    }
+    else {
+        logResult('graphql subscription result', log, args, result);
+    }
+    return result;
+}
+exports.openreaderSubscribe = openreaderSubscribe;
+async function* logSubscriptionResults(log, args, results) {
+    for await (let result of results) {
+        logResult('graphql subscription result', log, args, result);
+        yield result;
+    }
+    log.debug('graphql subscription ended');
+}
+function logResult(msg, log, args, result) {
+    if (log == null)
+        return;
+    if (log.isDebug()) {
+        log.debug({
+            graphqlResult: log.isTrace() ? result : undefined
+        }, msg);
+    }
+    (0, error_handling_1.logGraphQLErrors)(log, args, result.errors);
+}
+function validate(args, { maxRootFields }) {
     (0, execute_1.assertValidExecutionArguments)(args.schema, args.document, args.variableValues);
     let xtx = (0, execute_1.buildExecutionContext)(args.schema, args.document, args.rootValue, args.contextValue, args.variableValues, args.operationName, args.fieldResolver, args.typeResolver);
-    if (Array.isArray(xtx)) {
-        return { errors: xtx };
-    }
+    if (Array.isArray(xtx))
+        return xtx.map(err => (0, util_internal_1.addErrorContext)(err, {
+            __openreaderLogLevel: logger_1.LogLevel.WARN
+        }));
     let etx = xtx;
-    if (etx.operation.operation == 'query') {
+    if (maxRootFields && etx.operation.operation == 'query') {
         let query = (0, graphql_1.getOperationRootType)(etx.schema, etx.operation);
         let fields = (0, execute_1.collectFields)(etx, query, etx.operation.selectionSet, Object.create(null), Object.create(null));
         let fieldsCount = Object.keys(fields).length;
-        if (fieldsCount > maxQueries) {
-            return {
-                errors: [
-                    new graphql_1.GraphQLError(`only ${maxQueries} root query fields allowed, but got ${fieldsCount}`)
-                ]
-            };
+        if (fieldsCount > maxRootFields) {
+            return [
+                new apollo_server_core_1.UserInputError(`only ${maxRootFields} root fields allowed, but got ${fieldsCount}`)
+            ];
         }
     }
-    return (0, execute_1.execute)(args);
+    return [];
 }
-exports.executeWithLimit = executeWithLimit;
 //# sourceMappingURL=execute.js.map

package/lib/util/execute.js.map

@@ -1 +1 @@
-{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../src/util/execute.ts"],"names":[],"mappings":";;;AAAA,qCAA0D;AAE1D,uDAOkC;AAIlC,SAAgB,gBAAgB,CAAC,UAAkB,EAAE,IAAmB;IACpE,IAAA,uCAA6B,EAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,CAAA;IAE9E,IAAI,GAAG,GAAG,IAAA,+BAAqB,EAC3B,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,YAAY,CACpB,CAAA;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACrB,OAAO,EAAC,MAAM,EAAE,GAAG,EAAC,CAAA;IACxB,CAAC;IAED,IAAI,GAAG,GAAG,GAAuB,CAAA;IACjC,IAAI,GAAG,CAAC,SAAS,CAAC,SAAS,IAAI,OAAO,EAAE,CAAC;QACrC,IAAI,KAAK,GAAG,IAAA,8BAAoB,EAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,SAAS,CAAC,CAAA;QAC3D,IAAI,MAAM,GAAG,IAAA,uBAAa,EACtB,GAAG,EACH,KAAK,EACL,GAAG,CAAC,SAAS,CAAC,YAAY,EAC1B,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EACnB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CACtB,CAAA;QACD,IAAI,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAA;QAC5C,IAAI,WAAW,GAAG,UAAU,EAAE,CAAC;YAC3B,OAAO;gBACH,MAAM,EAAE;oBACJ,IAAI,sBAAY,CAAC,QAAQ,UAAU,uCAAuC,WAAW,EAAE,CAAC;iBAC3F;aACJ,CAAA;QACL,CAAC;IACL,CAAC;IAED,OAAO,IAAA,iBAAc,EAAC,IAAI,CAAC,CAAA;AAC/B,CAAC;AAvCD,4CAuCC"}
+{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../src/util/execute.ts"],"names":[],"mappings":"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"}

package/lib/util/limit.js

@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResponseSizeLimit = exports.Limit = void 0;
+const apollo_server_core_1 = require("apollo-server-core");
 const assert_1 = __importDefault(require("assert"));
-const graphql_1 = require("graphql");
 class Limit {
     constructor(error, value) {
         this.error = error;
@@ -28,7 +28,7 @@ class Limit {
     }
 }
 exports.Limit = Limit;
-const SIZE_LIMIT = new graphql_1.GraphQLError('response might exceed the size limit');
+const SIZE_LIMIT = new apollo_server_core_1.UserInputError('response might exceed the size limit');
 SIZE_LIMIT.stack = undefined;
 class ResponseSizeLimit extends Limit {
     constructor(maxNodes) {

package/lib/util/limit.js.map

@@ -1 +1 @@
-{"version":3,"file":"limit.js","sourceRoot":"","sources":["../../src/util/limit.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA2B;AAC3B,qCAAoC;AAGpC,MAAa,KAAK;IACd,YAAoB,KAAY,EAAU,KAAa;QAAnC,UAAK,GAAL,KAAK,CAAO;QAAU,UAAK,GAAL,KAAK,CAAQ;QACnD,IAAA,gBAAM,EAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAA;IAC1B,CAAC;IAED,IAAI,IAAI;QACJ,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;IAClC,CAAC;IAED,KAAK,CAAC,EAA4B;QAC9B,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC;YAAE,MAAM,IAAI,CAAC,KAAK,CAAA;QACpC,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QACtC,IAAI,IAAI,GAAG,CAAC,EAAE,CAAC;YACX,MAAM,IAAI,CAAC,KAAK,CAAA;QACpB,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,KAAK,GAAG,IAAI,CAAA;QACrB,CAAC;IACL,CAAC;CACJ;AAlBD,sBAkBC;AAGD,MAAM,UAAU,GAAG,IAAI,sBAAY,CAAC,sCAAsC,CAAC,CAAA;AAC3E,UAAU,CAAC,KAAK,GAAG,SAAS,CAAA;AAG5B,MAAa,iBAAkB,SAAQ,KAAK;IACxC,YAAY,QAAgB;QACxB,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;IAC/B,CAAC;CACJ;AAJD,8CAIC"}
+{"version":3,"file":"limit.js","sourceRoot":"","sources":["../../src/util/limit.ts"],"names":[],"mappings":";;;;;;AAAA,2DAAiD;AACjD,oDAA2B;AAG3B,MAAa,KAAK;IACd,YAAoB,KAAY,EAAU,KAAa;QAAnC,UAAK,GAAL,KAAK,CAAO;QAAU,UAAK,GAAL,KAAK,CAAQ;QACnD,IAAA,gBAAM,EAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAA;IAC1B,CAAC;IAED,IAAI,IAAI;QACJ,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;IAClC,CAAC;IAED,KAAK,CAAC,EAA4B;QAC9B,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC;YAAE,MAAM,IAAI,CAAC,KAAK,CAAA;QACpC,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QACtC,IAAI,IAAI,GAAG,CAAC,EAAE,CAAC;YACX,MAAM,IAAI,CAAC,KAAK,CAAA;QACpB,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,KAAK,GAAG,IAAI,CAAA;QACrB,CAAC;IACL,CAAC;CACJ;AAlBD,sBAkBC;AAGD,MAAM,UAAU,GAAG,IAAI,mCAAc,CAAC,sCAAsC,CAAC,CAAA;AAC7E,UAAU,CAAC,KAAK,GAAG,SAAS,CAAA;AAG5B,MAAa,iBAAkB,SAAQ,KAAK;IACxC,YAAY,QAAgB;QACxB,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;IAC/B,CAAC;CACJ;AAJD,8CAIC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@subsquid/openreader",
-  "version": "4.4.2",
+  "version": "4.5.1",
   "description": "GraphQL server for postgres-compatible databases",
   "keywords": [
     "graphql",
@@ -23,11 +23,11 @@
   "dependencies": {
     "@graphql-tools/merge": "^9.0.1",
     "@subsquid/graphiql-console": "^0.3.0",
-    "@subsquid/logger": "^1.3.2",
-    "@subsquid/util-internal": "^3.0.0",
+    "@subsquid/logger": "^1.3.3",
+    "@subsquid/util-internal": "^3.1.0",
     "@subsquid/util-internal-commander": "^1.3.2",
     "@subsquid/util-internal-hex": "^1.2.2",
-    "@subsquid/util-internal-http-server": "^1.2.2",
+    "@subsquid/util-internal-http-server": "^2.0.0",
     "@subsquid/util-naming": "^1.2.2",
     "apollo-server-core": "^3.13.0",
     "apollo-server-express": "^3.13.0",

package/src/context.ts

@@ -1,6 +1,7 @@
-import {Dialect} from './dialect'
-import {Query} from './sql/query'
-import {Limit} from './util/limit'
+import type {Logger} from '@subsquid/logger'
+import type {Dialect} from './dialect'
+import type {Query} from './sql/query'
+import type {Limit} from './util/limit'
 
 
 export interface Context {
@@ -9,9 +10,11 @@ export interface Context {
 
 
 export interface OpenreaderContext {
+    id: number
     dialect: Dialect
     executeQuery<T>(query: Query<T>): Promise<T>
     subscription<T>(query: Query<T>): AsyncIterable<T>
     responseSizeLimit?: Limit
     subscriptionResponseSizeLimit?: Limit
+    log?: Logger
 }

package/src/db.ts

@@ -1,39 +1,33 @@
-import type {ClientBase, Pool} from "pg"
-import {OpenreaderContext} from "./context"
-import {Dialect} from "./dialect"
-import {Query} from "./sql/query"
-import {Subscription} from "./subscription"
-import {withErrorContext} from "./util/error-handling"
-import {LazyTransaction} from "./util/lazy-transaction"
+import type {Logger} from '@subsquid/logger'
+import {addErrorContext} from '@subsquid/util-internal'
+import type {ClientBase, Pool} from 'pg'
+import {QueryResult} from 'pg'
+import {OpenreaderContext} from './context'
+import {Dialect} from './dialect'
+import {Query} from './sql/query'
+import {Subscription} from './subscription'
+import {LazyTransaction} from './util/lazy-transaction'
 
 
-export interface Database {
-    query(sql: string, parameters?: any[]): Promise<any[][]>
-}
-
-
-export class PgDatabase implements Database {
-    constructor(private client: ClientBase) {}
-
-    query(sql: string, parameters?: any[]): Promise<any[][]> {
-        return this.client.query({text: sql, rowMode: 'array'}, parameters)
-            .then(result => result.rows)
-            .catch(withErrorContext({sql, parameters}))
-    }
-}
+let CTX_COUNTER = 0
 
 
 export class PoolOpenreaderContext implements OpenreaderContext {
+    public id = (CTX_COUNTER = (CTX_COUNTER + 1) % Number.MAX_SAFE_INTEGER)
+    public log?: Logger
     private tx: LazyTransaction<Database>
     private subscriptionPool: Pool
+    private queryCounter = 0
 
     constructor(
         public readonly dialect: Dialect,
         pool: Pool,
         subscriptionPool?: Pool,
-        private subscriptionPollInterval: number = 1000
+        private subscriptionPollInterval: number = 1000,
+        log?: Logger
     ) {
-        this.tx = new LazyTransaction(cb => transact(pool, cb))
+        this.log = log?.child({graphqlCtx: this.id})
+        this.tx = new LazyTransaction(cb => this.transact(pool, cb))
         this.subscriptionPool = subscriptionPool || pool
     }
 
@@ -43,30 +37,67 @@ export class PoolOpenreaderContext implements OpenreaderContext {
 
     async executeQuery<T>(query: Query<T>): Promise<T> {
         let db = await this.tx.get()
-        let result = await db.query(query.sql, query.params)
+        let result = await db(query.sql, query.params)
         return query.map(result)
     }
 
     subscription<T>(query: Query<T>): AsyncIterable<T> {
-        return new Subscription(this.subscriptionPollInterval, () => transact(this.subscriptionPool, async db => {
-            let result = await db.query(query.sql, query.params)
+        return new Subscription(this.subscriptionPollInterval, () => this.transact(this.subscriptionPool, async db => {
+            let result = await db(query.sql, query.params)
             return query.map(result)
         }))
     }
-}
-
 
-async function transact<T>(pool: Pool, cb: (db: Database) => Promise<T>): Promise<T> {
-    let client = await pool.connect()
-    try {
-        await client.query('START TRANSACTION ISOLATION LEVEL SERIALIZABLE READ ONLY')
+    private async transact<T>(pool: Pool, cb: (db: Database) => Promise<T>): Promise<T> {
+        let client = await pool.connect()
         try {
-            let db = new PgDatabase(client)
-            return await cb(db)
+            await this.query(client, 'START TRANSACTION ISOLATION LEVEL SERIALIZABLE READ ONLY')
+            try {
+                return await cb(async (sql, parameters) => {
+                    let result = await this.query(client, sql, parameters)
+                    return result.rows
+                })
+            } finally {
+                await this.query(client, 'COMMIT').catch(() => {})
+            }
         } finally {
-            await client.query('COMMIT').catch(() => {})
+            client.release()
+        }
+    }
+
+    private async query(client: ClientBase, sql: string, parameters?: any[]): Promise<QueryResult> {
+        let queryId = this.queryCounter = (this.queryCounter + 1) % Number.MAX_SAFE_INTEGER
+
+        let ctx = {
+            graphqlCtx: this.id,
+            graphqlSqlQuery: queryId,
+        }
+
+        let log = this.log?.child('sql', ctx)
+
+        log?.debug({
+            sql,
+            parameters
+        }, 'sql query')
+
+        try {
+            let result = await client.query({text: sql, rowMode: 'array'}, parameters)
+            log?.debug({
+                rowCount: result.rowCount || 0,
+                rows: log.isTrace() ? result.rows : undefined
+            }, 'sql result')
+            return result
+        } catch(err: any) {
+            throw addErrorContext(err, {
+                ...ctx,
+                sql,
+                parameters
+            })
         }
-    } finally {
-        client.release()
     }
 }
+
+
+interface Database {
+    (sql: string, parameters?: any[]): Promise<any[][]>
+}

package/src/server.ts

@@ -15,8 +15,7 @@ import {PoolOpenreaderContext} from './db'
 import type {Dialect} from './dialect'
 import type {Model} from './model'
 import {SchemaBuilder} from './opencrud/schema'
-import {logGraphQLError} from './util/error-handling'
-import {executeWithLimit} from './util/execute'
+import {openreaderExecute, openreaderSubscribe} from './util/execute'
 import {ResponseSizeLimit} from './util/limit'
 
 
@@ -38,7 +37,15 @@ export interface ServerOptions {
 }
 
 export async function serve(options: ServerOptions): Promise<ListeningServer> {
-    let {connection, subscriptionConnection, subscriptionPollInterval, maxResponseNodes, subscriptionMaxResponseNodes} = options
+    let {
+        connection,
+        subscriptionConnection,
+        subscriptionPollInterval,
+        maxResponseNodes,
+        subscriptionMaxResponseNodes,
+        log
+    } = options
+
     let dialect = options.dialect ?? 'postgres'
 
     let schema = new SchemaBuilder(options).build()
@@ -48,7 +55,8 @@ export async function serve(options: ServerOptions): Promise<ListeningServer> {
             dialect,
             connection,
             subscriptionConnection,
-            subscriptionPollInterval
+            subscriptionPollInterval,
+            log
         )
 
         if (maxResponseNodes) {
@@ -104,12 +112,12 @@ export async function runApollo(options: ApolloOptions): Promise<ListeningServer
     const {disposals, context, schema, log, maxRootFields} = options
 
     let maxRequestSizeBytes = options.maxRequestSizeBytes ?? 256 * 1024
-    let app = express()
+    let app: express.Application = express()
     let server = http.createServer(app)
 
-    const execute = maxRootFields
-            ? (args: ExecutionArgs) => executeWithLimit(maxRootFields, args)
-            : undefined
+    let execute = (args: ExecutionArgs) => openreaderExecute(args, {
+        maxRootFields: maxRootFields
+    })
 
     if (options.subscriptions) {
         let wsServer = new WebSocketServer({
@@ -122,14 +130,7 @@ export async function runApollo(options: ApolloOptions): Promise<ListeningServer
                 schema,
                 context,
                 execute,
-                onError(ctx, message, errors) {
-                    if (log) {
-                        // FIXME: we don't want to log client errors
-                        for (let err of errors) {
-                            logGraphQLError(log, err)
-                        }
-                    }
-                },
+                subscribe: openreaderSubscribe,
                 onNext(_ctx, _message, args, result) {
                     args.contextValue.openreader.close()
                     return result
@@ -147,7 +148,7 @@ export async function runApollo(options: ApolloOptions): Promise<ListeningServer
         cache: options.cache,
         stopOnTerminationSignals: false,
         allowBatchedHttpRequests: false,
-        executor: execute && (async req => {
+        executor: async req => {
             return execute({
                 schema,
                 document: req.document,
@@ -156,7 +157,7 @@ export async function runApollo(options: ApolloOptions): Promise<ListeningServer
                 variableValues: req.request.variables,
                 operationName: req.operationName
             })
-        }),
+        },
         plugins: [
             ...options.plugins || [],
             {
@@ -164,13 +165,6 @@ export async function runApollo(options: ApolloOptions): Promise<ListeningServer
                     return {
                         willSendResponse(req: any) {
                             return req.context.openreader.close()
-                        },
-                        async didEncounterErrors(req) {
-                            if (req.operation && log) {
-                                for (let err of req.errors) {
-                                    logGraphQLError(log, err)
-                                }
-                            }
                         }
                     }
                 }
@@ -186,7 +180,7 @@ export async function runApollo(options: ApolloOptions): Promise<ListeningServer
     disposals.push(() => apollo.stop())
 
     apollo.applyMiddleware({
-        app,
+        app: app as any, // @types/express version mismatch. We don't want to pin it just because of this line.
         bodyParserConfig: {
             limit: maxRequestSizeBytes
         }

package/src/test/limits.test.ts

@@ -155,7 +155,7 @@ describe('response size limits', function() {
         `, {
             errors: [
                 expect.objectContaining({
-                    message: 'only 3 root query fields allowed, but got 4'
+                    message: 'only 3 root fields allowed, but got 4'
                 })
             ]
         })

package/src/test/setup.ts

@@ -1,3 +1,4 @@
+import {createLogger} from '@subsquid/logger'
 import {assertNotNull} from "@subsquid/util-internal"
 import {ListeningServer} from "@subsquid/util-internal-http-server"
 import {Client} from "gql-test-client"
@@ -72,6 +73,7 @@ export function useServer(schema: string, options?: Partial<ServerOptions>): Cli
             subscriptions: true,
             subscriptionPollInterval: 500,
             maxRootFields: 10,
+            // log: createLogger('sqd:openreader'),
             ...options
         })
         client.endpoint = `http://localhost:${info.port}/graphql`

package/src/util/error-handling.ts

@@ -1,40 +1,50 @@
-import {Logger, LogLevel} from "@subsquid/logger"
-import {GraphQLError, printError} from "graphql"
+import {Logger, LogLevel} from '@subsquid/logger'
+import {weakMemo} from '@subsquid/util-internal'
+import {ExecutionArgs, GraphQLError, print} from 'graphql'
 
 
-export function logGraphQLError(log: Logger, err: GraphQLError, level: LogLevel = LogLevel.ERROR): void {
-    if (log.level > level) return
-    let msg = printError(err) + '\n'
-    log.write(level, {
-        graphqlOriginalError: err.originalError,
-        graphqlPath: err.path?.join('.'),
-        graphqlQuery: err.source?.body,
-    }, msg)
+export interface DocumentCtx {
+    graphqlOperationName?: string
+    graphqlDocument: string
+    graphqlVariables: any
 }
 
 
-export function withErrorContext(ctx: object): (err: unknown) => never {
-    return function(err): never {
-        throw addErrorContext(err, ctx)
+export const getDocumentCtx = weakMemo((args: ExecutionArgs): DocumentCtx => {
+    return {
+        graphqlOperationName: args.operationName || undefined,
+        graphqlDocument: print(args.document),
+        graphqlVariables: args.variableValues
     }
+})
+
+
+export function logGraphQLErrors(
+    log: Logger,
+    args: ExecutionArgs,
+    errors: readonly GraphQLError[] | undefined,
+): void {
+    if (!errors?.length) return
+    let level = 0
+    let graphqlErrors = errors.map(err => {
+        level = Math.max(level, getErrorLevel(err))
+        return {
+            message: err.message,
+            path: err.path?.join('.'),
+            extensions: err.extensions,
+            originalError: err.originalError
+        }
+    })
+    if (log.level > level) return
+    log.write(level, {
+        graphqlErrors,
+        ...getDocumentCtx(args)
+    }, 'graphql query ended with errors')
 }
 
 
-export function addErrorContext(error: unknown, ctx: object): Error {
-    let e = ensureError(error)
-    Object.assign(e, ctx)
-    return e
-}
-
-
-export function ensureError(err: unknown): Error {
-    if (err instanceof Error) return err
-    return new NonErrorThrown(err)
-}
-
-
-export class NonErrorThrown extends Error {
-    constructor(public readonly value: unknown) {
-        super('Non error object thrown')
-    }
+function getErrorLevel(err: GraphQLError): LogLevel {
+    if ((err as any).__openreaderLogLevel) return (err as any).__openreaderLogLevel
+    if (err.extensions?.code === 'BAD_USER_INPUT') return LogLevel.WARN
+    return LogLevel.ERROR
 }

package/src/util/execute.ts

@@ -1,4 +1,7 @@
-import {getOperationRootType, GraphQLError} from 'graphql'
+import {Logger, LogLevel} from '@subsquid/logger'
+import {addErrorContext} from '@subsquid/util-internal'
+import {UserInputError} from 'apollo-server-core'
+import {getOperationRootType, GraphQLError, subscribe as graphqlSubscribe} from 'graphql'
 import {ExecutionResult} from 'graphql-ws'
 import {
     assertValidExecutionArguments,
@@ -8,10 +11,91 @@ import {
     ExecutionArgs,
     ExecutionContext
 } from 'graphql/execution/execute'
-import {PromiseOrValue} from 'graphql/jsutils/PromiseOrValue'
+import {getDocumentCtx, logGraphQLErrors} from './error-handling'
 
 
-export function executeWithLimit(maxQueries: number, args: ExecutionArgs): PromiseOrValue<ExecutionResult> {
+export interface ExecuteOptions {
+    maxRootFields?: number
+}
+
+
+export async function openreaderExecute(args: ExecutionArgs, options: ExecuteOptions): Promise<ExecutionResult> {
+    let log: Logger | undefined = args.contextValue.openreader.log?.child('gql')
+    if (log?.isDebug()) {
+        log.debug(getDocumentCtx(args), 'graphql query')
+    }
+
+    let result: ExecutionResult
+    let errors = validate(args, options)
+    if (errors.length > 0) {
+        result = {errors}
+    } else {
+        result = await graphqlExecute(args)
+    }
+
+    logResult('graphql result', log, args, result)
+
+    return result
+}
+
+
+type SubscriptionResult = AsyncIterableIterator<ExecutionResult> | ExecutionResult
+
+
+export async function openreaderSubscribe(args: ExecutionArgs): Promise<SubscriptionResult> {
+    let log: Logger | undefined = args.contextValue.openreader.log?.child('gql')
+    if (log?.isDebug()) {
+        log.debug(getDocumentCtx(args), 'graphql subscription')
+    }
+
+    let result: SubscriptionResult
+    let errors = validate(args, {})
+    if (errors.length > 0) {
+        result = {errors}
+    } else {
+        result = await graphqlSubscribe(args)
+    }
+
+    if ((result as any)[Symbol.asyncIterator]) {
+        log?.debug('graphql subscription initiated')
+        if (log) return logSubscriptionResults(
+            log,
+            args,
+            result as AsyncIterableIterator<ExecutionResult>
+        )
+    } else {
+        logResult('graphql subscription result', log, args, result as ExecutionResult)
+    }
+
+    return result
+}
+
+
+async function *logSubscriptionResults(
+    log: Logger,
+    args: ExecutionArgs,
+    results: AsyncIterableIterator<ExecutionResult>
+): AsyncIterableIterator<ExecutionResult> {
+    for await (let result of results) {
+        logResult('graphql subscription result', log, args, result)
+        yield result
+    }
+    log.debug('graphql subscription ended')
+}
+
+
+function logResult(msg: string, log: Logger | undefined, args: ExecutionArgs, result: ExecutionResult): void {
+    if (log == null) return
+    if (log.isDebug()) {
+        log.debug({
+            graphqlResult: log.isTrace() ? result : undefined
+        }, msg)
+    }
+    logGraphQLErrors(log, args, result.errors)
+}
+
+
+function validate(args: ExecutionArgs, {maxRootFields}: ExecuteOptions): GraphQLError[] {
     assertValidExecutionArguments(args.schema, args.document, args.variableValues)
 
     let xtx = buildExecutionContext(
@@ -25,12 +109,12 @@ export function executeWithLimit(maxQueries: number, args: ExecutionArgs): Promi
         args.typeResolver
     )
 
-    if (Array.isArray(xtx)) {
-        return {errors: xtx}
-    }
+    if (Array.isArray(xtx)) return xtx.map(err => addErrorContext(err, {
+        __openreaderLogLevel: LogLevel.WARN
+    }))
 
     let etx = xtx as ExecutionContext
-    if (etx.operation.operation == 'query') {
+    if (maxRootFields && etx.operation.operation == 'query') {
         let query = getOperationRootType(etx.schema, etx.operation)
         let fields = collectFields(
             etx,
@@ -40,14 +124,12 @@ export function executeWithLimit(maxQueries: number, args: ExecutionArgs): Promi
             Object.create(null)
         )
         let fieldsCount = Object.keys(fields).length
-        if (fieldsCount > maxQueries) {
-            return {
-                errors: [
-                    new GraphQLError(`only ${maxQueries} root query fields allowed, but got ${fieldsCount}`)
-                ]
-            }
+        if (fieldsCount > maxRootFields) {
+            return  [
+                new UserInputError(`only ${maxRootFields} root fields allowed, but got ${fieldsCount}`)
+            ]
         }
     }
 
-    return graphqlExecute(args)
+    return []
 }

package/src/util/limit.ts

@@ -1,5 +1,5 @@
+import {UserInputError} from 'apollo-server-core'
 import assert from 'assert'
-import {GraphQLError} from 'graphql'
 
 
 export class Limit {
@@ -23,7 +23,7 @@ export class Limit {
 }
 
 
-const SIZE_LIMIT = new GraphQLError('response might exceed the size limit')
+const SIZE_LIMIT = new UserInputError('response might exceed the size limit')
 SIZE_LIMIT.stack = undefined