@matter/testing 0.13.0-alpha.0-20250330-df5a17eba → 0.13.0-alpha.0-20250401-82b90831a
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.
- package/dist/cjs/chip/state.js +5 -5
- package/dist/cjs/chip/state.js.map +1 -1
- package/dist/cjs/docker/container.d.ts +2 -1
- package/dist/cjs/docker/container.d.ts.map +1 -1
- package/dist/cjs/docker/container.js +3 -2
- package/dist/cjs/docker/container.js.map +1 -1
- package/dist/cjs/docker/image.d.ts +19 -0
- package/dist/cjs/docker/image.d.ts.map +1 -0
- package/dist/cjs/docker/image.js +43 -0
- package/dist/cjs/docker/image.js.map +6 -0
- package/dist/esm/chip/state.js +5 -5
- package/dist/esm/chip/state.js.map +1 -1
- package/dist/esm/docker/container.d.ts +2 -1
- package/dist/esm/docker/container.d.ts.map +1 -1
- package/dist/esm/docker/container.js +3 -2
- package/dist/esm/docker/container.js.map +1 -1
- package/dist/esm/docker/image.d.ts +19 -0
- package/dist/esm/docker/image.d.ts.map +1 -0
- package/dist/esm/docker/image.js +23 -0
- package/dist/esm/docker/image.js.map +6 -0
- package/package.json +3 -3
- package/src/chip/state.ts +5 -5
- package/src/docker/container.ts +4 -3
- package/src/docker/image.ts +39 -0
package/dist/cjs/chip/state.js
CHANGED
|
@@ -135,11 +135,11 @@ const State = {
|
|
|
135
135
|
progress.update("Initializing containers");
|
|
136
136
|
try {
|
|
137
137
|
const result = await initialize();
|
|
138
|
-
const
|
|
139
|
-
const
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
);
|
|
138
|
+
const image = await State.container.image;
|
|
139
|
+
const info = await image.inspect();
|
|
140
|
+
const chipCommit = formatSha(info.Config.Labels["org.opencontainers.image.revision"] ?? "(unknown)");
|
|
141
|
+
const imageVersion = info.Config.Labels["org.opencontainers.image.version"] ?? "(unknown)";
|
|
142
|
+
progress.success(`Initialized CHIP ${import_tools.ansi.bold(chipCommit)} image ${import_tools.ansi.bold(imageVersion)}`);
|
|
143
143
|
return result;
|
|
144
144
|
} catch (e) {
|
|
145
145
|
progress.failure("Initializing containers");
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/chip/state.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,mBAA8B;AAK9B,oBAAuB;AACvB,kBAAqB;AACrB,oBAAuB;AACvB,mBAAoC;AAEpC,6BAAmD;AACnD,8BAAgC;AAEhC,oBAA0C;AAC1C,oCAAqC;AACrC,uBAAyB;AACzB,yBAA2B;AAC3B,uBAAyB;AAvBzB;AAAA;AAAA;AAAA;AAAA;AA4BA,MAAM,SAAS;AAAA,EACX,eAAe;AAAA,EACf,QAAQ;AAAA,EACR,OAAO;AAAA,EACP,SAAS;AAAA,EACT,MAAM;AAAA,EACN,eAAe;AAAA,EACf,eAAe;AAAA,EACf,MAAM;AAAA,EACN,OAAO;AAAA,EACP,qBAAqB,oBAAI,QAAiB;AAAA,EAC1C,eAAe;AAAA,EACf,kBAAkB;AAAA,EAClB,aAAa,oBAAI,IAAY;AAAA,EAC7B,SAAS,MAA2B;AAAA,EACpC,UAAU,oBAAI,IAA8C;AAAA,EAC5D,WAAW,oBAAI,IAAiB;AAAA,EAChC,6BAA6B;AAAA,EAC7B,SAAS,oBAAI,IAA0B;AAAA,EACvC,mBAAmB;AACvB;AAKO,MAAM,QAAQ;AAAA,EACjB,IAAI,YAAY;AACZ,UAAM,YAAY,OAAO;AAEzB,QAAI,cAAc,QAAW;AACzB,YAAM,IAAI,MAAM,qCAAqC;AAAA,IACzD;AAEA,WAAO;AAAA,EACX;AAAA,EAEA,IAAI,OAAO,QAAoB;AAC3B,WAAO,SAAS;AAAA,EACpB;AAAA,EAEA,IAAI,SAAS;AACT,UAAM,SAAS,OAAO;AAEtB,QAAI,WAAW,QAAW;AACtB,YAAM,IAAI,MAAM,2BAA2B;AAAA,IAC/C;AAEA,WAAO;AAAA,EACX;AAAA,EAEA,IAAI,MAAM,OAAc;AACpB,WAAO,QAAQ;AAAA,EACnB;AAAA,EAEA,IAAI,QAAQ;AACR,UAAM,QAAQ,OAAO;AAErB,QAAI,UAAU,QAAW;AACrB,YAAM,IAAI,MAAM,8BAA8B;AAAA,IAClD;AAEA,WAAO;AAAA,EACX;AAAA,EAEA,IAAI,QAAQ,SAA0B;AAClC,WAAO,UAAU;AAAA,EACrB;AAAA,EAEA,IAAI,UAAU;AACV,UAAM,UAAU,OAAO;AAEvB,QAAI,YAAY,QAAW;AACvB,YAAM,IAAI,MAAM,+BAA+B;AAAA,IACnD;AAEA,WAAO;AAAA,EACX;AAAA,EAEA,IAAI,oBAAoB;AACpB,WAAO,OAAO;AAAA,EAClB;AAAA,EAEA,IAAI,kBAAkB,OAAgB;AAClC,WAAO,oBAAoB;AAAA,EAC/B;AAAA,EAEA,IAAI,OAAO;AACP,QAAI,OAAO,SAAS,QAAW;AAC3B,YAAM,IAAI,MAAM,sBAAsB;AAAA,IAC1C;AAEA,WAAO,OAAO;AAAA,EAClB;AAAA,EAEA,IAAI,QAAQ;AACR,QAAI,OAAO,UAAU,QAAW;AAC5B,YAAM,IAAI,MAAM,iCAAiC;AAAA,IACrD;AACA,WAAO,OAAO;AAAA,EAClB;AAAA,EAEA,IAAI,OAAO;AACP,QAAI,OAAO,SAAS,QAAW;AAC3B,YAAM,IAAI,MAAM,gBAAgB;AAAA,IACpC;AAEA,WAAO,OAAO;AAAA,EAClB;AAAA,EAEA,IAAI,gBAAgB;AAChB,WAAO,OAAO;AAAA,EAClB;AAAA;AAAA;AAAA;AAAA,EAKA,MAAM,aAAa;AACf,QAAI,OAAO,eAAe;AACtB;AAAA,IACJ;AAEA,UAAM,EAAE,SAAS,IAAI,MAAM;AAE3B,aAAS,OAAO,yBAAyB;AACzC,QAAI;AACA,YAAM,SAAS,MAAM,WAAW;AAEhC,YAAM,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -7,6 +7,7 @@ import Dockerode from "dockerode";
|
|
|
7
7
|
import { ReadStream } from "node:fs";
|
|
8
8
|
import type { Docker } from "./docker.js";
|
|
9
9
|
import { edit } from "./edit.js";
|
|
10
|
+
import { Image } from "./image.js";
|
|
10
11
|
import { Network } from "./network.js";
|
|
11
12
|
import { Terminal } from "./terminal.js";
|
|
12
13
|
/**
|
|
@@ -14,7 +15,7 @@ import { Terminal } from "./terminal.js";
|
|
|
14
15
|
*/
|
|
15
16
|
export interface Container {
|
|
16
17
|
docker: Docker;
|
|
17
|
-
|
|
18
|
+
image: Promise<Image>;
|
|
18
19
|
start(): Promise<void>;
|
|
19
20
|
kill(): Promise<void>;
|
|
20
21
|
remove(force?: boolean): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../../../src/docker/container.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,SAAgC,MAAM,WAAW,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAGrC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC;;GAEG;AACH,MAAM,WAAW,SAAS;IACtB,MAAM,EAAE,MAAM,CAAC;IAEf,
|
|
1
|
+
{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../../../src/docker/container.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,6 +35,7 @@ var import_dockerode = __toESM(require("dockerode"), 1);
|
|
|
35
35
|
var import_promises = require("node:stream/promises");
|
|
36
36
|
var import_text = require("../util/text.js");
|
|
37
37
|
var import_errors = require("./errors.js");
|
|
38
|
+
var import_image = require("./image.js");
|
|
38
39
|
var import_terminal = require("./terminal.js");
|
|
39
40
|
/**
|
|
40
41
|
* @license
|
|
@@ -104,8 +105,8 @@ function configureContainer(options) {
|
|
|
104
105
|
function adaptContainer(docker, ct) {
|
|
105
106
|
return {
|
|
106
107
|
docker,
|
|
107
|
-
get
|
|
108
|
-
return ct.inspect().then((info) => info.Image);
|
|
108
|
+
get image() {
|
|
109
|
+
return import_errors.DockerError.adapt(ct.inspect().then((info) => (0, import_image.Image)(docker, info.Image)));
|
|
109
110
|
},
|
|
110
111
|
async start() {
|
|
111
112
|
await import_errors.DockerError.adapt(ct.start());
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/docker/container.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,uBAA6C;AAE7C,sBAAyB;AACzB,kBAAyB;AAGzB,oBAA8C;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["Dockerode"]
|
|
6
6
|
}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2022-2025 Project CHIP Authors
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import Dockerode from "dockerode";
|
|
7
|
+
import { Docker } from "./docker.js";
|
|
8
|
+
export interface Image {
|
|
9
|
+
inspect(): Promise<Dockerode.ImageInspectInfo>;
|
|
10
|
+
}
|
|
11
|
+
/**
|
|
12
|
+
* Create an image by name.
|
|
13
|
+
*/
|
|
14
|
+
export declare function Image(docker: Docker, name: string): Image;
|
|
15
|
+
/**
|
|
16
|
+
* Wrap a {@link Dockerode.Image}.
|
|
17
|
+
*/
|
|
18
|
+
export declare function Image(docker: Docker, image: Dockerode.Image): Image;
|
|
19
|
+
//# sourceMappingURL=image.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"image.d.ts","sourceRoot":"","sources":["../../../src/docker/image.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,SAAS,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAGrC,MAAM,WAAW,KAAK;IAClB,OAAO,IAAI,OAAO,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;CAClD;AAED;;GAEG;AACH,wBAAgB,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC;AAE3D;;GAEG;AACH,wBAAgB,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,GAAG,KAAK,CAAC"}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __export = (target, all) => {
|
|
7
|
+
for (var name in all)
|
|
8
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
9
|
+
};
|
|
10
|
+
var __copyProps = (to, from, except, desc) => {
|
|
11
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
12
|
+
for (let key of __getOwnPropNames(from))
|
|
13
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
14
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
15
|
+
}
|
|
16
|
+
return to;
|
|
17
|
+
};
|
|
18
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
|
+
var image_exports = {};
|
|
20
|
+
__export(image_exports, {
|
|
21
|
+
Image: () => Image
|
|
22
|
+
});
|
|
23
|
+
module.exports = __toCommonJS(image_exports);
|
|
24
|
+
var import_errors = require("./errors.js");
|
|
25
|
+
/**
|
|
26
|
+
* @license
|
|
27
|
+
* Copyright 2022-2025 Project CHIP Authors
|
|
28
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
29
|
+
*/
|
|
30
|
+
function Image(docker, definition) {
|
|
31
|
+
let image;
|
|
32
|
+
if (typeof definition === "string") {
|
|
33
|
+
image = docker.intf.getImage(definition);
|
|
34
|
+
} else {
|
|
35
|
+
image = definition;
|
|
36
|
+
}
|
|
37
|
+
return {
|
|
38
|
+
inspect() {
|
|
39
|
+
return import_errors.DockerError.adapt(image.inspect());
|
|
40
|
+
}
|
|
41
|
+
};
|
|
42
|
+
}
|
|
43
|
+
//# sourceMappingURL=image.js.map
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"sources": ["../../../src/docker/image.ts"],
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAQA,oBAA4B;AAR5B;AAAA;AAAA;AAAA;AAAA;AAwBO,SAAS,MAAM,QAAgB,YAA6C;AAC/E,MAAI;AAEJ,MAAI,OAAO,eAAe,UAAU;AAChC,YAAQ,OAAO,KAAK,SAAS,UAAU;AAAA,EAC3C,OAAO;AACH,YAAQ;AAAA,EACZ;AAEA,SAAO;AAAA,IACH,UAAU;AACN,aAAO,0BAAY,MAAM,MAAM,QAAQ,CAAC;AAAA,IAC5C;AAAA,EACJ;AACJ;",
|
|
5
|
+
"names": []
|
|
6
|
+
}
|
package/dist/esm/chip/state.js
CHANGED
|
@@ -112,11 +112,11 @@ const State = {
|
|
|
112
112
|
progress.update("Initializing containers");
|
|
113
113
|
try {
|
|
114
114
|
const result = await initialize();
|
|
115
|
-
const
|
|
116
|
-
const
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
);
|
|
115
|
+
const image = await State.container.image;
|
|
116
|
+
const info = await image.inspect();
|
|
117
|
+
const chipCommit = formatSha(info.Config.Labels["org.opencontainers.image.revision"] ?? "(unknown)");
|
|
118
|
+
const imageVersion = info.Config.Labels["org.opencontainers.image.version"] ?? "(unknown)";
|
|
119
|
+
progress.success(`Initialized CHIP ${ansi.bold(chipCommit)} image ${ansi.bold(imageVersion)}`);
|
|
120
120
|
return result;
|
|
121
121
|
} catch (e) {
|
|
122
122
|
progress.failure("Initializing containers");
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/chip/state.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,MAAM,eAAe;AAK9B,SAAS,cAAc;AACvB,SAAS,YAAY;AACrB,SAAS,cAAc;AACvB,SAAS,UAAU,iBAAiB;AAEpC,SAAS,sBAA0C;AACnD,SAAS,uBAAuB;AAEhC,SAAS,WAAW,sBAAsB;AAC1C,SAAS,4BAA4B;AACrC,SAAS,gBAAgB;AACzB,SAAS,kBAAkB;AAC3B,SAAS,gBAAgB;AAKzB,MAAM,SAAS;AAAA,EACX,eAAe;AAAA,EACf,QAAQ;AAAA,EACR,OAAO;AAAA,EACP,SAAS;AAAA,EACT,MAAM;AAAA,EACN,eAAe;AAAA,EACf,eAAe;AAAA,EACf,MAAM;AAAA,EACN,OAAO;AAAA,EACP,qBAAqB,oBAAI,QAAiB;AAAA,EAC1C,eAAe;AAAA,EACf,kBAAkB;AAAA,EAClB,aAAa,oBAAI,IAAY;AAAA,EAC7B,SAAS,MAA2B;AAAA,EACpC,UAAU,oBAAI,IAA8C;AAAA,EAC5D,WAAW,oBAAI,IAAiB;AAAA,EAChC,6BAA6B;AAAA,EAC7B,SAAS,oBAAI,IAA0B;AAAA,EACvC,mBAAmB;AACvB;AAKO,MAAM,QAAQ;AAAA,EACjB,IAAI,YAAY;AACZ,UAAM,YAAY,OAAO;AAEzB,QAAI,cAAc,QAAW;AACzB,YAAM,IAAI,MAAM,qCAAqC;AAAA,IACzD;AAEA,WAAO;AAAA,EACX;AAAA,EAEA,IAAI,OAAO,QAAoB;AAC3B,WAAO,SAAS;AAAA,EACpB;AAAA,EAEA,IAAI,SAAS;AACT,UAAM,SAAS,OAAO;AAEtB,QAAI,WAAW,QAAW;AACtB,YAAM,IAAI,MAAM,2BAA2B;AAAA,IAC/C;AAEA,WAAO;AAAA,EACX;AAAA,EAEA,IAAI,MAAM,OAAc;AACpB,WAAO,QAAQ;AAAA,EACnB;AAAA,EAEA,IAAI,QAAQ;AACR,UAAM,QAAQ,OAAO;AAErB,QAAI,UAAU,QAAW;AACrB,YAAM,IAAI,MAAM,8BAA8B;AAAA,IAClD;AAEA,WAAO;AAAA,EACX;AAAA,EAEA,IAAI,QAAQ,SAA0B;AAClC,WAAO,UAAU;AAAA,EACrB;AAAA,EAEA,IAAI,UAAU;AACV,UAAM,UAAU,OAAO;AAEvB,QAAI,YAAY,QAAW;AACvB,YAAM,IAAI,MAAM,+BAA+B;AAAA,IACnD;AAEA,WAAO;AAAA,EACX;AAAA,EAEA,IAAI,oBAAoB;AACpB,WAAO,OAAO;AAAA,EAClB;AAAA,EAEA,IAAI,kBAAkB,OAAgB;AAClC,WAAO,oBAAoB;AAAA,EAC/B;AAAA,EAEA,IAAI,OAAO;AACP,QAAI,OAAO,SAAS,QAAW;AAC3B,YAAM,IAAI,MAAM,sBAAsB;AAAA,IAC1C;AAEA,WAAO,OAAO;AAAA,EAClB;AAAA,EAEA,IAAI,QAAQ;AACR,QAAI,OAAO,UAAU,QAAW;AAC5B,YAAM,IAAI,MAAM,iCAAiC;AAAA,IACrD;AACA,WAAO,OAAO;AAAA,EAClB;AAAA,EAEA,IAAI,OAAO;AACP,QAAI,OAAO,SAAS,QAAW;AAC3B,YAAM,IAAI,MAAM,gBAAgB;AAAA,IACpC;AAEA,WAAO,OAAO;AAAA,EAClB;AAAA,EAEA,IAAI,gBAAgB;AAChB,WAAO,OAAO;AAAA,EAClB;AAAA;AAAA;AAAA;AAAA,EAKA,MAAM,aAAa;AACf,QAAI,OAAO,eAAe;AACtB;AAAA,IACJ;AAEA,UAAM,EAAE,SAAS,IAAI,MAAM;AAE3B,aAAS,OAAO,yBAAyB;AACzC,QAAI;AACA,YAAM,SAAS,MAAM,WAAW;AAEhC,YAAM,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -7,6 +7,7 @@ import Dockerode from "dockerode";
|
|
|
7
7
|
import { ReadStream } from "node:fs";
|
|
8
8
|
import type { Docker } from "./docker.js";
|
|
9
9
|
import { edit } from "./edit.js";
|
|
10
|
+
import { Image } from "./image.js";
|
|
10
11
|
import { Network } from "./network.js";
|
|
11
12
|
import { Terminal } from "./terminal.js";
|
|
12
13
|
/**
|
|
@@ -14,7 +15,7 @@ import { Terminal } from "./terminal.js";
|
|
|
14
15
|
*/
|
|
15
16
|
export interface Container {
|
|
16
17
|
docker: Docker;
|
|
17
|
-
|
|
18
|
+
image: Promise<Image>;
|
|
18
19
|
start(): Promise<void>;
|
|
19
20
|
kill(): Promise<void>;
|
|
20
21
|
remove(force?: boolean): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../../../src/docker/container.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,SAAgC,MAAM,WAAW,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAGrC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC;;GAEG;AACH,MAAM,WAAW,SAAS;IACtB,MAAM,EAAE,MAAM,CAAC;IAEf,
|
|
1
|
+
{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../../../src/docker/container.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ import Dockerode from "dockerode";
|
|
|
7
7
|
import { finished } from "node:stream/promises";
|
|
8
8
|
import { base64Of } from "../util/text.js";
|
|
9
9
|
import { DockerError, NonZeroExitError } from "./errors.js";
|
|
10
|
+
import { Image } from "./image.js";
|
|
10
11
|
import { Terminal } from "./terminal.js";
|
|
11
12
|
function Container(docker, input) {
|
|
12
13
|
if (input instanceof Dockerode.Container) {
|
|
@@ -71,8 +72,8 @@ function configureContainer(options) {
|
|
|
71
72
|
function adaptContainer(docker, ct) {
|
|
72
73
|
return {
|
|
73
74
|
docker,
|
|
74
|
-
get
|
|
75
|
-
return ct.inspect().then((info) => info.Image);
|
|
75
|
+
get image() {
|
|
76
|
+
return DockerError.adapt(ct.inspect().then((info) => Image(docker, info.Image)));
|
|
76
77
|
},
|
|
77
78
|
async start() {
|
|
78
79
|
await DockerError.adapt(ct.start());
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/docker/container.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,OAAO,eAAsC;AAE7C,SAAS,gBAAgB;AACzB,SAAS,gBAAgB;AAGzB,SAAS,aAAa,wBAAwB;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2022-2025 Project CHIP Authors
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import Dockerode from "dockerode";
|
|
7
|
+
import { Docker } from "./docker.js";
|
|
8
|
+
export interface Image {
|
|
9
|
+
inspect(): Promise<Dockerode.ImageInspectInfo>;
|
|
10
|
+
}
|
|
11
|
+
/**
|
|
12
|
+
* Create an image by name.
|
|
13
|
+
*/
|
|
14
|
+
export declare function Image(docker: Docker, name: string): Image;
|
|
15
|
+
/**
|
|
16
|
+
* Wrap a {@link Dockerode.Image}.
|
|
17
|
+
*/
|
|
18
|
+
export declare function Image(docker: Docker, image: Dockerode.Image): Image;
|
|
19
|
+
//# sourceMappingURL=image.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"image.d.ts","sourceRoot":"","sources":["../../../src/docker/image.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,SAAS,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAGrC,MAAM,WAAW,KAAK;IAClB,OAAO,IAAI,OAAO,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;CAClD;AAED;;GAEG;AACH,wBAAgB,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC;AAE3D;;GAEG;AACH,wBAAgB,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,GAAG,KAAK,CAAC"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2022-2025 Project CHIP Authors
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { DockerError } from "./errors.js";
|
|
7
|
+
function Image(docker, definition) {
|
|
8
|
+
let image;
|
|
9
|
+
if (typeof definition === "string") {
|
|
10
|
+
image = docker.intf.getImage(definition);
|
|
11
|
+
} else {
|
|
12
|
+
image = definition;
|
|
13
|
+
}
|
|
14
|
+
return {
|
|
15
|
+
inspect() {
|
|
16
|
+
return DockerError.adapt(image.inspect());
|
|
17
|
+
}
|
|
18
|
+
};
|
|
19
|
+
}
|
|
20
|
+
export {
|
|
21
|
+
Image
|
|
22
|
+
};
|
|
23
|
+
//# sourceMappingURL=image.js.map
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"sources": ["../../../src/docker/image.ts"],
|
|
4
|
+
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAQA,SAAS,mBAAmB;AAgBrB,SAAS,MAAM,QAAgB,YAA6C;AAC/E,MAAI;AAEJ,MAAI,OAAO,eAAe,UAAU;AAChC,YAAQ,OAAO,KAAK,SAAS,UAAU;AAAA,EAC3C,OAAO;AACH,YAAQ;AAAA,EACZ;AAEA,SAAO;AAAA,IACH,UAAU;AACN,aAAO,YAAY,MAAM,MAAM,QAAQ,CAAC;AAAA,IAC5C;AAAA,EACJ;AACJ;",
|
|
5
|
+
"names": []
|
|
6
|
+
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@matter/testing",
|
|
3
|
-
"version": "0.13.0-alpha.0-
|
|
3
|
+
"version": "0.13.0-alpha.0-20250401-82b90831a",
|
|
4
4
|
"description": "Test harness for running JavaScript and Matter certification tests",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"scripts": {
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
"#tools/ansi-text": "@matter/tools/ansi-text"
|
|
46
46
|
},
|
|
47
47
|
"dependencies": {
|
|
48
|
-
"@matter/tools": "0.13.0-alpha.0-
|
|
48
|
+
"@matter/tools": "0.13.0-alpha.0-20250401-82b90831a",
|
|
49
49
|
"@types/express": "^5.0.1",
|
|
50
50
|
"ansi-colors": "^4.1.3",
|
|
51
51
|
"chai": "^4.5.0",
|
|
@@ -68,7 +68,7 @@
|
|
|
68
68
|
"@types/debug": "^4.1.12",
|
|
69
69
|
"@types/mocha": "^10.0.10",
|
|
70
70
|
"@types/docker-modem": "^3.0.6",
|
|
71
|
-
"@types/node": "^22.13.
|
|
71
|
+
"@types/node": "^22.13.14",
|
|
72
72
|
"@types/wtfnode": "^0.7.3",
|
|
73
73
|
"@types/xml2js": "^0.4.14",
|
|
74
74
|
"@types/yargs": "^17.0.33"
|
package/src/chip/state.ts
CHANGED
|
@@ -153,12 +153,12 @@ export const State = {
|
|
|
153
153
|
try {
|
|
154
154
|
const result = await initialize();
|
|
155
155
|
|
|
156
|
-
const
|
|
157
|
-
const
|
|
156
|
+
const image = await State.container.image;
|
|
157
|
+
const info = await image.inspect();
|
|
158
|
+
const chipCommit = formatSha(info.Config.Labels["org.opencontainers.image.revision"] ?? "(unknown)");
|
|
159
|
+
const imageVersion = info.Config.Labels["org.opencontainers.image.version"] ?? "(unknown)";
|
|
158
160
|
|
|
159
|
-
progress.success(
|
|
160
|
-
`Initialized containers from image ${ansi.bold(imageVersion)} for CHIP ${ansi.bold(chipVersion)}`,
|
|
161
|
-
);
|
|
161
|
+
progress.success(`Initialized CHIP ${ansi.bold(chipCommit)} image ${ansi.bold(imageVersion)}`);
|
|
162
162
|
|
|
163
163
|
return result;
|
|
164
164
|
} catch (e) {
|
package/src/docker/container.ts
CHANGED
|
@@ -11,6 +11,7 @@ import { base64Of } from "../util/text.js";
|
|
|
11
11
|
import type { Docker } from "./docker.js";
|
|
12
12
|
import { edit } from "./edit.js";
|
|
13
13
|
import { DockerError, NonZeroExitError } from "./errors.js";
|
|
14
|
+
import { Image } from "./image.js";
|
|
14
15
|
import { Network } from "./network.js";
|
|
15
16
|
import { Terminal } from "./terminal.js";
|
|
16
17
|
|
|
@@ -20,7 +21,7 @@ import { Terminal } from "./terminal.js";
|
|
|
20
21
|
export interface Container {
|
|
21
22
|
docker: Docker;
|
|
22
23
|
|
|
23
|
-
|
|
24
|
+
image: Promise<Image>;
|
|
24
25
|
|
|
25
26
|
start(): Promise<void>;
|
|
26
27
|
kill(): Promise<void>;
|
|
@@ -229,8 +230,8 @@ function adaptContainer(docker: Docker, ct: Dockerode.Container): Container {
|
|
|
229
230
|
return {
|
|
230
231
|
docker,
|
|
231
232
|
|
|
232
|
-
get
|
|
233
|
-
return ct.inspect().then(info => info.Image);
|
|
233
|
+
get image() {
|
|
234
|
+
return DockerError.adapt(ct.inspect().then(info => Image(docker, info.Image)));
|
|
234
235
|
},
|
|
235
236
|
|
|
236
237
|
async start() {
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2022-2025 Project CHIP Authors
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
|
|
7
|
+
import Dockerode from "dockerode";
|
|
8
|
+
import { Docker } from "./docker.js";
|
|
9
|
+
import { DockerError } from "./errors.js";
|
|
10
|
+
|
|
11
|
+
export interface Image {
|
|
12
|
+
inspect(): Promise<Dockerode.ImageInspectInfo>;
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
/**
|
|
16
|
+
* Create an image by name.
|
|
17
|
+
*/
|
|
18
|
+
export function Image(docker: Docker, name: string): Image;
|
|
19
|
+
|
|
20
|
+
/**
|
|
21
|
+
* Wrap a {@link Dockerode.Image}.
|
|
22
|
+
*/
|
|
23
|
+
export function Image(docker: Docker, image: Dockerode.Image): Image;
|
|
24
|
+
|
|
25
|
+
export function Image(docker: Docker, definition: string | Dockerode.Image): Image {
|
|
26
|
+
let image;
|
|
27
|
+
|
|
28
|
+
if (typeof definition === "string") {
|
|
29
|
+
image = docker.intf.getImage(definition);
|
|
30
|
+
} else {
|
|
31
|
+
image = definition;
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
return {
|
|
35
|
+
inspect() {
|
|
36
|
+
return DockerError.adapt(image.inspect());
|
|
37
|
+
},
|
|
38
|
+
};
|
|
39
|
+
}
|