@webda/core 1.6.0-beta.2 → 2.0.0-beta.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 +351 -195
- package/lib/application.js +188 -682
- package/lib/application.js.map +1 -1
- package/lib/application.spec.js +109 -289
- package/lib/application.spec.js.map +1 -1
- package/lib/core.d.ts +108 -214
- package/lib/core.js +169 -71
- package/lib/core.js.map +1 -1
- package/lib/core.spec.js +103 -42
- package/lib/core.spec.js.map +1 -1
- package/lib/index.d.ts +4 -0
- package/lib/index.js +9 -1
- package/lib/index.js.map +1 -1
- package/lib/models/aclmodel.d.ts +3 -1
- package/lib/models/aclmodel.js +6 -3
- package/lib/models/aclmodel.js.map +1 -1
- package/lib/models/aclmodel.spec.js +10 -5
- package/lib/models/aclmodel.spec.js.map +1 -1
- package/lib/models/coremodel.d.ts +11 -18
- package/lib/models/coremodel.js +36 -36
- package/lib/models/coremodel.js.map +1 -1
- package/lib/models/coremodel.spec.js +2 -2
- package/lib/models/coremodel.spec.js.map +1 -1
- package/lib/models/ident.d.ts +3 -3
- package/lib/models/ident.js +2 -1
- package/lib/models/ident.js.map +1 -1
- package/lib/models/ident.spec.js +1 -1
- package/lib/models/ident.spec.js.map +1 -1
- package/lib/models/ownermodel.d.ts +8 -4
- package/lib/models/ownermodel.js +9 -4
- package/lib/models/ownermodel.js.map +1 -1
- package/lib/models/ownermodel.spec.js +1 -1
- package/lib/models/ownermodel.spec.js.map +1 -1
- package/lib/models/rolemodel.js.map +1 -1
- package/lib/models/rolemodel.spec.js +5 -2
- package/lib/models/rolemodel.spec.js.map +1 -1
- package/lib/models/user.d.ts +4 -3
- package/lib/models/user.js +2 -1
- package/lib/models/user.js.map +1 -1
- package/lib/models/user.spec.js +1 -1
- package/lib/models/user.spec.js.map +1 -1
- package/lib/queues/filequeue.d.ts +2 -7
- package/lib/queues/filequeue.js +4 -13
- package/lib/queues/filequeue.js.map +1 -1
- package/lib/queues/filequeue.spec.js +2 -3
- package/lib/queues/filequeue.spec.js.map +1 -1
- package/lib/queues/memoryqueue.d.ts +2 -7
- package/lib/queues/memoryqueue.js +1 -11
- package/lib/queues/memoryqueue.js.map +1 -1
- package/lib/queues/memoryqueue.spec.js +1 -1
- package/lib/queues/memoryqueue.spec.js.map +1 -1
- package/lib/queues/queue.spec.d.ts +1 -1
- package/lib/queues/queue.spec.js +12 -10
- package/lib/queues/queue.spec.js.map +1 -1
- package/lib/queues/queueservice.d.ts +1 -1
- package/lib/queues/queueservice.js +1 -1
- package/lib/queues/queueservice.js.map +1 -1
- package/lib/router.d.ts +48 -2
- package/lib/router.js +78 -51
- package/lib/router.js.map +1 -1
- package/lib/router.spec.js +23 -6
- package/lib/router.spec.js.map +1 -1
- package/lib/services/asyncevents.d.ts +1 -0
- package/lib/services/asyncevents.js +4 -3
- package/lib/services/asyncevents.js.map +1 -1
- package/lib/services/asyncevents.spec.js +2 -2
- package/lib/services/asyncevents.spec.js.map +1 -1
- package/lib/services/authentication.d.ts +39 -11
- package/lib/services/authentication.js +60 -55
- package/lib/services/authentication.js.map +1 -1
- package/lib/services/authentication.spec.js +2 -1
- package/lib/services/authentication.spec.js.map +1 -1
- package/lib/services/binary.d.ts +127 -65
- package/lib/services/binary.js +255 -98
- package/lib/services/binary.js.map +1 -1
- package/lib/services/binary.spec.d.ts +2 -1
- package/lib/services/binary.spec.js +101 -30
- package/lib/services/binary.spec.js.map +1 -1
- package/lib/services/cloudbinary.d.ts +67 -0
- package/lib/services/cloudbinary.js +178 -0
- package/lib/services/cloudbinary.js.map +1 -0
- package/lib/services/cloudbinary.spec.d.ts +13 -0
- package/lib/services/cloudbinary.spec.js +212 -0
- package/lib/services/cloudbinary.spec.js.map +1 -0
- package/lib/services/configuration.d.ts +7 -2
- package/lib/services/configuration.js +6 -5
- package/lib/services/configuration.js.map +1 -1
- package/lib/services/configuration.spec.js +3 -2
- package/lib/services/configuration.spec.js.map +1 -1
- package/lib/services/cron.d.ts +5 -6
- package/lib/services/cron.js +5 -12
- package/lib/services/cron.js.map +1 -1
- package/lib/services/cron.spec.js +3 -4
- package/lib/services/cron.spec.js.map +1 -1
- package/lib/services/debugmailer.d.ts +3 -5
- package/lib/services/debugmailer.js +3 -11
- package/lib/services/debugmailer.js.map +1 -1
- package/lib/services/debugmailer.spec.js +1 -1
- package/lib/services/debugmailer.spec.js.map +1 -1
- package/lib/services/echo.d.ts +3 -7
- package/lib/services/echo.js +1 -11
- package/lib/services/echo.js.map +1 -1
- package/lib/services/echo.spec.js +4 -3
- package/lib/services/echo.spec.js.map +1 -1
- package/lib/services/filebinary.d.ts +40 -16
- package/lib/services/filebinary.js +142 -50
- package/lib/services/filebinary.js.map +1 -1
- package/lib/services/filebinary.spec.d.ts +4 -2
- package/lib/services/filebinary.spec.js +50 -12
- package/lib/services/filebinary.spec.js.map +1 -1
- package/lib/services/fileconfiguration.d.ts +1 -5
- package/lib/services/fileconfiguration.js +3 -12
- package/lib/services/fileconfiguration.js.map +1 -1
- package/lib/services/fileconfiguration.spec.js +2 -2
- package/lib/services/fileconfiguration.spec.js.map +1 -1
- package/lib/services/invitationservice.d.ts +28 -4
- package/lib/services/invitationservice.js +9 -6
- package/lib/services/invitationservice.js.map +1 -1
- package/lib/services/invitationservice.spec.js +4 -3
- package/lib/services/invitationservice.spec.js.map +1 -1
- package/lib/services/kubernetesconfiguration.d.ts +3 -5
- package/lib/services/kubernetesconfiguration.js +7 -14
- package/lib/services/kubernetesconfiguration.js.map +1 -1
- package/lib/services/kubernetesconfiguration.spec.js +5 -5
- package/lib/services/kubernetesconfiguration.spec.js.map +1 -1
- package/lib/services/mailer.d.ts +1 -5
- package/lib/services/mailer.js +1 -10
- package/lib/services/mailer.js.map +1 -1
- package/lib/services/mailer.spec.js +3 -3
- package/lib/services/mailer.spec.js.map +1 -1
- package/lib/services/notificationservice.d.ts +2 -0
- package/lib/services/notificationservice.js +2 -0
- package/lib/services/notificationservice.js.map +1 -1
- package/lib/services/notificationservice.spec.js +2 -2
- package/lib/services/notificationservice.spec.js.map +1 -1
- package/lib/services/oauth.d.ts +8 -6
- package/lib/services/oauth.js +30 -14
- package/lib/services/oauth.js.map +1 -1
- package/lib/services/oauth.spec.js +10 -10
- package/lib/services/oauth.spec.js.map +1 -1
- package/lib/services/resource.d.ts +18 -5
- package/lib/services/resource.js +42 -23
- package/lib/services/resource.js.map +1 -1
- package/lib/services/resource.spec.js +4 -4
- package/lib/services/resource.spec.js.map +1 -1
- package/lib/services/service.d.ts +22 -25
- package/lib/services/service.js +16 -22
- package/lib/services/service.js.map +1 -1
- package/lib/services/service.spec.js +2 -2
- package/lib/services/service.spec.js.map +1 -1
- package/lib/services/version.d.ts +2 -5
- package/lib/services/version.js +1 -10
- package/lib/services/version.js.map +1 -1
- package/lib/services/version.spec.js +1 -1
- package/lib/services/version.spec.js.map +1 -1
- package/lib/stores/aggregator.d.ts +3 -5
- package/lib/stores/aggregator.js +3 -10
- package/lib/stores/aggregator.js.map +1 -1
- package/lib/stores/file.d.ts +15 -8
- package/lib/stores/file.js +21 -18
- package/lib/stores/file.js.map +1 -1
- package/lib/stores/file.spec.d.ts +3 -1
- package/lib/stores/file.spec.js +32 -8
- package/lib/stores/file.spec.js.map +1 -1
- package/lib/stores/mapper.d.ts +1 -5
- package/lib/stores/mapper.js +4 -13
- package/lib/stores/mapper.js.map +1 -1
- package/lib/stores/mapper.spec.js +2 -2
- package/lib/stores/mapper.spec.js.map +1 -1
- package/lib/stores/memory.d.ts +5 -9
- package/lib/stores/memory.js +5 -17
- package/lib/stores/memory.js.map +1 -1
- package/lib/stores/memory.spec.d.ts +2 -1
- package/lib/stores/memory.spec.js +36 -4
- package/lib/stores/memory.spec.js.map +1 -1
- package/lib/stores/store.d.ts +137 -26
- package/lib/stores/store.js +431 -75
- package/lib/stores/store.js.map +1 -1
- package/lib/stores/store.spec.d.ts +31 -4
- package/lib/stores/store.spec.js +206 -35
- package/lib/stores/store.spec.js.map +1 -1
- package/lib/stores/webdaql/WebdaQLLexer.d.ts +53 -0
- package/lib/stores/webdaql/WebdaQLLexer.js +290 -0
- package/lib/stores/webdaql/WebdaQLLexer.js.map +1 -0
- package/lib/stores/webdaql/WebdaQLParserLexer.d.ts +53 -0
- package/lib/stores/webdaql/WebdaQLParserLexer.js +290 -0
- package/lib/stores/webdaql/WebdaQLParserLexer.js.map +1 -0
- package/lib/stores/webdaql/WebdaQLParserListener.d.ts +284 -0
- package/lib/stores/webdaql/WebdaQLParserListener.js +4 -0
- package/lib/stores/webdaql/WebdaQLParserListener.js.map +1 -0
- package/lib/stores/webdaql/WebdaQLParserParser.d.ts +301 -0
- package/lib/stores/webdaql/WebdaQLParserParser.js +1781 -0
- package/lib/stores/webdaql/WebdaQLParserParser.js.map +1 -0
- package/lib/stores/webdaql/WebdaQLParserVisitor.d.ts +174 -0
- package/lib/stores/webdaql/WebdaQLParserVisitor.js +4 -0
- package/lib/stores/webdaql/WebdaQLParserVisitor.js.map +1 -0
- package/lib/stores/webdaql/query.d.ts +300 -0
- package/lib/stores/webdaql/query.js +471 -0
- package/lib/stores/webdaql/query.js.map +1 -0
- package/lib/stores/webdaql/query.spec.d.ts +1 -0
- package/lib/stores/webdaql/query.spec.js +136 -0
- package/lib/stores/webdaql/query.spec.js.map +1 -0
- package/lib/test.d.ts +54 -9
- package/lib/test.js +139 -25
- package/lib/test.js.map +1 -1
- package/lib/unpackedapplication.d.ts +66 -0
- package/lib/unpackedapplication.js +219 -0
- package/lib/unpackedapplication.js.map +1 -0
- package/lib/utils/abstractdeployer.spec.js +1 -1
- package/lib/utils/abstractdeployer.spec.js.map +1 -1
- package/lib/utils/context.d.ts +17 -58
- package/lib/utils/context.js +33 -124
- package/lib/utils/context.js.map +1 -1
- package/lib/utils/context.spec.js +49 -28
- package/lib/utils/context.spec.js.map +1 -1
- package/lib/utils/cookie.d.ts +6 -3
- package/lib/utils/cookie.js +9 -5
- package/lib/utils/cookie.js.map +1 -1
- package/lib/utils/cookie.spec.js +5 -5
- package/lib/utils/cookie.spec.js.map +1 -1
- package/lib/utils/httpcontext.d.ts +157 -0
- package/lib/utils/httpcontext.js +279 -0
- package/lib/utils/httpcontext.js.map +1 -0
- package/lib/utils/httpcontext.spec.d.ts +5 -0
- package/lib/utils/httpcontext.spec.js +82 -0
- package/lib/utils/httpcontext.spec.js.map +1 -0
- package/lib/utils/logger.d.ts +18 -5
- package/lib/utils/logger.js +17 -4
- package/lib/utils/logger.js.map +1 -1
- package/lib/utils/logger.spec.js.map +1 -1
- package/lib/utils/serializers.js +5 -1
- package/lib/utils/serializers.js.map +1 -1
- package/lib/utils/serializers.spec.js +3 -3
- package/lib/utils/serializers.spec.js.map +1 -1
- package/lib/utils/waiter.d.ts +1 -1
- package/lib/utils/waiter.js.map +1 -1
- package/lib/utils/waiter.spec.js +2 -2
- package/lib/utils/waiter.spec.js.map +1 -1
- package/package.json +25 -18
- package/test/config-file-no-reload.json +2 -1
- package/test/config-file-reload.json +2 -1
- package/test/config-kube-reload.json +2 -1
- package/test/config-reload.json +1 -1
- package/test/config.json +8 -11
- package/test/config.old.json +1 -1
- package/test/moddas/annotatedservice.js +1 -3
- package/test/moddas/debugmailer.js +2 -7
- package/test/moddas/fakeservice.js +1 -1
- package/test/moddas/voidstore.js +2 -4
- package/test/models/ident.js +1 -1
- package/test/models/task.js +1 -6
- package/webda.module.json +1124 -0
- package/test/config.old-default.json +0 -151
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { WebdaTest } from "../test";
|
|
2
|
+
import { Binary, BinaryEvents, BinaryParameters } from "./binary";
|
|
3
|
+
import { BinaryTest } from "./binary.spec";
|
|
4
|
+
export declare class CloudBinaryTest<T extends Binary<BinaryParameters, BinaryEvents> = Binary<BinaryParameters, BinaryEvents>> extends BinaryTest<T> {
|
|
5
|
+
redirectUrl(): Promise<void>;
|
|
6
|
+
redirectUrlInfo(): Promise<void>;
|
|
7
|
+
}
|
|
8
|
+
export declare class FakeCloudBinaryTest extends WebdaTest {
|
|
9
|
+
binaryService: any;
|
|
10
|
+
testDefaults(): Promise<void>;
|
|
11
|
+
initRoutes(): Promise<void>;
|
|
12
|
+
routes(): Promise<void>;
|
|
13
|
+
}
|
|
@@ -0,0 +1,212 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
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
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
9
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
10
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
11
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
12
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
13
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
14
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
15
|
+
});
|
|
16
|
+
};
|
|
17
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
+
exports.FakeCloudBinaryTest = exports.CloudBinaryTest = void 0;
|
|
19
|
+
const mocha_1 = require("@testdeck/mocha");
|
|
20
|
+
const assert = require("assert");
|
|
21
|
+
const sinon = require("sinon");
|
|
22
|
+
const coremodel_1 = require("../models/coremodel");
|
|
23
|
+
const test_1 = require("../test");
|
|
24
|
+
const binary_spec_1 = require("./binary.spec");
|
|
25
|
+
const cloudbinary_1 = require("./cloudbinary");
|
|
26
|
+
class CloudBinaryFakeService extends cloudbinary_1.CloudBinary {
|
|
27
|
+
store(object, property, file, metadata) {
|
|
28
|
+
throw new Error("Method not implemented.");
|
|
29
|
+
}
|
|
30
|
+
getUsageCount(hash) {
|
|
31
|
+
throw new Error("Method not implemented.");
|
|
32
|
+
}
|
|
33
|
+
/**
|
|
34
|
+
* Clean usage for a hash
|
|
35
|
+
*/
|
|
36
|
+
_cleanUsage(hash, uuid) {
|
|
37
|
+
return __awaiter(this, void 0, void 0, function* () { });
|
|
38
|
+
}
|
|
39
|
+
_get() {
|
|
40
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
41
|
+
return undefined;
|
|
42
|
+
});
|
|
43
|
+
}
|
|
44
|
+
/**
|
|
45
|
+
* Retrieve one signed URL to download the file in parameter
|
|
46
|
+
* @param {GetSignedUrlParams} params
|
|
47
|
+
* @returns {string} URL in order to download the file
|
|
48
|
+
*/
|
|
49
|
+
getSignedUrlFromMap(map, expires) {
|
|
50
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
51
|
+
return `${map.hash}:${expires}`;
|
|
52
|
+
});
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
class CloudBinaryTest extends binary_spec_1.BinaryTest {
|
|
56
|
+
redirectUrl() {
|
|
57
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
58
|
+
let { user1, ctx } = yield this.setupDefault();
|
|
59
|
+
// Making sure we are redirected on GET
|
|
60
|
+
let executor = this.getExecutor(ctx, "test.webda.io", "GET", `/binary/users/${user1.getUuid()}/images/0`, {});
|
|
61
|
+
yield executor.execute(ctx);
|
|
62
|
+
assert.ok(ctx.getResponseHeaders().Location !== undefined);
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
redirectUrlInfo() {
|
|
66
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
67
|
+
let { user1, ctx } = yield this.setupDefault();
|
|
68
|
+
// Making sure we are redirected on GET
|
|
69
|
+
let executor = this.getExecutor(ctx, "test.webda.io", "GET", `/binary/users/${user1.getUuid()}/images/0/url`, {});
|
|
70
|
+
yield executor.execute(ctx);
|
|
71
|
+
assert.ok(ctx.getResponseHeaders().Location === undefined);
|
|
72
|
+
assert.notStrictEqual(JSON.parse(ctx.getResponseBody()).Location, undefined);
|
|
73
|
+
});
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
__decorate([
|
|
77
|
+
mocha_1.test
|
|
78
|
+
], CloudBinaryTest.prototype, "redirectUrl", null);
|
|
79
|
+
__decorate([
|
|
80
|
+
mocha_1.test
|
|
81
|
+
], CloudBinaryTest.prototype, "redirectUrlInfo", null);
|
|
82
|
+
exports.CloudBinaryTest = CloudBinaryTest;
|
|
83
|
+
let FakeCloudBinaryTest = class FakeCloudBinaryTest extends test_1.WebdaTest {
|
|
84
|
+
testDefaults() {
|
|
85
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
86
|
+
let service = new CloudBinaryFakeService(this.webda, "fake", {});
|
|
87
|
+
let binaryMap = { hash: "test", size: 10 };
|
|
88
|
+
yield service.cascadeDelete(binaryMap, "plop");
|
|
89
|
+
let stub = sinon.stub(service, "_cleanUsage").callsFake(() => {
|
|
90
|
+
throw new Error();
|
|
91
|
+
});
|
|
92
|
+
// Should not fail even with exception
|
|
93
|
+
yield service.cascadeDelete(binaryMap, "plop");
|
|
94
|
+
stub.restore();
|
|
95
|
+
assert.strictEqual(service._getKey("hash"), "hash/data");
|
|
96
|
+
service.getParameters().prefix = "prefix";
|
|
97
|
+
assert.strictEqual(service._getKey("hash", "plop"), "prefix/hash/plop");
|
|
98
|
+
assert.strictEqual(new cloudbinary_1.CloudBinaryParameters({}, service).prefix, "");
|
|
99
|
+
sinon.stub(service, "deleteSuccess").resolves();
|
|
100
|
+
let model = new coremodel_1.CoreModel();
|
|
101
|
+
model.load({ plop: [{}, { hash: "fake" }] }, true);
|
|
102
|
+
yield service.delete(model, "plop", 1);
|
|
103
|
+
// Check called with "fake", 1
|
|
104
|
+
});
|
|
105
|
+
}
|
|
106
|
+
initRoutes() {
|
|
107
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
108
|
+
let service = new CloudBinaryFakeService(this.webda, "fake", {});
|
|
109
|
+
let counter = 0;
|
|
110
|
+
// @ts-ignore addRoute is a protected method of service
|
|
111
|
+
let stub = sinon.stub(service, "addRoute").callsFake(() => {
|
|
112
|
+
counter++;
|
|
113
|
+
});
|
|
114
|
+
service.initRoutes();
|
|
115
|
+
assert.strictEqual(counter, 0);
|
|
116
|
+
service.getParameters().expose = {
|
|
117
|
+
url: "plop",
|
|
118
|
+
restrict: {}
|
|
119
|
+
};
|
|
120
|
+
service.initRoutes();
|
|
121
|
+
assert.strictEqual(counter, 7);
|
|
122
|
+
counter = 0;
|
|
123
|
+
service.getParameters().expose = {
|
|
124
|
+
url: "plop",
|
|
125
|
+
restrict: {
|
|
126
|
+
get: true
|
|
127
|
+
}
|
|
128
|
+
};
|
|
129
|
+
service.initRoutes();
|
|
130
|
+
assert.strictEqual(counter, 4);
|
|
131
|
+
});
|
|
132
|
+
}
|
|
133
|
+
routes() {
|
|
134
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
135
|
+
let service = new CloudBinaryFakeService(this.webda, "fake", {});
|
|
136
|
+
let wrote;
|
|
137
|
+
let wroteHead;
|
|
138
|
+
let context = {
|
|
139
|
+
parameter: name => {
|
|
140
|
+
return name === "index" ? 1 : name;
|
|
141
|
+
},
|
|
142
|
+
write: (...arg) => {
|
|
143
|
+
wrote = arg;
|
|
144
|
+
},
|
|
145
|
+
writeHead: (...arg) => {
|
|
146
|
+
wroteHead = arg;
|
|
147
|
+
}
|
|
148
|
+
};
|
|
149
|
+
let storeGetResult;
|
|
150
|
+
// @ts-ignore
|
|
151
|
+
sinon.stub(service, "_verifyMapAndStore").callsFake(() => {
|
|
152
|
+
return {
|
|
153
|
+
get: () => __awaiter(this, void 0, void 0, function* () {
|
|
154
|
+
return storeGetResult;
|
|
155
|
+
})
|
|
156
|
+
};
|
|
157
|
+
});
|
|
158
|
+
yield assert.rejects(() => service.getRedirectUrl(context), /404/);
|
|
159
|
+
storeGetResult = {
|
|
160
|
+
property: "plop"
|
|
161
|
+
};
|
|
162
|
+
yield assert.rejects(() => service.getRedirectUrl(context), /404/);
|
|
163
|
+
storeGetResult = {
|
|
164
|
+
property: [1]
|
|
165
|
+
};
|
|
166
|
+
yield assert.rejects(() => service.getRedirectUrl(context), /404/);
|
|
167
|
+
let myEvt;
|
|
168
|
+
storeGetResult = {
|
|
169
|
+
property: [
|
|
170
|
+
1,
|
|
171
|
+
{
|
|
172
|
+
hash: "myhash"
|
|
173
|
+
}
|
|
174
|
+
],
|
|
175
|
+
canAct: (ctx, evt) => {
|
|
176
|
+
myEvt = evt;
|
|
177
|
+
}
|
|
178
|
+
};
|
|
179
|
+
let counter = 0;
|
|
180
|
+
service.on("Binary.Get", () => {
|
|
181
|
+
counter++;
|
|
182
|
+
});
|
|
183
|
+
yield service.getRedirectUrl(context);
|
|
184
|
+
assert.deepStrictEqual(wroteHead, [302, { Location: "myhash:30" }]);
|
|
185
|
+
yield service.getRedirectUrlInfo(context);
|
|
186
|
+
assert.strictEqual(counter, 2);
|
|
187
|
+
assert.deepStrictEqual(wrote, [
|
|
188
|
+
{
|
|
189
|
+
Location: "myhash:30",
|
|
190
|
+
Map: {
|
|
191
|
+
hash: "myhash"
|
|
192
|
+
}
|
|
193
|
+
}
|
|
194
|
+
]);
|
|
195
|
+
assert.strictEqual(myEvt, "get_binary");
|
|
196
|
+
});
|
|
197
|
+
}
|
|
198
|
+
};
|
|
199
|
+
__decorate([
|
|
200
|
+
mocha_1.test
|
|
201
|
+
], FakeCloudBinaryTest.prototype, "testDefaults", null);
|
|
202
|
+
__decorate([
|
|
203
|
+
mocha_1.test
|
|
204
|
+
], FakeCloudBinaryTest.prototype, "initRoutes", null);
|
|
205
|
+
__decorate([
|
|
206
|
+
mocha_1.test
|
|
207
|
+
], FakeCloudBinaryTest.prototype, "routes", null);
|
|
208
|
+
FakeCloudBinaryTest = __decorate([
|
|
209
|
+
mocha_1.suite
|
|
210
|
+
], FakeCloudBinaryTest);
|
|
211
|
+
exports.FakeCloudBinaryTest = FakeCloudBinaryTest;
|
|
212
|
+
//# sourceMappingURL=cloudbinary.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cloudbinary.spec.js","sourceRoot":"","sources":["../../src/services/cloudbinary.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,6 +36,10 @@ export declare class ConfigurationServiceParameters extends ServiceParameters {
|
|
|
36
36
|
default: any;
|
|
37
37
|
constructor(params: any);
|
|
38
38
|
}
|
|
39
|
+
export declare type ConfigurationEvents = {
|
|
40
|
+
"Configuration.Applied": undefined;
|
|
41
|
+
"Configuration.Applying": undefined;
|
|
42
|
+
};
|
|
39
43
|
/**
|
|
40
44
|
* Handle sessionSecret ( rolling between two secrets ) expire every hour
|
|
41
45
|
* Handle longTermSecret ( rolling between two longer secret ) expire every month
|
|
@@ -46,8 +50,9 @@ export declare class ConfigurationServiceParameters extends ServiceParameters {
|
|
|
46
50
|
* be dynamically reloaded
|
|
47
51
|
*
|
|
48
52
|
* @category CoreServices
|
|
53
|
+
* @WebdaModda
|
|
49
54
|
*/
|
|
50
|
-
export default class ConfigurationService<T extends ConfigurationServiceParameters = ConfigurationServiceParameters> extends Service<T> {
|
|
55
|
+
export default class ConfigurationService<T extends ConfigurationServiceParameters = ConfigurationServiceParameters, E extends ConfigurationEvents = ConfigurationEvents> extends Service<T, E> {
|
|
51
56
|
protected serializedConfiguration: any;
|
|
52
57
|
/**
|
|
53
58
|
*
|
|
@@ -103,7 +108,7 @@ export default class ConfigurationService<T extends ConfigurationServiceParamete
|
|
|
103
108
|
*
|
|
104
109
|
* @inheritdoc
|
|
105
110
|
*/
|
|
106
|
-
reinit(
|
|
111
|
+
reinit(_config: any): Promise<void>;
|
|
107
112
|
/**
|
|
108
113
|
* Load the configuration by calling the source service with the source id
|
|
109
114
|
* @returns
|
|
@@ -10,9 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.ConfigurationService = exports.ConfigurationServiceParameters = void 0;
|
|
13
|
-
const service_1 = require("./service");
|
|
14
|
-
const core_1 = require("../core");
|
|
15
13
|
const jsonpath = require("jsonpath");
|
|
14
|
+
const core_1 = require("../core");
|
|
15
|
+
const service_1 = require("./service");
|
|
16
16
|
class ConfigurationServiceParameters extends service_1.ServiceParameters {
|
|
17
17
|
constructor(params) {
|
|
18
18
|
var _a;
|
|
@@ -31,6 +31,7 @@ exports.ConfigurationServiceParameters = ConfigurationServiceParameters;
|
|
|
31
31
|
* be dynamically reloaded
|
|
32
32
|
*
|
|
33
33
|
* @category CoreServices
|
|
34
|
+
* @WebdaModda
|
|
34
35
|
*/
|
|
35
36
|
class ConfigurationService extends service_1.Service {
|
|
36
37
|
constructor() {
|
|
@@ -110,7 +111,7 @@ class ConfigurationService extends service_1.Service {
|
|
|
110
111
|
*
|
|
111
112
|
* @inheritdoc
|
|
112
113
|
*/
|
|
113
|
-
reinit(
|
|
114
|
+
reinit(_config) {
|
|
114
115
|
return __awaiter(this, void 0, void 0, function* () {
|
|
115
116
|
// Need to prevent any reinit
|
|
116
117
|
});
|
|
@@ -146,7 +147,7 @@ class ConfigurationService extends service_1.Service {
|
|
|
146
147
|
const newConfig = (yield this.loadConfiguration()) || this.parameters.default;
|
|
147
148
|
const serializedConfig = JSON.stringify(newConfig);
|
|
148
149
|
if (serializedConfig !== this.serializedConfiguration) {
|
|
149
|
-
this.emit("Configuration.Applying");
|
|
150
|
+
this.emit("Configuration.Applying", undefined);
|
|
150
151
|
this.log("DEBUG", "Apply new configuration");
|
|
151
152
|
this.serializedConfiguration = serializedConfig;
|
|
152
153
|
this.configuration = newConfig;
|
|
@@ -168,7 +169,7 @@ class ConfigurationService extends service_1.Service {
|
|
|
168
169
|
}
|
|
169
170
|
});
|
|
170
171
|
yield Promise.all(promises);
|
|
171
|
-
this.emit("Configuration.Applied");
|
|
172
|
+
this.emit("Configuration.Applied", undefined);
|
|
172
173
|
}
|
|
173
174
|
// If the ConfigurationProvider cannot trigger we check at interval
|
|
174
175
|
if (this.interval) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../src/services/configuration.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../src/services/configuration.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,11 +15,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
15
15
|
});
|
|
16
16
|
};
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
const assert = require("assert");
|
|
19
18
|
const mocha_1 = require("@testdeck/mocha");
|
|
19
|
+
const assert = require("assert");
|
|
20
|
+
const sinon_1 = require("sinon");
|
|
20
21
|
const test_1 = require("../test");
|
|
21
22
|
const configuration_1 = require("./configuration");
|
|
22
|
-
const sinon_1 = require("sinon");
|
|
23
23
|
let ConfigurationServiceTest = class ConfigurationServiceTest extends test_1.WebdaTest {
|
|
24
24
|
getTestConfiguration() {
|
|
25
25
|
return __dirname + "/../../test/config-reload.json";
|
|
@@ -85,6 +85,7 @@ let ConfigurationServiceTest = class ConfigurationServiceTest extends test_1.Web
|
|
|
85
85
|
let service = this.webda.getService("ConfigurationService");
|
|
86
86
|
// @ts-ignore
|
|
87
87
|
yield service.checkUpdate();
|
|
88
|
+
// @ts-ignore
|
|
88
89
|
let mock = (0, sinon_1.stub)(service, "loadConfiguration").callsFake(() => { });
|
|
89
90
|
// @ts-ignore
|
|
90
91
|
service.nextCheck = Date.now() + 86400000;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configuration.spec.js","sourceRoot":"","sources":["../../src/services/configuration.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,iCAAiC;AACjC,
|
|
1
|
+
{"version":3,"file":"configuration.spec.js","sourceRoot":"","sources":["../../src/services/configuration.spec.ts"],"names":[],"mappings":"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"}
|
package/lib/services/cron.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
+
import { CancelablePromise } from "..";
|
|
1
2
|
import { Service } from "./service";
|
|
2
|
-
import { ModdaDefinition, CancelablePromise } from "..";
|
|
3
3
|
/**
|
|
4
4
|
* Cron item
|
|
5
5
|
*/
|
|
@@ -36,6 +36,9 @@ export declare class CronDefinition {
|
|
|
36
36
|
constructor(cron: string, args?: any[], serviceName?: string, method?: string, description?: string);
|
|
37
37
|
toString(): string;
|
|
38
38
|
}
|
|
39
|
+
/**
|
|
40
|
+
* @WebdaModda
|
|
41
|
+
*/
|
|
39
42
|
declare class CronService extends Service {
|
|
40
43
|
enable: boolean;
|
|
41
44
|
crons: {
|
|
@@ -48,7 +51,7 @@ declare class CronService extends Service {
|
|
|
48
51
|
cb?: () => void;
|
|
49
52
|
}[];
|
|
50
53
|
private _scanned;
|
|
51
|
-
static Annotation(cron: string, description?: string, ...args: any[]): (
|
|
54
|
+
static Annotation(cron: string, description?: string, ...args: any[]): (_target: any, property: string, descriptor: PropertyDescriptor) => void;
|
|
52
55
|
static loadAnnotations(services: any): CronDefinition[];
|
|
53
56
|
addAnnotations(): void;
|
|
54
57
|
getCrontab(): {
|
|
@@ -63,10 +66,6 @@ declare class CronService extends Service {
|
|
|
63
66
|
work(annotations?: string): CancelablePromise;
|
|
64
67
|
run(annotations?: boolean): CancelablePromise;
|
|
65
68
|
schedule(cron: string, cb: () => any, description?: string): void;
|
|
66
|
-
/**
|
|
67
|
-
* @inheritdoc
|
|
68
|
-
*/
|
|
69
|
-
static getModda(): ModdaDefinition;
|
|
70
69
|
}
|
|
71
70
|
declare const Cron: typeof CronService.Annotation;
|
|
72
71
|
export { Cron, CronService };
|
package/lib/services/cron.js
CHANGED
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CronService = exports.Cron = exports.CronDefinition = void 0;
|
|
4
4
|
const crontab = require("node-cron");
|
|
5
|
-
const service_1 = require("./service");
|
|
6
5
|
const __1 = require("..");
|
|
6
|
+
const service_1 = require("./service");
|
|
7
7
|
/**
|
|
8
8
|
* Cron item
|
|
9
9
|
*/
|
|
@@ -28,6 +28,9 @@ class CronDefinition {
|
|
|
28
28
|
}
|
|
29
29
|
}
|
|
30
30
|
exports.CronDefinition = CronDefinition;
|
|
31
|
+
/**
|
|
32
|
+
* @WebdaModda
|
|
33
|
+
*/
|
|
31
34
|
class CronService extends service_1.Service {
|
|
32
35
|
constructor() {
|
|
33
36
|
super(...arguments);
|
|
@@ -35,7 +38,7 @@ class CronService extends service_1.Service {
|
|
|
35
38
|
this._scanned = false;
|
|
36
39
|
}
|
|
37
40
|
static Annotation(cron, description = "", ...args) {
|
|
38
|
-
return (
|
|
41
|
+
return (_target, property, descriptor) => {
|
|
39
42
|
descriptor.value.cron = descriptor.value.cron || [];
|
|
40
43
|
descriptor.value.cron.push(new CronDefinition(cron, args, "", property, description));
|
|
41
44
|
};
|
|
@@ -127,16 +130,6 @@ class CronService extends service_1.Service {
|
|
|
127
130
|
this.crons.push({ cron, cb, description, context });
|
|
128
131
|
}
|
|
129
132
|
}
|
|
130
|
-
/**
|
|
131
|
-
* @inheritdoc
|
|
132
|
-
*/
|
|
133
|
-
static getModda() {
|
|
134
|
-
return {
|
|
135
|
-
uuid: "Webda/CronService",
|
|
136
|
-
label: "Cron Service",
|
|
137
|
-
description: "Allow planified tasks"
|
|
138
|
-
};
|
|
139
|
-
}
|
|
140
133
|
}
|
|
141
134
|
exports.CronService = CronService;
|
|
142
135
|
const Cron = CronService.Annotation;
|
package/lib/services/cron.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cron.js","sourceRoot":"","sources":["../../src/services/cron.ts"],"names":[],"mappings":";;;AAAA,qCAAqC;AACrC,
|
|
1
|
+
{"version":3,"file":"cron.js","sourceRoot":"","sources":["../../src/services/cron.ts"],"names":[],"mappings":";;;AAAA,qCAAqC;AACrC,0BAAuC;AACvC,uCAAoC;AAEpC;;GAEG;AACH,MAAa,cAAc;IAwBzB;;;;;;;OAOG;IACH,YAAY,IAAY,EAAE,OAAc,EAAE,EAAE,cAAsB,EAAE,EAAE,SAAiB,EAAE,EAAE,cAAsB,EAAE;QACjH,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED,QAAQ;QACN,OAAO,GAAG,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IACnG,IAAI,CAAC,WAAW,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EACvD,EAAE,CAAC;IACL,CAAC;CACF;AA7CD,wCA6CC;AAED;;GAEG;AACH,MAAM,WAAY,SAAQ,iBAAO;IAAjC;;QAEE,UAAK,GAQC,EAAE,CAAC;QACD,aAAQ,GAAY,KAAK,CAAC;IAqGpC,CAAC;IAnGC,MAAM,CAAC,UAAU,CAAC,IAAY,EAAE,cAAsB,EAAE,EAAE,GAAG,IAAI;QAC/D,OAAO,CAAC,OAAY,EAAE,QAAgB,EAAE,UAA8B,EAAE,EAAE;YACxE,UAAU,CAAC,KAAK,CAAC,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC;YACpD,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;QACxF,CAAC,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,eAAe,CAAC,QAAQ;QAC7B,IAAI,WAAW,GAAqB,EAAE,CAAC;QACvC,KAAK,IAAI,CAAC,IAAI,QAAQ,EAAE;YACtB,IAAI,KAAK,GAAG,MAAM,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;YAChF,KAAK,IAAI,MAAM,IAAI,KAAK,EAAE;gBACxB,aAAa;gBACb,IAAI,KAAK,GAAqB,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;gBACvD,IAAI,KAAK,EAAE;oBACT,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;wBACnB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;wBACrB,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;wBACrB,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBACzB,CAAC,CAAC,CAAC;iBACJ;aACF;SACF;QACD,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,cAAc;QACZ,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,OAAO;SACR;QACD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;IAC7E,CAAC;IAED,UAAU;QACR,uBAAuB;QACvB,IAAI,CAAC,cAAc,EAAE,CAAC;QACtB,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,IAAI,CAAC,cAAsB,MAAM;QAC/B,OAAO,IAAI,CAAC,GAAG,CAAC,WAAW,KAAK,MAAM,CAAC,CAAC;IAC1C,CAAC;IAED,GAAG,CAAC,cAAuB,IAAI;QAC7B,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,sBAAsB,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,aAAa,CAAC,CAAC;QACrF,uBAAuB;QACvB,IAAI,WAAW,EAAE;YACf,IAAI,CAAC,cAAc,EAAE,CAAC;SACvB;QACD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,eAAe;QACf,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACrB,IAAI,CAAC,CAAC,EAAE,EAAE;gBACR,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;aAC7B;iBAAM;gBACL,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE;oBACzB,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC;gBACtD,CAAC,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,IAAI,GAAG,EAAE,CAAC;QACd,iBAAiB;QACjB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACrB,IAAI,CAAC,CAAC,EAAE,EAAE;gBACR,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,OAAO,IAAI,EAAE,GAAG,CAAC,CAAC;aAC9C;iBAAM;gBACL,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;aACnF;QACH,CAAC,CAAC,CAAC;QACH,IAAI,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAC9D,IAAI,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;QACtD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YAC1B,IAAI,CAAC,GAAG,CACN,MAAM,EACN,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,EAAE,CAC1G,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,qBAAqB;QACrB,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QAChB,OAAO,IAAI,qBAAiB,EAAE,CAAC;IACjC,CAAC;IAED,QAAQ,CAAC,IAAY,EAAE,EAAa,EAAE,cAAsB,EAAE;QAC5D,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;SAC5B;aAAM;YACL,IAAI,OAAO,CAAC;YACZ,IAAI;gBACF,MAAM,IAAI,KAAK,EAAE,CAAC;aACnB;YAAC,OAAO,GAAG,EAAE;gBACZ,yCAAyC;gBACzC,IAAI,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;gBACtD,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,GAAG,EAAE,EAAE,CAAC,CAAC;aACpD;YACD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,CAAC;SACrD;IACH,CAAC;CACF;AAIc,kCAAW;AAF1B,MAAM,IAAI,GAAG,WAAW,CAAC,UAAU,CAAC;AAE3B,oBAAI"}
|
|
@@ -6,12 +6,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
6
6
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
7
|
};
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
-
const assert = require("assert");
|
|
10
9
|
const mocha_1 = require("@testdeck/mocha");
|
|
11
|
-
const
|
|
12
|
-
const __1 = require("..");
|
|
10
|
+
const assert = require("assert");
|
|
13
11
|
const crontab = require("node-cron");
|
|
14
12
|
const sinon = require("sinon");
|
|
13
|
+
const __1 = require("..");
|
|
14
|
+
const test_1 = require("../test");
|
|
15
15
|
class MyService extends __1.Service {
|
|
16
16
|
test() {
|
|
17
17
|
// Empty one
|
|
@@ -33,7 +33,6 @@ let CronServiceTest = class CronServiceTest extends test_1.WebdaTest {
|
|
|
33
33
|
assert.deepStrictEqual(service.getCrontab()[1], def);
|
|
34
34
|
// for cov
|
|
35
35
|
assert.deepStrictEqual(service.getCrontab()[1], def);
|
|
36
|
-
__1.CronService.getModda();
|
|
37
36
|
const cron = sinon.stub(crontab, "schedule").callsFake((cron, cb) => {
|
|
38
37
|
try {
|
|
39
38
|
cb();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cron.spec.js","sourceRoot":"","sources":["../../src/services/cron.spec.ts"],"names":[],"mappings":";;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"cron.spec.js","sourceRoot":"","sources":["../../src/services/cron.spec.ts"],"names":[],"mappings":";;;;;;;;AAAA,2CAA8C;AAC9C,iCAAiC;AACjC,qCAAqC;AACrC,+BAA+B;AAC/B,0BAAgE;AAChE,kCAAoC;AAEpC,MAAM,SAAU,SAAQ,WAAO;IAE7B,IAAI;QACF,YAAY;IACd,CAAC;IAGD,KAAK,CAAC,KAAa,IAAG,CAAC;CACxB;AANC;IADC,IAAA,QAAI,EAAC,cAAc,EAAE,MAAM,CAAC;qCAG5B;AAGD;IADC,IAAA,QAAI,EAAC,cAAc,EAAE,SAAS,EAAE,OAAO,CAAC;sCAClB;AAGzB,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,gBAAS;IAErC,WAAW;QACT,IAAI,CAAC,eAAe,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC;QACjE,IAAI,GAAG,GAAG,IAAI,kBAAc,CAAC,cAAc,EAAE,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QAC9E,IAAI,OAAO,GAAG,IAAI,eAAW,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QACtD,OAAO,CAAC,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE,MAAM,CAAC,CAAC;QAChD,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QACrD,UAAU;QACV,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QACrD,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE;YAClE,IAAI;gBACF,EAAE,EAAE,CAAC;aACN;YAAC,OAAO,GAAG,EAAE,GAAE;QAClB,CAAC,CAAC,CAAC;QACH,IAAI;YACF,IAAI,OAAO,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;YAC7B,OAAO,CAAC,MAAM,EAAE,CAAC;YACjB,OAAO,CAAC,MAAM,GAAG,KAAK,CAAC;YACvB,OAAO,CAAC,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE,MAAM,CAAC,CAAC;YAChD,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,GAAG,SAAS,CAAC;YACrC,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;YACxB,OAAO,CAAC,MAAM,EAAE,CAAC;YACjB,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAC7B,OAAO,CAAC,MAAM,EAAE,CAAC;SAClB;gBAAS;SACT;IACH,CAAC;CACF,CAAA;AA1BC;IADC,YAAI;kDA0BJ;AA3BG,eAAe;IADpB,aAAK;GACA,eAAe,CA4BpB;AAGD,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAEtB,UAAU;QACR,MAAM,CAAC,WAAW,CAAC,IAAI,kBAAc,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,EAAE,gBAAgB,CAAC,CAAC;QACjF,MAAM,CAAC,WAAW,CAChB,IAAI,kBAAc,CAAC,WAAW,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,QAAQ,EAAE,EAC9E,gEAAgE,CACjE,CAAC;IACJ,CAAC;CACF,CAAA;AAPC;IADC,YAAI;oDAOJ;AARG,kBAAkB;IADvB,aAAK;GACA,kBAAkB,CASvB"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { ModdaDefinition } from "../core";
|
|
2
1
|
import { AbstractMailer } from "./mailer";
|
|
3
2
|
/**
|
|
4
3
|
* Fake Service to help debug mail expedition
|
|
4
|
+
* @WebdaModda
|
|
5
5
|
*/
|
|
6
6
|
export default class DebugMailer extends AbstractMailer {
|
|
7
7
|
sent: any[];
|
|
@@ -12,7 +12,7 @@ export default class DebugMailer extends AbstractMailer {
|
|
|
12
12
|
* @param options
|
|
13
13
|
* @param callback
|
|
14
14
|
*/
|
|
15
|
-
send(options: any,
|
|
15
|
+
send(options: any, _callback?: any): Promise<void>;
|
|
16
16
|
/**
|
|
17
17
|
* Just send a new Error exception
|
|
18
18
|
*/
|
|
@@ -23,7 +23,7 @@ export default class DebugMailer extends AbstractMailer {
|
|
|
23
23
|
* @param name
|
|
24
24
|
* @returns
|
|
25
25
|
*/
|
|
26
|
-
hasNotification(
|
|
26
|
+
hasNotification(_name: string): Promise<boolean>;
|
|
27
27
|
/**
|
|
28
28
|
* Just send a new Error exception as async
|
|
29
29
|
*/
|
|
@@ -32,7 +32,5 @@ export default class DebugMailer extends AbstractMailer {
|
|
|
32
32
|
* Empty async method
|
|
33
33
|
*/
|
|
34
34
|
async(): Promise<void>;
|
|
35
|
-
/** @inheritdoc */
|
|
36
|
-
static getModda(): ModdaDefinition;
|
|
37
35
|
}
|
|
38
36
|
export { DebugMailer };
|
|
@@ -13,6 +13,7 @@ exports.DebugMailer = void 0;
|
|
|
13
13
|
const mailer_1 = require("./mailer");
|
|
14
14
|
/**
|
|
15
15
|
* Fake Service to help debug mail expedition
|
|
16
|
+
* @WebdaModda
|
|
16
17
|
*/
|
|
17
18
|
class DebugMailer extends mailer_1.AbstractMailer {
|
|
18
19
|
constructor(webda, name, params) {
|
|
@@ -26,7 +27,7 @@ class DebugMailer extends mailer_1.AbstractMailer {
|
|
|
26
27
|
* @param options
|
|
27
28
|
* @param callback
|
|
28
29
|
*/
|
|
29
|
-
send(options,
|
|
30
|
+
send(options, _callback = undefined) {
|
|
30
31
|
return __awaiter(this, void 0, void 0, function* () {
|
|
31
32
|
this.log("DEBUG", "Send a fake email", options);
|
|
32
33
|
this.sent.push(options);
|
|
@@ -44,7 +45,7 @@ class DebugMailer extends mailer_1.AbstractMailer {
|
|
|
44
45
|
* @param name
|
|
45
46
|
* @returns
|
|
46
47
|
*/
|
|
47
|
-
hasNotification(
|
|
48
|
+
hasNotification(_name) {
|
|
48
49
|
return __awaiter(this, void 0, void 0, function* () {
|
|
49
50
|
// Load template
|
|
50
51
|
return true;
|
|
@@ -66,15 +67,6 @@ class DebugMailer extends mailer_1.AbstractMailer {
|
|
|
66
67
|
// Empty on purpose
|
|
67
68
|
});
|
|
68
69
|
}
|
|
69
|
-
/** @inheritdoc */
|
|
70
|
-
static getModda() {
|
|
71
|
-
return {
|
|
72
|
-
uuid: "Webda/DebugMailer",
|
|
73
|
-
label: "DebugMailer",
|
|
74
|
-
description: "Implements a mail that store in memory and output in log but nothing else",
|
|
75
|
-
logo: "images/icons/email.png"
|
|
76
|
-
};
|
|
77
|
-
}
|
|
78
70
|
}
|
|
79
71
|
exports.default = DebugMailer;
|
|
80
72
|
exports.DebugMailer = DebugMailer;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debugmailer.js","sourceRoot":"","sources":["../../src/services/debugmailer.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"debugmailer.js","sourceRoot":"","sources":["../../src/services/debugmailer.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAA0C;AAE1C;;;GAGG;AACH,MAAqB,WAAY,SAAQ,uBAAc;IAGrD,YAAY,KAAK,EAAE,IAAI,EAAE,MAAM;QAC7B,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QAH7B,SAAI,GAAU,EAAE,CAAC;QAIf,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC;IACjB,CAAC;IAED;;;;;OAKG;IACG,IAAI,CAAC,OAAO,EAAE,SAAS,GAAG,SAAS;;YACvC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,mBAAmB,EAAE,OAAO,CAAC,CAAC;YAChD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC1B,CAAC;KAAA;IAED;;OAEG;IACH,KAAK;QACH,MAAM,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC;IAC/B,CAAC;IAED;;;;;OAKG;IACG,eAAe,CAAC,KAAa;;YACjC,gBAAgB;YAChB,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;IAED;;OAEG;IACG,UAAU;;YACd,MAAM,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC;QAC/B,CAAC;KAAA;IAED;;OAEG;IACG,KAAK;;YACT,mBAAmB;QACrB,CAAC;KAAA;CACF;AAlDD,8BAkDC;AAEQ,kCAAW"}
|
|
@@ -15,8 +15,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
15
15
|
});
|
|
16
16
|
};
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
const assert = require("assert");
|
|
19
18
|
const mocha_1 = require("@testdeck/mocha");
|
|
19
|
+
const assert = require("assert");
|
|
20
20
|
const test_1 = require("../test");
|
|
21
21
|
const debugmailer_1 = require("./debugmailer");
|
|
22
22
|
let DebugMailerTest = class DebugMailerTest extends test_1.WebdaTest {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debugmailer.spec.js","sourceRoot":"","sources":["../../src/services/debugmailer.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,iCAAiC;AACjC,
|
|
1
|
+
{"version":3,"file":"debugmailer.spec.js","sourceRoot":"","sources":["../../src/services/debugmailer.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,2CAA8C;AAC9C,iCAAiC;AACjC,kCAAoC;AACpC,+CAA4C;AAG5C,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,gBAAS;IAE/B,QAAQ;;YACZ,IAAI,MAAM,GAAG,IAAI,yBAAW,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;YACrD,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;YACjC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YAC1C,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YACnD,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;YACrB,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,WAAW,CAAC,CAAC;YACjD,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,WAAW,CAAC,CAAC;YAC7D,MAAM,CAAC,WAAW,CAAC,MAAM,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;QAC7D,CAAC;KAAA;CACF,CAAA;AAVC;IADC,YAAI;+CAUJ;AAXG,eAAe;IADpB,aAAK;GACA,eAAe,CAYpB"}
|