@apex-pub/convector-adapter-fabric-in-chaincode 1.5.1 → 2.0.0-alpha.3

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 (6) hide show
  1. package/dist/src/fabric-in-chaincode.controller-adapter.d.ts +4 -5
  2. package/dist/src/fabric-in-chaincode.controller-adapter.js +32 -56
  3. package/dist/src/fabric-in-chaincode.controller-adapter.js.map +1 -1
  4. package/dist/src/index.js +1 -1
  5. package/package.json +11 -15
  6. package/CHANGELOG.md +0 -29
package/dist/src/fabric-in-chaincode.controller-adapter.d.ts CHANGED
@@ -1,4 +1,3 @@
1
- /// <reference types="node" />
2
1
  import { ChaincodeTx } from '@apex-pub/convector-core-chaincode';
3
2
  import { ControllerAdapter } from '@apex-pub/convector-core';
4
3
  export interface InChaincodeAdapterConfig {
@@ -10,13 +9,13 @@ export declare class InChaincodeAdapter implements ControllerAdapter {
10
9
  invoke(controller: string, name: string, config?: InChaincodeAdapterConfig, ...args: any[]): Promise<{
11
10
  result: any;
12
11
  status: number;
13
- message: string;
14
- payload: Buffer;
12
+ message?: string;
13
+ payload?: Uint8Array;
15
14
  }>;
16
15
  rawInvoke(fn: string, config?: InChaincodeAdapterConfig, ...args: any[]): Promise<{
17
16
  result: any;
18
17
  status: number;
19
- message: string;
20
- payload: Buffer;
18
+ message?: string;
19
+ payload?: Uint8Array;
21
20
  }>;
22
21
  }
package/dist/src/fabric-in-chaincode.controller-adapter.js CHANGED
@@ -1,63 +1,39 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- var tslib_1 = require("tslib");
4
- var convector_core_1 = require("@apex-pub/convector-core");
5
- var InChaincodeAdapter = (function () {
6
- function InChaincodeAdapter() {
3
+ exports.InChaincodeAdapter = void 0;
4
+ const convector_core_1 = require("@apex-pub/convector-core");
5
+ class InChaincodeAdapter {
6
+ async invoke(controller, name, config = {}, ...args) {
7
+ return this.rawInvoke(`${controller}_${name}`, config, ...args);
7
8
  }
8
- InChaincodeAdapter.prototype.invoke = function (controller, name, config) {
9
- if (config === void 0) { config = {}; }
10
- var args = [];
11
- for (var _i = 3; _i < arguments.length; _i++) {
12
- args[_i - 3] = arguments[_i];
9
+ async rawInvoke(fn, config = {}, ...args) {
10
+ if (!config.tx) {
11
+ throw new Error('InChaincodeAdapter needs the ChaincodeTx in config');
13
12
  }
14
- return tslib_1.__awaiter(this, void 0, void 0, function () {
15
- return tslib_1.__generator(this, function (_a) {
16
- return [2, this.rawInvoke.apply(this, [controller + "_" + name, config].concat(args))];
17
- });
18
- });
19
- };
20
- InChaincodeAdapter.prototype.rawInvoke = function (fn, config) {
21
- if (config === void 0) { config = {}; }
22
- var args = [];
23
- for (var _i = 2; _i < arguments.length; _i++) {
24
- args[_i - 2] = arguments[_i];
13
+ if (!config.chaincode) {
14
+ throw new Error('InChaincodeAdapter needs a stub in config');
25
15
  }
26
- return tslib_1.__awaiter(this, void 0, void 0, function () {
27
- var stub, beforeTx, res, storage, rawMessage, rawResult;
28
- return tslib_1.__generator(this, function (_a) {
29
- switch (_a.label) {
30
- case 0:
31
- if (!config.tx) {
32
- throw new Error('InChaincodeAdapter needs the ChaincodeTx in config');
33
- }
34
- if (!config.chaincode) {
35
- throw new Error('InChaincodeAdapter needs a stub in config');
36
- }
37
- stub = config.tx.stub.getStub();
38
- beforeTx = stub.constructor.name === 'ChaincodeMockStub' ? {
39
- signedProposal: stub.signedProposal,
40
- txID: stub.txID,
41
- transientMap: stub.transientMap,
42
- args: stub.args
43
- } : {};
44
- return [4, stub.invokeChaincode(config.chaincode, [fn].concat(args), config.channel)];
45
- case 1:
46
- res = _a.sent();
47
- storage = convector_core_1.BaseStorage.current;
48
- storage.stubHelper = config.tx.stub;
49
- Object.assign(stub, beforeTx);
50
- if (res.status === 500) {
51
- rawMessage = res.message.toString();
52
- throw rawMessage ? JSON.parse(rawMessage) : res;
53
- }
54
- rawResult = res.payload.toString('utf8');
55
- return [2, tslib_1.__assign({}, res, { result: rawResult ? JSON.parse(rawResult) : undefined })];
56
- }
57
- });
58
- });
59
- };
60
- return InChaincodeAdapter;
61
- }());
16
+ const stub = config.tx.stub.getStub();
17
+ let beforeTx = stub.constructor.name === 'ChaincodeMockStub' ? {
18
+ signedProposal: stub.signedProposal,
19
+ txID: stub.txID,
20
+ transientMap: stub.transientMap,
21
+ args: stub.args
22
+ } : {};
23
+ const res = await stub.invokeChaincode(config.chaincode, [fn, ...args], config.channel);
24
+ const storage = convector_core_1.BaseStorage.current;
25
+ storage.stubHelper = config.tx.stub;
26
+ Object.assign(stub, beforeTx);
27
+ if (res.status === 500) {
28
+ const rawMessage = res.message.toString();
29
+ throw rawMessage ? JSON.parse(rawMessage) : res;
30
+ }
31
+ const rawResult = res.payload.toString();
32
+ return {
33
+ ...res,
34
+ result: rawResult ? JSON.parse(rawResult) : undefined
35
+ };
36
+ }
37
+ }
62
38
  exports.InChaincodeAdapter = InChaincodeAdapter;
63
39
  //# sourceMappingURL=fabric-in-chaincode.controller-adapter.js.map
package/dist/src/fabric-in-chaincode.controller-adapter.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"fabric-in-chaincode.controller-adapter.js","sourceRoot":"","sources":["../../src/fabric-in-chaincode.controller-adapter.ts"],"names":[],"mappings":";;;AAEA,2DAA0E;AAQ1E;IAAA;IA2CA,CAAC;IAzCc,mCAAM,GAAnB,UAAoB,UAAkB,EAAE,IAAY,EAAE,MAAqC;QAArC,uBAAA,EAAA,WAAqC;QAAE,cAAc;aAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;YAAd,6BAAc;;;;gBACzG,WAAO,IAAI,CAAC,SAAS,OAAd,IAAI,GAAc,UAAU,SAAI,IAAM,EAAE,MAAM,SAAK,IAAI,IAAE;;;KACjE;IAEY,sCAAS,GAAtB,UAAuB,EAAU,EAAE,MAAqC;QAArC,uBAAA,EAAA,WAAqC;QAAE,cAAc;aAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;YAAd,6BAAc;;;;;;;wBACtF,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE;4BACd,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;yBACvE;wBAED,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;4BACrB,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;yBAC9D;wBAEK,IAAI,GAAG,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;wBAElC,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,mBAAmB,CAAC,CAAC,CAAC;4BAC7D,cAAc,EAAG,IAAY,CAAC,cAAc;4BAC5C,IAAI,EAAG,IAAY,CAAC,IAAI;4BACxB,YAAY,EAAG,IAAY,CAAC,YAAY;4BACxC,IAAI,EAAG,IAAY,CAAC,IAAI;yBACzB,CAAC,CAAC,CAAC,EAAE,CAAC;wBACK,WAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,SAAS,GAAG,EAAE,SAAK,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,EAAA;;wBAAjF,GAAG,GAAG,SAA2E;wBACjF,OAAO,GAAG,4BAAW,CAAC,OAAsB,CAAC;wBAInD,OAAO,CAAC,UAAU,GAAG,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC;wBACpC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;wBAE9B,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE;4BAChB,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;4BAC1C,MAAM,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;yBACjD;wBAEK,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;wBAE/C,gCACK,GAAG,IACN,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,KACrD;;;;KACH;IACH,yBAAC;AAAD,CAAC,AA3CD,IA2CC;AA3CY,gDAAkB"}
1
+ {"version":3,"file":"fabric-in-chaincode.controller-adapter.js","sourceRoot":"","sources":["../../src/fabric-in-chaincode.controller-adapter.ts"],"names":[],"mappings":";;;AAEA,6DAA0E;AAQ1E,MAAa,kBAAkB;IAEtB,KAAK,CAAC,MAAM,CAAC,UAAkB,EAAE,IAAY,EAAE,SAAmC,EAAE,EAAE,GAAG,IAAW;QACzG,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,UAAU,IAAI,IAAI,EAAE,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC;IAClE,CAAC;IAEM,KAAK,CAAC,SAAS,CAAC,EAAU,EAAE,SAAmC,EAAE,EAAE,GAAG,IAAW;QACtF,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;QACxE,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;QAC/D,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QAEtC,IAAI,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,mBAAmB,CAAC,CAAC,CAAC;YAC7D,cAAc,EAAG,IAAY,CAAC,cAAc;YAC5C,IAAI,EAAG,IAAY,CAAC,IAAI;YACxB,YAAY,EAAG,IAAY,CAAC,YAAY;YACxC,IAAI,EAAG,IAAY,CAAC,IAAI;SACzB,CAAC,CAAC,CAAC,EAAE,CAAC;QACP,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QACxF,MAAM,OAAO,GAAG,4BAAW,CAAC,OAAsB,CAAC;QAInD,OAAO,CAAC,UAAU,GAAG,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC;QACpC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAE9B,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YACvB,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;YAC1C,MAAM,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;QAClD,CAAC;QAED,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QAEzC,OAAO;YACL,GAAG,GAAG;YACN,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS;SACtD,CAAC;IACJ,CAAC;CACF;AA3CD,gDA2CC"}
package/dist/src/index.js CHANGED
@@ -1,5 +1,5 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- var tslib_1 = require("tslib");
3
+ const tslib_1 = require("tslib");
4
4
  tslib_1.__exportStar(require("./fabric-in-chaincode.controller-adapter"), exports);
5
5
  //# sourceMappingURL=index.js.map
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@apex-pub/convector-adapter-fabric-in-chaincode",
3
- "version": "1.5.1",
3
+ "version": "2.0.0-alpha.3",
4
4
  "description": "Controller adapter to inside chaincode transactions to invoke another chaincode",
5
5
  "license": "Apache-2.0",
6
6
  "repository": {
@@ -33,32 +33,28 @@
33
33
  "clean": "rimraf dist",
34
34
  "clean:docs": "rimraf docs",
35
35
  "build": "npm run clean && tsc",
36
- "prepare": "npm run build",
37
36
  "lint": "tslint --fix -c '../../tslint.json' -p './tsconfig.json'",
38
37
  "test": "mocha -r ts-node/register test/**/*.spec.ts --reporter spec",
39
38
  "predocs:generate": "npm run clean:docs",
40
39
  "docs:generate": "typedoc src --mode file --out docs --target ES6 --excludePrivate",
41
40
  "docs:serve": "http-server docs"
42
41
  },
43
- "peerDependencies": {
44
- "fabric-ca-client": ">=1.1.2",
45
- "fabric-client": ">=1.1.2"
46
- },
47
42
  "dependencies": {
48
- "@apex-pub/convector-core": "^1.5.1",
49
- "@apex-pub/convector-core-chaincode": "^1.5.1",
50
- "@apex-pub/convector-storage-stub": "^1.5.1",
43
+ "@apex-pub/convector-core": "^2.0.0-alpha.3",
44
+ "@apex-pub/convector-core-chaincode": "^2.0.0-alpha.3",
45
+ "@apex-pub/convector-storage-stub": "^2.0.0-alpha.3",
51
46
  "tslib": "^1.9.0"
52
47
  },
53
48
  "devDependencies": {
54
- "@apex-pub/convector-adapter-mock": "^1.5.1",
49
+ "@apex-pub/convector-adapter-mock": "^2.0.0-alpha.3",
55
50
  "http-server": "^0.11.1",
56
- "mocha": "^5.0.3",
51
+ "mocha": "^10.8.2",
57
52
  "npm-scripts-watcher": "^1.0.2",
58
53
  "rimraf": "^2.6.2",
59
- "ts-node": "^6.0.3",
60
- "tslint": "^5.9.1",
54
+ "ts-node": "^10.9.2",
55
+ "tslint": "^6.1.3",
61
56
  "typedoc": "^0.11.1",
62
- "typescript": "2.8.3"
63
- }
57
+ "typescript": "5.4.5"
58
+ },
59
+ "gitHead": "d275636ab454ac4f0c519c48695e25b36890633b"
64
60
  }
package/CHANGELOG.md DELETED
@@ -1,29 +0,0 @@
1
- # Change Log
2
-
3
- All notable changes to this project will be documented in this file.
4
- See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
-
6
- <a name="1.5.1"></a>
7
- ## [1.5.1](https://github.com/hyperledger-labs/convector/tree/develop/%40worldsibu/convector-adapter-fabric/compare/v1.5.0...v1.5.1) (2024-07-30)
8
-
9
-
10
-
11
-
12
- **Note:** Version bump only for package @apex-pub/convector-adapter-fabric-in-chaincode
13
-
14
- <a name="1.5.0"></a>
15
- # 1.5.0 (2024-07-29)
16
-
17
-
18
- ### Bug Fixes
19
-
20
- * in chaincode adapter return nothing ([7c69564](https://github.com/hyperledger-labs/convector/tree/develop/%40worldsibu/convector-adapter-fabric/commit/7c69564))
21
- * patch in chaincode adapter for mock ([967499d](https://github.com/hyperledger-labs/convector/tree/develop/%40worldsibu/convector-adapter-fabric/commit/967499d))
22
- * restore args for in-chaincode calls ([78f4dd2](https://github.com/hyperledger-labs/convector/tree/develop/%40worldsibu/convector-adapter-fabric/commit/78f4dd2))
23
- * throw errors for in-chaincode adapter ([c5fb921](https://github.com/hyperledger-labs/convector/tree/develop/%40worldsibu/convector-adapter-fabric/commit/c5fb921))
24
-
25
-
26
- ### Features
27
-
28
- * in-chaincode adapter with tests ([4b380af](https://github.com/hyperledger-labs/convector/tree/develop/%40worldsibu/convector-adapter-fabric/commit/4b380af))
29
- * raw tx result with $raw() ([3dac63c](https://github.com/hyperledger-labs/convector/tree/develop/%40worldsibu/convector-adapter-fabric/commit/3dac63c))