@nymphjs/client-node 1.0.0-alpha.2 → 1.0.0-alpha.23

package/CHANGELOG.md

@@ -3,6 +3,98 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.0.0-alpha.23](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.22...v1.0.0-alpha.23) (2021-12-30)
+
+**Note:** Version bump only for package @nymphjs/client-node
+
+# [1.0.0-alpha.22](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.21...v1.0.0-alpha.22) (2021-12-14)
+
+### Features
+
+- update smui to latest versions ([912873b](https://github.com/sciactive/nymphjs/commit/912873b863d1ae5d51c359a3c0558bff38ce85cd))
+
+# [1.0.0-alpha.21](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.20...v1.0.0-alpha.21) (2021-11-29)
+
+**Note:** Version bump only for package @nymphjs/client-node
+
+# [1.0.0-alpha.20](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.19...v1.0.0-alpha.20) (2021-11-24)
+
+**Note:** Version bump only for package @nymphjs/client-node
+
+# [1.0.0-alpha.19](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.18...v1.0.0-alpha.19) (2021-11-18)
+
+### Features
+
+- update smui and other packages to latest versions ([2465340](https://github.com/sciactive/nymphjs/commit/24653400d887bc04c41c3c4ee0c73ce2f2289e0d))
+
+# [1.0.0-alpha.18](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.17...v1.0.0-alpha.18) (2021-11-09)
+
+**Note:** Version bump only for package @nymphjs/client-node
+
+# [1.0.0-alpha.17](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.16...v1.0.0-alpha.17) (2021-10-14)
+
+**Note:** Version bump only for package @nymphjs/client-node
+
+# [1.0.0-alpha.16](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.15...v1.0.0-alpha.16) (2021-10-14)
+
+### Bug Fixes
+
+- don't ignore built files in npm packages ([7d688db](https://github.com/sciactive/nymphjs/commit/7d688dbec362f1f71fb451a1d0dbcaecc15d99fc))
+
+# [1.0.0-alpha.15](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.14...v1.0.0-alpha.15) (2021-10-14)
+
+**Note:** Version bump only for package @nymphjs/client-node
+
+# [1.0.0-alpha.14](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.13...v1.0.0-alpha.14) (2021-10-14)
+
+**Note:** Version bump only for package @nymphjs/client-node
+
+# [1.0.0-alpha.13](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.12...v1.0.0-alpha.13) (2021-10-14)
+
+**Note:** Version bump only for package @nymphjs/client-node
+
+# [1.0.0-alpha.12](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.11...v1.0.0-alpha.12) (2021-10-13)
+
+**Note:** Version bump only for package @nymphjs/client-node
+
+# [1.0.0-alpha.11](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.10...v1.0.0-alpha.11) (2021-10-13)
+
+**Note:** Version bump only for package @nymphjs/client-node
+
+# [1.0.0-alpha.10](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.9...v1.0.0-alpha.10) (2021-10-12)
+
+**Note:** Version bump only for package @nymphjs/client-node
+
+# [1.0.0-alpha.9](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.8...v1.0.0-alpha.9) (2021-10-12)
+
+**Note:** Version bump only for package @nymphjs/client-node
+
+# [1.0.0-alpha.8](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.7...v1.0.0-alpha.8) (2021-10-12)
+
+**Note:** Version bump only for package @nymphjs/client-node
+
+# [1.0.0-alpha.7](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.6...v1.0.0-alpha.7) (2021-10-05)
+
+**Note:** Version bump only for package @nymphjs/client-node
+
+# [1.0.0-alpha.6](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.5...v1.0.0-alpha.6) (2021-10-05)
+
+**Note:** Version bump only for package @nymphjs/client-node
+
+# [1.0.0-alpha.5](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.4...v1.0.0-alpha.5) (2021-09-30)
+
+**Note:** Version bump only for package @nymphjs/client-node
+
+# [1.0.0-alpha.4](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.3...v1.0.0-alpha.4) (2021-09-27)
+
+**Note:** Version bump only for package @nymphjs/client-node
+
+# [1.0.0-alpha.3](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.2...v1.0.0-alpha.3) (2021-09-22)
+
+### Features
+
+- allow multiple instances of Nymph Client ([81eacd7](https://github.com/sciactive/nymphjs/commit/81eacd7caff6f3c209d7d6dbfdac0414a1857c6d))
+
 # [1.0.0-alpha.2](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.1...v1.0.0-alpha.2) (2021-09-21)
 
 **Note:** Version bump only for package @nymphjs/client-node

package/README.md

@@ -12,23 +12,25 @@ npm install --save @nymphjs/client-node
 
 This package is the Nymph client for Node.js. You can find CJS in `dist`, or TS source in `src`. There is also a **[browser client](https://github.com/sciactive/nymphjs/packages/client)**.
 
-This package provides fetch and WebSocket ponyfills to Nymph, handles Tilmeld auth tokens, and sets up `Nymph.init` to also call `PubSub.init` with your configs if you provide a `pubsubUrl`.
+This package provides fetch and WebSocket ponyfills to Nymph and handles Tilmeld auth tokens.
 
 ## Usage
 
 To use, require it instead of `@nymphjs/client`:
 
-```js
-const { Nymph } = require('@nymphjs/client-node');
+```ts
+const { Nymph, PubSub } = require('@nymphjs/client-node');
 ```
 
-Then provide the options to Nymph.init:
+Then set up Nymph and PubSub like normal:
 
-```js
-Nymph.init({
+```ts
+const nymphOptions = {
   restUrl: 'https://yournymphrestserver/path/to/your/endpoint',
   pubsubUrl: 'wss://yournymphpubsubserver',
-});
+};
+const nymph = new Nymph(nymphOptions);
+const pubsub = new PubSub(nymphOptions, nymph);
 ```
 
 # License

package/dist/index.d.ts

@@ -1,4 +1,8 @@
-import * as NymphClient from '@nymphjs/client';
-declare const Nymph: typeof NymphClient.Nymph;
-export { Nymph };
-export default Nymph;
+import { Nymph, PubSub, NymphOptions } from '@nymphjs/client';
+declare class NodeNymph extends Nymph {
+    constructor(nymphOptions: NymphOptions);
+}
+declare class NodePubSub extends PubSub {
+    constructor(nymphOptions: NymphOptions, nymph: Nymph);
+}
+export { NodeNymph as Nymph, NodePubSub as PubSub };

package/dist/index.js

@@ -1,53 +1,37 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Nymph = void 0;
+exports.PubSub = exports.Nymph = void 0;
 const websocket_1 = require("websocket");
 const node_fetch_1 = __importDefault(require("node-fetch"));
-const NymphClient = __importStar(require("@nymphjs/client"));
-const { Nymph, PubSub } = NymphClient;
-exports.Nymph = Nymph;
-const _init = Nymph.init;
-Nymph.init = (nymphOptions) => {
-    _init.call(Nymph, Object.assign({ fetch: node_fetch_1.default }, nymphOptions));
-    if (nymphOptions.pubsubUrl) {
-        PubSub.init(Object.assign({ WebSocket: websocket_1.w3cwebsocket }, nymphOptions));
-    }
-};
-let authToken = null;
-Nymph.on('request', (_url, options) => {
-    if (authToken) {
-        options.headers['X-TILMELDAUTH'] = authToken;
+const client_1 = require("@nymphjs/client");
+class NodeNymph extends client_1.Nymph {
+    constructor(nymphOptions) {
+        super(Object.assign({ fetch: node_fetch_1.default }, nymphOptions));
+        let authToken = null;
+        this.on('request', (_url, options) => {
+            if (authToken) {
+                options.headers['X-TILMELDAUTH'] =
+                    authToken;
+            }
+        });
+        this.on('response', (response) => {
+            if (response.headers.has('X-TILMELDAUTH')) {
+                authToken = response.headers.get('X-TILMELDAUTH');
+                if (authToken === '') {
+                    authToken = null;
+                }
+            }
+        });
     }
-});
-Nymph.on('response', (response) => {
-    if (response.headers.has('X-TILMELDAUTH')) {
-        authToken = response.headers.get('X-TILMELDAUTH');
-        if (authToken === '') {
-            authToken = null;
-        }
+}
+exports.Nymph = NodeNymph;
+class NodePubSub extends client_1.PubSub {
+    constructor(nymphOptions, nymph) {
+        super(Object.assign({ WebSocket: websocket_1.w3cwebsocket }, nymphOptions), nymph);
     }
-});
-exports.default = Nymph;
+}
+exports.PubSub = NodePubSub;
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AACA,yCAAyC;AACzC,4DAA+B;AAC/B,6DAA+C;AAG/C,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC;AAiC7B,sBAAK;AA9Bd,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC;AACzB,KAAK,CAAC,IAAI,GAAG,CAAC,YAA0B,EAAE,EAAE;IAC1C,KAAK,CAAC,IAAI,CAAC,KAAK,kBACd,KAAK,EAAE,oBAAkD,IACtD,YAAY,EACf,CAAC;IACH,IAAI,YAAY,CAAC,SAAS,EAAE;QAC1B,MAAM,CAAC,IAAI,iBACT,SAAS,EAAE,wBAAuC,IAC/C,YAAY,EACf,CAAC;KACJ;AACH,CAAC,CAAC;AAGF,IAAI,SAAS,GAAkB,IAAI,CAAC;AACpC,KAAK,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,IAAY,EAAE,OAAoB,EAAE,EAAE;IACzD,IAAI,SAAS,EAAE;QACZ,OAAO,CAAC,OAAkC,CAAC,eAAe,CAAC,GAAG,SAAS,CAAC;KAC1E;AACH,CAAC,CAAC,CAAC;AACH,KAAK,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,QAAkB,EAAE,EAAE;IAC1C,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE;QACzC,SAAS,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QAClD,IAAI,SAAS,KAAK,EAAE,EAAE;YACpB,SAAS,GAAG,IAAI,CAAC;SAClB;KACF;AACH,CAAC,CAAC,CAAC;AAGH,kBAAe,KAAK,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AACA,yCAAyC;AACzC,4DAA+B;AAC/B,4CAA8D;AAG9D,MAAM,SAAU,SAAQ,cAAK;IAC3B,YAAY,YAA0B;QACpC,KAAK,iBACH,KAAK,EAAE,oBAAsD,IAC1D,YAAY,EACf,CAAC;QAGH,IAAI,SAAS,GAAkB,IAAI,CAAC;QACpC,IAAI,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,IAAY,EAAE,OAAoB,EAAE,EAAE;YACxD,IAAI,SAAS,EAAE;gBACZ,OAAO,CAAC,OAAkC,CAAC,eAAe,CAAC;oBAC1D,SAAS,CAAC;aACb;QACH,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,QAAkB,EAAE,EAAE;YACzC,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE;gBACzC,SAAS,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;gBAClD,IAAI,SAAS,KAAK,EAAE,EAAE;oBACpB,SAAS,GAAG,IAAI,CAAC;iBAClB;aACF;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAcqB,0BAAK;AAZ3B,MAAM,UAAW,SAAQ,eAAM;IAC7B,YAAY,YAA0B,EAAE,KAAY;QAClD,KAAK,iBAED,SAAS,EAAE,wBAA2C,IACnD,YAAY,GAEjB,KAAK,CACN,CAAC;IACJ,CAAC;CACF;AAE0C,4BAAM"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nymphjs/client-node",
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0-alpha.23",
   "description": "NymphJS - Node Client",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -30,18 +30,18 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@nymphjs/client": "^1.0.0-alpha.2",
-    "node-fetch": "^2.6.1",
+    "@nymphjs/client": "^1.0.0-alpha.23",
+    "node-fetch": "^2.6.6",
     "websocket": "^1.0.34"
   },
   "devDependencies": {
     "@tsconfig/recommended": "^1.0.1",
-    "@types/jest": "^27.0.1",
+    "@types/jest": "^27.0.3",
     "@types/node-fetch": "^2.5.12",
     "@types/websocket": "^1.0.4",
-    "jest": "^27.0.6",
-    "ts-jest": "^27.0.5",
-    "typescript": "^4.3.5"
+    "jest": "^27.4.5",
+    "ts-jest": "^27.1.1",
+    "typescript": "^4.5.4"
   },
-  "gitHead": "9596354bffaa484f3002f3063f0963f6261040be"
+  "gitHead": "4d0ec97a49f09228581fbc3773d5709531ccab73"
 }

package/src/index.ts

@@ -1,41 +1,45 @@
 // Nymph expects fetch and WebSocket.
 import { w3cwebsocket } from 'websocket';
 import fetch from 'node-fetch';
-import * as NymphClient from '@nymphjs/client';
-import { NymphOptions } from '@nymphjs/client';
-
-const { Nymph, PubSub } = NymphClient;
+import { Nymph, PubSub, NymphOptions } from '@nymphjs/client';
 
 // Make a shortcut for PubSub init.
-const _init = Nymph.init;
-Nymph.init = (nymphOptions: NymphOptions) => {
-  _init.call(Nymph, {
-    fetch: fetch as any as WindowOrWorkerGlobalScope['fetch'],
-    ...nymphOptions,
-  });
-  if (nymphOptions.pubsubUrl) {
-    PubSub.init({
-      WebSocket: w3cwebsocket as any as typeof WebSocket,
+class NodeNymph extends Nymph {
+  constructor(nymphOptions: NymphOptions) {
+    super({
+      fetch: fetch as unknown as WindowOrWorkerGlobalScope['fetch'],
       ...nymphOptions,
     });
-  }
-};
 
-// Save the Tilmeld auth token and send it in the header.
-let authToken: string | null = null;
-Nymph.on('request', (_url: string, options: RequestInit) => {
-  if (authToken) {
-    (options.headers as Record<string, string>)['X-TILMELDAUTH'] = authToken;
+    // Save the Tilmeld auth token and send it in the header.
+    let authToken: string | null = null;
+    this.on('request', (_url: string, options: RequestInit) => {
+      if (authToken) {
+        (options.headers as Record<string, string>)['X-TILMELDAUTH'] =
+          authToken;
+      }
+    });
+    this.on('response', (response: Response) => {
+      if (response.headers.has('X-TILMELDAUTH')) {
+        authToken = response.headers.get('X-TILMELDAUTH');
+        if (authToken === '') {
+          authToken = null;
+        }
+      }
+    });
   }
-});
-Nymph.on('response', (response: Response) => {
-  if (response.headers.has('X-TILMELDAUTH')) {
-    authToken = response.headers.get('X-TILMELDAUTH');
-    if (authToken === '') {
-      authToken = null;
-    }
+}
+
+class NodePubSub extends PubSub {
+  constructor(nymphOptions: NymphOptions, nymph: Nymph) {
+    super(
+      {
+        WebSocket: w3cwebsocket as unknown as typeof WebSocket,
+        ...nymphOptions,
+      },
+      nymph
+    );
   }
-});
+}
 
-export { Nymph };
-export default Nymph;
+export { NodeNymph as Nymph, NodePubSub as PubSub };