@whyvix/remote 0.1.0 → 0.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whyvix/remote",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "private": false,
   "type": "module",
   "files": [

package/packages/agent/src/agent.js

@@ -6,14 +6,14 @@ import { createSecurity } from "./security.js";
 import { ProcessManager } from "./process-manager.js";
 import { createToolExecutor } from "./tools.js";
 
-export function createAgent({gatewayUrl="ws://127.0.0.1:8787",deviceId=randomUUID(),deviceName=os.hostname(),token="",workspaces=[process.cwd()],reconnectMs=1000,reconnect=true,audit=()=>{}}={}) {
+export function createAgent({gatewayUrl="ws://127.0.0.1:8787",deviceId=randomUUID(),deviceName=os.hostname(),token="",workspaces=[process.cwd()],reconnectMs=1000,reconnect=true,audit=()=>{},log=console.log,errorLog=console.error,onRegistered=()=>{}}={}) {
   let ws=null,reconnectTimer=null,stopped=false,generation=0;
   const security=createSecurity({token,workspaces,audit});
   const processManager=new ProcessManager({audit});
   const executeTool=createToolExecutor({security,processManager});
   function scheduleReconnect(reason){
     if(stopped||!reconnect||reconnectTimer)return;
-    console.log("[agent:reconnect-scheduled]",reason,reconnectMs);
+    log("[agent:reconnect-scheduled]",reason,reconnectMs);
     reconnectTimer=setTimeout(()=>{reconnectTimer=null;connect();},reconnectMs);
   }
   function connect(){
@@ -21,11 +21,11 @@ export function createAgent({gatewayUrl="ws://127.0.0.1:8787",deviceId=randomUUI
     clearTimeout(reconnectTimer); reconnectTimer=null;
     const current=++generation;
     const socket=new WebSocket(gatewayUrl); ws=socket;
-    console.log("[agent:connecting]",gatewayUrl,"generation="+current);
-    socket.on("open",()=>{if(ws!==socket)return;console.log("[agent:connected]",gatewayUrl);socket.send(JSON.stringify(envelope(TYPES.REGISTER,{auth:{token},device:{id:deviceId,name:deviceName,platform:process.platform,agentVersion:"0.3.0"}})));});
-    socket.on("message",async(raw)=>{if(ws!==socket)return;try{const m=parseMessage(raw);if(m.type===TYPES.REGISTERED){console.log("[agent:registered]",m.deviceId);if(m.authorizedAccount)console.log("Authorized:",m.authorizedAccount);return;}if(m.type!==TYPES.REQUEST)return;try{const result=await executeTool(m.tool,m.arguments);if(m.tool==="device.ping")Object.assign(result,{deviceId,deviceName});if(socket.readyState===WebSocket.OPEN)socket.send(JSON.stringify(envelope(TYPES.RESPONSE,{requestId:m.requestId,result})));}catch(error){if(socket.readyState===WebSocket.OPEN)socket.send(JSON.stringify(envelope(TYPES.ERROR,{requestId:m.requestId,error:{code:error.code||"TOOL_ERROR",message:error.message}})));}}catch(error){console.error("[agent:protocol-error]",error.message);}});
-    socket.on("close",(code)=>{console.log("[agent:disconnected]","generation="+current,"code="+code);if(ws===socket)ws=null;if(code===1008){console.error("[agent:authorization-required] device credential rejected");return;}if(code===4001){console.error("[agent:replaced] newer WHYVIX Remote connection is active");return;}scheduleReconnect("close");});
-    socket.on("error",(e)=>{console.error("[agent:socket-error]",e.message);scheduleReconnect("error");});
+    log("[agent:connecting]",gatewayUrl,"generation="+current);
+    socket.on("open",()=>{if(ws!==socket)return;log("[agent:connected]",gatewayUrl);socket.send(JSON.stringify(envelope(TYPES.REGISTER,{auth:{token},device:{id:deviceId,name:deviceName,platform:process.platform,agentVersion:"0.3.0"}})));});
+    socket.on("message",async(raw)=>{if(ws!==socket)return;try{const m=parseMessage(raw);if(m.type===TYPES.REGISTERED){log("[agent:registered]",m.deviceId);onRegistered({deviceId:m.deviceId,authorizedAccount:m.authorizedAccount||""});return;}if(m.type!==TYPES.REQUEST)return;try{const result=await executeTool(m.tool,m.arguments);if(m.tool==="device.ping")Object.assign(result,{deviceId,deviceName});if(socket.readyState===WebSocket.OPEN)socket.send(JSON.stringify(envelope(TYPES.RESPONSE,{requestId:m.requestId,result})));}catch(error){if(socket.readyState===WebSocket.OPEN)socket.send(JSON.stringify(envelope(TYPES.ERROR,{requestId:m.requestId,error:{code:error.code||"TOOL_ERROR",message:error.message}})));}}catch(error){errorLog("[agent:protocol-error]",error.message);}});
+    socket.on("close",(code)=>{log("[agent:disconnected]","generation="+current,"code="+code);if(ws===socket)ws=null;if(code===1008){errorLog("[agent:authorization-required] device credential rejected");return;}if(code===4001){errorLog("[agent:replaced] newer WHYVIX Remote connection is active");return;}scheduleReconnect("close");});
+    socket.on("error",(e)=>{errorLog("[agent:socket-error]",e.message);scheduleReconnect("error");});
   }
   async function stop(){stopped=true;clearTimeout(reconnectTimer);reconnectTimer=null;const socket=ws;ws=null;if(socket&&socket.readyState<WebSocket.CLOSING)await new Promise(r=>{socket.once("close",r);socket.close();});}
   connect(); return{deviceId,deviceName,stop};

package/packages/cli/index.js

@@ -45,10 +45,30 @@ if(!credential){
   console.log("Device authorized.");
 }
 console.log("WHYVIX Remote");
-console.log("Device :",os.hostname());
-console.log("Gateway:",gatewayUrl);
-console.log("Workspace:",workspaces.join(", "));
-const agent=createAgent({gatewayUrl,deviceId,deviceName:os.hostname(),token:credential,workspaces,audit:(e)=>console.log("[audit]",JSON.stringify(e))});
-async function shutdown(){await agent.stop();process.exit(0);}
-process.on("SIGINT",shutdown);
-process.on("SIGTERM",shutdown);
+console.log("");
+const agent=createAgent({
+  gatewayUrl,
+  deviceId,
+  deviceName:os.hostname(),
+  token:credential,
+  workspaces,
+  audit:()=>{},
+  log:()=>{},
+  onRegistered:({authorizedAccount})=>{
+    console.log("Device     :",os.hostname());
+    console.log("Status     : Connected");
+    console.log("Authorized :",authorizedAccount||"-");
+    console.log("");
+    console.log("Keep this terminal open while using WHYVIX Remote.");
+    console.log("Press Ctrl+C to disconnect.");
+  }
+});
+let shuttingDown=false;
+async function shutdown(){
+  if(shuttingDown)return;
+  shuttingDown=true;
+  await agent.stop();
+  process.exit(0);
+}
+process.once("SIGINT",shutdown);
+process.once("SIGTERM",shutdown);