@live-change/dao-websocket 0.5.22 → 0.6.0

package/index.js

@@ -1,4 +1,5 @@
-module.exports = {
-  client: require("./lib/WebSocketConnection.js"),
-  server: require("./lib/WebSocketServerConnection.js")
-}
+import WebSocketConnection from "./lib/WebSocketConnection.js"
+import WebSocketServerConnection from "./lib/WebSocketServerConnection.js"
+
+export { WebSocketConnection, WebSocketServerConnection }
+export { WebSocketConnection as client, WebSocketServerConnection as server }

package/lib/WebSocketConnection.js

@@ -1,9 +1,9 @@
-const WebSocket = require('universal-websocket-client');
-const rd = require("@live-change/dao")
-const Connection = rd.ReactiveConnection
-const debug = require('debug')('reactive-dao-ws')
+import WebSocket from 'universal-websocket-client'
+import { ReactiveConnection } from '@live-change/dao'
+import Debug from 'debug'
+const debug = Debug('reactive-dao-ws')
 
-class WebSocketConnection extends Connection {
+class WebSocketConnection extends ReactiveConnection {
   constructor(credentials, url, settings) {
     super(credentials, settings)
     this.url = url
@@ -69,4 +69,4 @@ class WebSocketConnection extends Connection {
 
 }
 
-module.exports = WebSocketConnection
+export default WebSocketConnection

package/lib/WebSocketServerConnection.js

@@ -1,4 +1,4 @@
-const EventEmitter = require('events');
+import EventEmitter from 'events'
 
 class WebSocketServerConnection extends EventEmitter {
   constructor(request, origin) {
@@ -26,4 +26,4 @@ class WebSocketServerConnection extends EventEmitter {
   }
 }
 
-module.exports = WebSocketServerConnection
+export default WebSocketServerConnection

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/dao-websocket",
-  "version": "0.5.22",
+  "version": "0.6.0",
   "author": {
     "email": "m8@em8.pl",
     "name": "Michał Łaszczewski",
@@ -10,23 +10,23 @@
     "url": "https://github.com/live-change/live-change-dao/issues"
   },
   "dependencies": {
-    "@live-change/dao": "^0.5.22",
+    "@live-change/dao": "^0.6.0",
     "bufferutil": "^4.0.3",
     "debug": "^4.3.4",
-    "supports-color": "^7.2.0",
+    "supports-color": "^9.4.0",
     "universal-websocket-client": "^1.0.1",
     "utf-8-validate": "^5.0.4",
     "websocket": "^1.0.34"
   },
   "description": "live-change dao websocket transport",
   "devDependencies": {
-    "blue-tape": "^1.0.0"
+    "tape": "^5.7.4"
   },
   "directories": {},
   "homepage": "https://github.com/live-change/live-change-dao",
   "license": "BSD-3-Clause",
   "main": "index.js",
-  "browser": "browser.js",
+  "type": "module",
   "maintainers": [
     {
       "email": "michal@laszczewski.com",
@@ -39,7 +39,8 @@
     "url": ""
   },
   "scripts": {
-    "compileTests": "webpack test/*.js tests-bundle.js"
+    "compileTests": "webpack tests/*.js tests-bundle.js",
+    "test": "NODE_ENV=test tape tests/*"
   },
-  "gitHead": "c44369e98e27df9f5d09142e6c34d02510b018b1"
+  "gitHead": "a74891e96d33fc1f70f49423f3e560517890f067"
 }

package/tests/connection.js

@@ -1,10 +1,9 @@
-const test = require('blue-tape')
-const testServerDao = require('reactive-dao/tests/testServerDao.js')
-const ReactiveDao = require("reactive-dao")
-const WebSocketServer = require('websocket').server
-var http = require('http')
-
-const rdws = require("../index.js")
+import test from 'tape'
+import * as testServerDao from '@live-change/dao/tests/testServerDao.js'
+import ReactiveDao from "@live-change/dao"
+import { server as WebSocketConnection } from 'websocket'
+import http from 'http'
+import * as rdws from '../index.js'
 
 test("time value", (t) => {
   t.plan(4)
@@ -28,7 +27,7 @@ test("time value", (t) => {
       console.log('Server is listening on port',port);
     })
 
-    let wsServer = new WebSocketServer({ httpServer, autoAcceptConnections: false })
+    let wsServer = new WebSocketConnection({ httpServer, autoAcceptConnections: false })
     wsServer.on("request",(request) => {
       t.pass("WebSocket request made")
       let serverConnection = new rdws.server(request)

package/tests-bundle.js

@@ -0,0 +1,76 @@
+/******/ (function(modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+/******/
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+/******/
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId]) {
+/******/ 			return installedModules[moduleId].exports;
+/******/ 		}
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			i: moduleId,
+/******/ 			l: false,
+/******/ 			exports: {}
+/******/ 		};
+/******/
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+/******/
+/******/ 		// Flag the module as loaded
+/******/ 		module.l = true;
+/******/
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+/******/
+/******/
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+/******/
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+/******/
+/******/ 	// identity function for calling harmony imports with the correct context
+/******/ 	__webpack_require__.i = function(value) { return value; };
+/******/
+/******/ 	// define getter function for harmony exports
+/******/ 	__webpack_require__.d = function(exports, name, getter) {
+/******/ 		if(!__webpack_require__.o(exports, name)) {
+/******/ 			Object.defineProperty(exports, name, {
+/******/ 				configurable: false,
+/******/ 				enumerable: true,
+/******/ 				get: getter
+/******/ 			});
+/******/ 		}
+/******/ 	};
+/******/
+/******/ 	// getDefaultExport function for compatibility with non-harmony modules
+/******/ 	__webpack_require__.n = function(module) {
+/******/ 		var getter = module && module.__esModule ?
+/******/ 			function getDefault() { return module['default']; } :
+/******/ 			function getModuleExports() { return module; };
+/******/ 		__webpack_require__.d(getter, 'a', getter);
+/******/ 		return getter;
+/******/ 	};
+/******/
+/******/ 	// Object.prototype.hasOwnProperty.call
+/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
+/******/
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "";
+/******/
+/******/ 	// Load entry module and return exports
+/******/ 	return __webpack_require__(__webpack_require__.s = 0);
+/******/ })
+/************************************************************************/
+/******/ ([
+/* 0 */
+/***/ (function(module, exports) {
+
+throw new Error("Module parse failed: /home/m8/IdeaProjects/live-change/live-change-dao/dao-websocket/tests/connection.js Unexpected token (7:6)\nYou may need an appropriate loader to handle this file type.\n| import * as rdws from '../index.js'\n| \n| const (\"../index.js\")\n| \n| test(\"time value\", (t) => {");
+
+/***/ })
+/******/ ]);

package/browser.js

@@ -1,3 +0,0 @@
-module.exports = {
-  client: require("./lib/WebSocketConnection.js")
-}