@webda/core 2.0.0-beta.3 → 2.1.0

package/lib/services/filebinary.spec.js

@@ -1,40 +1,27 @@
-"use strict";
 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;
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FileBinaryTest = void 0;
-const mocha_1 = require("@testdeck/mocha");
-const assert = require("assert");
-const fs = require("fs");
-const fs_extra_1 = require("fs-extra");
-const stream_1 = require("stream");
-const binary_1 = require("./binary");
-const cloudbinary_spec_1 = require("./cloudbinary.spec");
-class FaultyBinaryFile extends binary_1.BinaryFile {
-    get() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const stream = new stream_1.Readable();
-            stream._read = () => {
-                stream.emit("error", new Error("Faulty stream"));
-            };
-            return stream;
-        });
+import { suite, test } from "@testdeck/mocha";
+import * as assert from "assert";
+import * as fs from "fs";
+import pkg from "fs-extra";
+import { Readable } from "stream";
+import { BinaryFile, MemoryBinaryFile } from "./binary.js";
+import { CloudBinaryTest } from "./cloudbinary.spec.js";
+const { removeSync } = pkg;
+class FaultyBinaryFile extends BinaryFile {
+    async get() {
+        const stream = new Readable();
+        stream._read = () => {
+            stream.emit("error", new Error("Faulty stream"));
+        };
+        return stream;
     }
 }
-let FileBinaryTest = class FileBinaryTest extends cloudbinary_spec_1.CloudBinaryTest {
+let FileBinaryTest = class FileBinaryTest extends CloudBinaryTest {
     initMap() {
         let binary = this.getBinary();
         binary.initMap(undefined);
@@ -46,21 +33,19 @@ let FileBinaryTest = class FileBinaryTest extends cloudbinary_spec_1.CloudBinary
             MemoryIdents: "idents"
         });
     }
-    _getFile() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let binary = this.getBinary();
-            let ctx = yield this.newContext();
-            ctx.getHttpContext().setBody("plop");
-            ctx.getHttpContext().headers = { "content-type": "text/plain" };
-            assert.deepStrictEqual(yield binary._getFile(ctx), new binary_1.MemoryBinaryFile(Buffer.from("plop"), {
-                challenge: undefined,
-                hash: undefined,
-                metadata: {},
-                mimetype: "text/plain",
-                name: "",
-                size: 4
-            }));
-        });
+    async _getFile() {
+        let binary = this.getBinary();
+        let ctx = await this.newContext();
+        ctx.getHttpContext().setBody("plop");
+        ctx.getHttpContext().headers = { "content-type": "text/plain" };
+        assert.deepStrictEqual(await binary._getFile(ctx), new MemoryBinaryFile(Buffer.from("plop"), {
+            challenge: undefined,
+            hash: undefined,
+            metadata: {},
+            mimetype: "text/plain",
+            name: "",
+            size: 4
+        }));
     }
     initRoutes() {
         let binary = this.getBinary();
@@ -70,75 +55,67 @@ let FileBinaryTest = class FileBinaryTest extends cloudbinary_spec_1.CloudBinary
         binary._name = "Binary";
         binary.initRoutes();
     }
-    downloadSignedUrl() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let binary = this.getBinary();
-            let { user1, ctx } = yield this.setupDefault(false);
-            let url = yield binary.getRedirectUrlFromObject(user1.images[0], ctx, 60);
-            assert.notStrictEqual(url, undefined);
-            yield this.execute(ctx, "test.webda.io", "GET", url.substring("http://test.webda.io".length));
-            // c59d?token -> d59d?token
-            yield assert.rejects(() => this.execute(ctx, "test.webda.io", "GET", url.substring("http://test.webda.io".length).replace("c59d?token", "d59d?token")), /403/);
-            yield assert.rejects(() => this.execute(ctx, "test.webda.io", "GET", url.substring("http://test.webda.io".length).replace("eyJhbG", "ezJhbG")), /403/);
-        });
+    async downloadSignedUrl() {
+        let binary = this.getBinary();
+        let { user1, ctx } = await this.setupDefault(false);
+        let url = await binary.getRedirectUrlFromObject(user1.images[0], ctx, 60);
+        assert.notStrictEqual(url, undefined);
+        await this.execute(ctx, "test.webda.io", "GET", url.substring("http://test.webda.io".length));
+        // c59d?token -> d59d?token
+        await assert.rejects(() => this.execute(ctx, "test.webda.io", "GET", url.substring("http://test.webda.io".length).replace("c59d?token", "d59d?token")), /403/);
+        await assert.rejects(() => this.execute(ctx, "test.webda.io", "GET", url.substring("http://test.webda.io".length).replace("eyJhbG", "ezJhbG")), /403/);
     }
-    verifyMapAndStore() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let binary = this.getBinary();
-            let ctx = yield this.newContext();
-            ctx.setPathParameters({ store: "Store", property: "images" });
-            assert.throws(() => binary._verifyMapAndStore(ctx), /404/);
-            ctx.setPathParameters({ store: "users", property: "images" });
-            assert.strictEqual(binary._verifyMapAndStore(ctx), this.getService("users"));
-            ctx.setPathParameters({ store: "users", property: "images2" });
-            assert.throws(() => binary._verifyMapAndStore(ctx), /404/);
-            ctx.setPathParameters({ store: "notexisting", property: "images" });
-            assert.throws(() => binary._verifyMapAndStore(ctx), /404/);
-        });
+    async verifyMapAndStore() {
+        let binary = this.getBinary();
+        let ctx = await this.newContext();
+        ctx.setPathParameters({ store: "Store", property: "images" });
+        assert.throws(() => binary._verifyMapAndStore(ctx), /404/);
+        ctx.setPathParameters({ store: "users", property: "images" });
+        assert.strictEqual(binary._verifyMapAndStore(ctx), this.getService("users"));
+        ctx.setPathParameters({ store: "users", property: "images2" });
+        assert.throws(() => binary._verifyMapAndStore(ctx), /404/);
+        ctx.setPathParameters({ store: "notexisting", property: "images" });
+        assert.throws(() => binary._verifyMapAndStore(ctx), /404/);
     }
     computeParameters() {
         let binary = this.getBinary();
-        (0, fs_extra_1.removeSync)(binary.getParameters().folder);
+        removeSync(binary.getParameters().folder);
         binary.computeParameters();
         assert.ok(fs.existsSync(binary.getParameters().folder));
     }
-    challenge() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.testChallenge();
-        });
+    async challenge() {
+        await this.testChallenge();
     }
-    badTokens() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let binary = this.getBinary();
-            let ctx = yield this.newContext();
-            let { hash } = yield new binary_1.MemoryBinaryFile(Buffer.from("PLOP"), {}).getHashes();
-            let token = "badt";
-            ctx.setPathParameters({
-                hash,
-                token
-            });
-            ctx.getHttpContext().setBody("PLOP");
-            yield assert.rejects(() => binary.storeBinary(ctx), /403/);
-            token = yield this.webda.getCrypto().jwtSign({ hash: "PLOP2" });
-            ctx.setPathParameters({
-                hash,
-                token
-            });
-            yield assert.rejects(() => binary.storeBinary(ctx), /403/);
-            // expired token
-            token = yield this.webda.getCrypto().jwtSign({ hash, exp: Math.floor(Date.now() / 1000) - 60 * 60 });
-            ctx.setPathParameters({
-                hash,
-                token
-            });
-            yield assert.rejects(() => binary.storeBinary(ctx), /403/);
-            token = yield this.webda.getCrypto().jwtSign({ hash });
-            ctx.setPathParameters({
-                hash,
-                token
-            });
-            yield assert.rejects(() => binary.storeBinary(ctx), /412/);
+    async badTokens() {
+        let binary = this.getBinary();
+        let ctx = await this.newContext();
+        let { hash } = await new MemoryBinaryFile(Buffer.from("PLOP"), {}).getHashes();
+        let token = "badt";
+        ctx.setPathParameters({
+            hash,
+            token
+        });
+        ctx.getHttpContext().setBody("PLOP");
+        await assert.rejects(() => binary.storeBinary(ctx), /403/);
+        token = await this.webda.getCrypto().jwtSign({ hash: "PLOP2" });
+        ctx.setPathParameters({
+            hash,
+            token
+        });
+        await assert.rejects(() => binary.storeBinary(ctx), /403/);
+        // expired token
+        token = await this.webda.getCrypto().jwtSign({ hash, exp: Math.floor(Date.now() / 1000) - 60 * 60 });
+        ctx.setPathParameters({
+            hash,
+            token
         });
+        await assert.rejects(() => binary.storeBinary(ctx), /403/);
+        token = await this.webda.getCrypto().jwtSign({ hash });
+        ctx.setPathParameters({
+            hash,
+            token
+        });
+        await assert.rejects(() => binary.storeBinary(ctx), /412/);
     }
     cleanNonExisting() {
         let binary = this.getBinary();
@@ -153,39 +130,52 @@ let FileBinaryTest = class FileBinaryTest extends cloudbinary_spec_1.CloudBinary
         });
         assert.rejects(() => file.getHashes(), /Faulty stream/);
     }
+    cov() {
+        let binary = this.getBinary();
+        try {
+            binary._touch("./touch.txt");
+            binary._touch("./touch.txt");
+        }
+        finally {
+            fs.unlinkSync("./touch.txt");
+        }
+    }
 };
 __decorate([
-    mocha_1.test
+    test
 ], FileBinaryTest.prototype, "initMap", null);
 __decorate([
-    mocha_1.test
+    test
 ], FileBinaryTest.prototype, "_getFile", null);
 __decorate([
-    mocha_1.test
+    test
 ], FileBinaryTest.prototype, "initRoutes", null);
 __decorate([
-    mocha_1.test
+    test
 ], FileBinaryTest.prototype, "downloadSignedUrl", null);
 __decorate([
-    mocha_1.test
+    test
 ], FileBinaryTest.prototype, "verifyMapAndStore", null);
 __decorate([
-    mocha_1.test
+    test
 ], FileBinaryTest.prototype, "computeParameters", null);
 __decorate([
-    mocha_1.test
+    test
 ], FileBinaryTest.prototype, "challenge", null);
 __decorate([
-    mocha_1.test
+    test
 ], FileBinaryTest.prototype, "badTokens", null);
 __decorate([
-    mocha_1.test
+    test
 ], FileBinaryTest.prototype, "cleanNonExisting", null);
 __decorate([
-    mocha_1.test
+    test
 ], FileBinaryTest.prototype, "faultyBinary", null);
+__decorate([
+    test
+], FileBinaryTest.prototype, "cov", null);
 FileBinaryTest = __decorate([
-    mocha_1.suite
+    suite
 ], FileBinaryTest);
-exports.FileBinaryTest = FileBinaryTest;
+export { FileBinaryTest };
 //# sourceMappingURL=filebinary.spec.js.map

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

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

package/lib/services/fileconfiguration.d.ts

@@ -1,4 +1,4 @@
-import ConfigurationService, { ConfigurationServiceParameters } from "./configuration";
+import ConfigurationService, { ConfigurationServiceParameters } from "./configuration.js";
 /**
  * Allow for dynamic configuration from a file
  * @WebdaModda Webda/FileConfiguration

package/lib/services/fileconfiguration.js

@@ -1,61 +1,42 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FileConfigurationService = void 0;
-const fs = require("fs");
-const __1 = require("..");
-const core_1 = require("../core");
-const configuration_1 = require("./configuration");
+import * as fs from "fs";
+import { WebdaError } from "../core.js";
+import { JSONUtils } from "../index.js";
+import ConfigurationService from "./configuration.js";
 /**
  * Allow for dynamic configuration from a file
  * @WebdaModda Webda/FileConfiguration
  */
-class FileConfigurationService extends configuration_1.default {
+export class FileConfigurationService extends ConfigurationService {
     /** @ignore */
-    init() {
-        return __awaiter(this, void 0, void 0, function* () {
-            // Do not call super as we diverged
-            if (!this.parameters.source) {
-                throw new core_1.WebdaError("FILE_CONFIGURATION_SOURCE_MISSING", "Need a source for FileConfigurationService");
-            }
-            // Load it from where it should be
-            this.parameters.source = this._webda.getAppPath(this.parameters.source);
-            if (!fs.existsSync(this.parameters.source)) {
-                throw new core_1.WebdaError("FILE_CONFIGURATION_SOURCE_MISSING", "Need a source for FileConfigurationService");
-            }
-            fs.watchFile(this.parameters.source, this.checkUpdate.bind(this));
-            // Add webda info
-            this.watch("$.webda.services", this._webda.reinit.bind(this._webda));
-            yield this.checkUpdate();
-            return this;
-        });
+    async init() {
+        // Do not call super as we diverged
+        if (!this.parameters.source) {
+            throw new WebdaError("FILE_CONFIGURATION_SOURCE_MISSING", "Need a source for FileConfigurationService");
+        }
+        // Load it from where it should be
+        this.parameters.source = this._webda.getAppPath(this.parameters.source);
+        if (!fs.existsSync(this.parameters.source)) {
+            throw new WebdaError("FILE_CONFIGURATION_SOURCE_MISSING", "Need a source for FileConfigurationService");
+        }
+        fs.watchFile(this.parameters.source, this.checkUpdate.bind(this));
+        // Add webda info
+        this.watch("$.webda.services", this._webda.reinit.bind(this._webda));
+        await this.checkUpdate();
+        return this;
     }
     /**
      * Load the JSON from source defined file
      * @override
      */
-    loadConfiguration() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return __1.JSONUtils.loadFile(this.parameters.source);
-        });
+    async loadConfiguration() {
+        return JSONUtils.loadFile(this.parameters.source);
     }
     /**
      * Read the file and store it
      */
-    initConfiguration() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.parameters.source = this._webda.getAppPath(this.parameters.source);
-            return this.loadAndStoreConfiguration();
-        });
+    async initConfiguration() {
+        this.parameters.source = this._webda.getAppPath(this.parameters.source);
+        return this.loadAndStoreConfiguration();
     }
 }
-exports.FileConfigurationService = FileConfigurationService;
 //# sourceMappingURL=fileconfiguration.js.map

package/lib/services/fileconfiguration.js.map

@@ -1 +1 @@
-{"version":3,"file":"fileconfiguration.js","sourceRoot":"","sources":["../../src/services/fileconfiguration.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yBAAyB;AACzB,0BAA+B;AAC/B,kCAAqC;AACrC,mDAAuF;AAEvF;;;GAGG;AACH,MAAa,wBAEX,SAAQ,uBAAuB;IAC/B,cAAc;IACR,IAAI;;YACR,mCAAmC;YACnC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;gBAC3B,MAAM,IAAI,iBAAU,CAAC,mCAAmC,EAAE,4CAA4C,CAAC,CAAC;aACzG;YAED,kCAAkC;YAClC,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACxE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;gBAC1C,MAAM,IAAI,iBAAU,CAAC,mCAAmC,EAAE,4CAA4C,CAAC,CAAC;aACzG;YAED,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAElE,iBAAiB;YACjB,IAAI,CAAC,KAAK,CAAC,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YAErE,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;IAED;;;OAGG;IACa,iBAAiB;;YAC/B,OAAO,aAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACpD,CAAC;KAAA;IAED;;OAEG;IACG,iBAAiB;;YACrB,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACxE,OAAO,IAAI,CAAC,yBAAyB,EAAE,CAAC;QAC1C,CAAC;KAAA;CACF;AAxCD,4DAwCC"}
+{"version":3,"file":"fileconfiguration.js","sourceRoot":"","sources":["../../src/services/fileconfiguration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,oBAAwD,MAAM,iBAAiB,CAAC;AAEvF;;;GAGG;AACH,MAAM,OAAO,wBAEX,SAAQ,oBAAuB;IAC/B,cAAc;IACd,KAAK,CAAC,IAAI;QACR,mCAAmC;QACnC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;YAC3B,MAAM,IAAI,UAAU,CAAC,mCAAmC,EAAE,4CAA4C,CAAC,CAAC;SACzG;QAED,kCAAkC;QAClC,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACxE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;YAC1C,MAAM,IAAI,UAAU,CAAC,mCAAmC,EAAE,4CAA4C,CAAC,CAAC;SACzG;QAED,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAElE,iBAAiB;QACjB,IAAI,CAAC,KAAK,CAAC,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAErE,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;OAGG;IACO,KAAK,CAAC,iBAAiB;QAC/B,OAAO,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IACpD,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,iBAAiB;QACrB,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACxE,OAAO,IAAI,CAAC,yBAAyB,EAAE,CAAC;IAC1C,CAAC;CACF"}