@silexlabs/silex 3.0.0-alpha.42 → 3.0.0-alpha.44

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.
Files changed (116) hide show
  1. package/dist/client/client/api.d.ts +6 -6
  2. package/dist/client/client/config.d.ts +26 -211
  3. package/dist/client/client/events.d.ts +14 -0
  4. package/dist/client/client/expose.d.ts +1 -2
  5. package/dist/client/client/grapesjs/LoginDialog.d.ts +1 -0
  6. package/dist/client/client/grapesjs/index.d.ts +3 -209
  7. package/dist/client/client/index.d.ts +1 -0
  8. package/dist/client/constants.d.ts +2 -3
  9. package/dist/client/css/admin.css +7 -0
  10. package/dist/client/js/main.js +51 -51
  11. package/dist/client/types.d.ts +7 -1
  12. package/dist/plugins/client/client/events.d.ts +14 -0
  13. package/dist/plugins/client/client/events.js +32 -0
  14. package/dist/plugins/client/client/events.js.map +1 -0
  15. package/dist/plugins/client/page.d.ts +2 -0
  16. package/dist/plugins/client/{events.js → page.js} +15 -11
  17. package/dist/plugins/client/page.js.map +1 -0
  18. package/dist/plugins/client/plugins/client/publicationRenderer.d.ts +2 -0
  19. package/dist/plugins/client/plugins/client/publicationRenderer.js +128 -0
  20. package/dist/plugins/client/plugins/client/publicationRenderer.js.map +1 -0
  21. package/dist/plugins/client/plugins/client/template.js +4 -4
  22. package/dist/plugins/client/plugins/client/template.js.map +1 -1
  23. package/dist/plugins/client/types.d.ts +315 -0
  24. package/dist/plugins/client/types.js +57 -0
  25. package/dist/plugins/client/types.js.map +1 -0
  26. package/dist/plugins/server/constants.d.ts +2 -3
  27. package/dist/plugins/server/constants.js +3 -4
  28. package/dist/plugins/server/constants.js.map +1 -1
  29. package/dist/plugins/server/plugins/server/FtpConnector.d.ts +17 -28
  30. package/dist/plugins/server/plugins/server/FtpConnector.js +17 -16
  31. package/dist/plugins/server/plugins/server/FtpConnector.js.map +1 -1
  32. package/dist/plugins/server/plugins/server/GitlabConnector.d.ts +81 -0
  33. package/dist/plugins/server/plugins/server/GitlabConnector.js +373 -0
  34. package/dist/plugins/server/plugins/server/GitlabConnector.js.map +1 -0
  35. package/dist/plugins/server/plugins/server/HooksPlugin.js +8 -8
  36. package/dist/plugins/server/plugins/server/HooksPlugin.js.map +1 -1
  37. package/dist/plugins/server/plugins/server/PublicationOptimizer.d.ts +0 -0
  38. package/dist/plugins/server/plugins/server/PublicationOptimizer.js +14 -0
  39. package/dist/plugins/server/plugins/server/PublicationOptimizer.js.map +1 -0
  40. package/dist/plugins/server/plugins/server/SslPlugin.js +2 -2
  41. package/dist/plugins/server/plugins/server/SslPlugin.js.map +1 -1
  42. package/dist/plugins/server/plugins/server/StaticPlugin.js +2 -2
  43. package/dist/plugins/server/plugins/server/StaticPlugin.js.map +1 -1
  44. package/dist/plugins/server/server/config.d.ts +18 -18
  45. package/dist/plugins/server/server/config.js +79 -81
  46. package/dist/plugins/server/server/config.js.map +1 -1
  47. package/dist/plugins/server/server/connectors/FsStorage.d.ts +13 -11
  48. package/dist/plugins/server/server/connectors/FsStorage.js +31 -14
  49. package/dist/plugins/server/server/connectors/FsStorage.js.map +1 -1
  50. package/dist/plugins/server/server/connectors/connectors.d.ts +5 -2
  51. package/dist/plugins/server/server/connectors/connectors.js +32 -3
  52. package/dist/plugins/server/server/connectors/connectors.js.map +1 -1
  53. package/dist/plugins/server/server/events.d.ts +26 -0
  54. package/dist/plugins/server/server/events.js +15 -0
  55. package/dist/plugins/server/server/events.js.map +1 -0
  56. package/dist/plugins/server/types.d.ts +7 -1
  57. package/dist/plugins/server/types.js +10 -1
  58. package/dist/plugins/server/types.js.map +1 -1
  59. package/dist/server/constants.js +3 -4
  60. package/dist/server/server/api/connectorApi.js +16 -11
  61. package/dist/server/server/api/publicationApi.js +26 -28
  62. package/dist/server/server/api/websiteApi.js +46 -41
  63. package/dist/server/server/cli.js +36 -18
  64. package/dist/server/server/config.js +63 -66
  65. package/dist/server/server/connectors/FsStorage.js +28 -14
  66. package/dist/server/server/connectors/connectors.js +27 -3
  67. package/dist/server/server/events.js +14 -0
  68. package/dist/server/server/expose.js +27 -0
  69. package/dist/server/server/express.js +3 -3
  70. package/dist/server/server/index.js +34 -4
  71. package/dist/server/types.js +10 -1
  72. package/package.json +6 -3
  73. package/src/css/_variables.scss +1 -0
  74. package/src/css/grapesjs.scss +5 -0
  75. package/src/css/loader.scss +2 -0
  76. package/src/ts/client/api.ts +8 -11
  77. package/src/ts/client/config.ts +30 -14
  78. package/src/ts/client/events.ts +31 -0
  79. package/src/ts/client/expose.ts +1 -2
  80. package/src/ts/client/grapesjs/LoginDialog.ts +12 -1
  81. package/src/ts/client/grapesjs/PublicationManager.ts +10 -10
  82. package/src/ts/client/grapesjs/eleventy.ts +2 -2
  83. package/src/ts/client/grapesjs/index.ts +8 -13
  84. package/src/ts/client/grapesjs/storage.ts +18 -10
  85. package/src/ts/client/index.ts +35 -16
  86. package/src/ts/constants.ts +2 -3
  87. package/src/ts/plugins/client/publicationRenderer.ts +128 -0
  88. package/src/ts/plugins/client/template.ts +4 -4
  89. package/src/ts/plugins/server/FtpConnector.test.ts +82 -0
  90. package/src/ts/plugins/server/FtpConnector.ts +31 -37
  91. package/src/ts/plugins/server/GitlabConnector.ts +434 -0
  92. package/src/ts/plugins/server/HooksPlugin.ts +8 -9
  93. package/src/ts/plugins/server/PublicationOptimizer.ts +14 -0
  94. package/src/ts/plugins/server/SslPlugin.ts +2 -2
  95. package/src/ts/plugins/server/StaticPlugin.ts +2 -2
  96. package/src/ts/server/api/connectorApi.ts +32 -27
  97. package/src/ts/server/api/publicationApi.ts +35 -48
  98. package/src/ts/server/api/websiteApi.ts +67 -45
  99. package/src/ts/server/cli.ts +25 -13
  100. package/src/ts/server/config.ts +80 -79
  101. package/src/ts/server/connectors/FsStorage.test.ts +51 -0
  102. package/src/ts/server/connectors/FsStorage.ts +45 -24
  103. package/src/ts/server/connectors/connectors.ts +35 -5
  104. package/src/ts/server/events.ts +20 -0
  105. package/src/ts/{events.ts → server/expose.ts} +2 -10
  106. package/src/ts/server/express.ts +3 -3
  107. package/src/ts/server/index.ts +36 -10
  108. package/src/ts/types.ts +10 -1
  109. package/.silex/default/website.json +0 -1
  110. package/dist/client/events.d.ts +0 -10
  111. package/dist/plugins/client/events.d.ts +0 -10
  112. package/dist/plugins/client/events.js.map +0 -1
  113. package/dist/plugins/server/events.d.ts +0 -10
  114. package/dist/plugins/server/events.js +0 -30
  115. package/dist/plugins/server/events.js.map +0 -1
  116. package/dist/server/events.js +0 -13
@@ -0,0 +1,373 @@
1
+ "use strict";
2
+ /*
3
+ * Silex website builder, free/libre no-code tool for makers.
4
+ * Copyright (c) 2023 lexoyo and Silex Labs foundation
5
+ *
6
+ * This program is free software: you can redistribute it and/or modify
7
+ * it under the terms of the GNU Affero General Public License as published by
8
+ * the Free Software Foundation, either version 3 of the License, or any later version.
9
+ *
10
+ * This program is distributed in the hope that it will be useful,
11
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
12
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13
+ * GNU Affero General Public License for more details.
14
+ *
15
+ * You should have received a copy of the GNU Affero General Public License
16
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
17
+ */
18
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
19
+ if (k2 === undefined) k2 = k;
20
+ var desc = Object.getOwnPropertyDescriptor(m, k);
21
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
22
+ desc = { enumerable: true, get: function() { return m[k]; } };
23
+ }
24
+ Object.defineProperty(o, k2, desc);
25
+ }) : (function(o, m, k, k2) {
26
+ if (k2 === undefined) k2 = k;
27
+ o[k2] = m[k];
28
+ }));
29
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
30
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
31
+ }) : function(o, v) {
32
+ o["default"] = v;
33
+ });
34
+ var __importStar = (this && this.__importStar) || function (mod) {
35
+ if (mod && mod.__esModule) return mod;
36
+ var result = {};
37
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
38
+ __setModuleDefault(result, mod);
39
+ return result;
40
+ };
41
+ var __importDefault = (this && this.__importDefault) || function (mod) {
42
+ return (mod && mod.__esModule) ? mod : { "default": mod };
43
+ };
44
+ Object.defineProperty(exports, "__esModule", { value: true });
45
+ const constants_1 = require("../../constants");
46
+ const connectors_1 = require("../../server/connectors/connectors");
47
+ const types_1 = require("../../types");
48
+ const node_fetch_1 = __importDefault(require("node-fetch"));
49
+ const crypto_1 = __importStar(require("crypto"));
50
+ async function wait(ms) {
51
+ return new Promise(resolve => setTimeout(resolve, ms));
52
+ }
53
+ class GitlabConnector {
54
+ config;
55
+ connectorId = 'gitlab';
56
+ connectorType = types_1.ConnectorType.STORAGE;
57
+ displayName = 'GitLab';
58
+ icon = 'http://gitlab.lcqb.upmc.fr/assets/favicon-075eba76312e8421991a0c1f89a89ee81678bcde72319dd3e8047e2a47cd3a42.ico';
59
+ disableLogout = false;
60
+ color = '#ffffff';
61
+ background = '#FC6D26';
62
+ options;
63
+ constructor(config, opts) {
64
+ this.config = config;
65
+ this.options = {
66
+ branch: 'main',
67
+ assetsFolder: '',
68
+ ...opts,
69
+ };
70
+ if (!this.options.clientId)
71
+ throw new Error('Missing Gitlab client ID');
72
+ if (!this.options.clientSecret)
73
+ throw new Error('Missing Gitlab client secret');
74
+ }
75
+ // **
76
+ // Convenience methods for the Gitlab API
77
+ getAssetPath(path) {
78
+ return `${this.options.assetsFolder}${path}`;
79
+ }
80
+ async createFile(session, websiteId, path, content, isBase64 = false) {
81
+ // Remove leading slash
82
+ const safePath = path.replace(/^\//, '');
83
+ return this.callApi(session, `api/v4/projects/${websiteId}/repository/files/${safePath}`, 'POST', {
84
+ id: websiteId,
85
+ branch: this.options.branch,
86
+ content,
87
+ commit_message: `Create file ${path} from Silex`,
88
+ encoding: isBase64 ? 'base64' : undefined,
89
+ });
90
+ }
91
+ async updateFile(session, websiteId, path, content, isBase64 = false) {
92
+ // Remove leading slash
93
+ const safePath = path.replace(/^\//, '');
94
+ return this.callApi(session, `api/v4/projects/${websiteId}/repository/files/${safePath}`, 'PUT', {
95
+ id: websiteId,
96
+ branch: this.options.branch,
97
+ content: await (0, connectors_1.contentToString)(content),
98
+ commit_message: `Update website asset ${path} from Silex`,
99
+ encoding: isBase64 ? 'base64' : undefined,
100
+ });
101
+ }
102
+ async callApi(session, path, method = 'GET', body = null, params = {}) {
103
+ const token = session?.gitlab?.token;
104
+ const tokenParam = token ? `access_token=${token.access_token}&` : '';
105
+ const paramsStr = Object.entries(params).map(([k, v]) => `${k}=${encodeURIComponent(v.toString())}`).join('&');
106
+ const url = `https://gitlab.com/${path}?${tokenParam}${paramsStr}`;
107
+ const response = await (0, node_fetch_1.default)(url, {
108
+ method,
109
+ headers: {
110
+ 'Content-Type': 'application/json',
111
+ },
112
+ body: body ? JSON.stringify(body) : undefined
113
+ });
114
+ let json;
115
+ // Handle the case when the server returns an non-JSON response (e.g. 400 Bad Request)
116
+ const text = await response.text();
117
+ try {
118
+ json = JSON.parse(text);
119
+ }
120
+ catch (e) {
121
+ if (!response.ok) {
122
+ // A real error
123
+ throw e;
124
+ }
125
+ else {
126
+ // Useless error linked to the fact that the response is not JSON
127
+ //console.error('Gitlab API error - could not parse response', response.status, response.statusText, {url, method, body, params, text})
128
+ return text;
129
+ }
130
+ }
131
+ if (!response.ok) {
132
+ if (response.status === 401 && session?.gitlab?.token?.refresh_token) {
133
+ // Refresh the token
134
+ const token = session?.gitlab?.token;
135
+ const body = {
136
+ grant_type: 'refresh_token',
137
+ refresh_token: token.refresh_token,
138
+ client_id: this.options.clientId,
139
+ client_secret: this.options.clientSecret,
140
+ };
141
+ const response = await (0, node_fetch_1.default)('https://gitlab.com/oauth/token', {
142
+ method: 'POST',
143
+ headers: {
144
+ 'Content-Type': 'application/json',
145
+ },
146
+ body: JSON.stringify(body)
147
+ });
148
+ const refreshJson = await response.json();
149
+ if (response.ok) {
150
+ session.gitlab.token = {
151
+ ...token,
152
+ ...refreshJson,
153
+ };
154
+ return await this.callApi(session, path, method, body, params);
155
+ }
156
+ else {
157
+ //console.error('Gitlab API error - could not refresh token', response.status, response.statusText, { url, method, body, params, refreshJson })
158
+ throw new types_1.ApiError(`Gitlab API error: ${refreshJson?.message ?? response.statusText}`, response.status);
159
+ }
160
+ }
161
+ else {
162
+ //console.error('Gitlab API error', response.status, response.statusText, { url, method, body, params, json })
163
+ throw new types_1.ApiError(`Gitlab API error: ${json?.message ?? json?.error ?? response.statusText}`, response.status);
164
+ }
165
+ }
166
+ return json;
167
+ }
168
+ generateCodeVerifier() {
169
+ return crypto_1.default.randomBytes(64).toString('base64')
170
+ .replace(/\+/g, '-')
171
+ .replace(/\//g, '_')
172
+ .replace(/=/g, '')
173
+ .substr(0, 128);
174
+ }
175
+ async generateCodeChallenge(verifier) {
176
+ const hashed = (0, crypto_1.createHash)('sha256').update(verifier).digest();
177
+ let base64Url = hashed.toString('base64');
178
+ // Replace '+' with '-', '/' with '_', and remove '='
179
+ base64Url = base64Url.replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '');
180
+ return base64Url;
181
+ }
182
+ getRedirect() {
183
+ const params = `connectorId=${this.connectorId}&type=${this.connectorType}`;
184
+ return `${this.config.url}${constants_1.API_PATH}${constants_1.API_CONNECTOR_PATH}${constants_1.API_CONNECTOR_LOGIN_CALLBACK}?${params}`;
185
+ }
186
+ /**
187
+ * Get the OAuth URL to redirect the user to
188
+ * The URL should look like
189
+ * https://gitlab.example.com/oauth/authorize?client_id=APP_ID&redirect_uri=REDIRECT_URI&response_type=code&state=STATE&scope=REQUESTED_SCOPES&code_challenge=CODE_CHALLENGE&code_challenge_method=S256
190
+ * OAuth2 Step #1 from https://docs.gitlab.com/ee/api/oauth2.html#authorization-code-with-proof-key-for-code-exchange-pkce
191
+ */
192
+ async getOAuthUrl(session) {
193
+ const redirect_uri = encodeURIComponent(this.getRedirect());
194
+ const state = Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15);
195
+ const codeVerifier = this.generateCodeVerifier();
196
+ // Create the code challenge
197
+ const codeChallenge = await this.generateCodeChallenge(codeVerifier);
198
+ // Store the code verifier and code challenge in the session
199
+ session.gitlab = {
200
+ ...session.gitlab,
201
+ state,
202
+ codeVerifier,
203
+ codeChallenge,
204
+ };
205
+ const scope = 'api+read_api+read_user+read_repository+write_repository+email+sudo+profile+openid';
206
+ return `https://gitlab.com/oauth/authorize?client_id=${this.options.clientId}&redirect_uri=${redirect_uri}&response_type=code&state=${session.gitlab.state}&scope=${scope}&code_challenge=${codeChallenge}&code_challenge_method=S256`;
207
+ }
208
+ getOptions(formData) {
209
+ return {}; // FIXME: store branch
210
+ }
211
+ async getLoginForm(session, redirectTo) {
212
+ return null;
213
+ }
214
+ async getSettingsForm(session, redirectTo) {
215
+ return null;
216
+ }
217
+ async isLoggedIn(session) {
218
+ return !!session?.gitlab?.token;
219
+ }
220
+ /**
221
+ * Get the token from return code
222
+ * Set the token in the session
223
+ * OAuth2 Step #2 from https://docs.gitlab.com/ee/api/oauth2.html#authorization-code-with-proof-key-for-code-exchange-pkce
224
+ */
225
+ async setToken(session, loginResult) {
226
+ if (!loginResult.state || loginResult.state !== session.gitlab?.state)
227
+ throw new types_1.ApiError('Invalid state', 401);
228
+ if (!session.gitlab?.codeVerifier)
229
+ throw new types_1.ApiError('Missing code verifier', 401);
230
+ if (!session.gitlab?.codeChallenge)
231
+ throw new types_1.ApiError('Missing code challenge', 401);
232
+ const token = await (0, node_fetch_1.default)('https://gitlab.com/oauth/token', {
233
+ method: 'POST',
234
+ headers: {
235
+ 'Content-Type': 'application/json',
236
+ },
237
+ body: JSON.stringify({
238
+ client_id: this.options.clientId,
239
+ client_secret: this.options.clientSecret,
240
+ code: loginResult.code,
241
+ grant_type: 'authorization_code',
242
+ redirect_uri: this.getRedirect(),
243
+ code_verifier: session.gitlab.codeVerifier,
244
+ }),
245
+ })
246
+ .then((response) => response.json());
247
+ session.gitlab = { token, state: session.gitlab.state, codeVerifier: session.gitlab.codeVerifier, codeChallenge: session.gitlab.codeChallenge };
248
+ // We need to get the user ID for listWebsites
249
+ const user = await this.callApi(session, 'api/v4/user');
250
+ session.gitlab.userId = user.id;
251
+ }
252
+ async logout(session) {
253
+ delete session.gitlab;
254
+ }
255
+ async getUser(session) {
256
+ const user = await this.callApi(session, 'api/v4/user');
257
+ return {
258
+ name: user.name,
259
+ email: user.email,
260
+ storage: await (0, connectors_1.toConnectorData)(session, this),
261
+ };
262
+ }
263
+ async listWebsites(session) {
264
+ const projects = await this.callApi(session, `api/v4/users/${session.gitlab?.userId}/projects`);
265
+ return projects.map(p => ({
266
+ websiteId: p.id,
267
+ name: p.name,
268
+ createdAt: p.created_at,
269
+ updatedAt: p.last_activity_at,
270
+ connectorUserSettings: {},
271
+ }));
272
+ }
273
+ async readWebsite(session, websiteId) {
274
+ const result = await this.callApi(session, `api/v4/projects/${websiteId}/repository/files/${constants_1.WEBSITE_DATA_FILE}`, 'GET', null, {
275
+ ref: this.options.branch,
276
+ });
277
+ const { content } = result;
278
+ const contentDecoded = Buffer.from(content, 'base64').toString('utf8');
279
+ const websiteData = JSON.parse(contentDecoded);
280
+ return websiteData;
281
+ }
282
+ async createWebsite(session, websiteMeta) {
283
+ const project = await this.callApi(session, 'api/v4/projects/', 'POST', {
284
+ name: websiteMeta.name,
285
+ });
286
+ await this.createFile(session, project.id, constants_1.WEBSITE_DATA_FILE, JSON.stringify({}));
287
+ await this.createFile(session, project.id, constants_1.WEBSITE_META_DATA_FILE, JSON.stringify(websiteMeta));
288
+ //await this.updateWebsite(session, project.id, {} as WebsiteData)
289
+ //await this.setWebsiteMeta(session, project.id, websiteMeta)
290
+ return project.id;
291
+ }
292
+ async updateWebsite(session, websiteId, websiteData) {
293
+ const project = await this.callApi(session, `api/v4/projects/${websiteId}/repository/files/${constants_1.WEBSITE_DATA_FILE}`, 'PUT', {
294
+ branch: this.options.branch,
295
+ commit_message: 'Update website data from Silex',
296
+ content: JSON.stringify(websiteData),
297
+ file_path: constants_1.WEBSITE_DATA_FILE,
298
+ id: websiteId,
299
+ });
300
+ }
301
+ async deleteWebsite(session, websiteId) {
302
+ await this.callApi(session, `api/v4/projects/${websiteId}`, 'DELETE');
303
+ }
304
+ async getWebsiteMeta(session, websiteId) {
305
+ const project = await this.callApi(session, `api/v4/projects/${websiteId}/repository/files/${constants_1.WEBSITE_META_DATA_FILE}`);
306
+ return {
307
+ websiteId: project.id,
308
+ name: project.name,
309
+ createdAt: project.created_at,
310
+ updatedAt: project.last_activity_at,
311
+ connectorUserSettings: {},
312
+ };
313
+ }
314
+ async setWebsiteMeta(session, websiteId, websiteMeta) {
315
+ const project = await this.callApi(session, `api/v4/projects/${websiteId}/repository/files/${constants_1.WEBSITE_META_DATA_FILE}`, 'PUT', {
316
+ branch: this.options.branch,
317
+ commit_message: 'Update website meta data from Silex',
318
+ content: JSON.stringify(websiteMeta),
319
+ file_path: constants_1.WEBSITE_META_DATA_FILE,
320
+ id: websiteId,
321
+ });
322
+ }
323
+ async writeAssets(session, websiteId, files, status) {
324
+ // For each file
325
+ for (const file of files) {
326
+ // Convert to base64
327
+ const content = (await (0, connectors_1.contentToBuffer)(file.content)).toString('base64');
328
+ try {
329
+ await this.updateFile(session, websiteId, this.getAssetPath(file.path), content, true);
330
+ }
331
+ catch (e) {
332
+ // If the file does not exist, create it
333
+ if (e.statusCode === 404 || e.message.endsWith('A file with this name doesn\'t exist')) {
334
+ await this.createFile(session, websiteId, file.path, content, true);
335
+ }
336
+ else {
337
+ throw e;
338
+ }
339
+ }
340
+ }
341
+ }
342
+ async readAsset(session, websiteId, fileName) {
343
+ // Remove leading slash
344
+ const finalPath = this.getAssetPath(fileName);
345
+ // Call the API
346
+ const url = `https://gitlab.com/api/v4/projects/${websiteId}/repository/files/${finalPath}?ref=${this.options.branch}&access_token=${session.gitlab?.token?.access_token}`;
347
+ const response = await (0, node_fetch_1.default)(url, {
348
+ method: 'GET',
349
+ headers: {
350
+ 'Content-Type': 'application/json',
351
+ },
352
+ });
353
+ const json = await response.json();
354
+ if (!response.ok)
355
+ throw new types_1.ApiError(`Gitlab API error: ${json?.message ?? json?.error ?? response.statusText}`, response.status);
356
+ // From base64 string to buffer
357
+ const buf = Buffer.from(json.content, 'base64');
358
+ return buf;
359
+ }
360
+ async deleteAssets(session, websiteId, fileNames) {
361
+ return this.callApi(session, `api/v4/projects/${websiteId}/repository/commits`, 'POST', {
362
+ id: websiteId,
363
+ branch: this.options.branch,
364
+ commit_message: `Delete assets from Silex: ${fileNames.join(', ')}`,
365
+ actions: fileNames.map(f => ({
366
+ action: 'delete',
367
+ file_path: this.getAssetPath(f),
368
+ })),
369
+ });
370
+ }
371
+ }
372
+ exports.default = GitlabConnector;
373
+ //# sourceMappingURL=GitlabConnector.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"GitlabConnector.js","sourceRoot":"","sources":["../../../../../src/ts/plugins/server/GitlabConnector.ts"],"names":[],"mappings":"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"}
@@ -20,36 +20,36 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
20
20
  };
21
21
  Object.defineProperty(exports, "__esModule", { value: true });
22
22
  const node_fetch_1 = __importDefault(require("node-fetch"));
23
- const events_1 = require("../../events");
24
- const rootPath = process.env.DATA_FOLDER;
23
+ const events_1 = require("../../server/events");
25
24
  // **********
26
25
  throw new Error('TODO: implement hooks plugin');
27
- function projectPath(projectId) { return `${rootPath}/${projectId}`; }
28
26
  // **********
29
27
  async function default_1(config, opts = {}) {
30
28
  // Options with defaults
31
29
  const options = {
32
30
  gitUrl: process.env.SILEX_HOOK_GIT,
33
31
  buildUrl: process.env.SILEX_HOOK_BUILD,
32
+ websitePath: process.env.DATA_FOLDER,
33
+ assetsPath: process.env.ASSETS_FOLDER,
34
34
  ...opts
35
35
  };
36
- config.on(events_1.EVENT_WRITE_END, async ({ res, req, projectId, data }) => {
36
+ config.on(events_1.ServerEvent.WEBSITE_STORE_END, async ({ res, req, projectId, data }) => {
37
37
  if (options.gitUrl) {
38
38
  await hook(options.gitUrl, {
39
- path: projectPath(projectId),
39
+ path: options.websitePath,
40
40
  message: 'Change from Silex',
41
41
  });
42
42
  }
43
43
  });
44
- config.on(events_1.EVENT_ASSET_WRITE_END, async ({ res, req, projectId, uploadDir, form, data }) => {
44
+ config.on(events_1.ServerEvent.WEBSITE_ASSET_STORE_END, async (e) => {
45
45
  if (options.gitUrl) {
46
46
  await hook(options.gitUrl, {
47
- path: projectPath(projectId),
47
+ path: options.assetsPath,
48
48
  message: 'Change from Silex',
49
49
  });
50
50
  }
51
51
  });
52
- config.on(events_1.EVENT_PUBLISH_END, async ({ projectId, files, req, res }) => {
52
+ config.on(events_1.ServerEvent.PUBLISH_END, async ({ projectId, files, req, res }) => {
53
53
  if (options.buildUrl) {
54
54
  await hook(options.buildUrl);
55
55
  }
@@ -1 +1 @@
1
- {"version":3,"file":"HooksPlugin.js","sourceRoot":"","sources":["../../../../../src/ts/plugins/server/HooksPlugin.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;;;;;AAEH,4DAA8B;AAE9B,yCAAwF;AAOxF,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,CAAA;AAExC,aAAa;AACb,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;AAC/C,SAAS,WAAW,CAAC,SAAiB,IAAI,OAAO,GAAG,QAAQ,IAAI,SAAS,EAAE,CAAA,CAAC,CAAC;AAC7E,aAAa;AAEE,KAAK,oBAAU,MAAoB,EAAE,OAAqB,EAAE;IACzE,wBAAwB;IACxB,MAAM,OAAO,GAAG;QACd,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;QAClC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB;QACtC,GAAG,IAAI;KACR,CAAA;IACD,MAAM,CAAC,EAAE,CAAC,wBAAe,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,EAAE;QACjE,IAAG,OAAO,CAAC,MAAM,EAAE;YACjB,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;gBACzB,IAAI,EAAE,WAAW,CAAC,SAAS,CAAC;gBAC5B,OAAO,EAAE,mBAAmB;aAC7B,CAAC,CAAA;SACH;IACH,CAAC,CAAC,CAAA;IACF,MAAM,CAAC,EAAE,CAAC,8BAAqB,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;QACxF,IAAG,OAAO,CAAC,MAAM,EAAE;YACjB,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;gBACzB,IAAI,EAAE,WAAW,CAAC,SAAS,CAAC;gBAC5B,OAAO,EAAE,mBAAmB;aAC7B,CAAC,CAAA;SACH;IACH,CAAC,CAAC,CAAA;IACF,MAAM,CAAC,EAAE,CAAC,0BAAiB,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE;QACpE,IAAG,OAAO,CAAC,QAAQ,EAAE;YACnB,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;SAC7B;IACH,CAAC,CAAC,CAAA;AACJ,CAAC;AA5BD,4BA4BC;AAED,KAAK,UAAU,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,EAAE;IAClC,IAAG,GAAG,EAAE;QACN,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAA;QAC3B,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,EAAC,GAAG,EAAC,CAAC,CAAA;QAClC,IAAI;YACF,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;iBAChB,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;YAC/D,OAAO,IAAA,oBAAK,EAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAA;SAChC;QAAC,OAAM,KAAK,EAAE;YACb,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,EAAC,GAAG,EAAE,KAAK,EAAC,CAAC,CAAA;YAC7C,OAAO,IAAI,CAAA;SACZ;KACF;AACH,CAAC"}
1
+ {"version":3,"file":"HooksPlugin.js","sourceRoot":"","sources":["../../../../../src/ts/plugins/server/HooksPlugin.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;;;;;AAEH,4DAA8B;AAE9B,gDAAgF;AAOhF,aAAa;AACb,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;AAC/C,aAAa;AAEE,KAAK,oBAAU,MAAoB,EAAE,OAAqB,EAAE;IACzE,wBAAwB;IACxB,MAAM,OAAO,GAAG;QACd,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;QAClC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB;QACtC,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW;QACpC,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa;QACrC,GAAG,IAAI;KACR,CAAA;IACD,MAAM,CAAC,EAAE,CAAC,oBAAW,CAAC,iBAAiB,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,EAAE;QAC/E,IAAG,OAAO,CAAC,MAAM,EAAE;YACjB,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;gBACzB,IAAI,EAAE,OAAO,CAAC,WAAW;gBACzB,OAAO,EAAE,mBAAmB;aAC7B,CAAC,CAAA;SACH;IACH,CAAC,CAAC,CAAA;IACF,MAAM,CAAC,EAAE,CAAC,oBAAW,CAAC,uBAAuB,EAAE,KAAK,EAAE,CAAgC,EAAE,EAAE;QACxF,IAAG,OAAO,CAAC,MAAM,EAAE;YACjB,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;gBACzB,IAAI,EAAE,OAAO,CAAC,UAAU;gBACxB,OAAO,EAAE,mBAAmB;aAC7B,CAAC,CAAA;SACH;IACH,CAAC,CAAC,CAAA;IACF,MAAM,CAAC,EAAE,CAAC,oBAAW,CAAC,WAAW,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE;QAC1E,IAAG,OAAO,CAAC,QAAQ,EAAE;YACnB,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;SAC7B;IACH,CAAC,CAAC,CAAA;AACJ,CAAC;AA9BD,4BA8BC;AAED,KAAK,UAAU,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,EAAE;IAClC,IAAG,GAAG,EAAE;QACN,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAA;QAC3B,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,EAAC,GAAG,EAAC,CAAC,CAAA;QAClC,IAAI;YACF,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;iBAChB,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;YAC/D,OAAO,IAAA,oBAAK,EAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAA;SAChC;QAAC,OAAM,KAAK,EAAE;YACb,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,EAAC,GAAG,EAAE,KAAK,EAAC,CAAC,CAAA;YAC7C,OAAO,IAAI,CAAA;SACZ;KACF;AACH,CAAC"}
@@ -0,0 +1,14 @@
1
+ //import { minify } from 'html-minifier'
2
+ //const optim = files.map(file => ({
3
+ // ...file,
4
+ // html: minify(file.html, {
5
+ // continueOnParseError: true,
6
+ // collapseInlineTagWhitespace: true,
7
+ // collapseWhitespace: true,
8
+ // minifyCSS: true,
9
+ // minifyJS: true,
10
+ // removeScriptTypeAttributes: true,
11
+ // removeStyleLinkTypeAttributes: true,
12
+ // }).trim(),
13
+ //}))
14
+ //# sourceMappingURL=PublicationOptimizer.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"PublicationOptimizer.js","sourceRoot":"","sources":["../../../../../src/ts/plugins/server/PublicationOptimizer.ts"],"names":[],"mappings":"AACA,wCAAwC;AACxC,oCAAoC;AACpC,YAAY;AACZ,6BAA6B;AAC7B,iCAAiC;AACjC,wCAAwC;AACxC,+BAA+B;AAC/B,sBAAsB;AACtB,qBAAqB;AACrB,uCAAuC;AACvC,0CAA0C;AAC1C,cAAc;AACd,KAAK"}
@@ -23,7 +23,7 @@ const express_1 = __importDefault(require("express"));
23
23
  const fs_1 = require("fs");
24
24
  const https_1 = require("https");
25
25
  const express_force_ssl_1 = __importDefault(require("express-force-ssl"));
26
- const events_1 = require("../../events");
26
+ const events_1 = require("../../server/events");
27
27
  // interface SslOptions {
28
28
  // forceHttps?: boolean
29
29
  // trustXFPHeader?: boolean
@@ -42,7 +42,7 @@ async function default_1(config, opts = {}) {
42
42
  ...opts,
43
43
  };
44
44
  // Add routes on silex startup
45
- config.on(events_1.EVENT_STARTUP_START, ({ app }) => {
45
+ config.on(events_1.ServerEvent.STARTUP_START, ({ app }) => {
46
46
  const router = express_1.default.Router();
47
47
  // SSL
48
48
  // force ssl if the env var SILEX_FORCE_HTTPS is set
@@ -1 +1 @@
1
- {"version":3,"file":"SslPlugin.js","sourceRoot":"","sources":["../../../../../src/ts/plugins/server/SslPlugin.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;;;;;AAEH,sDAA6B;AAC7B,2BAAiC;AACjC,iCAAoC;AACpC,0EAAwC;AACxC,yCAAkD;AAElD,yBAAyB;AACzB,yBAAyB;AACzB,6BAA6B;AAC7B,wBAAwB;AACxB,yBAAyB;AACzB,qBAAqB;AACrB,IAAI;AAEW,KAAK,oBAAU,MAAM,EAAE,IAAI,GAAG,EAAE;IAC7C,wBAAwB;IACxB,MAAM,OAAO,GAAG;QACd,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,KAAK,MAAM;QACpD,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,kCAAkC,KAAK,MAAM;QACzE,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB;QAC7C,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB;QAC9C,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,KAAK;QACtC,GAAG,IAAI;KACR,CAAA;IAED,8BAA8B;IAC9B,MAAM,CAAC,EAAE,CAAC,4BAAmB,EAAE,CAAC,EAAC,GAAG,EAAC,EAAE,EAAE;QACvC,MAAM,MAAM,GAAG,iBAAO,CAAC,MAAM,EAAE,CAAA;QAE/B,MAAM;QACN,oDAAoD;QACpD,IAAI,OAAO,CAAC,UAAU,EAAE;YACtB,OAAO,CAAC,GAAG,CAAC,2CAA2C,CAAC,CAAA;YACxD,GAAG,CAAC,GAAG,CAAC,iBAAiB,EAAE;gBACzB,cAAc,EAAE,CAAC,CAAC,OAAO,CAAC,cAAc;aACzC,CAAC,CAAA;YACF,MAAM,CAAC,GAAG,CAAC,2BAAQ,CAAC,CAAA;SACrB;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,+EAA+E,CAAC,CAAA;SAC7F;QAED,kBAAkB;QAClB,IAAI,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,WAAW,EAAE;YAC7C,OAAO,CAAC,GAAG,CAAC,8DAA8D,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;YAChG,IAAI;gBACF,MAAM,UAAU,GAAG,IAAA,iBAAY,EAAC,OAAO,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,CAAA;gBAC9D,MAAM,WAAW,GAAG,IAAA,iBAAY,EAAC,OAAO,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAA;gBAEhE,MAAM,gBAAgB,GAAG;oBACvB,GAAG,EAAE,UAAU;oBACf,IAAI,EAAE,WAAW;oBACjB,WAAW,EAAE,IAAI;oBACjB,kBAAkB,EAAE,KAAK;iBAC1B,CAAA;gBAED,IAAA,oBAAY,EAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE;oBAChE,OAAO,CAAC,GAAG,CAAC,kCAAkC,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;gBAClE,CAAC,CAAC,CAAA;aACH;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,KAAK,CAAC,wCAAwC,EAAE,CAAC,CAAC,CAAA;aAC3D;SACF;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,sGAAsG,CAAC,CAAA;SACpH;QACD,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IACjB,CAAC,CAAC,CAAA;AACJ,CAAC;AApDD,4BAoDC"}
1
+ {"version":3,"file":"SslPlugin.js","sourceRoot":"","sources":["../../../../../src/ts/plugins/server/SslPlugin.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;;;;;AAEH,sDAA6B;AAC7B,2BAAiC;AACjC,iCAAoC;AACpC,0EAAwC;AACxC,gDAAiD;AAEjD,yBAAyB;AACzB,yBAAyB;AACzB,6BAA6B;AAC7B,wBAAwB;AACxB,yBAAyB;AACzB,qBAAqB;AACrB,IAAI;AAEW,KAAK,oBAAU,MAAM,EAAE,IAAI,GAAG,EAAE;IAC7C,wBAAwB;IACxB,MAAM,OAAO,GAAG;QACd,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,KAAK,MAAM;QACpD,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,kCAAkC,KAAK,MAAM;QACzE,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB;QAC7C,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB;QAC9C,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,KAAK;QACtC,GAAG,IAAI;KACR,CAAA;IAED,8BAA8B;IAC9B,MAAM,CAAC,EAAE,CAAC,oBAAW,CAAC,aAAa,EAAE,CAAC,EAAC,GAAG,EAAC,EAAE,EAAE;QAC7C,MAAM,MAAM,GAAG,iBAAO,CAAC,MAAM,EAAE,CAAA;QAE/B,MAAM;QACN,oDAAoD;QACpD,IAAI,OAAO,CAAC,UAAU,EAAE;YACtB,OAAO,CAAC,GAAG,CAAC,2CAA2C,CAAC,CAAA;YACxD,GAAG,CAAC,GAAG,CAAC,iBAAiB,EAAE;gBACzB,cAAc,EAAE,CAAC,CAAC,OAAO,CAAC,cAAc;aACzC,CAAC,CAAA;YACF,MAAM,CAAC,GAAG,CAAC,2BAAQ,CAAC,CAAA;SACrB;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,+EAA+E,CAAC,CAAA;SAC7F;QAED,kBAAkB;QAClB,IAAI,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,WAAW,EAAE;YAC7C,OAAO,CAAC,GAAG,CAAC,8DAA8D,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;YAChG,IAAI;gBACF,MAAM,UAAU,GAAG,IAAA,iBAAY,EAAC,OAAO,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,CAAA;gBAC9D,MAAM,WAAW,GAAG,IAAA,iBAAY,EAAC,OAAO,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAA;gBAEhE,MAAM,gBAAgB,GAAG;oBACvB,GAAG,EAAE,UAAU;oBACf,IAAI,EAAE,WAAW;oBACjB,WAAW,EAAE,IAAI;oBACjB,kBAAkB,EAAE,KAAK;iBAC1B,CAAA;gBAED,IAAA,oBAAY,EAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE;oBAChE,OAAO,CAAC,GAAG,CAAC,kCAAkC,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;gBAClE,CAAC,CAAC,CAAA;aACH;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,KAAK,CAAC,wCAAwC,EAAE,CAAC,CAAC,CAAA;aAC3D;SACF;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,sGAAsG,CAAC,CAAA;SACpH;QACD,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IACjB,CAAC,CAAC,CAAA;AACJ,CAAC;AApDD,4BAoDC"}
@@ -24,7 +24,7 @@ const node_modules_path_1 = __importDefault(require("node_modules-path"));
24
24
  const serve_static_1 = __importDefault(require("serve-static"));
25
25
  const Cache_1 = require("./Cache");
26
26
  const path_1 = require("path");
27
- const events_1 = require("../../events");
27
+ const events_1 = require("../../server/events");
28
28
  async function default_1(config, opts = {}) {
29
29
  // Options with defaults
30
30
  const options = {
@@ -53,7 +53,7 @@ async function default_1(config, opts = {}) {
53
53
  }] : []),
54
54
  ...opts,
55
55
  };
56
- config.on(events_1.EVENT_STARTUP_START, ({ app }) => {
56
+ config.on(events_1.ServerEvent.STARTUP_START, ({ app }) => {
57
57
  const router = express_1.default.Router();
58
58
  options.routes
59
59
  .forEach(folder => {
@@ -1 +1 @@
1
- {"version":3,"file":"StaticPlugin.js","sourceRoot":"","sources":["../../../../../src/ts/plugins/server/StaticPlugin.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;;;;;AAEH,sDAA6B;AAC7B,0EAA2C;AAC3C,gEAAsC;AACtC,mCAAmC;AACnC,+BAA2B;AAC3B,yCAAkD;AASnC,KAAK,oBAAU,MAAM,EAAE,IAAI,GAAG,EAAE;IAC7C,wBAAwB;IACxB,MAAM,OAAO,GAAkB;QAC7B,MAAM,EAAE;YACN;gBACE,KAAK,EAAE,GAAG;gBACV,IAAI,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,gBAAgB,EAAE,QAAQ,CAAC;aAClD,EAAE;gBACD,KAAK,EAAE,OAAO;gBACd,IAAI,EAAE,IAAA,2BAAW,EAAC,+BAA+B,CAAC,GAAG,qCAAqC;aAC3F,EAAE;gBACD,KAAK,EAAE,YAAY;gBACnB,IAAI,EAAE,IAAA,2BAAW,EAAC,+BAA+B,CAAC,GAAG,0CAA0C;aAChG,EAAE;gBACD,KAAK,EAAE,gBAAgB;gBACvB,IAAI,EAAE,IAAA,2BAAW,GAAE;aACpB,EAAE;gBACD,KAAK,EAAE,GAAG;gBACV,IAAI,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,gBAAgB,EAAE,MAAM,EAAE,QAAQ,CAAC;aAC1D;SACF;YACD,oCAAoC;aACjC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACtB,KAAK,EAAE,GAAG;gBACV,IAAI,EAAE,IAAI;aACX,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACV,GAAG,IAAI;KACR,CAAA;IAED,MAAM,CAAC,EAAE,CAAC,4BAAmB,EAAE,CAAC,EAAC,GAAG,EAAC,EAAE,EAAE;QACvC,MAAM,MAAM,GAAG,iBAAO,CAAC,MAAM,EAAE,CAAA;QAC/B,OAAO,CAAC,MAAM;aACX,OAAO,CAAC,MAAM,CAAC,EAAE;YAChB,IAAI,CAAC,MAAM,CAAC,KAAK;gBAAE,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAA;YAC3F,IAAI,CAAC,MAAM,CAAC,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAA;YACzF,OAAO,CAAC,IAAI,CAAC,8CAA8C,MAAM,CAAC,IAAI,OAAO,MAAM,CAAC,KAAK,EAAE,CAAC,CAAA;YAC5F,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,IAAA,sBAAW,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAA;QACpD,CAAC,CAAC,CAAA;QACJ,GAAG,CAAC,GAAG,CAAC,iBAAS,EAAG,MAAM,CAAC,CAAA;IAC7B,CAAC,CAAC,CAAA;AACJ,CAAC;AAxCD,4BAwCC"}
1
+ {"version":3,"file":"StaticPlugin.js","sourceRoot":"","sources":["../../../../../src/ts/plugins/server/StaticPlugin.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;;;;;AAEH,sDAA6B;AAC7B,0EAA2C;AAC3C,gEAAsC;AACtC,mCAAmC;AACnC,+BAA2B;AAC3B,gDAAiD;AASlC,KAAK,oBAAU,MAAM,EAAE,IAAI,GAAG,EAAE;IAC7C,wBAAwB;IACxB,MAAM,OAAO,GAAkB;QAC7B,MAAM,EAAE;YACN;gBACE,KAAK,EAAE,GAAG;gBACV,IAAI,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,gBAAgB,EAAE,QAAQ,CAAC;aAClD,EAAE;gBACD,KAAK,EAAE,OAAO;gBACd,IAAI,EAAE,IAAA,2BAAW,EAAC,+BAA+B,CAAC,GAAG,qCAAqC;aAC3F,EAAE;gBACD,KAAK,EAAE,YAAY;gBACnB,IAAI,EAAE,IAAA,2BAAW,EAAC,+BAA+B,CAAC,GAAG,0CAA0C;aAChG,EAAE;gBACD,KAAK,EAAE,gBAAgB;gBACvB,IAAI,EAAE,IAAA,2BAAW,GAAE;aACpB,EAAE;gBACD,KAAK,EAAE,GAAG;gBACV,IAAI,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,gBAAgB,EAAE,MAAM,EAAE,QAAQ,CAAC;aAC1D;SACF;YACD,oCAAoC;aACjC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACtB,KAAK,EAAE,GAAG;gBACV,IAAI,EAAE,IAAI;aACX,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACV,GAAG,IAAI;KACR,CAAA;IAED,MAAM,CAAC,EAAE,CAAC,oBAAW,CAAC,aAAa,EAAE,CAAC,EAAC,GAAG,EAAC,EAAE,EAAE;QAC7C,MAAM,MAAM,GAAG,iBAAO,CAAC,MAAM,EAAE,CAAA;QAC/B,OAAO,CAAC,MAAM;aACX,OAAO,CAAC,MAAM,CAAC,EAAE;YAChB,IAAI,CAAC,MAAM,CAAC,KAAK;gBAAE,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAA;YAC3F,IAAI,CAAC,MAAM,CAAC,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAA;YACzF,OAAO,CAAC,IAAI,CAAC,8CAA8C,MAAM,CAAC,IAAI,OAAO,MAAM,CAAC,KAAK,EAAE,CAAC,CAAA;YAC5F,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,IAAA,sBAAW,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAA;QACpD,CAAC,CAAC,CAAA;QACJ,GAAG,CAAC,GAAG,CAAC,iBAAS,EAAG,MAAM,CAAC,CAAA;IAC7B,CAAC,CAAC,CAAA;AACJ,CAAC;AAxCD,4BAwCC"}
@@ -5,7 +5,7 @@
5
5
  /**
6
6
  * @class default config for Silex server
7
7
  */
8
- import { Config } from '@silexlabs/silex-plugins';
8
+ import { Config, Plugin } from '@silexlabs/silex-plugins';
9
9
  import { Application } from 'express';
10
10
  import { HostingConnector, StorageConnector } from './connectors/connectors';
11
11
  import { Connector } from './connectors/connectors';
@@ -14,10 +14,6 @@ import { ConnectorType } from '../types';
14
14
  * Config types definitions
15
15
  */
16
16
  export declare class ServerConfig extends Config {
17
- url: string;
18
- debug: boolean;
19
- port: string;
20
- apiPath: string;
21
17
  expressOptions: {
22
18
  jsonLimit: string;
23
19
  textLimit: string;
@@ -26,8 +22,12 @@ export declare class ServerConfig extends Config {
26
22
  sessionSecret: string;
27
23
  cors: string;
28
24
  };
29
- constructor(url: string, debug: boolean, port: string, apiPath: string);
30
- getConnectors<T extends Connector>(type?: ConnectorType | string | null): T[];
25
+ port: string;
26
+ debug: boolean;
27
+ url: string;
28
+ userConfigPath: Plugin | undefined;
29
+ configFilePath: Plugin;
30
+ getConnectors(type?: ConnectorType | string | null): Connector[];
31
31
  private storageConnectors;
32
32
  addStorageConnector(storage: StorageConnector | StorageConnector[]): void;
33
33
  setStorageConnectors(storageConnectors: StorageConnector[]): void;
@@ -45,15 +45,15 @@ export declare class ServerConfig extends Config {
45
45
  * This is the main config file and the user config file
46
46
  */
47
47
  loadConfigFiles(): Promise<void>;
48
+ /**
49
+ * Load user config file
50
+ * This is the config file passed as env var CONFIG
51
+ */
52
+ loadUserConfig(): Promise<void>;
53
+ /**
54
+ * Load .silex.js in the root folder
55
+ * This is the main config file
56
+ */
57
+ loadSilexConfig(): Promise<void>;
58
+ initDefaultConnectors(): Promise<void>;
48
59
  }
49
- export declare function createConfig(): ServerConfig;
50
- /**
51
- * Load user config file
52
- * This is the config file passed as env var CONFIG
53
- */
54
- export declare function loadUserConfig(config: ServerConfig): Promise<void>;
55
- /**
56
- * Load .silex.js in the root folder
57
- * This is the main config file
58
- */
59
- export declare function loadSilexConfig(config: ServerConfig): Promise<void>;