Skip to content

Commit bda4dca

Browse files
authored
Merge pull request #244 from internxt/fix/sqlite-errors
[_]: fix/sqlite-errors
2 parents 2dded4c + 3fa236a commit bda4dca

40 files changed

+1994
-3800
lines changed

.sequelizerc

Lines changed: 0 additions & 13 deletions
This file was deleted.

package.json

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
"test:watch": "vitest watch",
1717
"dev:webdav": "nodemon -e ts --exec ts-node src/webdav/index.ts",
1818
"pack:win": "oclif pack win",
19-
"migrate": "sequelize db:migrate",
20-
"migrate:undo": "sequelize db:migrate:undo",
2119
"publish:npm": "npm run build && npm publish --scope=@internxt --registry=https://registry.npmjs.org/ --access public",
2220
"publish:github": "npm run build && npm publish --scope=@internxt --registry=https://npm.pkg.github.com",
2321
"postinstall": "node ./scripts/restart-webdav.js"
@@ -53,17 +51,14 @@
5351
"express": "4.21.2",
5452
"express-async-handler": "1.2.0",
5553
"express-basic-auth": "1.2.1",
56-
"fast-xml-parser": "5.0.8",
54+
"fast-xml-parser": "5.0.6",
5755
"mime-types": "2.1.35",
5856
"openpgp": "5.11.2",
5957
"pm2": "5.4.3",
6058
"range-parser": "1.2.1",
6159
"reflect-metadata": "0.2.2",
6260
"selfsigned": "2.4.1",
63-
"sequelize": "6.37.5",
64-
"sequelize-typescript": "2.1.6",
6561
"sharp": "0.33.5",
66-
"sqlite3": "5.1.7",
6762
"tty-table": "4.2.3",
6863
"winston": "3.17.0"
6964
},
@@ -88,7 +83,6 @@
8883
"oclif": "4.17.34",
8984
"prettier": "3.5.3",
9085
"rimraf": "6.0.1",
91-
"sequelize-cli": "6.6.2",
9286
"ts-node": "10.9.2",
9387
"typescript": "5.8.2",
9488
"vitest": "3.0.7",

src/commands/login.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import { ValidationService } from '../services/validation.service';
66
import { CLIUtils } from '../utils/cli.utils';
77
import { ErrorUtils } from '../utils/errors.utils';
88
import { SdkManager } from '../services/sdk-manager.service';
9-
import { DriveDatabaseManager } from '../services/database/drive-database-manager.service';
109

1110
export default class Login extends Command {
1211
static readonly args = {};
@@ -62,8 +61,6 @@ export default class Login extends Command {
6261
});
6362

6463
await ConfigService.instance.saveUser(loginCredentials);
65-
await DriveDatabaseManager.init();
66-
await DriveDatabaseManager.clean();
6764
const message = `Succesfully logged in to: ${loginCredentials.user.email}`;
6865
CLIUtils.success(this.log.bind(this), message);
6966
return {

src/commands/logout.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { Command } from '@oclif/core';
22
import { ConfigService } from '../services/config.service';
33
import { CLIUtils } from '../utils/cli.utils';
44
import { ErrorUtils } from '../utils/errors.utils';
5-
import { DriveDatabaseManager } from '../services/database/drive-database-manager.service';
65

76
export default class Logout extends Command {
87
static readonly args = {};
@@ -16,7 +15,6 @@ export default class Logout extends Command {
1615
const user = await ConfigService.instance.readUser();
1716
if (user) {
1817
await ConfigService.instance.clearUser();
19-
await DriveDatabaseManager.clean();
2018
const message = 'User logged out successfully.';
2119
CLIUtils.success(this.log.bind(this), message);
2220
return { success: true, message };

src/commands/webdav.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { Args, Command, ux } from '@oclif/core';
22
import { PM2Utils } from '../utils/pm2.utils';
33
import { CLIUtils } from '../utils/cli.utils';
44
import { ConfigService } from '../services/config.service';
5-
import { DriveDatabaseManager } from '../services/database/drive-database-manager.service';
65
import { ErrorUtils } from '../utils/errors.utils';
76
import { AuthService } from '../services/auth.service';
87

@@ -76,7 +75,6 @@ export default class Webdav extends Command {
7675

7776
private enableWebDav = async (): Promise<string> => {
7877
CLIUtils.doing('Starting Internxt WebDav server...');
79-
await DriveDatabaseManager.clean();
8078
await PM2Utils.killWebDavServer();
8179
await PM2Utils.startWebDavServer();
8280
CLIUtils.done();
@@ -112,7 +110,6 @@ export default class Webdav extends Command {
112110

113111
private restartWebDav = async (): Promise<string> => {
114112
CLIUtils.doing('Restarting Internxt WebDav server...');
115-
await DriveDatabaseManager.clean();
116113
const { status } = await PM2Utils.webdavServerStatus();
117114
if (status === 'online') {
118115
await PM2Utils.killWebDavServer();

src/commands/whoami.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { ErrorUtils } from '../utils/errors.utils';
44
import { ConfigService } from '../services/config.service';
55
import { ValidationService } from '../services/validation.service';
66
import { LoginCredentials } from '../types/command.types';
7-
import { DriveDatabaseManager } from '../services/database/drive-database-manager.service';
87

98
export default class Whoami extends Command {
109
static readonly args = {};
@@ -25,7 +24,6 @@ export default class Whoami extends Command {
2524
if (!validCreds) {
2625
const message = 'Your session has expired. You have been logged out. Please log in again.';
2726
await ConfigService.instance.clearUser();
28-
await DriveDatabaseManager.clean();
2927
CLIUtils.error(this.log.bind(this), message);
3028
return { success: false, message };
3129
} else {

src/database/migrations/20240402164914-create-files.ts

Lines changed: 0 additions & 56 deletions
This file was deleted.

src/database/migrations/20240402165418-create-folders.ts

Lines changed: 0 additions & 38 deletions
This file was deleted.

src/database/migrations/20241018114828-add-parent-column.ts

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/database/sequelize.config.js

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)