@webda/core 4.0.0-beta.1 → 4.0.0-beta.3

package/lib/services/notificationservice.spec.js

@@ -1,78 +0,0 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    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;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-import { suite, test } from "@testdeck/mocha";
-import * as assert from "assert";
-import { Service } from "...js";
-import { WebdaTest } from "../test.js";
-import { MultiNotificationService } from "./notificationservice.js";
-class FakeNotification extends Service {
-    constructor() {
-        super(...arguments);
-        this.template = false;
-        this.user = false;
-        this.sent = 0;
-    }
-    async hasNotification(notification) {
-        return this.template;
-    }
-    async handleNotificationFor(user) {
-        return this.user;
-    }
-    async sendNotification(user, notification, replacements) {
-        this.sent++;
-    }
-}
-let NotificationServiceTest = class NotificationServiceTest extends WebdaTest {
-    getTestConfiguration() {
-        return process.cwd() + "/test/config-invitation.json";
-    }
-    async before() {
-        await super.before();
-        this.service = new MultiNotificationService(this.webda, "notif", {
-            senders: ["notifA", "notifB"]
-        });
-        this.fakeA = new FakeNotification(this.webda, "notifA", {});
-        this.fakeB = new FakeNotification(this.webda, "notifB", {});
-        this.registerService(this.fakeA);
-        this.registerService(this.fakeB);
-        this.registerService(this.service);
-        this.service.resolve();
-    }
-    async cov() {
-        assert.strictEqual(await this.service.handleNotificationFor(undefined), false);
-        assert.strictEqual(await this.service.hasNotification(undefined), false);
-        this.fakeB.user = true;
-        assert.strictEqual(await this.service.handleNotificationFor(undefined), true);
-        this.fakeA.template = true;
-        assert.strictEqual(await this.service.hasNotification(undefined), true);
-        await this.service.sendNotification(undefined, undefined, undefined);
-        assert.strictEqual(this.fakeA.sent + this.fakeB.sent, 0);
-        this.fakeA.user = true;
-        await this.service.sendNotification(undefined, undefined, undefined);
-        assert.strictEqual(this.fakeA.sent + this.fakeB.sent, 1);
-        this.fakeB.template = true;
-        await this.service.sendNotification(undefined, undefined, undefined);
-        assert.strictEqual(this.fakeA.sent + this.fakeB.sent, 2);
-        this.service.getParameters().multiple = true;
-        await this.service.sendNotification(undefined, undefined, undefined);
-        assert.strictEqual(this.fakeA.sent + this.fakeB.sent, 4);
-    }
-    async exception() {
-        this.service.getParameters().senders.push("unknown");
-        assert.throws(() => this.service.resolve(), /Unknown service 'unknown'/);
-    }
-};
-__decorate([
-    test
-], NotificationServiceTest.prototype, "cov", null);
-__decorate([
-    test
-], NotificationServiceTest.prototype, "exception", null);
-NotificationServiceTest = __decorate([
-    suite
-], NotificationServiceTest);
-//# sourceMappingURL=notificationservice.spec.js.map

package/lib/services/notificationservice.spec.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"notificationservice.spec.js","sourceRoot":"","sources":["../../src/services/notificationservice.spec.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAE7B,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,wBAAwB,EAAuB,MAAM,uBAAuB,CAAC;AAEtF,MAAM,gBAAiB,SAAQ,OAAO;IAAtC;;QACE,aAAQ,GAAY,KAAK,CAAC;QAC1B,SAAI,GAAY,KAAK,CAAC;QACtB,SAAI,GAAW,CAAC,CAAC;IAYnB,CAAC;IAVC,KAAK,CAAC,eAAe,CAAC,YAAoB;QACxC,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IACD,KAAK,CAAC,qBAAqB,CAAC,IAAU;QACpC,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,IAAU,EAAE,YAAoB,EAAE,YAAiB;QACxE,IAAI,CAAC,IAAI,EAAE,CAAC;IACd,CAAC;CACF;AAGD,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,SAAS;IAK7C,oBAAoB;QAClB,OAAO,OAAO,CAAC,GAAG,EAAE,GAAG,8BAA8B,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,MAAM;QACV,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC;QACrB,IAAI,CAAC,OAAO,GAAG,IAAI,wBAAwB,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE;YAC/D,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;SAC9B,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,GAAG,IAAI,gBAAgB,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;QAC5D,IAAI,CAAC,KAAK,GAAG,IAAI,gBAAgB,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;QAC5D,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACjC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACjC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACnC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;IACzB,CAAC;IAGK,AAAN,KAAK,CAAC,GAAG;QACP,MAAM,CAAC,WAAW,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,CAAC;QAC/E,MAAM,CAAC,WAAW,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,CAAC;QAEzE,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC;QACvB,MAAM,CAAC,WAAW,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,CAAC;QAC9E,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC;QAC3B,MAAM,CAAC,WAAW,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,CAAC;QAExE,MAAM,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;QACrE,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QACzD,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC;QACvB,MAAM,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;QACrE,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QACzD,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC;QAC3B,MAAM,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;QACrE,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QACzD,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,QAAQ,GAAG,IAAI,CAAC;QAC7C,MAAM,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;QACrE,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAC3D,CAAC;IAGK,AAAN,KAAK,CAAC,SAAS;QACb,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACrD,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,2BAA2B,CAAC,CAAC;IAC3E,CAAC;CACF,CAAA;AA3BO;IADL,IAAI;kDAqBJ;AAGK;IADL,IAAI;wDAIJ;AAjDG,uBAAuB;IAD5B,KAAK;GACA,uBAAuB,CAkD5B"}

package/lib/services/oauth.spec.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/services/oauth.spec.js

@@ -1,184 +0,0 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    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;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-import { suite, test } from "@testdeck/mocha";
-import * as assert from "assert";
-import { HttpContext, WebdaError } from "../.js";
-import { WebdaTest } from "../test.js";
-import { OAuthService } from "./oauth.js";
-class FakeOAuthService extends OAuthService {
-    getDefaultUrl() {
-        return "/fake";
-    }
-    generateAuthUrl() {
-        return "/fakeredirect";
-    }
-    async handleToken() {
-        return {
-            identId: "i1",
-            profile: {}
-        };
-    }
-    async handleCallback() {
-        return this.handleToken();
-    }
-    getName() {
-        return "fake";
-    }
-    getCallbackReferer() {
-        return [/bouzouf\d?\.com$/];
-    }
-}
-let OAuthServiceTest = class OAuthServiceTest extends WebdaTest {
-    async before() {
-        await super.before();
-        this.service = new FakeOAuthService(this.webda, "fake", {
-            authorized_uris: ["https://redirect.me/plop"]
-        });
-        this.registerService(this.service);
-    }
-    async testCheckRequest() {
-        let ctx = await this.newContext();
-        ctx.setHttpContext(new HttpContext("bouzouf.com", "GET", "/fake", "https", 80, {
-            referer: "bouzouf.com"
-        }));
-        assert.strictEqual(await this.service.checkRequest(ctx), true, "should allow bouzouf.com referer");
-        ctx.setHttpContext(new HttpContext("bouzouf.com", "GET", "/fake", "https", 80, {
-            referer: "bouzouf2.com"
-        }));
-        assert.strictEqual(await this.service.checkRequest(ctx), true, "should allow bouzouf2.com referer");
-        ctx.setHttpContext(new HttpContext("bouzouf.com", "GET", "/fake", "https", 80, {
-            referer: "bouzouf12.com"
-        }));
-        assert.strictEqual(await this.service.checkRequest(ctx), false, "should not allow bouzouf12.com referer");
-        ctx.setHttpContext(new HttpContext("bouzouf.com", "GET", "/plop", "https", 80, {
-            referer: "bouzouf.com"
-        }));
-        assert.strictEqual(await this.service.checkRequest(ctx), false, "should allow bouzouf.com only on its own url");
-        ctx.setHttpContext(new HttpContext("bouzouf.com", "GET", "/fake", "https", 80, {}));
-        assert.strictEqual(await this.service.checkRequest(ctx), false, "should not allow without referer");
-        this.service.getParameters().no_referer = true;
-        ctx.setHttpContext(new HttpContext("bouzouf.com", "GET", "/fake", "https", 80, {}));
-        assert.strictEqual(await this.service.checkRequest(ctx), true, "should allow without referer");
-    }
-    async testRoute() {
-        this.service.resolve();
-        let ctx = await this.newContext();
-        await this.getExecutor(ctx, "test.webda.io", "GET", "/fake/callback?state=qwYG5RI3RVm_LCt-psrYAg&code=4%2F0AVHEtk5UIL1IFer3juJuFYawc9oJnaTzThLqW0dNKJHPD41vbp7T5XROjdPYsaSWOzsKlA&scope=email+profile+https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fuserinfo.email+https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fdrive.labels.readonly+https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fdrive.metadata.readonly+https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fuserinfo.profile+https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fadmin.directory.group.readonly+openid+https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fdrive.readonly&authuser=0&hd=webda.io&prompt=none");
-        assert.strictEqual(ctx._executor, this.service);
-    }
-    async misc() {
-        this.service.resolve();
-        assert.notStrictEqual(this.service._authenticationService, undefined, "Should get default Authentication service");
-        // Test the 403 on handleReturn
-        assert.rejects(() => this.service.handleReturn(undefined, undefined, undefined), (err) => err.getResponseCode() === 403);
-        let ctx = await this.newContext();
-        await this.webda.getService("Idents").__clean();
-        // Register with oauth
-        await this.service.handleReturn(ctx, "plop", { email: "rcattiau@gmail.com" }, undefined);
-        // We should have two idents existing now
-        assert.ok(await this.service._authenticationService._identModel.ref("plop_fake").exists());
-        assert.ok(await this.service._authenticationService._identModel.ref("rcattiau@gmail.com_email").exists());
-        await ctx.newSession();
-        // Log with known ident / email
-        assert.strictEqual(ctx.getSession().identUsed, undefined);
-        await this.service.handleReturn(ctx, "plop", { email: "rcattiau@gmail.com" }, undefined);
-        assert.strictEqual(ctx.getSession().identUsed, "plop_fake");
-        let userId = ctx.getCurrentUserId();
-        await ctx.newSession();
-        // Log with new ident / known email
-        await this.service.handleReturn(ctx, "plop2", { email: "rcattiau@gmail.com" }, undefined);
-        assert.strictEqual(ctx.getSession().identUsed, "plop2_fake");
-        assert.strictEqual(ctx.getCurrentUserId(), userId);
-        await this.service.handleReturn(ctx, "plop3", { email: "rcattiau@gmail.com" }, undefined);
-        // Default to false for token
-        assert.rejects(() => this.execute(ctx, "webda.io", "GET", "/fake/scope"), (err) => err.getResponseCode() === 404);
-        assert.rejects(() => this.execute(ctx, "webda.io", "POST", "/fake/token"), (err) => err.getResponseCode() === 404);
-        // @ts-ignore
-        this.service.parameters = this.service.loadParameters({
-            authenticationService: "Authentication2",
-            exposeScope: true,
-            scope: ["email", "image"],
-            url: "/bouzouf",
-            authorized_uris: ["google.com"]
-        });
-        this.service.hasToken = () => true;
-        this.service.resolve();
-        this.registerService(this.service);
-        assert.strictEqual(this.service._authenticationService, undefined, "Should not get any Authentication service");
-        await this.execute(ctx, "webda.io", "GET", "/bouzouf/scope");
-        assert.deepStrictEqual(JSON.parse(ctx.getResponseBody()), ["email", "image"]);
-        let event = 0;
-        this.service.on("OAuth.Callback", evt => {
-            if (evt.type === "token") {
-                event++;
-            }
-        });
-        await this.execute(ctx, "webda.io", "POST", "/bouzouf/token");
-        assert.strictEqual(event, 1);
-        this.service.removeAllListeners();
-        this.service.on("OAuth.Callback", evt => {
-            if (evt.type === "callback") {
-                event++;
-            }
-        });
-        ctx.getSession().oauth.redirect = "bouzouf.com";
-        await this.execute(ctx, "webda.io", "GET", "/bouzouf/callback?code=123&scope=plop&state=123");
-        assert.strictEqual(event, 2);
-        assert.strictEqual(ctx.getResponseHeaders()["Location"], "bouzouf.com");
-        assert.strictEqual(ctx.getSession().oauth.redirect, undefined);
-        assert.strictEqual(ctx.getSession().oauth.state, undefined);
-        // @ts-ignore
-        this.service.parameters = this.service.loadParameters({
-            authenticationService: "Authentication2",
-            exposeScope: true,
-            scope: ["email", "image"],
-            url: "/bouzouf"
-        });
-        // @ts-ignore readonly
-        ctx.getHttpContext().getHeaders().referer = "http://myownwebsite.com";
-        this.service._redirect(ctx);
-        assert.strictEqual(ctx.getSession().oauth.redirect, "http://myownwebsite.com");
-    }
-    async redirect() {
-        let ctx = await this.newContext();
-        ctx.setHttpContext(new HttpContext("test.webda.io", "GET", "/fake", "https", 443, {
-            referer: "https://redirect.me/plop"
-        }));
-        await this.service._redirect(ctx);
-        assert.notStrictEqual(ctx.getSession().oauth.state, undefined);
-        assert.strictEqual(ctx.getSession().oauth.redirect, "https://redirect.me/plop");
-        assert.strictEqual(ctx.getResponseHeaders().Location, "/fakeredirect");
-        ctx.setHttpContext(new HttpContext("test.webda.io", "GET", "/fake", "https", 443, {
-            referer: "https://redirect.me/plop2"
-        }));
-        assert.throws(() => this.service._redirect(ctx), WebdaError.Unauthorized);
-        // Test w/o referer
-        ctx.setHttpContext(new HttpContext("test.webda.io", "GET", "/fake"));
-        assert.throws(() => this.service._redirect(ctx), WebdaError.Unauthorized);
-        // Enable the no_referer
-        this.service.getParameters().no_referer = true;
-        this.service._redirect(ctx);
-        assert.strictEqual(ctx.getSession().oauth.redirect, undefined);
-        assert.strictEqual(ctx.getResponseHeaders().Location, "/fakeredirect");
-    }
-};
-__decorate([
-    test
-], OAuthServiceTest.prototype, "testCheckRequest", null);
-__decorate([
-    test
-], OAuthServiceTest.prototype, "testRoute", null);
-__decorate([
-    test
-], OAuthServiceTest.prototype, "misc", null);
-__decorate([
-    test
-], OAuthServiceTest.prototype, "redirect", null);
-OAuthServiceTest = __decorate([
-    suite
-], OAuthServiceTest);
-//# sourceMappingURL=oauth.spec.js.map

package/lib/services/oauth.spec.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"oauth.spec.js","sourceRoot":"","sources":["../../src/services/oauth.spec.ts"],"names":[],"mappings":"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"}

package/lib/services/prometheus.js

@@ -1,160 +0,0 @@
-import * as http from "http";
-import { collectDefaultMetrics, Counter, Gauge, Histogram, register } from "prom-client";
-import { Service, ServiceParameters } from "./service.js";
-export class PrometheusParameters extends ServiceParameters {
-    constructor(params) {
-        super(params);
-        this.url ?? (this.url = "/metrics");
-        this.labels ?? (this.labels = {});
-        this.includeNodeMetrics ?? (this.includeNodeMetrics = true);
-        this.includeRequestMetrics ?? (this.includeRequestMetrics = true);
-        this.prefix ?? (this.prefix = "");
-    }
-}
-/**
- * This service expose metrics to Prometheus
- *
- * It can use the same server or a dedicated http server
- * We do not currently support push-gateway
- *
- * @WebdaModda
- */
-export class PrometheusService extends Service {
-    /**
-     *
-     * @param params
-     * @returns
-     */
-    loadParameters(params) {
-        return new PrometheusParameters(params);
-    }
-    /**
-     * @override
-     */
-    initMetrics() {
-        if (this.parameters.includeRequestMetrics) {
-            this.metrics = {
-                http_request_total: register.getSingleMetric(`${this.parameters.prefix}http_request_total`) ||
-                    new Counter({
-                        name: `${this.parameters.prefix}http_request_total`,
-                        help: "metric_help",
-                        labelNames: ["method", "statuscode", "handler"]
-                    }),
-                http_request_in_flight: register.getSingleMetric(`${this.parameters.prefix}http_request_in_flight`) ||
-                    new Gauge({
-                        name: `${this.parameters.prefix}http_request_in_flight`,
-                        help: "in flight"
-                    }),
-                http_request_duration_milliseconds: register.getSingleMetric(`${this.parameters.prefix}http_request_duration_milliseconds`) ||
-                    new Histogram({
-                        name: `${this.parameters.prefix}http_request_duration_milliseconds`,
-                        labelNames: ["method", "statuscode", "handler"],
-                        help: "ms"
-                    }),
-                http_request_sizes: register.getSingleMetric(`${this.parameters.prefix}http_request_sizes`) ||
-                    new Histogram({
-                        name: `${this.parameters.prefix}http_request_sizes`,
-                        labelNames: ["method", "statuscode", "handler"],
-                        help: "o"
-                    }),
-                http_response_sizes: register.getSingleMetric(`${this.parameters.prefix}http_response_sizes`) ||
-                    new Histogram({
-                        name: `${this.parameters.prefix}http_response_sizes`,
-                        labelNames: ["method", "statuscode", "handler"],
-                        help: "o"
-                    })
-            };
-        }
-        if (this.parameters.includeNodeMetrics && !PrometheusService.nodeMetricsRegistered) {
-            PrometheusService.nodeMetricsRegistered = true;
-            collectDefaultMetrics({
-                register,
-                labels: this.parameters.labels,
-                prefix: this.parameters.prefix
-            });
-        }
-    }
-    /**
-     * Close the http server if exists
-     */
-    async stop() {
-        this.http?.close();
-        this.http = undefined;
-    }
-    /**
-     *
-     * @returns
-     */
-    resolve() {
-        super.resolve();
-        register.setDefaultLabels(this.parameters.labels);
-        if (!this.parameters.portNumber) {
-            this.addRoute(this.parameters.url || "/metrics", ["GET"], this.serveMetrics);
-        }
-        else {
-            this.log("INFO", `Listening for prometheus scraper on ${this.parameters.bind || ""}:${this.parameters.portNumber}`);
-            this.http ?? (this.http = http
-                .createServer(async (req, res) => {
-                if (req.method === "GET" && req.url === this.parameters.url) {
-                    res.writeHead(200, { "Content-Type": register.contentType });
-                    res.write(await register.metrics());
-                }
-                else {
-                    res.writeHead(404);
-                }
-                res.end();
-            })
-                .listen(this.parameters.portNumber, this.parameters.bind));
-        }
-        // Only register on events if we need to get metrics
-        if (this.parameters.includeRequestMetrics) {
-            this.getWebda().on("Webda.Request", ({ context }) => {
-                if (context.getHttpContext().getRelativeUri() === this.parameters.url) {
-                    return;
-                }
-                this.metrics.http_request_in_flight.inc();
-                context.setExtension("prometheus", {
-                    timer: this.metrics.http_request_duration_milliseconds.startTimer()
-                });
-            });
-            this.getWebda().on("Webda.Result", ({ context }) => {
-                if (context.getHttpContext().getRelativeUri() === this.parameters.url) {
-                    return;
-                }
-                const staticLabels = this.parameters.labels || {};
-                const labels = {
-                    handler: context.getHttpContext().getRelativeUri(),
-                    method: context.getHttpContext().getMethod(),
-                    statuscode: context.statusCode,
-                    ...staticLabels
-                };
-                context
-                    .getExtension("prometheus")
-                    .timer(this.parameters.partitionHistogram ? labels : staticLabels);
-                this.metrics.http_request_total.inc(labels, 1);
-                if (["PUT", "POST", "PATCH"].includes(context.getHttpContext().getMethod())) {
-                    this.metrics.http_request_sizes.observe(this.parameters.partitionHistogram ? labels : staticLabels, Number.parseInt(context.getHttpContext().getHeaders()["content-length"] || "0"));
-                    this.metrics.http_response_sizes.observe(this.parameters.partitionHistogram ? labels : staticLabels, Number.parseInt(context.getResponseHeaders["content-length"] || "0"));
-                }
-                this.metrics.http_request_in_flight.dec(staticLabels, 1);
-            });
-        }
-        return this;
-    }
-    /**
-     * Serve the metrics in a webda context
-     * @param ctx
-     */
-    async serveMetrics(ctx) {
-        ctx.write(await register.metrics());
-    }
-}
-/**
- * Metrics registered
- */
-PrometheusService.requestMetricsRegistered = false;
-/**
- * Metrics registered
- */
-PrometheusService.nodeMetricsRegistered = false;
-//# sourceMappingURL=prometheus.js.map

package/lib/services/prometheus.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"prometheus.js","sourceRoot":"","sources":["../../src/services/prometheus.ts"],"names":[],"mappings":"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"}

package/lib/services/prometheus.spec.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/services/prometheus.spec.js

@@ -1,57 +0,0 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    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;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-import { suite, test } from "@testdeck/mocha";
-import * as assert from "assert";
-import axios from "axios";
-import { Histogram } from "prom-client";
-import { WebdaTest } from "../test.js";
-import { HttpContext } from "../utils/httpcontext.js";
-import { PrometheusService } from "./prometheus.js";
-let PrometheusTest = class PrometheusTest extends WebdaTest {
-    async sideServe() {
-        let service = new PrometheusService(this.webda, "", {
-            portNumber: 9090,
-            includeNodeMetrics: false,
-            includeRequestMetrics: false
-        });
-        try {
-            await service.resolve().init();
-            // Should be listen on 9090 now
-            let res = await axios.get("http://localhost:9090/metrics");
-            assert.ok(res.data.includes("webda_filequeue_messages_pending"));
-            await assert.rejects(() => axios.get("http://localhost:9090/metrics2"), /Request failed with status code 404/);
-        }
-        finally {
-            service.http?.close();
-        }
-    }
-    async normal() {
-        let ctx = await this.newContext("toto");
-        ctx.setHttpContext(new HttpContext("localhost", "GET", "/version"));
-        await this.webda.emitSync("Webda.Request", { context: ctx });
-        await this.webda.emitSync("Webda.Result", { context: ctx });
-        ctx.setHttpContext(new HttpContext("localhost", "PUT", "/version"));
-        await this.webda.emitSync("Webda.Request", { context: ctx });
-        await this.webda.emitSync("Webda.Result", { context: ctx });
-        await this.execute(ctx, "localhost", "GET", "/metrics");
-        await this.webda.emitSync("Webda.Request", { context: ctx });
-        await this.webda.emitSync("Webda.Result", { context: ctx });
-        this.webda.getGlobalParams().metrics = false;
-        // Fake metrics should return 0 for timer
-        assert.strictEqual(this.webda.getMetric(Histogram, { name: "test", help: "fake" }).startTimer()(), 0);
-    }
-};
-__decorate([
-    test
-], PrometheusTest.prototype, "sideServe", null);
-__decorate([
-    test
-], PrometheusTest.prototype, "normal", null);
-PrometheusTest = __decorate([
-    suite
-], PrometheusTest);
-//# sourceMappingURL=prometheus.spec.js.map

package/lib/services/prometheus.spec.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"prometheus.spec.js","sourceRoot":"","sources":["../../src/services/prometheus.spec.ts"],"names":[],"mappings":"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"}

package/lib/services/resource.d.ts

@@ -1,87 +0,0 @@
-import { WebContext } from "../utils/context.js";
-import { Service, ServiceParameters } from "./service.js";
-/**
- * ResourceService parameters
- */
-export declare class ResourceServiceParameters extends ServiceParameters {
-    /**
-     * URL on which to serve the content
-     *
-     * @default "resources"
-     */
-    url?: string;
-    /**
-     * Folder to server
-     *
-     * @default "." + url
-     */
-    folder?: string;
-    /**
-     * Add the / root to redirect to /{url}
-     *
-     * @default false
-     */
-    rootRedirect?: boolean;
-    /**
-     * Index file
-     *
-     * @default index.html
-     */
-    index?: string;
-    /**
-     * Return the index file for any unfound resource
-     * Useful for single page application
-     *
-     * @default true
-     */
-    indexFallback?: boolean;
-    /**
-     * Cache control header to set
-     * @default "public, max-age=31536000"
-     */
-    cacheControl?: string;
-    constructor(params: any);
-}
-/**
- * This service expose a folder as web
- *
- * It is the same as `static` on `express`
- *
- * @category CoreServices
- * @WebdaModda
- */
-export default class ResourceService<T extends ResourceServiceParameters = ResourceServiceParameters> extends Service<T> {
-    /**
-     * Resolved path to the folder to serve
-     */
-    _resolved: string;
-    /**
-     * If serving just one file
-     */
-    fileOnly: boolean;
-    /**
-     * Load the parameters for a service
-     */
-    loadParameters(params: any): ResourceServiceParameters;
-    /**
-     * Resolve resource folder
-     */
-    computeParameters(): void;
-    /**
-     * Init the routes
-     */
-    initRoutes(): void;
-    /**
-     * Handle / request and redirect to the resources folder
-     *
-     * @param ctx
-     */
-    _redirect(ctx: WebContext): void;
-    /**
-     * Serve the folder by itself, doing the mime detection
-     *
-     * @param ctx
-     */
-    _serve(ctx: WebContext): Promise<unknown>;
-}
-export { ResourceService };