@mojojs/core 0.5.3 → 0.5.7

package/lib/cli/gen-full-app.js

@@ -3,7 +3,7 @@ import * as util from './../util.js';
 export default async function genLiteAppCommand(app, args) {
     const name = args[1] ?? 'index.js';
     process.stdout.write('Generating application directory struture:\n');
-    await util.cliCreateFile('config.json', jsonConfig, { secret: crypto.randomBytes(16).toString('hex') });
+    await util.cliCreateFile('config.yml', yamlConfig, { secret: crypto.randomBytes(16).toString('hex') });
     await util.cliCreateFile(name, jsIndex);
     await util.cliCreateDir('controllers');
     await util.cliCreateFile('controllers/example.js', jsController);
@@ -27,17 +27,14 @@ genLiteAppCommand.usage = `Usage: APPLICATION gen-full-app [OPTIONS] [NAME]
 Options:
   -h, --help   Show this summary of available options
 `;
-const jsonConfig = `{
-  "secrets": [
-    "<%= secret %>"
-  ]
-}
+const yamlConfig = `---
+secrets: [<%= secret %>]
 `;
-const jsIndex = `import mojo, {jsonConfigPlugin} from '@mojojs/core';
+const jsIndex = `import mojo, {yamlConfigPlugin} from '@mojojs/core';
 
 export const app = mojo();
 
-app.plugin(jsonConfigPlugin);
+app.plugin(yamlConfigPlugin);
 app.secrets = [app.config.secrets];
 
 app.get('/').to('example#welcome');

package/lib/router/pattern.js

@@ -1,4 +1,4 @@
-import escapeStringRegexp from 'escape-string-regexp';
+import { escapeRegExp } from '../util.js';
 const OP = {
     placeholder: Symbol('placeholder'),
     relaxed: Symbol('relaxed'),
@@ -85,7 +85,7 @@ export class Pattern {
                 continue;
             }
             else if (token[0] === OP.text) {
-                part = escapeStringRegexp(token[1]);
+                part = escapeRegExp(token[1]);
                 optional = false;
             }
             else {
@@ -128,7 +128,7 @@ export class Pattern {
                 .slice()
                 .sort()
                 .reverse()
-                .map(val => escapeStringRegexp(val))
+                .map(val => escapeRegExp(val))
                 .join('|') +
             ')');
     }

package/lib/server.d.ts

@@ -4,7 +4,7 @@ import type { Socket } from 'net';
 import http from 'http';
 import https from 'https';
 import { URL } from 'url';
-import WS from 'ws';
+import { WebSocketServer } from 'ws';
 declare type ListenArgs = any[];
 interface ServerOptions {
     cluster?: boolean;
@@ -28,6 +28,6 @@ export declare class Server {
     stop(): Promise<void>;
     _createServer(location: string): Promise<void>;
     _handleRequest(req: http.IncomingMessage, res: http.ServerResponse): void;
-    _handleUpgrade(wss: WS.Server, req: http.IncomingMessage, socket: Socket, head: Buffer): void;
+    _handleUpgrade(wss: WebSocketServer, req: http.IncomingMessage, socket: Socket, head: Buffer): void;
 }
 export {};

package/lib/server.js

@@ -5,7 +5,7 @@ import os from 'os';
 import { URL } from 'url';
 import { WebSocket } from './websocket.js';
 import Path from '@mojojs/path';
-import WS from 'ws';
+import { WebSocketServer } from 'ws';
 export class Server {
     constructor(app, options = {}) {
         this.urls = [];
@@ -38,7 +38,7 @@ export class Server {
     }
     async start() {
         await this.app.hooks.runHook('start', this.app);
-        if (this._cluster && cluster.isMaster) {
+        if (this._cluster && cluster.isPrimary) {
             for (let i = 0; i < this._workers; i++) {
                 cluster.fork();
             }
@@ -64,7 +64,7 @@ export class Server {
             isHttps = true;
         }
         await this.app.warmup();
-        const wss = new WS.Server({ noServer: true });
+        const wss = new WebSocketServer({ noServer: true });
         const server = (isHttps ? https : http).createServer(options, this._handleRequest.bind(this));
         this._servers.push(server);
         server.on('upgrade', this._handleUpgrade.bind(this, wss));

package/lib/user-agent/test.d.ts

@@ -35,7 +35,7 @@ export declare class TestUserAgent extends MockUserAgent {
     headerExistsNot(name: string): this;
     headerIs(name: string, value: string): this;
     headerLike(name: string, regex: RegExp): this;
-    jsonIs(value: JSONValue): this;
+    jsonIs(value: JSONValue, pointer?: string): this;
     messageOk(): Promise<JSONValue>;
     static newTestUserAgent(app: App, options?: TestUserAgentOptions): Promise<TestUserAgent>;
     optionsOk(url: string | URL, options?: UserAgentRequestOptions): Promise<this>;
@@ -49,7 +49,7 @@ export declare class TestUserAgent extends MockUserAgent {
     typeLike(regex: RegExp): this;
     websocketOk(url: string | URL, options?: UserAgentWebSocketOptions): Promise<void>;
     get ws(): WebSocket;
-    yamlIs(value: any): this;
+    yamlIs(value: JSONValue, pointer?: string): this;
     get _cheerio(): cheerio.Root;
     _prepareTap(tap: Tap.Tap): void;
     _requestOk(skip: SkipFunction, method: string, url: string | URL, options?: UserAgentRequestOptions): Promise<this>;

package/lib/user-agent/test.js

@@ -1,5 +1,6 @@
 import assert from 'assert/strict';
 import { on } from 'events';
+import { jsonPointer } from '../util.js';
 import { MockUserAgent } from './mock.js';
 import cheerio from 'cheerio';
 import yaml from 'js-yaml';
@@ -79,8 +80,9 @@ export class TestUserAgent extends MockUserAgent {
         this.assert('match', [this.res.get(name), regex], `${name} is similar`, this.headerLike);
         return this;
     }
-    jsonIs(value) {
-        this.assert('same', [JSON.parse(this.body.toString()), value], 'JSON body is equal', this.jsonIs);
+    jsonIs(value, pointer = '') {
+        const expected = jsonPointer(JSON.parse(this.body.toString()), pointer);
+        this.assert('same', [expected, value], `exact match for JSON Pointer "${pointer}" (JSON)`, this.jsonIs);
         return this;
     }
     async messageOk() {
@@ -142,8 +144,9 @@ export class TestUserAgent extends MockUserAgent {
             throw new Error('No active WebSocket connection');
         return ws;
     }
-    yamlIs(value) {
-        this.assert('same', [yaml.load(this.body.toString()), value], 'YAML body is equal', this.yamlIs);
+    yamlIs(value, pointer = '') {
+        const expected = jsonPointer(yaml.load(this.body.toString()), pointer);
+        this.assert('same', [expected, value], `exact match for JSON Pointer "${pointer}" (YAML)`, this.yamlIs);
         return this;
     }
     get _cheerio() {

package/lib/user-agent.js

@@ -74,6 +74,7 @@ class UserAgent extends EventEmitter {
         const filtered = this._filterSharedConfig(options);
         await this._loadCookies(filtered.url, filtered);
         this.emit('websocket', filtered);
+        filtered.url.protocol = filtered.url.protocol === 'https:' ? 'wss:' : 'ws:';
         const ws = new WS(filtered.url, filtered.protocols, { headers: filtered.headers });
         return await new Promise((resolve, reject) => {
             let handshake;

package/lib/util.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+import type { JSONValue } from './types.js';
 import type { Mode } from 'fs';
 import { setTimeout } from 'timers/promises';
 export declare function captureOutput(fn: () => void, options?: {
@@ -11,6 +12,7 @@ export declare function cliCreateFile(path: string, template: string, values?: R
 }): Promise<void>;
 export declare function cliFixPackage(): Promise<void>;
 export declare function decodeURIComponentSafe(value: string): string | null;
+export declare function escapeRegExp(string: string): string;
 export declare function exceptionContext(error: Error, options?: {
     lines?: number;
 }): Promise<{
@@ -24,6 +26,7 @@ export declare function exceptionContext(error: Error, options?: {
 } | null>;
 export declare function htmlEscape(value: string | SafeString): string;
 export declare function htmlTag(name: string, attrs?: Record<string, string> | string | SafeString, content?: string | SafeString): SafeString;
+export declare function jsonPointer(value: JSONValue, pointer: string): JSONValue | undefined;
 export declare function loadModules(dirs: string[]): Promise<Record<string, any>>;
 export declare const sleep: typeof setTimeout;
 export declare function tablify(rows?: string[][]): string;

package/lib/util.js

@@ -106,6 +106,9 @@ export function decodeURIComponentSafe(value) {
         return null;
     }
 }
+export function escapeRegExp(string) {
+    return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
 export async function exceptionContext(error, options = {}) {
     const stack = error.stack ?? '';
     const match = stack.split('\n')[1].match(/^\s*at .+ \(([^)]+):(\d+):(\d+)\)\s*$/);
@@ -152,6 +155,24 @@ export function htmlTag(name, attrs = {}, content = '') {
     }
     return new SafeString(result.join(''));
 }
+export function jsonPointer(value, pointer) {
+    if (!pointer.startsWith('/'))
+        return pointer.length > 0 ? null : value;
+    let data = value;
+    for (const part of pointer.replace(/^\//, '').split('/')) {
+        const unescaped = part.replaceAll('~1', '/').replaceAll('~0', '~');
+        if (typeof data === 'object' && data[unescaped] !== undefined) {
+            data = data[unescaped];
+        }
+        else if (Array.isArray(data) && /^\d+$/.test(unescaped)) {
+            data = data[parseInt(unescaped)];
+        }
+        else {
+            return undefined;
+        }
+    }
+    return data;
+}
 export async function loadModules(dirs) {
     const modules = {};
     for (const dir of dirs.map(path => new Path(path))) {

package/lib/websocket.d.ts

@@ -29,6 +29,6 @@ declare class WebSocket extends EventEmitter {
     send(message: JSONValue | Buffer): Promise<void>;
     _messageIterator(): AsyncIterableIterator<Array<JSONValue | Buffer>>;
     _safeHandler<T extends keyof WebSocketControlEvents>(event: T, ...args: Parameters<WebSocketControlEvents[T]>): void;
-    _safeMessageHandler(message: string | Buffer): void;
+    _safeMessageHandler(message: Buffer, isBinary: boolean): void;
 }
 export { WebSocket };

package/lib/websocket.js

@@ -48,10 +48,10 @@ class WebSocket extends EventEmitter {
             this.emit('error', error);
         }
     }
-    _safeMessageHandler(message) {
+    _safeMessageHandler(message, isBinary) {
         try {
             if (!this.jsonMode) {
-                this.emit('message', message);
+                this.emit('message', isBinary ? message : message.toString());
             }
             else {
                 this.emit('message', JSON.parse(message.toString()));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojojs/core",
-  "version": "0.5.3",
+  "version": "0.5.7",
   "description": "Real-time web framework",
   "keywords": [
     "web",
@@ -61,7 +61,7 @@
     "@types/stack-utils": "^2.0.0",
     "@types/tap": "^15.0.3",
     "@types/tough-cookie": "^4.0.0",
-    "@types/ws": "^7.4.5",
+    "@types/ws": "^8.2.0",
     "@typescript-eslint/eslint-plugin": "^5.1.0",
     "autocannon": "^7.3.0",
     "concurrently": "^6.2.0",
@@ -71,6 +71,7 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^4.0.0",
     "prettier": "2.4.1",
+    "tap": "^15.0.6",
     "typescript": "^=4.3.2"
   },
   "engines": {
@@ -84,15 +85,17 @@
     "cheerio": "^1.0.0-rc.10",
     "cookie": "^0.4.1",
     "ejs": "^3.1.6",
-    "escape-string-regexp": "^5.0.0",
     "form-data": "^4.0.0",
     "js-yaml": "^4.1.0",
     "lru-cache": "^6.0.0",
     "mime-types": "^2.1.30",
     "nopt": "^5.0.0",
     "stack-utils": "^2.0.3",
-    "tap": "^15.0.6",
     "tough-cookie": "^4.0.0",
-    "ws": "^7.4.5"
+    "ws": "^8.2.3"
+  },
+  "optionalDependencies": {
+    "bufferutil": "^4.0.5",
+    "utf-8-validate": "^5.0.7"
   }
 }