Merge pull request #18 from hoobs-org/development

mkellsy · web-flow · commit d9be43682ee8 · 2021-07-19T07:23:47.000-06:00
Development
diff --git a/bin/bleeding b/bin/bleeding
@@ -215,4 +215,9 @@ setup() {
     echo "Run \"${bold}sudo apt install -y hoobs${normal}\" to install HOOBS, node and yarn"
 }
 
+clean() {
+    exec_cmd "rm -f /etc/apt/sources.list.d/hoobs.list"
+}
+
+clean
 setup
diff --git a/bin/build b/bin/build
@@ -79,11 +79,43 @@ Program.command("cli", { isDefault: true })
 
             if (!existsSync(join(root, "../repo/src")))  mkdirSync(join(root, "../repo/src"));
             if (existsSync(join(root, "../repo/src", `hoobs-cli-v${pjson.version}.tar.gz`))) unlinkSync(join(root, "../repo/src", `hoobs-cli-v${pjson.version}.tar.gz`))
-            if (existsSync(join(root, "../repo", repo))) unlinkSync(join(root, "../repo", repo))
 
             moveSync(join(root, "dist", `hoobs-cli-v${pjson.version}.tar.gz`), join(root, "../repo/src", `hoobs-cli-v${pjson.version}.tar.gz`));
-            copyFileSync(join(root, "bin", repo), join(root, "../repo", repo));
-            execSync(`chmod 755 ${join(root, "../repo", repo)}`, { cwd: root, stdio: "inherit" });
+
+            switch (repo) {
+                case "stable":
+                    if (existsSync(join(root, "../repo/stable"))) unlinkSync(join(root, "../repo/stable"));
+                    if (existsSync(join(root, "../repo/edge"))) unlinkSync(join(root, "../repo/edge"));
+                    if (existsSync(join(root, "../repo/bleeding"))) unlinkSync(join(root, "../repo/bleeding"));
+
+                    copyFileSync(join(root, "bin/stable"), join(root, "../repo", "stable"));
+                    copyFileSync(join(root, "bin/edge"), join(root, "../repo", "edge"));
+                    copyFileSync(join(root, "bin/bleeding"), join(root, "../repo/bleeding"));
+
+                    execSync(`chmod 755 ${join(root, "../repo/stable")}`, { cwd: root, stdio: "inherit" });
+                    execSync(`chmod 755 ${join(root, "../repo/edge")}`, { cwd: root, stdio: "inherit" });
+                    execSync(`chmod 755 ${join(root, "../repo/bleeding")}`, { cwd: root, stdio: "inherit" });
+                    break;
+
+                case "edge":
+                    if (existsSync(join(root, "../repo/edge"))) unlinkSync(join(root, "../repo/edge"));
+                    if (existsSync(join(root, "../repo/bleeding"))) unlinkSync(join(root, "../repo/bleeding"));
+
+                    copyFileSync(join(root, "bin/edge"), join(root, "../repo/edge"));
+                    copyFileSync(join(root, "bin/bleeding"), join(root, "../repo/bleeding"));
+
+                    execSync(`chmod 755 ${join(root, "../repo/edge")}`, { cwd: root, stdio: "inherit" });
+                    execSync(`chmod 755 ${join(root, "../repo/bleeding")}`, { cwd: root, stdio: "inherit" });
+                    break;
+
+                default:
+                    if (existsSync(join(root, "../repo/bleeding"))) unlinkSync(join(root, "../repo/bleeding"));
+
+                    copyFileSync(join(root, "bin/bleeding"), join(root, "../repo/bleeding"));
+                    execSync(`chmod 755 ${join(root, "../repo/bleeding")}`, { cwd: root, stdio: "inherit" });
+                    break;
+            }
+
             mkdirSync(join(root, "dist/DEBIAN"));
 
             let control = "";
@@ -100,15 +132,58 @@ Program.command("cli", { isDefault: true })
             control += "Description: Command line interface for the certified HOOBS smart home stack.\n";
 
             writeFileSync(join(root, "dist/DEBIAN/control"), control);
+
             copyFileSync(join(root, "bin", "postinst"), join(root, "dist/DEBIAN", "postinst"));
+
             execSync(`chmod 755 ${join(root, "dist/DEBIAN", "postinst")}`, { cwd: root, stdio: "inherit" });
             execSync("dpkg-deb --build dist", { cwd: root, stdio: "inherit" });
 
-            if (!existsSync(join(root, "../repo/deb", repo)))  mkdirSync(join(root, "../repo/deb", repo));
-            if (existsSync(join(root, "../repo/deb", repo, `hoobs-cli-v${pjson.version}.deb`))) unlinkSync(join(root, "../repo/deb", repo, `hoobs-cli-v${pjson.version}.deb`));
+            switch (repo) {
+                case "stable":
+                    if (!existsSync(join(root, "../repo/deb/stable")))  mkdirSync(join(root, "../repo/deb/stable"));
+                    if (!existsSync(join(root, "../repo/deb/edge")))  mkdirSync(join(root, "../repo/deb/edge"));
+                    if (!existsSync(join(root, "../repo/deb/bleeding")))  mkdirSync(join(root, "../repo/deb/bleeding"));
+
+                    if (existsSync(join(root, "../repo/deb/stable", `hoobs-cli-v${pjson.version}.deb`))) unlinkSync(join(root, "../repo/deb/stable", `hoobs-cli-v${pjson.version}.deb`));
+                    if (existsSync(join(root, "../repo/deb/edge", `hoobs-cli-v${pjson.version}.deb`))) unlinkSync(join(root, "../repo/deb/edge", `hoobs-cli-v${pjson.version}.deb`));
+                    if (existsSync(join(root, "../repo/deb/bleeding", `hoobs-cli-v${pjson.version}.deb`))) unlinkSync(join(root, "../repo/deb/bleeding", `hoobs-cli-v${pjson.version}.deb`));
+
+                    copyFileSync(join(root, "dist.deb"), join(root, "../repo/deb/stable", `hoobs-cli-v${pjson.version}.deb`));
+                    copyFileSync(join(root, "dist.deb"), join(root, "../repo/deb/edge", `hoobs-cli-v${pjson.version}.deb`));
+                    copyFileSync(join(root, "dist.deb"), join(root, "../repo/deb/bleeding", `hoobs-cli-v${pjson.version}.deb`));
+
+                    unlinkSync(join(root, "dist.deb"));
+
+                    execSync(`dpkg-sig --sign builder ${join(root, "../repo/deb/stable", `hoobs-cli-v${pjson.version}.deb`)}`, { cwd: root, stdio: "inherit" });
+                    execSync(`dpkg-sig --sign builder ${join(root, "../repo/deb/edge", `hoobs-cli-v${pjson.version}.deb`)}`, { cwd: root, stdio: "inherit" });
+                    execSync(`dpkg-sig --sign builder ${join(root, "../repo/deb/bleeding", `hoobs-cli-v${pjson.version}.deb`)}`, { cwd: root, stdio: "inherit" });
+                    break;
+
+                case "edge":
+                    if (!existsSync(join(root, "../repo/deb/edge")))  mkdirSync(join(root, "../repo/deb/edge"));
+                    if (!existsSync(join(root, "../repo/deb/bleeding")))  mkdirSync(join(root, "../repo/deb/bleeding"));
+
+                    if (existsSync(join(root, "../repo/deb/edge", `hoobs-cli-v${pjson.version}.deb`))) unlinkSync(join(root, "../repo/deb/edge", `hoobs-cli-v${pjson.version}.deb`));
+                    if (existsSync(join(root, "../repo/deb/bleeding", `hoobs-cli-v${pjson.version}.deb`))) unlinkSync(join(root, "../repo/deb/bleeding", `hoobs-cli-v${pjson.version}.deb`));
+
+                    copyFileSync(join(root, "dist.deb"), join(root, "../repo/deb/edge", `hoobs-cli-v${pjson.version}.deb`));
+                    copyFileSync(join(root, "dist.deb"), join(root, "../repo/deb/bleeding", `hoobs-cli-v${pjson.version}.deb`));
+
+                    unlinkSync(join(root, "dist.deb"));
+
+                    execSync(`dpkg-sig --sign builder ${join(root, "../repo/deb/edge", `hoobs-cli-v${pjson.version}.deb`)}`, { cwd: root, stdio: "inherit" });
+                    execSync(`dpkg-sig --sign builder ${join(root, "../repo/deb/bleeding", `hoobs-cli-v${pjson.version}.deb`)}`, { cwd: root, stdio: "inherit" });
+                    break;
+
+                default:
+                    if (!existsSync(join(root, "../repo/deb/bleeding")))  mkdirSync(join(root, "../repo/deb/bleeding"));
+                    if (existsSync(join(root, "../repo/deb/bleeding", `hoobs-cli-v${pjson.version}.deb`))) unlinkSync(join(root, "../repo/deb/bleeding", `hoobs-cli-v${pjson.version}.deb`));
 
-            moveSync(join(root, "dist.deb"), join(root, "../repo/deb", repo, `hoobs-cli-v${pjson.version}.deb`));
-            execSync(`dpkg-sig --sign builder ${join(root, "../repo/deb", repo, `hoobs-cli-v${pjson.version}.deb`)}`, { cwd: root, stdio: "inherit" });
+                    copyFileSync(join(root, "dist.deb"), join(root, "../repo/deb/bleeding", `hoobs-cli-v${pjson.version}.deb`));
+                    unlinkSync(join(root, "dist.deb"));
+                    execSync(`dpkg-sig --sign builder ${join(root, "../repo/deb/bleeding", `hoobs-cli-v${pjson.version}.deb`)}`, { cwd: root, stdio: "inherit" });
+                    break;
+            }
 
             if (existsSync(join(root, "dist"))) execSync(`${join(root, "node_modules", ".bin", "rimraf")} ${join(root, "dist")}`, { cwd: root, stdio: "inherit" });
         }
diff --git a/bin/edge b/bin/edge
@@ -215,4 +215,9 @@ setup() {
     echo "Run \"${bold}sudo apt install -y hoobs${normal}\" to install HOOBS, node and yarn"
 }
 
+clean() {
+    exec_cmd "rm -f /etc/apt/sources.list.d/hoobs.list"
+}
+
+clean
 setup
diff --git a/bin/postinst b/bin/postinst
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 cd /usr/lib/hbs
-yarn install --force --production
+yarn install --force --production --network-timeout 100000
diff --git a/bin/stable b/bin/stable
@@ -215,4 +215,9 @@ setup() {
     echo "Run \"${bold}sudo apt install -y hoobs${normal}\" to install HOOBS, node and yarn"
 }
 
+clean() {
+    exec_cmd "rm -f /etc/apt/sources.list.d/hoobs.list"
+}
+
+clean
 setup
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "hbs",
-    "version": "4.0.33",
+    "version": "4.0.40",
     "description": "Command line interface for the certified HOOBS smart home stack.",
     "license": "GPL-3.0",
     "repository": {
@@ -20,7 +20,7 @@
         "debug": "sudo bin/hbs --mode development"
     },
     "dependencies": {
-        "@hoobs/sdk": "^4.4.7",
+        "@hoobs/sdk": "^4.4.11",
         "archiver": "^5.2.0",
         "as-table": "^1.0.55",
         "axios": "^0.21.1",
diff --git a/src/plugins/index.ts b/src/plugins/index.ts
@@ -85,6 +85,7 @@ export default class Plugins {
                 flags.push("add");
                 flags.push("--unsafe-perm");
                 flags.push("--ignore-engines");
+                flags.push("--network-timeout 100000");
                 flags.push("hap-nodejs");
 
                 const proc = spawn(Paths.yarn, flags, {
@@ -111,6 +112,7 @@ export default class Plugins {
                 flags.push("add");
                 flags.push("--unsafe-perm");
                 flags.push("--ignore-engines");
+                flags.push("--network-timeout 100000");
                 flags.push(`${name}@${tag}`);
 
                 if ((definition || {}).sidecar) {
@@ -245,7 +247,7 @@ export default class Plugins {
                 flags.push("add");
                 flags.push("--unsafe-perm");
                 flags.push("--ignore-engines");
-
+                flags.push("--network-timeout 100000");
                 flags.push(`${name}@${tag}`);
 
                 Plugins.definition(name).then((definition) => {
@@ -275,6 +277,7 @@ export default class Plugins {
             } else {
                 flags.push("upgrade");
                 flags.push("--ignore-engines");
+                flags.push("--network-timeout 100000");
 
                 const proc = spawn(Paths.yarn, flags, {
                     cwd: Paths.data(State.id),
diff --git a/src/system/bridges.ts b/src/system/bridges.ts
@@ -41,6 +41,7 @@ import State from "../state";
 import Paths from "./paths";
 import Config from "../config";
 import { sanitize } from "../formatters";
+import { cloneJson } from "../json";
 
 const PROMPT: Inquirer.PromptModule = Inquirer.createPromptModule();
 const BRIDGE_TEARDOWN_DELAY = 1000;
@@ -58,6 +59,7 @@ export interface BridgeRecord {
     plugins?: string;
     advertiser?: string;
     project?: string;
+    debugging?: boolean,
 }
 
 const reserved = [
@@ -218,7 +220,7 @@ export default class Bridges {
         const bridges: BridgeRecord[] = [];
 
         for (let i = 0; i < State.bridges.length; i += 1) {
-            const { ...bridge } = State.bridges[i];
+            const bridge = cloneJson(State.bridges[i]);
 
             if (bridge.id === "hub") {
                 bridges.unshift({
@@ -621,7 +623,7 @@ export default class Bridges {
                             const bridges = Paths.loadJson<BridgeRecord[]>(Paths.bridges, []);
 
                             for (let i = 0; i < bridges.length; i += 1) {
-                                execSync(`${Paths.yarn} install --unsafe-perm --ignore-engines`, {
+                                execSync(`${Paths.yarn} install --unsafe-perm --ignore-engines --network-timeout 100000 --network-concurrency 1 --force --verbose`, {
                                     cwd: Paths.data(bridges[i].id),
                                     stdio: "inherit",
                                 });
diff --git a/yarn.lock b/yarn.lock
@@ -63,10 +63,10 @@
     source-map-support "^0.5.19"
     tslib "^2.0.3"
 
-"@hoobs/sdk@^4.4.7":
-  version "4.4.7"
-  resolved "https://registry.yarnpkg.com/@hoobs/sdk/-/sdk-4.4.7.tgz#e066c36b472106b716ee51d4f33081df68129f3b"
-  integrity sha512-GVaNBsZCQpHa0sLJWtdxZF/9gb326rMsbLOyxzUBtxnFhAIcI7iI6OXRXbe5m4S/PuUDMbBY6SBrqjkIB68fOQ==
+"@hoobs/sdk@^4.4.11":
+  version "4.4.11"
+  resolved "https://registry.yarnpkg.com/@hoobs/sdk/-/sdk-4.4.11.tgz#0655668e93e8903734cb1592ab26c763f42eb87d"
+  integrity sha512-fHit9WyNuv96CiGGe1JfpcmriC/B8uDWt/ZPwXNvrWksfuEP73zTSS+ONM5Z+57MMqqMThQmxcQcwhSaI/0RPQ==
   dependencies:
     axios "^0.21.1"
     sanitize-filename "^1.6.3"

Original file line number	Diff line number	Diff line change
`@@ -215,4 +215,9 @@ setup() {`
`215`	`215`	`echo "Run \"${bold}sudo apt install -y hoobs${normal}\" to install HOOBS, node and yarn"`
`216`	`216`	`}`
`217`	`217`
	`218`	`+clean() {`
	`219`	`+ exec_cmd "rm -f /etc/apt/sources.list.d/hoobs.list"`
	`220`	`+}`
	`221`	`+`
	`222`	`+clean`
`218`	`223`	`setup`