@constructive-io/graphql-server 2.10.10 → 2.10.12

package/esm/run.js

@@ -1,8 +1,4 @@
 #!/usr/bin/env node
 import { getEnvOptions } from '@constructive-io/graphql-env';
 import { GraphQLServer as server } from './server';
-server(getEnvOptions({
-    pg: {
-        database: process.env.PGDATABASE,
-    },
-}));
+server(getEnvOptions());

package/esm/scripts/create-bucket.js

@@ -1,28 +1,27 @@
 // Minimal script to create a bucket in MinIO using @constructive-io/s3-utils
 // Avoid strict type coupling between different @aws-sdk/client-s3 versions
-// Loads graphql/server/.env by default when running via ts-node from this workspace
-import 'dotenv/config';
 import { S3Client } from '@aws-sdk/client-s3';
 import { createS3Bucket } from '@constructive-io/s3-utils';
-const BUCKET = process.env.BUCKET_NAME || 'test-bucket';
-const REGION = process.env.AWS_REGION || 'us-east-1';
-const ACCESS_KEY = process.env.AWS_ACCESS_KEY || process.env.AWS_ACCESS_KEY_ID || 'minioadmin';
-const SECRET_KEY = process.env.AWS_SECRET_KEY ||
-    process.env.AWS_SECRET_ACCESS_KEY ||
-    'minioadmin';
-const ENDPOINT = process.env.MINIO_ENDPOINT || 'http://localhost:9000';
+import { getEnvOptions } from '@constructive-io/graphql-env';
 (async () => {
     try {
+        const opts = getEnvOptions();
+        const { cdn } = opts;
+        const bucket = cdn?.bucketName || 'test-bucket';
+        const region = cdn?.awsRegion || 'us-east-1';
+        const accessKey = cdn?.awsAccessKey || 'minioadmin';
+        const secretKey = cdn?.awsSecretKey || 'minioadmin';
+        const endpoint = cdn?.minioEndpoint || 'http://localhost:9000';
         const client = new S3Client({
-            region: REGION,
-            credentials: { accessKeyId: ACCESS_KEY, secretAccessKey: SECRET_KEY },
-            endpoint: ENDPOINT,
+            region,
+            credentials: { accessKeyId: accessKey, secretAccessKey: secretKey },
+            endpoint,
             forcePathStyle: true,
         });
         // Hint downstream to apply MinIO policies
         process.env.IS_MINIO = 'true';
-        const res = await createS3Bucket(client, BUCKET);
-        console.log(`[create-bucket] ${BUCKET}:`, res);
+        const res = await createS3Bucket(client, bucket);
+        console.log(`[create-bucket] ${bucket}:`, res);
         client.destroy();
     }
     catch (e) {

package/esm/server.js

@@ -1,4 +1,3 @@
-import 'dotenv/config';
 import { getEnvOptions } from '@constructive-io/graphql-env';
 import { Logger } from '@pgpmjs/logger';
 import { healthz, poweredBy, trustProxy } from '@pgpmjs/server-utils';
@@ -53,7 +52,16 @@ class Server {
     }
     listen() {
         const { server } = this.opts;
-        this.app.listen(server?.port, server?.host, () => log.info(`listening at http://${server?.host}:${server?.port}`));
+        const httpServer = this.app.listen(server?.port, server?.host, () => log.info(`listening at http://${server?.host}:${server?.port}`));
+        httpServer.on('error', (err) => {
+            if (err.code === 'EADDRINUSE') {
+                this.error(`Port ${server?.port ?? 'unknown'} is already in use`, err);
+            }
+            else {
+                this.error('Server failed to start', err);
+            }
+            throw err;
+        });
     }
     async flush(databaseId) {
         await flushService(this.opts, databaseId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructive-io/graphql-server",
-  "version": "2.10.10",
+  "version": "2.10.12",
   "author": "Constructive <developers@constructive.io>",
   "description": "Constructive GraphQL Server",
   "main": "index.js",
@@ -39,7 +39,7 @@
     "backend"
   ],
   "dependencies": {
-    "@constructive-io/graphql-env": "^2.8.7",
+    "@constructive-io/graphql-env": "^2.8.8",
     "@constructive-io/graphql-types": "^2.12.6",
     "@constructive-io/s3-utils": "^2.3.6",
     "@constructive-io/upload-names": "^2.3.4",
@@ -49,19 +49,18 @@
     "@pgpmjs/server-utils": "^2.8.8",
     "@pgpmjs/types": "^2.12.6",
     "cors": "^2.8.5",
-    "dotenv": "^17.2.3",
     "express": "^5.1.0",
     "graphile-build": "^4.14.1",
     "graphile-cache": "^1.6.8",
-    "graphile-i18n": "^0.2.15",
-    "graphile-meta-schema": "^0.3.15",
-    "graphile-plugin-connection-filter": "^2.4.15",
-    "graphile-plugin-connection-filter-postgis": "^1.1.15",
-    "graphile-plugin-fulltext-filter": "^2.1.15",
+    "graphile-i18n": "^0.2.17",
+    "graphile-meta-schema": "^0.3.17",
+    "graphile-plugin-connection-filter": "^2.4.17",
+    "graphile-plugin-connection-filter-postgis": "^1.1.17",
+    "graphile-plugin-fulltext-filter": "^2.1.17",
     "graphile-query": "^2.4.6",
-    "graphile-search-plugin": "^0.2.15",
-    "graphile-settings": "^2.9.10",
-    "graphile-simple-inflector": "^0.2.15",
+    "graphile-search-plugin": "^0.2.17",
+    "graphile-settings": "^2.9.12",
+    "graphile-simple-inflector": "^0.2.17",
     "graphile-utils": "^4.14.1",
     "graphql": "15.10.1",
     "graphql-tag": "2.12.6",
@@ -84,5 +83,5 @@
     "nodemon": "^3.1.10",
     "ts-node": "^10.9.2"
   },
-  "gitHead": "248d4056d3191b71bcab5892ef98b09164de9f7f"
+  "gitHead": "9a4f31663554bed9c6cc785a3eb283d0a5d27620"
 }

package/run.js

@@ -3,8 +3,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const graphql_env_1 = require("@constructive-io/graphql-env");
 const server_1 = require("./server");
-(0, server_1.GraphQLServer)((0, graphql_env_1.getEnvOptions)({
-    pg: {
-        database: process.env.PGDATABASE,
-    },
-}));
+(0, server_1.GraphQLServer)((0, graphql_env_1.getEnvOptions)());

package/scripts/create-bucket.d.ts

@@ -1 +1 @@
-import 'dotenv/config';
+export {};

package/scripts/create-bucket.js

@@ -2,29 +2,28 @@
 // Minimal script to create a bucket in MinIO using @constructive-io/s3-utils
 // Avoid strict type coupling between different @aws-sdk/client-s3 versions
 Object.defineProperty(exports, "__esModule", { value: true });
-// Loads graphql/server/.env by default when running via ts-node from this workspace
-require("dotenv/config");
 const client_s3_1 = require("@aws-sdk/client-s3");
 const s3_utils_1 = require("@constructive-io/s3-utils");
-const BUCKET = process.env.BUCKET_NAME || 'test-bucket';
-const REGION = process.env.AWS_REGION || 'us-east-1';
-const ACCESS_KEY = process.env.AWS_ACCESS_KEY || process.env.AWS_ACCESS_KEY_ID || 'minioadmin';
-const SECRET_KEY = process.env.AWS_SECRET_KEY ||
-    process.env.AWS_SECRET_ACCESS_KEY ||
-    'minioadmin';
-const ENDPOINT = process.env.MINIO_ENDPOINT || 'http://localhost:9000';
+const graphql_env_1 = require("@constructive-io/graphql-env");
 (async () => {
     try {
+        const opts = (0, graphql_env_1.getEnvOptions)();
+        const { cdn } = opts;
+        const bucket = cdn?.bucketName || 'test-bucket';
+        const region = cdn?.awsRegion || 'us-east-1';
+        const accessKey = cdn?.awsAccessKey || 'minioadmin';
+        const secretKey = cdn?.awsSecretKey || 'minioadmin';
+        const endpoint = cdn?.minioEndpoint || 'http://localhost:9000';
         const client = new client_s3_1.S3Client({
-            region: REGION,
-            credentials: { accessKeyId: ACCESS_KEY, secretAccessKey: SECRET_KEY },
-            endpoint: ENDPOINT,
+            region,
+            credentials: { accessKeyId: accessKey, secretAccessKey: secretKey },
+            endpoint,
             forcePathStyle: true,
         });
         // Hint downstream to apply MinIO policies
         process.env.IS_MINIO = 'true';
-        const res = await (0, s3_utils_1.createS3Bucket)(client, BUCKET);
-        console.log(`[create-bucket] ${BUCKET}:`, res);
+        const res = await (0, s3_utils_1.createS3Bucket)(client, bucket);
+        console.log(`[create-bucket] ${bucket}:`, res);
         client.destroy();
     }
     catch (e) {

package/server.d.ts

@@ -1,4 +1,3 @@
-import 'dotenv/config';
 import { PgpmOptions } from '@pgpmjs/types';
 import { Pool, PoolClient } from 'pg';
 export declare const GraphQLServer: (rawOpts?: PgpmOptions) => void;

package/server.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Server = exports.GraphQLServer = void 0;
-require("dotenv/config");
 const graphql_env_1 = require("@constructive-io/graphql-env");
 const logger_1 = require("@pgpmjs/logger");
 const server_utils_1 = require("@pgpmjs/server-utils");
@@ -60,7 +59,16 @@ class Server {
     }
     listen() {
         const { server } = this.opts;
-        this.app.listen(server?.port, server?.host, () => log.info(`listening at http://${server?.host}:${server?.port}`));
+        const httpServer = this.app.listen(server?.port, server?.host, () => log.info(`listening at http://${server?.host}:${server?.port}`));
+        httpServer.on('error', (err) => {
+            if (err.code === 'EADDRINUSE') {
+                this.error(`Port ${server?.port ?? 'unknown'} is already in use`, err);
+            }
+            else {
+                this.error('Server failed to start', err);
+            }
+            throw err;
+        });
     }
     async flush(databaseId) {
         await (0, flush_1.flushService)(this.opts, databaseId);