@subsquid/openreader 4.4.1 → 4.5.0

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;QACpB,OAAO,EAAC,MAAM,EAAE,GAAG,EAAC,CAAA;KACvB;IAED,IAAI,GAAG,GAAG,GAAuB,CAAA;IACjC,IAAI,GAAG,CAAC,SAAS,CAAC,SAAS,IAAI,OAAO,EAAE;QACpC,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;YAC1B,OAAO;gBACH,MAAM,EAAE;oBACJ,IAAI,sBAAY,CAAC,QAAQ,UAAU,uCAAuC,WAAW,EAAE,CAAC;iBAC3F;aACJ,CAAA;SACJ;KACJ;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":";;;AAAA,6CAAiD;AACjD,2DAAuD;AACvD,2DAAiD;AACjD,qCAAyF;AAEzF,uDAOkC;AAClC,qDAAiE;AAQ1D,KAAK,UAAU,iBAAiB,CAAC,IAAmB,EAAE,OAAuB;IAChF,IAAI,GAAG,GAAuB,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,CAAA;IAC5E,IAAI,GAAG,EAAE,OAAO,EAAE,EAAE,CAAC;QACjB,GAAG,CAAC,KAAK,CAAC,IAAA,+BAAc,EAAC,IAAI,CAAC,EAAE,eAAe,CAAC,CAAA;IACpD,CAAC;IAED,IAAI,MAAuB,CAAA;IAC3B,IAAI,MAAM,GAAG,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;IACpC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpB,MAAM,GAAG,EAAC,MAAM,EAAC,CAAA;IACrB,CAAC;SAAM,CAAC;QACJ,MAAM,GAAG,MAAM,IAAA,iBAAc,EAAC,IAAI,CAAC,CAAA;IACvC,CAAC;IAED,SAAS,CAAC,gBAAgB,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;IAE9C,OAAO,MAAM,CAAA;AACjB,CAAC;AAjBD,8CAiBC;AAMM,KAAK,UAAU,mBAAmB,CAAC,IAAmB;IACzD,IAAI,GAAG,GAAuB,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,CAAA;IAC5E,IAAI,GAAG,EAAE,OAAO,EAAE,EAAE,CAAC;QACjB,GAAG,CAAC,KAAK,CAAC,IAAA,+BAAc,EAAC,IAAI,CAAC,EAAE,sBAAsB,CAAC,CAAA;IAC3D,CAAC;IAED,IAAI,MAA0B,CAAA;IAC9B,IAAI,MAAM,GAAG,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;IAC/B,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpB,MAAM,GAAG,EAAC,MAAM,EAAC,CAAA;IACrB,CAAC;SAAM,CAAC;QACJ,MAAM,GAAG,MAAM,IAAA,mBAAgB,EAAC,IAAI,CAAC,CAAA;IACzC,CAAC;IAED,IAAK,MAAc,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;QACxC,GAAG,EAAE,KAAK,CAAC,gCAAgC,CAAC,CAAA;QAC5C,IAAI,GAAG;YAAE,OAAO,sBAAsB,CAClC,GAAG,EACH,IAAI,EACJ,MAAgD,CACnD,CAAA;IACL,CAAC;SAAM,CAAC;QACJ,SAAS,CAAC,6BAA6B,EAAE,GAAG,EAAE,IAAI,EAAE,MAAyB,CAAC,CAAA;IAClF,CAAC;IAED,OAAO,MAAM,CAAA;AACjB,CAAC;AA1BD,kDA0BC;AAGD,KAAK,SAAU,CAAC,CAAA,sBAAsB,CAClC,GAAW,EACX,IAAmB,EACnB,OAA+C;IAE/C,IAAI,KAAK,EAAE,IAAI,MAAM,IAAI,OAAO,EAAE,CAAC;QAC/B,SAAS,CAAC,6BAA6B,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;QAC3D,MAAM,MAAM,CAAA;IAChB,CAAC;IACD,GAAG,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAA;AAC3C,CAAC;AAGD,SAAS,SAAS,CAAC,GAAW,EAAE,GAAuB,EAAE,IAAmB,EAAE,MAAuB;IACjG,IAAI,GAAG,IAAI,IAAI;QAAE,OAAM;IACvB,IAAI,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC;QAChB,GAAG,CAAC,KAAK,CAAC;YACN,aAAa,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;SACpD,EAAE,GAAG,CAAC,CAAA;IACX,CAAC;IACD,IAAA,iCAAgB,EAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAA;AAC9C,CAAC;AAGD,SAAS,QAAQ,CAAC,IAAmB,EAAE,EAAC,aAAa,EAAiB;IAClE,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;QAAE,OAAO,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,IAAA,+BAAe,EAAC,GAAG,EAAE;YAC/D,oBAAoB,EAAE,iBAAQ,CAAC,IAAI;SACtC,CAAC,CAAC,CAAA;IAEH,IAAI,GAAG,GAAG,GAAuB,CAAA;IACjC,IAAI,aAAa,IAAI,GAAG,CAAC,SAAS,CAAC,SAAS,IAAI,OAAO,EAAE,CAAC;QACtD,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,aAAa,EAAE,CAAC;YAC9B,OAAQ;gBACJ,IAAI,mCAAc,CAAC,QAAQ,aAAa,iCAAiC,WAAW,EAAE,CAAC;aAC1F,CAAA;QACL,CAAC;IACL,CAAC;IAED,OAAO,EAAE,CAAA;AACb,CAAC"}

package/lib/util/lazy-transaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"lazy-transaction.js","sourceRoot":"","sources":["../../src/util/lazy-transaction.ts"],"names":[],"mappings":";;;AAMA,MAAa,eAAe;IAKxB,YAAoB,QAAyD;QAAzD,aAAQ,GAAR,QAAQ,CAAiD;QAJrE,WAAM,GAAG,KAAK,CAAA;IAKtB,CAAC;IAED,KAAK,CAAC,GAAG;QACL,IAAI,IAAI,CAAC,MAAM,EAAE;YACb,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAA;SACrD;QACD,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAA;QAC5C,IAAI,EAAC,GAAG,EAAC,GAAG,MAAM,IAAI,CAAC,EAAE,CAAA;QACzB,OAAO,GAAG,CAAA;IACd,CAAC;IAEO,KAAK,CAAC,gBAAgB;QAC1B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,IAAI,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBAC9B,OAAO,IAAI,OAAO,CAAO,KAAK,CAAC,EAAE;oBAC7B,OAAO,CAAC;wBACJ,GAAG;wBACH,KAAK,EAAE,GAAG,EAAE;4BACR,KAAK,EAAE,CAAA;4BACP,OAAO,OAAO,CAAA;wBAClB,CAAC;qBACJ,CAAC,CAAA;gBACN,CAAC,CAAC,CAAA;YACN,CAAC,CAAC,CAAA;YACF,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAA;QACrC,CAAC,CAAC,CAAA;IACN,CAAC;IAED,KAAK,CAAC,KAAK;QACP,IAAI,CAAC,MAAM,GAAG,IAAI,CAAA;QAClB,IAAI,IAAI,CAAC,EAAE,EAAE;YACT,IAAI,EAAE,GAAG,IAAI,CAAC,EAAE,CAAA;YAChB,IAAI,CAAC,EAAE,GAAG,SAAS,CAAA;YACnB,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAA;SAClC;IACL,CAAC;CACJ;AA1CD,0CA0CC"}
+{"version":3,"file":"lazy-transaction.js","sourceRoot":"","sources":["../../src/util/lazy-transaction.ts"],"names":[],"mappings":";;;AAMA,MAAa,eAAe;IAKxB,YAAoB,QAAyD;QAAzD,aAAQ,GAAR,QAAQ,CAAiD;QAJrE,WAAM,GAAG,KAAK,CAAA;IAKtB,CAAC;IAED,KAAK,CAAC,GAAG;QACL,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAA;QACtD,CAAC;QACD,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAA;QAC5C,IAAI,EAAC,GAAG,EAAC,GAAG,MAAM,IAAI,CAAC,EAAE,CAAA;QACzB,OAAO,GAAG,CAAA;IACd,CAAC;IAEO,KAAK,CAAC,gBAAgB;QAC1B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,IAAI,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBAC9B,OAAO,IAAI,OAAO,CAAO,KAAK,CAAC,EAAE;oBAC7B,OAAO,CAAC;wBACJ,GAAG;wBACH,KAAK,EAAE,GAAG,EAAE;4BACR,KAAK,EAAE,CAAA;4BACP,OAAO,OAAO,CAAA;wBAClB,CAAC;qBACJ,CAAC,CAAA;gBACN,CAAC,CAAC,CAAA;YACN,CAAC,CAAC,CAAA;YACF,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAA;QACrC,CAAC,CAAC,CAAA;IACN,CAAC;IAED,KAAK,CAAC,KAAK;QACP,IAAI,CAAC,MAAM,GAAG,IAAI,CAAA;QAClB,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;YACV,IAAI,EAAE,GAAG,IAAI,CAAC,EAAE,CAAA;YAChB,IAAI,CAAC,EAAE,GAAG,SAAS,CAAA;YACnB,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAA;QACnC,CAAC;IACL,CAAC;CACJ;AA1CD,0CA0CC"}

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;YACV,MAAM,IAAI,CAAC,KAAK,CAAA;SACnB;aAAM;YACH,IAAI,CAAC,KAAK,GAAG,IAAI,CAAA;SACpB;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/lib/util/resolve-tree.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolve-tree.js","sourceRoot":"","sources":["../../src/util/resolve-tree.ts"],"names":[],"mappings":";;;;;;AAAA,2DAAiD;AACjD,oDAA2B;AAE3B,2EAKmC;AAanC,SAAgB,mBAAmB,CAAC,MAAqB,EAAE,IAAiB,EAAE,QAAgB;IAC1F,IAAI,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IACnC,IAAA,gBAAM,EAAC,IAAI,IAAI,IAAI,CAAC,CAAA;IACpB,OAAO,IAAA,sEAAyC,EAAC,IAAI,EAAE,IAAI,CAAC,CAAA;AAChE,CAAC;AAJD,kDAIC;AAKD,SAAgB,cAAc,CAAC,IAAwB,EAAE,QAAiB;IACtE,IAAI,IAAI,GAAG,IAAA,6CAAgB,EAAC,IAAI,CAAC,CAAA;IACjC,IAAA,gBAAM,EAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAA;IAC3B,IAAI,QAAQ,EAAE;QACV,OAAO,mBAAmB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAA;KAC1D;SAAM;QACH,OAAO,IAAI,CAAA;KACd;AACL,CAAC;AARD,wCAQC;AAGD,SAAS,aAAa,CAAC,WAA8D;IACjF,OAAO,WAAW,IAAI,IAAI,IAAI,WAAW,CAAC,gBAAgB,IAAI,IAAI,CAAA;AACtE,CAAC;AAGD,SAAgB,cAAc,CAAC,UAA6B,EAAE,SAAiB;IAC3E,IAAI,GAA4B,CAAA;IAChC,KAAK,IAAI,KAAK,IAAI,UAAU,EAAE;QAC1B,IAAI,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,CAAA;QACzB,IAAI,CAAC,CAAC,IAAI,IAAI,SAAS;YAAE,SAAQ;QACjC,IAAI,GAAG,IAAI,IAAI;YAAE,MAAM,IAAI,mCAAc,CAAC,+BAA+B,SAAS,qBAAqB,CAAC,CAAA;QACxG,GAAG,GAAG,CAAC,CAAA;KACV;IACD,OAAO,GAAG,CAAA;AACd,CAAC;AATD,wCASC;AAGD,SAAgB,cAAc,CAAC,UAA6B,EAAE,SAAiB;IAC3E,KAAK,IAAI,KAAK,IAAI,UAAU,EAAE;QAC1B,IAAI,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,CAAA;QACzB,IAAI,CAAC,CAAC,IAAI,IAAI,SAAS;YAAE,OAAO,IAAI,CAAA;KACvC;IACD,OAAO,KAAK,CAAA;AAChB,CAAC;AAND,wCAMC"}
+{"version":3,"file":"resolve-tree.js","sourceRoot":"","sources":["../../src/util/resolve-tree.ts"],"names":[],"mappings":";;;;;;AAAA,2DAAiD;AACjD,oDAA2B;AAE3B,2EAKmC;AAanC,SAAgB,mBAAmB,CAAC,MAAqB,EAAE,IAAiB,EAAE,QAAgB;IAC1F,IAAI,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IACnC,IAAA,gBAAM,EAAC,IAAI,IAAI,IAAI,CAAC,CAAA;IACpB,OAAO,IAAA,sEAAyC,EAAC,IAAI,EAAE,IAAI,CAAC,CAAA;AAChE,CAAC;AAJD,kDAIC;AAKD,SAAgB,cAAc,CAAC,IAAwB,EAAE,QAAiB;IACtE,IAAI,IAAI,GAAG,IAAA,6CAAgB,EAAC,IAAI,CAAC,CAAA;IACjC,IAAA,gBAAM,EAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAA;IAC3B,IAAI,QAAQ,EAAE,CAAC;QACX,OAAO,mBAAmB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAA;IAC3D,CAAC;SAAM,CAAC;QACJ,OAAO,IAAI,CAAA;IACf,CAAC;AACL,CAAC;AARD,wCAQC;AAGD,SAAS,aAAa,CAAC,WAA8D;IACjF,OAAO,WAAW,IAAI,IAAI,IAAI,WAAW,CAAC,gBAAgB,IAAI,IAAI,CAAA;AACtE,CAAC;AAGD,SAAgB,cAAc,CAAC,UAA6B,EAAE,SAAiB;IAC3E,IAAI,GAA4B,CAAA;IAChC,KAAK,IAAI,KAAK,IAAI,UAAU,EAAE,CAAC;QAC3B,IAAI,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,CAAA;QACzB,IAAI,CAAC,CAAC,IAAI,IAAI,SAAS;YAAE,SAAQ;QACjC,IAAI,GAAG,IAAI,IAAI;YAAE,MAAM,IAAI,mCAAc,CAAC,+BAA+B,SAAS,qBAAqB,CAAC,CAAA;QACxG,GAAG,GAAG,CAAC,CAAA;IACX,CAAC;IACD,OAAO,GAAG,CAAA;AACd,CAAC;AATD,wCASC;AAGD,SAAgB,cAAc,CAAC,UAA6B,EAAE,SAAiB;IAC3E,KAAK,IAAI,KAAK,IAAI,UAAU,EAAE,CAAC;QAC3B,IAAI,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,CAAA;QACzB,IAAI,CAAC,CAAC,IAAI,IAAI,SAAS;YAAE,OAAO,IAAI,CAAA;IACxC,CAAC;IACD,OAAO,KAAK,CAAA;AAChB,CAAC;AAND,wCAMC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@subsquid/openreader",
-  "version": "4.4.1",
+  "version": "4.5.0",
   "description": "GraphQL server for postgres-compatible databases",
   "keywords": [
     "graphql",
@@ -21,22 +21,22 @@
     "src"
   ],
   "dependencies": {
-    "@graphql-tools/merge": "^9.0.0",
+    "@graphql-tools/merge": "^9.0.1",
     "@subsquid/graphiql-console": "^0.3.0",
-    "@subsquid/logger": "^1.3.1",
-    "@subsquid/util-internal": "^2.5.2",
-    "@subsquid/util-internal-commander": "^1.3.1",
-    "@subsquid/util-internal-hex": "^1.2.1",
-    "@subsquid/util-internal-http-server": "^1.2.1",
-    "@subsquid/util-naming": "^1.2.1",
-    "apollo-server-core": "^3.12.1",
-    "apollo-server-express": "^3.12.1",
-    "commander": "^11.0.0",
-    "deep-equal": "^2.2.2",
+    "@subsquid/logger": "^1.3.2",
+    "@subsquid/util-internal": "^3.0.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-naming": "^1.2.2",
+    "apollo-server-core": "^3.13.0",
+    "apollo-server-express": "^3.13.0",
+    "commander": "^11.1.0",
+    "deep-equal": "^2.2.3",
     "express": "^4.18.2",
     "graphql": "^15.8.0",
-    "graphql-parse-resolve-info": "^4.13.0",
-    "graphql-ws": "^5.14.1",
+    "graphql-parse-resolve-info": "^4.14.0",
+    "graphql-ws": "^5.14.2",
     "pg": "^8.11.3",
     "ws": "^8.14.2"
   },
@@ -49,17 +49,17 @@
     }
   },
   "devDependencies": {
-    "@types/deep-equal": "^1.0.2",
-    "@types/express": "^4.17.18",
-    "@types/mocha": "^10.0.2",
-    "@types/node": "^18.18.0",
-    "@types/pg": "^8.10.3",
-    "@types/ws": "^8.5.6",
+    "@types/deep-equal": "^1.0.4",
+    "@types/express": "^4.17.21",
+    "@types/mocha": "^10.0.6",
+    "@types/node": "^18.18.14",
+    "@types/pg": "^8.10.9",
+    "@types/ws": "^8.5.10",
     "dotenv": "^16.3.1",
     "expect": "^29.7.0",
     "gql-test-client": "^0.0.0",
     "mocha": "^10.2.0",
-    "typescript": "~5.2.2"
+    "typescript": "~5.3.2"
   },
   "scripts": {
     "build": "rm -rf lib && tsc",

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) {
@@ -107,9 +115,9 @@ export async function runApollo(options: ApolloOptions): Promise<ListeningServer
     let app = 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)
-                                }
-                            }
                         }
                     }
                 }

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
 }