@mondomob/gae-node-nestjs 11.0.2-alpha2 → 12.0.0-alpha-1

package/.claude/settings.local.json

@@ -0,0 +1,7 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(npm ls:*)"
+    ]
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mondomob/gae-node-nestjs",
-  "version": "11.0.2-alpha2",
+  "version": "12.0.0-alpha-1",
   "description": "Google App Engine datastore repositories and graphql setup with nestjs",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -23,10 +23,10 @@
   "license": "MIT",
   "homepage": "https://github.com/mondo-mob/gae-node-nestjs",
   "dependencies": {
-    "@apollo/server": "4.9.3",
-    "@google-cloud/datastore": "9.1.0",
+    "@apollo/server": "4.13.0",
+    "@google-cloud/datastore": "9.2.1",
     "@google-cloud/logging-bunyan": "5.1.0",
-    "@google-cloud/storage": "7.12.1",
+    "@google-cloud/storage": "7.19.0",
     "@google-cloud/tasks": "4.1.0",
     "@google-cloud/trace-agent": "7.1.2",
     "@node-saml/passport-saml": "5.1.0",
@@ -62,18 +62,18 @@
     "webpack": "5.94.0"
   },
   "peerDependencies": {
-    "@nestjs/common": "^10.4.20",
-    "@nestjs/core": "^10.4.20",
+    "@nestjs/common": "^10.4.18",
+    "@nestjs/core": "^10.4.18",
     "@nestjs/graphql": "^12.2.2",
-    "@nestjs/platform-express": "^10.4.20",
-    "express": ">= 4.21.0",
+    "@nestjs/platform-express": "^10.4.18",
+    "express": ">= 4.22.0",
     "rxjs": "7.8.1"
   },
   "devDependencies": {
-    "@nestjs/common": "10.4.20",
-    "@nestjs/core": "10.4.20",
+    "@nestjs/common": "10.4.22",
+    "@nestjs/core": "10.4.22",
     "@nestjs/graphql": "12.2.2",
-    "@nestjs/platform-express": "10.4.20",
+    "@nestjs/platform-express": "10.4.22",
     "@types/bcryptjs": "2.4.6",
     "@types/bunyan": "1.8.11",
     "@types/cls-hooked": "4.3.8",
@@ -90,7 +90,7 @@
     "@types/passport-local": "1.0.38",
     "@types/uuid": "8.3.4",
     "chokidar": "3.6.0",
-    "express": "4.21.2",
+    "express": "4.22.1",
     "jest": "29.7.0",
     "prettier": "2.8.8",
     "rxjs": "7.8.1",

package/server-start.js

@@ -21,6 +21,7 @@ const componentColors = {
   server: colors.blue,
   webpack: colors.magenta,
   datastore: colors.cyan,
+  dsui: colors.green,
 };
 
 class BunyanStream {
@@ -45,15 +46,17 @@ const { buildEvents, stopWebpack } = setupWebpack(logger);
 const { stopServer, startServer } = setupServer(logger, loggingStream, buildEvents);
 
 const { stopDatastore, startDatastore } = setupDatastore(logger, buildEvents);
+const { startDsui, stopDsui } = setupDsui(logger);
 
 buildEvents.once('reload', startServer);
 startDatastore();
+startDsui();
 
 // Handle process stop
 process.on('SIGINT', async function () {
   logger.info('Caught interrupt signal');
 
-  await Promise.all([stopWebpack(), stopDatastore(), stopServer()]);
+  await Promise.all([stopWebpack(), stopDatastore(), stopDsui(), stopServer()]);
 
   logger.info('Shutting down');
   process.exit();
@@ -229,6 +232,74 @@ function setupServer(logger, loggingStream, buildEvents) {
   };
 }
 
+function setupDsui(logger) {
+  const dsuiLogger = logger.child({ component: 'dsui' });
+  let dsui;
+  const startDsui = () => {
+    // poll the status URL until the datastore emulator is ready
+    dsuiLogger.info('Waiting for Datastore emulator to start');
+    const timeout = setInterval(() => {
+      let body = '';
+      http.get(
+        {
+          hostname: '127.0.0.1',
+          port: DATASTORE_PORT,
+          path: '/',
+          agent: false,
+        },
+        res => {
+          res.on('data', data => {
+            body += data;
+          });
+          res.on('end', () => {
+            if (res.statusCode == 200) {
+              dsuiLogger.info('Datastore emulator is ready, starting DSUI');
+              clearInterval(timeout);
+              const gcloud = spawn('gcloud', ['beta', 'emulators', 'datastore', 'env-init', '--format=json']);
+              gcloud.stdout.on('data', data => {
+                const datastoreConfig = JSON.parse(data);
+                _.forEach(datastoreConfig, (value, key) => {
+                  process.env[key] = value;
+                });
+              });
+
+              gcloud.once('close', () => {
+                dsui = spawn('npm', ['run', 'dsui']);
+                dsui.stdout.on('data', dsuiData => {
+                  const string = dsuiData.toString('utf8');
+                  dsuiLogger.info(string);
+                });
+
+                dsui.stderr.on('data', dsuiData => {
+                  const string = dsuiData.toString('utf8');
+                  dsuiLogger.error(string);
+                });
+              });
+            }
+          });
+        },
+      );
+    }, 2000);
+  };
+
+  const stopDsui = () => {
+    return new Promise(resolve => {
+      if (dsui) {
+        dsuiLogger.info('Killing DSUI');
+        dsui.kill('SIGINT');
+        dsui.once('close', () => {
+          logger.info('DSUI successfully shutdown');
+          resolve();
+        });
+      } else {
+        resolve();
+      }
+    });
+  };
+
+  return { startDsui, stopDsui };
+}
+
 function setupDatastore(logger, buildEvents) {
   const datastoreLogger = logger.child({
     component: 'datastore',