@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
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.loadSilexConfig = exports.loadUserConfig = exports.createConfig = exports.ServerConfig = void 0;
3
+ exports.ServerConfig = void 0;
4
4
  const silex_plugins_1 = require("@silexlabs/silex-plugins");
5
5
  const path_1 = require("path");
6
6
  const constants_1 = require("../constants");
@@ -10,29 +10,23 @@ const FsStorage_1 = require("./connectors/FsStorage");
10
10
  const types_1 = require("../types");
11
11
  const FsHosting_1 = require("./connectors/FsHosting");
12
12
  class ServerConfig extends silex_plugins_1.Config {
13
- url;
14
- debug;
15
- port;
16
- apiPath;
17
13
  expressOptions = {
18
- jsonLimit: process.env.SILEX_EXPRESS_JSON_LIMIT || '1mb',
19
- textLimit: process.env.SILEX_EXPRESS_TEXT_LIMIT || '10mb',
20
- urlencodedLimit: process.env.SILEX_EXPRESS_URLENCODED_LIMIT || '1mb',
21
- sessionName: process.env.SILEX_SESSION_NAME || 'silex-session',
22
- sessionSecret: process.env.SILEX_SESSION_SECRET || 'replace this session secret in env vars',
14
+ jsonLimit: process.env.SILEX_EXPRESS_JSON_LIMIT,
15
+ textLimit: process.env.SILEX_EXPRESS_TEXT_LIMIT,
16
+ urlencodedLimit: process.env.SILEX_EXPRESS_URLENCODED_LIMIT,
17
+ sessionName: process.env.SILEX_SESSION_NAME,
18
+ sessionSecret: process.env.SILEX_SESSION_SECRET,
23
19
  cors: process.env.SILEX_CORS_URL,
24
20
  };
25
- constructor(url, debug, port, apiPath) {
26
- super();
27
- this.url = url;
28
- this.debug = debug;
29
- this.port = port;
30
- this.apiPath = apiPath;
31
- }
21
+ port = process.env.SILEX_PORT;
22
+ debug = process.env.SILEX_DEBUG === 'true';
23
+ url = `${process.env.SILEX_PROTOCOL}://${process.env.SILEX_HOST}:${process.env.SILEX_PORT}`;
24
+ userConfigPath = process.env.SILEX_CONFIG;
25
+ configFilePath = (0, path_1.resolve)(__dirname, '../../../.silex.js');
32
26
  getConnectors(type = null) {
33
27
  if (!type) {
34
28
  const allConnectors = this.getStorageConnectors().concat(this.getHostingConnectors());
35
- return Array.from(new Set(allConnectors));
29
+ return [...new Set(allConnectors)];
36
30
  }
37
31
  const connectorType = (0, connectors_1.toConnectorEnum)(type.toString());
38
32
  switch (connectorType) {
@@ -41,9 +35,7 @@ class ServerConfig extends silex_plugins_1.Config {
41
35
  default: throw new Error(`Unknown connector type ${type}`);
42
36
  }
43
37
  }
44
- storageConnectors = [new FsStorage_1.FsStorage(null, {
45
- path: process.env.FS_ROOT,
46
- })];
38
+ storageConnectors = [];
47
39
  addStorageConnector(storage) {
48
40
  this.setStorageConnectors(this.storageConnectors.concat(storage));
49
41
  }
@@ -53,9 +45,7 @@ class ServerConfig extends silex_plugins_1.Config {
53
45
  getStorageConnectors() {
54
46
  return this.storageConnectors;
55
47
  }
56
- hostingConnectors = [new FsHosting_1.FsHosting(null, {
57
- path: process.env.FS_ROOT,
58
- })];
48
+ hostingConnectors = [];
59
49
  addHostingConnector(hosting) {
60
50
  this.setHostingConnectors(this.hostingConnectors.concat(hosting));
61
51
  }
@@ -67,58 +57,65 @@ class ServerConfig extends silex_plugins_1.Config {
67
57
  const path = process.env.SILEX_CLIENT_CONFIG;
68
58
  if (path) {
69
59
  console.log(`> Serving client side config ${path} at ${constants_1.CLIENT_CONFIG_FILE_NAME}`);
70
- let clientConfig = (await (0, promises_1.readFile)(path)).toString();
71
- app.get(`/${constants_1.CLIENT_CONFIG_FILE_NAME}`, async (req, res) => {
72
- if (this.debug) {
73
- console.log('[Debug mode] Reloading config file', path);
74
- clientConfig = (await (0, promises_1.readFile)(path)).toString();
75
- }
76
- res
77
- .contentType('application/javascript')
78
- .send(clientConfig);
79
- });
60
+ try {
61
+ let clientConfig = (await (0, promises_1.readFile)(path)).toString();
62
+ app.get(`/${constants_1.CLIENT_CONFIG_FILE_NAME}`, async (req, res) => {
63
+ if (this.debug) {
64
+ console.log('[Debug mode] Reloading config file', path);
65
+ clientConfig = (await (0, promises_1.readFile)(path)).toString();
66
+ }
67
+ res
68
+ .contentType('application/javascript')
69
+ .send(clientConfig);
70
+ });
71
+ }
72
+ catch (e) {
73
+ console.error(`Error loading client config file ${path}`, e);
74
+ throw new Error(`Error loading client config file ${path}: ${e.message}`);
75
+ }
80
76
  }
81
77
  }
82
78
  async loadConfigFiles() {
83
- await loadUserConfig(this);
84
- await loadSilexConfig(this);
79
+ await this.loadUserConfig();
80
+ await this.loadSilexConfig();
85
81
  }
86
- }
87
- exports.ServerConfig = ServerConfig;
88
- function createConfig() {
89
- const port = process.env.PORT || '6805';
90
- const debug = process.env.SILEX_DEBUG === 'true';
91
- const url = process.env.SERVER_URL || `http://localhost:${port}`;
92
- return new ServerConfig(url, debug, port, '/api');
93
- }
94
- exports.createConfig = createConfig;
95
- async function loadUserConfig(config) {
96
- if (process.env.CONFIG) {
97
- const userConfigPath = process.env.CONFIG;
98
- console.log('> Loading user config', userConfigPath);
82
+ async loadUserConfig() {
83
+ if (this.userConfigPath) {
84
+ console.log('> Loading user config', this.userConfigPath);
85
+ try {
86
+ await this.addPlugin(this.userConfigPath, {});
87
+ }
88
+ catch (e) {
89
+ throw new Error(`\nUser config file ${this.userConfigPath} error:\n\n\t${e.message}\n\n`);
90
+ }
91
+ }
92
+ }
93
+ async loadSilexConfig() {
94
+ console.log('> Loading config', this.configFilePath);
99
95
  try {
100
- await config.addPlugin(userConfigPath, {});
96
+ await this.addPlugin(this.configFilePath, {});
101
97
  }
102
98
  catch (e) {
103
- throw new Error(`User config file ${userConfigPath} error: ${e.message}`);
99
+ console.log(e.requireStack[0]);
100
+ if (e.code === 'MODULE_NOT_FOUND' && (!e.requireStack || !e.requireStack.find(path => path === this.configFilePath))) {
101
+ console.info('> /!\\ Config file not found', this.configFilePath);
102
+ }
103
+ else {
104
+ throw new Error(`Error in config file ${this.configFilePath}: ${e.message}`);
105
+ }
104
106
  }
105
107
  }
106
- }
107
- exports.loadUserConfig = loadUserConfig;
108
- async function loadSilexConfig(config) {
109
- const configFilePath = (0, path_1.resolve)(__dirname, '../../../.silex.js');
110
- console.log('> Loading config', configFilePath);
111
- try {
112
- await config.addPlugin(configFilePath, {});
113
- }
114
- catch (e) {
115
- console.log(e.requireStack[0]);
116
- if (e.code === 'MODULE_NOT_FOUND' && (!e.requireStack || !e.requireStack.find(path => path === configFilePath))) {
117
- console.info('> /!\\ Config file not found', configFilePath);
108
+ async initDefaultConnectors() {
109
+ if (!this.storageConnectors.length) {
110
+ this.addStorageConnector(new FsStorage_1.FsStorage(null, {
111
+ path: process.env.SILEX_FS_ROOT,
112
+ }));
118
113
  }
119
- else {
120
- throw new Error(`Error in config file ${configFilePath}: ${e.message}`);
114
+ if (!this.hostingConnectors.length) {
115
+ this.addHostingConnector(new FsHosting_1.FsHosting(null, {
116
+ path: process.env.SILEX_FS_ROOT,
117
+ }));
121
118
  }
122
119
  }
123
120
  }
124
- exports.loadSilexConfig = loadSilexConfig;
121
+ exports.ServerConfig = ServerConfig;
@@ -34,6 +34,10 @@ const validation_1 = require("../utils/validation");
34
34
  const constants_1 = require("../../constants");
35
35
  const stream_1 = require("stream");
36
36
  const uuid_1 = require("uuid");
37
+ if (!globalThis.__dirname) {
38
+ globalThis.__dirname = (0, path_1.dirname)(process.cwd() + '/src/ts/server/connectors/FsStorage.ts');
39
+ console.log('Redefining __dirname', globalThis.__dirname);
40
+ }
37
41
  const USER_ICON = 'data:image/svg+xml,%3Csvg xmlns=\'http://www.w3.org/2000/svg\' height=\'1em\' viewBox=\'0 0 448 512\'%3E%3Cpath d=\'M304 128a80 80 0 1 0 -160 0 80 80 0 1 0 160 0zM96 128a128 128 0 1 1 256 0A128 128 0 1 1 96 128zM49.3 464H398.7c-8.9-63.3-63.3-112-129-112H178.3c-65.7 0-120.1 48.7-129 112zM0 482.3C0 383.8 79.8 304 178.3 304h91.4C368.2 304 448 383.8 448 482.3c0 16.4-13.3 29.7-29.7 29.7H29.7C13.3 512 0 498.7 0 482.3z\'/%3E%3C/svg%3E';
38
42
  const FILE_ICON = 'data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20stroke%3D%22currentColor%22%20stroke-width%3D%222%22%20stroke-linecap%3D%22round%22%20stroke-linejoin%3D%22round%22%3E%3Cpath%20d%3D%22M6%202L6%2022%2018%2022%2018%207%2012%202%206%202Z%22%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M18%202L12%202%2012%208%2018%208%2018%202Z%22%3E%3C%2Fpath%3E%3C%2Fsvg%3E';
39
43
  class FsStorage {
@@ -43,11 +47,24 @@ class FsStorage {
43
47
  disableLogout = true;
44
48
  options;
45
49
  connectorType = types_1.ConnectorType.STORAGE;
50
+ color = '#ffffff';
51
+ background = '#006400';
46
52
  constructor(config, opts) {
47
53
  this.options = {
48
- path: __dirname + '../../../../.silex',
54
+ path: (0, path_1.join)(__dirname, '..', '..', '..', '..', 'data'),
55
+ assetsFolder: '/assets',
49
56
  ...opts,
50
57
  };
58
+ this.initFs();
59
+ }
60
+ async initFs() {
61
+ const stat = await promises_1.default.stat(this.options.path).catch(() => null);
62
+ if (!stat) {
63
+ const id = constants_1.DEFAULT_WEBSITE_ID;
64
+ await promises_1.default.mkdir((0, path_1.join)(this.options.path, id, this.options.assetsFolder), { recursive: true });
65
+ await this.setWebsiteMeta({}, id, { name: 'Default website', connectorUserSettings: {} });
66
+ await this.updateWebsite({}, id, types_1.defaultWebsiteData);
67
+ }
51
68
  }
52
69
  updateStatus(filesStatuses, status, statusCbk) {
53
70
  statusCbk && statusCbk({
@@ -65,9 +82,7 @@ class FsStorage {
65
82
  getOptions(formData) {
66
83
  return {};
67
84
  }
68
- async getOAuthUrl(session) {
69
- return null;
70
- }
85
+ async getOAuthUrl(session) { return null; }
71
86
  async getLoginForm(session, redirectTo) {
72
87
  return null;
73
88
  }
@@ -110,7 +125,7 @@ class FsStorage {
110
125
  }
111
126
  async createWebsite(session, meta) {
112
127
  const id = (0, uuid_1.v4)();
113
- await promises_1.default.mkdir((0, path_1.join)(this.options.path, id), { recursive: true });
128
+ await promises_1.default.mkdir((0, path_1.join)(this.options.path, id, this.options.assetsFolder), { recursive: true });
114
129
  await this.setWebsiteMeta(session, id, meta);
115
130
  await this.updateWebsite(session, id, types_1.defaultWebsiteData);
116
131
  return id;
@@ -139,18 +154,16 @@ class FsStorage {
139
154
  }));
140
155
  }
141
156
  async getAsset(session, id, path) {
142
- const fullPath = (0, path_1.join)(this.options.path, id, path);
157
+ const fullPath = (0, path_1.join)(this.options.path, id, this.options.assetsFolder, path);
143
158
  const content = await promises_1.default.readFile(fullPath);
144
159
  return { path, content };
145
160
  }
146
161
  async writeAssets(session, id, files, statusCbk) {
147
162
  const filesStatuses = this.initStatus(files);
148
- let error = false;
149
- const filePaths = [];
163
+ let error = null;
150
164
  for (const fileStatus of filesStatuses) {
151
165
  const { file } = fileStatus;
152
- const path = (0, path_1.join)(this.options.path, id, file.path);
153
- filePaths.push(path);
166
+ const path = (0, path_1.join)(this.options.path, id, this.options.assetsFolder, file.path);
154
167
  if (typeof file.content === 'string' || Buffer.isBuffer(file.content)) {
155
168
  fileStatus.message = 'Writing';
156
169
  this.updateStatus(filesStatuses, types_1.JobStatus.IN_PROGRESS, statusCbk);
@@ -160,7 +173,7 @@ class FsStorage {
160
173
  catch (err) {
161
174
  fileStatus.message = `Error (${err})`;
162
175
  this.updateStatus(filesStatuses, types_1.JobStatus.IN_PROGRESS, statusCbk);
163
- error = true;
176
+ error = err;
164
177
  continue;
165
178
  }
166
179
  fileStatus.message = 'Success';
@@ -181,7 +194,7 @@ class FsStorage {
181
194
  console.error('writeStream error', err);
182
195
  fileStatus.message = `Error (${err})`;
183
196
  this.updateStatus(filesStatuses, types_1.JobStatus.IN_PROGRESS, statusCbk);
184
- error = true;
197
+ error = err;
185
198
  resolve(file);
186
199
  });
187
200
  });
@@ -192,7 +205,8 @@ class FsStorage {
192
205
  }
193
206
  }
194
207
  this.updateStatus(filesStatuses, error ? types_1.JobStatus.ERROR : types_1.JobStatus.SUCCESS, statusCbk);
195
- return filePaths;
208
+ if (error)
209
+ throw error;
196
210
  }
197
211
  async deleteAssets(session, id, paths) {
198
212
  for (const path of paths) {
@@ -201,7 +215,7 @@ class FsStorage {
201
215
  }
202
216
  async readAsset(session, websiteId, fileName) {
203
217
  const id = (0, validation_1.requiredParam)(websiteId, 'website id');
204
- const path = (0, path_1.join)(this.options.path, id, fileName);
218
+ const path = (0, path_1.join)(this.options.path, id, this.options.assetsFolder, fileName);
205
219
  return await promises_1.default.readFile(path);
206
220
  }
207
221
  }
@@ -1,12 +1,12 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.contentToReadable = exports.contentToString = exports.toConnectorData = exports.getConnector = exports.toConnectorEnum = void 0;
3
+ exports.contentToReadable = exports.contentToBuffer = exports.contentToString = exports.toConnectorData = exports.getConnector = exports.toConnectorEnum = void 0;
4
4
  const stream_1 = require("stream");
5
5
  const types_1 = require("../../types");
6
6
  function toConnectorEnum(type) {
7
- const result = types_1.ConnectorType[type.toUpperCase()];
7
+ const result = types_1.ConnectorType[type.toString().toUpperCase()];
8
8
  if (!result)
9
- throw new Error('Unknown connector ' + type);
9
+ throw new Error(`Unknown connector type ${type}. It should be one of ${Object.keys(types_1.ConnectorType).join(', ')}`);
10
10
  return result;
11
11
  }
12
12
  exports.toConnectorEnum = toConnectorEnum;
@@ -31,6 +31,8 @@ async function toConnectorData(session, connector) {
31
31
  disableLogout: !!connector.disableLogout,
32
32
  isLoggedIn: await connector.isLoggedIn(session),
33
33
  oauthUrl: await connector.getOAuthUrl(session),
34
+ color: connector.color,
35
+ background: connector.background,
34
36
  };
35
37
  }
36
38
  exports.toConnectorData = toConnectorData;
@@ -53,6 +55,28 @@ async function contentToString(content) {
53
55
  });
54
56
  }
55
57
  exports.contentToString = contentToString;
58
+ async function contentToBuffer(content) {
59
+ if (typeof content === 'string')
60
+ return Buffer.from(content, 'utf8');
61
+ if (Buffer.isBuffer(content))
62
+ return content;
63
+ if (content instanceof stream_1.Readable) {
64
+ return new Promise((resolve, reject) => {
65
+ const chunks = [];
66
+ content.on('data', (chunk) => {
67
+ chunks.push(chunk);
68
+ });
69
+ content.on('error', (err) => {
70
+ reject(err);
71
+ });
72
+ content.on('end', () => {
73
+ resolve(Buffer.concat(chunks));
74
+ });
75
+ });
76
+ }
77
+ throw new Error('Unknown content type');
78
+ }
79
+ exports.contentToBuffer = contentToBuffer;
56
80
  function contentToReadable(content) {
57
81
  if (typeof content === 'string')
58
82
  return stream_1.Readable.from([content]);
@@ -0,0 +1,14 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.ServerEvent = void 0;
4
+ var ServerEvent;
5
+ (function (ServerEvent) {
6
+ ServerEvent["STARTUP_START"] = "startup-start";
7
+ ServerEvent["STARTUP_END"] = "startup-end";
8
+ ServerEvent["PUBLISH_START"] = "publish-start";
9
+ ServerEvent["PUBLISH_END"] = "publish-end";
10
+ ServerEvent["WEBSITE_STORE_START"] = "store-start";
11
+ ServerEvent["WEBSITE_STORE_END"] = "store-end";
12
+ ServerEvent["WEBSITE_ASSET_STORE_START"] = "asset-store-start";
13
+ ServerEvent["WEBSITE_ASSET_STORE_END"] = "asset-store-end";
14
+ })(ServerEvent || (exports.ServerEvent = ServerEvent = {}));
@@ -0,0 +1,27 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || function (mod) {
19
+ if (mod && mod.__esModule) return mod;
20
+ var result = {};
21
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
+ __setModuleDefault(result, mod);
23
+ return result;
24
+ };
25
+ Object.defineProperty(exports, "__esModule", { value: true });
26
+ exports.events = void 0;
27
+ exports.events = __importStar(require("./events"));
@@ -10,7 +10,7 @@ const compression_1 = __importDefault(require("compression"));
10
10
  const cookie_parser_1 = __importDefault(require("cookie-parser"));
11
11
  const cookie_session_1 = __importDefault(require("cookie-session"));
12
12
  const cors_1 = __importDefault(require("cors"));
13
- const events_1 = require("../events");
13
+ const events_1 = require("./events");
14
14
  function create(config) {
15
15
  const app = (0, express_1.default)();
16
16
  app.set('config', config);
@@ -36,10 +36,10 @@ function create(config) {
36
36
  exports.create = create;
37
37
  async function start(app) {
38
38
  const config = app.get('config');
39
- config.emit(events_1.EVENT_STARTUP_START, { app });
39
+ config.emit(events_1.ServerEvent.STARTUP_START, { app });
40
40
  return new Promise((resolve, reject) => {
41
41
  app.listen(config.port, () => {
42
- config.emit(events_1.EVENT_STARTUP_END, { app });
42
+ config.emit(events_1.ServerEvent.STARTUP_END, { app });
43
43
  resolve(app);
44
44
  });
45
45
  });
@@ -22,6 +22,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
22
22
  __setModuleDefault(result, mod);
23
23
  return result;
24
24
  };
25
+ var __exportStar = (this && this.__exportStar) || function(m, exports) {
26
+ for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
27
+ };
25
28
  var __importDefault = (this && this.__importDefault) || function (mod) {
26
29
  return (mod && mod.__esModule) ? mod : { "default": mod };
27
30
  };
@@ -29,11 +32,38 @@ Object.defineProperty(exports, "__esModule", { value: true });
29
32
  const silexApp = __importStar(require("./express"));
30
33
  const api_1 = __importDefault(require("./api/api"));
31
34
  const config_1 = require("./config");
32
- async function main() {
33
- const config = (0, config_1.createConfig)();
35
+ const dotenv_1 = __importDefault(require("dotenv"));
36
+ const path_1 = require("path");
37
+ __exportStar(require("./expose"), exports);
38
+ async function silex() {
39
+ const curDirEnv = dotenv_1.default.config();
40
+ if (curDirEnv.error) {
41
+ if (curDirEnv.error['code'] === 'ENOENT') {
42
+ console.info('> No .env file found in current directory');
43
+ }
44
+ else {
45
+ throw curDirEnv.error;
46
+ }
47
+ }
48
+ else {
49
+ console.info('> Env vars loaded from .env file');
50
+ }
51
+ const DEFAULT_ENV_FILE = (0, path_1.join)(__dirname, '../../../.env.default');
52
+ const rootDirEnv = dotenv_1.default.config({ path: DEFAULT_ENV_FILE });
53
+ if (rootDirEnv.error) {
54
+ if (rootDirEnv.error['code'] === 'ENOENT') {
55
+ throw new Error(`\n\nFailed to load default env vars. File not found ${DEFAULT_ENV_FILE}\n\n`);
56
+ }
57
+ else {
58
+ throw new Error(`\n\nFailed to load default env vars. Error in ${DEFAULT_ENV_FILE}: ${rootDirEnv.error.message}\n\n`);
59
+ }
60
+ }
61
+ console.info('> Default env vars loaded');
62
+ const config = new config_1.ServerConfig();
34
63
  const app = silexApp.create(config);
35
64
  await config.addRoutes(app);
36
65
  await config.loadConfigFiles();
66
+ await config.initDefaultConnectors();
37
67
  app.use('/api', (0, api_1.default)(config));
38
68
  await silexApp.start(app);
39
69
  console.info(`
@@ -43,7 +73,7 @@ I'm ready, listening to port ${config.port}
43
73
  startLiverReload();
44
74
  }
45
75
  }
46
- exports.default = main;
76
+ exports.default = silex;
47
77
  async function startLiverReload() {
48
78
  const { createServer } = await Promise.resolve().then(() => __importStar(require('livereload')));
49
79
  const { resolve } = await Promise.resolve().then(() => __importStar(require('path')));
@@ -56,5 +86,5 @@ async function startLiverReload() {
56
86
  server.watch(dist);
57
87
  }
58
88
  if (require.main === module) {
59
- main();
89
+ silex();
60
90
  }
@@ -1,6 +1,15 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.JobStatus = exports.ConnectorType = exports.Unit = exports.defaultWebsiteData = void 0;
3
+ exports.JobStatus = exports.ConnectorType = exports.Unit = exports.defaultWebsiteData = exports.ApiError = void 0;
4
+ class ApiError extends Error {
5
+ httpStatusCode;
6
+ constructor(message, httpStatusCode) {
7
+ super(message);
8
+ this.httpStatusCode = httpStatusCode;
9
+ console.info('API error', httpStatusCode, message);
10
+ }
11
+ }
12
+ exports.ApiError = ApiError;
4
13
  exports.defaultWebsiteData = {};
5
14
  var Unit;
6
15
  (function (Unit) {
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@silexlabs/silex",
3
3
  "description": "Free and easy website builder for everyone.",
4
- "version": "3.0.0-alpha.42",
4
+ "version": "3.0.0-alpha.44",
5
5
  "version:backwardcompat": "3.0.0",
6
6
  "author": {
7
7
  "name": "Alex Hoyau",
@@ -78,7 +78,7 @@
78
78
  "release": "",
79
79
  "watch": "npm-watch",
80
80
  "start": "node dist/server/server/",
81
- "start:debug": "cross-env FS_ROOT=`pwd`/.silex cross-env SILEX_DEBUG=true nodemon --watch dist/server dist/server/server/",
81
+ "start:debug": "cross-env SILEX_FS_ROOT=`pwd`/.silex cross-env SILEX_DEBUG=true nodemon --watch dist/server dist/server/server/",
82
82
  "prepublishOnly": "$npm_execpath run lint && $npm_execpath test && $npm_execpath run build",
83
83
  "preversion": "$npm_execpath run prepublishOnly",
84
84
  "build": "run-s build:css:release build:html build:client:release build:server:release build:plugins:client build:plugins:server",
@@ -101,6 +101,7 @@
101
101
  "dependencies": {
102
102
  "@directus/sdk": "10.3.3",
103
103
  "@fortawesome/fontawesome-free": "6.4.0",
104
+ "@gitbeaker/rest": "^39.7.0",
104
105
  "@silexlabs/grapesjs-directus-storage": "1.0.15",
105
106
  "@silexlabs/grapesjs-fonts": "1.0.12",
106
107
  "@silexlabs/grapesjs-loading": "1.0.8",
@@ -116,6 +117,8 @@
116
117
  "cookie-session": "2.0.0",
117
118
  "cors": "2.8.5",
118
119
  "cross-env": "7.0.3",
120
+ "crypto": "^1.0.1",
121
+ "dotenv": "^16.3.1",
119
122
  "express": "4.18.2",
120
123
  "express-force-ssl": "0.3.2",
121
124
  "formidable": "2.1.1",
@@ -125,7 +128,7 @@
125
128
  "grapesjs-custom-code": "1.0.2",
126
129
  "grapesjs-plugin-forms": "2.0.6",
127
130
  "grapesjs-style-filter": "1.0.2",
128
- "html-minifier": "4.0.0",
131
+ "html-minifier": "^4.0.0",
129
132
  "lit-html": "2.7.4",
130
133
  "mkdirp": "3.0.1",
131
134
  "node_modules-path": "2.0.7",
@@ -22,6 +22,7 @@ $prefix: 'gjs-';
22
22
  $pn-prefix: '#{$prefix}pn-';
23
23
  $cv-prefix: '#{$prefix}cv-';
24
24
  $z-dialog-inline: 10;
25
+ $z-loader: 10;
25
26
 
26
27
  :root {
27
28
  --primaryColor: #444;
@@ -109,6 +109,11 @@
109
109
  font-weight: 900;
110
110
  }
111
111
 
112
+ .fa-sign-out:before {
113
+ content: "\f08b";
114
+ font-weight: 900;
115
+ }
116
+
112
117
  /*
113
118
  .fa-plus:before {
114
119
  content: "+";
@@ -7,4 +7,6 @@
7
7
  color: variables.$secondaryColor;
8
8
  justify-content: center;
9
9
  align-items: center;
10
+ background-color: variables.$primaryColor;
11
+ z-index: variables.$z-loader;
10
12
  }
@@ -15,8 +15,8 @@
15
15
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
16
16
  */
17
17
 
18
- import { API_CONNECTOR_LIST, API_CONNECTOR_USER, API_CONNECTOR_LOGOUT, API_CONNECTOR_PATH, API_PATH, API_PUBLICATION_PATH, API_PUBLICATION_PUBLISH, API_PUBLICATION_STATUS, API_WEBSITE_ASSETS_READ, API_WEBSITE_ASSETS_WRITE, API_WEBSITE_DELETE, API_WEBSITE_LIST, API_WEBSITE_PATH, API_WEBSITE_READ, API_WEBSITE_WRITE, API_WEBSITE_META_READ, API_WEBSITE_META_WRITE, API_WEBSITE_CREATE } from '../constants'
19
- import { ApiPublicationPublishBody, ApiPublicationPublishQuery, ApiPublicationPublishResponse, ApiPublicationStatusQuery, ApiPublicationStatusResponse, ConnectorId, JobData, JobId, PublicationJobData, WebsiteId, ApiConnectorListResponse, ApiConnectorListQuery, ConnectorData, ConnectorType, ApiWebsiteReadQuery, ApiWebsiteReadResponse, WebsiteData, ApiWebsiteWriteQuery, ApiWebsiteWriteBody, ApiWebsiteWriteResponse, ApiWebsiteDeleteQuery, ApiWebsiteAssetsReadQuery, ApiWebsiteAssetsReadResponse, ApiWebsiteAssetsWriteQuery, ApiWebsiteAssetsWriteBody, ApiWebsiteAssetsWriteResponse, ClientSideFile, PublicationData, ApiConnectorUserResponse, ConnectorUser, WebsiteMeta, ApiConnectorLogoutQuery, ApiConnectorUserQuery, ApiWebsiteListResponse, ApiWebsiteListQuery, WebsiteMetaFileContent, ApiWebsiteCreateQuery, ApiWebsiteCreateBody, ApiWebsiteCreateResponse, ApiWebsiteMetaWriteQuery, ApiWebsiteMetaWriteBody, ApiWebsiteMetaWriteResponse, ApiWebsiteMetaReadQuery, ApiWebsiteMetaReadResponse, ConnectorOptions } from '../types'
18
+ import { API_CONNECTOR_LIST, API_CONNECTOR_USER, API_CONNECTOR_LOGOUT, API_CONNECTOR_PATH, API_PATH, API_PUBLICATION_PATH, API_PUBLICATION_PUBLISH, API_PUBLICATION_STATUS, API_WEBSITE_ASSET_READ, API_WEBSITE_ASSETS_WRITE, API_WEBSITE_DELETE, API_WEBSITE_LIST, API_WEBSITE_PATH, API_WEBSITE_READ, API_WEBSITE_WRITE, API_WEBSITE_META_READ, API_WEBSITE_META_WRITE, API_WEBSITE_CREATE } from '../constants'
19
+ import { ApiPublicationPublishBody, ApiPublicationPublishQuery, ApiPublicationPublishResponse, ApiPublicationStatusQuery, ApiPublicationStatusResponse, ConnectorId, JobData, JobId, PublicationJobData, WebsiteId, ApiConnectorListResponse, ApiConnectorListQuery, ConnectorData, ConnectorType, ApiWebsiteReadQuery, ApiWebsiteReadResponse, WebsiteData, ApiWebsiteWriteQuery, ApiWebsiteWriteBody, ApiWebsiteWriteResponse, ApiWebsiteDeleteQuery, ApiWebsiteAssetsReadQuery, ApiWebsiteAssetsReadResponse, ApiWebsiteAssetsWriteQuery, ApiWebsiteAssetsWriteBody, ApiWebsiteAssetsWriteResponse, ClientSideFile, PublicationData, ApiConnectorUserResponse, ConnectorUser, WebsiteMeta, ApiConnectorLogoutQuery, ApiConnectorUserQuery, ApiWebsiteListResponse, ApiWebsiteListQuery, WebsiteMetaFileContent, ApiWebsiteCreateQuery, ApiWebsiteCreateBody, ApiWebsiteCreateResponse, ApiWebsiteMetaWriteQuery, ApiWebsiteMetaWriteBody, ApiWebsiteMetaWriteResponse, ApiWebsiteMetaReadQuery, ApiWebsiteMetaReadResponse, ConnectorOptions, ApiError } from '../types'
20
20
 
21
21
  export enum ApiRoute {
22
22
  PUBLICATION_PUBLISH = API_PATH + API_PUBLICATION_PATH + API_PUBLICATION_PUBLISH,
@@ -29,19 +29,12 @@ export enum ApiRoute {
29
29
  WEBSITE_DELETE = API_PATH + API_WEBSITE_PATH + API_WEBSITE_DELETE,
30
30
  WEBSITE_CREATE = API_PATH + API_WEBSITE_PATH + API_WEBSITE_CREATE,
31
31
  WEBSITE_LIST = API_PATH + API_WEBSITE_PATH + API_WEBSITE_LIST,
32
- WEBSITE_ASSETS_READ = API_PATH + API_WEBSITE_PATH + API_WEBSITE_ASSETS_READ,
32
+ WEBSITE_ASSETS_READ = API_PATH + API_WEBSITE_PATH + API_WEBSITE_ASSET_READ,
33
33
  WEBSITE_ASSETS_WRITE = API_PATH + API_WEBSITE_PATH + API_WEBSITE_ASSETS_WRITE,
34
34
  WEBSITE_META_READ = API_PATH + API_WEBSITE_PATH + API_WEBSITE_META_READ,
35
35
  WEBSITE_META_WRITE = API_PATH + API_WEBSITE_PATH + API_WEBSITE_META_WRITE,
36
36
  }
37
37
 
38
- export class ApiError extends Error {
39
- constructor(message: string, public readonly code: number) {
40
- super(message)
41
- console.info('API error', code, message)
42
- }
43
- }
44
-
45
38
  const ROOT_URL = window.location.origin
46
39
 
47
40
  export async function getUser({type, connectorId}: {type: ConnectorType, connectorId?: ConnectorId}): Promise<ConnectorUser> {
@@ -110,13 +103,17 @@ export async function websiteAssetsLoad({path, websiteId, connectorId}: {path: s
110
103
  return api<ApiWebsiteAssetsReadQuery, null, ApiWebsiteAssetsReadResponse>(`${ApiRoute.WEBSITE_ASSETS_READ}/${path}`, 'GET', { websiteId, connectorId: connectorId })
111
104
  }
112
105
 
106
+ /**
107
+ * Not used directly, grapesjs handles the upload
108
+ * @see assetManager in src/ts/client/grapesjs/index.ts
109
+ */
113
110
  export async function websiteAssetsSave({websiteId, connectorId, files}: {websiteId: WebsiteId, connectorId: ConnectorId, files: ClientSideFile[]}): Promise<string[]> {
114
111
  const { data } = await api<ApiWebsiteAssetsWriteQuery, ApiWebsiteAssetsWriteBody, ApiWebsiteAssetsWriteResponse>(ApiRoute.WEBSITE_ASSETS_WRITE, 'POST', { websiteId, connectorId: connectorId }, files)
115
112
  return data
116
113
  }
117
114
 
118
115
  export async function api<ReqQuery, ReqBody, ResBody>(route: ApiRoute | string, method: string, query?: ReqQuery, payload?: ReqBody): Promise<ResBody> {
119
- const url = `${ROOT_URL}${route.toString()}?${new URLSearchParams(Object.entries(query).filter(([key, value]) => typeof value != 'undefined')).toString()}`
116
+ const url = `${ROOT_URL}${route.toString()}?${new URLSearchParams(Object.entries(query).filter(([key, value]) => !!value)).toString()}`
120
117
  const response = await fetch(url, {
121
118
  method,
122
119
  headers: {