@lwrjs/core 0.7.0-alpha.14 → 0.7.0-alpha.17

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.
Files changed (6) hide show
  1. package/build/cjs/index.cjs +24 -10
  2. package/build/cjs/middlewares/hmr-middleware.cjs +8 -0
  3. package/build/es/index.d.ts +4 -1
  4. package/build/es/index.js +24 -10
  5. package/build/es/middlewares/hmr-middleware.js +9 -0
  6. package/package.json +29 -29
package/build/cjs/index.cjs CHANGED
@@ -213,17 +213,31 @@ var LwrApp = class {
213
213
  await this.init();
214
214
  const {server, config, app} = this;
215
215
  const {serverMode, port} = config;
216
- server.listen(port || config.port, async () => {
217
- if (process.env.WARMUP?.toLowerCase() === "true") {
218
- try {
219
- await (0, import_server_warmup.warmupServer)(config, app.getInternalRequestKey());
220
- } catch (err) {
221
- throw (0, import_diagnostics.createSingleDiagnosticError)({
222
- description: import_diagnostics.descriptions.SERVER.WARMUP_ERROR(err.message)
223
- }, import_diagnostics.LwrServerError);
216
+ return new Promise((resolve, reject) => {
217
+ const handleError = (err) => {
218
+ server.off("error", handleError);
219
+ if (err.code === "EADDRINUSE") {
220
+ err = new Error(`Port ${port} is already in use.`);
224
221
  }
225
- }
226
- callback?.({serverMode, port});
222
+ reject(err);
223
+ };
224
+ server.on("error", handleError);
225
+ server.listen(port, async () => {
226
+ server.off("error", handleError);
227
+ if (process.env.WARMUP?.toLowerCase() === "true") {
228
+ try {
229
+ await (0, import_server_warmup.warmupServer)(config, app.getInternalRequestKey());
230
+ } catch (err) {
231
+ const diagnostic = (0, import_diagnostics.createSingleDiagnosticError)({
232
+ description: import_diagnostics.descriptions.SERVER.WARMUP_ERROR(err.message)
233
+ }, import_diagnostics.LwrServerError);
234
+ return reject(diagnostic);
235
+ }
236
+ }
237
+ const opts = {serverMode, port};
238
+ callback?.(opts);
239
+ resolve(opts);
240
+ });
227
241
  });
228
242
  }
229
243
  async close() {
package/build/cjs/middlewares/hmr-middleware.cjs CHANGED
@@ -33,6 +33,7 @@ var hmr;
33
33
  var Hmr = class {
34
34
  constructor(server, context) {
35
35
  this.server = server;
36
+ this.context = context;
36
37
  this.moduleRegistry = context.moduleRegistry;
37
38
  const observer = context.appObserver;
38
39
  observer.onModuleDefinitionChange(({payload}) => this.updateModuleDefOnClients(payload));
@@ -57,6 +58,13 @@ var Hmr = class {
57
58
  ws.on("error", () => connectedClients.delete(ws));
58
59
  }
59
60
  });
61
+ wss.on("error", (error) => {
62
+ if (error.code === "EADDRINUSE") {
63
+ console.error(`HMR Socket Server: Port ${this.context.appConfig.port} already in use.`);
64
+ } else {
65
+ console.error(error);
66
+ }
67
+ });
60
68
  }
61
69
  updateModuleDefOnClients(moduleDefinition) {
62
70
  const {moduleRegistry} = this;
package/build/es/index.d.ts CHANGED
@@ -11,7 +11,10 @@ export declare class LwrApp {
11
11
  listen(callback?: ((opts: {
12
12
  serverMode: string;
13
13
  port: number;
14
- }) => void) | undefined): Promise<void>;
14
+ }) => void) | undefined): Promise<{
15
+ serverMode: string;
16
+ port: number;
17
+ }>;
15
18
  close(): Promise<void>;
16
19
  getInternalServer<S extends ServerTypes>(): ServerTypeImpl<S>;
17
20
  getServer(): PublicAppServer<ServerTypes>;
package/build/es/index.js CHANGED
@@ -179,18 +179,32 @@ export class LwrApp {
179
179
  await this.init();
180
180
  const { server, config, app } = this;
181
181
  const { serverMode, port } = config;
182
- server.listen(port || config.port, async () => {
183
- if (process.env.WARMUP?.toLowerCase() === 'true') {
184
- try {
185
- await warmupServer(config, app.getInternalRequestKey());
182
+ return new Promise((resolve, reject) => {
183
+ const handleError = (err) => {
184
+ server.off('error', handleError);
185
+ if (err.code === 'EADDRINUSE') {
186
+ err = new Error(`Port ${port} is already in use.`);
186
187
  }
187
- catch (err) {
188
- throw createSingleDiagnosticError({
189
- description: descriptions.SERVER.WARMUP_ERROR(err.message),
190
- }, LwrServerError);
188
+ reject(err);
189
+ };
190
+ server.on('error', handleError);
191
+ server.listen(port, async () => {
192
+ server.off('error', handleError);
193
+ if (process.env.WARMUP?.toLowerCase() === 'true') {
194
+ try {
195
+ await warmupServer(config, app.getInternalRequestKey());
196
+ }
197
+ catch (err) {
198
+ const diagnostic = createSingleDiagnosticError({
199
+ description: descriptions.SERVER.WARMUP_ERROR(err.message),
200
+ }, LwrServerError);
201
+ return reject(diagnostic);
202
+ }
191
203
  }
192
- }
193
- callback?.({ serverMode, port });
204
+ const opts = { serverMode, port };
205
+ callback?.(opts);
206
+ resolve(opts);
207
+ });
194
208
  });
195
209
  }
196
210
  async close() {
package/build/es/middlewares/hmr-middleware.js CHANGED
@@ -5,6 +5,7 @@ let hmr;
5
5
  class Hmr {
6
6
  constructor(server, context) {
7
7
  this.server = server;
8
+ this.context = context;
8
9
  this.moduleRegistry = context.moduleRegistry;
9
10
  const observer = context.appObserver;
10
11
  observer.onModuleDefinitionChange(({ payload }) => this.updateModuleDefOnClients(payload));
@@ -30,6 +31,14 @@ class Hmr {
30
31
  ws.on('error', () => connectedClients.delete(ws));
31
32
  }
32
33
  });
34
+ wss.on('error', (error) => {
35
+ if (error.code === 'EADDRINUSE') {
36
+ console.error(`HMR Socket Server: Port ${this.context.appConfig.port} already in use.`);
37
+ }
38
+ else {
39
+ console.error(error);
40
+ }
41
+ });
33
42
  }
34
43
  updateModuleDefOnClients(moduleDefinition) {
35
44
  const { moduleRegistry } = this;
package/package.json CHANGED
@@ -4,7 +4,7 @@
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
7
- "version": "0.7.0-alpha.14",
7
+ "version": "0.7.0-alpha.17",
8
8
  "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
9
9
  "repository": {
10
10
  "type": "git",
@@ -33,32 +33,32 @@
33
33
  "package.cjs"
34
34
  ],
35
35
  "dependencies": {
36
- "@lwrjs/app-service": "0.7.0-alpha.14",
37
- "@lwrjs/asset-registry": "0.7.0-alpha.14",
38
- "@lwrjs/asset-transformer": "0.7.0-alpha.14",
39
- "@lwrjs/base-template-engine": "0.7.0-alpha.14",
40
- "@lwrjs/base-view-provider": "0.7.0-alpha.14",
41
- "@lwrjs/base-view-transformer": "0.7.0-alpha.14",
42
- "@lwrjs/client-modules": "0.7.0-alpha.14",
43
- "@lwrjs/compiler": "0.7.0-alpha.14",
44
- "@lwrjs/diagnostics": "0.7.0-alpha.14",
45
- "@lwrjs/fs-asset-provider": "0.7.0-alpha.14",
46
- "@lwrjs/html-view-provider": "0.7.0-alpha.14",
47
- "@lwrjs/loader": "0.7.0-alpha.14",
48
- "@lwrjs/lwc-module-provider": "0.7.0-alpha.14",
49
- "@lwrjs/lwc-ssr": "0.7.0-alpha.14",
50
- "@lwrjs/markdown-view-provider": "0.7.0-alpha.14",
51
- "@lwrjs/module-bundler": "0.7.0-alpha.14",
52
- "@lwrjs/module-registry": "0.7.0-alpha.14",
53
- "@lwrjs/npm-module-provider": "0.7.0-alpha.14",
54
- "@lwrjs/nunjucks-view-provider": "0.7.0-alpha.14",
55
- "@lwrjs/o11y": "0.7.0-alpha.14",
56
- "@lwrjs/resource-registry": "0.7.0-alpha.14",
57
- "@lwrjs/router": "0.7.0-alpha.14",
58
- "@lwrjs/server": "0.7.0-alpha.14",
59
- "@lwrjs/shared-utils": "0.7.0-alpha.14",
60
- "@lwrjs/view-registry": "0.7.0-alpha.14",
61
- "fs-extra": "^10.0.0",
36
+ "@lwrjs/app-service": "0.7.0-alpha.17",
37
+ "@lwrjs/asset-registry": "0.7.0-alpha.17",
38
+ "@lwrjs/asset-transformer": "0.7.0-alpha.17",
39
+ "@lwrjs/base-template-engine": "0.7.0-alpha.17",
40
+ "@lwrjs/base-view-provider": "0.7.0-alpha.17",
41
+ "@lwrjs/base-view-transformer": "0.7.0-alpha.17",
42
+ "@lwrjs/client-modules": "0.7.0-alpha.17",
43
+ "@lwrjs/compiler": "0.7.0-alpha.17",
44
+ "@lwrjs/diagnostics": "0.7.0-alpha.17",
45
+ "@lwrjs/fs-asset-provider": "0.7.0-alpha.17",
46
+ "@lwrjs/html-view-provider": "0.7.0-alpha.17",
47
+ "@lwrjs/loader": "0.7.0-alpha.17",
48
+ "@lwrjs/lwc-module-provider": "0.7.0-alpha.17",
49
+ "@lwrjs/lwc-ssr": "0.7.0-alpha.17",
50
+ "@lwrjs/markdown-view-provider": "0.7.0-alpha.17",
51
+ "@lwrjs/module-bundler": "0.7.0-alpha.17",
52
+ "@lwrjs/module-registry": "0.7.0-alpha.17",
53
+ "@lwrjs/npm-module-provider": "0.7.0-alpha.17",
54
+ "@lwrjs/nunjucks-view-provider": "0.7.0-alpha.17",
55
+ "@lwrjs/o11y": "0.7.0-alpha.17",
56
+ "@lwrjs/resource-registry": "0.7.0-alpha.17",
57
+ "@lwrjs/router": "0.7.0-alpha.17",
58
+ "@lwrjs/server": "0.7.0-alpha.17",
59
+ "@lwrjs/shared-utils": "0.7.0-alpha.17",
60
+ "@lwrjs/view-registry": "0.7.0-alpha.17",
61
+ "fs-extra": "^10.1.0",
62
62
  "jsdom": "^16.7.0",
63
63
  "jsonc-parser": "^3.0.0",
64
64
  "ms": "^2.1.3",
@@ -66,7 +66,7 @@
66
66
  "qs": "^6.9.4"
67
67
  },
68
68
  "devDependencies": {
69
- "@lwrjs/types": "0.7.0-alpha.14"
69
+ "@lwrjs/types": "0.7.0-alpha.17"
70
70
  },
71
71
  "peerDependencies": {
72
72
  "lwc": ">= 1.x <= 2.x"
@@ -74,5 +74,5 @@
74
74
  "engines": {
75
75
  "node": ">=14.15.4 <17"
76
76
  },
77
- "gitHead": "60265ddd2d76cd898ce3c3593c24d5488ce68467"
77
+ "gitHead": "d664cf021a3b2cb7d38c449169e842d7109f8928"
78
78
  }