@silexlabs/silex 3.0.0-alpha.43 → 3.0.0-alpha.45

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 (102) hide show
  1. package/.env.default +18 -0
  2. package/dist/client/client/api.d.ts +6 -6
  3. package/dist/client/client/config.d.ts +26 -211
  4. package/dist/client/client/events.d.ts +2 -0
  5. package/dist/client/client/expose.d.ts +0 -1
  6. package/dist/client/client/grapesjs/LoginDialog.d.ts +1 -0
  7. package/dist/client/client/grapesjs/index.d.ts +3 -209
  8. package/dist/client/client/index.d.ts +1 -0
  9. package/dist/client/constants.d.ts +2 -3
  10. package/dist/client/css/admin.css +2 -0
  11. package/dist/client/js/main.js +47 -47
  12. package/dist/client/types.d.ts +7 -1
  13. package/dist/plugins/client/client/events.d.ts +2 -0
  14. package/dist/plugins/client/client/events.js +2 -0
  15. package/dist/plugins/client/client/events.js.map +1 -1
  16. package/dist/plugins/client/plugins/client/template.js +4 -4
  17. package/dist/plugins/client/plugins/client/template.js.map +1 -1
  18. package/dist/plugins/client/types.d.ts +7 -1
  19. package/dist/plugins/client/types.js +8 -0
  20. package/dist/plugins/client/types.js.map +1 -1
  21. package/dist/plugins/server/constants.d.ts +2 -3
  22. package/dist/plugins/server/constants.js +3 -4
  23. package/dist/plugins/server/constants.js.map +1 -1
  24. package/dist/plugins/server/plugins/server/FtpConnector.d.ts +17 -28
  25. package/dist/plugins/server/plugins/server/FtpConnector.js +16 -16
  26. package/dist/plugins/server/plugins/server/FtpConnector.js.map +1 -1
  27. package/dist/plugins/server/plugins/server/GitlabConnector.d.ts +81 -0
  28. package/dist/plugins/server/plugins/server/GitlabConnector.js +373 -0
  29. package/dist/plugins/server/plugins/server/GitlabConnector.js.map +1 -0
  30. package/dist/plugins/server/server/config.js +1 -1
  31. package/dist/plugins/server/server/config.js.map +1 -1
  32. package/dist/plugins/server/server/connectors/FsStorage.d.ts +13 -12
  33. package/dist/plugins/server/server/connectors/FsStorage.js +22 -15
  34. package/dist/plugins/server/server/connectors/FsStorage.js.map +1 -1
  35. package/dist/plugins/server/server/connectors/connectors.d.ts +5 -2
  36. package/dist/plugins/server/server/connectors/connectors.js +31 -3
  37. package/dist/plugins/server/server/connectors/connectors.js.map +1 -1
  38. package/dist/plugins/server/types.d.ts +7 -1
  39. package/dist/plugins/server/types.js +10 -1
  40. package/dist/plugins/server/types.js.map +1 -1
  41. package/dist/server/constants.js +3 -4
  42. package/dist/server/server/api/connectorApi.js +16 -11
  43. package/dist/server/server/api/publicationApi.js +18 -20
  44. package/dist/server/server/api/websiteApi.js +36 -40
  45. package/dist/server/server/cli.js +34 -16
  46. package/dist/server/server/config.js +1 -1
  47. package/dist/server/server/connectors/FsStorage.js +19 -15
  48. package/dist/server/server/connectors/connectors.js +27 -3
  49. package/dist/server/server/expose.js +27 -0
  50. package/dist/server/server/index.js +28 -2
  51. package/dist/server/types.js +10 -1
  52. package/package.json +4 -1
  53. package/src/css/_variables.scss +1 -0
  54. package/src/css/loader.scss +2 -0
  55. package/src/ts/client/api.ts +8 -11
  56. package/src/ts/client/config.ts +30 -14
  57. package/src/ts/client/events.ts +2 -0
  58. package/src/ts/client/expose.ts +0 -1
  59. package/src/ts/client/grapesjs/LoginDialog.ts +12 -1
  60. package/src/ts/client/grapesjs/PublicationManager.ts +1 -1
  61. package/src/ts/client/grapesjs/index.ts +8 -13
  62. package/src/ts/client/grapesjs/storage.ts +18 -10
  63. package/src/ts/client/index.ts +32 -14
  64. package/src/ts/constants.ts +2 -3
  65. package/src/ts/plugins/client/template.ts +4 -4
  66. package/src/ts/plugins/server/FtpConnector.test.ts +82 -0
  67. package/src/ts/plugins/server/FtpConnector.ts +30 -37
  68. package/src/ts/plugins/server/GitlabConnector.ts +434 -0
  69. package/src/ts/server/api/connectorApi.ts +31 -26
  70. package/src/ts/server/api/publicationApi.ts +23 -23
  71. package/src/ts/server/api/websiteApi.ts +42 -43
  72. package/src/ts/server/cli.ts +23 -11
  73. package/src/ts/server/config.ts +1 -1
  74. package/src/ts/server/connectors/FsStorage.test.ts +51 -0
  75. package/src/ts/server/connectors/FsStorage.ts +35 -25
  76. package/src/ts/server/connectors/connectors.ts +32 -4
  77. package/{dist/plugins/client/server/utils/validation.js → src/ts/server/expose.ts} +3 -18
  78. package/src/ts/server/index.ts +24 -2
  79. package/src/ts/types.ts +10 -1
  80. package/dist/plugins/client/constants.d.ts +0 -30
  81. package/dist/plugins/client/constants.js +0 -47
  82. package/dist/plugins/client/constants.js.map +0 -1
  83. package/dist/plugins/client/server/config.d.ts +0 -59
  84. package/dist/plugins/client/server/config.js +0 -178
  85. package/dist/plugins/client/server/config.js.map +0 -1
  86. package/dist/plugins/client/server/connectors/FsHosting.d.ts +0 -13
  87. package/dist/plugins/client/server/connectors/FsHosting.js +0 -51
  88. package/dist/plugins/client/server/connectors/FsHosting.js.map +0 -1
  89. package/dist/plugins/client/server/connectors/FsStorage.d.ts +0 -41
  90. package/dist/plugins/client/server/connectors/FsStorage.js +0 -220
  91. package/dist/plugins/client/server/connectors/FsStorage.js.map +0 -1
  92. package/dist/plugins/client/server/connectors/connectors.d.ts +0 -83
  93. package/dist/plugins/client/server/connectors/connectors.js +0 -91
  94. package/dist/plugins/client/server/connectors/connectors.js.map +0 -1
  95. package/dist/plugins/client/server/events.d.ts +0 -26
  96. package/dist/plugins/client/server/events.js +0 -12
  97. package/dist/plugins/client/server/events.js.map +0 -1
  98. package/dist/plugins/client/server/jobs.d.ts +0 -6
  99. package/dist/plugins/client/server/jobs.js +0 -67
  100. package/dist/plugins/client/server/jobs.js.map +0 -1
  101. package/dist/plugins/client/server/utils/validation.d.ts +0 -7
  102. package/dist/plugins/client/server/utils/validation.js.map +0 -1
@@ -37,6 +37,8 @@ export interface Connector<Session extends ConnectorSession = ConnectorSession>
37
37
  displayName: string;
38
38
  icon: string;
39
39
  disableLogout?: boolean;
40
+ color: string;
41
+ background: string;
40
42
  getOAuthUrl(session: Session): Promise<string | null>;
41
43
  getLoginForm(session: Session, redirectTo: string): Promise<string | null>;
42
44
  getSettingsForm(session: Session, redirectTo: string): Promise<string | null>;
@@ -59,7 +61,7 @@ export interface StorageConnector<Session extends ConnectorSession = ConnectorSe
59
61
  createWebsite(session: Session, data: WebsiteMetaFileContent): Promise<WebsiteId>;
60
62
  updateWebsite(session: Session, websiteId: WebsiteId, data: WebsiteData): Promise<void>;
61
63
  deleteWebsite(session: Session, websiteId: WebsiteId): Promise<void>;
62
- writeAssets(session: Session, websiteId: WebsiteId, files: ConnectorFile[], status?: StatusCallback): Promise<string[]>;
64
+ writeAssets(session: Session, websiteId: WebsiteId, files: ConnectorFile[], status?: StatusCallback): Promise<void>;
63
65
  readAsset(session: Session, websiteId: WebsiteId, fileName: string): Promise<ConnectorFileContent>;
64
66
  deleteAssets(session: Session, websiteId: WebsiteId, fileNames: string[]): Promise<void>;
65
67
  }
@@ -70,7 +72,7 @@ export interface HostingConnector<Session extends ConnectorSession = ConnectorSe
70
72
  publish(session: Session, websiteId: WebsiteId, files: ConnectorFile[]): Promise<JobData>;
71
73
  getUrl(session: Session, websiteId: WebsiteId): Promise<string>;
72
74
  }
73
- export declare function toConnectorEnum(type: string): ConnectorType;
75
+ export declare function toConnectorEnum(type: string | ConnectorType): ConnectorType;
74
76
  /**
75
77
  * Get a connector by id or by type
76
78
  */
@@ -80,4 +82,5 @@ export declare function getConnector<T extends Connector>(config: ServerConfig,
80
82
  */
81
83
  export declare function toConnectorData(session: any, connector: Connector): Promise<ConnectorData>;
82
84
  export declare function contentToString(content: ConnectorFileContent): Promise<string>;
85
+ export declare function contentToBuffer(content: ConnectorFileContent): Promise<Buffer>;
83
86
  export declare function contentToReadable(content: ConnectorFileContent): Readable;
@@ -16,13 +16,13 @@
16
16
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
17
17
  */
18
18
  Object.defineProperty(exports, "__esModule", { value: true });
19
- exports.contentToReadable = exports.contentToString = exports.toConnectorData = exports.getConnector = exports.toConnectorEnum = void 0;
19
+ exports.contentToReadable = exports.contentToBuffer = exports.contentToString = exports.toConnectorData = exports.getConnector = exports.toConnectorEnum = void 0;
20
20
  const stream_1 = require("stream");
21
21
  const types_1 = require("../../types");
22
22
  function toConnectorEnum(type) {
23
- const result = types_1.ConnectorType[type.toUpperCase()];
23
+ const result = types_1.ConnectorType[type.toString().toUpperCase()];
24
24
  if (!result)
25
- throw new Error('Unknown connector ' + type);
25
+ throw new Error(`Unknown connector type ${type}. It should be one of ${Object.keys(types_1.ConnectorType).join(', ')}`);
26
26
  return result;
27
27
  }
28
28
  exports.toConnectorEnum = toConnectorEnum;
@@ -57,6 +57,8 @@ async function toConnectorData(session, connector) {
57
57
  disableLogout: !!connector.disableLogout,
58
58
  isLoggedIn: await connector.isLoggedIn(session),
59
59
  oauthUrl: await connector.getOAuthUrl(session),
60
+ color: connector.color,
61
+ background: connector.background,
60
62
  };
61
63
  }
62
64
  exports.toConnectorData = toConnectorData;
@@ -82,6 +84,32 @@ async function contentToString(content) {
82
84
  });
83
85
  }
84
86
  exports.contentToString = contentToString;
87
+ async function contentToBuffer(content) {
88
+ // String
89
+ if (typeof content === 'string')
90
+ return Buffer.from(content, 'utf8');
91
+ // Buffer
92
+ if (Buffer.isBuffer(content))
93
+ return content;
94
+ // Stream
95
+ if (content instanceof stream_1.Readable) {
96
+ return new Promise((resolve, reject) => {
97
+ const chunks = [];
98
+ content.on('data', (chunk) => {
99
+ chunks.push(chunk);
100
+ });
101
+ content.on('error', (err) => {
102
+ reject(err);
103
+ });
104
+ content.on('end', () => {
105
+ resolve(Buffer.concat(chunks));
106
+ });
107
+ });
108
+ }
109
+ // Unknown
110
+ throw new Error('Unknown content type');
111
+ }
112
+ exports.contentToBuffer = contentToBuffer;
85
113
  function contentToReadable(content) {
86
114
  // String
87
115
  if (typeof content === 'string')
@@ -1 +1 @@
1
- {"version":3,"file":"connectors.js","sourceRoot":"","sources":["../../../../../src/ts/server/connectors/connectors.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"connectors.js","sourceRoot":"","sources":["../../../../../src/ts/server/connectors/connectors.ts"],"names":[],"mappings":"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"}
@@ -13,7 +13,11 @@ export interface WebsiteFile {
13
13
  htmlPath: string;
14
14
  cssPath: string;
15
15
  }
16
- export type ApiError = {
16
+ export declare class ApiError extends Error {
17
+ readonly httpStatusCode: number;
18
+ constructor(message: string, httpStatusCode: number);
19
+ }
20
+ export type ApiResponseError = {
17
21
  message: string;
18
22
  };
19
23
  export type ApiPublicationPublishBody = WebsiteData;
@@ -252,6 +256,8 @@ export interface ConnectorData {
252
256
  disableLogout: boolean;
253
257
  isLoggedIn: boolean;
254
258
  oauthUrl: string | null;
259
+ color: string;
260
+ background: string;
255
261
  }
256
262
  /**
257
263
  * User settings for a connector and for a given website
@@ -16,7 +16,16 @@
16
16
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
17
17
  */
18
18
  Object.defineProperty(exports, "__esModule", { value: true });
19
- exports.JobStatus = exports.ConnectorType = exports.Unit = exports.defaultWebsiteData = void 0;
19
+ exports.JobStatus = exports.ConnectorType = exports.Unit = exports.defaultWebsiteData = exports.ApiError = void 0;
20
+ class ApiError extends Error {
21
+ httpStatusCode;
22
+ constructor(message, httpStatusCode) {
23
+ super(message);
24
+ this.httpStatusCode = httpStatusCode;
25
+ console.info('API error', httpStatusCode, message);
26
+ }
27
+ }
28
+ exports.ApiError = ApiError;
20
29
  // **
21
30
  // Website API
22
31
  exports.defaultWebsiteData = {
@@ -1 +1 @@
1
- {"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/ts/types.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;;;AAkEH,KAAK;AACL,cAAc;AACD,QAAA,kBAAkB,GAAgB;AAC7C,YAAY;AACZ,aAAa;AACb,aAAa;AACb,eAAe;AACf,YAAY;AACZ,cAAc;AACd,kBAAkB;CACJ,CAAA;AAyDhB,IAAY,IAEX;AAFD,WAAY,IAAI;IACd,iBAAS,CAAA;AACX,CAAC,EAFW,IAAI,oBAAJ,IAAI,QAEf;AAoDD;;GAEG;AACH,IAAY,aAGX;AAHD,WAAY,aAAa;IACvB,oCAAmB,CAAA;IACnB,oCAAmB,CAAA;AACrB,CAAC,EAHW,aAAa,6BAAb,aAAa,QAGxB;AAqDD;;GAEG;AACH,IAAY,SAIX;AAJD,WAAY,SAAS;IACnB,wCAA2B,CAAA;IAC3B,gCAAmB,CAAA;IACnB,4BAAe,CAAA;AACjB,CAAC,EAJW,SAAS,yBAAT,SAAS,QAIpB"}
1
+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/ts/types.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;;;AAqBH,MAAa,QAAS,SAAQ,KAAK;IACY;IAA7C,YAAY,OAAe,EAAkB,cAAsB;QACjE,KAAK,CAAC,OAAO,CAAC,CAAA;QAD6B,mBAAc,GAAd,cAAc,CAAQ;QAEjE,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,EAAE,OAAO,CAAC,CAAA;IACpD,CAAC;CACF;AALD,4BAKC;AA+CD,KAAK;AACL,cAAc;AACD,QAAA,kBAAkB,GAAgB;AAC7C,YAAY;AACZ,aAAa;AACb,aAAa;AACb,eAAe;AACf,YAAY;AACZ,cAAc;AACd,kBAAkB;CACJ,CAAA;AAyDhB,IAAY,IAEX;AAFD,WAAY,IAAI;IACd,iBAAS,CAAA;AACX,CAAC,EAFW,IAAI,oBAAJ,IAAI,QAEf;AAoDD;;GAEG;AACH,IAAY,aAGX;AAHD,WAAY,aAAa;IACvB,oCAAmB,CAAA;IACnB,oCAAmB,CAAA;AACrB,CAAC,EAHW,aAAa,6BAAb,aAAa,QAGxB;AAuDD;;GAEG;AACH,IAAY,SAIX;AAJD,WAAY,SAAS;IACnB,wCAA2B,CAAA;IAC3B,gCAAmB,CAAA;IACnB,4BAAe,CAAA;AACjB,CAAC,EAJW,SAAS,yBAAT,SAAS,QAIpB"}
@@ -1,10 +1,9 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.API_WEBSITE_META_WRITE = exports.API_WEBSITE_META_READ = exports.API_WEBSITE_ASSETS_WRITE = exports.API_WEBSITE_ASSETS_READ = exports.API_WEBSITE_LIST = exports.API_WEBSITE_DELETE = exports.API_WEBSITE_CREATE = exports.API_WEBSITE_WRITE = exports.API_WEBSITE_READ = exports.API_WEBSITE_PATH = exports.API_PUBLICATION_STATUS = exports.API_PUBLICATION_PUBLISH = exports.API_PUBLICATION_PATH = exports.API_CONNECTOR_LOGIN_CALLBACK = exports.API_CONNECTOR_SETTINGS = exports.API_CONNECTOR_LOGIN = exports.API_CONNECTOR_LOGOUT = exports.API_CONNECTOR_LIST = exports.API_CONNECTOR_USER = exports.API_CONNECTOR_PATH = exports.API_PATH = exports.CLIENT_CONFIG_FILE_NAME = exports.DEFAULT_LANGUAGE = exports.DEFAULT_CONNECTOR_ID = exports.DEFAULT_WEBSITE_ID = exports.WEBSITE_META_DATA_FILE = exports.WEBSITE_DATA_FILE = void 0;
3
+ exports.API_WEBSITE_META_WRITE = exports.API_WEBSITE_META_READ = exports.API_WEBSITE_ASSETS_WRITE = exports.API_WEBSITE_ASSET_READ = exports.API_WEBSITE_LIST = exports.API_WEBSITE_DELETE = exports.API_WEBSITE_CREATE = exports.API_WEBSITE_WRITE = exports.API_WEBSITE_READ = exports.API_WEBSITE_PATH = exports.API_PUBLICATION_STATUS = exports.API_PUBLICATION_PUBLISH = exports.API_PUBLICATION_PATH = exports.API_CONNECTOR_LOGIN_CALLBACK = exports.API_CONNECTOR_SETTINGS = exports.API_CONNECTOR_LOGIN = exports.API_CONNECTOR_LOGOUT = exports.API_CONNECTOR_LIST = exports.API_CONNECTOR_USER = exports.API_CONNECTOR_PATH = exports.API_PATH = exports.CLIENT_CONFIG_FILE_NAME = exports.DEFAULT_LANGUAGE = exports.DEFAULT_WEBSITE_ID = exports.WEBSITE_META_DATA_FILE = exports.WEBSITE_DATA_FILE = void 0;
4
4
  exports.WEBSITE_DATA_FILE = 'website.json';
5
5
  exports.WEBSITE_META_DATA_FILE = 'meta.json';
6
6
  exports.DEFAULT_WEBSITE_ID = 'default';
7
- exports.DEFAULT_CONNECTOR_ID = '';
8
7
  exports.DEFAULT_LANGUAGE = 'en';
9
8
  exports.CLIENT_CONFIG_FILE_NAME = 'silex.js';
10
9
  exports.API_PATH = '/api';
@@ -24,7 +23,7 @@ exports.API_WEBSITE_WRITE = '/';
24
23
  exports.API_WEBSITE_CREATE = '/';
25
24
  exports.API_WEBSITE_DELETE = '/';
26
25
  exports.API_WEBSITE_LIST = '/';
27
- exports.API_WEBSITE_ASSETS_READ = 'assets/:path';
28
- exports.API_WEBSITE_ASSETS_WRITE = 'assets';
26
+ exports.API_WEBSITE_ASSET_READ = '/assets';
27
+ exports.API_WEBSITE_ASSETS_WRITE = '/assets';
29
28
  exports.API_WEBSITE_META_READ = '/meta';
30
29
  exports.API_WEBSITE_META_WRITE = '/meta';
@@ -45,7 +45,7 @@ async function routeUser(req, res) {
45
45
  }
46
46
  catch (error) {
47
47
  console.error('Error in the login status request', error);
48
- res.status(error?.code ?? 500).json({
48
+ res.status(error?.code ?? error?.httpStatusCode ?? 500).json({
49
49
  error: true,
50
50
  message: error.message,
51
51
  });
@@ -64,7 +64,7 @@ async function routeListConnectors(req, res) {
64
64
  }
65
65
  catch (error) {
66
66
  console.error('Error while listing connectors', error);
67
- res.status(error?.code ?? 500).json({
67
+ res.status(error?.code ?? error?.httpStatusCode ?? 500).json({
68
68
  error: true,
69
69
  message: 'Error while listing connectors: ' + error.message,
70
70
  });
@@ -72,7 +72,7 @@ async function routeListConnectors(req, res) {
72
72
  }
73
73
  catch (error) {
74
74
  console.error('Error in the list connectors request', error);
75
- res.status(error?.code ?? 400).json({
75
+ res.status(error?.code ?? error?.httpStatusCode ?? 400).json({
76
76
  error: true,
77
77
  message: 'Error in the list connectors request: ' + error.message,
78
78
  });
@@ -105,7 +105,7 @@ async function routeLogin(req, res) {
105
105
  }
106
106
  catch (error) {
107
107
  console.error('Error in the login request', error);
108
- res.status(error?.code ?? 400).json({
108
+ res.status(error?.code ?? error?.httpStatusCode ?? 400).json({
109
109
  error: true,
110
110
  message: 'Error in the login request: ' + error.message,
111
111
  });
@@ -124,15 +124,20 @@ async function routeLoginSuccess(req, res) {
124
124
  const connector = await (0, connectors_1.getConnector)(config, req['session'], type, connectorId);
125
125
  if (!connector)
126
126
  throw new Error('Connector not found ' + connectorId);
127
- await connector.setToken(session, {
128
- ...query,
129
- ...body,
130
- });
127
+ if (await connector.isLoggedIn(session)) {
128
+ console.info('User already logged in for connector ' + connectorId);
129
+ }
130
+ else {
131
+ await connector.setToken(session, {
132
+ ...query,
133
+ ...body,
134
+ });
135
+ }
131
136
  res.send(getEndAuthHtml('Logged in', false, connectorId, connector.getOptions(body)));
132
137
  }
133
138
  catch (error) {
134
139
  res
135
- .status(error?.code ?? 500)
140
+ .status(error?.code ?? error?.httpStatusCode ?? 500)
136
141
  .send(getEndAuthHtml(error.message, true));
137
142
  }
138
143
  }
@@ -155,7 +160,7 @@ async function routeLogout(req, res) {
155
160
  }
156
161
  catch (error) {
157
162
  console.error('Error while logging out', error);
158
- res.status(error?.code ?? 500).json({
163
+ res.status(error?.code ?? error?.httpStatusCode ?? 500).json({
159
164
  error: true,
160
165
  message: 'Error while logging out: ' + error.message,
161
166
  });
@@ -164,7 +169,7 @@ async function routeLogout(req, res) {
164
169
  }
165
170
  catch (error) {
166
171
  console.error('Error in the logout request', error);
167
- res.status(error?.code ?? 400).json({
172
+ res.status(error?.code ?? error?.httpStatusCode ?? 400).json({
168
173
  error: true,
169
174
  message: 'Error in the logout request: ' + error.message,
170
175
  });
@@ -7,7 +7,6 @@ const jobs_1 = require("../jobs");
7
7
  const types_1 = require("../../types");
8
8
  const connectors_1 = require("../connectors/connectors");
9
9
  const validation_1 = require("../utils/validation");
10
- const path_1 = require("path");
11
10
  const events_1 = require("../events");
12
11
  class PublicationError extends Error {
13
12
  code;
@@ -17,6 +16,7 @@ class PublicationError extends Error {
17
16
  }
18
17
  }
19
18
  exports.PublicationError = PublicationError;
19
+ const PROJECT_ROOT = require.main ? require.main.path : process.cwd();
20
20
  async function getHostingConnector(session, config, connectorId) {
21
21
  const hostingConnector = await (0, connectors_1.getConnector)(config, session, types_1.ConnectorType.HOSTING, connectorId);
22
22
  if (!hostingConnector) {
@@ -73,10 +73,18 @@ function default_1(config) {
73
73
  config.emit(events_1.ServerEvent.PUBLISH_START, data);
74
74
  const hostingConnector = await getHostingConnector(session, config, hostingId);
75
75
  const storage = await getStorageConnector(session, config, storageId);
76
- const assetsFiles = await Promise.all(assets.map(async (asset) => ({
77
- path: asset.path ? (0, path_1.join)(...asset.path.split('/')) : '',
78
- content: await storage.readAsset(session, websiteId, asset.src),
79
- })));
76
+ const assetsFiles = await Promise.all(assets.map(async (asset) => {
77
+ if (!asset.path)
78
+ throw new PublicationError('Missing path in asset', 400);
79
+ if (!asset.src)
80
+ throw new PublicationError('Missing src in asset', 400);
81
+ const prefix = constants_1.API_WEBSITE_ASSET_READ.replace(/^\//, '');
82
+ const src = asset.src.startsWith(prefix) ? asset.src.substring(prefix.length) : asset.src;
83
+ return {
84
+ path: asset.path,
85
+ content: await storage.readAsset(session, websiteId, src),
86
+ };
87
+ }));
80
88
  const filesList = files.flatMap(file => ([{
81
89
  path: file.htmlPath,
82
90
  content: file.html,
@@ -84,25 +92,15 @@ function default_1(config) {
84
92
  path: file.cssPath,
85
93
  content: file.css,
86
94
  }])).concat(assetsFiles);
87
- try {
88
- res.json({
89
- url: await hostingConnector.getUrl(session, websiteId),
90
- job: await hostingConnector.publish(session, websiteId, filesList),
91
- });
92
- }
93
- catch (err) {
94
- console.error('Error publishing the website', err);
95
- res.status(500).json({
96
- message: `Error publishing the website. ${err.message}`
97
- });
98
- config.emit(events_1.ServerEvent.PUBLISH_END, err);
99
- return;
100
- }
95
+ res.json({
96
+ url: await hostingConnector.getUrl(session, websiteId),
97
+ job: await hostingConnector.publish(session, websiteId, filesList),
98
+ });
101
99
  }
102
100
  catch (err) {
103
101
  console.error('Error publishing the website', err);
104
102
  res
105
- .status(err.code ?? 500)
103
+ .status(typeof err.code === 'number' ? err.code : 500)
106
104
  .json({
107
105
  message: `Error publishing the website. ${err.message}`
108
106
  });
@@ -3,7 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.WebsiteError = void 0;
7
6
  const express_1 = require("express");
8
7
  const formidable_1 = __importDefault(require("formidable"));
9
8
  const constants_1 = require("../../constants");
@@ -14,14 +13,6 @@ const stream_1 = require("stream");
14
13
  const validation_1 = require("../utils/validation");
15
14
  const path_1 = require("path");
16
15
  const events_1 = require("../events");
17
- class WebsiteError extends Error {
18
- code;
19
- constructor(message, code) {
20
- super(message);
21
- this.code = code;
22
- }
23
- }
24
- exports.WebsiteError = WebsiteError;
25
16
  function default_1(config, opts = {}) {
26
17
  const options = {
27
18
  assetsPath: '/assets',
@@ -46,9 +37,8 @@ function default_1(config, opts = {}) {
46
37
  }
47
38
  }
48
39
  catch (e) {
49
- console.error('Error getting website data', e);
50
- if (e instanceof WebsiteError) {
51
- res.status(e.code).json({ message: e.message });
40
+ if (e.httpStatusCode) {
41
+ res.status(e.httpStatusCode).json({ message: e.message });
52
42
  }
53
43
  else {
54
44
  res.status(500).json({ message: e.message });
@@ -65,8 +55,8 @@ function default_1(config, opts = {}) {
65
55
  }
66
56
  catch (e) {
67
57
  console.error('Error getting website data', e);
68
- if (e instanceof WebsiteError) {
69
- res.status(e.code).json({ message: e.message });
58
+ if (e.httpStatusCode) {
59
+ res.status(e.httpStatusCode).json({ message: e.message });
70
60
  }
71
61
  else {
72
62
  res.status(500).json({ message: e.message });
@@ -88,8 +78,8 @@ function default_1(config, opts = {}) {
88
78
  catch (e) {
89
79
  console.error('Error saving website data', e);
90
80
  config.emit(events_1.ServerEvent.WEBSITE_STORE_END, e);
91
- if (e instanceof WebsiteError) {
92
- res.status(e.code).json({ message: e.message });
81
+ if (e.httpStatusCode) {
82
+ res.status(e.httpStatusCode).json({ message: e.message });
93
83
  }
94
84
  else {
95
85
  res.status(500).json({ message: e.message });
@@ -105,15 +95,15 @@ function default_1(config, opts = {}) {
105
95
  const connectorId = query.connectorId;
106
96
  const connector = await (0, connectors_1.getConnector)(config, session, types_1.ConnectorType.STORAGE, connectorId);
107
97
  if (!connector) {
108
- throw new WebsiteError(`Connector ${connectorId} not found`, 500);
98
+ throw new types_1.ApiError(`Connector ${connectorId} not found`, 500);
109
99
  }
110
100
  await connector.createWebsite(session, websiteMeta);
111
101
  res.json({ message: 'Website meta saved' });
112
102
  }
113
103
  catch (e) {
114
104
  console.error('Error saving website meta', e);
115
- if (e instanceof WebsiteError) {
116
- res.status(e.code).json({ message: e.message });
105
+ if (e.httpStatusCode) {
106
+ res.status(e.httpStatusCode).json({ message: e.message });
117
107
  }
118
108
  else {
119
109
  res.status(500).json({ message: e.message });
@@ -130,15 +120,15 @@ function default_1(config, opts = {}) {
130
120
  const connectorId = query.connectorId;
131
121
  const connector = await (0, connectors_1.getConnector)(config, session, types_1.ConnectorType.STORAGE, connectorId);
132
122
  if (!connector) {
133
- throw new WebsiteError(`Connector ${connectorId} not found`, 500);
123
+ throw new types_1.ApiError(`Connector ${connectorId} not found`, 500);
134
124
  }
135
125
  await connector.setWebsiteMeta(session, websiteId, websiteMeta);
136
126
  res.json({ message: 'Website meta saved' });
137
127
  }
138
128
  catch (e) {
139
129
  console.error('Error saving website meta', e);
140
- if (e instanceof WebsiteError) {
141
- res.status(e.code).json({ message: e.message });
130
+ if (e.httpStatusCode) {
131
+ res.status(e.httpStatusCode).json({ message: e.message });
142
132
  }
143
133
  else {
144
134
  res.status(500).json({ message: e.message });
@@ -153,15 +143,15 @@ function default_1(config, opts = {}) {
153
143
  const connectorId = query.connectorId;
154
144
  const connector = await (0, connectors_1.getConnector)(config, session, types_1.ConnectorType.STORAGE, connectorId);
155
145
  if (!connector) {
156
- throw new WebsiteError(`Connector ${connectorId} not found`, 500);
146
+ throw new types_1.ApiError(`Connector ${connectorId} not found`, 500);
157
147
  }
158
148
  const websiteMeta = await connector.getWebsiteMeta(session, websiteId);
159
149
  res.json(websiteMeta);
160
150
  }
161
151
  catch (e) {
162
152
  console.error('Error getting website meta', e);
163
- if (e instanceof WebsiteError) {
164
- res.status(e.code).json({ message: e.message });
153
+ if (e.httpStatusCode) {
154
+ res.status(e.httpStatusCode).json({ message: e.message });
165
155
  }
166
156
  else {
167
157
  res.status(500).json({ message: e.message });
@@ -177,15 +167,15 @@ function default_1(config, opts = {}) {
177
167
  }
178
168
  catch (e) {
179
169
  console.error('Error deleting website data', e);
180
- if (e instanceof WebsiteError) {
181
- res.status(e.code).json({ message: e.message });
170
+ if (e.httpStatusCode) {
171
+ res.status(e.httpStatusCode).json({ message: e.message });
182
172
  }
183
173
  else {
184
174
  res.status(500).json({ message: e.message });
185
175
  }
186
176
  }
187
177
  });
188
- router.get(constants_1.API_WEBSITE_ASSETS_READ, async (req, res) => {
178
+ router.get(constants_1.API_WEBSITE_ASSET_READ + '/:path', async (req, res) => {
189
179
  {
190
180
  try {
191
181
  const query = req.query;
@@ -203,8 +193,8 @@ function default_1(config, opts = {}) {
203
193
  }
204
194
  catch (e) {
205
195
  console.error('Error getting asset', e);
206
- if (e instanceof WebsiteError) {
207
- res.status(e.code).json({ message: e.message });
196
+ if (e.httpStatusCode) {
197
+ res.status(e.httpStatusCode).json({ message: e.message });
208
198
  }
209
199
  else {
210
200
  res.status(500).json({ message: e.message });
@@ -226,13 +216,13 @@ function default_1(config, opts = {}) {
226
216
  form.parse(req, async (err, fields, _files) => {
227
217
  if (err) {
228
218
  console.error('Error parsing upload data', err);
229
- reject(new WebsiteError('Error parsing upload data: ' + err.message, 400));
219
+ reject(new types_1.ApiError('Error parsing upload data: ' + err.message, 400));
230
220
  }
231
221
  else {
232
222
  const files = [].concat(_files['files[]'])
233
223
  .map(file => file.toJSON())
234
224
  .map(file => ({
235
- path: `${options.assetsPath}/${file.originalFilename}`,
225
+ path: `/${file.originalFilename}`,
236
226
  content: (0, fs_1.createReadStream)(file.filepath),
237
227
  }));
238
228
  resolve(files);
@@ -240,16 +230,18 @@ function default_1(config, opts = {}) {
240
230
  });
241
231
  });
242
232
  config.emit(events_1.ServerEvent.WEBSITE_ASSET_STORE_START, { files, websiteId, connectorId });
243
- const data = await writeAssets(req['session'], websiteId, files, connectorId);
233
+ await writeAssets(req['session'], websiteId, files, connectorId);
244
234
  res.json({
245
- data,
235
+ data: files.map(file => constants_1.API_PATH + constants_1.API_WEBSITE_PATH + constants_1.API_WEBSITE_ASSET_READ
236
+ + file.path
237
+ + `?websiteId=${websiteId}&connectorId=${connectorId ? connectorId : ''}`),
246
238
  });
247
239
  config.emit(events_1.ServerEvent.WEBSITE_ASSET_STORE_END, null);
248
240
  }
249
241
  catch (e) {
250
242
  console.error('Error uploading assets', e);
251
- if (e instanceof WebsiteError) {
252
- res.status(e.code).json({ message: e.message });
243
+ if (e.httpStatusCode) {
244
+ res.status(e.httpStatusCode).json({ message: e.message });
253
245
  }
254
246
  else {
255
247
  res.status(500).json({ message: e.message });
@@ -260,10 +252,10 @@ function default_1(config, opts = {}) {
260
252
  async function getStorageConnector(session, connectorId) {
261
253
  const storageConnector = await (0, connectors_1.getConnector)(config, session, types_1.ConnectorType.STORAGE, connectorId);
262
254
  if (!storageConnector) {
263
- throw new WebsiteError('No storage connector found', 404);
255
+ throw new types_1.ApiError('No storage connector found', 404);
264
256
  }
265
257
  if (!await storageConnector.isLoggedIn(session)) {
266
- throw new WebsiteError('Not logged in', 401);
258
+ throw new types_1.ApiError('Not logged in', 401);
267
259
  }
268
260
  return storageConnector;
269
261
  }
@@ -285,11 +277,15 @@ function default_1(config, opts = {}) {
285
277
  }
286
278
  async function readAsset(session, websiteId, fileName, connectorId) {
287
279
  const storageConnector = await getStorageConnector(session, connectorId);
288
- return storageConnector.readAsset(session, websiteId, `/${options.assetsPath}/${fileName}`);
280
+ return storageConnector.readAsset(session, websiteId, `/${fileName}`);
289
281
  }
290
282
  async function writeAssets(session, websiteId, files, connectorId) {
291
283
  const storageConnector = await getStorageConnector(session, connectorId);
292
- await storageConnector.writeAssets(session, websiteId, files);
284
+ const cleanPathFiles = files.map(file => ({
285
+ ...file,
286
+ path: file.path.replace('/assets/', '/'),
287
+ }));
288
+ await storageConnector.writeAssets(session, websiteId, cleanPathFiles);
293
289
  return files.map(({ path }) => `${path}?websiteId=${websiteId}`);
294
290
  }
295
291
  return router;
@@ -7,25 +7,41 @@ Object.defineProperty(exports, "__esModule", { value: true });
7
7
  const index_1 = __importDefault(require("./index"));
8
8
  const cli_1 = require("cli");
9
9
  const options = (0, cli_1.parse)({
10
- config: ['c', 'Path for the server side config file to load at startup', 'file'],
11
- port: ['p', 'Port to listen to', 'int'],
12
- debug: [false, 'Debug mode, with live reload, source maps etc.', 'boolean'],
10
+ 'host': ['', 'Sets the host param of the express module "cookie-session".', 'string'],
11
+ 'port': ['p', 'Port to listen to', 'int'],
12
+ 'protocol': ['', 'Sets the protocol param of the express module "cookie-session".', 'string'],
13
+ 'config': ['c', 'Path for the server side config file to load at startup', 'file'],
14
+ 'client-config': ['', 'Path to client config file to be served on .silex-client.js', 'string'],
15
+ 'fs-root': ['', 'Path to the root folder where to store websites. Used by the default connector (fs).', 'string'],
16
+ 'session-name': ['', 'Sets the name param of the express module "cookie-session".', 'string'],
17
+ 'session-secret': ['s', 'Session secret', 'string'],
13
18
  'ssl-port': [false, 'Port to listen to for SSL/HTTPS', 'int'],
14
19
  'force-https': [false, 'Force HTTPS', 'boolean'],
15
20
  'ssl-private-key': [false, 'Path to private key for SSL', 'file'],
16
21
  'ssl-certificate': [false, 'Path to SSL certificate', 'file'],
17
22
  'force-https-trust-xfp-header': [false, 'Sets the trustXFPHeader param of the express module "cookie-session". Use only with --force-https', 'boolean'],
18
- 'session-secret': ['s', 'Session secret', 'string'],
19
23
  'cors-url': ['', 'Enable CORS for URL (can be "*")', 'string'],
20
- 'client-config': ['', 'Path to client config file to be served on .silex-client.js', 'string'],
21
- 'fs-root': ['', 'Path to the root folder where to store websites. Used by the default connector (fs).', 'string'],
24
+ 'express-json-limit': ['', 'Sets the limit param of the express module "json".', 'string'],
25
+ 'express-text-limit': ['', 'Sets the limit param of the express module "text".', 'string'],
26
+ 'express-urlencoded-limit': ['', 'Sets the limit param of the express module "urlencoded".', 'string'],
27
+ 'debug': [false, 'Debug mode, with live reload, source maps etc.', 'boolean'],
22
28
  }, {});
23
- if (options.config)
24
- process.env.SILEX_CONFIG = options.config;
29
+ if (options['host'])
30
+ process.env.SILEX_HOST = options['host'];
25
31
  if (options.port)
26
32
  process.env.SILEX_PORT = options.port;
27
- if (options.debug)
28
- process.env.SILEX_DEBUG = options.debug;
33
+ if (options['protocol'])
34
+ process.env.SILEX_PROTOCOL = options['protocol'];
35
+ if (options.config)
36
+ process.env.SILEX_CONFIG = options.config;
37
+ if (options['client-config'])
38
+ process.env.SILEX_CLIENT_CONFIG = options['client-config'];
39
+ if (options['fs-root'])
40
+ process.env.SILEX_FS_ROOT = options['fs-root'];
41
+ if (options['session-name'])
42
+ process.env.SILEX_SESSION_NAME = options['session-name'];
43
+ if (options['session-secret'])
44
+ process.env.SILEX_SESSION_SECRET = options['session-secret'];
29
45
  if (options['ssl-port'])
30
46
  process.env.SILEX_SSL_PORT = options['ssl-port'];
31
47
  if (options['force-https'])
@@ -36,12 +52,14 @@ if (options['ssl-certificate'])
36
52
  process.env.SILEX_SSL_CERTIFICATE = options['ssl-certificate'];
37
53
  if (options['force-https-trust-xfp-header'])
38
54
  process.env.SILEX_FORCE_HTTPS_TRUST_XFP_HEADER = options['force-https-trust-xfp-header'];
39
- if (options['session-secret'])
40
- process.env.SILEX_SESSION_SECRET = options['session-secret'];
41
55
  if (options['cors-url'])
42
56
  process.env.SILEX_CORS_URL = options['cors-url'];
43
- if (options['client-config'])
44
- process.env.SILEX_CLIENT_CONFIG = options['client-config'];
45
- if (options['fs-root'])
46
- process.env.SILEX_FS_ROOT = options['fs-root'];
57
+ if (options['express-json-limit'])
58
+ process.env.SILEX_EXPRESS_JSON_LIMIT = options['express-json-limit'];
59
+ if (options['express-text-limit'])
60
+ process.env.SILEX_EXPRESS_TEXT_LIMIT = options['express-text-limit'];
61
+ if (options['express-urlencoded-limit'])
62
+ process.env.SILEX_EXPRESS_URLENCODED_LIMIT = options['express-urlencoded-limit'];
63
+ if (options.debug)
64
+ process.env.SILEX_DEBUG = options.debug;
47
65
  (0, index_1.default)();
@@ -86,7 +86,7 @@ class ServerConfig extends silex_plugins_1.Config {
86
86
  await this.addPlugin(this.userConfigPath, {});
87
87
  }
88
88
  catch (e) {
89
- throw new Error(`User config file ${this.userConfigPath} error: ${e.message}`);
89
+ throw new Error(`\nUser config file ${this.userConfigPath} error:\n\n\t${e.message}\n\n`);
90
90
  }
91
91
  }
92
92
  }