diff --git a/server/mixins/socketio.mixin.ts b/server/mixins/socketio.mixin.ts index d83998e0..e97f2eed 100644 --- a/server/mixins/socketio.mixin.ts +++ b/server/mixins/socketio.mixin.ts @@ -15,7 +15,7 @@ import { Errors, } from 'tailchat-server-sdk'; import _ from 'lodash'; -import { ServiceUnavailableError } from '../lib/errors'; +import { ServiceUnavailableError } from 'tailchat-server-sdk'; import { generateRandomStr, isValidStr } from '../lib/utils'; import bcrypt from 'bcryptjs'; diff --git a/server/packages/sdk/src/index.ts b/server/packages/sdk/src/index.ts index b96041d2..9a513a60 100644 --- a/server/packages/sdk/src/index.ts +++ b/server/packages/sdk/src/index.ts @@ -12,6 +12,7 @@ export type { } from './services/types'; export { parseLanguageFromHead } from './services/lib/i18n/parser'; export { t } from './services/lib/i18n'; +export * from './services/lib/errors'; export { call } from './services/lib/call'; export { config, diff --git a/server/lib/errors.ts b/server/packages/sdk/src/services/lib/errors.ts similarity index 100% rename from server/lib/errors.ts rename to server/packages/sdk/src/services/lib/errors.ts diff --git a/server/plugins/com.msgbyte.tasks/services/tasks.service.ts b/server/plugins/com.msgbyte.tasks/services/tasks.service.ts index 56850a1f..d0e450e6 100644 --- a/server/plugins/com.msgbyte.tasks/services/tasks.service.ts +++ b/server/plugins/com.msgbyte.tasks/services/tasks.service.ts @@ -1,5 +1,9 @@ -import { NoPermissionError } from '../../../lib/errors'; -import { TcService, TcDbService, TcContext } from 'tailchat-server-sdk'; +import { + TcService, + TcDbService, + TcContext, + NoPermissionError, +} from 'tailchat-server-sdk'; import type { TaskDocument, TaskModel } from '../models/task'; /** diff --git a/server/plugins/com.msgbyte.tasks/test/tasks.spec.ts b/server/plugins/com.msgbyte.tasks/test/tasks.spec.ts index 1bcddc10..5089a1ed 100644 --- a/server/plugins/com.msgbyte.tasks/test/tasks.spec.ts +++ b/server/plugins/com.msgbyte.tasks/test/tasks.spec.ts @@ -2,7 +2,7 @@ import { createTestServiceBroker } from '../../../test/utils'; import TasksService from '../services/tasks.service'; import { Types } from 'mongoose'; import _ from 'lodash'; -import { NoPermissionError } from '../../../lib/errors'; +import { NoPermissionError } from 'tailchat-server-sdk'; describe('Test "plugin:com.msgbyte.tasks" service', () => { const { broker, service, insertTestData } = diff --git a/server/services/core/chat/converse.service.ts b/server/services/core/chat/converse.service.ts index 1a7e52d7..f9fc3cb8 100644 --- a/server/services/core/chat/converse.service.ts +++ b/server/services/core/chat/converse.service.ts @@ -1,12 +1,12 @@ import _ from 'lodash'; import { Types } from 'mongoose'; -import { DataNotFoundError } from '../../../lib/errors'; import { TcDbService, TcService, TcContext, UserStruct, call, + DataNotFoundError, } from 'tailchat-server-sdk'; import type { ConverseDocument, diff --git a/server/services/core/chat/message.service.ts b/server/services/core/chat/message.service.ts index 7889e5fc..067edcb6 100644 --- a/server/services/core/chat/message.service.ts +++ b/server/services/core/chat/message.service.ts @@ -1,6 +1,5 @@ import moment from 'moment'; import { Types } from 'mongoose'; -import { DataNotFoundError, NoPermissionError } from '../../../lib/errors'; import type { MessageDocument, MessageModel, @@ -10,6 +9,8 @@ import { TcDbService, GroupBaseInfo, TcContext, + DataNotFoundError, + NoPermissionError, } from 'tailchat-server-sdk'; import type { Group } from '../../../models/group/group'; import { isValidStr } from '../../../lib/utils'; diff --git a/server/services/core/file.service.ts b/server/services/core/file.service.ts index 8bf48408..334b93d0 100644 --- a/server/services/core/file.service.ts +++ b/server/services/core/file.service.ts @@ -5,13 +5,13 @@ import { buildUploadUrl, config, TcDbService, + NoPermissionError, } from 'tailchat-server-sdk'; import MinioService from 'moleculer-minio'; import _ from 'lodash'; import mime from 'mime'; import type { Client as MinioClient } from 'minio'; import { isValidStaticAssetsUrl, isValidStr } from '../../lib/utils'; -import { NoPermissionError } from '../../lib/errors'; import path from 'node:path'; import type { FileDocument, FileModel } from '../../models/file'; import { Types } from 'mongoose'; diff --git a/server/services/core/group/group.service.ts b/server/services/core/group/group.service.ts index 987a0fd5..ac58fa1c 100644 --- a/server/services/core/group/group.service.ts +++ b/server/services/core/group/group.service.ts @@ -1,10 +1,5 @@ import _ from 'lodash'; import { Types } from 'mongoose'; -import { - DataNotFoundError, - EntityError, - NoPermissionError, -} from '../../../lib/errors'; import { isValidStr } from '../../../lib/utils'; import { Group, @@ -20,6 +15,9 @@ import { TcDbService, PureContext, call, + DataNotFoundError, + EntityError, + NoPermissionError, } from 'tailchat-server-sdk'; import moment from 'moment'; import { PERMISSION } from '../../../lib/role'; diff --git a/server/services/core/group/invite.service.ts b/server/services/core/group/invite.service.ts index 2c765a09..9ddb9534 100644 --- a/server/services/core/group/invite.service.ts +++ b/server/services/core/group/invite.service.ts @@ -1,5 +1,4 @@ import _ from 'lodash'; -import { NoPermissionError } from '../../../lib/errors'; import type { GroupInvite, GroupInviteDocument, @@ -11,6 +10,7 @@ import { TcDbService, PureContext, call, + NoPermissionError, } from 'tailchat-server-sdk'; import { PERMISSION } from '../../../lib/role'; diff --git a/server/services/core/user/friendRequest.service.ts b/server/services/core/user/friendRequest.service.ts index 5b1b1ba4..9984146a 100644 --- a/server/services/core/user/friendRequest.service.ts +++ b/server/services/core/user/friendRequest.service.ts @@ -1,7 +1,12 @@ -import { TcCacheCleaner } from '../../../mixins/cache.cleaner.mixin'; -import { TcService, TcDbService, TcContext, Errors } from 'tailchat-server-sdk'; +import { + TcService, + TcDbService, + TcContext, + Errors, + DataNotFoundError, + NoPermissionError, +} from 'tailchat-server-sdk'; import _ from 'lodash'; -import { DataNotFoundError, NoPermissionError } from '../../../lib/errors'; import type { FriendRequest } from '../../../models/user/friendRequest'; interface FriendService extends TcService, TcDbService {} diff --git a/server/services/core/user/user.service.ts b/server/services/core/user/user.service.ts index 60b94887..d6a15cc0 100644 --- a/server/services/core/user/user.service.ts +++ b/server/services/core/user/user.service.ts @@ -15,8 +15,9 @@ import { config, PureContext, Errors, + DataNotFoundError, + EntityError, } from 'tailchat-server-sdk'; -import { DataNotFoundError, EntityError } from '../../../lib/errors'; import { generateRandomNumStr, generateRandomStr, diff --git a/server/services/openapi/app.service.ts b/server/services/openapi/app.service.ts index 5fadb79c..2bc9f5b7 100644 --- a/server/services/openapi/app.service.ts +++ b/server/services/openapi/app.service.ts @@ -1,11 +1,16 @@ -import { TcService, config, TcDbService, TcContext } from 'tailchat-server-sdk'; +import { + TcService, + config, + TcDbService, + TcContext, + EntityError, +} from 'tailchat-server-sdk'; import _ from 'lodash'; import { filterAvailableAppCapability, OpenAppDocument, OpenAppModel, } from '../../models/openapi/app'; -import { EntityError } from '../../lib/errors'; import { Types } from 'mongoose'; import { nanoid } from 'nanoid';