@phreshos/node 0.1.5 → 0.1.6

package/dist/system.js

@@ -153,7 +153,7 @@ class ProgramRegistry extends Events {
         const waited = value;
         if (waited.event === "uninstall") {
             const payload = waited.payload;
-            return { program: programHandle(this.system, required(payload.program)), everythingRemoved: payload.everythingRemoved === true };
+            return { program: programHandle(this.system, required(payload.program)), everything: payload.everything === true };
         }
         return programHandle(this.system, required(waited.payload));
     }
@@ -171,7 +171,7 @@ class ProgramHandle extends ProgramBase {
         this.snapshot = snapshot;
         bindEvents(this, new Events(["forget", "uninstall"], (event, signal, timeout) => transport(system).control({
             capability: "program", operation: "wait", input: { program: snapshot.identity, event, timeout }
-        }, signal).then(value => value.payload)));
+        }, signal).then(value => programEntityEvent(event, value))));
         this.reference = snapshot.reference;
         this.identity = snapshot.identity;
         this.process = new ProgramProcesses(system, this);
@@ -255,7 +255,7 @@ class ProgramProcesses extends Events {
     system;
     program;
     constructor(system, program) {
-        super(["endpointStart", "endpointStop", "create", "exit"], (event, signal, timeout) => transport(system).control({
+        super(["create", "exit"], (event, signal, timeout) => transport(system).control({
             capability: "process", operation: "wait", input: { program: program.identity, event, timeout }
         }, signal).then(value => processEvent(system, value)));
         this.system = system;
@@ -328,7 +328,7 @@ class ProgramProcesses extends Events {
 class ProcessRegistry extends Events {
     system;
     constructor(system) {
-        super(["endpointStart", "endpointStop", "create", "exit"], (event, signal, timeout) => transport(system).control({
+        super(["create", "exit"], (event, signal, timeout) => transport(system).control({
             capability: "process", operation: "wait", input: { event, timeout }
         }, signal).then(value => processEvent(system, value)));
         this.system = system;
@@ -358,9 +358,9 @@ class ProcessHandle extends ProcessBase {
         super();
         this.system = system;
         this.snapshot = snapshot;
-        bindEvents(this, new Events(["endpointStart", "endpointStop", "exit"], (event, signal, timeout) => transport(system).control({
+        bindEvents(this, new Events(["exit"], (event, signal, timeout) => transport(system).control({
             capability: "process", operation: "wait", input: { process: snapshot.identity, event, timeout }
-        }, signal).then(value => processEvent(system, value))));
+        }, signal).then(exactProcessEvent)));
         this.identity = snapshot.identity;
         this.name = snapshot.name;
         this.startedAt = new Date(snapshot.startedAt);
@@ -599,18 +599,15 @@ async function* command(system, request) {
 async function waitEndpointLifecycle(system, owner, endpoint, event, signal, timeout = 10_000) {
     if (event !== "start" && event !== "stop")
         throw new Error(`An Endpoint lifecycle has no "${event}" event`);
-    const processEventName = event === "start" ? "endpointStart" : "endpointStop";
-    const deadline = Date.now() + timeout;
-    while (true) {
-        const value = await transport(system).control({
-            capability: "process",
-            operation: "wait",
-            input: { process: owner.identity, event: processEventName, timeout: Math.max(0, deadline - Date.now()) }
-        }, signal);
-        const changed = processEvent(system, value);
-        if (changed === owner[endpoint])
-            return undefined;
-    }
+    await transport(system).control({
+        capability: "endpoint",
+        operation: "waitLifecycle",
+        input: { process: owner.identity, endpoint, event, timeout }
+    }, signal);
+}
+function programEntityEvent(event, value) {
+    const payload = value.payload;
+    return event === "uninstall" ? payload?.everything === true : undefined;
 }
 function processEvent(system, value) {
     const waited = value;
@@ -622,14 +619,20 @@ function processEvent(system, value) {
             code: payload.code,
             signal: payload.signal
         };
-    if ((waited.event === "endpointStart" || waited.event === "endpointStop") && payload?.processSnapshot) {
-        const process = processHandle(system, payload.processSnapshot);
-        return payload.endpoint === "client" ? process.client : process.server;
-    }
     if (payload && typeof payload.identity === "string")
         return processHandle(system, payload);
     return payload;
 }
+function exactProcessEvent(value) {
+    const payload = value.payload;
+    if (!payload)
+        return payload;
+    return {
+        status: payload.status,
+        code: payload.code,
+        signal: payload.signal
+    };
+}
 function bindEvents(target, events) {
     Object.assign(target, eventsOf(events));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phreshos/node",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "Node.js access to PhreshOS and Program projects.",
   "type": "module",
   "main": "dist/main.js",
@@ -11,7 +11,11 @@
       "default": "./dist/main.js"
     }
   },
-  "files": ["dist", "LICENSE", "README.md"],
+  "files": [
+    "dist",
+    "LICENSE",
+    "README.md"
+  ],
   "author": "Zohayr SLILEH",
   "license": "MIT",
   "repository": {
@@ -32,7 +36,7 @@
     "prepack": "node --run build"
   },
   "dependencies": {
-    "@phreshos/core": "^0.1.26",
+    "@phreshos/core": "^0.1.27",
     "adm-zip": "^0.6.0",
     "jiti": "^2.7.0"
   },