cloud: publish beta

koush · Aug 17, 2023 · ff28238 · ff28238
1 parent 4e97443
commit ff28238
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 168 deletions.
diff --git a/plugins/cloud/package-lock.json b/plugins/cloud/package-lock.json
diff --git a/plugins/cloud/package.json b/plugins/cloud/package.json
@@ -43,13 +43,17 @@
       "@scrypted/sdk": "file:../../sdk",
       "axios": "^1.4.0",
       "bpmux": "^8.2.1",
+      "cloudflared": "^0.4.0",
+      "exponential-backoff": "^3.1.1",
       "http-proxy": "^1.18.1",
+      "ip": "^1.1.8",
       "nat-upnp": "file:./external/node-nat-upnp"
    },
    "devDependencies": {
       "@types/http-proxy": "^1.17.11",
+      "@types/ip": "^1.1.0",
       "@types/nat-upnp": "^1.1.2",
       "@types/node": "^20.4.5"
    },
-   "version": "0.1.27"
+   "version": "0.1.29"
 }
diff --git a/plugins/cloud/src/main.ts b/plugins/cloud/src/main.ts
@@ -17,6 +17,11 @@ import { createSelfSignedCertificate } from '../../../server/src/cert';
 import { PushManager } from './push';
 import { readLine } from '../../../common/src/read-stream';
 import { qsparse, qsstringify } from "./qs";
+import * as cloudflared from 'cloudflared';
+import fs, { mkdirSync } from 'fs';
+import { backOff } from "exponential-backoff";
+import ip from 'ip';
+
 // import { registerDuckDns } from "./greenlock";
 
 const { deviceManager, endpointManager, systemManager } = sdk;
@@ -45,6 +50,7 @@ class ScryptedPush extends ScryptedDeviceBase implements BufferConverter {
 }
 
 class ScryptedCloud extends ScryptedDeviceBase implements OauthClient, Settings, BufferConverter, DeviceProvider, HttpRequestHandler {
+    cloudflareTunnel: string;
     manager = new PushManager(DEFAULT_SENDER_ID);
     server: http.Server;
     secureServer: https.Server;
@@ -313,7 +319,7 @@ class ScryptedCloud extends ScryptedDeviceBase implements OauthClient, Settings,
         if (this.storageSettings.values.forwardingMode === 'Custom Domain')
             upnpPort = 443;
 
-        this.console.log(`Mapped port https://127.0.0.1:${this.securePort} to https://${ip}:${upnpPort}`);
+        this.console.log(`Scrypted Cloud mapped https://${ip}:${upnpPort} to https://127.0.0.1:${this.securePort}`);
 
         // the ip is not sent, but should be checked to see if it changed.
         if (this.storageSettings.values.lastPersistedUpnpPort !== upnpPort || ip !== this.storageSettings.values.lastPersistedIp) {
@@ -717,7 +723,8 @@ class ScryptedCloud extends ScryptedDeviceBase implements OauthClient, Settings,
         this.proxy.on('proxyRes', (res, req) => {
             res.headers['X-Scrypted-Cloud'] = req.headers['x-scrypted-cloud'];
             res.headers['X-Scrypted-Direct-Address'] = req.headers['x-scrypted-direct-address'];
-            res.headers['Access-Control-Expose-Headers'] = 'X-Scrypted-Cloud, X-Scrypted-Direct-Address';
+            res.headers['X-Scrypted-Cloud-Address'] = this.cloudflareTunnel;
+            res.headers['Access-Control-Expose-Headers'] = 'X-Scrypted-Cloud, X-Scrypted-Direct-Address, X-Scrypted-Cloud-Address';
         });
 
         let backoff = 0;
@@ -771,6 +778,30 @@ class ScryptedCloud extends ScryptedDeviceBase implements OauthClient, Settings,
                 });
             }
         });
+
+
+        backOff(async () => {
+            try {
+                const pluginVolume = process.env.SCRYPTED_PLUGIN_VOLUME;
+                const cloudflareD = path.join(pluginVolume, 'cloudflare.d');
+                mkdirSync(cloudflareD, {
+                    recursive: true,
+                })
+                process.chdir(cloudflareD);
+
+                if (!fs.existsSync(cloudflared.bin))
+                    await cloudflared.install(cloudflared.bin);
+                const insecureUrl = `http://127.0.0.1:${port}`;
+                const cloudflareTunnel = cloudflared.tunnel({
+                    '--url': insecureUrl,
+                });
+                this.cloudflareTunnel = await cloudflareTunnel.url;
+                this.console.log(`cloudflare url mapped ${this.cloudflareTunnel} to ${insecureUrl}`);
+            }
+            catch (e) {
+                this.cloudflareTunnel = undefined;
+            }
+        });
     }
 
     ensureReverseConnections(registrationId: string) {