@adaas/a-frame 0.1.1 → 0.1.2

package/src/lib/A-FrameBundle/index.browser.ts

@@ -1,5 +1,5 @@
 // Browser-safe surface — no filesystem access. Only types and constants.
-export type { A_FrameBundle } from './A-FrameBundle.types';
+export type { A_FrameBundle, A_FrameBundleDefinitionRecord, A_FrameBundleNamespaceRecord } from './A-FrameBundle.types';
 export {
     A_FRAME_BUNDLE_VERSION,
     A_FRAME_BUNDLE_DEFAULT_FILENAME,

package/src/lib/A-FrameBundle/index.ts

@@ -1,6 +1,6 @@
 export { A_FrameBundleBuilder } from './A-FrameBundle.builder.env-node';
 export type { A_FrameBundleBuilderOptions } from './A-FrameBundle.builder.env-node';
-export type { A_FrameBundle } from './A-FrameBundle.types';
+export type { A_FrameBundle, A_FrameBundleDefinitionRecord, A_FrameBundleNamespaceRecord } from './A-FrameBundle.types';
 export {
     A_FRAME_BUNDLE_VERSION,
     A_FRAME_BUNDLE_DEFAULT_FILENAME,

package/src/lib/A-FrameCLI/A-FrameCLI.container.ts

@@ -97,30 +97,41 @@ export class A_FrameCLIContainer extends A_Container {
         this.logger.info(`Storage:  ${storageDir}`);
         this.logger.info(`Output:   ${outFile}`);
 
-        // Need server version to stamp the bundle metadata. Authenticate first.
+        // Need server version AND encryption key to decrypt .aframe files into plain bundle.
         let serverVersion = 'unknown';
+        let encryptionKey = '';
         try {
             const credentials = await channel.getCredentials();
             if (credentials.error) {
                 this.logger.warn(`Could not fetch credentials: ${credentials.error.message}. Bundle will be tagged with serverVersion="unknown".`);
             } else {
                 serverVersion = credentials.response?.server_version || 'unknown';
+                encryptionKey = credentials.response?.encryption_key || '';
             }
         } catch (err) {
             this.logger.warn(`getCredentials failed: ${err instanceof Error ? err.message : String(err)}. Bundle will be tagged with serverVersion="unknown".`);
         }
 
+        if (!encryptionKey) {
+            this.logger.error('No encryption key available from server credentials. Cannot build bundle.');
+            process.exit(1);
+        }
+
         const builder = new A_FrameBundleBuilder();
         try {
-            const bundle = await builder.build({ storageDir, serverVersion });
+            const bundle = await builder.build({ storageDir, serverVersion, encryptionKey });
             await builder.writeAuto(bundle, outFile);
 
-            this.logger.set('namespaces', bundle.namespaces ? 1 : 0);
-            this.logger.set('definitionFiles', Object.keys(bundle.definitions).length);
-            this.logger.set('serverVersion', 0); // placeholder (counters are numeric)
+            const nsCount = bundle.namespaceRecords.length;
+            const defFiles = Object.keys(bundle.records).length;
+            const defCount = Object.values(bundle.records).reduce((s, a) => s + a.length, 0);
+            this.logger.set('namespaces', nsCount);
+            this.logger.set('definitionFiles', defFiles);
             this.logger.success(`Bundle written to ${outFile}`);
-            this.logger.info(`  serverVersion: ${bundle.serverVersion}`);
-            this.logger.info(`  aFrameVersion: ${bundle.aFrameVersion}`);
+            this.logger.info(`  serverVersion:    ${bundle.serverVersion}`);
+            this.logger.info(`  aFrameVersion:    ${bundle.aFrameVersion}`);
+            this.logger.info(`  namespaces:       ${nsCount}`);
+            this.logger.info(`  definition files: ${defFiles}  (${defCount} records)`);
             this.logger.summary('Bundle Stats');
         } catch (err) {
             this.logger.error(`Bundle build failed: ${err instanceof Error ? err.message : String(err)}`);

package/src/lib/A-FrameChannel/A-FrameChannel.component.env-browser.ts

@@ -59,5 +59,3 @@ export class A_FrameBrowserChannel extends A_FrameChannel {
     }
 }
 
-
-

package/src/lib/A-FrameChannel/A-FrameChannel.component.env-node.ts

@@ -36,9 +36,8 @@ export class A_FrameNodeChannel extends A_FrameChannel {
                     path: `${parsedUrl.pathname}${parsedUrl.search}`,
                     method: context.method,
                     headers: {
-                        "Content-Type": "application/json",
+                        ...(payload ? { "Content-Type": "application/json", "Content-Length": Buffer.byteLength(payload) } : {}),
                         Authorization: `Bearer ${env.A_FRAME_SERVER_API_KEY}`,
-                        ...(payload ? { "Content-Length": Buffer.byteLength(payload) } : {}),
                     },
                 },
                 (res) => {
@@ -60,17 +59,14 @@ export class A_FrameNodeChannel extends A_FrameChannel {
                         }
 
                         if (!raw) {
-                            console.log(`[A-FrameChannel] <-- ${res.statusCode} ${context.method} ${url} (empty)`);
                             resolve(undefined);
                             return;
                         }
 
                         try {
                             const parsed = JSON.parse(raw);
-                            console.log(`[A-FrameChannel] <-- ${res.statusCode} ${context.method} ${url}`);
                             resolve(parsed);
                         } catch {
-                            console.error(`[A-FrameChannel] <-- ${res.statusCode} ${context.method} ${url} (invalid JSON)`);
                             reject(
                                 new A_FrameChannelError({
                                     title: A_FrameChannelError.RequestFailed,
@@ -82,12 +78,12 @@ export class A_FrameNodeChannel extends A_FrameChannel {
                 },
             );
 
-            req.setTimeout(15_000, () => {
+            req.setTimeout(env.A_FRAME_REQUEST_TIMEOUT, () => {
                 console.error(`[A-FrameChannel] TIMEOUT ${context.method} ${url}`);
                 req.destroy(
                     new A_FrameChannelError({
                         title: A_FrameChannelError.Timeout,
-                        description: `Request to ${context.path} timed out after 15 seconds`,
+                        description: `Request to ${context.path} timed out after ${env.A_FRAME_REQUEST_TIMEOUT}ms`,
                     }),
                 );
             });
@@ -105,6 +101,10 @@ export class A_FrameNodeChannel extends A_FrameChannel {
 
 
 
+    @A_Feature.Extend({
+        name: A_FrameFeatures.Stream,
+        scope: [A_FrameChannel],
+    })
     async stream(
         @A_Inject(A_FrameChannelStream) stream: A_FrameChannelStream,
         @A_Inject(A_FrameEnv) env: A_FrameEnv,
@@ -124,7 +124,7 @@ export class A_FrameNodeChannel extends A_FrameChannel {
                     path: `${parsedUrl.pathname}${parsedUrl.search}`,
                     method: stream.method,
                     headers: {
-                        "Content-Type": "application/json",
+                        ...(payload ? { "Content-Type": "application/json" } : {}),
                         Accept: "text/event-stream",
                         Authorization: `Bearer ${env.A_FRAME_SERVER_API_KEY}`,
                         ...(payload ? { "Content-Length": Buffer.byteLength(payload) } : {}),
@@ -181,7 +181,6 @@ export class A_FrameNodeChannel extends A_FrameChannel {
                     });
 
                     res.on("end", () => {
-                        console.log(`[A-FrameChannel] <-- ${res.statusCode} ${stream.method} ${url} (stream complete)`);
                         resolve();
                     });
 
@@ -189,12 +188,12 @@ export class A_FrameNodeChannel extends A_FrameChannel {
                 },
             );
 
-            req.setTimeout(60_000, () => {
+            req.setTimeout(300_000, () => {
                 console.error(`[A-FrameChannel] TIMEOUT ${stream.method} ${url}`);
                 req.destroy(
                     new A_FrameChannelError({
                         title: A_FrameChannelError.Timeout,
-                        description: `Stream request to ${stream.path} timed out after 60 seconds`,
+                        description: `Stream request to ${stream.path} timed out after 300 seconds`,
                     }),
                 );
             });
@@ -209,6 +208,10 @@ export class A_FrameNodeChannel extends A_FrameChannel {
     }
 
 
+    @A_Feature.Extend({
+        name: A_FrameFeatures.Send,
+        scope: [A_FrameChannel],
+    })
     async send(
         @A_Inject(A_FrameChannelStream) stream: A_FrameChannelStream,
         @A_Inject(A_FrameChannelEvent) event: A_FrameChannelEvent,
@@ -258,14 +261,12 @@ export class A_FrameNodeChannel extends A_FrameChannel {
                             return;
                         }
 
-                        console.log(`[A-FrameChannel] --> ${res.statusCode} POST ${url} (event: ${event.name})`);
                         resolve();
                     });
                 },
             );
 
             req.setTimeout(15_000, () => {
-                console.error(`[A-FrameChannel] TIMEOUT POST ${url}`);
                 req.destroy(
                     new A_FrameChannelError({
                         title: A_FrameChannelError.Timeout,
@@ -404,7 +405,6 @@ export class A_FrameNodeChannel extends A_FrameChannel {
 //                         rawSocket.write(encodeWebSocketFrame(data));
 //                     });
 
-//                     console.log(`[A-FrameChannel] WS OPEN ${url}`);
 //                 }
 
 //                 // ── Phase 2: parse and dispatch complete WS frames ───────────
@@ -420,7 +420,6 @@ export class A_FrameNodeChannel extends A_FrameChannel {
 //                             rawSocket.write(encodeWebSocketFrame("", 0x8));
 //                             rawSocket.end();
 //                             socket.complete();
-//                             console.log(`[A-FrameChannel] WS CLOSE ${url}`);
 //                             resolve();
 //                             return;
 //                         }