@live-change/db-server 0.6.23 → 0.7.2

package/bin/server.js

@@ -1,18 +1,20 @@
 #!/usr/bin/env node
-const path = require('path')
-const fs = require('fs')
-const service = require ("os-service")
-const Server = require('../lib/Server.js')
-const { client: WSClient } = require("@live-change/dao-websocket")
-const ReactiveDao = require('@live-change/dao')
-const db = require("@live-change/db")
-const profileOutput = require("../lib/profileOutput.js")
-const { performance } = require('perf_hooks')
+import path from 'path'
+import fs from 'fs'
+import service from "os-service"
+import Server from '../lib/Server.js'
+import { client as WSClient } from "@live-change/dao-websocket"
+import ReactiveDao from '@live-change/dao'
+import * as db from "@live-change/db"
+import profileOutput from "../lib/profileOutput.js"
+import { performance } from 'perf_hooks'
+import yargs from 'yargs'
+import { fileURLToPath } from 'url'
 
-const {
+import {
   SsrServer,
   createLoopbackDao
-} = require("@live-change/server")
+} from "@live-change/server"
 
 process.on('unhandledRejection', (reason, p) => {
   console.log('Unhandled Rejection at: Promise', p, 'reason:', reason)
@@ -73,7 +75,7 @@ function serviceOptions(yargs) {
   })
 }
 
-const argv = require('yargs') // eslint-disable-line
+const argv = yargs(process.argv.slice(2)) // eslint-disable-line
     .command('create', 'create database root', (yargs) => {
       storeOptions(yargs)
     }, (argv) => create(argv))
@@ -157,7 +159,9 @@ async function serve(argv) {
   if(verbose) console.info(`database initialized!`)
   if(verbose) console.info(`listening on: ${argv.host}:${argv.port}`)
 
-  const ssrRoot = path.dirname(require.resolve("@live-change/db-admin/front/vite.config.js"))
+  const ssrRoot = path.dirname(
+      fileURLToPath(import.meta.resolve("@live-change/db-admin/front/vite.config.js"))
+  )
 
   const http = await server.getHttp()
   const { app } = http
@@ -165,7 +169,9 @@ async function serve(argv) {
   const dev = await fs.promises.access(path.resolve(ssrRoot, './dist'), fs.constants.R_OK)
     .then(r => false).catch(r => true)
   if(dev) console.log("STARTING ADMIN IN DEV MODE!")
-  const manifest = dev ? null : require(path.resolve(ssrRoot, 'dist/client/ssr-manifest.json'))
+  const manifest = (dev || argv.spa)
+      ? null
+      : JSON.parse(fs.readFileSync((path.resolve(ssrRoot, 'dist/client/.vite/ssr-manifest.json'))))
   const admin = new SsrServer(app, manifest, {
     dev,
     fastAuth: true,

package/index.js

@@ -1 +1,3 @@
-module.exports = require('./lib/Server.js')
+import Server from './lib/Server.js'
+
+export default Server

package/lib/Replicator.js

@@ -371,4 +371,4 @@ class Replicator { // synchronizes database list
   }
 }
 
-module.exports = Replicator
+export default Replicator

package/lib/Server.js

@@ -1,23 +1,21 @@
-const fs = require('fs')
-const path = require('path')
-const http = require("http")
-const express = require("express")
-const sockjs = require('@live-change/sockjs')
-const WebSocketServer = require('websocket').server
-const ReactiveDaoWebsocketServer = require("@live-change/dao-websocket").server
-const ReactiveDaoWebsocketClient = require("@live-change/dao-websocket").client
-const ScriptContext = require('@live-change/db/lib/ScriptContext.js')
-const dbDao = require('./dbDao.js')
-const storeDao = require('./storeDao.js')
-const createBackend = require("./backend.js")
-const Replicator = require("./Replicator.js")
-const { profileLog } = require("@live-change/db")
+import fs from 'fs'
+import path from 'path'
+import http from 'http'
+import express from 'express'
+import sockjs from '@live-change/sockjs'
+import { server as WebSocketServer } from 'websocket'
+import { server as ReactiveDaoWebsocketServer, client as ReactiveDaoWebsocketClient } from '@live-change/dao-websocket'
+import ScriptContext from '@live-change/db/lib/ScriptContext.js'
+import * as dbDao from './dbDao.js'
+import * as storeDao from './storeDao.js'
+import createBackend from './backend.js'
+import Replicator from './Replicator.js'
+import { profileLog } from '@live-change/db'
+import { Database } from '@live-change/db'
+import ReactiveDao from '@live-change/dao'
 
-const ReactiveDao = require("@live-change/dao")
-
-const Database = require('@live-change/db').Database
-
-const debug = require('debug')('db-server')
+import Debug from 'debug'
+const debug = Debug('db-server')
 
 class DatabaseStore {
   constructor(path, backends, options) {
@@ -131,7 +129,8 @@ class Server {
     }
   }
   createDao(session) {
-    const packageInfo = require('@live-change/db-server/package.json')
+
+    const packageInfo = eval('import("@live-change/db-server/package.json"'+', { assert: { type: "json" } })')
 
     const store = { /// Low level data access
       type: 'local',
@@ -153,11 +152,11 @@ class Server {
         methods: {},
         values: {
           version: {
-            observable() {
-              return new ReactiveDao.ObservableValue(packageInfo.version)
+            async observable() {
+              return new ReactiveDao.ObservableValue((await packageInfo).version)
             },
             async get() {
-              return packageInfo.version
+              return (await packageInfo).version
             }
           }
         }
@@ -432,4 +431,4 @@ class Server {
   }
 }
 
-module.exports = Server
+export default Server

package/lib/backend.js

@@ -1,6 +1,8 @@
-const fs = require('fs')
-const path = require('path')
-const rimraf = require("rimraf-promise")
+import fs from 'fs'
+import { rimraf } from "rimraf"
+import lmdb from 'node-lmdb'
+import lmdbStore from'@live-change/db-store-lmdb'
+import rbTreeStore from'@live-change/db-store-rbtree'
 
 function createBackend({ name, url, maxDbs, mapSize }) {
   if(name == 'leveldb') {
@@ -92,7 +94,7 @@ function createBackend({ name, url, maxDbs, mapSize }) {
     }
   } else if(name == 'mem' || name == 'memory') {
     return {
-      Store: require('@live-change/db-store-rbtree'),
+      Store: rbTreeStore,
       createDb(path, options) {
         const db = {}
         db.path = path
@@ -112,8 +114,8 @@ function createBackend({ name, url, maxDbs, mapSize }) {
     }
   } else if(name == 'lmdb') {
     return {
-      lmdb: require('node-lmdb'),
-      Store: require('@live-change/db-store-lmdb'),
+      lmdb,
+      Store: lmdbStore,
       createDb(path, options) {
         fs.mkdirSync(path, { recursive: true })
         const env = new this.lmdb.Env()
@@ -192,4 +194,4 @@ function createBackend({ name, url, maxDbs, mapSize }) {
   } else throw new Error("Unknown backend " + name)
 }
 
-module.exports = createBackend
+export default createBackend

package/lib/dbDao.js

@@ -1,4 +1,4 @@
-const ReactiveDao = require("@live-change/dao")
+import ReactiveDao from "@live-change/dao"
 
 function localRequests(server, scriptContext) {
   return {
@@ -848,7 +848,7 @@ function localReads(server, scriptContext) {
   }
 }
 
-module.exports = {
+export {
   localRequests,
   remoteRequests,
   localReads

package/lib/profileOutput.js

@@ -1,5 +1,5 @@
-const fs = require('fs')
-const { once } = require('events')
+import fs from 'fs'
+import { once } from 'events'
 
 function profileOutput(path) {
   const profileLogStream = fs.createWriteStream(path)
@@ -23,4 +23,4 @@ function profileOutput(path) {
   return write
 }
 
-module.exports = profileOutput
+export default profileOutput

package/lib/storeDao.js

@@ -54,7 +54,7 @@ function localReads(server) {
   }
 }
 
-module.exports = {
+export {
   localRequests,
   localReads
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/db-server",
-  "version": "0.6.23",
+  "version": "0.7.2",
   "description": "Database with observable data for live queries",
   "main": "index.js",
   "scripts": {
@@ -24,30 +24,30 @@
     "url": "https://github.com/live-change/live-change-db/issues"
   },
   "homepage": "https://github.com/live-change/live-change-db",
+  "type": "module",
   "devDependencies": {
-    "tape": "^5.3.2"
+    "tape": "^5.7.4"
   },
   "dependencies": {
-    "@live-change/dao": "0.5.22",
-    "@live-change/dao-message": "0.5.22",
-    "@live-change/dao-sockjs": "0.5.22",
-    "@live-change/dao-websocket": "0.5.22",
-    "@live-change/db": "^0.6.23",
-    "@live-change/db-admin": "^0.6.23",
-    "@live-change/db-client": "^0.6.23",
-    "@live-change/db-store-level": "^0.6.23",
-    "@live-change/db-store-lmdb": "^0.6.23",
-    "@live-change/db-store-observable-db": "^0.6.23",
-    "@live-change/db-store-rbtree": "^0.6.23",
+    "@live-change/dao": "0.6.0",
+    "@live-change/dao-message": "0.6.0",
+    "@live-change/dao-sockjs": "0.6.0",
+    "@live-change/dao-websocket": "0.6.0",
+    "@live-change/db": "^0.7.2",
+    "@live-change/db-admin": "^0.7.2",
+    "@live-change/db-client": "^0.7.2",
+    "@live-change/db-store-level": "^0.7.2",
+    "@live-change/db-store-lmdb": "^0.7.2",
+    "@live-change/db-store-observable-db": "^0.7.2",
+    "@live-change/db-store-rbtree": "^0.7.2",
     "@live-change/sockjs": "0.4.1",
     "express": "^4.18.2",
     "line-reader": "^0.4.0",
     "node-interval-tree": "^1.3.3",
     "os-service": "^2.2.0",
-    "rimraf": "^3.0.2",
-    "rimraf-promise": "^2.0.0",
+    "rimraf": "^5.0.5",
     "websocket": "^1.0.34",
-    "yargs": "^17.5.1"
+    "yargs": "^17.7.2"
   },
-  "gitHead": "0998da21c5082239a24d631110b33a5b00310a07"
+  "gitHead": "36d5b8a4430d82526b8b63290c44209e6187da96"
 }

package/tests/getServer.js

@@ -1,28 +1,32 @@
-const rimraf = require("rimraf")
-const fs = require('fs')
-const Server = require('../lib/Server.js')
-const ReactiveDao = require('@live-change/dao')
+import { rimrafSync } from 'rimraf'
+import fs from 'fs'
+import Server from '../lib/Server.js'
+import ReactiveDao from '@live-change/dao'
 
-serverPromise = (async () => {
-  rimraf.sync('test.db')
-  await fs.promises.mkdir('test.db')
-  const server = new Server({
-    backend: process.env.DB_BACKEND || 'lmdb',
-    dbRoot: 'test.db'
-  })
-  await server.initialize()
-  server.connect = (sessionId, delay = 50) => new Promise((resolve, reject) => {
-    const client = new ReactiveDao.LoopbackConnection(sessionId, server.apiServer, {
-      onConnect: () => resolve(client),
-      delay
-    })
-  })
-  return server
-})()
+let serverPromise = null
 
 process.on('unhandledRejection', (reason, p) => {
   console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
   // application specific logging, throwing an error, or other logic here
 })
 
-module.exports = serverPromise
+export default function getServer() {
+  if(serverPromise) return serverPromise
+  serverPromise = (async () => {
+    rimrafSync('test.db')
+    await fs.promises.mkdir('test.db')
+    const server = new Server({
+      backend: process.env.DB_BACKEND || 'lmdb',
+      dbRoot: 'test.db'
+    })
+    await server.initialize()
+    server.connect = (sessionId, delay = 50) => new Promise((resolve, reject) => {
+      const client = new ReactiveDao.LoopbackConnection(sessionId, server.apiServer, {
+        onConnect: () => resolve(client),
+        delay
+      })
+    })
+    return server
+  })()
+  return serverPromise
+}

package/tests/index.js

@@ -1,4 +1,5 @@
-const test = require('tape')
+import test from 'tape'
+import getServer from './getServer.js'
 
 let users = [
   { id: '1', name: 'david' },
@@ -33,7 +34,7 @@ test("index", t => {
 
   t.test('connect to server and create database', async t => {
     t.plan(1)
-    server = await require('./getServer.js')
+    server = await getServer()
     client = await server.connect(1)
     await client.request(['database', 'createDatabase'], 'index.test')
     t.pass('opened')