@tremho/mist-lift 2.0.5-prerelease.1 → 2.0.6
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 +6 -1
- package/build/commands/build.js +6 -0
- package/build/commands/build.js.map +1 -1
- package/build/commands/builtin/ApiDocMaker.js +2 -1
- package/build/commands/builtin/ApiDocMaker.js.map +1 -1
- package/build/commands/builtin/BuiltInHandler.js +1 -1
- 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 +33 -8
- package/build/commands/deploy.js.map +1 -1
- package/build/lib/openAPI/openApiConstruction.js +4 -1
- package/build/lib/openAPI/openApiConstruction.js.map +1 -1
- package/package.json +2 -2
- package/src/commands/build.ts +6 -0
- package/src/commands/builtin/ApiDocMaker.ts +2 -1
- package/src/commands/builtin/BuiltInHandler.ts +1 -1
- 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 +33 -7
- package/src/lib/openAPI/openApiConstruction.ts +5 -1
- package/templateData/function-definition-template +2 -1
package/README.md
CHANGED
|
@@ -64,8 +64,13 @@ To get started using MistLift, please see the [QuickStart Guide](https://github.
|
|
|
64
64
|
|
|
65
65
|
## Changelog
|
|
66
66
|
|
|
67
|
+
### 2.0.6
|
|
68
|
+
- additional fixes for API built-in
|
|
69
|
+
- minor update for memorySize and timeout reporting
|
|
70
|
+
|
|
67
71
|
### 2.0.5
|
|
68
|
-
-
|
|
72
|
+
- add support for memorySize in definitions.json
|
|
73
|
+
- increase memorySize for webroot built-in to 1024
|
|
69
74
|
|
|
70
75
|
### 2.0.4
|
|
71
76
|
- FIXED BUILTINS That were broken in the 2.0.3 release. Now file access and api are working again.
|
package/build/commands/build.js
CHANGED
|
@@ -178,6 +178,12 @@ function doPostBuildSteps(funcDir, buildPath) {
|
|
|
178
178
|
console.error(ac.red.bold('no definition file found at ' + srcdef));
|
|
179
179
|
return 1;
|
|
180
180
|
}
|
|
181
|
+
// Copy the runmain.mjs file over
|
|
182
|
+
const srcrun = path.join(funcDir, 'runmain.mjs');
|
|
183
|
+
const dstrun = path.join(buildPath, 'runmain.mjs');
|
|
184
|
+
if (fs.existsSync(srcrun)) {
|
|
185
|
+
fs.copyFileSync(srcrun, dstrun);
|
|
186
|
+
}
|
|
181
187
|
// copy the resources folder if it exists
|
|
182
188
|
const filedirPath = path.join(funcDir, 'resources');
|
|
183
189
|
if (fs.existsSync(filedirPath)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/commands/build.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/commands/build.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,7 +36,6 @@ function addBuiltInDefinitions(defs) {
|
|
|
36
36
|
// console.warn("NOT ADDING ANY BUILTIN API INTEGRATIONS")
|
|
37
37
|
// console.log("ADDING apiDef");
|
|
38
38
|
defs.push(apiDef);
|
|
39
|
-
// console.log("ADDING webrootDef");
|
|
40
39
|
defs.push(webrootDef);
|
|
41
40
|
// console.warn("Adding webroot literals");
|
|
42
41
|
// do just /docs and see how that goes
|
|
@@ -101,6 +100,8 @@ const webrootDef = {
|
|
|
101
100
|
version: '1.0.0',
|
|
102
101
|
pathMap: '/{path}',
|
|
103
102
|
method: 'get',
|
|
103
|
+
timeout: 8,
|
|
104
|
+
memorySize: 1024,
|
|
104
105
|
logLevel: 'Debug',
|
|
105
106
|
sessionRequired: false,
|
|
106
107
|
userRequired: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ApiDocMaker.js","sourceRoot":"","sources":["../../../src/commands/builtin/ApiDocMaker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2EAA+E;AAC/E,+EAAoE;AACpE,6EAA2E;AAE3E,gDAAuB;AAEvB,SAAsB,gBAAgB;;QAGpC,MAAM,IAAI,GAAG,IAAA,6CAAyB,GAAE,CAAA;QACxC,OAAO,MAAM,IAAA,kCAAY,EAAC,IAAI,CAAC,CAAA;IACjC,CAAC;CAAA;AALD,4CAKC;AAED,SAAsB,iBAAiB,CAErC,QAAgB;;QAGhB,MAAM,IAAI,GAAG,IAAA,6CAAyB,GAAE,CAAA;QACxC,qBAAqB,CAAC,IAAI,CAAC,CAAA;QAC3B,OAAO,MAAM,IAAA,kCAAY,EAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAA,CAAC,SAAS;IAC5D,CAAC;CAAA;AARD,8CAQC;AAED,SAAgB,qBAAqB,CAAE,IAAW;IAChD,0DAA0D;IAC1D,gCAAgC;IAChC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACjB,
|
|
1
|
+
{"version":3,"file":"ApiDocMaker.js","sourceRoot":"","sources":["../../../src/commands/builtin/ApiDocMaker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2EAA+E;AAC/E,+EAAoE;AACpE,6EAA2E;AAE3E,gDAAuB;AAEvB,SAAsB,gBAAgB;;QAGpC,MAAM,IAAI,GAAG,IAAA,6CAAyB,GAAE,CAAA;QACxC,OAAO,MAAM,IAAA,kCAAY,EAAC,IAAI,CAAC,CAAA;IACjC,CAAC;CAAA;AALD,4CAKC;AAED,SAAsB,iBAAiB,CAErC,QAAgB;;QAGhB,MAAM,IAAI,GAAG,IAAA,6CAAyB,GAAE,CAAA;QACxC,qBAAqB,CAAC,IAAI,CAAC,CAAA;QAC3B,OAAO,MAAM,IAAA,kCAAY,EAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAA,CAAC,SAAS;IAC5D,CAAC;CAAA;AARD,8CAQC;AAED,SAAgB,qBAAqB,CAAE,IAAW;IAChD,0DAA0D;IAC1D,gCAAgC;IAChC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACjB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IAErB,2CAA2C;IAC3C,sCAAsC;IACtC,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,YAAY,CAAC,CAAA,CAAC,OAAO;IACrD,KAAK,CAAC,IAAI,GAAG,gBAAgB,CAAA;IAC7B,KAAK,CAAC,OAAO,GAAG,cAAc,CAAA;IAC9B,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IAChB,MAAM,KAAK,GAAG,IAAA,yCAAoB,GAAE,CAAA;IACpC,8BAA8B;IAC9B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,IAAI,KAAK,EAAE,EAAE,CAAC;YAChB,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,cAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;YAC5C,IAAI,QAAQ,GAAG,QAAQ,CAAA;YACvB,OAAO,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC;gBAAE,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAA;YACxF,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,YAAY,CAAC,CAAA,CAAC,OAAO;YACzD,SAAS,CAAC,IAAI,GAAG,YAAY,GAAG,QAAQ,CAAA;YACxC,SAAS,CAAC,OAAO,GAAG,GAAG,QAAQ,SAAS,CAAA;YACxC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QACtB,CAAC;IACH,CAAC;AACH,CAAC;AAzBD,sDAyBC;AAED,MAAM,MAAM,GAAG;IACb,IAAI,EAAE,KAAK;IACX,WAAW,EAAE,EAAE;IACf,OAAO,EAAE,OAAO;IAChB,OAAO,EAAE,MAAM;IACf,MAAM,EAAE,KAAK;IACb,QAAQ,EAAE,OAAO;IACjB,eAAe,EAAE,KAAK;IACtB,YAAY,EAAE,KAAK;IACnB,OAAO,EAAE,EAAE;IACX,UAAU,EAAE,EAAE;IACd,OAAO,EAAE;QACP,GAAG,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,sBAAsB,EAAE;QAC3D,GAAG,EAAE;YACH,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,eAAe;SAC7B;KACF;CACF,CAAA;AAED,MAAM,YAAY,GAAG;IACnB,IAAI,EAAE,WAAW;IACjB,WAAW,EAAE,cAAc;IAC3B,OAAO,EACD,OAAO;IACb,OAAO,EAAE,EAAE;IACX,MAAM,EAAE,KAAK;IACb,QAAQ,EAAE,OAAO;IACjB,eAAe,EAAE,KAAK;IACtB,YAAY,EAAE,KAAK;IACnB,OAAO,EAAE,EAAE;IACX,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC;IAC1C,OAAO,EAAE;QACP,GAAG,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,sBAAsB,EAAE;QAC3D,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,eAAe,EAAE;KACtD;CACF,CAAA;AAED,MAAM,UAAU,GAAG;IACjB,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,iCAAiC;IAC9C,OAAO,EAAE,OAAO;IAChB,OAAO,EAAE,SAAS;IAClB,MAAM,EAAE,KAAK;IACb,OAAO,EAAE,CAAC;IACV,UAAU,EAAE,IAAI;IAChB,QAAQ,EAAE,OAAO;IACjB,eAAe,EAAE,KAAK;IACtB,YAAY,EAAE,KAAK;IACnB,OAAO,EAAE,EAAE;IACX,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC;IAC1C,OAAO,EAAE;QACP,GAAG,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,sBAAsB,EAAE;QAC3D,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,eAAe,EAAE;KACtD;CACF,CAAA"}
|
|
@@ -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
|
}
|
|
@@ -51,7 +52,6 @@ function DeployRootFileserves() {
|
|
|
51
52
|
exports.DeployRootFileserves = DeployRootFileserves;
|
|
52
53
|
function DeployApiBuiltin() {
|
|
53
54
|
return __awaiter(this, void 0, void 0, function* () {
|
|
54
|
-
console.log('Deploy API Builtin');
|
|
55
55
|
// get the prebuilt zip location
|
|
56
56
|
const apiZip = path_1.default.join(__dirname, 'prebuilt-zips', 'API.zip');
|
|
57
57
|
yield (0, DeployBuiltInZip_1.DeployBuiltInZip)('api', apiZip);
|
|
@@ -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
|
|
@@ -119,7 +120,7 @@ exports.doDeployAsync = doDeployAsync;
|
|
|
119
120
|
// ------------
|
|
120
121
|
function deployPackage(funcName, zipFile) {
|
|
121
122
|
return __awaiter(this, void 0, void 0, function* () {
|
|
122
|
-
var _a, _b, _c, _d;
|
|
123
|
+
var _a, _b, _c, _d, _e;
|
|
123
124
|
// first off, anchor a base directory
|
|
124
125
|
projectPaths = (0, pathResolve_1.resolvePaths)();
|
|
125
126
|
zipFile !== null && zipFile !== void 0 ? zipFile : (zipFile = path_1.default.join(projectPaths.basePath, 'MistLift_Zips', funcName + '.zip'));
|
|
@@ -128,10 +129,18 @@ function deployPackage(funcName, zipFile) {
|
|
|
128
129
|
try {
|
|
129
130
|
def = JSON.parse(fs_1.default.readFileSync(defFile).toString());
|
|
130
131
|
}
|
|
131
|
-
catch (e) {
|
|
132
|
+
catch (e) {
|
|
133
|
+
// hack for assigning a definition -- the defs from ApiDocMaker don't appear here
|
|
134
|
+
if (funcName === 'Webroot') {
|
|
135
|
+
def.name = 'Webroot';
|
|
136
|
+
def.timeoutSeconds = 8;
|
|
137
|
+
def.memorySize = 256;
|
|
138
|
+
}
|
|
139
|
+
}
|
|
132
140
|
const timeout = (_a = def.timeoutSeconds) !== null && _a !== void 0 ? _a : 0; // zero will mean default (3 seconds on AWS)
|
|
141
|
+
const memorySize = (_b = def.memorySize) !== null && _b !== void 0 ? _b : 0; // zero is default (128 [mb] for AWS)
|
|
133
142
|
// funcname gets decorated with current instance identifier
|
|
134
|
-
const idsrc = (0, md5_1.default)(((
|
|
143
|
+
const idsrc = (0, md5_1.default)(((_c = (0, LiftVersion_1.getProjectName)()) !== null && _c !== void 0 ? _c : '') + ((_e = (_d = (0, LiftVersion_1.getProjectVersion)()) === null || _d === void 0 ? void 0 : _d.toString()) !== null && _e !== void 0 ? _e : ''));
|
|
135
144
|
const dFuncName = funcName + '_' + idsrc;
|
|
136
145
|
// See if function exists
|
|
137
146
|
const client = new client_lambda_1.LambdaClient((0, LiftConfig_1.getAWSCredentials)());
|
|
@@ -141,13 +150,28 @@ function deployPackage(funcName, zipFile) {
|
|
|
141
150
|
client.send(command).then((response) => {
|
|
142
151
|
}).catch((e) => {
|
|
143
152
|
});
|
|
144
|
-
//
|
|
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);
|
|
145
156
|
try {
|
|
146
|
-
const response = yield CreateCloudFunction(dFuncName, zipFile, timeout);
|
|
157
|
+
const response = yield CreateCloudFunction(dFuncName, zipFile, timeout, memorySize);
|
|
147
158
|
const parts = response.FunctionArn.split(':');
|
|
148
159
|
const principal = parts[4];
|
|
149
160
|
yield AddPermissions(client, dFuncName, principal);
|
|
150
|
-
|
|
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));
|
|
151
175
|
}
|
|
152
176
|
catch (e) {
|
|
153
177
|
console.error(ac.red.bold.italic('Error deploying ' + funcName), e);
|
|
@@ -155,7 +179,7 @@ function deployPackage(funcName, zipFile) {
|
|
|
155
179
|
});
|
|
156
180
|
}
|
|
157
181
|
exports.deployPackage = deployPackage;
|
|
158
|
-
function CreateCloudFunction(funcName, zipFile, timeout) {
|
|
182
|
+
function CreateCloudFunction(funcName, zipFile, timeout, memorySize) {
|
|
159
183
|
return __awaiter(this, void 0, void 0, function* () {
|
|
160
184
|
var _a;
|
|
161
185
|
const settings = (0, LiftConfig_1.getSettings)();
|
|
@@ -171,7 +195,8 @@ function CreateCloudFunction(funcName, zipFile, timeout) {
|
|
|
171
195
|
Code: {
|
|
172
196
|
ZipFile: zipFileBase64
|
|
173
197
|
},
|
|
174
|
-
Timeout: timeout > 0 ? timeout : undefined
|
|
198
|
+
Timeout: timeout > 0 ? timeout : undefined,
|
|
199
|
+
MemorySize: memorySize > 0 ? memorySize : undefined
|
|
175
200
|
});
|
|
176
201
|
const resp = yield client.send(command); // response
|
|
177
202
|
return resp;
|
|
@@ -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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"}
|
|
@@ -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
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tremho/mist-lift",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.6",
|
|
4
4
|
"description": "lift command line utility for MistLift development",
|
|
5
5
|
"main": "build/lift.js",
|
|
6
6
|
"bin": {
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"@aws-sdk/client-api-gateway": "^3.598.0",
|
|
50
50
|
"@aws-sdk/client-lambda": "^3.598.0",
|
|
51
51
|
"@aws-sdk/credential-providers": "^3.598.0",
|
|
52
|
-
"@tremho/inverse-y": "^2.0.2
|
|
52
|
+
"@tremho/inverse-y": "^2.0.2",
|
|
53
53
|
"@tremho/session-tbd": "^2.0.1-pre-release.3",
|
|
54
54
|
"ansi-colors": "^4.1.3",
|
|
55
55
|
"body-parser": "^1.20.2",
|
package/src/commands/build.ts
CHANGED
|
@@ -150,6 +150,12 @@ function doPostBuildSteps (
|
|
|
150
150
|
console.error(ac.red.bold('no definition file found at ' + srcdef))
|
|
151
151
|
return 1
|
|
152
152
|
}
|
|
153
|
+
// Copy the runmain.mjs file over
|
|
154
|
+
const srcrun = path.join(funcDir, 'runmain.mjs')
|
|
155
|
+
const dstrun = path.join(buildPath, 'runmain.mjs')
|
|
156
|
+
if (fs.existsSync(srcrun)) {
|
|
157
|
+
fs.copyFileSync(srcrun, dstrun)
|
|
158
|
+
}
|
|
153
159
|
// copy the resources folder if it exists
|
|
154
160
|
const filedirPath = path.join(funcDir, 'resources')
|
|
155
161
|
if (fs.existsSync(filedirPath)) {
|
|
@@ -25,7 +25,6 @@ export function addBuiltInDefinitions (defs: any[]): void {
|
|
|
25
25
|
// console.warn("NOT ADDING ANY BUILTIN API INTEGRATIONS")
|
|
26
26
|
// console.log("ADDING apiDef");
|
|
27
27
|
defs.push(apiDef)
|
|
28
|
-
// console.log("ADDING webrootDef");
|
|
29
28
|
defs.push(webrootDef)
|
|
30
29
|
|
|
31
30
|
// console.warn("Adding webroot literals");
|
|
@@ -93,6 +92,8 @@ const webrootDef = {
|
|
|
93
92
|
version: '1.0.0',
|
|
94
93
|
pathMap: '/{path}',
|
|
95
94
|
method: 'get',
|
|
95
|
+
timeout: 8,
|
|
96
|
+
memorySize: 1024,
|
|
96
97
|
logLevel: 'Debug',
|
|
97
98
|
sessionRequired: false,
|
|
98
99
|
userRequired: false,
|
|
@@ -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
|
|
|
@@ -39,7 +40,6 @@ export async function DeployRootFileserves
|
|
|
39
40
|
export async function DeployApiBuiltin
|
|
40
41
|
(
|
|
41
42
|
): Promise<any> {
|
|
42
|
-
console.log('Deploy API Builtin')
|
|
43
43
|
// get the prebuilt zip location
|
|
44
44
|
const apiZip = path.join(__dirname, 'prebuilt-zips', 'API.zip')
|
|
45
45
|
await DeployBuiltInZip('api', apiZip)
|
|
@@ -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
|
|
|
@@ -98,8 +99,16 @@ export async function deployPackage (
|
|
|
98
99
|
let def: any = {}
|
|
99
100
|
try {
|
|
100
101
|
def = JSON.parse(fs.readFileSync(defFile).toString())
|
|
101
|
-
} catch (e: any) {
|
|
102
|
-
|
|
102
|
+
} catch (e: any) {
|
|
103
|
+
// hack for assigning a definition -- the defs from ApiDocMaker don't appear here
|
|
104
|
+
if (funcName === 'Webroot') {
|
|
105
|
+
def.name = 'Webroot'
|
|
106
|
+
def.timeoutSeconds = 8
|
|
107
|
+
def.memorySize = 256
|
|
108
|
+
}
|
|
109
|
+
}
|
|
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)
|
|
103
112
|
// funcname gets decorated with current instance identifier
|
|
104
113
|
const idsrc = md5((getProjectName() ?? '') + (getProjectVersion()?.toString() ?? ''))
|
|
105
114
|
const dFuncName = funcName + '_' + idsrc
|
|
@@ -113,14 +122,29 @@ export async function deployPackage (
|
|
|
113
122
|
}).catch((e: any) => {
|
|
114
123
|
})
|
|
115
124
|
|
|
116
|
-
//
|
|
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);
|
|
117
128
|
|
|
118
129
|
try {
|
|
119
|
-
const response: any = await CreateCloudFunction(dFuncName, zipFile, timeout)
|
|
130
|
+
const response: any = await CreateCloudFunction(dFuncName, zipFile, timeout, memorySize)
|
|
120
131
|
const parts = response.FunctionArn.split(':')
|
|
121
132
|
const principal = parts[4]
|
|
122
133
|
await AddPermissions(client, dFuncName, principal)
|
|
123
|
-
|
|
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))
|
|
124
148
|
} catch (e: any) {
|
|
125
149
|
console.error(ac.red.bold.italic('Error deploying ' + funcName), e)
|
|
126
150
|
}
|
|
@@ -128,7 +152,8 @@ export async function deployPackage (
|
|
|
128
152
|
async function CreateCloudFunction (
|
|
129
153
|
funcName: string,
|
|
130
154
|
zipFile: string,
|
|
131
|
-
timeout: number
|
|
155
|
+
timeout: number,
|
|
156
|
+
memorySize: number
|
|
132
157
|
|
|
133
158
|
): Promise<any> {
|
|
134
159
|
const settings = getSettings()
|
|
@@ -144,7 +169,8 @@ async function CreateCloudFunction (
|
|
|
144
169
|
Code: {
|
|
145
170
|
ZipFile: zipFileBase64
|
|
146
171
|
},
|
|
147
|
-
Timeout: timeout > 0 ? timeout : undefined
|
|
172
|
+
Timeout: timeout > 0 ? timeout : undefined,
|
|
173
|
+
MemorySize: memorySize > 0 ? memorySize : undefined
|
|
148
174
|
})
|
|
149
175
|
const resp = await client.send(command) // response
|
|
150
176
|
return resp
|
|
@@ -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',
|