@internxt/cli 1.0.14 → 1.0.17
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.
- package/.env +1 -1
- package/README.md +13 -13
- package/dist/commands/logout.js +1 -1
- package/dist/commands/webdav.js +11 -4
- package/dist/webdav/middewares/errors.middleware.js +2 -2
- package/dist/webdav/middewares/request-logger.middleware.d.ts +2 -1
- package/dist/webdav/middewares/request-logger.middleware.js +3 -4
- package/dist/webdav/webdav-server.js +2 -1
- package/oclif.manifest.json +1 -1
- package/package.json +2 -2
package/.env
CHANGED
|
@@ -9,5 +9,5 @@ APP_MAGIC_IV=d139cb9a2cd17092e79e1861cf9d7023
|
|
|
9
9
|
APP_MAGIC_SALT=38dce0391b49efba88dbc8c39ebf868f0267eb110bb0012ab27dc52a528d61b1d1ed9d76f400ff58e3240028442b1eab9bb84e111d9dadd997982dbde9dbd25e
|
|
10
10
|
NETWORK_URL=https://api.internxt.com
|
|
11
11
|
WEBDAV_SERVER_PORT=3005
|
|
12
|
-
RUDDERSTACK_WRITE_KEY=
|
|
12
|
+
RUDDERSTACK_WRITE_KEY=2gEQj6IAjlsh0a3LGyf7VA6hZsL
|
|
13
13
|
RUDDERSTACK_DATAPLANE_URL=https://cdp.internxt.com
|
package/README.md
CHANGED
|
@@ -31,7 +31,7 @@ $ npm install -g @internxt/cli
|
|
|
31
31
|
$ internxt COMMAND
|
|
32
32
|
running command...
|
|
33
33
|
$ internxt (--version)
|
|
34
|
-
@internxt/cli/1.0.
|
|
34
|
+
@internxt/cli/1.0.17 darwin-arm64 node-v20.10.0
|
|
35
35
|
$ internxt --help [COMMAND]
|
|
36
36
|
USAGE
|
|
37
37
|
$ internxt COMMAND
|
|
@@ -82,7 +82,7 @@ EXAMPLES
|
|
|
82
82
|
$ internxt config
|
|
83
83
|
```
|
|
84
84
|
|
|
85
|
-
_See code: [src/commands/config.ts](https://github.com/internxt/cli/blob/v1.0.
|
|
85
|
+
_See code: [src/commands/config.ts](https://github.com/internxt/cli/blob/v1.0.17/src/commands/config.ts)_
|
|
86
86
|
|
|
87
87
|
## `internxt create-folder`
|
|
88
88
|
|
|
@@ -103,7 +103,7 @@ EXAMPLES
|
|
|
103
103
|
$ internxt create-folder
|
|
104
104
|
```
|
|
105
105
|
|
|
106
|
-
_See code: [src/commands/create-folder.ts](https://github.com/internxt/cli/blob/v1.0.
|
|
106
|
+
_See code: [src/commands/create-folder.ts](https://github.com/internxt/cli/blob/v1.0.17/src/commands/create-folder.ts)_
|
|
107
107
|
|
|
108
108
|
## `internxt download`
|
|
109
109
|
|
|
@@ -126,7 +126,7 @@ EXAMPLES
|
|
|
126
126
|
$ internxt download
|
|
127
127
|
```
|
|
128
128
|
|
|
129
|
-
_See code: [src/commands/download.ts](https://github.com/internxt/cli/blob/v1.0.
|
|
129
|
+
_See code: [src/commands/download.ts](https://github.com/internxt/cli/blob/v1.0.17/src/commands/download.ts)_
|
|
130
130
|
|
|
131
131
|
## `internxt list`
|
|
132
132
|
|
|
@@ -160,7 +160,7 @@ EXAMPLES
|
|
|
160
160
|
$ internxt list
|
|
161
161
|
```
|
|
162
162
|
|
|
163
|
-
_See code: [src/commands/list.ts](https://github.com/internxt/cli/blob/v1.0.
|
|
163
|
+
_See code: [src/commands/list.ts](https://github.com/internxt/cli/blob/v1.0.17/src/commands/list.ts)_
|
|
164
164
|
|
|
165
165
|
## `internxt login`
|
|
166
166
|
|
|
@@ -186,7 +186,7 @@ EXAMPLES
|
|
|
186
186
|
$ internxt login
|
|
187
187
|
```
|
|
188
188
|
|
|
189
|
-
_See code: [src/commands/login.ts](https://github.com/internxt/cli/blob/v1.0.
|
|
189
|
+
_See code: [src/commands/login.ts](https://github.com/internxt/cli/blob/v1.0.17/src/commands/login.ts)_
|
|
190
190
|
|
|
191
191
|
## `internxt logout`
|
|
192
192
|
|
|
@@ -203,7 +203,7 @@ EXAMPLES
|
|
|
203
203
|
$ internxt logout
|
|
204
204
|
```
|
|
205
205
|
|
|
206
|
-
_See code: [src/commands/logout.ts](https://github.com/internxt/cli/blob/v1.0.
|
|
206
|
+
_See code: [src/commands/logout.ts](https://github.com/internxt/cli/blob/v1.0.17/src/commands/logout.ts)_
|
|
207
207
|
|
|
208
208
|
## `internxt logs`
|
|
209
209
|
|
|
@@ -220,7 +220,7 @@ EXAMPLES
|
|
|
220
220
|
$ internxt logs
|
|
221
221
|
```
|
|
222
222
|
|
|
223
|
-
_See code: [src/commands/logs.ts](https://github.com/internxt/cli/blob/v1.0.
|
|
223
|
+
_See code: [src/commands/logs.ts](https://github.com/internxt/cli/blob/v1.0.17/src/commands/logs.ts)_
|
|
224
224
|
|
|
225
225
|
## `internxt move`
|
|
226
226
|
|
|
@@ -245,7 +245,7 @@ EXAMPLES
|
|
|
245
245
|
$ internxt move
|
|
246
246
|
```
|
|
247
247
|
|
|
248
|
-
_See code: [src/commands/move.ts](https://github.com/internxt/cli/blob/v1.0.
|
|
248
|
+
_See code: [src/commands/move.ts](https://github.com/internxt/cli/blob/v1.0.17/src/commands/move.ts)_
|
|
249
249
|
|
|
250
250
|
## `internxt trash`
|
|
251
251
|
|
|
@@ -269,7 +269,7 @@ EXAMPLES
|
|
|
269
269
|
$ internxt trash
|
|
270
270
|
```
|
|
271
271
|
|
|
272
|
-
_See code: [src/commands/trash.ts](https://github.com/internxt/cli/blob/v1.0.
|
|
272
|
+
_See code: [src/commands/trash.ts](https://github.com/internxt/cli/blob/v1.0.17/src/commands/trash.ts)_
|
|
273
273
|
|
|
274
274
|
## `internxt upload`
|
|
275
275
|
|
|
@@ -293,7 +293,7 @@ EXAMPLES
|
|
|
293
293
|
$ internxt upload
|
|
294
294
|
```
|
|
295
295
|
|
|
296
|
-
_See code: [src/commands/upload.ts](https://github.com/internxt/cli/blob/v1.0.
|
|
296
|
+
_See code: [src/commands/upload.ts](https://github.com/internxt/cli/blob/v1.0.17/src/commands/upload.ts)_
|
|
297
297
|
|
|
298
298
|
## `internxt webdav ACTION`
|
|
299
299
|
|
|
@@ -316,7 +316,7 @@ EXAMPLES
|
|
|
316
316
|
$ internxt webdav status
|
|
317
317
|
```
|
|
318
318
|
|
|
319
|
-
_See code: [src/commands/webdav.ts](https://github.com/internxt/cli/blob/v1.0.
|
|
319
|
+
_See code: [src/commands/webdav.ts](https://github.com/internxt/cli/blob/v1.0.17/src/commands/webdav.ts)_
|
|
320
320
|
|
|
321
321
|
## `internxt whoami`
|
|
322
322
|
|
|
@@ -333,7 +333,7 @@ EXAMPLES
|
|
|
333
333
|
$ internxt whoami
|
|
334
334
|
```
|
|
335
335
|
|
|
336
|
-
_See code: [src/commands/whoami.ts](https://github.com/internxt/cli/blob/v1.0.
|
|
336
|
+
_See code: [src/commands/whoami.ts](https://github.com/internxt/cli/blob/v1.0.17/src/commands/whoami.ts)_
|
|
337
337
|
<!-- commandsstop -->
|
|
338
338
|
|
|
339
339
|
# Current Limitations
|
package/dist/commands/logout.js
CHANGED
|
@@ -14,7 +14,7 @@ class Logout extends core_1.Command {
|
|
|
14
14
|
const user = await config_service_1.ConfigService.instance.readUser();
|
|
15
15
|
if (user) {
|
|
16
16
|
await config_service_1.ConfigService.instance.clearUser();
|
|
17
|
-
drive_database_manager_service_1.DriveDatabaseManager.clean();
|
|
17
|
+
await drive_database_manager_service_1.DriveDatabaseManager.clean();
|
|
18
18
|
cli_utils_1.CLIUtils.success('User logged out correctly');
|
|
19
19
|
}
|
|
20
20
|
else {
|
package/dist/commands/webdav.js
CHANGED
|
@@ -50,10 +50,17 @@ class Webdav extends core_1.Command {
|
|
|
50
50
|
cli_utils_1.CLIUtils.doing('Restarting Internxt WebDav server...');
|
|
51
51
|
await drive_database_manager_service_1.DriveDatabaseManager.clean();
|
|
52
52
|
await pm2_utils_1.PM2Utils.connect();
|
|
53
|
-
await pm2_utils_1.PM2Utils.
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
53
|
+
const { status } = await pm2_utils_1.PM2Utils.webdavServerStatus();
|
|
54
|
+
if (status === 'online') {
|
|
55
|
+
await pm2_utils_1.PM2Utils.killWebDavServer();
|
|
56
|
+
await pm2_utils_1.PM2Utils.startWebDavServer();
|
|
57
|
+
cli_utils_1.CLIUtils.done();
|
|
58
|
+
cli_utils_1.CLIUtils.success('Internxt WebDav server restarted successfully');
|
|
59
|
+
}
|
|
60
|
+
else {
|
|
61
|
+
cli_utils_1.CLIUtils.done();
|
|
62
|
+
cli_utils_1.CLIUtils.error('Internxt WebDav server is not running, cannot restart');
|
|
63
|
+
}
|
|
57
64
|
}
|
|
58
65
|
async webDAVStatus() {
|
|
59
66
|
await pm2_utils_1.PM2Utils.connect();
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ErrorHandlingMiddleware = void 0;
|
|
4
4
|
const logger_utils_1 = require("../../utils/logger.utils");
|
|
5
|
-
const ErrorHandlingMiddleware = (err,
|
|
6
|
-
logger_utils_1.webdavLogger.error(err);
|
|
5
|
+
const ErrorHandlingMiddleware = (err, req, res, __) => {
|
|
6
|
+
logger_utils_1.webdavLogger.error(`[ERROR MIDDLEWARE] [${req.method.toUpperCase()} - ${req.url}]`, err);
|
|
7
7
|
if ('statusCode' in err) {
|
|
8
8
|
res.status(err.statusCode).send({
|
|
9
9
|
error: {
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { RequestHandler } from 'express';
|
|
2
|
+
import { AnalyticsService } from '../../services/analytics.service';
|
|
2
3
|
type RequestLoggerConfig = {
|
|
3
4
|
enable: boolean;
|
|
4
5
|
methods?: string[];
|
|
5
6
|
};
|
|
6
|
-
export declare const RequestLoggerMiddleware: (config: RequestLoggerConfig) => RequestHandler;
|
|
7
|
+
export declare const RequestLoggerMiddleware: (config: RequestLoggerConfig, analytics: AnalyticsService) => RequestHandler;
|
|
7
8
|
export {};
|
|
@@ -2,11 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.RequestLoggerMiddleware = void 0;
|
|
4
4
|
const logger_utils_1 = require("../../utils/logger.utils");
|
|
5
|
-
const
|
|
6
|
-
const RequestLoggerMiddleware = (config) => {
|
|
5
|
+
const RequestLoggerMiddleware = (config, analytics) => {
|
|
7
6
|
return (req, _, next) => {
|
|
8
|
-
if (req.user
|
|
9
|
-
|
|
7
|
+
if (req.user?.uuid) {
|
|
8
|
+
analytics.track('WebDAVRequest', { app: 'internxt-webdav', userId: req.user.uuid }, { method: req.method.toUpperCase() });
|
|
10
9
|
}
|
|
11
10
|
if (!config.enable)
|
|
12
11
|
return next();
|
|
@@ -25,6 +25,7 @@ const DELETE_handler_1 = require("./handlers/DELETE.handler");
|
|
|
25
25
|
const PROPPATCH_handler_1 = require("./handlers/PROPPATCH.handler");
|
|
26
26
|
const MOVE_handler_1 = require("./handlers/MOVE.handler");
|
|
27
27
|
const COPY_handler_1 = require("./handlers/COPY.handler");
|
|
28
|
+
const analytics_service_1 = require("../services/analytics.service");
|
|
28
29
|
class WebDavServer {
|
|
29
30
|
app;
|
|
30
31
|
configService;
|
|
@@ -64,7 +65,7 @@ class WebDavServer {
|
|
|
64
65
|
this.app.use((0, auth_middleware_1.AuthMiddleware)(config_service_1.ConfigService.instance));
|
|
65
66
|
this.app.use((0, request_logger_middleware_1.RequestLoggerMiddleware)({
|
|
66
67
|
enable: false,
|
|
67
|
-
}));
|
|
68
|
+
}, analytics_service_1.AnalyticsService.instance));
|
|
68
69
|
};
|
|
69
70
|
registerHandlers = async () => {
|
|
70
71
|
const networkFacade = await this.getNetworkFacade();
|
package/oclif.manifest.json
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"author": "PixoDev",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.17",
|
|
4
4
|
"description": "Internxt CLI to manage your encrypted storage",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"build": "tsc",
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
"migrate:undo": "sequelize db:migrate:undo",
|
|
18
18
|
"publish:npm": "npm run build && npm publish --scope=@internxt --registry=https://registry.npmjs.org/ --access public",
|
|
19
19
|
"publish:github": "npm publish",
|
|
20
|
-
"postinstall": "internxt webdav restart"
|
|
20
|
+
"postinstall": "node ./scripts/skip-in-ci.js || internxt webdav restart"
|
|
21
21
|
},
|
|
22
22
|
"publishConfig": {
|
|
23
23
|
"access": "public",
|