@highstate/mullvad 0.7.2 → 0.7.4

package/dist/highstate.manifest.json

@@ -0,0 +1,5 @@
+{
+  "sourceHashes": {
+    "./dist/peer/index.js": "01d5f0f0502cd08002ce9e981854b4890ce98df9e547cbac027a9154a5a2651f"
+  }
+}

package/dist/peer/index.js

@@ -1,7 +1,10 @@
-import { mullvad } from '@highstate/library';
-import { dynamic, forUnit, interpolate } from '@highstate/pulumi';
+// src/peer/index.ts
+import { mullvad } from "@highstate/library";
+import { forUnit, interpolate, toPromise } from "@highstate/pulumi";
 
-class ServerListProvider {
+// src/peer/server-list.ts
+import { dynamic } from "@highstate/pulumi";
+var ServerListProvider = class {
   async create() {
     const servers = await fetchServers();
     return { id: "all", outs: { servers } };
@@ -12,21 +15,23 @@ class ServerListProvider {
   async read() {
     return { props: { servers: await fetchServers() } };
   }
-}
-class ServerList extends dynamic.Resource {
-  constructor(name, args, opts) {
-    super(new ServerListProvider(), name, { servers: void 0, ...args }, opts);
+};
+var ServerList = class extends dynamic.Resource {
+  constructor(name2, args2, opts) {
+    super(new ServerListProvider(), name2, { servers: void 0, ...args2 }, opts);
   }
-}
+};
 async function fetchServers() {
   const response = await fetch("https://api.mullvad.net/www/relays/all/");
   return await response.json();
 }
 
-const { name, args, outputs } = forUnit(mullvad.peer);
-const hostname = args.hostname ?? name;
-const serverList = new ServerList("servers", { now: Date.now() });
-const server = serverList.servers.apply((servers) => {
+// src/peer/index.ts
+var { name, args, inputs, outputs } = forUnit(mullvad.peer);
+var network = await toPromise(inputs.network);
+var hostname = args.hostname ?? name;
+var serverList = new ServerList("servers", { now: Date.now() });
+var server = serverList.servers.apply((servers) => {
   const server2 = servers.find((server3) => server3.hostname === hostname);
   if (!server2) {
     throw new Error(`Server not found: ${args.hostname}`);
@@ -36,7 +41,7 @@ const server = serverList.servers.apply((servers) => {
   }
   return server2;
 });
-const endpoint = server.apply((server2) => {
+var endpoint = server.apply((server2) => {
   switch (args.endpointType) {
     case "ipv4":
       return server2.ipv4_addr_in;
@@ -46,12 +51,18 @@ const endpoint = server.apply((server2) => {
       return server2.fqdn;
   }
 });
-var index = outputs({
+var dns = ["10.64.0.1"];
+var allowedIps = ["0.0.0.0/0", ...dns];
+if (network?.ipv6) {
+  allowedIps.push("::0/0");
+}
+var peer_default = outputs({
   peer: {
     name,
     publicKey: server.pubkey,
     endpoint: interpolate`${endpoint}:51820`,
-    allowedIps: ["0.0.0.0/0", "::0/0"]
+    allowedIps,
+    dns
   },
   $status: {
     fqdn: server.fqdn,
@@ -60,5 +71,7 @@ var index = outputs({
     publicKey: server.pubkey
   }
 });
-
-export { index as default };
+export {
+  peer_default as default
+};
+//# sourceMappingURL=index.js.map

package/dist/peer/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/peer/index.ts","../../src/peer/server-list.ts"],"sourcesContent":["import { mullvad } from \"@highstate/library\"\nimport { forUnit, interpolate, toPromise } from \"@highstate/pulumi\"\nimport { ServerList } from \"./server-list\"\n\nconst { name, args, inputs, outputs } = forUnit(mullvad.peer)\n\nconst network = await toPromise(inputs.network)\n\nconst hostname = args.hostname ?? name\nconst serverList = new ServerList(\"servers\", { now: Date.now() })\n\nconst server = serverList.servers.apply(servers => {\n  const server = servers.find(server => server.hostname === hostname)\n  if (!server) {\n    throw new Error(`Server not found: ${args.hostname}`)\n  }\n\n  if (server.type !== \"wireguard\") {\n    throw new Error(`Server is not a WireGuard server: ${args.hostname}`)\n  }\n\n  return server\n})\n\nconst endpoint = server.apply(server => {\n  switch (args.endpointType) {\n    case \"ipv4\":\n      return server.ipv4_addr_in\n    case \"ipv6\":\n      return server.ipv6_addr_in\n    default:\n      return server.fqdn\n  }\n})\n\nconst dns = [\"10.64.0.1\"]\nconst allowedIps = [\"0.0.0.0/0\", ...dns]\n\nif (network?.ipv6) {\n  allowedIps.push(\"::0/0\")\n}\n\nexport default outputs({\n  peer: {\n    name,\n    publicKey: server.pubkey,\n    endpoint: interpolate`${endpoint}:51820`,\n    allowedIps,\n    dns,\n  },\n  $status: {\n    fqdn: server.fqdn,\n    ipv4: server.ipv4_addr_in,\n    ipv6: server.ipv6_addr_in,\n    publicKey: server.pubkey,\n  },\n})\n","import { dynamic, Output, type CustomResourceOptions } from \"@highstate/pulumi\"\n\ntype Server = {\n  hostname: string\n  country_code: string\n  country_name: string\n  city_code: string\n  city_name: string\n  fqdn: string\n  active: boolean\n  owned: boolean\n  provider: string\n  ipv4_addr_in: string\n  ipv6_addr_in: string\n  network_port_speed: number\n  stboot: boolean\n  pubkey: string\n  multihop_port: number\n  socks_name: string\n  socks_port: number\n  daita: boolean\n  type: string\n  status_messages: string[]\n}\n\nclass ServerListProvider implements dynamic.ResourceProvider {\n  async create(): Promise<dynamic.CreateResult> {\n    const servers = await fetchServers()\n\n    return { id: \"all\", outs: { servers } }\n  }\n\n  async update(): Promise<dynamic.UpdateResult> {\n    return { outs: { servers: await fetchServers() } }\n  }\n\n  async read(): Promise<dynamic.ReadResult> {\n    return { props: { servers: await fetchServers() } }\n  }\n}\n\nexport type ServerListArgs = {\n  /**\n   * The current time from `Date.now()` to trigger a refresh.\n   */\n  now: number\n}\n\nexport class ServerList extends dynamic.Resource {\n  declare readonly servers: Output<Server[]>\n\n  constructor(name: string, args: ServerListArgs, opts?: CustomResourceOptions) {\n    super(new ServerListProvider(), name, { servers: undefined, ...args }, opts)\n  }\n}\n\nasync function fetchServers(): Promise<Server[]> {\n  const response = await fetch(\"https://api.mullvad.net/www/relays/all/\")\n\n  return (await response.json()) as Server[]\n}\n"],"mappings":";AAAA,SAAS,eAAe;AACxB,SAAS,SAAS,aAAa,iBAAiB;;;ACDhD,SAAS,eAAmD;AAyB5D,IAAM,qBAAN,MAA6D;AAAA,EAC3D,MAAM,SAAwC;AAC5C,UAAM,UAAU,MAAM,aAAa;AAEnC,WAAO,EAAE,IAAI,OAAO,MAAM,EAAE,QAAQ,EAAE;AAAA,EACxC;AAAA,EAEA,MAAM,SAAwC;AAC5C,WAAO,EAAE,MAAM,EAAE,SAAS,MAAM,aAAa,EAAE,EAAE;AAAA,EACnD;AAAA,EAEA,MAAM,OAAoC;AACxC,WAAO,EAAE,OAAO,EAAE,SAAS,MAAM,aAAa,EAAE,EAAE;AAAA,EACpD;AACF;AASO,IAAM,aAAN,cAAyB,QAAQ,SAAS;AAAA,EAG/C,YAAYA,OAAcC,OAAsB,MAA8B;AAC5E,UAAM,IAAI,mBAAmB,GAAGD,OAAM,EAAE,SAAS,QAAW,GAAGC,MAAK,GAAG,IAAI;AAAA,EAC7E;AACF;AAEA,eAAe,eAAkC;AAC/C,QAAM,WAAW,MAAM,MAAM,yCAAyC;AAEtE,SAAQ,MAAM,SAAS,KAAK;AAC9B;;;ADxDA,IAAM,EAAE,MAAM,MAAM,QAAQ,QAAQ,IAAI,QAAQ,QAAQ,IAAI;AAE5D,IAAM,UAAU,MAAM,UAAU,OAAO,OAAO;AAE9C,IAAM,WAAW,KAAK,YAAY;AAClC,IAAM,aAAa,IAAI,WAAW,WAAW,EAAE,KAAK,KAAK,IAAI,EAAE,CAAC;AAEhE,IAAM,SAAS,WAAW,QAAQ,MAAM,aAAW;AACjD,QAAMC,UAAS,QAAQ,KAAK,CAAAA,YAAUA,QAAO,aAAa,QAAQ;AAClE,MAAI,CAACA,SAAQ;AACX,UAAM,IAAI,MAAM,qBAAqB,KAAK,QAAQ,EAAE;AAAA,EACtD;AAEA,MAAIA,QAAO,SAAS,aAAa;AAC/B,UAAM,IAAI,MAAM,qCAAqC,KAAK,QAAQ,EAAE;AAAA,EACtE;AAEA,SAAOA;AACT,CAAC;AAED,IAAM,WAAW,OAAO,MAAM,CAAAA,YAAU;AACtC,UAAQ,KAAK,cAAc;AAAA,IACzB,KAAK;AACH,aAAOA,QAAO;AAAA,IAChB,KAAK;AACH,aAAOA,QAAO;AAAA,IAChB;AACE,aAAOA,QAAO;AAAA,EAClB;AACF,CAAC;AAED,IAAM,MAAM,CAAC,WAAW;AACxB,IAAM,aAAa,CAAC,aAAa,GAAG,GAAG;AAEvC,IAAI,SAAS,MAAM;AACjB,aAAW,KAAK,OAAO;AACzB;AAEA,IAAO,eAAQ,QAAQ;AAAA,EACrB,MAAM;AAAA,IACJ;AAAA,IACA,WAAW,OAAO;AAAA,IAClB,UAAU,cAAc,QAAQ;AAAA,IAChC;AAAA,IACA;AAAA,EACF;AAAA,EACA,SAAS;AAAA,IACP,MAAM,OAAO;AAAA,IACb,MAAM,OAAO;AAAA,IACb,MAAM,OAAO;AAAA,IACb,WAAW,OAAO;AAAA,EACpB;AACF,CAAC;","names":["name","args","server"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@highstate/mullvad",
-  "version": "0.7.2",
+  "version": "0.7.4",
   "type": "module",
   "files": [
     "dist"
@@ -12,11 +12,11 @@
     "access": "public"
   },
   "scripts": {
-    "build": "pkgroll --tsconfig=tsconfig.build.json"
+    "build": "highstate build"
   },
   "dependencies": {
-    "@highstate/k8s": "^0.7.2",
-    "@highstate/pulumi": "^0.7.2",
+    "@highstate/k8s": "^0.7.4",
+    "@highstate/pulumi": "^0.7.4",
     "@noble/curves": "^1.8.0",
     "@pulumi/kubernetes": "^4.18.0"
   },
@@ -24,7 +24,7 @@
     "@highstate/library": "workspace:^0.4.4"
   },
   "devDependencies": {
-    "pkgroll": "^2.5.1"
+    "@highstate/cli": "^0.7.4"
   },
-  "gitHead": "e177535015e0fa3c74ae8ddc0bc6d31b191d2c54"
+  "gitHead": "c482cdf650746f6814122602d65bf5b842a2bc2c"
 }