@tremho/mist-lift 2.0.2-pre-release.1 → 2.0.2-pre-release.2
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 +12 -0
- package/build/commands/deploy.js +9 -5
- package/build/commands/deploy.js.map +1 -1
- package/build/commands/init.js +8 -1
- package/build/commands/init.js.map +1 -1
- package/build/commands/start.js +3 -2
- package/build/commands/start.js.map +1 -1
- package/package.json +1 -1
- package/src/commands/deploy.ts +9 -4
- package/src/commands/init.ts +10 -1
- package/src/commands/start.ts +3 -1
- package/templateData/function-definition-template +1 -0
- package/templateData/localServerConfig.json +12 -0
- package/templateData/webroot/app.css +1 -0
- package/templateData/webroot/app.js +9 -0
- package/templateData/webroot/index.html +13 -0
- package/templateData/webroot/watcher.js +31 -0
package/README.md
CHANGED
|
@@ -3,10 +3,18 @@
|
|
|
3
3
|
|
|
4
4
|
_CLI tools and structured project support for easy-access cloud development_
|
|
5
5
|
|
|
6
|
+
[![AWSLogo][aws-logo]][aws-url]
|
|
7
|
+
[![AWSFeature][aws-feature]][lambda-url]
|
|
8
|
+
|
|
6
9
|
[![NPM version][npm-image]][npm-url]
|
|
7
10
|
[![Downloads][downloads-image]][npm-url]
|
|
8
11
|
[![TotalDownloads][total-downloads-image]][npm-url]
|
|
9
12
|
|
|
13
|
+
[aws-url]: https://aws.amazon.com
|
|
14
|
+
[lambda-url]: https://aws.amazon.com/lambda
|
|
15
|
+
[aws-logo]: https://img.shields.io/badge/-white?logo=amazonwebservices&logoColor=black
|
|
16
|
+
[aws-feature]: https://img.shields.io/badge/lambda-blue
|
|
17
|
+
|
|
10
18
|
[build-status]: https://travis-ci.org/tremho/mist-lift.svg?branch=master
|
|
11
19
|
|
|
12
20
|
[build-url]: https://travis-ci.org/tremho/mist-lift
|
|
@@ -56,6 +64,10 @@ To get started using MistLift, please see the [QuickStart Guide](https://github.
|
|
|
56
64
|
|
|
57
65
|
## Changelog
|
|
58
66
|
|
|
67
|
+
### 2.0.2
|
|
68
|
+
- includes webroot template files for esbuild and watcher support
|
|
69
|
+
- adds support for timeoutSeconds in definitions.json
|
|
70
|
+
|
|
59
71
|
### 2.0.1
|
|
60
72
|
- Fixes sourcemap issues, via @tremho/gen-logger 2.0.1
|
|
61
73
|
|
package/build/commands/deploy.js
CHANGED
|
@@ -119,11 +119,14 @@ exports.doDeployAsync = doDeployAsync;
|
|
|
119
119
|
// ------------
|
|
120
120
|
function deployPackage(funcName, zipFile) {
|
|
121
121
|
return __awaiter(this, void 0, void 0, function* () {
|
|
122
|
-
var _a, _b, _c;
|
|
122
|
+
var _a, _b, _c, _d;
|
|
123
123
|
// first off, anchor a base directory
|
|
124
124
|
zipFile !== null && zipFile !== void 0 ? zipFile : (zipFile = path_1.default.join(projectPaths.basePath, 'MistLift_Zips', funcName + '.zip'));
|
|
125
|
+
const defFile = path_1.default.join(projectPaths.functionPath, funcName, 'src', 'definition.json');
|
|
126
|
+
const def = JSON.parse(fs_1.default.readFileSync(defFile).toString());
|
|
127
|
+
const timeout = (_a = def.timeoutSeconds) !== null && _a !== void 0 ? _a : 0; // zero will mean default (3 seconds on AWS)
|
|
125
128
|
// funcname gets decorated with current instance identifier
|
|
126
|
-
const idsrc = (0, md5_1.default)(((
|
|
129
|
+
const idsrc = (0, md5_1.default)(((_b = (0, LiftVersion_1.getProjectName)()) !== null && _b !== void 0 ? _b : '') + ((_d = (_c = (0, LiftVersion_1.getProjectVersion)()) === null || _c === void 0 ? void 0 : _c.toString()) !== null && _d !== void 0 ? _d : ''));
|
|
127
130
|
const dFuncName = funcName + '_' + idsrc;
|
|
128
131
|
// See if function exists
|
|
129
132
|
const client = new client_lambda_1.LambdaClient((0, LiftConfig_1.getAWSCredentials)());
|
|
@@ -135,7 +138,7 @@ function deployPackage(funcName, zipFile) {
|
|
|
135
138
|
});
|
|
136
139
|
// console.log(ac.green.italic("deploying ")+ac.green.bold(funcName)+"...")
|
|
137
140
|
try {
|
|
138
|
-
const response = yield CreateCloudFunction(dFuncName, zipFile);
|
|
141
|
+
const response = yield CreateCloudFunction(dFuncName, zipFile, timeout);
|
|
139
142
|
const parts = response.FunctionArn.split(':');
|
|
140
143
|
const principal = parts[4];
|
|
141
144
|
yield AddPermissions(client, dFuncName, principal);
|
|
@@ -147,7 +150,7 @@ function deployPackage(funcName, zipFile) {
|
|
|
147
150
|
});
|
|
148
151
|
}
|
|
149
152
|
exports.deployPackage = deployPackage;
|
|
150
|
-
function CreateCloudFunction(funcName, zipFile) {
|
|
153
|
+
function CreateCloudFunction(funcName, zipFile, timeout) {
|
|
151
154
|
return __awaiter(this, void 0, void 0, function* () {
|
|
152
155
|
var _a;
|
|
153
156
|
const settings = (0, LiftConfig_1.getSettings)();
|
|
@@ -162,7 +165,8 @@ function CreateCloudFunction(funcName, zipFile) {
|
|
|
162
165
|
Handler: 'runmain.handler',
|
|
163
166
|
Code: {
|
|
164
167
|
ZipFile: zipFileBase64
|
|
165
|
-
}
|
|
168
|
+
},
|
|
169
|
+
Timeout: timeout > 0 ? timeout : undefined
|
|
166
170
|
});
|
|
167
171
|
const resp = yield client.send(command); // response
|
|
168
172
|
return resp;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":"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"}
|
package/build/commands/init.js
CHANGED
|
@@ -73,7 +73,8 @@ function doInit(folder, defaults) {
|
|
|
73
73
|
fs.mkdirSync(libDir);
|
|
74
74
|
}
|
|
75
75
|
// make webroot with docs folder and placeholder yaml
|
|
76
|
-
const
|
|
76
|
+
const webroot = path.join(refPath, 'webroot');
|
|
77
|
+
const webrootDocs = path.join(webroot, 'docs');
|
|
77
78
|
if (!fs.existsSync(webrootDocs)) {
|
|
78
79
|
fs.mkdirSync(webrootDocs, { recursive: true });
|
|
79
80
|
const yaml = path.join(webrootDocs, 'apidoc.yaml');
|
|
@@ -82,6 +83,12 @@ function doInit(folder, defaults) {
|
|
|
82
83
|
fs.copyFileSync(path.join(swaggerSrcDir, 'swagger-ui.css'), path.join(webrootDocs, 'swagger-ui.css'));
|
|
83
84
|
fs.copyFileSync(path.join(swaggerSrcDir, 'swagger-ui-bundle.js'), path.join(webrootDocs, 'swagger-ui-bundle.js'));
|
|
84
85
|
fs.copyFileSync(path.join(swaggerSrcDir, 'swagger-ui-standalone-preset.js'), path.join(webrootDocs, 'swagger-ui-standalone-preset.js'));
|
|
86
|
+
const webrootSrcDir = path.join(swaggerSrcDir, 'webroot');
|
|
87
|
+
fs.copyFileSync(path.join(webrootSrcDir, 'index.html'), path.join(webroot, 'index.html'));
|
|
88
|
+
fs.copyFileSync(path.join(webrootSrcDir, 'app.js'), path.join(webroot, 'app.js'));
|
|
89
|
+
fs.copyFileSync(path.join(webrootSrcDir, 'app.css'), path.join(webroot, 'app.css'));
|
|
90
|
+
fs.copyFileSync(path.join(webrootSrcDir, 'watcher.js'), path.join(webroot, 'watcher.js'));
|
|
91
|
+
fs.copyFileSync(path.join(swaggerSrcDir, 'localServerConfig.json'), path.join(refPath, 'localServerConfig.json'));
|
|
85
92
|
}
|
|
86
93
|
yield (0, initQuestions_1.interrogateUserForPackageJsonSettings)(refPath, defaults);
|
|
87
94
|
yield (0, setupPackageJson_1.addPackageScripts)(refPath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,2CAA4B;AAC5B,uCAAwB;AACxB,iCAAiC;AACjC,2DAA+E;AAC/E,iEAAiG;AAEjG,SAAsB,MAAM,CAC1B,MAAe,EACf,QAAkB;;QAElB,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,EAAE,EAAE,CAAC;YAC1C,IAAA,eAAQ,GAAE,CAAA;YACV,OAAM;QACR,CAAC;QACD,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAA;QACzB,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAA;QACzG,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5B,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QAC5C,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAA;QAC/C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5B,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;QACvB,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAA;QAC9C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3B,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;QACtB,CAAC;QAED,qDAAqD;QACrD,MAAM,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"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"}
|
package/build/commands/start.js
CHANGED
|
@@ -104,8 +104,9 @@ function readServerConfig() {
|
|
|
104
104
|
function esbuilder() {
|
|
105
105
|
return __awaiter(this, void 0, void 0, function* () {
|
|
106
106
|
var _a, _b, _c, _d, _e;
|
|
107
|
-
if (!serverConfig.esbuild)
|
|
108
|
-
return;
|
|
107
|
+
if (!serverConfig.esbuild) {
|
|
108
|
+
return triggerRebuild(); // forces real start
|
|
109
|
+
}
|
|
109
110
|
const entryPoints = (_a = serverConfig.esbuild.entryPoints) !== null && _a !== void 0 ? _a : [];
|
|
110
111
|
const outDir = (_b = serverConfig.esbuild.outdir) !== null && _b !== void 0 ? _b : 'webroot';
|
|
111
112
|
const watch = (_c = serverConfig.esbuild.watch) !== null && _c !== void 0 ? _c : false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yBAAyB;AACzB,sDAA6B;AAE7B,iDAAkC;AAClC,4DAA+B;AAC/B,4DAAkC;AAElC,kFAAgF;AAEhF,+DAA4C;AAC5C,4DAA2D;AAC3D,oDAAiD;AACjD,mCAAsC;AAEtC,gDAAiC;AAEjC,gDAAuB;AACvB,4CAAmB;AAInB,MAAM,WAAW,GAAG,IAAI,CAAA;AACxB,MAAM,YAAY,GAAG,gBAAgB,EAAE,CAAC;AACxC,IAAI,MAAM,GAAO,IAAI,CAAA;AACrB,MAAM,GAAG,GAAG,IAAA,iBAAO,GAAE,CAAA;AAErB,SAAsB,gBAAgB;;QACpC,mCAAmC;QACnC,MAAM,YAAY,GAAG,IAAA,0BAAY,GAAE,CAAA;QACnC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;YAC3B,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC,CAAA;YACrD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,2CAA2C,CAAC,CAAC,CAAA;YACxE,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;YACf,OAAM;QACR,CAAC;QAED,yDAAyD;QACzD,MAAM,IAAA,oBAAY,EAAC,EAAE,CAAC,CAAA;QACtB,MAAM,IAAA,eAAS,GAAE,CAAA;QACjB,sCAAsC;QACtC,MAAM,IAAA,+BAAc,GAAE,CAAA;QACtB,2CAA2C;QAC3C,iBAAiB;QACjB,4CAA4C;QAC5C,GAAG,CAAC,GAAG,CAAC,iBAAO,CAAC,IAAI,EAAE,CAAC,CAAA;QACvB,iBAAiB;QACjB,GAAG,CAAC,GAAG,CAAC,iBAAO,CAAC,UAAU,CAAC,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC,CAAC,CAAA;QAE7C,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,wBAAc,CAAC,CAAA;QAC5B,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,aAAS,CAAC,CAAA;QAC1B,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,aAAS,CAAC,CAAA;QAGvB,YAAY,EAAE,CAAA;QAEd,WAAW,CAAC,cAAI,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,WAAW,CAAC,EAAE,cAAI,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC;QACxG,sCAAsC;QACtC,SAAS,EAAE,CAAA;IAEb,CAAC;CAAA;AAjCD,4CAiCC;AACD,SAAS,YAAY;IACnB,wBAAwB,CAAC,GAAG,CAAC,CAAA;IAC7B,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE;;QACrC,OAAO,CAAC,GAAG,CAAC,0BAA0B,MAAA,YAAY,CAAC,IAAI,mCAAI,WAAW,EAAE,CAAC,CAAA;IAC3E,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,SAAS,gBAAgB;IACvB,qCAAqC;IACrC,MAAM,YAAY,GAAG,IAAA,0BAAY,GAAE,CAAA;IACnC,MAAM,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,wBAAwB,CAAC,CAAA;IAC3E,IAAG,CAAC,YAAE,CAAC,UAAU,CAAC,QAAQ,CAAC;QAAE,OAAO,EAAE,CAAA;IAEtC,MAAM,IAAI,GAAO,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;IACjE,4CAA4C;IAC5C,OAAO,IAAI,CAAA;AACb,CAAC;AAED,SAAe,SAAS;;;QAEtB,IAAG,CAAC,YAAY,CAAC,OAAO;
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/commands/deploy.ts
CHANGED
|
@@ -3,7 +3,7 @@ import {
|
|
|
3
3
|
LambdaClient,
|
|
4
4
|
CreateFunctionCommand,
|
|
5
5
|
DeleteFunctionCommand,
|
|
6
|
-
AddPermissionCommand
|
|
6
|
+
AddPermissionCommand, UpdateFunctionConfigurationCommand
|
|
7
7
|
} from '@aws-sdk/client-lambda'
|
|
8
8
|
|
|
9
9
|
import md5 from 'md5'
|
|
@@ -94,6 +94,9 @@ export async function deployPackage (
|
|
|
94
94
|
// first off, anchor a base directory
|
|
95
95
|
zipFile ??= path.join(projectPaths.basePath, 'MistLift_Zips', funcName + '.zip')
|
|
96
96
|
|
|
97
|
+
const defFile = path.join(projectPaths.functionPath, funcName, 'src', 'definition.json')
|
|
98
|
+
const def = JSON.parse(fs.readFileSync(defFile).toString())
|
|
99
|
+
const timeout = def.timeoutSeconds ?? 0 // zero will mean default (3 seconds on AWS)
|
|
97
100
|
// funcname gets decorated with current instance identifier
|
|
98
101
|
const idsrc = md5((getProjectName() ?? '') + (getProjectVersion()?.toString() ?? ''))
|
|
99
102
|
const dFuncName = funcName + '_' + idsrc
|
|
@@ -110,7 +113,7 @@ export async function deployPackage (
|
|
|
110
113
|
// console.log(ac.green.italic("deploying ")+ac.green.bold(funcName)+"...")
|
|
111
114
|
|
|
112
115
|
try {
|
|
113
|
-
const response: any = await CreateCloudFunction(dFuncName, zipFile)
|
|
116
|
+
const response: any = await CreateCloudFunction(dFuncName, zipFile, timeout)
|
|
114
117
|
const parts = response.FunctionArn.split(':')
|
|
115
118
|
const principal = parts[4]
|
|
116
119
|
await AddPermissions(client, dFuncName, principal)
|
|
@@ -121,7 +124,8 @@ export async function deployPackage (
|
|
|
121
124
|
}
|
|
122
125
|
async function CreateCloudFunction (
|
|
123
126
|
funcName: string,
|
|
124
|
-
zipFile: string
|
|
127
|
+
zipFile: string,
|
|
128
|
+
timeout: number
|
|
125
129
|
|
|
126
130
|
): Promise<any> {
|
|
127
131
|
const settings = getSettings()
|
|
@@ -136,7 +140,8 @@ async function CreateCloudFunction (
|
|
|
136
140
|
Handler: 'runmain.handler',
|
|
137
141
|
Code: {
|
|
138
142
|
ZipFile: zipFileBase64
|
|
139
|
-
}
|
|
143
|
+
},
|
|
144
|
+
Timeout: timeout > 0 ? timeout : undefined
|
|
140
145
|
})
|
|
141
146
|
const resp = await client.send(command) // response
|
|
142
147
|
return resp
|
package/src/commands/init.ts
CHANGED
|
@@ -45,7 +45,8 @@ export async function doInit (
|
|
|
45
45
|
}
|
|
46
46
|
|
|
47
47
|
// make webroot with docs folder and placeholder yaml
|
|
48
|
-
const
|
|
48
|
+
const webroot = path.join(refPath, 'webroot');
|
|
49
|
+
const webrootDocs = path.join(webroot, 'docs')
|
|
49
50
|
if (!fs.existsSync(webrootDocs)) {
|
|
50
51
|
fs.mkdirSync(webrootDocs, { recursive: true })
|
|
51
52
|
const yaml = path.join(webrootDocs, 'apidoc.yaml')
|
|
@@ -54,6 +55,14 @@ export async function doInit (
|
|
|
54
55
|
fs.copyFileSync(path.join(swaggerSrcDir, 'swagger-ui.css'), path.join(webrootDocs, 'swagger-ui.css'))
|
|
55
56
|
fs.copyFileSync(path.join(swaggerSrcDir, 'swagger-ui-bundle.js'), path.join(webrootDocs, 'swagger-ui-bundle.js'))
|
|
56
57
|
fs.copyFileSync(path.join(swaggerSrcDir, 'swagger-ui-standalone-preset.js'), path.join(webrootDocs, 'swagger-ui-standalone-preset.js'))
|
|
58
|
+
|
|
59
|
+
const webrootSrcDir = path.join(swaggerSrcDir, 'webroot')
|
|
60
|
+
fs.copyFileSync(path.join(webrootSrcDir, 'index.html'), path.join(webroot, 'index.html'))
|
|
61
|
+
fs.copyFileSync(path.join(webrootSrcDir, 'app.js'), path.join(webroot, 'app.js'))
|
|
62
|
+
fs.copyFileSync(path.join(webrootSrcDir, 'app.css'), path.join(webroot, 'app.css'))
|
|
63
|
+
fs.copyFileSync(path.join(webrootSrcDir, 'watcher.js'), path.join(webroot, 'watcher.js'))
|
|
64
|
+
|
|
65
|
+
fs.copyFileSync(path.join(swaggerSrcDir, 'localServerConfig.json'), path.join(refPath, 'localServerConfig.json'))
|
|
57
66
|
}
|
|
58
67
|
|
|
59
68
|
await interrogateUserForPackageJsonSettings(refPath, defaults)
|
package/src/commands/start.ts
CHANGED
|
@@ -78,7 +78,9 @@ function readServerConfig() {
|
|
|
78
78
|
|
|
79
79
|
async function esbuilder() {
|
|
80
80
|
|
|
81
|
-
if(!serverConfig.esbuild)
|
|
81
|
+
if(!serverConfig.esbuild) {
|
|
82
|
+
return triggerRebuild() // forces real start
|
|
83
|
+
}
|
|
82
84
|
|
|
83
85
|
const entryPoints = serverConfig.esbuild.entryPoints ?? []
|
|
84
86
|
const outDir = serverConfig.esbuild.outdir ?? 'webroot'
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
/* may be used for css stylings for index.html and/or loaded SPA bundles */
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
<html>
|
|
2
|
+
<head>
|
|
3
|
+
<title>App Page</title>
|
|
4
|
+
<link rel="stylesheet" href="./app.css"></link>
|
|
5
|
+
<script src="./watcher.js"></script>
|
|
6
|
+
</head>
|
|
7
|
+
|
|
8
|
+
<body onload="startWatcher()">
|
|
9
|
+
<div id="root"></div>
|
|
10
|
+
<script src="./app.js"></script>
|
|
11
|
+
</body>
|
|
12
|
+
|
|
13
|
+
</html>
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
/* Rebuild and signal a Reload on ESBuild or function changes -- browser watch
|
|
2
|
+
* See 'docs/ESBuild and React support.md' for details
|
|
3
|
+
*/
|
|
4
|
+
|
|
5
|
+
let connected = false;
|
|
6
|
+
function startWatcher()
|
|
7
|
+
{
|
|
8
|
+
if(window.location.host.indexOf("localhost") === -1 && window.location.host.indexOf("127.0.0.1") === -1) return; // localhost only
|
|
9
|
+
console.log("Starting Watcher client")
|
|
10
|
+
const ws = new WebSocket("ws://localhost:8081/watch")
|
|
11
|
+
|
|
12
|
+
ws.onopen = (e) => {
|
|
13
|
+
console.log('Watcher Connection Established')
|
|
14
|
+
connected = true;
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
ws.onclose = (e) => {
|
|
18
|
+
if(connected) {
|
|
19
|
+
console.log("reload")
|
|
20
|
+
document.location.reload()
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
ws.onerror = (e) => {
|
|
25
|
+
console.error("WS Error", connected)
|
|
26
|
+
if(connected) return ws.onclose(e)
|
|
27
|
+
|
|
28
|
+
setTimeout(() => {startWatcher()}, 750)
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
|