From 4b7efedfac74248d89549370ca368cb61fb7a55e Mon Sep 17 00:00:00 2001 From: Michael Taylor Date: Mon, 28 Oct 2024 10:44:57 -0400 Subject: [PATCH 1/3] fix: unregister store monitor on unsubscribe --- src/controllers/storeController.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/controllers/storeController.ts b/src/controllers/storeController.ts index 34c32ba..b490e05 100644 --- a/src/controllers/storeController.ts +++ b/src/controllers/storeController.ts @@ -9,6 +9,7 @@ import { DigPeer, ServerCoin, NconfManager, + StoreMonitorRegistry } from "@dignetwork/dig-sdk"; import { getStorageLocation } from "../utils/storage"; import requestIp from 'request-ip'; @@ -66,10 +67,16 @@ export const unsubscribeToStore = async ( try { const { storeId } = req.body; + const storeMonitorRegistryInstance = StoreMonitorRegistry.getInstance(); + storeMonitorRegistryInstance.unregisterStore(storeId); + const pathToStore = path.resolve(getStorageLocation(), "stores", storeId); // Remove the store directory - setTimeout(() => fs.rmdirSync(pathToStore, { recursive: true }), 0); + setTimeout(() => { + fs.rmdirSync(pathToStore, { recursive: true }); + storeMonitorRegistryInstance.unregisterStore(storeId); + }, 0); res.status(200).json({ message: `Unsubscribed to store ${storeId}` }); } catch (error) { From 6d99119a892248feb0b1689cf3d2de7e7969dfa0 Mon Sep 17 00:00:00 2001 From: Michael Taylor Date: Sat, 16 Nov 2024 09:05:31 -0500 Subject: [PATCH 2/3] chore: update sdk --- package-lock.json | 24 ++++++++++++++++++------ package.json | 2 +- src/tasks/sync_stores.ts | 6 ++---- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index b951aa3..aed94ce 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "ISC", "dependencies": { "@dignetwork/datalayer-driver": "^0.1.28", - "@dignetwork/dig-sdk": "^0.0.1-alpha.174", + "@dignetwork/dig-sdk": "^0.0.1-alpha.194", "async-mutex": "^0.5.0", "busboy": "^1.6.0", "express": "^4.19.2", @@ -252,9 +252,9 @@ } }, "node_modules/@dignetwork/dig-sdk": { - "version": "0.0.1-alpha.174", - "resolved": "https://registry.npmjs.org/@dignetwork/dig-sdk/-/dig-sdk-0.0.1-alpha.174.tgz", - "integrity": "sha512-dy5fXblcvgpZCkl46+LQyjiHwbtktn5nAb7Ia6GKGhpPANhCb1swm9gMPfn+SmmCUXUnFRkIcgJDm9Dk6nWJUw==", + "version": "0.0.1-alpha.194", + "resolved": "https://registry.npmjs.org/@dignetwork/dig-sdk/-/dig-sdk-0.0.1-alpha.194.tgz", + "integrity": "sha512-yo7LgOYaGZ+xyTLWI/RtmIRoYAyzMVyePQp20d83TFTPqMf+/h3yjWzgqp3wDQf93JADOarBdkPZ8xEMZMqcIQ==", "dependencies": { "@dignetwork/datalayer-driver": "^0.1.29", "@dignetwork/dig-sdk": "^0.0.1-alpha.158", @@ -272,6 +272,7 @@ "crypto-js": "^4.2.0", "figures": "^6.1.0", "fs-extra": "^11.2.0", + "hi-base32": "^0.5.1", "ignore": "^5.3.2", "inquirer": "^10.2.2", "lodash": "^4.17.21", @@ -283,8 +284,9 @@ "progress-stream": "^2.0.0", "proper-lockfile": "^4.1.2", "redis": "^4.7.0", - "superagent": "^10.1.0", - "unzipper": "^0.12.3" + "superagent": "^10.0.0", + "unzipper": "^0.12.3", + "urns": "^0.6.0" } }, "node_modules/@ethereumjs/rlp": { @@ -3354,6 +3356,11 @@ "node": ">=8" } }, + "node_modules/hi-base32": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/hi-base32/-/hi-base32-0.5.1.tgz", + "integrity": "sha512-EmBBpvdYh/4XxsnUybsPag6VikPYnN30td+vQk+GI3qpahVEG9+gTkG0aXVxTjBqQ5T6ijbWIu77O+C5WFWsnA==" + }, "node_modules/hosted-git-info": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", @@ -5933,6 +5940,11 @@ "node-int64": "^0.4.0" } }, + "node_modules/urns": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/urns/-/urns-0.6.0.tgz", + "integrity": "sha512-KqXGkRiq76KDvw+wHusJL0fSVltnF3Teqf1BK4f1xK3p1u1NAYYBQRsP89nw5CV/y+egjehITVPLh6upfqFdLg==" + }, "node_modules/utf8": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/utf8/-/utf8-3.0.0.tgz", diff --git a/package.json b/package.json index d17ff7f..8ec7a8a 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ ], "dependencies": { "@dignetwork/datalayer-driver": "^0.1.28", - "@dignetwork/dig-sdk": "^0.0.1-alpha.174", + "@dignetwork/dig-sdk": "^0.0.1-alpha.194", "async-mutex": "^0.5.0", "busboy": "^1.6.0", "express": "^4.19.2", diff --git a/src/tasks/sync_stores.ts b/src/tasks/sync_stores.ts index 7642fb7..21d128a 100644 --- a/src/tasks/sync_stores.ts +++ b/src/tasks/sync_stores.ts @@ -256,10 +256,8 @@ const task = new Task("sync-stores", async () => { try { console.log("Starting sync-stores task..."); - const storeList = getStoresList() - // temp fix for a store that is causing issues - .filter((store) => store !== "a3f1b2c4d5e6f708192a3b4c5d6e7f8091a2b3c4d5e6f708192a3b4c5d6e7f80"); - + const storeList = getStoresList(); + let publicIp: string | null | undefined; try { From 54c1043eab18af0629f73e74d741c4a6b44ee5ff Mon Sep 17 00:00:00 2001 From: Michael Taylor Date: Sat, 16 Nov 2024 09:06:05 -0500 Subject: [PATCH 3/3] chore(release): 0.0.1-alpha.142 --- CHANGELOG.md | 7 +++++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a58ea0..f444b82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [0.0.1-alpha.142](https://github.com/DIG-Network/dig-propagation-server/compare/v0.0.1-alpha.141...v0.0.1-alpha.142) (2024-11-16) + + +### Bug Fixes + +* unregister store monitor on unsubscribe ([4b7efed](https://github.com/DIG-Network/dig-propagation-server/commit/4b7efedfac74248d89549370ca368cb61fb7a55e)) + ### [0.0.1-alpha.141](https://github.com/DIG-Network/dig-propagation-server/compare/v0.0.1-alpha.140...v0.0.1-alpha.141) (2024-11-16) diff --git a/package-lock.json b/package-lock.json index aed94ce..fcc42a5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "dig-propagation-server", - "version": "0.0.1-alpha.141", + "version": "0.0.1-alpha.142", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "dig-propagation-server", - "version": "0.0.1-alpha.141", + "version": "0.0.1-alpha.142", "license": "ISC", "dependencies": { "@dignetwork/datalayer-driver": "^0.1.28", diff --git a/package.json b/package.json index 8ec7a8a..7f61b3d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dig-propagation-server", - "version": "0.0.1-alpha.141", + "version": "0.0.1-alpha.142", "description": "", "type": "commonjs", "main": "./dist/index.js",