@sphereon/ssi-express-support 0.14.2-next.26 → 0.14.2-next.27
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"express-builders.d.ts","sourceRoot":"","sources":["../src/express-builders.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"express-builders.d.ts","sourceRoot":"","sources":["../src/express-builders.ts"],"names":[],"mappings":";AAIA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAGjC,OAAO,OAAO,EAAE,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAC1C,OAAO,EAAE,WAAW,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAA;AAClF,OAAO,OAAO,MAAM,iBAAiB,CAAA;AACrC,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,MAAM,MAAM,QAAQ,CAAA;AAC3B,OAAiB,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAA;AAItD,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAA;AAE5D,KAAK,OAAO,CAAC,OAAO,SAAS,IAAI,CAAC,eAAe,EAAE,QAAQ,SAAS,IAAI,CAAC,cAAc,IAAI,CACzF,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,EACb,QAAQ,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,KAAK,IAAI,KAC5B,IAAI,CAAA;AAGT,qBAAa,cAAc;IACzB,OAAO,CAAC,eAAe,CAAC,CAAS;IACjC,OAAO,CAAC,YAAY,CAAC,CAAQ;IAC7B,OAAO,CAAC,IAAI,CAAC,CAAQ;IACrB,OAAO,CAAC,SAAS,CAAC,CAA+C;IACjE,OAAO,CAAC,cAAc,CAAC,CAAY;IACnC,OAAO,CAAC,YAAY,CAAC,CAAiC;IACtD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAQ;IACtC,OAAO,CAAC,eAAe,CAAC,CAAuB;IAC/C,OAAO,CAAC,YAAY,CAAC,CAAwB;IAC7C,OAAO,CAAC,gBAAgB,CAAC,CAAiB;IAC1C,OAAO,CAAC,iBAAiB,CAAC,CAAmB;IAC7C,OAAO,CAAC,aAAa,CAAC,CAAmB;IACzC,OAAO,CAAC,SAAS,CAAC,CAAU;IAC5B,OAAO,CAAC,OAAO,CAAC,CAA+B;IAE/C,OAAO;WAQO,mBAAmB,CAAC,IAAI,CAAC,EAAE;QAAE,eAAe,CAAC,EAAE,OAAO,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAA;KAAE;WAI/E,cAAc,CAAC,IAAI,EAAE,kBAAkB,GAAG;QAAE,YAAY,CAAC,EAAE,MAAM,CAAA;KAAE;IAK1E,YAAY,CAAC,YAAY,CAAC,EAAE,OAAO,GAAG,IAAI;IAO1C,iBAAiB,CAAC,IAAI,CAAC,EAAE;QAAE,cAAc,CAAC,EAAE,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;KAAE,GAAG,IAAI;IAQ3H,oBAAoB,CAAC,EAC1B,IAAI,EACJ,YAAY,EACZ,QAAQ,EACR,YAAY,GACb,EAAE;QACD,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,YAAY,CAAC,EAAE,MAAM,CAAA;QACrB,YAAY,CAAC,EAAE,OAAO,CAAA;QACtB,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;KACtB,GAAG,IAAI;IAUD,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAK5B,YAAY,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI;IAKxC,kBAAkB,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI;IAK9C,WAAW,CAAC,eAAe,EAAE,OAAO,GAAG,IAAI;IAM3C,kBAAkB,CAAC,UAAU,EAAE,qBAAqB,GAAG,IAAI;IAK3D,gBAAgB,CAAC,WAAW,EAAE,OAAO,EAAE,iBAAiB,CAAC,EAAE,iBAAiB,GAAG,IAAI;IAMnF,sBAAsB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI;IAK7D,YAAY,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAKtC,cAAc,CAAC,OAAO,EAAE,OAAO;IAI/B,WAAW,IAAI,MAAM;IAIrB,OAAO,IAAI,MAAM;IAIjB,WAAW,CAAC,QAAQ,EAAE,yBAAyB,CAAC,GAAG,CAAC,GAAG,yBAAyB,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI;IAe9F,UAAU,CAAC,OAAO,EAAE,yBAAyB,CAAC,GAAG,CAAC,GAAG,IAAI;IAQzD,kBAAkB,CAAC,WAAW,EAAE,OAAO,CAAC,cAAc,GAAG,IAAI;IAK7D,KAAK,CAAC,CAAC,SAAS,WAAW,EAAE,IAAI,CAAC,EAAE;QACzC,OAAO,CAAC,EAAE,OAAO,CAAA;QACjB,cAAc,CAAC,EAAE,OAAO,CAAA;QACxB,QAAQ,CAAC,EAAE,yBAAyB,CAAC,CAAC,CAAC,GAAG,yBAAyB,CAAC,CAAC,CAAC,EAAE,CAAA;KACzE,GAAG,cAAc;IAyBlB,SAAS,CAAC,YAAY,CAAC,CAAC,SAAS,WAAW,EAAE,IAAI,CAAC,EAAE;QACnD,OAAO,CAAC,EAAE,OAAO,CAAA;QACjB,cAAc,CAAC,EAAE,OAAO,CAAA;QACxB,QAAQ,CAAC,EAAE,yBAAyB,CAAC,CAAC,CAAC,GAAG,yBAAyB,CAAC,CAAC,CAAC,EAAE,CAAA;KACzE,GAAG,OAAO,CAAC,OAAO;CAmCpB;AAED,qBAAa,qBAAqB;IAChC,OAAO,CAAC,YAAY,CAAC,CAAS;IAC9B,OAAO,CAAC,uBAAuB,CAAC,CAAS;IACzC,OAAO,CAAC,YAAY,CAAC,CAA8D;IACnF,OAAO,CAAC,aAAa,CAAC,CAAmB;IACzC,OAAO,CAAC,eAAe,CAAC,CAAmB;IAC3C,OAAO,CAAC,iBAAiB,CAAC,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAQ;gBAE3B,EAAE,eAAe,EAAE,YAAY,EAAE,EAAE;QAAE,eAAe,CAAC,EAAE,OAAO,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAA;KAAE;IAK5F,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,KAAK,CAAC,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC,GAAG,IAAI;IAKtF,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAKjC,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI;IAK5C,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI;IAK9C,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAKtC,SAAS,CAAC,EAAE,eAAe,EAAE,EAAE;QAAE,eAAe,CAAC,EAAE,OAAO,CAAA;KAAE;CAqCpE"}
|
package/dist/express-builders.js
CHANGED
|
@@ -56,8 +56,9 @@ class ExpressBuilder {
|
|
|
56
56
|
return new ExpressBuilder(opts !== null && opts !== void 0 ? opts : {});
|
|
57
57
|
}
|
|
58
58
|
static fromServerOpts(opts) {
|
|
59
|
+
var _a;
|
|
59
60
|
const builder = new ExpressBuilder({ existingExpress: opts === null || opts === void 0 ? void 0 : opts.existingExpress, envVarPrefix: opts === null || opts === void 0 ? void 0 : opts.envVarPrefix });
|
|
60
|
-
return builder.withEnableListenOpts(opts);
|
|
61
|
+
return builder.withEnableListenOpts(Object.assign(Object.assign({}, opts), { hostnameOrIP: opts.hostname, startOnBuild: (_a = opts.startListening) !== null && _a !== void 0 ? _a : false }));
|
|
61
62
|
}
|
|
62
63
|
enableListen(startOnBuild) {
|
|
63
64
|
if (startOnBuild !== undefined) {
|
|
@@ -155,17 +156,21 @@ class ExpressBuilder {
|
|
|
155
156
|
}
|
|
156
157
|
build(opts) {
|
|
157
158
|
const express = this.buildExpress(opts);
|
|
159
|
+
const startListening = (opts === null || opts === void 0 ? void 0 : opts.startListening) === undefined ? this._startListen !== false : opts.startListening;
|
|
158
160
|
return {
|
|
159
161
|
express,
|
|
160
162
|
port: this.getPort(),
|
|
161
163
|
hostname: this.getHostname(),
|
|
162
164
|
userIsInRole: this._userIsInRole,
|
|
163
|
-
startListening
|
|
165
|
+
startListening,
|
|
164
166
|
enforcer: this._enforcer,
|
|
165
167
|
start: (opts) => {
|
|
166
|
-
if (
|
|
168
|
+
if (startListening) {
|
|
167
169
|
this.startListening(express);
|
|
168
170
|
}
|
|
171
|
+
else {
|
|
172
|
+
throw Error('Express already started during build');
|
|
173
|
+
}
|
|
169
174
|
if ((opts === null || opts === void 0 ? void 0 : opts.disableErrorHandler) !== true) {
|
|
170
175
|
express.use(express_utils_1.jsonErrorHandler);
|
|
171
176
|
}
|
|
@@ -201,9 +206,9 @@ class ExpressBuilder {
|
|
|
201
206
|
(opts === null || opts === void 0 ? void 0 : opts.handlers) && app.use(opts.handlers);
|
|
202
207
|
app.use(body_parser_1.default.urlencoded({ extended: true }));
|
|
203
208
|
app.use(body_parser_1.default.json());
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
209
|
+
if (this._startListen === true) {
|
|
210
|
+
this.startListening(app);
|
|
211
|
+
}
|
|
207
212
|
return app;
|
|
208
213
|
}
|
|
209
214
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"express-builders.js","sourceRoot":"","sources":["../src/express-builders.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;GAEG;AACH,8DAAoC;AAEpC,gDAAwC;AACxC,oDAAqC;AACrC,sDAA0C;AAE1C,sEAAqC;AAErC,oDAA2B;AAC3B,wDAAsD;AACtD,6CAAgD;AAChD,mDAAkD;AAClD,2CAAiC;AAQjC,MAAM,CAAC,MAAM,EAAE,CAAA;AAEf,MAAa,cAAc;IAgBzB,YAAoB,IAA2D;QAZvE,cAAS,GAA8C,EAAE,CAAA;QAEzD,iBAAY,GAAyB,SAAS,CAAA;QAI9C,qBAAgB,GAAa,KAAK,CAAA;QAOxC,MAAM,EAAE,eAAe,EAAE,YAAY,EAAE,GAAG,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,EAAE,CAAA;QACpD,IAAI,eAAe,EAAE;YACnB,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,CAAA;SAClC;QACD,IAAI,CAAC,YAAY,GAAG,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,EAAE,CAAA;IACxC,CAAC;IAEM,MAAM,CAAC,mBAAmB,CAAC,IAA2D;QAC3F,OAAO,IAAI,cAAc,CAAC,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,EAAE,CAAC,CAAA;IACvC,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,IAAoD
|
|
1
|
+
{"version":3,"file":"express-builders.js","sourceRoot":"","sources":["../src/express-builders.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sphereon/ssi-express-support",
|
|
3
|
-
"version": "0.14.2-next.
|
|
3
|
+
"version": "0.14.2-next.27+af9a447",
|
|
4
4
|
"source": "src/index.ts",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -66,5 +66,5 @@
|
|
|
66
66
|
"SSI",
|
|
67
67
|
"Agent"
|
|
68
68
|
],
|
|
69
|
-
"gitHead": "
|
|
69
|
+
"gitHead": "af9a4479995a4acc8fbe1c94d8445405f6b4fbb7"
|
|
70
70
|
}
|
package/src/express-builders.ts
CHANGED
|
@@ -53,7 +53,7 @@ export class ExpressBuilder {
|
|
|
53
53
|
|
|
54
54
|
public static fromServerOpts(opts: IExpressServerOpts & { envVarPrefix?: string }) {
|
|
55
55
|
const builder = new ExpressBuilder({ existingExpress: opts?.existingExpress, envVarPrefix: opts?.envVarPrefix })
|
|
56
|
-
return builder.withEnableListenOpts(opts)
|
|
56
|
+
return builder.withEnableListenOpts({...opts, hostnameOrIP: opts.hostname, startOnBuild: opts.startListening ?? false})
|
|
57
57
|
}
|
|
58
58
|
|
|
59
59
|
public enableListen(startOnBuild?: boolean): this {
|
|
@@ -179,16 +179,19 @@ export class ExpressBuilder {
|
|
|
179
179
|
handlers?: ApplicationRequestHandler<T> | ApplicationRequestHandler<T>[]
|
|
180
180
|
}): ExpressSupport {
|
|
181
181
|
const express = this.buildExpress(opts)
|
|
182
|
+
const startListening = opts?.startListening === undefined ? this._startListen !== false : opts.startListening
|
|
182
183
|
return {
|
|
183
184
|
express,
|
|
184
185
|
port: this.getPort(),
|
|
185
186
|
hostname: this.getHostname(),
|
|
186
187
|
userIsInRole: this._userIsInRole,
|
|
187
|
-
startListening
|
|
188
|
+
startListening,
|
|
188
189
|
enforcer: this._enforcer,
|
|
189
190
|
start: (opts) => {
|
|
190
|
-
if (
|
|
191
|
+
if (startListening) {
|
|
191
192
|
this.startListening(express)
|
|
193
|
+
} else {
|
|
194
|
+
throw Error('Express already started during build')
|
|
192
195
|
}
|
|
193
196
|
|
|
194
197
|
if (opts?.disableErrorHandler !== true) {
|
|
@@ -233,9 +236,9 @@ export class ExpressBuilder {
|
|
|
233
236
|
app.use(bodyParser.urlencoded({ extended: true }))
|
|
234
237
|
app.use(bodyParser.json())
|
|
235
238
|
|
|
236
|
-
|
|
239
|
+
if (this._startListen === true) {
|
|
237
240
|
this.startListening(app)
|
|
238
|
-
|
|
241
|
+
}
|
|
239
242
|
return app
|
|
240
243
|
}
|
|
241
244
|
}
|