@xyo-network/react-node 2.57.2 → 2.57.4

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 (14) hide show
  1. package/dist/cjs/hooks/useModuleFromNode.js +21 -9
  2. package/dist/cjs/hooks/useModuleFromNode.js.map +1 -1
  3. package/dist/cjs/hooks/useNodeFromNode.js +1 -1
  4. package/dist/cjs/hooks/useNodeFromNode.js.map +1 -1
  5. package/dist/docs.json +14 -14
  6. package/dist/esm/hooks/useModuleFromNode.js +21 -9
  7. package/dist/esm/hooks/useModuleFromNode.js.map +1 -1
  8. package/dist/esm/hooks/useNodeFromNode.js +1 -1
  9. package/dist/esm/hooks/useNodeFromNode.js.map +1 -1
  10. package/dist/types/hooks/useModuleFromNode.d.ts.map +1 -1
  11. package/package.json +6 -6
  12. package/src/components/Node.stories.tsx +2 -1
  13. package/src/hooks/useModuleFromNode.tsx +19 -9
  14. package/src/hooks/useNodeFromNode.tsx +1 -1
package/dist/cjs/hooks/useModuleFromNode.js CHANGED
@@ -20,20 +20,28 @@ const useModuleFromNode = (nameOrAddress, config) => {
20
20
  if (node) {
21
21
  const attachHandler = (args) => {
22
22
  const eventModule = args.module;
23
+ console.log('attachHandler: ', eventModule.address);
23
24
  if (nameOrAddress && ((eventModule === null || eventModule === void 0 ? void 0 : eventModule.address) === nameOrAddress || (eventModule === null || eventModule === void 0 ? void 0 : eventModule.config.name) === nameOrAddress)) {
24
25
  logger === null || logger === void 0 ? void 0 : logger.debug(`attachHandler-setting [${nameOrAddress}]`);
25
- if ((0, module_model_1.isModuleInstance)(eventModule)) {
26
- setModule(eventModule);
27
- setError(undefined);
26
+ if (eventModule) {
27
+ if ((0, module_model_1.isModuleInstance)(eventModule)) {
28
+ setModule(eventModule);
29
+ setError(undefined);
30
+ }
31
+ else {
32
+ setModule(null);
33
+ setError(Error('Attached module failed identity check'));
34
+ }
28
35
  }
29
36
  else {
30
- setModule(null);
31
- setError(Error('Attached module failed identity check'));
37
+ setModule(undefined);
38
+ setError(undefined);
32
39
  }
33
40
  }
34
41
  };
35
42
  const detachHandler = (args) => {
36
43
  const eventModule = args.module;
44
+ console.log('detachHandler: ', eventModule.address);
37
45
  if (eventModule.address === address) {
38
46
  logger === null || logger === void 0 ? void 0 : logger.debug(`detachHandler-clearing [${address}]`);
39
47
  setModule(null);
@@ -47,12 +55,16 @@ const useModuleFromNode = (nameOrAddress, config) => {
47
55
  setModule(null);
48
56
  setError(Error('Resolved module failed identity check'));
49
57
  }
58
+ else {
59
+ eventUnsubscribe.push(node.on('moduleAttached', attachHandler));
60
+ eventUnsubscribe.push(node.on('moduleDetached', detachHandler));
61
+ logger === null || logger === void 0 ? void 0 : logger.debug(`resolved [${nameOrAddress}]`);
62
+ setModule(module !== null && module !== void 0 ? module : null);
63
+ setError(undefined);
64
+ }
50
65
  }
51
66
  else {
52
- eventUnsubscribe.push(node.on('moduleAttached', attachHandler));
53
- eventUnsubscribe.push(node.on('moduleDetached', detachHandler));
54
- logger === null || logger === void 0 ? void 0 : logger.debug(`resolved [${nameOrAddress}]`);
55
- setModule(module !== null && module !== void 0 ? module : null);
67
+ setModule(undefined);
56
68
  setError(undefined);
57
69
  }
58
70
  }
package/dist/cjs/hooks/useModuleFromNode.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"useModuleFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useModuleFromNode.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"useModuleFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useModuleFromNode.tsx"],"names":[],"mappings":"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"}
package/dist/cjs/hooks/useNodeFromNode.js CHANGED
@@ -5,7 +5,7 @@ const node_model_1 = require("@xyo-network/node-model");
5
5
  const useModuleFromNode_1 = require("./useModuleFromNode");
6
6
  const useNodeFromNode = (nameOrAddress, config) => {
7
7
  const [module, error] = (0, useModuleFromNode_1.useModuleFromNode)(nameOrAddress, config);
8
- const instance = (0, node_model_1.asNodeInstance)(module);
8
+ const instance = module ? (0, node_model_1.asNodeInstance)(module) : module;
9
9
  if (module && !instance) {
10
10
  return [null, Error('Resolved mode is not a NodeInstance')];
11
11
  }
package/dist/cjs/hooks/useNodeFromNode.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"useNodeFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useNodeFromNode.tsx"],"names":[],"mappings":";;;AAAA,wDAAsE;AAEtE,2DAA6E;AAEtE,MAAM,eAAe,GAAG,CAAC,aAAsB,EAAE,MAA6B,EAAwD,EAAE;IAC7I,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,IAAA,qCAAiB,EAAC,aAAa,EAAE,MAAM,CAAC,CAAA;IAChE,MAAM,QAAQ,GAAG,IAAA,2BAAc,EAAC,MAAM,CAAC,CAAA;IACvC,IAAI,MAAM,IAAI,CAAC,QAAQ,EAAE;QACvB,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,qCAAqC,CAAC,CAAC,CAAA;KAC5D;IACD,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;AAC1B,CAAC,CAAA;AAPY,QAAA,eAAe,mBAO3B"}
1
+ {"version":3,"file":"useNodeFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useNodeFromNode.tsx"],"names":[],"mappings":";;;AAAA,wDAAsE;AAEtE,2DAA6E;AAEtE,MAAM,eAAe,GAAG,CAAC,aAAsB,EAAE,MAA6B,EAAwD,EAAE;IAC7I,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,IAAA,qCAAiB,EAAC,aAAa,EAAE,MAAM,CAAC,CAAA;IAChE,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,IAAA,2BAAc,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAA;IACzD,IAAI,MAAM,IAAI,CAAC,QAAQ,EAAE;QACvB,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,qCAAqC,CAAC,CAAC,CAAA;KAC5D;IACD,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;AAC1B,CAAC,CAAA;AAPY,QAAA,eAAe,mBAO3B"}
package/dist/docs.json CHANGED
@@ -601,7 +601,7 @@
601
601
  "fileName": "packages/modules/packages/node/src/components/NodeDrawer.tsx",
602
602
  "line": 10,
603
603
  "character": 17,
604
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/766ebcfe0aff/packages/modules/packages/node/src/components/NodeDrawer.tsx#L10"
604
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/d1de194a5711/packages/modules/packages/node/src/components/NodeDrawer.tsx#L10"
605
605
  }
606
606
  ],
607
607
  "extendedTypes": [
@@ -1349,7 +1349,7 @@
1349
1349
  "fileName": "packages/modules/packages/node/src/hooks/useModuleFromNode.tsx",
1350
1350
  "line": 10,
1351
1351
  "character": 12,
1352
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/766ebcfe0aff/packages/modules/packages/node/src/hooks/useModuleFromNode.tsx#L10"
1352
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/d1de194a5711/packages/modules/packages/node/src/hooks/useModuleFromNode.tsx#L10"
1353
1353
  }
1354
1354
  ],
1355
1355
  "type": {
@@ -1386,7 +1386,7 @@
1386
1386
  "fileName": "packages/modules/packages/node/src/hooks/useModuleFromNode.tsx",
1387
1387
  "line": 11,
1388
1388
  "character": 2,
1389
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/766ebcfe0aff/packages/modules/packages/node/src/hooks/useModuleFromNode.tsx#L11"
1389
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/d1de194a5711/packages/modules/packages/node/src/hooks/useModuleFromNode.tsx#L11"
1390
1390
  }
1391
1391
  ],
1392
1392
  "type": {
@@ -1413,7 +1413,7 @@
1413
1413
  "fileName": "packages/modules/packages/node/src/hooks/useModuleFromNode.tsx",
1414
1414
  "line": 10,
1415
1415
  "character": 57,
1416
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/766ebcfe0aff/packages/modules/packages/node/src/hooks/useModuleFromNode.tsx#L10"
1416
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/d1de194a5711/packages/modules/packages/node/src/hooks/useModuleFromNode.tsx#L10"
1417
1417
  }
1418
1418
  ]
1419
1419
  }
@@ -1681,7 +1681,7 @@
1681
1681
  "fileName": "packages/modules/packages/node/src/components/Node.tsx",
1682
1682
  "line": 7,
1683
1683
  "character": 13,
1684
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/766ebcfe0aff/packages/modules/packages/node/src/components/Node.tsx#L7"
1684
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/d1de194a5711/packages/modules/packages/node/src/components/Node.tsx#L7"
1685
1685
  }
1686
1686
  ],
1687
1687
  "signatures": [
@@ -1772,7 +1772,7 @@
1772
1772
  "fileName": "packages/modules/packages/node/src/components/NodeDrawer.tsx",
1773
1773
  "line": 12,
1774
1774
  "character": 13,
1775
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/766ebcfe0aff/packages/modules/packages/node/src/components/NodeDrawer.tsx#L12"
1775
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/d1de194a5711/packages/modules/packages/node/src/components/NodeDrawer.tsx#L12"
1776
1776
  }
1777
1777
  ],
1778
1778
  "signatures": [
@@ -2045,7 +2045,7 @@
2045
2045
  "fileName": "packages/modules/packages/node/src/hooks/useModuleFromNode.tsx",
2046
2046
  "line": 14,
2047
2047
  "character": 13,
2048
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/766ebcfe0aff/packages/modules/packages/node/src/hooks/useModuleFromNode.tsx#L14"
2048
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/d1de194a5711/packages/modules/packages/node/src/hooks/useModuleFromNode.tsx#L14"
2049
2049
  }
2050
2050
  ],
2051
2051
  "signatures": [
@@ -2060,7 +2060,7 @@
2060
2060
  "fileName": "packages/modules/packages/node/src/hooks/useModuleFromNode.tsx",
2061
2061
  "line": 14,
2062
2062
  "character": 33,
2063
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/766ebcfe0aff/packages/modules/packages/node/src/hooks/useModuleFromNode.tsx#L14"
2063
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/d1de194a5711/packages/modules/packages/node/src/hooks/useModuleFromNode.tsx#L14"
2064
2064
  }
2065
2065
  ],
2066
2066
  "parameters": [
@@ -2443,7 +2443,7 @@
2443
2443
  "fileName": "packages/modules/packages/node/src/hooks/useModulesFromNode.ts",
2444
2444
  "line": 11,
2445
2445
  "character": 13,
2446
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/766ebcfe0aff/packages/modules/packages/node/src/hooks/useModulesFromNode.ts#L11"
2446
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/d1de194a5711/packages/modules/packages/node/src/hooks/useModulesFromNode.ts#L11"
2447
2447
  }
2448
2448
  ],
2449
2449
  "signatures": [
@@ -2458,7 +2458,7 @@
2458
2458
  "fileName": "packages/modules/packages/node/src/hooks/useModulesFromNode.ts",
2459
2459
  "line": 11,
2460
2460
  "character": 34,
2461
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/766ebcfe0aff/packages/modules/packages/node/src/hooks/useModulesFromNode.ts#L11"
2461
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/d1de194a5711/packages/modules/packages/node/src/hooks/useModulesFromNode.ts#L11"
2462
2462
  }
2463
2463
  ],
2464
2464
  "parameters": [
@@ -3071,7 +3071,7 @@
3071
3071
  "fileName": "packages/modules/packages/node/src/hooks/useNodeFromNode.tsx",
3072
3072
  "line": 5,
3073
3073
  "character": 13,
3074
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/766ebcfe0aff/packages/modules/packages/node/src/hooks/useNodeFromNode.tsx#L5"
3074
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/d1de194a5711/packages/modules/packages/node/src/hooks/useNodeFromNode.tsx#L5"
3075
3075
  }
3076
3076
  ],
3077
3077
  "signatures": [
@@ -3086,7 +3086,7 @@
3086
3086
  "fileName": "packages/modules/packages/node/src/hooks/useNodeFromNode.tsx",
3087
3087
  "line": 5,
3088
3088
  "character": 31,
3089
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/766ebcfe0aff/packages/modules/packages/node/src/hooks/useNodeFromNode.tsx#L5"
3089
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/d1de194a5711/packages/modules/packages/node/src/hooks/useNodeFromNode.tsx#L5"
3090
3090
  }
3091
3091
  ],
3092
3092
  "parameters": [
@@ -3426,7 +3426,7 @@
3426
3426
  "fileName": "packages/modules/packages/node/src/hooks/provided/useProvidedNode.tsx",
3427
3427
  "line": 5,
3428
3428
  "character": 13,
3429
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/766ebcfe0aff/packages/modules/packages/node/src/hooks/provided/useProvidedNode.tsx#L5"
3429
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/d1de194a5711/packages/modules/packages/node/src/hooks/provided/useProvidedNode.tsx#L5"
3430
3430
  }
3431
3431
  ],
3432
3432
  "signatures": [
@@ -3441,7 +3441,7 @@
3441
3441
  "fileName": "packages/modules/packages/node/src/hooks/provided/useProvidedNode.tsx",
3442
3442
  "line": 5,
3443
3443
  "character": 31,
3444
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/766ebcfe0aff/packages/modules/packages/node/src/hooks/provided/useProvidedNode.tsx#L5"
3444
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/d1de194a5711/packages/modules/packages/node/src/hooks/provided/useProvidedNode.tsx#L5"
3445
3445
  }
3446
3446
  ],
3447
3447
  "type": {
package/dist/esm/hooks/useModuleFromNode.js CHANGED
@@ -16,20 +16,28 @@ export const useModuleFromNode = (nameOrAddress, config) => {
16
16
  if (node) {
17
17
  const attachHandler = (args) => {
18
18
  const eventModule = args.module;
19
+ console.log('attachHandler: ', eventModule.address);
19
20
  if (nameOrAddress && (eventModule?.address === nameOrAddress || eventModule?.config.name === nameOrAddress)) {
20
21
  logger?.debug(`attachHandler-setting [${nameOrAddress}]`);
21
- if (isModuleInstance(eventModule)) {
22
- setModule(eventModule);
23
- setError(undefined);
22
+ if (eventModule) {
23
+ if (isModuleInstance(eventModule)) {
24
+ setModule(eventModule);
25
+ setError(undefined);
26
+ }
27
+ else {
28
+ setModule(null);
29
+ setError(Error('Attached module failed identity check'));
30
+ }
24
31
  }
25
32
  else {
26
- setModule(null);
27
- setError(Error('Attached module failed identity check'));
33
+ setModule(undefined);
34
+ setError(undefined);
28
35
  }
29
36
  }
30
37
  };
31
38
  const detachHandler = (args) => {
32
39
  const eventModule = args.module;
40
+ console.log('detachHandler: ', eventModule.address);
33
41
  if (eventModule.address === address) {
34
42
  logger?.debug(`detachHandler-clearing [${address}]`);
35
43
  setModule(null);
@@ -43,12 +51,16 @@ export const useModuleFromNode = (nameOrAddress, config) => {
43
51
  setModule(null);
44
52
  setError(Error('Resolved module failed identity check'));
45
53
  }
54
+ else {
55
+ eventUnsubscribe.push(node.on('moduleAttached', attachHandler));
56
+ eventUnsubscribe.push(node.on('moduleDetached', detachHandler));
57
+ logger?.debug(`resolved [${nameOrAddress}]`);
58
+ setModule(module ?? null);
59
+ setError(undefined);
60
+ }
46
61
  }
47
62
  else {
48
- eventUnsubscribe.push(node.on('moduleAttached', attachHandler));
49
- eventUnsubscribe.push(node.on('moduleDetached', detachHandler));
50
- logger?.debug(`resolved [${nameOrAddress}]`);
51
- setModule(module ?? null);
63
+ setModule(undefined);
52
64
  setError(undefined);
53
65
  }
54
66
  }
package/dist/esm/hooks/useModuleFromNode.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"useModuleFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useModuleFromNode.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"useModuleFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useModuleFromNode.tsx"],"names":[],"mappings":"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"}
package/dist/esm/hooks/useNodeFromNode.js CHANGED
@@ -2,7 +2,7 @@ import { asNodeInstance } from '@xyo-network/node-model';
2
2
  import { useModuleFromNode } from './useModuleFromNode';
3
3
  export const useNodeFromNode = (nameOrAddress, config) => {
4
4
  const [module, error] = useModuleFromNode(nameOrAddress, config);
5
- const instance = asNodeInstance(module);
5
+ const instance = module ? asNodeInstance(module) : module;
6
6
  if (module && !instance) {
7
7
  return [null, Error('Resolved mode is not a NodeInstance')];
8
8
  }
package/dist/esm/hooks/useNodeFromNode.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"useNodeFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useNodeFromNode.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAgB,MAAM,yBAAyB,CAAA;AAEtE,OAAO,EAAwB,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAE7E,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,aAAsB,EAAE,MAA6B,EAAwD,EAAE;IAC7I,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,iBAAiB,CAAC,aAAa,EAAE,MAAM,CAAC,CAAA;IAChE,MAAM,QAAQ,GAAG,cAAc,CAAC,MAAM,CAAC,CAAA;IACvC,IAAI,MAAM,IAAI,CAAC,QAAQ,EAAE;QACvB,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,qCAAqC,CAAC,CAAC,CAAA;KAC5D;IACD,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;AAC1B,CAAC,CAAA"}
1
+ {"version":3,"file":"useNodeFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useNodeFromNode.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAgB,MAAM,yBAAyB,CAAA;AAEtE,OAAO,EAAwB,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAE7E,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,aAAsB,EAAE,MAA6B,EAAwD,EAAE;IAC7I,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,iBAAiB,CAAC,aAAa,EAAE,MAAM,CAAC,CAAA;IAChE,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAA;IACzD,IAAI,MAAM,IAAI,CAAC,QAAQ,EAAE;QACvB,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,qCAAqC,CAAC,CAAC,CAAA;KAC5D;IACD,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;AAC1B,CAAC,CAAA"}
package/dist/types/hooks/useModuleFromNode.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"useModuleFromNode.d.ts","sourceRoot":"","sources":["../../../src/hooks/useModuleFromNode.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE1C,OAAO,EAAoB,mBAAmB,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAMjG,MAAM,MAAM,oBAAoB,GAAG,mBAAmB,GAAG;IACvD,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,eAAO,MAAM,iBAAiB,mBAAoB,MAAM,WAAW,oBAAoB,KAAG,CAAC,cAAc,GAAG,IAAI,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CAyE9I,CAAA"}
1
+ {"version":3,"file":"useModuleFromNode.d.ts","sourceRoot":"","sources":["../../../src/hooks/useModuleFromNode.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE1C,OAAO,EAAoB,mBAAmB,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAMjG,MAAM,MAAM,oBAAoB,GAAG,mBAAmB,GAAG;IACvD,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,eAAO,MAAM,iBAAiB,mBAAoB,MAAM,WAAW,oBAAoB,KAAG,CAAC,cAAc,GAAG,IAAI,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CAmF9I,CAAA"}
package/package.json CHANGED
@@ -21,9 +21,9 @@
21
21
  "@xyo-network/module-model": "~2.66.5",
22
22
  "@xyo-network/node": "~2.66.5",
23
23
  "@xyo-network/node-model": "~2.66.5",
24
- "@xyo-network/react-module": "~2.57.2",
25
- "@xyo-network/react-node-context": "~2.57.2",
26
- "@xyo-network/react-node-provider": "~2.57.2",
24
+ "@xyo-network/react-module": "~2.57.4",
25
+ "@xyo-network/react-node-context": "~2.57.4",
26
+ "@xyo-network/react-node-provider": "~2.57.4",
27
27
  "lodash": "^4.17.21"
28
28
  },
29
29
  "devDependencies": {
@@ -32,8 +32,8 @@
32
32
  "@xylabs/ts-scripts-yarn3": "^2.18.11",
33
33
  "@xylabs/tsconfig-react": "^2.18.11",
34
34
  "@xyo-network/payload-model": "~2.66.5",
35
- "@xyo-network/react-storybook": "~2.57.2",
36
- "@xyo-network/react-wallet": "~2.57.2",
35
+ "@xyo-network/react-storybook": "~2.57.4",
36
+ "@xyo-network/react-wallet": "~2.57.4",
37
37
  "typescript": "^5.1.6"
38
38
  },
39
39
  "peerDependencies": {
@@ -88,5 +88,5 @@
88
88
  },
89
89
  "sideEffects": false,
90
90
  "types": "dist/types/index.d.ts",
91
- "version": "2.57.2"
91
+ "version": "2.57.4"
92
92
  }
package/src/components/Node.stories.tsx CHANGED
@@ -9,7 +9,7 @@ import { DefaultSeedPhrase } from '@xyo-network/react-storybook'
9
9
  import { useWallet, WalletProvider } from '@xyo-network/react-wallet'
10
10
  import { useEffect, useState } from 'react'
11
11
 
12
- import { useModuleFromNode, useProvidedNode } from '../hooks'
12
+ import { useModuleFromNode, useNodeFromNode, useProvidedNode } from '../hooks'
13
13
 
14
14
  const TestModuleConfigSchema = 'network.xyo.test.module'
15
15
  class TestModule extends AbstractModule {
@@ -55,6 +55,7 @@ const Template: StoryFn<React.FC> = (props) => {
55
55
  const [description, setDescription] = useState<string>()
56
56
 
57
57
  const [account] = useWallet({ mnemonic: DefaultSeedPhrase, path: '0' })
58
+ const [node2] = useNodeFromNode((node ? node : undefined)?.address)
58
59
 
59
60
  useAsyncEffect(
60
61
  // eslint-disable-next-line react-hooks/exhaustive-deps
package/src/hooks/useModuleFromNode.tsx CHANGED
@@ -27,19 +27,26 @@ export const useModuleFromNode = (nameOrAddress?: string, config?: ModuleFromNod
27
27
  if (node) {
28
28
  const attachHandler = (args: ModuleAttachedEventArgs) => {
29
29
  const eventModule = args.module
30
+ console.log('attachHandler: ', eventModule.address)
30
31
  if (nameOrAddress && (eventModule?.address === nameOrAddress || eventModule?.config.name === nameOrAddress)) {
31
32
  logger?.debug(`attachHandler-setting [${nameOrAddress}]`)
32
- if (isModuleInstance(eventModule)) {
33
- setModule(eventModule)
34
- setError(undefined)
33
+ if (eventModule) {
34
+ if (isModuleInstance(eventModule)) {
35
+ setModule(eventModule)
36
+ setError(undefined)
37
+ } else {
38
+ setModule(null)
39
+ setError(Error('Attached module failed identity check'))
40
+ }
35
41
  } else {
36
- setModule(null)
37
- setError(Error('Attached module failed identity check'))
42
+ setModule(undefined)
43
+ setError(undefined)
38
44
  }
39
45
  }
40
46
  }
41
47
  const detachHandler = (args: ModuleDetachedEventArgs) => {
42
48
  const eventModule = args.module
49
+ console.log('detachHandler: ', eventModule.address)
43
50
  if (eventModule.address === address) {
44
51
  logger?.debug(`detachHandler-clearing [${address}]`)
45
52
  setModule(null)
@@ -52,12 +59,15 @@ export const useModuleFromNode = (nameOrAddress?: string, config?: ModuleFromNod
52
59
  if (!isModuleInstance(module)) {
53
60
  setModule(null)
54
61
  setError(Error('Resolved module failed identity check'))
62
+ } else {
63
+ eventUnsubscribe.push(node.on('moduleAttached', attachHandler))
64
+ eventUnsubscribe.push(node.on('moduleDetached', detachHandler))
65
+ logger?.debug(`resolved [${nameOrAddress}]`)
66
+ setModule(module ?? null)
67
+ setError(undefined)
55
68
  }
56
69
  } else {
57
- eventUnsubscribe.push(node.on('moduleAttached', attachHandler))
58
- eventUnsubscribe.push(node.on('moduleDetached', detachHandler))
59
- logger?.debug(`resolved [${nameOrAddress}]`)
60
- setModule(module ?? null)
70
+ setModule(undefined)
61
71
  setError(undefined)
62
72
  }
63
73
  }
package/src/hooks/useNodeFromNode.tsx CHANGED
@@ -4,7 +4,7 @@ import { ModuleFromNodeConfig, useModuleFromNode } from './useModuleFromNode'
4
4
 
5
5
  export const useNodeFromNode = (nameOrAddress?: string, config?: ModuleFromNodeConfig): [NodeInstance | null | undefined, Error | undefined] => {
6
6
  const [module, error] = useModuleFromNode(nameOrAddress, config)
7
- const instance = asNodeInstance(module)
7
+ const instance = module ? asNodeInstance(module) : module
8
8
  if (module && !instance) {
9
9
  return [null, Error('Resolved mode is not a NodeInstance')]
10
10
  }