@tremho/mist-lift 2.0.5 → 2.0.7
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 +10 -2
- package/build/commands/builtin/BuiltInHandler.js +1 -0
- package/build/commands/builtin/BuiltInHandler.js.map +1 -1
- package/build/commands/builtin/StageWebrootZip.js +28 -6
- package/build/commands/builtin/StageWebrootZip.js.map +1 -1
- package/build/commands/builtin/prebuilt-zips/API.zip +0 -0
- package/build/commands/builtin/prebuilt-zips/FileServe.zip +0 -0
- package/build/commands/builtin/prebuilt-zips/Webroot.zip +0 -0
- package/build/commands/deploy.js +19 -3
- package/build/commands/deploy.js.map +1 -1
- package/build/commands/start.js +7 -5
- package/build/commands/start.js.map +1 -1
- package/build/lib/openAPI/openApiConstruction.js +4 -1
- package/build/lib/openAPI/openApiConstruction.js.map +1 -1
- package/package.json +1 -1
- package/src/commands/builtin/BuiltInHandler.ts +1 -0
- package/src/commands/builtin/StageWebrootZip.ts +31 -6
- package/src/commands/builtin/prebuilt-zips/API.zip +0 -0
- package/src/commands/builtin/prebuilt-zips/FileServe.zip +0 -0
- package/src/commands/builtin/prebuilt-zips/Webroot.zip +0 -0
- package/src/commands/deploy.ts +21 -5
- package/src/commands/start.ts +8 -5
- package/src/lib/openAPI/openApiConstruction.ts +5 -1
- package/templateData/function-definition-template +2 -1
package/README.md
CHANGED
|
@@ -64,6 +64,14 @@ To get started using MistLift, please see the [QuickStart Guide](https://github.
|
|
|
64
64
|
|
|
65
65
|
## Changelog
|
|
66
66
|
|
|
67
|
+
### 2.0.7
|
|
68
|
+
- misc fixes
|
|
69
|
+
- improved esbuild start/watch
|
|
70
|
+
|
|
71
|
+
### 2.0.6
|
|
72
|
+
- additional fixes for API built-in
|
|
73
|
+
- minor update for memorySize and timeout reporting
|
|
74
|
+
|
|
67
75
|
### 2.0.5
|
|
68
76
|
- add support for memorySize in definitions.json
|
|
69
77
|
- increase memorySize for webroot built-in to 1024
|
|
@@ -95,8 +103,8 @@ creating a new .test.ts file that demonstrates its use for the placeholder sourc
|
|
|
95
103
|
- __Minor Breaking Change__ service definition _allowedMethods_ changed to just _method_. No more pretense of supporting multiple methods for the same function.
|
|
96
104
|
This is breaking because any previous service definition files need to change this property name to continue to work with this version or later.
|
|
97
105
|
|
|
98
|
-
- Support for a common library shared by functions (_see [Tips and Techniques](./doc/Tips%20and%20Techiques.md))
|
|
99
|
-
- Support for esbuild (e.g. React) (_see [ESBuild and React support](./doc/ESBuild and React support.md))
|
|
106
|
+
- Support for a common library shared by functions (_see [Tips and Techniques](./doc/Tips%20and%20Techiques.md)_)
|
|
107
|
+
- Support for esbuild (e.g. React) (_see [ESBuild and React support](./doc/ESBuild and React support.md)_)
|
|
100
108
|
|
|
101
109
|
### 1.1.8
|
|
102
110
|
|
|
@@ -24,6 +24,7 @@ function DeployWebrootBuiltIn() {
|
|
|
24
24
|
// console.log("Deploy Webroot Builtin from "+wrZip)
|
|
25
25
|
yield (0, DeployBuiltInZip_1.DeployBuiltInZip)('Webroot', wrZip);
|
|
26
26
|
// remove temp zip when done
|
|
27
|
+
// console.warn("a.zip is left behind")
|
|
27
28
|
fs_1.default.rmSync(wrZip, { recursive: true });
|
|
28
29
|
});
|
|
29
30
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BuiltInHandler.js","sourceRoot":"","sources":["../../../src/commands/builtin/BuiltInHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uDAAmD;AACnD,yDAAqD;AACrD,6EAA2E;AAE3E,4CAAmB;AACnB,gDAAuB;AAEvB,SAAsB,oBAAoB;;QAGxC,MAAM,KAAK,GAAG,MAAM,IAAA,iCAAe,GAAE,CAAA;QACrC,oDAAoD;QACpD,MAAM,IAAA,mCAAgB,EAAC,SAAS,EAAE,KAAK,CAAC,CAAA;QACxC,4BAA4B;QAC5B,YAAE,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IACvC,CAAC;CAAA;
|
|
1
|
+
{"version":3,"file":"BuiltInHandler.js","sourceRoot":"","sources":["../../../src/commands/builtin/BuiltInHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uDAAmD;AACnD,yDAAqD;AACrD,6EAA2E;AAE3E,4CAAmB;AACnB,gDAAuB;AAEvB,SAAsB,oBAAoB;;QAGxC,MAAM,KAAK,GAAG,MAAM,IAAA,iCAAe,GAAE,CAAA;QACrC,oDAAoD;QACpD,MAAM,IAAA,mCAAgB,EAAC,SAAS,EAAE,KAAK,CAAC,CAAA;QACxC,4BAA4B;QAC5B,uCAAuC;QACvC,YAAE,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IACvC,CAAC;CAAA;AATD,oDASC;AAED,SAAsB,oBAAoB;;QAGxC,iBAAiB;QACjB,MAAM,KAAK,GAAG,IAAA,yCAAoB,GAAE,CAAA;QACpC,0CAA0C;QAC1C,MAAM,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,eAAe,EAAE,eAAe,CAAC,CAAA;QAC3E,MAAM,GAAG,GAAwB,EAAE,CAAA;QACnC,KAAK,IAAI,IAAI,IAAI,KAAK,EAAE,CAAC;YACvB,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAA;YAClB,IAAI,IAAI,GAAG,YAAY,GAAG,IAAI,CAAA;YAC9B,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC1B,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;YAC9B,CAAC;YACD,GAAG,CAAC,IAAI,CAAC,IAAA,mCAAgB,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAA;QAChD,CAAC;QACD,2BAA2B;QAC3B,MAAM,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QACtB,+BAA+B;IACjC,CAAC;CAAA;AAnBD,oDAmBC;AAED,SAAsB,gBAAgB;;QAGpC,gCAAgC;QAChC,MAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,eAAe,EAAE,SAAS,CAAC,CAAA;QAC/D,MAAM,IAAA,mCAAgB,EAAC,KAAK,EAAE,MAAM,CAAC,CAAA;IACvC,CAAC;CAAA;AAND,4CAMC"}
|
|
@@ -39,31 +39,53 @@ const fs = __importStar(require("fs"));
|
|
|
39
39
|
const pathResolve_1 = require("../../lib/pathResolve");
|
|
40
40
|
const DirectoryUtils_1 = require("../../lib/DirectoryUtils");
|
|
41
41
|
const utils_1 = require("../../lib/utils");
|
|
42
|
+
// import { executeCommand } from '../../lib/executeCommand'
|
|
43
|
+
const fs_1 = require("fs");
|
|
42
44
|
function StageWebrootZip() {
|
|
43
45
|
return __awaiter(this, void 0, void 0, function* () {
|
|
44
|
-
// console.log("
|
|
46
|
+
// console.log(">>>> staging webroot to zip")
|
|
45
47
|
const projectPaths = (0, pathResolve_1.resolvePaths)();
|
|
48
|
+
const webroot = path.join(projectPaths.basePath, 'webroot');
|
|
49
|
+
const packageTemp = path.join(projectPaths.basePath, '.package_temp');
|
|
50
|
+
const stagedWebrootFolder = path.join(packageTemp, 'Webroot');
|
|
51
|
+
const zipFilesPath = path.join(stagedWebrootFolder, '__files__');
|
|
52
|
+
// console.log(">>>> paths", {webroot, packageTemp, stagedWebrootFolder, zipFilesPath})
|
|
53
|
+
if (fs.existsSync(stagedWebrootFolder))
|
|
54
|
+
(0, fs_1.rmSync)(stagedWebrootFolder, { recursive: true });
|
|
55
|
+
yield fs.mkdirSync(stagedWebrootFolder);
|
|
46
56
|
// make a public yaml
|
|
47
57
|
yield (0, ApiDocMaker_1.MakePublicApiDoc)(); // writes apidoc.yaml to docs
|
|
48
58
|
const builtinPath = path.join(__dirname, 'prebuilt-zips', 'Webroot.zip');
|
|
49
59
|
const exdir = path.join(projectPaths.basePath, '.package_temp');
|
|
60
|
+
// console.log(">>>> unzipping from "+builtinPath+" to "+exdir)
|
|
50
61
|
yield (0, utils_1.UnzipToFolder)(builtinPath, exdir);
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
yield
|
|
62
|
+
yield (0, fs_1.rmSync)(path.join(stagedWebrootFolder, 'Api.test.js'));
|
|
63
|
+
yield (0, fs_1.rmSync)(path.join(stagedWebrootFolder, 'Api.test.js.map'));
|
|
64
|
+
yield (0, fs_1.rmSync)(path.join(stagedWebrootFolder, 'FileServe.test.js'));
|
|
65
|
+
yield (0, fs_1.rmSync)(path.join(stagedWebrootFolder, 'FileServe.test.js.map'));
|
|
66
|
+
yield (0, fs_1.rmSync)(path.join(stagedWebrootFolder, 'Webroot.test.js'));
|
|
67
|
+
yield (0, fs_1.rmSync)(path.join(stagedWebrootFolder, 'Webroot.test.js.map'));
|
|
68
|
+
// console.log("is exdir "+exdir+"/Webroot the same as stagedWebrootFolder "+stagedWebrootFolder+"?")
|
|
69
|
+
// console.log(">>>> Code-only webroot folder at "+stagedWebrootFolder)
|
|
70
|
+
// await executeCommand('ls', [ '-l', stagedWebrootFolder], '', true)
|
|
71
|
+
// console.log(">>>> making zipFilesPath "+zipFilesPath)
|
|
72
|
+
yield fs.mkdirSync(zipFilesPath);
|
|
73
|
+
// console.log(">>>> enumerating "+webroot)
|
|
55
74
|
yield (0, DirectoryUtils_1.recurseDirectory)(webroot, (filepath, stats) => {
|
|
56
75
|
const relPath = filepath.substring(webroot.length);
|
|
57
76
|
if (stats.isDirectory()) {
|
|
58
77
|
fs.mkdirSync(zipFilesPath + relPath, { recursive: true });
|
|
59
78
|
}
|
|
60
79
|
else {
|
|
80
|
+
// console.log(">>>> copying "+filepath+" to "+zipFilesPath+relPath)
|
|
61
81
|
fs.copyFileSync(filepath, zipFilesPath + relPath);
|
|
62
82
|
}
|
|
63
83
|
return false;
|
|
64
84
|
});
|
|
65
85
|
const webrootZip = path.join(projectPaths.basePath, 'a.zip');
|
|
66
|
-
|
|
86
|
+
// console.log(">>>> Combined webroot folder at "+stagedWebrootFolder)
|
|
87
|
+
// await executeCommand('ls', [ '-l', stagedWebrootFolder], '', true)
|
|
88
|
+
yield (0, utils_1.FolderToZip)(stagedWebrootFolder, webrootZip);
|
|
67
89
|
// return path to this zip
|
|
68
90
|
return webrootZip;
|
|
69
91
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StageWebrootZip.js","sourceRoot":"","sources":["../../../src/commands/builtin/StageWebrootZip.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAgD;AAEhD,2CAA4B;AAC5B,uCAAwB;AACxB,uDAAoD;AACpD,6DAA2D;AAC3D,2CAA4D;
|
|
1
|
+
{"version":3,"file":"StageWebrootZip.js","sourceRoot":"","sources":["../../../src/commands/builtin/StageWebrootZip.ts"],"names":[],"mappings":"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"}
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
package/build/commands/deploy.js
CHANGED
|
@@ -47,6 +47,7 @@ const LiftVersion_1 = require("../lib/LiftVersion");
|
|
|
47
47
|
const utils_1 = require("../lib/utils");
|
|
48
48
|
const package_1 = require("./package");
|
|
49
49
|
const LiftConfig_1 = require("../lib/LiftConfig");
|
|
50
|
+
// import { executeCommand } from '../lib/executeCommand'
|
|
50
51
|
let projectPaths;
|
|
51
52
|
let deploymentRecord = {}; // a map of last deployment times
|
|
52
53
|
// package then deploy
|
|
@@ -133,7 +134,7 @@ function deployPackage(funcName, zipFile) {
|
|
|
133
134
|
if (funcName === 'Webroot') {
|
|
134
135
|
def.name = 'Webroot';
|
|
135
136
|
def.timeoutSeconds = 8;
|
|
136
|
-
def.memorySize =
|
|
137
|
+
def.memorySize = 256;
|
|
137
138
|
}
|
|
138
139
|
}
|
|
139
140
|
const timeout = (_a = def.timeoutSeconds) !== null && _a !== void 0 ? _a : 0; // zero will mean default (3 seconds on AWS)
|
|
@@ -149,13 +150,28 @@ function deployPackage(funcName, zipFile) {
|
|
|
149
150
|
client.send(command).then((response) => {
|
|
150
151
|
}).catch((e) => {
|
|
151
152
|
});
|
|
152
|
-
//
|
|
153
|
+
// Use to detect runmain.mjs in zips (including built-ins)
|
|
154
|
+
// console.log(ac.green.italic("deploying ")+ac.green.bold(funcName)+" from "+zipFile)
|
|
155
|
+
// await executeCommand('unzip', ['-t', zipFile, '|', 'grep runmain.mjs'], '', true);
|
|
153
156
|
try {
|
|
154
157
|
const response = yield CreateCloudFunction(dFuncName, zipFile, timeout, memorySize);
|
|
155
158
|
const parts = response.FunctionArn.split(':');
|
|
156
159
|
const principal = parts[4];
|
|
157
160
|
yield AddPermissions(client, dFuncName, principal);
|
|
158
|
-
|
|
161
|
+
let deployMsg = `Successfully deployed ${funcName}`;
|
|
162
|
+
if (memorySize > 0 || timeout > 0) {
|
|
163
|
+
deployMsg += ac.grey.italic(' with ');
|
|
164
|
+
const useAnd = memorySize > 9 && timeout > 0;
|
|
165
|
+
if (memorySize > 0) {
|
|
166
|
+
deployMsg += ac.grey(`memorySize ${memorySize}mb`);
|
|
167
|
+
if (useAnd)
|
|
168
|
+
deployMsg += ac.grey.italic(' and ');
|
|
169
|
+
}
|
|
170
|
+
if (timeout > 0) {
|
|
171
|
+
deployMsg += ac.grey(`timeout ${timeout} seconds`);
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
console.log(ac.green.bold(deployMsg));
|
|
159
175
|
}
|
|
160
176
|
catch (e) {
|
|
161
177
|
console.error(ac.red.bold.italic('Error deploying ' + funcName), e);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0DAK+B;AAE/B,8CAAqB;AAErB,gDAAuB;AACvB,4CAAmB;AACnB,oDAAiD;AAEjD,gDAAiC;AAEjC,0DAAwD;AACxD,oDAAsE;AACtE,wCAAoC;AACpC,uCAA0C;AAC1C,kDAA+E;
|
|
1
|
+
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":"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"}
|
package/build/commands/start.js
CHANGED
|
@@ -55,7 +55,7 @@ let server = null;
|
|
|
55
55
|
const app = (0, express_1.default)();
|
|
56
56
|
function startLocalServer() {
|
|
57
57
|
return __awaiter(this, void 0, void 0, function* () {
|
|
58
|
-
|
|
58
|
+
console.warn('startLocalServer');
|
|
59
59
|
const projectPaths = (0, pathResolve_1.resolvePaths)();
|
|
60
60
|
if (!projectPaths.verified) {
|
|
61
61
|
console.log(ac.bold.red('Cannot start local server'));
|
|
@@ -105,7 +105,8 @@ function readServerConfig() {
|
|
|
105
105
|
function esbuilder() {
|
|
106
106
|
return __awaiter(this, void 0, void 0, function* () {
|
|
107
107
|
var _a, _b, _c;
|
|
108
|
-
|
|
108
|
+
console.warn('esbuilder starting...');
|
|
109
|
+
if (serverConfig.esbuild === undefined) {
|
|
109
110
|
return yield triggerRebuild(); // forces real start
|
|
110
111
|
}
|
|
111
112
|
const entryPoints = (_a = serverConfig.esbuild.entryPoints) !== null && _a !== void 0 ? _a : [];
|
|
@@ -113,12 +114,13 @@ function esbuilder() {
|
|
|
113
114
|
const watch = (_c = serverConfig.esbuild.watch) !== null && _c !== void 0 ? _c : false;
|
|
114
115
|
// const breakOnError = serverConfig.esbuild.breakOnError ?? false
|
|
115
116
|
// const breakOnWarn = serverConfig.esbuild.breakOnWarn ?? false
|
|
117
|
+
console.warn('running esbuild', { entryPoints, outDir, watch });
|
|
116
118
|
const ctx = yield esbuild.context({
|
|
117
119
|
entryPoints,
|
|
118
120
|
bundle: true,
|
|
119
121
|
outdir: outDir
|
|
120
122
|
});
|
|
121
|
-
|
|
123
|
+
console.log('esbuild...');
|
|
122
124
|
/* let result = */ yield ctx.rebuild();
|
|
123
125
|
let more = watch === true;
|
|
124
126
|
do {
|
|
@@ -152,7 +154,7 @@ function onWatch1(evt, name) {
|
|
|
152
154
|
void triggerRebuild();
|
|
153
155
|
}
|
|
154
156
|
function onWatch2(evt, name) {
|
|
155
|
-
|
|
157
|
+
console.log("Webroot Watch Event seen", { evt, name });
|
|
156
158
|
void triggerBrowserRestart();
|
|
157
159
|
}
|
|
158
160
|
let alreadyBuilding = false;
|
|
@@ -182,7 +184,7 @@ function triggerBrowserRestart() {
|
|
|
182
184
|
closing = true;
|
|
183
185
|
yield socketClose();
|
|
184
186
|
yield server.close();
|
|
185
|
-
|
|
187
|
+
// await sleep(1000)
|
|
186
188
|
closing = false;
|
|
187
189
|
startServers();
|
|
188
190
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yBAAyB;AACzB,sDAA6B;AAE7B,iDAAkC;AAClC,4DAA8B;AAC9B,4DAAkC;AAElC,kFAAgF;AAEhF,+DAA4C;AAC5C,4DAA2D;AAC3D,oDAAiD;AACjD,mCAAsC;AAEtC,gDAAiC;AAEjC,gDAAuB;AACvB,4CAAmB;AAEnB,MAAM,WAAW,GAAG,IAAI,CAAA;AACxB,MAAM,YAAY,GAAG,gBAAgB,EAAE,CAAA;AACvC,IAAI,MAAM,GAAQ,IAAI,CAAA;AACtB,MAAM,GAAG,GAAG,IAAA,iBAAO,GAAE,CAAA;AAErB,SAAsB,gBAAgB;;QACpC,
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"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"}
|
|
@@ -71,6 +71,7 @@ function buildOpenApi(defs_1) {
|
|
|
71
71
|
svcInfo = JSON.parse(fs_1.default.readFileSync(infoFile).toString());
|
|
72
72
|
}
|
|
73
73
|
// spdx = svcInfo.contact?.spdx ?? spdx
|
|
74
|
+
// const stagePathSegment = '/Dev' // todo: at some point this should be in config somewhere. it is used in many places.
|
|
74
75
|
const info = {
|
|
75
76
|
title: (_c = svcInfo.name) !== null && _c !== void 0 ? _c : title,
|
|
76
77
|
// summary: summary,
|
|
@@ -104,7 +105,9 @@ function buildOpenApi(defs_1) {
|
|
|
104
105
|
addParameter(pathDef, param);
|
|
105
106
|
}
|
|
106
107
|
addCORSOptionMethod(pathDef);
|
|
107
|
-
|
|
108
|
+
const pathMap = (_h = def.pathMap) !== null && _h !== void 0 ? _h : '/' + def.name;
|
|
109
|
+
// pathMap = stagePathSegment + pathMap
|
|
110
|
+
builder.addPath(pathMap, pathDef);
|
|
108
111
|
builder.addSchema('Empty', {
|
|
109
112
|
title: 'Empty Schema',
|
|
110
113
|
type: 'object'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openApiConstruction.js","sourceRoot":"","sources":["../../../src/lib/openAPI/openApiConstruction.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"openApiConstruction.js","sourceRoot":"","sources":["../../../src/lib/openAPI/openApiConstruction.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -12,6 +12,7 @@ export async function DeployWebrootBuiltIn
|
|
|
12
12
|
// console.log("Deploy Webroot Builtin from "+wrZip)
|
|
13
13
|
await DeployBuiltInZip('Webroot', wrZip)
|
|
14
14
|
// remove temp zip when done
|
|
15
|
+
// console.warn("a.zip is left behind")
|
|
15
16
|
fs.rmSync(wrZip, { recursive: true })
|
|
16
17
|
}
|
|
17
18
|
|
|
@@ -5,33 +5,58 @@ import * as fs from 'fs'
|
|
|
5
5
|
import { resolvePaths } from '../../lib/pathResolve'
|
|
6
6
|
import { recurseDirectory } from '../../lib/DirectoryUtils'
|
|
7
7
|
import { FolderToZip, UnzipToFolder } from '../../lib/utils'
|
|
8
|
+
// import { executeCommand } from '../../lib/executeCommand'
|
|
9
|
+
import { rmSync } from 'fs'
|
|
8
10
|
|
|
9
11
|
export async function StageWebrootZip
|
|
10
12
|
(
|
|
11
13
|
): Promise<string> {
|
|
12
|
-
// console.log("
|
|
14
|
+
// console.log(">>>> staging webroot to zip")
|
|
13
15
|
const projectPaths = resolvePaths()
|
|
16
|
+
const webroot = path.join(projectPaths.basePath, 'webroot')
|
|
17
|
+
const packageTemp = path.join(projectPaths.basePath, '.package_temp')
|
|
18
|
+
const stagedWebrootFolder = path.join(packageTemp, 'Webroot')
|
|
19
|
+
const zipFilesPath = path.join(stagedWebrootFolder, '__files__')
|
|
20
|
+
// console.log(">>>> paths", {webroot, packageTemp, stagedWebrootFolder, zipFilesPath})
|
|
21
|
+
if (fs.existsSync(stagedWebrootFolder)) rmSync(stagedWebrootFolder, { recursive: true })
|
|
22
|
+
await fs.mkdirSync(stagedWebrootFolder)
|
|
14
23
|
// make a public yaml
|
|
15
24
|
await MakePublicApiDoc() // writes apidoc.yaml to docs
|
|
16
25
|
const builtinPath = path.join(__dirname, 'prebuilt-zips', 'Webroot.zip')
|
|
17
26
|
const exdir = path.join(projectPaths.basePath, '.package_temp')
|
|
27
|
+
// console.log(">>>> unzipping from "+builtinPath+" to "+exdir)
|
|
18
28
|
await UnzipToFolder(builtinPath, exdir)
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
await
|
|
29
|
+
|
|
30
|
+
await rmSync(path.join(stagedWebrootFolder, 'Api.test.js'))
|
|
31
|
+
await rmSync(path.join(stagedWebrootFolder, 'Api.test.js.map'))
|
|
32
|
+
await rmSync(path.join(stagedWebrootFolder, 'FileServe.test.js'))
|
|
33
|
+
await rmSync(path.join(stagedWebrootFolder, 'FileServe.test.js.map'))
|
|
34
|
+
await rmSync(path.join(stagedWebrootFolder, 'Webroot.test.js'))
|
|
35
|
+
await rmSync(path.join(stagedWebrootFolder, 'Webroot.test.js.map'))
|
|
36
|
+
|
|
37
|
+
// console.log("is exdir "+exdir+"/Webroot the same as stagedWebrootFolder "+stagedWebrootFolder+"?")
|
|
38
|
+
// console.log(">>>> Code-only webroot folder at "+stagedWebrootFolder)
|
|
39
|
+
// await executeCommand('ls', [ '-l', stagedWebrootFolder], '', true)
|
|
40
|
+
|
|
41
|
+
// console.log(">>>> making zipFilesPath "+zipFilesPath)
|
|
42
|
+
await fs.mkdirSync(zipFilesPath)
|
|
43
|
+
|
|
44
|
+
// console.log(">>>> enumerating "+webroot)
|
|
23
45
|
await recurseDirectory(webroot, (filepath, stats) => {
|
|
24
46
|
const relPath = filepath.substring(webroot.length)
|
|
25
47
|
if (stats.isDirectory()) {
|
|
26
48
|
fs.mkdirSync(zipFilesPath + relPath, { recursive: true })
|
|
27
49
|
} else {
|
|
50
|
+
// console.log(">>>> copying "+filepath+" to "+zipFilesPath+relPath)
|
|
28
51
|
fs.copyFileSync(filepath, zipFilesPath + relPath)
|
|
29
52
|
}
|
|
30
53
|
return false
|
|
31
54
|
})
|
|
32
55
|
const webrootZip = path.join(projectPaths.basePath, 'a.zip')
|
|
56
|
+
// console.log(">>>> Combined webroot folder at "+stagedWebrootFolder)
|
|
57
|
+
// await executeCommand('ls', [ '-l', stagedWebrootFolder], '', true)
|
|
33
58
|
|
|
34
|
-
await FolderToZip(
|
|
59
|
+
await FolderToZip(stagedWebrootFolder, webrootZip)
|
|
35
60
|
// return path to this zip
|
|
36
61
|
return webrootZip
|
|
37
62
|
}
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
package/src/commands/deploy.ts
CHANGED
|
@@ -19,6 +19,7 @@ import { getProjectName, getProjectVersion } from '../lib/LiftVersion'
|
|
|
19
19
|
import { delay } from '../lib/utils'
|
|
20
20
|
import { doPackageAsync } from './package'
|
|
21
21
|
import { getAWSCredentials, getSettings, RuntimeType } from '../lib/LiftConfig'
|
|
22
|
+
// import { executeCommand } from '../lib/executeCommand'
|
|
22
23
|
|
|
23
24
|
let projectPaths: { basePath: string, buildPath: string, functionPath: string, packagePath: string, verified: boolean }
|
|
24
25
|
|
|
@@ -103,11 +104,11 @@ export async function deployPackage (
|
|
|
103
104
|
if (funcName === 'Webroot') {
|
|
104
105
|
def.name = 'Webroot'
|
|
105
106
|
def.timeoutSeconds = 8
|
|
106
|
-
def.memorySize =
|
|
107
|
+
def.memorySize = 256
|
|
107
108
|
}
|
|
108
109
|
}
|
|
109
|
-
const timeout = def.timeoutSeconds ?? 0 // zero will mean default (3 seconds on AWS)
|
|
110
|
-
const memorySize = def.memorySize ?? 0 // zero is default (128 [mb] for AWS)
|
|
110
|
+
const timeout: number = def.timeoutSeconds ?? 0 // zero will mean default (3 seconds on AWS)
|
|
111
|
+
const memorySize: number = def.memorySize ?? 0 // zero is default (128 [mb] for AWS)
|
|
111
112
|
// funcname gets decorated with current instance identifier
|
|
112
113
|
const idsrc = md5((getProjectName() ?? '') + (getProjectVersion()?.toString() ?? ''))
|
|
113
114
|
const dFuncName = funcName + '_' + idsrc
|
|
@@ -121,14 +122,29 @@ export async function deployPackage (
|
|
|
121
122
|
}).catch((e: any) => {
|
|
122
123
|
})
|
|
123
124
|
|
|
124
|
-
//
|
|
125
|
+
// Use to detect runmain.mjs in zips (including built-ins)
|
|
126
|
+
// console.log(ac.green.italic("deploying ")+ac.green.bold(funcName)+" from "+zipFile)
|
|
127
|
+
// await executeCommand('unzip', ['-t', zipFile, '|', 'grep runmain.mjs'], '', true);
|
|
125
128
|
|
|
126
129
|
try {
|
|
127
130
|
const response: any = await CreateCloudFunction(dFuncName, zipFile, timeout, memorySize)
|
|
128
131
|
const parts = response.FunctionArn.split(':')
|
|
129
132
|
const principal = parts[4]
|
|
130
133
|
await AddPermissions(client, dFuncName, principal)
|
|
131
|
-
|
|
134
|
+
let deployMsg: string = `Successfully deployed ${funcName}`
|
|
135
|
+
if (memorySize > 0 || timeout > 0) {
|
|
136
|
+
deployMsg += ac.grey.italic(' with ')
|
|
137
|
+
const useAnd = memorySize > 9 && timeout > 0
|
|
138
|
+
if (memorySize > 0) {
|
|
139
|
+
deployMsg += ac.grey(`memorySize ${memorySize}mb`)
|
|
140
|
+
if (useAnd) deployMsg += ac.grey.italic(' and ')
|
|
141
|
+
}
|
|
142
|
+
if (timeout > 0) {
|
|
143
|
+
deployMsg += ac.grey(`timeout ${timeout} seconds`)
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
console.log(ac.green.bold(deployMsg))
|
|
132
148
|
} catch (e: any) {
|
|
133
149
|
console.error(ac.red.bold.italic('Error deploying ' + funcName), e)
|
|
134
150
|
}
|
package/src/commands/start.ts
CHANGED
|
@@ -23,7 +23,7 @@ let server: any = null
|
|
|
23
23
|
const app = express()
|
|
24
24
|
|
|
25
25
|
export async function startLocalServer (): Promise<void> {
|
|
26
|
-
|
|
26
|
+
console.warn('startLocalServer')
|
|
27
27
|
const projectPaths = resolvePaths()
|
|
28
28
|
if (!projectPaths.verified) {
|
|
29
29
|
console.log(ac.bold.red('Cannot start local server'))
|
|
@@ -74,7 +74,8 @@ function readServerConfig (): any {
|
|
|
74
74
|
}
|
|
75
75
|
|
|
76
76
|
async function esbuilder (): Promise<void> {
|
|
77
|
-
|
|
77
|
+
console.warn('esbuilder starting...')
|
|
78
|
+
if (serverConfig.esbuild === undefined) {
|
|
78
79
|
return await triggerRebuild() // forces real start
|
|
79
80
|
}
|
|
80
81
|
|
|
@@ -84,12 +85,14 @@ async function esbuilder (): Promise<void> {
|
|
|
84
85
|
// const breakOnError = serverConfig.esbuild.breakOnError ?? false
|
|
85
86
|
// const breakOnWarn = serverConfig.esbuild.breakOnWarn ?? false
|
|
86
87
|
|
|
88
|
+
console.warn('running esbuild', { entryPoints, outDir, watch })
|
|
89
|
+
|
|
87
90
|
const ctx = await esbuild.context({
|
|
88
91
|
entryPoints,
|
|
89
92
|
bundle: true,
|
|
90
93
|
outdir: outDir
|
|
91
94
|
})
|
|
92
|
-
|
|
95
|
+
console.log('esbuild...')
|
|
93
96
|
|
|
94
97
|
/* let result = */ await ctx.rebuild()
|
|
95
98
|
let more: boolean = watch === true
|
|
@@ -121,7 +124,7 @@ function onWatch1 (evt: string, name: string): void {
|
|
|
121
124
|
void triggerRebuild()
|
|
122
125
|
}
|
|
123
126
|
function onWatch2 (evt: string, name: string): void {
|
|
124
|
-
|
|
127
|
+
console.log('Webroot Watch Event seen', { evt, name })
|
|
125
128
|
void triggerBrowserRestart()
|
|
126
129
|
}
|
|
127
130
|
|
|
@@ -149,7 +152,7 @@ async function triggerBrowserRestart (): Promise<void> {
|
|
|
149
152
|
closing = true
|
|
150
153
|
await socketClose()
|
|
151
154
|
await server.close()
|
|
152
|
-
await sleep(1000)
|
|
155
|
+
// await sleep(1000)
|
|
153
156
|
closing = false
|
|
154
157
|
startServers()
|
|
155
158
|
} else {
|
|
@@ -36,6 +36,8 @@ export async function buildOpenApi (
|
|
|
36
36
|
}
|
|
37
37
|
// spdx = svcInfo.contact?.spdx ?? spdx
|
|
38
38
|
|
|
39
|
+
// const stagePathSegment = '/Dev' // todo: at some point this should be in config somewhere. it is used in many places.
|
|
40
|
+
|
|
39
41
|
const info = {
|
|
40
42
|
title: svcInfo.name ?? title,
|
|
41
43
|
// summary: summary,
|
|
@@ -70,7 +72,9 @@ export async function buildOpenApi (
|
|
|
70
72
|
addParameter(pathDef, param)
|
|
71
73
|
}
|
|
72
74
|
addCORSOptionMethod(pathDef)
|
|
73
|
-
|
|
75
|
+
const pathMap = def.pathMap ?? '/' + (def.name as string)
|
|
76
|
+
// pathMap = stagePathSegment + pathMap
|
|
77
|
+
builder.addPath(pathMap, pathDef)
|
|
74
78
|
|
|
75
79
|
builder.addSchema('Empty', {
|
|
76
80
|
title: 'Empty Schema',
|