wapplr 1.0.75 → 1.0.77
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/dist/client/app.js +183 -243
- package/dist/client/config.js +1 -5
- package/dist/client/createClient.js +88 -134
- package/dist/client/history.js +10 -39
- package/dist/client/index.js +0 -15
- package/dist/client/middlewares.js +93 -168
- package/dist/common/config.js +1 -4
- package/dist/common/contents.js +91 -142
- package/dist/common/index.js +7 -18
- package/dist/common/log/index.js +27 -48
- package/dist/common/log/renderedContent.js +57 -70
- package/dist/common/logo/index.js +0 -2
- package/dist/common/middlewares.js +7 -61
- package/dist/common/requests.js +98 -143
- package/dist/common/router.js +97 -162
- package/dist/common/states.js +7 -68
- package/dist/common/styles.js +6 -51
- package/dist/common/template/index.js +19 -24
- package/dist/common/template/template_css.js +1 -1
- package/dist/common/utils.js +4 -18
- package/dist/server/app.js +151 -217
- package/dist/server/config.js +1 -13
- package/dist/server/createServer.js +110 -197
- package/dist/server/html.js +34 -45
- package/dist/server/index.js +1 -16
- package/dist/server/middlewares.js +13 -73
- package/dist/server/static.js +0 -26
- package/package.json +1 -1
|
@@ -3,6 +3,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
3
3
|
value: true
|
|
4
4
|
});
|
|
5
5
|
const tokens = {"page":"template_3HXPB","header":"template_3ck2q","sticky":"template_2Nz4A","innerHeader":"template_3nJPj","logo":"template_rKBgA","content":"template_1zK-k","footer":"template_3Rlwa","menu":"template_1r1_q","button":"template_1iINl","copyright":"template_3y44t"};
|
|
6
|
-
tokens._getCss = function () {return `/* imported from template.css */ .template_3HXPB { display: block; position: relative; overflow-x: hidden; overflow-y: hidden; min-height: 100vh; max-width: 100vw; } .template_3ck2q { display: block; position: fixed; width: 100%; height: 64px; padding: 6px; background: white; z-index: 1; -webkit-transition: all 450ms cubic-bezier(0.23, 1, 0.32, 1) 0ms;
|
|
6
|
+
tokens._getCss = function () {return `/* imported from template.css */ .template_3HXPB { display: block; position: relative; overflow-x: hidden; overflow-y: hidden; min-height: 100vh; max-width: 100vw; } .template_3ck2q { display: block; position: fixed; width: 100%; height: 64px; padding: 6px; background: white; z-index: 1; -webkit-transition: all 450ms cubic-bezier(0.23, 1, 0.32, 1) 0ms; transition: all 450ms cubic-bezier(0.23, 1, 0.32, 1) 0ms; } .template_3ck2q.template_2Nz4A { -webkit-box-shadow: 0 2px 3px rgba(62, 62, 62, 0.15); box-shadow: 0 2px 3px rgba(62, 62, 62, 0.15); } .template_3nJPj { display: block; width: 100%; height: 100%; position: relative; overflow: hidden; } .template_3ck2q .template_rKBgA { height: 52px; -webkit-transition: all 450ms cubic-bezier(0.23, 1, 0.32, 1) 0ms; transition: all 450ms cubic-bezier(0.23, 1, 0.32, 1) 0ms; margin-top: 100%; } .template_3ck2q.template_2Nz4A .template_rKBgA { margin-top: 0; } .template_1zK-k { min-height: 100vh; position: relative; padding-top: 64px; } .template_3Rlwa { display: -ms-flexbox; display: flex; min-height: 128px; -ms-flex-align: center; align-items: center; -ms-flex-pack: center; justify-content: center; } .template_1r1_q { } .template_1r1_q > div { } .template_3Rlwa .template_1r1_q { -ms-flex-pack: center; justify-content: center; display: -ms-flexbox; display: flex; } .template_3Rlwa .template_1r1_q > div { display: inline-block; } .template_1iINl { color: rgba(0, 0, 0, 0.87); padding: 6px 16px; font-size: 14px; font-size: 0.875rem; min-width: 64px; -webkit-box-sizing: border-box; box-sizing: border-box; -webkit-transition: background-color 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,border 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,-webkit-box-shadow 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms; transition: background-color 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,border 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,-webkit-box-shadow 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms; transition: background-color 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,box-shadow 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,border 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms; transition: background-color 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,box-shadow 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,border 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,-webkit-box-shadow 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms; line-height: 1.75; border-radius: 4px; letter-spacing: 0.02857em; text-transform: uppercase; font-weight: bold; border: 0; cursor: pointer; margin: 0; display: -ms-inline-flexbox; display: inline-flex; outline: 0; position: relative; -ms-flex-align: center; align-items: center; -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none; vertical-align: middle; -ms-flex-pack: center; justify-content: center; text-decoration: none; background-color: transparent; text-align: center; } a.template_1iINl { text-decoration: none; } .template_3y44t { font-size: 12px; margin: 24px; text-align: center; -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none; } `;};
|
|
7
7
|
tokens._module = (typeof module !== "undefined") ? module : {id:"./common/template/template_css.js"};
|
|
8
8
|
exports["default"] = tokens;
|
package/dist/common/utils.js
CHANGED
|
@@ -6,65 +6,51 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.copyObject = copyObject;
|
|
7
7
|
exports.defaultDescriptor = void 0;
|
|
8
8
|
exports.mergeProperties = mergeProperties;
|
|
9
|
-
|
|
10
9
|
function mergeProperties(dest, src) {
|
|
11
10
|
Object.getOwnPropertyNames(src).forEach(function forEachOwnPropertyName(name) {
|
|
12
11
|
if (Object.hasOwnProperty.call(dest, name)) {
|
|
13
12
|
return;
|
|
14
13
|
}
|
|
15
|
-
|
|
16
14
|
var descriptor = Object.getOwnPropertyDescriptor(src, name);
|
|
17
15
|
Object.defineProperty(dest, name, descriptor);
|
|
18
16
|
});
|
|
19
17
|
return dest;
|
|
20
18
|
}
|
|
21
|
-
|
|
22
|
-
var defaultDescriptor = {
|
|
19
|
+
var defaultDescriptor = exports.defaultDescriptor = {
|
|
23
20
|
writable: true,
|
|
24
21
|
enumerable: true,
|
|
25
22
|
configurable: false
|
|
26
23
|
};
|
|
27
|
-
exports.defaultDescriptor = defaultDescriptor;
|
|
28
|
-
|
|
29
24
|
function copyObject(obj) {
|
|
30
25
|
var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
31
|
-
|
|
32
26
|
function cloneObj() {
|
|
33
27
|
var _options$skip = options.skip,
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
28
|
+
skip = _options$skip === void 0 ? [] : _options$skip,
|
|
29
|
+
_options$keep = options.keep,
|
|
30
|
+
keep = _options$keep === void 0 ? [] : _options$keep;
|
|
37
31
|
var clone = {};
|
|
38
|
-
|
|
39
32
|
for (var key in obj) {
|
|
40
33
|
if (keep.indexOf(key) === -1 && skip.indexOf(key) === -1 && obj.hasOwnProperty(key)) {
|
|
41
34
|
clone[key] = copyObject(obj[key], options);
|
|
42
35
|
}
|
|
43
|
-
|
|
44
36
|
if (keep.indexOf(key) > -1) {
|
|
45
37
|
clone[key] = obj[key];
|
|
46
38
|
}
|
|
47
39
|
}
|
|
48
|
-
|
|
49
40
|
return clone;
|
|
50
41
|
}
|
|
51
|
-
|
|
52
42
|
function cloneArr() {
|
|
53
43
|
return obj.map(function (item) {
|
|
54
44
|
return copyObject(item, options);
|
|
55
45
|
});
|
|
56
46
|
}
|
|
57
|
-
|
|
58
47
|
var transformedObject = obj && obj.toJSON ? obj.toJSON() : obj;
|
|
59
48
|
var type = Object.prototype.toString.call(transformedObject).slice(8, -1).toLowerCase();
|
|
60
|
-
|
|
61
49
|
if (type === "object") {
|
|
62
50
|
return cloneObj();
|
|
63
51
|
}
|
|
64
|
-
|
|
65
52
|
if (type === "array") {
|
|
66
53
|
return cloneArr();
|
|
67
54
|
}
|
|
68
|
-
|
|
69
55
|
return obj !== null && obj !== void 0 && obj.toJSON ? obj.toJSON() : obj;
|
|
70
56
|
}
|
package/dist/server/app.js
CHANGED
|
@@ -1,26 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
|
|
4
|
-
|
|
5
4
|
Object.defineProperty(exports, "__esModule", {
|
|
6
5
|
value: true
|
|
7
6
|
});
|
|
8
7
|
exports["default"] = createApp;
|
|
9
|
-
|
|
10
8
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
|
11
|
-
|
|
12
9
|
var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
|
|
13
|
-
|
|
14
10
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
|
15
|
-
|
|
16
11
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
17
|
-
|
|
18
12
|
var _utils = require("../common/utils.js");
|
|
19
|
-
|
|
20
13
|
var _static = _interopRequireDefault(require("./static"));
|
|
21
|
-
|
|
22
14
|
var _url = require("url");
|
|
23
|
-
|
|
24
15
|
function createApp() {
|
|
25
16
|
var p = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
26
17
|
var wapp = p.wapp;
|
|
@@ -29,30 +20,25 @@ function createApp() {
|
|
|
29
20
|
if (next) {
|
|
30
21
|
return next();
|
|
31
22
|
}
|
|
32
|
-
|
|
33
23
|
return null;
|
|
34
24
|
}];
|
|
35
|
-
|
|
36
25
|
function defaultErrorHandler(err, req, res, next) {
|
|
37
26
|
var wapp = app.wapp;
|
|
38
27
|
var _wapp$log = wapp.log,
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
28
|
+
log = _wapp$log === void 0 ? function () {
|
|
29
|
+
return "";
|
|
30
|
+
} : _wapp$log;
|
|
42
31
|
res.status(500, err);
|
|
43
32
|
var text = log(err, req, res);
|
|
44
|
-
|
|
45
33
|
if (res.headersSent) {
|
|
46
34
|
if (next) {
|
|
47
35
|
return next(err);
|
|
48
36
|
}
|
|
49
|
-
|
|
50
37
|
return;
|
|
51
38
|
}
|
|
52
|
-
|
|
53
39
|
var config = wapp.server.config;
|
|
54
40
|
var _config$siteName = config.siteName,
|
|
55
|
-
|
|
41
|
+
siteName = _config$siteName === void 0 ? "Wapplr" : _config$siteName;
|
|
56
42
|
var renderedContent = wapp.log.renderedContent({
|
|
57
43
|
title: err.message + " | " + siteName,
|
|
58
44
|
text: text.split("\n")[0],
|
|
@@ -60,166 +46,132 @@ function createApp() {
|
|
|
60
46
|
});
|
|
61
47
|
res.send(renderedContent);
|
|
62
48
|
}
|
|
63
|
-
|
|
64
49
|
function defaultHandle(_x, _x2, _x3) {
|
|
65
50
|
return _defaultHandle.apply(this, arguments);
|
|
66
51
|
}
|
|
67
|
-
|
|
68
52
|
function _defaultHandle() {
|
|
69
53
|
_defaultHandle = (0, _asyncToGenerator2["default"])( /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee3(req, res, out) {
|
|
70
54
|
var middlewares, index, next, _next;
|
|
71
|
-
|
|
72
55
|
return (0, _regeneratorRuntime2["default"])().wrap(function _callee3$(_context3) {
|
|
73
|
-
while (1) {
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
_next = function
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
return next(err);
|
|
97
|
-
|
|
98
|
-
case 2:
|
|
99
|
-
case "end":
|
|
100
|
-
return _context.stop();
|
|
101
|
-
}
|
|
102
|
-
}
|
|
103
|
-
}, _callee);
|
|
104
|
-
})) : next];
|
|
105
|
-
args = func.length === 4 && err ? [err].concat(defaultArgs) : defaultArgs;
|
|
106
|
-
_context2.prev = 5;
|
|
107
|
-
_context2.next = 8;
|
|
108
|
-
return func.apply(void 0, (0, _toConsumableArray2["default"])(args));
|
|
109
|
-
|
|
110
|
-
case 8:
|
|
111
|
-
return _context2.abrupt("return", _context2.sent);
|
|
112
|
-
|
|
113
|
-
case 11:
|
|
114
|
-
_context2.prev = 11;
|
|
115
|
-
_context2.t0 = _context2["catch"](5);
|
|
116
|
-
res.status(500, _context2.t0);
|
|
117
|
-
_context2.next = 16;
|
|
118
|
-
return next(_context2.t0);
|
|
119
|
-
|
|
120
|
-
case 16:
|
|
121
|
-
return _context2.abrupt("return", _context2.sent);
|
|
122
|
-
|
|
123
|
-
case 17:
|
|
124
|
-
_context2.next = 25;
|
|
125
|
-
break;
|
|
126
|
-
|
|
127
|
-
case 19:
|
|
128
|
-
if (!(typeof out === "function")) {
|
|
129
|
-
_context2.next = 24;
|
|
130
|
-
break;
|
|
131
|
-
}
|
|
132
|
-
|
|
133
|
-
index = 0;
|
|
134
|
-
return _context2.abrupt("return", out(err));
|
|
135
|
-
|
|
136
|
-
case 24:
|
|
137
|
-
if (err) {
|
|
138
|
-
index = 0;
|
|
139
|
-
app.errorHandler(err, req, res, out);
|
|
140
|
-
} else if (!res.headersSent) {
|
|
141
|
-
index = 0;
|
|
142
|
-
res.status(404);
|
|
143
|
-
requestMethod = req.method;
|
|
144
|
-
requestUrl = req.url;
|
|
145
|
-
res.send(requestMethod + " " + requestUrl);
|
|
56
|
+
while (1) switch (_context3.prev = _context3.next) {
|
|
57
|
+
case 0:
|
|
58
|
+
_next = function _next3() {
|
|
59
|
+
_next = (0, _asyncToGenerator2["default"])( /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee2(err) {
|
|
60
|
+
var func, defaultArgs, args, requestMethod, requestUrl;
|
|
61
|
+
return (0, _regeneratorRuntime2["default"])().wrap(function _callee2$(_context2) {
|
|
62
|
+
while (1) switch (_context2.prev = _context2.next) {
|
|
63
|
+
case 0:
|
|
64
|
+
if (!middlewares[index]) {
|
|
65
|
+
_context2.next = 19;
|
|
66
|
+
break;
|
|
67
|
+
}
|
|
68
|
+
func = middlewares[index];
|
|
69
|
+
index = index + 1;
|
|
70
|
+
defaultArgs = [req, res, err ? /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee() {
|
|
71
|
+
return (0, _regeneratorRuntime2["default"])().wrap(function _callee$(_context) {
|
|
72
|
+
while (1) switch (_context.prev = _context.next) {
|
|
73
|
+
case 0:
|
|
74
|
+
_context.next = 2;
|
|
75
|
+
return next(err);
|
|
76
|
+
case 2:
|
|
77
|
+
case "end":
|
|
78
|
+
return _context.stop();
|
|
146
79
|
}
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
80
|
+
}, _callee);
|
|
81
|
+
})) : next];
|
|
82
|
+
args = func.length === 4 && err ? [err].concat(defaultArgs) : defaultArgs;
|
|
83
|
+
_context2.prev = 5;
|
|
84
|
+
_context2.next = 8;
|
|
85
|
+
return func.apply(void 0, (0, _toConsumableArray2["default"])(args));
|
|
86
|
+
case 8:
|
|
87
|
+
return _context2.abrupt("return", _context2.sent);
|
|
88
|
+
case 11:
|
|
89
|
+
_context2.prev = 11;
|
|
90
|
+
_context2.t0 = _context2["catch"](5);
|
|
91
|
+
res.status(500, _context2.t0);
|
|
92
|
+
_context2.next = 16;
|
|
93
|
+
return next(_context2.t0);
|
|
94
|
+
case 16:
|
|
95
|
+
return _context2.abrupt("return", _context2.sent);
|
|
96
|
+
case 17:
|
|
97
|
+
_context2.next = 25;
|
|
98
|
+
break;
|
|
99
|
+
case 19:
|
|
100
|
+
if (!(typeof out === "function")) {
|
|
101
|
+
_context2.next = 24;
|
|
102
|
+
break;
|
|
154
103
|
}
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
104
|
+
index = 0;
|
|
105
|
+
return _context2.abrupt("return", out(err));
|
|
106
|
+
case 24:
|
|
107
|
+
if (err) {
|
|
108
|
+
index = 0;
|
|
109
|
+
app.errorHandler(err, req, res, out);
|
|
110
|
+
} else if (!res.headersSent) {
|
|
111
|
+
index = 0;
|
|
112
|
+
res.status(404);
|
|
113
|
+
requestMethod = req.method;
|
|
114
|
+
requestUrl = req.url;
|
|
115
|
+
res.send(requestMethod + " " + requestUrl);
|
|
116
|
+
}
|
|
117
|
+
case 25:
|
|
118
|
+
return _context2.abrupt("return", null);
|
|
119
|
+
case 26:
|
|
120
|
+
case "end":
|
|
121
|
+
return _context2.stop();
|
|
122
|
+
}
|
|
123
|
+
}, _callee2, null, [[5, 11]]);
|
|
124
|
+
}));
|
|
125
|
+
return _next.apply(this, arguments);
|
|
126
|
+
};
|
|
127
|
+
next = function _next2(_x4) {
|
|
128
|
+
return _next.apply(this, arguments);
|
|
129
|
+
};
|
|
130
|
+
middlewares = app.middlewares;
|
|
131
|
+
index = 0;
|
|
132
|
+
_context3.next = 6;
|
|
133
|
+
return next();
|
|
134
|
+
case 6:
|
|
135
|
+
return _context3.abrupt("return", _context3.sent);
|
|
136
|
+
case 7:
|
|
137
|
+
case "end":
|
|
138
|
+
return _context3.stop();
|
|
177
139
|
}
|
|
178
140
|
}, _callee3);
|
|
179
141
|
}));
|
|
180
142
|
return _defaultHandle.apply(this, arguments);
|
|
181
143
|
}
|
|
182
|
-
|
|
183
144
|
function defaultUse(fn) {
|
|
184
145
|
var fns = typeof fn === "function" ? [fn] : typeof fn === "object" && fn.length ? fn : [];
|
|
185
|
-
|
|
186
146
|
if (fns.length === 0) {
|
|
187
147
|
throw new TypeError('app.use() requires a middleware function');
|
|
188
148
|
}
|
|
189
|
-
|
|
190
149
|
var middlewares = app.middlewares;
|
|
191
150
|
fns.forEach(function (fn, i) {
|
|
192
151
|
middlewares.push(fn);
|
|
193
152
|
});
|
|
194
153
|
return this;
|
|
195
154
|
}
|
|
196
|
-
|
|
197
155
|
function defaultPost(path, fn) {
|
|
198
156
|
function post(req, res, next) {
|
|
199
157
|
if (req.method === "POST" && req.path === path) {
|
|
200
158
|
return fn(req, res, next);
|
|
201
159
|
}
|
|
202
|
-
|
|
203
160
|
next();
|
|
204
161
|
}
|
|
205
|
-
|
|
206
162
|
app.use(post);
|
|
207
163
|
return this;
|
|
208
164
|
}
|
|
209
|
-
|
|
210
165
|
function defaultGet(path, fn) {
|
|
211
166
|
function get(req, res, next) {
|
|
212
167
|
if (req.method === "GET" && req.path === path) {
|
|
213
168
|
return fn(req, res, next);
|
|
214
169
|
}
|
|
215
|
-
|
|
216
170
|
next();
|
|
217
171
|
}
|
|
218
|
-
|
|
219
172
|
app.use(get);
|
|
220
173
|
return this;
|
|
221
174
|
}
|
|
222
|
-
|
|
223
175
|
var appProperties = Object.create(Object.prototype, {
|
|
224
176
|
config: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
|
|
225
177
|
writable: false,
|
|
@@ -248,104 +200,86 @@ function createApp() {
|
|
|
248
200
|
value: _static["default"]
|
|
249
201
|
})
|
|
250
202
|
});
|
|
251
|
-
|
|
252
203
|
function app() {
|
|
253
204
|
return _app.apply(this, arguments);
|
|
254
205
|
}
|
|
255
|
-
|
|
256
206
|
function _app() {
|
|
257
207
|
_app = (0, _asyncToGenerator2["default"])( /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee4() {
|
|
258
208
|
var req,
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
209
|
+
res,
|
|
210
|
+
next,
|
|
211
|
+
defaultOut,
|
|
212
|
+
fullUrl,
|
|
213
|
+
_args4 = arguments;
|
|
264
214
|
return (0, _regeneratorRuntime2["default"])().wrap(function _callee4$(_context4) {
|
|
265
|
-
while (1) {
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
defaultOut = function defaultOut(err) {
|
|
278
|
-
if (err) {
|
|
279
|
-
return app.errorHandler(err, req, res);
|
|
280
|
-
}
|
|
281
|
-
|
|
282
|
-
if (!res.headersSent) {
|
|
283
|
-
res.status(404);
|
|
284
|
-
var requestMethod = req.method;
|
|
285
|
-
var requestUrl = req.url;
|
|
286
|
-
return res.send(requestMethod + " " + requestUrl);
|
|
287
|
-
}
|
|
288
|
-
|
|
289
|
-
return null;
|
|
290
|
-
};
|
|
291
|
-
|
|
292
|
-
// these properties and functions what usually there are in req and res, but there is not in NodeJs default
|
|
293
|
-
// req: path,
|
|
294
|
-
// res: status, send, json
|
|
295
|
-
// need some other properties, but those set in NodeJs default
|
|
296
|
-
// req: url, hostname, protocol, secure, method, httpVersion,
|
|
297
|
-
// res: statusCode, headersSent
|
|
298
|
-
// and some function in res: end, setHeader
|
|
299
|
-
fullUrl = req.protocol + "://" + req.hostname + req.url;
|
|
300
|
-
|
|
301
|
-
if (!req.path) {
|
|
302
|
-
try {
|
|
303
|
-
req.path = new _url.URL(fullUrl).pathname;
|
|
304
|
-
} catch (e) {}
|
|
305
|
-
}
|
|
306
|
-
|
|
307
|
-
if (!req.query) {
|
|
308
|
-
try {
|
|
309
|
-
req.query = Object.fromEntries(new _url.URL(fullUrl).searchParams);
|
|
310
|
-
} catch (e) {}
|
|
311
|
-
}
|
|
312
|
-
|
|
313
|
-
if (!res.status) {
|
|
314
|
-
res.status = function (sc) {
|
|
315
|
-
res.statusCode = sc;
|
|
316
|
-
return res;
|
|
317
|
-
};
|
|
318
|
-
}
|
|
319
|
-
|
|
320
|
-
if (!res.send) {
|
|
321
|
-
res.send = function (html) {
|
|
322
|
-
res.end(html);
|
|
323
|
-
};
|
|
215
|
+
while (1) switch (_context4.prev = _context4.next) {
|
|
216
|
+
case 0:
|
|
217
|
+
req = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : {};
|
|
218
|
+
res = _args4.length > 1 && _args4[1] !== undefined ? _args4[1] : {};
|
|
219
|
+
next = _args4.length > 2 ? _args4[2] : undefined;
|
|
220
|
+
if (!(typeof app.handle === "function")) {
|
|
221
|
+
_context4.next = 13;
|
|
222
|
+
break;
|
|
223
|
+
}
|
|
224
|
+
defaultOut = function defaultOut(err) {
|
|
225
|
+
if (err) {
|
|
226
|
+
return app.errorHandler(err, req, res);
|
|
324
227
|
}
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
};
|
|
228
|
+
if (!res.headersSent) {
|
|
229
|
+
res.status(404);
|
|
230
|
+
var requestMethod = req.method;
|
|
231
|
+
var requestUrl = req.url;
|
|
232
|
+
return res.send(requestMethod + " " + requestUrl);
|
|
331
233
|
}
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
234
|
+
return null;
|
|
235
|
+
};
|
|
236
|
+
// these properties and functions what usually there are in req and res, but there is not in NodeJs default
|
|
237
|
+
// req: path,
|
|
238
|
+
// res: status, send, json
|
|
239
|
+
// need some other properties, but those set in NodeJs default
|
|
240
|
+
// req: url, hostname, protocol, secure, method, httpVersion,
|
|
241
|
+
// res: statusCode, headersSent
|
|
242
|
+
// and some function in res: end, setHeader
|
|
243
|
+
fullUrl = req.protocol + "://" + req.hostname + req.url;
|
|
244
|
+
if (!req.path) {
|
|
245
|
+
try {
|
|
246
|
+
req.path = new _url.URL(fullUrl).pathname;
|
|
247
|
+
} catch (e) {}
|
|
248
|
+
}
|
|
249
|
+
if (!req.query) {
|
|
250
|
+
try {
|
|
251
|
+
req.query = Object.fromEntries(new _url.URL(fullUrl).searchParams);
|
|
252
|
+
} catch (e) {}
|
|
253
|
+
}
|
|
254
|
+
if (!res.status) {
|
|
255
|
+
res.status = function (sc) {
|
|
256
|
+
res.statusCode = sc;
|
|
257
|
+
return res;
|
|
258
|
+
};
|
|
259
|
+
}
|
|
260
|
+
if (!res.send) {
|
|
261
|
+
res.send = function (html) {
|
|
262
|
+
res.end(html);
|
|
263
|
+
};
|
|
264
|
+
}
|
|
265
|
+
if (!res.json) {
|
|
266
|
+
res.json = function (json) {
|
|
267
|
+
res.setHeader('Content-Type', 'application/json');
|
|
268
|
+
res.send(JSON.stringify(json));
|
|
269
|
+
};
|
|
270
|
+
}
|
|
271
|
+
_context4.next = 13;
|
|
272
|
+
return app.handle(req, res, next || defaultOut);
|
|
273
|
+
case 13:
|
|
274
|
+
return _context4.abrupt("return", app);
|
|
275
|
+
case 14:
|
|
276
|
+
case "end":
|
|
277
|
+
return _context4.stop();
|
|
343
278
|
}
|
|
344
279
|
}, _callee4);
|
|
345
280
|
}));
|
|
346
281
|
return _app.apply(this, arguments);
|
|
347
282
|
}
|
|
348
|
-
|
|
349
283
|
(0, _utils.mergeProperties)(app, appProperties);
|
|
350
284
|
Object.defineProperty(app, "wapp", (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
|
|
351
285
|
writable: false,
|
package/dist/server/config.js
CHANGED
|
@@ -1,24 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
|
|
4
|
-
|
|
5
4
|
Object.defineProperty(exports, "__esModule", {
|
|
6
5
|
value: true
|
|
7
6
|
});
|
|
8
7
|
exports["default"] = getConfig;
|
|
9
|
-
|
|
10
8
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
|
11
|
-
|
|
12
9
|
var _fs = _interopRequireDefault(require("fs"));
|
|
13
|
-
|
|
14
10
|
var _path = _interopRequireDefault(require("path"));
|
|
15
|
-
|
|
16
11
|
var _config = _interopRequireDefault(require("../common/config"));
|
|
17
|
-
|
|
18
12
|
function getConfig() {
|
|
19
13
|
var p = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
20
14
|
var _p$config = p.config,
|
|
21
|
-
|
|
15
|
+
config = _p$config === void 0 ? {} : _p$config;
|
|
22
16
|
var serverConfig = config.server || {};
|
|
23
17
|
var commonConfig = (0, _config["default"])(p).config;
|
|
24
18
|
var globals = (0, _objectSpread2["default"])({}, commonConfig.globals);
|
|
@@ -26,24 +20,19 @@ function getConfig() {
|
|
|
26
20
|
var assets = serverConfig.assets;
|
|
27
21
|
var credentials = serverConfig.credentials;
|
|
28
22
|
var dirname = globals.ROOT || __dirname;
|
|
29
|
-
|
|
30
23
|
try {
|
|
31
24
|
if (!assets && _fs["default"].existsSync(_path["default"].resolve(dirname, "./asset-manifest.json"))) {
|
|
32
25
|
assets = JSON.parse(_fs["default"].readFileSync(_path["default"].resolve(dirname, "./asset-manifest.json"), "utf-8"));
|
|
33
26
|
}
|
|
34
|
-
|
|
35
27
|
if (_fs["default"].existsSync(_path["default"].resolve(dirname, "./chunk-manifest.json"))) {
|
|
36
28
|
var chunks = JSON.parse(_fs["default"].readFileSync(_path["default"].resolve(dirname, "./chunk-manifest.json"), "utf-8"));
|
|
37
|
-
|
|
38
29
|
if (chunks) {
|
|
39
30
|
assets.chunks = (0, _objectSpread2["default"])({}, chunks);
|
|
40
31
|
}
|
|
41
32
|
}
|
|
42
33
|
} catch (e) {}
|
|
43
|
-
|
|
44
34
|
try {
|
|
45
35
|
var credentialsFolder = "secure/";
|
|
46
|
-
|
|
47
36
|
if (!credentials && _fs["default"].existsSync(_path["default"].resolve(dirname, credentialsFolder, "localhost.key")) && _fs["default"].existsSync(_path["default"].resolve(dirname, credentialsFolder, "localhost.crt"))) {
|
|
48
37
|
credentials = {
|
|
49
38
|
key: _fs["default"].readFileSync(_path["default"].resolve(dirname, credentialsFolder, "localhost.key"), "utf8"),
|
|
@@ -51,7 +40,6 @@ function getConfig() {
|
|
|
51
40
|
};
|
|
52
41
|
}
|
|
53
42
|
} catch (e) {}
|
|
54
|
-
|
|
55
43
|
var server = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, serverConfig), {}, {
|
|
56
44
|
port: serverConfig.port || 80,
|
|
57
45
|
portSSL: serverConfig.portSSL || 443,
|