@webda/core 1.2.1 → 1.6.0-beta.0

package/lib/utils/waiter.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WaitFor = exports.WaitExponentialDelay = exports.WaitLinearDelay = void 0;
+exports.CancelableLoopPromise = exports.CancelablePromise = exports.WaitFor = exports.WaitDelayerFactories = exports.WaitExponentialDelay = exports.WaitLinearDelay = void 0;
 const uuid_1 = require("uuid");
 /**
  * Return a delayer that always wait for the same amount of time
@@ -29,6 +29,40 @@ function WaitExponentialDelay(pause) {
     return (retries) => Math.pow(2, retries - 1) * pause;
 }
 exports.WaitExponentialDelay = WaitExponentialDelay;
+/**
+ * Registry for DelayerFactory
+ */
+class WaitDelayerFactories {
+    /**
+     * Add a delayer
+     * @param type
+     * @param delayer
+     */
+    static registerFactory(type, delayer) {
+        WaitDelayerFactories.registry[type] = delayer;
+    }
+    /**
+     * Return a registered delayer
+     * @param type
+     * @returns
+     */
+    static getFactory(type) {
+        return WaitDelayerFactories.registry[type];
+    }
+    /**
+     *
+     * @param definition to get delayer from
+     * @returns
+     */
+    static get(definition = { interval: 1000, type: "exponential" }) {
+        return WaitDelayerFactories.getFactory(definition.type)(definition.interval);
+    }
+}
+exports.WaitDelayerFactories = WaitDelayerFactories;
+WaitDelayerFactories.registry = {
+    linear: WaitLinearDelay,
+    exponential: WaitExponentialDelay
+};
 /**
  * Wait for an operation to end
  *
@@ -49,11 +83,11 @@ exports.WaitExponentialDelay = WaitExponentialDelay;
 function WaitFor(callback, retries, title, logger, delayer) {
     return __awaiter(this, void 0, void 0, function* () {
         if (!delayer) {
-            delayer = WaitExponentialDelay(1000);
+            delayer = WaitDelayerFactories.get();
         }
         return new Promise((mainResolve, mainReject) => __awaiter(this, void 0, void 0, function* () {
             let tries = 0;
-            let uuid = uuid_1.v4();
+            let uuid = (0, uuid_1.v4)();
             if (logger) {
                 logger.logProgressStart(uuid, retries, title);
             }
@@ -77,4 +111,53 @@ function WaitFor(callback, retries, title, logger, delayer) {
     });
 }
 exports.WaitFor = WaitFor;
+/**
+ * Return a promise that can be cancelled
+ */
+class CancelablePromise extends Promise {
+    constructor(callback = () => {
+        // noop
+    }, onCancel = undefined) {
+        let localReject;
+        super((resolve, reject) => {
+            localReject = () => __awaiter(this, void 0, void 0, function* () {
+                if (onCancel) {
+                    yield onCancel();
+                }
+                reject("Cancelled");
+            });
+            callback(resolve, reject);
+        });
+        this.cancel = localReject;
+    }
+}
+exports.CancelablePromise = CancelablePromise;
+/**
+ * Create a promise that will loop on the same callback until cancelled
+ */
+class CancelableLoopPromise extends Promise {
+    constructor(callback, onCancel = undefined) {
+        let localReject;
+        let shouldRun = true;
+        super(resolve => {
+            localReject = () => __awaiter(this, void 0, void 0, function* () {
+                if (onCancel) {
+                    yield onCancel();
+                }
+                shouldRun = false;
+            });
+            let loop = () => {
+                if (shouldRun) {
+                    return callback(localReject).then(loop);
+                }
+            };
+            resolve(callback(localReject).then(loop));
+        });
+        this.cancel = localReject;
+    }
+    static get [Symbol.species]() {
+        return Promise;
+    }
+}
+exports.CancelableLoopPromise = CancelableLoopPromise;
 //# sourceMappingURL=waiter.js.map

package/lib/utils/waiter.js.map

@@ -1 +1 @@
-{"version":3,"file":"waiter.js","sourceRoot":"","sources":["../../src/utils/waiter.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,+BAAoC;AAOpC;;;;GAIG;AACH,SAAgB,eAAe,CAAC,KAAa;IAC3C,OAAO,GAAG,EAAE,CAAC,KAAK,CAAC;AACrB,CAAC;AAFD,0CAEC;AAED;;;;GAIG;AACH,SAAgB,oBAAoB,CAAC,KAAa;IAChD,OAAO,CAAC,OAAe,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC;AAC/D,CAAC;AAFD,oDAEC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,SAAsB,OAAO,CAC3B,QAA4F,EAC5F,OAAe,EACf,KAAa,EACb,MAAe,EACf,OAAqB;;QAErB,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC;SACtC;QACD,OAAO,IAAI,OAAO,CAAI,CAAO,WAAW,EAAE,UAAU,EAAE,EAAE;YACtD,IAAI,KAAK,GAAW,CAAC,CAAC;YACtB,IAAI,IAAI,GAAG,SAAM,EAAE,CAAC;YACpB,IAAI,MAAM,EAAE;gBACV,MAAM,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;aAC/C;YACD,OAAO,OAAO,GAAG,KAAK,EAAE,EAAE;gBACxB,IAAI,KAAK,IAAI,MAAM,EAAE;oBACnB,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,GAAG,KAAK,GAAG,GAAG,GAAG,OAAO,GAAG,GAAG,EAAE,KAAK,CAAC,CAAC;iBAC/D;gBACD,IAAI,MAAM,EAAE;oBACV,MAAM,CAAC,iBAAiB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;iBACvC;gBACD,IAAI,MAAM,QAAQ,CAAC,WAAW,EAAE,UAAU,CAAC,EAAE;oBAC3C,IAAI,MAAM,EAAE;wBACV,MAAM,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;qBACnC;oBACD,OAAO;iBACR;gBACD,MAAM,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;aACzE;YACD,UAAU,CAAC,4BAA4B,GAAG,KAAK,CAAC,CAAC;QACnD,CAAC,CAAA,CAAC,CAAC;IACL,CAAC;CAAA;AAjCD,0BAiCC"}
+{"version":3,"file":"waiter.js","sourceRoot":"","sources":["../../src/utils/waiter.ts"],"names":[],"mappings":"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"}

package/lib/utils/waiter.spec.js

@@ -21,25 +21,42 @@ const assert = require("assert");
 const waiter_1 = require("./waiter");
 const sinon = require("sinon");
 let WaiterTest = class WaiterTest {
+    cancellablePromise() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let promise = new waiter_1.CancelablePromise();
+            yield promise.cancel();
+            yield assert.rejects(() => promise, /Cancelled/);
+            let callback = false;
+            promise = new waiter_1.CancelablePromise(() => { }, () => __awaiter(this, void 0, void 0, function* () {
+                callback = true;
+            }));
+            yield promise.cancel();
+            yield assert.rejects(() => promise, /Cancelled/);
+            assert.strictEqual(callback, true);
+        });
+    }
     testWaitFor() {
         return __awaiter(this, void 0, void 0, function* () {
             let logger = new logger_1.Logger(undefined, undefined);
             let consoleSpy = sinon.stub(logger, "log");
             sinon.stub(logger, "logProgressStart");
             sinon.stub(logger, "logProgressUpdate");
+            waiter_1.WaitDelayerFactories.registerFactory("static", () => {
+                return t => t;
+            });
             try {
-                yield assert.rejects(() => __awaiter(this, void 0, void 0, function* () { return yield waiter_1.WaitFor(() => __awaiter(this, void 0, void 0, function* () { return false; }), 3, "title", logger, waiter_1.WaitExponentialDelay(1)); }), /Timeout while waiting for title/g);
+                yield assert.rejects(() => __awaiter(this, void 0, void 0, function* () { return yield (0, waiter_1.WaitFor)(() => __awaiter(this, void 0, void 0, function* () { return false; }), 3, "title", logger, (0, waiter_1.WaitExponentialDelay)(1)); }), /Timeout while waiting for title/g);
                 assert.strictEqual(consoleSpy.callCount, 3);
                 assert.strictEqual(consoleSpy.calledWith("DEBUG", "[1/3]", "title"), true);
                 assert.strictEqual(consoleSpy.calledWith("DEBUG", "[2/3]", "title"), true);
                 assert.strictEqual(consoleSpy.calledWith("DEBUG", "[3/3]", "title"), true);
                 consoleSpy.resetHistory();
-                let res = yield waiter_1.WaitFor((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+                let res = yield (0, waiter_1.WaitFor)((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
                     if (consoleSpy.callCount === 2) {
                         resolve({ myobject: "test" });
                         return true;
                     }
-                }), 3, "title", logger, waiter_1.WaitLinearDelay(1));
+                }), 3, "title", logger, (0, waiter_1.WaitLinearDelay)(1));
                 assert.strictEqual(consoleSpy.callCount, 2);
                 assert.strictEqual(consoleSpy.calledWith("DEBUG", "[1/3]", "title"), true);
                 assert.strictEqual(consoleSpy.calledWith("DEBUG", "[2/3]", "title"), true);
@@ -47,7 +64,7 @@ let WaiterTest = class WaiterTest {
                 assert.deepStrictEqual(res, { myobject: "test" });
                 let time = Date.now();
                 consoleSpy.resetHistory();
-                yield waiter_1.WaitFor((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+                yield (0, waiter_1.WaitFor)((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
                     if (consoleSpy.callCount === 3) {
                         resolve({ myobject: "test" });
                         return true;
@@ -55,16 +72,43 @@ let WaiterTest = class WaiterTest {
                 }), 3, "title", logger);
                 let elapsed = Date.now() - time;
                 assert.strictEqual(elapsed > 2500 && elapsed < 3500, true, `Should have a duration close to 3 seconds, got: ${elapsed}ms`);
+                // COV test
+                yield (0, waiter_1.WaitFor)((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+                    resolve();
+                    return true;
+                }), 3);
+                yield (0, waiter_1.WaitFor)((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+                    resolve();
+                    return true;
+                }), 3, "title");
             }
             finally {
                 consoleSpy.restore();
             }
         });
     }
+    loopPromise() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let i = 0;
+            yield new waiter_1.CancelableLoopPromise((canceller) => __awaiter(this, void 0, void 0, function* () {
+                i++;
+                if (i > 10) {
+                    yield canceller();
+                }
+            }), () => __awaiter(this, void 0, void 0, function* () { }));
+            assert.strictEqual(i, 11);
+        });
+    }
 };
+__decorate([
+    mocha_1.test
+], WaiterTest.prototype, "cancellablePromise", null);
 __decorate([
     mocha_1.test
 ], WaiterTest.prototype, "testWaitFor", null);
+__decorate([
+    mocha_1.test
+], WaiterTest.prototype, "loopPromise", null);
 WaiterTest = __decorate([
     mocha_1.suite
 ], WaiterTest);

package/lib/utils/waiter.spec.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webda/core",
-  "version": "1.2.1",
+  "version": "1.6.0-beta.0",
   "description": "Expose API with Lambda",
   "keywords": [
     "aws",
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@types/json-schema": "^7.0.8",
-    "@webda/workout": "^1.2.1",
+    "@webda/workout": "^1.6.0-beta.0",
     "accept-language": "^3.0.18",
     "ajv": "^8.6.2",
     "bcryptjs": "^2.4.3",
@@ -29,6 +29,7 @@
     "deepmerge": "^4.2.2",
     "email-templates": "^8.0.7",
     "fs-finder": "^1.8.1",
+    "glob": "^7.1.7",
     "global": "^4.4.0",
     "jsonpath": "^1.1.1",
     "jsonwebtoken": "^8.5.1",
@@ -37,7 +38,7 @@
     "mustache": "^4.2.0",
     "node-cron": "^3.0.0",
     "nodemailer": "^6.6.3",
-    "openapi-types": "^9.1.0",
+    "openapi-types": "^10.0.0",
     "sanitize-html": "^2.4.0",
     "semver": "^7.3.5",
     "ts-method-cache": "^3.3.1",
@@ -48,18 +49,16 @@
   "devDependencies": {
     "@istanbuljs/nyc-config-typescript": "^1.0.1",
     "@testdeck/mocha": "^0.1.2",
-    "@types/node": "^16.4.2",
+    "@types/node": "14.0.0",
+    "axios": "^0.24.0",
     "fs-extra": "^10.0.0",
-    "glob": "^7.1.7",
-    "istanbul": "^0.4.5",
     "mocha": "^9.0.2",
     "nyc": "^15.1.0",
     "prettier": "^2.3.2",
-    "remap-istanbul": "^0.13.0",
-    "sinon": "^11.1.1",
+    "sinon": "^12.0.1",
     "source-map-support": "^0.5.19",
     "ts-node": "^10.1.0",
-    "typescript": "~4.2.4"
+    "typescript": "~4.5.2"
   },
   "files": [
     "lib",
@@ -71,7 +70,13 @@
     "reporter": [
       "html",
       "lcov",
-      "json"
+      "json",
+      "text"
+    ],
+    "exclude": [
+      "src/test.ts",
+      "**/*.spec.ts",
+      "test/**/*"
     ]
   },
   "homepage": "https://webda.io",
@@ -81,5 +86,5 @@
   "webda": {
     "namespace": "Webda"
   },
-  "gitHead": "a547205d0e2033b073db5558521120c739366dbc"
+  "gitHead": "259be61f3760c5c56a88c2f870ac608908cf4e4e"
 }

package/test/badapp/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "badapp",
+  "version": "0.1.0"
+}

package/test/badapp/webda.config.json

@@ -0,0 +1 @@
+BAD APP FILE

package/test/cachedapp/webda.config.json

@@ -0,0 +1,7 @@
+{
+  "version": 2,
+  "module": {},
+  "cachedModules": {
+    "sources": ["./test/moddas/fakeservice.js", "./test/models/task.js"]
+  }
+}

package/test/config-file-no-reload.json

@@ -0,0 +1,70 @@
+{
+  "version": 1,
+  "parameters": {
+    "TEST": "Global",
+    "region": "us-east-1",
+    "website": ["test.webda.io", "test2.webda.io"],
+    "locales": ["es-ES", "en-GB", "fr-FR"],
+    "configurationService": "FileConfigurationService"
+  },
+  "moddas": {
+    "Test/Mailer": {
+      "type": "local",
+      "require": "../test/moddas/debugmailer"
+    },
+    "Test/VoidStore": {
+      "type": "local",
+      "require": "../test/moddas/voidstore"
+    }
+  },
+  "models": {
+    "WebdaTest/Task": "../test/models/task",
+    "WebdaTest/Ident": "../test/models/ident"
+  },
+  "services": {
+    "Authentication": {
+      "successRedirect": "https://webda.io/user.html",
+      "failureRedirect": "/login-error",
+      "providers": {
+        "facebook": {},
+        "email": {
+          "from": "",
+          "subject": "",
+          "html": "",
+          "text": "Test",
+          "mailer": "DefinedMailer",
+          "postValidation": false
+        },
+        "phone": {},
+        "twitter": {},
+        "google": {},
+        "github": {}
+      }
+    },
+    "DefinedMailer": {
+      "type": "Test/Mailer"
+    },
+    "Users": {
+      "type": "MemoryStore"
+    },
+    "Idents": {
+      "type": "MemoryStore"
+    },
+    "FileConfigurationService": {
+      "source": "./my-cnf.json",
+      "default": {
+        "webda": {
+          "services": {
+            "Authentication": {
+              "providers": {
+                "email": {
+                  "text": "Test"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

package/test/config-file-reload.json

@@ -54,7 +54,13 @@
       "default": {
         "webda": {
           "services": {
-            "Authentication.providers.email.text": "Test"
+            "Authentication": {
+              "providers": {
+                "email": {
+                  "text": "Test"
+                }
+              }
+            }
           }
         }
       }

package/test/config-kube-reload.json

@@ -54,7 +54,13 @@
       "default": {
         "webda": {
           "services": {
-            "Authentication.providers.email.text": "Test"
+            "Authentication": {
+              "providers": {
+                "email": {
+                  "text": "Plop0"
+                }
+              }
+            }
           }
         },
         "other": "text",

package/test/config.json

@@ -42,7 +42,13 @@
     },
     "MemoryQueue": {
       "type": "MemoryQueue",
-      "expire": 1
+      "expire": 1,
+      "maxConsumers": 1
+    },
+    "FileQueue": {
+      "type": "FileQueue",
+      "expire": 1,
+      "folder": "./test/data/queue"
     },
     "PriorityEventQueue": {
       "type": "MemoryQueue",
@@ -54,6 +60,7 @@
     },
     "Authentication": {
       "successRedirect": "https://webda.io/user.html",
+      "registerRedirect": "https://webda.io/register.html",
       "failureRedirect": "/login-error",
       "email": {
         "from": "",
@@ -73,16 +80,25 @@
         "transport": "ses"
       }
     },
+    "MemoryIdentsIndexer": {
+      "type": "Webda/Aggregator",
+      "source": "MemoryIdents",
+      "target": "MemoryAggregators",
+      "fields": "type"
+    },
+    "MemoryAggregators": {
+      "type": "MemoryStore"
+    },
+    "MemoryIdentsMapper": {
+      "type": "Webda/Mapper",
+      "source": "MemoryIdents",
+      "targetAttribute": "idents",
+      "target": "MemoryUsers",
+      "attribute": "_user",
+      "fields": "type,_lastUpdate",
+      "cascade": true
+    },
     "MemoryIdents": {
-      "map": {
-        "MemoryUsers": {
-          "key": "_user",
-          "target": "idents",
-          "fields": "type,_lastUpdate",
-          "cascade": true
-        }
-      },
-      "index": ["type", "_lastUpdate"],
       "asyncDelete": true,
       "expose": {
         "url": "/memory/idents"
@@ -96,16 +112,23 @@
       },
       "type": "MemoryStore"
     },
+    "IdentsMapper": {
+      "type": "Webda/Mapper",
+      "source": "Idents",
+      "targetAttribute": "idents",
+      "target": "Users",
+      "attribute": "_user",
+      "fields": "type,_lastUpdate,counter",
+      "cascade": true
+    },
+    "IdentsIndexer": {
+      "type": "Webda/Aggregator",
+      "source": "Idents",
+      "target": "MemoryAggregators",
+      "fields": "type,_lastUpdate",
+      "key": "idents-index"
+    },
     "Idents": {
-      "map": {
-        "Users": {
-          "key": "_user",
-          "target": "idents",
-          "fields": "type,_lastUpdate",
-          "cascade": true
-        }
-      },
-      "index": ["type", "_lastUpdate"],
       "asyncDelete": true,
       "expose": {
         "restrict": {
@@ -124,7 +147,7 @@
         "url": "/users"
       },
       "type": "FileStore",
-      "folder": "./test/data/users",
+      "folder": "./test/data/idents",
       "model": "Webda/User"
     },
     "Tasks": {
@@ -137,7 +160,8 @@
       "type": "FileBinary",
       "folder": "./test/data/binaries",
       "map": {
-        "users": ["images"]
+        "users": ["images"],
+        "notexisting": ["images"]
       },
       "expose": {
         "url": "/binary"

package/test/config.old-default.json

@@ -62,14 +62,6 @@
           "type": "Test/Mailer"
         },
         "MemoryIdents": {
-          "map": {
-            "MemoryUsers": {
-              "key": "user",
-              "target": "idents",
-              "fields": "type",
-              "cascade": true
-            }
-          },
           "asyncDelete": true,
           "expose": {
             "restrict": {
@@ -88,14 +80,6 @@
           "type": "MemoryStore"
         },
         "Idents": {
-          "map": {
-            "Users": {
-              "key": "user",
-              "target": "idents",
-              "fields": "type",
-              "cascade": true
-            }
-          },
           "asyncDelete": true,
           "expose": {
             "restrict": {

package/test/config.old.json

@@ -64,14 +64,6 @@
           "type": "Test/Mailer"
         },
         "MemoryIdents": {
-          "map": {
-            "MemoryUsers": {
-              "key": "user",
-              "target": "idents",
-              "fields": "type",
-              "cascade": true
-            }
-          },
           "asyncDelete": true,
           "expose": {
             "restrict": {
@@ -90,14 +82,6 @@
           "type": "MemoryStore"
         },
         "Idents": {
-          "map": {
-            "Users": {
-              "key": "user",
-              "target": "idents",
-              "fields": "type",
-              "cascade": true
-            }
-          },
           "asyncDelete": true,
           "expose": {
             "restrict": {

package/test/deployments/invalid.json

@@ -0,0 +1 @@
+INVALID DEPLOYMENT

package/test/moddas/fakeservice.js

@@ -0,0 +1,5 @@
+const Webda = require("../../lib/index.js");
+
+class FakeService extends Webda.Service {}
+
+module.exports = FakeService;

package/test/models/ident.js

@@ -6,37 +6,33 @@ const WebdaIdent = require("../../lib/index.js").Ident;
  * @class
  */
 class Ident extends WebdaIdent {
-
   static getActions() {
     return {
-      'plop': {},
-      'index': {
+      plop: {},
+      index: {
         global: true,
-        method: 'GET'
+        methods: ["GET"]
       },
-      'yop': {
-        method: ['GET', 'POST']
+      yop: {
+        methods: ["GET", "POST"]
       }
     };
   }
 
   _yop() {
-
+    return "youpi";
   }
 
-  canAct(ctx, action) {
-
-  }
+  canAct(ctx, action) {}
 
   static _index(ctx) {
-    ctx.write('indexer');
+    ctx.write("indexer");
   }
 
   _plop(ctx) {
-    this._plop = true;
-    ctx.write(this);
+    ctx.write({ _plop: true });
     return Promise.resolve();
   }
 }
 
-module.exports = Ident
+module.exports = Ident;