sliftutils 1.7.9 → 1.7.11

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 (92) hide show
  1. package/bin/storageserver.js +4 -0
  2. package/{teststorage → examplestorage}/browser.tsx +18 -22
  3. package/{teststorage/server.ts → examplestorage/exampleserver.ts} +4 -6
  4. package/index.d.ts +770 -84
  5. package/misc/dist/environment.ts.cache +3 -3
  6. package/misc/dist/getSecret.ts.cache +139 -0
  7. package/misc/dist/strings.ts.cache +13 -0
  8. package/misc/dist/zip.ts.cache +9 -0
  9. package/misc/getSecret.ts +38 -16
  10. package/misc/https/cloudflareHelpers.d.ts +19 -0
  11. package/misc/https/cloudflareHelpers.ts +69 -0
  12. package/misc/https/dist/certs.ts.cache +115 -179
  13. package/misc/https/dist/cloudflareHelpers.ts.cache +68 -0
  14. package/misc/https/dist/dns.ts.cache +112 -100
  15. package/misc/https/dist/hostServer.ts.cache +130 -0
  16. package/misc/https/dist/httpsCerts.ts.cache +24 -5
  17. package/misc/https/dist/persistentLocalStorage.ts.cache +3 -2
  18. package/misc/https/dns.d.ts +41 -8
  19. package/misc/https/dns.ts +104 -106
  20. package/misc/https/hostServer.d.ts +0 -3
  21. package/misc/https/hostServer.ts +12 -8
  22. package/package.json +3 -2
  23. package/render-utils/dist/observer.tsx.cache +3 -2
  24. package/spec.txt +0 -55
  25. package/storage/ArchivesDisk.d.ts +67 -0
  26. package/storage/ArchivesDisk.ts +369 -0
  27. package/storage/BulkDatabase2/dist/BulkDatabaseBase.ts.cache +1242 -0
  28. package/storage/BulkDatabase2/dist/BulkDatabaseFormat.ts.cache +513 -0
  29. package/storage/BulkDatabase2/dist/BulkDatabaseMerge.ts.cache +352 -0
  30. package/storage/BulkDatabase2/dist/BulkDatabaseReader.ts.cache +306 -0
  31. package/storage/BulkDatabase2/dist/LoadedIndex.ts.cache +435 -0
  32. package/storage/BulkDatabase2/dist/WriteOverlay.ts.cache +58 -0
  33. package/storage/BulkDatabase2/dist/blockCache.ts.cache +179 -0
  34. package/storage/BulkDatabase2/dist/mergeLock.ts.cache +149 -0
  35. package/storage/BulkDatabase2/dist/mergeMarkers.ts.cache +101 -0
  36. package/storage/BulkDatabase2/dist/streamLog.ts.cache +227 -0
  37. package/storage/BulkDatabase2/dist/syncClient.ts.cache +104 -0
  38. package/storage/IArchives.d.ts +127 -1
  39. package/storage/IArchives.ts +201 -1
  40. package/storage/backblaze.d.ts +29 -2
  41. package/storage/backblaze.ts +214 -78
  42. package/storage/dist/ArchivesDisk.ts.cache +373 -0
  43. package/storage/dist/FileFolderAPI.tsx.cache +508 -65
  44. package/storage/dist/IArchives.ts.cache +44 -0
  45. package/storage/dist/IndexedDBFileFolderAPI.ts.cache +8 -2
  46. package/storage/dist/JSONStorage.ts.cache +6 -2
  47. package/storage/dist/PendingManager.tsx.cache +1 -1
  48. package/storage/dist/TransactionStorage.ts.cache +231 -92
  49. package/storage/dist/backblaze.ts.cache +797 -0
  50. package/storage/dist/fileSystemPointer.ts.cache +36 -3
  51. package/storage/dist/remoteFileStorage.ts.cache +495 -0
  52. package/storage/remoteStorage/ArchivesRemote.d.ts +34 -18
  53. package/storage/remoteStorage/ArchivesRemote.ts +85 -65
  54. package/storage/remoteStorage/ArchivesUrl.d.ts +48 -0
  55. package/storage/remoteStorage/ArchivesUrl.ts +86 -0
  56. package/storage/remoteStorage/accessPage.tsx +111 -28
  57. package/storage/remoteStorage/blobStore.d.ts +128 -25
  58. package/storage/remoteStorage/blobStore.ts +757 -290
  59. package/storage/remoteStorage/cliArgs.d.ts +1 -0
  60. package/storage/remoteStorage/cliArgs.ts +9 -0
  61. package/storage/remoteStorage/createArchives.d.ts +85 -0
  62. package/storage/remoteStorage/createArchives.ts +612 -0
  63. package/storage/remoteStorage/dist/ArchivesRemote.ts.cache +197 -0
  64. package/storage/remoteStorage/dist/ArchivesUrl.ts.cache +85 -0
  65. package/storage/remoteStorage/dist/accessPage.tsx.cache +222 -0
  66. package/storage/remoteStorage/dist/blobStore.ts.cache +837 -0
  67. package/storage/remoteStorage/dist/cliArgs.ts.cache +16 -0
  68. package/storage/remoteStorage/dist/createArchives.ts.cache +610 -0
  69. package/storage/remoteStorage/dist/remoteConfig.ts.cache +206 -0
  70. package/storage/remoteStorage/dist/sourceWrapper.ts.cache +223 -0
  71. package/storage/remoteStorage/dist/storageController.ts.cache +500 -0
  72. package/storage/remoteStorage/dist/storageServer.ts.cache +106 -0
  73. package/storage/remoteStorage/dist/storageServerCli.ts.cache +39 -0
  74. package/storage/remoteStorage/dist/storageServerState.ts.cache +518 -0
  75. package/storage/remoteStorage/grantAccess.js +4 -0
  76. package/storage/remoteStorage/grantAccessCli.d.ts +1 -0
  77. package/storage/remoteStorage/grantAccessCli.ts +27 -0
  78. package/storage/remoteStorage/remoteConfig.d.ts +29 -0
  79. package/storage/remoteStorage/remoteConfig.ts +194 -0
  80. package/storage/remoteStorage/sourceWrapper.d.ts +41 -0
  81. package/storage/remoteStorage/sourceWrapper.ts +223 -0
  82. package/storage/remoteStorage/spec.md +31 -0
  83. package/storage/remoteStorage/storageController.d.ts +30 -27
  84. package/storage/remoteStorage/storageController.ts +297 -159
  85. package/storage/remoteStorage/storageServer.d.ts +6 -0
  86. package/storage/remoteStorage/storageServer.ts +88 -94
  87. package/storage/remoteStorage/storageServerCli.d.ts +1 -0
  88. package/storage/remoteStorage/storageServerCli.ts +38 -0
  89. package/storage/remoteStorage/storageServerState.d.ts +43 -0
  90. package/storage/remoteStorage/storageServerState.ts +540 -0
  91. package/testsite/server.ts +0 -2
  92. package/yarn.lock +11 -6
@@ -1,4 +1,4 @@
1
- "use strict";
1
+ "use strict"; var console = (function shimConsole() { let baseConsole = globalThis.console; if (typeof window !== "undefined") return baseConsole; let name = __filename.replaceAll("\\", "/").split("/").pop(); let dirName = __dirname.replaceAll("\\", "/").split("/").pop(); let context = { __FILE__: __filename, __DIR__: __dirname, __NAME__: name, __DIRNAME__: dirName }; let newConsole = { ...baseConsole }; for (let shim of ["log", "info", "warn", "error"]) { newConsole[shim] = (...args) => { args.push(context); baseConsole[shim](...args); }; } newConsole.__context = context; return newConsole; })(); "use strict";
2
2
  var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
3
  if (k2 === undefined) k2 = k;
4
4
  var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
26
26
  return (mod && mod.__esModule && mod.default) ? mod : { "default": mod };
27
27
  };
28
28
  Object.defineProperty(exports, "__esModule", { value: true , configurable: true});
29
- exports.getHTTPSCert = void 0;
29
+ exports.generateCert = exports.normalizeCertToPEM = exports.parseCert = exports.getAccountKey = exports.getHTTPSCert = void 0;
30
30
  const dns_1 = require("./dns");
31
31
  const caching_1 = require("socket-function/src/caching");
32
32
  const forge = __importStar(require("node-forge"));
@@ -37,6 +37,17 @@ const misc_1 = require("socket-function/src/misc");
37
37
  const batching_1 = require("socket-function/src/batching");
38
38
  const fs_1 = __importDefault(require("fs"));
39
39
  const persistentLocalStorage_1 = require("./persistentLocalStorage");
40
+ // For example:
41
+ /*
42
+ let domain = "querysubtest.com";
43
+ await loadIdentityCA(domain);
44
+
45
+ let listenPublic = false;
46
+ let port = 9823;
47
+ let localDomain = "127-0-0-1." + domain;
48
+ await addRecord("A", localDomain, "127.0.0.1");
49
+ let keyCert = await getHTTPSCert(domain);
50
+ */
40
51
  // Expire EXPIRATION_THRESHOLD% of the way through the certificate's lifetime
41
52
  const EXPIRATION_THRESHOLD = 0.4;
42
53
  /** NOTE: We also generate the domain *.domain */
@@ -44,6 +55,10 @@ exports.getHTTPSCert = (0, caching_1.cache)(async (domain) => {
44
55
  if (!domain.endsWith(".")) {
45
56
  domain = domain + ".";
46
57
  }
58
+ // No matter what, reset this from the in-memory cache in an hour. This is fine. We'll just see the cache on disk and see that it hasn't expired. Or we might see that it has expired, and then we will get the new value.
59
+ setTimeout(() => {
60
+ exports.getHTTPSCert.clear(domain);
61
+ }, misc_1.timeInHour);
47
62
  let keyCert;
48
63
  let path = domain + ".cert";
49
64
  try {
@@ -68,7 +83,7 @@ exports.getHTTPSCert = (0, caching_1.cache)(async (domain) => {
68
83
  if (keyCert) {
69
84
  return keyCert;
70
85
  }
71
- const accountKey = await getAccountKey(domain);
86
+ const accountKey = await (0, exports.getAccountKey)(domain);
72
87
  let altDomains = [];
73
88
  // altDomains.push("noproxy." + domain);
74
89
  // // NOTE: Allowing local access is just an optimization, not to avoid having to forward ports
@@ -107,9 +122,11 @@ const getAccountKey = async function getAccountKey(domain) {
107
122
  }
108
123
  return secret;
109
124
  };
125
+ exports.getAccountKey = getAccountKey;
110
126
  function parseCert(PEMorDER) {
111
127
  return forge.pki.certificateFromPem(normalizeCertToPEM(PEMorDER));
112
128
  }
129
+ exports.parseCert = parseCert;
113
130
  function normalizeCertToPEM(PEMorDER) {
114
131
  if (PEMorDER.toString().startsWith("-----BEGIN CERTIFICATE-----")) {
115
132
  return PEMorDER.toString();
@@ -117,6 +134,7 @@ function normalizeCertToPEM(PEMorDER) {
117
134
  PEMorDER = PEMorDER.toString("base64");
118
135
  return "-----BEGIN CERTIFICATE-----\n" + PEMorDER + "\n-----END CERTIFICATE-----";
119
136
  }
137
+ exports.normalizeCertToPEM = normalizeCertToPEM;
120
138
  async function generateCert(config) {
121
139
  let { accountKey, domain } = config;
122
140
  console.log((0, logColors_1.magenta)(`Generating new cert for ${domain}`));
@@ -177,5 +195,6 @@ async function generateCert(config) {
177
195
  cert: cert,
178
196
  };
179
197
  }
180
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"httpsCerts.js","sourceRoot":"","sources":["httpsCerts.ts"],"names":[],"mappings":"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","sourcesContent":["\nimport { addRecord, deleteRecord, getRecords, setRecord } from \"./dns\";\nimport { cache, lazy } from \"socket-function/src/caching\";\nimport * as forge from \"node-forge\";\nimport acme from \"acme-client\";\nimport { magenta, red } from \"socket-function/src/formatting/logColors\";\nimport { formatDateTime, formatTime } from \"socket-function/src/formatting/format\";\nimport { timeInMinute } from \"socket-function/src/misc\";\nimport { delay } from \"socket-function/src/batching\";\nimport fs from \"fs\";\nimport { getKeyStore } from \"./persistentLocalStorage\";\n\n\n// Expire EXPIRATION_THRESHOLD% of the way through the certificate's lifetime\nconst EXPIRATION_THRESHOLD = 0.4;\n\n/** NOTE: We also generate the domain *.domain */\nexport const getHTTPSCert = cache(async (domain: string): Promise<{ key: string; cert: string }> => {\n    if (!domain.endsWith(\".\")) {\n        domain = domain + \".\";\n    }\n    let keyCert: { key: string; cert: string } | undefined;\n    let path = domain + \".cert\";\n\n    try {\n        keyCert = JSON.parse(fs.readFileSync(path, \"utf8\")) as { key: string; cert: string };\n    } catch { }\n    if (keyCert) {\n        // If 40% of the lifetime has passed, renew it (has to be < the threshold\n        //  in EdgeCertController).\n        let certObj = parseCert(keyCert.cert);\n        let expirationTime = +new Date(certObj.validity.notAfter);\n        let createTime = +new Date(certObj.validity.notBefore);\n        let renewDate = createTime + (expirationTime - createTime) * EXPIRATION_THRESHOLD;\n        if (renewDate < Date.now()) {\n            console.log(magenta(`Renewing domain ${domain} (renew target is ${formatDateTime(renewDate)}).`));\n            keyCert = undefined;\n        }\n    } else {\n        console.log(magenta(`No cert found for domain ${domain}, generating shortly.`));\n    }\n    if (keyCert) {\n        return keyCert;\n    }\n\n    const accountKey = await getAccountKey(domain);\n    let altDomains: string[] = [];\n\n    // altDomains.push(\"noproxy.\" + domain);\n    // // NOTE: Allowing local access is just an optimization, not to avoid having to forward ports\n    // //  (unless you type 127-0-0-1.domain into the browser... then I guess you don't have to forward ports?)\n    // altDomains.push(\"127-0-0-1.\" + domain);\n\n    // NOTE: I forget why we were not allowing wildcard domains. I think it was to prevent\n    //  any HTTPS domains from impersonating servers. But... servers have two levels, so that isn't\n    //  an issue. And even if they didn't they store their public key in their domain, so you\n    //  can't really impersonate them anyways...\n    //  - AND, we need this for IP type A records, which... we need to pick the server we want\n    //      to connect to.\n    altDomains.push(\"*.\" + domain);\n\n    try {\n        keyCert = await generateCert({ accountKey, domain, altDomains });\n    } catch (e) {\n        if (String(e).includes(\"authorization must be pending\")) {\n            console.log(`Authorization appears to be pending, waiting 2 minutes for other process to create certificate`);\n            await delay(timeInMinute * 2);\n            return await getHTTPSCert(domain);\n        }\n        throw e;\n    }\n    await fs.promises.writeFile(path, JSON.stringify(keyCert));\n    return keyCert;\n});\n\n\nconst getAccountKey = async function getAccountKey(domain: string) {\n    let accountKey = getKeyStore<string>(domain, \"letsEncryptAccountKey\");\n    let secret = await accountKey.get();\n    if (!secret) {\n        // Should only HAPPEN ONCE, EVER!\n        console.error(red(`Generating new letsencrypt account key`));\n        const keyPair = forge.pki.rsa.generateKeyPair();\n        secret = forge.pki.privateKeyToPem(keyPair.privateKey);\n        await accountKey.set(secret);\n    }\n    return secret;\n};\n\n\nfunction parseCert(PEMorDER: string | Buffer) {\n    return forge.pki.certificateFromPem(normalizeCertToPEM(PEMorDER));\n}\n\nfunction normalizeCertToPEM(PEMorDER: string | Buffer): string {\n    if (PEMorDER.toString().startsWith(\"-----BEGIN CERTIFICATE-----\")) {\n        return PEMorDER.toString();\n    }\n    PEMorDER = PEMorDER.toString(\"base64\");\n    return \"-----BEGIN CERTIFICATE-----\\n\" + PEMorDER + \"\\n-----END CERTIFICATE-----\";\n}\n\n\nasync function generateCert(config: {\n    accountKey: string;\n    domain: string;\n    altDomains?: string[];\n}): Promise<{\n    domains: string[];\n    key: string;\n    cert: string;\n}> {\n    let { accountKey, domain } = config;\n\n    console.log(magenta(`Generating new cert for ${domain}`));\n\n    let domainList = [domain, ...config.altDomains || []];\n    // Strip trailing \".\"\n    domainList = domainList.map(x => x.endsWith(\".\") ? x.slice(0, -1) : x);\n\n    const [certificateKey, certificateCsr] = await acme.forge.createCsr({\n        commonName: domainList[0],\n        altNames: domainList.slice(1),\n    });\n\n    // So... acme-client is fine. Just re-implement the \"auto\" mode ourselves, to have more control over it.\n    const client = new acme.Client({\n        directoryUrl: acme.directory.letsencrypt.production,\n        accountKey: accountKey,\n    });\n\n    const accountPayload = {\n        termsOfServiceAgreed: true,\n        contact: [`mailto:devops@perspectanalytics.com`],\n    };\n\n    try {\n        await client.getAccountUrl();\n    } catch {\n        await client.createAccount(accountPayload);\n    }\n\n    const orderPayload = {\n        identifiers: domainList.map(domain => ({ type: \"dns\", value: domain })),\n    };\n    const order = await client.createOrder(orderPayload);\n    const authorizations = await client.getAuthorizations(order);\n    console.log(`Starting authorizations: ${JSON.stringify(authorizations)}`);\n\n    for (let auth of authorizations) {\n        if (auth.status === \"valid\") {\n            console.log(`Authorization already valid for ${auth.identifier.value}`);\n            continue;\n        }\n        console.log(`Starting authorization for ${JSON.stringify(auth)}`);\n\n        // Only use DNS authorization\n        let challenge = auth.challenges.find(x => x.type === \"dns-01\");\n        if (!challenge) {\n            throw new Error(\"No DNS challenge found\");\n        }\n        const keyAuthorization = await client.getChallengeKeyAuthorization(challenge);\n\n        let hostname = auth.identifier.value;\n        let challengeRecordName = \"_acme-challenge.\" + hostname + \".\";\n        await setRecord(\"TXT\", challengeRecordName, keyAuthorization);\n\n        await client.completeChallenge(challenge);\n        console.log(`Challenge completed`);\n\n        await client.waitForValidStatus(challenge);\n        console.log(`Status of order is valid`);\n    }\n\n    const finalized = await client.finalizeOrder(order, certificateCsr);\n    console.log(`Order finalized`);\n\n    let cert = await client.getCertificate(finalized);\n    return {\n        domains: domainList,\n        key: certificateKey.toString(),\n        cert: cert,\n    };\n}\n"]}
181
- /* _JS_SOURCE_HASH = "4d56068f29ee3700832b43eb0cee884139d4fe1f48558129ee9da54ea1825056"; */
198
+ exports.generateCert = generateCert;
199
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"httpsCerts.js","sourceRoot":"","sources":["httpsCerts.ts"],"names":[],"mappings":"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","sourcesContent":["\nimport { addRecord, deleteRecord, getRecords, setRecord } from \"./dns\";\nimport { cache, lazy } from \"socket-function/src/caching\";\nimport * as forge from \"node-forge\";\nimport acme from \"acme-client\";\nimport { magenta, red } from \"socket-function/src/formatting/logColors\";\nimport { formatDateTime, formatTime } from \"socket-function/src/formatting/format\";\nimport { timeInHour, timeInMinute } from \"socket-function/src/misc\";\nimport { delay } from \"socket-function/src/batching\";\nimport fs from \"fs\";\nimport { getKeyStore } from \"./persistentLocalStorage\";\n\n// For example:\n/*\nlet domain = \"querysubtest.com\";\nawait loadIdentityCA(domain);\n\nlet listenPublic = false;\nlet port = 9823;\nlet localDomain = \"127-0-0-1.\" + domain;\nawait addRecord(\"A\", localDomain, \"127.0.0.1\");\nlet keyCert = await getHTTPSCert(domain);\n*/\n\n// Expire EXPIRATION_THRESHOLD% of the way through the certificate's lifetime\nconst EXPIRATION_THRESHOLD = 0.4;\n\n/** NOTE: We also generate the domain *.domain */\nexport const getHTTPSCert = cache(async (domain: string): Promise<{ key: string; cert: string }> => {\n    if (!domain.endsWith(\".\")) {\n        domain = domain + \".\";\n    }\n\n    // No matter what, reset this from the in-memory cache in an hour. This is fine. We'll just see the cache on disk and see that it hasn't expired. Or we might see that it has expired, and then we will get the new value. \n    setTimeout(() => {\n        getHTTPSCert.clear(domain);\n    }, timeInHour);\n\n    let keyCert: { key: string; cert: string } | undefined;\n    let path = domain + \".cert\";\n\n    try {\n        keyCert = JSON.parse(fs.readFileSync(path, \"utf8\")) as { key: string; cert: string };\n    } catch { }\n    if (keyCert) {\n        // If 40% of the lifetime has passed, renew it (has to be < the threshold\n        //  in EdgeCertController).\n        let certObj = parseCert(keyCert.cert);\n        let expirationTime = +new Date(certObj.validity.notAfter);\n        let createTime = +new Date(certObj.validity.notBefore);\n        let renewDate = createTime + (expirationTime - createTime) * EXPIRATION_THRESHOLD;\n        if (renewDate < Date.now()) {\n            console.log(magenta(`Renewing domain ${domain} (renew target is ${formatDateTime(renewDate)}).`));\n            keyCert = undefined;\n        }\n    } else {\n        console.log(magenta(`No cert found for domain ${domain}, generating shortly.`));\n    }\n    if (keyCert) {\n        return keyCert;\n    }\n\n    const accountKey = await getAccountKey(domain);\n    let altDomains: string[] = [];\n\n    // altDomains.push(\"noproxy.\" + domain);\n    // // NOTE: Allowing local access is just an optimization, not to avoid having to forward ports\n    // //  (unless you type 127-0-0-1.domain into the browser... then I guess you don't have to forward ports?)\n    // altDomains.push(\"127-0-0-1.\" + domain);\n\n    // NOTE: I forget why we were not allowing wildcard domains. I think it was to prevent\n    //  any HTTPS domains from impersonating servers. But... servers have two levels, so that isn't\n    //  an issue. And even if they didn't they store their public key in their domain, so you\n    //  can't really impersonate them anyways...\n    //  - AND, we need this for IP type A records, which... we need to pick the server we want\n    //      to connect to.\n    altDomains.push(\"*.\" + domain);\n\n    try {\n        keyCert = await generateCert({ accountKey, domain, altDomains });\n    } catch (e) {\n        if (String(e).includes(\"authorization must be pending\")) {\n            console.log(`Authorization appears to be pending, waiting 2 minutes for other process to create certificate`);\n            await delay(timeInMinute * 2);\n            return await getHTTPSCert(domain);\n        }\n        throw e;\n    }\n    await fs.promises.writeFile(path, JSON.stringify(keyCert));\n    return keyCert;\n});\n\n\nexport const getAccountKey = async function getAccountKey(domain: string) {\n    let accountKey = getKeyStore<string>(domain, \"letsEncryptAccountKey\");\n    let secret = await accountKey.get();\n    if (!secret) {\n        // Should only HAPPEN ONCE, EVER!\n        console.error(red(`Generating new letsencrypt account key`));\n        const keyPair = forge.pki.rsa.generateKeyPair();\n        secret = forge.pki.privateKeyToPem(keyPair.privateKey);\n        await accountKey.set(secret);\n    }\n    return secret;\n};\n\n\nexport function parseCert(PEMorDER: string | Buffer) {\n    return forge.pki.certificateFromPem(normalizeCertToPEM(PEMorDER));\n}\n\nexport function normalizeCertToPEM(PEMorDER: string | Buffer): string {\n    if (PEMorDER.toString().startsWith(\"-----BEGIN CERTIFICATE-----\")) {\n        return PEMorDER.toString();\n    }\n    PEMorDER = PEMorDER.toString(\"base64\");\n    return \"-----BEGIN CERTIFICATE-----\\n\" + PEMorDER + \"\\n-----END CERTIFICATE-----\";\n}\n\n\nexport async function generateCert(config: {\n    accountKey: string;\n    domain: string;\n    altDomains?: string[];\n}): Promise<{\n    domains: string[];\n    key: string;\n    cert: string;\n}> {\n    let { accountKey, domain } = config;\n\n    console.log(magenta(`Generating new cert for ${domain}`));\n\n    let domainList = [domain, ...config.altDomains || []];\n    // Strip trailing \".\"\n    domainList = domainList.map(x => x.endsWith(\".\") ? x.slice(0, -1) : x);\n\n    const [certificateKey, certificateCsr] = await acme.forge.createCsr({\n        commonName: domainList[0],\n        altNames: domainList.slice(1),\n    });\n\n    // So... acme-client is fine. Just re-implement the \"auto\" mode ourselves, to have more control over it.\n    const client = new acme.Client({\n        directoryUrl: acme.directory.letsencrypt.production,\n        accountKey: accountKey,\n    });\n\n    const accountPayload = {\n        termsOfServiceAgreed: true,\n        contact: [`mailto:devops@perspectanalytics.com`],\n    };\n\n    try {\n        await client.getAccountUrl();\n    } catch {\n        await client.createAccount(accountPayload);\n    }\n\n    const orderPayload = {\n        identifiers: domainList.map(domain => ({ type: \"dns\", value: domain })),\n    };\n    const order = await client.createOrder(orderPayload);\n    const authorizations = await client.getAuthorizations(order);\n    console.log(`Starting authorizations: ${JSON.stringify(authorizations)}`);\n\n    for (let auth of authorizations) {\n        if (auth.status === \"valid\") {\n            console.log(`Authorization already valid for ${auth.identifier.value}`);\n            continue;\n        }\n        console.log(`Starting authorization for ${JSON.stringify(auth)}`);\n\n        // Only use DNS authorization\n        let challenge = auth.challenges.find(x => x.type === \"dns-01\");\n        if (!challenge) {\n            throw new Error(\"No DNS challenge found\");\n        }\n        const keyAuthorization = await client.getChallengeKeyAuthorization(challenge);\n\n        let hostname = auth.identifier.value;\n        let challengeRecordName = \"_acme-challenge.\" + hostname + \".\";\n        await setRecord(\"TXT\", challengeRecordName, keyAuthorization);\n\n        await client.completeChallenge(challenge);\n        console.log(`Challenge completed`);\n\n        await client.waitForValidStatus(challenge);\n        console.log(`Status of order is valid`);\n    }\n\n    const finalized = await client.finalizeOrder(order, certificateCsr);\n    console.log(`Order finalized`);\n\n    let cert = await client.getCertificate(finalized);\n    return {\n        domains: domainList,\n        key: certificateKey.toString(),\n        cert: cert,\n    };\n}\n"]}
200
+ /* _JS_SOURCE_HASH = "084f601d346362ed5f0c9543c3fa3c94cc41cf830ff204cdd42953a7e701ea26"; */
@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true , configurable: true});
6
6
  //exports.getKeyStore = void 0;
7
+ module.allowclient = true;
7
8
  const misc_1 = require("socket-function/src/misc");
8
9
  const fs_1 = __importDefault(require("fs"));
9
10
  const os_1 = __importDefault(require("os"));
@@ -41,5 +42,5 @@ function getKeyStore(appName, key) {
41
42
  }
42
43
  }
43
44
  exports.getKeyStore = getKeyStore;
44
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGVyc2lzdGVudExvY2FsU3RvcmFnZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInBlcnNpc3RlbnRMb2NhbFN0b3JhZ2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsbURBQWtEO0FBQ2xELDRDQUFvQjtBQUNwQiw0Q0FBb0I7QUFJcEIsU0FBZ0IsV0FBVyxDQUFJLE9BQWUsRUFBRSxHQUFXO0lBSXZELElBQUksSUFBQSxhQUFNLEdBQUUsRUFBRSxDQUFDO1FBQ1gsSUFBSSxJQUFJLEdBQUcsWUFBRSxDQUFDLE9BQU8sRUFBRSxHQUFHLGFBQWEsT0FBTyxHQUFHLEdBQUcsR0FBRyxHQUFHLE9BQU8sQ0FBQztRQUNsRSxPQUFPO1lBQ0gsR0FBRztnQkFDQyxJQUFJLFFBQVEsR0FBdUIsU0FBUyxDQUFDO2dCQUM3QyxJQUFJLENBQUM7b0JBQUMsUUFBUSxHQUFHLFlBQUUsQ0FBQyxZQUFZLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxDQUFDO2dCQUFDLENBQUM7Z0JBQUMsV0FBTSxDQUFDLENBQUMsQ0FBQztnQkFDM0QsSUFBSSxDQUFDLFFBQVE7b0JBQUUsT0FBTyxTQUFTLENBQUM7Z0JBQ2hDLE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQU0sQ0FBQztZQUNyQyxDQUFDO1lBQ0QsR0FBRyxDQUFDLEtBQWU7Z0JBQ2YsWUFBRSxDQUFDLGFBQWEsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO1lBQ2xELENBQUM7U0FDSixDQUFDO0lBQ04sQ0FBQztTQUFNLENBQUM7UUFDSixPQUFPO1lBQ0gsR0FBRztnQkFDQyxJQUFJLElBQUksR0FBRyxZQUFZLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDO2dCQUNyQyxJQUFJLENBQUMsSUFBSTtvQkFBRSxPQUFPLFNBQVMsQ0FBQztnQkFDNUIsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBTSxDQUFDO1lBQ2pDLENBQUM7WUFDRCxHQUFHLENBQUMsS0FBZTtnQkFDZixZQUFZLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7WUFDckQsQ0FBQztTQUNKLENBQUM7SUFDTixDQUFDO0FBQ0wsQ0FBQztBQTdCRCxrQ0E2QkMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBpc05vZGUgfSBmcm9tIFwic29ja2V0LWZ1bmN0aW9uL3NyYy9taXNjXCI7XG5pbXBvcnQgZnMgZnJvbSBcImZzXCI7XG5pbXBvcnQgb3MgZnJvbSBcIm9zXCI7XG5pbXBvcnQgeyBNYXliZVByb21pc2UgfSBmcm9tIFwic29ja2V0LWZ1bmN0aW9uL3NyYy90eXBlc1wiO1xuaW1wb3J0IHsgY2FjaGUgfSBmcm9tIFwic29ja2V0LWZ1bmN0aW9uL3NyYy9jYWNoaW5nXCI7XG5cbmV4cG9ydCBmdW5jdGlvbiBnZXRLZXlTdG9yZTxUPihhcHBOYW1lOiBzdHJpbmcsIGtleTogc3RyaW5nKToge1xuICAgIGdldCgpOiBNYXliZVByb21pc2U8VCB8IHVuZGVmaW5lZD47XG4gICAgc2V0KHZhbHVlOiBUIHwgbnVsbCk6IE1heWJlUHJvbWlzZTx2b2lkPjtcbn0ge1xuICAgIGlmIChpc05vZGUoKSkge1xuICAgICAgICBsZXQgcGF0aCA9IG9zLmhvbWVkaXIoKSArIGAva2V5c3RvcmVfJHthcHBOYW1lfV9gICsga2V5ICsgXCIuanNvblwiO1xuICAgICAgICByZXR1cm4ge1xuICAgICAgICAgICAgZ2V0KCkge1xuICAgICAgICAgICAgICAgIGxldCBjb250ZW50czogc3RyaW5nIHwgdW5kZWZpbmVkID0gdW5kZWZpbmVkO1xuICAgICAgICAgICAgICAgIHRyeSB7IGNvbnRlbnRzID0gZnMucmVhZEZpbGVTeW5jKHBhdGgsIFwidXRmOFwiKTsgfSBjYXRjaCB7IH1cbiAgICAgICAgICAgICAgICBpZiAoIWNvbnRlbnRzKSByZXR1cm4gdW5kZWZpbmVkO1xuICAgICAgICAgICAgICAgIHJldHVybiBKU09OLnBhcnNlKGNvbnRlbnRzKSBhcyBUO1xuICAgICAgICAgICAgfSxcbiAgICAgICAgICAgIHNldCh2YWx1ZTogVCB8IG51bGwpIHtcbiAgICAgICAgICAgICAgICBmcy53cml0ZUZpbGVTeW5jKHBhdGgsIEpTT04uc3RyaW5naWZ5KHZhbHVlKSk7XG4gICAgICAgICAgICB9XG4gICAgICAgIH07XG4gICAgfSBlbHNlIHtcbiAgICAgICAgcmV0dXJuIHtcbiAgICAgICAgICAgIGdldCgpIHtcbiAgICAgICAgICAgICAgICBsZXQganNvbiA9IGxvY2FsU3RvcmFnZS5nZXRJdGVtKGtleSk7XG4gICAgICAgICAgICAgICAgaWYgKCFqc29uKSByZXR1cm4gdW5kZWZpbmVkO1xuICAgICAgICAgICAgICAgIHJldHVybiBKU09OLnBhcnNlKGpzb24pIGFzIFQ7XG4gICAgICAgICAgICB9LFxuICAgICAgICAgICAgc2V0KHZhbHVlOiBUIHwgbnVsbCkge1xuICAgICAgICAgICAgICAgIGxvY2FsU3RvcmFnZS5zZXRJdGVtKGtleSwgSlNPTi5zdHJpbmdpZnkodmFsdWUpKTtcbiAgICAgICAgICAgIH1cbiAgICAgICAgfTtcbiAgICB9XG59Il19
45
- /* _JS_SOURCE_HASH = "fab658bfd6afe5a0e23dd617216d46662e36d867c7ac2a1d0b56d0ac77e47290"; */
45
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGVyc2lzdGVudExvY2FsU3RvcmFnZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInBlcnNpc3RlbnRMb2NhbFN0b3JhZ2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsTUFBTSxDQUFDLFdBQVcsR0FBRyxJQUFJLENBQUM7QUFFMUIsbURBQWtEO0FBQ2xELDRDQUFvQjtBQUNwQiw0Q0FBb0I7QUFHcEIsU0FBZ0IsV0FBVyxDQUFJLE9BQWUsRUFBRSxHQUFXO0lBSXZELElBQUksSUFBQSxhQUFNLEdBQUUsRUFBRSxDQUFDO1FBQ1gsSUFBSSxJQUFJLEdBQUcsWUFBRSxDQUFDLE9BQU8sRUFBRSxHQUFHLGFBQWEsT0FBTyxHQUFHLEdBQUcsR0FBRyxHQUFHLE9BQU8sQ0FBQztRQUNsRSxPQUFPO1lBQ0gsR0FBRztnQkFDQyxJQUFJLFFBQVEsR0FBdUIsU0FBUyxDQUFDO2dCQUM3QyxJQUFJLENBQUM7b0JBQUMsUUFBUSxHQUFHLFlBQUUsQ0FBQyxZQUFZLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxDQUFDO2dCQUFDLENBQUM7Z0JBQUMsV0FBTSxDQUFDLENBQUMsQ0FBQztnQkFDM0QsSUFBSSxDQUFDLFFBQVE7b0JBQUUsT0FBTyxTQUFTLENBQUM7Z0JBQ2hDLE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQU0sQ0FBQztZQUNyQyxDQUFDO1lBQ0QsR0FBRyxDQUFDLEtBQWU7Z0JBQ2YsWUFBRSxDQUFDLGFBQWEsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO1lBQ2xELENBQUM7U0FDSixDQUFDO0lBQ04sQ0FBQztTQUFNLENBQUM7UUFDSixPQUFPO1lBQ0gsR0FBRztnQkFDQyxJQUFJLElBQUksR0FBRyxZQUFZLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDO2dCQUNyQyxJQUFJLENBQUMsSUFBSTtvQkFBRSxPQUFPLFNBQVMsQ0FBQztnQkFDNUIsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBTSxDQUFDO1lBQ2pDLENBQUM7WUFDRCxHQUFHLENBQUMsS0FBZTtnQkFDZixZQUFZLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7WUFDckQsQ0FBQztTQUNKLENBQUM7SUFDTixDQUFDO0FBQ0wsQ0FBQztBQTdCRCxrQ0E2QkMiLCJzb3VyY2VzQ29udGVudCI6WyJtb2R1bGUuYWxsb3djbGllbnQgPSB0cnVlO1xuXG5pbXBvcnQgeyBpc05vZGUgfSBmcm9tIFwic29ja2V0LWZ1bmN0aW9uL3NyYy9taXNjXCI7XG5pbXBvcnQgZnMgZnJvbSBcImZzXCI7XG5pbXBvcnQgb3MgZnJvbSBcIm9zXCI7XG5pbXBvcnQgeyBjYWNoZSB9IGZyb20gXCJzb2NrZXQtZnVuY3Rpb24vc3JjL2NhY2hpbmdcIjtcblxuZXhwb3J0IGZ1bmN0aW9uIGdldEtleVN0b3JlPFQ+KGFwcE5hbWU6IHN0cmluZywga2V5OiBzdHJpbmcpOiB7XG4gICAgZ2V0KCk6IFQgfCB1bmRlZmluZWQ7XG4gICAgc2V0KHZhbHVlOiBUIHwgbnVsbCk6IHZvaWQ7XG59IHtcbiAgICBpZiAoaXNOb2RlKCkpIHtcbiAgICAgICAgbGV0IHBhdGggPSBvcy5ob21lZGlyKCkgKyBgL2tleXN0b3JlXyR7YXBwTmFtZX1fYCArIGtleSArIFwiLmpzb25cIjtcbiAgICAgICAgcmV0dXJuIHtcbiAgICAgICAgICAgIGdldCgpIHtcbiAgICAgICAgICAgICAgICBsZXQgY29udGVudHM6IHN0cmluZyB8IHVuZGVmaW5lZCA9IHVuZGVmaW5lZDtcbiAgICAgICAgICAgICAgICB0cnkgeyBjb250ZW50cyA9IGZzLnJlYWRGaWxlU3luYyhwYXRoLCBcInV0ZjhcIik7IH0gY2F0Y2ggeyB9XG4gICAgICAgICAgICAgICAgaWYgKCFjb250ZW50cykgcmV0dXJuIHVuZGVmaW5lZDtcbiAgICAgICAgICAgICAgICByZXR1cm4gSlNPTi5wYXJzZShjb250ZW50cykgYXMgVDtcbiAgICAgICAgICAgIH0sXG4gICAgICAgICAgICBzZXQodmFsdWU6IFQgfCBudWxsKSB7XG4gICAgICAgICAgICAgICAgZnMud3JpdGVGaWxlU3luYyhwYXRoLCBKU09OLnN0cmluZ2lmeSh2YWx1ZSkpO1xuICAgICAgICAgICAgfVxuICAgICAgICB9O1xuICAgIH0gZWxzZSB7XG4gICAgICAgIHJldHVybiB7XG4gICAgICAgICAgICBnZXQoKSB7XG4gICAgICAgICAgICAgICAgbGV0IGpzb24gPSBsb2NhbFN0b3JhZ2UuZ2V0SXRlbShrZXkpO1xuICAgICAgICAgICAgICAgIGlmICghanNvbikgcmV0dXJuIHVuZGVmaW5lZDtcbiAgICAgICAgICAgICAgICByZXR1cm4gSlNPTi5wYXJzZShqc29uKSBhcyBUO1xuICAgICAgICAgICAgfSxcbiAgICAgICAgICAgIHNldCh2YWx1ZTogVCB8IG51bGwpIHtcbiAgICAgICAgICAgICAgICBsb2NhbFN0b3JhZ2Uuc2V0SXRlbShrZXksIEpTT04uc3RyaW5naWZ5KHZhbHVlKSk7XG4gICAgICAgICAgICB9XG4gICAgICAgIH07XG4gICAgfVxufSJdfQ==
46
+ /* _JS_SOURCE_HASH = "58cffcfad7122960997b72d8b4809ea1c8f4b8d638bf51c327f012d95d941526"; */
@@ -1,18 +1,51 @@
1
+ /** Parses our tag back out; 0 (i.e. always stale) when it's absent or unparseable. */
2
+ export declare function freshnessTime(comment?: string): number;
3
+ export declare const hasDNSWritePermissions: {
4
+ (): Promise<boolean>;
5
+ reset(): void;
6
+ set(newValue: Promise<boolean>): void;
7
+ };
8
+ export declare const getZoneId: {
9
+ (key: string): Promise<string>;
10
+ clear(key: string): void;
11
+ clearAll(): void;
12
+ forceSet(key: string, value: Promise<string>): void;
13
+ getAllKeys(): string[];
14
+ get(key: string): Promise<string> | undefined;
15
+ };
1
16
  export declare function getRecordsRaw(type: string, key: string): Promise<{
2
17
  id: string;
3
18
  type: string;
4
19
  name: string;
5
20
  content: string;
6
21
  proxied: boolean;
22
+ modified_on: string;
23
+ comment?: string | undefined;
7
24
  }[]>;
25
+ /** Cloudflare's batch endpoint applies deletes, then patches, then posts in a single database
26
+ * transaction. We route edits (patches) through here because the standalone PATCH/PUT verbs
27
+ * aren't usable in our setup, and because it lets "remove others + assert target" happen
28
+ * without a window where the name resolves to nothing. */
29
+ export declare function batchRecords(zoneId: string, batch: {
30
+ deletes?: {
31
+ id: string;
32
+ }[];
33
+ patches?: {
34
+ id: string;
35
+ comment?: string;
36
+ }[];
37
+ posts?: {
38
+ type: string;
39
+ name: string;
40
+ content: string;
41
+ ttl: number;
42
+ proxied: boolean;
43
+ comment?: string;
44
+ }[];
45
+ }): Promise<void>;
8
46
  export declare function getRecords(type: string, key: string): Promise<string[]>;
9
47
  export declare function deleteRecord(type: string, key: string, value: string): Promise<void>;
10
- /** Removes all existing records (unless the record is already present) */
11
- export declare function setRecord(type: string, key: string, value: string, proxied?: "proxied"): Promise<void>;
48
+ /** Removes all existing records (unless the record is already present and fresh) */
49
+ export declare function setRecord(type: string, key: string, value: string, proxied?: "proxied", staleAfter?: number): Promise<void>;
12
50
  /** Keeps existing records */
13
- export declare function addRecord(type: string, key: string, value: string, proxied?: "proxied"): Promise<void>;
14
- /** Provide Cloudflare credentials directly (an API token, or a path to a file containing one), instead of relying on ./cloudflare.json */
15
- export declare function setCloudflareCredentials(config: {
16
- key?: string;
17
- path?: string;
18
- }): void;
51
+ export declare function addRecord(type: string, key: string, value: string, proxied?: "proxied", staleAfter?: number): Promise<void>;
package/misc/https/dns.ts CHANGED
@@ -1,15 +1,48 @@
1
- import { httpsRequest } from "socket-function/src/https";
2
1
  import { cache, lazy } from "socket-function/src/caching";
3
- import fs from "fs";
4
2
  import { delay } from "socket-function/src/batching";
5
3
  import { SocketFunction } from "socket-function/SocketFunction";
4
+ import { isNode, timeInDay } from "socket-function/src/misc";
5
+ import { magenta } from "socket-function/src/formatting/logColors";
6
+ import { cloudflareCall, cloudflareGETCall, cloudflarePOSTCall, getCloudflareCreds } from "./cloudflareHelpers";
6
7
 
7
8
  const DNS_TTLSeconds = {
8
9
  "TXT": 60,
9
10
  "A": 60,
10
11
  };
11
12
 
12
- const getZoneId = cache(async (rootDomain: string): Promise<string> => {
13
+ const DNS_REFRESH_STALE_AFTER = timeInDay;
14
+
15
+ // We stamp our own "last asserted" time into the record's comment, because Cloudflare's
16
+ // modified_on can only be moved by an actual content change - and re-asserting an already
17
+ // correct record has no content change to make (a create errors with 81058, a no-op edit
18
+ // doesn't bump the timestamp). Reading freshness from text we control sidesteps that entirely,
19
+ // and lets us refresh a stale-but-correct record in place instead of deleting and recreating it.
20
+ const FRESHNESS_REGEX = /<set on:[^>]*>/;
21
+
22
+ /** Strips any prior freshness tag and appends a new one, preserving other comment text. */
23
+ function stampFreshness(comment?: string): string {
24
+ let base = (comment ?? "").replace(FRESHNESS_REGEX, "").trim();
25
+ let stamp = `<set on: ${new Date().toString()}>`;
26
+ return base ? `${base} ${stamp}` : stamp;
27
+ }
28
+ /** Parses our tag back out; 0 (i.e. always stale) when it's absent or unparseable. */
29
+ export function freshnessTime(comment?: string): number {
30
+ let match = FRESHNESS_REGEX.exec(comment ?? "");
31
+ if (!match) return 0;
32
+ return new Date(match[0].replace("<set on:", "").replace(">", "").trim()).getTime() || 0;
33
+ }
34
+
35
+ export const hasDNSWritePermissions = lazy(async () => {
36
+ if (!isNode()) return false;
37
+ try {
38
+ await getCloudflareCreds();
39
+ return true;
40
+ } catch {
41
+ return false;
42
+ }
43
+ });
44
+
45
+ export const getZoneId = cache(async (rootDomain: string): Promise<string> => {
13
46
  let zones = await cloudflareGETCall<{ id: string; name: string }[]>("/zones", {});
14
47
  let selected = zones.find(x => x.name === rootDomain);
15
48
  if (!selected) {
@@ -34,8 +67,35 @@ export async function getRecordsRaw(type: string, key: string) {
34
67
  name: string;
35
68
  content: string;
36
69
  proxied: boolean;
70
+ modified_on: string;
71
+ // Omitted by Cloudflare when the record has no comment.
72
+ comment?: string;
37
73
  }[]>(`/zones/${zoneId}/dns_records`);
38
- return results.filter(x => x.type === type && x.name === key);
74
+ // DNS names are case-insensitive and Cloudflare returns them lowercased, so a mixed-case key
75
+ // (e.g. a machine id subdomain) would never match an exact-case compare - match lowercased.
76
+ let keyLower = key.toLowerCase();
77
+ return results.filter(x => x.type === type && x.name.toLowerCase() === keyLower);
78
+ }
79
+
80
+ /** Cloudflare's batch endpoint applies deletes, then patches, then posts in a single database
81
+ * transaction. We route edits (patches) through here because the standalone PATCH/PUT verbs
82
+ * aren't usable in our setup, and because it lets "remove others + assert target" happen
83
+ * without a window where the name resolves to nothing. */
84
+ export async function batchRecords(zoneId: string, batch: {
85
+ deletes?: { id: string }[];
86
+ patches?: { id: string; comment?: string }[];
87
+ posts?: { type: string; name: string; content: string; ttl: number; proxied: boolean; comment?: string }[];
88
+ }) {
89
+ let payload: { [key: string]: unknown } = {};
90
+ if (batch.deletes && batch.deletes.length > 0) payload.deletes = batch.deletes;
91
+ if (batch.patches && batch.patches.length > 0) payload.patches = batch.patches;
92
+ if (batch.posts && batch.posts.length > 0) payload.posts = batch.posts;
93
+ try {
94
+ await cloudflarePOSTCall(`/zones/${zoneId}/dns_records/batch`, payload);
95
+ } catch (error) {
96
+ console.error(`Error updating DNS records:`, { error: error, batch });
97
+ throw new Error(`Error updating DNS records. ${JSON.stringify(batch)}. Error: ${error}`);
98
+ }
39
99
  }
40
100
  export async function getRecords(type: string, key: string) {
41
101
  if (key.endsWith(".")) key = key.slice(0, -1);
@@ -59,121 +119,59 @@ export async function deleteRecord(type: string, key: string, value: string) {
59
119
  await cloudflareCall(`/zones/${zoneId}/dns_records/${value.id}`, Buffer.from([]), "DELETE");
60
120
  }
61
121
  }
62
- /** Removes all existing records (unless the record is already present) */
63
- export async function setRecord(type: string, key: string, value: string, proxied?: "proxied") {
64
- let stack = new Error();
122
+ /** Removes all existing records (unless the record is already present and fresh) */
123
+ export async function setRecord(type: string, key: string, value: string, proxied?: "proxied", staleAfter = DNS_REFRESH_STALE_AFTER) {
65
124
  if (key.endsWith(".")) key = key.slice(0, -1);
66
125
  let zoneId = await getZoneId(getRootDomain(key));
67
126
  let prevValues = await getRecordsRaw(type, key);
68
- // NOTE: Apparently if we try to update by just changing proxied, cloudflare complains and
69
- // says "an identical record already exists", even though it doesn't, we changed the proxied value...
70
- if (prevValues.some(x => x.content === value)) return;
127
+ let existing = prevValues.find(x => x.content === value);
128
+ let others = prevValues.filter(x => x.content !== value);
71
129
 
72
- console.log(`Removing previous records of ${type} for ${key} ${JSON.stringify(prevValues.map(x => x.content))}`);
73
- let didDeletions = false;
74
- for (let value of prevValues) {
75
- didDeletions = true;
76
- await cloudflareCall(`/zones/${zoneId}/dns_records/${value.id}`, Buffer.from([]), "DELETE");
77
- }
130
+ // Already correct and recently asserted - a prior run also cleaned up the other records,
131
+ // so there is nothing left to do.
132
+ if (existing && Date.now() - freshnessTime(existing.comment) < staleAfter) return;
78
133
 
79
- console.log(`Setting ${type} record for ${key} to ${value} (previously had ${JSON.stringify(prevValues.map(x => x.content))})`);
80
- const ttl = DNS_TTLSeconds[type as "A"] || 60;
81
- await cloudflarePOSTCall(`/zones/${zoneId}/dns_records`, {
82
- type: type,
83
- name: key,
84
- content: value,
85
- ttl,
86
- proxied: proxied === "proxied",
134
+ // A single atomic batch: drop the wrong records, and either refresh the existing record's
135
+ // comment in place or create it - so the name is never left resolving to nothing.
136
+ let ttl = DNS_TTLSeconds[type as "A"] || 60;
137
+ let comment = stampFreshness(existing?.comment);
138
+ console.log(magenta(`Setting ${type} record for ${key} to ${value} (previously had ${JSON.stringify(prevValues.map(x => x.content))})`));
139
+ await batchRecords(zoneId, {
140
+ deletes: others.map(x => ({ id: x.id })),
141
+ patches: existing ? [{ id: existing.id, comment }] : [],
142
+ posts: existing ? [] : [{ type, name: key, content: value, ttl, proxied: proxied === "proxied", comment }],
87
143
  });
88
- // NOTE: Apparently... even if the record didn't exist, we still have to wait...
89
- console.log(`Waiting ${ttl} seconds for DNS to propagate...`);
90
- await delay(ttl * 1000);
91
- console.log(`Done waiting for DNS to update.`);
92
-
144
+ // Only a brand new record needs to propagate; an in-place comment refresh doesn't change the answer.
145
+ if (!existing) {
146
+ console.log(`Waiting ${ttl} seconds for DNS to propagate...`);
147
+ for (let ttlLeft = ttl; ttlLeft > 0; ttlLeft--) {
148
+ await delay(1000);
149
+ console.log(`${ttlLeft} seconds left...`);
150
+ }
151
+ console.log(`Done waiting for DNS to update.`);
152
+ }
93
153
  }
94
154
  /** Keeps existing records */
95
- export async function addRecord(type: string, key: string, value: string, proxied?: "proxied") {
155
+ export async function addRecord(type: string, key: string, value: string, proxied?: "proxied", staleAfter = DNS_REFRESH_STALE_AFTER) {
96
156
  if (key.endsWith(".")) key = key.slice(0, -1);
97
157
  let zoneId = await getZoneId(getRootDomain(key));
98
158
  let prevValues = await getRecordsRaw(type, key);
99
- // NOTE: Apparently if we try to update by just changing proxied, cloudflare complains and
100
- // says "an identical record already exists", even though it doesn't, we changed the proxied value...
101
- if (prevValues.some(x => x.content === value)) return;
159
+ let existing = prevValues.find(x => x.content === value);
160
+ if (existing && Date.now() - freshnessTime(existing.comment) < staleAfter) return;
161
+
162
+ // Same single-batch flow as setRecord, minus the deletes (we keep sibling records here).
163
+ let ttl = DNS_TTLSeconds[type as "A"] || 60;
164
+ let comment = stampFreshness(existing?.comment);
102
165
  console.log(`Adding ${type} record for ${key} to ${value} (previously had ${JSON.stringify(prevValues.map(x => x.content))})`);
103
- const ttl = DNS_TTLSeconds[type as "A"] || 60;
104
- await cloudflarePOSTCall(`/zones/${zoneId}/dns_records`, {
105
- type: type,
106
- name: key,
107
- content: value,
108
- ttl,
109
- proxied: proxied === "proxied",
166
+ await batchRecords(zoneId, {
167
+ patches: existing ? [{ id: existing.id, comment }] : [],
168
+ posts: existing ? [] : [{ type, name: key, content: value, ttl, proxied: proxied === "proxied", comment }],
110
169
  });
170
+ if (existing) return;
111
171
  console.log(`Waiting ${ttl} seconds for DNS to propagate...`);
112
- await delay(ttl * 1000);
113
- console.log(`Done waiting for DNS to update.`);
114
- }
115
-
116
-
117
- let credsOverride: { key: string } | undefined;
118
- /** Provide Cloudflare credentials directly (an API token, or a path to a file containing one), instead of relying on ./cloudflare.json */
119
- export function setCloudflareCredentials(config: { key?: string; path?: string }) {
120
- let key = config.key;
121
- if (!key && config.path) {
122
- key = fs.readFileSync(config.path, "utf8").trim();
123
- }
124
- if (!key) {
125
- throw new Error(`Must provide either key or path in setCloudflareCredentials, received ${JSON.stringify(Object.keys(config))}`);
126
- }
127
- credsOverride = { key };
128
- }
129
-
130
- const getCloudflareCredsFromFile = lazy(async (): Promise<{ key: string; }> => {
131
- const path = "cloudflare.json";
132
- if (!fs.existsSync(path)) {
133
- throw new Error(`Must add cloudflare.json file to root of project (or call setCloudflareCredentials).`);
134
- }
135
- let creds = JSON.parse(fs.readFileSync(path, "utf8")) as { key: string; };
136
- return {
137
- key: creds.key,
138
- };
139
- });
140
- async function getCloudflareCreds() {
141
- return credsOverride || await getCloudflareCredsFromFile();
142
- }
143
-
144
- async function cloudflareGETCall<T>(path: string, params?: { [key: string]: string }): Promise<T> {
145
- let url = new URL(`https://api.cloudflare.com/client/v4` + path);
146
- for (let key in params) {
147
- url.searchParams.set(key, params[key]);
148
- }
149
- let creds = await getCloudflareCreds();
150
- let result = await httpsRequest(url.toString(), [], "GET", undefined, {
151
- headers: {
152
- "Content-Type": "application/json",
153
- "Authorization": `Bearer ${creds.key}`,
154
- }
155
- });
156
- let result2 = JSON.parse(result.toString()) as { result: unknown; success: boolean; errors: { code: number; message: string }[] };
157
- if (!result2.success) {
158
- throw new Error(`Cloudflare call failed: ${result2.errors.map(x => x.message).join(", ")}`);
172
+ for (let ttlLeft = ttl; ttlLeft > 0; ttlLeft--) {
173
+ await delay(1000);
174
+ console.log(`${ttlLeft} seconds left...`);
159
175
  }
160
- return result2.result as T;
161
- }
162
- async function cloudflarePOSTCall<T>(path: string, params: { [key: string]: unknown }): Promise<T> {
163
- return await cloudflareCall(path, Buffer.from(JSON.stringify(params)), "POST");
176
+ console.log(`Done waiting for DNS to update.`);
164
177
  }
165
- async function cloudflareCall<T>(path: string, payload: Buffer, method: string): Promise<T> {
166
- let url = new URL(`https://api.cloudflare.com/client/v4` + path);
167
- let creds = await getCloudflareCreds();
168
- let result = await httpsRequest(url.toString(), payload, method, undefined, {
169
- headers: {
170
- "Content-Type": "application/json",
171
- "Authorization": `Bearer ${creds.key}`,
172
- }
173
- });
174
- let result2 = JSON.parse(result.toString()) as { result: unknown; success: boolean; errors: { code: number; message: string }[] };
175
- if (!result2.success) {
176
- throw new Error(`Cloudflare call failed: ${result2.errors.map(x => x.message).join(", ")}`);
177
- }
178
- return result2.result as T;
179
- }
@@ -2,9 +2,6 @@ export type HostServerConfig = {
2
2
  /** Full domain to host on (e.g. "testsite.example.com"). The HTTPS cert is created for this domain and *.domain, so using a subdomain never touches the root domain (beyond its _acme-challenge TXT record). */
3
3
  domain: string;
4
4
  port: number;
5
- /** Cloudflare API token (or a path to a file containing one). If neither is given, ./cloudflare.json is used. */
6
- cloudflareApiToken?: string;
7
- cloudflareApiTokenPath?: string;
8
5
  /** Creates an unproxied A record pointing domain at this machine (publicIp, or our detected external IP) */
9
6
  setDNSRecord?: boolean;
10
7
  publicIp?: string;
@@ -5,9 +5,9 @@ import { timeInMinute } from "socket-function/src/misc";
5
5
  import { delay } from "socket-function/src/batching";
6
6
  import { getExternalIP } from "socket-function/src/networking";
7
7
  import { magenta } from "socket-function/src/formatting/logColors";
8
- import { getThreadKeyCert, loadIdentityCA } from "./certs";
8
+ import { getOwnMachineId, getThreadKeyCert, loadIdentityCA } from "./certs";
9
9
  import { generateCert, getAccountKey, parseCert } from "./httpsCerts";
10
- import { setCloudflareCredentials, setRecord } from "./dns";
10
+ import { setRecord } from "./dns";
11
11
 
12
12
  // Renew somewhere randomly between 40% and 60% of the way through the cert lifetime. The random threshold staggers parallel processes on the same machine, so usually one process renews early, and the others see the renewed cert on disk (we re-read the disk before every renewal check) and never renew themselves.
13
13
  const RENEW_THRESHOLD_MIN = 0.4;
@@ -21,9 +21,8 @@ export type HostServerConfig = {
21
21
  /** Full domain to host on (e.g. "testsite.example.com"). The HTTPS cert is created for this domain and *.domain, so using a subdomain never touches the root domain (beyond its _acme-challenge TXT record). */
22
22
  domain: string;
23
23
  port: number;
24
- /** Cloudflare API token (or a path to a file containing one). If neither is given, ./cloudflare.json is used. */
25
- cloudflareApiToken?: string;
26
- cloudflareApiTokenPath?: string;
24
+
25
+ // TODO: Eventually we should support running without Cloudflare API tokens. It's annoying though as the user will have to create a self-signed certificate and then they'll have to go through and trust it everywhere, and a lot of the stuff is transparent, and so it'll have to be non-transparent, getting the user to go to the page that owns the domain and trust it from there. It's much better just make a Cloudflare account. You can buy a domain for $15 a year, and then you can use it for GitHub pages to host your own site and do all kinds of things just like any other real site.
27
26
  /** Creates an unproxied A record pointing domain at this machine (publicIp, or our detected external IP) */
28
27
  setDNSRecord?: boolean;
29
28
  publicIp?: string;
@@ -33,9 +32,6 @@ export type HostServerConfig = {
33
32
  /** Hosts a SocketFunction server on a real domain, with an automatically created and renewed Let's Encrypt HTTPS certificate (cached in the home folder, shared between processes on the machine). Expose your controllers (and any RequireController setup) before calling this. Returns the mounted nodeId. */
34
33
  export async function hostServer(config: HostServerConfig): Promise<string> {
35
34
  let { domain, port } = config;
36
- if (config.cloudflareApiToken || config.cloudflareApiTokenPath) {
37
- setCloudflareCredentials({ key: config.cloudflareApiToken, path: config.cloudflareApiTokenPath });
38
- }
39
35
  // The identity CA always lives on the root domain (nodeIds are threadHash.machineHash.root.tld)
40
36
  let rootDomain = domain.split(".").slice(-2).join(".");
41
37
  await loadIdentityCA(rootDomain);
@@ -56,6 +52,7 @@ export async function hostServer(config: HostServerConfig): Promise<string> {
56
52
 
57
53
  let nodeId = await SocketFunction.mount({
58
54
  public: true,
55
+ autoForwardPort: true,
59
56
  port,
60
57
  ...getThreadKeyCert(rootDomain),
61
58
  SNICerts: {
@@ -63,6 +60,13 @@ export async function hostServer(config: HostServerConfig): Promise<string> {
63
60
  callback(keyCert);
64
61
  certListeners.push(callback);
65
62
  },
63
+ [getOwnMachineId(rootDomain) + "." + rootDomain]: async callback => {
64
+ let threadCert = await getThreadKeyCert(rootDomain);
65
+ callback({
66
+ key: threadCert.key,
67
+ cert: threadCert.cert,
68
+ });
69
+ },
66
70
  },
67
71
  allowHostnames: config.allowHostnames,
68
72
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sliftutils",
3
- "version": "1.7.9",
3
+ "version": "1.7.11",
4
4
  "main": "index.js",
5
5
  "license": "MIT",
6
6
  "files": [
@@ -33,6 +33,7 @@
33
33
  "bin": {
34
34
  "filehoster": "./bin/filehoster.js",
35
35
  "autohost": "./bin/autohost.js",
36
+ "storageserver": "./bin/storageserver.js",
36
37
  "build-nodejs": "./builders/nodeJSBuildRun.js",
37
38
  "buildnodejs": "./builders/nodeJSBuildRun.js",
38
39
  "build-extension": "./builders/extensionBuildRun.js",
@@ -56,7 +57,7 @@
56
57
  "node-forge": "https://github.com/sliftist/forge#e618181b469b07bdc70b968b0391beb8ef5fecd6",
57
58
  "preact-old-types": "^10.28.1",
58
59
  "shell-quote": "^1.8.3",
59
- "socket-function": "^1.2.4",
60
+ "socket-function": "^1.2.16",
60
61
  "typenode": "^6.6.1",
61
62
  "typesafecss": "*",
62
63
  "ws": "^8.18.3",
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true , configurable: true});
3
3
  //exports.observer = void 0;
4
+ module.allowclient = true;
4
5
  const mobx_1 = require("mobx");
5
6
  const measure_1 = require("socket-function/src/profiling/measure");
6
7
  let globalConstructOrder = 1;
@@ -32,5 +33,5 @@ function observer(Constructor) {
32
33
  };
33
34
  }
34
35
  exports.observer = observer;
35
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib2JzZXJ2ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJvYnNlcnZlci50c3giXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0EsK0JBQTRDO0FBQzVDLG1FQUFxRTtBQUVyRSxJQUFJLG9CQUFvQixHQUFHLENBQUMsQ0FBQztBQUM3QixTQUFnQixRQUFRLENBU3BCLFdBQWM7SUFFZCxJQUFJLElBQUksR0FBRyxXQUFXLENBQUMsSUFBSSxDQUFDO0lBQzVCLE9BQU8sS0FBTSxTQUFRLFdBQVc7UUFBekI7O1lBR0gsYUFBUSxHQUFHLElBQUksZUFBUSxDQUFDLFVBQVUsSUFBSSxJQUFJLG9CQUFvQixFQUFFLEVBQUUsRUFBRSxHQUFHLEVBQUU7Z0JBQ3JFLEtBQUssQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUN4QixDQUFDLENBQUMsQ0FBQztRQWNQLENBQUM7UUFsQkcsYUFBYTtRQUNiLE1BQU0sS0FBSyxJQUFJLEtBQUssT0FBTyxXQUFXLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztRQUk5QyxvQkFBb0I7O1lBQ2hCLElBQUksQ0FBQyxRQUFRLENBQUMsT0FBTyxFQUFFLENBQUM7WUFDeEIsTUFBQSxLQUFLLENBQUMsb0JBQW9CLG9EQUFJLENBQUM7UUFDbkMsQ0FBQztRQUNELE1BQU0sQ0FBQyxHQUFHLElBQVc7WUFDakIsSUFBSSxNQUE2QixDQUFDO1lBQ2xDLElBQUksQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRTtnQkFDckIsSUFBQSxzQkFBWSxFQUFDLEdBQUcsRUFBRTtvQkFDZCxNQUFNLEdBQUksS0FBSyxDQUFDLE1BQWMsQ0FBQyxHQUFHLElBQUksQ0FBQyxDQUFDO2dCQUM1QyxDQUFDLEVBQUUsR0FBRyxJQUFJLFNBQVMsQ0FBQyxDQUFDO1lBQ3pCLENBQUMsQ0FBQyxDQUFDO1lBQ0gsT0FBTyxNQUFNLENBQUM7UUFDbEIsQ0FBQztLQUNKLENBQUM7QUFDTixDQUFDO0FBaENELDRCQWdDQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCAqIGFzIHByZWFjdCBmcm9tIFwicHJlYWN0XCI7XG5pbXBvcnQgeyBvYnNlcnZhYmxlLCBSZWFjdGlvbiB9IGZyb20gXCJtb2J4XCI7XG5pbXBvcnQgeyBtZWFzdXJlQmxvY2sgfSBmcm9tIFwic29ja2V0LWZ1bmN0aW9uL3NyYy9wcm9maWxpbmcvbWVhc3VyZVwiO1xuXG5sZXQgZ2xvYmFsQ29uc3RydWN0T3JkZXIgPSAxO1xuZXhwb3J0IGZ1bmN0aW9uIG9ic2VydmVyPFxuICAgIFQgZXh0ZW5kcyB7XG4gICAgICAgIG5ldyguLi5hcmdzOiBhbnlbXSk6IHtcbiAgICAgICAgICAgIHJlbmRlcigpOiBwcmVhY3QuQ29tcG9uZW50Q2hpbGQ7XG4gICAgICAgICAgICBmb3JjZVVwZGF0ZShjYWxsYmFjaz86ICgpID0+IHZvaWQpOiB2b2lkO1xuICAgICAgICAgICAgY29tcG9uZW50V2lsbFVubW91bnQ/KCk6IHZvaWQ7XG4gICAgICAgIH1cbiAgICB9XG4+KFxuICAgIENvbnN0cnVjdG9yOiBUXG4pIHtcbiAgICBsZXQgbmFtZSA9IENvbnN0cnVjdG9yLm5hbWU7XG4gICAgcmV0dXJuIGNsYXNzIGV4dGVuZHMgQ29uc3RydWN0b3Ige1xuICAgICAgICAvLyBAdHMtaWdub3JlXG4gICAgICAgIHN0YXRpYyBnZXQgbmFtZSgpIHsgcmV0dXJuIENvbnN0cnVjdG9yLm5hbWU7IH1cbiAgICAgICAgcmVhY3Rpb24gPSBuZXcgUmVhY3Rpb24oYHJlbmRlci4ke25hbWV9LiR7Z2xvYmFsQ29uc3RydWN0T3JkZXIrK31gLCAoKSA9PiB7XG4gICAgICAgICAgICBzdXBlci5mb3JjZVVwZGF0ZSgpO1xuICAgICAgICB9KTtcbiAgICAgICAgY29tcG9uZW50V2lsbFVubW91bnQoKSB7XG4gICAgICAgICAgICB0aGlzLnJlYWN0aW9uLmRpc3Bvc2UoKTtcbiAgICAgICAgICAgIHN1cGVyLmNvbXBvbmVudFdpbGxVbm1vdW50Py4oKTtcbiAgICAgICAgfVxuICAgICAgICByZW5kZXIoLi4uYXJnczogYW55W10pIHtcbiAgICAgICAgICAgIGxldCBvdXRwdXQ6IHByZWFjdC5Db21wb25lbnRDaGlsZDtcbiAgICAgICAgICAgIHRoaXMucmVhY3Rpb24udHJhY2soKCkgPT4ge1xuICAgICAgICAgICAgICAgIG1lYXN1cmVCbG9jaygoKSA9PiB7XG4gICAgICAgICAgICAgICAgICAgIG91dHB1dCA9IChzdXBlci5yZW5kZXIgYXMgYW55KSguLi5hcmdzKTtcbiAgICAgICAgICAgICAgICB9LCBgJHtuYW1lfXxyZW5kZXJgKTtcbiAgICAgICAgICAgIH0pO1xuICAgICAgICAgICAgcmV0dXJuIG91dHB1dDtcbiAgICAgICAgfVxuICAgIH07XG59Il19
36
- /* _JS_SOURCE_HASH = "fe68ffdc0211272fc44c1e75e0764edfae9f906d786a5dd59e684386a442d95f"; */
36
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib2JzZXJ2ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJvYnNlcnZlci50c3giXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsTUFBTSxDQUFDLFdBQVcsR0FBRyxJQUFJLENBQUM7QUFHMUIsK0JBQTRDO0FBQzVDLG1FQUFxRTtBQUVyRSxJQUFJLG9CQUFvQixHQUFHLENBQUMsQ0FBQztBQUM3QixTQUFnQixRQUFRLENBU3BCLFdBQWM7SUFFZCxJQUFJLElBQUksR0FBRyxXQUFXLENBQUMsSUFBSSxDQUFDO0lBQzVCLE9BQU8sS0FBTSxTQUFRLFdBQVc7UUFBekI7O1lBR0gsYUFBUSxHQUFHLElBQUksZUFBUSxDQUFDLFVBQVUsSUFBSSxJQUFJLG9CQUFvQixFQUFFLEVBQUUsRUFBRSxHQUFHLEVBQUU7Z0JBQ3JFLEtBQUssQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUN4QixDQUFDLENBQUMsQ0FBQztRQWNQLENBQUM7UUFsQkcsYUFBYTtRQUNiLE1BQU0sS0FBSyxJQUFJLEtBQUssT0FBTyxXQUFXLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztRQUk5QyxvQkFBb0I7O1lBQ2hCLElBQUksQ0FBQyxRQUFRLENBQUMsT0FBTyxFQUFFLENBQUM7WUFDeEIsTUFBQSxLQUFLLENBQUMsb0JBQW9CLG9EQUFJLENBQUM7UUFDbkMsQ0FBQztRQUNELE1BQU0sQ0FBQyxHQUFHLElBQVc7WUFDakIsSUFBSSxNQUE2QixDQUFDO1lBQ2xDLElBQUksQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRTtnQkFDckIsSUFBQSxzQkFBWSxFQUFDLEdBQUcsRUFBRTtvQkFDZCxNQUFNLEdBQUksS0FBSyxDQUFDLE1BQWMsQ0FBQyxHQUFHLElBQUksQ0FBQyxDQUFDO2dCQUM1QyxDQUFDLEVBQUUsR0FBRyxJQUFJLFNBQVMsQ0FBQyxDQUFDO1lBQ3pCLENBQUMsQ0FBQyxDQUFDO1lBQ0gsT0FBTyxNQUFNLENBQUM7UUFDbEIsQ0FBQztLQUNKLENBQUM7QUFDTixDQUFDO0FBaENELDRCQWdDQyIsInNvdXJjZXNDb250ZW50IjpbIm1vZHVsZS5hbGxvd2NsaWVudCA9IHRydWU7XG5cbmltcG9ydCAqIGFzIHByZWFjdCBmcm9tIFwicHJlYWN0XCI7XG5pbXBvcnQgeyBvYnNlcnZhYmxlLCBSZWFjdGlvbiB9IGZyb20gXCJtb2J4XCI7XG5pbXBvcnQgeyBtZWFzdXJlQmxvY2sgfSBmcm9tIFwic29ja2V0LWZ1bmN0aW9uL3NyYy9wcm9maWxpbmcvbWVhc3VyZVwiO1xuXG5sZXQgZ2xvYmFsQ29uc3RydWN0T3JkZXIgPSAxO1xuZXhwb3J0IGZ1bmN0aW9uIG9ic2VydmVyPFxuICAgIFQgZXh0ZW5kcyB7XG4gICAgICAgIG5ldyguLi5hcmdzOiBhbnlbXSk6IHtcbiAgICAgICAgICAgIHJlbmRlcigpOiBwcmVhY3QuQ29tcG9uZW50Q2hpbGQ7XG4gICAgICAgICAgICBmb3JjZVVwZGF0ZShjYWxsYmFjaz86ICgpID0+IHZvaWQpOiB2b2lkO1xuICAgICAgICAgICAgY29tcG9uZW50V2lsbFVubW91bnQ/KCk6IHZvaWQ7XG4gICAgICAgIH1cbiAgICB9XG4+KFxuICAgIENvbnN0cnVjdG9yOiBUXG4pIHtcbiAgICBsZXQgbmFtZSA9IENvbnN0cnVjdG9yLm5hbWU7XG4gICAgcmV0dXJuIGNsYXNzIGV4dGVuZHMgQ29uc3RydWN0b3Ige1xuICAgICAgICAvLyBAdHMtaWdub3JlXG4gICAgICAgIHN0YXRpYyBnZXQgbmFtZSgpIHsgcmV0dXJuIENvbnN0cnVjdG9yLm5hbWU7IH1cbiAgICAgICAgcmVhY3Rpb24gPSBuZXcgUmVhY3Rpb24oYHJlbmRlci4ke25hbWV9LiR7Z2xvYmFsQ29uc3RydWN0T3JkZXIrK31gLCAoKSA9PiB7XG4gICAgICAgICAgICBzdXBlci5mb3JjZVVwZGF0ZSgpO1xuICAgICAgICB9KTtcbiAgICAgICAgY29tcG9uZW50V2lsbFVubW91bnQoKSB7XG4gICAgICAgICAgICB0aGlzLnJlYWN0aW9uLmRpc3Bvc2UoKTtcbiAgICAgICAgICAgIHN1cGVyLmNvbXBvbmVudFdpbGxVbm1vdW50Py4oKTtcbiAgICAgICAgfVxuICAgICAgICByZW5kZXIoLi4uYXJnczogYW55W10pIHtcbiAgICAgICAgICAgIGxldCBvdXRwdXQ6IHByZWFjdC5Db21wb25lbnRDaGlsZDtcbiAgICAgICAgICAgIHRoaXMucmVhY3Rpb24udHJhY2soKCkgPT4ge1xuICAgICAgICAgICAgICAgIG1lYXN1cmVCbG9jaygoKSA9PiB7XG4gICAgICAgICAgICAgICAgICAgIG91dHB1dCA9IChzdXBlci5yZW5kZXIgYXMgYW55KSguLi5hcmdzKTtcbiAgICAgICAgICAgICAgICB9LCBgJHtuYW1lfXxyZW5kZXJgKTtcbiAgICAgICAgICAgIH0pO1xuICAgICAgICAgICAgcmV0dXJuIG91dHB1dDtcbiAgICAgICAgfVxuICAgIH07XG59Il19
37
+ /* _JS_SOURCE_HASH = "9ea1e7947dad4dc649b606086b48cc67b99bda02fd8fbe7af03aa1185a7420d9"; */