@highstate/timeweb 0.9.15 → 0.9.18

package/dist/connection/index.js

@@ -1,6 +1,7 @@
+import { timeweb } from '@highstate/library';
+import { forUnit } from '@highstate/pulumi';
+
 // src/connection/index.ts
-import { timeweb } from "@highstate/library";
-import { forUnit } from "@highstate/pulumi";
 var { name, secrets, outputs } = forUnit(timeweb.connection);
 var connection_default = outputs({
   connection: {
@@ -8,7 +9,7 @@ var connection_default = outputs({
     apiToken: secrets.apiToken
   }
 });
-export {
-  connection_default as default
-};
+
+export { connection_default as default };
+//# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map

package/dist/connection/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/connection/index.ts"],"sourcesContent":["import { timeweb } from \"@highstate/library\"\nimport { forUnit } from \"@highstate/pulumi\"\n\nconst { name, secrets, outputs } = forUnit(timeweb.connection)\n\nexport default outputs({\n  connection: {\n    name,\n    apiToken: secrets.apiToken,\n  },\n})\n"],"mappings":";AAAA,SAAS,eAAe;AACxB,SAAS,eAAe;AAExB,IAAM,EAAE,MAAM,SAAS,QAAQ,IAAI,QAAQ,QAAQ,UAAU;AAE7D,IAAO,qBAAQ,QAAQ;AAAA,EACrB,YAAY;AAAA,IACV;AAAA,IACA,UAAU,QAAQ;AAAA,EACpB;AACF,CAAC;","names":[]}
+{"version":3,"sources":["../../src/connection/index.ts"],"names":[],"mappings":";;;;AAGA,IAAM,EAAE,IAAA,EAAM,OAAA,EAAS,SAAQ,GAAI,OAAA,CAAQ,QAAQ,UAAU,CAAA;AAE7D,IAAO,qBAAQ,OAAA,CAAQ;AAAA,EACrB,UAAA,EAAY;AAAA,IACV,IAAA;AAAA,IACA,UAAU,OAAA,CAAQ;AAAA;AAEtB,CAAC","file":"index.js","sourcesContent":["import { timeweb } from \"@highstate/library\"\nimport { forUnit } from \"@highstate/pulumi\"\n\nconst { name, secrets, outputs } = forUnit(timeweb.connection)\n\nexport default outputs({\n  connection: {\n    name,\n    apiToken: secrets.apiToken,\n  },\n})\n"]}

package/dist/highstate.manifest.json

@@ -1,6 +1,6 @@
 {
   "sourceHashes": {
-    "./dist/connection/index.js": "0dd6660031010d3048beaccb45d3147a8be55172c24f63685597e106e6818acf",
-    "./dist/virtual-machine/index.js": "92b2459d92e453f2a4e4205127a9990ba64c31a5fe205706777ebb2ba43def69"
+    "./dist/connection/index.js": 2081631216,
+    "./dist/virtual-machine/index.js": 114751294
   }
 }

package/dist/virtual-machine/index.js

@@ -1,15 +1,10 @@
+import { Provider, SshKey, FloatingIp, Server } from '@highstate/timeweb-sdk';
+import { timeweb } from '@highstate/library';
+import { forUnit, getResourceComment, toPromise, interpolate } from '@highstate/pulumi';
+import { getOrCreateSshKeyPair, parseL3Endpoint, createServerEntity, createSshTerminal, l3EndpointToString } from '@highstate/common';
+import { local } from '@pulumi/command';
+
 // src/virtual-machine/index.ts
-import { Provider, SshKey, FloatingIp, Server as TimewebServer } from "@highstate/timeweb-sdk";
-import { timeweb } from "@highstate/library";
-import { forUnit, getResourceComment, interpolate, toPromise } from "@highstate/pulumi";
-import {
-  createServerEntity,
-  createSshTerminal,
-  getOrCreateSshKeyPair,
-  l3EndpointToString,
-  parseL3Endpoint
-} from "@highstate/common";
-import { local } from "@pulumi/command";
 var { name, args, inputs, secrets, outputs } = forUnit(timeweb.virtualMachine);
 var provider = new Provider(name, { token: inputs.connection.apiToken });
 var keyPair = getOrCreateSshKeyPair(inputs, secrets);
@@ -30,7 +25,7 @@ var floatingIp = new FloatingIp(
   },
   { provider }
 );
-new TimewebServer(
+new Server(
   name,
   {
     name,
@@ -54,7 +49,7 @@ var server = availabilityCommand.stdout.apply(
 );
 var virtual_machine_default = outputs({
   server,
-  $status: {
+  $statusFields: {
     hostname: {
       value: server.hostname
     },
@@ -64,7 +59,7 @@ var virtual_machine_default = outputs({
   },
   $terminals: [createSshTerminal(server.ssh)]
 });
-export {
-  virtual_machine_default as default
-};
+
+export { virtual_machine_default as default };
+//# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map

package/dist/virtual-machine/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/virtual-machine/index.ts"],"sourcesContent":["import { Provider, SshKey, FloatingIp, Server as TimewebServer } from \"@highstate/timeweb-sdk\"\nimport { timeweb } from \"@highstate/library\"\nimport { forUnit, getResourceComment, interpolate, toPromise } from \"@highstate/pulumi\"\nimport {\n  createServerEntity,\n  createSshTerminal,\n  getOrCreateSshKeyPair,\n  l3EndpointToString,\n  parseL3Endpoint,\n} from \"@highstate/common\"\nimport { local } from \"@pulumi/command\"\n\nconst { name, args, inputs, secrets, outputs } = forUnit(timeweb.virtualMachine)\n\nconst provider = new Provider(name, { token: inputs.connection.apiToken })\n\nconst keyPair = getOrCreateSshKeyPair(inputs, secrets)\n\nconst sshKey = new SshKey(\n  name,\n  {\n    name,\n    body: keyPair.publicKey,\n  },\n  { provider },\n)\n\nconst floatingIp = new FloatingIp(\n  name,\n  {\n    comment: getResourceComment(),\n    availabilityZone: args.availabilityZone,\n    ddosGuard: false,\n  },\n  { provider },\n)\n\nnew TimewebServer(\n  name,\n  {\n    name,\n    comment: getResourceComment(),\n    availabilityZone: args.availabilityZone,\n    floatingIpId: floatingIp.id,\n    presetId: args.presetId,\n    osId: args.osId,\n    isRootPasswordRequired: false,\n    sshKeysIds: [sshKey.sshKeyId.apply(Number)],\n  },\n  { provider },\n)\n\nconst serverIp = await toPromise(floatingIp.ip)\nconst endpoint = parseL3Endpoint(serverIp)\n\nconst availabilityCommand = new local.Command(\"check-availability\", {\n  create: interpolate`while ! ping -c 1 ${floatingIp.ip}; do echo \"Waiting for server to be available...\"; sleep 5; done`,\n})\n\nconst server = availabilityCommand.stdout.apply(() =>\n  createServerEntity(name, endpoint, 22, \"root\", undefined, keyPair.privateKey),\n)\n\nexport default outputs({\n  server,\n\n  $status: {\n    hostname: {\n      value: server.hostname,\n    },\n    endpoints: {\n      value: [l3EndpointToString(endpoint)],\n    },\n  },\n\n  $terminals: [createSshTerminal(server.ssh)],\n})\n"],"mappings":";AAAA,SAAS,UAAU,QAAQ,YAAY,UAAU,qBAAqB;AACtE,SAAS,eAAe;AACxB,SAAS,SAAS,oBAAoB,aAAa,iBAAiB;AACpE;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,aAAa;AAEtB,IAAM,EAAE,MAAM,MAAM,QAAQ,SAAS,QAAQ,IAAI,QAAQ,QAAQ,cAAc;AAE/E,IAAM,WAAW,IAAI,SAAS,MAAM,EAAE,OAAO,OAAO,WAAW,SAAS,CAAC;AAEzE,IAAM,UAAU,sBAAsB,QAAQ,OAAO;AAErD,IAAM,SAAS,IAAI;AAAA,EACjB;AAAA,EACA;AAAA,IACE;AAAA,IACA,MAAM,QAAQ;AAAA,EAChB;AAAA,EACA,EAAE,SAAS;AACb;AAEA,IAAM,aAAa,IAAI;AAAA,EACrB;AAAA,EACA;AAAA,IACE,SAAS,mBAAmB;AAAA,IAC5B,kBAAkB,KAAK;AAAA,IACvB,WAAW;AAAA,EACb;AAAA,EACA,EAAE,SAAS;AACb;AAEA,IAAI;AAAA,EACF;AAAA,EACA;AAAA,IACE;AAAA,IACA,SAAS,mBAAmB;AAAA,IAC5B,kBAAkB,KAAK;AAAA,IACvB,cAAc,WAAW;AAAA,IACzB,UAAU,KAAK;AAAA,IACf,MAAM,KAAK;AAAA,IACX,wBAAwB;AAAA,IACxB,YAAY,CAAC,OAAO,SAAS,MAAM,MAAM,CAAC;AAAA,EAC5C;AAAA,EACA,EAAE,SAAS;AACb;AAEA,IAAM,WAAW,MAAM,UAAU,WAAW,EAAE;AAC9C,IAAM,WAAW,gBAAgB,QAAQ;AAEzC,IAAM,sBAAsB,IAAI,MAAM,QAAQ,sBAAsB;AAAA,EAClE,QAAQ,gCAAgC,WAAW,EAAE;AACvD,CAAC;AAED,IAAM,SAAS,oBAAoB,OAAO;AAAA,EAAM,MAC9C,mBAAmB,MAAM,UAAU,IAAI,QAAQ,QAAW,QAAQ,UAAU;AAC9E;AAEA,IAAO,0BAAQ,QAAQ;AAAA,EACrB;AAAA,EAEA,SAAS;AAAA,IACP,UAAU;AAAA,MACR,OAAO,OAAO;AAAA,IAChB;AAAA,IACA,WAAW;AAAA,MACT,OAAO,CAAC,mBAAmB,QAAQ,CAAC;AAAA,IACtC;AAAA,EACF;AAAA,EAEA,YAAY,CAAC,kBAAkB,OAAO,GAAG,CAAC;AAC5C,CAAC;","names":[]}
+{"version":3,"sources":["../../src/virtual-machine/index.ts"],"names":["TimewebServer"],"mappings":";;;;;;;AAYA,IAAM,EAAE,MAAM,IAAA,EAAM,MAAA,EAAQ,SAAS,OAAA,EAAQ,GAAI,OAAA,CAAQ,OAAA,CAAQ,cAAc,CAAA;AAE/E,IAAM,QAAA,GAAW,IAAI,QAAA,CAAS,IAAA,EAAM,EAAE,KAAA,EAAO,MAAA,CAAO,UAAA,CAAW,QAAA,EAAU,CAAA;AAEzE,IAAM,OAAA,GAAU,qBAAA,CAAsB,MAAA,EAAQ,OAAO,CAAA;AAErD,IAAM,SAAS,IAAI,MAAA;AAAA,EACjB,IAAA;AAAA,EACA;AAAA,IACE,IAAA;AAAA,IACA,MAAM,OAAA,CAAQ;AAAA,GAChB;AAAA,EACA,EAAE,QAAA;AACJ,CAAA;AAEA,IAAM,aAAa,IAAI,UAAA;AAAA,EACrB,IAAA;AAAA,EACA;AAAA,IACE,SAAS,kBAAA,EAAmB;AAAA,IAC5B,kBAAkB,IAAA,CAAK,gBAAA;AAAA,IACvB,SAAA,EAAW;AAAA,GACb;AAAA,EACA,EAAE,QAAA;AACJ,CAAA;AAEA,IAAIA,MAAA;AAAA,EACF,IAAA;AAAA,EACA;AAAA,IACE,IAAA;AAAA,IACA,SAAS,kBAAA,EAAmB;AAAA,IAC5B,kBAAkB,IAAA,CAAK,gBAAA;AAAA,IACvB,cAAc,UAAA,CAAW,EAAA;AAAA,IACzB,UAAU,IAAA,CAAK,QAAA;AAAA,IACf,MAAM,IAAA,CAAK,IAAA;AAAA,IACX,sBAAA,EAAwB,KAAA;AAAA,IACxB,YAAY,CAAC,MAAA,CAAO,QAAA,CAAS,KAAA,CAAM,MAAM,CAAC;AAAA,GAC5C;AAAA,EACA,EAAE,QAAA;AACJ,CAAA;AAEA,IAAM,QAAA,GAAW,MAAM,SAAA,CAAU,UAAA,CAAW,EAAE,CAAA;AAC9C,IAAM,QAAA,GAAW,gBAAgB,QAAQ,CAAA;AAEzC,IAAM,mBAAA,GAAsB,IAAI,KAAA,CAAM,OAAA,CAAQ,oBAAA,EAAsB;AAAA,EAClE,MAAA,EAAQ,WAAA,CAAA,kBAAA,EAAgC,UAAA,CAAW,EAAE,CAAA,gEAAA;AACvD,CAAC,CAAA;AAED,IAAM,MAAA,GAAS,oBAAoB,MAAA,CAAO,KAAA;AAAA,EAAM,MAC9C,mBAAmB,IAAA,EAAM,QAAA,EAAU,IAAI,MAAA,EAAQ,MAAA,EAAW,QAAQ,UAAU;AAC9E,CAAA;AAEA,IAAO,0BAAQ,OAAA,CAAQ;AAAA,EACrB,MAAA;AAAA,EAEA,aAAA,EAAe;AAAA,IACb,QAAA,EAAU;AAAA,MACR,OAAO,MAAA,CAAO;AAAA,KAChB;AAAA,IACA,SAAA,EAAW;AAAA,MACT,KAAA,EAAO,CAAC,kBAAA,CAAmB,QAAQ,CAAC;AAAA;AACtC,GACF;AAAA,EAEA,UAAA,EAAY,CAAC,iBAAA,CAAkB,MAAA,CAAO,GAAG,CAAC;AAC5C,CAAC","file":"index.js","sourcesContent":["import { Provider, SshKey, FloatingIp, Server as TimewebServer } from \"@highstate/timeweb-sdk\"\nimport { timeweb } from \"@highstate/library\"\nimport { forUnit, getResourceComment, interpolate, toPromise } from \"@highstate/pulumi\"\nimport {\n  createServerEntity,\n  createSshTerminal,\n  getOrCreateSshKeyPair,\n  l3EndpointToString,\n  parseL3Endpoint,\n} from \"@highstate/common\"\nimport { local } from \"@pulumi/command\"\n\nconst { name, args, inputs, secrets, outputs } = forUnit(timeweb.virtualMachine)\n\nconst provider = new Provider(name, { token: inputs.connection.apiToken })\n\nconst keyPair = getOrCreateSshKeyPair(inputs, secrets)\n\nconst sshKey = new SshKey(\n  name,\n  {\n    name,\n    body: keyPair.publicKey,\n  },\n  { provider },\n)\n\nconst floatingIp = new FloatingIp(\n  name,\n  {\n    comment: getResourceComment(),\n    availabilityZone: args.availabilityZone,\n    ddosGuard: false,\n  },\n  { provider },\n)\n\nnew TimewebServer(\n  name,\n  {\n    name,\n    comment: getResourceComment(),\n    availabilityZone: args.availabilityZone,\n    floatingIpId: floatingIp.id,\n    presetId: args.presetId,\n    osId: args.osId,\n    isRootPasswordRequired: false,\n    sshKeysIds: [sshKey.sshKeyId.apply(Number)],\n  },\n  { provider },\n)\n\nconst serverIp = await toPromise(floatingIp.ip)\nconst endpoint = parseL3Endpoint(serverIp)\n\nconst availabilityCommand = new local.Command(\"check-availability\", {\n  create: interpolate`while ! ping -c 1 ${floatingIp.ip}; do echo \"Waiting for server to be available...\"; sleep 5; done`,\n})\n\nconst server = availabilityCommand.stdout.apply(() =>\n  createServerEntity(name, endpoint, 22, \"root\", undefined, keyPair.privateKey),\n)\n\nexport default outputs({\n  server,\n\n  $statusFields: {\n    hostname: {\n      value: server.hostname,\n    },\n    endpoints: {\n      value: [l3EndpointToString(endpoint)],\n    },\n  },\n\n  $terminals: [createSshTerminal(server.ssh)],\n})\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@highstate/timeweb",
-  "version": "0.9.15",
+  "version": "0.9.18",
   "type": "module",
   "files": [
     "dist"
@@ -16,16 +16,16 @@
     "build": "highstate build"
   },
   "dependencies": {
-    "@highstate/common": "^0.9.15",
-    "@highstate/k8s": "^0.9.15",
-    "@highstate/library": "^0.9.15",
-    "@highstate/pulumi": "^0.9.15",
-    "@highstate/timeweb-sdk": "^0.9.15",
+    "@highstate/common": "^0.9.18",
+    "@highstate/k8s": "^0.9.18",
+    "@highstate/library": "^0.9.18",
+    "@highstate/pulumi": "^0.9.18",
+    "@highstate/timeweb-sdk": "^0.9.18",
     "@pulumi/command": "^1.0.2",
-    "@pulumi/pulumi": "^3.165.0"
+    "@pulumi/pulumi": "^3.184.0"
   },
   "devDependencies": {
-    "@highstate/cli": "^0.9.15"
+    "@highstate/cli": "^0.9.18"
   },
-  "gitHead": "f61b9905d4cd50511b03331411f42595403ebc06"
+  "gitHead": "9ebcd7da56b00b8ca08bf52cc8438f527338cd64"
 }