piral-cli 1.5.0-beta.6658 → 1.5.0-beta.6684
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/lib/apps/debug-pilet.js +8 -2
- package/lib/apps/debug-pilet.js.map +1 -1
- package/lib/apps/debug-piral.js +5 -1
- package/lib/apps/debug-piral.js.map +1 -1
- package/lib/build/bundler-calls.js +4 -1
- package/lib/build/bundler-calls.js.map +1 -1
- package/lib/platforms/web.js +20 -7
- package/lib/platforms/web.js.map +1 -1
- package/lib/types/common.d.ts +8 -4
- package/package.json +2 -2
- package/src/apps/debug-pilet.ts +10 -3
- package/src/apps/debug-piral.ts +6 -2
- package/src/build/bundler-calls.ts +4 -1
- package/src/platforms/web.ts +25 -8
- package/src/types/common.ts +9 -4
package/lib/apps/debug-pilet.js
CHANGED
|
@@ -76,6 +76,7 @@ async function debugPilet(baseDir = process.cwd(), options = {}) {
|
|
|
76
76
|
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, krasrc: customkrasrc = exports.debugPiletDefaults.krasrc, optimizeModules = exports.debugPiletDefaults.optimizeModules, schemaVersion: originalSchemaVersion = exports.debugPiletDefaults.schemaVersion, _ = {}, hooks = {}, bundlerName, app, appInstanceDir, feed, } = options;
|
|
77
77
|
const publicUrl = (0, common_1.normalizePublicUrl)(originalPublicUrl);
|
|
78
78
|
const fullBase = (0, path_1.resolve)(process.cwd(), baseDir);
|
|
79
|
+
const networks = [];
|
|
79
80
|
(0, common_1.setLogLevel)(logLevel);
|
|
80
81
|
await hooks.onBegin?.({ options, fullBase });
|
|
81
82
|
const watcherRef = await (0, common_1.watcherTask)(async (watcherContext) => {
|
|
@@ -158,7 +159,12 @@ async function debugPilet(baseDir = process.cwd(), options = {}) {
|
|
|
158
159
|
}
|
|
159
160
|
await Promise.all(appInstances.sort(byPort).map(async ([appDir, appPort], i) => {
|
|
160
161
|
const platform = (0, common_1.configurePlatform)();
|
|
161
|
-
|
|
162
|
+
if (networks.length === i) {
|
|
163
|
+
networks.push({
|
|
164
|
+
port: appPort || originalPort + i,
|
|
165
|
+
type: 'proposed',
|
|
166
|
+
});
|
|
167
|
+
}
|
|
162
168
|
await platform.startModule({
|
|
163
169
|
appDir,
|
|
164
170
|
pilets,
|
|
@@ -167,7 +173,7 @@ async function debugPilet(baseDir = process.cwd(), options = {}) {
|
|
|
167
173
|
fullBase,
|
|
168
174
|
hooks,
|
|
169
175
|
open,
|
|
170
|
-
|
|
176
|
+
network: networks[i],
|
|
171
177
|
publicUrl,
|
|
172
178
|
maxListeners,
|
|
173
179
|
registerEnd(cb) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-pilet.js","sourceRoot":"","sources":["../../src/apps/debug-pilet.ts"],"names":[],"mappings":";;;AAAA,+BAAkE;AAClE,wCAAwE;AACxE,
|
|
1
|
+
{"version":3,"file":"debug-pilet.js","sourceRoot":"","sources":["../../src/apps/debug-pilet.ts"],"names":[],"mappings":"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"}
|
package/lib/apps/debug-piral.js
CHANGED
|
@@ -20,6 +20,10 @@ async function debugPiral(baseDir = process.cwd(), options = {}) {
|
|
|
20
20
|
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, krasrc: customkrasrc = exports.debugPiralDefaults.krasrc, optimizeModules = exports.debugPiralDefaults.optimizeModules, feed, _ = {}, hooks = {}, bundlerName, } = options;
|
|
21
21
|
const publicUrl = (0, common_1.normalizePublicUrl)(originalPublicUrl);
|
|
22
22
|
const fullBase = (0, path_1.resolve)(process.cwd(), baseDir);
|
|
23
|
+
const network = {
|
|
24
|
+
port: originalPort,
|
|
25
|
+
type: 'proposed',
|
|
26
|
+
};
|
|
23
27
|
(0, common_1.setLogLevel)(logLevel);
|
|
24
28
|
await hooks.onBegin?.({ options, fullBase });
|
|
25
29
|
(0, common_1.progress)('Reading configuration ...');
|
|
@@ -66,7 +70,7 @@ async function debugPiral(baseDir = process.cwd(), options = {}) {
|
|
|
66
70
|
fullBase,
|
|
67
71
|
hooks,
|
|
68
72
|
open,
|
|
69
|
-
|
|
73
|
+
network,
|
|
70
74
|
publicUrl,
|
|
71
75
|
root,
|
|
72
76
|
targetDir,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-piral.js","sourceRoot":"","sources":["../../src/apps/debug-piral.ts"],"names":[],"mappings":";;;AAAA,+BAA8C;AAC9C,wCAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"debug-piral.js","sourceRoot":"","sources":["../../src/apps/debug-piral.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundler-calls.js","sourceRoot":"","sources":["../../src/build/bundler-calls.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,iDAAmD;AAGnD,SAAS,OAAO,CAAC,IAAY;IAC3B,OAAO,IAAA,cAAO,EAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,IAAI,KAAK,CAAC,CAAC;AAC1E,CAAC;AAID,SAAS,aAAa,CAAC,GAAW,EAAE,EAAgB,EAAE,IAAS;IAC7D,IAAI,OAAO,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAChC,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,MAAM,SAAS,GAA0B,EAAE,CAAC;IAC5C,MAAM,MAAM,GAAkB;QAC5B,GAAG,EAAE,GAAG;QACR,IAAI,EAAE,EAAE;QACR,IAAI,EAAE,EAAE;KACT,CAAC;IACF,MAAM,UAAU,GAAG,GAAG,EAAE;QACtB,OAAO,GAAG,IAAI,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YAC7B,MAAM,CAAC,GAAG,GAAG,EAAE;gBACb,IAAI,EAAE,CAAC;gBACP,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACjB,CAAC,CAAC;YACF,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAChB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IACF,MAAM,OAAO,GAAG;QACd,MAAM;QACN,KAAK;YACH,IAAI,CAAC,OAAO,EAAE;gBACZ,OAAO,GAAG,IAAI,CAAC;gBACf,EAAE,CAAC,IAAI,CAAC;oBACN,IAAI,EAAE,QAAQ;oBACd,GAAG,IAAI;iBACR,CAAC,CAAC;aACJ;QACH,CAAC;QACD,IAAI;YACF,EAAE,CAAC,IAAI,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"bundler-calls.js","sourceRoot":"","sources":["../../src/build/bundler-calls.ts"],"names":[],"mappings":"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"}
|
package/lib/platforms/web.js
CHANGED
|
@@ -9,8 +9,15 @@ const config_1 = require("../common/config");
|
|
|
9
9
|
const browser_1 = require("../common/browser");
|
|
10
10
|
const io_1 = require("../common/io");
|
|
11
11
|
const port_1 = require("../common/port");
|
|
12
|
+
async function getPort(network) {
|
|
13
|
+
if (network.type === 'proposed') {
|
|
14
|
+
network.port = await (0, port_1.getAvailablePort)(network.port);
|
|
15
|
+
network.type = 'fixed';
|
|
16
|
+
}
|
|
17
|
+
return network.port;
|
|
18
|
+
}
|
|
12
19
|
async function startModule(options) {
|
|
13
|
-
const { appDir, fullBase, open, feed, publicUrl, customkrasrc,
|
|
20
|
+
const { appDir, fullBase, open, feed, publicUrl, customkrasrc, network, hooks, registerWatcher, registerEnd, pilets, maxListeners, } = options;
|
|
14
21
|
const sources = pilets.map((m) => m.mocks).filter(Boolean);
|
|
15
22
|
const api = `${publicUrl}${config_1.config.piletApi.replace(/^\/+/, '')}`;
|
|
16
23
|
const baseMocks = (0, path_1.resolve)(fullBase, 'mocks');
|
|
@@ -41,13 +48,16 @@ async function startModule(options) {
|
|
|
41
48
|
configs.push((0, path_1.resolve)(fullBase, customkrasrc));
|
|
42
49
|
}
|
|
43
50
|
configs.forEach(registerWatcher);
|
|
44
|
-
const
|
|
51
|
+
const shouldNotify = network.type === 'proposed';
|
|
52
|
+
const port = await getPort(network);
|
|
45
53
|
const krasConfig = (0, kras_1.readKrasConfig)({ port, initial, required }, ...configs);
|
|
46
54
|
(0, log_1.log)('generalVerbose_0004', `Using kras with configuration: ${JSON.stringify(krasConfig, undefined, 2)}`);
|
|
47
55
|
const krasServer = (0, kras_1.buildKrasWithCli)(krasConfig);
|
|
48
56
|
krasServer.setMaxListeners(maxListeners);
|
|
49
57
|
krasServer.removeAllListeners('open');
|
|
50
|
-
|
|
58
|
+
if (shouldNotify) {
|
|
59
|
+
krasServer.on('open', (0, injectors_1.notifyServerOnline)(publicUrl, krasConfig.api));
|
|
60
|
+
}
|
|
51
61
|
await hooks.beforeOnline?.({ krasServer, krasConfig, open, port, api, feed, pilets, publicUrl });
|
|
52
62
|
await krasServer.start();
|
|
53
63
|
(0, browser_1.openBrowser)(open, port, publicUrl, !!krasConfig.ssl);
|
|
@@ -55,7 +65,7 @@ async function startModule(options) {
|
|
|
55
65
|
registerEnd(() => krasServer.stop());
|
|
56
66
|
}
|
|
57
67
|
async function startShell(options) {
|
|
58
|
-
const { fullBase, open, root, targetDir, feed, publicUrl, bundler, customkrasrc,
|
|
68
|
+
const { fullBase, open, root, targetDir, feed, publicUrl, bundler, customkrasrc, network, hooks, registerWatcher, registerEnd, } = options;
|
|
59
69
|
const krasBaseConfig = (0, path_1.resolve)(fullBase, kras_1.krasrc);
|
|
60
70
|
const krasRootConfig = (0, path_1.resolve)(root, kras_1.krasrc);
|
|
61
71
|
const mocks = (0, path_1.join)(targetDir, 'mocks');
|
|
@@ -82,18 +92,21 @@ async function startShell(options) {
|
|
|
82
92
|
configs.push((0, path_1.resolve)(fullBase, customkrasrc));
|
|
83
93
|
}
|
|
84
94
|
configs.forEach(registerWatcher);
|
|
85
|
-
const
|
|
95
|
+
const shouldNotify = network.type === 'proposed';
|
|
96
|
+
const port = await getPort(network);
|
|
86
97
|
const krasConfig = (0, kras_1.readKrasConfig)({ port, initial, required }, ...configs);
|
|
87
98
|
(0, log_1.log)('generalVerbose_0004', `Using kras with configuration: ${JSON.stringify(krasConfig, undefined, 2)}`);
|
|
88
99
|
const krasServer = (0, kras_1.buildKrasWithCli)(krasConfig);
|
|
89
100
|
krasServer.setMaxListeners(16);
|
|
90
101
|
krasServer.removeAllListeners('open');
|
|
91
|
-
|
|
102
|
+
if (shouldNotify) {
|
|
103
|
+
krasServer.on('open', (0, injectors_1.notifyServerOnline)(publicUrl, krasConfig.api));
|
|
104
|
+
}
|
|
92
105
|
await hooks.beforeOnline?.({ krasServer, krasConfig, open, port, publicUrl });
|
|
93
106
|
await krasServer.start();
|
|
94
107
|
(0, browser_1.openBrowser)(open, port, publicUrl, !!krasConfig.ssl);
|
|
95
108
|
await hooks.afterOnline?.({ krasServer, krasConfig, open, port, publicUrl });
|
|
96
|
-
registerEnd(() => krasServer.stop());
|
|
109
|
+
registerEnd(async () => krasServer.stop());
|
|
97
110
|
}
|
|
98
111
|
function setup() {
|
|
99
112
|
return {
|
package/lib/platforms/web.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web.js","sourceRoot":"","sources":["../../src/platforms/web.ts"],"names":[],"mappings":";;;AAAA,+BAAgE;AAChE,+BAA8C;AAC9C,mDAAkF;AAClF,uCAAoC;AACpC,6CAA0C;AAC1C,+CAAgD;AAChD,qCAAgE;AAChE,yCAAkD;AAGlD,KAAK,UAAU,WAAW,CAAC,OAAmC;IAC5D,MAAM,EACJ,MAAM,EACN,QAAQ,EACR,IAAI,EACJ,IAAI,EACJ,SAAS,EACT,YAAY,EACZ,
|
|
1
|
+
{"version":3,"file":"web.js","sourceRoot":"","sources":["../../src/platforms/web.ts"],"names":[],"mappings":"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"}
|
package/lib/types/common.d.ts
CHANGED
|
@@ -101,11 +101,15 @@ export interface BundleDetails {
|
|
|
101
101
|
export interface Bundler {
|
|
102
102
|
readonly bundle: BundleDetails;
|
|
103
103
|
start(): void;
|
|
104
|
-
stop(): void
|
|
104
|
+
stop(): Promise<void>;
|
|
105
105
|
on(cb: (args: any) => void): void;
|
|
106
106
|
off(cb: (args: any) => void): void;
|
|
107
107
|
ready(): Promise<void>;
|
|
108
108
|
}
|
|
109
|
+
export interface NetworkSpec {
|
|
110
|
+
port: number;
|
|
111
|
+
type: 'proposed' | 'fixed';
|
|
112
|
+
}
|
|
109
113
|
export interface PlatformStartModuleOptions {
|
|
110
114
|
appDir?: string;
|
|
111
115
|
open: boolean;
|
|
@@ -113,7 +117,7 @@ export interface PlatformStartModuleOptions {
|
|
|
113
117
|
feed: string | Array<string>;
|
|
114
118
|
publicUrl: string;
|
|
115
119
|
customkrasrc: string;
|
|
116
|
-
|
|
120
|
+
network: NetworkSpec;
|
|
117
121
|
hooks: Record<string, Function>;
|
|
118
122
|
registerWatcher(file: string): void;
|
|
119
123
|
registerEnd(cb: () => void): void;
|
|
@@ -129,10 +133,10 @@ export interface PlatformStartShellOptions {
|
|
|
129
133
|
publicUrl: string;
|
|
130
134
|
bundler: Bundler;
|
|
131
135
|
customkrasrc: string;
|
|
132
|
-
|
|
136
|
+
network: NetworkSpec;
|
|
133
137
|
hooks: Record<string, Function>;
|
|
134
138
|
registerWatcher(file: string): void;
|
|
135
|
-
registerEnd(cb: () => void): void;
|
|
139
|
+
registerEnd(cb: () => void | Promise<void>): void;
|
|
136
140
|
}
|
|
137
141
|
export interface ReleaseProvider {
|
|
138
142
|
(directory: string, files: Array<string>, args: Record<string, string>, interactive: boolean): Promise<void>;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "piral-cli",
|
|
3
|
-
"version": "1.5.0-beta.
|
|
3
|
+
"version": "1.5.0-beta.6684",
|
|
4
4
|
"description": "The standard CLI for creating and building a Piral instance or a Pilet.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"portal",
|
|
@@ -81,5 +81,5 @@
|
|
|
81
81
|
"typescript": "^5.0.0",
|
|
82
82
|
"yargs": "^15.0.0"
|
|
83
83
|
},
|
|
84
|
-
"gitHead": "
|
|
84
|
+
"gitHead": "2619f43474cb2825c357cf425e31da0816878c2c"
|
|
85
85
|
}
|
package/src/apps/debug-pilet.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { join, dirname, resolve, relative, basename } from 'path';
|
|
2
2
|
import { callDebugPiralFromMonoRepo, callPiletDebug } from '../bundler';
|
|
3
|
-
import { AppDefinition, LogLevels, PiletSchemaVersion } from '../types';
|
|
3
|
+
import { AppDefinition, LogLevels, NetworkSpec, PiletSchemaVersion } from '../types';
|
|
4
4
|
import {
|
|
5
5
|
checkExistingDirectory,
|
|
6
6
|
retrievePiletData,
|
|
@@ -230,6 +230,7 @@ export async function debugPilet(baseDir = process.cwd(), options: DebugPiletOpt
|
|
|
230
230
|
} = options;
|
|
231
231
|
const publicUrl = normalizePublicUrl(originalPublicUrl);
|
|
232
232
|
const fullBase = resolve(process.cwd(), baseDir);
|
|
233
|
+
const networks: Array<NetworkSpec> = [];
|
|
233
234
|
setLogLevel(logLevel);
|
|
234
235
|
|
|
235
236
|
await hooks.onBegin?.({ options, fullBase });
|
|
@@ -341,7 +342,13 @@ export async function debugPilet(baseDir = process.cwd(), options: DebugPiletOpt
|
|
|
341
342
|
await Promise.all(
|
|
342
343
|
appInstances.sort(byPort).map(async ([appDir, appPort], i) => {
|
|
343
344
|
const platform = configurePlatform();
|
|
344
|
-
|
|
345
|
+
|
|
346
|
+
if (networks.length === i) {
|
|
347
|
+
networks.push({
|
|
348
|
+
port: appPort || originalPort + i,
|
|
349
|
+
type: 'proposed',
|
|
350
|
+
});
|
|
351
|
+
}
|
|
345
352
|
|
|
346
353
|
await platform.startModule({
|
|
347
354
|
appDir,
|
|
@@ -351,7 +358,7 @@ export async function debugPilet(baseDir = process.cwd(), options: DebugPiletOpt
|
|
|
351
358
|
fullBase,
|
|
352
359
|
hooks,
|
|
353
360
|
open,
|
|
354
|
-
|
|
361
|
+
network: networks[i],
|
|
355
362
|
publicUrl,
|
|
356
363
|
maxListeners,
|
|
357
364
|
registerEnd(cb) {
|
package/src/apps/debug-piral.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { dirname, join, resolve } from 'path';
|
|
2
2
|
import { callPiralDebug } from '../bundler';
|
|
3
|
-
import { LogLevels } from '../types';
|
|
3
|
+
import { LogLevels, NetworkSpec } from '../types';
|
|
4
4
|
import {
|
|
5
5
|
retrievePiletsInfo,
|
|
6
6
|
retrievePiralRoot,
|
|
@@ -124,6 +124,10 @@ export async function debugPiral(baseDir = process.cwd(), options: DebugPiralOpt
|
|
|
124
124
|
} = options;
|
|
125
125
|
const publicUrl = normalizePublicUrl(originalPublicUrl);
|
|
126
126
|
const fullBase = resolve(process.cwd(), baseDir);
|
|
127
|
+
const network: NetworkSpec = {
|
|
128
|
+
port: originalPort,
|
|
129
|
+
type: 'proposed',
|
|
130
|
+
};
|
|
127
131
|
setLogLevel(logLevel);
|
|
128
132
|
|
|
129
133
|
await hooks.onBegin?.({ options, fullBase });
|
|
@@ -187,7 +191,7 @@ export async function debugPiral(baseDir = process.cwd(), options: DebugPiralOpt
|
|
|
187
191
|
fullBase,
|
|
188
192
|
hooks,
|
|
189
193
|
open,
|
|
190
|
-
|
|
194
|
+
network,
|
|
191
195
|
publicUrl,
|
|
192
196
|
root,
|
|
193
197
|
targetDir,
|
package/src/platforms/web.ts
CHANGED
|
@@ -6,7 +6,16 @@ import { config } from '../common/config';
|
|
|
6
6
|
import { openBrowser } from '../common/browser';
|
|
7
7
|
import { checkExistingDirectory, findFile } from '../common/io';
|
|
8
8
|
import { getAvailablePort } from '../common/port';
|
|
9
|
-
import { PlatformStartShellOptions, PlatformStartModuleOptions } from '../types';
|
|
9
|
+
import { PlatformStartShellOptions, PlatformStartModuleOptions, NetworkSpec } from '../types';
|
|
10
|
+
|
|
11
|
+
async function getPort(network: NetworkSpec) {
|
|
12
|
+
if (network.type === 'proposed') {
|
|
13
|
+
network.port = await getAvailablePort(network.port);
|
|
14
|
+
network.type = 'fixed';
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
return network.port;
|
|
18
|
+
}
|
|
10
19
|
|
|
11
20
|
async function startModule(options: PlatformStartModuleOptions) {
|
|
12
21
|
const {
|
|
@@ -16,7 +25,7 @@ async function startModule(options: PlatformStartModuleOptions) {
|
|
|
16
25
|
feed,
|
|
17
26
|
publicUrl,
|
|
18
27
|
customkrasrc,
|
|
19
|
-
|
|
28
|
+
network,
|
|
20
29
|
hooks,
|
|
21
30
|
registerWatcher,
|
|
22
31
|
registerEnd,
|
|
@@ -60,7 +69,8 @@ async function startModule(options: PlatformStartModuleOptions) {
|
|
|
60
69
|
|
|
61
70
|
configs.forEach(registerWatcher);
|
|
62
71
|
|
|
63
|
-
const
|
|
72
|
+
const shouldNotify = network.type === 'proposed';
|
|
73
|
+
const port = await getPort(network);
|
|
64
74
|
const krasConfig = readKrasConfig({ port, initial, required }, ...configs);
|
|
65
75
|
|
|
66
76
|
log('generalVerbose_0004', `Using kras with configuration: ${JSON.stringify(krasConfig, undefined, 2)}`);
|
|
@@ -68,7 +78,10 @@ async function startModule(options: PlatformStartModuleOptions) {
|
|
|
68
78
|
const krasServer = buildKrasWithCli(krasConfig);
|
|
69
79
|
krasServer.setMaxListeners(maxListeners);
|
|
70
80
|
krasServer.removeAllListeners('open');
|
|
71
|
-
|
|
81
|
+
|
|
82
|
+
if (shouldNotify) {
|
|
83
|
+
krasServer.on('open', notifyServerOnline(publicUrl, krasConfig.api));
|
|
84
|
+
}
|
|
72
85
|
|
|
73
86
|
await hooks.beforeOnline?.({ krasServer, krasConfig, open, port, api, feed, pilets, publicUrl });
|
|
74
87
|
await krasServer.start();
|
|
@@ -88,7 +101,7 @@ async function startShell(options: PlatformStartShellOptions) {
|
|
|
88
101
|
publicUrl,
|
|
89
102
|
bundler,
|
|
90
103
|
customkrasrc,
|
|
91
|
-
|
|
104
|
+
network,
|
|
92
105
|
hooks,
|
|
93
106
|
registerWatcher,
|
|
94
107
|
registerEnd,
|
|
@@ -123,21 +136,25 @@ async function startShell(options: PlatformStartShellOptions) {
|
|
|
123
136
|
|
|
124
137
|
configs.forEach(registerWatcher);
|
|
125
138
|
|
|
126
|
-
const
|
|
139
|
+
const shouldNotify = network.type === 'proposed';
|
|
140
|
+
const port = await getPort(network);
|
|
127
141
|
const krasConfig = readKrasConfig({ port, initial, required }, ...configs);
|
|
128
142
|
log('generalVerbose_0004', `Using kras with configuration: ${JSON.stringify(krasConfig, undefined, 2)}`);
|
|
129
143
|
|
|
130
144
|
const krasServer = buildKrasWithCli(krasConfig);
|
|
131
145
|
krasServer.setMaxListeners(16);
|
|
132
146
|
krasServer.removeAllListeners('open');
|
|
133
|
-
|
|
147
|
+
|
|
148
|
+
if (shouldNotify) {
|
|
149
|
+
krasServer.on('open', notifyServerOnline(publicUrl, krasConfig.api));
|
|
150
|
+
}
|
|
134
151
|
|
|
135
152
|
await hooks.beforeOnline?.({ krasServer, krasConfig, open, port, publicUrl });
|
|
136
153
|
await krasServer.start();
|
|
137
154
|
openBrowser(open, port, publicUrl, !!krasConfig.ssl);
|
|
138
155
|
await hooks.afterOnline?.({ krasServer, krasConfig, open, port, publicUrl });
|
|
139
156
|
|
|
140
|
-
registerEnd(() => krasServer.stop());
|
|
157
|
+
registerEnd(async () => krasServer.stop());
|
|
141
158
|
}
|
|
142
159
|
|
|
143
160
|
export function setup() {
|
package/src/types/common.ts
CHANGED
|
@@ -112,12 +112,17 @@ export interface BundleDetails {
|
|
|
112
112
|
export interface Bundler {
|
|
113
113
|
readonly bundle: BundleDetails;
|
|
114
114
|
start(): void;
|
|
115
|
-
stop(): void
|
|
115
|
+
stop(): Promise<void>;
|
|
116
116
|
on(cb: (args: any) => void): void;
|
|
117
117
|
off(cb: (args: any) => void): void;
|
|
118
118
|
ready(): Promise<void>;
|
|
119
119
|
}
|
|
120
120
|
|
|
121
|
+
export interface NetworkSpec {
|
|
122
|
+
port: number;
|
|
123
|
+
type: 'proposed' | 'fixed';
|
|
124
|
+
}
|
|
125
|
+
|
|
121
126
|
export interface PlatformStartModuleOptions {
|
|
122
127
|
appDir?: string;
|
|
123
128
|
open: boolean;
|
|
@@ -125,7 +130,7 @@ export interface PlatformStartModuleOptions {
|
|
|
125
130
|
feed: string | Array<string>;
|
|
126
131
|
publicUrl: string;
|
|
127
132
|
customkrasrc: string;
|
|
128
|
-
|
|
133
|
+
network: NetworkSpec;
|
|
129
134
|
hooks: Record<string, Function>;
|
|
130
135
|
registerWatcher(file: string): void;
|
|
131
136
|
registerEnd(cb: () => void): void;
|
|
@@ -143,10 +148,10 @@ export interface PlatformStartShellOptions {
|
|
|
143
148
|
publicUrl: string;
|
|
144
149
|
bundler: Bundler;
|
|
145
150
|
customkrasrc: string;
|
|
146
|
-
|
|
151
|
+
network: NetworkSpec;
|
|
147
152
|
hooks: Record<string, Function>;
|
|
148
153
|
registerWatcher(file: string): void;
|
|
149
|
-
registerEnd(cb: () => void): void;
|
|
154
|
+
registerEnd(cb: () => void | Promise<void>): void;
|
|
150
155
|
}
|
|
151
156
|
|
|
152
157
|
export interface ReleaseProvider {
|