pmcf 6.10.0 → 6.10.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/README.md +20 -20
  2. package/package.json +2 -2
  3. package/src/base.mjs +1 -1
  4. package/src/subnet.mjs +2 -8
package/README.md CHANGED
@@ -77,26 +77,26 @@ generates config packages for:
77
77
  * [domainNames](#domainnames)
78
78
  * [InitializationContext](#initializationcontext)
79
79
  * [Parameters](#parameters-13)
80
- * [SkeletonNetworkInterface](#skeletonnetworkinterface)
81
- * [networkAddresses](#networkaddresses)
82
- * [Parameters](#parameters-14)
83
80
  * [SystemdJournalRemoteService](#systemdjournalremoteservice)
84
81
  * [Properties](#properties)
85
82
  * [systemdConfigs](#systemdconfigs)
86
- * [Parameters](#parameters-15)
83
+ * [Parameters](#parameters-14)
87
84
  * [SystemdJournalUploadService](#systemdjournaluploadservice)
88
85
  * [Properties](#properties-1)
89
86
  * [systemdConfigs](#systemdconfigs-1)
90
- * [Parameters](#parameters-16)
87
+ * [Parameters](#parameters-15)
91
88
  * [NetworkAddress](#networkaddress)
92
- * [Parameters](#parameters-17)
89
+ * [Parameters](#parameters-16)
93
90
  * [subnet](#subnet)
94
91
  * [networkInterface](#networkinterface)
95
92
  * [address](#address)
96
93
  * [addresses](#addresses)
97
- * [Parameters](#parameters-18)
94
+ * [Parameters](#parameters-17)
98
95
  * [cidrAddresses](#cidraddresses)
99
- * [Parameters](#parameters-19)
96
+ * [Parameters](#parameters-18)
97
+ * [SkeletonNetworkInterface](#skeletonnetworkinterface)
98
+ * [networkAddresses](#networkaddresses)
99
+ * [Parameters](#parameters-19)
100
100
  * [families](#families)
101
101
  * [secretName](#secretname)
102
102
  * [directHosts](#directhosts)
@@ -286,18 +286,6 @@ Keeps track of all in flight object creations and loose ends during config initi
286
286
 
287
287
  * `directory` (optional, default `"/"`)
288
288
 
289
- ## SkeletonNetworkInterface
290
-
291
- **Extends ServiceOwner**
292
-
293
- ### networkAddresses
294
-
295
- #### Parameters
296
-
297
- * `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** (optional, default `n=>true`)
298
-
299
- Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
300
-
301
289
  ## SystemdJournalRemoteService
302
290
 
303
291
  **Extends CoreService**
@@ -373,6 +361,18 @@ Returns **Iterable<[string](https://developer.mozilla.org/docs/Web/JavaScript/Re
373
361
 
374
362
  Returns **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**&#x20;
375
363
 
364
+ ## SkeletonNetworkInterface
365
+
366
+ **Extends ServiceOwner**
367
+
368
+ ### networkAddresses
369
+
370
+ #### Parameters
371
+
372
+ * `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** (optional, default `n=>true`)
373
+
374
+ Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
375
+
376
376
  ## families
377
377
 
378
378
  Returns **[Set](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Set)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**&#x20;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "pmcf",
3
- "version": "6.10.0",
3
+ "version": "6.10.2",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
@@ -52,7 +52,7 @@
52
52
  "dependencies": {
53
53
  "aggregated-map": "^1.0.7",
54
54
  "content-entry-transform": "^1.6.9",
55
- "ip-utilties": "^3.7.1",
55
+ "ip-utilties": "^3.7.4",
56
56
  "npm-pkgbuild": "^20.8.2",
57
57
  "pacc": "^10.4.1",
58
58
  "package-directory": "^8.2.0",
package/src/base.mjs CHANGED
@@ -516,7 +516,7 @@ export class Base {
516
516
 
517
517
  try {
518
518
  if ((await stat(dir)).isDirectory) {
519
- console.log("TD", dir);
519
+ //console.log("TD", dir);
520
520
  yield transform(
521
521
  new FileContentProvider(
522
522
  { dir, pattern: "**/*" },
package/src/subnet.mjs CHANGED
@@ -1,9 +1,7 @@
1
1
  import {
2
2
  normalizeCIDR,
3
- isLinkLocal,
4
3
  rangeIP,
5
4
  decodeIP,
6
- familyIP,
7
5
  matchPrefixIP,
8
6
  FAMILY_IPV6
9
7
  } from "ip-utilties";
@@ -36,13 +34,13 @@ export class Subnet {
36
34
  networks = new Set();
37
35
 
38
36
  constructor(address) {
39
- const { longPrefix, prefix, prefixLength, cidr } = normalizeCIDR(address);
37
+ const { longPrefix, prefix, prefixLength, cidr, family } = normalizeCIDR(address);
40
38
 
41
39
  this.address = cidr;
42
40
  this.prefix = prefix;
43
41
  this.prefixLength = prefixLength;
44
42
  this.longPrefix = longPrefix;
45
- this.family = familyIP(address);
43
+ this.family = family;
46
44
  }
47
45
 
48
46
  get owner() {
@@ -82,10 +80,6 @@ export class Subnet {
82
80
  return matchPrefixIP(this.address, this.prefixLength, address);
83
81
  }
84
82
 
85
- get isLinkLocal() {
86
- return isLinkLocal(this.address);
87
- }
88
-
89
83
  get addressRange() {
90
84
  return rangeIP(this.prefix, this.prefixLength, 1, 1).map(a => decodeIP(a));
91
85
  }