@internxt/cli 1.6.1 → 1.6.3

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 (157) hide show
  1. package/README.md +410 -71
  2. package/dist/commands/add-cert.d.ts +1 -1
  3. package/dist/commands/add-cert.js +3 -3
  4. package/dist/commands/config.d.ts +7 -1
  5. package/dist/commands/config.js +36 -5
  6. package/dist/commands/create-folder.d.ts +2 -1
  7. package/dist/commands/create-folder.js +10 -7
  8. package/dist/commands/delete-permanently-file.d.ts +1 -0
  9. package/dist/commands/delete-permanently-folder.d.ts +1 -0
  10. package/dist/commands/download-file.d.ts +1 -0
  11. package/dist/commands/download-file.js +4 -2
  12. package/dist/commands/list.d.ts +1 -0
  13. package/dist/commands/list.js +2 -4
  14. package/dist/commands/login-legacy.d.ts +1 -0
  15. package/dist/commands/logs.js +3 -3
  16. package/dist/commands/move-file.d.ts +1 -1
  17. package/dist/commands/move-file.js +7 -21
  18. package/dist/commands/move-folder.d.ts +1 -1
  19. package/dist/commands/move-folder.js +7 -21
  20. package/dist/commands/rename-file.d.ts +1 -0
  21. package/dist/commands/rename-folder.d.ts +1 -0
  22. package/dist/commands/trash-clear.d.ts +1 -0
  23. package/dist/commands/trash-file.d.ts +1 -0
  24. package/dist/commands/trash-folder.d.ts +1 -0
  25. package/dist/commands/trash-restore-file.d.ts +1 -1
  26. package/dist/commands/trash-restore-file.js +7 -21
  27. package/dist/commands/trash-restore-folder.d.ts +1 -1
  28. package/dist/commands/trash-restore-folder.js +7 -21
  29. package/dist/commands/upload-file.d.ts +5 -6
  30. package/dist/commands/upload-file.js +77 -52
  31. package/dist/commands/upload-folder.d.ts +1 -0
  32. package/dist/commands/upload-folder.js +11 -6
  33. package/dist/commands/webdav-config.d.ts +19 -1
  34. package/dist/commands/webdav-config.js +81 -3
  35. package/dist/commands/webdav.d.ts +1 -1
  36. package/dist/commands/webdav.js +10 -5
  37. package/dist/commands/whoami.js +2 -1
  38. package/dist/commands/workspaces-list.d.ts +20 -0
  39. package/dist/commands/workspaces-list.js +67 -0
  40. package/dist/commands/workspaces-unset.d.ts +23 -0
  41. package/dist/commands/workspaces-unset.js +45 -0
  42. package/dist/commands/workspaces-use.d.ts +27 -0
  43. package/dist/commands/workspaces-use.js +113 -0
  44. package/dist/constants/configs.d.ts +13 -0
  45. package/dist/constants/configs.js +21 -0
  46. package/dist/hooks/prerun/auth_check.js +13 -4
  47. package/dist/services/auth.service.d.ts +5 -2
  48. package/dist/services/auth.service.js +68 -6
  49. package/dist/services/config.service.d.ts +1 -13
  50. package/dist/services/config.service.js +44 -41
  51. package/dist/services/crypto.service.d.ts +5 -0
  52. package/dist/services/crypto.service.js +43 -0
  53. package/dist/services/database/database.service.d.ts +9 -0
  54. package/dist/services/database/database.service.js +39 -0
  55. package/dist/services/database/drive-file/drive-file.attributes.d.ts +3 -6
  56. package/dist/services/database/drive-file/drive-file.domain.d.ts +3 -6
  57. package/dist/services/database/drive-file/drive-file.domain.js +1 -12
  58. package/dist/services/database/drive-file/drive-file.model.d.ts +15 -0
  59. package/dist/services/database/drive-file/drive-file.model.js +67 -0
  60. package/dist/services/database/drive-file/drive-file.repository.d.ts +11 -0
  61. package/dist/services/database/drive-file/drive-file.repository.js +63 -0
  62. package/dist/services/database/drive-folder/drive-folder.attributes.d.ts +3 -4
  63. package/dist/services/database/drive-folder/drive-folder.domain.d.ts +4 -5
  64. package/dist/services/database/drive-folder/drive-folder.domain.js +11 -15
  65. package/dist/services/database/drive-folder/drive-folder.model.d.ts +11 -0
  66. package/dist/services/database/drive-folder/drive-folder.model.js +51 -0
  67. package/dist/services/database/drive-folder/drive-folder.repository.d.ts +13 -0
  68. package/dist/services/database/drive-folder/drive-folder.repository.js +99 -0
  69. package/dist/services/drive/drive-file.service.d.ts +2 -0
  70. package/dist/services/drive/drive-file.service.js +71 -15
  71. package/dist/services/drive/drive-folder.service.d.ts +6 -1
  72. package/dist/services/drive/drive-folder.service.js +157 -31
  73. package/dist/services/drive/trash.service.d.ts +3 -0
  74. package/dist/services/drive/trash.service.js +52 -16
  75. package/dist/services/drive/workspace.service.d.ts +7 -0
  76. package/dist/services/drive/workspace.service.js +30 -0
  77. package/dist/services/keys.service.d.ts +7 -0
  78. package/dist/services/keys.service.js +55 -0
  79. package/dist/services/local-filesystem/local-filesystem.service.d.ts +2 -2
  80. package/dist/services/local-filesystem/local-filesystem.service.js +4 -4
  81. package/dist/services/network/download.service.d.ts +2 -2
  82. package/dist/services/network/download.service.js +2 -2
  83. package/dist/services/network/network-facade.service.d.ts +3 -7
  84. package/dist/services/network/network-facade.service.js +9 -11
  85. package/dist/services/network/upload/upload-facade.service.d.ts +1 -1
  86. package/dist/services/network/upload/upload-facade.service.js +15 -8
  87. package/dist/services/network/upload/upload-file.service.d.ts +5 -4
  88. package/dist/services/network/upload/upload-file.service.js +73 -41
  89. package/dist/services/network/upload/upload-folder.service.d.ts +2 -2
  90. package/dist/services/network/upload/upload-folder.service.js +15 -10
  91. package/dist/services/network/upload/upload.types.d.ts +13 -2
  92. package/dist/services/network/upload/upload.types.js +1 -1
  93. package/dist/services/sdk-manager.service.d.ts +11 -9
  94. package/dist/services/sdk-manager.service.js +29 -15
  95. package/dist/services/thumbnail.service.d.ts +19 -1
  96. package/dist/services/thumbnail.service.js +29 -2
  97. package/dist/services/universal-link.service.d.ts +3 -1
  98. package/dist/services/universal-link.service.js +15 -3
  99. package/dist/services/usage.service.d.ts +1 -2
  100. package/dist/services/usage.service.js +1 -1
  101. package/dist/services/validation.service.d.ts +5 -0
  102. package/dist/services/validation.service.js +36 -22
  103. package/dist/{webdav/services → services/webdav}/webdav-folder.service.d.ts +1 -7
  104. package/dist/{webdav/services → services/webdav}/webdav-folder.service.js +6 -10
  105. package/dist/types/command.types.d.ts +44 -1
  106. package/dist/types/command.types.js +29 -1
  107. package/dist/types/config.types.d.ts +1 -0
  108. package/dist/types/drive.types.d.ts +7 -6
  109. package/dist/types/network.types.d.ts +6 -0
  110. package/dist/utils/async.utils.d.ts +2 -1
  111. package/dist/utils/async.utils.js +13 -2
  112. package/dist/utils/cli.utils.d.ts +23 -15
  113. package/dist/utils/cli.utils.js +85 -21
  114. package/dist/utils/crypto.utils.d.ts +3 -1
  115. package/dist/utils/crypto.utils.js +15 -2
  116. package/dist/utils/database.utils.d.ts +11 -0
  117. package/dist/utils/database.utils.js +26 -0
  118. package/dist/utils/drive.utils.js +7 -10
  119. package/dist/utils/errors.utils.d.ts +4 -3
  120. package/dist/utils/errors.utils.js +16 -13
  121. package/dist/utils/format.utils.d.ts +1 -0
  122. package/dist/utils/format.utils.js +3 -0
  123. package/dist/utils/inquirer.utils.js +10 -1
  124. package/dist/utils/logger.utils.js +5 -5
  125. package/dist/utils/network.utils.js +17 -18
  126. package/dist/utils/path.utils.d.ts +7 -0
  127. package/dist/utils/path.utils.js +18 -0
  128. package/dist/utils/thumbnail.utils.d.ts +6 -20
  129. package/dist/utils/thumbnail.utils.js +20 -45
  130. package/dist/utils/webdav.utils.d.ts +4 -20
  131. package/dist/utils/webdav.utils.js +12 -14
  132. package/dist/utils/xml.utils.d.ts +1 -1
  133. package/dist/utils/xml.utils.js +1 -1
  134. package/dist/webdav/handlers/DELETE.handler.d.ts +0 -9
  135. package/dist/webdav/handlers/DELETE.handler.js +18 -16
  136. package/dist/webdav/handlers/GET.handler.d.ts +0 -13
  137. package/dist/webdav/handlers/GET.handler.js +6 -13
  138. package/dist/webdav/handlers/HEAD.handler.d.ts +0 -5
  139. package/dist/webdav/handlers/HEAD.handler.js +11 -23
  140. package/dist/webdav/handlers/MKCOL.handler.d.ts +0 -7
  141. package/dist/webdav/handlers/MKCOL.handler.js +5 -12
  142. package/dist/webdav/handlers/MOVE.handler.d.ts +0 -9
  143. package/dist/webdav/handlers/MOVE.handler.js +10 -16
  144. package/dist/webdav/handlers/PROPFIND.handler.d.ts +0 -7
  145. package/dist/webdav/handlers/PROPFIND.handler.js +7 -19
  146. package/dist/webdav/handlers/PUT.handler.d.ts +0 -15
  147. package/dist/webdav/handlers/PUT.handler.js +70 -57
  148. package/dist/webdav/index.js +6 -8
  149. package/dist/webdav/middewares/auth.middleware.d.ts +1 -2
  150. package/dist/webdav/middewares/auth.middleware.js +5 -4
  151. package/dist/webdav/middewares/errors.middleware.js +3 -3
  152. package/dist/webdav/middewares/webdav-auth.middleware.d.ts +3 -0
  153. package/dist/webdav/middewares/webdav-auth.middleware.js +44 -0
  154. package/dist/webdav/webdav-server.d.ts +3 -16
  155. package/dist/webdav/webdav-server.js +33 -91
  156. package/oclif.manifest.json +429 -6
  157. package/package.json +27 -22
@@ -2,106 +2,119 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.PUTRequestHandler = void 0;
4
4
  const drive_file_service_1 = require("../../services/drive/drive-file.service");
5
+ const auth_service_1 = require("../../services/auth.service");
5
6
  const errors_utils_1 = require("../../utils/errors.utils");
6
7
  const webdav_utils_1 = require("../../utils/webdav.utils");
7
8
  const logger_utils_1 = require("../../utils/logger.utils");
9
+ const trash_service_1 = require("../../services/drive/trash.service");
8
10
  const types_1 = require("@internxt/sdk/dist/drive/storage/types");
9
11
  const cli_utils_1 = require("../../utils/cli.utils");
10
12
  const stream_utils_1 = require("../../utils/stream.utils");
13
+ const webdav_folder_service_1 = require("../../services/webdav/webdav-folder.service");
14
+ const async_utils_1 = require("../../utils/async.utils");
11
15
  const thumbnail_utils_1 = require("../../utils/thumbnail.utils");
12
16
  const thumbnail_service_1 = require("../../services/thumbnail.service");
13
- const async_utils_1 = require("../../utils/async.utils");
14
17
  class PUTRequestHandler {
15
- dependencies;
16
- constructor(dependencies) {
17
- this.dependencies = dependencies;
18
- }
19
18
  handle = async (req, res) => {
20
- const contentLength = Number(req.headers['content-length']);
21
- if (!contentLength || isNaN(contentLength) || contentLength <= 0) {
22
- throw new errors_utils_1.UnsupportedMediaTypeError('Empty files are not supported');
19
+ let contentLength = Number(req.headers['content-length']);
20
+ if (!contentLength || Number.isNaN(contentLength) || contentLength <= 0) {
21
+ contentLength = 0;
23
22
  }
24
23
  const resource = await webdav_utils_1.WebDavUtils.getRequestedResource(req.url);
25
- const driveFileItem = await webdav_utils_1.WebDavUtils.getDriveItemFromResource({
26
- resource: resource,
27
- driveFileService: this.dependencies.driveFileService,
28
- driveFolderService: this.dependencies.driveFolderService,
29
- });
24
+ const driveFileItem = await webdav_utils_1.WebDavUtils.getDriveItemFromResource(resource);
30
25
  if (driveFileItem?.itemType === 'folder') {
31
26
  throw new errors_utils_1.NotFoundError('Folders cannot be created with PUT. Use MKCOL instead.');
32
27
  }
33
28
  logger_utils_1.webdavLogger.info(`[PUT] Request received for file at ${resource.url}`);
34
- logger_utils_1.webdavLogger.info(`[PUT] Uploading '${resource.name}' to '${resource.parentPath}'`);
35
- const parentDriveFolderItem = (await this.dependencies.webDavFolderService.getDriveFolderItemFromPath(resource.parentPath)) ??
36
- (await this.dependencies.webDavFolderService.createParentPathOrThrow(resource.parentPath));
29
+ logger_utils_1.webdavLogger.info(`[PUT] Uploading '${resource.name}' (${cli_utils_1.CLIUtils.formatBytesToString(contentLength)}) to '${resource.parentPath}'`);
30
+ const timings = {
31
+ networkUpload: 0,
32
+ driveUpload: 0,
33
+ thumbnailUpload: 0,
34
+ };
35
+ const parentDriveFolderItem = (await webdav_folder_service_1.WebDavFolderService.instance.getDriveFolderItemFromPath(resource.parentPath)) ??
36
+ (await webdav_folder_service_1.WebDavFolderService.instance.createParentPathOrThrow(resource.parentPath));
37
37
  try {
38
38
  if (driveFileItem && driveFileItem.status === 'EXISTS') {
39
39
  logger_utils_1.webdavLogger.info(`[PUT] File '${resource.name}' already exists in '${resource.path.dir}', trashing it...`);
40
- await this.dependencies.trashService.trashItems({
40
+ await trash_service_1.TrashService.instance.trashItems({
41
41
  items: [{ type: driveFileItem.itemType, uuid: driveFileItem.uuid }],
42
42
  });
43
43
  }
44
44
  }
45
45
  catch {
46
46
  }
47
- const { user } = await this.dependencies.authService.getAuthDetails();
47
+ const { user } = await auth_service_1.AuthService.instance.getAuthDetails();
48
48
  const fileType = resource.path.ext.replace('.', '');
49
- const timer = cli_utils_1.CLIUtils.timer();
50
49
  let bufferStream;
51
50
  let fileStream = req;
52
- const isThumbnailable = (0, thumbnail_utils_1.isFileThumbnailable)(fileType);
51
+ const isThumbnailable = thumbnail_utils_1.ThumbnailUtils.isFileThumbnailable(fileType);
53
52
  if (isThumbnailable) {
54
53
  bufferStream = new stream_utils_1.BufferStream();
55
54
  fileStream = req.pipe(bufferStream);
56
55
  }
57
- let uploaded = false, aborted = false;
58
- const progressCallback = (progress) => {
59
- if (!uploaded && !aborted) {
60
- logger_utils_1.webdavLogger.info(`[PUT] Upload progress for file ${resource.name}: ${(progress * 100).toFixed(2)}%`);
61
- }
62
- };
63
- const fileId = await new Promise((resolve, reject) => {
64
- const state = this.dependencies.networkFacade.uploadFile(fileStream, contentLength, user.bucket, (err, res) => {
65
- if (err) {
66
- aborted = true;
67
- return reject(err);
68
- }
69
- resolve(res);
70
- }, progressCallback);
71
- res.on('close', async () => {
72
- aborted = true;
73
- if (!uploaded) {
74
- logger_utils_1.webdavLogger.info('[PUT] ❌ HTTP Client has been disconnected, res has been closed.');
75
- state.stop();
56
+ const { networkFacade, bucket } = await cli_utils_1.CLIUtils.prepareNetwork(user);
57
+ let fileId;
58
+ if (contentLength > 0) {
59
+ let uploaded = false, aborted = false;
60
+ const progressCallback = (progress) => {
61
+ if (!uploaded && !aborted) {
62
+ logger_utils_1.webdavLogger.info(`[PUT] Upload progress for file ${resource.name}: ${(progress * 100).toFixed(2)}%`);
76
63
  }
64
+ };
65
+ const networkUploadTimer = cli_utils_1.CLIUtils.timer();
66
+ fileId = await new Promise((resolve, reject) => {
67
+ const state = networkFacade.uploadFile(fileStream, contentLength, bucket, (err, res) => {
68
+ if (err) {
69
+ aborted = true;
70
+ return reject(err);
71
+ }
72
+ resolve(res);
73
+ }, progressCallback);
74
+ res.on('close', async () => {
75
+ aborted = true;
76
+ if (!uploaded) {
77
+ logger_utils_1.webdavLogger.info('[PUT] ❌ HTTP Client has been disconnected, res has been closed.');
78
+ state.stop();
79
+ }
80
+ });
77
81
  });
78
- });
79
- uploaded = true;
80
- logger_utils_1.webdavLogger.info('[PUT] ✅ File uploaded to network');
82
+ uploaded = true;
83
+ timings.networkUpload = networkUploadTimer.stop();
84
+ logger_utils_1.webdavLogger.info('[PUT] ✅ File uploaded to network');
85
+ }
86
+ const driveTimer = cli_utils_1.CLIUtils.timer();
81
87
  const file = await drive_file_service_1.DriveFileService.instance.createFile({
82
88
  plainName: resource.path.name,
83
89
  type: fileType,
84
90
  size: contentLength,
85
91
  folderUuid: parentDriveFolderItem.uuid,
86
- fileId: fileId,
87
- bucket: user.bucket,
92
+ fileId,
93
+ bucket,
88
94
  encryptVersion: types_1.EncryptionVersion.Aes03,
89
95
  });
90
- try {
91
- if (isThumbnailable && bufferStream) {
92
- const thumbnailBuffer = bufferStream.getBuffer();
93
- if (thumbnailBuffer) {
94
- await thumbnail_service_1.ThumbnailService.instance.uploadThumbnail(thumbnailBuffer, fileType, user.bucket, file.uuid, this.dependencies.networkFacade);
95
- }
96
- }
97
- }
98
- catch (error) {
99
- logger_utils_1.webdavLogger.info(`[PUT] ❌ File thumbnail upload failed ${error.message}`);
96
+ timings.driveUpload = driveTimer.stop();
97
+ const thumbnailTimer = cli_utils_1.CLIUtils.timer();
98
+ if (contentLength > 0 && isThumbnailable && bufferStream) {
99
+ await thumbnail_service_1.ThumbnailService.instance.tryUploadThumbnail({
100
+ fileUuid: file.uuid,
101
+ bufferStream,
102
+ fileType,
103
+ bucket,
104
+ networkFacade,
105
+ size: contentLength,
106
+ });
100
107
  }
101
- const uploadTime = timer.stop();
102
- logger_utils_1.webdavLogger.info(`[PUT] File uploaded in ${uploadTime}ms to Internxt Drive`);
108
+ timings.thumbnailUpload = thumbnailTimer.stop();
109
+ const totalTime = Object.values(timings).reduce((sum, time) => sum + time, 0);
110
+ const throughputMBps = cli_utils_1.CLIUtils.calculateThroughputMBps(contentLength, timings.networkUpload);
111
+ logger_utils_1.webdavLogger.info(`[PUT] ✅ File uploaded in ${cli_utils_1.CLIUtils.formatDuration(totalTime)} to Internxt Drive`);
112
+ logger_utils_1.webdavLogger.info('[PUT] Timing breakdown:\n' +
113
+ `Network upload: ${cli_utils_1.CLIUtils.formatDuration(timings.networkUpload)} (${throughputMBps.toFixed(2)} MB/s)\n` +
114
+ `Drive upload: ${cli_utils_1.CLIUtils.formatDuration(timings.driveUpload)}\n` +
115
+ `Thumbnail: ${cli_utils_1.CLIUtils.formatDuration(timings.thumbnailUpload)}\n`);
103
116
  await async_utils_1.AsyncUtils.sleep(500);
104
- logger_utils_1.webdavLogger.info(`[PUT] [RESPONSE-201] ${resource.url} - Returning 201 Created after ${uploadTime}ms (+ 500ms propagation delay)`);
117
+ logger_utils_1.webdavLogger.info(`[PUT] [RESPONSE-201] ${resource.url} - Returning 201 Created after ${cli_utils_1.CLIUtils.formatDuration(totalTime)}`);
105
118
  res.status(201).send();
106
119
  };
107
120
  }
@@ -7,22 +7,20 @@ const dotenv_1 = __importDefault(require("dotenv"));
7
7
  const webdav_server_1 = require("./webdav-server");
8
8
  const express_1 = __importDefault(require("express"));
9
9
  const config_service_1 = require("../services/config.service");
10
- const drive_folder_service_1 = require("../services/drive/drive-folder.service");
11
- const drive_file_service_1 = require("../services/drive/drive-file.service");
12
- const download_service_1 = require("../services/network/download.service");
13
10
  const auth_service_1 = require("../services/auth.service");
14
- const crypto_service_1 = require("../services/crypto.service");
15
- const trash_service_1 = require("../services/drive/trash.service");
16
11
  const logger_utils_1 = require("../utils/logger.utils");
17
12
  const sdk_manager_service_1 = require("../services/sdk-manager.service");
13
+ const database_service_1 = require("../services/database/database.service");
18
14
  dotenv_1.default.config({ quiet: true });
19
15
  const init = async () => {
20
16
  await config_service_1.ConfigService.instance.ensureInternxtCliDataDirExists();
21
17
  await config_service_1.ConfigService.instance.ensureWebdavCertsDirExists();
22
18
  await config_service_1.ConfigService.instance.ensureInternxtLogsDirExists();
23
- const { token } = await auth_service_1.AuthService.instance.getAuthDetails();
24
- sdk_manager_service_1.SdkManager.init({ token });
25
- new webdav_server_1.WebDavServer((0, express_1.default)(), config_service_1.ConfigService.instance, drive_file_service_1.DriveFileService.instance, drive_folder_service_1.DriveFolderService.instance, download_service_1.DownloadService.instance, auth_service_1.AuthService.instance, crypto_service_1.CryptoService.instance, trash_service_1.TrashService.instance)
19
+ await database_service_1.DatabaseService.instance.initialize();
20
+ await database_service_1.DatabaseService.instance.clear();
21
+ const { token, workspace } = await auth_service_1.AuthService.instance.getAuthDetails();
22
+ sdk_manager_service_1.SdkManager.init({ token, workspaceToken: workspace?.workspaceCredentials.token });
23
+ new webdav_server_1.WebDavServer((0, express_1.default)())
26
24
  .start()
27
25
  .then()
28
26
  .catch((err) => logger_utils_1.webdavLogger.error('Failed to start WebDAV server', err));
@@ -1,3 +1,2 @@
1
1
  import { RequestHandler } from 'express';
2
- import { AuthService } from '../../services/auth.service';
3
- export declare const AuthMiddleware: (authService: AuthService) => RequestHandler;
2
+ export declare const AuthMiddleware: () => RequestHandler;
@@ -2,20 +2,21 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.AuthMiddleware = void 0;
4
4
  const sdk_manager_service_1 = require("../../services/sdk-manager.service");
5
+ const auth_service_1 = require("../../services/auth.service");
5
6
  const logger_utils_1 = require("../../utils/logger.utils");
6
7
  const xml_utils_1 = require("../../utils/xml.utils");
7
8
  const errors_utils_1 = require("../../utils/errors.utils");
8
- const AuthMiddleware = (authService) => {
9
+ const AuthMiddleware = () => {
9
10
  return (_, res, next) => {
10
11
  (async () => {
11
12
  try {
12
- const { token } = await authService.getAuthDetails();
13
- sdk_manager_service_1.SdkManager.init({ token });
13
+ const { token, workspace } = await auth_service_1.AuthService.instance.getAuthDetails();
14
+ sdk_manager_service_1.SdkManager.init({ token, workspaceToken: workspace?.workspaceCredentials.token });
14
15
  next();
15
16
  }
16
17
  catch (error) {
17
18
  let message = 'Authentication required to access this resource.';
18
- if ((0, errors_utils_1.isError)(error)) {
19
+ if (errors_utils_1.ErrorUtils.isError(error)) {
19
20
  message = error.message;
20
21
  if (error.stack) {
21
22
  logger_utils_1.webdavLogger.error(`Error from AuthMiddleware: ${message}\nStack: ${error.stack}`);
@@ -5,8 +5,8 @@ const logger_utils_1 = require("../../utils/logger.utils");
5
5
  const xml_utils_1 = require("../../utils/xml.utils");
6
6
  const errors_utils_1 = require("../../utils/errors.utils");
7
7
  const ErrorHandlingMiddleware = (err, req, res, _) => {
8
- const message = (0, errors_utils_1.isError)(err) ? err.message : 'Something went wrong';
9
- if ((0, errors_utils_1.isError)(err) && err.stack) {
8
+ const message = errors_utils_1.ErrorUtils.isError(err) ? err.message : 'Something went wrong';
9
+ if (errors_utils_1.ErrorUtils.isError(err) && err.stack) {
10
10
  logger_utils_1.webdavLogger.error(`[ERROR MIDDLEWARE] [${req.method.toUpperCase()} - ${req.url}] ${message}\nStack: ${err.stack}`);
11
11
  }
12
12
  else {
@@ -16,7 +16,7 @@ const ErrorHandlingMiddleware = (err, req, res, _) => {
16
16
  [xml_utils_1.XMLUtils.addDefaultNamespace('responsedescription')]: message,
17
17
  }, {}, 'error');
18
18
  let statusCode = 500;
19
- if ('statusCode' in err && !isNaN(err.statusCode)) {
19
+ if ('statusCode' in err && !Number.isNaN(err.statusCode)) {
20
20
  statusCode = err.statusCode;
21
21
  }
22
22
  res.status(statusCode).send(errorBodyXML);
@@ -0,0 +1,3 @@
1
+ import { RequestHandler } from 'express';
2
+ import { WebdavConfig } from '../../types/command.types';
3
+ export declare const WebDAVAuthMiddleware: (configs: WebdavConfig) => RequestHandler;
@@ -0,0 +1,44 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.WebDAVAuthMiddleware = void 0;
4
+ const xml_utils_1 = require("../../utils/xml.utils");
5
+ const WebDAVAuthMiddleware = (configs) => {
6
+ return (req, res, next) => {
7
+ (async () => {
8
+ if (configs.customAuth) {
9
+ const authHeader = req.headers.authorization;
10
+ if (!authHeader) {
11
+ return sendUnauthorizedError(res, 'Missing Authorization header.');
12
+ }
13
+ if (!authHeader.startsWith('Basic ')) {
14
+ return sendUnauthorizedError(res, 'Unsupported authentication method. Only Basic authentication is supported.');
15
+ }
16
+ const base64Credentials = authHeader.substring(6);
17
+ const credentials = Buffer.from(base64Credentials, 'base64').toString('utf-8');
18
+ const [username, password] = credentials.split(':');
19
+ if (!username || !password) {
20
+ return sendUnauthorizedError(res, 'Invalid authentication credentials format.');
21
+ }
22
+ if (username !== configs.username || password !== configs.password) {
23
+ return sendUnauthorizedError(res, 'Authentication failed. Please check your WebDAV custom credentials.');
24
+ }
25
+ else {
26
+ next();
27
+ return;
28
+ }
29
+ }
30
+ else {
31
+ next();
32
+ return;
33
+ }
34
+ })();
35
+ };
36
+ };
37
+ exports.WebDAVAuthMiddleware = WebDAVAuthMiddleware;
38
+ const sendUnauthorizedError = (res, message) => {
39
+ const errorBodyXML = xml_utils_1.XMLUtils.toWebDavXML({
40
+ [xml_utils_1.XMLUtils.addDefaultNamespace('responsedescription')]: message,
41
+ }, {}, 'error');
42
+ res.status(401).send(errorBodyXML);
43
+ return;
44
+ };
@@ -1,24 +1,11 @@
1
1
  import { Express } from 'express';
2
- import { ConfigService } from '../services/config.service';
3
- import { DriveFolderService } from '../services/drive/drive-folder.service';
4
- import { DriveFileService } from '../services/drive/drive-file.service';
5
- import { DownloadService } from '../services/network/download.service';
6
- import { AuthService } from '../services/auth.service';
7
- import { CryptoService } from '../services/crypto.service';
8
- import { TrashService } from '../services/drive/trash.service';
2
+ import { WebdavConfig } from '../types/command.types';
9
3
  export declare class WebDavServer {
10
4
  private readonly app;
11
- private readonly configService;
12
- private readonly driveFileService;
13
- private readonly driveFolderService;
14
- private readonly downloadService;
15
- private readonly authService;
16
- private readonly cryptoService;
17
- private readonly trashService;
18
- constructor(app: Express, configService: ConfigService, driveFileService: DriveFileService, driveFolderService: DriveFolderService, downloadService: DownloadService, authService: AuthService, cryptoService: CryptoService, trashService: TrashService);
19
- private readonly getNetworkFacade;
5
+ constructor(app: Express);
20
6
  private readonly registerStartMiddlewares;
21
7
  private readonly registerEndMiddleWares;
22
8
  private readonly registerHandlers;
9
+ static readonly checkwebDAVCredentials: (configs: WebdavConfig) => void;
23
10
  start: () => Promise<void>;
24
11
  }
@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.WebDavServer = void 0;
7
- const https_1 = __importDefault(require("https"));
8
- const http_1 = __importDefault(require("http"));
7
+ const node_https_1 = __importDefault(require("node:https"));
8
+ const node_http_1 = __importDefault(require("node:http"));
9
9
  const config_service_1 = require("../services/config.service");
10
10
  const OPTIONS_handler_1 = require("./handlers/OPTIONS.handler");
11
11
  const PROPFIND_handler_1 = require("./handlers/PROPFIND.handler");
@@ -15,13 +15,9 @@ const auth_middleware_1 = require("./middewares/auth.middleware");
15
15
  const request_logger_middleware_1 = require("./middewares/request-logger.middleware");
16
16
  const GET_handler_1 = require("./handlers/GET.handler");
17
17
  const HEAD_handler_1 = require("./handlers/HEAD.handler");
18
- const download_service_1 = require("../services/network/download.service");
19
- const auth_service_1 = require("../services/auth.service");
20
- const crypto_service_1 = require("../services/crypto.service");
21
18
  const errors_middleware_1 = require("./middewares/errors.middleware");
22
19
  const express_async_handler_1 = __importDefault(require("express-async-handler"));
23
20
  const sdk_manager_service_1 = require("../services/sdk-manager.service");
24
- const network_facade_service_1 = require("../services/network/network-facade.service");
25
21
  const network_utils_1 = require("../utils/network.utils");
26
22
  const PUT_handler_1 = require("./handlers/PUT.handler");
27
23
  const MKCOL_handler_1 = require("./handlers/MKCOL.handler");
@@ -29,48 +25,16 @@ const DELETE_handler_1 = require("./handlers/DELETE.handler");
29
25
  const PROPPATCH_handler_1 = require("./handlers/PROPPATCH.handler");
30
26
  const MOVE_handler_1 = require("./handlers/MOVE.handler");
31
27
  const COPY_handler_1 = require("./handlers/COPY.handler");
32
- const inxt_js_1 = require("@internxt/inxt-js");
33
28
  const mkcol_middleware_1 = require("./middewares/mkcol.middleware");
34
- const webdav_folder_service_1 = require("./services/webdav-folder.service");
29
+ const webdav_auth_middleware_1 = require("./middewares/webdav-auth.middleware");
35
30
  class WebDavServer {
36
31
  app;
37
- configService;
38
- driveFileService;
39
- driveFolderService;
40
- downloadService;
41
- authService;
42
- cryptoService;
43
- trashService;
44
- constructor(app, configService, driveFileService, driveFolderService, downloadService, authService, cryptoService, trashService) {
32
+ constructor(app) {
45
33
  this.app = app;
46
- this.configService = configService;
47
- this.driveFileService = driveFileService;
48
- this.driveFolderService = driveFolderService;
49
- this.downloadService = downloadService;
50
- this.authService = authService;
51
- this.cryptoService = cryptoService;
52
- this.trashService = trashService;
53
34
  }
54
- getNetworkFacade = async () => {
55
- const credentials = await this.configService.readUser();
56
- if (!credentials)
57
- throw new Error('Credentials not found in Config service, do login first');
58
- const networkModule = sdk_manager_service_1.SdkManager.instance.getNetwork({
59
- user: credentials.user.bridgeUser,
60
- pass: credentials.user.userId,
61
- });
62
- const environment = new inxt_js_1.Environment({
63
- bridgeUser: credentials.user.bridgeUser,
64
- bridgePass: credentials.user.userId,
65
- bridgeUrl: config_service_1.ConfigService.instance.get('NETWORK_URL'),
66
- encryptionKey: credentials.user.mnemonic,
67
- appDetails: sdk_manager_service_1.SdkManager.getAppDetails(),
68
- });
69
- const networkFacade = new network_facade_service_1.NetworkFacade(networkModule, environment, download_service_1.DownloadService.instance, crypto_service_1.CryptoService.instance);
70
- return networkFacade;
71
- };
72
- registerStartMiddlewares = () => {
73
- this.app.use((0, auth_middleware_1.AuthMiddleware)(auth_service_1.AuthService.instance));
35
+ registerStartMiddlewares = (configs) => {
36
+ this.app.use((0, webdav_auth_middleware_1.WebDAVAuthMiddleware)(configs));
37
+ this.app.use((0, auth_middleware_1.AuthMiddleware)());
74
38
  this.app.use((0, request_logger_middleware_1.RequestLoggerMiddleware)({
75
39
  enable: true,
76
40
  }));
@@ -80,72 +44,50 @@ class WebDavServer {
80
44
  registerEndMiddleWares = () => {
81
45
  this.app.use(errors_middleware_1.ErrorHandlingMiddleware);
82
46
  };
83
- registerHandlers = async () => {
47
+ registerHandlers = () => {
84
48
  const serverListenPath = /(.*)/;
85
- const networkFacade = await this.getNetworkFacade();
86
- const webDavFolderService = new webdav_folder_service_1.WebDavFolderService({
87
- driveFolderService: this.driveFolderService,
88
- configService: this.configService,
89
- });
90
- this.app.head(serverListenPath, (0, express_async_handler_1.default)(new HEAD_handler_1.HEADRequestHandler({
91
- driveFileService: this.driveFileService,
92
- }).handle));
93
- this.app.get(serverListenPath, (0, express_async_handler_1.default)(new GET_handler_1.GETRequestHandler({
94
- driveFileService: this.driveFileService,
95
- downloadService: this.downloadService,
96
- cryptoService: this.cryptoService,
97
- authService: this.authService,
98
- networkFacade: networkFacade,
99
- }).handle));
49
+ this.app.head(serverListenPath, (0, express_async_handler_1.default)(new HEAD_handler_1.HEADRequestHandler().handle));
50
+ this.app.get(serverListenPath, (0, express_async_handler_1.default)(new GET_handler_1.GETRequestHandler().handle));
100
51
  this.app.options(serverListenPath, (0, express_async_handler_1.default)(new OPTIONS_handler_1.OPTIONSRequestHandler().handle));
101
- this.app.propfind(serverListenPath, (0, express_async_handler_1.default)(new PROPFIND_handler_1.PROPFINDRequestHandler({
102
- driveFileService: this.driveFileService,
103
- driveFolderService: this.driveFolderService,
104
- }).handle));
105
- this.app.put(serverListenPath, (0, express_async_handler_1.default)(new PUT_handler_1.PUTRequestHandler({
106
- driveFileService: this.driveFileService,
107
- driveFolderService: this.driveFolderService,
108
- webDavFolderService: webDavFolderService,
109
- authService: this.authService,
110
- trashService: this.trashService,
111
- networkFacade: networkFacade,
112
- }).handle));
113
- this.app.mkcol(serverListenPath, (0, express_async_handler_1.default)(new MKCOL_handler_1.MKCOLRequestHandler({
114
- driveFolderService: this.driveFolderService,
115
- webDavFolderService: webDavFolderService,
116
- }).handle));
117
- this.app.delete(serverListenPath, (0, express_async_handler_1.default)(new DELETE_handler_1.DELETERequestHandler({
118
- trashService: this.trashService,
119
- driveFileService: this.driveFileService,
120
- driveFolderService: this.driveFolderService,
121
- }).handle));
52
+ this.app.propfind(serverListenPath, (0, express_async_handler_1.default)(new PROPFIND_handler_1.PROPFINDRequestHandler().handle));
53
+ this.app.put(serverListenPath, (0, express_async_handler_1.default)(new PUT_handler_1.PUTRequestHandler().handle));
54
+ this.app.mkcol(serverListenPath, (0, express_async_handler_1.default)(new MKCOL_handler_1.MKCOLRequestHandler().handle));
55
+ this.app.delete(serverListenPath, (0, express_async_handler_1.default)(new DELETE_handler_1.DELETERequestHandler().handle));
122
56
  this.app.proppatch(serverListenPath, (0, express_async_handler_1.default)(new PROPPATCH_handler_1.PROPPATCHRequestHandler().handle));
123
- this.app.move(serverListenPath, (0, express_async_handler_1.default)(new MOVE_handler_1.MOVERequestHandler({
124
- driveFolderService: this.driveFolderService,
125
- driveFileService: this.driveFileService,
126
- webDavFolderService,
127
- }).handle));
57
+ this.app.move(serverListenPath, (0, express_async_handler_1.default)(new MOVE_handler_1.MOVERequestHandler().handle));
128
58
  this.app.copy(serverListenPath, (0, express_async_handler_1.default)(new COPY_handler_1.COPYRequestHandler().handle));
129
59
  };
60
+ static checkwebDAVCredentials = (configs) => {
61
+ if (configs.customAuth) {
62
+ if (!configs.username?.trim()) {
63
+ throw new Error('WebDAV CustomAuth is enabled but no username was provided.');
64
+ }
65
+ if (!configs.password?.trim()) {
66
+ throw new Error('WebDAV CustomAuth is enabled but no password was provided.');
67
+ }
68
+ }
69
+ };
130
70
  start = async () => {
131
- const configs = await this.configService.readWebdavConfig();
71
+ const configs = await config_service_1.ConfigService.instance.readWebdavConfig();
72
+ WebDavServer.checkwebDAVCredentials(configs);
132
73
  this.app.disable('x-powered-by');
133
- this.registerStartMiddlewares();
134
- await this.registerHandlers();
74
+ this.registerStartMiddlewares(configs);
75
+ this.registerHandlers();
135
76
  this.registerEndMiddleWares();
136
77
  const plainHttp = configs.protocol === 'http';
137
78
  let server;
138
79
  if (plainHttp) {
139
- server = http_1.default.createServer(this.app);
80
+ server = node_http_1.default.createServer(this.app);
140
81
  }
141
82
  else {
142
83
  const httpsCerts = await network_utils_1.NetworkUtils.getWebdavSSLCerts(configs);
143
- server = https_1.default.createServer(httpsCerts, this.app);
84
+ server = node_https_1.default.createServer(httpsCerts, this.app);
144
85
  }
145
86
  server.requestTimeout = configs.timeoutMinutes * 60 * 1000;
146
87
  server.listen(Number(configs.port), configs.host, undefined, () => {
147
88
  logger_utils_1.webdavLogger.info(`Internxt ${sdk_manager_service_1.SdkManager.getAppDetails().clientVersion} WebDav server ` +
148
- `listening at ${configs.protocol}://${configs.host}:${configs.port}`);
89
+ `listening at ${configs.protocol}://${configs.host}:${configs.port}` +
90
+ `${configs.customAuth ? ' (with custom authentication)' : ''}`);
149
91
  });
150
92
  };
151
93
  }