@makefully/adaptfully 2.1.0 → 3.0.1

package/lib/runtime/platform.js

@@ -1,89 +1,89 @@
-/* global window */
-
-(function registerPlatform(ns) {
-    class Platform {
-        /**
-         * @param {object} authPlugin
-         */
-        constructor(authPlugin) {
-            this.auth = authPlugin;
-            this.online = true;
-            this.#ready = false;
-            this.#queue = [];
-
-            authPlugin.whenReady((err) => {
-                if (err) {
-                    this.online = false;
-                }
-                this.#ready = true;
-                const queue = this.#queue;
-                this.#queue = [];
-                for (const callback of queue) {
-                    callback();
-                }
-            });
-        }
-
-        /** @type {boolean} */
-        #ready;
-
-        /** @type {Array<() => void>} */
-        #queue;
-
-        whenReady(callback) {
-            if (this.#ready) {
-                callback();
-                return;
-            }
-            this.#queue.push(callback);
-        }
-
-        login(callback) {
-            this.whenReady(() => {
-                if (!this.online) {
-                    callback({ authenticated: false });
-                    return;
-                }
-                this.auth.login((result) => {
-                    callback(result || {
-                        authenticated: this.auth.isAuthenticated(),
-                        user: this.auth.getUser(),
-                    });
-                });
-            });
-        }
-
-        silentLogin(callback) {
-            this.whenReady(() => {
-                if (!this.online) {
-                    callback({ authenticated: false });
-                    return;
-                }
-                this.auth.silentLogin((result) => {
-                    callback(result || {
-                        authenticated: this.auth.isAuthenticated(),
-                        user: this.auth.getUser(),
-                    });
-                });
-            });
-        }
-
-        logout(callback) {
-            this.whenReady(() => {
-                this.auth.logout(() => {
-                    callback({ authenticated: false });
-                });
-            });
-        }
-
-        getUser() {
-            return this.auth.getUser();
-        }
-
-        isAuthenticated() {
-            return this.auth.isAuthenticated();
-        }
-    }
-
-    ns.Platform = Platform;
-}(window.adaptfully));
+/* global window */
+
+(function registerPlatform(ns) {
+    class Platform {
+        /**
+         * @param {object} authPlugin
+         */
+        constructor(authPlugin) {
+            this.auth = authPlugin;
+            this.online = true;
+            this.#ready = false;
+            this.#queue = [];
+
+            authPlugin.whenReady((err) => {
+                if (err) {
+                    this.online = false;
+                }
+                this.#ready = true;
+                const queue = this.#queue;
+                this.#queue = [];
+                for (const callback of queue) {
+                    callback();
+                }
+            });
+        }
+
+        /** @type {boolean} */
+        #ready;
+
+        /** @type {Array<() => void>} */
+        #queue;
+
+        whenReady(callback) {
+            if (this.#ready) {
+                callback();
+                return;
+            }
+            this.#queue.push(callback);
+        }
+
+        login(callback) {
+            this.whenReady(() => {
+                if (!this.online) {
+                    callback({ authenticated: false });
+                    return;
+                }
+                this.auth.login((result) => {
+                    callback(result || {
+                        authenticated: this.auth.isAuthenticated(),
+                        user: this.auth.getUser(),
+                    });
+                });
+            });
+        }
+
+        silentLogin(callback) {
+            this.whenReady(() => {
+                if (!this.online) {
+                    callback({ authenticated: false });
+                    return;
+                }
+                this.auth.silentLogin((result) => {
+                    callback(result || {
+                        authenticated: this.auth.isAuthenticated(),
+                        user: this.auth.getUser(),
+                    });
+                });
+            });
+        }
+
+        logout(callback) {
+            this.whenReady(() => {
+                this.auth.logout(() => {
+                    callback({ authenticated: false });
+                });
+            });
+        }
+
+        getUser() {
+            return this.auth.getUser();
+        }
+
+        isAuthenticated() {
+            return this.auth.isAuthenticated();
+        }
+    }
+
+    ns.Platform = Platform;
+}(window.adaptfully));

package/package.json

@@ -1,61 +1,62 @@
-{
-    "name": "@makefully/adaptfully",
-    "version": "2.1.0",
-    "description": "Platform abstraction and Wrapfully deploy client for Makefully games",
-    "type": "module",
-    "main": "./lib/node/index.js",
-    "exports": {
-        ".": "./lib/node/index.js",
-        "./runtime/*": "./lib/runtime/*",
-        "./deploy": "./lib/node/deploy.js",
-        "./package.json": "./package.json"
-    },
-    "bin": {
-        "wrapfully-deploy": "bin/wrapfully-deploy.js"
-    },
-    "files": [
-        "bin",
-        "lib",
-        "CHANGELOG.md",
-        "LICENSE",
-        "README.md"
-    ],
-    "scripts": {
-        "deploy": "node bin/wrapfully-deploy.js",
-        "test": "node --test test/*.test.js"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/Makefully-Studios/adaptfully.git"
-    },
-    "bugs": {
-        "url": "https://github.com/Makefully-Studios/adaptfully/issues"
-    },
-    "homepage": "https://github.com/Makefully-Studios/adaptfully#readme",
-    "keywords": [
-        "adaptfully",
-        "wrapfully",
-        "auth",
-        "platform",
-        "deploy",
-        "build",
-        "cordova",
-        "electron"
-    ],
-    "contributors": [
-        "Derek Detweiler <derek@makefullystudios.com>"
-    ],
-    "license": "MIT",
-    "publishConfig": {
-        "access": "public",
-        "provenance": true
-    },
-    "engines": {
-        "node": ">=18"
-    },
-    "dependencies": {
-        "archiver": "^7.0.1",
-        "axios": "^1.7.9",
-        "unzip-stream": "^0.3.4"
-    }
-}
+{
+    "name": "@makefully/adaptfully",
+    "version": "3.0.1",
+    "description": "Platform abstraction and Wrapfully deploy client for Makefully games",
+    "type": "module",
+    "main": "./lib/node/index.js",
+    "exports": {
+        ".": "./lib/node/index.js",
+        "./runtime/*": "./lib/runtime/*",
+        "./deploy": "./lib/node/deploy.js",
+        "./package.json": "./package.json"
+    },
+    "bin": {
+        "adaptfully": "bin/adaptfully.js",
+        "wrapfully-deploy": "bin/wrapfully-deploy.js"
+    },
+    "files": [
+        "bin",
+        "lib",
+        "CHANGELOG.md",
+        "LICENSE",
+        "README.md"
+    ],
+    "scripts": {
+        "deploy": "node bin/wrapfully-deploy.js",
+        "test": "node --test test/*.test.js"
+    },
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/Makefully-Studios/adaptfully.git"
+    },
+    "bugs": {
+        "url": "https://github.com/Makefully-Studios/adaptfully/issues"
+    },
+    "homepage": "https://github.com/Makefully-Studios/adaptfully#readme",
+    "keywords": [
+        "adaptfully",
+        "wrapfully",
+        "auth",
+        "platform",
+        "deploy",
+        "build",
+        "cordova",
+        "electron"
+    ],
+    "contributors": [
+        "Derek Detweiler <derek@makefullystudios.com>"
+    ],
+    "license": "MIT",
+    "publishConfig": {
+        "access": "public",
+        "provenance": true
+    },
+    "engines": {
+        "node": ">=18"
+    },
+    "dependencies": {
+        "archiver": "^7.0.1",
+        "axios": "^1.7.9",
+        "unzip-stream": "^0.3.4"
+    }
+}

package/lib/node/distribution.js

@@ -1,138 +0,0 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const PACKAGE_ROOT = path.resolve(__dirname, '..', '..');
-const RUNTIME_DIR = path.join(PACKAGE_ROOT, 'lib', 'runtime');
-
-/** @typedef {'web' | 'steam' | 'android' | 'ios'} BuildChannel */
-
-export const VALID_CHANNELS = new Set(['web', 'steam', 'android', 'ios']);
-
-/** @type {Record<BuildChannel, string[]>} */
-const CHANNEL_EXCLUDED_AUTH = {
-    steam: ['auth/google-auth.js'],
-    web: ['auth/steam-auth.js'],
-    android: ['auth/steam-auth.js'],
-    ios: ['auth/steam-auth.js'],
-};
-
-/** @type {Record<BuildChannel, string>} */
-const CHANNEL_EXT_SCRIPTS = {
-    web: '<script src="https://accounts.google.com/gsi/client" async defer></script>\n',
-    android: '<script src="https://accounts.google.com/gsi/client" async defer></script>\n',
-    ios: '<script src="https://accounts.google.com/gsi/client" async defer></script>\n',
-};
-
-/** @type {Record<BuildChannel, string>} */
-const CHANNEL_AUTH_REGISTRATION = {
-    web: "adaptfully.register('auth', adaptfully.auth.Google);",
-    android: "adaptfully.register('auth', adaptfully.auth.Google);",
-    ios: "adaptfully.register('auth', adaptfully.auth.Google);",
-    steam: "adaptfully.register('auth', adaptfully.auth.Steam);",
-};
-
-const DEV_AUTH_REGISTRATION = "adaptfully.register('auth', adaptfully.auth.Dev);";
-
-const RUNTIME_BASE_SCRIPTS = [
-    'core.js',
-    'platform.js',
-];
-
-export function getPackageRoot() {
-    return PACKAGE_ROOT;
-}
-
-export function getRuntimeDir() {
-    return RUNTIME_DIR;
-}
-
-export function resolveRuntimeScript(relativePath) {
-    return path.join(RUNTIME_DIR, relativePath);
-}
-
-/**
- * @param {NodeJS.ProcessEnv} [env]
- * @returns {BuildChannel}
- */
-export function getBuildChannel(env = process.env) {
-    const channel = env.ENTANGLEMENT_CHANNEL
-        || env.VITE_ENTANGLEMENT_CHANNEL
-        || env.ADAPTFULLY_CHANNEL
-        || 'web';
-
-    if (!VALID_CHANNELS.has(channel)) {
-        throw new Error(
-            `Invalid distribution channel "${channel}". Expected one of: ${[...VALID_CHANNELS].join(', ')}`,
-        );
-    }
-
-    return /** @type {BuildChannel} */ (channel);
-}
-
-/** @param {BuildChannel} [channel] */
-export function authRegistrationForChannel(channel = getBuildChannel()) {
-    const registration = CHANNEL_AUTH_REGISTRATION[channel];
-    if (!registration) {
-        throw new Error(`No auth registration for channel: ${channel}`);
-    }
-    return registration;
-}
-
-export function devAuthRegistration() {
-    return DEV_AUTH_REGISTRATION;
-}
-
-/** @param {BuildChannel} [channel] */
-export function getAuthScriptsForChannel(channel = getBuildChannel()) {
-    const excluded = new Set(CHANNEL_EXCLUDED_AUTH[channel] ?? []);
-    const scripts = RUNTIME_BASE_SCRIPTS.map((rel) => resolveRuntimeScript(rel));
-
-    const authDir = path.join(RUNTIME_DIR, 'auth');
-    for (const file of fs.readdirSync(authDir).sort()) {
-        const rel = path.join('auth', file).replace(/\\/g, '/');
-        if (!excluded.has(rel)) {
-            scripts.push(path.join(authDir, file));
-        }
-    }
-
-    return scripts;
-}
-
-/** @param {BuildChannel} [channel] */
-export function authRegistrationScript(channel = getBuildChannel()) {
-    return authRegistrationForChannel(channel);
-}
-
-/** @param {BuildChannel} [channel] */
-export function extScriptsForBuildChannel(channel = getBuildChannel()) {
-    return CHANNEL_EXT_SCRIPTS[channel] ?? '';
-}
-
-/**
- * @param {Array<string | { src: string }>} includes
- * @param {BuildChannel} [channel]
- */
-export function filterIncludesForBuildChannel(includes, channel = getBuildChannel()) {
-    if (channel !== 'steam') {
-        return includes;
-    }
-
-    return includes.filter((include) => {
-        const rel = typeof include === 'string' ? include : include.src;
-        return rel !== 'script/banner-ads.js';
-    });
-}
-
-/**
- * @param {BuildChannel} channel
- * @param {{ profiles: object, allExpansionsBitmask?: number }} distributionConfig
- */
-export function distributionSettingsForBuild(channel, distributionConfig) {
-    return {
-        channel,
-        profiles: distributionConfig.profiles,
-        allExpansionsBitmask: distributionConfig.allExpansionsBitmask ?? 15,
-    };
-}