publish-microfrontend 1.7.2 → 1.7.3-beta.7564

package/lib/index.js

@@ -29772,8 +29772,16 @@ function getMessage(body) {
   }
   return "";
 }
-async function downloadFile(url2, ca) {
-  const httpsAgent = ca ? new import_https2.Agent({ ca }) : void 0;
+function getAgent({ allowSelfSigned, ca }) {
+  if (ca) {
+    return new import_https2.Agent({ ca });
+  } else if (allowSelfSigned) {
+    return new import_https2.Agent({ rejectUnauthorized: false });
+  } else {
+    return void 0;
+  }
+}
+async function downloadFile(url2, httpsAgent) {
   try {
     const res = await axios_default.get(url2, {
       responseType: "stream",
@@ -29787,8 +29795,7 @@ async function downloadFile(url2, ca) {
     return [];
   }
 }
-function postForm(target, scheme, key, formData, customHeaders = {}, ca, interactive = false) {
-  const httpsAgent = ca ? new import_https2.Agent({ ca }) : void 0;
+function postForm(target, scheme, key, formData, customHeaders = {}, httpsAgent, interactive = false) {
   const form = new import_form_data2.default();
   Object.keys(formData).forEach((key2) => {
     const value = formData[key2];
@@ -29837,7 +29844,7 @@ function postForm(target, scheme, key, formData, customHeaders = {}, ca, interac
       if (interactive && "interactiveAuth" in data) {
         const { interactiveAuth } = data;
         if (typeof interactiveAuth === "string") {
-          return getTokenInteractively(interactiveAuth, httpsAgent).then(({ mode, token }) => postForm(target, mode, token, formData, customHeaders, ca, false));
+          return getTokenInteractively(interactiveAuth, httpsAgent).then(({ mode, token }) => postForm(target, mode, token, formData, customHeaders, httpsAgent, false));
         }
       }
       const message = getMessage(data) || "";
@@ -29871,9 +29878,9 @@ function postForm(target, scheme, key, formData, customHeaders = {}, ca, interac
     };
   });
 }
-function postFile(target, scheme, key, file, customFields = {}, customHeaders = {}, ca, interactive = false) {
+function postFile(target, scheme, key, file, customFields = {}, customHeaders = {}, agent, interactive = false) {
   const data = { ...customFields, file: [file, "microfrontend.tgz"] };
-  return postForm(target, scheme, key, data, customHeaders, ca, interactive);
+  return postForm(target, scheme, key, data, customHeaders, agent, interactive);
 }
 
 // src/scripts.ts
@@ -29991,7 +29998,7 @@ async function getCa(cert) {
   }
   return void 0;
 }
-async function getFiles(baseDir, sources, from, ca) {
+async function getFiles(baseDir, sources, from, agent) {
   switch (from) {
     case "local": {
       const allFiles = await Promise.all(sources.map((s) => matchFiles(baseDir, s)));
@@ -30025,12 +30032,12 @@ async function getFiles(baseDir, sources, from, ca) {
       return allMatches.filter(isFile2);
     }
     case "remote": {
-      const allFiles = await Promise.all(sources.map((s) => downloadFile(s, ca)));
+      const allFiles = await Promise.all(sources.map((s) => downloadFile(s, agent)));
       return allFiles.reduce((result, files) => [...result, ...files], []);
     }
     case "npm": {
       const allUrls = await Promise.all(sources.map((s) => findTarball(s)));
-      const allFiles = await Promise.all(allUrls.map((url2) => downloadFile(url2, ca)));
+      const allFiles = await Promise.all(allUrls.map((url2) => downloadFile(url2, agent)));
       return allFiles.reduce((result, files) => [...result, ...files], []);
     }
   }
@@ -30042,18 +30049,20 @@ var defaultArgs = (0, import_rc.default)("microfrontend", {
   url: void 0,
   apiKey: void 0,
   cert: void 0,
+  allowSelfSigned: false,
   mode: "basic",
   from: "local",
   fields: {},
   headers: {},
   interactive: false
 });
-var args = yargs.string("source").describe("source", "Sets the source of either the previously packed *.tgz bundle or the directory to publish.").default("source", current).string("url").describe("url", "Sets the explicit URL where to publish the micro frontend to.").default("url", defaultArgs.url).string("api-key").describe("api-key", "Sets the potential API key to send to the service.").default("api-key", defaultArgs.apiKey).string("cert").describe("cert", "Sets a custom certificate authority to use, if any.").default("cert", defaultArgs.cert).choices("mode", publishModeKeys).describe("mode", "Sets the authorization mode to use.").default("mode", defaultArgs.mode).alias("mode", "auth-mode").choices("from", fromKeys).describe("from", "Sets the type of the source to use for publishing.").default("from", defaultArgs.from).option("fields", void 0).describe("fields", "Sets additional fields to be included in the feed service request.").default("fields", defaultArgs.fields).option("headers", void 0).describe("headers", "Sets additional headers to be included in the feed service request.").default("headers", defaultArgs.headers).boolean("interactive").describe("interactive", "Defines if authorization tokens can be retrieved interactively.").default("interactive", defaultArgs.interactive).argv;
+var args = yargs.string("source").describe("source", "Sets the source of either the previously packed *.tgz bundle or the directory to publish.").default("source", current).string("url").describe("url", "Sets the explicit URL where to publish the micro frontend to.").default("url", defaultArgs.url).string("api-key").describe("api-key", "Sets the potential API key to send to the service.").default("api-key", defaultArgs.apiKey).string("cert").describe("cert", "Sets a custom certificate authority to use, if any.").default("cert", defaultArgs.cert).boolean("allow-self-signed").describe("allow-self-signed", "Indicates that self-signed certificates should be allowed.").default("allow-self-signed", defaultArgs.allowSelfSigned).choices("mode", publishModeKeys).describe("mode", "Sets the authorization mode to use.").default("mode", defaultArgs.mode).alias("mode", "auth-mode").choices("from", fromKeys).describe("from", "Sets the type of the source to use for publishing.").default("from", defaultArgs.from).option("fields", void 0).describe("fields", "Sets additional fields to be included in the feed service request.").default("fields", defaultArgs.fields).option("headers", void 0).describe("headers", "Sets additional headers to be included in the feed service request.").default("headers", defaultArgs.headers).boolean("interactive").describe("interactive", "Defines if authorization tokens can be retrieved interactively.").default("interactive", defaultArgs.interactive).argv;
 async function run() {
-  const { cert, source, from, url: url2, "api-key": apiKey, headers, fields, interactive, mode } = args;
+  const { cert, source, from, url: url2, "api-key": apiKey, "allow-self-signed": allowSelfSigned, headers, fields, interactive, mode } = args;
   const sources = Array.isArray(source) ? source : [source];
   const ca = await getCa(cert);
-  const files = await getFiles(current, sources, from, ca);
+  const agent = getAgent({ ca, allowSelfSigned });
+  const files = await getFiles(current, sources, from, agent);
   const successfulUploads = [];
   if (files.length === 0) {
     fail("No micro frontends for publishing found: %s.", sources.join(", "));
@@ -30063,7 +30072,7 @@ async function run() {
     const content = await (0, import_promises2.readFile)(file);
     if (content) {
       progress(`Publishing "%s" ...`, file, url2);
-      const { success, status, response } = await postFile(url2, mode, apiKey, content, fields, headers, ca, interactive);
+      const { success, status, response } = await postFile(url2, mode, apiKey, content, fields, headers, agent, interactive);
       const result = typeof response !== "string" ? JSON.stringify(response, void 0, 2) : response;
       if (success) {
         successfulUploads.push(file);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "publish-microfrontend",
-  "version": "1.7.2",
+  "version": "1.7.3-beta.7564",
   "description": "A CLI for publishing micro frontends to a feed service.",
   "keywords": [
     "modules",
@@ -69,5 +69,5 @@
     "typescript": "^5.0.0",
     "yargs": "^15.0.0"
   },
-  "gitHead": "79c505aaf4c6be1d279c1f554ab60321f9f5ef68"
+  "gitHead": "936744c565691e81a9e3ce914803c42ba369879c"
 }

package/src/http.ts

@@ -34,10 +34,22 @@ export interface PostFormResult {
 
 export type FormDataObj = Record<string, string | [Buffer, string]>;
 
+export interface AgentOptions {
+  ca?: Buffer;
+  allowSelfSigned?: boolean;
+}
 
-export async function downloadFile(url: string, ca?: Buffer): Promise<Array<string>> {
-  const httpsAgent = ca ? new Agent({ ca }) : undefined;
+export function getAgent({ allowSelfSigned, ca }: AgentOptions) {
+  if (ca) {
+    return new Agent({ ca });
+  } else if (allowSelfSigned) {
+    return new Agent({ rejectUnauthorized: false });
+  } else {
+    return undefined;
+  }
+}
 
+export async function downloadFile(url: string, httpsAgent?: Agent): Promise<Array<string>> {
   try {
     const res = await axios.get<Stream>(url, {
       responseType: 'stream',
@@ -58,10 +70,9 @@ export function postForm(
   key: string,
   formData: FormDataObj,
   customHeaders: Record<string, string> = {},
-  ca?: Buffer,
+  httpsAgent?: Agent,
   interactive = false,
 ): Promise<PostFormResult> {
-  const httpsAgent = ca ? new Agent({ ca }) : undefined;
   const form = new FormData();
 
   Object.keys(formData).forEach((key) => {
@@ -124,7 +135,7 @@ export function postForm(
 
             if (typeof interactiveAuth === 'string') {
               return getTokenInteractively(interactiveAuth, httpsAgent).then(({ mode, token }) =>
-                postForm(target, mode, token, formData, customHeaders, ca, false),
+                postForm(target, mode, token, formData, customHeaders, httpsAgent, false),
               );
             }
           }
@@ -173,9 +184,9 @@ export function postFile(
   file: Buffer,
   customFields: Record<string, string> = {},
   customHeaders: Record<string, string> = {},
-  ca?: Buffer,
+  agent?: Agent,
   interactive = false,
 ): Promise<PostFormResult> {
   const data: FormDataObj = { ...customFields, file: [file, 'microfrontend.tgz'] };
-  return postForm(target, scheme, key, data, customHeaders, ca, interactive);
+  return postForm(target, scheme, key, data, customHeaders, agent, interactive);
 }

package/src/index.ts

@@ -7,13 +7,14 @@ import { basename } from 'path';
 import { readFile } from 'fs/promises';
 import { progress, fail, logDone, logFail, logInfo } from './log';
 import { getCa, getFiles } from './utils';
-import { postFile } from './http';
+import { getAgent, postFile } from './http';
 
 const current = process.cwd();
 const defaultArgs = rc('microfrontend', {
   url: undefined,
   apiKey: undefined,
   cert: undefined,
+  allowSelfSigned: false,
   mode: 'basic',
   from: 'local',
   fields: {},
@@ -34,6 +35,9 @@ const args = yargs
   .string('cert')
   .describe('cert', 'Sets a custom certificate authority to use, if any.')
   .default('cert', defaultArgs.cert)
+  .boolean('allow-self-signed')
+  .describe('allow-self-signed', 'Indicates that self-signed certificates should be allowed.')
+  .default('allow-self-signed', defaultArgs.allowSelfSigned)
   .choices('mode', publishModeKeys)
   .describe('mode', 'Sets the authorization mode to use.')
   .default('mode', defaultArgs.mode)
@@ -52,10 +56,11 @@ const args = yargs
   .default('interactive', defaultArgs.interactive).argv;
 
 async function run() {
-  const { cert, source, from, url, 'api-key': apiKey, headers, fields, interactive, mode } = args;
+  const { cert, source, from, url, 'api-key': apiKey, 'allow-self-signed': allowSelfSigned, headers, fields, interactive, mode } = args;
   const sources = Array.isArray(source) ? source : [source];
   const ca = await getCa(cert);
-  const files = await getFiles(current, sources, from, ca);
+  const agent = getAgent({ ca, allowSelfSigned });
+  const files = await getFiles(current, sources, from, agent);
   const successfulUploads: Array<string> = [];
 
   if (files.length === 0) {
@@ -76,7 +81,7 @@ async function run() {
         content,
         fields,
         headers,
-        ca,
+        agent,
         interactive,
       );
 

package/src/utils.ts

@@ -1,4 +1,5 @@
 import glob from 'glob';
+import { Agent } from 'https';
 import { existsSync, statSync } from 'fs';
 import { stat, readFile, readdir, copyFile, rm } from 'fs/promises';
 import { dirname, basename, resolve } from 'path';
@@ -83,7 +84,7 @@ export async function getFiles(
   baseDir: string,
   sources: Array<string>,
   from: string,
-  ca: Buffer,
+  agent: Agent,
 ): Promise<Array<string>> {
   switch (from) {
     case 'local': {
@@ -127,12 +128,12 @@ export async function getFiles(
       return allMatches.filter(isFile);
     }
     case 'remote': {
-      const allFiles = await Promise.all(sources.map((s) => downloadFile(s, ca)));
+      const allFiles = await Promise.all(sources.map((s) => downloadFile(s, agent)));
       return allFiles.reduce((result, files) => [...result, ...files], []);
     }
     case 'npm': {
       const allUrls = await Promise.all(sources.map((s) => findTarball(s)));
-      const allFiles = await Promise.all(allUrls.map((url) => downloadFile(url, ca)));
+      const allFiles = await Promise.all(allUrls.map((url) => downloadFile(url, agent)));
       return allFiles.reduce((result, files) => [...result, ...files], []);
     }
   }