piral-cli 0.15.0-alpha.4257 → 0.15.0-alpha.4284

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -23,12 +23,14 @@ Right now the following generic plugins exist:
23
23
 
24
24
  Also the following bundler plugin exists (bringing build / debug capabilities):
25
25
 
26
- - [**piral-cli-parcel**](https://github.com/smapiot/piral), provides an integration for Parcel (v1) as a bundler
27
- - [**piral-cli-parcel2**](https://github.com/smapiot/piral), provides an integration for Parcel (v2) as a bundler
28
- - [**piral-cli-webpack**](https://github.com/smapiot/piral), provides an integration for Webpack (v4) as a bundler
26
+ - [**piral-cli-parcel**](https://github.com/smapiot/piral-cli-parcel), provides an integration for Parcel (v1) as a bundler
27
+ - [**piral-cli-parcel2**](https://github.com/smapiot/piral-cli-parcel2), provides an integration for Parcel (v2) as a bundler
28
+ - [**piral-cli-webpack**](https://github.com/smapiot/piral-cli-webpack), provides an integration for Webpack (v4) as a bundler
29
29
  - [**piral-cli-webpack5**](https://github.com/smapiot/piral), provides an integration for Webpack (v5) as a bundler
30
- - [**piral-cli-esbuild**](https://github.com/smapiot/piral), provides an integration for ES Build as a bundler
31
- - [**piral-cli-xbuild**](https://github.com/smapiot/piral), provides the possibility of using npm scripts for building and debugging
30
+ - [**piral-cli-esbuild**](https://github.com/smapiot/piral-cli-esbuild), provides an integration for ES Build as a bundler
31
+ - [**piral-cli-rollup**](https://github.com/smapiot/piral-cli-rollup), provides an integration for Rollup as a bundler
32
+ - [**piral-cli-vite**](https://github.com/smapiot/piral-cli-vite), provides an integration for Vite as a bundler
33
+ - [**piral-cli-xbuild**](https://github.com/smapiot/piral-cli-xbuild), provides the possibility of using npm scripts for building and debugging
32
34
 
33
35
  You'll find an updated list [on NPM](https://www.npmjs.com/search?q=keywords%3Apiral-cli) using the keyword **piral-cli**.
34
36
 
@@ -69,7 +69,7 @@ function checkSanity(pilets) {
69
69
  function debugPilet(baseDir = process.cwd(), options = {}) {
70
70
  var _a, _b, _c, _d, _e, _f;
71
71
  return __awaiter(this, void 0, void 0, function* () {
72
- const { entry = exports.debugPiletDefaults.entry, target = exports.debugPiletDefaults.target, port = exports.debugPiletDefaults.port, open = exports.debugPiletDefaults.open, hmr = exports.debugPiletDefaults.hmr, publicUrl: originalPublicUrl = exports.debugPiletDefaults.publicUrl, logLevel = exports.debugPiletDefaults.logLevel, concurrency = exports.debugPiletDefaults.concurrency, optimizeModules = exports.debugPiletDefaults.optimizeModules, schemaVersion = exports.debugPiletDefaults.schemaVersion, _ = {}, hooks = {}, bundlerName, app, appInstanceDir, feed, } = options;
72
+ const { entry = exports.debugPiletDefaults.entry, target = exports.debugPiletDefaults.target, open = exports.debugPiletDefaults.open, hmr = exports.debugPiletDefaults.hmr, port: originalPort = exports.debugPiletDefaults.port, publicUrl: originalPublicUrl = exports.debugPiletDefaults.publicUrl, logLevel = exports.debugPiletDefaults.logLevel, concurrency = exports.debugPiletDefaults.concurrency, optimizeModules = exports.debugPiletDefaults.optimizeModules, schemaVersion = exports.debugPiletDefaults.schemaVersion, _ = {}, hooks = {}, bundlerName, app, appInstanceDir, feed, } = options;
73
73
  const publicUrl = (0, common_1.normalizePublicUrl)(originalPublicUrl);
74
74
  const fullBase = (0, path_1.resolve)(process.cwd(), baseDir);
75
75
  (0, common_1.setLogLevel)(logLevel);
@@ -158,6 +158,7 @@ function debugPilet(baseDir = process.cwd(), options = {}) {
158
158
  },
159
159
  };
160
160
  const configs = [krasBaseConfig, ...pilets.map((p) => (0, path_1.resolve)(p.root, kras_1.krasrc)), krasRootConfig];
161
+ const port = yield (0, common_1.getAvailablePort)(originalPort);
161
162
  const krasConfig = (0, kras_1.readKrasConfig)({ port, initial, required }, ...configs);
162
163
  (0, common_1.log)('generalVerbose_0004', `Using kras with configuration: ${JSON.stringify(krasConfig, undefined, 2)}`);
163
164
  const krasServer = (0, kras_1.buildKrasWithCli)(krasConfig);
@@ -1 +1 @@
1
- {"version":3,"file":"debug-pilet.js","sourceRoot":"","sources":["../../src/apps/debug-pilet.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"debug-pilet.js","sourceRoot":"","sources":["../../src/apps/debug-pilet.ts"],"names":[],"mappings":"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"}
@@ -28,7 +28,7 @@ exports.debugPiralDefaults = {
28
28
  function debugPiral(baseDir = process.cwd(), options = {}) {
29
29
  var _a, _b, _c, _d, _e;
30
30
  return __awaiter(this, void 0, void 0, function* () {
31
- const { entry = exports.debugPiralDefaults.entry, target = exports.debugPiralDefaults.target, port = exports.debugPiralDefaults.port, open = exports.debugPiralDefaults.open, hmr = exports.debugPiralDefaults.hmr, publicUrl: originalPublicUrl = exports.debugPiralDefaults.publicUrl, logLevel = exports.debugPiralDefaults.logLevel, optimizeModules = exports.debugPiralDefaults.optimizeModules, feed, _ = {}, hooks = {}, bundlerName, } = options;
31
+ const { entry = exports.debugPiralDefaults.entry, target = exports.debugPiralDefaults.target, open = exports.debugPiralDefaults.open, hmr = exports.debugPiralDefaults.hmr, port: originalPort = exports.debugPiralDefaults.port, publicUrl: originalPublicUrl = exports.debugPiralDefaults.publicUrl, logLevel = exports.debugPiralDefaults.logLevel, optimizeModules = exports.debugPiralDefaults.optimizeModules, feed, _ = {}, hooks = {}, bundlerName, } = options;
32
32
  const publicUrl = (0, common_1.normalizePublicUrl)(originalPublicUrl);
33
33
  const fullBase = (0, path_1.resolve)(process.cwd(), baseDir);
34
34
  (0, common_1.setLogLevel)(logLevel);
@@ -68,6 +68,7 @@ function debugPiral(baseDir = process.cwd(), options = {}) {
68
68
  },
69
69
  },
70
70
  };
71
+ const port = yield (0, common_1.getAvailablePort)(originalPort);
71
72
  const krasConfig = (0, kras_1.readKrasConfig)({ port, initial, required }, krasBaseConfig, krasRootConfig);
72
73
  (0, common_1.log)('generalVerbose_0004', `Using kras with configuration: ${JSON.stringify(krasConfig, undefined, 2)}`);
73
74
  const krasServer = (0, kras_1.buildKrasWithCli)(krasConfig);
@@ -1 +1 @@
1
- {"version":3,"file":"debug-piral.js","sourceRoot":"","sources":["../../src/apps/debug-piral.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"debug-piral.js","sourceRoot":"","sources":["../../src/apps/debug-piral.ts"],"names":[],"mappings":"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"}
@@ -52,7 +52,7 @@ function publishRelease(baseDir, source, providerName, args = {}, interactive =
52
52
  (0, common_1.fail)('publishDirectoryMissing_0110', directory);
53
53
  }
54
54
  const files = yield (0, common_1.matchFiles)(directory, '**/*');
55
- yield (0, release_1.publishArtifacts)(providerName, files, args, interactive);
55
+ yield (0, release_1.publishArtifacts)(providerName, directory, files, args, interactive);
56
56
  });
57
57
  }
58
58
  function publishPiral(baseDir = process.cwd(), options = {}) {
@@ -1 +1 @@
1
- {"version":3,"file":"publish-piral.js","sourceRoot":"","sources":["../../src/apps/publish-piral.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"publish-piral.js","sourceRoot":"","sources":["../../src/apps/publish-piral.ts"],"names":[],"mappings":"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"}
@@ -1,9 +1,11 @@
1
1
  /// <reference types="node" />
2
2
  import { PiletPublishScheme } from '../types';
3
3
  export declare function downloadFile(target: string, ca?: Buffer): Promise<Array<string>>;
4
- export interface PostFileResult {
4
+ export interface PostFormResult {
5
5
  status: number;
6
6
  success: boolean;
7
7
  response?: object;
8
8
  }
9
- export declare function postFile(target: string, scheme: PiletPublishScheme, key: string, file: Buffer, customFields?: Record<string, string>, customHeaders?: Record<string, string>, ca?: Buffer, interactive?: boolean): Promise<PostFileResult>;
9
+ export declare type FormDataObj = Record<string, string | [Buffer, string]>;
10
+ export declare function postForm(target: string, scheme: PiletPublishScheme, key: string, formData: FormDataObj, customHeaders?: Record<string, string>, ca?: Buffer, interactive?: boolean): Promise<PostFormResult>;
11
+ export declare function postFile(target: string, scheme: PiletPublishScheme, key: string, file: Buffer, customFields?: Record<string, string>, customHeaders?: Record<string, string>, ca?: Buffer, interactive?: boolean): Promise<PostFormResult>;
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.postFile = exports.downloadFile = void 0;
3
+ exports.postFile = exports.postForm = exports.downloadFile = void 0;
4
4
  const path_1 = require("path");
5
5
  const https_1 = require("https");
6
6
  const os_1 = require("os");
@@ -57,11 +57,18 @@ function downloadFile(target, ca) {
57
57
  });
58
58
  }
59
59
  exports.downloadFile = downloadFile;
60
- function postFile(target, scheme, key, file, customFields = {}, customHeaders = {}, ca, interactive = false) {
61
- const form = new external_1.FormData();
60
+ function postForm(target, scheme, key, formData, customHeaders = {}, ca, interactive = false) {
62
61
  const httpsAgent = ca ? new https_1.Agent({ ca }) : undefined;
63
- Object.keys(customFields).forEach((key) => form.append(key, customFields[key]));
64
- form.append('file', file, 'pilet.tgz');
62
+ const form = new external_1.FormData();
63
+ Object.keys(formData).forEach((key) => {
64
+ const value = formData[key];
65
+ if (typeof value === 'string') {
66
+ form.append(key, value);
67
+ }
68
+ else {
69
+ form.append(key, value[0], value[1]);
70
+ }
71
+ });
65
72
  const headers = Object.assign(Object.assign(Object.assign({}, form.getHeaders()), info_1.standardHeaders), customHeaders);
66
73
  if (key) {
67
74
  switch (scheme) {
@@ -87,11 +94,13 @@ function postFile(target, scheme, key, file, customFields = {}, customHeaders =
87
94
  maxContentLength: Infinity,
88
95
  maxBodyLength: Infinity,
89
96
  })
90
- .then((res) => ({
91
- status: res.status,
92
- success: true,
93
- response: res.data,
94
- }), (error) => {
97
+ .then((res) => {
98
+ return {
99
+ status: res.status,
100
+ success: true,
101
+ response: res.data,
102
+ };
103
+ }, (error) => {
95
104
  var _a;
96
105
  if (error.response) {
97
106
  // The request was made and the server responded with a status code
@@ -101,7 +110,7 @@ function postFile(target, scheme, key, file, customFields = {}, customHeaders =
101
110
  const { interactiveAuth } = data;
102
111
  if (typeof interactiveAuth === 'string') {
103
112
  (0, log_1.log)('generalDebug_0003', `Received status "${status}" from HTTP - trying interactive log in to "${interactiveAuth}".`);
104
- return (0, interactive_1.getTokenInteractively)(interactiveAuth, httpsAgent).then(({ mode, token }) => postFile(target, mode, token, file, customFields, customHeaders, ca, false));
113
+ return (0, interactive_1.getTokenInteractively)(interactiveAuth, httpsAgent).then(({ mode, token }) => postForm(target, mode, token, formData, customHeaders, ca, false));
105
114
  }
106
115
  }
107
116
  const message = getMessage(data) || '';
@@ -143,5 +152,10 @@ function postFile(target, scheme, key, file, customFields = {}, customHeaders =
143
152
  };
144
153
  });
145
154
  }
155
+ exports.postForm = postForm;
156
+ function postFile(target, scheme, key, file, customFields = {}, customHeaders = {}, ca, interactive = false) {
157
+ const data = Object.assign(Object.assign({}, customFields), { file: [file, 'pilet.tgz'] });
158
+ return postForm(target, scheme, key, data, customHeaders, ca, interactive);
159
+ }
146
160
  exports.postFile = postFile;
147
161
  //# sourceMappingURL=http.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/common/http.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAC5B,iCAA8B;AAE9B,2BAA4B;AAC5B,2BAAuC;AACvC,+BAA4B;AAC5B,iCAAyC;AACzC,+CAAsD;AACtD,0CAA8C;AAG9C,SAAS,UAAU,CAAC,IAAmC;IACrD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QAC5B,IAAI;YACF,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACjC,OAAO,OAAO,CAAC,OAAO,CAAC;SACxB;QAAC,OAAO,EAAE,EAAE;YACX,OAAO,IAAI,CAAC;SACb;KACF;SAAM,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QAC3C,IAAI,SAAS,IAAI,IAAI,EAAE;YACrB,OAAO,IAAI,CAAC,OAAO,CAAC;SACrB;aAAM;YACL,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;SAC7B;KACF;IAED,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,YAAY,CAAC,MAAc,EAAE,MAAc;IAClD,MAAM,IAAI,GAAG,IAAA,sBAAiB,EAAC,MAAM,CAAC,CAAC;IACvC,OAAO,IAAI,OAAO,CAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACpD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClB,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QACzC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,YAAY,CAAC,MAAc,EAAE,EAAW;IACtD,MAAM,UAAU,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,aAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACtD,OAAO,gBAAK,CAAC,OAAO;SACjB,GAAG,CAAS,MAAM,EAAE;QACnB,YAAY,EAAE,QAAQ;QACtB,OAAO,EAAE,sBAAe;QACxB,UAAU;KACX,CAAC;SACD,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;QACZ,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QACxD,MAAM,MAAM,GAAG,IAAA,WAAI,EAAC,IAAA,WAAM,GAAE,EAAE,SAAS,GAAG,MAAM,CAAC,CAAC;QAClD,IAAA,SAAG,EAAC,mBAAmB,EAAE,mCAAmC,MAAM,IAAI,CAAC,CAAC;QACxE,OAAO,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACxC,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;QACf,IAAA,SAAG,EAAC,oBAAoB,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QACzC,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;AACP,CAAC;AAlBD,oCAkBC;AAQD,SAAgB,QAAQ,CACtB,MAAc,EACd,MAA0B,EAC1B,GAAW,EACX,IAAY,EACZ,eAAuC,EAAE,EACzC,gBAAwC,EAAE,EAC1C,EAAW,EACX,WAAW,GAAG,KAAK;IAEnB,MAAM,IAAI,GAAG,IAAI,mBAAQ,EAAE,CAAC;IAC5B,MAAM,UAAU,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,aAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAEtD,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAEhF,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;IAEvC,MAAM,OAAO,iDACR,IAAI,CAAC,UAAU,EAAE,GACjB,sBAAe,GACf,aAAa,CACjB,CAAC;IAEF,IAAI,GAAG,EAAE;QACP,QAAQ,MAAM,EAAE;YACd,KAAK,OAAO;gBACV,OAAO,CAAC,aAAa,GAAG,SAAS,GAAG,EAAE,CAAC;gBACvC,MAAM;YACR,KAAK,QAAQ;gBACX,OAAO,CAAC,aAAa,GAAG,UAAU,GAAG,EAAE,CAAC;gBACxC,MAAM;YACR,KAAK,QAAQ;gBACX,OAAO,CAAC,aAAa,GAAG,UAAU,GAAG,EAAE,CAAC;gBACxC,MAAM;YACR,KAAK,MAAM,CAAC;YACZ;gBACE,OAAO,CAAC,aAAa,GAAG,GAAG,CAAC;gBAC5B,MAAM;SACT;KACF;IAED,OAAO,gBAAK,CAAC,OAAO;SACjB,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE;QAClB,OAAO;QACP,UAAU;QACV,gBAAgB,EAAE,QAAQ;QAC1B,aAAa,EAAE,QAAQ;KACxB,CAAC;SACD,IAAI,CACH,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACR,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,OAAO,EAAE,IAAI;QACb,QAAQ,EAAE,GAAG,CAAC,IAAI;KACnB,CAAC,EACF,CAAC,KAAK,EAAE,EAAE;;QACR,IAAI,KAAK,CAAC,QAAQ,EAAE;YAClB,mEAAmE;YACnE,qCAAqC;YACrC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,QAAQ,CAAC;YAEpD,IAAI,WAAW,IAAI,iBAAiB,IAAI,IAAI,EAAE;gBAC5C,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;gBAEjC,IAAI,OAAO,eAAe,KAAK,QAAQ,EAAE;oBACvC,IAAA,SAAG,EACD,mBAAmB,EACnB,oBAAoB,MAAM,+CAA+C,eAAe,IAAI,CAC7F,CAAC;oBAEF,OAAO,IAAA,mCAAqB,EAAC,eAAe,EAAE,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,CACjF,QAAQ,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE,aAAa,EAAE,EAAE,EAAE,KAAK,CAAC,CAC5E,CAAC;iBACH;aACF;YAED,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACvC,IAAA,SAAG,EAAC,2BAA2B,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;YAC9D,OAAO;gBACL,MAAM;gBACN,OAAO,EAAE,KAAK;gBACd,QAAQ,EAAE,OAAO;aAClB,CAAC;SACH;aAAM,IAAI,KAAK,CAAC,YAAY,EAAE;YAC7B,gEAAgE;YAChE,IAAI,YAAY,GAAW,KAAK,CAAC,KAAK,IAAI,qBAAqB,CAAC;YAEhE,IAAI,OAAO,KAAK,CAAC,MAAM,KAAK,UAAU,EAAE;gBACtC,MAAM,QAAQ,GAAyB,KAAK,CAAC,MAAM,EAAE,CAAC;gBACtD,YAAY,GAAG,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,mCAAI,YAAY,CAAC;aAClD;YAED,IAAA,SAAG,EAAC,qBAAqB,EAAE,YAAY,CAAC,CAAC;YACzC,OAAO;gBACL,MAAM,EAAE,GAAG;gBACX,OAAO,EAAE,KAAK;gBACd,QAAQ,EAAE,YAAY;aACvB,CAAC;SACH;aAAM,IAAI,KAAK,CAAC,OAAO,EAAE;YACxB,oDAAoD;YACpD,qFAAqF;YACrF,gCAAgC;YAChC,IAAA,SAAG,EAAC,qBAAqB,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;SAC3C;aAAM;YACL,uEAAuE;YACvE,IAAA,SAAG,EAAC,qBAAqB,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;SAC3C;QAED,OAAO;YACL,MAAM,EAAE,GAAG;YACX,OAAO,EAAE,KAAK;YACd,QAAQ,EAAE,SAAS;SACpB,CAAC;IACJ,CAAC,CACF,CAAC;AACN,CAAC;AAlHD,4BAkHC"}
1
+ {"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/common/http.ts"],"names":[],"mappings":"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"}
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getTokenInteractively = exports.promptConfirm = exports.promptSelect = void 0;
4
4
  const browser_1 = require("./browser");
5
5
  const info_1 = require("./info");
6
+ const log_1 = require("./log");
6
7
  const external_1 = require("../external");
7
8
  function promptSelect(message, values, defaultValue) {
8
9
  const questions = [
@@ -32,6 +33,7 @@ exports.promptConfirm = promptConfirm;
32
33
  const tokenRetrievers = {};
33
34
  function getTokenInteractively(url, httpsAgent) {
34
35
  if (!(url in tokenRetrievers)) {
36
+ const logResume = (0, log_1.logSuspend)();
35
37
  tokenRetrievers[url] = external_1.axios.default
36
38
  .post(url, {
37
39
  clientId: 'piral-cli',
@@ -48,10 +50,10 @@ function getTokenInteractively(url, httpsAgent) {
48
50
  console.log(loginUrl);
49
51
  console.log('===');
50
52
  (0, browser_1.openBrowserAt)(loginUrl);
51
- return external_1.axios.default.get(callbackUrl).then(({ data }) => {
52
- console.log('Logged in successfully.');
53
- return Object.assign({}, data);
54
- });
53
+ return external_1.axios.default
54
+ .get(callbackUrl)
55
+ .then(({ data }) => (Object.assign({}, data)))
56
+ .finally(logResume);
55
57
  });
56
58
  }
57
59
  return tokenRetrievers[url];
@@ -1 +1 @@
1
- {"version":3,"file":"interactive.js","sourceRoot":"","sources":["../../src/common/interactive.ts"],"names":[],"mappings":";;;AACA,uCAA0C;AAC1C,iCAAyC;AACzC,0CAA8C;AAG9C,SAAgB,YAAY,CAAC,OAAe,EAAE,MAAqB,EAAE,YAAoB;IACvF,MAAM,SAAS,GAAG;QAChB;YACE,IAAI,EAAE,GAAG;YACT,IAAI,EAAE,MAAe;YACrB,OAAO,EAAE,MAAM;YACf,OAAO;YACP,OAAO,EAAE,YAAY;SACtB;KACF,CAAC;IACF,OAAO,mBAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;AACtE,CAAC;AAXD,oCAWC;AAED,SAAgB,aAAa,CAAC,OAAe,EAAE,YAAqB;IAClE,MAAM,SAAS,GAAG;QAChB;YACE,IAAI,EAAE,GAAG;YACT,IAAI,EAAE,SAAkB;YACxB,OAAO;YACP,OAAO,EAAE,YAAY;SACtB;KACF,CAAC;IACF,OAAO,mBAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;AACtE,CAAC;AAVD,sCAUC;AAID,MAAM,eAAe,GAAgC,EAAE,CAAC;AAExD,SAAgB,qBAAqB,CAAC,GAAW,EAAE,UAAiB;IAClE,IAAI,CAAC,CAAC,GAAG,IAAI,eAAe,CAAC,EAAE;QAC7B,eAAe,CAAC,GAAG,CAAC,GAAG,gBAAK,CAAC,OAAO;aACjC,IAAI,CACH,GAAG,EACH;YACE,QAAQ,EAAE,WAAW;YACrB,UAAU,EAAE,WAAW;YACvB,WAAW,EAAE,sEAAsE;SACpF,EACD;YACE,OAAO,kCACF,sBAAe,KAClB,cAAc,EAAE,kBAAkB,GACnC;YACD,UAAU;SACX,CACF;aACA,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;YACZ,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;YACpD,OAAO,CAAC,GAAG,CAAC,gEAAgE,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAClG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACnB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACtB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAEnB,IAAA,uBAAa,EAAC,QAAQ,CAAC,CAAC;YAExB,OAAO,gBAAK,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;gBACtD,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;gBACvC,yBACK,IAAI,EACP;YACJ,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;KACN;IAED,OAAO,eAAe,CAAC,GAAG,CAAC,CAAC;AAC9B,CAAC;AArCD,sDAqCC"}
1
+ {"version":3,"file":"interactive.js","sourceRoot":"","sources":["../../src/common/interactive.ts"],"names":[],"mappings":";;;AACA,uCAA0C;AAC1C,iCAAyC;AACzC,+BAAmC;AACnC,0CAA8C;AAG9C,SAAgB,YAAY,CAAC,OAAe,EAAE,MAAqB,EAAE,YAAoB;IACvF,MAAM,SAAS,GAAG;QAChB;YACE,IAAI,EAAE,GAAG;YACT,IAAI,EAAE,MAAe;YACrB,OAAO,EAAE,MAAM;YACf,OAAO;YACP,OAAO,EAAE,YAAY;SACtB;KACF,CAAC;IACF,OAAO,mBAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;AACtE,CAAC;AAXD,oCAWC;AAED,SAAgB,aAAa,CAAC,OAAe,EAAE,YAAqB;IAClE,MAAM,SAAS,GAAG;QAChB;YACE,IAAI,EAAE,GAAG;YACT,IAAI,EAAE,SAAkB;YACxB,OAAO;YACP,OAAO,EAAE,YAAY;SACtB;KACF,CAAC;IACF,OAAO,mBAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;AACtE,CAAC;AAVD,sCAUC;AAID,MAAM,eAAe,GAAgC,EAAE,CAAC;AAExD,SAAgB,qBAAqB,CAAC,GAAW,EAAE,UAAiB;IAClE,IAAI,CAAC,CAAC,GAAG,IAAI,eAAe,CAAC,EAAE;QAC7B,MAAM,SAAS,GAAG,IAAA,gBAAU,GAAE,CAAC;QAE/B,eAAe,CAAC,GAAG,CAAC,GAAG,gBAAK,CAAC,OAAO;aACjC,IAAI,CACH,GAAG,EACH;YACE,QAAQ,EAAE,WAAW;YACrB,UAAU,EAAE,WAAW;YACvB,WAAW,EAAE,sEAAsE;SACpF,EACD;YACE,OAAO,kCACF,sBAAe,KAClB,cAAc,EAAE,kBAAkB,GACnC;YACD,UAAU;SACX,CACF;aACA,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;YACZ,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;YACpD,OAAO,CAAC,GAAG,CAAC,gEAAgE,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAClG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACnB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACtB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAEnB,IAAA,uBAAa,EAAC,QAAQ,CAAC,CAAC;YAExB,OAAO,gBAAK,CAAC,OAAO;iBACjB,GAAG,CAAC,WAAW,CAAC;iBAChB,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,mBAAM,IAAI,EAAG,CAAC;iBACjC,OAAO,CAAC,SAAS,CAAC,CAAC;QACxB,CAAC,CAAC,CAAC;KACN;IAED,OAAO,eAAe,CAAC,GAAG,CAAC,CAAC;AAC9B,CAAC;AArCD,sDAqCC"}
@@ -12,6 +12,7 @@ export declare function logWarn(message: string, ...args: Array<string | number
12
12
  export declare function logFail(message: string, ...args: Array<string | number | boolean>): string;
13
13
  export declare function progress(message: string, ...args: Array<string | number | boolean>): void;
14
14
  export declare function logReset(): void;
15
+ export declare function logSuspend(): () => any;
15
16
  export declare function fail<T extends MessageTypes>(type: T, ...args: Parameters<Messages[T]>): never;
16
17
  export declare function log<T extends MessageTypes>(type: T, ...args: Parameters<Messages[T]>): string;
17
18
  export {};
package/lib/common/log.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.log = exports.fail = exports.logReset = exports.progress = exports.logFail = exports.logWarn = exports.logDone = exports.logVerbose = exports.logDebug = exports.logInfo = exports.setLogLevel = exports.getLogLevel = void 0;
3
+ exports.log = exports.fail = exports.logSuspend = exports.logReset = exports.progress = exports.logFail = exports.logWarn = exports.logDone = exports.logVerbose = exports.logDebug = exports.logInfo = exports.setLogLevel = exports.getLogLevel = void 0;
4
4
  const messages = require("../messages");
5
5
  const path_1 = require("path");
6
6
  const util_1 = require("util");
@@ -8,6 +8,7 @@ const fs_1 = require("fs");
8
8
  const info_1 = require("./info");
9
9
  const external_1 = require("../external");
10
10
  const types_1 = require("../types");
11
+ let currentProgress = undefined;
11
12
  const logger = (() => {
12
13
  try {
13
14
  const logger = require('@parcel/logger');
@@ -84,7 +85,8 @@ function logFail(message, ...args) {
84
85
  }
85
86
  exports.logFail = logFail;
86
87
  function progress(message, ...args) {
87
- logger.progress((0, util_1.format)(message, ...args));
88
+ currentProgress = (0, util_1.format)(message, ...args);
89
+ logger.progress(currentProgress);
88
90
  }
89
91
  exports.progress = progress;
90
92
  function logReset() {
@@ -92,6 +94,11 @@ function logReset() {
92
94
  logger.stopSpinner();
93
95
  }
94
96
  exports.logReset = logReset;
97
+ function logSuspend() {
98
+ logReset();
99
+ return () => logger.progress(currentProgress);
100
+ }
101
+ exports.logSuspend = logSuspend;
95
102
  function fail(type, ...args) {
96
103
  const message = log(type, ...args);
97
104
  const error = new Error(message);
@@ -1 +1 @@
1
- {"version":3,"file":"log.js","sourceRoot":"","sources":["../../src/common/log.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"log.js","sourceRoot":"","sources":["../../src/common/log.ts"],"names":[],"mappings":"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"}
@@ -1 +1,2 @@
1
+ export declare function getAvailablePort(defaultPort: number): Promise<number>;
1
2
  export declare function getFreePort(preferred?: number): Promise<number>;
@@ -9,9 +9,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
9
9
  });
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
- exports.getFreePort = void 0;
12
+ exports.getFreePort = exports.getAvailablePort = void 0;
13
13
  const log_1 = require("./log");
14
14
  const external_1 = require("../external");
15
+ function getAvailablePort(defaultPort) {
16
+ return __awaiter(this, void 0, void 0, function* () {
17
+ const selectedPort = yield getFreePort(defaultPort);
18
+ if (selectedPort !== defaultPort) {
19
+ (0, log_1.log)('portNotFree_0047', selectedPort, defaultPort);
20
+ }
21
+ return selectedPort;
22
+ });
23
+ }
24
+ exports.getAvailablePort = getAvailablePort;
15
25
  function getFreePort(preferred) {
16
26
  return __awaiter(this, void 0, void 0, function* () {
17
27
  (0, log_1.log)('generalDebug_0003', `Looking for a free port. Preferred port: ${preferred}`);
@@ -1 +1 @@
1
- {"version":3,"file":"port.js","sourceRoot":"","sources":["../../src/common/port.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAA4B;AAC5B,0CAAsC;AAEtC,SAAsB,WAAW,CAAC,SAAkB;;QAClD,IAAA,SAAG,EAAC,mBAAmB,EAAE,4CAA4C,SAAS,EAAE,CAAC,CAAC;QAClF,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAO,EAAC,SAAS,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QAC7D,IAAA,SAAG,EAAC,mBAAmB,EAAE,cAAc,IAAI,kBAAkB,CAAC,CAAC;QAC/D,OAAO,IAAI,CAAC;IACd,CAAC;CAAA;AALD,kCAKC"}
1
+ {"version":3,"file":"port.js","sourceRoot":"","sources":["../../src/common/port.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAA4B;AAC5B,0CAAsC;AAEtC,SAAsB,gBAAgB,CAAC,WAAmB;;QACxD,MAAM,YAAY,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,CAAC;QAEpD,IAAI,YAAY,KAAK,WAAW,EAAE;YAChC,IAAA,SAAG,EAAC,kBAAkB,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;SACpD;QAED,OAAO,YAAY,CAAC;IACtB,CAAC;CAAA;AARD,4CAQC;AAED,SAAsB,WAAW,CAAC,SAAkB;;QAClD,IAAA,SAAG,EAAC,mBAAmB,EAAE,4CAA4C,SAAS,EAAE,CAAC,CAAC;QAClF,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAO,EAAC,SAAS,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QAC7D,IAAA,SAAG,EAAC,mBAAmB,EAAE,cAAc,IAAI,kBAAkB,CAAC,CAAC;QAC/D,OAAO,IAAI,CAAC;IACd,CAAC;CAAA;AALD,kCAKC"}
package/lib/messages.d.ts CHANGED
@@ -870,6 +870,38 @@ export declare function didNotOverWriteFile_0045(file: string): QuickMessage;
870
870
  * configuration.
871
871
  */
872
872
  export declare function cannotFindFile_0046(file: string): QuickMessage;
873
+ /**
874
+ * @kind Warning
875
+ *
876
+ * @summary
877
+ * Reported when the provided / default port was not available.
878
+ *
879
+ * @abstract
880
+ * By default, the debug commands spawn at the port 1234. However, under certain
881
+ * circumstances (e.g., another debug command running somewhere) this port may not
882
+ * be free.
883
+ *
884
+ * The piral-cli can select a new port, which is free, however, it will still report
885
+ * a warning message in such cases. You can then always abort the current debug
886
+ * process and start a new one - either closing the other run blocking the port or
887
+ * explicitly selecting a new one using the `--port` flag.
888
+ *
889
+ * @see
890
+ * - [Port (computer networking)](https://en.wikipedia.org/wiki/Port_(computer_networking))
891
+ *
892
+ * @example
893
+ * If you start one process to debug an app shell using `piral debug` and another process
894
+ * to debug some pilet using `pilet debug` both processes would want to run on the default
895
+ * port 1234.
896
+ *
897
+ * As a mitigation you can now either be very explicit, e.g., `piral debug --port 1010` and
898
+ * `pilet debug --port 1020` or you can just drop one of the two and always only run a single
899
+ * debug process.
900
+ *
901
+ * In any case, running both without any options also works, but then a new port will be chosen.
902
+ * The output of the Piral CLI will always show you what port is currently used.
903
+ */
904
+ export declare function portNotFree_0047(newPort: number, oldPort: number): QuickMessage;
873
905
  /**
874
906
  * @kind Warning
875
907
  *
@@ -2035,6 +2067,52 @@ export declare function publishProviderMissing_0113(providerName: string, availa
2035
2067
  * The type is "release".
2036
2068
  */
2037
2069
  export declare function publishEmulatorSourcesInvalid_0114(): QuickMessage;
2070
+ /**
2071
+ * @kind Error
2072
+ *
2073
+ * @summary
2074
+ * The "feed" provider requires a "--fields.url" argument.
2075
+ *
2076
+ * @abstract
2077
+ * The `piral publish --type release` command requires the selection of a suitable
2078
+ * provider for running successfully. The "feed" provider releases the files to
2079
+ * the a Piral Feed Service with the static page feature.
2080
+ *
2081
+ * Make sure to supply the URL for the feed service via the `--fields.url` command
2082
+ * line flag.
2083
+ *
2084
+ * @example
2085
+ * The following command would specify `https://feed.piral.cloud/api/v1/feed/sample/page`
2086
+ * for the feed service:
2087
+ *
2088
+ * ```sh
2089
+ * piral publish --type release --provider feed --fields.url "https://feed.piral.cloud/api/v1/feed/sample/page" --fields.apikey "foobar123"
2090
+ * ```
2091
+ */
2092
+ export declare function publishFeedMissingUrl_0115(): QuickMessage;
2093
+ /**
2094
+ * @kind Error
2095
+ *
2096
+ * @summary
2097
+ * The "feed" provider requires a "--fields.version" argument.
2098
+ *
2099
+ * @abstract
2100
+ * The `piral publish --type release` command requires the selection of a suitable
2101
+ * provider for running successfully. The "feed" provider releases the files to
2102
+ * the a Piral Feed Service with the static page feature.
2103
+ *
2104
+ * Make sure to supply the version either explicitly via the `--fields.version` argument
2105
+ * or implicitly by having the artifacts stored in a sub-directory of the project's root,
2106
+ * which contains a package.json with the version to use.
2107
+ *
2108
+ * @example
2109
+ * The following command would specify version "1.2.3" for the feed service:
2110
+ *
2111
+ * ```sh
2112
+ * piral publish --type release --provider feed --fields.url "..." --fields.apikey "..." --fields.version "1.2.3"
2113
+ * ```
2114
+ */
2115
+ export declare function publishFeedMissingVersion_0116(): QuickMessage;
2038
2116
  /**
2039
2117
  * @kind Warning
2040
2118
  *
package/lib/messages.js CHANGED
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.entryFileMissing_0077 = exports.declarationCouldNotBeGenerated_0076 = exports.packageJsonMissing_0075 = exports.packageJsonMissing_0074 = exports.entryPointDoesNotExist_0073 = exports.expectedArray_0072 = exports.entryPointMissing_0071 = exports.entryPointMissing_0070 = exports.failedToUploadSize_0163 = exports.failedToUploadVersion_0162 = exports.failedToUploadPayment_0161 = exports.failedHttpGet_0068 = exports.httpPostResponse_0067 = exports.unsuccessfulHttpPost_0066 = exports.failedHttpPost_0065 = exports.failedUploading_0064 = exports.failedToRead_0063 = exports.failedToUpload_0062 = exports.missingPiletTarball_0061 = exports.missingPiletFeedUrl_0060 = exports.cannotResolveDependency_0053 = exports.cannotResolveVersion_0052 = exports.gitLatestForUpgradeMissing_0051 = exports.localeFileForUpgradeMissing_0050 = exports.cannotFindFile_0046 = exports.didNotOverWriteFile_0045 = exports.cannotCreateDirectory_0044 = exports.invalidPiralReference_0043 = exports.invalidPiletPackage_0042 = exports.invalidPiletPackage_0041 = exports.invalidPiletTarget_0040 = exports.projectReferenceNotSupported_0032 = exports.upgradePathDoesNotExist_0031 = exports.scaffoldPathDoesNotExist_0030 = exports.importMapFileNotFound_0028 = exports.importMapReferenceNotFound_0027 = exports.importMapVersionSpecInvalid_0026 = exports.importMapVersionSpecNotSatisfied_0025 = exports.packageVersionInvalid_0024 = exports.packageNotInstalled_0023 = exports.packageJsonMissingVersion_0022 = exports.packageJsonMissingName_0021 = exports.packageJsonNotFound_0020 = exports.appInstanceInvalid_0011 = exports.appInstanceNotFound_0010 = exports.generalVerbose_0004 = exports.generalDebug_0003 = exports.generalError_0002 = exports.generalWarning_0001 = exports.generalInfo_0000 = void 0;
4
- exports.piletMultiDebugExternalsDifferent_0303 = exports.piletMultiDebugAppShellVersions_0302 = exports.piletMultiDebugAppShellDifferent_0301 = exports.apiReleaseProviderInvalid_0207 = exports.apiBundlerInvalid_0206 = exports.pluginCouldNotBeLoaded_0205 = exports.apiPatchInvalid_0204 = exports.apiValidateRunInvalid_0203 = exports.apiValidateNameInvalid_0202 = exports.apiArgumentInvalid_0201 = exports.apiCommandNameInvalid_0200 = exports.bundlerUnspecified_0175 = exports.bundlingFailed_0174 = exports.defaultBundlerMissing_0173 = exports.bundlerMissing_0172 = exports.invalidSchemaVersion_0171 = exports.failedToOpenBrowser_0170 = exports.publishEmulatorSourcesInvalid_0114 = exports.publishProviderMissing_0113 = exports.publishXcopyMissingTarget_0112 = exports.publishEmulatorFilesUnexpected_0111 = exports.publishDirectoryMissing_0110 = exports.appShellMaybeIncompatible_0102 = exports.toolingIncompatible_0101 = exports.appShellIncompatible_0100 = exports.validationWarned_0081 = exports.validationFailed_0080 = exports.frameworkLibMissing_0078 = void 0;
3
+ exports.declarationCouldNotBeGenerated_0076 = exports.packageJsonMissing_0075 = exports.packageJsonMissing_0074 = exports.entryPointDoesNotExist_0073 = exports.expectedArray_0072 = exports.entryPointMissing_0071 = exports.entryPointMissing_0070 = exports.failedToUploadSize_0163 = exports.failedToUploadVersion_0162 = exports.failedToUploadPayment_0161 = exports.failedHttpGet_0068 = exports.httpPostResponse_0067 = exports.unsuccessfulHttpPost_0066 = exports.failedHttpPost_0065 = exports.failedUploading_0064 = exports.failedToRead_0063 = exports.failedToUpload_0062 = exports.missingPiletTarball_0061 = exports.missingPiletFeedUrl_0060 = exports.cannotResolveDependency_0053 = exports.cannotResolveVersion_0052 = exports.gitLatestForUpgradeMissing_0051 = exports.localeFileForUpgradeMissing_0050 = exports.portNotFree_0047 = exports.cannotFindFile_0046 = exports.didNotOverWriteFile_0045 = exports.cannotCreateDirectory_0044 = exports.invalidPiralReference_0043 = exports.invalidPiletPackage_0042 = exports.invalidPiletPackage_0041 = exports.invalidPiletTarget_0040 = exports.projectReferenceNotSupported_0032 = exports.upgradePathDoesNotExist_0031 = exports.scaffoldPathDoesNotExist_0030 = exports.importMapFileNotFound_0028 = exports.importMapReferenceNotFound_0027 = exports.importMapVersionSpecInvalid_0026 = exports.importMapVersionSpecNotSatisfied_0025 = exports.packageVersionInvalid_0024 = exports.packageNotInstalled_0023 = exports.packageJsonMissingVersion_0022 = exports.packageJsonMissingName_0021 = exports.packageJsonNotFound_0020 = exports.appInstanceInvalid_0011 = exports.appInstanceNotFound_0010 = exports.generalVerbose_0004 = exports.generalDebug_0003 = exports.generalError_0002 = exports.generalWarning_0001 = exports.generalInfo_0000 = void 0;
4
+ exports.piletMultiDebugExternalsDifferent_0303 = exports.piletMultiDebugAppShellVersions_0302 = exports.piletMultiDebugAppShellDifferent_0301 = exports.apiReleaseProviderInvalid_0207 = exports.apiBundlerInvalid_0206 = exports.pluginCouldNotBeLoaded_0205 = exports.apiPatchInvalid_0204 = exports.apiValidateRunInvalid_0203 = exports.apiValidateNameInvalid_0202 = exports.apiArgumentInvalid_0201 = exports.apiCommandNameInvalid_0200 = exports.bundlerUnspecified_0175 = exports.bundlingFailed_0174 = exports.defaultBundlerMissing_0173 = exports.bundlerMissing_0172 = exports.invalidSchemaVersion_0171 = exports.failedToOpenBrowser_0170 = exports.publishFeedMissingVersion_0116 = exports.publishFeedMissingUrl_0115 = exports.publishEmulatorSourcesInvalid_0114 = exports.publishProviderMissing_0113 = exports.publishXcopyMissingTarget_0112 = exports.publishEmulatorFilesUnexpected_0111 = exports.publishDirectoryMissing_0110 = exports.appShellMaybeIncompatible_0102 = exports.toolingIncompatible_0101 = exports.appShellIncompatible_0100 = exports.validationWarned_0081 = exports.validationFailed_0080 = exports.frameworkLibMissing_0078 = exports.entryFileMissing_0077 = void 0;
5
5
  const types_1 = require("./types");
6
6
  /**
7
7
  * @kind Info
@@ -956,6 +956,41 @@ function cannotFindFile_0046(file) {
956
956
  return [types_1.LogLevels.error, '0046', `The file "${file}" does not exist!`];
957
957
  }
958
958
  exports.cannotFindFile_0046 = cannotFindFile_0046;
959
+ /**
960
+ * @kind Warning
961
+ *
962
+ * @summary
963
+ * Reported when the provided / default port was not available.
964
+ *
965
+ * @abstract
966
+ * By default, the debug commands spawn at the port 1234. However, under certain
967
+ * circumstances (e.g., another debug command running somewhere) this port may not
968
+ * be free.
969
+ *
970
+ * The piral-cli can select a new port, which is free, however, it will still report
971
+ * a warning message in such cases. You can then always abort the current debug
972
+ * process and start a new one - either closing the other run blocking the port or
973
+ * explicitly selecting a new one using the `--port` flag.
974
+ *
975
+ * @see
976
+ * - [Port (computer networking)](https://en.wikipedia.org/wiki/Port_(computer_networking))
977
+ *
978
+ * @example
979
+ * If you start one process to debug an app shell using `piral debug` and another process
980
+ * to debug some pilet using `pilet debug` both processes would want to run on the default
981
+ * port 1234.
982
+ *
983
+ * As a mitigation you can now either be very explicit, e.g., `piral debug --port 1010` and
984
+ * `pilet debug --port 1020` or you can just drop one of the two and always only run a single
985
+ * debug process.
986
+ *
987
+ * In any case, running both without any options also works, but then a new port will be chosen.
988
+ * The output of the Piral CLI will always show you what port is currently used.
989
+ */
990
+ function portNotFree_0047(newPort, oldPort) {
991
+ return [types_1.LogLevels.warning, '0047', `The selected port "${oldPort}" is already used. Changed port to "${newPort}".`];
992
+ }
993
+ exports.portNotFree_0047 = portNotFree_0047;
959
994
  /**
960
995
  * @kind Warning
961
996
  *
@@ -2259,6 +2294,58 @@ function publishEmulatorSourcesInvalid_0114() {
2259
2294
  ];
2260
2295
  }
2261
2296
  exports.publishEmulatorSourcesInvalid_0114 = publishEmulatorSourcesInvalid_0114;
2297
+ /**
2298
+ * @kind Error
2299
+ *
2300
+ * @summary
2301
+ * The "feed" provider requires a "--fields.url" argument.
2302
+ *
2303
+ * @abstract
2304
+ * The `piral publish --type release` command requires the selection of a suitable
2305
+ * provider for running successfully. The "feed" provider releases the files to
2306
+ * the a Piral Feed Service with the static page feature.
2307
+ *
2308
+ * Make sure to supply the URL for the feed service via the `--fields.url` command
2309
+ * line flag.
2310
+ *
2311
+ * @example
2312
+ * The following command would specify `https://feed.piral.cloud/api/v1/feed/sample/page`
2313
+ * for the feed service:
2314
+ *
2315
+ * ```sh
2316
+ * piral publish --type release --provider feed --fields.url "https://feed.piral.cloud/api/v1/feed/sample/page" --fields.apikey "foobar123"
2317
+ * ```
2318
+ */
2319
+ function publishFeedMissingUrl_0115() {
2320
+ return [types_1.LogLevels.error, '0115', `The "feed" provider requires a "--fields.url" argument.`];
2321
+ }
2322
+ exports.publishFeedMissingUrl_0115 = publishFeedMissingUrl_0115;
2323
+ /**
2324
+ * @kind Error
2325
+ *
2326
+ * @summary
2327
+ * The "feed" provider requires a "--fields.version" argument.
2328
+ *
2329
+ * @abstract
2330
+ * The `piral publish --type release` command requires the selection of a suitable
2331
+ * provider for running successfully. The "feed" provider releases the files to
2332
+ * the a Piral Feed Service with the static page feature.
2333
+ *
2334
+ * Make sure to supply the version either explicitly via the `--fields.version` argument
2335
+ * or implicitly by having the artifacts stored in a sub-directory of the project's root,
2336
+ * which contains a package.json with the version to use.
2337
+ *
2338
+ * @example
2339
+ * The following command would specify version "1.2.3" for the feed service:
2340
+ *
2341
+ * ```sh
2342
+ * piral publish --type release --provider feed --fields.url "..." --fields.apikey "..." --fields.version "1.2.3"
2343
+ * ```
2344
+ */
2345
+ function publishFeedMissingVersion_0116() {
2346
+ return [types_1.LogLevels.error, '0116', `The "feed" provider requires either a "--fields.version" argument or a package.json with a version.`];
2347
+ }
2348
+ exports.publishFeedMissingVersion_0116 = publishFeedMissingVersion_0116;
2262
2349
  /**
2263
2350
  * @kind Warning
2264
2351
  *
@@ -1 +1 @@
1
- {"version":3,"file":"messages.js","sourceRoot":"","sources":["../src/messages.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"messages.js","sourceRoot":"","sources":["../src/messages.ts"],"names":[],"mappings":"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"}
package/lib/release.d.ts CHANGED
@@ -4,4 +4,4 @@ export interface QualifiedReleaseProvider {
4
4
  action: ReleaseProvider;
5
5
  }
6
6
  export declare function setReleaseProvider(provider: QualifiedReleaseProvider): void;
7
- export declare function publishArtifacts(providerName: string, files: Array<string>, args: Record<string, string>, interactive: boolean): Promise<void>;
7
+ export declare function publishArtifacts(providerName: string, directory: string, files: Array<string>, args: Record<string, string>, interactive: boolean): Promise<void>;
package/lib/release.js CHANGED
@@ -13,11 +13,21 @@ exports.publishArtifacts = exports.setReleaseProvider = void 0;
13
13
  const path_1 = require("path");
14
14
  const common_1 = require("./common");
15
15
  const helpers_1 = require("./helpers");
16
+ function getVersion(directory) {
17
+ return __awaiter(this, void 0, void 0, function* () {
18
+ const data = yield (0, common_1.findFile)(directory, 'package.json');
19
+ if (!data) {
20
+ (0, common_1.fail)('packageJsonNotFound_0020');
21
+ }
22
+ const { version } = require(data);
23
+ return version;
24
+ });
25
+ }
16
26
  const providers = {
17
27
  none() {
18
28
  return Promise.resolve();
19
29
  },
20
- xcopy(files, args) {
30
+ xcopy(_, files, args) {
21
31
  return __awaiter(this, void 0, void 0, function* () {
22
32
  const { target } = args;
23
33
  if (!target) {
@@ -26,9 +36,26 @@ const providers = {
26
36
  yield Promise.all(files.map((file) => __awaiter(this, void 0, void 0, function* () { return (0, common_1.copy)(file, (0, path_1.resolve)(target, (0, path_1.basename)(file))); })));
27
37
  });
28
38
  },
29
- feed(files, args, interactive) {
39
+ feed(directory, files, args, interactive) {
30
40
  return __awaiter(this, void 0, void 0, function* () {
31
- //TODO post files to Piral Feed Service
41
+ const { url, apiKey, scheme = 'basic', version = yield getVersion(directory) } = args;
42
+ if (!url) {
43
+ (0, common_1.fail)('publishFeedMissingUrl_0115');
44
+ }
45
+ if (!version) {
46
+ (0, common_1.fail)('publishFeedMissingVersion_0116');
47
+ }
48
+ const data = {
49
+ version,
50
+ type: 'custom',
51
+ };
52
+ for (const file of files) {
53
+ const relPath = (0, path_1.relative)(file, directory);
54
+ const fileName = (0, path_1.basename)(file);
55
+ const content = yield (0, common_1.readBinary)((0, path_1.dirname)(file), fileName);
56
+ data[relPath] = [content, fileName];
57
+ }
58
+ yield (0, common_1.postForm)(url, scheme, apiKey, data, {}, undefined, interactive);
32
59
  });
33
60
  },
34
61
  };
@@ -47,9 +74,9 @@ function setReleaseProvider(provider) {
47
74
  }
48
75
  }
49
76
  exports.setReleaseProvider = setReleaseProvider;
50
- function publishArtifacts(providerName, files, args, interactive) {
77
+ function publishArtifacts(providerName, directory, files, args, interactive) {
51
78
  const runRelease = findReleaseProvider(providerName);
52
- return runRelease(files, args, interactive);
79
+ return runRelease(directory, files, args, interactive);
53
80
  }
54
81
  exports.publishArtifacts = publishArtifacts;
55
82
  //# sourceMappingURL=release.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"release.js","sourceRoot":"","sources":["../src/release.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAAyC;AACzC,qCAAsC;AACtC,uCAAsD;AAQtD,MAAM,SAAS,GAAoC;IACjD,IAAI;QACF,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IACK,KAAK,CAAC,KAAK,EAAE,IAAI;;YACrB,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;YAExB,IAAI,CAAC,MAAM,EAAE;gBACX,IAAA,aAAI,EAAC,gCAAgC,CAAC,CAAC;aACxC;YAED,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAO,IAAI,EAAE,EAAE,gDAAC,OAAA,IAAA,aAAI,EAAC,IAAI,EAAE,IAAA,cAAO,EAAC,MAAM,EAAE,IAAA,eAAQ,EAAC,IAAI,CAAC,CAAC,CAAC,CAAA,GAAA,CAAC,CAAC,CAAC;QAC5F,CAAC;KAAA;IACK,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,WAAW;;YACjC,uCAAuC;QACzC,CAAC;KAAA;CACF,CAAC;AAEF,SAAS,mBAAmB,CAAC,YAAoB;IAC/C,MAAM,QAAQ,GAAG,SAAS,CAAC,YAAY,CAAC,CAAC;IAEzC,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE;QAClC,IAAA,aAAI,EAAC,6BAA6B,EAAE,YAAY,EAAE,mCAAyB,CAAC,CAAC;KAC9E;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,mCAAyB,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;AAE1D,SAAgB,kBAAkB,CAAC,QAAkC;IACnE,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC;IAE3C,IAAI,CAAC,mCAAyB,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QACtD,mCAAyB,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;KAC/C;AACH,CAAC;AAND,gDAMC;AAED,SAAgB,gBAAgB,CAC9B,YAAoB,EACpB,KAAoB,EACpB,IAA4B,EAC5B,WAAoB;IAEpB,MAAM,UAAU,GAAG,mBAAmB,CAAC,YAAY,CAAC,CAAC;IACrD,OAAO,UAAU,CAAC,KAAK,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;AAC9C,CAAC;AARD,4CAQC"}
1
+ {"version":3,"file":"release.js","sourceRoot":"","sources":["../src/release.ts"],"names":[],"mappings":"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"}
@@ -39,7 +39,7 @@ export interface Bundler {
39
39
  ready(): Promise<void>;
40
40
  }
41
41
  export interface ReleaseProvider {
42
- (files: Array<string>, args: Record<string, string>, interactive: boolean): Promise<void>;
42
+ (directory: string, files: Array<string>, args: Record<string, string>, interactive: boolean): Promise<void>;
43
43
  }
44
44
  export interface TemplateFileLocation {
45
45
  from: string;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "piral-cli",
3
- "version": "0.15.0-alpha.4257",
3
+ "version": "0.15.0-alpha.4284",
4
4
  "description": "The standard CLI for creating and building a Piral instance or a Pilet.",
5
5
  "keywords": [
6
6
  "portal",
@@ -75,10 +75,10 @@
75
75
  "chalk": "^2.4.2",
76
76
  "dets": "^0.11.1",
77
77
  "ejs": "^3.1.7",
78
- "kras": "^0.14.0",
78
+ "kras": "^0.14.1",
79
79
  "rimraf": "^3.0.0",
80
80
  "typescript": "^4.0.2",
81
81
  "yargs": "^15.4.1"
82
82
  },
83
- "gitHead": "61f4ebc7b6c7cea553e2159b075cb761216f8e85"
83
+ "gitHead": "c48d6a2c320241d04e3c9c4c4edb423345003587"
84
84
  }
@@ -20,6 +20,7 @@ import {
20
20
  normalizePublicUrl,
21
21
  findFile,
22
22
  createInitialKrasConfig,
23
+ getAvailablePort,
23
24
  } from '../common';
24
25
 
25
26
  export interface DebugPiletOptions {
@@ -183,9 +184,9 @@ export async function debugPilet(baseDir = process.cwd(), options: DebugPiletOpt
183
184
  const {
184
185
  entry = debugPiletDefaults.entry,
185
186
  target = debugPiletDefaults.target,
186
- port = debugPiletDefaults.port,
187
187
  open = debugPiletDefaults.open,
188
188
  hmr = debugPiletDefaults.hmr,
189
+ port: originalPort = debugPiletDefaults.port,
189
190
  publicUrl: originalPublicUrl = debugPiletDefaults.publicUrl,
190
191
  logLevel = debugPiletDefaults.logLevel,
191
192
  concurrency = debugPiletDefaults.concurrency,
@@ -301,6 +302,7 @@ export async function debugPilet(baseDir = process.cwd(), options: DebugPiletOpt
301
302
  },
302
303
  };
303
304
  const configs = [krasBaseConfig, ...pilets.map((p) => resolve(p.root, krasrc)), krasRootConfig];
305
+ const port = await getAvailablePort(originalPort);
304
306
  const krasConfig = readKrasConfig({ port, initial, required }, ...configs);
305
307
 
306
308
  log('generalVerbose_0004', `Using kras with configuration: ${JSON.stringify(krasConfig, undefined, 2)}`);
@@ -16,6 +16,7 @@ import {
16
16
  logDone,
17
17
  getDestination,
18
18
  createInitialKrasConfig,
19
+ getAvailablePort,
19
20
  } from '../common';
20
21
 
21
22
  export interface DebugPiralOptions {
@@ -103,9 +104,9 @@ export async function debugPiral(baseDir = process.cwd(), options: DebugPiralOpt
103
104
  const {
104
105
  entry = debugPiralDefaults.entry,
105
106
  target = debugPiralDefaults.target,
106
- port = debugPiralDefaults.port,
107
107
  open = debugPiralDefaults.open,
108
108
  hmr = debugPiralDefaults.hmr,
109
+ port: originalPort = debugPiralDefaults.port,
109
110
  publicUrl: originalPublicUrl = debugPiralDefaults.publicUrl,
110
111
  logLevel = debugPiralDefaults.logLevel,
111
112
  optimizeModules = debugPiralDefaults.optimizeModules,
@@ -168,6 +169,7 @@ export async function debugPiral(baseDir = process.cwd(), options: DebugPiralOpt
168
169
  },
169
170
  },
170
171
  };
172
+ const port = await getAvailablePort(originalPort);
171
173
  const krasConfig = readKrasConfig({ port, initial, required }, krasBaseConfig, krasRootConfig);
172
174
 
173
175
  log('generalVerbose_0004', `Using kras with configuration: ${JSON.stringify(krasConfig, undefined, 2)}`);
@@ -90,7 +90,7 @@ async function publishRelease(
90
90
  }
91
91
 
92
92
  const files = await matchFiles(directory, '**/*');
93
- await publishArtifacts(providerName, files, args, interactive);
93
+ await publishArtifacts(providerName, directory, files, args, interactive);
94
94
  }
95
95
 
96
96
  export async function publishPiral(baseDir = process.cwd(), options: PublishPiralOptions = {}) {
@@ -57,28 +57,35 @@ export function downloadFile(target: string, ca?: Buffer): Promise<Array<string>
57
57
  });
58
58
  }
59
59
 
60
- export interface PostFileResult {
60
+ export interface PostFormResult {
61
61
  status: number;
62
62
  success: boolean;
63
63
  response?: object;
64
64
  }
65
65
 
66
- export function postFile(
66
+ export type FormDataObj = Record<string, string | [Buffer, string]>;
67
+
68
+ export function postForm(
67
69
  target: string,
68
70
  scheme: PiletPublishScheme,
69
71
  key: string,
70
- file: Buffer,
71
- customFields: Record<string, string> = {},
72
+ formData: FormDataObj,
72
73
  customHeaders: Record<string, string> = {},
73
74
  ca?: Buffer,
74
75
  interactive = false,
75
- ): Promise<PostFileResult> {
76
- const form = new FormData();
76
+ ): Promise<PostFormResult> {
77
77
  const httpsAgent = ca ? new Agent({ ca }) : undefined;
78
+ const form = new FormData();
78
79
 
79
- Object.keys(customFields).forEach((key) => form.append(key, customFields[key]));
80
+ Object.keys(formData).forEach((key) => {
81
+ const value = formData[key];
80
82
 
81
- form.append('file', file, 'pilet.tgz');
83
+ if (typeof value === 'string') {
84
+ form.append(key, value);
85
+ } else {
86
+ form.append(key, value[0], value[1]);
87
+ }
88
+ });
82
89
 
83
90
  const headers: Record<string, string> = {
84
91
  ...form.getHeaders(),
@@ -112,11 +119,13 @@ export function postFile(
112
119
  maxBodyLength: Infinity,
113
120
  })
114
121
  .then(
115
- (res) => ({
116
- status: res.status,
117
- success: true,
118
- response: res.data,
119
- }),
122
+ (res) => {
123
+ return {
124
+ status: res.status,
125
+ success: true,
126
+ response: res.data,
127
+ };
128
+ },
120
129
  (error) => {
121
130
  if (error.response) {
122
131
  // The request was made and the server responded with a status code
@@ -133,7 +142,7 @@ export function postFile(
133
142
  );
134
143
 
135
144
  return getTokenInteractively(interactiveAuth, httpsAgent).then(({ mode, token }) =>
136
- postFile(target, mode, token, file, customFields, customHeaders, ca, false),
145
+ postForm(target, mode, token, formData, customHeaders, ca, false),
137
146
  );
138
147
  }
139
148
  }
@@ -178,3 +187,17 @@ export function postFile(
178
187
  },
179
188
  );
180
189
  }
190
+
191
+ export function postFile(
192
+ target: string,
193
+ scheme: PiletPublishScheme,
194
+ key: string,
195
+ file: Buffer,
196
+ customFields: Record<string, string> = {},
197
+ customHeaders: Record<string, string> = {},
198
+ ca?: Buffer,
199
+ interactive = false,
200
+ ): Promise<PostFormResult> {
201
+ const data: FormDataObj = { ...customFields, file: [file, 'pilet.tgz'] };
202
+ return postForm(target, scheme, key, data, customHeaders, ca, interactive);
203
+ }
@@ -1,6 +1,7 @@
1
1
  import { Agent } from 'https';
2
2
  import { openBrowserAt } from './browser';
3
3
  import { standardHeaders } from './info';
4
+ import { logSuspend } from './log';
4
5
  import { axios, inquirer } from '../external';
5
6
  import { PiletPublishScheme } from '../types';
6
7
 
@@ -35,6 +36,8 @@ const tokenRetrievers: Record<string, TokenResult> = {};
35
36
 
36
37
  export function getTokenInteractively(url: string, httpsAgent: Agent): TokenResult {
37
38
  if (!(url in tokenRetrievers)) {
39
+ const logResume = logSuspend();
40
+
38
41
  tokenRetrievers[url] = axios.default
39
42
  .post(
40
43
  url,
@@ -60,12 +63,10 @@ export function getTokenInteractively(url: string, httpsAgent: Agent): TokenResu
60
63
 
61
64
  openBrowserAt(loginUrl);
62
65
 
63
- return axios.default.get(callbackUrl).then(({ data }) => {
64
- console.log('Logged in successfully.');
65
- return {
66
- ...data,
67
- };
68
- });
66
+ return axios.default
67
+ .get(callbackUrl)
68
+ .then(({ data }) => ({ ...data }))
69
+ .finally(logResume);
69
70
  });
70
71
  }
71
72
 
package/src/common/log.ts CHANGED
@@ -8,6 +8,7 @@ import { LogLevels, QuickMessage } from '../types';
8
8
 
9
9
  type Messages = typeof messages;
10
10
  type MessageTypes = keyof Messages;
11
+ let currentProgress: string = undefined;
11
12
 
12
13
  const logger = (() => {
13
14
  try {
@@ -92,7 +93,8 @@ export function logFail(message: string, ...args: Array<string | number | boolea
92
93
  }
93
94
 
94
95
  export function progress(message: string, ...args: Array<string | number | boolean>) {
95
- logger.progress(format(message, ...args));
96
+ currentProgress = format(message, ...args)
97
+ logger.progress(currentProgress);
96
98
  }
97
99
 
98
100
  export function logReset() {
@@ -100,6 +102,12 @@ export function logReset() {
100
102
  logger.stopSpinner();
101
103
  }
102
104
 
105
+ export function logSuspend() {
106
+ logReset();
107
+
108
+ return () => logger.progress(currentProgress);
109
+ }
110
+
103
111
  export function fail<T extends MessageTypes>(type: T, ...args: Parameters<Messages[T]>): never {
104
112
  const message = log(type, ...args);
105
113
  const error = new Error(message);
@@ -1,6 +1,16 @@
1
1
  import { log } from './log';
2
2
  import { getPort } from '../external';
3
3
 
4
+ export async function getAvailablePort(defaultPort: number) {
5
+ const selectedPort = await getFreePort(defaultPort);
6
+
7
+ if (selectedPort !== defaultPort) {
8
+ log('portNotFree_0047', selectedPort, defaultPort);
9
+ }
10
+
11
+ return selectedPort;
12
+ }
13
+
4
14
  export async function getFreePort(preferred?: number) {
5
15
  log('generalDebug_0003', `Looking for a free port. Preferred port: ${preferred}`);
6
16
  const port = await getPort(preferred && { port: preferred });
package/src/messages.ts CHANGED
@@ -953,6 +953,41 @@ export function cannotFindFile_0046(file: string): QuickMessage {
953
953
  return [LogLevels.error, '0046', `The file "${file}" does not exist!`];
954
954
  }
955
955
 
956
+ /**
957
+ * @kind Warning
958
+ *
959
+ * @summary
960
+ * Reported when the provided / default port was not available.
961
+ *
962
+ * @abstract
963
+ * By default, the debug commands spawn at the port 1234. However, under certain
964
+ * circumstances (e.g., another debug command running somewhere) this port may not
965
+ * be free.
966
+ *
967
+ * The piral-cli can select a new port, which is free, however, it will still report
968
+ * a warning message in such cases. You can then always abort the current debug
969
+ * process and start a new one - either closing the other run blocking the port or
970
+ * explicitly selecting a new one using the `--port` flag.
971
+ *
972
+ * @see
973
+ * - [Port (computer networking)](https://en.wikipedia.org/wiki/Port_(computer_networking))
974
+ *
975
+ * @example
976
+ * If you start one process to debug an app shell using `piral debug` and another process
977
+ * to debug some pilet using `pilet debug` both processes would want to run on the default
978
+ * port 1234.
979
+ *
980
+ * As a mitigation you can now either be very explicit, e.g., `piral debug --port 1010` and
981
+ * `pilet debug --port 1020` or you can just drop one of the two and always only run a single
982
+ * debug process.
983
+ *
984
+ * In any case, running both without any options also works, but then a new port will be chosen.
985
+ * The output of the Piral CLI will always show you what port is currently used.
986
+ */
987
+ export function portNotFree_0047(newPort: number, oldPort: number): QuickMessage {
988
+ return [LogLevels.warning, '0047', `The selected port "${oldPort}" is already used. Changed port to "${newPort}".`];
989
+ }
990
+
956
991
  /**
957
992
  * @kind Warning
958
993
  *
@@ -2256,6 +2291,58 @@ export function publishEmulatorSourcesInvalid_0114(): QuickMessage {
2256
2291
  ];
2257
2292
  }
2258
2293
 
2294
+ /**
2295
+ * @kind Error
2296
+ *
2297
+ * @summary
2298
+ * The "feed" provider requires a "--fields.url" argument.
2299
+ *
2300
+ * @abstract
2301
+ * The `piral publish --type release` command requires the selection of a suitable
2302
+ * provider for running successfully. The "feed" provider releases the files to
2303
+ * the a Piral Feed Service with the static page feature.
2304
+ *
2305
+ * Make sure to supply the URL for the feed service via the `--fields.url` command
2306
+ * line flag.
2307
+ *
2308
+ * @example
2309
+ * The following command would specify `https://feed.piral.cloud/api/v1/feed/sample/page`
2310
+ * for the feed service:
2311
+ *
2312
+ * ```sh
2313
+ * piral publish --type release --provider feed --fields.url "https://feed.piral.cloud/api/v1/feed/sample/page" --fields.apikey "foobar123"
2314
+ * ```
2315
+ */
2316
+ export function publishFeedMissingUrl_0115(): QuickMessage {
2317
+ return [LogLevels.error, '0115', `The "feed" provider requires a "--fields.url" argument.`];
2318
+ }
2319
+
2320
+ /**
2321
+ * @kind Error
2322
+ *
2323
+ * @summary
2324
+ * The "feed" provider requires a "--fields.version" argument.
2325
+ *
2326
+ * @abstract
2327
+ * The `piral publish --type release` command requires the selection of a suitable
2328
+ * provider for running successfully. The "feed" provider releases the files to
2329
+ * the a Piral Feed Service with the static page feature.
2330
+ *
2331
+ * Make sure to supply the version either explicitly via the `--fields.version` argument
2332
+ * or implicitly by having the artifacts stored in a sub-directory of the project's root,
2333
+ * which contains a package.json with the version to use.
2334
+ *
2335
+ * @example
2336
+ * The following command would specify version "1.2.3" for the feed service:
2337
+ *
2338
+ * ```sh
2339
+ * piral publish --type release --provider feed --fields.url "..." --fields.apikey "..." --fields.version "1.2.3"
2340
+ * ```
2341
+ */
2342
+ export function publishFeedMissingVersion_0116(): QuickMessage {
2343
+ return [LogLevels.error, '0116', `The "feed" provider requires either a "--fields.version" argument or a package.json with a version.`];
2344
+ }
2345
+
2259
2346
  /**
2260
2347
  * @kind Warning
2261
2348
  *
package/src/release.ts CHANGED
@@ -1,8 +1,19 @@
1
- import { basename, resolve } from 'path';
2
- import { copy, fail } from './common';
1
+ import { basename, dirname, relative, resolve } from 'path';
2
+ import { copy, fail, findFile, FormDataObj, postForm, readBinary } from './common';
3
3
  import { availableReleaseProviders } from './helpers';
4
4
  import { ReleaseProvider } from './types';
5
5
 
6
+ async function getVersion(directory: string) {
7
+ const data = await findFile(directory, 'package.json');
8
+
9
+ if (!data) {
10
+ fail('packageJsonNotFound_0020');
11
+ }
12
+
13
+ const { version } = require(data);
14
+ return version;
15
+ }
16
+
6
17
  export interface QualifiedReleaseProvider {
7
18
  name: string;
8
19
  action: ReleaseProvider;
@@ -12,7 +23,7 @@ const providers: Record<string, ReleaseProvider> = {
12
23
  none() {
13
24
  return Promise.resolve();
14
25
  },
15
- async xcopy(files, args) {
26
+ async xcopy(_, files, args) {
16
27
  const { target } = args;
17
28
 
18
29
  if (!target) {
@@ -21,8 +32,30 @@ const providers: Record<string, ReleaseProvider> = {
21
32
 
22
33
  await Promise.all(files.map(async (file) => copy(file, resolve(target, basename(file)))));
23
34
  },
24
- async feed(files, args, interactive) {
25
- //TODO post files to Piral Feed Service
35
+ async feed(directory, files, args, interactive) {
36
+ const { url, apiKey, scheme = 'basic', version = await getVersion(directory) } = args;
37
+
38
+ if (!url) {
39
+ fail('publishFeedMissingUrl_0115');
40
+ }
41
+
42
+ if (!version) {
43
+ fail('publishFeedMissingVersion_0116');
44
+ }
45
+
46
+ const data: FormDataObj = {
47
+ version,
48
+ type: 'custom',
49
+ };
50
+
51
+ for (const file of files) {
52
+ const relPath = relative(file, directory);
53
+ const fileName = basename(file);
54
+ const content = await readBinary(dirname(file), fileName);
55
+ data[relPath] = [content, fileName];
56
+ }
57
+
58
+ await postForm(url, scheme as any, apiKey, data, {}, undefined, interactive);
26
59
  },
27
60
  };
28
61
 
@@ -48,10 +81,11 @@ export function setReleaseProvider(provider: QualifiedReleaseProvider) {
48
81
 
49
82
  export function publishArtifacts(
50
83
  providerName: string,
84
+ directory: string,
51
85
  files: Array<string>,
52
86
  args: Record<string, string>,
53
87
  interactive: boolean,
54
88
  ) {
55
89
  const runRelease = findReleaseProvider(providerName);
56
- return runRelease(files, args, interactive);
90
+ return runRelease(directory, files, args, interactive);
57
91
  }
@@ -42,7 +42,7 @@ export interface Bundler {
42
42
  }
43
43
 
44
44
  export interface ReleaseProvider {
45
- (files: Array<string>, args: Record<string, string>, interactive: boolean): Promise<void>;
45
+ (directory: string, files: Array<string>, args: Record<string, string>, interactive: boolean): Promise<void>;
46
46
  }
47
47
 
48
48
  export interface TemplateFileLocation {