@webda/core 2.0.0-beta.2 → 2.0.1
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/lib/application.d.ts +5 -21
- package/lib/application.js +71 -84
- package/lib/application.js.map +1 -1
- package/lib/application.spec.js +121 -140
- package/lib/application.spec.js.map +1 -1
- package/lib/core.d.ts +44 -45
- package/lib/core.js +239 -320
- package/lib/core.js.map +1 -1
- package/lib/core.spec.js +326 -391
- package/lib/core.spec.js.map +1 -1
- package/lib/index.d.ts +49 -45
- package/lib/index.js +54 -67
- package/lib/index.js.map +1 -1
- package/lib/models/aclmodel.d.ts +2 -2
- package/lib/models/aclmodel.js +63 -90
- package/lib/models/aclmodel.js.map +1 -1
- package/lib/models/aclmodel.spec.js +128 -151
- package/lib/models/aclmodel.spec.js.map +1 -1
- package/lib/models/coremodel.d.ts +39 -17
- package/lib/models/coremodel.js +160 -117
- package/lib/models/coremodel.js.map +1 -1
- package/lib/models/coremodel.spec.js +143 -107
- package/lib/models/coremodel.spec.js.map +1 -1
- package/lib/models/deployment.js +1 -2
- package/lib/models/ident.d.ts +3 -3
- package/lib/models/ident.js +4 -9
- package/lib/models/ident.js.map +1 -1
- package/lib/models/ident.spec.js +9 -11
- package/lib/models/ident.spec.js.map +1 -1
- package/lib/models/ownermodel.d.ts +2 -2
- package/lib/models/ownermodel.js +39 -62
- package/lib/models/ownermodel.js.map +1 -1
- package/lib/models/ownermodel.spec.js +126 -166
- package/lib/models/ownermodel.spec.js.map +1 -1
- package/lib/models/rolemodel.d.ts +2 -2
- package/lib/models/rolemodel.js +24 -40
- package/lib/models/rolemodel.js.map +1 -1
- package/lib/models/rolemodel.spec.js +44 -61
- package/lib/models/rolemodel.spec.js.map +1 -1
- package/lib/models/user.d.ts +9 -9
- package/lib/models/user.js +3 -8
- package/lib/models/user.js.map +1 -1
- package/lib/models/user.spec.js +14 -16
- package/lib/models/user.spec.js.map +1 -1
- package/lib/queues/filequeue.d.ts +2 -2
- package/lib/queues/filequeue.js +72 -93
- package/lib/queues/filequeue.js.map +1 -1
- package/lib/queues/filequeue.spec.js +53 -70
- package/lib/queues/filequeue.spec.js.map +1 -1
- package/lib/queues/memoryqueue.d.ts +2 -2
- package/lib/queues/memoryqueue.js +37 -61
- package/lib/queues/memoryqueue.js.map +1 -1
- package/lib/queues/memoryqueue.spec.js +142 -165
- package/lib/queues/memoryqueue.spec.js.map +1 -1
- package/lib/queues/pubsubservice.d.ts +2 -2
- package/lib/queues/pubsubservice.js +3 -7
- package/lib/queues/pubsubservice.js.map +1 -1
- package/lib/queues/queue.spec.d.ts +1 -1
- package/lib/queues/queue.spec.js +42 -56
- package/lib/queues/queue.spec.js.map +1 -1
- package/lib/queues/queueservice.d.ts +4 -4
- package/lib/queues/queueservice.js +52 -67
- package/lib/queues/queueservice.js.map +1 -1
- package/lib/router.d.ts +3 -3
- package/lib/router.js +46 -47
- package/lib/router.js.map +1 -1
- package/lib/router.spec.js +64 -61
- package/lib/router.spec.js.map +1 -1
- package/lib/services/asyncevents.d.ts +2 -2
- package/lib/services/asyncevents.js +44 -64
- package/lib/services/asyncevents.js.map +1 -1
- package/lib/services/asyncevents.spec.js +81 -98
- package/lib/services/asyncevents.spec.js.map +1 -1
- package/lib/services/authentication.d.ts +28 -19
- package/lib/services/authentication.js +542 -574
- package/lib/services/authentication.js.map +1 -1
- package/lib/services/authentication.spec.js +411 -447
- package/lib/services/authentication.spec.js.map +1 -1
- package/lib/services/binary.d.ts +9 -7
- package/lib/services/binary.js +213 -245
- package/lib/services/binary.js.map +1 -1
- package/lib/services/binary.spec.d.ts +3 -3
- package/lib/services/binary.spec.js +390 -443
- package/lib/services/binary.spec.js.map +1 -1
- package/lib/services/cloudbinary.d.ts +3 -3
- package/lib/services/cloudbinary.js +45 -70
- package/lib/services/cloudbinary.js.map +1 -1
- package/lib/services/cloudbinary.spec.d.ts +3 -3
- package/lib/services/cloudbinary.spec.js +133 -162
- package/lib/services/cloudbinary.spec.js.map +1 -1
- package/lib/services/configuration.d.ts +6 -3
- package/lib/services/configuration.js +78 -103
- package/lib/services/configuration.js.map +1 -1
- package/lib/services/configuration.spec.js +63 -83
- package/lib/services/configuration.spec.js.map +1 -1
- package/lib/services/cron.d.ts +3 -2
- package/lib/services/cron.js +9 -13
- package/lib/services/cron.js.map +1 -1
- package/lib/services/cron.spec.js +18 -21
- package/lib/services/cron.spec.js.map +1 -1
- package/lib/services/cryptoservice.d.ts +258 -0
- package/lib/services/cryptoservice.js +312 -0
- package/lib/services/cryptoservice.js.map +1 -0
- package/lib/services/cryptoservice.spec.d.ts +1 -0
- package/lib/services/cryptoservice.spec.js +137 -0
- package/lib/services/cryptoservice.spec.js.map +1 -0
- package/lib/services/debugmailer.d.ts +1 -1
- package/lib/services/debugmailer.js +13 -34
- package/lib/services/debugmailer.js.map +1 -1
- package/lib/services/debugmailer.spec.js +16 -29
- package/lib/services/debugmailer.spec.js.map +1 -1
- package/lib/services/echo.d.ts +2 -2
- package/lib/services/echo.js +15 -31
- package/lib/services/echo.js.map +1 -1
- package/lib/services/echo.spec.js +27 -40
- package/lib/services/echo.spec.js.map +1 -1
- package/lib/services/filebinary.d.ts +10 -5
- package/lib/services/filebinary.js +171 -205
- package/lib/services/filebinary.js.map +1 -1
- package/lib/services/filebinary.spec.d.ts +2 -1
- package/lib/services/filebinary.spec.js +106 -117
- package/lib/services/filebinary.spec.js.map +1 -1
- package/lib/services/fileconfiguration.d.ts +2 -2
- package/lib/services/fileconfiguration.js +25 -43
- package/lib/services/fileconfiguration.js.map +1 -1
- package/lib/services/fileconfiguration.spec.js +79 -109
- package/lib/services/fileconfiguration.spec.js.map +1 -1
- package/lib/services/invitationservice.d.ts +10 -10
- package/lib/services/invitationservice.js +275 -313
- package/lib/services/invitationservice.js.map +1 -1
- package/lib/services/invitationservice.spec.js +443 -449
- package/lib/services/invitationservice.spec.js.map +1 -1
- package/lib/services/kubernetesconfiguration.d.ts +2 -2
- package/lib/services/kubernetesconfiguration.js +41 -59
- package/lib/services/kubernetesconfiguration.js.map +1 -1
- package/lib/services/kubernetesconfiguration.spec.js +80 -98
- package/lib/services/kubernetesconfiguration.spec.js.map +1 -1
- package/lib/services/mailer.d.ts +4 -4
- package/lib/services/mailer.js +62 -86
- package/lib/services/mailer.js.map +1 -1
- package/lib/services/mailer.spec.js +86 -127
- package/lib/services/mailer.spec.js.map +1 -1
- package/lib/services/notificationservice.d.ts +4 -4
- package/lib/services/notificationservice.js +23 -42
- package/lib/services/notificationservice.js.map +1 -1
- package/lib/services/notificationservice.spec.js +47 -73
- package/lib/services/notificationservice.spec.js.map +1 -1
- package/lib/services/oauth.d.ts +32 -6
- package/lib/services/oauth.js +73 -78
- package/lib/services/oauth.js.map +1 -1
- package/lib/services/oauth.spec.js +128 -148
- package/lib/services/oauth.spec.js.map +1 -1
- package/lib/services/proxy.d.ts +74 -0
- package/lib/services/proxy.js +126 -0
- package/lib/services/proxy.js.map +1 -0
- package/lib/services/proxy.spec.d.ts +1 -0
- package/lib/services/proxy.spec.js +59 -0
- package/lib/services/proxy.spec.js.map +1 -0
- package/lib/services/resource.d.ts +2 -2
- package/lib/services/resource.js +12 -18
- package/lib/services/resource.js.map +1 -1
- package/lib/services/resource.spec.js +67 -99
- package/lib/services/resource.spec.js.map +1 -1
- package/lib/services/service.d.ts +29 -6
- package/lib/services/service.js +69 -39
- package/lib/services/service.js.map +1 -1
- package/lib/services/service.spec.js +62 -67
- package/lib/services/service.spec.js.map +1 -1
- package/lib/services/version.d.ts +1 -1
- package/lib/services/version.js +3 -8
- package/lib/services/version.js.map +1 -1
- package/lib/services/version.spec.js +11 -24
- package/lib/services/version.spec.js.map +1 -1
- package/lib/stores/aggregator.d.ts +3 -3
- package/lib/stores/aggregator.js +37 -57
- package/lib/stores/aggregator.js.map +1 -1
- package/lib/stores/file.d.ts +3 -3
- package/lib/stores/file.js +93 -131
- package/lib/stores/file.js.map +1 -1
- package/lib/stores/file.spec.d.ts +2 -2
- package/lib/stores/file.spec.js +262 -289
- package/lib/stores/file.spec.js.map +1 -1
- package/lib/stores/mapper.d.ts +4 -4
- package/lib/stores/mapper.js +111 -137
- package/lib/stores/mapper.js.map +1 -1
- package/lib/stores/mapper.spec.js +133 -150
- package/lib/stores/mapper.spec.js.map +1 -1
- package/lib/stores/memory.d.ts +67 -6
- package/lib/stores/memory.js +155 -117
- package/lib/stores/memory.js.map +1 -1
- package/lib/stores/memory.spec.d.ts +3 -2
- package/lib/stores/memory.spec.js +127 -105
- package/lib/stores/memory.spec.js.map +1 -1
- package/lib/stores/store.d.ts +40 -16
- package/lib/stores/store.js +847 -830
- package/lib/stores/store.js.map +1 -1
- package/lib/stores/store.spec.d.ts +6 -4
- package/lib/stores/store.spec.js +628 -647
- package/lib/stores/store.spec.js.map +1 -1
- package/lib/stores/webdaql/WebdaQLLexer.d.ts +4 -4
- package/lib/stores/webdaql/WebdaQLLexer.js +9 -13
- package/lib/stores/webdaql/WebdaQLLexer.js.map +1 -1
- package/lib/stores/webdaql/WebdaQLParserLexer.d.ts +4 -4
- package/lib/stores/webdaql/WebdaQLParserLexer.js +9 -13
- package/lib/stores/webdaql/WebdaQLParserLexer.js.map +1 -1
- package/lib/stores/webdaql/WebdaQLParserListener.d.ts +2 -2
- package/lib/stores/webdaql/WebdaQLParserListener.js +1 -2
- package/lib/stores/webdaql/WebdaQLParserListener.js.map +1 -1
- package/lib/stores/webdaql/WebdaQLParserParser.d.ts +10 -10
- package/lib/stores/webdaql/WebdaQLParserParser.js +62 -91
- package/lib/stores/webdaql/WebdaQLParserParser.js.map +1 -1
- package/lib/stores/webdaql/WebdaQLParserVisitor.d.ts +2 -2
- package/lib/stores/webdaql/WebdaQLParserVisitor.js +1 -2
- package/lib/stores/webdaql/WebdaQLParserVisitor.js.map +1 -1
- package/lib/stores/webdaql/query.d.ts +4 -5
- package/lib/stores/webdaql/query.js +16 -19
- package/lib/stores/webdaql/query.js.map +1 -1
- package/lib/stores/webdaql/query.spec.js +30 -32
- package/lib/stores/webdaql/query.spec.js.map +1 -1
- package/lib/test.d.ts +3 -3
- package/lib/test.js +74 -94
- package/lib/test.js.map +1 -1
- package/lib/unpackedapplication.d.ts +1 -1
- package/lib/unpackedapplication.js +44 -38
- package/lib/unpackedapplication.js.map +1 -1
- package/lib/utils/abstractdeployer.js +1 -5
- package/lib/utils/abstractdeployer.js.map +1 -1
- package/lib/utils/abstractdeployer.spec.js +6 -8
- package/lib/utils/abstractdeployer.spec.js.map +1 -1
- package/lib/utils/context.d.ts +61 -29
- package/lib/utils/context.js +133 -127
- package/lib/utils/context.js.map +1 -1
- package/lib/utils/context.spec.js +144 -153
- package/lib/utils/context.spec.js.map +1 -1
- package/lib/utils/cookie.d.ts +66 -45
- package/lib/utils/cookie.js +69 -158
- package/lib/utils/cookie.js.map +1 -1
- package/lib/utils/cookie.spec.js +220 -238
- package/lib/utils/cookie.spec.js.map +1 -1
- package/lib/utils/esm.d.ts +4 -0
- package/lib/utils/esm.js +10 -0
- package/lib/utils/esm.js.map +1 -0
- package/lib/utils/httpcontext.d.ts +3 -0
- package/lib/utils/httpcontext.js +48 -65
- package/lib/utils/httpcontext.js.map +1 -1
- package/lib/utils/httpcontext.spec.js +37 -56
- package/lib/utils/httpcontext.spec.js.map +1 -1
- package/lib/utils/logger.d.ts +2 -2
- package/lib/utils/logger.js +15 -28
- package/lib/utils/logger.js.map +1 -1
- package/lib/utils/logger.spec.js +9 -11
- package/lib/utils/logger.spec.js.map +1 -1
- package/lib/utils/serializers.js +17 -20
- package/lib/utils/serializers.js.map +1 -1
- package/lib/utils/serializers.spec.js +43 -44
- package/lib/utils/serializers.spec.js.map +1 -1
- package/lib/utils/session.d.ts +120 -0
- package/lib/utils/session.js +155 -0
- package/lib/utils/session.js.map +1 -0
- package/lib/utils/session.spec.d.ts +1 -0
- package/lib/utils/session.spec.js +66 -0
- package/lib/utils/session.spec.js.map +1 -0
- package/lib/utils/waiter.d.ts +1 -1
- package/lib/utils/waiter.js +32 -52
- package/lib/utils/waiter.js.map +1 -1
- package/lib/utils/waiter.spec.js +75 -92
- package/lib/utils/waiter.spec.js.map +1 -1
- package/package.json +22 -14
- package/test/config-invitation.json +1 -3
- package/test/config.json +3 -3
- package/test/config.old.json +1 -2
- package/test/moddas/annotatedservice.js +5 -5
- package/test/moddas/debugmailer.js +2 -3
- package/test/moddas/fakeservice.js +2 -3
- package/test/moddas/voidstore.js +6 -4
- package/test/models/ident.js +2 -6
- package/test/models/task.js +3 -7
- package/test/package.json +2 -1
- package/webda.module.json +895 -189
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
2
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
3
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
4
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
5
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
|
+
};
|
|
7
|
+
import { suite, test } from "@testdeck/mocha";
|
|
8
|
+
import * as assert from "assert";
|
|
9
|
+
import * as http from "http";
|
|
10
|
+
import { WebdaTest } from "../test.js";
|
|
11
|
+
import { ProxyService } from "./proxy.js";
|
|
12
|
+
let ProxyTest = class ProxyTest extends WebdaTest {
|
|
13
|
+
async before() {
|
|
14
|
+
await super.before();
|
|
15
|
+
this.fakeServe();
|
|
16
|
+
}
|
|
17
|
+
fakeServe() {
|
|
18
|
+
this.server = http
|
|
19
|
+
.createServer((req, res) => {
|
|
20
|
+
// Just simple echo
|
|
21
|
+
req.pipe(res);
|
|
22
|
+
})
|
|
23
|
+
.listen(28888);
|
|
24
|
+
}
|
|
25
|
+
after() {
|
|
26
|
+
this.server?.close();
|
|
27
|
+
}
|
|
28
|
+
async proxy() {
|
|
29
|
+
const proxyService = new ProxyService(this.webda, "proxy", {
|
|
30
|
+
url: "/proxy",
|
|
31
|
+
backend: "http://localhost:28888/"
|
|
32
|
+
});
|
|
33
|
+
this.registerService(proxyService);
|
|
34
|
+
await proxyService.resolve().init();
|
|
35
|
+
this.webda.getRouter().remapRoutes();
|
|
36
|
+
let ctx = await this.newContext();
|
|
37
|
+
ctx.getHttpContext().setClientIp("127.0.0.1");
|
|
38
|
+
let exec = this.getExecutor(ctx, "test.webda.io", "PUT", "/proxy/test/plop", "Bouzouf");
|
|
39
|
+
await exec.execute(ctx);
|
|
40
|
+
assert.notStrictEqual(ctx.getStream().size(), 0);
|
|
41
|
+
assert.strictEqual(ctx.getResponseBody().toString(), "Bouzouf");
|
|
42
|
+
proxyService.getParameters().requireAuthentication = true;
|
|
43
|
+
await assert.rejects(() => this.execute(ctx, "test.webda.io", "GET", "/proxy"), /401/);
|
|
44
|
+
ctx.reinit();
|
|
45
|
+
ctx.getSession().login("test", "test");
|
|
46
|
+
await this.execute(ctx, "test.webda.io", "GET", "/proxy", undefined, { "x-forwarded-for": "10.0.0.8" });
|
|
47
|
+
//assert.strictEqual(ctx.getResponseHeaders()["x-forwarded-for"], "127.0.0.1, 10.0.0.8");
|
|
48
|
+
// cov
|
|
49
|
+
proxyService.getParameters().url = undefined;
|
|
50
|
+
proxyService.resolve();
|
|
51
|
+
}
|
|
52
|
+
};
|
|
53
|
+
__decorate([
|
|
54
|
+
test
|
|
55
|
+
], ProxyTest.prototype, "proxy", null);
|
|
56
|
+
ProxyTest = __decorate([
|
|
57
|
+
suite
|
|
58
|
+
], ProxyTest);
|
|
59
|
+
//# sourceMappingURL=proxy.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"proxy.spec.js","sourceRoot":"","sources":["../../src/services/proxy.spec.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAGvC,IAAM,SAAS,GAAf,MAAM,SAAU,SAAQ,SAAS;IAG/B,KAAK,CAAC,MAAM;QACV,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC;QACrB,IAAI,CAAC,SAAS,EAAE,CAAC;IACnB,CAAC;IAED,SAAS;QACP,IAAI,CAAC,MAAM,GAAG,IAAI;aACf,YAAY,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YACzB,mBAAmB;YACnB,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAChB,CAAC,CAAC;aACD,MAAM,CAAC,KAAK,CAAC,CAAC;IACnB,CAAC;IAED,KAAK;QACH,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC;IACvB,CAAC;IAGD,KAAK,CAAC,KAAK;QACT,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE;YACzD,GAAG,EAAE,QAAQ;YACb,OAAO,EAAE,yBAAyB;SACnC,CAAC,CAAC;QACH,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;QACnC,MAAM,YAAY,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,CAAC;QACpC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,WAAW,EAAE,CAAC;QACrC,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QAClC,GAAG,CAAC,cAAc,EAAE,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QAE9C,IAAI,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,kBAAkB,EAAE,SAAS,CAAC,CAAC;QACxF,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACxB,MAAM,CAAC,cAAc,CAAwB,GAAG,CAAC,SAAS,EAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;QACzE,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC,QAAQ,EAAE,EAAE,SAAS,CAAC,CAAC;QAEhE,YAAY,CAAC,aAAa,EAAE,CAAC,qBAAqB,GAAG,IAAI,CAAC;QAC1D,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,KAAK,CAAC,CAAC;QACvF,GAAG,CAAC,MAAM,EAAE,CAAC;QACb,GAAG,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAEvC,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,iBAAiB,EAAE,UAAU,EAAE,CAAC,CAAC;QACxG,yFAAyF;QAEzF,MAAM;QACN,YAAY,CAAC,aAAa,EAAE,CAAC,GAAG,GAAG,SAAS,CAAC;QAC7C,YAAY,CAAC,OAAO,EAAE,CAAC;IACzB,CAAC;CACF,CAAA;AA5BC;IADC,IAAI;sCA4BJ;AAjDG,SAAS;IADd,KAAK;GACA,SAAS,CAkDd"}
|
package/lib/services/resource.js
CHANGED
|
@@ -1,34 +1,29 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
const mime = require("mime-types");
|
|
6
|
-
const path = require("path");
|
|
7
|
-
const service_1 = require("./service");
|
|
1
|
+
import * as fs from "fs";
|
|
2
|
+
import * as mime from "mime-types";
|
|
3
|
+
import * as path from "path";
|
|
4
|
+
import { Service, ServiceParameters } from "./service.js";
|
|
8
5
|
/**
|
|
9
6
|
* ResourceService parameters
|
|
10
7
|
*/
|
|
11
|
-
class ResourceServiceParameters extends
|
|
8
|
+
export class ResourceServiceParameters extends ServiceParameters {
|
|
12
9
|
constructor(params) {
|
|
13
|
-
var _a, _b, _c, _d, _e;
|
|
14
10
|
super(params);
|
|
15
|
-
|
|
16
|
-
|
|
11
|
+
this.url ?? (this.url = "resources");
|
|
12
|
+
this.rootRedirect ?? (this.rootRedirect = false);
|
|
17
13
|
if (!this.url.startsWith("/")) {
|
|
18
14
|
this.url = "/" + this.url;
|
|
19
15
|
}
|
|
20
16
|
if (!this.url.endsWith("/")) {
|
|
21
17
|
this.url += "/";
|
|
22
18
|
}
|
|
23
|
-
|
|
19
|
+
this.folder ?? (this.folder = "." + this.url);
|
|
24
20
|
if (!this.folder.endsWith("/")) {
|
|
25
21
|
this.folder += "/";
|
|
26
22
|
}
|
|
27
|
-
|
|
28
|
-
|
|
23
|
+
this.index ?? (this.index = "index.html");
|
|
24
|
+
this.indexFallback ?? (this.indexFallback = true);
|
|
29
25
|
}
|
|
30
26
|
}
|
|
31
|
-
exports.ResourceServiceParameters = ResourceServiceParameters;
|
|
32
27
|
/**
|
|
33
28
|
* This service expose a folder as web
|
|
34
29
|
*
|
|
@@ -37,7 +32,7 @@ exports.ResourceServiceParameters = ResourceServiceParameters;
|
|
|
37
32
|
* @category CoreServices
|
|
38
33
|
* @WebdaModda
|
|
39
34
|
*/
|
|
40
|
-
class ResourceService extends
|
|
35
|
+
export default class ResourceService extends Service {
|
|
41
36
|
/**
|
|
42
37
|
* Load the parameters for a service
|
|
43
38
|
*/
|
|
@@ -148,6 +143,5 @@ class ResourceService extends service_1.Service {
|
|
|
148
143
|
ctx.end();
|
|
149
144
|
}
|
|
150
145
|
}
|
|
151
|
-
|
|
152
|
-
exports.ResourceService = ResourceService;
|
|
146
|
+
export { ResourceService };
|
|
153
147
|
//# sourceMappingURL=resource.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resource.js","sourceRoot":"","sources":["../../src/services/resource.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"resource.js","sourceRoot":"","sources":["../../src/services/resource.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,144 +1,112 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
2
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
3
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
4
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
5
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
6
|
};
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
const assert = require("assert");
|
|
20
|
-
const fs = require("fs");
|
|
21
|
-
const test_1 = require("../test");
|
|
22
|
-
const resource_1 = require("./resource");
|
|
23
|
-
let ResourceTest = class ResourceTest extends test_1.WebdaTest {
|
|
24
|
-
before(init = true) {
|
|
25
|
-
const _super = Object.create(null, {
|
|
26
|
-
before: { get: () => super.before }
|
|
27
|
-
});
|
|
28
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
29
|
-
yield _super.before.call(this, init);
|
|
30
|
-
this.resource = this.getService("ResourceService");
|
|
31
|
-
this.resourceModel = this.getService("ModelsResource");
|
|
32
|
-
this.ctx = yield this.newContext();
|
|
33
|
-
});
|
|
7
|
+
import { suite, test } from "@testdeck/mocha";
|
|
8
|
+
import * as assert from "assert";
|
|
9
|
+
import * as fs from "fs";
|
|
10
|
+
import { WebdaTest } from "../test.js";
|
|
11
|
+
import { ResourceServiceParameters } from "./resource.js";
|
|
12
|
+
let ResourceTest = class ResourceTest extends WebdaTest {
|
|
13
|
+
async before(init = true) {
|
|
14
|
+
await super.before(init);
|
|
15
|
+
this.resource = this.getService("ResourceService");
|
|
16
|
+
this.resourceModel = this.getService("ModelsResource");
|
|
17
|
+
this.ctx = await this.newContext();
|
|
34
18
|
}
|
|
35
|
-
parentFolder() {
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
yield assert.rejects(() => executor.execute(this.ctx), err => err == 401);
|
|
40
|
-
});
|
|
19
|
+
async parentFolder() {
|
|
20
|
+
let executor = this.getExecutor(this.ctx, "test.webda.io", "GET", "/resources/../config.json");
|
|
21
|
+
assert.notStrictEqual(executor, undefined);
|
|
22
|
+
await assert.rejects(() => executor.execute(this.ctx), err => err == 401);
|
|
41
23
|
}
|
|
42
24
|
params() {
|
|
43
|
-
let params = new
|
|
25
|
+
let params = new ResourceServiceParameters({
|
|
44
26
|
url: "/test/",
|
|
45
27
|
rootRedirect: true
|
|
46
28
|
});
|
|
47
29
|
assert.strictEqual(params.url, "/test/");
|
|
48
30
|
assert.strictEqual(params.folder, "./test/");
|
|
49
31
|
}
|
|
50
|
-
redirect() {
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
assert.strictEqual(this.ctx.getResponseHeaders().Location, "http://test.webda.io/resources/");
|
|
59
|
-
});
|
|
32
|
+
async redirect() {
|
|
33
|
+
this.resource.getParameters().rootRedirect = true;
|
|
34
|
+
this.webda.getRouter().removeRoute("/");
|
|
35
|
+
assert.ok(this.webda.getRouter().getRouteFromUrl(this.ctx, "GET", "/") === undefined);
|
|
36
|
+
this.resource.initRoutes();
|
|
37
|
+
assert.ok(this.webda.getRouter().getRouteFromUrl(this.ctx, "GET", "/") !== undefined);
|
|
38
|
+
this.resource._redirect(this.ctx);
|
|
39
|
+
assert.strictEqual(this.ctx.getResponseHeaders().Location, "http://test.webda.io/resources/");
|
|
60
40
|
}
|
|
61
|
-
index() {
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
yield assert.rejects(() => executor.execute(this.ctx), err => err == 404);
|
|
66
|
-
});
|
|
41
|
+
async index() {
|
|
42
|
+
let executor = this.getExecutor(this.ctx, "test.webda.io", "GET", "/resources/");
|
|
43
|
+
// index.html does not exist in our case
|
|
44
|
+
await assert.rejects(() => executor.execute(this.ctx), err => err == 404);
|
|
67
45
|
}
|
|
68
|
-
unknownFile() {
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
yield assert.rejects(() => executor.execute(this.ctx), /404/);
|
|
74
|
-
});
|
|
46
|
+
async unknownFile() {
|
|
47
|
+
this.getService("ResourceService").getParameters().indexFallback = true;
|
|
48
|
+
let executor = this.getExecutor(this.ctx, "test.webda.io", "GET", "/resources/config.unknown.json");
|
|
49
|
+
assert.notStrictEqual(executor, undefined);
|
|
50
|
+
await assert.rejects(() => executor.execute(this.ctx), /404/);
|
|
75
51
|
}
|
|
76
|
-
jsonFile() {
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
assert.strictEqual(this.ctx.getResponseHeaders()["Content-Type"], "application/json");
|
|
83
|
-
});
|
|
52
|
+
async jsonFile() {
|
|
53
|
+
let executor = this.getExecutor(this.ctx, "test.webda.io", "GET", "/resources/config.json");
|
|
54
|
+
assert.notStrictEqual(executor, undefined);
|
|
55
|
+
await executor.execute(this.ctx);
|
|
56
|
+
assert.strictEqual(this.ctx.getResponseBody().toString(), fs.readFileSync("./test/config.json").toString());
|
|
57
|
+
assert.strictEqual(this.ctx.getResponseHeaders()["Content-Type"], "application/json");
|
|
84
58
|
}
|
|
85
|
-
jsFile() {
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
assert.strictEqual(this.ctx.getResponseHeaders()["Content-Type"], "application/javascript");
|
|
92
|
-
});
|
|
59
|
+
async jsFile() {
|
|
60
|
+
let executor = this.getExecutor(this.ctx, "test.webda.io", "GET", "/resources/moddas/voidstore.js");
|
|
61
|
+
assert.notStrictEqual(executor, undefined);
|
|
62
|
+
await executor.execute(this.ctx);
|
|
63
|
+
assert.strictEqual(this.ctx.getResponseBody().toString(), fs.readFileSync("./test/moddas/voidstore.js").toString());
|
|
64
|
+
assert.strictEqual(this.ctx.getResponseHeaders()["Content-Type"], "application/javascript");
|
|
93
65
|
}
|
|
94
|
-
textFile() {
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
assert.strictEqual(this.ctx.getResponseHeaders()["Content-Type"], "text/plain; charset=UTF-8");
|
|
101
|
-
});
|
|
66
|
+
async textFile() {
|
|
67
|
+
let executor = this.getExecutor(this.ctx, "test.webda.io", "GET", "/resources/data/test.txt");
|
|
68
|
+
assert.notStrictEqual(executor, undefined);
|
|
69
|
+
await executor.execute(this.ctx);
|
|
70
|
+
assert.strictEqual(this.ctx.getResponseBody().toString(), fs.readFileSync("./test/data/test.txt").toString());
|
|
71
|
+
assert.strictEqual(this.ctx.getResponseHeaders()["Content-Type"], "text/plain; charset=UTF-8");
|
|
102
72
|
}
|
|
103
73
|
// Check Store HTTP mapping
|
|
104
|
-
testStoreHttpMapping() {
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
assert.strictEqual(this.ctx.getResponseHeaders()["Content-Type"], "application/octet-stream");
|
|
111
|
-
});
|
|
74
|
+
async testStoreHttpMapping() {
|
|
75
|
+
let executor = this.getExecutor(this.ctx, "test.webda.io", "GET", "/templates/PASSPORT_EMAIL_RECOVERY/html.mustache");
|
|
76
|
+
assert.notStrictEqual(executor, undefined);
|
|
77
|
+
await executor.execute(this.ctx);
|
|
78
|
+
assert.strictEqual(this.ctx.getResponseBody().toString(), fs.readFileSync("./templates/PASSPORT_EMAIL_RECOVERY/html.mustache").toString());
|
|
79
|
+
assert.strictEqual(this.ctx.getResponseHeaders()["Content-Type"], "application/octet-stream");
|
|
112
80
|
}
|
|
113
81
|
};
|
|
114
82
|
__decorate([
|
|
115
|
-
|
|
83
|
+
test
|
|
116
84
|
], ResourceTest.prototype, "parentFolder", null);
|
|
117
85
|
__decorate([
|
|
118
|
-
|
|
86
|
+
test
|
|
119
87
|
], ResourceTest.prototype, "params", null);
|
|
120
88
|
__decorate([
|
|
121
|
-
|
|
89
|
+
test
|
|
122
90
|
], ResourceTest.prototype, "redirect", null);
|
|
123
91
|
__decorate([
|
|
124
|
-
|
|
92
|
+
test
|
|
125
93
|
], ResourceTest.prototype, "index", null);
|
|
126
94
|
__decorate([
|
|
127
|
-
|
|
95
|
+
test
|
|
128
96
|
], ResourceTest.prototype, "unknownFile", null);
|
|
129
97
|
__decorate([
|
|
130
|
-
|
|
98
|
+
test
|
|
131
99
|
], ResourceTest.prototype, "jsonFile", null);
|
|
132
100
|
__decorate([
|
|
133
|
-
|
|
101
|
+
test
|
|
134
102
|
], ResourceTest.prototype, "jsFile", null);
|
|
135
103
|
__decorate([
|
|
136
|
-
|
|
104
|
+
test
|
|
137
105
|
], ResourceTest.prototype, "textFile", null);
|
|
138
106
|
__decorate([
|
|
139
|
-
|
|
107
|
+
test
|
|
140
108
|
], ResourceTest.prototype, "testStoreHttpMapping", null);
|
|
141
109
|
ResourceTest = __decorate([
|
|
142
|
-
|
|
110
|
+
suite
|
|
143
111
|
], ResourceTest);
|
|
144
112
|
//# sourceMappingURL=resource.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resource.spec.js","sourceRoot":"","sources":["../../src/services/resource.spec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"resource.spec.js","sourceRoot":"","sources":["../../src/services/resource.spec.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAwB,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAGxE,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,SAAS;IAIlC,KAAK,CAAC,MAAM,CAAC,OAAgB,IAAI;QAC/B,MAAM,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACzB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;QACnD,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;QACvD,IAAI,CAAC,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;IACrC,CAAC;IAGD,KAAK,CAAC,YAAY;QAChB,IAAI,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,2BAA2B,CAAC,CAAC;QAC/F,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;QAC3C,MAAM,MAAM,CAAC,OAAO,CAClB,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAChC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,GAAG,CAClB,CAAC;IACJ,CAAC;IAGD,MAAM;QACJ,IAAI,MAAM,GAAG,IAAI,yBAAyB,CAAC;YACzC,GAAG,EAAE,QAAQ;YACb,YAAY,EAAE,IAAI;SACnB,CAAC,CAAC;QACH,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACzC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAC/C,CAAC;IAGD,KAAK,CAAC,QAAQ;QACZ,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC,YAAY,GAAG,IAAI,CAAC;QAClD,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QACxC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,SAAS,CAAC,CAAC;QACtF,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;QAC3B,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,SAAS,CAAC,CAAC;QACtF,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAClC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,kBAAkB,EAAE,CAAC,QAAQ,EAAE,iCAAiC,CAAC,CAAC;IAChG,CAAC;IAGD,KAAK,CAAC,KAAK;QACT,IAAI,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC;QACjF,wCAAwC;QACxC,MAAM,MAAM,CAAC,OAAO,CAClB,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAChC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,GAAG,CAClB,CAAC;IACJ,CAAC;IAGD,KAAK,CAAC,WAAW;QACf,IAAI,CAAC,UAAU,CAAkB,iBAAiB,CAAC,CAAC,aAAa,EAAE,CAAC,aAAa,GAAG,IAAI,CAAC;QACzF,IAAI,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,gCAAgC,CAAC,CAAC;QACpG,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;QAC3C,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC;IAChE,CAAC;IAGD,KAAK,CAAC,QAAQ;QACZ,IAAI,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,wBAAwB,CAAC,CAAC;QAC5F,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;QAC3C,MAAM,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC,QAAQ,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,oBAAoB,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC5G,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,kBAAkB,EAAE,CAAC,cAAc,CAAC,EAAE,kBAAkB,CAAC,CAAC;IACxF,CAAC;IAGD,KAAK,CAAC,MAAM;QACV,IAAI,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,gCAAgC,CAAC,CAAC;QACpG,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;QAC3C,MAAM,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC,QAAQ,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,4BAA4B,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QACpH,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,kBAAkB,EAAE,CAAC,cAAc,CAAC,EAAE,wBAAwB,CAAC,CAAC;IAC9F,CAAC;IAGD,KAAK,CAAC,QAAQ;QACZ,IAAI,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,0BAA0B,CAAC,CAAC;QAC9F,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;QAC3C,MAAM,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC,QAAQ,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,sBAAsB,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC9G,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,kBAAkB,EAAE,CAAC,cAAc,CAAC,EAAE,2BAA2B,CAAC,CAAC;IACjG,CAAC;IACD,2BAA2B;IAE3B,KAAK,CAAC,oBAAoB;QACxB,IAAI,QAAQ,GAAG,IAAI,CAAC,WAAW,CAC7B,IAAI,CAAC,GAAG,EACR,eAAe,EACf,KAAK,EACL,kDAAkD,CACnD,CAAC;QACF,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;QAC3C,MAAM,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjC,MAAM,CAAC,WAAW,CAChB,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC,QAAQ,EAAE,EACrC,EAAE,CAAC,YAAY,CAAC,mDAAmD,CAAC,CAAC,QAAQ,EAAE,CAChF,CAAC;QACF,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,kBAAkB,EAAE,CAAC,cAAc,CAAC,EAAE,0BAA0B,CAAC,CAAC;IAChG,CAAC;CACF,CAAA;AA3FC;IADC,IAAI;gDAQJ;AAGD;IADC,IAAI;0CAQJ;AAGD;IADC,IAAI;4CASJ;AAGD;IADC,IAAI;yCAQJ;AAGD;IADC,IAAI;+CAMJ;AAGD;IADC,IAAI;4CAOJ;AAGD;IADC,IAAI;0CAOJ;AAGD;IADC,IAAI;4CAOJ;AAGD;IADC,IAAI;wDAeJ;AAtGG,YAAY;IADjB,KAAK;GACA,YAAY,CAuGjB"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { WorkerLogLevel } from "@webda/workout";
|
|
3
3
|
import * as events from "events";
|
|
4
|
-
import { Core, Logger } from "../index";
|
|
5
|
-
import { OpenAPIWebdaDefinition } from "../router";
|
|
6
|
-
import { HttpMethodType } from "../utils/httpcontext";
|
|
4
|
+
import { Core, Logger } from "../index.js";
|
|
5
|
+
import { OpenAPIWebdaDefinition } from "../router.js";
|
|
6
|
+
import { HttpMethodType } from "../utils/httpcontext.js";
|
|
7
7
|
/**
|
|
8
8
|
* Inject a Bean inside this attribute
|
|
9
9
|
*
|
|
@@ -18,6 +18,7 @@ import { HttpMethodType } from "../utils/httpcontext";
|
|
|
18
18
|
* Might consider to split into two annotations
|
|
19
19
|
*/
|
|
20
20
|
export declare function Inject(parameterOrName: string, defaultValue?: string | boolean, optional?: boolean): (target: any, propertyName: string) => void;
|
|
21
|
+
export declare function Route(route: string, methods?: string | string[], allowPath?: boolean, openapi?: OpenAPIWebdaDefinition): (target: any, executor: string) => void;
|
|
21
22
|
/**
|
|
22
23
|
* Interface to specify the Service parameters
|
|
23
24
|
*/
|
|
@@ -26,6 +27,15 @@ export declare class ServiceParameters {
|
|
|
26
27
|
* Type of the service
|
|
27
28
|
*/
|
|
28
29
|
type: string;
|
|
30
|
+
/**
|
|
31
|
+
* URL on which to serve the content
|
|
32
|
+
*/
|
|
33
|
+
url?: string;
|
|
34
|
+
/**
|
|
35
|
+
* OpenAPI override
|
|
36
|
+
* @SchemaIgnore
|
|
37
|
+
*/
|
|
38
|
+
openapi?: OpenAPIWebdaDefinition;
|
|
29
39
|
/**
|
|
30
40
|
* Copy all parameters into the object by default
|
|
31
41
|
*
|
|
@@ -110,7 +120,15 @@ declare abstract class Service<T extends ServiceParameters = ServiceParameters,
|
|
|
110
120
|
* Resolve parameters
|
|
111
121
|
* Call initRoutes and initBeanRoutes
|
|
112
122
|
*/
|
|
113
|
-
resolve():
|
|
123
|
+
resolve(): this;
|
|
124
|
+
/**
|
|
125
|
+
* Return the full path url based on parameters
|
|
126
|
+
*
|
|
127
|
+
* @param url relative url to service
|
|
128
|
+
* @param _methods in case we need filtering (like Store)
|
|
129
|
+
* @returns absolute url or undefined if need to skip the Route
|
|
130
|
+
*/
|
|
131
|
+
getUrl(url: string, _methods: HttpMethodType[]): string;
|
|
114
132
|
/**
|
|
115
133
|
* Add a route dynamicaly
|
|
116
134
|
*
|
|
@@ -119,6 +137,11 @@ declare abstract class Service<T extends ServiceParameters = ServiceParameters,
|
|
|
119
137
|
* @param {Function} executer Method to execute for this route
|
|
120
138
|
*/
|
|
121
139
|
protected addRoute(url: string, methods: HttpMethodType[], executer: Function, openapi?: OpenAPIWebdaDefinition, allowPath?: boolean, override?: boolean): void;
|
|
140
|
+
/**
|
|
141
|
+
* Return variables for replacement in openapi
|
|
142
|
+
* @returns
|
|
143
|
+
*/
|
|
144
|
+
getOpenApiReplacements(): any;
|
|
122
145
|
/**
|
|
123
146
|
* Init the routes
|
|
124
147
|
*/
|
|
@@ -137,12 +160,12 @@ declare abstract class Service<T extends ServiceParameters = ServiceParameters,
|
|
|
137
160
|
* @param config for the host so you can add your own route here
|
|
138
161
|
* @abstract
|
|
139
162
|
*/
|
|
140
|
-
init(): Promise<
|
|
163
|
+
init(): Promise<this>;
|
|
141
164
|
/**
|
|
142
165
|
*
|
|
143
166
|
* @param config new parameters for the service
|
|
144
167
|
*/
|
|
145
|
-
reinit(config: DeepPartial<T>): Promise<
|
|
168
|
+
reinit(config: DeepPartial<T>): Promise<this>;
|
|
146
169
|
/**
|
|
147
170
|
* Display a message if the listener takes too long
|
|
148
171
|
* @param start
|