@nitwel/sandbox 1.0.4 → 1.0.6

package/dist/cli.js

@@ -16,8 +16,7 @@ program
     .option('--docker.suffix <suffix>', 'Adds a suffix to the docker project. Can be used to ensure uniqueness')
     .option('-e, --extras <extras>', 'Enable redis,maildev,saml or other extras')
     .option('--silent', 'Silence all logs except for errors')
-    .option('-i, --instances <instances>', 'Horizontally scale directus to a given number of instances', '1')
-    .option('--killPorts', 'Forcefully kills all processes that occupy ports that the api would use');
+    .option('-i, --instances <instances>', 'Horizontally scale directus to a given number of instances', '1');
 program.parse();
 const options = program.opts();
 const sb = await sandbox(program.args[0], {

package/dist/config.d.ts

@@ -33,6 +33,7 @@ declare const baseConfig: {
     readonly maria: {
         readonly TZ: "0" | "UTC";
         readonly ADMIN_EMAIL: "admin@example.com";
+        readonly PROJECT_OWNER: "admin@example.com";
         readonly ADMIN_PASSWORD: "pw";
         readonly ADMIN_TOKEN: "admin";
         readonly SECRET: "directus-test";
@@ -67,6 +68,7 @@ declare const baseConfig: {
     readonly postgres: {
         readonly TZ: "0" | "UTC";
         readonly ADMIN_EMAIL: "admin@example.com";
+        readonly PROJECT_OWNER: "admin@example.com";
         readonly ADMIN_PASSWORD: "pw";
         readonly ADMIN_TOKEN: "admin";
         readonly SECRET: "directus-test";
@@ -101,6 +103,7 @@ declare const baseConfig: {
     readonly sqlite: {
         readonly TZ: "0" | "UTC";
         readonly ADMIN_EMAIL: "admin@example.com";
+        readonly PROJECT_OWNER: "admin@example.com";
         readonly ADMIN_PASSWORD: "pw";
         readonly ADMIN_TOKEN: "admin";
         readonly SECRET: "directus-test";
@@ -130,6 +133,7 @@ declare const baseConfig: {
     readonly cockroachdb: {
         readonly TZ: "0" | "UTC";
         readonly ADMIN_EMAIL: "admin@example.com";
+        readonly PROJECT_OWNER: "admin@example.com";
         readonly ADMIN_PASSWORD: "pw";
         readonly ADMIN_TOKEN: "admin";
         readonly SECRET: "directus-test";
@@ -165,6 +169,7 @@ declare const baseConfig: {
     readonly mssql: {
         readonly TZ: "0" | "UTC";
         readonly ADMIN_EMAIL: "admin@example.com";
+        readonly PROJECT_OWNER: "admin@example.com";
         readonly ADMIN_PASSWORD: "pw";
         readonly ADMIN_TOKEN: "admin";
         readonly SECRET: "directus-test";
@@ -199,6 +204,7 @@ declare const baseConfig: {
     readonly mysql: {
         readonly TZ: "0" | "UTC";
         readonly ADMIN_EMAIL: "admin@example.com";
+        readonly PROJECT_OWNER: "admin@example.com";
         readonly ADMIN_PASSWORD: "pw";
         readonly ADMIN_TOKEN: "admin";
         readonly SECRET: "directus-test";
@@ -233,6 +239,7 @@ declare const baseConfig: {
     readonly oracle: {
         readonly TZ: "0" | "UTC";
         readonly ADMIN_EMAIL: "admin@example.com";
+        readonly PROJECT_OWNER: "admin@example.com";
         readonly ADMIN_PASSWORD: "pw";
         readonly ADMIN_TOKEN: "admin";
         readonly SECRET: "directus-test";

package/dist/config.js

@@ -4,6 +4,7 @@ const isWindows = ['win32', 'win64'].includes(process.platform);
 const directusConfig = {
     TZ: isWindows ? '0' : 'UTC',
     ADMIN_EMAIL: 'admin@example.com',
+    PROJECT_OWNER: 'admin@example.com',
     ADMIN_PASSWORD: 'pw',
     ADMIN_TOKEN: 'admin',
     SECRET: 'directus-test',

package/dist/sandbox.d.ts

@@ -40,8 +40,6 @@ export type Options = {
     schema: string | undefined;
     /** Start the api with debugger */
     inspect: boolean;
-    /** Forcefully kills all processes that occupy ports that the api would use */
-    killPorts: boolean;
     /** Enable redis,maildev,saml or other extras */
     extras: {
         /** Used for caching, forced to true if instances > 1 */

package/dist/sandbox.js

@@ -30,7 +30,6 @@ async function getOptions(options) {
         schema: undefined,
         silent: false,
         export: false,
-        killPorts: false,
         extras: {
             redis: false,
             maildev: false,

package/dist/steps/api.js

@@ -4,8 +4,7 @@ import {} from '../config.js';
 import {} from '../logger.js';
 import { apiFolder } from '../sandbox.js';
 import chalk from 'chalk';
-import { portToPid } from 'pid-port';
-import { createInterface } from 'readline/promises';
+import { detect } from 'detect-port';
 export async function buildDirectus(opts, logger, onRebuild) {
     const start = performance.now();
     logger.info('Rebuilding Directus');
@@ -71,33 +70,11 @@ export async function startDirectus(opts, env, logger) {
     const apiCount = Math.max(1, Number(opts.instances));
     const apiPorts = [...Array(apiCount).keys()].flatMap((i) => Number(env.PORT) + i * (opts.inspect ? 2 : 1));
     const allPorts = apiPorts.flatMap((port) => (opts.inspect ? [port, port + 1] : [port]));
-    const occupiedPorts = (await Promise.allSettled(allPorts.map((port) => portToPid(port))))
+    const occupiedPorts = (await Promise.allSettled(allPorts.map((port) => detect(port))))
         .map((result, i) => (result.status === 'fulfilled' ? [result.value, allPorts[i]] : undefined))
-        .filter((val) => val);
-    let killPorts;
-    for (const [pid, port] of occupiedPorts) {
-        logger.warn(`Port ${port} is occupied by pid ${pid}`);
-    }
-    if (opts.killPorts) {
-        killPorts = true;
-    }
-    else {
-        if (occupiedPorts.length > 0) {
-            const rl = createInterface({ input: process.stdin, output: process.stdout });
-            const result = (await rl.question('Would you like to kill all occupying processes? (Y/N) ')).toLowerCase();
-            killPorts = result === 'y' || result === 'yes';
-        }
-    }
-    if (killPorts) {
-        for (const [pid] of occupiedPorts) {
-            try {
-                process.kill(pid, 'SIGKILL');
-                logger.info(`Killed process ${pid}`);
-            }
-            catch (err) {
-                logger.error(`Failed to kill process ${pid}: ${err.message}`);
-            }
-        }
+        .filter((val) => val && val[0] !== val[1]);
+    for (const [port] of occupiedPorts) {
+        logger.warn(`Port ${port} is already occupied`);
     }
     return await Promise.all(apiPorts.map((port) => {
         const newLogger = apiCount > 1 ? logger.addGroup(`API ${port}`) : logger;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nitwel/sandbox",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Toolkit for spinning up directus test environments",
   "homepage": "https://directus.io",
   "exports": {
@@ -20,7 +20,7 @@
   "author": "Nils Twelker (nils@directus.io)",
   "license": "MIT",
   "private": false,
-  "devDependencies": {
+  "dependencies": {
     "@directus/tsconfig": "3.0.0",
     "@directus/utils": "13.0.9",
     "@types/lodash-es": "4.17.12",
@@ -28,9 +28,9 @@
     "chalk": "5.4.1",
     "commander": "14.0.0",
     "copyfiles": "2.4.1",
+    "detect-port": "2.1.0",
     "get-port": "7.1.0",
     "lodash-es": "4.17.21",
-    "pid-port": "1.0.2",
     "tsdown": "0.14.2",
     "tsx": "4.20.3",
     "typedoc": "0.28.12",