@live-change/server 0.8.5 → 0.8.7

package/lib/setupApiServer.js

@@ -86,6 +86,39 @@ async function setupApiServer(settings) {
 
   const apiServer = await app.createLiveApiServer(apiServerConfig)
 
+  const internalCredentials = { internal: true, roles: ['admin'] }
+
+  let serviceRemotes = {}
+  if(settings.withServices) {
+    const localServer = new Dao.ReactiveServer(
+        () => app.createDao(apiServerConfig, { ...internalCredentials, ignoreRemoteView: true })
+    )
+    const loopback = new Dao.LoopbackConnection('local', localServer, {})
+    const localConfig = {
+      type: 'remote',
+      generator: Dao.ObservableList,
+      protocol: 'local',
+      url: 'services'
+    }
+    app.dao.definition = {
+      ...app.dao.definition,
+      protocols: { ...app.dao.definition.protocols, local: null },
+      ...(typeof services.config.local === 'function' ? services.config.local(internalCredentials) : services.config.local),
+      ...(typeof services.config.remote === 'function' ? services.config.remote(internalCredentials) : services.config.remote)
+    }
+    for(const service of services.services) {
+      app.dao.definition[service.name] = localConfig
+    }
+    app.dao.connections.set('local:services', loopback)
+    await loopback.initialize()
+    if(!loopback.connected) {
+      console.error("LOOPBACK NOT CONNECTED?!")
+      process.exit(1)
+    }
+  } else {
+    throw new Error("remote services not implemented")
+  }
+
   apiServer.services = services
 
   return apiServer

package/lib/setupApp.js

@@ -4,12 +4,12 @@ import { hashCode, encodeNumber, uidGenerator }from '@live-change/uid'
 
 import setupDbServer from './setupDbServer.js'
 import setupDbClient from './setupDbClient.js'
-import createLoopbackDao from './createLoopbackDao.js'
 
 import Debug from 'debug'
 const debug = Debug('server:app')
 
 import App from "@live-change/framework"
+import Dao from "@live-change/dao"
 
 async function setupApp(settings, env = process.env) {
   const app = App.app()
@@ -17,15 +17,20 @@ async function setupApp(settings, env = process.env) {
     `app${process.pid}${os.hostname()} ${process.cwd()}/${process.argv.join(' ')}`))
   app.uidGenerator = uidGenerator(app.instanceId, 1, settings.uidBorders)
   debug("SETUP APP", settings)
-  let dbServer
+
+  app.databaseName = env.DB_NAME || 'test'
+
+  await setupAppDao(settings)
+}
+
+export async function setupAppDao(settings, env = process.env) {
+  const app = App.app()
+  app.dao = new Dao('app', {})
   if(settings.withDb) {
-    dbServer = await setupDbServer(settings)
-    const loopbackDao = await createLoopbackDao('local', () => dbServer.createDao('local'))
-    app.dao = loopbackDao
+    await setupDbServer(settings)
   } else {
-    app.dao = setupDbClient(settings)
+    await setupDbClient(settings)
   }
-  app.databaseName = env.DB_NAME || 'test'
 }
 
 export default setupApp

package/lib/setupDbClient.js

@@ -1,20 +1,29 @@
 import ReactiveDao from "@live-change/dao"
 import * as ReactiveDaoWebsocket from "@live-change/dao-websocket"
+import setupDbServer from "./setupDbServer.js"
+import createLoopbackDao from "./createLoopbackDao.js"
+import App from "@live-change/framework"
 
 function setupDbClient(argv, env = process.env) {
   const config = {
     url: env.DB_URL,
     name: env.DB_NAME,
     requestTimeout: env.DB_REQUEST_TIMEOUT && +env.DB_REQUEST_TIMEOUT,
-    cache: env.DB_CACHE == "YES",
     //unobserveDebug: env.UNOBSERVE_DEBUG == "YES",
   }
-  const dbDao = new ReactiveDao(process.cwd()+' '+process.argv.join(' '), {
-    remoteUrl: config?.url || "http://localhost:9417/api/ws",
-    protocols: {
-      'ws': ReactiveDaoWebsocket.client
-    },
-    connectionSettings: {
+  const app = App.app()
+
+  const remoteConfig = {
+    type: 'remote',
+    protocol: 'dbWs',
+    url: config?.url || "http://localhost:9417/api/ws",
+    generator: ReactiveDao.ObservableList,
+  }
+
+  app.dao.definition = {
+    ...app.dao.definition,
+    protocols: { ...app.dao.definition.protocols, dbWs: ReactiveDaoWebsocket.client },
+    connectionSettings: app.dao.definition.connectionSettings ?? {
       queueRequestsWhenDisconnected: true,
       requestSendTimeout: 2000,
       requestTimeout: config.requestTimeout,
@@ -23,18 +32,9 @@ function setupDbClient(argv, env = process.env) {
       logLevel: 1,
       unobserveDebug: config?.unobserveDebug || false
     },
-    database: {
-      type: 'remote',
-      generator: ReactiveDao.ObservableList
-    },
-    store: {
-      type: 'remote',
-      generator: ReactiveDao.ObservableList
-    }
-  })
-
-  if(config?.cache) return new ReactiveDao.DaoCache(dbDao)
-  return dbDao
+    database: remoteConfig,
+    store: remoteConfig,
+  }
 }
 
 export default setupDbClient

package/lib/setupDbServer.js

@@ -1,15 +1,17 @@
 import path from 'path'
 import DbServer from '@live-change/db-server'
+import App from "@live-change/framework"
+import Dao from '@live-change/dao'
 
 async function setupDbServer(settings) {
   const { dbRoot, dbBackend, dbBackendUrl, dbSlowStart } = settings
-  console.info(`starting database in ${dbBackend == 'mem' ? 'memory' : path.resolve(dbRoot)}`)
+  console.info(`starting database in ${dbBackend === 'mem' ? 'memory' : path.resolve(dbRoot)}`)
   let server = new DbServer({
     dbRoot,
     backend: dbBackend,
     backendUrl: dbBackendUrl,
     slowStart: dbSlowStart,
-    temporary: dbBackend == "mem"
+    temporary: dbBackend === "mem"
   })
 
   process.on('unhandledRejection', (reason, promise) => {
@@ -21,6 +23,32 @@ async function setupDbServer(settings) {
   await server.initialize()
   console.info(`database initialized!`)
 
+  const app = App.app()
+
+  const localServer = new Dao.ReactiveServer(() => server.createDao('local'))
+  const loopback = new Dao.LoopbackConnection('local', localServer, {})
+  const localConfig = {
+    type: 'remote',
+    generator: Dao.ObservableList,
+    protocol: 'local',
+    url: 'dao'
+  }
+
+  app.dao.definition = {
+    ...app.dao.definition,
+    protocols: { ...app.dao.definition.protocols, local: null },
+    database: localConfig,
+    serverDatabase: localConfig,
+    store: localConfig,
+  }
+
+  app.dao.connections.set('local:dao', loopback)
+  await loopback.initialize()
+  if(!loopback.connected) {
+    console.error("LOOPBACK NOT CONNECTED?!")
+    process.exit(1)
+  }
+
   return server
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/server",
-  "version": "0.8.5",
+  "version": "0.8.7",
   "description": "Live Change Framework - server",
   "main": "index.js",
   "scripts": {
@@ -22,12 +22,12 @@
   "type": "module",
   "homepage": "https://github.com/live-change/live-change-framework",
   "dependencies": {
-    "@live-change/dao": "^0.8.5",
-    "@live-change/dao-sockjs": "0.8.2",
-    "@live-change/db-server": "^0.8.5",
-    "@live-change/framework": "0.8.2",
+    "@live-change/dao": "^0.8.7",
+    "@live-change/dao-sockjs": "^0.8.7",
+    "@live-change/db-server": "^0.8.7",
+    "@live-change/framework": "^0.8.7",
     "@live-change/sockjs": "0.4.1",
-    "@live-change/uid": "0.8.2",
+    "@live-change/uid": "^0.8.7",
     "dotenv": "^16.4.4",
     "express": "^4.18.2",
     "express-static-gzip": "2.1.7",
@@ -39,5 +39,5 @@
     "websocket": "^1.0.34",
     "yargs": "^17.7.2"
   },
-  "gitHead": "40f20811c2b0b4f9f99cd079dc570053d94869e3"
+  "gitHead": "b00392ddc91b273e8e7b6d2bdf543f8fe0aec0ca"
 }