refactor server

Signed-off-by: Andrey Platov <andrey@hardcoreeng.com>
This commit is contained in:
Andrey Platov
2021-08-04 18:17:01 +02:00
parent 57c17692eb
commit a78f96ba7d
13 changed files with 222 additions and 18 deletions
+6
View File
@@ -0,0 +1,6 @@
module.exports = {
extends: ['./node_modules/@anticrm/platform-rig/profiles/default/config/eslint.config.json'],
parserOptions: {
project: './tsconfig.json'
}
}
+18
View File
@@ -0,0 +1,18 @@
// The "rig.json" file directs tools to look for their config files in an external package.
// Documentation for this system: https://www.npmjs.com/package/@rushstack/rig-package
{
"$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json",
/**
* (Required) The name of the rig package to inherit from.
* It should be an NPM package name with the "-rig" suffix.
*/
"rigPackageName": "@anticrm/platform-rig"
/**
* (Optional) Selects a config profile from the rig package. The name must consist of
* lowercase alphanumeric words separated by hyphens, for example "sample-profile".
* If omitted, then the "default" profile will be used."
*/
// "rigProfile": "your-profile-name"
}
+30
View File
@@ -0,0 +1,30 @@
{
"name": "@anticrm/dev-server",
"version": "0.6.0",
"main": "lib/index.js",
"author": "Anticrm Platform Contributors",
"license": "EPL-2.0",
"scripts": {
"build": "heft build",
"build:docs": "api-extractor run --local",
"test": "jest",
"lint": "ts-standard src",
"lint:fix": "eslint --fix ./src",
"format": "prettier --write 'src/**/*.{ts*,js*,yml}' && ts-standard --fix src"
},
"devDependencies": {
"@anticrm/platform-rig":"~0.6.0",
"@types/heft-jest":"^1.0.2",
"@typescript-eslint/eslint-plugin":"4",
"eslint-plugin-import":"2",
"eslint-plugin-promise":"4",
"eslint-plugin-node":"11",
"eslint":"^7.32.0"
},
"dependencies": {
"@anticrm/dev-storage": "~0.6.0",
"@anticrm/server-ws": "~0.6.0",
"@anticrm/core": "~0.6.0",
"@anticrm/platform": "~0.6.0"
}
}
+17
View File
@@ -0,0 +1,17 @@
//
// Copyright © 2020, 2021 Anticrm Platform Contributors.
// Copyright © 2021 Hardcore Engineering Inc.
//
// Licensed under the Eclipse Public License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License. You may
// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
//
// See the License for the specific language governing permissions and
// limitations under the License.
//
export { start } from './server'
+27
View File
@@ -0,0 +1,27 @@
//
// Copyright © 2020, 2021 Anticrm Platform Contributors.
// Copyright © 2021 Hardcore Engineering Inc.
//
// Licensed under the Eclipse Public License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License. You may
// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
//
// See the License for the specific language governing permissions and
// limitations under the License.
//
import { start as startJsonRpc } from '@anticrm/server-ws'
import { createStorage } from '@anticrm/dev-storage'
import { DevSession } from './session'
/**
* @public
*/
export async function start (): Promise<void> {
const storage = await createStorage()
startJsonRpc(server => new DevSession(server, storage), 3333)
}
+37
View File
@@ -0,0 +1,37 @@
//
// Copyright © 2020, 2021 Anticrm Platform Contributors.
// Copyright © 2021 Hardcore Engineering Inc.
//
// Licensed under the Eclipse Public License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License. You may
// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
//
// See the License for the specific language governing permissions and
// limitations under the License.
//
import type { Class, Doc, DocumentQuery, FindOptions, FindResult, Ref, Storage, Tx } from '@anticrm/core'
import { JsonRpcServer } from '@anticrm/server-ws'
import type { ServerStorage } from '@anticrm/dev-storage'
export class DevSession implements Storage {
constructor (
private readonly server: JsonRpcServer,
private readonly storage: ServerStorage
) {}
async findAll <T extends Doc>(_class: Ref<Class<T>>, query: DocumentQuery<T>, options?: FindOptions<T>): Promise<FindResult<T>> {
return await this.storage.findAll(_class, query, options)
}
async tx (tx: Tx<Doc>): Promise<void> {
const derived = await this.storage.tx(tx)
for (const tx of derived) {
this.server.broadcast(this, { result: tx })
}
}
}
+8
View File
@@ -0,0 +1,8 @@
{
"extends": "./node_modules/@anticrm/platform-rig/profiles/default/tsconfig.json",
"compilerOptions": {
"rootDir": "./src",
"outDir": "./lib"
}
}
+1 -1
View File
@@ -14,4 +14,4 @@
// limitations under the License.
//
export { createStorage } from './storage'
export { createStorage, ServerStorage } from './storage'
+22 -8
View File
@@ -15,7 +15,6 @@
import type {
Tx,
Storage,
Ref,
Doc,
Class,
@@ -26,18 +25,30 @@ import type {
import { getResource } from '@anticrm/platform'
import core, { ModelDb, TxDb, Hierarchy, DOMAIN_TX, DefaultTxFactory } from '@anticrm/core'
/**
* @public
*/
export interface ServerStorage {
findAll: <T extends Doc>(
_class: Ref<Class<T>>,
query: DocumentQuery<T>,
options?: FindOptions<T>
) => Promise<FindResult<T>>
tx: (tx: Tx) => Promise<Tx[]>
}
async function getModel (): Promise<Tx[]> {
return import('./model.tx.json') as unknown as Tx[]
}
class DevStorage implements Storage {
class DevStorage implements ServerStorage {
private readonly txFactory: DefaultTxFactory
constructor (
private readonly hierarchy: Hierarchy,
private readonly txdb: TxDb,
private readonly modeldb: ModelDb,
private readonly handler: (tx: Tx) => void) {
private readonly modeldb: ModelDb
) {
this.txFactory = new DefaultTxFactory(core.account.System)
}
@@ -51,7 +62,7 @@ class DevStorage implements Storage {
return await this.modeldb.findAll(_class, query, options)
}
async tx (tx: Tx): Promise<void> {
async tx (tx: Tx): Promise<Tx[]> {
if (tx.objectSpace === core.space.Model) {
this.hierarchy.tx(tx)
}
@@ -59,15 +70,18 @@ class DevStorage implements Storage {
// invoke triggers
const triggers = this.hierarchy.getClass(tx.objectClass).triggers
if (triggers !== undefined) {
const derived: Tx[] = []
for (const trigger of triggers) {
const impl = await getResource(trigger)
const txes = await impl(tx, this.txFactory)
derived.push(...txes)
for (const tx of txes) {
await Promise.all([this.modeldb.tx(tx), this.txdb.tx(tx)])
this.handler(tx)
}
}
return derived
}
return []
}
}
@@ -76,7 +90,7 @@ class DevStorage implements Storage {
* @param handler -
* @returns
*/
export async function createStorage (handler: (tx: Tx) => void): Promise<Storage> {
export async function createStorage (): Promise<ServerStorage> {
const txes = await getModel()
const hierarchy = new Hierarchy()
@@ -88,5 +102,5 @@ export async function createStorage (handler: (tx: Tx) => void): Promise<Storage
await Promise.all([transactions.tx(tx), model.tx(tx)])
}
return new DevStorage(hierarchy, transactions, model, handler)
return new DevStorage(hierarchy, transactions, model)
}