@constructive-io/graphql-server 5.14.4 → 5.14.6

package/esm/middleware/graphile.js

@@ -1,6 +1,6 @@
 import './types'; // for Request type
 import crypto from 'node:crypto';
-import { classify, parse } from '@constructive-io/errors';
+import { classify, errors, parse } from '@constructive-io/errors';
 import { getNodeEnv } from '@pgpmjs/env';
 import { Logger } from '@pgpmjs/logger';
 import { createGraphileInstance, graphileCache } from 'graphile-cache';
@@ -10,9 +10,11 @@ import { getPgPool } from 'pg-cache';
 import { getPgEnvOptions } from 'pg-env';
 import { isGraphqlObservabilityEnabled } from '../diagnostics/observability';
 import { HandlerCreationError } from '../errors/api-errors';
+import { respondWithGraphQLError } from '../errors/graphql-response';
 import { AuthCookiePlugin } from '../plugins/auth-cookie-plugin';
 import { observeGraphileBuild } from './observability/graphile-build-stats';
 const maskErrorLog = new Logger('graphile:maskError');
+const isDev = () => getNodeEnv() === 'development';
 /**
  * GraphQL framework protocol codes. These originate in the GraphQL/grafast
  * transport layer (not in constructive-db), so they are not Constructive domain
@@ -276,12 +278,14 @@ export const graphile = (opts) => {
             const api = req.api;
             if (!api) {
                 log.error(`${label} Missing API info`);
-                return res.status(500).send('Missing API info');
+                respondWithGraphQLError(res, errors.INTERNAL_FAILURE({ details: 'Missing API info' }));
+                return;
             }
             const key = req.svc_key;
             if (!key) {
                 log.error(`${label} Missing service cache key`);
-                return res.status(500).send('Missing service cache key');
+                respondWithGraphQLError(res, errors.INTERNAL_FAILURE({ details: 'Missing service cache key' }));
+                return;
             }
             const { dbname, anonRole, roleName, schema } = api;
             const schemaLabel = schema?.join(',') || 'unknown';
@@ -367,9 +371,10 @@ export const graphile = (opts) => {
         catch (e) {
             log.error(`${label} PostGraphile middleware error`, e);
             if (!res.headersSent) {
-                return res.status(500).json({
-                    error: { code: 'INTERNAL_ERROR', message: 'An unexpected error occurred' }
-                });
+                respondWithGraphQLError(res, errors.INTERNAL_FAILURE({
+                    details: isDev() ? e?.message ?? String(e) : 'An unexpected error occurred'
+                }));
+                return;
             }
             next(e);
         }

package/middleware/graphile.js

@@ -19,9 +19,11 @@ const pg_cache_1 = require("pg-cache");
 const pg_env_1 = require("pg-env");
 const observability_1 = require("../diagnostics/observability");
 const api_errors_1 = require("../errors/api-errors");
+const graphql_response_1 = require("../errors/graphql-response");
 const auth_cookie_plugin_1 = require("../plugins/auth-cookie-plugin");
 const graphile_build_stats_1 = require("./observability/graphile-build-stats");
 const maskErrorLog = new logger_1.Logger('graphile:maskError');
+const isDev = () => (0, env_1.getNodeEnv)() === 'development';
 /**
  * GraphQL framework protocol codes. These originate in the GraphQL/grafast
  * transport layer (not in constructive-db), so they are not Constructive domain
@@ -285,12 +287,14 @@ const graphile = (opts) => {
             const api = req.api;
             if (!api) {
                 log.error(`${label} Missing API info`);
-                return res.status(500).send('Missing API info');
+                (0, graphql_response_1.respondWithGraphQLError)(res, errors_1.errors.INTERNAL_FAILURE({ details: 'Missing API info' }));
+                return;
             }
             const key = req.svc_key;
             if (!key) {
                 log.error(`${label} Missing service cache key`);
-                return res.status(500).send('Missing service cache key');
+                (0, graphql_response_1.respondWithGraphQLError)(res, errors_1.errors.INTERNAL_FAILURE({ details: 'Missing service cache key' }));
+                return;
             }
             const { dbname, anonRole, roleName, schema } = api;
             const schemaLabel = schema?.join(',') || 'unknown';
@@ -376,9 +380,10 @@ const graphile = (opts) => {
         catch (e) {
             log.error(`${label} PostGraphile middleware error`, e);
             if (!res.headersSent) {
-                return res.status(500).json({
-                    error: { code: 'INTERNAL_ERROR', message: 'An unexpected error occurred' }
-                });
+                (0, graphql_response_1.respondWithGraphQLError)(res, errors_1.errors.INTERNAL_FAILURE({
+                    details: isDev() ? e?.message ?? String(e) : 'An unexpected error occurred'
+                }));
+                return;
             }
             next(e);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructive-io/graphql-server",
-  "version": "5.14.4",
+  "version": "5.14.6",
   "author": "Constructive <developers@constructive.io>",
   "description": "Constructive GraphQL Server",
   "main": "index.js",
@@ -46,7 +46,7 @@
     "@constructive-io/express-context": "^0.23.2",
     "@constructive-io/graphql-env": "^3.28.2",
     "@constructive-io/graphql-types": "^3.27.2",
-    "@constructive-io/query-builder": "^3.9.3",
+    "@constructive-io/query-builder": "^3.9.4",
     "@constructive-io/s3-utils": "^2.29.2",
     "@constructive-io/url-domains": "^2.28.2",
     "@graphile-contrib/pg-many-to-many": "2.0.0-rc.2",
@@ -65,8 +65,8 @@
     "graphile-build-pg": "5.0.2",
     "graphile-cache": "^4.9.2",
     "graphile-config": "1.0.1",
-    "graphile-function-bindings": "^1.10.4",
-    "graphile-settings": "^6.11.4",
+    "graphile-function-bindings": "^1.10.6",
+    "graphile-settings": "^6.11.6",
     "graphile-utils": "5.0.1",
     "graphql": "16.13.0",
     "graphql-upload": "^13.0.0",
@@ -88,10 +88,10 @@
     "@types/pg": "^8.20.0",
     "@types/request-ip": "^0.0.41",
     "cookie-parser": "^1.4.7",
-    "graphile-test": "5.10.4",
+    "graphile-test": "5.10.6",
     "makage": "^0.3.0",
     "nodemon": "^3.1.14",
     "ts-node": "^10.9.2"
   },
-  "gitHead": "90f447482b056a4949134565db2665f21d11aca3"
+  "gitHead": "45cd961cf956d2d28e4d09b20db4204982c33593"
 }