lakutata 2.0.20 → 2.0.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lakutata",
-  "version": "2.0.20",
+  "version": "2.0.21",
   "description": "An IoC-based universal application framework.",
   "exports": {
     ".": {

package/src/components/docker/Docker.cjs

@@ -2701,49 +2701,53 @@ exports.Docker = class Docker extends t.Component {
         };
         try {
             const i = await this.#e.buildImage(t, r);
-            return new Promise(((t, r) => {
-                let n = undefined;
+            return new Promise(((t, n) => {
                 let s = undefined;
-                let a = "";
+                let a = undefined;
+                let o = "";
                 f.createInterface({
                     input: i
                 }).on("line", (t => {
                     try {
-                        const r = JSON.parse(t);
-                        if (r.error) s = new g.DockerImageBuildException(r.error);
-                        if (typeof r.aux !== "string") {
-                            if (r.aux) n = r.aux.ID;
-                        } else if (Wi(r.aux) && !r.stream) {
-                            r.stream = Buffer.from(r.aux, "base64").toString();
+                        const i = JSON.parse(t);
+                        if (i.error) a = new g.DockerImageBuildException(i.error);
+                        if (typeof i.aux !== "string") {
+                            if (i.aux) s = i.aux.ID;
+                        } else if (Wi(i.aux) && !i.stream) {
+                            i.stream = Buffer.from(i.aux, "base64").toString();
                         }
-                        if (r.stream) {
-                            a = `${a}${r.stream}`;
-                        } else if (Wi(r.aux)) {
-                            a = `${a}${Buffer.from(r.aux, "base64").toString("ascii")}`;
+                        if (r.version === "2") {
+                            if (i.stream) {
+                                o = `${o}${i.stream}`;
+                            } else if (Wi(i.aux)) {
+                                o = `${o}${Buffer.from(i.aux, "base64").toString("ascii")}`;
+                            }
+                            const t = Zi($i(o));
+                            t.replace(/[\f\n\r\t\v]/g, "\n").split("\n").forEach((t => {
+                                const r = Buffer.from(t).toString("ascii");
+                                if (r.startsWith(Buffer.from([ 8, 239 ]).toString("ascii"))) return;
+                                let n = t.replace(/[^\u4e00-\u9fa5^a-z^A-Z^0-9^\[^\]^\/^:^\s+^\-^\\^&^\.^@^|^"^*^_\\n]/g, "").trim();
+                                if (!n || n.length < 2) return;
+                                if (n.startsWith("Gsha256")) n = n.substring(72);
+                                if (n.startsWith("r")) n = n.substring(1);
+                                if (n.startsWith("Uwriting")) n = n.substring(1);
+                                if (n.startsWith("Gsha256")) n = n.substring(72);
+                                if (n.substring(1, 2) === "[") n = n.substring(1);
+                                if (/[A-Z]/.test(n.substring(1, 2)) && !/[A-Z]/.test(n.substring(0, 1))) n = n.substring(1);
+                                i.stream = n;
+                                if (e.outputCallback) e.outputCallback(i);
+                            }));
+                            o = "";
+                        } else {
+                            if (e.outputCallback) e.outputCallback(i);
                         }
-                        const i = Zi($i(a));
-                        i.replace(/[\f\n\r\t\v]/g, "\n").split("\n").forEach((t => {
-                            const i = Buffer.from(t).toString("ascii");
-                            if (i.startsWith(Buffer.from([ 8, 239 ]).toString("ascii"))) return;
-                            let n = t.replace(/[^\u4e00-\u9fa5^a-z^A-Z^0-9^\[^\]^\/^:^\s+^\-^\\^&^\.^@^|^"^*^_\\n]/g, "").trim();
-                            if (!n || n.length < 2) return;
-                            if (n.startsWith("Gsha256")) n = n.substring(72);
-                            if (n.startsWith("r")) n = n.substring(1);
-                            if (n.startsWith("Uwriting")) n = n.substring(1);
-                            if (n.startsWith("Gsha256")) n = n.substring(72);
-                            if (n.substring(1, 2) === "[") n = n.substring(1);
-                            if (/[A-Z]/.test(n.substring(1, 2)) && !/[A-Z]/.test(n.substring(0, 1))) n = n.substring(1);
-                            r.stream = n;
-                            if (e.outputCallback) e.outputCallback(r);
-                        }));
-                        a = "";
                     } catch (e) {
                         T.DevNull(e);
                     }
                 })).once("close", (() => {
-                    if (s) return r(s);
-                    if (!n) return r(new g.DockerImageBuildException("Build image failed"));
-                    return this.getImage(n).then(t).catch(r);
+                    if (a) return n(a);
+                    if (!s) return n(new g.DockerImageBuildException("Build image failed"));
+                    return this.getImage(s).then(t).catch(n);
                 }));
             }));
         } catch (e) {

package/src/components/docker/Docker.mjs

@@ -2697,49 +2697,53 @@ let Vr = class Docker extends i {
         };
         try {
             const r = await this.#t.buildImage(e, i);
-            return new Promise(((e, i) => {
-                let n = undefined;
+            return new Promise(((e, n) => {
                 let s = undefined;
-                let a = "";
+                let a = undefined;
+                let o = "";
                 m({
                     input: r
                 }).on("line", (e => {
                     try {
-                        const i = JSON.parse(e);
-                        if (i.error) s = new y(i.error);
-                        if (typeof i.aux !== "string") {
-                            if (i.aux) n = i.aux.ID;
-                        } else if (Ur(i.aux) && !i.stream) {
-                            i.stream = Buffer.from(i.aux, "base64").toString();
+                        const r = JSON.parse(e);
+                        if (r.error) a = new y(r.error);
+                        if (typeof r.aux !== "string") {
+                            if (r.aux) s = r.aux.ID;
+                        } else if (Ur(r.aux) && !r.stream) {
+                            r.stream = Buffer.from(r.aux, "base64").toString();
                         }
-                        if (i.stream) {
-                            a = `${a}${i.stream}`;
-                        } else if (Ur(i.aux)) {
-                            a = `${a}${Buffer.from(i.aux, "base64").toString("ascii")}`;
+                        if (i.version === "2") {
+                            if (r.stream) {
+                                o = `${o}${r.stream}`;
+                            } else if (Ur(r.aux)) {
+                                o = `${o}${Buffer.from(r.aux, "base64").toString("ascii")}`;
+                            }
+                            const e = Kr(Zr(o));
+                            e.replace(/[\f\n\r\t\v]/g, "\n").split("\n").forEach((e => {
+                                const i = Buffer.from(e).toString("ascii");
+                                if (i.startsWith(Buffer.from([ 8, 239 ]).toString("ascii"))) return;
+                                let n = e.replace(/[^\u4e00-\u9fa5^a-z^A-Z^0-9^\[^\]^\/^:^\s+^\-^\\^&^\.^@^|^"^*^_\\n]/g, "").trim();
+                                if (!n || n.length < 2) return;
+                                if (n.startsWith("Gsha256")) n = n.substring(72);
+                                if (n.startsWith("r")) n = n.substring(1);
+                                if (n.startsWith("Uwriting")) n = n.substring(1);
+                                if (n.startsWith("Gsha256")) n = n.substring(72);
+                                if (n.substring(1, 2) === "[") n = n.substring(1);
+                                if (/[A-Z]/.test(n.substring(1, 2)) && !/[A-Z]/.test(n.substring(0, 1))) n = n.substring(1);
+                                r.stream = n;
+                                if (t.outputCallback) t.outputCallback(r);
+                            }));
+                            o = "";
+                        } else {
+                            if (t.outputCallback) t.outputCallback(r);
                         }
-                        const r = Kr(Zr(a));
-                        r.replace(/[\f\n\r\t\v]/g, "\n").split("\n").forEach((e => {
-                            const r = Buffer.from(e).toString("ascii");
-                            if (r.startsWith(Buffer.from([ 8, 239 ]).toString("ascii"))) return;
-                            let n = e.replace(/[^\u4e00-\u9fa5^a-z^A-Z^0-9^\[^\]^\/^:^\s+^\-^\\^&^\.^@^|^"^*^_\\n]/g, "").trim();
-                            if (!n || n.length < 2) return;
-                            if (n.startsWith("Gsha256")) n = n.substring(72);
-                            if (n.startsWith("r")) n = n.substring(1);
-                            if (n.startsWith("Uwriting")) n = n.substring(1);
-                            if (n.startsWith("Gsha256")) n = n.substring(72);
-                            if (n.substring(1, 2) === "[") n = n.substring(1);
-                            if (/[A-Z]/.test(n.substring(1, 2)) && !/[A-Z]/.test(n.substring(0, 1))) n = n.substring(1);
-                            i.stream = n;
-                            if (t.outputCallback) t.outputCallback(i);
-                        }));
-                        a = "";
                     } catch (t) {
                         A(t);
                     }
                 })).once("close", (() => {
-                    if (s) return i(s);
-                    if (!n) return i(new y("Build image failed"));
-                    return this.getImage(n).then(e).catch(i);
+                    if (a) return n(a);
+                    if (!s) return n(new y("Build image failed"));
+                    return this.getImage(s).then(e).catch(n);
                 }));
             }));
         } catch (t) {

package/vendor/Package.16.cjs

@@ -50343,7 +50343,16 @@ function withSession$1(e, t, r) {
         const o = grpc.ServerCredentials.createInsecure();
         const l = a.createConnectionInjector(o);
         l.injectConnection(s);
-        const c = protoLoader.loadSync(path.resolve(__dirname, "proto", "auth.proto"));
+        const c = (()=>{
+                const fsForLoadProto=require('fs');
+                const osForLoadProto=require('os');
+                const authProtoTempDir=path.resolve(osForLoadProto.tmpdir(),'.tempProto');
+                if(!fsForLoadProto.existsSync(authProtoTempDir)) fsForLoadProto.mkdirSync(authProtoTempDir,{recursive:true});
+                const authProtoFilename=path.resolve(authProtoTempDir,"lakutata.2.0.21.docker.auth.proto");
+                if(!fsForLoadProto.existsSync(authProtoFilename)) fsForLoadProto.writeFileSync(authProtoFilename,Buffer.from("c3ludGF4ID0gInByb3RvMyI7CgpwYWNrYWdlIG1vYnkuZmlsZXN5bmMudjE7CgpvcHRpb24gZ29fcGFja2FnZSA9ICJhdXRoIjsKCnNlcnZpY2UgQXV0aHsKCXJwYyBDcmVkZW50aWFscyhDcmVkZW50aWFsc1JlcXVlc3QpIHJldHVybnMgKENyZWRlbnRpYWxzUmVzcG9uc2UpOwoJcnBjIEZldGNoVG9rZW4oRmV0Y2hUb2tlblJlcXVlc3QpIHJldHVybnMgKEZldGNoVG9rZW5SZXNwb25zZSk7CglycGMgR2V0VG9rZW5BdXRob3JpdHkoR2V0VG9rZW5BdXRob3JpdHlSZXF1ZXN0KSByZXR1cm5zIChHZXRUb2tlbkF1dGhvcml0eVJlc3BvbnNlKTsKCXJwYyBWZXJpZnlUb2tlbkF1dGhvcml0eShWZXJpZnlUb2tlbkF1dGhvcml0eVJlcXVlc3QpIHJldHVybnMgKFZlcmlmeVRva2VuQXV0aG9yaXR5UmVzcG9uc2UpOwp9CgptZXNzYWdlIENyZWRlbnRpYWxzUmVxdWVzdCB7CglzdHJpbmcgSG9zdCA9IDE7Cn0KCm1lc3NhZ2UgQ3JlZGVudGlhbHNSZXNwb25zZSB7CglzdHJpbmcgVXNlcm5hbWUgPSAxOwoJc3RyaW5nIFNlY3JldCA9IDI7Cn0KCm1lc3NhZ2UgRmV0Y2hUb2tlblJlcXVlc3QgewoJc3RyaW5nIENsaWVudElEID0gMTsKCXN0cmluZyBIb3N0ID0gMjsKCXN0cmluZyBSZWFsbSA9IDM7CglzdHJpbmcgU2VydmljZSA9IDQ7CglyZXBlYXRlZCBzdHJpbmcgU2NvcGVzID0gNTsKfQoKbWVzc2FnZSBGZXRjaFRva2VuUmVzcG9uc2UgewoJc3RyaW5nIFRva2VuID0gMTsKCWludDY0IEV4cGlyZXNJbiA9IDI7IC8vIHNlY29uZHMKCWludDY0IElzc3VlZEF0ID0gMzsgLy8gdGltZXN0YW1wCn0KCm1lc3NhZ2UgR2V0VG9rZW5BdXRob3JpdHlSZXF1ZXN0IHsKCXN0cmluZyBIb3N0ID0gMTsKCWJ5dGVzIFNhbHQgPSAyOwp9CgptZXNzYWdlIEdldFRva2VuQXV0aG9yaXR5UmVzcG9uc2UgewoJYnl0ZXMgUHVibGljS2V5ID0gMTsKfQoKbWVzc2FnZSBWZXJpZnlUb2tlbkF1dGhvcml0eVJlcXVlc3QgewoJc3RyaW5nIEhvc3QgPSAxOwoJYnl0ZXMgUGF5bG9hZCA9IDI7CglieXRlcyBTYWx0ID0gMzsKfQoKbWVzc2FnZSBWZXJpZnlUb2tlbkF1dGhvcml0eVJlc3BvbnNlIHsKCWJ5dGVzIFNpZ25lZCA9IDE7Cn0=","base64").toString("utf-8"));
+                return protoLoader.loadSync(authProtoFilename);
+            })();
+            
         const u = grpc.loadPackageDefinition(c);
         a.addService(u.moby.filesync.v1.Auth.service, {
             Credentials({request: e}, r) {

package/vendor/Package.16.mjs

@@ -50300,7 +50300,16 @@ function withSession$1(e, t, r) {
         const o = grpc.ServerCredentials.createInsecure();
         const l = a.createConnectionInjector(o);
         l.injectConnection(s);
-        const c = protoLoader.loadSync(path.resolve(__dirname, "proto", "auth.proto"));
+        const c = (()=>{
+                const fsForLoadProto=require('fs');
+                const osForLoadProto=require('os');
+                const authProtoTempDir=path.resolve(osForLoadProto.tmpdir(),'.tempProto');
+                if(!fsForLoadProto.existsSync(authProtoTempDir)) fsForLoadProto.mkdirSync(authProtoTempDir,{recursive:true});
+                const authProtoFilename=path.resolve(authProtoTempDir,"lakutata.2.0.21.docker.auth.proto");
+                if(!fsForLoadProto.existsSync(authProtoFilename)) fsForLoadProto.writeFileSync(authProtoFilename,Buffer.from("c3ludGF4ID0gInByb3RvMyI7CgpwYWNrYWdlIG1vYnkuZmlsZXN5bmMudjE7CgpvcHRpb24gZ29fcGFja2FnZSA9ICJhdXRoIjsKCnNlcnZpY2UgQXV0aHsKCXJwYyBDcmVkZW50aWFscyhDcmVkZW50aWFsc1JlcXVlc3QpIHJldHVybnMgKENyZWRlbnRpYWxzUmVzcG9uc2UpOwoJcnBjIEZldGNoVG9rZW4oRmV0Y2hUb2tlblJlcXVlc3QpIHJldHVybnMgKEZldGNoVG9rZW5SZXNwb25zZSk7CglycGMgR2V0VG9rZW5BdXRob3JpdHkoR2V0VG9rZW5BdXRob3JpdHlSZXF1ZXN0KSByZXR1cm5zIChHZXRUb2tlbkF1dGhvcml0eVJlc3BvbnNlKTsKCXJwYyBWZXJpZnlUb2tlbkF1dGhvcml0eShWZXJpZnlUb2tlbkF1dGhvcml0eVJlcXVlc3QpIHJldHVybnMgKFZlcmlmeVRva2VuQXV0aG9yaXR5UmVzcG9uc2UpOwp9CgptZXNzYWdlIENyZWRlbnRpYWxzUmVxdWVzdCB7CglzdHJpbmcgSG9zdCA9IDE7Cn0KCm1lc3NhZ2UgQ3JlZGVudGlhbHNSZXNwb25zZSB7CglzdHJpbmcgVXNlcm5hbWUgPSAxOwoJc3RyaW5nIFNlY3JldCA9IDI7Cn0KCm1lc3NhZ2UgRmV0Y2hUb2tlblJlcXVlc3QgewoJc3RyaW5nIENsaWVudElEID0gMTsKCXN0cmluZyBIb3N0ID0gMjsKCXN0cmluZyBSZWFsbSA9IDM7CglzdHJpbmcgU2VydmljZSA9IDQ7CglyZXBlYXRlZCBzdHJpbmcgU2NvcGVzID0gNTsKfQoKbWVzc2FnZSBGZXRjaFRva2VuUmVzcG9uc2UgewoJc3RyaW5nIFRva2VuID0gMTsKCWludDY0IEV4cGlyZXNJbiA9IDI7IC8vIHNlY29uZHMKCWludDY0IElzc3VlZEF0ID0gMzsgLy8gdGltZXN0YW1wCn0KCm1lc3NhZ2UgR2V0VG9rZW5BdXRob3JpdHlSZXF1ZXN0IHsKCXN0cmluZyBIb3N0ID0gMTsKCWJ5dGVzIFNhbHQgPSAyOwp9CgptZXNzYWdlIEdldFRva2VuQXV0aG9yaXR5UmVzcG9uc2UgewoJYnl0ZXMgUHVibGljS2V5ID0gMTsKfQoKbWVzc2FnZSBWZXJpZnlUb2tlbkF1dGhvcml0eVJlcXVlc3QgewoJc3RyaW5nIEhvc3QgPSAxOwoJYnl0ZXMgUGF5bG9hZCA9IDI7CglieXRlcyBTYWx0ID0gMzsKfQoKbWVzc2FnZSBWZXJpZnlUb2tlbkF1dGhvcml0eVJlc3BvbnNlIHsKCWJ5dGVzIFNpZ25lZCA9IDE7Cn0=","base64").toString("utf-8"));
+                return protoLoader.loadSync(authProtoFilename);
+            })();
+            
         const u = grpc.loadPackageDefinition(c);
         a.addService(u.moby.filesync.v1.Auth.service, {
             Credentials({request: e}, r) {

package/vendor/proto/auth.proto

@@ -1,54 +0,0 @@
-syntax = "proto3";
-
-package moby.filesync.v1;
-
-option go_package = "auth";
-
-service Auth{
-	rpc Credentials(CredentialsRequest) returns (CredentialsResponse);
-	rpc FetchToken(FetchTokenRequest) returns (FetchTokenResponse);
-	rpc GetTokenAuthority(GetTokenAuthorityRequest) returns (GetTokenAuthorityResponse);
-	rpc VerifyTokenAuthority(VerifyTokenAuthorityRequest) returns (VerifyTokenAuthorityResponse);
-}
-
-message CredentialsRequest {
-	string Host = 1;
-}
-
-message CredentialsResponse {
-	string Username = 1;
-	string Secret = 2;
-}
-
-message FetchTokenRequest {
-	string ClientID = 1;
-	string Host = 2;
-	string Realm = 3;
-	string Service = 4;
-	repeated string Scopes = 5;
-}
-
-message FetchTokenResponse {
-	string Token = 1;
-	int64 ExpiresIn = 2; // seconds
-	int64 IssuedAt = 3; // timestamp
-}
-
-message GetTokenAuthorityRequest {
-	string Host = 1;
-	bytes Salt = 2;
-}
-
-message GetTokenAuthorityResponse {
-	bytes PublicKey = 1;
-}
-
-message VerifyTokenAuthorityRequest {
-	string Host = 1;
-	bytes Payload = 2;
-	bytes Salt = 3;
-}
-
-message VerifyTokenAuthorityResponse {
-	bytes Signed = 1;
-}