@live-change/dao 0.5.9 → 0.5.11

package/lib/Dao.js

@@ -4,6 +4,15 @@ const ReactiveConnection = require("./ReactiveConnection.js")
 const ObservableList = require("./ObservableList.js")
 const debug = require('debug')('dao')
 
+function isConstructor(f) {
+  try {
+    Reflect.construct(String, [], f);
+  } catch (e) {
+    return false;
+  }
+  return true;
+}
+
 class Dao extends EventEmitter {
   constructor(credentials, definition) {
     super()
@@ -25,10 +34,11 @@ class Dao extends EventEmitter {
     const protocol = this.definition.protocols[proto]
     if(!protocol) throw new Error("Protocol "+proto+" not supported")
     debug("connecting to "+url)
-    try {
-      connection = new protocol(this.credentials, url, this.definition.connectionSettings)
-    } catch(e) {
-      connection = protocol(this.credentials, url, this.definition.connectionSettings)
+
+    if(isConstructor(protocol)) {
+      connection = new protocol(this.credentials, url, defn.settings ?? this.definition.connectionSettings)
+    } else {
+      connection = protocol(this.credentials, url, defn.settings ?? this.definition.connectionSettings)
     }
     this.connections.set(connectionId, connection)
 

package/lib/ReactiveServerConnection.js

@@ -419,7 +419,8 @@ class ReactiveServerConnection extends EventEmitter {
 
     if(this.settings.fastAuth) {
       try {
-        this.handleDaoPromise(this.daoFactory(this.credentials, this.connection, this))
+        const promise = this.daoFactory(this.credentials, this.connection, this)
+        if(promise) this.handleDaoPromise(promise)
       } catch(error) {
         return this.handleDaoFactoryError(error)
       }

package/package.json

@@ -35,6 +35,6 @@
   "scripts": {
     "test": "NODE_ENV=test blue-tape tests/*"
   },
-  "version": "0.5.9",
-  "gitHead": "b4fc670f10aa369feb0c371c976464b246e87e9d"
+  "version": "0.5.11",
+  "gitHead": "9cf176fdad2760a9dd2c3d1e8bb7087c27ac3e90"
 }

package/.github/workflows/npmpublish.yml

@@ -1,31 +0,0 @@
-name: Node.js Package
-
-on:
-  release:
-    types: [created]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 12
-      - run: npm ci
-      - run: npm test
-
-  publish-npm:
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 12
-          registry-url: https://registry.npmjs.org/
-      - run: npm ci
-      - run: npm publish
-        env:
-          NODE_AUTH_TOKEN: ${{secrets.npm_token}}
-