pmcf 3.8.17 → 3.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "3.8.17",
+  "version": "3.9.0",
   "publishConfig": {
     "access": "public"
   },

package/src/network-interfaces/network-interface.mjs

@@ -101,9 +101,12 @@ export class NetworkInterface extends SkeletonNetworkInterface {
   }
 
   get gatewayAddress() {
-    for (const a of this.gateway.networkAddresses()) {
-      if (a.networkInterface.network === this.network) {
-        return a.address;
+    const gateway = this.gateway;
+    if (gateway) {
+      for (const a of gateway.networkAddresses()) {
+        if (a.networkInterface.network === this.network) {
+          return a.address;
+        }
       }
     }
   }
@@ -208,7 +211,7 @@ export class NetworkInterface extends SkeletonNetworkInterface {
 
     const routeSectionExtra = this.destination
       ? { Destination: this.destination }
-      : { Gateway: this.gatewayAddress };
+      : this.gateway ? { Gateway: this.gatewayAddress } : {};
 
     const networkSectionExtra = this.arpbridge
       ? {

package/src/network-interfaces/tun.mjs

@@ -23,4 +23,6 @@ export class TUNNetworkInterface extends NetworkInterface {
   get kind() {
     return TUNdNetworkInterfaceTypeDefinition.name;
   }
+
+  async systemdDefinitions(packageData) {}
 }

package/src/network-interfaces/wlan.mjs

@@ -1,5 +1,6 @@
 import { mkdir } from "node:fs/promises";
 import { join } from "node:path";
+import { string_attribute_writable, secret_attribute } from "pacc";
 import { addType } from "../types.mjs";
 import { writeLines, sectionLines } from "../utils.mjs";
 import { NetworkInterfaceTypeDefinition } from "./network-interface.mjs";
@@ -14,17 +15,26 @@ const WLANNetworkInterfaceTypeDefinition = {
   owners: EthernetNetworkInterfaceTypeDefinition.owners,
   extends: EthernetNetworkInterfaceTypeDefinition,
   priority: 0.1,
-  properties: {}
+  properties: {
+    ssid: string_attribute_writable,
+    psk: { ...secret_attribute, writable: true },
+    secretName: string_attribute_writable
+  }
 };
 
 export class WLANNetworkInterface extends EthernetNetworkInterface {
   _ssid;
   _psk;
+  _secretName;
 
   static {
     addType(this);
   }
 
+  static isCommonName(name) {
+    return name.match(/wlan\d+$/);
+  }
+
   static get typeDefinition() {
     return WLANNetworkInterfaceTypeDefinition;
   }
@@ -33,6 +43,18 @@ export class WLANNetworkInterface extends EthernetNetworkInterface {
     return WLANNetworkInterfaceTypeDefinition.name;
   }
 
+  set secretName(value) {
+    this._secretName = value;
+  }
+
+  get secretName() {
+    return (
+      this.extendedProperty("_secretName") ??
+      this.network?.secretName ??
+      `${this.network.name}.password`
+    );
+  }
+
   set ssid(value) {
     this._ssid = value;
   }
@@ -53,7 +75,7 @@ export class WLANNetworkInterface extends EthernetNetworkInterface {
     await super.systemdDefinitions(packageData);
     await mkdir(join(packageData.dir, "var/lib/iwd/"), { recursive: true });
 
-    const secretName = "iwd-secret";
+    const secretName = this.secretName;
 
     await writeLines(join(packageData.dir, "/etc/iwd"), "main.conf", [
       sectionLines("General", {
@@ -63,7 +85,7 @@ export class WLANNetworkInterface extends EthernetNetworkInterface {
 
     await writeLines(
       join(packageData.dir, "usr/lib/systemd/system/iwd.service.d/"),
-      "mf.conf",
+      "pmcf.conf",
       [
         sectionLines("Service", {
           LoadCredentialEncrypted: `${secretName}:/etc/credstore.encrypted/${secretName}`

package/src/network-support.mjs

@@ -22,6 +22,7 @@ export const networkProperties = {
   },
   ssid: { ...string_attribute_writable },
   psk: { ...string_attribute_writable },
+  secretName: string_attribute_writable,
   metric: { ...number_attribute_writable /*default: 1004*/ },
   mtu: { ...number_attribute_writable, default: 1500 },
   gateway: { type: "host", collection: false, writable: true },

package/src/network.mjs

@@ -79,4 +79,12 @@ export class Network extends Owner {
     this._bridge = this.owner.addBridge(this, network);
     network.bridge = this.bridge; // TODO should happen in addBridge
   }
+
+  set secretName(value) {
+    this._secretName = value;
+  }
+
+  get secretName() {
+    return this._secretName ?? `${this.name}.password`;
+  }
 }

package/types/network-interfaces/ethernet.d.mts

@@ -262,6 +262,7 @@ export class EthernetNetworkInterface extends NetworkInterface {
                     get?: Function;
                     env?: string[] | string;
                 };
+                secretName: import("pacc").AttributeDefinition;
                 metric: {
                     type: string;
                     isKey: boolean;
@@ -546,6 +547,7 @@ export class EthernetNetworkInterface extends NetworkInterface {
                     get?: Function;
                     env?: string[] | string;
                 };
+                secretName: import("pacc").AttributeDefinition;
                 metric: {
                     type: string;
                     isKey: boolean;

package/types/network-interfaces/loopback.d.mts

@@ -248,6 +248,7 @@ export class LoopbackNetworkInterface extends SkeletonNetworkInterface {
                     get?: Function;
                     env?: string[] | string;
                 };
+                secretName: import("pacc").AttributeDefinition;
                 metric: {
                     type: string;
                     isKey: boolean;
@@ -532,6 +533,7 @@ export class LoopbackNetworkInterface extends SkeletonNetworkInterface {
                     get?: Function;
                     env?: string[] | string;
                 };
+                secretName: import("pacc").AttributeDefinition;
                 metric: {
                     type: string;
                     isKey: boolean;

package/types/network-interfaces/network-interface.d.mts

@@ -246,6 +246,7 @@ export namespace NetworkInterfaceTypeDefinition {
             get?: Function;
             env?: string[] | string;
         };
+        secretName: import("pacc").AttributeDefinition;
         metric: {
             type: string;
             isKey: boolean;
@@ -530,6 +531,7 @@ export class NetworkInterface extends SkeletonNetworkInterface {
                 get?: Function;
                 env?: string[] | string;
             };
+            secretName: import("pacc").AttributeDefinition;
             metric: {
                 type: string;
                 isKey: boolean;

package/types/network-interfaces/tun.d.mts

@@ -248,6 +248,7 @@ export class TUNNetworkInterface extends NetworkInterface {
                     get?: Function;
                     env?: string[] | string;
                 };
+                secretName: import("pacc").AttributeDefinition;
                 metric: {
                     type: string;
                     isKey: boolean;
@@ -532,6 +533,7 @@ export class TUNNetworkInterface extends NetworkInterface {
                     get?: Function;
                     env?: string[] | string;
                 };
+                secretName: import("pacc").AttributeDefinition;
                 metric: {
                     type: string;
                     isKey: boolean;

package/types/network-interfaces/wireguard.d.mts

@@ -248,6 +248,7 @@ export class WireguardNetworkInterface extends SkeletonNetworkInterface {
                     get?: Function;
                     env?: string[] | string;
                 };
+                secretName: import("pacc").AttributeDefinition;
                 metric: {
                     type: string;
                     isKey: boolean;
@@ -532,6 +533,7 @@ export class WireguardNetworkInterface extends SkeletonNetworkInterface {
                     get?: Function;
                     env?: string[] | string;
                 };
+                secretName: import("pacc").AttributeDefinition;
                 metric: {
                     type: string;
                     isKey: boolean;

package/types/network-interfaces/wlan.d.mts

@@ -248,6 +248,7 @@ export class WLANNetworkInterface extends EthernetNetworkInterface {
                     get?: Function;
                     env?: string[] | string;
                 };
+                secretName: import("pacc").AttributeDefinition;
                 metric: {
                     type: string;
                     isKey: boolean;
@@ -534,6 +535,7 @@ export class WLANNetworkInterface extends EthernetNetworkInterface {
                         get?: Function;
                         env?: string[] | string;
                     };
+                    secretName: import("pacc").AttributeDefinition;
                     metric: {
                         type: string;
                         isKey: boolean;
@@ -818,6 +820,7 @@ export class WLANNetworkInterface extends EthernetNetworkInterface {
                         get?: Function;
                         env?: string[] | string;
                     };
+                    secretName: import("pacc").AttributeDefinition;
                     metric: {
                         type: string;
                         isKey: boolean;
@@ -864,10 +867,30 @@ export class WLANNetworkInterface extends EthernetNetworkInterface {
             };
         };
         priority: number;
-        properties: {};
+        properties: {
+            ssid: import("pacc").AttributeDefinition;
+            psk: {
+                writable: boolean;
+                type: string;
+                isKey: boolean;
+                mandatory: boolean;
+                collection: boolean;
+                private?: boolean;
+                depends?: string;
+                description?: string;
+                default?: any;
+                set?: Function;
+                get?: Function;
+                env?: string[] | string;
+            };
+            secretName: import("pacc").AttributeDefinition;
+        };
     };
     _ssid: any;
     _psk: any;
+    _secretName: any;
+    set secretName(value: any);
+    get secretName(): any;
     set ssid(value: any);
     get ssid(): any;
     set psk(value: any);

package/types/network-support.d.mts

@@ -73,6 +73,7 @@ export namespace networkProperties {
         get?: Function;
         env?: string[] | string;
     };
+    export { string_attribute_writable as secretName };
     export let metric: {
         type: string;
         isKey: boolean;
@@ -180,4 +181,5 @@ export namespace networkAddressProperties {
         env?: string[] | string;
     };
 }
+import { string_attribute_writable } from "pacc";
 import { boolean_attribute_writable } from "pacc";

package/types/network.d.mts

@@ -329,6 +329,7 @@ export class Network extends Owner {
                 get?: Function;
                 env?: string[] | string;
             };
+            secretName: import("pacc").AttributeDefinition;
             metric: {
                 type: string;
                 isKey: boolean;
@@ -369,5 +370,8 @@ export class Network extends Owner {
     get address(): any;
     set bridge(network: any);
     get bridge(): any;
+    set secretName(value: any);
+    get secretName(): any;
+    _secretName: any;
 }
 import { Owner } from "./owner.mjs";