cnpmcore 3.36.0 → 3.37.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.
|
@@ -32,6 +32,8 @@ const DOWNLOAD_PATHS = {
|
|
|
32
32
|
'ubuntu22.04-arm64': 'builds/chromium/%s/chromium-linux-arm64.zip',
|
|
33
33
|
'debian11': 'builds/chromium/%s/chromium-linux.zip',
|
|
34
34
|
'debian11-arm64': 'builds/chromium/%s/chromium-linux-arm64.zip',
|
|
35
|
+
'debian12': 'builds/chromium/%s/chromium-linux.zip',
|
|
36
|
+
'debian12-arm64': 'builds/chromium/%s/chromium-linux-arm64.zip',
|
|
35
37
|
'mac10.13': 'builds/chromium/%s/chromium-mac.zip',
|
|
36
38
|
'mac10.14': 'builds/chromium/%s/chromium-mac.zip',
|
|
37
39
|
'mac10.15': 'builds/chromium/%s/chromium-mac.zip',
|
|
@@ -55,6 +57,8 @@ const DOWNLOAD_PATHS = {
|
|
|
55
57
|
'ubuntu22.04-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux-arm64.zip',
|
|
56
58
|
'debian11': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux.zip',
|
|
57
59
|
'debian11-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux-arm64.zip',
|
|
60
|
+
'debian12': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux.zip',
|
|
61
|
+
'debian12-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux-arm64.zip',
|
|
58
62
|
'mac10.13': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac.zip',
|
|
59
63
|
'mac10.14': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac.zip',
|
|
60
64
|
'mac10.15': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac.zip',
|
|
@@ -78,6 +82,8 @@ const DOWNLOAD_PATHS = {
|
|
|
78
82
|
'ubuntu22.04-arm64': 'builds/chromium/%s/chromium-with-symbols-linux-arm64.zip',
|
|
79
83
|
'debian11': 'builds/chromium/%s/chromium-with-symbols-linux.zip',
|
|
80
84
|
'debian11-arm64': 'builds/chromium/%s/chromium-with-symbols-linux-arm64.zip',
|
|
85
|
+
'debian12': 'builds/chromium/%s/chromium-with-symbols-linux.zip',
|
|
86
|
+
'debian12-arm64': 'builds/chromium/%s/chromium-with-symbols-linux-arm64.zip',
|
|
81
87
|
'mac10.13': 'builds/chromium/%s/chromium-with-symbols-mac.zip',
|
|
82
88
|
'mac10.14': 'builds/chromium/%s/chromium-with-symbols-mac.zip',
|
|
83
89
|
'mac10.15': 'builds/chromium/%s/chromium-with-symbols-mac.zip',
|
|
@@ -101,15 +107,17 @@ const DOWNLOAD_PATHS = {
|
|
|
101
107
|
'ubuntu22.04-arm64': 'builds/firefox/%s/firefox-ubuntu-22.04-arm64.zip',
|
|
102
108
|
'debian11': 'builds/firefox/%s/firefox-debian-11.zip',
|
|
103
109
|
'debian11-arm64': 'builds/firefox/%s/firefox-debian-11-arm64.zip',
|
|
104
|
-
'
|
|
105
|
-
'
|
|
106
|
-
'mac10.
|
|
107
|
-
'
|
|
108
|
-
'
|
|
109
|
-
'
|
|
110
|
-
'
|
|
111
|
-
'
|
|
112
|
-
'
|
|
110
|
+
'debian12': undefined,
|
|
111
|
+
'debian12-arm64': undefined,
|
|
112
|
+
'mac10.13': 'builds/firefox/%s/firefox-mac-13.zip',
|
|
113
|
+
'mac10.14': 'builds/firefox/%s/firefox-mac-13.zip',
|
|
114
|
+
'mac10.15': 'builds/firefox/%s/firefox-mac-13.zip',
|
|
115
|
+
'mac11': 'builds/firefox/%s/firefox-mac-13.zip',
|
|
116
|
+
'mac11-arm64': 'builds/firefox/%s/firefox-mac-13-arm64.zip',
|
|
117
|
+
'mac12': 'builds/firefox/%s/firefox-mac-13.zip',
|
|
118
|
+
'mac12-arm64': 'builds/firefox/%s/firefox-mac-13-arm64.zip',
|
|
119
|
+
'mac13': 'builds/firefox/%s/firefox-mac-13.zip',
|
|
120
|
+
'mac13-arm64': 'builds/firefox/%s/firefox-mac-13-arm64.zip',
|
|
113
121
|
'win64': 'builds/firefox/%s/firefox-win64.zip',
|
|
114
122
|
},
|
|
115
123
|
'firefox-beta': {
|
|
@@ -124,15 +132,17 @@ const DOWNLOAD_PATHS = {
|
|
|
124
132
|
'ubuntu22.04-arm64': 'builds/firefox-beta/%s/firefox-beta-ubuntu-22.04-arm64.zip',
|
|
125
133
|
'debian11': 'builds/firefox-beta/%s/firefox-beta-debian-11.zip',
|
|
126
134
|
'debian11-arm64': 'builds/firefox-beta/%s/firefox-beta-debian-11-arm64.zip',
|
|
127
|
-
'
|
|
128
|
-
'
|
|
129
|
-
'mac10.
|
|
130
|
-
'
|
|
131
|
-
'
|
|
132
|
-
'
|
|
133
|
-
'
|
|
134
|
-
'
|
|
135
|
-
'
|
|
135
|
+
'debian12': undefined,
|
|
136
|
+
'debian12-arm64': undefined,
|
|
137
|
+
'mac10.13': 'builds/firefox-beta/%s/firefox-beta-mac-13.zip',
|
|
138
|
+
'mac10.14': 'builds/firefox-beta/%s/firefox-beta-mac-13.zip',
|
|
139
|
+
'mac10.15': 'builds/firefox-beta/%s/firefox-beta-mac-13.zip',
|
|
140
|
+
'mac11': 'builds/firefox-beta/%s/firefox-beta-mac-13.zip',
|
|
141
|
+
'mac11-arm64': 'builds/firefox-beta/%s/firefox-beta-mac-13-arm64.zip',
|
|
142
|
+
'mac12': 'builds/firefox-beta/%s/firefox-beta-mac-13.zip',
|
|
143
|
+
'mac12-arm64': 'builds/firefox-beta/%s/firefox-beta-mac-13-arm64.zip',
|
|
144
|
+
'mac13': 'builds/firefox-beta/%s/firefox-beta-mac-13.zip',
|
|
145
|
+
'mac13-arm64': 'builds/firefox-beta/%s/firefox-beta-mac-13-arm64.zip',
|
|
136
146
|
'win64': 'builds/firefox-beta/%s/firefox-beta-win64.zip',
|
|
137
147
|
},
|
|
138
148
|
'webkit': {
|
|
@@ -147,6 +157,8 @@ const DOWNLOAD_PATHS = {
|
|
|
147
157
|
'ubuntu22.04-arm64': 'builds/webkit/%s/webkit-ubuntu-22.04-arm64.zip',
|
|
148
158
|
'debian11': 'builds/webkit/%s/webkit-debian-11.zip',
|
|
149
159
|
'debian11-arm64': 'builds/webkit/%s/webkit-debian-11-arm64.zip',
|
|
160
|
+
'debian12': undefined,
|
|
161
|
+
'debian12-arm64': undefined,
|
|
150
162
|
'mac10.13': undefined,
|
|
151
163
|
'mac10.14': 'builds/deprecated-webkit-mac-10.14/%s/deprecated-webkit-mac-10.14.zip',
|
|
152
164
|
'mac10.15': 'builds/deprecated-webkit-mac-10.15/%s/deprecated-webkit-mac-10.15.zip',
|
|
@@ -170,6 +182,8 @@ const DOWNLOAD_PATHS = {
|
|
|
170
182
|
'ubuntu22.04-arm64': 'builds/ffmpeg/%s/ffmpeg-linux-arm64.zip',
|
|
171
183
|
'debian11': 'builds/ffmpeg/%s/ffmpeg-linux.zip',
|
|
172
184
|
'debian11-arm64': 'builds/ffmpeg/%s/ffmpeg-linux-arm64.zip',
|
|
185
|
+
'debian12': 'builds/ffmpeg/%s/ffmpeg-linux.zip',
|
|
186
|
+
'debian12-arm64': 'builds/ffmpeg/%s/ffmpeg-linux-arm64.zip',
|
|
173
187
|
'mac10.13': 'builds/ffmpeg/%s/ffmpeg-mac.zip',
|
|
174
188
|
'mac10.14': 'builds/ffmpeg/%s/ffmpeg-mac.zip',
|
|
175
189
|
'mac10.15': 'builds/ffmpeg/%s/ffmpeg-mac.zip',
|
|
@@ -256,4 +270,4 @@ exports.PlaywrightBinary = PlaywrightBinary = __decorate([
|
|
|
256
270
|
(0, tegg_1.SingletonProto)(),
|
|
257
271
|
(0, AbstractBinary_1.BinaryAdapter)(Binary_1.BinaryType.Playwright)
|
|
258
272
|
], PlaywrightBinary);
|
|
259
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
273
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PlaywrightBinary.js","sourceRoot":"","sources":["../../../../../app/common/adapter/binary/PlaywrightBinary.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ export declare class TokenService extends AbstractService {
|
|
|
6
6
|
private readonly Package;
|
|
7
7
|
private readonly userRepository;
|
|
8
8
|
listTokenPackages(token: Token): Promise<PackageEntity[] | null>;
|
|
9
|
-
|
|
9
|
+
checkTokenStatus(token: Token): Promise<void>;
|
|
10
10
|
checkGranularTokenAccess(token: Token, fullname: string): Promise<boolean>;
|
|
11
11
|
getUserAndToken(authorization: string): Promise<{
|
|
12
12
|
token: Token;
|
|
@@ -33,13 +33,9 @@ let TokenService = exports.TokenService = class TokenService extends AbstractSer
|
|
|
33
33
|
}
|
|
34
34
|
return null;
|
|
35
35
|
}
|
|
36
|
-
async
|
|
37
|
-
// skip classic token
|
|
38
|
-
if (!(0, Token_1.isGranularToken)(token)) {
|
|
39
|
-
return true;
|
|
40
|
-
}
|
|
36
|
+
async checkTokenStatus(token) {
|
|
41
37
|
// check for expires
|
|
42
|
-
if ((0, dayjs_1.default)(token.expiredAt).isBefore(new Date())) {
|
|
38
|
+
if ((0, Token_1.isGranularToken)(token) && (0, dayjs_1.default)(token.expiredAt).isBefore(new Date())) {
|
|
43
39
|
throw new egg_errors_1.UnauthorizedError('Token expired');
|
|
44
40
|
}
|
|
45
41
|
token.lastUsedAt = new Date();
|
|
@@ -93,4 +89,4 @@ exports.TokenService = TokenService = __decorate([
|
|
|
93
89
|
accessLevel: tegg_1.AccessLevel.PUBLIC,
|
|
94
90
|
})
|
|
95
91
|
], TokenService);
|
|
96
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
92
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVG9rZW5TZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vYXBwL2NvcmUvc2VydmljZS9Ub2tlblNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsa0RBQTBCO0FBQzFCLHNDQUlxQjtBQUNyQixtQ0FBaUM7QUFDakMsa0VBQStEO0FBQy9ELDJDQUF5RDtBQUd6RCxnRkFBNkU7QUFDN0UsK0NBQTZEO0FBQzdELDJDQUErRDtBQUMvRCxpRUFBa0U7QUFDbEUsMkRBQXNEO0FBQ3RELDJFQUF3RTtBQUtqRSxJQUFNLFlBQVksMEJBQWxCLE1BQU0sWUFBYSxTQUFRLGlDQUFlO0lBUXhDLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxLQUFZO1FBQ3pDLElBQUksSUFBQSx1QkFBZSxFQUFDLEtBQUssQ0FBQyxFQUFFO1lBQzFCLE1BQU0sTUFBTSxHQUFHLE1BQU0sSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsRUFBRSxPQUFPLEVBQUUsS0FBSyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUM7WUFDeEUsTUFBTSxRQUFRLEdBQUcsTUFBTSxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxFQUFFLFNBQVMsRUFBRSxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUN0RixPQUFPLFFBQVEsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQywrQkFBYyxDQUFDLG9CQUFvQixDQUFDLEdBQUcsRUFBRSxpQkFBYSxDQUFDLENBQUMsQ0FBQztTQUNyRjtRQUNELE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVNLEtBQUssQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFZO1FBQ3hDLG9CQUFvQjtRQUNwQixJQUFJLElBQUEsdUJBQWUsRUFBQyxLQUFLLENBQUMsSUFBSSxJQUFBLGVBQUssRUFB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
|
|
@@ -89,7 +89,7 @@ let UserRoleManager = exports.UserRoleManager = class UserRoleManager {
|
|
|
89
89
|
return null;
|
|
90
90
|
}
|
|
91
91
|
// check token expired & set lastUsedAt
|
|
92
|
-
await this.tokenService.
|
|
92
|
+
await this.tokenService.checkTokenStatus(authorizedUserAndToken.token);
|
|
93
93
|
this.currentAuthorizedToken = authorizedUserAndToken.token;
|
|
94
94
|
this.currentAuthorizedUser = authorizedUserAndToken.user;
|
|
95
95
|
ctx.userId = authorizedUserAndToken.user.userId;
|
|
@@ -186,4 +186,4 @@ exports.UserRoleManager = UserRoleManager = __decorate([
|
|
|
186
186
|
accessLevel: tegg_1.AccessLevel.PRIVATE,
|
|
187
187
|
})
|
|
188
188
|
], UserRoleManager);
|
|
189
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
189
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVXNlclJvbGVNYW5hZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vYXBwL3BvcnQvVXNlclJvbGVNYW5hZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7OztBQUFBLHNDQUtxQjtBQUVyQiwyQ0FBK0Q7QUFDL0QsdUVBQW9FO0FBSXBFLHVEQUF3RDtBQUN4RCxtRkFBZ0Y7QUFDaEYsK0RBQTREO0FBU3JELElBQU0sZUFBZSw2QkFBckIsTUFBTSxlQUFlO0lBQXJCO1FBWUcscUJBQWdCLEdBQUcsS0FBSyxDQUFDO0lBeUpuQyxDQUFDO0lBckpDLHVCQUF1QjtJQUN2QiwwQkFBMEI7SUFDMUIsdUNBQXVDO0lBQ3ZDLHFDQUFxQztJQUNyQyxnRUFBZ0U7SUFDekQsS0FBSyxDQUFDLGtCQUFrQixDQUFDLEdBQWUsRUFBRSxRQUFnQjtRQUUvRCxNQUFNLElBQUksR0FBRyxNQUFNLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxHQUFHLEVBQUUsU0FBUyxDQUFDLENBQUM7UUFFL0QsMEJBQTBCO1FBQzFCLE1BQU0sT0FBTyxHQUFHLE1BQU0sSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUN4QyxJQUFJLE9BQU8sRUFBRTtZQUNYLE9BQU8sSUFBSSxDQUFDO1NBQ2I7UUFFRCx3Q0FBd0M7UUFDeEMsTUFBTSxzQkFBc0IsR0FBRyxNQUFNLElBQUksQ0FBQyx5QkFBeUIsQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUN6RSxNQUFNLEVBQUUsS0FBSyxFQUFFLEdBQUcsc0JBQXVCLENBQUM7UUFDMUMsTUFBTSxJQUFJLENBQUMsWUFBWSxDQUFDLHdCQUF3QixDQUFDLEtBQUssRUFBRSxRQUFRLENBQUMsQ0FBQztRQUVsRSx1Q0FBdUM7UUFDdkMsTUFBTSxDQUFFLEtBQUssRUFBRSxJQUFJLENBQUUsR0FBRyxJQUFBLDZCQUFlLEVBQUMsUUFBUSxDQUFDLENBQUM7UUFDbEQsTUFBTSxHQUFHLEdBQUcsTUFBTSxJ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
|