@metaplay/metaplay-auth 1.4.1 → 1.5.0

package/src/utils.ts

@@ -1,8 +1,5 @@
 import { spawn } from 'child_process'
-
-export function stackApiBaseFromOptions (arg: string, options: Record<string, any>): string {
-  return ''
-}
+import path from 'path'
 
 /**
  * Checks if the given string is a fully qualified domain name (FQDN).
@@ -49,15 +46,27 @@ export function getGameserverAdminUrl (uri: string): string {
   return `${hostname}-admin.${domain}`
 }
 
-interface CommandResult {
-  code: number | null
+export interface ExecuteCommandResult {
+  exitCode: number | null
   stdout: any[]
   stderr: any[]
 }
 
-export async function executeCommand (command: string, args: string[]): Promise<CommandResult> {
+/**
+ * Run a child process and return an awaitable Promise.
+ *
+ * @param command Name of the command/binary to execute.
+ * @param args List of arugments to pass to the child process.
+ * @param inheritStdio Should the stdin/stdout/stderr be inherited from the parent process? If false, the outputs are buffered for reading later.
+ * @param env Environment variables to pass in. Does not inherit parent process env. Use current process env if not specified.
+ * @returns Awaitable promise with the result of the execution.
+ */
+export async function executeCommand (command: string, args: string[], inheritStdio: boolean, env?: NodeJS.ProcessEnv): Promise<ExecuteCommandResult> {
   return await new Promise((resolve, reject) => {
-    const childProcess = spawn(command, args) //, { stdio: 'inherit' }) -- this pipes stdout & stderr to our output
+    const childProcess = spawn(command, args, {
+      stdio: inheritStdio ? 'inherit' : undefined,
+      env,
+    })
     let stdout: any[] = []
     let stderr: any[] = []
 
@@ -71,7 +80,7 @@ export async function executeCommand (command: string, args: string[]): Promise<
 
     // If program runs to completion, resolve promise with success
     childProcess.on('close', (code) => {
-      resolve({ code, stdout, stderr })
+      resolve({ exitCode: code, stdout, stderr })
     })
 
     childProcess.on('error', (err) => {
@@ -83,3 +92,34 @@ export async function executeCommand (command: string, args: string[]): Promise<
     })
   })
 }
+
+export function isRunningUnderNpx () {
+  // console.log('process.argv:', process.argv)
+  const matchBinary = (binaryPath: string, binaryName: string): boolean => {
+    const binary = path.basename(binaryPath, path.extname(binaryPath)) // drop path and extension
+    return binary === binaryName
+  }
+
+  // Check if 'npx' is the invoked binary (this check is not sufficient as it can also be 'node')
+  if (matchBinary(process.argv[0], 'npx')) {
+    return true
+  }
+
+  // Check if the script path contains a known npx temporary directory pattern
+  const scriptPath = process.argv[1]
+  if (scriptPath?.includes(`${path.sep}_npx${path.sep}`)) {
+    return true
+  }
+
+  // Check if the environment variable 'npm_execpath' is exactly 'npx'
+  if (process.env.npm_execpath && matchBinary(process.env.npm_execpath, 'npx')) {
+    return true
+  }
+
+  // Check if the environment variable '_' ends with 'npx' (specific to npx usage)
+  if (process.env._ && matchBinary(process.env._, 'npx')) {
+    return true
+  }
+
+  return false
+}

package/src/version.ts

@@ -0,0 +1 @@
+export const PACKAGE_VERSION = '1.5.0'