@tremho/mist-lift 1.1.8 → 1.2.0-prerelease.4
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 +8 -0
- package/build/commands/builtin/ApiDocMaker.js +3 -3
- package/build/commands/builtin/ApiDocMaker.js.map +1 -1
- package/build/commands/create.js +6 -0
- package/build/commands/create.js.map +1 -1
- package/build/commands/init.js +4 -0
- package/build/commands/init.js.map +1 -1
- package/build/commands/publish.js +2 -2
- package/build/commands/publish.js.map +1 -1
- package/build/commands/start.js +144 -11
- package/build/commands/start.js.map +1 -1
- package/build/expressRoutes/all.js +9 -8
- package/build/expressRoutes/all.js.map +1 -1
- package/build/expressRoutes/functionBinder.js +43 -37
- package/build/expressRoutes/functionBinder.js.map +1 -1
- package/build/lib/DirectoryUtils.js +3 -1
- package/build/lib/DirectoryUtils.js.map +1 -1
- package/build/lib/openAPI/openApiConstruction.js +37 -7
- package/build/lib/openAPI/openApiConstruction.js.map +1 -1
- package/package.json +7 -3
- package/src/commands/builtin/ApiDocMaker.ts +3 -3
- package/src/commands/create.ts +7 -0
- package/src/commands/init.ts +5 -0
- package/src/commands/publish.ts +2 -2
- package/src/commands/start.ts +163 -11
- package/src/expressRoutes/all.ts +8 -7
- package/src/expressRoutes/functionBinder.ts +39 -32
- package/src/lib/DirectoryUtils.ts +7 -5
- package/src/lib/openAPI/openApiConstruction.ts +14 -7
- package/templateData/function-definition-template +1 -1
package/README.md
CHANGED
|
@@ -40,6 +40,14 @@ To get started using MistLift, please see the [QuickStart Guide](https://github.
|
|
|
40
40
|
|
|
41
41
|
## Changelog
|
|
42
42
|
|
|
43
|
+
### 1.2.0
|
|
44
|
+
|
|
45
|
+
- __Minor Breaking Change__ service definition _allowedMethods_ changed to just _method_. No more pretense of supporting multiple methods for the same function.
|
|
46
|
+
This is breaking because any previous service definition files need to change this property name to continue to work with this version or later.
|
|
47
|
+
|
|
48
|
+
- Support for a common library shared by functions (_see [Tips and Techniques](./doc/Tips%20and%20Techiques.md))
|
|
49
|
+
- Support for esbuild (e.g. React) (_see [ESBuild and React support](./doc/ESBuild and React support.md))
|
|
50
|
+
|
|
43
51
|
### 1.1.8
|
|
44
52
|
|
|
45
53
|
- Fixed a bug with certain forms of JSON responses on AWS
|
|
@@ -65,7 +65,7 @@ const apiDef = {
|
|
|
65
65
|
description: '',
|
|
66
66
|
version: '1.0.0',
|
|
67
67
|
pathMap: '/api',
|
|
68
|
-
|
|
68
|
+
method: 'GET',
|
|
69
69
|
logLevel: 'Debug',
|
|
70
70
|
sessionRequired: false,
|
|
71
71
|
userRequired: false,
|
|
@@ -84,7 +84,7 @@ const fileServeDef = {
|
|
|
84
84
|
description: 'file service',
|
|
85
85
|
version: '1.0.0',
|
|
86
86
|
pathMap: '',
|
|
87
|
-
|
|
87
|
+
method: 'GET',
|
|
88
88
|
logLevel: 'Debug',
|
|
89
89
|
sessionRequired: false,
|
|
90
90
|
userRequired: false,
|
|
@@ -100,7 +100,7 @@ const webrootDef = {
|
|
|
100
100
|
description: 'Serves files from the webroot /',
|
|
101
101
|
version: '1.0.0',
|
|
102
102
|
pathMap: '/{path}',
|
|
103
|
-
|
|
103
|
+
method: 'get',
|
|
104
104
|
logLevel: 'Debug',
|
|
105
105
|
sessionRequired: false,
|
|
106
106
|
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,oCAAoC;IACpC,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;AA1BD,sDA0BC;AAED,MAAM,MAAM,GAAG;IACb,IAAI,EAAE,KAAK;IACX,WAAW,EAAE,EAAE;IACf,OAAO,EAAE,OAAO;IAChB,OAAO,EAAE,MAAM;IACf,
|
|
1
|
+
{"version":3,"file":"ApiDocMaker.js","sourceRoot":"","sources":["../../../src/commands/builtin/ApiDocMaker.ts"],"names":[],"mappings":"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"}
|
package/build/commands/create.js
CHANGED
|
@@ -53,6 +53,12 @@ function doCreate(funcName // name of function to create
|
|
|
53
53
|
fs.mkdirSync(path.join(funcPath, testdirname));
|
|
54
54
|
if (!fs.existsSync(path.join(funcPath, 'src')))
|
|
55
55
|
fs.mkdirSync(path.join(funcPath, 'src'));
|
|
56
|
+
// create link to common lib
|
|
57
|
+
if (!fs.existsSync(path.join(funcPath, 'src', 'commonLib'))) {
|
|
58
|
+
const funcSrc = path.join(funcPath, 'src');
|
|
59
|
+
const relPath = path.relative(funcSrc, projectPaths.basePath);
|
|
60
|
+
fs.symlinkSync(path.join(relPath, 'commonLib'), path.join(funcSrc, 'lib'), 'dir');
|
|
61
|
+
}
|
|
56
62
|
let localsrc = fs.readFileSync(path.join(dataDir, 'function-local-ts')).toString();
|
|
57
63
|
while (localsrc.includes('$$FUNCTION_NAME$$')) {
|
|
58
64
|
localsrc = localsrc.replace('$$FUNCTION_NAME$$', funcName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../src/commands/create.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../src/commands/create.ts"],"names":[],"mappings":"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"}
|
package/build/commands/init.js
CHANGED
|
@@ -68,6 +68,10 @@ function doInit(folder, defaults) {
|
|
|
68
68
|
if (!fs.existsSync(funcDir)) {
|
|
69
69
|
fs.mkdirSync(funcDir);
|
|
70
70
|
}
|
|
71
|
+
const libDir = path.join(refPath, 'commonLib');
|
|
72
|
+
if (!fs.existsSync(libDir)) {
|
|
73
|
+
fs.mkdirSync(libDir);
|
|
74
|
+
}
|
|
71
75
|
// make webroot with docs folder and placeholder yaml
|
|
72
76
|
const webrootDocs = path.join(refPath, 'webroot', 'docs');
|
|
73
77
|
if (!fs.existsSync(webrootDocs)) {
|
|
@@ -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,qDAAqD;QACrD,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,CAAA;QACzD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;YAChC,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;YAC9C,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,aAAa,CAAC,CAAA;YAClD,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;YAC1B,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAA;YACtE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,gBAAgB,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC,CAAA;YACrG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,sBAAsB,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,sBAAsB,CAAC,CAAC,CAAA;YACjH,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,iCAAiC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,iCAAiC,CAAC,CAAC,CAAA;QACzI,CAAC;QAED,MAAM,IAAA,qDAAqC,EAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;QAC9D,MAAM,IAAA,oCAAiB,EAAC,OAAO,CAAC,CAAA;QAChC,MAAM,IAAA,oCAAiB,EAAC,OAAO,EAAE,aAAa,CAAC,CAAA;QAC/C,MAAM,IAAA,oCAAiB,EAAC,OAAO,EAAE,YAAY,CAAC,CAAA;QAC9C,MAAM,IAAA,oCAAiB,EAAC,OAAO,EAAE,KAAK,CAAC,CAAA;QACvC,MAAM,IAAA,iCAAc,EAAC,OAAO,EAAE,mBAAmB,CAAC,CAAA;IACpD,CAAC;CAAA;
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -219,7 +219,7 @@ class PrereqInfo {
|
|
|
219
219
|
// console.log("resourceMethods", api.resourceMethods)
|
|
220
220
|
const methodList = Object.getOwnPropertyNames(api.resourceMethods);
|
|
221
221
|
// ClogTrace("methodList", methodList)
|
|
222
|
-
for (const meth of allowedMethods.toUpperCase().split(',')) {
|
|
222
|
+
for (const meth of allowedMethods.toUpperCase().split(',')) { // NOTE: we no longer try to support multiples, but this still works as is.
|
|
223
223
|
// console.log("meth", meth)
|
|
224
224
|
if (methodList.includes(meth)) {
|
|
225
225
|
(api).method = meth;
|
|
@@ -247,7 +247,7 @@ class PrereqInfo {
|
|
|
247
247
|
const out = [];
|
|
248
248
|
for (const d of this.defs) {
|
|
249
249
|
const def = (d);
|
|
250
|
-
const api = this.findApi(def.pathMap, def.
|
|
250
|
+
const api = this.findApi(def.pathMap, def.method);
|
|
251
251
|
const arn = (_c = this.findARN(def.name)) !== null && _c !== void 0 ? _c : '';
|
|
252
252
|
if (arn === '') {
|
|
253
253
|
console.log(`>>> No ARN for ${def.name} ${def.pathMap}, ${api.id}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../src/commands/publish.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../src/commands/publish.ts"],"names":[],"mappings":"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"}
|
package/build/commands/start.js
CHANGED
|
@@ -38,14 +38,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
38
38
|
exports.startLocalServer = void 0;
|
|
39
39
|
/** Run Express Server */
|
|
40
40
|
const express_1 = __importDefault(require("express"));
|
|
41
|
+
const esbuild = __importStar(require("esbuild"));
|
|
42
|
+
const node_watch_1 = __importDefault(require("node-watch"));
|
|
43
|
+
const express_ws_1 = __importDefault(require("express-ws"));
|
|
41
44
|
const functionBinder_1 = __importStar(require("../expressRoutes/functionBinder"));
|
|
42
45
|
const api_1 = __importDefault(require("../expressRoutes/api"));
|
|
43
46
|
const all_1 = __importStar(require("../expressRoutes/all"));
|
|
44
47
|
const pathResolve_1 = require("../lib/pathResolve");
|
|
45
48
|
const build_1 = require("./build");
|
|
46
49
|
const ac = __importStar(require("ansi-colors"));
|
|
50
|
+
const path_1 = __importDefault(require("path"));
|
|
51
|
+
const fs_1 = __importDefault(require("fs"));
|
|
52
|
+
const defaultPort = 8081;
|
|
53
|
+
const serverConfig = readServerConfig();
|
|
54
|
+
let server = null;
|
|
55
|
+
const app = (0, express_1.default)();
|
|
47
56
|
function startLocalServer() {
|
|
48
57
|
return __awaiter(this, void 0, void 0, function* () {
|
|
58
|
+
// console.warn('startLocalServer')
|
|
49
59
|
const projectPaths = (0, pathResolve_1.resolvePaths)();
|
|
50
60
|
if (!projectPaths.verified) {
|
|
51
61
|
console.log(ac.bold.red('Cannot start local server'));
|
|
@@ -53,11 +63,12 @@ function startLocalServer() {
|
|
|
53
63
|
console.log('');
|
|
54
64
|
return;
|
|
55
65
|
}
|
|
66
|
+
// first build will exit on an error regardless of config
|
|
56
67
|
yield (0, build_1.doBuildAsync)([]);
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
(0, functionBinder_1.functionBinder)();
|
|
60
|
-
|
|
68
|
+
yield (0, all_1.allBinder)();
|
|
69
|
+
// Log.Trace('calling functionBinder')
|
|
70
|
+
yield (0, functionBinder_1.functionBinder)();
|
|
71
|
+
// Log.Trace('done calling functionBinder')
|
|
61
72
|
// for JSON posts
|
|
62
73
|
// app.use(bodyParser.json({limit: '50mb'}))
|
|
63
74
|
app.use(express_1.default.json());
|
|
@@ -66,14 +77,136 @@ function startLocalServer() {
|
|
|
66
77
|
app.use('/', functionBinder_1.default);
|
|
67
78
|
app.use('/api', api_1.default);
|
|
68
79
|
app.use('*', all_1.default);
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
app.listen(port, function () {
|
|
73
|
-
console.log(`http listening on port ${port}`);
|
|
74
|
-
});
|
|
75
|
-
// ================================================
|
|
80
|
+
startServers();
|
|
81
|
+
funcWatcher(path_1.default.join(projectPaths.basePath, 'functions'), path_1.default.join(projectPaths.basePath, 'webroot'));
|
|
82
|
+
esbuilder();
|
|
76
83
|
});
|
|
77
84
|
}
|
|
78
85
|
exports.startLocalServer = startLocalServer;
|
|
86
|
+
function startServers() {
|
|
87
|
+
startWebSocketConnection(app);
|
|
88
|
+
server = app.listen(serverConfig.port, function () {
|
|
89
|
+
var _a;
|
|
90
|
+
console.log(`http listening on port ${(_a = serverConfig.port) !== null && _a !== void 0 ? _a : defaultPort}`);
|
|
91
|
+
});
|
|
92
|
+
}
|
|
93
|
+
function readServerConfig() {
|
|
94
|
+
// console.log('readServerConfig...')
|
|
95
|
+
const projectPaths = (0, pathResolve_1.resolvePaths)();
|
|
96
|
+
const confFile = path_1.default.join(projectPaths.basePath, 'localServerConfig.json');
|
|
97
|
+
if (!fs_1.default.existsSync(confFile))
|
|
98
|
+
return {};
|
|
99
|
+
const conf = JSON.parse(fs_1.default.readFileSync(confFile).toString());
|
|
100
|
+
// console.log("server configuration", conf)
|
|
101
|
+
return conf;
|
|
102
|
+
}
|
|
103
|
+
function esbuilder() {
|
|
104
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
105
|
+
var _a, _b, _c, _d, _e;
|
|
106
|
+
if (!serverConfig.esbuild)
|
|
107
|
+
return;
|
|
108
|
+
const entryPoints = (_a = serverConfig.esbuild.entryPoints) !== null && _a !== void 0 ? _a : [];
|
|
109
|
+
const outDir = (_b = serverConfig.esbuild.outdir) !== null && _b !== void 0 ? _b : 'webroot';
|
|
110
|
+
const watch = (_c = serverConfig.esbuild.watch) !== null && _c !== void 0 ? _c : false;
|
|
111
|
+
const breakOnError = (_d = serverConfig.esbuild.breakOnError) !== null && _d !== void 0 ? _d : false;
|
|
112
|
+
const breakOnWarn = (_e = serverConfig.esbuild.breakOnWarn) !== null && _e !== void 0 ? _e : false;
|
|
113
|
+
let ctx = yield esbuild.context({
|
|
114
|
+
entryPoints,
|
|
115
|
+
bundle: true,
|
|
116
|
+
outdir: outDir
|
|
117
|
+
});
|
|
118
|
+
// console.log('esbuild...')
|
|
119
|
+
let result = yield ctx.rebuild();
|
|
120
|
+
let more = watch;
|
|
121
|
+
do {
|
|
122
|
+
yield sleep(500);
|
|
123
|
+
result = yield ctx.rebuild();
|
|
124
|
+
} while (more);
|
|
125
|
+
});
|
|
126
|
+
}
|
|
127
|
+
function sleep(ms) {
|
|
128
|
+
return new Promise(resolve => {
|
|
129
|
+
setTimeout(resolve, ms);
|
|
130
|
+
});
|
|
131
|
+
}
|
|
132
|
+
function funcWatcher(watchPath, webrootPath) {
|
|
133
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
134
|
+
if (serverConfig.rebuildFunctionsOnChange !== true)
|
|
135
|
+
return;
|
|
136
|
+
// console.log('watching for changes in functions')
|
|
137
|
+
(0, node_watch_1.default)(watchPath, { recursive: true }, onWatch1);
|
|
138
|
+
if (serverConfig.refreshBrowserOnWebrootChange) {
|
|
139
|
+
// console.log('watching for webroot changes')
|
|
140
|
+
(0, node_watch_1.default)(webrootPath, { recursive: true }, onWatch2);
|
|
141
|
+
}
|
|
142
|
+
});
|
|
143
|
+
}
|
|
144
|
+
function onWatch1(evt, name) {
|
|
145
|
+
// console.log("funcWatch Event seen", {evt, name})
|
|
146
|
+
triggerRebuild();
|
|
147
|
+
}
|
|
148
|
+
function onWatch2(evt, name) {
|
|
149
|
+
// console.log("Webroot Watch Event seen", {evt, name})
|
|
150
|
+
triggerBrowserRestart();
|
|
151
|
+
}
|
|
152
|
+
let alreadyBuilding = false;
|
|
153
|
+
function triggerRebuild() {
|
|
154
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
155
|
+
if (!alreadyBuilding) {
|
|
156
|
+
alreadyBuilding = true;
|
|
157
|
+
const errRet = yield (0, build_1.doBuildAsync)([]);
|
|
158
|
+
if (errRet) {
|
|
159
|
+
process.exit(errRet);
|
|
160
|
+
}
|
|
161
|
+
alreadyBuilding = false;
|
|
162
|
+
if (serverConfig.refreshBrowserOnFunctionChange)
|
|
163
|
+
triggerBrowserRestart();
|
|
164
|
+
}
|
|
165
|
+
});
|
|
166
|
+
}
|
|
167
|
+
function triggerBrowserRestart() {
|
|
168
|
+
// console.log("Trigger Browser Restart")
|
|
169
|
+
if (server) {
|
|
170
|
+
socketClose();
|
|
171
|
+
server.close(() => {
|
|
172
|
+
startServers();
|
|
173
|
+
});
|
|
174
|
+
// console.log("server close initiated")
|
|
175
|
+
}
|
|
176
|
+
else {
|
|
177
|
+
// console.log("first start of servers")
|
|
178
|
+
startServers();
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
class WSConnection {
|
|
182
|
+
constructor() {
|
|
183
|
+
this.remoteAddress = '';
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
var socketClose = () => { };
|
|
187
|
+
function startWebSocketConnection(app) {
|
|
188
|
+
// console.log("Starting WebSocket Connection Listener")
|
|
189
|
+
const ews = (0, express_ws_1.default)(app);
|
|
190
|
+
const wsapp = ews.app;
|
|
191
|
+
socketClose = (e) => {
|
|
192
|
+
// console.log("close wss", e)
|
|
193
|
+
ews.getWss().close();
|
|
194
|
+
};
|
|
195
|
+
// wsapp.use((err:any, req:any, res:any, next:any) => {
|
|
196
|
+
// console.error(err.stack);
|
|
197
|
+
// res.status(500).send('Something broke!');
|
|
198
|
+
// })
|
|
199
|
+
wsapp.get('/watch', (req, res, next) => {
|
|
200
|
+
// console.log('get route', req.testing)
|
|
201
|
+
});
|
|
202
|
+
wsapp.ws('/watch', (ws, req) => {
|
|
203
|
+
ws.on('message', (msg) => {
|
|
204
|
+
// console.log('Received WS Message: ' + msg)
|
|
205
|
+
ws.send(msg);
|
|
206
|
+
});
|
|
207
|
+
ws.on('close', () => {
|
|
208
|
+
// console.log("Websocket connection closed")
|
|
209
|
+
});
|
|
210
|
+
});
|
|
211
|
+
}
|
|
79
212
|
//# sourceMappingURL=start.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yBAAyB;AACzB,sDAA6B;AAE7B,kFAAgF;AAEhF,+DAA4C;AAC5C,4DAA2D;AAC3D,oDAAiD;AACjD,mCAAsC;AAEtC,gDAAiC;AAEjC,SAAsB,gBAAgB;;QACpC,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;
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"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"}
|
|
@@ -55,7 +55,6 @@ function allBinder() {
|
|
|
55
55
|
router.all('*', (req, res, next) => {
|
|
56
56
|
var _a;
|
|
57
57
|
// any PHP requests should be ignored
|
|
58
|
-
// ClogTrace('incoming: '+req.originalUrl)
|
|
59
58
|
if (req.originalUrl.includes('.php')) {
|
|
60
59
|
return res.send('');
|
|
61
60
|
}
|
|
@@ -112,13 +111,15 @@ function allBinder() {
|
|
|
112
111
|
return res.sendStatus(200);
|
|
113
112
|
}
|
|
114
113
|
}
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
114
|
+
if (!filepath.endsWith('.websocket')) {
|
|
115
|
+
filepath = path_1.default.resolve(path_1.default.join(projectPaths.basePath, 'webroot', filepath)); // .. out of build
|
|
116
|
+
if (fs_1.default.existsSync(filepath)) {
|
|
117
|
+
return res.sendFile(filepath);
|
|
118
|
+
}
|
|
119
|
+
else {
|
|
120
|
+
console.log(ac.red.bold("can't find " + filepath));
|
|
121
|
+
return res.sendStatus(404);
|
|
122
|
+
}
|
|
122
123
|
}
|
|
123
124
|
}
|
|
124
125
|
// if none of the above, tickle enumerator so we can process other paths
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"all.js","sourceRoot":"","sources":["../../src/expressRoutes/all.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAuB;AACvB,4CAAmB;AAEnB,gDAAiC;AACjC,oDAAiD;AACjD,wEAA4E;AAE5E,sDAA6B;AAC7B,MAAM,MAAM,GAAG,iBAAO,CAAC,MAAM,EAAE,CAAA;AAE/B,SAAgB,SAAS;IACvB,MAAM,YAAY,GAAG,IAAA,0BAAY,GAAE,CAAA;IACnC,MAAM,IAAI,GAAG,IAAA,6CAAyB,GAAE,CAAA;IAExC;;;;;;;;;;;;;;SAcK;IACL,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;;QACjC,qCAAqC;QACrC,
|
|
1
|
+
{"version":3,"file":"all.js","sourceRoot":"","sources":["../../src/expressRoutes/all.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,46 +42,52 @@ function functionBinder() {
|
|
|
42
42
|
(0, openApiConstruction_1.buildOpenApi)(defs).then(() => {
|
|
43
43
|
const projectPaths = (0, pathResolve_1.resolvePaths)();
|
|
44
44
|
for (const def of defs) {
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
let entryRoot = pathMap;
|
|
54
|
-
const n = entryRoot.indexOf('/{');
|
|
55
|
-
if (n !== -1)
|
|
56
|
-
entryRoot = entryRoot.substring(0, n) + '/*';
|
|
57
|
-
const callHandler = (pathMap, req, res) => {
|
|
58
|
-
const event = requestToEvent(pathMap, req);
|
|
59
|
-
Promise.resolve(start(event, null, null)).then(respOut => {
|
|
60
|
-
handleResponse(res, respOut);
|
|
61
|
-
}).catch((reason) => undefined);
|
|
62
|
-
};
|
|
63
|
-
if (method === 'get') {
|
|
64
|
-
router.get(entryRoot, (req, res) => callHandler(pathMap, req, res));
|
|
65
|
-
}
|
|
66
|
-
else if (method === 'post') {
|
|
67
|
-
router.post(entryRoot, (req, res) => callHandler(pathMap, req, res));
|
|
68
|
-
}
|
|
69
|
-
else if (method === 'put') {
|
|
70
|
-
router.put(entryRoot, (req, res) => callHandler(pathMap, req, res));
|
|
71
|
-
}
|
|
72
|
-
else if (method === 'patch') {
|
|
73
|
-
router.patch(entryRoot, (req, res) => callHandler(pathMap, req, res));
|
|
74
|
-
}
|
|
75
|
-
else if (method === 'delete') {
|
|
76
|
-
router.delete(entryRoot, (req, res) => callHandler(pathMap, req, res));
|
|
77
|
-
}
|
|
78
|
-
else {
|
|
79
|
-
console.log(ac.red.bold('Cannot map method ') + ac.blue.bold(method));
|
|
45
|
+
let { name, pathMap, method } = def;
|
|
46
|
+
try {
|
|
47
|
+
if (!method) {
|
|
48
|
+
console.log(ac.red('no method defined for ' + name));
|
|
49
|
+
if (def.allowedMethods) {
|
|
50
|
+
console.log(ac.bgBlack.yellowBright('DEPRECATED') + ac.blue(' As of v1.1.8, The use of ') + ac.black.italic('allowedMethods') + ac.blue(' is replaced by the single' +
|
|
51
|
+
ac.black.italic(' method ') + ac.blue('property.') + ac.black.bold('Please update your definition file')));
|
|
52
|
+
method = def.allowedMethods.split(',')[0];
|
|
80
53
|
}
|
|
81
54
|
}
|
|
82
|
-
|
|
83
|
-
|
|
55
|
+
method = method.trim().toLowerCase();
|
|
56
|
+
const rpath = path_1.default.join(projectPaths.buildPath, 'functions', name, 'src', 'main.js');
|
|
57
|
+
clearModule(rpath);
|
|
58
|
+
const { start } = require(rpath);
|
|
59
|
+
let entryRoot = pathMap;
|
|
60
|
+
const n = entryRoot.indexOf('/{');
|
|
61
|
+
if (n !== -1)
|
|
62
|
+
entryRoot = entryRoot.substring(0, n) + '/*';
|
|
63
|
+
const callHandler = (pathMap, req, res) => {
|
|
64
|
+
const event = requestToEvent(pathMap, req);
|
|
65
|
+
Promise.resolve(start(event, null, null)).then(respOut => {
|
|
66
|
+
handleResponse(res, respOut);
|
|
67
|
+
}).catch((reason) => undefined);
|
|
68
|
+
};
|
|
69
|
+
if (method === 'get') {
|
|
70
|
+
router.get(entryRoot, (req, res) => callHandler(pathMap, req, res));
|
|
71
|
+
}
|
|
72
|
+
else if (method === 'post') {
|
|
73
|
+
router.post(entryRoot, (req, res) => callHandler(pathMap, req, res));
|
|
84
74
|
}
|
|
75
|
+
else if (method === 'put') {
|
|
76
|
+
router.put(entryRoot, (req, res) => callHandler(pathMap, req, res));
|
|
77
|
+
}
|
|
78
|
+
else if (method === 'patch') {
|
|
79
|
+
router.patch(entryRoot, (req, res) => callHandler(pathMap, req, res));
|
|
80
|
+
}
|
|
81
|
+
else if (method === 'delete') {
|
|
82
|
+
router.delete(entryRoot, (req, res) => callHandler(pathMap, req, res));
|
|
83
|
+
}
|
|
84
|
+
else {
|
|
85
|
+
console.log(ac.red.bold('Cannot map method ') + ac.blue.bold(method));
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
catch (e) {
|
|
89
|
+
// Log.Error(ac.bold.red(e.message.split('\n')[0]))0
|
|
90
|
+
inverse_y_1.Log.Exception(e);
|
|
85
91
|
}
|
|
86
92
|
}
|
|
87
93
|
}).catch((reason) => undefined);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"functionBinder.js","sourceRoot":"","sources":["../../src/expressRoutes/functionBinder.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAAsD;AACtD,gDAAuB;AAEvB,gDAAiC;AACjC,oDAAiD;AAEjD,sDAA6B;AAC7B,wEAA4E;AAC5E,4EAAiE;AACjE,iDAAuC;AAEvC,MAAM,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC,CAAA;AAC3C,MAAM,MAAM,GAAG,iBAAO,CAAC,MAAM,EAAE,CAAA;AAE/B,SAAgB,cAAc;IAC5B,MAAM,IAAI,GAAG,IAAA,6CAAyB,GAAE,CAAA;IACxC,IAAA,kCAAY,EAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;QAC3B,MAAM,YAAY,GAAG,IAAA,0BAAY,GAAE,CAAA;QAEnC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,
|
|
1
|
+
{"version":3,"file":"functionBinder.js","sourceRoot":"","sources":["../../src/expressRoutes/functionBinder.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,12 +10,14 @@ const path_1 = __importDefault(require("path"));
|
|
|
10
10
|
function recurseDirectory(dirpath, callback) {
|
|
11
11
|
fs_1.default.readdirSync(dirpath).forEach((file) => {
|
|
12
12
|
const fpath = path_1.default.join(dirpath, file);
|
|
13
|
-
|
|
13
|
+
// if(fpath.indexOf('node_modules') === -1) {
|
|
14
|
+
const stat = fs_1.default.statSync(fpath);
|
|
14
15
|
if ((callback != null) && !callback(fpath, stat)) {
|
|
15
16
|
if (stat.isDirectory()) {
|
|
16
17
|
recurseDirectory(fpath, callback);
|
|
17
18
|
}
|
|
18
19
|
}
|
|
20
|
+
// }
|
|
19
21
|
});
|
|
20
22
|
}
|
|
21
23
|
exports.recurseDirectory = recurseDirectory;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DirectoryUtils.js","sourceRoot":"","sources":["../../src/lib/DirectoryUtils.ts"],"names":[],"mappings":";;;;;;AACA,4CAA8B;AAC9B,gDAAuB;AAKvB,mFAAmF;AACnF,SAAgB,gBAAgB,CAAE,OAAe,EAAE,QAAoB;IACrE,YAAE,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,IAAY,EAAE,EAAE;QAC/C,MAAM,KAAK,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;QACtC,MAAM,IAAI,GAAG,YAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"DirectoryUtils.js","sourceRoot":"","sources":["../../src/lib/DirectoryUtils.ts"],"names":[],"mappings":";;;;;;AACA,4CAA8B;AAC9B,gDAAuB;AAKvB,mFAAmF;AACnF,SAAgB,gBAAgB,CAAE,OAAe,EAAE,QAAoB;IACrE,YAAE,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,IAAY,EAAE,EAAE;QAC/C,MAAM,KAAK,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;QACtC,6CAA6C;QAC3C,MAAM,IAAI,GAAG,YAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;QAC/B,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC;YACjD,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;gBACvB,gBAAgB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;YACnC,CAAC;QACH,CAAC;QACH,IAAI;IACN,CAAC,CAAC,CAAA;AACJ,CAAC;AAZD,4CAYC;AAED,kEAAkE;AAClE,SAAgB,kBAAkB,CAAE,OAAe,EAAE,KAAa;IAChE,IAAI,UAAU,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,CAAA;IAC5B,IAAI,YAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QAC3B,gBAAgB,CAAC,OAAO,EAAE,CAAC,QAAgB,EAAE,KAAY,EAAE,EAAE;YAC3D,MAAM,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAA;YAClE,IAAI,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC;gBAClC,IAAI,KAAK,CAAC,KAAK,GAAG,UAAU;oBAAE,UAAU,GAAG,KAAK,CAAC,KAAK,CAAA;YACxD,CAAC;YACD,OAAO,KAAK,CAAA;QACd,CAAC,CAAC,CAAA;IACJ,CAAC;IACD,OAAO,UAAU,CAAA;AACnB,CAAC;AAZD,gDAYC"}
|
|
@@ -1,4 +1,27 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
2
25
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
26
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
27
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -20,6 +43,7 @@ const oas30_1 = require("openapi3-ts/oas30");
|
|
|
20
43
|
const fs_1 = __importDefault(require("fs"));
|
|
21
44
|
const path_1 = __importDefault(require("path"));
|
|
22
45
|
const pathResolve_1 = require("../pathResolve");
|
|
46
|
+
const ac = __importStar(require("ansi-colors"));
|
|
23
47
|
function buildOpenApi(defs_1) {
|
|
24
48
|
return __awaiter(this, arguments, void 0, function* (defs, includePrivate = false, yamlFile) {
|
|
25
49
|
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
@@ -60,18 +84,24 @@ function buildOpenApi(defs_1) {
|
|
|
60
84
|
if (def.private === true && !includePrivate)
|
|
61
85
|
continue; // skip private
|
|
62
86
|
const parameters = (_f = def.parameters) !== null && _f !== void 0 ? _f : [];
|
|
63
|
-
|
|
87
|
+
let method = def.method;
|
|
88
|
+
if (!def.method) {
|
|
89
|
+
console.log(ac.red('no method defined for ' + def.name));
|
|
90
|
+
if (def.allowedMethods) {
|
|
91
|
+
console.log(ac.bgBlack.yellowBright('DEPRECATED') + ac.blue(' As of v1.1.8, The use of ') + ac.black.italic('allowedMethods') + ac.blue(' is replaced by the single' +
|
|
92
|
+
ac.black.italic(' method ') + ac.blue('property.') + ac.black.bold('Please update your definition file')));
|
|
93
|
+
def.method = def.allowedMethods.split(',')[0];
|
|
94
|
+
}
|
|
95
|
+
}
|
|
64
96
|
const schemas = (_g = def.schemas) !== null && _g !== void 0 ? _g : {};
|
|
65
97
|
for (const schemaName of Object.getOwnPropertyNames(schemas)) {
|
|
66
98
|
const schema = schemas[schemaName];
|
|
67
99
|
addTypeSchema(builder, schemaName, schema);
|
|
68
100
|
}
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
addParameter(pathDef, param);
|
|
74
|
-
}
|
|
101
|
+
method = method.trim().toLowerCase();
|
|
102
|
+
addFunctionMethod(pathDef, method, def);
|
|
103
|
+
for (const param of parameters) {
|
|
104
|
+
addParameter(pathDef, param);
|
|
75
105
|
}
|
|
76
106
|
addCORSOptionMethod(pathDef);
|
|
77
107
|
builder.addPath(((_h = def.pathMap) !== null && _h !== void 0 ? _h : '/' + def.name), pathDef);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openApiConstruction.js","sourceRoot":"","sources":["../../../src/lib/openAPI/openApiConstruction.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"openApiConstruction.js","sourceRoot":"","sources":["../../../src/lib/openAPI/openApiConstruction.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;GAEG;AACH,6CAAkD;AAClD,4CAAmB;AACnB,gDAAuB;AACvB,gDAA6C;AAC7C,gDAAiC;AAEjC,SAAsB,YAAY;yDAChC,IAAW,EACX,iBAA0B,KAAK,EAC/B,QAAiB;;QAEjB,MAAM,OAAO,GAAG,IAAI,sBAAc,EAAE,CAAA;QAEpC,MAAM,YAAY,GAAG,MAAM,IAAA,0BAAY,GAAE,CAAA;QACzC,IAAI,CAAC,YAAY,CAAC,QAAQ;YAAE,OAAO,IAAI,UAAU,CAAC,CAAC,CAAC,CAAA,CAAC,8BAA8B;QAEnF,qDAAqD;QACrD,MAAM,OAAO,GAAG,YAAY,CAAC,WAAW,CAAA;QACxC,IAAI,GAAG,GAAQ,EAAE,CAAA;QACjB,IAAI,CAAC;YAAC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;QAAC,CAAC;QAAC,WAAM,CAAC,CAAA,CAAC;QACtE,MAAM,KAAK,GAAW,MAAA,GAAG,CAAC,IAAI,mCAAI,EAAE,CAAA;QACpC,iCAAiC;QACjC,uCAAuC;QACvC,+CAA+C;QAC/C,MAAM,OAAO,GAAW,MAAA,GAAG,CAAC,OAAO,mCAAI,EAAE,CAAA;QAEzC,wDAAwD;QACxD,kEAAkE;QAClE,MAAM,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,sBAAsB,CAAC,CAAA;QAC7E,IAAI,OAAO,GAAQ,EAAE,CAAA;QACrB,IAAI,YAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC5B,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;QAC5D,CAAC;QACD,uCAAuC;QAEvC,MAAM,IAAI,GAAG;YACX,KAAK,EAAE,MAAA,OAAO,CAAC,IAAI,mCAAI,KAAK;YAC5B,oBAAoB;YACpB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,OAAO,EAAE,MAAA,MAAA,OAAO,CAAC,OAAO,mCAAI,OAAO,mCAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SAChE,CAAA;QACD,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QAErB,mCAAmC;QACnC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,OAAO,GAAG,EAAE,CAAA;YAClB,IAAI,GAAG,CAAC,OAAO,KAAK,IAAI,IAAI,CAAC,cAAc;gBAAE,SAAQ,CAAC,eAAe;YAErE,MAAM,UAAU,GAAG,MAAA,GAAG,CAAC,UAAU,mCAAI,EAAE,CAAA;YACvC,IAAI,MAAM,GAAG,GAAG,CAAC,MAAM,CAAA;YACvB,IAAG,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;gBACf,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,wBAAwB,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;gBACzD,IAAG,GAAG,CAAC,cAAc,EAAE,CAAC;oBACtB,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC,GAAC,EAAE,CAAC,IAAI,CAAC,4BAA4B,CAAC,GAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,gBAAgB,CAAC,GAAC,EAAE,CAAC,IAAI,CAAC,4BAA4B;wBAC1J,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,GAAC,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,GAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC,CAAC,CAAC;oBAC3G,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;gBAC/C,CAAC;YACH,CAAC;YACD,MAAM,OAAO,GAAG,MAAA,GAAG,CAAC,OAAO,mCAAI,EAAE,CAAA;YACjC,KAAK,MAAM,UAAU,IAAI,MAAM,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC7D,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;gBAClC,aAAa,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,CAAA;YAC5C,CAAC;YACD,MAAM,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAA;YACpC,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,CAAA;YACvC,KAAK,MAAM,KAAK,IAAI,UAAU,EAAE,CAAC;gBAC/B,YAAY,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;YAC9B,CAAC;YACD,mBAAmB,CAAC,OAAO,CAAC,CAAA;YAC5B,OAAO,CAAC,OAAO,CAAC,CAAC,MAAA,GAAG,CAAC,OAAO,mCAAI,GAAG,GAAI,GAAG,CAAC,IAAe,CAAC,EAAE,OAAO,CAAC,CAAA;YAErE,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE;gBACzB,KAAK,EAAE,cAAc;gBACrB,IAAI,EAAE,QAAQ;aACf,CAAC,CAAA;QACJ,CAAC;QAED,MAAM,OAAO,GAAG,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,cAAI,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,aAAa,CAAC,CAAA;QAE9F,MAAM,MAAM,GAAG,CAAC,GAAW,EAAc,EAAE;YACzC,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA,CAAC,wBAAwB;YACpE,MAAM,OAAO,GAAG,IAAI,UAAU,CAAC,GAAG,CAAC,CAAA;YACnC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrD,OAAO,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;YAChC,CAAC;YACD,OAAO,OAAO,CAAA;QAChB,CAAC,CAAA;QAED,MAAM,IAAI,GAAG,OAAO,CAAC,aAAa,EAAE,CAAA;QACpC,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAA;QAC1B,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,YAAE,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;QACjC,CAAC;QACD,OAAO,KAAK,CAAA;IACd,CAAC;CAAA;AAxFD,oCAwFC;AAED,SAAS,aAAa,CAAE,OAAY,EAAE,UAAkB,EAAE,MAAW;IACnE,MAAM,GAAG,GAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,EAAE,CAAA;IACtE,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,mBAAmB,CAAC,MAAM,CAAC,EAAE,CAAC;QACtD,MAAM,MAAM,GAAQ,UAAU,CAAC,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAA;QAEvD,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,MAAM,CAAA;IAC/B,CAAC;IAED,OAAO,CAAC,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,CAAA;AACpC,CAAC;AAED,SAAS,iBAAiB,CAAE,OAAY,EAAE,MAAc,EAAE,GAAQ;;IAChE,iDAAiD;IACjD,MAAM,MAAM,GAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAA;IACxC,MAAM,OAAO,GAAQ,EAAE,CAAA;IACvB,MAAM,IAAI,GAAG,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,mCAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,mCAAI,YAAY,CAAA;IAC5D,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAA;IAElB,MAAM,QAAQ,GAAG;QACf,OAAO,EAAE,GAAG,CAAC,IAAI;QACjB,WAAW,EAAE,GAAG,CAAC,WAAW;QAC5B,SAAS,EAAE;YACT,GAAG,EAAE;gBACH,WAAW,EAAE,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,WAAW,mCAAI,kBAAkB;gBACtD,OAAO;aACR;SACF;KACF,CAAA;IACD,OAAO,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAA;AAC5B,CAAC;AACD,SAAS,mBAAmB,CAAE,OAAY;IACxC,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS;QAAE,OAAM,CAAC,iCAAiC;IAC3E,uBAAuB;IACvB,OAAO,CAAC,OAAO,GAAG;QAChB,SAAS,EAAE;YACT,GAAG,EAAE;gBACH,WAAW,EAAE,cAAc;gBAC3B,OAAO,EAAE;oBACP,kBAAkB,EAAE;wBAClB,MAAM,EAAE;4BACN,IAAI,EAAE,4BAA4B;yBACnC;qBACF;iBACF;aACF;SACF;QACD,iCAAiC,EAAE;YACjC,SAAS,EAAE;gBACT,OAAO,EAAE;oBACP,UAAU,EAAE,KAAK;iBAClB;aACF;YACD,gBAAgB,EAAE;gBAChB,kBAAkB,EAAE,qBAAqB;aAC1C;YACD,mBAAmB,EAAE,eAAe;YACpC,IAAI,EAAE,MAAM;SACb;KACF,CAAA;AACH,CAAC;AAED,SAAS,YAAY,CAAE,OAAY,EAAE,KAAU;;IAC7C,IAAI,OAAO,CAAC,UAAU,KAAK,SAAS;QAAE,OAAO,CAAC,UAAU,GAAG,EAAE,CAAA;IAC7D,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAA;IACrC,MAAM,OAAO,GAAG,MAAA,MAAA,KAAK,CAAC,OAAO,mCAAI,KAAK,CAAC,OAAO,mCAAI,EAAE,CAAA;IACpD,MAAM,IAAI,GAAG,MAAA,KAAK,CAAC,IAAI,mCAAI,OAAO,OAAO,CAAA;IACzC,MAAM,KAAK,GAAG,MAAA,KAAK,CAAC,OAAO,mCAAI,OAAO,CAAA;IAEtC,UAAU,CAAC,IAAI,CAAC;QACd,EAAE,EAAE,KAAK,CAAC,EAAE;QACZ,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,OAAO;QACP,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,MAAM,EAAE,UAAU,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC;KACtC,CAAC,CAAA;AACJ,CAAC;AAED,SAAS,UAAU,CAAE,KAAa,EAAE,SAAiB,EAAE,SAAkB;IACvE,IAAI,OAAO,SAAS,KAAK,QAAQ;QAAE,OAAO,SAAS,CAAA;IACnD,MAAM,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IACvC,IAAI,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,CAAA;IACxB,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAChE,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ;QACjB,IAAI,KAAK,QAAQ;QACjB,IAAI,KAAK,SAAS;QAClB,IAAI,KAAK,SAAS;QAClB,IAAI,KAAK,KAAK;QACd,IAAI,KAAK,MAAM,CACpB,EAAE,CAAC;QACF,OAAO,SAAS;YACd,CAAC,CAAC;gBACE,IAAI,EAAE,wBAAwB,IAAI,EAAE;aACrC;YACH,CAAC,CAAC;gBACE,MAAM,EAAE;oBACN,IAAI,EAAE,wBAAwB,IAAI,EAAE;iBACrC;aACF,CAAA;IACP,CAAC;IACD,IAAI,IAAI,KAAK,KAAK;QAAE,IAAI,GAAG,SAAS,CAAA;IACpC,IAAI,IAAI,KAAK,MAAM;QAAE,IAAI,GAAG,SAAS,CAAA;IACrC,OAAO,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,CAAA;AACpG,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tremho/mist-lift",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.2.0-prerelease.4",
|
|
4
4
|
"description": "lift command line utility for MistLift development",
|
|
5
5
|
"main": "build/lift.js",
|
|
6
6
|
"bin": {
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"indev": "run-script-os",
|
|
22
22
|
"indev:nix": "echo nix",
|
|
23
23
|
"indev:windows": "echo windows",
|
|
24
|
-
"postbuild"
|
|
24
|
+
"postbuild": "run-script-os",
|
|
25
25
|
"postbuild:nix": "cp -r src/commands/builtin/prebuilt-zips build/commands/builtin",
|
|
26
26
|
"postbuild:windows": "robocopy src/commands/builtin/prebuilt-zips build/commands/builtin/prebuilt-zips /e > NUL 2>&1"
|
|
27
27
|
},
|
|
@@ -51,12 +51,15 @@
|
|
|
51
51
|
"@aws-sdk/client-api-gateway": "^3.598.0",
|
|
52
52
|
"@aws-sdk/client-lambda": "^3.598.0",
|
|
53
53
|
"@aws-sdk/credential-providers": "^3.598.0",
|
|
54
|
-
"@tremho/inverse-y": "^1.1.
|
|
54
|
+
"@tremho/inverse-y": "^1.1.5-prerelease.6",
|
|
55
55
|
"ansi-colors": "^4.1.3",
|
|
56
56
|
"body-parser": "^1.20.2",
|
|
57
57
|
"clear-module": "^4.1.2",
|
|
58
|
+
"esbuild": "^0.23.0",
|
|
58
59
|
"express": "^4.19.2",
|
|
60
|
+
"express-ws": "^5.0.2",
|
|
59
61
|
"md5": "^2.3.0",
|
|
62
|
+
"node-watch": "^0.7.4",
|
|
60
63
|
"openapi-ui": "^1.0.4",
|
|
61
64
|
"openapi3-ts": "^4.3.3",
|
|
62
65
|
"readline-sync": "^1.4.10",
|
|
@@ -64,6 +67,7 @@
|
|
|
64
67
|
},
|
|
65
68
|
"devDependencies": {
|
|
66
69
|
"@types/express": "^4.17.21",
|
|
70
|
+
"@types/express-ws": "^3.0.4",
|
|
67
71
|
"@types/md5": "^2.3.5",
|
|
68
72
|
"@types/node": "^20.14.2",
|
|
69
73
|
"@types/tap": "^15.0.11",
|
|
@@ -54,7 +54,7 @@ const apiDef = {
|
|
|
54
54
|
description: '',
|
|
55
55
|
version: '1.0.0',
|
|
56
56
|
pathMap: '/api',
|
|
57
|
-
|
|
57
|
+
method: 'GET',
|
|
58
58
|
logLevel: 'Debug',
|
|
59
59
|
sessionRequired: false,
|
|
60
60
|
userRequired: false,
|
|
@@ -75,7 +75,7 @@ const fileServeDef = {
|
|
|
75
75
|
version:
|
|
76
76
|
'1.0.0',
|
|
77
77
|
pathMap: '',
|
|
78
|
-
|
|
78
|
+
method: 'GET',
|
|
79
79
|
logLevel: 'Debug',
|
|
80
80
|
sessionRequired: false,
|
|
81
81
|
userRequired: false,
|
|
@@ -92,7 +92,7 @@ const webrootDef = {
|
|
|
92
92
|
description: 'Serves files from the webroot /',
|
|
93
93
|
version: '1.0.0',
|
|
94
94
|
pathMap: '/{path}',
|
|
95
|
-
|
|
95
|
+
method: 'get',
|
|
96
96
|
logLevel: 'Debug',
|
|
97
97
|
sessionRequired: false,
|
|
98
98
|
userRequired: false,
|
package/src/commands/create.ts
CHANGED
|
@@ -29,6 +29,13 @@ export function doCreate (
|
|
|
29
29
|
if (!fs.existsSync(path.join(funcPath, testdirname))) fs.mkdirSync(path.join(funcPath, testdirname))
|
|
30
30
|
if (!fs.existsSync(path.join(funcPath, 'src'))) fs.mkdirSync(path.join(funcPath, 'src'))
|
|
31
31
|
|
|
32
|
+
// create link to common lib
|
|
33
|
+
if(!fs.existsSync(path.join(funcPath, 'src', 'commonLib'))) {
|
|
34
|
+
const funcSrc = path.join(funcPath, 'src')
|
|
35
|
+
const relPath = path.relative(funcSrc, projectPaths.basePath)
|
|
36
|
+
fs.symlinkSync(path.join(relPath, 'commonLib'),path.join(funcSrc, 'lib'), 'dir')
|
|
37
|
+
}
|
|
38
|
+
|
|
32
39
|
let localsrc = fs.readFileSync(path.join(dataDir, 'function-local-ts')).toString()
|
|
33
40
|
while (localsrc.includes('$$FUNCTION_NAME$$')) {
|
|
34
41
|
localsrc = localsrc.replace('$$FUNCTION_NAME$$', funcName)
|
package/src/commands/init.ts
CHANGED
|
@@ -39,6 +39,11 @@ export async function doInit (
|
|
|
39
39
|
fs.mkdirSync(funcDir)
|
|
40
40
|
}
|
|
41
41
|
|
|
42
|
+
const libDir = path.join(refPath, 'commonLib')
|
|
43
|
+
if (!fs.existsSync(libDir)) {
|
|
44
|
+
fs.mkdirSync(libDir)
|
|
45
|
+
}
|
|
46
|
+
|
|
42
47
|
// make webroot with docs folder and placeholder yaml
|
|
43
48
|
const webrootDocs = path.join(refPath, 'webroot', 'docs')
|
|
44
49
|
if (!fs.existsSync(webrootDocs)) {
|
package/src/commands/publish.ts
CHANGED
|
@@ -199,7 +199,7 @@ class PrereqInfo {
|
|
|
199
199
|
// console.log("resourceMethods", api.resourceMethods)
|
|
200
200
|
const methodList = Object.getOwnPropertyNames(api.resourceMethods)
|
|
201
201
|
// ClogTrace("methodList", methodList)
|
|
202
|
-
for (const meth of allowedMethods.toUpperCase().split(',')) {
|
|
202
|
+
for (const meth of allowedMethods.toUpperCase().split(',')) { // NOTE: we no longer try to support multiples, but this still works as is.
|
|
203
203
|
// console.log("meth", meth)
|
|
204
204
|
if (methodList.includes(meth)) {
|
|
205
205
|
(api).method = meth
|
|
@@ -226,7 +226,7 @@ class PrereqInfo {
|
|
|
226
226
|
const out: PutIntegrationRequest[] = []
|
|
227
227
|
for (const d of this.defs) {
|
|
228
228
|
const def = (d)
|
|
229
|
-
const api = this.findApi(def.pathMap, def.
|
|
229
|
+
const api = this.findApi(def.pathMap, def.method)
|
|
230
230
|
const arn = this.findARN(def.name) ?? ''
|
|
231
231
|
if (arn === '') {
|
|
232
232
|
console.log(`>>> No ARN for ${(def.name as string)} ${(def.pathMap as string)}, ${(api.id as string)}`)
|
package/src/commands/start.ts
CHANGED
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
/** Run Express Server */
|
|
2
2
|
import express from 'express'
|
|
3
3
|
|
|
4
|
+
import * as esbuild from 'esbuild'
|
|
5
|
+
import watch from 'node-watch';
|
|
6
|
+
import expressWS from 'express-ws'
|
|
7
|
+
|
|
4
8
|
import functionRouter, { functionBinder } from '../expressRoutes/functionBinder'
|
|
5
9
|
|
|
6
10
|
import apiRouter from '../expressRoutes/api'
|
|
@@ -10,7 +14,18 @@ import { doBuildAsync } from './build'
|
|
|
10
14
|
|
|
11
15
|
import * as ac from 'ansi-colors'
|
|
12
16
|
|
|
17
|
+
import path from 'path'
|
|
18
|
+
import fs from 'fs'
|
|
19
|
+
|
|
20
|
+
import {Log} from "@tremho/inverse-y"
|
|
21
|
+
|
|
22
|
+
const defaultPort = 8081
|
|
23
|
+
const serverConfig = readServerConfig();
|
|
24
|
+
let server:any = null
|
|
25
|
+
const app = express()
|
|
26
|
+
|
|
13
27
|
export async function startLocalServer (): Promise<void> {
|
|
28
|
+
// console.warn('startLocalServer')
|
|
14
29
|
const projectPaths = resolvePaths()
|
|
15
30
|
if (!projectPaths.verified) {
|
|
16
31
|
console.log(ac.bold.red('Cannot start local server'))
|
|
@@ -18,26 +33,163 @@ export async function startLocalServer (): Promise<void> {
|
|
|
18
33
|
console.log('')
|
|
19
34
|
return
|
|
20
35
|
}
|
|
36
|
+
|
|
37
|
+
// first build will exit on an error regardless of config
|
|
21
38
|
await doBuildAsync([])
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
functionBinder()
|
|
25
|
-
|
|
39
|
+
await allBinder()
|
|
40
|
+
// Log.Trace('calling functionBinder')
|
|
41
|
+
await functionBinder()
|
|
42
|
+
// Log.Trace('done calling functionBinder')
|
|
26
43
|
// for JSON posts
|
|
27
44
|
// app.use(bodyParser.json({limit: '50mb'}))
|
|
28
45
|
app.use(express.json())
|
|
29
46
|
// for form posts
|
|
30
|
-
app.use(express.urlencoded({
|
|
47
|
+
app.use(express.urlencoded({extended: true}))
|
|
31
48
|
|
|
32
49
|
app.use('/', functionRouter)
|
|
33
50
|
app.use('/api', apiRouter)
|
|
34
51
|
app.use('*', allRouter)
|
|
35
52
|
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
53
|
+
startServers()
|
|
54
|
+
|
|
55
|
+
funcWatcher(path.join(projectPaths.basePath, 'functions'), path.join(projectPaths.basePath, 'webroot'));
|
|
56
|
+
esbuilder();
|
|
57
|
+
|
|
58
|
+
}
|
|
59
|
+
function startServers() {
|
|
60
|
+
startWebSocketConnection(app)
|
|
61
|
+
server = app.listen(serverConfig.port, function () {
|
|
62
|
+
console.log(`http listening on port ${serverConfig.port ?? defaultPort}`)
|
|
63
|
+
})
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
function readServerConfig() {
|
|
67
|
+
// console.log('readServerConfig...')
|
|
68
|
+
const projectPaths = resolvePaths()
|
|
69
|
+
const confFile = path.join(projectPaths.basePath, 'localServerConfig.json')
|
|
70
|
+
if(!fs.existsSync(confFile)) return {}
|
|
71
|
+
|
|
72
|
+
const conf:any = JSON.parse(fs.readFileSync(confFile).toString())
|
|
73
|
+
// console.log("server configuration", conf)
|
|
74
|
+
return conf
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
async function esbuilder() {
|
|
78
|
+
|
|
79
|
+
if(!serverConfig.esbuild) return;
|
|
80
|
+
|
|
81
|
+
const entryPoints = serverConfig.esbuild.entryPoints ?? []
|
|
82
|
+
const outDir = serverConfig.esbuild.outdir ?? 'webroot'
|
|
83
|
+
const watch = serverConfig.esbuild.watch ?? false
|
|
84
|
+
const breakOnError = serverConfig.esbuild.breakOnError ?? false
|
|
85
|
+
const breakOnWarn = serverConfig.esbuild.breakOnWarn ?? false
|
|
86
|
+
|
|
87
|
+
let ctx = await esbuild.context({
|
|
88
|
+
entryPoints,
|
|
89
|
+
bundle: true,
|
|
90
|
+
outdir: outDir
|
|
91
|
+
})
|
|
92
|
+
// console.log('esbuild...')
|
|
93
|
+
|
|
94
|
+
let result = await ctx.rebuild()
|
|
95
|
+
let more = watch
|
|
96
|
+
do {
|
|
97
|
+
await sleep(500)
|
|
98
|
+
result = await ctx.rebuild()
|
|
99
|
+
} while(more)
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
function sleep(ms:number)
|
|
103
|
+
{
|
|
104
|
+
return new Promise(resolve => {
|
|
105
|
+
setTimeout(resolve, ms)
|
|
106
|
+
})
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
async function funcWatcher(watchPath:string, webrootPath:string) {
|
|
110
|
+
|
|
111
|
+
if(serverConfig.rebuildFunctionsOnChange !== true) return;
|
|
112
|
+
// console.log('watching for changes in functions')
|
|
113
|
+
watch(watchPath, {recursive:true}, onWatch1)
|
|
114
|
+
|
|
115
|
+
if(serverConfig.refreshBrowserOnWebrootChange) {
|
|
116
|
+
// console.log('watching for webroot changes')
|
|
117
|
+
watch(webrootPath, {recursive: true}, onWatch2)
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
function onWatch1(evt:string, name:string) {
|
|
121
|
+
// console.log("funcWatch Event seen", {evt, name})
|
|
122
|
+
triggerRebuild()
|
|
123
|
+
}
|
|
124
|
+
function onWatch2(evt:string, name:string) {
|
|
125
|
+
// console.log("Webroot Watch Event seen", {evt, name})
|
|
126
|
+
triggerBrowserRestart()
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
let alreadyBuilding = false
|
|
130
|
+
async function triggerRebuild() {
|
|
131
|
+
if(!alreadyBuilding) {
|
|
132
|
+
alreadyBuilding = true;
|
|
133
|
+
const errRet = await doBuildAsync([]);
|
|
134
|
+
if(errRet) {
|
|
135
|
+
process.exit(errRet)
|
|
136
|
+
}
|
|
137
|
+
alreadyBuilding = false;
|
|
138
|
+
if(serverConfig.refreshBrowserOnFunctionChange)
|
|
139
|
+
triggerBrowserRestart()
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
function triggerBrowserRestart() {
|
|
144
|
+
// console.log("Trigger Browser Restart")
|
|
145
|
+
if(server) {
|
|
146
|
+
socketClose();
|
|
147
|
+
server.close(() => {
|
|
148
|
+
startServers()
|
|
149
|
+
})
|
|
150
|
+
// console.log("server close initiated")
|
|
151
|
+
} else {
|
|
152
|
+
// console.log("first start of servers")
|
|
153
|
+
startServers()
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
|
|
157
|
+
class WSConnection {
|
|
158
|
+
on: any
|
|
159
|
+
sendUTF: any
|
|
160
|
+
remoteAddress:string = ''
|
|
161
|
+
}
|
|
162
|
+
|
|
163
|
+
var socketClose:any = () => {}
|
|
164
|
+
|
|
165
|
+
function startWebSocketConnection(app:any)
|
|
166
|
+
{
|
|
167
|
+
// console.log("Starting WebSocket Connection Listener")
|
|
168
|
+
const ews = expressWS(app)
|
|
169
|
+
const wsapp = ews.app
|
|
170
|
+
|
|
171
|
+
socketClose = (e:any) => {
|
|
172
|
+
// console.log("close wss", e)
|
|
173
|
+
ews.getWss().close()
|
|
174
|
+
}
|
|
175
|
+
|
|
176
|
+
|
|
177
|
+
// wsapp.use((err:any, req:any, res:any, next:any) => {
|
|
178
|
+
// console.error(err.stack);
|
|
179
|
+
// res.status(500).send('Something broke!');
|
|
180
|
+
// })
|
|
181
|
+
|
|
182
|
+
wsapp.get('/watch', (req:any, res:any, next:any) => {
|
|
183
|
+
// console.log('get route', req.testing)
|
|
184
|
+
})
|
|
185
|
+
|
|
186
|
+
wsapp.ws('/watch', (ws:any, req:any) => {
|
|
187
|
+
ws.on('message', (msg:string)=> {
|
|
188
|
+
// console.log('Received WS Message: ' + msg)
|
|
189
|
+
ws.send(msg)
|
|
190
|
+
})
|
|
191
|
+
ws.on('close', () => {
|
|
192
|
+
// console.log("Websocket connection closed")
|
|
193
|
+
})
|
|
41
194
|
})
|
|
42
|
-
// ================================================
|
|
43
195
|
}
|
package/src/expressRoutes/all.ts
CHANGED
|
@@ -29,7 +29,6 @@ export function allBinder (): void {
|
|
|
29
29
|
*/
|
|
30
30
|
router.all('*', (req, res, next) => {
|
|
31
31
|
// any PHP requests should be ignored
|
|
32
|
-
// ClogTrace('incoming: '+req.originalUrl)
|
|
33
32
|
if (req.originalUrl.includes('.php')) {
|
|
34
33
|
return res.send('')
|
|
35
34
|
}
|
|
@@ -84,12 +83,14 @@ export function allBinder (): void {
|
|
|
84
83
|
return res.sendStatus(200)
|
|
85
84
|
}
|
|
86
85
|
}
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
86
|
+
if (!filepath.endsWith('.websocket')) {
|
|
87
|
+
filepath = path.resolve(path.join(projectPaths.basePath, 'webroot', filepath)) // .. out of build
|
|
88
|
+
if (fs.existsSync(filepath)) {
|
|
89
|
+
return res.sendFile(filepath)
|
|
90
|
+
} else {
|
|
91
|
+
console.log(ac.red.bold("can't find " + filepath))
|
|
92
|
+
return res.sendStatus(404)
|
|
93
|
+
}
|
|
93
94
|
}
|
|
94
95
|
}
|
|
95
96
|
// if none of the above, tickle enumerator so we can process other paths
|
|
@@ -18,42 +18,49 @@ export function functionBinder (): void {
|
|
|
18
18
|
const projectPaths = resolvePaths()
|
|
19
19
|
|
|
20
20
|
for (const def of defs) {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
21
|
+
let { name, pathMap, method } = def
|
|
22
|
+
try {
|
|
23
|
+
if(!method) {
|
|
24
|
+
console.log(ac.red('no method defined for ' + name));
|
|
25
|
+
if(def.allowedMethods) {
|
|
26
|
+
console.log(ac.bgBlack.yellowBright('DEPRECATED')+ac.blue(' As of v1.1.8, The use of ')+ac.black.italic('allowedMethods')+ac.blue(' is replaced by the single' +
|
|
27
|
+
ac.black.italic(' method ')+ac.blue('property.')+ac.black.bold('Please update your definition file')));
|
|
28
|
+
method = def.allowedMethods.split(',')[0]
|
|
29
|
+
}
|
|
30
|
+
}
|
|
29
31
|
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
32
|
+
method = method.trim().toLowerCase()
|
|
33
|
+
const rpath = path.join(projectPaths.buildPath, 'functions', name, 'src', 'main.js')
|
|
34
|
+
clearModule(rpath)
|
|
35
|
+
const { start } = require(rpath)
|
|
33
36
|
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
handleResponse(res, respOut)
|
|
38
|
-
}).catch<any>((reason: any) => undefined)
|
|
39
|
-
}
|
|
37
|
+
let entryRoot: string = pathMap
|
|
38
|
+
const n = entryRoot.indexOf('/{')
|
|
39
|
+
if (n !== -1) entryRoot = entryRoot.substring(0, n) + '/*'
|
|
40
40
|
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
}
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
}
|
|
55
|
-
|
|
41
|
+
const callHandler = (pathMap: string, req: any, res: any): void => {
|
|
42
|
+
const event = requestToEvent(pathMap, req)
|
|
43
|
+
Promise.resolve(start(event, null, null)).then(respOut => {
|
|
44
|
+
handleResponse(res, respOut)
|
|
45
|
+
}).catch<any>((reason: any) => undefined)
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
if (method === 'get') {
|
|
49
|
+
router.get(entryRoot, (req, res) => callHandler(pathMap, req, res))
|
|
50
|
+
} else if (method === 'post') {
|
|
51
|
+
router.post(entryRoot, (req, res) => callHandler(pathMap, req, res))
|
|
52
|
+
} else if (method === 'put') {
|
|
53
|
+
router.put(entryRoot, (req, res) => callHandler(pathMap, req, res))
|
|
54
|
+
} else if (method === 'patch') {
|
|
55
|
+
router.patch(entryRoot, (req, res) => callHandler(pathMap, req, res))
|
|
56
|
+
} else if (method === 'delete') {
|
|
57
|
+
router.delete(entryRoot, (req, res) => callHandler(pathMap, req, res))
|
|
58
|
+
} else {
|
|
59
|
+
console.log(ac.red.bold('Cannot map method ') + ac.blue.bold(method))
|
|
56
60
|
}
|
|
61
|
+
} catch (e: any) {
|
|
62
|
+
// Log.Error(ac.bold.red(e.message.split('\n')[0]))0
|
|
63
|
+
Log.Exception(e)
|
|
57
64
|
}
|
|
58
65
|
}
|
|
59
66
|
}).catch<any>((reason: any) => undefined)
|
|
@@ -9,12 +9,14 @@ export type RecurseCB = (filepath: string, stats: Stats) => boolean
|
|
|
9
9
|
export function recurseDirectory (dirpath: string, callback?: RecurseCB): void {
|
|
10
10
|
fs.readdirSync(dirpath).forEach((file: string) => {
|
|
11
11
|
const fpath = path.join(dirpath, file)
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
if (
|
|
15
|
-
|
|
12
|
+
// if(fpath.indexOf('node_modules') === -1) {
|
|
13
|
+
const stat = fs.statSync(fpath)
|
|
14
|
+
if ((callback != null) && !callback(fpath, stat)) {
|
|
15
|
+
if (stat.isDirectory()) {
|
|
16
|
+
recurseDirectory(fpath, callback)
|
|
17
|
+
}
|
|
16
18
|
}
|
|
17
|
-
}
|
|
19
|
+
// }
|
|
18
20
|
})
|
|
19
21
|
}
|
|
20
22
|
|
|
@@ -5,6 +5,7 @@ import { OpenApiBuilder } from 'openapi3-ts/oas30'
|
|
|
5
5
|
import fs from 'fs'
|
|
6
6
|
import path from 'path'
|
|
7
7
|
import { resolvePaths } from '../pathResolve'
|
|
8
|
+
import * as ac from 'ansi-colors'
|
|
8
9
|
|
|
9
10
|
export async function buildOpenApi (
|
|
10
11
|
defs: any[],
|
|
@@ -49,18 +50,24 @@ export async function buildOpenApi (
|
|
|
49
50
|
if (def.private === true && !includePrivate) continue // skip private
|
|
50
51
|
|
|
51
52
|
const parameters = def.parameters ?? []
|
|
52
|
-
|
|
53
|
+
let method = def.method
|
|
54
|
+
if(!def.method) {
|
|
55
|
+
console.log(ac.red('no method defined for ' + def.name));
|
|
56
|
+
if(def.allowedMethods) {
|
|
57
|
+
console.log(ac.bgBlack.yellowBright('DEPRECATED')+ac.blue(' As of v1.1.8, The use of ')+ac.black.italic('allowedMethods')+ac.blue(' is replaced by the single' +
|
|
58
|
+
ac.black.italic(' method ')+ac.blue('property.')+ac.black.bold('Please update your definition file')));
|
|
59
|
+
def.method = def.allowedMethods.split(',')[0]
|
|
60
|
+
}
|
|
61
|
+
}
|
|
53
62
|
const schemas = def.schemas ?? {}
|
|
54
63
|
for (const schemaName of Object.getOwnPropertyNames(schemas)) {
|
|
55
64
|
const schema = schemas[schemaName]
|
|
56
65
|
addTypeSchema(builder, schemaName, schema)
|
|
57
66
|
}
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
addParameter(pathDef, param)
|
|
63
|
-
}
|
|
67
|
+
method = method.trim().toLowerCase()
|
|
68
|
+
addFunctionMethod(pathDef, method, def)
|
|
69
|
+
for (const param of parameters) {
|
|
70
|
+
addParameter(pathDef, param)
|
|
64
71
|
}
|
|
65
72
|
addCORSOptionMethod(pathDef)
|
|
66
73
|
builder.addPath((def.pathMap ?? '/' + (def.name as string)), pathDef)
|