@gitpod/gitpod-protocol 0.1.5-pavel-prebuilds.0 → 0.1.5-pavel-git-status-fix.5
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/data/gitpod-schema.json +16 -0
- package/lib/admin-protocol.d.ts +4 -0
- package/lib/admin-protocol.d.ts.map +1 -1
- package/lib/admin-protocol.js.map +1 -1
- package/lib/attribution.d.ts +20 -0
- package/lib/attribution.d.ts.map +1 -0
- package/lib/attribution.js +40 -0
- package/lib/attribution.js.map +1 -0
- package/lib/blocked-repositories-protocol.d.ts +13 -0
- package/lib/blocked-repositories-protocol.d.ts.map +1 -0
- package/lib/blocked-repositories-protocol.js +8 -0
- package/lib/blocked-repositories-protocol.js.map +1 -0
- package/lib/context-url.js +1 -1
- package/lib/context-url.js.map +1 -1
- package/lib/experiments/always-default.d.ts +8 -0
- package/lib/experiments/always-default.d.ts.map +1 -0
- package/lib/experiments/always-default.js +20 -0
- package/lib/experiments/always-default.js.map +1 -0
- package/lib/experiments/configcat-server.d.ts +8 -0
- package/lib/experiments/configcat-server.d.ts.map +1 -0
- package/lib/experiments/configcat-server.js +35 -0
- package/lib/experiments/configcat-server.js.map +1 -0
- package/lib/experiments/configcat.d.ts +22 -0
- package/lib/experiments/configcat.d.ts.map +1 -0
- package/lib/experiments/configcat.js +53 -0
- package/lib/experiments/configcat.js.map +1 -0
- package/lib/experiments/types.d.ts +23 -0
- package/lib/experiments/types.d.ts.map +1 -0
- package/lib/experiments/types.js +10 -0
- package/lib/experiments/types.js.map +1 -0
- package/lib/gitpod-service.d.ts +16 -5
- package/lib/gitpod-service.d.ts.map +1 -1
- package/lib/gitpod-service.js.map +1 -1
- package/lib/installation-admin-protocol.d.ts +3 -0
- package/lib/installation-admin-protocol.d.ts.map +1 -1
- package/lib/installation-admin-protocol.js +1 -0
- package/lib/installation-admin-protocol.js.map +1 -1
- package/lib/messaging/error.d.ts +1 -0
- package/lib/messaging/error.d.ts.map +1 -1
- package/lib/messaging/error.js +2 -0
- package/lib/messaging/error.js.map +1 -1
- package/lib/protocol.d.ts +50 -1
- package/lib/protocol.d.ts.map +1 -1
- package/lib/protocol.js +90 -2
- package/lib/protocol.js.map +1 -1
- package/lib/protocol.spec.d.ts +7 -0
- package/lib/protocol.spec.d.ts.map +1 -0
- package/lib/protocol.spec.js +127 -0
- package/lib/protocol.spec.js.map +1 -0
- package/lib/teams-projects-protocol.d.ts +1 -0
- package/lib/teams-projects-protocol.d.ts.map +1 -1
- package/lib/teams-projects-protocol.js.map +1 -1
- package/lib/usage.d.ts +22 -0
- package/lib/usage.d.ts.map +1 -0
- package/lib/usage.js +115 -0
- package/lib/usage.js.map +1 -0
- package/lib/util/debug-app.d.ts +25 -0
- package/lib/util/debug-app.d.ts.map +1 -0
- package/lib/util/debug-app.js +100 -0
- package/lib/util/debug-app.js.map +1 -0
- package/lib/util/logging.d.ts.map +1 -1
- package/lib/util/logging.js +8 -1
- package/lib/util/logging.js.map +1 -1
- package/lib/util/timeutil.d.ts +1 -0
- package/lib/util/timeutil.d.ts.map +1 -1
- package/lib/util/timeutil.js +7 -1
- package/lib/util/timeutil.js.map +1 -1
- package/lib/workspace-cluster.d.ts +6 -1
- package/lib/workspace-cluster.d.ts.map +1 -1
- package/lib/workspace-cluster.js.map +1 -1
- package/lib/workspace-instance.d.ts +6 -0
- package/lib/workspace-instance.d.ts.map +1 -1
- package/package.json +9 -6
- package/pkg-yarn.lock +7 -5
- package/provenance-bundle.jsonl +1 -1
- package/src/admin-protocol.ts +7 -0
- package/src/attribution.ts +48 -0
- package/src/blocked-repositories-protocol.ts +13 -0
- package/src/context-url.ts +1 -1
- package/src/experiments/always-default.ts +24 -0
- package/src/experiments/configcat-server.ts +38 -0
- package/src/experiments/configcat.ts +58 -0
- package/src/experiments/types.ts +35 -0
- package/src/gitpod-service.ts +21 -4
- package/src/installation-admin-protocol.ts +3 -0
- package/src/messaging/error.ts +3 -0
- package/src/protocol.spec.ts +97 -0
- package/src/protocol.ts +135 -3
- package/src/teams-projects-protocol.ts +1 -0
- package/src/usage.ts +146 -0
- package/src/util/debug-app.ts +81 -0
- package/src/util/logging.ts +11 -2
- package/src/util/timeutil.ts +6 -0
- package/src/workspace-cluster.ts +3 -1
- package/src/workspace-instance.ts +11 -0
|
@@ -0,0 +1,127 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Copyright (c) 2020 Gitpod GmbH. All rights reserved.
|
|
4
|
+
* Licensed under the GNU Affero General Public License (AGPL).
|
|
5
|
+
* See License-AGPL.txt in the project root for license information.
|
|
6
|
+
*/
|
|
7
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
8
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
10
|
+
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;
|
|
11
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
12
|
+
};
|
|
13
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
14
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
15
|
+
};
|
|
16
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
+
const mocha_typescript_1 = require("mocha-typescript");
|
|
18
|
+
const chai = require("chai");
|
|
19
|
+
const _1 = require(".");
|
|
20
|
+
const expect = chai.expect;
|
|
21
|
+
let TestSSHPublicKeyValue = class TestSSHPublicKeyValue {
|
|
22
|
+
constructor() {
|
|
23
|
+
this.key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDCnrN9UdK1bNGPmZfenTWXLuYYDjlYvZE8S+WOfP08WpR1GETzX5ZvgYOEZGwEE8KUPHC9cge4Hvo/ydIS9aqbZ5MiVGJ8cAIq1Ic89SjlDWU6fl8TwIqOPCi2imAASlEDP4q8vMLK1N6UOW1EVbxyL3uybGd10ysC1t1FxFPveIGNsYE/MOQeuEWS16AplpXYXIfVRSlgAskeBft2w8Ud3B4gNe8ECLA/FXu96UpvZkdtOarA3JZ9Z27GveNJg9Mtmmw0+US0KXiO9x9NyH7G8+mqVDwDY+nNvaFA5gtQxkkl/uY2oz9k/B4Rjlj3jOiUXe5uQs3XUm5m8g9a9fh62DabLpA2fEvtfg+a/VqNe52dNa5YjupwvBd6Inb5uMW/TYjNl6bNHPlXFKw/nwLOVzukpkjxMZUKS6+4BGkpoasj6y2rTU/wkpbdD8J7yjI1p6J9aKkC6KksIWgN7xGmHkv2PCGDqMHTNbnQyowtNKMgA/667vAYJ0qW7HAHBFXJRs6uRi/DI3+c1QV2s4wPCpEHDIYApovQ0fbON4WDPoGMyHd7kPh9xB/bX7Dj0uMXImu1pdTd62fQ/1XXX64+vjAAXS/P9RSCD0RCRt/K3LPKl2m7GPI3y1niaE52XhxZw+ms9ays6NasNVMw/ZC+f02Ti+L5FBEVf8230RVVRQ== notfound@gitpod.io";
|
|
24
|
+
}
|
|
25
|
+
testValidate() {
|
|
26
|
+
const key = this.key;
|
|
27
|
+
const [t, k, e] = key.split(" ");
|
|
28
|
+
expect(_1.SSHPublicKeyValue.getData({
|
|
29
|
+
key,
|
|
30
|
+
name: "NiceName",
|
|
31
|
+
})).to.deep.equal({ type: t, key: k, email: e });
|
|
32
|
+
}
|
|
33
|
+
testValidateWithDiffType() {
|
|
34
|
+
const key = this.key;
|
|
35
|
+
const [_, k, e] = key.split(" ");
|
|
36
|
+
expect(_1.SSHPublicKeyValue.getData({
|
|
37
|
+
key: key.replace("ssh-rsa", "sk-ecdsa-sha2-nistp256@openssh.com"),
|
|
38
|
+
name: "NiceName",
|
|
39
|
+
})).to.deep.equal({ type: "sk-ecdsa-sha2-nistp256@openssh.com", key: k, email: e });
|
|
40
|
+
}
|
|
41
|
+
testValidateWithoutEmail() {
|
|
42
|
+
const key = this.key;
|
|
43
|
+
const [t, k, _] = key.split(" ");
|
|
44
|
+
expect(_1.SSHPublicKeyValue.getData({
|
|
45
|
+
key: key.replace(" notfound@gitpod.io", ""),
|
|
46
|
+
name: "NiceName",
|
|
47
|
+
})).to.deep.equal({ type: t, key: k, email: undefined });
|
|
48
|
+
}
|
|
49
|
+
testValidateWithoutEmailButEndsWithSpaces() {
|
|
50
|
+
const key = this.key;
|
|
51
|
+
const [t, k, _] = key.split(" ");
|
|
52
|
+
expect(_1.SSHPublicKeyValue.getData({
|
|
53
|
+
key: key.replace("notfound@gitpod.io", " "),
|
|
54
|
+
name: "NiceName",
|
|
55
|
+
})).to.deep.equal({ type: t, key: k, email: undefined });
|
|
56
|
+
}
|
|
57
|
+
testValidateWithError() {
|
|
58
|
+
expect(() => _1.SSHPublicKeyValue.getData({
|
|
59
|
+
key: "Hello World",
|
|
60
|
+
name: "NiceName",
|
|
61
|
+
})).throw("Key is invalid");
|
|
62
|
+
expect(() => _1.SSHPublicKeyValue.getData({
|
|
63
|
+
key: "",
|
|
64
|
+
name: "NiceName",
|
|
65
|
+
})).throw("Key is invalid");
|
|
66
|
+
}
|
|
67
|
+
testGetFingerprint() {
|
|
68
|
+
const key = this.key;
|
|
69
|
+
expect(_1.SSHPublicKeyValue.getFingerprint({
|
|
70
|
+
key,
|
|
71
|
+
name: "NiceName",
|
|
72
|
+
})).to.equal("ykjP/b5aqoa3envmXzWpPMCGgEFMu3QvubfSTNrJCMA=");
|
|
73
|
+
}
|
|
74
|
+
testGetFingerprintWithIncorrectPublicKey() {
|
|
75
|
+
expect(() => _1.SSHPublicKeyValue.getFingerprint({
|
|
76
|
+
key: "Hello World",
|
|
77
|
+
name: "NiceName",
|
|
78
|
+
})).to.throw("Key is invalid");
|
|
79
|
+
}
|
|
80
|
+
};
|
|
81
|
+
__decorate([
|
|
82
|
+
mocha_typescript_1.test,
|
|
83
|
+
__metadata("design:type", Function),
|
|
84
|
+
__metadata("design:paramtypes", []),
|
|
85
|
+
__metadata("design:returntype", void 0)
|
|
86
|
+
], TestSSHPublicKeyValue.prototype, "testValidate", null);
|
|
87
|
+
__decorate([
|
|
88
|
+
mocha_typescript_1.test,
|
|
89
|
+
__metadata("design:type", Function),
|
|
90
|
+
__metadata("design:paramtypes", []),
|
|
91
|
+
__metadata("design:returntype", void 0)
|
|
92
|
+
], TestSSHPublicKeyValue.prototype, "testValidateWithDiffType", null);
|
|
93
|
+
__decorate([
|
|
94
|
+
mocha_typescript_1.test,
|
|
95
|
+
__metadata("design:type", Function),
|
|
96
|
+
__metadata("design:paramtypes", []),
|
|
97
|
+
__metadata("design:returntype", void 0)
|
|
98
|
+
], TestSSHPublicKeyValue.prototype, "testValidateWithoutEmail", null);
|
|
99
|
+
__decorate([
|
|
100
|
+
mocha_typescript_1.test,
|
|
101
|
+
__metadata("design:type", Function),
|
|
102
|
+
__metadata("design:paramtypes", []),
|
|
103
|
+
__metadata("design:returntype", void 0)
|
|
104
|
+
], TestSSHPublicKeyValue.prototype, "testValidateWithoutEmailButEndsWithSpaces", null);
|
|
105
|
+
__decorate([
|
|
106
|
+
mocha_typescript_1.test,
|
|
107
|
+
__metadata("design:type", Function),
|
|
108
|
+
__metadata("design:paramtypes", []),
|
|
109
|
+
__metadata("design:returntype", void 0)
|
|
110
|
+
], TestSSHPublicKeyValue.prototype, "testValidateWithError", null);
|
|
111
|
+
__decorate([
|
|
112
|
+
mocha_typescript_1.test,
|
|
113
|
+
__metadata("design:type", Function),
|
|
114
|
+
__metadata("design:paramtypes", []),
|
|
115
|
+
__metadata("design:returntype", void 0)
|
|
116
|
+
], TestSSHPublicKeyValue.prototype, "testGetFingerprint", null);
|
|
117
|
+
__decorate([
|
|
118
|
+
mocha_typescript_1.test,
|
|
119
|
+
__metadata("design:type", Function),
|
|
120
|
+
__metadata("design:paramtypes", []),
|
|
121
|
+
__metadata("design:returntype", void 0)
|
|
122
|
+
], TestSSHPublicKeyValue.prototype, "testGetFingerprintWithIncorrectPublicKey", null);
|
|
123
|
+
TestSSHPublicKeyValue = __decorate([
|
|
124
|
+
mocha_typescript_1.suite
|
|
125
|
+
], TestSSHPublicKeyValue);
|
|
126
|
+
module.exports = new TestSSHPublicKeyValue(); // Only to circumvent no usage warning :-/
|
|
127
|
+
//# sourceMappingURL=protocol.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"protocol.spec.js","sourceRoot":"","sources":["../src/protocol.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"teams-projects-protocol.d.ts","sourceRoot":"","sources":["../src/teams-projects-protocol.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAEpD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,MAAM,WAAW,aAAa;IAC1B,aAAa,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,eAAe;IAC5B,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,wBAAwB,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"teams-projects-protocol.d.ts","sourceRoot":"","sources":["../src/teams-projects-protocol.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"teams-projects-protocol.js","sourceRoot":"","sources":["../src/teams-projects-protocol.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAGH,+BAAoC;
|
|
1
|
+
{"version":3,"file":"teams-projects-protocol.js","sourceRoot":"","sources":["../src/teams-projects-protocol.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAGH,+BAAoC;AA6BpC,IAAiB,OAAO,CAiCvB;AAjCD,WAAiB,OAAO;IACP,cAAM,GAAG,CAAC,OAA6C,EAAW,EAAE;QAC7E,uCACO,OAAO,KACV,EAAE,EAAE,IAAA,SAAM,GAAE,EACZ,YAAY,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,IACxC;IACN,CAAC,CAAC;IAMF,IAAiB,QAAQ,CAIxB;IAJD,WAAiB,QAAQ;QACrB,SAAgB,EAAE,CAAC,IAAU;YACzB,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,CAAC,CAAC;QACzC,CAAC;QAFe,WAAE,KAEjB,CAAA;IACL,CAAC,EAJgB,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAIxB;AAgBL,CAAC,EAjCgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAiCvB;AAyCD,IAAiB,YAAY,CAI5B;AAJD,WAAiB,YAAY;IACzB,SAAgB,EAAE,CAAC,IAAU;QACzB,OAAO,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,IAAI,EAAE,kBAAkB,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC;IACjH,CAAC;IAFe,eAAE,KAEjB,CAAA;AACL,CAAC,EAJgB,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAI5B"}
|
package/lib/usage.d.ts
ADDED
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Copyright (c) 2022 Gitpod GmbH. All rights reserved.
|
|
3
|
+
* Licensed under the GNU Affero General Public License (AGPL).
|
|
4
|
+
* See License-AGPL.txt in the project root for license information.
|
|
5
|
+
*/
|
|
6
|
+
import { WorkspaceType } from "./protocol";
|
|
7
|
+
export interface BillableSession {
|
|
8
|
+
attributionId: string;
|
|
9
|
+
userId?: string;
|
|
10
|
+
teamId?: string;
|
|
11
|
+
instanceId: string;
|
|
12
|
+
workspaceId: string;
|
|
13
|
+
workspaceType: BillableWorkspaceType;
|
|
14
|
+
workspaceClass: string;
|
|
15
|
+
startTime: string;
|
|
16
|
+
endTime: string;
|
|
17
|
+
credits: number;
|
|
18
|
+
projectId?: string;
|
|
19
|
+
}
|
|
20
|
+
export declare type BillableWorkspaceType = WorkspaceType;
|
|
21
|
+
export declare const billableSessionDummyData: BillableSession[];
|
|
22
|
+
//# sourceMappingURL=usage.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"usage.d.ts","sourceRoot":"","sources":["../src/usage.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C,MAAM,WAAW,eAAe;IAE5B,aAAa,EAAE,MAAM,CAAC;IAGtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,UAAU,EAAE,MAAM,CAAC;IAEnB,WAAW,EAAE,MAAM,CAAC;IAEpB,aAAa,EAAE,qBAAqB,CAAC;IAGrC,cAAc,EAAE,MAAM,CAAC;IAGvB,SAAS,EAAE,MAAM,CAAC;IAGlB,OAAO,EAAE,MAAM,CAAC;IAGhB,OAAO,EAAE,MAAM,CAAC;IAGhB,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,oBAAY,qBAAqB,GAAG,aAAa,CAAC;AAElD,eAAO,MAAM,wBAAwB,EAAE,eAAe,EAyGrD,CAAC"}
|
package/lib/usage.js
ADDED
|
@@ -0,0 +1,115 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Copyright (c) 2022 Gitpod GmbH. All rights reserved.
|
|
4
|
+
* Licensed under the GNU Affero General Public License (AGPL).
|
|
5
|
+
* See License-AGPL.txt in the project root for license information.
|
|
6
|
+
*/
|
|
7
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
8
|
+
exports.billableSessionDummyData = void 0;
|
|
9
|
+
exports.billableSessionDummyData = [
|
|
10
|
+
{
|
|
11
|
+
attributionId: "some-attribution-id",
|
|
12
|
+
userId: "prebuild",
|
|
13
|
+
teamId: "prebuild",
|
|
14
|
+
instanceId: "some-instance-id",
|
|
15
|
+
workspaceId: "some-workspace-id",
|
|
16
|
+
workspaceType: "prebuild",
|
|
17
|
+
workspaceClass: "XL",
|
|
18
|
+
startTime: new Date(Date.now() + -3 * 24 * 3600 * 1000).toISOString(),
|
|
19
|
+
endTime: new Date().toISOString(),
|
|
20
|
+
credits: 320,
|
|
21
|
+
projectId: "project-123",
|
|
22
|
+
},
|
|
23
|
+
{
|
|
24
|
+
attributionId: "some-attribution-id2",
|
|
25
|
+
userId: "some-user",
|
|
26
|
+
teamId: "some-team",
|
|
27
|
+
instanceId: "some-instance-id2",
|
|
28
|
+
workspaceId: "some-workspace-id2",
|
|
29
|
+
workspaceType: "regular",
|
|
30
|
+
workspaceClass: "standard",
|
|
31
|
+
startTime: new Date(Date.now() + -5 * 24 * 3600 * 1000).toISOString(),
|
|
32
|
+
endTime: new Date().toISOString(),
|
|
33
|
+
credits: 130,
|
|
34
|
+
projectId: "project-123",
|
|
35
|
+
},
|
|
36
|
+
{
|
|
37
|
+
attributionId: "some-attribution-id3",
|
|
38
|
+
userId: "some-other-user",
|
|
39
|
+
teamId: "some-other-team",
|
|
40
|
+
instanceId: "some-instance-id3",
|
|
41
|
+
workspaceId: "some-workspace-id3",
|
|
42
|
+
workspaceType: "regular",
|
|
43
|
+
workspaceClass: "XL",
|
|
44
|
+
startTime: new Date(Date.now() + -5 * 24 * 3600 * 1000).toISOString(),
|
|
45
|
+
endTime: new Date(Date.now() + -4 * 24 * 3600 * 1000).toISOString(),
|
|
46
|
+
credits: 150,
|
|
47
|
+
projectId: "project-134",
|
|
48
|
+
},
|
|
49
|
+
{
|
|
50
|
+
attributionId: "some-attribution-id4",
|
|
51
|
+
userId: "some-other-user2",
|
|
52
|
+
teamId: "some-other-team2",
|
|
53
|
+
instanceId: "some-instance-id4",
|
|
54
|
+
workspaceId: "some-workspace-id4",
|
|
55
|
+
workspaceType: "regular",
|
|
56
|
+
workspaceClass: "standard",
|
|
57
|
+
startTime: new Date(Date.now() + -10 * 24 * 3600 * 1000).toISOString(),
|
|
58
|
+
endTime: new Date(Date.now() + -9 * 24 * 3600 * 1000).toISOString(),
|
|
59
|
+
credits: 330,
|
|
60
|
+
projectId: "project-137",
|
|
61
|
+
},
|
|
62
|
+
{
|
|
63
|
+
attributionId: "some-attribution-id5",
|
|
64
|
+
userId: "some-other-user3",
|
|
65
|
+
teamId: "some-other-team3",
|
|
66
|
+
instanceId: "some-instance-id5",
|
|
67
|
+
workspaceId: "some-workspace-id5",
|
|
68
|
+
workspaceType: "regular",
|
|
69
|
+
workspaceClass: "XL",
|
|
70
|
+
startTime: new Date(Date.now() + -2 * 24 * 3600 * 1000).toISOString(),
|
|
71
|
+
endTime: new Date().toISOString(),
|
|
72
|
+
credits: 222,
|
|
73
|
+
projectId: "project-138",
|
|
74
|
+
},
|
|
75
|
+
{
|
|
76
|
+
attributionId: "some-attribution-id6",
|
|
77
|
+
userId: "some-other-user4",
|
|
78
|
+
teamId: "some-other-team4",
|
|
79
|
+
instanceId: "some-instance-id6",
|
|
80
|
+
workspaceId: "some-workspace-id3",
|
|
81
|
+
workspaceType: "regular",
|
|
82
|
+
workspaceClass: "XL",
|
|
83
|
+
startTime: new Date(Date.now() + -7 * 24 * 3600 * 1000).toISOString(),
|
|
84
|
+
endTime: new Date(Date.now() + -6 * 24 * 3600 * 1000).toISOString(),
|
|
85
|
+
credits: 300,
|
|
86
|
+
projectId: "project-134",
|
|
87
|
+
},
|
|
88
|
+
{
|
|
89
|
+
attributionId: "some-attribution-id8",
|
|
90
|
+
userId: "some-other-user5",
|
|
91
|
+
teamId: "some-other-team5",
|
|
92
|
+
instanceId: "some-instance-id8",
|
|
93
|
+
workspaceId: "some-workspace-id3",
|
|
94
|
+
workspaceType: "regular",
|
|
95
|
+
workspaceClass: "standard",
|
|
96
|
+
startTime: new Date(Date.now() + -1 * 24 * 3600 * 1000).toISOString(),
|
|
97
|
+
endTime: new Date().toISOString(),
|
|
98
|
+
credits: 100,
|
|
99
|
+
projectId: "project-567",
|
|
100
|
+
},
|
|
101
|
+
{
|
|
102
|
+
attributionId: "some-attribution-id7",
|
|
103
|
+
userId: "prebuild",
|
|
104
|
+
teamId: "some-other-team7",
|
|
105
|
+
instanceId: "some-instance-id7",
|
|
106
|
+
workspaceId: "some-workspace-id7",
|
|
107
|
+
workspaceType: "prebuild",
|
|
108
|
+
workspaceClass: "XL",
|
|
109
|
+
startTime: new Date(Date.now() + -1 * 24 * 3600 * 1000).toISOString(),
|
|
110
|
+
endTime: new Date().toISOString(),
|
|
111
|
+
credits: 200,
|
|
112
|
+
projectId: "project-345",
|
|
113
|
+
},
|
|
114
|
+
];
|
|
115
|
+
//# sourceMappingURL=usage.js.map
|
package/lib/usage.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"usage.js","sourceRoot":"","sources":["../src/usage.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Copyright (c) 2021 Gitpod GmbH. All rights reserved.
|
|
3
|
+
* Licensed under the GNU Affero General Public License (AGPL).
|
|
4
|
+
* See License-AGPL.txt in the project root for license information.
|
|
5
|
+
*/
|
|
6
|
+
/// <reference types="node" />
|
|
7
|
+
import * as http from "http";
|
|
8
|
+
import * as express from "express";
|
|
9
|
+
import { LogrusLogLevel } from "./logging";
|
|
10
|
+
export interface SetLogLevelRequest {
|
|
11
|
+
level: LogrusLogLevel;
|
|
12
|
+
}
|
|
13
|
+
export declare namespace SetLogLevelRequest {
|
|
14
|
+
function is(o: any): o is SetLogLevelRequest;
|
|
15
|
+
}
|
|
16
|
+
export declare class DebugApp {
|
|
17
|
+
protected _app: express.Application;
|
|
18
|
+
protected httpServer: http.Server | undefined;
|
|
19
|
+
ctor(): void;
|
|
20
|
+
create(): express.Application;
|
|
21
|
+
start(port?: number): void;
|
|
22
|
+
stop(): Promise<void>;
|
|
23
|
+
get app(): express.Application;
|
|
24
|
+
}
|
|
25
|
+
//# sourceMappingURL=debug-app.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"debug-app.d.ts","sourceRoot":"","sources":["../../src/util/debug-app.ts"],"names":[],"mappings":"AAAA;;;;GAIG;;AAEH,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAEnC,OAAO,EAAO,cAAc,EAAE,MAAM,WAAW,CAAC;AAEhD,MAAM,WAAW,kBAAkB;IAC/B,KAAK,EAAE,cAAc,CAAC;CACzB;AACD,yBAAiB,kBAAkB,CAAC;IAChC,SAAgB,EAAE,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,IAAI,kBAAkB,CAElD;CACJ;AAED,qBACa,QAAQ;IACjB,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC;IACpC,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,MAAM,GAAG,SAAS,CAAa;IAGnD,IAAI;IAIX,MAAM,IAAI,OAAO,CAAC,WAAW;IAyBtB,KAAK,CAAC,IAAI,GAAE,MAAa;IAMnB,IAAI;IAgBjB,IAAW,GAAG,IAAI,OAAO,CAAC,WAAW,CAEpC;CACJ"}
|
|
@@ -0,0 +1,100 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Copyright (c) 2021 Gitpod GmbH. All rights reserved.
|
|
4
|
+
* Licensed under the GNU Affero General Public License (AGPL).
|
|
5
|
+
* See License-AGPL.txt in the project root for license information.
|
|
6
|
+
*/
|
|
7
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
8
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
10
|
+
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;
|
|
11
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
12
|
+
};
|
|
13
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
14
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
15
|
+
};
|
|
16
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
17
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
18
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
19
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
20
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
21
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
22
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
23
|
+
});
|
|
24
|
+
};
|
|
25
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
+
exports.DebugApp = exports.SetLogLevelRequest = void 0;
|
|
27
|
+
const express = require("express");
|
|
28
|
+
const inversify_1 = require("inversify");
|
|
29
|
+
const logging_1 = require("./logging");
|
|
30
|
+
var SetLogLevelRequest;
|
|
31
|
+
(function (SetLogLevelRequest) {
|
|
32
|
+
function is(o) {
|
|
33
|
+
return typeof o === "object" && "level" in o;
|
|
34
|
+
}
|
|
35
|
+
SetLogLevelRequest.is = is;
|
|
36
|
+
})(SetLogLevelRequest = exports.SetLogLevelRequest || (exports.SetLogLevelRequest = {}));
|
|
37
|
+
let DebugApp = class DebugApp {
|
|
38
|
+
constructor() {
|
|
39
|
+
this.httpServer = undefined;
|
|
40
|
+
}
|
|
41
|
+
ctor() {
|
|
42
|
+
this._app = this.create();
|
|
43
|
+
}
|
|
44
|
+
create() {
|
|
45
|
+
const app = express();
|
|
46
|
+
app.use(express.json());
|
|
47
|
+
app.use(express.urlencoded({ extended: true }));
|
|
48
|
+
app.post("/debug/logging", (req, res) => {
|
|
49
|
+
try {
|
|
50
|
+
const levelRequest = req.body;
|
|
51
|
+
if (!SetLogLevelRequest.is(levelRequest)) {
|
|
52
|
+
res.status(400).end("not a SetLogLevelRequest");
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
55
|
+
const newLogLevel = levelRequest.level;
|
|
56
|
+
logging_1.log.setLogLevel(newLogLevel);
|
|
57
|
+
logging_1.log.info("set log level", { newLogLevel });
|
|
58
|
+
res.status(200).end(JSON.stringify(levelRequest));
|
|
59
|
+
}
|
|
60
|
+
catch (err) {
|
|
61
|
+
res.status(500).end(err);
|
|
62
|
+
}
|
|
63
|
+
});
|
|
64
|
+
return app;
|
|
65
|
+
}
|
|
66
|
+
start(port = 6060) {
|
|
67
|
+
this.httpServer = this._app.listen(port, "localhost", () => {
|
|
68
|
+
logging_1.log.info(`debug server listening on port: ${port}`);
|
|
69
|
+
});
|
|
70
|
+
}
|
|
71
|
+
stop() {
|
|
72
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
73
|
+
const server = this.httpServer;
|
|
74
|
+
if (!server) {
|
|
75
|
+
return;
|
|
76
|
+
}
|
|
77
|
+
return new Promise((resolve) => server.close((err) => {
|
|
78
|
+
if (err) {
|
|
79
|
+
logging_1.log.warn(`error while closing http server`, { err });
|
|
80
|
+
}
|
|
81
|
+
this.httpServer = undefined;
|
|
82
|
+
resolve();
|
|
83
|
+
}));
|
|
84
|
+
});
|
|
85
|
+
}
|
|
86
|
+
get app() {
|
|
87
|
+
return this._app;
|
|
88
|
+
}
|
|
89
|
+
};
|
|
90
|
+
__decorate([
|
|
91
|
+
(0, inversify_1.postConstruct)(),
|
|
92
|
+
__metadata("design:type", Function),
|
|
93
|
+
__metadata("design:paramtypes", []),
|
|
94
|
+
__metadata("design:returntype", void 0)
|
|
95
|
+
], DebugApp.prototype, "ctor", null);
|
|
96
|
+
DebugApp = __decorate([
|
|
97
|
+
(0, inversify_1.injectable)()
|
|
98
|
+
], DebugApp);
|
|
99
|
+
exports.DebugApp = DebugApp;
|
|
100
|
+
//# sourceMappingURL=debug-app.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"debug-app.js","sourceRoot":"","sources":["../../src/util/debug-app.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;;;;;;;AAGH,mCAAmC;AACnC,yCAAsD;AACtD,uCAAgD;AAKhD,IAAiB,kBAAkB,CAIlC;AAJD,WAAiB,kBAAkB;IAC/B,SAAgB,EAAE,CAAC,CAAM;QACrB,OAAO,OAAO,CAAC,KAAK,QAAQ,IAAI,OAAO,IAAI,CAAC,CAAC;IACjD,CAAC;IAFe,qBAAE,KAEjB,CAAA;AACL,CAAC,EAJgB,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAIlC;AAGD,IAAa,QAAQ,GAArB,MAAa,QAAQ;IAArB;QAEc,eAAU,GAA4B,SAAS,CAAC;IAyD9D,CAAC;IAtDU,IAAI;QACP,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;IAC9B,CAAC;IAED,MAAM;QACF,MAAM,GAAG,GAAG,OAAO,EAAE,CAAC;QAEtB,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QACxB,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAEhD,GAAG,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YACpC,IAAI;gBACA,MAAM,YAAY,GAAG,GAAG,CAAC,IAAI,CAAC;gBAC9B,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,YAAY,CAAC,EAAE;oBACtC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;oBAChD,OAAO;iBACV;gBAED,MAAM,WAAW,GAAG,YAAY,CAAC,KAAK,CAAC;gBACvC,aAAG,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;gBAC7B,aAAG,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;gBAC3C,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC;aACrD;YAAC,OAAO,GAAG,EAAE;gBACV,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;aAC5B;QACL,CAAC,CAAC,CAAC;QACH,OAAO,GAAG,CAAC;IACf,CAAC;IAEM,KAAK,CAAC,OAAe,IAAI;QAC5B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE;YACvD,aAAG,CAAC,IAAI,CAAC,mCAAmC,IAAI,EAAE,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;IACP,CAAC;IAEY,IAAI;;YACb,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC;YAC/B,IAAI,CAAC,MAAM,EAAE;gBACT,OAAO;aACV;YACD,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,CACjC,MAAM,CAAC,KAAK,CAAC,CAAC,GAAQ,EAAE,EAAE;gBACtB,IAAI,GAAG,EAAE;oBACL,aAAG,CAAC,IAAI,CAAC,iCAAiC,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;iBACxD;gBACD,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;gBAC5B,OAAO,EAAE,CAAC;YACd,CAAC,CAAC,CACL,CAAC;QACN,CAAC;KAAA;IAED,IAAW,GAAG;QACV,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;CACJ,CAAA;AAtDG;IADC,IAAA,yBAAa,GAAE;;;;oCAGf;AAPQ,QAAQ;IADpB,IAAA,sBAAU,GAAE;GACA,QAAQ,CA2DpB;AA3DY,4BAAQ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logging.d.ts","sourceRoot":"","sources":["../../src/util/logging.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"logging.d.ts","sourceRoot":"","sources":["../../src/util/logging.ts"],"names":[],"mappings":"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"}
|
package/lib/util/logging.js
CHANGED
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
8
8
|
exports.LogrusLogLevel = exports.LogrusLogLevels = exports.log = exports.LogContext = void 0;
|
|
9
9
|
const inspect = require("util").inspect; // undefined in frontend
|
|
10
|
+
let plainLogging = false; // set to true during development to get non JSON output
|
|
10
11
|
let jsonLogging = false;
|
|
11
12
|
let component;
|
|
12
13
|
let version;
|
|
@@ -234,10 +235,16 @@ function makeLogItem(severity, context, message, error, payloadArgs, calledViaCo
|
|
|
234
235
|
message,
|
|
235
236
|
error,
|
|
236
237
|
payload, loggedViaConsole: calledViaConsole ? true : undefined });
|
|
238
|
+
if (plainLogging) {
|
|
239
|
+
return `[${logItem.severity}] [${logItem.component}] ${logItem.message}
|
|
240
|
+
${JSON.stringify(payload || "", undefined, " ")}
|
|
241
|
+
${error || ""}
|
|
242
|
+
`.trim();
|
|
243
|
+
}
|
|
237
244
|
let result = stringifyLogItem(logItem);
|
|
238
245
|
if (result.length > maxAllowedLogItemLength && payload !== undefined) {
|
|
239
246
|
delete logItem.payload;
|
|
240
|
-
logItem.payloadStub = `Payload stripped as log item was longer than ${maxAllowedLogItemLength} characters`;
|
|
247
|
+
(logItem).payloadStub = `Payload stripped as log item was longer than ${maxAllowedLogItemLength} characters`;
|
|
241
248
|
result = stringifyLogItem(logItem);
|
|
242
249
|
if (result.length <= maxAllowedLogItemLength) {
|
|
243
250
|
log.warn("Log item too large, stripping payload", { logItemStub: makeLogItemStub(logItem) });
|
package/lib/util/logging.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../src/util/logging.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../src/util/logging.ts"],"names":[],"mappings":"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"}
|
package/lib/util/timeutil.d.ts
CHANGED
|
@@ -25,6 +25,7 @@ export declare const earliest: (d1: string, d2: string) => string;
|
|
|
25
25
|
export declare const orderAsc: (d1: string, d2: string) => number;
|
|
26
26
|
export declare const liftDate1: <T>(d1: string, f: (d1: Date) => T) => T;
|
|
27
27
|
export declare const liftDate: <T>(d1: string, d2: string, f: (d1: Date, d2: Date) => T) => T;
|
|
28
|
+
export declare function hoursBefore(date: string, hours: number): string;
|
|
28
29
|
export declare function hoursLater(date: string, hours: number): string;
|
|
29
30
|
export declare function secondsBefore(date: string, seconds: number): string;
|
|
30
31
|
export declare function rightAfter(date: string): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"timeutil.d.ts","sourceRoot":"","sources":["../../src/util/timeutil.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAUpE;AACD,eAAO,MAAM,UAAU,aAAc,MAAM,SAAS,MAAM,KAAG,MAIvD,CAAC;AAGP,eAAO,MAAM,SAAS,OAAQ,MAAM,UAAU,MAAM,WACoB,CAAC;AACzE,eAAO,MAAM,eAAe,OAAQ,MAAM,MAAM,MAAM,WAC4B,CAAC;AACnF,eAAO,MAAM,gBAAgB,OAAQ,MAAM,MAAM,MAAM,WAA8D,CAAC;AAEtH,eAAO,MAAM,oBAAoB,OAAQ,MAAM,MAAM,MAAM,KAAG,OACA,CAAC;AAC/D,eAAO,MAAM,oBAAoB,OAAQ,MAAM,MAAM,MAAM,GAAG,SAAS,YAAoB,CAAC;AAC5F,eAAO,MAAM,aAAa,OAAQ,MAAM,MAAM,MAAM,GAAG,SAAS,YAAmB,CAAC;AACpF,eAAO,MAAM,MAAM,OAAQ,MAAM,MAAM,MAAM,KAAG,MAA6B,CAAC;AAC9E,eAAO,MAAM,QAAQ,OAAQ,MAAM,MAAM,MAAM,KAAG,MAA6B,CAAC;AAChF,eAAO,MAAM,QAAQ,OAAQ,MAAM,MAAM,MAAM,KAAG,MAAmE,CAAC;AACtH,eAAO,MAAM,SAAS,UAAW,MAAM,UAAU,IAAI,YAA6B,CAAC;AACnF,eAAO,MAAM,QAAQ,UAAW,MAAM,MAAM,MAAM,UAAU,IAAI,MAAM,IAAI,YAA2C,CAAC;AAEtH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAI9D;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAEnE;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE/C;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAEhE;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEzD"}
|
|
1
|
+
{"version":3,"file":"timeutil.d.ts","sourceRoot":"","sources":["../../src/util/timeutil.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAUpE;AACD,eAAO,MAAM,UAAU,aAAc,MAAM,SAAS,MAAM,KAAG,MAIvD,CAAC;AAGP,eAAO,MAAM,SAAS,OAAQ,MAAM,UAAU,MAAM,WACoB,CAAC;AACzE,eAAO,MAAM,eAAe,OAAQ,MAAM,MAAM,MAAM,WAC4B,CAAC;AACnF,eAAO,MAAM,gBAAgB,OAAQ,MAAM,MAAM,MAAM,WAA8D,CAAC;AAEtH,eAAO,MAAM,oBAAoB,OAAQ,MAAM,MAAM,MAAM,KAAG,OACA,CAAC;AAC/D,eAAO,MAAM,oBAAoB,OAAQ,MAAM,MAAM,MAAM,GAAG,SAAS,YAAoB,CAAC;AAC5F,eAAO,MAAM,aAAa,OAAQ,MAAM,MAAM,MAAM,GAAG,SAAS,YAAmB,CAAC;AACpF,eAAO,MAAM,MAAM,OAAQ,MAAM,MAAM,MAAM,KAAG,MAA6B,CAAC;AAC9E,eAAO,MAAM,QAAQ,OAAQ,MAAM,MAAM,MAAM,KAAG,MAA6B,CAAC;AAChF,eAAO,MAAM,QAAQ,OAAQ,MAAM,MAAM,MAAM,KAAG,MAAmE,CAAC;AACtH,eAAO,MAAM,SAAS,UAAW,MAAM,UAAU,IAAI,YAA6B,CAAC;AACnF,eAAO,MAAM,QAAQ,UAAW,MAAM,MAAM,MAAM,UAAU,IAAI,MAAM,IAAI,YAA2C,CAAC;AAEtH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAI/D;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAI9D;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAEnE;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE/C;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAEhE;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEzD"}
|
package/lib/util/timeutil.js
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* See License-AGPL.txt in the project root for license information.
|
|
6
6
|
*/
|
|
7
7
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
8
|
-
exports.hoursToMilliseconds = exports.millisecondsToHours = exports.rightBefore = exports.rightAfter = exports.secondsBefore = exports.hoursLater = exports.liftDate = exports.liftDate1 = exports.orderAsc = exports.earliest = exports.oldest = exports.isDateSmaller = exports.isDateSmallerOrEqual = exports.isDateGreaterOrEqual = exports.durationInMillis = exports.durationInHours = exports.addMillis = exports.yearsLater = exports.oneMonthLater = void 0;
|
|
8
|
+
exports.hoursToMilliseconds = exports.millisecondsToHours = exports.rightBefore = exports.rightAfter = exports.secondsBefore = exports.hoursLater = exports.hoursBefore = exports.liftDate = exports.liftDate1 = exports.orderAsc = exports.earliest = exports.oldest = exports.isDateSmaller = exports.isDateSmallerOrEqual = exports.isDateGreaterOrEqual = exports.durationInMillis = exports.durationInHours = exports.addMillis = exports.yearsLater = exports.oneMonthLater = void 0;
|
|
9
9
|
/**
|
|
10
10
|
* Returns the <code>day</code>th of the next month from <code>formDate</code>.
|
|
11
11
|
* If the next month does not have a <code>day</code>th, the last day of that
|
|
@@ -56,6 +56,12 @@ const liftDate1 = (d1, f) => f(new Date(d1));
|
|
|
56
56
|
exports.liftDate1 = liftDate1;
|
|
57
57
|
const liftDate = (d1, d2, f) => f(new Date(d1), new Date(d2));
|
|
58
58
|
exports.liftDate = liftDate;
|
|
59
|
+
function hoursBefore(date, hours) {
|
|
60
|
+
const result = new Date(date);
|
|
61
|
+
result.setHours(result.getHours() - hours);
|
|
62
|
+
return result.toISOString();
|
|
63
|
+
}
|
|
64
|
+
exports.hoursBefore = hoursBefore;
|
|
59
65
|
function hoursLater(date, hours) {
|
|
60
66
|
const result = new Date(date);
|
|
61
67
|
result.setHours(result.getHours() + hours);
|
package/lib/util/timeutil.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"timeutil.js","sourceRoot":"","sources":["../../src/util/timeutil.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"timeutil.js","sourceRoot":"","sources":["../../src/util/timeutil.ts"],"names":[],"mappings":"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"}
|