larasopp 1.2.21 → 1.2.22

package/lib/Core.d.ts

@@ -6,6 +6,7 @@ declare abstract class Core {
     private _socketId?;
     private config;
     private reconnectCount;
+    private reconnectTimer?;
     constructor(config: IConfig);
     setConfig(config: IConfig): this;
     setToken(token: string): this;

package/lib/Core.js

@@ -37,6 +37,12 @@ class Core {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "reconnectTimer", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.events = new easy_event_emitter_1.default;
         this.reconnectCount = 0;
         this.config = config;
@@ -44,6 +50,7 @@ class Core {
         this.handleClose = this.handleClose.bind(this);
         this.handleError = this.handleError.bind(this);
         this.handleMessage = this.handleMessage.bind(this);
+        this.tryReconnect = this.tryReconnect.bind(this);
     }
     setConfig(config) {
         this.config = config;
@@ -103,16 +110,21 @@ class Core {
         return true;
     }
     tryReconnect() {
-        var _a, _b;
-        if (typeof this.config.reconnect === 'undefined' ||
-            this.reconnectCount >= this.config.reconnect ||
-            typeof this.ws === 'undefined' ||
-            this.status ||
-            ((_a = this.ws) === null || _a === void 0 ? void 0 : _a.readyState) === this.ws.CONNECTING)
-            return;
-        ++this.reconnectCount;
-        this.connect();
-        setTimeout(() => this.tryReconnect(), (_b = this.config.reconnectDelay) !== null && _b !== void 0 ? _b : 1000);
+        var _a;
+        if (this.reconnectTimer)
+            clearTimeout(this.reconnectTimer);
+        this.reconnectTimer = setTimeout(() => {
+            var _a;
+            if (typeof this.config.reconnect === 'undefined' ||
+                this.reconnectCount >= this.config.reconnect ||
+                typeof this.ws === 'undefined' ||
+                this.status ||
+                ((_a = this.ws) === null || _a === void 0 ? void 0 : _a.readyState) === this.ws.CONNECTING)
+                return;
+            ++this.reconnectCount;
+            this.connect();
+            this.tryReconnect();
+        }, (_a = this.config.reconnectDelay) !== null && _a !== void 0 ? _a : 1000);
     }
     handleOpen(e) {
         this.events.emit("open", e);

package/package.json

@@ -1,18 +1,22 @@
 {
   "name": "larasopp",
-  "version": "1.2.21",
+  "version": "1.2.22",
   "description": "Websocket client for laravel",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {
     "test": "jest",
-    "build": "tsc"
+    "build": "tsc",
+    "prepublishOnly": "npm run build"
   },
   "jest": {
     "transform": {
       "^.+\\.[t|j]sx?$": "babel-jest"
     }
   },
+  "files": [
+    "lib"
+  ],
   "repository": {
     "type": "git",
     "url": "git+https://github.com/SergoMorello/larasopp.client.git"
@@ -37,6 +41,6 @@
     "typescript": "^5.1.6"
   },
   "dependencies": {
-    "easy-event-emitter": "^1.1.5"
+    "easy-event-emitter": "^1.2.2"
   }
 }

package/__tests__/connect.test.js

@@ -1,5 +0,0 @@
-import Larasopp from "../src";
-
-test('Connect', () => {
-	// todo
-});

package/src/Core.ts

@@ -1,185 +0,0 @@
-import EventEmitter from "easy-event-emitter";
-import { ListenerEvents } from "./constants";
-import type {
-	IConfig,
-	TListenerEvents,
-	TMessage
-} from "./types";
-
-abstract class Core {
-	public readonly events: EventEmitter;
-	private ws?: WebSocket;
-	private _socketId?: string;
-	private config: IConfig;
-	private reconnectCount: number;
-
-	constructor(config: IConfig) {
-		this.events = new EventEmitter;
-		this.reconnectCount = 0;
-		this.config = config;
-		
-		this.handleOpen = this.handleOpen.bind(this);
-		this.handleClose = this.handleClose.bind(this);
-		this.handleError = this.handleError.bind(this);
-		this.handleMessage = this.handleMessage.bind(this);
-	}
-
-	public setConfig(config: IConfig) {
-		this.config = config;
-		return this;
-	}
-
-	public setToken(token: string) {
-		this.config = {
-			...this.config,
-			token
-		};
-		if (this.status) {
-			this.send({
-				token
-			});
-		}
-		return this;
-	}
-
-	/**
-	 * Connect to websocket
-	 * @returns {this}
-	 */
-	public connect(token?: string): this {
-		if (this.status) return this;
-		try {
-			if (token) this.setToken(token);
-			const host = this.config.host + '/token=' + this.config.token;
-			this.ws = new WebSocket(encodeURI(host));
-			this.ws.onopen = this.handleOpen;
-			this.ws.onclose = this.handleClose;
-			this.ws.onerror = this.handleError;
-			this.ws.onmessage = this.handleMessage;
-		}catch(e) {
-			console.warn(e);
-			this.handleError(new Event('Socket exception'));
-			this.handleClose(new CloseEvent(String(e)));
-		}
-		
-		return this;
-	}
-
-	/**
-	 * Disconnect
-	 * @returns {void}
-	 */
-	public disconnect(): void {
-		if (this.status) {
-			this.ws?.close();
-		}
-		this.ws = undefined;
-	}
-
-	protected isJson(str: string) {
-		try {
-			JSON.parse(str);
-		} catch (e) {
-			return false;
-		}
-		return true;
-	}
-
-	private tryReconnect() {
-		if (
-			typeof this.config.reconnect === 'undefined' ||
-			this.reconnectCount >= this.config.reconnect ||
-			typeof this.ws === 'undefined' ||
-			this.status ||
-			this.ws?.readyState === this.ws.CONNECTING
-		) return;
-		
-		++this.reconnectCount;
-		this.connect();
-		setTimeout(() => this.tryReconnect(), this.config.reconnectDelay ?? 1000);
-	}
-
-	private handleOpen(e: Event): void {
-		this.events.emit("open", e);
-	}
-
-	private handleClose(e: CloseEvent): void {
-		this.events.emit("close", e);
-		this.tryReconnect();
-	}
-
-	private handleError(e: Event): void {
-		this.events.emit("error", e);
-	}
-
-	private jsonParse(str: string) {
-		if (this.config) {
-			if (typeof this.config.reviver === 'function') {
-				return JSON.parse(str, this.config.reviver);
-			}
-	
-			if (this.config.dataReviver) {
-				const replace = this.config.dataReviver;
-				return JSON.parse(str, (key, value) => {
-					if (key === "createdAt" || key === "updatedAt") {
-						return new Date(value);
-					}
-					if (key in replace && typeof replace[key] === 'function') {
-						return replace[key](value);
-					}
-					return value;
-				});
-			}
-		}
-		
-		return JSON.parse(str);
-	}
-
-	private handleMessage(e: MessageEvent): void {
-		if (this.isJson(e.data)) {
-			const json = this.jsonParse(e.data);
-			if (json.socket_id) {
-				this._socketId = json.socket_id;
-				return;
-			}
-			this.emitListener(json.channel, json.message);
-			this.events.emit(json.channel + ':' + json.event, json.message);
-		}
-	}
-
-	private emitListener(method: TListenerEvents, channel: string): void {
-		if (ListenerEvents.includes(method)) {	
-			this.events.emit(method + ':' + channel, {
-				channel
-			});
-		}
-	}
-
-	public get socketId() {
-		return this._socketId;
-	}
-
-	public get status(): boolean {
-		if (!this.ws) return false;
-		return this.ws?.readyState === this.ws?.OPEN;
-	}
-
-	private _send<T>(message: TMessage<T>) {
-		if (!this.ws || !this.status) return;
-		this.ws.send(JSON.stringify(message));
-	}
-
-	protected send<T>(message: TMessage<T>) {
-		if (this.status) {
-			this._send(message);
-		}else{
-			if (this.ws?.readyState !== this.ws?.CONNECTING) this.connect();
-			const event = this.events.addListener('open',() => {
-				this._send(message);
-				event.remove();
-			});
-		}
-	}
-}
-
-export default Core;

package/src/Listener.ts

@@ -1,67 +0,0 @@
-import EventEmmiter, {
-	type EventListener
-} from "easy-event-emitter";
-import type Larasopp from ".";
-
-type TListenerCacheEvents = {
-	[event: string]: unknown;
-};
-
-class Listener extends EventEmmiter.Stack {
-	private readonly context: Larasopp;
-	private channel: string;
-	private listener?: EventListener;
-	private cacheEvents: TListenerCacheEvents;
-
-	constructor(channel: string, constext: Larasopp) {
-		super([]);
-		this.channel = channel;
-		this.context = constext;
-		this.cacheEvents = {};
-
-		this.here(()=>{}, true);
-	}
-
-	public listen(event: string, callback: (data: any) => void, withCache = false) {
-
-		if (withCache && this.hasCache(event)) callback(this.getCache(event));
-		const listener = this.context.events.addListener(this.channel + ':' + event, (data) => {
-			callback(data);
-			if (withCache) this.pushCache(event, data);
-		});
-
-		this.push(listener);
-		return this;
-	}
-
-	public here(callback: (data: any) => void, withCache = true) {
-		return this.listen('__HERE', callback, withCache);
-	}
-
-	public joining(callback: (data: any) => void, withCache = false) {
-		return this.listen('__JOIN', callback, withCache);
-	}
-
-	public leaving(callback: (data: any) => void, withCache = false) {
-		return this.listen('__LEAVE', callback, withCache);
-	}
-
-	public unsubscribe() {
-		this.context.unsubscribe(this.channel);
-		this.remove();
-	}
-
-	private hasCache(event: string) {
-		return event in this.cacheEvents;
-	}
-
-	private getCache(event: string) {
-		return this.cacheEvents[event];
-	}
-
-	private pushCache(event: string, data: unknown) {
-		this.cacheEvents[event] = data;
-	}
-}
-
-export default Listener;

package/src/constants.ts

@@ -1,3 +0,0 @@
-export const SocketEvents = ['open', 'close', 'error'] as const;
-
-export const ListenerEvents = ['subscribe', 'unsubscribe'] as const;

package/src/index.ts

@@ -1,89 +0,0 @@
-import {
-	type EventListener
-} from "easy-event-emitter";
-import Core from "./Core";
-import { SocketEvents } from "./constants";
-import Listener from "./Listener";
-import type {
-	IConfig,
-	TPermissions,
-	TSocketEvents,
-	TListenerCallback,
-	TChannels
-} from "./types";
-
-class Larasopp extends Core {
-	private readonly channels: TChannels;
-
-	constructor(config: IConfig) {
-		super(config);
-		
-		this.channels = {};
-
-		this.listenResumeSubscribes();
-	}
-
-	private listenResumeSubscribes() {
-		this.addListener('open', () => {
-			Object.keys(this.channels).forEach((channel) => this.send({
-				subscribe: channel
-			}));
-		});
-	}
-
-	public subscribe(channel: string) {
-		const listener = new Listener(channel, this);
-		this.pushListener(channel, listener);
-		return listener;
-	}
-
-	public unsubscribe(channel: string) {
-		if (!this.channels[channel]) return;
-		this.channels[channel].forEach((listener) => listener.remove());
-		delete this.channels[channel];
-		this.send({
-			unsubscribe: channel
-		});
-	}
-
-	public trigger<T>(channel: string, event: string, message: T, permission: TPermissions = 'public', waitSubscribe: boolean = false): void {
-		const send = () => {
-			this.send<T>({
-				channel: channel,
-				event: event,
-				message: message,
-				type: permission
-			});
-		};
-		
-		if (waitSubscribe) this.events.addListener(event + ':' + channel, send);
-		send();
-	}
-
-	private pushListener(channel: string, listener: Listener): void {
-		if (!this.channels[channel]) {
-			this.channels[channel] = [];
-			this.send({
-				subscribe: channel
-			});
-		}
-		this.channels[channel].push(listener);
-	}
-
-	public countListeners(channel: string) {
-		if (!this.channels[channel]) return -1;
-		return this.channels[channel].length;
-	}
-
-	public addListener(event: TSocketEvents, callback: TListenerCallback): EventListener | undefined {
-		if (!SocketEvents.includes(event)) return;
-		return this.events.addListener(event, callback);
-	}
-}
-
-export type {
-	Listener,
-	EventListener
-};
-
-export default Larasopp;

package/src/types.ts

@@ -1,40 +0,0 @@
-import type Listener from "./Listener";
-import {
-	SocketEvents,
-	ListenerEvents
-} from "./constants";
-
-export type TSocketEvents = typeof SocketEvents[number];
-
-export type TListenerEvents = typeof ListenerEvents[number];
-
-export type TListenerCallback = (data:{channel: string}) => void;
-
-export type TPermissions = 'public' | 'protected' | 'private';
-
-export type TMessage<T> = {
-	subscribe?: string;
-	unsubscribe?: string;
-	channel?: string;
-	event?: string;
-	token?: string;
-	message?: T;
-	type?: TPermissions;
-};
-
-export type TConfigDataReviver = {
-	[index: string]: (value: any) => any;
-};
-
-export interface IConfig {
-	host: string;
-	token?: string;
-	reviver?: (this: any, key: string, value: any) => any;
-	dataReviver?: TConfigDataReviver;
-	reconnect?: number;
-	reconnectDelay?: number;
-};
-
-export type TChannels = {
-	[channel: string]: Listener[];
-};

package/tsconfig.json

@@ -1,109 +0,0 @@
-{
-  "compilerOptions": {
-    /* Visit https://aka.ms/tsconfig to read more about this file */
-
-    /* Projects */
-    // "incremental": true,                              /* Save .tsbuildinfo files to allow for incremental compilation of projects. */
-    // "composite": true,                                /* Enable constraints that allow a TypeScript project to be used with project references. */
-    // "tsBuildInfoFile": "./.tsbuildinfo",              /* Specify the path to .tsbuildinfo incremental compilation file. */
-    // "disableSourceOfProjectReferenceRedirect": true,  /* Disable preferring source files instead of declaration files when referencing composite projects. */
-    // "disableSolutionSearching": true,                 /* Opt a project out of multi-project reference checking when editing. */
-    // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
-
-    /* Language and Environment */
-    "target": "es2016",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
-    // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
-    // "jsx": "preserve",                                /* Specify what JSX code is generated. */
-    // "experimentalDecorators": true,                   /* Enable experimental support for legacy experimental decorators. */
-    // "emitDecoratorMetadata": true,                    /* Emit design-type metadata for decorated declarations in source files. */
-    // "jsxFactory": "",                                 /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */
-    // "jsxFragmentFactory": "",                         /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
-    // "jsxImportSource": "",                            /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */
-    // "reactNamespace": "",                             /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */
-    // "noLib": true,                                    /* Disable including any library files, including the default lib.d.ts. */
-    "useDefineForClassFields": true,                  /* Emit ECMAScript-standard-compliant class fields. */
-    // "moduleDetection": "auto",                        /* Control what method is used to detect module-format JS files. */
-
-    /* Modules */
-    "module": "commonjs",                                /* Specify what module code is generated. */
-    // "rootDir": "./",                                  /* Specify the root folder within your source files. */
-    // "moduleResolution": "node10",                     /* Specify how TypeScript looks up a file from a given module specifier. */
-    // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
-    // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
-    // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
-    // "typeRoots": [],                                  /* Specify multiple folders that act like './node_modules/@types'. */
-    // "types": [],                                      /* Specify type package names to be included without being referenced in a source file. */
-    // "allowUmdGlobalAccess": true,                     /* Allow accessing UMD globals from modules. */
-    // "moduleSuffixes": [],                             /* List of file name suffixes to search when resolving a module. */
-    // "allowImportingTsExtensions": true,               /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */
-    // "resolvePackageJsonExports": true,                /* Use the package.json 'exports' field when resolving package imports. */
-    // "resolvePackageJsonImports": true,                /* Use the package.json 'imports' field when resolving imports. */
-    // "customConditions": [],                           /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */
-    // "resolveJsonModule": true,                        /* Enable importing .json files. */
-    // "allowArbitraryExtensions": true,                 /* Enable importing files with any extension, provided a declaration file is present. */
-    // "noResolve": true,                                /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */
-
-    /* JavaScript Support */
-    // "allowJs": true,                                  /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */
-    // "checkJs": true,                                  /* Enable error reporting in type-checked JavaScript files. */
-    // "maxNodeModuleJsDepth": 1,                        /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */
-
-    /* Emit */
-    "declaration": true,                              /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
-    // "declarationMap": true,                           /* Create sourcemaps for d.ts files. */
-    // "emitDeclarationOnly": true,                      /* Only output d.ts files and not JavaScript files. */
-    // "sourceMap": true,                                /* Create source map files for emitted JavaScript files. */
-    // "inlineSourceMap": true,                          /* Include sourcemap files inside the emitted JavaScript. */
-    // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
-    "outDir": "./lib/",                                   /* Specify an output folder for all emitted files. */
-    // "removeComments": true,                           /* Disable emitting comments. */
-    // "noEmit": true,                                   /* Disable emitting files from a compilation. */
-    // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
-    // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types. */
-    // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
-    // "sourceRoot": "",                                 /* Specify the root path for debuggers to find the reference source code. */
-    // "mapRoot": "",                                    /* Specify the location where debugger should locate map files instead of generated locations. */
-    // "inlineSources": true,                            /* Include source code in the sourcemaps inside the emitted JavaScript. */
-    // "emitBOM": true,                                  /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
-    // "newLine": "crlf",                                /* Set the newline character for emitting files. */
-    // "stripInternal": true,                            /* Disable emitting declarations that have '@internal' in their JSDoc comments. */
-    // "noEmitHelpers": true,                            /* Disable generating custom helper functions like '__extends' in compiled output. */
-    // "noEmitOnError": true,                            /* Disable emitting files if any type checking errors are reported. */
-    // "preserveConstEnums": true,                       /* Disable erasing 'const enum' declarations in generated code. */
-    // "declarationDir": "./",                           /* Specify the output directory for generated declaration files. */
-    // "preserveValueImports": true,                     /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
-
-    /* Interop Constraints */
-    // "isolatedModules": true,                          /* Ensure that each file can be safely transpiled without relying on other imports. */
-    // "verbatimModuleSyntax": true,                     /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */
-    // "allowSyntheticDefaultImports": true,             /* Allow 'import x from y' when a module doesn't have a default export. */
-    "esModuleInterop": true,                             /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
-    // "preserveSymlinks": true,                         /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
-    "forceConsistentCasingInFileNames": true,            /* Ensure that casing is correct in imports. */
-
-    /* Type Checking */
-    "strict": true,                                      /* Enable all strict type-checking options. */
-    // "noImplicitAny": true,                            /* Enable error reporting for expressions and declarations with an implied 'any' type. */
-    // "strictNullChecks": true,                         /* When type checking, take into account 'null' and 'undefined'. */
-    // "strictFunctionTypes": true,                      /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
-    // "strictBindCallApply": true,                      /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */
-    // "strictPropertyInitialization": true,             /* Check for class properties that are declared but not set in the constructor. */
-    // "noImplicitThis": true,                           /* Enable error reporting when 'this' is given the type 'any'. */
-    // "useUnknownInCatchVariables": true,               /* Default catch clause variables as 'unknown' instead of 'any'. */
-    // "alwaysStrict": true,                             /* Ensure 'use strict' is always emitted. */
-    // "noUnusedLocals": true,                           /* Enable error reporting when local variables aren't read. */
-    // "noUnusedParameters": true,                       /* Raise an error when a function parameter isn't read. */
-    // "exactOptionalPropertyTypes": true,               /* Interpret optional property types as written, rather than adding 'undefined'. */
-    // "noImplicitReturns": true,                        /* Enable error reporting for codepaths that do not explicitly return in a function. */
-    // "noFallthroughCasesInSwitch": true,               /* Enable error reporting for fallthrough cases in switch statements. */
-    // "noUncheckedIndexedAccess": true,                 /* Add 'undefined' to a type when accessed using an index. */
-    // "noImplicitOverride": true,                       /* Ensure overriding members in derived classes are marked with an override modifier. */
-    // "noPropertyAccessFromIndexSignature": true,       /* Enforces using indexed accessors for keys declared using an indexed type. */
-    // "allowUnusedLabels": true,                        /* Disable error reporting for unused labels. */
-    // "allowUnreachableCode": true,                     /* Disable error reporting for unreachable code. */
-
-    /* Completeness */
-    // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
-    "skipLibCheck": true                                 /* Skip type checking all .d.ts files. */
-  }
-}