@live-change/db-client 0.6.22 → 0.7.0

package/bin/client.js

@@ -5,7 +5,6 @@ const exec = require('../lib/exec.js')
 const request = require('../lib/request.js')
 const get = require('../lib/get.js')
 const observe = require('../lib/observe.js')
-
 const parseList = require('../lib/parseList.js')
 
 process.on('unhandledRejection', (reason, p) => {

package/lib/dump.js

@@ -1,56 +1,57 @@
-const { client: WSClient } = require("@live-change/dao-websocket")
+import { client as WSClient } from "@live-change/dao-websocket"
 
 async function dump(
     options,
     req = (method, ...args) => console.log(JSON.stringify({ type: 'request', method, parameters: args })),
     sync = () => console.log(JSON.stringify({ type: 'sync' }))
 ) {
-  let { serverUrl, verbose, db, targetDb, tables, logs, metadata, structure } = options
+  let { serverUrl, verbose, db, targetDb, tables, logs, metadata, structure, dao } = options
   if(!targetDb) targetDb = db
   // console.log("options", options)
   const dumpAll = !tables && !logs
 
   let done = false
 
-  let disconnectCallbacks
-  const disconnectPromise = new Promise((resolve, reject) => disconnectCallbacks = { resolve, reject })
+  if(!dao) {
+    let disconnectCallbacks
+    const disconnectPromise = new Promise((resolve, reject) => disconnectCallbacks = {resolve, reject})
 
-  const clientPromise = new Promise((resolve, reject) => {
-    const client = new WSClient("commandLine", serverUrl, {
-      connectionSettings: {
-        logLevel: 1
-      },
-      onConnect: () => {
-        if(verbose) console.error("connected to server")
-        resolve(client)
-      },
-      onDisconnect: () => {
-        if(verbose) console.error("disconnected from server")
-        if(!done) {
-          console.error("disconnected before request done")
-          disconnectCallbacks.reject("disconnected before request done")
-        } else {
-          disconnectCallbacks.resolve('ok')
+    const clientPromise = new Promise((resolve, reject) => {
+      const client = new WSClient("commandLine", serverUrl, {
+        connectionSettings: {
+          logLevel: 1
+        },
+        onConnect: () => {
+          if (verbose) console.error("connected to server")
+          resolve(client)
+        },
+        onDisconnect: () => {
+          if (verbose) console.error("disconnected from server")
+          if (!done) {
+            console.error("disconnected before request done")
+            disconnectCallbacks.reject("disconnected before request done")
+          } else {
+            disconnectCallbacks.resolve('ok')
+          }
         }
-      }
+      })
     })
-  })
-
-  const client = await clientPromise
 
+    dao = await clientPromise
+  }
 
   let tablesList = tables || [], logsList = logs || []
   let databaseConfig
   if(structure || metadata) {
-    databaseConfig = await client.get(['database', 'databaseConfig', db])
+    databaseConfig = await dao.get(['database', 'databaseConfig', db])
   }
   if(dumpAll && (structure || metadata)) {
     // console.log("CONFIG", databaseConfig)
     tablesList = Object.keys(databaseConfig.tables)
     logsList = Object.keys(databaseConfig.logs)
   } else if(dumpAll) {
-    tablesList = await client.get(['database', 'tablesList', db])
-    logsList = await client.get(['database', 'logsList', db])
+    tablesList = await dao.get(['database', 'tablesList', db])
+    logsList = await dao.get(['database', 'logsList', db])
   }
   if(structure || metadata) {
     if(dumpAll) {
@@ -108,7 +109,7 @@ async function dump(
     let found = 0
     let position = ''
     do {
-      const results = await client.get(path(position, bucket))
+      const results = await dao.get(path(position, bucket))
       await Promise.all(results.map(output))
       found = results.length
       if(results.length) position = results[results.length - 1].id
@@ -132,9 +133,10 @@ async function dump(
 
   done = true
 
-  client.dispose()
-
-  await disconnectPromise
+  if(!options.dao) {
+    dao.dispose()
+    await disconnectPromise
+  }
 }
 
-module.exports = dump
+export default dump

package/lib/exec.js

@@ -1,5 +1,5 @@
-const { client: WSClient } = require("@live-change/dao-websocket")
-const lineReader = require('line-reader')
+import { client as WSClient } from "@live-change/dao-websocket"
+import lineReader from 'line-reader'
 
 async function exec(options) {
   let { serverUrl, verbose, file, targetDb } = options
@@ -83,4 +83,4 @@ async function exec(options) {
   })
 }
 
-module.exports = exec
+export default exec

package/lib/get.js

@@ -1,4 +1,4 @@
-const { client: WSClient } = require("@live-change/dao-websocket")
+import { client as WSClient } from "@live-change/dao-websocket"
 
 async function get({ serverUrl, path, verbose }) {
   if(verbose) console.info(`getting ${serverUrl} value ${JSON.stringify(path)}`)
@@ -35,4 +35,4 @@ async function get({ serverUrl, path, verbose }) {
   })
 }
 
-module.exports = get
+export default get

package/lib/observe.js

@@ -1,5 +1,5 @@
-const { client: WSClient } = require("@live-change/dao-websocket")
-const ReactiveDao = require("@live-change/dao")
+import { client as WSClient } from "@live-change/dao-websocket"
+import ReactiveDao from "@live-change/dao"
 
 async function observe({ serverUrl, path, verbose }) {
   if(verbose) console.info(`observing ${serverUrl} value ${JSON.stringify(path)}`)
@@ -27,4 +27,4 @@ async function observe({ serverUrl, path, verbose }) {
   })
 }
 
-module.exports = observe
+export default observe

package/lib/parseList.js

@@ -12,4 +12,4 @@ function parseList(str, sep = '.') {
   }
 }
 
-module.exports = parseList
+export default parseList

package/lib/request.js

@@ -1,4 +1,4 @@
-const { client: WSClient } = require("@live-change/dao-websocket")
+import { client as WSClient } from "@live-change/dao-websocket"
 
 async function request({ serverUrl, method, args, verbose }) {
   if(verbose) console.info(`requesting ${serverUrl} method ${JSON.stringify(method)} with arguments `
@@ -36,4 +36,4 @@ async function request({ serverUrl, method, args, verbose }) {
   })
 }
 
-module.exports = request
+export default request

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/db-client",
-  "version": "0.6.22",
+  "version": "0.7.0",
   "description": "Database with observable data for live queries",
   "main": "index.js",
   "scripts": {
@@ -24,14 +24,15 @@
   },
   "homepage": "https://github.com/live-change/live-change-db",
   "devDependencies": {
-    "tape": "^5.3.2"
+    "tape": "^5.7.4"
   },
+  "type": "module",
   "dependencies": {
-    "@live-change/dao": "0.5.21",
-    "@live-change/dao-websocket": "0.5.21",
+    "@live-change/dao": "0.5.22",
+    "@live-change/dao-websocket": "0.5.22",
     "line-reader": "^0.4.0",
     "websocket": "^1.0.34",
-    "yargs": "^17.5.1"
+    "yargs": "^17.7.2"
   },
-  "gitHead": "cef1aace649e46c20af0ff07b30ca2508ac3714d"
+  "gitHead": "b372725d436e29f7cc66b811533009c9ea5330a1"
 }