phirepass-widgets 0.0.13 → 0.0.15

package/dist/esm/loader.js

@@ -5,7 +5,7 @@ import { g as globalScripts } from './app-globals-DQuL1Twl.js';
 const defineCustomElements = async (win, options) => {
   if (typeof window === 'undefined') return undefined;
   await globalScripts();
-  return bootstrapLazy([["phirepass-sftp-client",[[257,"phirepass-sftp-client"]]],["phirepass-terminal",[[513,"phirepass-terminal",{"terminalOptions":[16],"serverHost":[1,"server-host"],"serverPort":[2,"server-port"],"allowInsecure":[4,"allow-insecure"],"heartbeatInterval":[2,"heartbeat-interval"],"nodeId":[1,"node-id"],"serverId":[1,"server-id"]},null,{"nodeId":[{"onNodeIdChange":0}],"serverId":[{"onServerIdChange":0}]}]]]], options);
+  return bootstrapLazy([["phirepass-sftp-client",[[257,"phirepass-sftp-client"]]],["phirepass-terminal",[[513,"phirepass-terminal",{"terminalOptions":[16],"serverHost":[1,"server-host"],"serverPort":[2,"server-port"],"allowInsecure":[4,"allow-insecure"],"heartbeatInterval":[2,"heartbeat-interval"],"nodeId":[1,"node-id"],"token":[1],"serverId":[1,"server-id"]},null,{"nodeId":[{"onNodeIdChange":0}],"serverId":[{"onServerIdChange":0}]}]]]], options);
 };
 
 export { defineCustomElements };

package/dist/esm/phirepass-terminal.entry.js

@@ -224,6 +224,18 @@ class Channel {
         const ptr = this.__destroy_into_raw();
         wasm.__wbg_channel_free(ptr, 0);
     }
+    /**
+     * @param {string} token
+     * @param {string} node_id
+     * @param {number | null} [msg_id]
+     */
+    authenticate(token, node_id, msg_id) {
+        const ptr0 = passStringToWasm0(token, wasm.__wbindgen_export, wasm.__wbindgen_export2);
+        const len0 = WASM_VECTOR_LEN;
+        const ptr1 = passStringToWasm0(node_id, wasm.__wbindgen_export, wasm.__wbindgen_export2);
+        const len1 = WASM_VECTOR_LEN;
+        wasm.channel_authenticate(this.__wbg_ptr, ptr0, len0, ptr1, len1, isLikeNone(msg_id) ? 0x100000001 : (msg_id) >>> 0);
+    }
     connect() {
         wasm.channel_connect(this.__wbg_ptr);
     }
@@ -579,7 +591,7 @@ function __wbg_get_imports() {
         __wbg_set_onopen_34e3e24cf9337ddd: function(arg0, arg1) {
             getObject(arg0).onopen = getObject(arg1);
         },
-        __wbg_warn_5bd788cc2f780742: function(arg0, arg1) {
+        __wbg_warn_3ba994e68c965ce3: function(arg0, arg1) {
             console.warn(getStringFromWasm0(arg0, arg1));
         },
         __wbindgen_cast_0000000000000001: function(arg0, arg1) {
@@ -963,7 +975,7 @@ async function __wbg_init(module_or_path) {
     return __wbg_finalize_init(instance);
 }
 
-const phirepassTerminalCss = () => `.xterm{cursor:text;position:relative;user-select:none;-ms-user-select:none;-webkit-user-select:none}.xterm.focus,.xterm:focus{outline:none}.xterm .xterm-helpers{position:absolute;top:0;z-index:5}.xterm .xterm-helper-textarea{padding:0;border:0;margin:0;position:absolute;opacity:0;left:-9999em;top:0;width:0;height:0;z-index:-5;white-space:nowrap;overflow:hidden;resize:none}.xterm .composition-view{background:#000;color:#FFF;display:none;position:absolute;white-space:nowrap;z-index:1}.xterm .composition-view.active{display:block}.xterm .xterm-viewport{background-color:#000;overflow-y:scroll;cursor:default;position:absolute;right:0;left:0;top:0;bottom:0}.xterm .xterm-screen{position:relative}.xterm .xterm-screen canvas{position:absolute;left:0;top:0}.xterm-char-measure-element{display:inline-block;visibility:hidden;position:absolute;top:0;left:-9999em;line-height:normal}.xterm.enable-mouse-events{cursor:default}.xterm.xterm-cursor-pointer,.xterm .xterm-cursor-pointer{cursor:pointer}.xterm.column-select.focus{cursor:crosshair}.xterm .xterm-accessibility:not(.debug),.xterm .xterm-message{position:absolute;left:0;top:0;bottom:0;right:0;z-index:10;color:transparent;pointer-events:none}.xterm .xterm-accessibility-tree:not(.debug) *::selection{color:transparent}.xterm .xterm-accessibility-tree{font-family:monospace;user-select:text;white-space:pre}.xterm .xterm-accessibility-tree>div{transform-origin:left;width:fit-content}.xterm .live-region{position:absolute;left:-9999px;width:1px;height:1px;overflow:hidden}.xterm-dim{opacity:1 !important}.xterm-underline-1{text-decoration:underline}.xterm-underline-2{text-decoration:double underline}.xterm-underline-3{text-decoration:wavy underline}.xterm-underline-4{text-decoration:dotted underline}.xterm-underline-5{text-decoration:dashed underline}.xterm-overline{text-decoration:overline}.xterm-overline.xterm-underline-1{text-decoration:overline underline}.xterm-overline.xterm-underline-2{text-decoration:overline double underline}.xterm-overline.xterm-underline-3{text-decoration:overline wavy underline}.xterm-overline.xterm-underline-4{text-decoration:overline dotted underline}.xterm-overline.xterm-underline-5{text-decoration:overline dashed underline}.xterm-strikethrough{text-decoration:line-through}.xterm-screen .xterm-decoration-container .xterm-decoration{z-index:6;position:absolute}.xterm-screen .xterm-decoration-container .xterm-decoration.xterm-decoration-top-layer{z-index:7}.xterm-decoration-overview-ruler{z-index:8;position:absolute;top:0;right:0;pointer-events:none}.xterm-decoration-top{z-index:2;position:relative}.xterm .xterm-scrollable-element>.scrollbar{cursor:default}.xterm .xterm-scrollable-element>.scrollbar>.scra{cursor:pointer;font-size:11px !important}.xterm .xterm-scrollable-element>.visible{opacity:1;background:rgba(0,0,0,0);transition:opacity 100ms linear;z-index:11}.xterm .xterm-scrollable-element>.invisible{opacity:0;pointer-events:none}.xterm .xterm-scrollable-element>.invisible.fade{transition:opacity 800ms linear}.xterm .xterm-scrollable-element>.shadow{position:absolute;display:none}.xterm .xterm-scrollable-element>.shadow.top{display:block;top:0;left:3px;height:3px;width:100%;box-shadow:var(--vscode-scrollbar-shadow, #000) 0 6px 6px -6px inset}.xterm .xterm-scrollable-element>.shadow.left{display:block;top:3px;left:0;height:100%;width:3px;box-shadow:var(--vscode-scrollbar-shadow, #000) 6px 0 6px -6px inset}.xterm .xterm-scrollable-element>.shadow.top-left-corner{display:block;top:0;left:0;height:3px;width:3px}.xterm .xterm-scrollable-element>.shadow.top.left{box-shadow:var(--vscode-scrollbar-shadow, #000) 6px 0 6px -6px inset}:host{display:block;width:100%;height:100%}:host #ccc{width:inherit;height:inherit}`;
+const phirepassTerminalCss = () => `.xterm{cursor:text;position:relative;user-select:none;-ms-user-select:none;-webkit-user-select:none}.xterm.focus,.xterm:focus{outline:none}.xterm .xterm-helpers{position:absolute;top:0;z-index:5}.xterm .xterm-helper-textarea{padding:0;border:0;margin:0;position:absolute;opacity:0;left:-9999em;top:0;width:0;height:0;z-index:-5;white-space:nowrap;overflow:hidden;resize:none}.xterm .composition-view{background:#000;color:#FFF;display:none;position:absolute;white-space:nowrap;z-index:1}.xterm .composition-view.active{display:block}.xterm .xterm-viewport{background-color:#000;overflow-y:scroll;cursor:default;position:absolute;right:0;left:0;top:0;bottom:0}.xterm .xterm-screen{position:relative}.xterm .xterm-screen canvas{position:absolute;left:0;top:0}.xterm-char-measure-element{display:inline-block;visibility:hidden;position:absolute;top:0;left:-9999em;line-height:normal}.xterm.enable-mouse-events{cursor:default}.xterm.xterm-cursor-pointer,.xterm .xterm-cursor-pointer{cursor:pointer}.xterm.column-select.focus{cursor:crosshair}.xterm .xterm-accessibility:not(.debug),.xterm .xterm-message{position:absolute;left:0;top:0;bottom:0;right:0;z-index:10;color:transparent;pointer-events:none}.xterm .xterm-accessibility-tree:not(.debug) *::selection{color:transparent}.xterm .xterm-accessibility-tree{font-family:monospace;user-select:text;white-space:pre}.xterm .xterm-accessibility-tree>div{transform-origin:left;width:fit-content}.xterm .live-region{position:absolute;left:-9999px;width:1px;height:1px;overflow:hidden}.xterm-dim{opacity:1 !important}.xterm-underline-1{text-decoration:underline}.xterm-underline-2{text-decoration:double underline}.xterm-underline-3{text-decoration:wavy underline}.xterm-underline-4{text-decoration:dotted underline}.xterm-underline-5{text-decoration:dashed underline}.xterm-overline{text-decoration:overline}.xterm-overline.xterm-underline-1{text-decoration:overline underline}.xterm-overline.xterm-underline-2{text-decoration:overline double underline}.xterm-overline.xterm-underline-3{text-decoration:overline wavy underline}.xterm-overline.xterm-underline-4{text-decoration:overline dotted underline}.xterm-overline.xterm-underline-5{text-decoration:overline dashed underline}.xterm-strikethrough{text-decoration:line-through}.xterm-screen .xterm-decoration-container .xterm-decoration{z-index:6;position:absolute}.xterm-screen .xterm-decoration-container .xterm-decoration.xterm-decoration-top-layer{z-index:7}.xterm-decoration-overview-ruler{z-index:8;position:absolute;top:0;right:0;pointer-events:none}.xterm-decoration-top{z-index:2;position:relative}.xterm .xterm-scrollable-element>.scrollbar{cursor:default}.xterm .xterm-scrollable-element>.scrollbar>.scra{cursor:pointer;font-size:11px !important}.xterm .xterm-scrollable-element>.visible{opacity:1;background:rgba(0,0,0,0);transition:opacity 100ms linear;z-index:11}.xterm .xterm-scrollable-element>.invisible{opacity:0;pointer-events:none}.xterm .xterm-scrollable-element>.invisible.fade{transition:opacity 800ms linear}.xterm .xterm-scrollable-element>.shadow{position:absolute;display:none}.xterm .xterm-scrollable-element>.shadow.top{display:block;top:0;left:3px;height:3px;width:100%;box-shadow:var(--vscode-scrollbar-shadow, #000) 0 6px 6px -6px inset}.xterm .xterm-scrollable-element>.shadow.left{display:block;top:3px;left:0;height:100%;width:3px;box-shadow:var(--vscode-scrollbar-shadow, #000) 6px 0 6px -6px inset}.xterm .xterm-scrollable-element>.shadow.top-left-corner{display:block;top:0;left:0;height:3px;width:3px}.xterm .xterm-scrollable-element>.shadow.top.left{box-shadow:var(--vscode-scrollbar-shadow, #000) 6px 0 6px -6px inset}:host{display:block;width:100%;height:100%}:host #ccc{width:inherit;height:inherit}:host #ccc .terminal{height:inherit}:host #ccc .terminal .xterm-scrollable-element{height:inherit}`;
 
 var InputMode;
 (function (InputMode) {
@@ -1048,11 +1060,12 @@ const PhirepassTerminal = class {
     allowInsecure = false;
     heartbeatInterval = 30_000;
     nodeId;
+    token;
     onNodeIdChange(newValue, _oldValue) {
         // Handle the change in node_id here
         // console.log(`node_id changed from ${oldValue} to ${newValue}`);
         // Always clear local session state and reset terminal view
-        this.resetSessionState();
+        this.reset_session_state();
         this.terminal.reset();
         // Close existing comms if connected
         if (this.channel && this.channel.is_connected()) {
@@ -1079,9 +1092,13 @@ const PhirepassTerminal = class {
         return `${protocol}://${this.serverHost}:${this.serverPort}`;
     }
     async connectedCallback() {
+        console.log('PhirepassTerminal connected to DOM');
         await __wbg_init();
+        console.log('PhirepassChannel module initialized');
         this.setup_terminal();
+        console.log('Terminal setup complete');
         this.open_comms();
+        console.log('Comms opened');
         if (!this.nodeId) {
             console.warn('Prop node_id is not set. Cannot connect to terminal.');
             return;
@@ -1132,8 +1149,7 @@ const PhirepassTerminal = class {
             this.channel = new Channel(`${this.createWebSocketEndpoint()}/api/web/ws`, this.nodeId);
         }
         this.channel.on_connection_open(() => {
-            this.channel.start_heartbeat(this.heartbeatInterval <= 15_000 ? 30_000 : this.heartbeatInterval);
-            this.channel.open_ssh_tunnel(this.nodeId);
+            this.channel.authenticate(this.token, this.nodeId);
         });
         this.channel.on_connection_close(() => {
             this.terminal.reset();
@@ -1150,6 +1166,9 @@ const PhirepassTerminal = class {
                 case "Error":
                     this.handle_error(web);
                     break;
+                case "AuthSuccess":
+                    this.handleAuthSuccess(web);
+                    break;
                 case "TunnelOpened":
                     this.session_id = web.sid;
                     this.terminal.reset();
@@ -1216,27 +1235,30 @@ const PhirepassTerminal = class {
         this.channel.stop_heartbeat();
         this.channel.disconnect();
     }
-    cancelCredentialEntry() {
+    cancel_credential_entry() {
         this.inputMode = InputMode.Default;
-        this.usernameBuffer = "";
-        this.passwordBuffer = "";
+        this.clear_creds_buffer();
         this.terminal.writeln("Authentication cancelled.");
         this.terminal.reset();
     }
-    resetSessionState() {
-        this.session_id = undefined;
-        this.inputMode = InputMode.Default;
+    clear_creds_buffer() {
         this.usernameBuffer = "";
         this.passwordBuffer = "";
     }
+    reset_session_state() {
+        this.session_id = undefined;
+        this.inputMode = InputMode.Default;
+        this.clear_creds_buffer();
+    }
+    handleAuthSuccess(_auth_) {
+        this.clear_creds_buffer();
+        this.channel.start_heartbeat(this.heartbeatInterval <= 15_000 ? 30_000 : this.heartbeatInterval);
+        this.channel.open_ssh_tunnel(this.nodeId);
+    }
     handleTunnelClosed() {
-        // Clear session state
         this.session_id = undefined;
         this.inputMode = InputMode.Default;
-        // Clear credential buffers for security
-        this.usernameBuffer = "";
-        this.passwordBuffer = "";
-        // Reset terminal display
+        this.clear_creds_buffer();
         this.terminal.reset();
         this.terminal.writeln("Connection closed.");
     }
@@ -1249,6 +1271,7 @@ const PhirepassTerminal = class {
             this.terminal.onData(this.handleTerminalData.bind(this));
             this.channel.connect();
             this.setupResizeObserver();
+            console.log('Terminal connected and ready');
         }
     }
     setupResizeObserver() {
@@ -1284,7 +1307,7 @@ const PhirepassTerminal = class {
         }
         if (data === "\u0003") {
             this.terminal.write("^C\r\n");
-            this.cancelCredentialEntry();
+            this.cancel_credential_entry();
             return;
         }
         if (data === "\u007f") {
@@ -1321,7 +1344,7 @@ const PhirepassTerminal = class {
         }
         if (data === "\u0003") {
             this.terminal.write("^C\r\n");
-            this.cancelCredentialEntry();
+            this.cancel_credential_entry();
             return;
         }
         if (data === "\u007f") {
@@ -1356,7 +1379,7 @@ const PhirepassTerminal = class {
         this.usernameBuffer = "";
     }
     render() {
-        return (h$1(Host, { key: '885e11a9806ba614dda57e491f9d67fddd9aca9e' }, h$1("div", { key: 'ea169bd62479b9f831989f244f640777d48d65c4', id: "ccc" })));
+        return (h$1(Host, { key: '3f923e0cc42c6a8eca61424a7e75960317a5d99c' }, h$1("div", { key: '4a3e2f6d4652b7049c9ec9f535ad32fd6401cc09', id: "ccc" })));
     }
     static get watchers() { return {
         "nodeId": [{

package/dist/esm/phirepass-widgets.js

@@ -17,5 +17,5 @@ var patchBrowser = () => {
 
 patchBrowser().then(async (options) => {
   await globalScripts();
-  return bootstrapLazy([["phirepass-sftp-client",[[257,"phirepass-sftp-client"]]],["phirepass-terminal",[[513,"phirepass-terminal",{"terminalOptions":[16],"serverHost":[1,"server-host"],"serverPort":[2,"server-port"],"allowInsecure":[4,"allow-insecure"],"heartbeatInterval":[2,"heartbeat-interval"],"nodeId":[1,"node-id"],"serverId":[1,"server-id"]},null,{"nodeId":[{"onNodeIdChange":0}],"serverId":[{"onServerIdChange":0}]}]]]], options);
+  return bootstrapLazy([["phirepass-sftp-client",[[257,"phirepass-sftp-client"]]],["phirepass-terminal",[[513,"phirepass-terminal",{"terminalOptions":[16],"serverHost":[1,"server-host"],"serverPort":[2,"server-port"],"allowInsecure":[4,"allow-insecure"],"heartbeatInterval":[2,"heartbeat-interval"],"nodeId":[1,"node-id"],"token":[1],"serverId":[1,"server-id"]},null,{"nodeId":[{"onNodeIdChange":0}],"serverId":[{"onServerIdChange":0}]}]]]], options);
 });