Merge branch 'main' into transport-headers

Author: avistramer

.github/workflows/stale.yml

@@ -17,4 +17,4 @@ jobs:
         days-before-close: 5
         stale-issue-message: 'This issue has been inactive for 30 days. It will be in closed in 5 days without any new activity.'
         stale-issue-label: 'no-issue-activity'
-        exempt-issue-labels: 'discussion,work-in-progress'
+        any-of-labels: 'inactive'

Changelog.md

@@ -1,3 +1,7 @@
+1.6.2
+==
+ * Added ECMAScript build with TypeScript types.
+
 1.6.1
 ==
 Fixes

dist/sockjs-esm.js

@@ -0,0 +1,48 @@
+// index.d.ts
+declare module "sockjs-client" {
+  const SockJS: {
+      new(url: string, _reserved?: any, options?: SockJS.Options): WebSocket;
+      (url: string, _reserved?: any, options?: SockJS.Options): WebSocket;
+      prototype: WebSocket;
+      CONNECTING: SockJS.CONNECTING;
+      OPEN: SockJS.OPEN;
+      CLOSING: SockJS.CLOSING;
+      CLOSED: SockJS.CLOSED;
+  };
+
+  namespace SockJS {
+      type CONNECTING = 0;
+      type OPEN = 1;
+      type CLOSING = 2;
+      type CLOSED = 3;
+
+      type State = CONNECTING | OPEN | CLOSING | CLOSED;
+
+      interface BaseEvent extends Event {
+          type: string;
+      }
+
+      type OpenEvent = BaseEvent;
+
+      interface CloseEvent extends BaseEvent {
+          code: number;
+          reason: string;
+          wasClean: boolean;
+      }
+
+      interface MessageEvent extends BaseEvent {
+          data: string;
+      }
+
+      type SessionGenerator = () => string;
+
+      interface Options {
+          server?: string | undefined;
+          sessionId?: number | SessionGenerator | undefined;
+          transports?: string | string[] | undefined;
+          timeout?: number | undefined;
+      }
+  }
+
+  export = SockJS;
+}

dist/sockjs.d.ts

@@ -33,7 +33,7 @@ function InfoAjax(url, AjaxObject, opts) {
         info = {};
       }
     }
-    self.emit('finish', info, rtt, headers);
+    self.emit('finish', info, rtt, status, headers);
     self.removeAllListeners();
   });
 }

lib/info-ajax.js

@@ -61,10 +61,10 @@ InfoReceiver.prototype.doXhr = function(baseUrl, urlInfo, transportOptions) {
     self.emit('finish');
   }, InfoReceiver.timeout);
 
-  this.xo.once('finish', function(info, rtt, headers) {
-    debug('finish', info, rtt, headers);
+  this.xo.once('finish', function(info, rtt, status, headers) {
+    debug('finish', info, rtt, status, headers);
     self._cleanup(true);
-    self.emit('finish', info, rtt, headers || {});
+    self.emit('finish', info, rtt, status, headers || {});
   });
 };
 

lib/info-receiver.js

@@ -174,12 +174,12 @@ SockJS.OPEN = 1;
 SockJS.CLOSING = 2;
 SockJS.CLOSED = 3;
 
-SockJS.prototype._receiveInfo = function(info, rtt, headers) {
+SockJS.prototype._receiveInfo = function(info, rtt, status, headers) {
   debug('_receiveInfo', rtt);
   this.dispatchEvent(new InfoEvent(info, rtt, headers));
   this._ir = null;
   if (!info) {
-    this._close(1002, 'Cannot connect to server');
+    this._close(status || 1002, 'Cannot connect to server');
     return;
   }
 
@@ -299,9 +299,11 @@ SockJS.prototype._transportMessage = function(msg) {
 SockJS.prototype._transportClose = function(code, reason) {
   debug('_transportClose', this.transport, code, reason);
   if (this._transport) {
+    clearTimeout(this._transportTimeoutId);
     this._transport.removeAllListeners();
     this._transport = null;
     this.transport = null;
+    this._transportTimeoutId = null;
   }
 
   if (!userSetCode(code) && code !== 2000 && this.readyState === SockJS.CONNECTING) {

lib/main.js

@@ -10,6 +10,10 @@ if (process.env.NODE_ENV !== 'production') {
   debug = require('debug')('sockjs-client:receiver:eventsource');
 }
 
+function decodeURISafe(s) {
+    return decodeURI(s.replace(/%(?![0-9][0-9a-fA-F]+)/g, '%25'));
+}
+
 function EventSourceReceiver(url) {
   debug(url);
   EventEmitter.call(this);
@@ -18,7 +22,7 @@ function EventSourceReceiver(url) {
   var es = this.es = new EventSourceDriver(url);
   es.onmessage = function(e) {
     debug('message', e.data);
-    self.emit('message', decodeURI(e.data));
+    self.emit('message', decodeURISafe(e.data));
   };
   es.onerror = function(e) {
     debug('error', es.readyState, e);

lib/transport/receiver/eventsource.js

@@ -1 +1 @@
-module.exports = '1.6.1';
+module.exports = '1.6.2';