piral-cli 0.14.19-beta.3927 → 0.14.19-beta.3968

package/src/common/http.ts

@@ -5,6 +5,7 @@ import { platform, tmpdir } from 'os';
 import { createWriteStream } from 'fs';
 import { log } from './log';
 import { axios, FormData } from '../external';
+import { PiletPublishScheme } from '../types';
 
 const os = platform();
 const standardHeaders = {
@@ -67,25 +68,42 @@ export interface PostFileResult {
 
 export function postFile(
   target: string,
+  scheme: PiletPublishScheme,
   key: string,
   file: Buffer,
-  fields: Record<string, string> = {},
+  customFields: Record<string, string> = {},
+  customHeaders: Record<string, string> = {},
   ca?: Buffer,
 ): Promise<PostFileResult> {
   const form = new FormData();
   const httpsAgent = ca ? new Agent({ ca }) : undefined;
 
-  Object.keys(fields).forEach((key) => form.append(key, fields[key]));
+  Object.keys(customFields).forEach((key) => form.append(key, customFields[key]));
 
   form.append('file', file, 'pilet.tgz');
 
   const headers: Record<string, string> = {
     ...form.getHeaders(),
     ...standardHeaders,
+    ...customHeaders,
   };
 
   if (key) {
-    headers.authorization = `Basic ${key}`;
+    switch (scheme) {
+      case 'basic':
+        headers.authorization = `Basic ${key}`;
+        break;
+      case 'basic':
+        headers.authorization = `Bearer ${key}`;
+        break;
+      case 'digest':
+        headers.authorization = `Digest ${key}`;
+        break;
+      case 'none':
+      default:
+        headers.authorization = key;
+        break;
+    }
   }
 
   return axios.default

package/src/common/index.ts

@@ -19,6 +19,7 @@ export * from './merge';
 export * from './npm';
 export * from './pack';
 export * from './package';
+export * from './parallel';
 export * from './patcher';
 export * from './patches';
 export * from './port';

package/src/common/info.ts

@@ -1,3 +1,5 @@
+import { cpus } from 'os';
+
 const info = require('../../package.json');
 
 export function findCompatVersion(version: string) {
@@ -18,3 +20,4 @@ export const compatVersion = findCompatVersion(cliVersion);
 export const repositoryUrl = info.repository.url;
 export const isWindows = process.platform === 'win32';
 export const pathSeparator = isWindows ? ';' : ':';
+export const cpuCount = cpus().length;

package/src/common/parallel.test.ts

@@ -0,0 +1,28 @@
+import { concurrentWorkers } from './parallel';
+
+describe('Concurrent Workers', () => {
+  it('Can run against no entries', async () => {
+    const result = await concurrentWorkers([], 10, () => Promise.resolve('foo'));
+    expect(result).toEqual([]);
+  });
+
+  it('Can run against single entry', async () => {
+    const result = await concurrentWorkers(['bar'], 10, (item) => Promise.resolve('foo' + item));
+    expect(result).toEqual(['foobar']);
+  });
+
+  it('Can run against less entries than concurrency', async () => {
+    const result = await concurrentWorkers(['bar', 'rba', 'abr', 'rab', 'arb', 'bra'], 10, (item) => Promise.resolve('foo' + item));
+    expect(result).toEqual(['foobar', 'foorba', 'fooabr', 'foorab', 'fooarb', 'foobra']);
+  });
+
+  it('Can run against more entries than concurrency', async () => {
+    const result = await concurrentWorkers(['bar', 'rba', 'abr', 'rab', 'arb', 'bra'], 2, (item) => Promise.resolve('foo' + item));
+    expect(result).toEqual(['foobar', 'foorba', 'fooabr', 'foorab', 'fooarb', 'foobra']);
+  });
+
+  it('Can run against equal entries than concurrency', async () => {
+    const result = await concurrentWorkers(['bar', 'rba', 'abr', 'rab', 'arb', 'bra'], 6, (item) => Promise.resolve('foo' + item));
+    expect(result).toEqual(['foobar', 'foorba', 'fooabr', 'foorab', 'fooarb', 'foobra']);
+  });
+});

package/src/common/parallel.ts

@@ -0,0 +1,21 @@
+export async function concurrentWorkers<T, R>(
+  items: Array<T>,
+  concurrency: number,
+  worker: (item: T) => Promise<R>,
+): Promise<Array<R>> {
+  const maxItems = items.length;
+  const results: Array<R> = new Array(maxItems);
+  let offset = 0;
+
+  await Promise.all(
+    items.slice(0, concurrency).map(async () => {
+      while (offset < maxItems) {
+        const i = offset++;
+        const item = items[i];
+        results[i] = await worker(item);
+      }
+    }),
+  );
+
+  return results;
+}

package/src/helpers.ts

@@ -7,9 +7,11 @@ import {
   PiletPublishSource,
   PiralBuildType,
   PiletBuildType,
+  PiletPublishScheme,
 } from './types';
 
 export const schemaKeys: Array<PiletSchemaVersion> = ['v0', 'v1', 'v2', 'none'];
+export const publishModeKeys: Array<PiletPublishScheme> = ['none', 'basic', 'bearer', 'digest'];
 export const fromKeys: Array<PiletPublishSource> = ['local', 'remote', 'npm'];
 export const piralBuildTypeKeys: Array<PiralBuildType> = ['all', 'release', 'emulator', 'emulator-sources'];
 export const piletBuildTypeKeys: Array<PiletBuildType> = ['default', 'standalone', 'manifest'];

package/src/types/public.ts

@@ -214,6 +214,8 @@ export interface BundlerDefinition {
 
 export type PiletSchemaVersion = 'none' | 'v0' | 'v1' | 'v2';
 
+export type PiletPublishScheme = 'none' | 'digest' | 'bearer' | 'basic';
+
 export type PiletPublishSource = 'local' | 'npm' | 'remote';
 
 export type PiralBuildType = 'all' | 'release' | 'emulator' | 'emulator-sources';