lib.ts: Fix prompt for interactive tty

Author: theCalcaholic

cli/lib.ts

@@ -1,9 +1,11 @@
 // SPDX-FileCopyrightText: Tobias Knöppler <[email protected]>
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
-import readline from 'node:readline'
+//import readline from 'node:readline'
 import process from 'process'
 
+// readline breaks in noninteractive environments, so we're building our own prompt function
+//
 // const rl = readline.createInterface({
 // 	input: process.stdin,
 // 	output: process.stdout,
@@ -24,17 +26,31 @@ import process from 'process'
 // 	}
 // )
 
+let promptBuf = ""
+
 export async function prompt(query: string){
 
 	process.stderr.write(query)
 
-	let data = ""
+	let inputs = promptBuf.split(/\r?\n/)
+	if (inputs.length > 1) {
+		let data = inputs.shift() as string;
+		promptBuf = inputs.join("\n")
+		return data
+	}
+
+	let data = promptBuf
 	for await (const chunk of process.stdin) {
+		let inputs = ("" + chunk).split(/\r?\n/)
+		if (inputs.length > 1) {
+			data += inputs.shift() as string
+			promptBuf = inputs.join("\n")
+			break;
+		}
 		data += chunk;
 	}
 
-
 	// process all the data and write it back to stdout
 
-	return data.replace(/\n$/, "")
+	return data.replace(/\r?\n$/, "")
 }

cli/secrets.ts

@@ -11,6 +11,7 @@ import { CommandExecutionError } from './CommandExecutionError.ts'
 import { prompt } from './lib.ts'
 import process from "process";
 import * as url from "node:url";
+import * as https from "node:https";
 
 const btoa = (str: string) => Buffer.from(str, 'binary').toString('base64')
 const atob = (str: string) => Buffer.from(str, 'base64').toString('binary')
@@ -91,7 +92,7 @@ export async function createSecret(ncUrl: string, ncUser: string, secretFile: st
 
 	const result = await new Promise<string>((resolve, reject) => {
 
-		const req = http.request(
+		const req = http_client(ncUrl).request(
 			`${ncUrl}/ocs/v2.php/apps/secrets/api/v1/secrets?format=json`,
 			rOptions,
 			(response) => {
@@ -201,7 +202,7 @@ export async function retrieveSecret(shareUrlStr: string, options: {
 	}
 
 	const result = await new Promise<string>((resolve, reject) => {
-		const req = http.request(
+		const req = http_client(shareUrlStr).request(
 			`${baseUrl}/ocs/v2.php/apps/secrets/api/v1/share?format=json`,
 			reqOptions,
 			(response) => {
@@ -238,13 +239,23 @@ export async function retrieveSecret(shareUrlStr: string, options: {
 
 }
 
+function http_client(url: string): any {
+
+	let http_client = http
+	if (url.startsWith("https:")) {
+		http_client = https
+	}
+
+	return http_client
+}
+
 /**
  * @param ncUrl
  */
 async function getApiInfo(ncUrl: string): Promise<string> {
 
 	const result = await new Promise<string>((resolve, reject) => {
-		const req = http.request(`${ncUrl}/ocs/v2.php/apps/secrets/version?format=json`,
+		const req = http_client(ncUrl).request(`${ncUrl}/ocs/v2.php/apps/secrets/version?format=json`,
 			{
 				method: 'GET',
 				headers: {