refactor: 将errors移动到sdk中

pull/49/head
moonrailgun 3 years ago
parent 83eee9ef91
commit 4e2ea330ca

@ -15,7 +15,7 @@ import {
Errors, Errors,
} from 'tailchat-server-sdk'; } from 'tailchat-server-sdk';
import _ from 'lodash'; import _ from 'lodash';
import { ServiceUnavailableError } from '../lib/errors'; import { ServiceUnavailableError } from 'tailchat-server-sdk';
import { generateRandomStr, isValidStr } from '../lib/utils'; import { generateRandomStr, isValidStr } from '../lib/utils';
import bcrypt from 'bcryptjs'; import bcrypt from 'bcryptjs';

@ -12,6 +12,7 @@ export type {
} from './services/types'; } from './services/types';
export { parseLanguageFromHead } from './services/lib/i18n/parser'; export { parseLanguageFromHead } from './services/lib/i18n/parser';
export { t } from './services/lib/i18n'; export { t } from './services/lib/i18n';
export * from './services/lib/errors';
export { call } from './services/lib/call'; export { call } from './services/lib/call';
export { export {
config, config,

@ -1,5 +1,9 @@
import { NoPermissionError } from '../../../lib/errors'; import {
import { TcService, TcDbService, TcContext } from 'tailchat-server-sdk'; TcService,
TcDbService,
TcContext,
NoPermissionError,
} from 'tailchat-server-sdk';
import type { TaskDocument, TaskModel } from '../models/task'; import type { TaskDocument, TaskModel } from '../models/task';
/** /**

@ -2,7 +2,7 @@ import { createTestServiceBroker } from '../../../test/utils';
import TasksService from '../services/tasks.service'; import TasksService from '../services/tasks.service';
import { Types } from 'mongoose'; import { Types } from 'mongoose';
import _ from 'lodash'; import _ from 'lodash';
import { NoPermissionError } from '../../../lib/errors'; import { NoPermissionError } from 'tailchat-server-sdk';
describe('Test "plugin:com.msgbyte.tasks" service', () => { describe('Test "plugin:com.msgbyte.tasks" service', () => {
const { broker, service, insertTestData } = const { broker, service, insertTestData } =

@ -1,12 +1,12 @@
import _ from 'lodash'; import _ from 'lodash';
import { Types } from 'mongoose'; import { Types } from 'mongoose';
import { DataNotFoundError } from '../../../lib/errors';
import { import {
TcDbService, TcDbService,
TcService, TcService,
TcContext, TcContext,
UserStruct, UserStruct,
call, call,
DataNotFoundError,
} from 'tailchat-server-sdk'; } from 'tailchat-server-sdk';
import type { import type {
ConverseDocument, ConverseDocument,

@ -1,6 +1,5 @@
import moment from 'moment'; import moment from 'moment';
import { Types } from 'mongoose'; import { Types } from 'mongoose';
import { DataNotFoundError, NoPermissionError } from '../../../lib/errors';
import type { import type {
MessageDocument, MessageDocument,
MessageModel, MessageModel,
@ -10,6 +9,8 @@ import {
TcDbService, TcDbService,
GroupBaseInfo, GroupBaseInfo,
TcContext, TcContext,
DataNotFoundError,
NoPermissionError,
} from 'tailchat-server-sdk'; } from 'tailchat-server-sdk';
import type { Group } from '../../../models/group/group'; import type { Group } from '../../../models/group/group';
import { isValidStr } from '../../../lib/utils'; import { isValidStr } from '../../../lib/utils';

@ -5,13 +5,13 @@ import {
buildUploadUrl, buildUploadUrl,
config, config,
TcDbService, TcDbService,
NoPermissionError,
} from 'tailchat-server-sdk'; } from 'tailchat-server-sdk';
import MinioService from 'moleculer-minio'; import MinioService from 'moleculer-minio';
import _ from 'lodash'; import _ from 'lodash';
import mime from 'mime'; import mime from 'mime';
import type { Client as MinioClient } from 'minio'; import type { Client as MinioClient } from 'minio';
import { isValidStaticAssetsUrl, isValidStr } from '../../lib/utils'; import { isValidStaticAssetsUrl, isValidStr } from '../../lib/utils';
import { NoPermissionError } from '../../lib/errors';
import path from 'node:path'; import path from 'node:path';
import type { FileDocument, FileModel } from '../../models/file'; import type { FileDocument, FileModel } from '../../models/file';
import { Types } from 'mongoose'; import { Types } from 'mongoose';

@ -1,10 +1,5 @@
import _ from 'lodash'; import _ from 'lodash';
import { Types } from 'mongoose'; import { Types } from 'mongoose';
import {
DataNotFoundError,
EntityError,
NoPermissionError,
} from '../../../lib/errors';
import { isValidStr } from '../../../lib/utils'; import { isValidStr } from '../../../lib/utils';
import { import {
Group, Group,
@ -20,6 +15,9 @@ import {
TcDbService, TcDbService,
PureContext, PureContext,
call, call,
DataNotFoundError,
EntityError,
NoPermissionError,
} from 'tailchat-server-sdk'; } from 'tailchat-server-sdk';
import moment from 'moment'; import moment from 'moment';
import { PERMISSION } from '../../../lib/role'; import { PERMISSION } from '../../../lib/role';

@ -1,5 +1,4 @@
import _ from 'lodash'; import _ from 'lodash';
import { NoPermissionError } from '../../../lib/errors';
import type { import type {
GroupInvite, GroupInvite,
GroupInviteDocument, GroupInviteDocument,
@ -11,6 +10,7 @@ import {
TcDbService, TcDbService,
PureContext, PureContext,
call, call,
NoPermissionError,
} from 'tailchat-server-sdk'; } from 'tailchat-server-sdk';
import { PERMISSION } from '../../../lib/role'; import { PERMISSION } from '../../../lib/role';

@ -1,7 +1,12 @@
import { TcCacheCleaner } from '../../../mixins/cache.cleaner.mixin'; import {
import { TcService, TcDbService, TcContext, Errors } from 'tailchat-server-sdk'; TcService,
TcDbService,
TcContext,
Errors,
DataNotFoundError,
NoPermissionError,
} from 'tailchat-server-sdk';
import _ from 'lodash'; import _ from 'lodash';
import { DataNotFoundError, NoPermissionError } from '../../../lib/errors';
import type { FriendRequest } from '../../../models/user/friendRequest'; import type { FriendRequest } from '../../../models/user/friendRequest';
interface FriendService extends TcService, TcDbService<any> {} interface FriendService extends TcService, TcDbService<any> {}

@ -15,8 +15,9 @@ import {
config, config,
PureContext, PureContext,
Errors, Errors,
DataNotFoundError,
EntityError,
} from 'tailchat-server-sdk'; } from 'tailchat-server-sdk';
import { DataNotFoundError, EntityError } from '../../../lib/errors';
import { import {
generateRandomNumStr, generateRandomNumStr,
generateRandomStr, generateRandomStr,

@ -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 _ from 'lodash';
import { import {
filterAvailableAppCapability, filterAvailableAppCapability,
OpenAppDocument, OpenAppDocument,
OpenAppModel, OpenAppModel,
} from '../../models/openapi/app'; } from '../../models/openapi/app';
import { EntityError } from '../../lib/errors';
import { Types } from 'mongoose'; import { Types } from 'mongoose';
import { nanoid } from 'nanoid'; import { nanoid } from 'nanoid';

Loading…
Cancel
Save