@verentis/cli 0.2.7 → 0.2.9

package/dist/index.js

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
 import { Command } from 'commander';
 import { mkdir, stat, writeFile, readFile, readdir, realpath, mkdtemp, rm, glob } from 'fs/promises';
-import { Agent } from 'https';
 import { tmpdir, homedir } from 'os';
 import { resolve, basename, dirname, posix, join, isAbsolute, extname, relative, sep } from 'path';
 import { spawn, spawnSync } from 'child_process';
@@ -13,9 +12,11 @@ import { pipeline } from 'stream/promises';
 import * as tar from 'tar';
 import { fileURLToPath } from 'url';
 
-var insecureAgent = new Agent({ rejectUnauthorized: false });
 function insecureFetchOptions(insecure) {
-  return insecure ? { dispatcher: insecureAgent } : {};
+  if (insecure) {
+    process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
+  }
+  return {};
 }
 var configDir = () => process.env.VERENTIS_CONFIG_DIR ?? join(homedir(), ".verentis");
 var configPath = () => join(configDir(), "config.json");
@@ -246,15 +247,16 @@ ${truncate(text)}` : ""}`);
     }
     const headers = { Authorization: `Bearer ${token}` };
     let body;
+    const isFormData = options.rawBody instanceof FormData;
     if (options.rawBody !== void 0) {
       body = options.rawBody;
-      headers["Content-Type"] = options.contentType ?? "application/octet-stream";
+      if (!isFormData) headers["Content-Type"] = options.contentType ?? "application/octet-stream";
     } else if (options.body !== void 0) {
       body = JSON.stringify(options.body);
       headers["Content-Type"] = "application/json";
     }
     for (const [key, value] of Object.entries(options.headers ?? {})) headers[key] = value;
-    const res = await fetch(url, { method, headers, body, ...insecureFetchOptions(insecure), ...options.rawBody !== void 0 ? { duplex: "half" } : {} });
+    const res = await fetch(url, { method, headers, body, ...insecureFetchOptions(insecure), ...options.rawBody !== void 0 && !isFormData ? { duplex: "half" } : {} });
     if (!res.ok) {
       const text = await res.text().catch(() => "");
       throw new ApiError(res.status, `${method} ${path} failed (${res.status}). ${hintFor(res.status)}${formatErrorBody(text)}`);
@@ -1546,15 +1548,15 @@ var normalizeRemote = (path) => {
   return trimmed;
 };
 async function uploadWithHeaders(api, workspaceId, remotePath, localPath, options) {
-  const stream = Readable.toWeb(createReadStream(localPath));
+  const buffer = await readFile(localPath);
+  const form = new FormData();
+  form.append("file", new Blob([buffer], { type: options.contentType ?? "application/octet-stream" }), basename(localPath));
+  form.append("metadata", JSON.stringify({ branch: options.branch, contentType: options.contentType }));
   const res = await api.requestRaw("POST", fillPath(files.upload.path, { path: normalizeRemote(remotePath) }), {
     scopes: [...files.upload.scopes],
     tokenWorkspaceId: workspaceId,
-    rawBody: stream,
-    contentType: options.contentType ?? "application/octet-stream",
+    rawBody: form,
     headers: {
-      "X-Branch": options.branch,
-      "Content-Disposition": `attachment; filename="${basename(localPath)}"`,
       ...options.autoExtract ? { "X-Auto-Extract": "true" } : {}
     }
   });